From 98405edf61a02b4a8697a05ec2320c9337d844c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 28 Nov 2014 20:26:50 +0100 Subject: [PATCH 0001/4996] Add a Jekyll doctor warning for URLs that only differ by case Those URLs are problematic on case-insensitive file systems because one of the URLs is overwritten by the other. Fixes #3035 --- lib/jekyll/commands/doctor.rb | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index 0fab8b3a7a5..5d3dfc610b2 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -31,7 +31,8 @@ def process(options) def healthy?(site) [ !deprecated_relative_permalinks(site), - !conflicting_urls(site) + !conflicting_urls(site), + !urls_only_differ_by_case(site) ].all? end @@ -63,6 +64,22 @@ def conflicting_urls(site) conflicting_urls end + def urls_only_differ_by_case(site) + urls_only_differ_by_case = false + urls = {} + urls = collect_urls_case_insensitive(urls, site.pages, site.dest) + urls = collect_urls_case_insensitive(urls, site.posts, site.dest) + urls.each do |case_insensitive_url, real_urls| + if real_urls.uniq.size > 1 + urls_only_differ_by_case = true + Jekyll.logger.warn "Warning:", "The following URLs only differ" + + " by case. On a case-insensitive file system one of the URLs" + + " will be overwritten by the other: #{real_urls.join(", ")}" + end + end + urls_only_differ_by_case + end + private def collect_urls(urls, things, destination) @@ -77,6 +94,17 @@ def collect_urls(urls, things, destination) urls end + def collect_urls_case_insensitive(urls, things, destination) + things.each do |thing| + dest = thing.destination(destination) + if urls[dest.downcase] + urls[dest.downcase] << dest + else + urls[dest.downcase] = [dest] + end + end + urls + end end end From a0da18e4f85c9b844bd29da5bfc7c1b24aedcdd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Sun, 30 Nov 2014 14:30:22 +0100 Subject: [PATCH 0002/4996] Incorporate code review feedback --- lib/jekyll/commands/doctor.rb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index 5d3dfc610b2..8da68956e40 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -95,13 +95,10 @@ def collect_urls(urls, things, destination) end def collect_urls_case_insensitive(urls, things, destination) - things.each do |thing| - dest = thing.destination(destination) - if urls[dest.downcase] - urls[dest.downcase] << dest - else - urls[dest.downcase] = [dest] - end + things.inject(urls) do |memo, thing| + dest = thing.destination(destination) + (memo[dest.downcase] ||= []) << dest + memo end urls end From 6055f112fb248e90f5bc8378f7c06942645296ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Sun, 30 Nov 2014 14:52:16 +0100 Subject: [PATCH 0003/4996] Incorporate code review feedback --- lib/jekyll/commands/doctor.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index 8da68956e40..d238f0d18b2 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -66,9 +66,7 @@ def conflicting_urls(site) def urls_only_differ_by_case(site) urls_only_differ_by_case = false - urls = {} - urls = collect_urls_case_insensitive(urls, site.pages, site.dest) - urls = collect_urls_case_insensitive(urls, site.posts, site.dest) + urls = case_insensitive_urls(site.pages + site.posts, site.dest) urls.each do |case_insensitive_url, real_urls| if real_urls.uniq.size > 1 urls_only_differ_by_case = true @@ -94,13 +92,12 @@ def collect_urls(urls, things, destination) urls end - def collect_urls_case_insensitive(urls, things, destination) - things.inject(urls) do |memo, thing| + def case_insensitive_urls(things, destination) + things.inject(Hash.new) do |memo, thing| dest = thing.destination(destination) (memo[dest.downcase] ||= []) << dest memo end - urls end end From 34ff0bbb36916dff4bd719981c2f15d903f862a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 15 Dec 2014 21:26:47 +0100 Subject: [PATCH 0004/4996] Added tests for new jekyll doctor warning --- .../_urls_differ_by_case_invalid/page1.html | 6 ++++ .../_urls_differ_by_case_invalid/page2.html | 6 ++++ .../_urls_differ_by_case_valid/page1.html | 6 ++++ test/test_doctor_command.rb | 36 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 test/source/_urls_differ_by_case_invalid/page1.html create mode 100644 test/source/_urls_differ_by_case_invalid/page2.html create mode 100644 test/source/_urls_differ_by_case_valid/page1.html create mode 100644 test/test_doctor_command.rb diff --git a/test/source/_urls_differ_by_case_invalid/page1.html b/test/source/_urls_differ_by_case_invalid/page1.html new file mode 100644 index 00000000000..a6a79f932db --- /dev/null +++ b/test/source/_urls_differ_by_case_invalid/page1.html @@ -0,0 +1,6 @@ +--- +title: About +permalink: /about/ +--- + +About the site diff --git a/test/source/_urls_differ_by_case_invalid/page2.html b/test/source/_urls_differ_by_case_invalid/page2.html new file mode 100644 index 00000000000..21f679f3f97 --- /dev/null +++ b/test/source/_urls_differ_by_case_invalid/page2.html @@ -0,0 +1,6 @@ +--- +title: About +permalink: /About/ +--- + +About the site diff --git a/test/source/_urls_differ_by_case_valid/page1.html b/test/source/_urls_differ_by_case_valid/page1.html new file mode 100644 index 00000000000..a6a79f932db --- /dev/null +++ b/test/source/_urls_differ_by_case_valid/page1.html @@ -0,0 +1,6 @@ +--- +title: About +permalink: /about/ +--- + +About the site diff --git a/test/test_doctor_command.rb b/test/test_doctor_command.rb new file mode 100644 index 00000000000..43fa602c7b0 --- /dev/null +++ b/test/test_doctor_command.rb @@ -0,0 +1,36 @@ +require 'helper' +require 'jekyll/commands/doctor' + +class TestDoctorCommand < Test::Unit::TestCase + context 'urls only differ by case' do + setup do + clear_dest + end + + should 'return success on a valid site/page' do + @site = Site.new(Jekyll.configuration({ + "source" => File.join(source_dir, '/_urls_differ_by_case_valid'), + "destination" => dest_dir + })) + @site.process + output = capture_stderr do + ret = Jekyll::Commands::Doctor.urls_only_differ_by_case(@site) + assert_equal false, ret + end + assert_equal "", output + end + + should 'return warning for pages only differing by case' do + @site = Site.new(Jekyll.configuration({ + "source" => File.join(source_dir, '/_urls_differ_by_case_invalid'), + "destination" => dest_dir + })) + @site.process + output = capture_stderr do + ret = Jekyll::Commands::Doctor.urls_only_differ_by_case(@site) + assert_equal true, ret + end + assert_equal "\e[33m Warning: The following URLs only differ by case. On a case-insensitive file system one of the URLs will be overwritten by the other: #{dest_dir}/about/index.html, #{dest_dir}/About/index.html\e[0m\n", output + end + end +end From 34438ed325423a75248cd6bd2927b69b39bfa217 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Tue, 9 Jun 2015 19:10:55 -0500 Subject: [PATCH 0005/4996] Refactor: lib/jekyll/convertor/markdown.rb - tests: no additions/breaks. Reason: #3770 --- lib/jekyll/converters/markdown.rb | 101 ++++++++++++++++++------------ 1 file changed, 62 insertions(+), 39 deletions(-) diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb index 30c7ef36682..7633ccf7d80 100644 --- a/lib/jekyll/converters/markdown.rb +++ b/lib/jekyll/converters/markdown.rb @@ -1,54 +1,63 @@ module Jekyll module Converters class Markdown < Converter - safe true - highlighter_prefix "\n" highlighter_suffix "\n" + safe true def setup return if @setup - @parser = - case @config['markdown'].downcase - when 'redcarpet' then RedcarpetParser.new(@config) - when 'kramdown' then KramdownParser.new(@config) - when 'rdiscount' then RDiscountParser.new(@config) - else - # So they can't try some tricky bullshit or go down the ancestor chain, I hope. - if allowed_custom_class?(@config['markdown']) - self.class.const_get(@config['markdown']).new(@config) - else - Jekyll.logger.error "Invalid Markdown Processor:", "#{@config['markdown']}" - Jekyll.logger.error "", "Valid options are [ #{valid_processors.join(" | ")} ]" - raise Errors::FatalException, "Invalid Markdown Processor: #{@config['markdown']}" - end - end - @setup = true + if (!@parser = get_processor) + Jekyll.logger.error "Invalid Markdown processor given:", @config["markdown"] + Jekyll.logger.info "", "Custom processors are not loaded in safe mode" if @config["safe"] + Jekyll.logger.error "", "Available processors are: #{valid_processors.join(", ")}" + raise Errors::FatalException, "Bailing out; invalid Markdown processor." + end + + @setup = \ + true + end + + def get_processor + case @config["markdown"].downcase + when "redcarpet" then return RedcarpetParser.new(@config) + when "kramdown" then return KramdownParser.new(@config) + when "rdiscount" then return RDiscountParser.new(@config) + else + get_custom_processor + end end + # Public: Provides you with a list of processors, the ones we + # support internally and the ones that you have provided to us (if you + # 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. + # This is really only available if you are not in safe mode, if you are + # in safe mode (re: Github) then there will be none. + def third_party_processors - self.class.constants - %w[ - KramdownParser - RDiscountParser - RedcarpetParser - PRIORITIES - ].map(&:to_sym) + self.class.constants - \ + %w[KramdownParser RDiscountParser RedcarpetParser PRIORITIES].map( + &:to_sym + ) end def extname_list - @extname_list ||= @config['markdown_ext'].split(',').map { |e| ".#{e.downcase}" } + @extname_list ||= @config['markdown_ext'].split(',').map do |e| + ".#{e.downcase}" + end end def matches(ext) - extname_list.include? ext.downcase + extname_list.include?( + ext.downcase + ) end def output_ext(ext) @@ -56,21 +65,35 @@ def output_ext(ext) end def convert(content) - setup - @parser.convert(content) + setup + @parser.convert( + content + ) end private + def get_custom_processor + md = @config["markdown"] + if custom_class_allowed?(md) + self.class.const_get(md).new( + @config + ) + end + end - # Private: Determine whether a class name is an allowed custom markdown - # class name + # Private: Determine whether a class name is an allowed custom + # markdown class name. # # parser_name - the name of the parser class # - # Returns true if the parser name contains only alphanumeric characters - # and is defined within Jekyll::Converters::Markdown - def allowed_custom_class?(parser_name) - parser_name !~ /[^A-Za-z0-9]/ && self.class.constants.include?(parser_name.to_sym) + # Returns true if the parser name contains only alphanumeric + # characters and is defined within Jekyll::Converters::Markdown + + private + def custom_class_allowed?(parser_name) + parser_name !~ /[^A-Za-z0-9]/ && self.class.constants.include?( + parser_name.to_sym + ) end end end From a58f23aeaf38bc180b2fdf46f7a6b98064d1302c Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Wed, 10 Jun 2015 15:05:17 -0500 Subject: [PATCH 0006/4996] Add support for underscores. --- lib/jekyll/converters/markdown.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb index 7633ccf7d80..e3c89934856 100644 --- a/lib/jekyll/converters/markdown.rb +++ b/lib/jekyll/converters/markdown.rb @@ -91,7 +91,7 @@ def get_custom_processor private def custom_class_allowed?(parser_name) - parser_name !~ /[^A-Za-z0-9]/ && self.class.constants.include?( + parser_name !~ /[^A-Za-z0-9_]/ && self.class.constants.include?( parser_name.to_sym ) end From e0b8539670b9cbc24175d9816241567e9eea74ae Mon Sep 17 00:00:00 2001 From: Shinnosuke Kondo Date: Mon, 13 Jul 2015 17:47:42 -0500 Subject: [PATCH 0007/4996] Added a new case for test_clearner where a directory is not in keep_files, but its path contains a string in keep_files. --- test/test_cleaner.rb | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/test/test_cleaner.rb b/test/test_cleaner.rb index 819dbf5cd21..c96394d7a68 100644 --- a/test/test_cleaner.rb +++ b/test/test_cleaner.rb @@ -37,6 +37,40 @@ class TestCleaner < JekyllUnitTest end end + context "not-nested directory in keep_files and similary named directory not in keep_files" do + setup do + clear_dest + + FileUtils.mkdir_p(dest_dir('.git/child_dir')) + FileUtils.mkdir_p(dest_dir('username.github.io')) + FileUtils.touch(File.join(dest_dir('.git'), 'index.html')) + FileUtils.touch(File.join(dest_dir('username.github.io'), 'index.html')) + + @site = fixture_site + @site.keep_files = ['.git'] + + @cleaner = Cleaner.new(@site) + @cleaner.cleanup! + end + + teardown do + FileUtils.rm_rf(dest_dir('.git')) + FileUtils.rm_rf(dest_dir('.username.github.io')) + end + + should "keep the file in the directory in keep_files" do + assert File.exist?(File.join(dest_dir('.git'), 'index.html')) + end + + should "delete the file in the directory not in keep_files" do + assert !File.exist?(File.join(dest_dir('username.github.io'), 'index.html')) + end + + should "delete the directory not in keep_files" do + assert !File.exist?(dest_dir('username.github.io')) + end + end + context "directory containing no files and non-empty directories" do setup do clear_dest From 3b60237cb152aa19526902d30bd02feb39a71f24 Mon Sep 17 00:00:00 2001 From: Shinnosuke Kondo Date: Mon, 13 Jul 2015 18:34:40 -0500 Subject: [PATCH 0008/4996] Fix keep_files to be used as paths relative to the destination. They were used as keywords to match files containing them in the paths. --- lib/jekyll/cleaner.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb index 70bd2f790ea..2a00a737bfb 100644 --- a/lib/jekyll/cleaner.rb +++ b/lib/jekyll/cleaner.rb @@ -94,11 +94,12 @@ def keep_dirs # Private: Creates a regular expression from the config's keep_files array # # Examples - # ['.git','.svn'] creates the following regex: /\/(\.git|\/.svn)/ + # ['.git','.svn'] with site.dest "/myblog/_site" creates + # the following regex: /\/myblog\/_site\/(\.git|\/.svn)/ # # Returns the regular expression def keep_file_regex - Regexp.union(site.keep_files) + /#{Regexp.quote(site.dest)}\/(#{Regexp.union(site.keep_files).source})/ end end end From 1eb626b1dfdcb90cbc6f48c0b67b665ed71fccbe Mon Sep 17 00:00:00 2001 From: Shinnosuke Kondo Date: Mon, 13 Jul 2015 19:08:11 -0500 Subject: [PATCH 0009/4996] Fix keep_files not to match a file with repeated path. --- lib/jekyll/cleaner.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb index 2a00a737bfb..509cebb1fb5 100644 --- a/lib/jekyll/cleaner.rb +++ b/lib/jekyll/cleaner.rb @@ -95,11 +95,11 @@ def keep_dirs # # Examples # ['.git','.svn'] with site.dest "/myblog/_site" creates - # the following regex: /\/myblog\/_site\/(\.git|\/.svn)/ + # the following regex: /\A\/myblog\/_site\/(\.git|\/.svn)/ # # Returns the regular expression def keep_file_regex - /#{Regexp.quote(site.dest)}\/(#{Regexp.union(site.keep_files).source})/ + /\A#{Regexp.quote(site.dest)}\/(#{Regexp.union(site.keep_files).source})/ end end end From 36a41cd22424f5cca95e11403e91114f01f67542 Mon Sep 17 00:00:00 2001 From: chrisfinazzo Date: Mon, 19 Oct 2015 12:06:46 -0400 Subject: [PATCH 0010/4996] Typos and line wrapping --- site/_docs/configuration.md | 4 ++-- site/_docs/contributing.md | 2 +- site/_docs/deployment-methods.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md index ffbef8a40c3..fb7cd2f36fe 100644 --- a/site/_docs/configuration.md +++ b/site/_docs/configuration.md @@ -653,8 +653,8 @@ class Jekyll::Converters::Markdown::MyCustomProcessor end {% endhighlight %} -Once you've created your class and have it properly setup either as a plugin in -the `_plugins` folder or as a gem, specify it in your `_config.yml`: +Once you've created your class and have it properly set up either as a plugin +in the `_plugins` folder or as a gem, specify it in your `_config.yml`: {% highlight yaml %} markdown: MyCustomProcessor diff --git a/site/_docs/contributing.md b/site/_docs/contributing.md index ae768e5b553..4728e96ec9d 100644 --- a/site/_docs/contributing.md +++ b/site/_docs/contributing.md @@ -43,7 +43,7 @@ Test Dependencies ----------------- To run the test suite and build the gem you'll need to install Jekyll's -dependencies. Simply run this command to get all setup: +dependencies. Simply run this command to get all set up: $ script/bootstrap diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md index c1040b2b780..1fb0c64c89d 100644 --- a/site/_docs/deployment-methods.md +++ b/site/_docs/deployment-methods.md @@ -112,7 +112,7 @@ That's why rrsync wrapper shall be installed. If it is not already installed by - Put it to the bin subdirectory of your home folder (```~/bin```) - Make it executable (```chmod +x```) -#### Step 2: Setup certificate-based ssh access (server side) +#### Step 2: Set up certificate-based ssh access (server side) [This process is described in a lot of places in the net](https://wiki.gentoo.org/wiki/SSH#Passwordless_Authentication). We will not cover it here. What is different from usual approach is to put the restriction to certificate-based authorization in ```~/.ssh/authorized_keys```). We will launch ```rrsync``` utility and supply it with the folder it shall have read-write access to: From cf71c563ab2ce4fe974e2e0c07361c2721a9b334 Mon Sep 17 00:00:00 2001 From: Florian Thomas Date: Sat, 24 Oct 2015 17:34:29 +0200 Subject: [PATCH 0011/4996] Handle empty config files SafeYAML.load_file returns `false` when processing empty files so we convert this into an empty hash for further processing. fixes #4030 --- lib/jekyll/configuration.rb | 20 +++++++++++++++++--- test/test_configuration.rb | 28 ++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index f57b3ae4853..52b65a33b0a 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -118,7 +118,7 @@ def safe_load_file(filename) Jekyll::External.require_with_graceful_fail('toml') unless defined?(TOML) TOML.load_file(filename) when /\.ya?ml/i - SafeYAML.load_file(filename) + SafeYAML.load_file(filename) || {} else raise ArgumentError, "No parser for '#{filename}' is available. Use a .toml or .y(a)ml file instead." end @@ -153,7 +153,7 @@ def config_files(override) # Returns this configuration, overridden by the values in the file def read_config_file(file) next_config = safe_load_file(file) - raise ArgumentError.new("Configuration file: (INVALID) #{file}".yellow) unless next_config.is_a?(Hash) + check_config_is_hash!(next_config, file) Jekyll.logger.info "Configuration file:", file next_config rescue SystemCallError @@ -236,7 +236,8 @@ def backwards_compatibilize end %w[include exclude].each do |option| - if config.fetch(option, []).is_a?(String) + config[option] ||= [] + if config[option].is_a?(String) Jekyll::Deprecator.deprecation_message "The '#{option}' configuration option" + " must now be specified as an array, but you specified" + " a string. For now, we've treated the string you provided" + @@ -300,6 +301,7 @@ def renamed_key(old, new, config, allowed_values = nil) end private + def style_to_permalink(permalink_style) case permalink_style.to_sym when :pretty @@ -314,5 +316,17 @@ def style_to_permalink(permalink_style) permalink_style.to_s end end + + # Private: Checks if a given config is a hash + # + # extracted_config - the value to check + # file - the file from which the config was extracted + # + # Raises an ArgumentError if given config is not a hash + def check_config_is_hash!(extracted_config, file) + unless extracted_config.is_a?(Hash) + raise ArgumentError.new("Configuration file: (INVALID) #{file}".yellow) + end + end end end diff --git a/test/test_configuration.rb b/test/test_configuration.rb index 553dfda3d00..608dfef0c07 100644 --- a/test/test_configuration.rb +++ b/test/test_configuration.rb @@ -59,6 +59,34 @@ class TestConfiguration < JekyllUnitTest assert_equal %w[config/site.yml config/deploy.toml configuration.yml], @config.config_files(@multiple_files) end end + + context "#read_config_file" do + setup do + @config = Configuration[{"source" => source_dir('empty.yml')}] + end + + should "not raise an error on empty files" do + allow(SafeYAML).to receive(:load_file).with('empty.yml').and_return(false) + Jekyll.logger.log_level = :warn + @config.read_config_file('empty.yml') + Jekyll.logger.log_level = :info + end + end + + context "#read_config_files" do + setup do + @config = Configuration[{"source" => source_dir}] + end + + should "continue to read config files if one is empty" do + allow(SafeYAML).to receive(:load_file).with('empty.yml').and_return(false) + allow(SafeYAML).to receive(:load_file).with('not_empty.yml').and_return({'foo' => 'bar', 'include' => '', 'exclude' => ''}) + Jekyll.logger.log_level = :warn + read_config = @config.read_config_files(['empty.yml', 'not_empty.yml']) + Jekyll.logger.log_level = :info + assert_equal 'bar', read_config['foo'] + end + end context "#backwards_compatibilize" do setup do @config = Configuration[{ From 056abdf8997c4739336d14b813ebfd075f1c604e Mon Sep 17 00:00:00 2001 From: chrisfinazzo Date: Tue, 10 Nov 2015 22:17:20 -0500 Subject: [PATCH 0012/4996] Improve readability of rrsync instructions, update deploy scripts --- site/_docs/deployment-methods.md | 65 +++++++++++++++++++------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md index 1fb0c64c89d..9bbc63fa0f6 100644 --- a/site/_docs/deployment-methods.md +++ b/site/_docs/deployment-methods.md @@ -102,64 +102,77 @@ Once you’ve generated the `_site` directory, you can easily scp it using a `ta Once you’ve generated the `_site` directory, you can easily rsync it using a `tasks/deploy` shell script similar to [this deploy script here](https://github.com/vitalyrepin/vrepinblog/blob/master/transfer.sh). You’d obviously need to change the values to reflect your site’s details. -#### Step 1: Install rrsync to your home folder (server-side) +Certificate-based authorization is another way to simplify the publishing +process. It makes sense to restrict rsync access only to the directory which it is supposed to sync. This can be done using rrsync. -We will use certificate-based authorization to simplify the publishing process. It makes sense to restrict rsync access only to the directory which it is supposed to sync. +#### Step 1: Install rrsync to your home folder (server-side) -That's why rrsync wrapper shall be installed. If it is not already installed by your hoster you can do it yourself: +If it is not already installed by your host, you can do it yourself: -- [download rrsync](http://ftp.samba.org/pub/unpacked/rsync/support/rrsync) -- Put it to the bin subdirectory of your home folder (```~/bin```) -- Make it executable (```chmod +x```) +- [Download rrsync](http://ftp.samba.org/pub/unpacked/rsync/support/rrsync) +- Place it in the `bin` subdirectory of your home folder (`~/bin`) +- Make it executable (`chmod +x`) -#### Step 2: Set up certificate-based ssh access (server side) +#### Step 2: Set up certificate-based SSH access (server side) -[This process is described in a lot of places in the net](https://wiki.gentoo.org/wiki/SSH#Passwordless_Authentication). We will not cover it here. What is different from usual approach is to put the restriction to certificate-based authorization in ```~/.ssh/authorized_keys```). We will launch ```rrsync``` utility and supply it with the folder it shall have read-write access to: +This [process](https://wiki.gentoo.org/wiki/SSH#Passwordless_Authentication) is +described in several places online. What is different from the typical approach +is to put the restriction to certificate-based authorization in +```~/.ssh/authorized_keys```. Then, aunch `rrsync` and supply +it with the folder it shall have read-write access to: -``` +{% highlight bash %} command="$HOME/bin/rrsync ",no-agent-forwarding,no-port-forwarding,no-pty,no-user-rc,no-X11-forwarding ssh-rsa -``` +{% endhighlight %} `````` is the path to your site. E.g., ```~/public_html/you.org/blog-html/```. -#### Step 3: Rsync! (client-side) +#### Step 3: Rsync (client-side) -Add the script ```deploy``` to the web site source folder: +Add the `deploy` script to the site source folder: {% highlight bash %} #!/bin/sh -rsync -avr --rsh='ssh -p2222' --delete-after --delete-excluded @: +rsync -crvz --rsh=ssh -p2222' --delete-after --delete-excluded @: {% endhighlight %} Command line parameters are: -- ```--rsh='ssh -p2222'``` It is needed if your hoster provides ssh access using ssh port different from default one (e.g., this is what hostgator is doing) -- `````` is the name of the local folder with generated web content. By default it is ```_site/``` for Jekyll -- `````` — ssh user name for your hosting account -- `````` — your hosting server +- ````--rsh=ssh -p2222```` — The port for SSH access. It is required if +your host uses a different port than the default (e.g, HostGator) +- `` — The name of the local output folder (defaults to `_site`) +- `` — The username for your hosting account +- `` — Your hosting server -Example command line is: +Using this setup, you might run the following command: {% highlight bash %} -rsync -avr --rsh='ssh -p2222' --delete-after --delete-excluded _site/ hostuser@vrepin.org: +rsync -crvz --rsh='ssh -p2222' --delete-after --delete-excluded _site/ hostuser@example.org: {% endhighlight %} -Don't forget column ':' after server name! +Don't forget the column `:` after server name! + +#### Step 4 (Optional): Exclude the transfer script from being copied to the output folder. -#### Optional step 4: exclude transfer.sh from being copied to the output folder by Jekyll +This step is recommended if you use these instructions to deploy your site. If +you put the `deploy` script in the root folder of your project, Jekyll will +copy it to the output folder. This behavior can be changed in `_config.yml`. -This step is recommended if you use this how-to to deploy Jekyll-based web site. If you put ```deploy``` script to the root folder of your project, Jekyll copies it to the output folder. -This behavior can be changed in ```_config.yml```. Just add the following line there: +Just add the following line: {% highlight yaml %} -# Do not copy these file to the output directory +# Do not copy these files to the output directory exclude: ["deploy"] {% endhighlight %} -#### We are done! +Alternatively, you can use an `rsync-exclude.txt` file to control which files will be transferred to your server. + +#### Done! -Now it's possible to publish your web site by launching ```deploy``` script. If your ssh certificate is [passphrase-protected](https://martin.kleppmann.com/2013/05/24/improving-security-of-ssh-private-keys.html), you are asked to enter the password. +Now it's possible to publish your website simply by running the `deploy` +script. If your SSH certificate is [passphrase-protected](https://martin.kleppmann.com/2013/05/24/improving-security-of-ssh-private-keys.html), you will be asked to enter it when the +script executes. ## Rack-Jekyll From 4a91bb669c1339a786aeb8cb88452009f31c43a7 Mon Sep 17 00:00:00 2001 From: chrisfinazzo Date: Wed, 11 Nov 2015 20:33:44 -0500 Subject: [PATCH 0013/4996] Fix a typo, use single backticks for inline code examples --- site/_docs/deployment-methods.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md index 9bbc63fa0f6..51a3a5b221c 100644 --- a/site/_docs/deployment-methods.md +++ b/site/_docs/deployment-methods.md @@ -118,14 +118,14 @@ If it is not already installed by your host, you can do it yourself: This [process](https://wiki.gentoo.org/wiki/SSH#Passwordless_Authentication) is described in several places online. What is different from the typical approach is to put the restriction to certificate-based authorization in -```~/.ssh/authorized_keys```. Then, aunch `rrsync` and supply +`~/.ssh/authorized_keys`. Then, launch `rrsync` and supply it with the folder it shall have read-write access to: {% highlight bash %} command="$HOME/bin/rrsync ",no-agent-forwarding,no-port-forwarding,no-pty,no-user-rc,no-X11-forwarding ssh-rsa {% endhighlight %} -`````` is the path to your site. E.g., ```~/public_html/you.org/blog-html/```. +`` is the path to your site. E.g., `~/public_html/you.org/blog-html/`. #### Step 3: Rsync (client-side) @@ -139,7 +139,7 @@ rsync -crvz --rsh=ssh -p2222' --delete-after --delete-excluded Command line parameters are: -- ````--rsh=ssh -p2222```` — The port for SSH access. It is required if +- `--rsh=ssh -p2222` — The port for SSH access. It is required if your host uses a different port than the default (e.g, HostGator) - `` — The name of the local output folder (defaults to `_site`) - `` — The username for your hosting account From bd2c337e5bd1a3532f42776f55f80f4e273cfeac Mon Sep 17 00:00:00 2001 From: Ducksan Cho Date: Wed, 18 Nov 2015 02:16:03 +1300 Subject: [PATCH 0014/4996] Avoid using Dir.glob with absolute path the absolute path including '[', '{', '?', or '*' could change the outcome --- lib/jekyll/cleaner.rb | 11 ++++++++--- lib/jekyll/collection.rb | 7 +++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb index d23da78fc4f..a8bbf24e280 100644 --- a/lib/jekyll/cleaner.rb +++ b/lib/jekyll/cleaner.rb @@ -36,13 +36,18 @@ def metadata_file # # Returns a Set with the file paths def existing_files + return Set.new unless Dir.exist?(site.in_dest_dir) + files = Set.new regex = keep_file_regex dirs = keep_dirs - Dir.glob(site.in_dest_dir("**", "*"), File::FNM_DOTMATCH) do |file| - next if file =~ HIDDEN_FILE_REGEX || file =~ regex || dirs.include?(file) - files << file + Dir.chdir(site.in_dest_dir) do + Dir.glob("**/*", File::FNM_DOTMATCH).each do |f| + file = File.join(site.in_dest_dir, f) + next if file =~ HIDDEN_FILE_REGEX || file =~ regex || dirs.include?(file) + files << file + end end files diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb index 4363aee195b..4d4b9bd0869 100644 --- a/lib/jekyll/collection.rb +++ b/lib/jekyll/collection.rb @@ -74,8 +74,11 @@ def read def entries return Array.new unless exists? @entries ||= - Dir.glob(collection_dir("**", "*.*")).map do |entry| - entry["#{collection_dir}/"] = ''; entry + Dir.chdir(collection_dir) do + Dir.glob("**/*.*").map do |f| + entry = collection_dir(f) + entry["#{collection_dir}/"] = ''; entry + end end end From a168edae45cf6878dfe7408cc396252b8899c17a Mon Sep 17 00:00:00 2001 From: Ducksan Cho Date: Thu, 19 Nov 2015 00:46:46 +1300 Subject: [PATCH 0015/4996] Add Utils.safe_glob method which works the same way as Dir.glob but seperating the input into two parts ('dir' + '/' + 'pattern') to make sure the first part('dir') does not act as a pattern. --- lib/jekyll/utils.rb | 29 +++++++++++++++++++++++++++ test/safe_glob_test[/find_me.txt | 0 test/test_utils.rb | 34 ++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 test/safe_glob_test[/find_me.txt diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index c30a986a389..ab516767664 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -207,5 +207,34 @@ def add_permalink_suffix(template, permalink_style) template end + + # Work the same way as Dir.glob but seperating the input into two parts + # ('dir' + '/' + 'pattern') to make sure the first part('dir') does not act + # as a pattern. + # + # For example, Dir.glob("path[/*") always returns an empty array, + # because the method fails to find the closing pattern to '[' which is ']' + # + # Examples: + # safe_glob("path[", "*") + # # => ["path[/file1", "path[/file2"] + # + # safe_glob("path", "*", File::FNM_DOTMATCH) + # # => ["path/.", "path/..", "path/file1"] + # + # dir - the dir where glob will be executed under + # (the dir will be included to each result) + # pattern - the pattern which will be applied under the dir + # flags - the flags which will be applied to the pattern + # + # Returns matched pathes + def safe_glob(dir, pattern, flags = 0) + return [] unless Dir.exist?(dir) + return [dir] if pattern.nil? || pattern.empty? + Dir.chdir(dir) do + Dir.glob(pattern, flags).map { |f| File.join(dir, f) } + end + end + end end diff --git a/test/safe_glob_test[/find_me.txt b/test/safe_glob_test[/find_me.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/test/test_utils.rb b/test/test_utils.rb index 9d4a5a4df3a..02ebb09ad45 100644 --- a/test/test_utils.rb +++ b/test/test_utils.rb @@ -180,4 +180,38 @@ class TestUtils < JekyllUnitTest assert_equal "/:basename", Utils.add_permalink_suffix("/:basename", "/:title") end end + + context "The \`Utils.safe_glob\` method" do + should "not apply pattern to the dir" do + dir = "test/safe_glob_test[" + assert_equal [], Dir.glob(dir + "/*") + assert_equal ["test/safe_glob_test[/find_me.txt"], Utils.safe_glob(dir, "*") + end + + should "return the same data to #glob" do + dir = "test" + assert_equal Dir.glob(dir + "/*"), Utils.safe_glob(dir, "*") + assert_equal Dir.glob(dir + "/**/*"), Utils.safe_glob(dir, "**/*") + end + + should "return the same data to #glob if dir is not found" do + dir = "dir_not_exist" + assert_equal [], Utils.safe_glob(dir, "*") + assert_equal Dir.glob(dir + "/*"), Utils.safe_glob(dir, "*") + end + + should "return the same data to #glob if pattern is blank" do + dir = "test" + assert_equal [dir], Utils.safe_glob(dir, "") + assert_equal Dir.glob(dir), Utils.safe_glob(dir, "") + assert_equal Dir.glob(dir), Utils.safe_glob(dir, nil) + end + + should "return the same data to #glob if flag is given" do + dir = "test" + assert_equal Dir.glob(dir + "/*", File::FNM_DOTMATCH), + Utils.safe_glob(dir, "*", File::FNM_DOTMATCH) + end + end + end From 20735e12f9ea1ffd49294bb8e5bf3ec724853dc6 Mon Sep 17 00:00:00 2001 From: Ducksan Cho Date: Thu, 19 Nov 2015 01:02:48 +1300 Subject: [PATCH 0016/4996] Use safe_glob to unsafe glob --- lib/jekyll/cleaner.rb | 11 +++-------- lib/jekyll/collection.rb | 7 ++----- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb index a8bbf24e280..9146e7de497 100644 --- a/lib/jekyll/cleaner.rb +++ b/lib/jekyll/cleaner.rb @@ -36,18 +36,13 @@ def metadata_file # # Returns a Set with the file paths def existing_files - return Set.new unless Dir.exist?(site.in_dest_dir) - files = Set.new regex = keep_file_regex dirs = keep_dirs - Dir.chdir(site.in_dest_dir) do - Dir.glob("**/*", File::FNM_DOTMATCH).each do |f| - file = File.join(site.in_dest_dir, f) - next if file =~ HIDDEN_FILE_REGEX || file =~ regex || dirs.include?(file) - files << file - end + Utils.safe_glob(site.in_dest_dir, "**/*", File::FNM_DOTMATCH).each do |file| + next if file =~ HIDDEN_FILE_REGEX || file =~ regex || dirs.include?(file) + files << file end files diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb index 4d4b9bd0869..e472571806f 100644 --- a/lib/jekyll/collection.rb +++ b/lib/jekyll/collection.rb @@ -74,11 +74,8 @@ def read def entries return Array.new unless exists? @entries ||= - Dir.chdir(collection_dir) do - Dir.glob("**/*.*").map do |f| - entry = collection_dir(f) - entry["#{collection_dir}/"] = ''; entry - end + Utils.safe_glob(collection_dir, "**/*.*").map do |entry| + entry["#{collection_dir}/"] = ''; entry end end From 90865d5fc173f5ed4af8bff0a975f720326b06d6 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Wed, 18 Nov 2015 15:58:26 -0600 Subject: [PATCH 0017/4996] Fix #4082: Allow users to use .htm and .xhtml (XHTML5.) --- lib/jekyll/page.rb | 15 ++++++++++++--- test/test_page.rb | 20 ++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb index ca5bb268131..a62a99402bd 100644 --- a/lib/jekyll/page.rb +++ b/lib/jekyll/page.rb @@ -16,6 +16,15 @@ class Page url ] + # A set of extensions that are considered HTML or HTML-like so we + # should not alter them, this includes .xhtml through XHTM5. + + HTML_EXTENSIONS = %W( + .html + .xhtml + .htm + ) + # Initialize a new Page. # # site - The Site object. @@ -135,8 +144,8 @@ def relative_path # Returns the destination file path String. def destination(dest) path = site.in_dest_dir(dest, URL.unescape_path(url)) - path = File.join(path, "index.html") if url.end_with?("/") - path << output_ext unless path.end_with?(output_ext) + path = File.join(path, "index") if url.end_with?("/") + path << output_ext unless path.end_with?(output_ext) path end @@ -147,7 +156,7 @@ def inspect # Returns the Boolean of whether this Page is HTML or not. def html? - output_ext == '.html' + HTML_EXTENSIONS.include?(output_ext) end # Returns the Boolean of whether this Page is an index file or not. diff --git a/test/test_page.rb b/test/test_page.rb index 1e4d3da62eb..625812aa6d3 100644 --- a/test/test_page.rb +++ b/test/test_page.rb @@ -261,6 +261,26 @@ def do_render(page) assert File.exist?(File.join(dest_dir, 'contacts', 'index.html')) end + should "support .htm extension and respects that" do + page = setup_page('contacts.htm') + page.site.permalink_style = :pretty + do_render(page) + page.write(dest_dir) + + assert File.directory?(dest_dir) + assert File.exist?(File.join(dest_dir, 'contacts', 'index.htm')) + end + + should "support .xhtml extension and respects that" do + page = setup_page('contacts.xhtml') + page.site.permalink_style = :pretty + do_render(page) + page.write(dest_dir) + + assert File.directory?(dest_dir) + assert File.exist?(File.join(dest_dir, 'contacts', 'index.xhtml')) + end + should "write properly with extension different from html" do page = setup_page("sitemap.xml") page.site.permalink_style = :pretty From e9f8b4df749eb793db744e7ba379de9f5bd89377 Mon Sep 17 00:00:00 2001 From: ducksan cho Date: Thu, 19 Nov 2015 17:15:51 +1300 Subject: [PATCH 0018/4996] Add Windows support to Utils.safe_glob --- lib/jekyll/cleaner.rb | 2 +- lib/jekyll/collection.rb | 2 +- lib/jekyll/utils.rb | 14 +++++++++----- test/test_utils.rb | 5 +++++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb index 9146e7de497..ca8a0ca99f6 100644 --- a/lib/jekyll/cleaner.rb +++ b/lib/jekyll/cleaner.rb @@ -40,7 +40,7 @@ def existing_files regex = keep_file_regex dirs = keep_dirs - Utils.safe_glob(site.in_dest_dir, "**/*", File::FNM_DOTMATCH).each do |file| + Utils.safe_glob(site.in_dest_dir, ["**", "*"], File::FNM_DOTMATCH).each do |file| next if file =~ HIDDEN_FILE_REGEX || file =~ regex || dirs.include?(file) files << file end diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb index e472571806f..009063520f0 100644 --- a/lib/jekyll/collection.rb +++ b/lib/jekyll/collection.rb @@ -74,7 +74,7 @@ def read def entries return Array.new unless exists? @entries ||= - Utils.safe_glob(collection_dir, "**/*.*").map do |entry| + Utils.safe_glob(collection_dir, ["**", "*.*"]).map do |entry| entry["#{collection_dir}/"] = ''; entry end end diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index ab516767664..54f400f8b02 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -222,15 +222,19 @@ def add_permalink_suffix(template, permalink_style) # safe_glob("path", "*", File::FNM_DOTMATCH) # # => ["path/.", "path/..", "path/file1"] # - # dir - the dir where glob will be executed under + # safe_glob("path", ["**", "*"]) + # # => ["path[/file1", "path[/folder/file2"] + # + # dir - the dir where glob will be executed under # (the dir will be included to each result) - # pattern - the pattern which will be applied under the dir - # flags - the flags which will be applied to the pattern + # patterns - the patterns (or the pattern) which will be applied under the dir + # flags - the flags which will be applied to the pattern # # Returns matched pathes - def safe_glob(dir, pattern, flags = 0) + def safe_glob(dir, patterns, flags = 0) return [] unless Dir.exist?(dir) - return [dir] if pattern.nil? || pattern.empty? + pattern = File.join(Array patterns) + return [dir] if pattern.empty? Dir.chdir(dir) do Dir.glob(pattern, flags).map { |f| File.join(dir, f) } end diff --git a/test/test_utils.rb b/test/test_utils.rb index 02ebb09ad45..133aba0a82d 100644 --- a/test/test_utils.rb +++ b/test/test_utils.rb @@ -212,6 +212,11 @@ class TestUtils < JekyllUnitTest assert_equal Dir.glob(dir + "/*", File::FNM_DOTMATCH), Utils.safe_glob(dir, "*", File::FNM_DOTMATCH) end + + should "support pattern as an array to support windows" do + dir = "test" + assert_equal Dir.glob(dir + "/**/*"), Utils.safe_glob(dir, ["**", "*"]) + end end end From 16aea22c8d392c38afcda86f479d61a38718746c Mon Sep 17 00:00:00 2001 From: rebornix Date: Mon, 23 Nov 2015 22:38:45 +0800 Subject: [PATCH 0019/4996] pass build options into clean command --- lib/jekyll/commands/clean.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/commands/clean.rb b/lib/jekyll/commands/clean.rb index bf05dbe0bf9..94f9bf97844 100644 --- a/lib/jekyll/commands/clean.rb +++ b/lib/jekyll/commands/clean.rb @@ -10,8 +10,8 @@ def init_with_program(prog) add_build_options(c) - c.action do |args, _| - Jekyll::Commands::Clean.process({}) + c.action do |args, options| + Jekyll::Commands::Clean.process(options) end end end From 2011addabcfa38d872a0940b4720232c725cad3c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 23 Nov 2015 08:25:06 -0800 Subject: [PATCH 0020/4996] Update history to reflect merge of #4177 [ci skip] --- History.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.markdown b/History.markdown index cbc710e6a02..3d4a5fa67a4 100644 --- a/History.markdown +++ b/History.markdown @@ -5,6 +5,10 @@ * Cache parsed include file to save liquid parsing time. (#4120) * Slightly speed up url sanitization and handle multiples of ///. (#4168) +### Bug Fixes + + * Pass build options into `clean` command (#4177) + ### Development Fixes * `jekyll-docs` should be easily release-able (#4152) From bf66d1fc23eafa4b0d605ad5eb671c877cf969e8 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 23 Nov 2015 08:29:18 -0800 Subject: [PATCH 0021/4996] Upgrading 2-3: note that default syntax highlighter changed. Fixes #4176 --- site/_docs/upgrading/2-to-3.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md index 25d38b00aad..8bbadd99622 100644 --- a/site/_docs/upgrading/2-to-3.md +++ b/site/_docs/upgrading/2-to-3.md @@ -61,4 +61,14 @@ merged and some unexpected behaviour. In Jekyll 3, all layout data is accessible in Liquid. For example, if your layout has `class: my-layout` in its YAML front matter, then the layout can access that via `{% raw %}{{ layout.class }}{% endraw %}`. +### Syntax highlighter changed + +For the first time, the default syntax highlighter has changed for the +`highlight` tag and for backtick code blocks. Instead of [Pygments.rb][], +it's now [Rouge][]. If you were using the `highlight` tag with certain +options, such as `hl_lines`, they may not be available when using Rouge. To +go back to using Pygments, set `highlighter: pygments` in your +`_config.yml` file and run `gem install pygments.rb` or add +`gem 'pygments.rb'` to your project's `Gemfile`. + _Did we miss something? Please click "Improve this page" above and add a section. Thanks!_ From 3417a33e7a1a903a170565f910388f6ba3831ea1 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 23 Nov 2015 08:37:52 -0800 Subject: [PATCH 0022/4996] Update templates docs to reflect Rouge default. Fixes #3323 --- site/_docs/templates.md | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/site/_docs/templates.md b/site/_docs/templates.md index 7a4ed049294..58e06c94661 100644 --- a/site/_docs/templates.md +++ b/site/_docs/templates.md @@ -317,16 +317,16 @@ such as using variables. ### Code snippet highlighting -Jekyll has built in support for syntax highlighting of [over 100 -languages](http://pygments.org/languages/) thanks to -[Pygments](http://pygments.org/). To use Pygments, you must have Python installed -on your system and set `highlighter` to `pygments` in your site's configuration -file. +Jekyll has built in support for syntax highlighting of over 60 languages +thanks to [Rouge](http://rouge.jneen.net). Rouge is the default highlighter +in Jekyll 3 and above. To use it in Jekyll 2, set `highlighter` to `rouge` +and ensure the `rouge` gem is installed properly. -Alternatively, you can use [Rouge](https://github.com/jayferd/rouge) to highlight -your code snippets. It doesn't support as many languages as Pygments, however it -should suit most use cases. Also, since [Rouge](https://github.com/jayferd/rouge) -is written in pure Ruby, you don't need Python on your system! +Alternatively, you can use [Pygments](http://pygments.org) to highlight +your code snippets. To use Pygments, you must have Python installed on your +system, have the `pygments.rb` gem installed and set `highlighter` to +`pygments` in your site's configuration file. Pygments supports [over 100 +languages](http://pygments.org/languages/) To render a code block with syntax highlighting, surround your code as follows: @@ -342,9 +342,9 @@ end 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 -you want to highlight, look for the “short name” on the [Pygments' Lexers -page](http://pygments.org/docs/lexers/) or the [Rouge -wiki](https://github.com/jayferd/rouge/wiki/List-of-supported-languages-and-lexers). +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/). #### Line numbers @@ -422,4 +422,5 @@ You may also optionally specify the filename in the gist to display: {% endraw %} {% endhighlight %} -To use the `gist` tag, you'll need to add the [jekyll-gist](https://github.com/jekyll/jekyll-gist) gem to your project. +To use the `gist` tag, you'll need to add the +[jekyll-gist](https://github.com/jekyll/jekyll-gist) gem to your project. From a7730914df272d003de6d3b63669e8e8417e0c61 Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Sun, 22 Nov 2015 16:00:50 +1100 Subject: [PATCH 0023/4996] rename `@options` in HighlightBlock (clash with Liquid::Block). fixes #4173 --- lib/jekyll/tags/highlight.rb | 10 +++++----- test/test_tags.rb | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index 454c09a2f80..3e64bc8bc52 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -14,7 +14,7 @@ def initialize(tag_name, markup, tokens) super if markup.strip =~ SYNTAX @lang = $1.downcase - @options = {} + @highlight_options = {} if defined?($2) && $2 != '' # Split along 3 possible forms -- key="", key=value, or key $2.scan(/(?:\w="[^"]*"|\w=\w|\w)+/) do |opt| @@ -24,10 +24,10 @@ def initialize(tag_name, markup, tokens) value.gsub!(/"/, "") value = value.split end - @options[key.to_sym] = value || true + @highlight_options[key.to_sym] = value || true end end - @options[:linenos] = "inline" if @options.key?(:linenos) and @options[:linenos] == true + @highlight_options[:linenos] = "inline" if @highlight_options.key?(:linenos) and @highlight_options[:linenos] == true else raise SyntaxError.new <<-eos Syntax Error in tag 'highlight' while parsing the following markup: @@ -80,7 +80,7 @@ def render_pygments(code, is_safe) highlighted_code = Pygments.highlight( code, :lexer => @lang, - :options => sanitized_opts(@options, is_safe) + :options => sanitized_opts(@highlight_options, is_safe) ) if highlighted_code.nil? @@ -99,7 +99,7 @@ def render_pygments(code, is_safe) def render_rouge(code) Jekyll::External.require_with_graceful_fail('rouge') - formatter = Rouge::Formatters::HTML.new(line_numbers: @options[:linenos], wrap: false) + formatter = Rouge::Formatters::HTML.new(line_numbers: @highlight_options[:linenos], wrap: false) lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText formatter.format(lexer.lex(code)) end diff --git a/test/test_tags.rb b/test/test_tags.rb index 2276b207278..f263e9d8867 100644 --- a/test/test_tags.rb +++ b/test/test_tags.rb @@ -65,37 +65,37 @@ def highlight_block_with_opts(options_string) context "highlight tag in unsafe mode" do should "set the no options with just a language name" do tag = highlight_block_with_opts('ruby ') - assert_equal({}, tag.instance_variable_get(:@options)) + assert_equal({}, tag.instance_variable_get(:@highlight_options)) end should "set the linenos option as 'inline' if no linenos value" do tag = highlight_block_with_opts('ruby linenos ') - assert_equal({ :linenos => 'inline' }, tag.instance_variable_get(:@options)) + assert_equal({ :linenos => 'inline' }, tag.instance_variable_get(:@highlight_options)) end should "set the linenos option to 'table' if the linenos key is given the table value" do tag = highlight_block_with_opts('ruby linenos=table ') - assert_equal({ :linenos => 'table' }, tag.instance_variable_get(:@options)) + assert_equal({ :linenos => 'table' }, tag.instance_variable_get(:@highlight_options)) end should "recognize nowrap option with linenos set" do tag = highlight_block_with_opts('ruby linenos=table nowrap ') - assert_equal({ :linenos => 'table', :nowrap => true }, tag.instance_variable_get(:@options)) + assert_equal({ :linenos => 'table', :nowrap => true }, tag.instance_variable_get(:@highlight_options)) end should "recognize the cssclass option" do tag = highlight_block_with_opts('ruby linenos=table cssclass=hl ') - assert_equal({ :cssclass => 'hl', :linenos => 'table' }, tag.instance_variable_get(:@options)) + assert_equal({ :cssclass => 'hl', :linenos => 'table' }, tag.instance_variable_get(:@highlight_options)) end should "recognize the hl_linenos option and its value" do tag = highlight_block_with_opts('ruby linenos=table cssclass=hl hl_linenos=3 ') - assert_equal({ :cssclass => 'hl', :linenos => 'table', :hl_linenos => '3' }, tag.instance_variable_get(:@options)) + assert_equal({ :cssclass => 'hl', :linenos => 'table', :hl_linenos => '3' }, tag.instance_variable_get(:@highlight_options)) end should "recognize multiple values of hl_linenos" do tag = highlight_block_with_opts('ruby linenos=table cssclass=hl hl_linenos="3 5 6" ') - assert_equal({ :cssclass => 'hl', :linenos => 'table', :hl_linenos => ['3', '5', '6'] }, tag.instance_variable_get(:@options)) + assert_equal({ :cssclass => 'hl', :linenos => 'table', :hl_linenos => ['3', '5', '6'] }, tag.instance_variable_get(:@highlight_options)) end should "treat language name as case insensitive" do From 95203d99ba4d667060c6ada3414d28c385dcf5a3 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Tue, 24 Nov 2015 04:20:44 -0600 Subject: [PATCH 0024/4996] Update History.markdown --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 3d4a5fa67a4..82caf865dcd 100644 --- a/History.markdown +++ b/History.markdown @@ -30,6 +30,7 @@ * Align hooks implementation with documentation (#4104) * Fix the deprecation warning in the doctor command (#4114) * Fix case in `:title` and add `:slug` which is downcased (#4100) + * Rename @options so that it does not impact Liquid. (#4173) ### Development Fixes From 256212649a44f4d10eabaf45f58efe7e66718e7a Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Tue, 24 Nov 2015 04:26:05 -0600 Subject: [PATCH 0025/4996] Update mime-types. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 9b64809eca1..68b1a63684f 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,7 @@ gem 'jekyll-paginate', '~> 1.0' gem 'jekyll-coffeescript', '~> 1.0' gem 'jekyll-feed' gem 'jekyll-gist', '~> 1.0' -gem 'mime-types', '~> 2.6' +gem 'mime-types', '~> 3.0' gem 'kramdown', '~> 1.9' platform :ruby, :mswin, :mingw do From 6739072fb2e3cdd19add25c5027f64514808dcd5 Mon Sep 17 00:00:00 2001 From: Vincent Wochnik Date: Tue, 24 Nov 2015 22:39:07 +0100 Subject: [PATCH 0026/4996] Update plugins.md Add `jekyll-deploy` plugin. --- site/_docs/plugins.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index 37ca947d9c5..a6154556825 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -876,6 +876,7 @@ LESS.js files during generation. - [jekyll-minifier](https://github.com/digitalsparky/jekyll-minifier): Minifies HTML, XML, CSS, and Javascript both inline and as separate files utilising yui-compressor and htmlcompressor. - [Jekyll views router](https://bitbucket.org/nyufac/jekyll-views-router): Simple router between generator plugins and templates. - [Jekyll Language Plugin](https://github.com/vwochnik/jekyll-language-plugin): Jekyll 3.0-compatible multi-language plugin for posts, pages and includes. +- [Jekyll Deploy](https://github.com/vwochnik/jekyll-deploy): Adds a `deploy` sub-command to Jekyll. #### Editors From 35070d6806cad526724985f7dbccba7f727175da Mon Sep 17 00:00:00 2001 From: Sam Volin Date: Tue, 24 Nov 2015 16:02:10 -0700 Subject: [PATCH 0027/4996] added debug message to collection --- lib/jekyll/collection.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb index 4363aee195b..70d47e90d90 100644 --- a/lib/jekyll/collection.rb +++ b/lib/jekyll/collection.rb @@ -58,7 +58,11 @@ def read if Utils.has_yaml_header? full_path doc = Jekyll::Document.new(full_path, { site: site, collection: self }) doc.read - docs << doc if site.publisher.publish?(doc) || !write? + if site.publisher.publish?(doc) || !write? + docs << doc + else + Jekyll.logger.debug "Skipped From Publishing:", doc.relative_path + end else relative_dir = Jekyll.sanitized_path(relative_directory, File.dirname(file_path)).chomp("/.") files << StaticFile.new(site, site.source, relative_dir, File.basename(full_path), self) From 1c42a8225ecd0e5dcbce35e69d38bcc5f1d84a06 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 24 Nov 2015 15:04:19 -0800 Subject: [PATCH 0028/4996] Update history to reflect merge of #4179 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 82caf865dcd..30f129035ef 100644 --- a/History.markdown +++ b/History.markdown @@ -18,6 +18,7 @@ * Add three plugins to directory (#4163) * Add upgrading docs from 2.x to 3.x (#4157) * Add protect_email to the plugins index. (#4169) + * Add `jekyll-deploy` to list of third-party plugins (#4179) ## 3.0.1 / 2015-11-17 From 934273ad92f6161a243327ca1d850428cacbf412 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 24 Nov 2015 15:18:28 -0800 Subject: [PATCH 0029/4996] Update history to reflect merge of #4180 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 30f129035ef..ff2eb51377e 100644 --- a/History.markdown +++ b/History.markdown @@ -4,6 +4,7 @@ * Cache parsed include file to save liquid parsing time. (#4120) * Slightly speed up url sanitization and handle multiples of ///. (#4168) + * Print debug message when a document is skipped from reading (#4180) ### Bug Fixes From d7bac8cc40978c0a6d8978aa80dc31cbd6e53cbf Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 24 Nov 2015 16:19:58 -0800 Subject: [PATCH 0030/4996] Update history to reflect merge of #4160 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index ff2eb51377e..560b65c66a6 100644 --- a/History.markdown +++ b/History.markdown @@ -9,6 +9,7 @@ ### Bug Fixes * Pass build options into `clean` command (#4177) + * Allow users to use .htm and .xhtml (XHTML5.) (#4160) ### Development Fixes From 8a0941808329efac9cdc9b031c76aa5b25606de4 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 24 Nov 2015 16:27:16 -0800 Subject: [PATCH 0031/4996] Allow use of Cucumber 2.1 or greater --- Gemfile | 2 +- features/support/overview.rb | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 68b1a63684f..4f3da61ca7a 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ end group :test do gem 'redgreen', '~> 1.2' gem 'shoulda', '~> 3.5' - gem 'cucumber', '~> 2.0', '< 2.1' + gem 'cucumber', '~> 2.1' gem 'simplecov', '~> 0.9' gem 'jekyll_test_plugin' gem 'jekyll_test_plugin_malicious' diff --git a/features/support/overview.rb b/features/support/overview.rb index 8d414be7f54..9550969b39c 100644 --- a/features/support/overview.rb +++ b/features/support/overview.rb @@ -2,7 +2,6 @@ require 'colorator' require 'cucumber/formatter/console' require 'cucumber/formatter/io' -require 'gherkin/formatter/escaping' module Features module Support @@ -17,12 +16,11 @@ class Overview include FileUtils include Cucumber::Formatter::Console include Cucumber::Formatter::Io - include Gherkin::Formatter::Escaping attr_writer :indent attr_reader :runtime def initialize(runtime, path_or_io, options) - @runtime, @io, @options = runtime, ensure_io(path_or_io, "pretty"), options + @runtime, @io, @options = runtime, ensure_io(path_or_io), options @exceptions = [] @indent = 0 @prefixes = options[:prefixes] || {} From 1bde4ce84a373e86770d26388f02512c991bc2c4 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 24 Nov 2015 17:11:47 -0800 Subject: [PATCH 0032/4996] include_tag.feature: double escape --- features/include_tag.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/include_tag.feature b/features/include_tag.feature index 427c1bb4f0c..cab01187df0 100644 --- a/features/include_tag.feature +++ b/features/include_tag.feature @@ -15,7 +15,7 @@ Feature: Include tags | Ignore params if unused | 2013-03-21 | html | {% include ignore.html date="today" %} | | List multiple parameters | 2013-03-21 | html | {% include params.html date="today" start="tomorrow" %} | | Dont keep parameters | 2013-03-21 | html | {% include ignore.html param="test" %}\n{% include header.html %} | - | Allow params with spaces and quotes | 2013-04-07 | html | {% include params.html cool="param with spaces" super="\"quoted\"" single='has "quotes"' escaped='\'single\' quotes' %} | + | Allow params with spaces and quotes | 2013-04-07 | html | {% include params.html cool="param with spaces" super="\\"quoted\\"" single='has "quotes"' escaped='\\'single\\' quotes' %} | | Parameter syntax | 2013-04-12 | html | {% include params.html param1_or_2="value" %} | | Pass a variable | 2013-06-22 | html | {% assign var = 'some text' %}{% include params.html local=var title=page.title %} | When I run jekyll build From 7a284b802b68557dd585fee3a64e4d59bf500fd4 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 24 Nov 2015 17:33:33 -0800 Subject: [PATCH 0033/4996] Update history to reflect merge of #4181 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 560b65c66a6..9977b65207e 100644 --- a/History.markdown +++ b/History.markdown @@ -14,6 +14,7 @@ ### Development Fixes * `jekyll-docs` should be easily release-able (#4152) + * Allow use of Cucumber 2.1 or greater (#4181) ### Site Enhancements From 43cfad250e7f81e2ebf050494161a3bf7cc733c2 Mon Sep 17 00:00:00 2001 From: Chi Trung Nguyen Date: Wed, 18 Nov 2015 12:42:42 +0100 Subject: [PATCH 0034/4996] Update Plugin Docs according to #4126 --- site/_docs/plugins.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index 7cd7c3f8087..a617f574dc3 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -32,10 +32,10 @@ Jekyll generates your site. values of the gem names of the plugins you'd like to use. An example: - gems: [jekyll-test-plugin, jekyll-jsonify, jekyll-assets] + gems: [jekyll-coffeescript, jekyll-watch, jekyll-assets] # This will require each of these gems automatically. - Then install your plugins using `gem install jekyll-test-plugin jekyll-jsonify jekyll-assets` + Then install your plugins using `gem install jekyll-coffeescript jekyll-watch jekyll-assets` 3. Add the relevant plugins to a Bundler group in your `Gemfile`. An example: From effe23a00896a2b91edaf873a5611ee165a0a3f0 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Tue, 24 Nov 2015 20:50:09 -0600 Subject: [PATCH 0035/4996] Update history.markdown to reflect the merger of #4154 --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 9977b65207e..c25fc45ef11 100644 --- a/History.markdown +++ b/History.markdown @@ -22,6 +22,7 @@ * Add upgrading docs from 2.x to 3.x (#4157) * Add protect_email to the plugins index. (#4169) * Add `jekyll-deploy` to list of third-party plugins (#4179) + * Clarify plugin docs (#4154) ## 3.0.1 / 2015-11-17 From 657a8d7239533553571559aad954b40764e55b79 Mon Sep 17 00:00:00 2001 From: rebornix Date: Wed, 25 Nov 2015 16:37:08 +0800 Subject: [PATCH 0036/4996] Allow users to input multiple variables in include tag --- features/include_tag.feature | 8 ++++++++ lib/jekyll/tags/include.rb | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/features/include_tag.feature b/features/include_tag.feature index cab01187df0..83ae379f8a0 100644 --- a/features/include_tag.feature +++ b/features/include_tag.feature @@ -89,3 +89,11 @@ Feature: Include tags Then I have an "_includes/one.html" file that contains "include content changed" When I run jekyll build Then I should see "include content changed" in "_site/index.html" + + Scenario: Include a file with multiple variables + Given I have an _includes directory + And I have an "_includes/header-en.html" file that contains "include" + And I have an "index.html" page that contains "{% assign name = 'header' %}{% assign locale = 'en' %}{% include {{name}}-{{locale}}.html %}" + When I run jekyll build + Then the _site directory should exist + And I should see "include" in "_site/index.html" diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb index 0e944407b59..2e39738e0aa 100644 --- a/lib/jekyll/tags/include.rb +++ b/lib/jekyll/tags/include.rb @@ -16,7 +16,7 @@ class IncludeTag < Liquid::Tag attr_reader :includes_dir VALID_SYNTAX = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/ - VARIABLE_SYNTAX = /(?[^{]*\{\{\s*(?[\w\-\.]+)\s*(\|.*)?\}\}[^\s}]*)(?.*)/ + VARIABLE_SYNTAX = /(?[^{]*(\{\{\s*[\w\-\.]+\s*(\|.*)?\}\}[^\s{}]*)+)(?.*)/ def initialize(tag_name, markup, tokens) super From e60e5f35327944bd2198cc19b54d27a1dffc9479 Mon Sep 17 00:00:00 2001 From: Ducksan Cho Date: Wed, 25 Nov 2015 23:18:33 +1300 Subject: [PATCH 0037/4996] Allow quoted date in front matter defaults --- lib/jekyll/frontmatter_defaults.rb | 9 ++++++++- test/test_front_matter_defaults.rb | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb index d6cb173f9c8..d6fba04f639 100644 --- a/lib/jekyll/frontmatter_defaults.rb +++ b/lib/jekyll/frontmatter_defaults.rb @@ -30,6 +30,13 @@ def update_deprecated_types(set) set end + def parse_quoted_date(set) + return set unless set.key?('values') && set['values'].key?('date') + return set if set['values']['date'].is_a?(Time) + set['values']['date'] = Utils.parse_date(set['values']['date'], "Front matter defaults does not have a valid date.") + set + end + # Finds a default value for a given setting, filtered by path and type # # path - the path (relative to the source) of the page, post or :draft the default is used in @@ -159,7 +166,7 @@ def valid_sets sets.map do |set| if valid?(set) - update_deprecated_types(set) + parse_quoted_date(update_deprecated_types(set)) else Jekyll.logger.warn "Defaults:", "An invalid front-matter default set was found:" Jekyll.logger.warn "#{set}" diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb index 99efedead2a..8eeed7f3ae0 100644 --- a/test/test_front_matter_defaults.rb +++ b/test/test_front_matter_defaults.rb @@ -175,4 +175,29 @@ class TestFrontMatterDefaults < JekyllUnitTest end end + context "A site with front matter defaults with quoted date" do + setup do + @site = Site.new(Jekyll.configuration({ + "source" => source_dir, + "destination" => dest_dir, + "defaults" => [{ + "values" => { + "date" => "2015-01-01 00:00:01" + } + }] + })) + end + + should "not raise error" do + @site.process + end + + should "parse date" do + @site.process + date = Time.parse("2015-01-01 00:00:01") + assert @site.pages.find { |page| page.data["date"] == date } + assert @site.posts.find { |page| page.data["date"] == date } + end + end + end From c159f19c7d92ca0f1b32f76f679e80dfc308173f Mon Sep 17 00:00:00 2001 From: Ducksan Cho Date: Thu, 26 Nov 2015 00:06:09 +1300 Subject: [PATCH 0038/4996] Rename destructive method with bang --- lib/jekyll/frontmatter_defaults.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb index d6fba04f639..a37dcbe7df9 100644 --- a/lib/jekyll/frontmatter_defaults.rb +++ b/lib/jekyll/frontmatter_defaults.rb @@ -30,7 +30,7 @@ def update_deprecated_types(set) set end - def parse_quoted_date(set) + def ensure_time!(set) return set unless set.key?('values') && set['values'].key?('date') return set if set['values']['date'].is_a?(Time) set['values']['date'] = Utils.parse_date(set['values']['date'], "Front matter defaults does not have a valid date.") @@ -166,7 +166,7 @@ def valid_sets sets.map do |set| if valid?(set) - parse_quoted_date(update_deprecated_types(set)) + ensure_time!(update_deprecated_types(set)) else Jekyll.logger.warn "Defaults:", "An invalid front-matter default set was found:" Jekyll.logger.warn "#{set}" From 918bfd5fe5f9f411869f3bfbbf81a478316f04b2 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 25 Nov 2015 10:28:07 -0800 Subject: [PATCH 0039/4996] Update history to reflect merge of #4183 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index c25fc45ef11..208ba7559bc 100644 --- a/History.markdown +++ b/History.markdown @@ -5,6 +5,7 @@ * Cache parsed include file to save liquid parsing time. (#4120) * Slightly speed up url sanitization and handle multiples of ///. (#4168) * Print debug message when a document is skipped from reading (#4180) + * Include tag should accept multiple variables in the include name (#4183) ### Bug Fixes From 147a29302f01a431580e0b29c21788a07e93646d Mon Sep 17 00:00:00 2001 From: Nielsen Ramon Date: Thu, 26 Nov 2015 22:54:00 +0100 Subject: [PATCH 0040/4996] Add Kickster to deployment methods in documentation --- site/_docs/deployment-methods.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md index c1040b2b780..03b13cf7953 100644 --- a/site/_docs/deployment-methods.md +++ b/site/_docs/deployment-methods.md @@ -190,3 +190,11 @@ for that](https://github.com/openshift-cartridges/openshift-jekyll-cartridge).
ProTip™: Use GitHub Pages for zero-hassle Jekyll hosting

GitHub Pages are powered by Jekyll behind the scenes, so if you’re looking for a zero-hassle, zero-cost solution, GitHub Pages are a great way to host your Jekyll-powered website for free.

+ +## Kickster + +Use [Kickster](http://kickster.nielsenramon.com/) for easy (automated) deploys to Github Pages when using unsupported plugins on Github Pages. + +Kickster provides a basic Jekyll project setup packed with web best practises and useful optimization tools increasing your overall project quality. Kickster ships with automated and worry-free deployment scripts for GitHub Pages. + +Setting up Kickster is very easy, just install the gem and you are good to go. More documentation can here found [here](https://github.com/nielsenramon/kickster#kickster). If you do not want to use the gem or start a new project you can just copy paste the deployment scripts for [Travis CI](https://github.com/nielsenramon/kickster/tree/master/snippets/travis) or [Circle CI](https://github.com/nielsenramon/kickster#automated-deployment-with-circle-ci). From face3985dc0e16f0d82d7e86123bf64a98af75ee Mon Sep 17 00:00:00 2001 From: Sasha Friedenberg Date: Sun, 15 Nov 2015 15:45:29 -0500 Subject: [PATCH 0041/4996] add "-o" option to serve command which opens server URL --- lib/jekyll/commands/serve.rb | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index 111d6709f7f..c26cd48da18 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -19,6 +19,7 @@ def init_with_program(prog) c.option 'host', '-H', '--host [HOST]', 'Host to bind to' c.option 'baseurl', '-b', '--baseurl [URL]', 'Base URL' c.option 'skip_initial_build', '--skip-initial-build', 'Skips the initial site build which occurs before the server is started.' + c.option 'open_url', '-o', '--open-url', 'Opens the local URL in your default browser' c.action do |args, options| options["serving"] = true @@ -45,7 +46,24 @@ def process(options) file_handler_options ) - Jekyll.logger.info "Server address:", server_address(s, options) + server_address_str = server_address(s, options) + Jekyll.logger.info "Server address:", server_address_str + + begin + command_name = "" + + if Utils::Platforms.windows? + command_name = "start" + elsif Utils::Platforms.osx? + command_name = "open" + elsif Utils::Platforms.linux? + command_name = "xdg-open" + end + + system("#{command_name} #{server_address_str}") + rescue + Jekyll.logger.info "Could not open URL, exception was thrown" + end if options['open_url'] if options['detach'] # detach the server pid = Process.fork { s.start } From 3e8f00a0690df8d7ac8aae4689dbd831dc227f24 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 28 Nov 2015 23:22:10 -0800 Subject: [PATCH 0042/4996] Update history to reflect merge of #4144 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 208ba7559bc..cd86d80ff70 100644 --- a/History.markdown +++ b/History.markdown @@ -6,6 +6,7 @@ * Slightly speed up url sanitization and handle multiples of ///. (#4168) * Print debug message when a document is skipped from reading (#4180) * Include tag should accept multiple variables in the include name (#4183) + * Add `-o` option to serve command which opens server URL (#4144) ### Bug Fixes From 2a4aa0fdb1dfb234c9222c62b82a684358f15407 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 28 Nov 2015 23:25:34 -0800 Subject: [PATCH 0043/4996] Update history to reflect merge of #4190 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index cd86d80ff70..e4b06a7de13 100644 --- a/History.markdown +++ b/History.markdown @@ -25,6 +25,7 @@ * Add protect_email to the plugins index. (#4169) * Add `jekyll-deploy` to list of third-party plugins (#4179) * Clarify plugin docs (#4154) + * Add Kickster to deployment methods in documentation (#4190) ## 3.0.1 / 2015-11-17 From c8edb1582071d24019bd0d9b3f8dc6b8875f3d4b Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 29 Nov 2015 21:22:27 -0600 Subject: [PATCH 0044/4996] Prevent shell injection when opening a URL. --- lib/jekyll/commands/serve.rb | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index c26cd48da18..389ae5a2cb1 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -46,24 +46,16 @@ def process(options) file_handler_options ) + server_address_str = server_address(s, options) Jekyll.logger.info "Server address:", server_address_str - begin - command_name = "" - - if Utils::Platforms.windows? - command_name = "start" - elsif Utils::Platforms.osx? - command_name = "open" - elsif Utils::Platforms.linux? - command_name = "xdg-open" - end - - system("#{command_name} #{server_address_str}") - rescue - Jekyll.logger.info "Could not open URL, exception was thrown" - end if options['open_url'] + if options["open_url"] + command = Utils::Platforms.windows?? "start" : Utils::Platforms.osx?? \ + "open" : "xdg-open" + + system command, server_address_str + end if options['detach'] # detach the server pid = Process.fork { s.start } From d100a685636b491d0df05e3ff3a8d53516edc7ad Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 29 Nov 2015 21:42:31 -0600 Subject: [PATCH 0045/4996] Update History.markdown --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index e4b06a7de13..a5adb225fc6 100644 --- a/History.markdown +++ b/History.markdown @@ -12,6 +12,7 @@ * Pass build options into `clean` command (#4177) * Allow users to use .htm and .xhtml (XHTML5.) (#4160) + * Prevent Shell Injection. (#4200) ### Development Fixes From 47081736ef035e4fea5f216fc55968aab5b899af Mon Sep 17 00:00:00 2001 From: rebornix Date: Mon, 30 Nov 2015 13:16:20 +0800 Subject: [PATCH 0046/4996] Update CSS to avoid it overlaps parent div --- site/_docs/deployment-methods.md | 4 ++-- site/_sass/_style.scss | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md index 03b13cf7953..9dae4a1a2ae 100644 --- a/site/_docs/deployment-methods.md +++ b/site/_docs/deployment-methods.md @@ -116,9 +116,9 @@ That's why rrsync wrapper shall be installed. If it is not already installed by [This process is described in a lot of places in the net](https://wiki.gentoo.org/wiki/SSH#Passwordless_Authentication). We will not cover it here. What is different from usual approach is to put the restriction to certificate-based authorization in ```~/.ssh/authorized_keys```). We will launch ```rrsync``` utility and supply it with the folder it shall have read-write access to: -``` +{% highlight bash %} command="$HOME/bin/rrsync ",no-agent-forwarding,no-port-forwarding,no-pty,no-user-rc,no-X11-forwarding ssh-rsa -``` +{% endhighlight %} `````` is the path to your site. E.g., ```~/public_html/you.org/blog-html/```. diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss index 5980d248b7c..f06ea77f36d 100644 --- a/site/_sass/_style.scss +++ b/site/_sass/_style.scss @@ -643,10 +643,14 @@ p > pre, p > code, p > nobr > code, li > code, +li> pre, h5 > code, .note > code { background-color: #2b2b2b; color: #fff; + max-width: 100%; + overflow-x: auto; + vertical-align: middle; @include border-radius(5px); @include box-shadow(inset 0 1px 10px rgba(0,0,0,.3), 0 1px 0 rgba(255,255,255,.1), From ac9fa413a5675ee73171e532c575145f7a59872b Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 30 Nov 2015 14:34:01 -0800 Subject: [PATCH 0047/4996] Convertible should make layout data accessible via 'layout' Not via 'page'. Erroneous! Fixes #4117. --- lib/jekyll/convertible.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index 121513955ba..016ff245d5b 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -210,7 +210,13 @@ def render_all_layouts(layouts, payload, info) while layout Jekyll.logger.debug "Rendering Layout:", path - payload = Utils.deep_merge_hashes(payload, {"content" => output, "page" => layout.data}) + payload = Utils.deep_merge_hashes( + payload, + { + "content" => output, + "layout" => layout.data + } + ) self.output = render_liquid(layout.content, payload, From 928f51ad249331d10c9be27c2d57b1c3b4705ebf Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 30 Nov 2015 19:56:08 -0800 Subject: [PATCH 0048/4996] Update history to reflect merge of #4205 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index a5adb225fc6..e0f8c769b7f 100644 --- a/History.markdown +++ b/History.markdown @@ -13,6 +13,7 @@ * Pass build options into `clean` command (#4177) * Allow users to use .htm and .xhtml (XHTML5.) (#4160) * Prevent Shell Injection. (#4200) + * Convertible should make layout data accessible via `layout` instead of `page` (#4205) ### Development Fixes From c7eacbdfcd3c6be246091f08500aff0d9a2351cc Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 30 Nov 2015 19:58:16 -0800 Subject: [PATCH 0049/4996] Update history to reflect merge of #4150 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index e0f8c769b7f..1bef2ce6d5c 100644 --- a/History.markdown +++ b/History.markdown @@ -14,6 +14,7 @@ * Allow users to use .htm and .xhtml (XHTML5.) (#4160) * Prevent Shell Injection. (#4200) * Convertible should make layout data accessible via `layout` instead of `page` (#4205) + * Avoid using `Dir.glob` with absolute path to allow special characters in the path (#4150) ### Development Fixes From e5e5369cde15c027a59009849032354b727fe898 Mon Sep 17 00:00:00 2001 From: David Burela Date: Wed, 2 Dec 2015 15:23:11 +0800 Subject: [PATCH 0050/4996] Update windows.md Added a very quick guide on getting Jekyll up and running on Windows in the fastest way possible with just a few command prompt commands. --- site/_docs/windows.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/_docs/windows.md b/site/_docs/windows.md index a3e6b5f0677..5a1a0a56ffa 100644 --- a/site/_docs/windows.md +++ b/site/_docs/windows.md @@ -15,6 +15,8 @@ Julian Thilo has written up instructions to get The instructions were written for Ruby 2.0.0, but should work for later versions [prior to 2.2][hitimes-issue]. +Alternatively David Burela has written instructions on [how to install Jekyll via Chocolately with 3 command prompt entries](https://davidburela.wordpress.com/2015/11/28/easily-install-jekyll-on-windows-with-3-command-prompt-entries-and-chocolatey/) + ## Encoding If you use UTF-8 encoding, make sure that no `BOM` header From 15fdc828210cda93ee16f10c8addb5164ec87d4e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 2 Dec 2015 10:51:04 -0800 Subject: [PATCH 0051/4996] Update history to reflect merge of #4210 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 1bef2ce6d5c..242810a835c 100644 --- a/History.markdown +++ b/History.markdown @@ -29,6 +29,7 @@ * Add `jekyll-deploy` to list of third-party plugins (#4179) * Clarify plugin docs (#4154) * Add Kickster to deployment methods in documentation (#4190) + * Add DavidBurela's tutorial for Windows to Windows docs page (#4210) ## 3.0.1 / 2015-11-17 From a5be27b2226a3615a5a64fe6d9ef687ece0512a2 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 2 Dec 2015 11:51:37 -0800 Subject: [PATCH 0052/4996] Update history to reflect merge of #4121 [ci skip] --- History.markdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/History.markdown b/History.markdown index 242810a835c..86d5582115c 100644 --- a/History.markdown +++ b/History.markdown @@ -25,11 +25,12 @@ * Add three plugins to directory (#4163) * Add upgrading docs from 2.x to 3.x (#4157) - * Add protect_email to the plugins index. (#4169) + * Add `protect_email` to the plugins index. (#4169) * Add `jekyll-deploy` to list of third-party plugins (#4179) * Clarify plugin docs (#4154) * Add Kickster to deployment methods in documentation (#4190) * Add DavidBurela's tutorial for Windows to Windows docs page (#4210) + * Change GitHub code block to highlight tag to avoid it overlaps parent div (#4121) ## 3.0.1 / 2015-11-17 From 3432fd2c2dcc1a367732e16404f5cd1fee895c43 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Tue, 3 Nov 2015 19:48:29 -0600 Subject: [PATCH 0053/4996] Modernize Kramdown for Markdown converter. --- Gemfile | 3 +- lib/jekyll/configuration.rb | 12 +- .../converters/markdown/kramdown_parser.rb | 87 ++++++++++--- lib/jekyll/utils.rb | 4 + test/helper.rb | 14 ++- test/test_kramdown.rb | 119 ++++++++++++------ 6 files changed, 169 insertions(+), 70 deletions(-) diff --git a/Gemfile b/Gemfile index 9b64809eca1..19548e81c35 100644 --- a/Gemfile +++ b/Gemfile @@ -18,8 +18,9 @@ group :test do gem 'jekyll_test_plugin_malicious' gem 'minitest-reporters' gem 'minitest-profile' - gem 'minitest' gem 'rspec-mocks' + gem 'minitest' + gem "nokogiri" if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2") gem 'test-unit' diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index f57b3ae4853..a3e80c7ffc5 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -68,17 +68,7 @@ class Configuration < Hash 'footnote_nr' => 1, 'entity_output' => 'as_char', 'toc_levels' => '1..6', - 'smart_quotes' => 'lsquo,rsquo,ldquo,rdquo', - 'enable_coderay' => false, - - 'coderay' => { - 'coderay_wrap' => 'div', - 'coderay_line_numbers' => 'inline', - 'coderay_line_number_start' => 1, - 'coderay_tab_width' => 4, - 'coderay_bold_every' => 10, - 'coderay_css' => 'style' - } + 'smart_quotes' => 'lsquo,rsquo,ldquo,rdquo' } }] diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb index 40dfa87eaea..d1fa7865cf7 100644 --- a/lib/jekyll/converters/markdown/kramdown_parser.rb +++ b/lib/jekyll/converters/markdown/kramdown_parser.rb @@ -1,33 +1,86 @@ +# Frozen-string-literal: true +# Encoding: utf-8 + module Jekyll module Converters class Markdown class KramdownParser + CODERAY_DEFAULTS = { + "css" => "style", + "bold_every" => 10, + "line_numbers" => "inline", + "line_number_start" => 1, + "tab_width" => 4, + "wrap" => "div" + } + def initialize(config) - require 'kramdown' - @config = config - # If kramdown supported highlighter enabled, use that - highlighter = @config['highlighter'] - if highlighter == 'rouge' || highlighter == 'coderay' - @config['kramdown']['syntax_highlighter'] ||= highlighter - end - rescue LoadError - STDERR.puts 'You are missing a library required for Markdown. Please run:' - STDERR.puts ' $ [sudo] gem install kramdown' - raise Errors::FatalException.new("Missing dependency: kramdown") + Jekyll::External.require_with_graceful_fail "kramdown" + @main_fallback_highlighter = config["highlighter"] || "rogue" + @config = config["kramdown"] || {} + setup + end + + # Setup and normalize the configuration: + # * Create Kramdown if it doesn't exist. + # * Set syntax_highlighter, detecting enable_coderay and merging highlighter if none. + # * Merge kramdown[coderay] into syntax_highlighter_opts stripping coderay_. + # * Make sure `syntax_highlighter_opts` exists. + + def setup + @config["syntax_highlighter"] ||= highlighter + @config["syntax_highlighter_opts"] ||= {} + @config["coderay"] ||= {} # XXX: Legacy. + modernize_coderay_config end def convert(content) - # Check for use of coderay - if @config['kramdown']['enable_coderay'] - %w[wrap line_numbers line_numbers_start tab_width bold_every css default_lang].each do |opt| - key = "coderay_#{opt}" - @config['kramdown'][key] = @config['kramdown']['coderay'][key] unless @config['kramdown'].key?(key) + Kramdown::Document.new(content, @config).to_html + end + + # config[kramdown][syntax_higlighter] > config[kramdown][enable_coderay] > config[highlighter] + # Where `enable_coderay` is now deprecated because Kramdown + # supports Rouge now too. + + private + def highlighter + @highlighter ||= begin + if highlighter = @config["syntax_highlighter"] then highlighter + elsif @config.key?("enable_coderay") && @config["enable_coderay"] + Jekyll.logger.warn "DEPRECATION: You are using 'enable_coderay', use syntax_highlighter: coderay." + "coderay" + else + @main_fallback_highlighter end end + end - Kramdown::Document.new(content, Utils.symbolize_hash_keys(@config['kramdown'])).to_html + private + def strip_coderay_prefix(hash) + hash.each_with_object({}) do |(key, val), hsh| + cleaned_key = key.gsub(/\Acoderay_/, "") + Jekyll.logger.warn "You are using '#{key}'. Normalizing to #{cleaned_key}." if key != cleaned_key + hsh[cleaned_key] = val + end end + # If our highlighter is CodeRay we go in to merge the CodeRay defaults + # with your "coderay" key if it's there, deprecating it in the + # process of you using it. + + private + def modernize_coderay_config + if highlighter == "coderay" + Jekyll.logger.warn "DEPRECATION: kramdown.coderay is deprecated use syntax_highlighter_opts." + @config["syntax_highlighter_opts"] = begin + strip_coderay_prefix( + @config["syntax_highlighter_opts"] \ + .merge(CODERAY_DEFAULTS) \ + .merge(@config["coderay"]) + ) + end + end + end end end end diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index 7d2490a6864..0b67911b803 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -8,6 +8,10 @@ module Utils extend self SLUGIFY_DEFAULT_REGEXP = Regexp.new('[^[:alnum:]]+').freeze SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze + def strip_heredoc(str) + str.gsub(/^[ \t]{#{(str.scan(/^[ \t]*(?=\S)/).min || "").size}}/, "") + end + # Non-destructive version of deep_merge_hashes! See that method. # # Returns the merged hashes. diff --git a/test/helper.rb b/test/helper.rb index dc0217676d1..281f68715f6 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -11,13 +11,13 @@ def jruby? end end +require "nokogiri" require 'rubygems' require 'ostruct' require 'minitest/autorun' require 'minitest/reporters' require 'minitest/profile' require 'rspec/mocks' - require 'jekyll' Jekyll.logger = Logger.new(StringIO.new) @@ -51,15 +51,15 @@ def mocks_expect(*args) end def before_setup - ::RSpec::Mocks.setup + RSpec::Mocks.setup super end def after_teardown super - ::RSpec::Mocks.verify + RSpec::Mocks.verify ensure - ::RSpec::Mocks.teardown + RSpec::Mocks.teardown end def fixture_site(overrides = {}) @@ -120,4 +120,10 @@ def capture_output end alias_method :capture_stdout, :capture_output alias_method :capture_stderr, :capture_output + + def nokogiri_fragment(str) + Nokogiri::HTML.fragment( + str + ) + end end diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb index b7f44925cc1..21ba5764ab1 100644 --- a/test/test_kramdown.rb +++ b/test/test_kramdown.rb @@ -8,65 +8,110 @@ class TestKramdown < JekyllUnitTest @config = { 'markdown' => 'kramdown', 'kramdown' => { - 'auto_ids' => false, - 'footnote_nr' => 1, + 'smart_quotes' => 'lsquo,rsquo,ldquo,rdquo', 'entity_output' => 'as_char', - 'toc_levels' => '1..6', - 'smart_quotes' => 'lsquo,rsquo,ldquo,rdquo', - - 'enable_coderay' => true, - 'coderay_bold_every'=> 12, - 'coderay' => { - 'coderay_css' => :style, - 'coderay_bold_every' => 8 + 'toc_levels' => '1..6', + 'auto_ids' => false, + 'footnote_nr' => 1, + + 'syntax_highlighter_opts' => { + 'bold_every' => 8, 'css' => :class } } } + @config = Jekyll.configuration(@config) - @markdown = Converters::Markdown.new(@config) + @markdown = Converters::Markdown.new( + @config + ) end - # http://kramdown.gettalong.org/converter/html.html#options - should "pass kramdown options" do + should "run Kramdown" do assert_equal "

Some Header

", @markdown.convert('# Some Header #').strip end - should "convert quotes to smart quotes" do - assert_match /

(“|“)Pit(’|’)hy(”|”)<\/p>/, @markdown.convert(%{"Pit'hy"}).strip + context "when asked to convert smart quotes" do + should "convert" do + assert_match %r!

(“|“)Pit(’|’)hy(”|”)<\/p>!, @markdown.convert(%{"Pit'hy"}).strip + end - override = { 'kramdown' => { 'smart_quotes' => 'lsaquo,rsaquo,laquo,raquo' } } - markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, override)) - assert_match /

(«|«)Pit(›|›)hy(»|»)<\/p>/, markdown.convert(%{"Pit'hy"}).strip + should "support custom types" do + override = { + 'kramdown' => { + 'smart_quotes' => 'lsaquo,rsaquo,laquo,raquo' + } + } + + markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, override)) + assert_match %r!

(«|«)Pit(›|›)hy(»|»)<\/p>!, \ + markdown.convert(%{"Pit'hy"}).strip + end end should "render fenced code blocks with syntax highlighting" do - assert_equal "

puts \"Hello world\"\n
\n
", @markdown.convert( - <<-EOS -~~~ruby -puts "Hello world" -~~~ - EOS - ).strip + result = nokogiri_fragment(@markdown.convert(Utils.strip_heredoc <<-MARKDOWN)) + ~~~ruby + puts "Hello World" + ~~~ + MARKDOWN + + selector = "div.highlighter-rouge>pre.highlight>code" + refute result.css(selector).empty? end - context "moving up nested coderay options" do - setup do - @markdown.convert('some markup') - @converter_config = @markdown.instance_variable_get(:@config)['kramdown'] - end + context "when a custom highlighter is chosen" do + should "use the chosen highlighter if it's available" do + override = { "markdown" => "kramdown", "kramdown" => { "syntax_highlighter" => :coderay }} + markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, override)) + result = nokogiri_fragment(markdown.convert(Utils.strip_heredoc <<-MARKDOWN)) + ~~~ruby + puts "Hello World" + ~~~ + MARKDOWN - should "work correctly" do - assert_equal :style, @converter_config['coderay_css'] + selector = "div.highlighter-coderay>div.CodeRay>div.code>pre" + refute result.css(selector).empty? end - should "also work for defaults" do - default = Jekyll::Configuration::DEFAULTS['kramdown']['coderay']['coderay_tab_width'] - assert_equal default, @converter_config['coderay_tab_width'] + should "support legacy enable_coderay... for now" do + override = { + "markdown" => "kramdown", + "kramdown" => { + "syntax_highlighter" => nil, + "enable_coderay" => true + } + } + + markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, override)) + result = nokogiri_fragment(markdown.convert(Utils.strip_heredoc <<-MARKDOWN)) + ~~~ruby + puts "Hello World" + ~~~ + MARKDOWN + + selector = "div.highlighter-coderay>div.CodeRay>div.code>pre" + refute result.css(selector).empty? end + end - should "not overwrite" do - assert_equal 12, @converter_config['coderay_bold_every'] + should "move coderay to syntax_highlighter_opts" do + original = Kramdown::Document.method(:new) + markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, { + "markdown" => "kramdown", + "kramdown" => { + "syntax_highlighter" => "coderay", + "coderay" => { + "hello" => "world" + } + } + })) + + expect(Kramdown::Document).to receive(:new) do |arg1, hash| + assert_equal hash["syntax_highlighter_opts"]["hello"], "world" + original.call(arg1, hash) end + + markdown.convert("hello world") end end end From e331a372608393c32c2abab2d06b0e73ba02cb5b Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Fri, 4 Dec 2015 11:11:30 -0600 Subject: [PATCH 0054/4996] Fix #4202: Have Kramdown behave like Github. --- lib/jekyll/configuration.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index a3e80c7ffc5..c2e74eb2e40 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -65,10 +65,12 @@ class Configuration < Hash 'kramdown' => { 'auto_ids' => true, - 'footnote_nr' => 1, - 'entity_output' => 'as_char', 'toc_levels' => '1..6', - 'smart_quotes' => 'lsquo,rsquo,ldquo,rdquo' + 'entity_output' => 'as_char', + 'smart_quotes' => 'lsquo,rsquo,ldquo,rdquo', + 'input' => "GFM", + 'hard_wrap' => false, + 'footnote_nr' => 1 } }] From fe13c3b3664b475764f51afd468dd6ea24b0598c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 4 Dec 2015 09:21:11 -0800 Subject: [PATCH 0055/4996] KramdownConverter: clean up some source with some unified methods --- Gemfile | 2 +- .../converters/markdown/kramdown_parser.rb | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 19548e81c35..b1c118dde14 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ group :test do gem 'minitest-profile' gem 'rspec-mocks' gem 'minitest' - gem "nokogiri" + gem 'nokogiri' if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2") gem 'test-unit' diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb index d1fa7865cf7..05b94337e55 100644 --- a/lib/jekyll/converters/markdown/kramdown_parser.rb +++ b/lib/jekyll/converters/markdown/kramdown_parser.rb @@ -6,12 +6,12 @@ module Converters class Markdown class KramdownParser CODERAY_DEFAULTS = { - "css" => "style", - "bold_every" => 10, - "line_numbers" => "inline", + "css" => "style", + "bold_every" => 10, + "line_numbers" => "inline", "line_number_start" => 1, - "tab_width" => 4, - "wrap" => "div" + "tab_width" => 4, + "wrap" => "div" } def initialize(config) @@ -47,7 +47,7 @@ def highlighter @highlighter ||= begin if highlighter = @config["syntax_highlighter"] then highlighter elsif @config.key?("enable_coderay") && @config["enable_coderay"] - Jekyll.logger.warn "DEPRECATION: You are using 'enable_coderay', use syntax_highlighter: coderay." + Jekyll::Deprecator.deprecation_message "You are using 'enable_coderay', use syntax_highlighter: coderay in your configuration file." "coderay" else @main_fallback_highlighter @@ -59,7 +59,7 @@ def highlighter def strip_coderay_prefix(hash) hash.each_with_object({}) do |(key, val), hsh| cleaned_key = key.gsub(/\Acoderay_/, "") - Jekyll.logger.warn "You are using '#{key}'. Normalizing to #{cleaned_key}." if key != cleaned_key + Jekyll::Deprecator.deprecation_message "You are using '#{key}'. Normalizing to #{cleaned_key}." if key != cleaned_key hsh[cleaned_key] = val end end @@ -71,7 +71,7 @@ def strip_coderay_prefix(hash) private def modernize_coderay_config if highlighter == "coderay" - Jekyll.logger.warn "DEPRECATION: kramdown.coderay is deprecated use syntax_highlighter_opts." + Jekyll::Deprecator.deprecation_message "You are using 'kramdown.coderay' in your configuration, please use 'syntax_highlighter_opts' instead." @config["syntax_highlighter_opts"] = begin strip_coderay_prefix( @config["syntax_highlighter_opts"] \ From b78d5085f148e2794dba12546245ee5c2007ccb7 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 4 Dec 2015 09:21:43 -0800 Subject: [PATCH 0056/4996] Update history to reflect merge of #4109 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 86d5582115c..1346ab282f1 100644 --- a/History.markdown +++ b/History.markdown @@ -20,6 +20,7 @@ * `jekyll-docs` should be easily release-able (#4152) * Allow use of Cucumber 2.1 or greater (#4181) + * Modernize Kramdown for Markdown converter. (#4109) ### Site Enhancements From 96bc62c666b598c3dc7df7e2ec8a9b22625ed0af Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 4 Dec 2015 09:33:33 -0800 Subject: [PATCH 0057/4996] Add 'sample' Liquid filter Equivalent to Array#sample functionality --- lib/jekyll/filters.rb | 5 +++++ site/_docs/templates.md | 11 +++++++++++ test/test_filters.rb | 7 +++++++ 3 files changed, 23 insertions(+) diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb index 7e2d30f3492..f3193f21462 100644 --- a/lib/jekyll/filters.rb +++ b/lib/jekyll/filters.rb @@ -281,6 +281,11 @@ def unshift(array, input) new_ary end + def sample(input) + return input unless input.respond_to?(:sample) + input.sample(1) + end + # Convert an object into its String representation for debugging # # input - The Object to be converted diff --git a/site/_docs/templates.md b/site/_docs/templates.md index 58e06c94661..20a3a3f24bd 100644 --- a/site/_docs/templates.md +++ b/site/_docs/templates.md @@ -246,6 +246,17 @@ common tasks easier.

+ + +

Sample

+

Pick a random value from an array.

+ + +

+ {% raw %}{{ site.pages | sample }}{% endraw %} +

+ + diff --git a/test/test_filters.rb b/test/test_filters.rb index cf4db89b70d..59b882f12f6 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -388,5 +388,12 @@ def to_liquid end end + context "sample filter" do + should "return a random item from the array" do + input = %w(hey there bernie) + assert_includes input, @filter.sample(input) + end + end + end end From 86195655d798e4afcb888fa37787453e0d56ae23 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 4 Dec 2015 09:40:57 -0800 Subject: [PATCH 0058/4996] filters: allow sample(n) instead of just sample(1) --- lib/jekyll/filters.rb | 4 ++-- site/_docs/templates.md | 5 ++++- test/test_filters.rb | 7 +++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb index f3193f21462..70e93b90ea6 100644 --- a/lib/jekyll/filters.rb +++ b/lib/jekyll/filters.rb @@ -281,9 +281,9 @@ def unshift(array, input) new_ary end - def sample(input) + def sample(input, num = 1) return input unless input.respond_to?(:sample) - input.sample(1) + input.sample(num) end # Convert an object into its String representation for debugging diff --git a/site/_docs/templates.md b/site/_docs/templates.md index 20a3a3f24bd..fd42b6b1625 100644 --- a/site/_docs/templates.md +++ b/site/_docs/templates.md @@ -249,12 +249,15 @@ common tasks easier.

Sample

-

Pick a random value from an array.

+

Pick a random value from an array. Optional: pick multiple values.

{% raw %}{{ site.pages | sample }}{% endraw %}

+

+ {% raw %}{{ site.pages | sample:2 }}{% endraw %} +

diff --git a/test/test_filters.rb b/test/test_filters.rb index 59b882f12f6..5fd9facb8b5 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -393,6 +393,13 @@ def to_liquid input = %w(hey there bernie) assert_includes input, @filter.sample(input) end + + should "allow sampling of multiple values (n > 1)" do + input = %w(hey there bernie) + @filter.sample(input, 2).each do |val| + assert_includes val, input + end + end end end From b6de905ee44d39eb25dd8eba06426d4fac74229b Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Fri, 4 Dec 2015 06:46:44 -0600 Subject: [PATCH 0059/4996] Fix: #4219: Add CodeClimate Platform. --- .codeclimate.yml | 46 +++++++++++++++++++++++++++ .gitignore | 1 + .rubocop.yml | 27 ++++++++++++++++ Rakefile | 37 ++++++++++++++++++++++ lib/jekyll/utils.rb | 1 + lib/jekyll/utils/ansi.rb | 59 +++++++++++++++++++++++++++++++++++ lib/jekyll/utils/platforms.rb | 3 +- test/test_ansi.rb | 23 ++++++++++++++ 8 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 .codeclimate.yml create mode 100644 .rubocop.yml create mode 100644 lib/jekyll/utils/ansi.rb create mode 100644 test/test_ansi.rb diff --git a/.codeclimate.yml b/.codeclimate.yml new file mode 100644 index 00000000000..29ed62d0cda --- /dev/null +++ b/.codeclimate.yml @@ -0,0 +1,46 @@ +engines: + rubocop: + enabled: true + checks: + Rubocop/Style/SpaceInsideBrackets: { enabled: false } + Rubocop/Style/BracesAroundHashParameters: { enabled: false} + Rubocop/Style/EmptyLinesAroundAccessModifier: { enabled: false } + Rubocop/Style/EmptyLinesAroundModuleBody: { enabled: false } + Rubocop/Lint/FormatParameterMismatch: { enabled: false } + Rubocop/Lint/UselessAccessModifier: { enabled: false } + Rubocop/Lint/AssignmentInCondition: { enabled: false } + Rubocop/Style/SpaceAroundOperators: { enabled: false } + Rubocop/Style/AlignParameters: { enabled: false } + Rubocop/Style/SignalException: { enabled: false } + Rubocop/Style/Documentation: { enabled: false } + Rubocop/Style/DoubleNegation: { enabled: false } + Rubocop/Style/UnneededCapitalW: { enabled: false } + Rubocop/Style/IfUnlessModifier: { enabled: false } + Rubocop/Style/RescueModifier: { enabled: false } + Rubocop/Style/RegexpLiteral: { enabled: false } + Rubocop/Style/GuardClause: { enabled: false } + Rubocop/Style/FileName: { enabled: false } + fixme: + enabled: false +exclude_paths: +- .rubocop.yml +- .codeclimate.yml +- .travis.yml +- .gitignore +- .rspec + +- Gemfile.lock +- CHANGELOG.md +- readme.md +- README.md +- Readme.md +- ReadMe.md +- COPYING +- LICENSE + +- test/**/* +- script/**/* +- spec/**/* +ratings: + paths: + - lib/**/* diff --git a/.gitignore b/.gitignore index d75a4982cd2..6441a147fd9 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ tmp/* .jekyll-metadata /vendor /test/source/file_name.txt +.analysis diff --git a/.rubocop.yml b/.rubocop.yml new file mode 100644 index 00000000000..66b8552d634 --- /dev/null +++ b/.rubocop.yml @@ -0,0 +1,27 @@ +Style/IndentHash: { EnforcedStyle: align_braces } +Style/StringLiteralsInInterpolation: { EnforcedStyle: double_quotes } +Style/StringLiterals: { EnforcedStyle: none } +Metrics/MethodLength: { Max: 24 } +Metrics/ClassLength: { Max: 240 } +Metrics/ModuleLength: { Max: 240 } +Metrics/LineLength: { Max: 112 } + +Style/HashSyntax: + UseHashRocketsWithSymbolValues: false + SupportedStyles: [ruby19 ruby19_no_mixed_keys, hash_rockets] + EnforcedStyle: ruby19 + +Style/MultilineOperationIndentation: + EnforcedStyle: indented + SupportedStyles: + - indented + +Style/PercentLiteralDelimiters: + PreferredDelimiters: + '%q': '{}' + '%Q': '{}' + '%r': '!!' + '%s': '()' + '%w': '()' + '%W': '()' + '%x': '()' diff --git a/Rakefile b/Rakefile index e189f0b947a..3596270ba20 100644 --- a/Rakefile +++ b/Rakefile @@ -329,3 +329,40 @@ namespace :docs do sh "mv #{docs_name}-#{version}.gem pkg" end end + +task :analysis do + require "jekyll/utils/ansi" + require "open3" + + cmd = [ + "docker", "run", "--rm", "--env=CODE_PATH=#{Dir.pwd}", \ + "--volume='#{Dir.pwd}:/code'", "--volume=/var/run/docker.sock:/var/run/docker.sock", \ + "--volume=/tmp/cc:/tmp/cc", "-i", "codeclimate/codeclimate", "analyze" + ] + + ansi = Jekyll::Utils::Ansi + file = File.open(".analysis", "w+") + Open3.popen3(cmd.shelljoin) do |_, out, err, _| + while data = out.gets + file.write data + if data =~ /\A==/ + $stdout.print ansi.yellow(data) + + elsif data !~ %r!\A[0-9\-]+! + $stdout.puts data + + else + h, d = data.split(":", 2) + $stdout.print ansi.cyan(h) + $stdout.print ":", d + end + end + + while data = err.gets + file.write data + $stderr.print ansi.red(data) + end + end + + file.close +end diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index 7d2490a6864..339c860a20f 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -1,6 +1,7 @@ module Jekyll module Utils extend self autoload :Platforms, 'jekyll/utils/platforms' + autoload :Ansi, "jekyll/utils/ansi" # Constants for use in #slugify SLUGIFY_MODES = %w{raw default pretty} diff --git a/lib/jekyll/utils/ansi.rb b/lib/jekyll/utils/ansi.rb new file mode 100644 index 00000000000..05f38429b3f --- /dev/null +++ b/lib/jekyll/utils/ansi.rb @@ -0,0 +1,59 @@ +# Frozen-string-literal: true +# Copyright: 2015 Jekyll - MIT License +# Encoding: utf-8 + +module Jekyll + module Utils + module Ansi + extend self + + ESCAPE = format("%c", 27) + MATCH = /#{ESCAPE}\[(?:\d+)(?:;\d+)*(j|k|m|s|u|A|B|G)|\e\(B\e\[m/ix.freeze + COLORS = { + :red => 31, + :green => 32, + :black => 30, + :magenta => 35, + :yellow => 33, + :white => 37, + :blue => 34, + :cyan => 36 + } + + # Strip ANSI from the current string. It also strips cursor stuff, + # well some of it, and it also strips some other stuff that a lot of + # the other ANSI strippers don't. + + def strip(str) + str.gsub MATCH, "" + end + + # + + def has?(str) + !!(str =~ MATCH) + end + + # Reset the color back to the default color so that you do not leak any + # colors when you move onto the next line. This is probably normally + # used as part of a wrapper so that we don't leak colors. + + def reset(str = "") + @ansi_reset ||= format("%c[0m", 27) + "#{@ansi_reset}#{str}" + end + + # SEE: `self::COLORS` for a list of methods. They are mostly + # standard base colors supported by pretty much any xterm-color, we do + # not need more than the base colors so we do not include them. + # Actually... if I'm honest we don't even need most of the + # base colors. + + COLORS.each do |color, num| + define_method color do |str| + "#{format("%c", 27)}[#{num}m#{str}#{reset}" + end + end + end + end +end diff --git a/lib/jekyll/utils/platforms.rb b/lib/jekyll/utils/platforms.rb index 83858a074a6..abc1598cb42 100644 --- a/lib/jekyll/utils/platforms.rb +++ b/lib/jekyll/utils/platforms.rb @@ -1,6 +1,7 @@ module Jekyll module Utils - module Platforms extend self + module Platforms + extend self # Provides jruby? and mri? which respectively detect these two types of # tested Engines we support, in the future we might probably support the diff --git a/test/test_ansi.rb b/test/test_ansi.rb new file mode 100644 index 00000000000..b209e23775c --- /dev/null +++ b/test/test_ansi.rb @@ -0,0 +1,23 @@ +require "helper" + +class TestAnsi < JekyllUnitTest + context nil do + setup do + @subject = Jekyll::Utils::Ansi + end + + Jekyll::Utils::Ansi::COLORS.each do |color, val| + should "respond_to? #{color}" do + assert @subject.respond_to?(color) + end + end + + should "be able to strip colors" do + assert_equal @subject.strip(@subject.yellow(@subject.red("hello"))), "hello" + end + + should "be able to detect colors" do + assert @subject.has?(@subject.yellow("hello")) + end + end +end From 0aa3c96d1150afe8a69332e5749a799cef89af2f Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 4 Dec 2015 09:59:00 -0800 Subject: [PATCH 0060/4996] travis: do NOT wait for branch builds for PR's. it just wastes time. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8026187c503..82e32e86566 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,9 @@ env: matrix: - TEST_SUITE=test - TEST_SUITE=cucumber +branches: + only: + - master before_script: bundle update script: script/cibuild notifications: From d10dc012908751f24836e65754177e4bbaaca65e Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Fri, 4 Dec 2015 12:09:06 -0600 Subject: [PATCH 0061/4996] Update History.markdown --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 1346ab282f1..583784ae1e2 100644 --- a/History.markdown +++ b/History.markdown @@ -7,6 +7,7 @@ * Print debug message when a document is skipped from reading (#4180) * Include tag should accept multiple variables in the include name (#4183) * Add `-o` option to serve command which opens server URL (#4144) + * Add CodeClimate platform for better code quality. (#4220) ### Bug Fixes From 2e91d094e5852ccb760010ede2e1062e6aff74a1 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 4 Dec 2015 10:25:13 -0800 Subject: [PATCH 0062/4996] filters#sample: n == 1, return item; n > 1, return array --- lib/jekyll/filters.rb | 7 ++++++- test/test_filters.rb | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb index 70e93b90ea6..6efc2e9404a 100644 --- a/lib/jekyll/filters.rb +++ b/lib/jekyll/filters.rb @@ -283,7 +283,12 @@ def unshift(array, input) def sample(input, num = 1) return input unless input.respond_to?(:sample) - input.sample(num) + sampling = input.sample(num) + if num == 1 + sampling.first + else + sampling + end end # Convert an object into its String representation for debugging diff --git a/test/test_filters.rb b/test/test_filters.rb index 5fd9facb8b5..dc51252e68e 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -397,7 +397,7 @@ def to_liquid should "allow sampling of multiple values (n > 1)" do input = %w(hey there bernie) @filter.sample(input, 2).each do |val| - assert_includes val, input + assert_includes input, val end end end From a43d2907c788bb2e932a06a3b81906b958429335 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 4 Dec 2015 10:48:25 -0800 Subject: [PATCH 0063/4996] travis: fast finish. don't wait for allowed failures to finish. JRUBY... --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8026187c503..6c86836f800 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ rvm: - ruby-head - jruby-9.0.3.0 matrix: + fast_finish: true allow_failures: - rvm: ruby-head - rvm: jruby-9.0.3.0 From 8efbdc01ff27397d614eb2702d0916375a634f90 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Tue, 16 Jun 2015 20:15:18 -0500 Subject: [PATCH 0064/4996] Fix #3791/#3478 * Add support for SSL through command line switches. * Add suppport for file/index.html > file.html > directory. * Add support for custom-headers through configuration. * Modernize and split up the serve. * Add a few basic tests. --- lib/jekyll/commands/serve.rb | 261 +++++++++++++++------------ lib/jekyll/commands/serve/servlet.rb | 56 ++++++ site/_docs/configuration.md | 36 ++++ test/test_commands_serve.rb | 115 ++++++++++++ 4 files changed, 355 insertions(+), 113 deletions(-) create mode 100644 lib/jekyll/commands/serve/servlet.rb create mode 100644 test/test_commands_serve.rb diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index 389ae5a2cb1..aa8fc6a882e 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -1,161 +1,196 @@ -# -*- encoding: utf-8 -*- module Jekyll module Commands class Serve < Command - class << self + COMMAND_OPTIONS = { + "ssl_cert" => ["--ssl-cert [CERT]", "X.509 (SSL) certificate."], + "host" => ["host", "-H", "--host [HOST]", "Host to bind to"], + "open_url" => ["-o", "--open-url", "Launch your browser with your site."], + "detach" => ["-B", "--detach", "Run the server in the background (detach)"], + "ssl_key" => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."], + "port" => ["-P", "--port [PORT]", "Port to listen on"], + "baseurl" => ["-b", "--baseurl [URL]", "Base URL"], + "skip_initial_build" => ["skip_initial_build", "--skip-initial-build", + "Skips the initial site build which occurs before the server is started."] + } + + # def init_with_program(prog) - prog.command(:serve) do |c| - c.syntax 'serve [options]' - c.description 'Serve your site locally' - c.alias :server - c.alias :s - - add_build_options(c) - - c.option 'detach', '-B', '--detach', 'Run the server in the background (detach)' - c.option 'port', '-P', '--port [PORT]', 'Port to listen on' - c.option 'host', '-H', '--host [HOST]', 'Host to bind to' - c.option 'baseurl', '-b', '--baseurl [URL]', 'Base URL' - c.option 'skip_initial_build', '--skip-initial-build', 'Skips the initial site build which occurs before the server is started.' - c.option 'open_url', '-o', '--open-url', 'Opens the local URL in your default browser' - - c.action do |args, options| - options["serving"] = true - options["watch"] = true unless options.key?("watch") - Jekyll::Commands::Build.process(options) - Jekyll::Commands::Serve.process(options) + prog.command(:serve) do |cmd| + cmd.description "Serve your site locally" + cmd.syntax "serve [options]" + cmd.alias :server + cmd.alias :s + + add_build_options(cmd) + COMMAND_OPTIONS.each do |key, val| + cmd.option key, *val + end + + cmd.action do |_, opts| + opts["serving"] = true + opts["watch" ] = true unless opts.key?("watch") + Build.process(opts) + Serve.process(opts) end end end - # Boot up a WEBrick server which points to the compiled site's root. - def process(options) - options = configuration_from_options(options) - destination = options['destination'] - setup(destination) - - s = WEBrick::HTTPServer.new(webrick_options(options)) - s.unmount("") - - s.mount( - options['baseurl'], - custom_file_handler, - destination, - file_handler_options - ) - + # - server_address_str = server_address(s, options) - Jekyll.logger.info "Server address:", server_address_str - - if options["open_url"] - command = Utils::Platforms.windows?? "start" : Utils::Platforms.osx?? \ - "open" : "xdg-open" - - system command, server_address_str - end + def process(opts) + opts = configuration_from_options(opts) + destination = opts["destination"] + setup(destination) - if options['detach'] # detach the server - pid = Process.fork { s.start } - Process.detach(pid) - Jekyll.logger.info "Server detached with pid '#{pid}'.", "Run `pkill -f jekyll' or `kill -9 #{pid}' to stop the server." - else # create a new server thread, then join it with current terminal - t = Thread.new { s.start } - trap("INT") { s.shutdown } - t.join - end + server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") } + server.mount(opts["baseurl"], Servlet, destination, file_handler_opts) + Jekyll.logger.info "Server address:", server_address(server, opts) + launch_browser server, opts if opts["open_url"] + boot_or_detach server, opts end + # Do a base pre-setup of WEBRick so that everything is in place + # when we get ready to party, checking for an setting up an error page + # and making sure our destination exists. + + private def setup(destination) - require 'webrick' + require_relative "serve/servlet" FileUtils.mkdir_p(destination) - - # monkey patch WEBrick using custom 404 page (/404.html) - if File.exist?(File.join(destination, '404.html')) + if File.exist?(File.join(destination, "404.html")) WEBrick::HTTPResponse.class_eval do def create_error_page - @header['content-type'] = "text/html; charset=UTF-8" - @body = IO.read(File.join(@config[:DocumentRoot], '404.html')) + @header["Content-Type"] = "text/html; charset=UTF-8" + @body = IO.read(File.join(@config[:DocumentRoot], "404.html")) end end end end - def webrick_options(config) + # + + private + def webrick_opts(opts) opts = { - :BindAddress => config['host'], - :DirectoryIndex => %w(index.html index.htm index.cgi index.rhtml index.xml), - :DocumentRoot => config['destination'], + :JekyllOptions => opts, :DoNotReverseLookup => true, :MimeTypes => mime_types, - :Port => config['port'], - :StartCallback => start_callback(config['detach']) + :DocumentRoot => opts["destination"], + :StartCallback => start_callback(opts["detach"]), + :BindAddress => opts["host"], + :Port => opts["port"], + :DirectoryIndex => %W( + index.htm + index.html + index.rhtml + index.cgi + index.xml + ) } - if config['verbose'] - opts.merge!({ - :Logger => WEBrick::Log.new($stdout, WEBrick::Log::DEBUG) - }) + enable_ssl(opts) + enable_logging(opts) + opts + end + + # Recreate NondisclosureName under utf-8 circumstance + + private + def file_handler_opts + WEBrick::Config::FileHandler.merge({ + :FancyIndexing => true, + :NondisclosureName => [ + '.ht*','~*' + ] + }) + end + + # + + private + def server_address(server, opts) + address = server.config[:BindAddress] + baseurl = "#{opts["baseurl"]}/" if opts["baseurl"] + port = server.config[:Port] + + "http://#{address}:#{port}#{baseurl}" + end + + # + + private + def launch_browser(server, opts) + command = Utils::Platforms.windows?? "start" : Utils::Platforms.osx?? "open" : "xdg-open" + system command, server_address(server, opts) + end + + # Keep in our area with a thread or detach the server as requested + # by the user. This method determines what we do based on what you + # ask us to do. + + private + def boot_or_detach(server, opts) + if opts["detach"] + pid = Process.fork do + server.start + end + + Process.detach(pid) + Jekyll.logger.info "Server detached with pid '#{pid}'.", \ + "Run `pkill -f jekyll' or `kill -9 #{pid}' to stop the server." else - opts.merge!({ - :AccessLog => [], - :Logger => WEBrick::Log.new([], WEBrick::Log::WARN) - }) + t = Thread.new { server.start } + trap("INT") { server.shutdown } + t.join end + end - opts + # Make the stack verbose if the user requests it. + + private + def enable_logging(opts) + opts[:AccessLog] = [] + level = WEBrick::Log.const_get(opts[:JekyllOptions]["verbose"] ? :DEBUG : :WARN) + opts[:Logger] = WEBrick::Log.new($stdout, level) end - # Custom WEBrick FileHandler servlet for serving "/file.html" at "/file" - # when no exact match is found. This mirrors the behavior of GitHub - # Pages and many static web server configs. - def custom_file_handler - Class.new WEBrick::HTTPServlet::FileHandler do - def search_file(req, res, basename) - if file = super - file - else - super(req, res, "#{basename}.html") - end - end + # Add SSL to the stack if the user triggers --enable-ssl and they + # provide both types of certificates commonly needed. Raise if they + # forget to add one of the certificates. + + private + def enable_ssl(opts) + return if !opts[:JekyllOptions]["ssl_cert"] && !opts[:JekyllOptions]["ssl_key"] + if !opts[:JekyllOptions]["ssl_cert"] || !opts[:JekyllOptions]["ssl_key"] + raise RuntimeError, "--ssl-cert or --ssl-key missing." end + + require "openssl"; require "webrick/https" + source_key = Jekyll.sanitized_path(opts[:JekyllOptions]["source"], opts[:JekyllOptions]["ssl_key" ]) + source_certificate = Jekyll.sanitized_path(opts[:JekyllOptions]["source"], opts[:JekyllOptions]["ssl_cert"]) + opts[:SSLCertificate] = OpenSSL::X509::Certificate.new(File.read(source_certificate)) + opts[:SSLPrivateKey ] = OpenSSL::PKey::RSA.new(File.read(source_key)) + opts[:EnableSSL] = true end + private def start_callback(detached) unless detached - Proc.new { Jekyll.logger.info "Server running...", "press ctrl-c to stop." } + proc do + Jekyll.logger.info("Server running...", "press ctrl-c to stop.") + end end end + private def mime_types - mime_types_file = File.expand_path('../mime.types', File.dirname(__FILE__)) - WEBrick::HTTPUtils::load_mime_types(mime_types_file) + file = File.expand_path('../mime.types', File.dirname(__FILE__)) + WEBrick::HTTPUtils.load_mime_types(file) end - - def server_address(server, options) - baseurl = "#{options['baseurl']}/" if options['baseurl'] - [ - "http://", - server.config[:BindAddress], - ":", - server.config[:Port], - baseurl || "" - ].map(&:to_s).join("") - end - - # recreate NondisclosureName under utf-8 circumstance - def file_handler_options - WEBrick::Config::FileHandler.merge({ - :FancyIndexing => true, - :NondisclosureName => ['.ht*','~*'] - }) - end - end - end end end diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb new file mode 100644 index 00000000000..4b11ad0da19 --- /dev/null +++ b/lib/jekyll/commands/serve/servlet.rb @@ -0,0 +1,56 @@ +require "webrick" + +module Jekyll + module Commands + class Serve + class Servlet < WEBrick::HTTPServlet::FileHandler + HEADER_DEFAULTS = {} + + def initialize(server, root, callbacks) + extract_headers(server.config[:JekyllOptions]) + super + end + + # + + def do_GET(req, res) + res.header.merge!(@headers) if @headers.any? + return super + end + + # --------------------------------------------------------------------- + # file > file/index.html > file.html > directory -> Having a directory + # with the same name as a file will result in the file being served the + # way that Nginx behaves (probably not exactly...) For browsing. + # --------------------------------------------------------------------- + + def search_file(req, res, basename) + return file if (file = super) || (file = super req, res, "#{basename}.html") + + file = "#{req.path.gsub(/\/\Z/, "")}.html" + if file && File.file?(File.join(@config[:DocumentRoot], file)) + return ".html" + end + nil + end + + def extract_headers(opts) + @headers = add_defaults(opts.fetch("webrick", {}).fetch("headers", {})) + end + + def add_defaults(opts) + control_development_cache(opts) + HEADER_DEFAULTS.each_with_object(opts) do |(k, v), h| + h[k] = v if !h[k] + end + end + + def control_development_cache(opts) + if !opts.has_key?("Cache-Control") && Jekyll.env == "development" + opts["Cache-Control"] = "private, max-age=0, proxy-revalidate, no-store, no-cache, must-revalidate" + end + end + end + end + end +end diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md index 2bb65e822f3..f6a71ed2bb1 100644 --- a/site/_docs/configuration.md +++ b/site/_docs/configuration.md @@ -352,6 +352,24 @@ before your site is served.

--skip-initial-build

+ + +

X.509 (SSL) Private Key

+

SSL Private Key.

+ + +

--ssl-key

+ + + + +

X.509 (SSL) Certificate

+

SSL Public certificate.

+ + +

--ssl-cert

+ + @@ -364,6 +382,24 @@ before your site is served.

+## Custom WEBRick Headers + +You can provide custom headers for your site by adding them to `_config.yml` + +{% highlight yaml %} +# File: _config.yml +webrick: + headers: + My-Header: My-Value + My-Other-Header: My-Other-Value +{% endhighlight %} + +### Defaults + +We only provide on default and that's a Content-Type header that disables +caching in development so that you don't have to fight with Chrome's aggressive +caching when you are in development mode. + ## Specifying a Jekyll environment at build time In the build (or serve) arguments, you can specify a Jekyll environment and value. The build will then apply this value in any conditional statements in your content. diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb new file mode 100644 index 00000000000..87472c3df06 --- /dev/null +++ b/test/test_commands_serve.rb @@ -0,0 +1,115 @@ +require "webrick" +require "mercenary" +require "helper" + +class TestCommandsServe < JekyllUnitTest + def custom_opts(what) + @cmd.send( + :webrick_opts, what + ) + end + + context "with a program" do + setup do + @merc, @cmd = nil, Jekyll::Commands::Serve + Mercenary.program(:jekyll) do |p| + @merc = @cmd.init_with_program( + p + ) + end + end + + should "label itself" do + assert_equal( + @merc.name, :serve + ) + end + + should "have aliases" do + assert_includes @merc.aliases, :s + assert_includes @merc.aliases, :server + end + + should "have a description" do + refute_nil( + @merc.description + ) + end + + should "have an action" do + refute_empty( + @merc.actions + ) + end + + should "not have an empty options set" do + refute_empty( + @merc.options + ) + end + + context "with custom options" do + should "create a default set of mimetypes" do + refute_nil custom_opts({})[ + :MimeTypes + ] + end + + should "use user destinations" do + assert_equal "foo", custom_opts({ "destination" => "foo" })[ + :DocumentRoot + ] + end + + should "use user port" do + # WHAT?!?!1 Over 9000? That's impossible. + assert_equal 9001, custom_opts( { "port" => 9001 })[ + :Port + ] + end + + context "verbose" do + should "debug when verbose" do + assert_equal custom_opts({ "verbose" => true })[:Logger].level, 5 + end + + should "warn when not verbose" do + assert_equal custom_opts({})[:Logger].level, 3 + end + end + + context "enabling ssl" do + should "raise if enabling without key or cert" do + assert_raises RuntimeError do + custom_opts({ + "ssl_key" => "foo" + }) + end + + assert_raises RuntimeError do + custom_opts({ + "ssl_key" => "foo" + }) + end + end + + should "allow SSL with a key and cert" do + expect(OpenSSL::PKey::RSA).to receive(:new).and_return("c2") + expect(OpenSSL::X509::Certificate).to receive(:new).and_return("c1") + allow(File).to receive(:read).and_return("foo") + + result = custom_opts({ + "ssl_cert" => "foo", + "source" => "bar", + "enable_ssl" => true, + "ssl_key" => "bar" + }) + + assert result[:EnableSSL] + assert_equal result[:SSLPrivateKey ], "c2" + assert_equal result[:SSLCertificate], "c1" + end + end + end + end +end From dd971a35814527df3cda0835508b14be0862c1bd Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 4 Dec 2015 13:16:40 -0800 Subject: [PATCH 0065/4996] Update history to reflect merge of #4224 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 583784ae1e2..2d4e3fa3290 100644 --- a/History.markdown +++ b/History.markdown @@ -8,6 +8,7 @@ * Include tag should accept multiple variables in the include name (#4183) * Add `-o` option to serve command which opens server URL (#4144) * Add CodeClimate platform for better code quality. (#4220) + * General improvements for WEBrick via jekyll serve such as SSL & custom headers (#4224) ### Bug Fixes From 47d2a2459d0dbe07301f8d8fb5bbf142bf5eb2d2 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 4 Dec 2015 13:48:09 -0800 Subject: [PATCH 0066/4996] filters: refactor #sample to leave off the arg --- lib/jekyll/filters.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb index 6efc2e9404a..2b1bf1afbd8 100644 --- a/lib/jekyll/filters.rb +++ b/lib/jekyll/filters.rb @@ -283,11 +283,11 @@ def unshift(array, input) def sample(input, num = 1) return input unless input.respond_to?(:sample) - sampling = input.sample(num) - if num == 1 - sampling.first + n = num.to_i rescue 1 + if n == 1 + input.sample else - sampling + input.sample(n) end end From 79ceb4d394f77a42069c5d7cba6a7f4f10ef4716 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 4 Dec 2015 14:12:59 -0800 Subject: [PATCH 0067/4996] Update history to reflect merge of #4223 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 2d4e3fa3290..c87e220b2c1 100644 --- a/History.markdown +++ b/History.markdown @@ -2,6 +2,7 @@ ### Minor Enhancements + * Add 'sample' Liquid filter Equivalent to Array#sample functionality (#4223) * Cache parsed include file to save liquid parsing time. (#4120) * Slightly speed up url sanitization and handle multiples of ///. (#4168) * Print debug message when a document is skipped from reading (#4180) From 99042fa8702189bbdd664946f962d0141e64206c Mon Sep 17 00:00:00 2001 From: Ducksan Cho Date: Sat, 5 Dec 2015 16:21:50 +1300 Subject: [PATCH 0068/4996] Improve error message --- lib/jekyll/frontmatter_defaults.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb index a37dcbe7df9..673d9a99f69 100644 --- a/lib/jekyll/frontmatter_defaults.rb +++ b/lib/jekyll/frontmatter_defaults.rb @@ -33,7 +33,7 @@ def update_deprecated_types(set) def ensure_time!(set) return set unless set.key?('values') && set['values'].key?('date') return set if set['values']['date'].is_a?(Time) - set['values']['date'] = Utils.parse_date(set['values']['date'], "Front matter defaults does not have a valid date.") + set['values']['date'] = Utils.parse_date(set['values']['date'], "An invalid date format was found in a front-matter default set: #{set}") set end From b63712e40312f85846da3ca34b52d3f1ac5db580 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sat, 5 Dec 2015 04:48:51 -0600 Subject: [PATCH 0069/4996] Fix an edge where file is sometimes not returned properly. --- lib/jekyll/commands/serve/servlet.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb index 4b11ad0da19..cc6d958fbc6 100644 --- a/lib/jekyll/commands/serve/servlet.rb +++ b/lib/jekyll/commands/serve/servlet.rb @@ -18,24 +18,26 @@ def do_GET(req, res) return super end - # --------------------------------------------------------------------- # file > file/index.html > file.html > directory -> Having a directory - # with the same name as a file will result in the file being served the - # way that Nginx behaves (probably not exactly...) For browsing. - # --------------------------------------------------------------------- + # with the same name as a file will result in the file being served the way + # that Nginx behaves (probably not exactly...) For browsing. def search_file(req, res, basename) - return file if (file = super) || (file = super req, res, "#{basename}.html") + file = super || super(req, res, "#{basename}.html") + return file if file file = "#{req.path.gsub(/\/\Z/, "")}.html" if file && File.file?(File.join(@config[:DocumentRoot], file)) return ".html" end - nil + + nil end def extract_headers(opts) - @headers = add_defaults(opts.fetch("webrick", {}).fetch("headers", {})) + @headers = add_defaults(opts.fetch("webrick", {}).fetch("headers", { + # Nothing. + })) end def add_defaults(opts) From fdf12efde40c6f1696d58c7fa3c18e740d48afd9 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sat, 5 Dec 2015 04:54:34 -0600 Subject: [PATCH 0070/4996] [CI:SKIP] Update history.markdown to reflect the merger of #4228 --- History.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/History.markdown b/History.markdown index c87e220b2c1..f5ad6291792 100644 --- a/History.markdown +++ b/History.markdown @@ -9,7 +9,7 @@ * Include tag should accept multiple variables in the include name (#4183) * Add `-o` option to serve command which opens server URL (#4144) * Add CodeClimate platform for better code quality. (#4220) - * General improvements for WEBrick via jekyll serve such as SSL & custom headers (#4224) + * General improvements for WEBrick via jekyll serve such as SSL & custom headers (#4224, #4228) ### Bug Fixes From 643ae6891271f9cfc481f9b42ecea890b2f9dcef Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 6 Dec 2015 20:33:53 -0600 Subject: [PATCH 0071/4996] Add a default charset to content-type on webrick. Add a default charset to content-type on webrick, using Jekyll's default encoding (or user set encoding) and cleanup servlet removing unecessary logic that really served no purpose at the end of the day, we don't need to strictly match Nginx, only be "like it." This also cleans up the way we set headers and merges that logic into a cleaner to understand interface that is slightly speedier. --- lib/jekyll/commands/serve/servlet.rb | 63 +++++++++++++++------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb index cc6d958fbc6..fa376f6118d 100644 --- a/lib/jekyll/commands/serve/servlet.rb +++ b/lib/jekyll/commands/serve/servlet.rb @@ -4,52 +4,55 @@ module Jekyll module Commands class Serve class Servlet < WEBrick::HTTPServlet::FileHandler - HEADER_DEFAULTS = {} + DEFAULTS = { + "Cache-Control" => "private, max-age=0, proxy-revalidate, " \ + "no-store, no-cache, must-revalidate" + } def initialize(server, root, callbacks) - extract_headers(server.config[:JekyllOptions]) + # So we can access them easily. + @jekyll_opts = server.config[:JekyllOptions] + set_defaults super end + # Add the ability to tap file.html the same way that Nginx does on our + # Docker images (or on Github pages.) The difference is that we might end + # up with a different preference on which comes first. + + def search_file(req, res, basename) + # /file.* > /file/index.html > /file.html + super || super(req, res, "#{basename}.html") + end + # def do_GET(req, res) - res.header.merge!(@headers) if @headers.any? - return super + rtn = super + validate_and_ensure_charset(req, res) + res.header.merge!(@headers) + rtn end - # file > file/index.html > file.html > directory -> Having a directory - # with the same name as a file will result in the file being served the way - # that Nginx behaves (probably not exactly...) For browsing. + # - def search_file(req, res, basename) - file = super || super(req, res, "#{basename}.html") + private + def validate_and_ensure_charset(req, res) + key = res.header.keys.grep(/content-type/i).first + typ = res.header[key] - return file if file - file = "#{req.path.gsub(/\/\Z/, "")}.html" - if file && File.file?(File.join(@config[:DocumentRoot], file)) - return ".html" + unless typ =~ /;\s*charset=/ + res.header[key] = "#{typ}; charset=#{@jekyll_opts["encoding"]}" end - - nil - end - - def extract_headers(opts) - @headers = add_defaults(opts.fetch("webrick", {}).fetch("headers", { - # Nothing. - })) end - def add_defaults(opts) - control_development_cache(opts) - HEADER_DEFAULTS.each_with_object(opts) do |(k, v), h| - h[k] = v if !h[k] - end - end + # - def control_development_cache(opts) - if !opts.has_key?("Cache-Control") && Jekyll.env == "development" - opts["Cache-Control"] = "private, max-age=0, proxy-revalidate, no-store, no-cache, must-revalidate" + private + def set_defaults + hash_ = @jekyll_opts.fetch("webrick", {}).fetch("headers", {}) + DEFAULTS.each_with_object(@headers = hash_) do |(key, val), hash| + hash[key] = val if !hash.key?(key) end end end From 915d8adb1b1cc71ef47e78b56d3b6daf8ba7dfbe Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Mon, 7 Dec 2015 11:37:37 -0600 Subject: [PATCH 0072/4996] [CI:SKIP] Update Gemnasium URL. --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index b1dfae4a494..d8c621d1910 100644 --- a/README.markdown +++ b/README.markdown @@ -3,7 +3,7 @@ [![Gem Version](https://img.shields.io/gem/v/jekyll.svg)](https://rubygems.org/gems/jekyll) [![Build Status](https://img.shields.io/travis/jekyll/jekyll/master.svg)](https://travis-ci.org/jekyll/jekyll) [![Code Climate](https://img.shields.io/codeclimate/github/jekyll/jekyll.svg)](https://codeclimate.com/github/jekyll/jekyll) -[![Dependency Status](https://img.shields.io/gemnasium/jekyll/jekyll.svg)](https://gemnasium.com/jekyll/jekyll) +[![Dependency Status](https://gemnasium.com/jekyll/jekyll.svg)](https://gemnasium.com/jekyll/jekyll) [![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)](https://hakiri.io/github/jekyll/jekyll/master) By Tom Preston-Werner, Nick Quaranto, Parker Moore, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)! From f4fa2e735e1499d1212e2ce42c8e3e475573ac2a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 7 Dec 2015 09:58:46 -0800 Subject: [PATCH 0073/4996] Update history to reflect merge of #4231 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index f5ad6291792..ef9e8f03f10 100644 --- a/History.markdown +++ b/History.markdown @@ -10,6 +10,7 @@ * Add `-o` option to serve command which opens server URL (#4144) * Add CodeClimate platform for better code quality. (#4220) * General improvements for WEBrick via jekyll serve such as SSL & custom headers (#4224, #4228) + * Add a default charset to content-type on webrick. (#4231) ### Bug Fixes From 0e89e80426cd854bafeea8b89dec76979f8847ca Mon Sep 17 00:00:00 2001 From: James Wen Date: Mon, 7 Dec 2015 09:56:17 -0500 Subject: [PATCH 0074/4996] Switch PluginManager to use require_with_graceful_fail * Add debug statement specifying current plugin to External#require_with_graceful_fail --- lib/jekyll/external.rb | 1 + lib/jekyll/plugin_manager.rb | 14 ++++---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/jekyll/external.rb b/lib/jekyll/external.rb index e41bce27d17..04dbb6f2f01 100644 --- a/lib/jekyll/external.rb +++ b/lib/jekyll/external.rb @@ -39,6 +39,7 @@ def require_if_present(names) def require_with_graceful_fail(names) Array(names).each do |name| begin + Jekyll.logger.debug("Requiring #{name}") require name rescue LoadError => e Jekyll.logger.error "Dependency Error:", <<-MSG diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb index bc541617255..11db89d1772 100644 --- a/lib/jekyll/plugin_manager.rb +++ b/lib/jekyll/plugin_manager.rb @@ -24,12 +24,7 @@ def conscientious_require # # Returns nothing. def require_gems - site.gems.each do |gem| - if plugin_allowed?(gem) - Jekyll.logger.debug("PluginManager:", "Requiring #{gem}") - require gem - end - end + Jekyll::External.require_with_graceful_fail(site.gems.select { |gem| plugin_allowed?(gem) }) end def self.require_from_bundler @@ -70,10 +65,9 @@ def whitelist # Returns nothing. def require_plugin_files unless site.safe - plugins_path.each do |plugins| - Dir[File.join(plugins, "**", "*.rb")].sort.each do |f| - require f - end + plugins_path.each do |plugin_search_path| + plugin_files = Utils.safe_glob(plugin_search_path, File.join("**", "*.rb")) + Jekyll::External.require_with_graceful_fail(plugin_files) end end end From eadbf2a711a75b5f794f9c0748033391de114a40 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 7 Dec 2015 22:11:43 -0800 Subject: [PATCH 0075/4996] Update history to reflect merge of #4233 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index ef9e8f03f10..a598bdf851e 100644 --- a/History.markdown +++ b/History.markdown @@ -11,6 +11,7 @@ * Add CodeClimate platform for better code quality. (#4220) * General improvements for WEBrick via jekyll serve such as SSL & custom headers (#4224, #4228) * Add a default charset to content-type on webrick. (#4231) + * Switch `PluginManager` to use `require_with_graceful_fail` for better UX (#4233) ### Bug Fixes From c9ead955a41d7e890d958ff9c900ae2162967a0b Mon Sep 17 00:00:00 2001 From: Ben Orenstein Date: Wed, 9 Dec 2015 13:44:45 -0500 Subject: [PATCH 0076/4996] Link to less generic FormKeep page This link used to point to a generic landing page. Now it links to a guide written specifically for Jekyll users. --- site/_docs/resources.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/resources.md b/site/_docs/resources.md index 8ede6a68da0..aad76dc8696 100644 --- a/site/_docs/resources.md +++ b/site/_docs/resources.md @@ -12,7 +12,7 @@ Jekyll’s growing use is producing a wide variety of tutorials, frameworks, ext Code example reuse, and keeping documentation up to date. -- [Use FormKeep for Jekyll form backend and webhooks](https://formkeep.com/) +- [Use FormKeep as a backend for forms (contact forms, hiring forms, etc.)](https://formkeep.com/guides/how-to-make-a-contact-form-in-jekyll) - [Use Simple Form to integrate a simple contact form](http://getsimpleform.com/) - [JekyllBootstrap.com](http://jekyllbootstrap.com) From 6a4c8a0b1c1052c261dad54839ce2e90c665bfaf Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 9 Dec 2015 11:14:01 -0800 Subject: [PATCH 0077/4996] Update history to reflect merge of #4243 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index a598bdf851e..3f9622d7949 100644 --- a/History.markdown +++ b/History.markdown @@ -37,6 +37,7 @@ * Add Kickster to deployment methods in documentation (#4190) * Add DavidBurela's tutorial for Windows to Windows docs page (#4210) * Change GitHub code block to highlight tag to avoid it overlaps parent div (#4121) + * Update FormKeep link to be something more specific to Jekyll (#4243) ## 3.0.1 / 2015-11-17 From e8b1a8aa44dc1fe41d0cd24e05a472ef77f0125c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 9 Dec 2015 11:46:47 -0800 Subject: [PATCH 0078/4996] script/cibuild: fail if subprocesses fail --- script/cibuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script/cibuild b/script/cibuild index afafd7d0990..d30fd36b7df 100755 --- a/script/cibuild +++ b/script/cibuild @@ -2,6 +2,8 @@ script/branding +set -e + if [[ -z "$TEST_SUITE" ]] then script/test ci From f97a48d970bddc716e3e4e03e72dfc91ba08dcb6 Mon Sep 17 00:00:00 2001 From: Ben Orenstein Date: Wed, 9 Dec 2015 16:28:25 -0500 Subject: [PATCH 0079/4996] Add utm params to link in docs https://github.com/jekyll/jekyll/pull/4243 updated this link to a jekyll-specific page. This commit adds utm params to the link so we can tell that users came to us from the Jekyll documentation. Among other things, this will help us provide better support to Jekyll users who sign up, since we'll know what site generator they're using. --- site/_docs/resources.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/resources.md b/site/_docs/resources.md index aad76dc8696..b414c90de0b 100644 --- a/site/_docs/resources.md +++ b/site/_docs/resources.md @@ -12,7 +12,7 @@ Jekyll’s growing use is producing a wide variety of tutorials, frameworks, ext Code example reuse, and keeping documentation up to date. -- [Use FormKeep as a backend for forms (contact forms, hiring forms, etc.)](https://formkeep.com/guides/how-to-make-a-contact-form-in-jekyll) +- [Use FormKeep as a backend for forms (contact forms, hiring forms, etc.)](https://formkeep.com/guides/how-to-make-a-contact-form-in-jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=contact-form-jekyll) - [Use Simple Form to integrate a simple contact form](http://getsimpleform.com/) - [JekyllBootstrap.com](http://jekyllbootstrap.com) From 961c807c721e92a4f3e28cfcf656be213604f223 Mon Sep 17 00:00:00 2001 From: Conor O'Callaghan Date: Thu, 10 Dec 2015 17:24:17 +0000 Subject: [PATCH 0080/4996] Removed example Roger Chapman site Page not found for this demo site --- site/_docs/sites.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/_docs/sites.md b/site/_docs/sites.md index 42d0492148e..7eb6559f600 100644 --- a/site/_docs/sites.md +++ b/site/_docs/sites.md @@ -12,8 +12,6 @@ learning purposes. ([source](https://github.com/mojombo/mojombo.github.io)) - [Nick Quaranto](http://quaran.to/) ([source](https://github.com/qrush/qrush.github.com)) -- [Roger Chapman](http://rogchap.com/) - ([source](https://github.com/rogchap/rogchap.github.com)) - [GitHub Official Teaching Materials](http://training.github.com) ([source](https://github.com/github/training.github.com/tree/7049d7532a6856411e34046aedfce43a4afaf424)) - [Rasmus Andersson](http://rsms.me/) From fceddca1b25d4a40c0ab4418b1986adc0c0c2bb3 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 10 Dec 2015 11:11:13 -0800 Subject: [PATCH 0081/4996] Update history to reflect merge of #4249 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 3f9622d7949..2a9ee75b986 100644 --- a/History.markdown +++ b/History.markdown @@ -38,6 +38,7 @@ * Add DavidBurela's tutorial for Windows to Windows docs page (#4210) * Change GitHub code block to highlight tag to avoid it overlaps parent div (#4121) * Update FormKeep link to be something more specific to Jekyll (#4243) + * Remove example Roger Chapman site, as the domain doesn't exist (#4249) ## 3.0.1 / 2015-11-17 From b79c17292141b81a688688517bca79fd7b112fb9 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Thu, 10 Dec 2015 15:02:24 -0600 Subject: [PATCH 0082/4996] E-Mail on test failure since I'm not often in IRC. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bf5d2d4c076..58980f41c2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,9 @@ notifications: template: - "%{repository}#%{build_number} (%{branch}) %{message} %{build_url}" email: + recipients: + - jordon@envygeeks.io on_success: never - on_failure: never + on_failure: always slack: secure: dNdKk6nahNURIUbO3ULhA09/vTEQjK0fNbgjVjeYPEvROHgQBP1cIP3AJy8aWs8rl5Yyow4YGEilNRzKPz18AsFptVXofpwyqcBxaCfmHP809NX5PHBaadydveLm+TNVao2XeLXSWu+HUNAYO1AanCUbJSEyJTju347xCBGzESU= From ed41ff7774ba6882fc58a53487bd2c8a16dbd84b Mon Sep 17 00:00:00 2001 From: Mike Neumegen Date: Thu, 10 Dec 2015 13:40:53 -0800 Subject: [PATCH 0083/4996] Updated configuration docs Added configuration options for draft_posts to configuration docs. --- site/_docs/configuration.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md index f6a71ed2bb1..ccff8f49c63 100644 --- a/site/_docs/configuration.md +++ b/site/_docs/configuration.md @@ -198,6 +198,7 @@ class="flag">flags (specified on the command-line) that control them.

Process and render draft posts.

+

show_drafts: BOOL

--drafts

From 29e721a804f2e0899e3ab4479d7a01949b937803 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 10 Dec 2015 15:59:05 -0800 Subject: [PATCH 0084/4996] Update history to reflect merge of #4251 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 2a9ee75b986..309b9a6c88b 100644 --- a/History.markdown +++ b/History.markdown @@ -39,6 +39,7 @@ * Change GitHub code block to highlight tag to avoid it overlaps parent div (#4121) * Update FormKeep link to be something more specific to Jekyll (#4243) * Remove example Roger Chapman site, as the domain doesn't exist (#4249) + * Added configuration options for `draft_posts` to configuration docs (#4251) ## 3.0.1 / 2015-11-17 From dfa3f8b33a6b74f9e240a4e81edb9aa23b8db32a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 11 Dec 2015 14:03:05 -0800 Subject: [PATCH 0085/4996] Update history to reflect merge of #4184 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 309b9a6c88b..1928439455b 100644 --- a/History.markdown +++ b/History.markdown @@ -12,6 +12,7 @@ * General improvements for WEBrick via jekyll serve such as SSL & custom headers (#4224, #4228) * Add a default charset to content-type on webrick. (#4231) * Switch `PluginManager` to use `require_with_graceful_fail` for better UX (#4233) + * Allow quoted date in front matter defaults (#4184) ### Bug Fixes From b94800361b4e3c507569e632a0ab017a834af273 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 11 Dec 2015 14:07:34 -0800 Subject: [PATCH 0086/4996] Collection: change missing_method message to be a bit clearer. Fixes #4234. Fixes #4199. --- lib/jekyll/collection.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb index 6cf3e99ba29..c4a1f456e2d 100644 --- a/lib/jekyll/collection.rb +++ b/lib/jekyll/collection.rb @@ -32,7 +32,7 @@ def respond_to?(method, include_private = false) # Override of method_missing to check in @data for the key. def method_missing(method, *args, &blck) if docs.respond_to?(method.to_sym) - Jekyll.logger.warn "Deprecation:", "Collection##{method} should be called on the #docs array directly." + Jekyll.logger.warn "Deprecation:", "#{label}.#{method} should be changed to #{label}.docs.#{method}." Jekyll.logger.warn "", "Called by #{caller.first}." docs.public_send(method.to_sym, *args, &blck) else From 9e5b1c9f6a338fae534e26c4c563d72e0792cc23 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 11 Dec 2015 14:11:40 -0800 Subject: [PATCH 0087/4996] Update history to reflect merge of #4052 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 1928439455b..b6d01032993 100644 --- a/History.markdown +++ b/History.markdown @@ -21,6 +21,7 @@ * Prevent Shell Injection. (#4200) * Convertible should make layout data accessible via `layout` instead of `page` (#4205) * Avoid using `Dir.glob` with absolute path to allow special characters in the path (#4150) + * Handle empty config files (#4052) ### Development Fixes From e61e93b48685bc4eb64868a5a523aed1d7151d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sat, 12 Dec 2015 15:08:12 +0100 Subject: [PATCH 0088/4996] Added missing links to Pygments.rb and Rouge --- site/_docs/upgrading/2-to-3.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md index 8bbadd99622..cdc69fd044b 100644 --- a/site/_docs/upgrading/2-to-3.md +++ b/site/_docs/upgrading/2-to-3.md @@ -64,8 +64,8 @@ then the layout can access that via `{% raw %}{{ layout.class }}{% endraw %}`. ### Syntax highlighter changed For the first time, the default syntax highlighter has changed for the -`highlight` tag and for backtick code blocks. Instead of [Pygments.rb][], -it's now [Rouge][]. If you were using the `highlight` tag with certain +`highlight` tag and for backtick code blocks. Instead of [Pygments.rb](https://github.com/tmm1/pygments.rb), +it's now [Rouge](http://rouge.jneen.net/). If you were using the `highlight` tag with certain options, such as `hl_lines`, they may not be available when using Rouge. To go back to using Pygments, set `highlighter: pygments` in your `_config.yml` file and run `gem install pygments.rb` or add From 05924bae5e22030b5b53eb505400f186026e5ce9 Mon Sep 17 00:00:00 2001 From: Dan K Date: Sun, 13 Dec 2015 16:52:35 +0300 Subject: [PATCH 0089/4996] Fix checklist in _assets.md --- site/_docs/assets.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site/_docs/assets.md b/site/_docs/assets.md index 202ade0e58b..61d74a3264b 100644 --- a/site/_docs/assets.md +++ b/site/_docs/assets.md @@ -83,7 +83,8 @@ here, too. ## Coffeescript -To enable Coffeescript in Jekyll 3.0 and up you must +To enable Coffeescript in Jekyll 3.0 and up you must + * Install the `jekyll-coffeescript` gem * Ensure that your `_config.yml` is up-to-date and includes the following From 02b8e326edf727c1101630208facaf50e60ef69b Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 13 Dec 2015 08:09:44 -0600 Subject: [PATCH 0090/4996] [CI:SKIP] Update history.markdown to reflect the merger of #4259. --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index b6d01032993..1f78cecb9c3 100644 --- a/History.markdown +++ b/History.markdown @@ -42,6 +42,7 @@ * Update FormKeep link to be something more specific to Jekyll (#4243) * Remove example Roger Chapman site, as the domain doesn't exist (#4249) * Added configuration options for `draft_posts` to configuration docs (#4251) + * Fix checklist in _assets.md (#4259) ## 3.0.1 / 2015-11-17 From 2c5a5e76ec40fd526d8cd56953cac50fe79f2014 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 13 Dec 2015 12:21:32 -0800 Subject: [PATCH 0091/4996] script/stackprof: allow CLI to set stackprof mode [ci skip] --- script/stackprof | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/script/stackprof b/script/stackprof index 3399616f272..1c8331429ae 100755 --- a/script/stackprof +++ b/script/stackprof @@ -2,15 +2,21 @@ set -e +case "$1" in + cpu|object) STACKPROF_MODE="$1"; shift ;; + *) STACKPROF_MODE="cpu" ;; +esac + export BENCHMARK=true command -v stackprof > /dev/null || script/bootstrap TEST_SCRIPT="Jekyll::Commands::Build.process({'source' => 'site'})" -PROF_OUTPUT_FILE=tmp/stackprof-$(date +%Y%m%d%H%M).dump +PROF_OUTPUT_FILE=tmp/stackprof-${STACKPROF_MODE}-$(date +%Y%m%d%H%M).dump +echo Stackprof Mode: $STACKPROF_MODE test -f "$PROF_OUTPUT_FILE" || { bundle exec ruby -r./lib/jekyll -rstackprof \ - -e "StackProf.run(mode: :cpu, interval: 100, out: '${PROF_OUTPUT_FILE}') { ${TEST_SCRIPT} }" + -e "StackProf.run(mode: :${STACKPROF_MODE}, interval: 100, out: '${PROF_OUTPUT_FILE}') { ${TEST_SCRIPT} }" } bundle exec stackprof $PROF_OUTPUT_FILE $@ From fb8bf7bab6ab76cdc669a6ac218cedc432cc7fed Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 13 Dec 2015 12:26:58 -0800 Subject: [PATCH 0092/4996] Update history to reflect merge of #3171 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 1f78cecb9c3..92780830bc0 100644 --- a/History.markdown +++ b/History.markdown @@ -13,6 +13,7 @@ * Add a default charset to content-type on webrick. (#4231) * Switch `PluginManager` to use `require_with_graceful_fail` for better UX (#4233) * Allow quoted date in front matter defaults (#4184) + * Add a Jekyll doctor warning for URLs that only differ by case (#3171) ### Bug Fixes From 115926fd54041e85a4a1c49e6ebe06d61703bf7f Mon Sep 17 00:00:00 2001 From: Nick Quaranto Date: Mon, 14 Dec 2015 21:58:36 -0500 Subject: [PATCH 0093/4996] Change TestDoctorCommand to JekyllUnitTest since Test constant doesn't necessarily exist --- test/test_doctor_command.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_doctor_command.rb b/test/test_doctor_command.rb index 43fa602c7b0..eb33ec85fb7 100644 --- a/test/test_doctor_command.rb +++ b/test/test_doctor_command.rb @@ -1,7 +1,7 @@ require 'helper' require 'jekyll/commands/doctor' -class TestDoctorCommand < Test::Unit::TestCase +class TestDoctorCommand < JekyllUnitTest context 'urls only differ by case' do setup do clear_dest From 595ad56a7e36e68ef719d86409a96da8961cf63e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 14 Dec 2015 20:26:08 -0800 Subject: [PATCH 0094/4996] Update history to reflect merge of #4263 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 92780830bc0..dc030d1f22c 100644 --- a/History.markdown +++ b/History.markdown @@ -29,6 +29,7 @@ * `jekyll-docs` should be easily release-able (#4152) * Allow use of Cucumber 2.1 or greater (#4181) * Modernize Kramdown for Markdown converter. (#4109) + * Change TestDoctorCommand to JekyllUnitTest... (#4263) ### Site Enhancements From 645a2cc664ca39c672c5139a294515cec10be0d8 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 14 Dec 2015 20:59:52 -0800 Subject: [PATCH 0095/4996] test/test_doctor_command.rb: fix test for Doctor.urls_only_differ_by_case --- test/test_doctor_command.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test_doctor_command.rb b/test/test_doctor_command.rb index eb33ec85fb7..dee50ac210f 100644 --- a/test/test_doctor_command.rb +++ b/test/test_doctor_command.rb @@ -13,7 +13,7 @@ class TestDoctorCommand < JekyllUnitTest "destination" => dest_dir })) @site.process - output = capture_stderr do + output = capture_stderr do ret = Jekyll::Commands::Doctor.urls_only_differ_by_case(@site) assert_equal false, ret end @@ -26,11 +26,11 @@ class TestDoctorCommand < JekyllUnitTest "destination" => dest_dir })) @site.process - output = capture_stderr do + output = capture_stderr do ret = Jekyll::Commands::Doctor.urls_only_differ_by_case(@site) assert_equal true, ret end - assert_equal "\e[33m Warning: The following URLs only differ by case. On a case-insensitive file system one of the URLs will be overwritten by the other: #{dest_dir}/about/index.html, #{dest_dir}/About/index.html\e[0m\n", output + assert_includes output, "Warning: The following URLs only differ by case. On a case-insensitive file system one of the URLs will be overwritten by the other: #{dest_dir}/about/index.html, #{dest_dir}/About/index.html" end end end From 05285798be8c43b985f64ebd62854a176b36a0d5 Mon Sep 17 00:00:00 2001 From: Decider UI Date: Wed, 16 Dec 2015 16:54:27 -0800 Subject: [PATCH 0096/4996] site: remove preceding space before coffeescript installation steps list items Closes #4267 --- site/_docs/assets.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/_docs/assets.md b/site/_docs/assets.md index 61d74a3264b..66023147b87 100644 --- a/site/_docs/assets.md +++ b/site/_docs/assets.md @@ -85,8 +85,8 @@ here, too. To enable Coffeescript in Jekyll 3.0 and up you must - * Install the `jekyll-coffeescript` gem - * Ensure that your `_config.yml` is up-to-date and includes the following +* Install the `jekyll-coffeescript` gem +* Ensure that your `_config.yml` is up-to-date and includes the following {% highlight yaml %} gems: From 4c050bba652d7e68451ca8bcc902547ce05017f6 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 18 Dec 2015 10:19:11 -0800 Subject: [PATCH 0097/4996] docs: posts example code is invalid UTF-8, use three dots instead of ellipsis Fixes #4271 --- site/_docs/posts.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/_docs/posts.md b/site/_docs/posts.md index ee02d06b0a0..f16bd2021cc 100644 --- a/site/_docs/posts.md +++ b/site/_docs/posts.md @@ -91,14 +91,14 @@ variable in a post. Including an image asset in a post: {% highlight text %} -… which is shown in the screenshot below: +... which is shown in the screenshot below: ![My helpful screenshot]({% raw %}{{ site.url }}{% endraw %}/assets/screenshot.jpg) {% endhighlight %} Linking to a PDF for readers to download: {% highlight text %} -… you can [get the PDF]({% raw %}{{ site.url }}{% endraw %}/assets/mydoc.pdf) directly. +... you can [get the PDF]({% raw %}{{ site.url }}{% endraw %}/assets/mydoc.pdf) directly. {% endhighlight %}
From 37517c9a39cece71a24225c666a0231d9089e97b Mon Sep 17 00:00:00 2001 From: midnightSuyama Date: Sun, 20 Dec 2015 03:02:24 +0900 Subject: [PATCH 0098/4996] Add jekyll-paginate-category to plugins.md --- site/_docs/plugins.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index 3fa1e4c3e5b..1ca2948a61f 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -736,6 +736,7 @@ LESS.js files during generation. - [Jekyll Portfolio Generator by Shannon Babincsak](https://github.com/codeinpink/jekyll-portfolio-generator): Generates project pages and computes related projects out of project data files. - [Jekyll-Umlauts by Arne Gockeln](https://github.com/webchef/jekyll-umlauts): This generator replaces all german umlauts (äöüß) case sensitive with html. - [Jekyll Flickr Plugin](https://github.com/lawmurray/indii-jekyll-flickr) by [Lawrence Murray](http://www.indii.org): Generates posts for photos uploaded to a Flickr photostream. +- [Jekyll::Paginate::Category](https://github.com/midnightSuyama/jekyll-paginate-category): Pagination Generator for Jekyll Category. #### Converters From cc633543675758a02bb770843fc057707d66d0b3 Mon Sep 17 00:00:00 2001 From: Samuel Wright Date: Mon, 21 Dec 2015 11:56:13 +0700 Subject: [PATCH 0099/4996] Adding markdown examples to Pages Fix for #3824 --- site/_docs/pages.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/site/_docs/pages.md b/site/_docs/pages.md index fa76a9fb1b1..3bb4af117a6 100644 --- a/site/_docs/pages.md +++ b/site/_docs/pages.md @@ -27,12 +27,14 @@ homepage of your Jekyll-generated site. ## Where additional pages live -Where you put HTML files for pages depends on how you want the pages to work. +Where you put HTML or [Markdown](http://daringfireball.net/projects/markdown/) +files for pages depends on how you want the pages to work. There are two main ways of creating pages: -- Place named HTML files for each page in your site's root folder. +- Place named HTML or [Markdown](http://daringfireball.net/projects/markdown/) +files for each page in your site's root folder. - Create a folder in the site's root for each page, and place an index.html -file in each page folder. +or index.md file in each page folder. Both methods work fine (and can be used in conjunction with each other), with the only real difference being the resulting URLs. @@ -53,6 +55,7 @@ and associated URLs might look like: |-- _site/ |-- about.html # => http://example.com/about.html |-- index.html # => http://example.com/ +|-- other.md # => http://example.com/other.html └── contact.html # => http://example.com/contact.html {% endhighlight %} @@ -77,6 +80,8 @@ might look like: | └── index.html # => http://example.com/about/ ├── contact/ | └── index.html # => http://example.com/contact/ +|── other/ +| └── index.md # => http://example.com/other.html └── index.html # => http://example.com/ {% endhighlight %} From fe5984ee153d3f1252b0ce5aec75d05a4d04abd0 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 15 Dec 2015 00:01:35 -0800 Subject: [PATCH 0100/4996] History: move reference for #4173 to latest HEAD, not 3.0.1 --- History.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/History.markdown b/History.markdown index dc030d1f22c..9dd16cb0912 100644 --- a/History.markdown +++ b/History.markdown @@ -23,6 +23,7 @@ * Convertible should make layout data accessible via `layout` instead of `page` (#4205) * Avoid using `Dir.glob` with absolute path to allow special characters in the path (#4150) * Handle empty config files (#4052) + * Rename `@options` so that it does not impact Liquid. (#4173) ### Development Fixes @@ -57,7 +58,6 @@ * Align hooks implementation with documentation (#4104) * Fix the deprecation warning in the doctor command (#4114) * Fix case in `:title` and add `:slug` which is downcased (#4100) - * Rename @options so that it does not impact Liquid. (#4173) ### Development Fixes From f92d6639e65a66a159c260e8b4068197b5e09e42 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 15 Dec 2015 00:01:56 -0800 Subject: [PATCH 0101/4996] Rakefile: alias :generate to :build --- Rakefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Rakefile b/Rakefile index 3596270ba20..02e105d5b7a 100644 --- a/Rakefile +++ b/Rakefile @@ -169,6 +169,7 @@ namespace :site do "destination" => File.expand_path("site/_site") }) end + task :build => :generate desc "Update normalize.css library to the latest version and minify" task :update_normalize_css do From 82c3ee365f5a8b948ce2ea853d75a954fa709939 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 21 Dec 2015 22:45:26 -0500 Subject: [PATCH 0102/4996] Initial work on using Liquid::Drops instead of Hashes. The properties of Liquid::Drops are only evaluated when they're asked for and therefore save computation time. This prevents a lot of GC time cleaning up objects that are not needed, because they're not created unless requested. Additionally, this saves time for actual computation of those values because they can be computed only if needed. It's funny how much it helps when you only do what is needed. Far less overhead. --- lib/jekyll.rb | 1 + lib/jekyll/collection.rb | 9 +--- lib/jekyll/convertible.rb | 15 +++---- lib/jekyll/document.rb | 42 +------------------ lib/jekyll/drops/collection_drop.rb | 22 ++++++++++ lib/jekyll/drops/document_drop.rb | 50 +++++++++++++++++++++++ lib/jekyll/drops/immutable_drop.rb | 29 +++++++++++++ lib/jekyll/drops/jekyll_drop.rb | 21 ++++++++++ lib/jekyll/drops/mutable_drop.rb | 28 +++++++++++++ lib/jekyll/drops/site_drop.rb | 38 +++++++++++++++++ lib/jekyll/drops/unified_payload_drop.rb | 24 +++++++++++ lib/jekyll/drops/url_drop.rb | 52 ++++++++++++++++++++++++ lib/jekyll/page.rb | 8 ++-- lib/jekyll/renderer.rb | 31 ++++++-------- lib/jekyll/site.rb | 20 +-------- lib/jekyll/url.rb | 14 +++++++ 16 files changed, 303 insertions(+), 101 deletions(-) create mode 100644 lib/jekyll/drops/collection_drop.rb create mode 100644 lib/jekyll/drops/document_drop.rb create mode 100644 lib/jekyll/drops/immutable_drop.rb create mode 100644 lib/jekyll/drops/jekyll_drop.rb create mode 100644 lib/jekyll/drops/mutable_drop.rb create mode 100644 lib/jekyll/drops/site_drop.rb create mode 100644 lib/jekyll/drops/unified_payload_drop.rb create mode 100644 lib/jekyll/drops/url_drop.rb diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 3e8e639def0..a90a5a0bfe6 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -172,6 +172,7 @@ def sanitized_path(base_directory, questionable_path) require_all 'jekyll/commands' require_all 'jekyll/converters' require_all 'jekyll/converters/markdown' +require_all 'jekyll/drops' require_all 'jekyll/generators' require_all 'jekyll/tags' diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb index c4a1f456e2d..f74ccf6f791 100644 --- a/lib/jekyll/collection.rb +++ b/lib/jekyll/collection.rb @@ -170,14 +170,7 @@ def sanitize_label(label) # # Returns a representation of this collection for use in Liquid. def to_liquid - metadata.merge({ - "label" => label, - "docs" => docs, - "files" => files, - "directory" => directory, - "output" => write?, - "relative_directory" => relative_directory - }) + Drops::CollectionDrop.new self end # Whether the collection's documents ought to be written as individual diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index 016ff245d5b..db34307ab61 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -210,13 +210,8 @@ def render_all_layouts(layouts, payload, info) while layout Jekyll.logger.debug "Rendering Layout:", path - payload = Utils.deep_merge_hashes( - payload, - { - "content" => output, - "layout" => layout.data - } - ) + payload.content = output + payload.layout = layout.data self.output = render_liquid(layout.content, payload, @@ -250,11 +245,11 @@ def do_layout(payload, layouts) Jekyll.logger.debug "Pre-Render Hooks:", self.relative_path Jekyll::Hooks.trigger hook_owner, :pre_render, self, payload - info = { :filters => [Jekyll::Filters], :registers => { :site => site, :page => payload['page'] } } + info = { :filters => [Jekyll::Filters], :registers => { :site => site, :page => payload.page } } # render and transform content (this becomes the final content of the object) - payload["highlighter_prefix"] = converters.first.highlighter_prefix - payload["highlighter_suffix"] = converters.first.highlighter_suffix + payload.highlighter_prefix = converters.first.highlighter_prefix + payload.highlighter_suffix = converters.first.highlighter_suffix if render_with_liquid? Jekyll.logger.debug "Rendering Liquid:", self.relative_path diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 528fed6845f..622f1180ddd 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -38,12 +38,10 @@ def initialize(path, relations) end def output=(output) - @to_liquid = nil @output = output end def content=(content) - @to_liquid = nil @content = content end @@ -181,27 +179,7 @@ def url_template # # Returns the Hash of key-value pairs for replacement in the URL. def url_placeholders - { - collection: collection.label, - path: cleaned_relative_path, - output_ext: output_ext, - name: Utils.slugify(basename_without_ext), - title: Utils.slugify(data['slug'], mode: "pretty", cased: true) || Utils - .slugify(basename_without_ext, mode: "pretty", cased: true), - slug: Utils.slugify(data['slug']) || Utils.slugify(basename_without_ext), - year: date.strftime("%Y"), - month: date.strftime("%m"), - day: date.strftime("%d"), - hour: date.strftime("%H"), - minute: date.strftime("%M"), - second: date.strftime("%S"), - i_day: date.strftime("%-d"), - i_month: date.strftime("%-m"), - categories: (data['categories'] || []).map { |c| c.to_s.downcase }.uniq.join('/'), - short_month: date.strftime("%b"), - short_year: date.strftime("%y"), - y_day: date.strftime("%j"), - } + @url_placeholders ||= Drops::UrlDrop.new(self) end # The permalink for this Document. @@ -278,8 +256,6 @@ def published? # # Returns nothing. def read(opts = {}) - @to_liquid = nil - Jekyll.logger.debug "Reading:", relative_path if yaml_file? @@ -353,21 +329,7 @@ def populate_tags # # Returns a Hash representing this Document's data. def to_liquid - @to_liquid ||= if data.is_a?(Hash) - Utils.deep_merge_hashes Utils.deep_merge_hashes({ - "output" => output, - "content" => content, - "relative_path" => relative_path, - "path" => relative_path, - "url" => url, - "collection" => collection.label, - "next" => next_doc, - "previous" => previous_doc, - "id" => id, - }, data), { 'excerpt' => data['excerpt'].to_s } - else - data - end + @to_liquid ||= Drops::DocumentDrop.new(self) end # The inspect string for this document. diff --git a/lib/jekyll/drops/collection_drop.rb b/lib/jekyll/drops/collection_drop.rb new file mode 100644 index 00000000000..30c9f8657b9 --- /dev/null +++ b/lib/jekyll/drops/collection_drop.rb @@ -0,0 +1,22 @@ +# encoding: UTF-8 +require "jekyll/drops/immutable_drop" + +module Jekyll + module Drops + class CollectionDrop < ImmutableDrop + extend Forwardable + + def_delegators :@obj, :label, :docs, :files, :directory, :relative_directory + + def output + @obj.write? + end + + private + def data + @obj.metadata + end + + end + end +end diff --git a/lib/jekyll/drops/document_drop.rb b/lib/jekyll/drops/document_drop.rb new file mode 100644 index 00000000000..4d7207d5f13 --- /dev/null +++ b/lib/jekyll/drops/document_drop.rb @@ -0,0 +1,50 @@ +# encoding: UTF-8 + +module Jekyll + module Drops + class DocumentDrop < ImmutableDrop + + def output + @obj.output + end + + def content + @obj.content + end + + def relative_path + @obj.relative_path + end + alias_method :path, :relative_path + + def url + @obj.url + end + + def collection + @obj.collection.label + end + + def next + @obj.next_doc + end + + def previous + @obj.previous_doc + end + + def id + @obj.id + end + + def excerpt + data['excerpt'].to_s + end + + def data + @obj.data + end + + end + end +end diff --git a/lib/jekyll/drops/immutable_drop.rb b/lib/jekyll/drops/immutable_drop.rb new file mode 100644 index 00000000000..51257cff7cb --- /dev/null +++ b/lib/jekyll/drops/immutable_drop.rb @@ -0,0 +1,29 @@ +# encoding: UTF-8 + +module Jekyll + module Drops + class ImmutableDrop < Liquid::Drop + + def initialize(obj) + @obj = obj + end + + def [](key) + if respond_to? key + public_send key + else + data[key] + end + end + + def []=(key, val) + if respond_to? key + raise ArgumentError.new("Key #{key} cannot be set in the drop.") + else + data[key] = val + end + end + + end + end +end diff --git a/lib/jekyll/drops/jekyll_drop.rb b/lib/jekyll/drops/jekyll_drop.rb new file mode 100644 index 00000000000..c4009da01bb --- /dev/null +++ b/lib/jekyll/drops/jekyll_drop.rb @@ -0,0 +1,21 @@ +# encoding: UTF-8 + +module Jekyll + module Drops + class JekyllDrop < Liquid::Drop + class << self + def global + @global ||= JekyllDrop.new + end + end + + def version + Jekyll::VERSION + end + + def environment + Jekyll.env + end + end + end +end diff --git a/lib/jekyll/drops/mutable_drop.rb b/lib/jekyll/drops/mutable_drop.rb new file mode 100644 index 00000000000..1551728e24f --- /dev/null +++ b/lib/jekyll/drops/mutable_drop.rb @@ -0,0 +1,28 @@ +# encoding: UTF-8 + +module Jekyll + module Drops + class MutableDrop < Liquid::Drop + + def initialize(obj) + @obj = obj + @mutations = {} + end + + def [](key) + if @mutations.key? key + @mutations[key] + elsif respond_to? key + public_send key + else + data[key] + end + end + + def []=(key, val) + @mutations[key] = val + end + + end + end +end diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb new file mode 100644 index 00000000000..77d6a4162e8 --- /dev/null +++ b/lib/jekyll/drops/site_drop.rb @@ -0,0 +1,38 @@ +# encoding: UTF-8 + +module Jekyll + module Drops + class SiteDrop < ImmutableDrop + extend Forwardable + + def_delegator :@obj, :site_data, :data + def_delegators :@obj, :time, :pages, :static_files, :documents + + def posts + @site_posts ||= @obj.posts.docs.sort { |a, b| b <=> a } + end + + def html_pages + @site_html_pages ||= @obj.pages.select { |page| page.html? || page.url.end_with?("/") } + end + + def categories + @site_categories ||= @obj.post_attr_hash('categories') + end + + def tags + @site_tags ||= @obj.post_attr_hash('tags') + end + + def collections + @site_collections ||= @obj.collections.values.map(&:to_liquid) + end + + private + def data + @obj.config + end + + end + end +end diff --git a/lib/jekyll/drops/unified_payload_drop.rb b/lib/jekyll/drops/unified_payload_drop.rb new file mode 100644 index 00000000000..65733b20bd2 --- /dev/null +++ b/lib/jekyll/drops/unified_payload_drop.rb @@ -0,0 +1,24 @@ +# encoding: UTF-8 + +module Jekyll + module Drops + class UnifiedPayloadDrop < Liquid::Drop + + attr_accessor :page, :layout, :content, :paginator + attr_accessor :highlighter_prefix, :highlighter_suffix + + def initialize(site) + @site = site + end + + def jekyll + JekyllDrop.global + end + + def site + @site_drop ||= SiteDrop.new(@site) + end + + end + end +end diff --git a/lib/jekyll/drops/url_drop.rb b/lib/jekyll/drops/url_drop.rb new file mode 100644 index 00000000000..047acacf6a2 --- /dev/null +++ b/lib/jekyll/drops/url_drop.rb @@ -0,0 +1,52 @@ +# encoding: UTF-8 + +module Jekyll + module Drops + class UrlDrop < ImmutableDrop + def collection + @obj.collection.label + end + + def path + @obj.cleaned_relative_path + end + + def output_ext + @obj.output_ext + end + + def name + Utils.slugify(@obj.basename_without_ext) + end + + def title + Utils.slugify(@obj.data['slug'], mode: "pretty", cased: true) || + Utils.slugify(@obj.basename_without_ext, mode: "pretty", cased: true) + end + + def slug + Utils.slugify(@obj.data['slug']) || Utils.slugify(@obj.basename_without_ext) + end + + def categories + category_set = Set.new + Array(@obj.data['categories']).each do |category| + category_set << category.to_s.downcase + end + category_set.to_a.join('/') + end + + def year; @obj.date.strftime("%Y"); end + def month; @obj.date.strftime("%m"); end + def day; @obj.date.strftime("%d"); end + def hour; @obj.date.strftime("%H"); end + def minute; @obj.date.strftime("%M"); end + def second; @obj.date.strftime("%S"); end + def i_day; @obj.date.strftime("%-d"); end + def i_month; @obj.date.strftime("%-m"); end + def short_month; @obj.date.strftime("%b"); end + def short_year; @obj.date.strftime("%y"); end + def y_day; @obj.date.strftime("%j"); end + end + end +end diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb index a62a99402bd..0644e1b650e 100644 --- a/lib/jekyll/page.rb +++ b/lib/jekyll/page.rb @@ -117,12 +117,10 @@ def process(name) # # Returns nothing. def render(layouts, site_payload) - payload = Utils.deep_merge_hashes({ - "page" => to_liquid, - 'paginator' => pager.to_liquid - }, site_payload) + site_payload.page = to_liquid + site_payload.paginator = pager.to_liquid - do_layout(payload, layouts) + do_layout(site_payload, layouts) end # The path to the source file diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb index 529ff84bd68..09763cca529 100644 --- a/lib/jekyll/renderer.rb +++ b/lib/jekyll/renderer.rb @@ -3,12 +3,12 @@ module Jekyll class Renderer - attr_reader :document, :site, :site_payload + attr_reader :document, :site, :payload def initialize(site, document, site_payload = nil) - @site = site - @document = document - @site_payload = site_payload + @site = site + @document = document + @payload = site_payload || site.site_payload end # Determine which converters to use based on this document's @@ -33,12 +33,10 @@ def output_ext def run Jekyll.logger.debug "Rendering:", document.relative_path - payload = Utils.deep_merge_hashes({ - "page" => document.to_liquid - }, site_payload || site.site_payload) + payload.page = document.to_liquid if document.collection.label == 'posts' && document.is_a?(Document) - payload['site']['related_posts'] = document.related_posts + payload.site['related_posts'] = document.related_posts end Jekyll.logger.debug "Pre-Render Hooks:", document.relative_path @@ -46,12 +44,12 @@ def run info = { filters: [Jekyll::Filters], - registers: { :site => site, :page => payload['page'] } + registers: { :site => site, :page => payload.page } } # render and transform content (this becomes the final content of the object) - payload["highlighter_prefix"] = converters.first.highlighter_prefix - payload["highlighter_suffix"] = converters.first.highlighter_suffix + payload.highlighter_prefix = converters.first.highlighter_prefix + payload.highlighter_suffix = converters.first.highlighter_suffix output = document.content @@ -135,14 +133,9 @@ def place_in_layouts(content, payload, info) used = Set.new([layout]) while layout - payload = Utils.deep_merge_hashes( - payload, - { - "content" => output, - "page" => document.to_liquid, - "layout" => layout.data - } - ) + payload.content = output + payload.page = document.to_liquid + payload.layout = layout.data output = render_liquid( layout.content, diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index 5e9402f4dbb..4dc3ac847e6 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -259,25 +259,7 @@ def site_data # "tags" - The Hash of tag values and Posts. # See Site#post_attr_hash for type info. def site_payload - { - "jekyll" => { - "version" => Jekyll::VERSION, - "environment" => Jekyll.env - }, - "site" => Utils.deep_merge_hashes(config, - Utils.deep_merge_hashes(Hash[collections.map{|label, coll| [label, coll.docs]}], { - "time" => time, - "posts" => posts.docs.sort { |a, b| b <=> a }, - "pages" => pages, - "static_files" => static_files, - "html_pages" => pages.select { |page| page.html? || page.url.end_with?("/") }, - "categories" => post_attr_hash('categories'), - "tags" => post_attr_hash('tags'), - "collections" => collections.values.map(&:to_liquid), - "documents" => documents, - "data" => site_data - })) - } + Drops::UnifiedPayloadDrop.new self end # Get the implementation class for the given Converter. diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb index 6e8042b01d9..b338c23a7b2 100644 --- a/lib/jekyll/url.rb +++ b/lib/jekyll/url.rb @@ -59,6 +59,14 @@ def generated_url # # Returns the unsanitized String URL def generate_url(template) + if @placeholders.is_a? Drops::UrlDrop + generate_url_from_drop(template) + else + generate_url_from_hash(template) + end + end + + def generate_url_from_hash(template) @placeholders.inject(template) do |result, token| break result if result.index(':').nil? if token.last.nil? @@ -70,6 +78,12 @@ def generate_url(template) end end + def generate_url_from_drop(template) + template.gsub(/(:[a-z_]+)/) do |match| + @placeholders.public_send(match.sub(':', '')) + end.gsub(/\/\//, '/') + end + # Returns a sanitized String URL, stripping "../../" and multiples of "/", # as well as the beginning "/" so we can enforce and ensure it. From b9721024be69150312dfe7bdbced1553009090d5 Mon Sep 17 00:00:00 2001 From: Samuel Wright Date: Tue, 22 Dec 2015 11:33:25 +0700 Subject: [PATCH 0103/4996] URL fix up --- site/_docs/pages.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/pages.md b/site/_docs/pages.md index 3bb4af117a6..2299c83c8dd 100644 --- a/site/_docs/pages.md +++ b/site/_docs/pages.md @@ -81,7 +81,7 @@ might look like: ├── contact/ | └── index.html # => http://example.com/contact/ |── other/ -| └── index.md # => http://example.com/other.html +| └── index.md # => http://example.com/other/ └── index.html # => http://example.com/ {% endhighlight %} From ebe3c106047f5843f354c8b88a640a146bd1df2d Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 21 Dec 2015 23:33:33 -0500 Subject: [PATCH 0104/4996] Drops: fix accessing of site collections via site.COL_NAME --- lib/jekyll/drops/collection_drop.rb | 2 +- lib/jekyll/drops/document_drop.rb | 5 +++-- lib/jekyll/drops/immutable_drop.rb | 4 ++-- lib/jekyll/drops/mutable_drop.rb | 2 +- lib/jekyll/drops/site_drop.rb | 10 +++++++++- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/lib/jekyll/drops/collection_drop.rb b/lib/jekyll/drops/collection_drop.rb index 30c9f8657b9..2c447cb45aa 100644 --- a/lib/jekyll/drops/collection_drop.rb +++ b/lib/jekyll/drops/collection_drop.rb @@ -13,7 +13,7 @@ def output end private - def data + def fallback_data @obj.metadata end diff --git a/lib/jekyll/drops/document_drop.rb b/lib/jekyll/drops/document_drop.rb index 4d7207d5f13..9319424b644 100644 --- a/lib/jekyll/drops/document_drop.rb +++ b/lib/jekyll/drops/document_drop.rb @@ -38,10 +38,11 @@ def id end def excerpt - data['excerpt'].to_s + fallback_data['excerpt'].to_s end - def data + private + def fallback_data @obj.data end diff --git a/lib/jekyll/drops/immutable_drop.rb b/lib/jekyll/drops/immutable_drop.rb index 51257cff7cb..d7948bebffa 100644 --- a/lib/jekyll/drops/immutable_drop.rb +++ b/lib/jekyll/drops/immutable_drop.rb @@ -12,7 +12,7 @@ def [](key) if respond_to? key public_send key else - data[key] + fallback_data[key] end end @@ -20,7 +20,7 @@ def []=(key, val) if respond_to? key raise ArgumentError.new("Key #{key} cannot be set in the drop.") else - data[key] = val + fallback_data[key] = val end end diff --git a/lib/jekyll/drops/mutable_drop.rb b/lib/jekyll/drops/mutable_drop.rb index 1551728e24f..9dd4048dfd9 100644 --- a/lib/jekyll/drops/mutable_drop.rb +++ b/lib/jekyll/drops/mutable_drop.rb @@ -15,7 +15,7 @@ def [](key) elsif respond_to? key public_send key else - data[key] + fallback_data[key] end end diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb index 77d6a4162e8..82c552307a7 100644 --- a/lib/jekyll/drops/site_drop.rb +++ b/lib/jekyll/drops/site_drop.rb @@ -8,6 +8,14 @@ class SiteDrop < ImmutableDrop def_delegator :@obj, :site_data, :data def_delegators :@obj, :time, :pages, :static_files, :documents + def [](key) + if !respond_to?(key) && @obj.collections.key?(key) + @obj.collections[key].docs + else + super(key) + end + end + def posts @site_posts ||= @obj.posts.docs.sort { |a, b| b <=> a } end @@ -29,7 +37,7 @@ def collections end private - def data + def fallback_data @obj.config end From 03488b1cde735eaac9a75a64cc155324f4167e64 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 21 Dec 2015 23:36:31 -0500 Subject: [PATCH 0105/4996] DocumentDrop: use def_delegators instead of duplicating methods --- lib/jekyll/drops/document_drop.rb | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/lib/jekyll/drops/document_drop.rb b/lib/jekyll/drops/document_drop.rb index 9319424b644..c4170d86dad 100644 --- a/lib/jekyll/drops/document_drop.rb +++ b/lib/jekyll/drops/document_drop.rb @@ -3,18 +3,10 @@ module Jekyll module Drops class DocumentDrop < ImmutableDrop + extend Forwardable - def output - @obj.output - end - - def content - @obj.content - end + def_delegators :@obj, :id, :output, :content, :to_s, :relative_path, :url - def relative_path - @obj.relative_path - end alias_method :path, :relative_path def url @@ -33,10 +25,6 @@ def previous @obj.previous_doc end - def id - @obj.id - end - def excerpt fallback_data['excerpt'].to_s end From 4935e85f7cd1f09cefbe9988fd0e52eeb49d6f9a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 21 Dec 2015 23:41:36 -0500 Subject: [PATCH 0106/4996] CollectionDrop: to_s should work like Array#to_s --- lib/jekyll/drops/collection_drop.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/drops/collection_drop.rb b/lib/jekyll/drops/collection_drop.rb index 2c447cb45aa..8dc8c6b8233 100644 --- a/lib/jekyll/drops/collection_drop.rb +++ b/lib/jekyll/drops/collection_drop.rb @@ -6,7 +6,12 @@ module Drops class CollectionDrop < ImmutableDrop extend Forwardable - def_delegators :@obj, :label, :docs, :files, :directory, :relative_directory + def_delegators :@obj, :label, :docs, :files, :directory, + :relative_directory + + def to_s + @obj.docs.map(&:to_s).join(' ') + end def output @obj.write? From bbbe6479e58c0f436a314f8b23cca196ddf74b67 Mon Sep 17 00:00:00 2001 From: Alfred Xing Date: Tue, 22 Dec 2015 09:14:51 -0800 Subject: [PATCH 0107/4996] Update history to reflect merge of #4275 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 9dd16cb0912..22f4f05d819 100644 --- a/History.markdown +++ b/History.markdown @@ -46,6 +46,7 @@ * Remove example Roger Chapman site, as the domain doesn't exist (#4249) * Added configuration options for `draft_posts` to configuration docs (#4251) * Fix checklist in _assets.md (#4259) + * Add Markdown examples to Pages docs (#4275) ## 3.0.1 / 2015-11-17 From 532bb9e9cb4851405ed595ed315724779b93b286 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 22 Dec 2015 21:33:42 -0500 Subject: [PATCH 0108/4996] Further consolidation in the Drops. --- lib/jekyll/drops/collection_drop.rb | 2 +- lib/jekyll/drops/document_drop.rb | 8 +------- lib/jekyll/drops/site_drop.rb | 13 +++---------- lib/jekyll/drops/unified_payload_drop.rb | 7 ++++++- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/lib/jekyll/drops/collection_drop.rb b/lib/jekyll/drops/collection_drop.rb index 8dc8c6b8233..b8a1bdd7539 100644 --- a/lib/jekyll/drops/collection_drop.rb +++ b/lib/jekyll/drops/collection_drop.rb @@ -10,7 +10,7 @@ class CollectionDrop < ImmutableDrop :relative_directory def to_s - @obj.docs.map(&:to_s).join(' ') + docs.to_s end def output diff --git a/lib/jekyll/drops/document_drop.rb b/lib/jekyll/drops/document_drop.rb index c4170d86dad..0da6986b644 100644 --- a/lib/jekyll/drops/document_drop.rb +++ b/lib/jekyll/drops/document_drop.rb @@ -9,10 +9,6 @@ class DocumentDrop < ImmutableDrop alias_method :path, :relative_path - def url - @obj.url - end - def collection @obj.collection.label end @@ -30,9 +26,7 @@ def excerpt end private - def fallback_data - @obj.data - end + def_delegator :@obj, :data, :fallback_data end end diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb index 82c552307a7..4c632a0d8a9 100644 --- a/lib/jekyll/drops/site_drop.rb +++ b/lib/jekyll/drops/site_drop.rb @@ -6,10 +6,11 @@ class SiteDrop < ImmutableDrop extend Forwardable def_delegator :@obj, :site_data, :data - def_delegators :@obj, :time, :pages, :static_files, :documents + def_delegators :@obj, :time, :pages, :static_files, :documents, + :tags, :categories def [](key) - if !respond_to?(key) && @obj.collections.key?(key) + if @obj.collections.key?(key) && key != "posts" @obj.collections[key].docs else super(key) @@ -24,14 +25,6 @@ def html_pages @site_html_pages ||= @obj.pages.select { |page| page.html? || page.url.end_with?("/") } end - def categories - @site_categories ||= @obj.post_attr_hash('categories') - end - - def tags - @site_tags ||= @obj.post_attr_hash('tags') - end - def collections @site_collections ||= @obj.collections.values.map(&:to_liquid) end diff --git a/lib/jekyll/drops/unified_payload_drop.rb b/lib/jekyll/drops/unified_payload_drop.rb index 65733b20bd2..6db48f6665b 100644 --- a/lib/jekyll/drops/unified_payload_drop.rb +++ b/lib/jekyll/drops/unified_payload_drop.rb @@ -2,7 +2,7 @@ module Jekyll module Drops - class UnifiedPayloadDrop < Liquid::Drop + class UnifiedPayloadDrop < ImmutableDrop attr_accessor :page, :layout, :content, :paginator attr_accessor :highlighter_prefix, :highlighter_suffix @@ -19,6 +19,11 @@ def site @site_drop ||= SiteDrop.new(@site) end + private + def fallback_data + @fallback_data ||= {} + end + end end end From 233589e15076c41ac4b95ad6e0595f2f6a4a7ac2 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 22 Dec 2015 21:34:24 -0500 Subject: [PATCH 0109/4996] document: throw ArgumentError if compared to non-doc --- lib/jekyll/document.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 622f1180ddd..0a416eff1b6 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -353,7 +353,7 @@ def to_s # Returns -1, 0, +1 or nil depending on whether this doc's path is less than, # equal or greater than the other doc's path. See String#<=> for more details. def <=>(other) - return nil if !other.respond_to?(:data) + return ArgumentError.new("document cannot be compared against #{other}") unless other.respond_to?(:data) cmp = data['date'] <=> other.data['date'] cmp = path <=> other.path if cmp == 0 cmp From 659f0869e078249c2dfa1a6b088f8f934b9956f5 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 22 Dec 2015 21:35:28 -0500 Subject: [PATCH 0110/4996] features/collections: drops don't output like a hash -- update accordingly --- features/collections.feature | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/features/collections.feature b/features/collections.feature index d97918bd27d..1fcc7ccea57 100644 --- a/features/collections.feature +++ b/features/collections.feature @@ -13,7 +13,7 @@ Feature: Collections And the "_site/methods/configuration.html" file should not exist Scenario: Rendered collection - Given I have an "index.html" page that contains "Collections: {{ site.collections }}" + Given I have an "index.html" page that contains "Collections: output => {{ site.collections[0].output }} label => {{ site.collections[0].label }}" And I have an "collection_metadata.html" page that contains "Methods metadata: {{ site.collections[0].foo }} {{ site.collections[0] }}" And I have fixture collections And I have a "_config.yml" file with content: @@ -25,8 +25,8 @@ Feature: Collections """ When I run jekyll build Then the _site directory should exist - And I should see "Collections: {\"output\"=>true" in "_site/index.html" - And I should see "\"label\"=>\"methods\"," in "_site/index.html" + And I should see "Collections: output => true" in "_site/index.html" + And I should see "label => methods" in "_site/index.html" And I should see "Methods metadata: bar" in "_site/collection_metadata.html" And I should see "

Whatever: foo.bar

" in "_site/methods/configuration.html" @@ -45,7 +45,7 @@ Feature: Collections And I should see "

Whatever: foo.bar

" in "_site/methods/configuration/index.html" Scenario: Rendered document in a layout - Given I have an "index.html" page that contains "Collections: {{ site.collections }}" + Given I have an "index.html" page that contains "Collections: output => {{ site.collections[0].output }} label => {{ site.collections[0].label }} foo => {{ site.collections[0].foo }}" And I have a default layout that contains "
Tom Preston-Werner
{{content}}" And I have fixture collections And I have a "_config.yml" file with content: @@ -57,8 +57,9 @@ Feature: Collections """ When I run jekyll build Then the _site directory should exist - And I should see "Collections: {\"output\"=>true" in "_site/index.html" - And I should see "\"label\"=>\"methods\"," in "_site/index.html" + And I should see "Collections: output => true" in "_site/index.html" + And I should see "label => methods" in "_site/index.html" + And I should see "foo => bar" in "_site/index.html" And I should see "

Run your generators! default

" in "_site/methods/site/generate.html" And I should see "
Tom Preston-Werner
" in "_site/methods/site/generate.html" From 30ceda52ef6f00a1edefcd8c9ce1bf1e81c1028c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 22 Dec 2015 21:36:15 -0500 Subject: [PATCH 0111/4996] features/hooks: global payload _is_ global -- not new for each page --- features/hooks.feature | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/features/hooks.feature b/features/hooks.feature index 489f256b897..b561c00c77e 100644 --- a/features/hooks.feature +++ b/features/hooks.feature @@ -89,11 +89,11 @@ Feature: Hooks And I have a "_plugins/ext.rb" file with content: """ Jekyll::Hooks.register :pages, :pre_render do |page, payload| - payload['myparam'] = 'special' if page.name == 'page1.html' + payload.page['myparam'] = 'special' if page.name == 'page1.html' end """ - And I have a "page1.html" page that contains "{{ myparam }}" - And I have a "page2.html" page that contains "{{ myparam }}" + And I have a "page1.html" page that contains "{{ page.myparam }}" + And I have a "page2.html" page that contains "{{ page.myparam }}" When I run jekyll build Then I should see "special" in "_site/page1.html" And I should not see "special" in "_site/page2.html" From 9bb59e9999ef7ecd6ce64022fc6394906c9f43e5 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 22 Dec 2015 21:36:29 -0500 Subject: [PATCH 0112/4996] features/post_data: do NOT allow page.path to be overridden --- features/post_data.feature | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/features/post_data.feature b/features/post_data.feature index 6ebfb27d2e6..0b43c8c9209 100644 --- a/features/post_data.feature +++ b/features/post_data.feature @@ -233,14 +233,14 @@ Feature: Post data | dir | dir/ | | dir/nested | dir/nested/ | - Scenario: Override page.path variable + Scenario: Cannot override page.path variable Given I have a _posts directory And I have the following post: | title | date | path | content | - | override | 2013-04-12 | override-path.html | Custom path: {{ page.path }} | + | override | 2013-04-12 | override-path.html | Non-custom path: {{ page.path }} | When I run jekyll build Then the _site directory should exist - And I should see "Custom path: override-path.html" in "_site/2013/04/12/override.html" + And I should see "Non-custom path: _posts/2013-04-12-override.markdown in "_site/2013/04/12/override.html" Scenario: Disable a post from being published Given I have a _posts directory From cd2688ab6665367b3e65ce7d1e878bb00599f4b9 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 22 Dec 2015 22:37:48 -0500 Subject: [PATCH 0113/4996] test_excerpt & _page: use Drop instead of Hash to mock payload --- test/test_excerpt.rb | 3 +-- test/test_page.rb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb index 322ba3c6eb3..61ffded302b 100644 --- a/test/test_excerpt.rb +++ b/test/test_excerpt.rb @@ -10,8 +10,7 @@ def setup_post(file) def do_render(document) @site.layouts = { "default" => Layout.new(@site, source_dir('_layouts'), "simple.html")} - payload = {"site" => {"posts" => []}} - document.output = Jekyll::Renderer.new(@site, document, payload).run + document.output = Jekyll::Renderer.new(@site, document, @site.site_payload).run end context "With extraction disabled" do diff --git a/test/test_page.rb b/test/test_page.rb index 625812aa6d3..16b9e06031c 100644 --- a/test/test_page.rb +++ b/test/test_page.rb @@ -9,7 +9,7 @@ def setup_page(*args) def do_render(page) layouts = { "default" => Layout.new(@site, source_dir('_layouts'), "simple.html")} - page.render(layouts, {"site" => {"posts" => []}}) + page.render(layouts, @site.site_payload) end context "A Page" do From 6a72d4a98690d5b13eca50c42bcbb9c8c3daca35 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 22 Dec 2015 22:44:56 -0500 Subject: [PATCH 0114/4996] features/post_data: Fix undefined feature step. --- features/post_data.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/post_data.feature b/features/post_data.feature index 0b43c8c9209..2792a829f93 100644 --- a/features/post_data.feature +++ b/features/post_data.feature @@ -240,7 +240,7 @@ Feature: Post data | override | 2013-04-12 | override-path.html | Non-custom path: {{ page.path }} | When I run jekyll build Then the _site directory should exist - And I should see "Non-custom path: _posts/2013-04-12-override.markdown in "_site/2013/04/12/override.html" + And I should see "Non-custom path: _posts/2013-04-12-override.markdown" in "_site/2013/04/12/override.html" Scenario: Disable a post from being published Given I have a _posts directory From bff1726a5a24551164d958eca93983b96a975203 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 24 Dec 2015 15:06:32 -0500 Subject: [PATCH 0115/4996] immutable_drop: use custom error for bad set --- lib/jekyll.rb | 1 + lib/jekyll/drops/immutable_drop.rb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index a90a5a0bfe6..de6b6c69fc7 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -32,6 +32,7 @@ def require_all(path) SafeYAML::OPTIONS[:suppress_warnings] = true module Jekyll + StandardError = Class.new(::StandardError) # internal requires autoload :Cleaner, 'jekyll/cleaner' diff --git a/lib/jekyll/drops/immutable_drop.rb b/lib/jekyll/drops/immutable_drop.rb index d7948bebffa..630cbfe1551 100644 --- a/lib/jekyll/drops/immutable_drop.rb +++ b/lib/jekyll/drops/immutable_drop.rb @@ -3,6 +3,7 @@ module Jekyll module Drops class ImmutableDrop < Liquid::Drop + IllegalDropModification = Class.new(Jekyll::StandardError) def initialize(obj) @obj = obj @@ -18,7 +19,7 @@ def [](key) def []=(key, val) if respond_to? key - raise ArgumentError.new("Key #{key} cannot be set in the drop.") + raise IllegalDropModification.new("Key #{key} cannot be set in the drop.") else fallback_data[key] = val end From d070a77716f65fc9cbdef1aed91943959e9616e0 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 24 Dec 2015 15:07:20 -0500 Subject: [PATCH 0116/4996] url: fix issue with bad URL escaping when using Drop --- lib/jekyll/url.rb | 8 ++++++-- lib/jekyll/utils.rb | 13 +++++++------ test/test_url.rb | 18 ++++++++++++++++++ 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb index b338c23a7b2..a001f44daf1 100644 --- a/lib/jekyll/url.rb +++ b/lib/jekyll/url.rb @@ -79,8 +79,12 @@ def generate_url_from_hash(template) end def generate_url_from_drop(template) - template.gsub(/(:[a-z_]+)/) do |match| - @placeholders.public_send(match.sub(':', '')) + template.gsub(/:([a-z_]+)/) do |match| + if replacement = @placeholders.public_send(match.sub(':', '')) + self.class.escape_path replacement + else + ''.freeze + end end.gsub(/\/\//, '/') end diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index 94da8bd5eea..a2c6139d5da 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -174,13 +174,14 @@ def slugify(string, mode: nil, cased: false) SLUGIFY_PRETTY_REGEXP end - slug = string. - # Strip according to the mode - gsub(re, '-'). - # Remove leading/trailing hyphen - gsub(/^\-|\-$/i, '') + # Strip according to the mode + slug = string.gsub(re, '-') - cased ? slug : slug.downcase + # Remove leading/trailing hyphen + slug.gsub!(/^\-|\-$/i, '') + + slug.downcase! unless cased + slug end # Add an appropriate suffix to template so that it matches the specified diff --git a/test/test_url.rb b/test/test_url.rb index e4529be7c81..578e8962bc7 100644 --- a/test/test_url.rb +++ b/test/test_url.rb @@ -54,5 +54,23 @@ class TestURL < JekyllUnitTest ).to_s end + should "handle UrlDrop as a placeholder in addition to a hash" do + site = fixture_site({ + "collections" => { + "methods" => { + "output" => true + } + }, + }) + site.read + doc = site.collections["methods"].docs.find do |doc| + doc.relative_path == "_methods/escape-+ #%20[].md" + end + assert_equal '/methods/escape-+-20/escape-20.html', URL.new( + :template => '/methods/:title/:name:output_ext', + :placeholders => doc.url_placeholders + ).to_s + end + end end From fcce0d5482e6cd541e3e6857cad00a6969a9dd4e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 24 Dec 2015 15:07:31 -0500 Subject: [PATCH 0117/4996] document: fix issue with bad comparison --- lib/jekyll/document.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 0a416eff1b6..a1bf6badad8 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -12,11 +12,13 @@ class Document # Create a new Document. # - # site - the Jekyll::Site instance to which this Document belongs # path - the path to the file + # relations - a hash with keys :site and :collection, the values of which + # are the Jekyll::Site and Jekyll::Collection to which this + # Document belong. # # Returns nothing. - def initialize(path, relations) + def initialize(path, relations = {}) @site = relations[:site] @path = path @extname = File.extname(path) @@ -354,9 +356,11 @@ def to_s # equal or greater than the other doc's path. See String#<=> for more details. def <=>(other) return ArgumentError.new("document cannot be compared against #{other}") unless other.respond_to?(:data) - cmp = data['date'] <=> other.data['date'] - cmp = path <=> other.path if cmp == 0 - cmp + if data['date'] && other.data['date'] && (cmp = data['date'] <=> other.data['date']) != 0 + cmp + else + path <=> other.path + end end # Determine whether this document should be written. From b2b634e767c7a8775b41e8f8a28353577d84e340 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 24 Dec 2015 15:07:48 -0500 Subject: [PATCH 0118/4996] drops: use def_delegator more liberally where acceptable --- lib/jekyll/drops/collection_drop.rb | 9 ++------- lib/jekyll/drops/document_drop.rb | 13 +++---------- lib/jekyll/drops/site_drop.rb | 4 +--- lib/jekyll/drops/url_drop.rb | 13 +++++-------- 4 files changed, 11 insertions(+), 28 deletions(-) diff --git a/lib/jekyll/drops/collection_drop.rb b/lib/jekyll/drops/collection_drop.rb index b8a1bdd7539..ccb3045a2cb 100644 --- a/lib/jekyll/drops/collection_drop.rb +++ b/lib/jekyll/drops/collection_drop.rb @@ -6,6 +6,7 @@ module Drops class CollectionDrop < ImmutableDrop extend Forwardable + def_delegator :@obj, :write?, :output def_delegators :@obj, :label, :docs, :files, :directory, :relative_directory @@ -13,14 +14,8 @@ def to_s docs.to_s end - def output - @obj.write? - end - private - def fallback_data - @obj.metadata - end + def_delegator :@obj, :metadata, :fallback_data end end diff --git a/lib/jekyll/drops/document_drop.rb b/lib/jekyll/drops/document_drop.rb index 0da6986b644..81c9bcd25f9 100644 --- a/lib/jekyll/drops/document_drop.rb +++ b/lib/jekyll/drops/document_drop.rb @@ -5,22 +5,15 @@ module Drops class DocumentDrop < ImmutableDrop extend Forwardable + def_delegator :@obj, :next_doc, :next + def_delegator :@obj, :previous_doc, :previous + def_delegator :@obj, :relative_path, :path def_delegators :@obj, :id, :output, :content, :to_s, :relative_path, :url - alias_method :path, :relative_path - def collection @obj.collection.label end - def next - @obj.next_doc - end - - def previous - @obj.previous_doc - end - def excerpt fallback_data['excerpt'].to_s end diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb index 4c632a0d8a9..61ac8098a88 100644 --- a/lib/jekyll/drops/site_drop.rb +++ b/lib/jekyll/drops/site_drop.rb @@ -30,9 +30,7 @@ def collections end private - def fallback_data - @obj.config - end + def_delegator :@obj, :config, :fallback_data end end diff --git a/lib/jekyll/drops/url_drop.rb b/lib/jekyll/drops/url_drop.rb index 047acacf6a2..163591dd18a 100644 --- a/lib/jekyll/drops/url_drop.rb +++ b/lib/jekyll/drops/url_drop.rb @@ -3,16 +3,13 @@ module Jekyll module Drops class UrlDrop < ImmutableDrop - def collection - @obj.collection.label - end + extend Forwardable - def path - @obj.cleaned_relative_path - end + def_delegator :@obj, :cleaned_relative_path, :path + def_delegator :@obj, :output_ext, :output_ext - def output_ext - @obj.output_ext + def collection + @obj.collection.label end def name From 3effae59d8a8ab0b78e3dba19f4d13aa9eea03d6 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 24 Dec 2015 15:09:26 -0500 Subject: [PATCH 0119/4996] Update history to reflect merge of #4273 [ci skip] --- History.markdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/History.markdown b/History.markdown index 22f4f05d819..6ee375f47f8 100644 --- a/History.markdown +++ b/History.markdown @@ -45,8 +45,9 @@ * Update FormKeep link to be something more specific to Jekyll (#4243) * Remove example Roger Chapman site, as the domain doesn't exist (#4249) * Added configuration options for `draft_posts` to configuration docs (#4251) - * Fix checklist in _assets.md (#4259) + * Fix checklist in `_assets.md` (#4259) * Add Markdown examples to Pages docs (#4275) + * Add jekyll-paginate-category to list of third-party plugins (#4273) ## 3.0.1 / 2015-11-17 From b34e8e0bc04c4c8dbe5ffa786ca891d58b59de19 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 25 Dec 2015 21:32:46 -0500 Subject: [PATCH 0120/4996] Update history to reflect merge of #4277 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 6ee375f47f8..c415701d041 100644 --- a/History.markdown +++ b/History.markdown @@ -2,6 +2,7 @@ ### Minor Enhancements + * Use `Liquid::Drop`s instead of `Hash`es in `#to_liquid` (#4277) * Add 'sample' Liquid filter Equivalent to Array#sample functionality (#4223) * Cache parsed include file to save liquid parsing time. (#4120) * Slightly speed up url sanitization and handle multiples of ///. (#4168) From debdb15171d006610888d20894eb94b5f28c6b3d Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 25 Dec 2015 22:45:51 -0500 Subject: [PATCH 0121/4996] Move 'forwardable' require to earlier in the program start up. --- lib/jekyll.rb | 1 + lib/jekyll/excerpt.rb | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index de6b6c69fc7..686aad3b14c 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -16,6 +16,7 @@ def require_all(path) require 'rubygems' # stdlib +require 'forwardable' require 'fileutils' require 'time' require 'English' diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb index 36fcd11b4c5..f5884d682d8 100644 --- a/lib/jekyll/excerpt.rb +++ b/lib/jekyll/excerpt.rb @@ -1,5 +1,3 @@ -require 'forwardable' - module Jekyll class Excerpt extend Forwardable From c63b51b6612a0bb867a69dff2aa38d66a08eb2a4 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 25 Dec 2015 22:54:12 -0500 Subject: [PATCH 0122/4996] document: revert comparison of Documents to old style & add nil check @envygeeks, this should address your comment: https://github.com/jekyll/jekyll/commit/fcce0d5482e6cd541e3e6857cad00a6969a9dd4e#commitcomment-15162261 --- lib/jekyll/document.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index a1bf6badad8..8c1b77cf73d 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -356,11 +356,9 @@ def to_s # equal or greater than the other doc's path. See String#<=> for more details. def <=>(other) return ArgumentError.new("document cannot be compared against #{other}") unless other.respond_to?(:data) - if data['date'] && other.data['date'] && (cmp = data['date'] <=> other.data['date']) != 0 - cmp - else - path <=> other.path - end + cmp = data['date'] <=> other.data['date'] + cmp = path <=> other.path if cmp.nil? || cmp == 0 + cmp end # Determine whether this document should be written. From b05b174b875193021ebd31a49bfdc71da5949118 Mon Sep 17 00:00:00 2001 From: leethomas Date: Fri, 25 Dec 2015 22:50:23 -0800 Subject: [PATCH 0123/4996] moved namespaced rake tasks to separate .rake files under lib/tasks --- Rakefile | 241 +---------------------------------------- lib/tasks/docs.rake | 60 ++++++++++ lib/tasks/release.rake | 25 +++++ lib/tasks/site.rake | 151 ++++++++++++++++++++++++++ 4 files changed, 238 insertions(+), 239 deletions(-) create mode 100644 lib/tasks/docs.rake create mode 100644 lib/tasks/release.rake create mode 100644 lib/tasks/site.rake diff --git a/Rakefile b/Rakefile index 02e105d5b7a..00c93db5646 100644 --- a/Rakefile +++ b/Rakefile @@ -7,6 +7,8 @@ require 'yaml' $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[lib])) require 'jekyll/version' +Dir.glob('lib/tasks/**.rake').each { |f| import f } + ############################################################################# # # Helper functions @@ -128,242 +130,3 @@ desc "Open an irb session preloaded with this library" task :console do sh "irb -rubygems -r ./lib/#{name}.rb" end - -############################################################################# -# -# Site tasks - http://jekyllrb.com -# -############################################################################# - -namespace :site do - desc "Generate and view the site locally" - task :preview => [:history, :version_file] do - require "launchy" - require "jekyll" - - # Yep, it's a hack! Wait a few seconds for the Jekyll site to generate and - # then open it in a browser. Someday we can do better than this, I hope. - Thread.new do - sleep 4 - puts "Opening in browser..." - Launchy.open("http://localhost:4000") - end - - # Generate the site in server mode. - puts "Running Jekyll..." - options = { - "source" => File.expand_path("site"), - "destination" => File.expand_path("site/_site"), - "watch" => true, - "serving" => true - } - Jekyll::Commands::Build.process(options) - Jekyll::Commands::Serve.process(options) - end - - desc "Generate the site" - task :generate => [:history, :version_file] do - require "jekyll" - Jekyll::Commands::Build.process({ - "source" => File.expand_path("site"), - "destination" => File.expand_path("site/_site") - }) - end - task :build => :generate - - desc "Update normalize.css library to the latest version and minify" - task :update_normalize_css do - Dir.chdir("site/_sass") do - sh 'curl "http://necolas.github.io/normalize.css/latest/normalize.css" -o "normalize.scss"' - sh 'sass "normalize.scss":"_normalize.scss" --style compressed' - rm ['normalize.scss', Dir.glob('*.map')].flatten - end - end - - desc "Commit the local site to the gh-pages branch and publish to GitHub Pages" - task :publish => [:history, :version_file] do - # Ensure the gh-pages dir exists so we can generate into it. - puts "Checking for gh-pages dir..." - unless File.exist?("./gh-pages") - puts "Creating gh-pages dir..." - sh "git clone git@github.com:jekyll/jekyll gh-pages" - end - - # Ensure latest gh-pages branch history. - Dir.chdir('gh-pages') do - sh "git checkout gh-pages" - sh "git pull origin gh-pages" - end - - # Proceed to purge all files in case we removed a file in this release. - puts "Cleaning gh-pages directory..." - purge_exclude = %w[ - gh-pages/. - gh-pages/.. - gh-pages/.git - gh-pages/.gitignore - ] - FileList["gh-pages/{*,.*}"].exclude(*purge_exclude).each do |path| - sh "rm -rf #{path}" - end - - # Copy site to gh-pages dir. - puts "Building site into gh-pages branch..." - ENV['JEKYLL_ENV'] = 'production' - require "jekyll" - Jekyll::Commands::Build.process({ - "source" => File.expand_path("site"), - "destination" => File.expand_path("gh-pages"), - "sass" => { "style" => "compressed" } - }) - - File.open('gh-pages/.nojekyll', 'wb') { |f| f.puts(":dog: food.") } - - # Commit and push. - puts "Committing and pushing to GitHub Pages..." - sha = `git rev-parse HEAD`.strip - Dir.chdir('gh-pages') do - sh "git add ." - sh "git commit --allow-empty -m 'Updating to #{sha}.'" - sh "git push origin gh-pages" - end - puts 'Done.' - end - - desc "Create a nicely formatted history page for the jekyll site based on the repo history." - task :history do - if File.exist?("History.markdown") - history_file = File.read("History.markdown") - front_matter = { - "layout" => "docs", - "title" => "History", - "permalink" => "/docs/history/" - } - Dir.chdir('site/_docs/') do - File.open("history.md", "w") do |file| - file.write("#{front_matter.to_yaml}---\n\n") - file.write(converted_history(history_file)) - end - end - else - abort "You seem to have misplaced your History.markdown file. I can haz?" - end - end - - desc "Write the site latest_version.txt file" - task :version_file do - File.open('site/latest_version.txt', 'wb') { |f| f.puts(version) } unless version =~ /(beta|rc|alpha)/i - end - - namespace :releases do - desc "Create new release post" - task :new, :version do |t, args| - raise "Specify a version: rake site:releases:new['1.2.3']" unless args.version - today = Time.new.strftime('%Y-%m-%d') - release = args.version.to_s - filename = "site/_posts/#{today}-jekyll-#{release.split('.').join('-')}-released.markdown" - - File.open(filename, "wb") do |post| - post.puts("---") - post.puts("layout: news_item") - post.puts("title: 'Jekyll #{release} Released'") - post.puts("date: #{Time.new.strftime('%Y-%m-%d %H:%M:%S %z')}") - post.puts("author: ") - post.puts("version: #{release}") - post.puts("categories: [release]") - post.puts("---") - post.puts - post.puts - end - - puts "Created #{filename}" - end - end -end - -############################################################################# -# -# Packaging tasks -# -############################################################################# - -desc "Release #{name} v#{version}" -task :release => :build do - unless `git branch` =~ /^\* master$/ - puts "You must be on the master branch to release!" - exit! - end - sh "git commit --allow-empty -m 'Release :gem: #{version}'" - sh "git tag v#{version}" - sh "git push origin master" - sh "git push origin v#{version}" - sh "gem push pkg/#{name}-#{version}.gem" -end - -desc "Build #{name} v#{version} into pkg/" -task :build do - mkdir_p "pkg" - sh "gem build #{gemspec_file}" - sh "mv #{gem_file} pkg" -end - -############################################################################# -# -# Packaging tasks for jekyll-docs -# -############################################################################# - -namespace :docs do - desc "Release #{docs_name} v#{version}" - task :release => :build do - unless `git branch` =~ /^\* master$/ - puts "You must be on the master branch to release!" - exit! - end - sh "gem push pkg/#{docs_name}-#{version}.gem" - end - - desc "Build #{docs_name} v#{version} into pkg/" - task :build do - mkdir_p "pkg" - sh "gem build #{docs_name}.gemspec" - sh "mv #{docs_name}-#{version}.gem pkg" - end -end - -task :analysis do - require "jekyll/utils/ansi" - require "open3" - - cmd = [ - "docker", "run", "--rm", "--env=CODE_PATH=#{Dir.pwd}", \ - "--volume='#{Dir.pwd}:/code'", "--volume=/var/run/docker.sock:/var/run/docker.sock", \ - "--volume=/tmp/cc:/tmp/cc", "-i", "codeclimate/codeclimate", "analyze" - ] - - ansi = Jekyll::Utils::Ansi - file = File.open(".analysis", "w+") - Open3.popen3(cmd.shelljoin) do |_, out, err, _| - while data = out.gets - file.write data - if data =~ /\A==/ - $stdout.print ansi.yellow(data) - - elsif data !~ %r!\A[0-9\-]+! - $stdout.puts data - - else - h, d = data.split(":", 2) - $stdout.print ansi.cyan(h) - $stdout.print ":", d - end - end - - while data = err.gets - file.write data - $stderr.print ansi.red(data) - end - end - - file.close -end diff --git a/lib/tasks/docs.rake b/lib/tasks/docs.rake new file mode 100644 index 00000000000..c04520e571d --- /dev/null +++ b/lib/tasks/docs.rake @@ -0,0 +1,60 @@ +############################################################################# +# +# Packaging tasks for jekyll-docs +# +############################################################################# + +namespace :docs do + desc "Release #{docs_name} v#{version}" + task :release => :build do + unless `git branch` =~ /^\* master$/ + puts "You must be on the master branch to release!" + exit! + end + sh "gem push pkg/#{docs_name}-#{version}.gem" + end + + desc "Build #{docs_name} v#{version} into pkg/" + task :build do + mkdir_p "pkg" + sh "gem build #{docs_name}.gemspec" + sh "mv #{docs_name}-#{version}.gem pkg" + end +end + +task :analysis do + require "jekyll/utils/ansi" + require "open3" + + cmd = [ + "docker", "run", "--rm", "--env=CODE_PATH=#{Dir.pwd}", \ + "--volume='#{Dir.pwd}:/code'", "--volume=/var/run/docker.sock:/var/run/docker.sock", \ + "--volume=/tmp/cc:/tmp/cc", "-i", "codeclimate/codeclimate", "analyze" + ] + + ansi = Jekyll::Utils::Ansi + file = File.open(".analysis", "w+") + Open3.popen3(cmd.shelljoin) do |_, out, err, _| + while data = out.gets + file.write data + if data =~ /\A==/ + $stdout.print ansi.yellow(data) + + elsif data !~ %r!\A[0-9\-]+! + $stdout.puts data + + else + h, d = data.split(":", 2) + $stdout.print ansi.cyan(h) + $stdout.print ":", d + end + end + + while data = err.gets + file.write data + $stderr.print ansi.red(data) + end + end + + file.close +end diff --git a/lib/tasks/release.rake b/lib/tasks/release.rake new file mode 100644 index 00000000000..a78690d8726 --- /dev/null +++ b/lib/tasks/release.rake @@ -0,0 +1,25 @@ +############################################################################# +# +# Packaging tasks +# +############################################################################# + +desc "Release #{name} v#{version}" +task :release => :build do + unless `git branch` =~ /^\* master$/ + puts "You must be on the master branch to release!" + exit! + end + sh "git commit --allow-empty -m 'Release :gem: #{version}'" + sh "git tag v#{version}" + sh "git push origin master" + sh "git push origin v#{version}" + sh "gem push pkg/#{name}-#{version}.gem" +end + +desc "Build #{name} v#{version} into pkg/" +task :build do + mkdir_p "pkg" + sh "gem build #{gemspec_file}" + sh "mv #{gem_file} pkg" +end diff --git a/lib/tasks/site.rake b/lib/tasks/site.rake new file mode 100644 index 00000000000..eb5b263b8d1 --- /dev/null +++ b/lib/tasks/site.rake @@ -0,0 +1,151 @@ +############################################################################# +# +# Site tasks - http://jekyllrb.com +# +############################################################################# + +namespace :site do + desc "Generate and view the site locally" + task :preview => [:history, :version_file] do + require "launchy" + require "jekyll" + + # Yep, it's a hack! Wait a few seconds for the Jekyll site to generate and + # then open it in a browser. Someday we can do better than this, I hope. + Thread.new do + sleep 4 + puts "Opening in browser..." + Launchy.open("http://localhost:4000") + end + + # Generate the site in server mode. + puts "Running Jekyll..." + options = { + "source" => File.expand_path("site"), + "destination" => File.expand_path("site/_site"), + "watch" => true, + "serving" => true + } + Jekyll::Commands::Build.process(options) + Jekyll::Commands::Serve.process(options) + end + + desc "Generate the site" + task :generate => [:history, :version_file] do + require "jekyll" + Jekyll::Commands::Build.process({ + "source" => File.expand_path("site"), + "destination" => File.expand_path("site/_site") + }) + end + task :build => :generate + + desc "Update normalize.css library to the latest version and minify" + task :update_normalize_css do + Dir.chdir("site/_sass") do + sh 'curl "http://necolas.github.io/normalize.css/latest/normalize.css" -o "normalize.scss"' + sh 'sass "normalize.scss":"_normalize.scss" --style compressed' + rm ['normalize.scss', Dir.glob('*.map')].flatten + end + end + + desc "Commit the local site to the gh-pages branch and publish to GitHub Pages" + task :publish => [:history, :version_file] do + # Ensure the gh-pages dir exists so we can generate into it. + puts "Checking for gh-pages dir..." + unless File.exist?("./gh-pages") + puts "Creating gh-pages dir..." + sh "git clone git@github.com:jekyll/jekyll gh-pages" + end + + # Ensure latest gh-pages branch history. + Dir.chdir('gh-pages') do + sh "git checkout gh-pages" + sh "git pull origin gh-pages" + end + + # Proceed to purge all files in case we removed a file in this release. + puts "Cleaning gh-pages directory..." + purge_exclude = %w[ + gh-pages/. + gh-pages/.. + gh-pages/.git + gh-pages/.gitignore + ] + FileList["gh-pages/{*,.*}"].exclude(*purge_exclude).each do |path| + sh "rm -rf #{path}" + end + + # Copy site to gh-pages dir. + puts "Building site into gh-pages branch..." + ENV['JEKYLL_ENV'] = 'production' + require "jekyll" + Jekyll::Commands::Build.process({ + "source" => File.expand_path("site"), + "destination" => File.expand_path("gh-pages"), + "sass" => { "style" => "compressed" } + }) + + File.open('gh-pages/.nojekyll', 'wb') { |f| f.puts(":dog: food.") } + + # Commit and push. + puts "Committing and pushing to GitHub Pages..." + sha = `git rev-parse HEAD`.strip + Dir.chdir('gh-pages') do + sh "git add ." + sh "git commit --allow-empty -m 'Updating to #{sha}.'" + sh "git push origin gh-pages" + end + puts 'Done.' + end + + desc "Create a nicely formatted history page for the jekyll site based on the repo history." + task :history do + if File.exist?("History.markdown") + history_file = File.read("History.markdown") + front_matter = { + "layout" => "docs", + "title" => "History", + "permalink" => "/docs/history/" + } + Dir.chdir('site/_docs/') do + File.open("history.md", "w") do |file| + file.write("#{front_matter.to_yaml}---\n\n") + file.write(converted_history(history_file)) + end + end + else + abort "You seem to have misplaced your History.markdown file. I can haz?" + end + end + + desc "Write the site latest_version.txt file" + task :version_file do + File.open('site/latest_version.txt', 'wb') { |f| f.puts(version) } unless version =~ /(beta|rc|alpha)/i + end + + namespace :releases do + desc "Create new release post" + task :new, :version do |t, args| + raise "Specify a version: rake site:releases:new['1.2.3']" unless args.version + today = Time.new.strftime('%Y-%m-%d') + release = args.version.to_s + filename = "site/_posts/#{today}-jekyll-#{release.split('.').join('-')}-released.markdown" + + File.open(filename, "wb") do |post| + post.puts("---") + post.puts("layout: news_item") + post.puts("title: 'Jekyll #{release} Released'") + post.puts("date: #{Time.new.strftime('%Y-%m-%d %H:%M:%S %z')}") + post.puts("author: ") + post.puts("version: #{release}") + post.puts("categories: [release]") + post.puts("---") + post.puts + post.puts + end + + puts "Created #{filename}" + end + end +end From 1afbe9967d561fdcd5784382cac87f67d432a351 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 26 Dec 2015 12:23:21 -0500 Subject: [PATCH 0124/4996] document: return nil if bad arg in #<=> Addresses @envygeek's comment: https://github.com/jekyll/jekyll/commit/233589e15076c41ac4b95ad6e0595f2f6a4a7ac2#commitcomment-15164178 --- lib/jekyll/document.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 8c1b77cf73d..14a0a92e224 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -355,7 +355,7 @@ def to_s # Returns -1, 0, +1 or nil depending on whether this doc's path is less than, # equal or greater than the other doc's path. See String#<=> for more details. def <=>(other) - return ArgumentError.new("document cannot be compared against #{other}") unless other.respond_to?(:data) + return nil unless other.respond_to?(:data) cmp = data['date'] <=> other.data['date'] cmp = path <=> other.path if cmp.nil? || cmp == 0 cmp From b70ea3ca5cf0769753d358c8f358a242f3b15cbe Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 26 Dec 2015 12:27:07 -0500 Subject: [PATCH 0125/4996] immutable_drop/errors: consolidate errors & fix syntax for raising Addresses @envygeeks's comments: https://github.com/jekyll/jekyll/commit/bff1726a5a24551164d958eca93983b96a975203 --- lib/jekyll.rb | 2 -- lib/jekyll/drops/immutable_drop.rb | 4 +--- lib/jekyll/errors.rb | 7 +++---- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 686aad3b14c..e3fca10b1f6 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -33,8 +33,6 @@ def require_all(path) SafeYAML::OPTIONS[:suppress_warnings] = true module Jekyll - StandardError = Class.new(::StandardError) - # internal requires autoload :Cleaner, 'jekyll/cleaner' autoload :Collection, 'jekyll/collection' diff --git a/lib/jekyll/drops/immutable_drop.rb b/lib/jekyll/drops/immutable_drop.rb index 630cbfe1551..5440aa00ba2 100644 --- a/lib/jekyll/drops/immutable_drop.rb +++ b/lib/jekyll/drops/immutable_drop.rb @@ -3,8 +3,6 @@ module Jekyll module Drops class ImmutableDrop < Liquid::Drop - IllegalDropModification = Class.new(Jekyll::StandardError) - def initialize(obj) @obj = obj end @@ -19,7 +17,7 @@ def [](key) def []=(key, val) if respond_to? key - raise IllegalDropModification.new("Key #{key} cannot be set in the drop.") + raise DropMutationException, "Key #{key} cannot be set in the drop." else fallback_data[key] = val end diff --git a/lib/jekyll/errors.rb b/lib/jekyll/errors.rb index dc5238a05ee..2b0dbc0c39a 100644 --- a/lib/jekyll/errors.rb +++ b/lib/jekyll/errors.rb @@ -1,9 +1,8 @@ module Jekyll module Errors - class FatalException < RuntimeError - end + FatalException = Class.new(::RuntimeError) - class MissingDependencyException < FatalException - end + MissingDependencyException = Class.new(FatalException) + DropMutationException = Class.new(FatalException) end end From 1f298e0d9d3482492a43d0b37262342631c95894 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 26 Dec 2015 12:32:21 -0500 Subject: [PATCH 0126/4996] url: move setter outside of if statement Addresses @envygeeks's comment: https://github.com/jekyll/jekyll/commit/d070a77716f65fc9cbdef1aed91943959e9616e0#commitcomment-15164169 --- lib/jekyll/url.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb index a001f44daf1..3f00cfd337b 100644 --- a/lib/jekyll/url.rb +++ b/lib/jekyll/url.rb @@ -80,10 +80,11 @@ def generate_url_from_hash(template) def generate_url_from_drop(template) template.gsub(/:([a-z_]+)/) do |match| - if replacement = @placeholders.public_send(match.sub(':', '')) - self.class.escape_path replacement - else + replacement = @placeholders.public_send(match.sub(':', '')) + if replacement.nil? ''.freeze + else + self.class.escape_path(replacement) end end.gsub(/\/\//, '/') end From 75be388487002c390356356332fac9f14fad5792 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 26 Dec 2015 12:48:18 -0500 Subject: [PATCH 0127/4996] Update history to reflect merge of #4282 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index c415701d041..7b373689cb2 100644 --- a/History.markdown +++ b/History.markdown @@ -32,6 +32,7 @@ * Allow use of Cucumber 2.1 or greater (#4181) * Modernize Kramdown for Markdown converter. (#4109) * Change TestDoctorCommand to JekyllUnitTest... (#4263) + * Create namespaced rake tasks in separate `.rake` files under `lib/tasks` (#4282) ### Site Enhancements From 57613b31dd1247785418c9e627861f860b4c39bc Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 26 Dec 2015 12:53:30 -0500 Subject: [PATCH 0128/4996] Slightly restructure rake helper files Ref #4282 --- Rakefile | 2 +- lib/tasks/docs.rake => rake/analysis.rake | 22 ++-------------------- rake/docs.rake | 23 +++++++++++++++++++++++ {lib/tasks => rake}/release.rake | 0 {lib/tasks => rake}/site.rake | 0 5 files changed, 26 insertions(+), 21 deletions(-) rename lib/tasks/docs.rake => rake/analysis.rake (67%) create mode 100644 rake/docs.rake rename {lib/tasks => rake}/release.rake (100%) rename {lib/tasks => rake}/site.rake (100%) diff --git a/Rakefile b/Rakefile index 00c93db5646..e3f99c41295 100644 --- a/Rakefile +++ b/Rakefile @@ -7,7 +7,7 @@ require 'yaml' $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[lib])) require 'jekyll/version' -Dir.glob('lib/tasks/**.rake').each { |f| import f } +Dir.glob('rake/**.rake').each { |f| import f } ############################################################################# # diff --git a/lib/tasks/docs.rake b/rake/analysis.rake similarity index 67% rename from lib/tasks/docs.rake rename to rake/analysis.rake index c04520e571d..4fcc6af5563 100644 --- a/lib/tasks/docs.rake +++ b/rake/analysis.rake @@ -1,27 +1,9 @@ ############################################################################# # -# Packaging tasks for jekyll-docs +# Analyze the quality of the Jekyll source code (requires Docker) # ############################################################################# -namespace :docs do - desc "Release #{docs_name} v#{version}" - task :release => :build do - unless `git branch` =~ /^\* master$/ - puts "You must be on the master branch to release!" - exit! - end - sh "gem push pkg/#{docs_name}-#{version}.gem" - end - - desc "Build #{docs_name} v#{version} into pkg/" - task :build do - mkdir_p "pkg" - sh "gem build #{docs_name}.gemspec" - sh "mv #{docs_name}-#{version}.gem pkg" - end -end - task :analysis do require "jekyll/utils/ansi" require "open3" @@ -57,4 +39,4 @@ task :analysis do end file.close -end +end \ No newline at end of file diff --git a/rake/docs.rake b/rake/docs.rake new file mode 100644 index 00000000000..aec162b59e9 --- /dev/null +++ b/rake/docs.rake @@ -0,0 +1,23 @@ +############################################################################# +# +# Packaging tasks for jekyll-docs +# +############################################################################# + +namespace :docs do + desc "Release #{docs_name} v#{version}" + task :release => :build do + unless `git branch` =~ /^\* master$/ + puts "You must be on the master branch to release!" + exit! + end + sh "gem push pkg/#{docs_name}-#{version}.gem" + end + + desc "Build #{docs_name} v#{version} into pkg/" + task :build do + mkdir_p "pkg" + sh "gem build #{docs_name}.gemspec" + sh "mv #{docs_name}-#{version}.gem pkg" + end +end diff --git a/lib/tasks/release.rake b/rake/release.rake similarity index 100% rename from lib/tasks/release.rake rename to rake/release.rake diff --git a/lib/tasks/site.rake b/rake/site.rake similarity index 100% rename from lib/tasks/site.rake rename to rake/site.rake From 95b05cd0c52f46d002f5877827fa2ea5997a5e24 Mon Sep 17 00:00:00 2001 From: Joseph Wynn Date: Sat, 26 Dec 2015 18:38:32 +0000 Subject: [PATCH 0129/4996] Add jekyll-responsive_image to plugins list [jekyll-responsive_image](https://github.com/wildlyinaccurate/jekyll-responsive-image) has been gaining popularity recently. I thought it would be worth adding it to the documentation. --- site/_docs/plugins.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index 1ca2948a61f..57f7d51583d 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -817,6 +817,7 @@ LESS.js files during generation. - [Jekyll-swfobject](https://github.com/sectore/jekyll-swfobject): Liquid plugin for embedding Adobe Flash files (.swf) using [SWFObject](http://code.google.com/p/swfobject/). - [Jekyll Picture Tag](https://github.com/robwierzbowski/jekyll-picture-tag): Easy responsive images for Jekyll. Based on the proposed [``](https://html.spec.whatwg.org/multipage/embedded-content.html#the-picture-element) element, polyfilled with Scott Jehl’s [Picturefill](https://github.com/scottjehl/picturefill). - [Jekyll Image Tag](https://github.com/robwierzbowski/jekyll-image-tag): Better images for Jekyll. Save image presets, generate resized images, and add classes, alt text, and other attributes. +- [Jekyll Responsive Image](https://github.com/wildlyinaccurate/jekyll-responsive-image): Responsive images for Jekyll. Automatically resizes images, supports all responsive methods (``, `srcset`, Imager.js, etc), super-flexible configuration. - [Ditaa Tag](https://github.com/matze/jekyll-ditaa) by [matze](https://github.com/matze): Renders ASCII diagram art into PNG images and inserts a figure tag. - [Jekyll Suggested Tweet](https://github.com/davidensinger/jekyll-suggested-tweet) by [David Ensinger](https://github.com/davidensinger/): A Liquid tag for Jekyll that allows for the embedding of suggested tweets via Twitter’s Web Intents API. - [Jekyll Date Chart](https://github.com/GSI/jekyll_date_chart) by [GSI](https://github.com/GSI): Block that renders date line charts based on textile-formatted tables. From 3fa8af2a18b1f79dbb9c6af24894bdf5b7122d76 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 26 Dec 2015 13:26:22 -0500 Subject: [PATCH 0130/4996] drops: create one base Drop class which can be set as mutable or not --- lib/jekyll/drops/collection_drop.rb | 6 +- lib/jekyll/drops/document_drop.rb | 4 +- lib/jekyll/drops/drop.rb | 74 ++++++++++++++++++++++++ lib/jekyll/drops/immutable_drop.rb | 28 --------- lib/jekyll/drops/mutable_drop.rb | 28 --------- lib/jekyll/drops/site_drop.rb | 4 +- lib/jekyll/drops/unified_payload_drop.rb | 3 +- lib/jekyll/drops/url_drop.rb | 4 +- 8 files changed, 89 insertions(+), 62 deletions(-) create mode 100644 lib/jekyll/drops/drop.rb delete mode 100644 lib/jekyll/drops/immutable_drop.rb delete mode 100644 lib/jekyll/drops/mutable_drop.rb diff --git a/lib/jekyll/drops/collection_drop.rb b/lib/jekyll/drops/collection_drop.rb index ccb3045a2cb..009635a427e 100644 --- a/lib/jekyll/drops/collection_drop.rb +++ b/lib/jekyll/drops/collection_drop.rb @@ -1,11 +1,13 @@ # encoding: UTF-8 -require "jekyll/drops/immutable_drop" +require "jekyll/drops/drop" module Jekyll module Drops - class CollectionDrop < ImmutableDrop + class CollectionDrop < Drop extend Forwardable + mutable false + def_delegator :@obj, :write?, :output def_delegators :@obj, :label, :docs, :files, :directory, :relative_directory diff --git a/lib/jekyll/drops/document_drop.rb b/lib/jekyll/drops/document_drop.rb index 81c9bcd25f9..f6e03fec546 100644 --- a/lib/jekyll/drops/document_drop.rb +++ b/lib/jekyll/drops/document_drop.rb @@ -2,9 +2,11 @@ module Jekyll module Drops - class DocumentDrop < ImmutableDrop + class DocumentDrop < Drop extend Forwardable + mutable false + def_delegator :@obj, :next_doc, :next def_delegator :@obj, :previous_doc, :previous def_delegator :@obj, :relative_path, :path diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb new file mode 100644 index 00000000000..09bdb2d2479 --- /dev/null +++ b/lib/jekyll/drops/drop.rb @@ -0,0 +1,74 @@ +# encoding: UTF-8 + +module Jekyll + module Drops + class Drop < Liquid::Drop + # Get or set whether the drop class is mutable. + # Mutability determines whether or not pre-defined fields may be + # overwritten. + # + # is_mutable - Boolean set mutability of the class (default: nil) + # + # Returns the mutability of the class + def self.mutable(is_mutable = nil) + if is_mutable + @is_mutable = is_mutable + end + @is_mutable || false + end + + # Create a new Drop + # + # obj - the Jekyll Site, Collection, or Document required by the + # drop. + # + # Returns nothing + def initialize(obj) + @obj = obj + @mutations = {} # only if mutable: true + end + + # Access a method in the Drop or a field in the underlying hash data. + # If mutable, checks the mutations first. Then checks the methods, + # and finally check the underlying hash (e.g. document front matter) + # if all the previous places didn't match. + # + # key - the string key whose value to fetch + # + # Returns the value for the given key, or nil if none exists + def [](key) + if self.class.mutable && @mutations.key?(key) + @mutations[key] + elsif respond_to? key + public_send key + else + fallback_data[key] + end + end + + # 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 + # Drop method and raises a DropMutationException if so. If not + # mutable and the key is not a method on the Drop, then it sets the + # key to the value in the underlying hash (e.g. document front + # matter) + # + # key - the String key whose value to set + # val - the Object to set the key's value to + # + # Returns the value the key was set to unless the Drop is not mutable + # and the key matches a method in which case it raises a + # DropMutationException. + def []=(key, val) + if self.class.mutable + @mutations[key] = val + elsif respond_to? key + raise Errors::DropMutationException, "Key #{key} cannot be set in the drop." + else + fallback_data[key] = val + end + end + + end + end +end diff --git a/lib/jekyll/drops/immutable_drop.rb b/lib/jekyll/drops/immutable_drop.rb deleted file mode 100644 index 5440aa00ba2..00000000000 --- a/lib/jekyll/drops/immutable_drop.rb +++ /dev/null @@ -1,28 +0,0 @@ -# encoding: UTF-8 - -module Jekyll - module Drops - class ImmutableDrop < Liquid::Drop - def initialize(obj) - @obj = obj - end - - def [](key) - if respond_to? key - public_send key - else - fallback_data[key] - end - end - - def []=(key, val) - if respond_to? key - raise DropMutationException, "Key #{key} cannot be set in the drop." - else - fallback_data[key] = val - end - end - - end - end -end diff --git a/lib/jekyll/drops/mutable_drop.rb b/lib/jekyll/drops/mutable_drop.rb deleted file mode 100644 index 9dd4048dfd9..00000000000 --- a/lib/jekyll/drops/mutable_drop.rb +++ /dev/null @@ -1,28 +0,0 @@ -# encoding: UTF-8 - -module Jekyll - module Drops - class MutableDrop < Liquid::Drop - - def initialize(obj) - @obj = obj - @mutations = {} - end - - def [](key) - if @mutations.key? key - @mutations[key] - elsif respond_to? key - public_send key - else - fallback_data[key] - end - end - - def []=(key, val) - @mutations[key] = val - end - - end - end -end diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb index 61ac8098a88..ec4f0910189 100644 --- a/lib/jekyll/drops/site_drop.rb +++ b/lib/jekyll/drops/site_drop.rb @@ -2,9 +2,11 @@ module Jekyll module Drops - class SiteDrop < ImmutableDrop + class SiteDrop < Drop extend Forwardable + mutable false + def_delegator :@obj, :site_data, :data def_delegators :@obj, :time, :pages, :static_files, :documents, :tags, :categories diff --git a/lib/jekyll/drops/unified_payload_drop.rb b/lib/jekyll/drops/unified_payload_drop.rb index 6db48f6665b..3c593ba6a47 100644 --- a/lib/jekyll/drops/unified_payload_drop.rb +++ b/lib/jekyll/drops/unified_payload_drop.rb @@ -2,7 +2,8 @@ module Jekyll module Drops - class UnifiedPayloadDrop < ImmutableDrop + class UnifiedPayloadDrop < Drop + mutable false attr_accessor :page, :layout, :content, :paginator attr_accessor :highlighter_prefix, :highlighter_suffix diff --git a/lib/jekyll/drops/url_drop.rb b/lib/jekyll/drops/url_drop.rb index 163591dd18a..a2bf6262c55 100644 --- a/lib/jekyll/drops/url_drop.rb +++ b/lib/jekyll/drops/url_drop.rb @@ -2,9 +2,11 @@ module Jekyll module Drops - class UrlDrop < ImmutableDrop + class UrlDrop < Drop extend Forwardable + mutable false + def_delegator :@obj, :cleaned_relative_path, :path def_delegator :@obj, :output_ext, :output_ext From 839fd45b9dbf9d301865768b41ff13bf51132341 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 26 Dec 2015 13:47:31 -0500 Subject: [PATCH 0131/4996] Update history to reflect merge of #4286 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 7b373689cb2..0e8182803cb 100644 --- a/History.markdown +++ b/History.markdown @@ -50,6 +50,7 @@ * Fix checklist in `_assets.md` (#4259) * Add Markdown examples to Pages docs (#4275) * Add jekyll-paginate-category to list of third-party plugins (#4273) + * Add `jekyll-responsive_image` to list of third-party plugins (#4286) ## 3.0.1 / 2015-11-17 From ceca1bcf1416ec01c5d0089702e6bf2cfa38b90c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 26 Dec 2015 13:49:32 -0500 Subject: [PATCH 0132/4996] site: set the timezone in the config for consistent generation times --- site/_config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/_config.yml b/site/_config.yml index d1cd5367b53..e09c4857045 100644 --- a/site/_config.yml +++ b/site/_config.yml @@ -9,6 +9,8 @@ google_analytics_id: UA-50755011-1 repository: https://github.com/jekyll/jekyll help_url: https://github.com/jekyll/jekyll-help +timezone: America/Los_Angeles + collections: docs: output: true From cc5937815e3a3954160e50a1e81fa514409cfa40 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 26 Dec 2015 13:53:08 -0500 Subject: [PATCH 0133/4996] Update history to reflect merge of #4285 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 0e8182803cb..f603cbd3aaf 100644 --- a/History.markdown +++ b/History.markdown @@ -15,6 +15,7 @@ * Switch `PluginManager` to use `require_with_graceful_fail` for better UX (#4233) * Allow quoted date in front matter defaults (#4184) * Add a Jekyll doctor warning for URLs that only differ by case (#3171) + * drops: create one base Drop class which can be set as mutable or not (#4285) ### Bug Fixes From d138558c1de5dded742050ed2d587b4f8d256189 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 25 Dec 2015 21:57:21 -0500 Subject: [PATCH 0134/4996] drops: provide #to_h to allow for hash introspection Follow-up to #4277 --- lib/jekyll/drops/drop.rb | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb index 09bdb2d2479..b14581a40af 100644 --- a/lib/jekyll/drops/drop.rb +++ b/lib/jekyll/drops/drop.rb @@ -3,6 +3,8 @@ module Jekyll module Drops class Drop < Liquid::Drop + NON_CONTENT_METHODS = [:[], :[]=, :inspect, :to_h, :fallback_data].freeze + # Get or set whether the drop class is mutable. # Mutability determines whether or not pre-defined fields may be # overwritten. @@ -69,6 +71,37 @@ def []=(key, val) end end + # Generates a list of keys with user content as their values. + # This gathers up the Drop methods and keys of the mutations and + # underlying data hashes and performs a set union to ensure a list + # of unique keys for the Drop. + # + # Returns an Array of unique keys for content for the Drop. + def keys + ((self.class.instance_methods(false) - NON_CONTENT_METHODS).map(&:to_s) | + @mutations.keys | + fallback_data.keys).flatten + end + + # Generate a Hash representation of the Drop by resolving each key's + # value. It includes Drop methods, mutations, and the underlying object's + # data. See the documentation for Drop#keys for more. + # + # Returns a Hash with all the keys and values resolved. + def to_h + keys.each_with_object({}) do |(key, val), result| + result[key] = self[key] + end + end + + # Inspect the drop's keys and values through a JSON representation + # of its keys and values. + # + # Returns a pretty generation of the hash representation of the Drop. + def inspect + JSON.pretty_generate to_h + end + end end end From a47ce7b6552fe051cf8b82513103e67f4da808e5 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sat, 26 Dec 2015 12:48:20 -0800 Subject: [PATCH 0135/4996] Wrap Arguments in () when used in a setter --- test/test_generated_site.rb | 6 +++--- test/test_layout_reader.rb | 2 +- test/test_static_file.rb | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb index 88e0fe9eea3..32999aba9b1 100644 --- a/test/test_generated_site.rb +++ b/test/test_generated_site.rb @@ -6,7 +6,7 @@ class TestGeneratedSite < JekyllUnitTest clear_dest config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir}) - @site = fixture_site config + @site = fixture_site(config) @site.process @index = File.read(dest_dir('index.html')) end @@ -59,7 +59,7 @@ class TestGeneratedSite < JekyllUnitTest setup do clear_dest config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 5}) - @site = fixture_site config + @site = fixture_site(config) @site.process @index = File.read(dest_dir('index.html')) end @@ -73,7 +73,7 @@ class TestGeneratedSite < JekyllUnitTest clear_dest config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => -1}) - @site = fixture_site config + @site = fixture_site(config) end end diff --git a/test/test_layout_reader.rb b/test/test_layout_reader.rb index 88f35220765..11acdb3140e 100644 --- a/test/test_layout_reader.rb +++ b/test/test_layout_reader.rb @@ -4,7 +4,7 @@ class TestLayoutReader < JekyllUnitTest context "reading layouts" do setup do config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir}) - @site = fixture_site config + @site = fixture_site(config) end should "read layouts" do diff --git a/test/test_static_file.rb b/test/test_static_file.rb index 3af7a1f0e45..85512ab449b 100644 --- a/test/test_static_file.rb +++ b/test/test_static_file.rb @@ -19,12 +19,12 @@ def setup_static_file(base, dir, name) end def setup_static_file_with_collection(base, dir, name, label, metadata) - site = fixture_site 'collections' => {label => metadata} + site = fixture_site('collections' => {label => metadata}) StaticFile.new(site, base, dir, name, site.collections[label]) end def setup_static_file_with_defaults(base, dir, name, defaults) - site = fixture_site 'defaults' => defaults + site = fixture_site('defaults' => defaults) StaticFile.new(site, base, dir, name) end @@ -130,4 +130,3 @@ def setup_static_file_with_defaults(base, dir, name, defaults) end end end - From 59a5fc64f997c5bd08e8a2c0c4dcb2b1f7da4e3c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 26 Dec 2015 22:09:34 -0500 Subject: [PATCH 0136/4996] Update history to reflect merge of #4281 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index f603cbd3aaf..52d7053835a 100644 --- a/History.markdown +++ b/History.markdown @@ -16,6 +16,7 @@ * Allow quoted date in front matter defaults (#4184) * Add a Jekyll doctor warning for URLs that only differ by case (#3171) * drops: create one base Drop class which can be set as mutable or not (#4285) + * drops: provide `#to_h` to allow for hash introspection (#4281) ### Bug Fixes From 69a6323599ea1c902097d958892611fc9b672a51 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sat, 26 Dec 2015 12:37:08 -0800 Subject: [PATCH 0137/4996] Utils.deep_merge_hashes failing test --- test/test_utils.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/test_utils.rb b/test/test_utils.rb index f25a5f694aa..42d4f3ed8b0 100644 --- a/test/test_utils.rb +++ b/test/test_utils.rb @@ -1,6 +1,21 @@ require 'helper' class TestUtils < JekyllUnitTest + context "The \`Utils.deep_merge_hashes\` method" do + setup do + clear_dest + config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir}) + + @site = fixture_site(config) + @site.process + end + + should "merge a page into the site" do + data = {"page" => {}} + assert Utils.deep_merge_hashes(data, @site.site_payload) + end + end + context "hash" do context "pluralized_array" do From 5bf596b2390ec716cad3da81eece9f2c08dc6f96 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 27 Dec 2015 08:06:37 -0500 Subject: [PATCH 0138/4996] utils/drops: update Drop to support Utils.deep_merge_hashes Fixes #4287 --- lib/jekyll/drops/drop.rb | 23 ++++++++++++++++++++++- lib/jekyll/drops/unified_payload_drop.rb | 8 ++------ lib/jekyll/utils.rb | 5 +++-- test/test_utils.rb | 20 +++++++++++++++----- 4 files changed, 42 insertions(+), 14 deletions(-) diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb index b14581a40af..98eb864acfa 100644 --- a/lib/jekyll/drops/drop.rb +++ b/lib/jekyll/drops/drop.rb @@ -71,6 +71,18 @@ def []=(key, val) end end + # Generates a list of strings which correspond to content getter + # methods. + # + # Returns an Array of strings which represent method-specific keys. + def content_methods + @content_methods ||= ( + self.class.instance_methods(false) - NON_CONTENT_METHODS + ).map(&:to_s).reject do |method| + method.end_with?("=") + end + end + # Generates a list of keys with user content as their values. # This gathers up the Drop methods and keys of the mutations and # underlying data hashes and performs a set union to ensure a list @@ -78,7 +90,7 @@ def []=(key, val) # # Returns an Array of unique keys for content for the Drop. def keys - ((self.class.instance_methods(false) - NON_CONTENT_METHODS).map(&:to_s) | + (content_methods | @mutations.keys | fallback_data.keys).flatten end @@ -102,6 +114,15 @@ def inspect JSON.pretty_generate to_h end + # Collects all the keys and passes each to the block in turn. + # + # block - a block which accepts one argument, the key + # + # Returns nothing. + def each_key(&block) + keys.each(&block) + end + end end end diff --git a/lib/jekyll/drops/unified_payload_drop.rb b/lib/jekyll/drops/unified_payload_drop.rb index 3c593ba6a47..26b9104b6d9 100644 --- a/lib/jekyll/drops/unified_payload_drop.rb +++ b/lib/jekyll/drops/unified_payload_drop.rb @@ -3,21 +3,17 @@ module Jekyll module Drops class UnifiedPayloadDrop < Drop - mutable false + mutable true attr_accessor :page, :layout, :content, :paginator attr_accessor :highlighter_prefix, :highlighter_suffix - def initialize(site) - @site = site - end - def jekyll JekyllDrop.global end def site - @site_drop ||= SiteDrop.new(@site) + @site_drop ||= SiteDrop.new(@obj) end private diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index a2c6139d5da..c0c56579d2e 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -31,7 +31,8 @@ def deep_merge_hashes(master_hash, other_hash) # Thanks to whoever made it. def deep_merge_hashes!(target, overwrite) overwrite.each_key do |key| - if overwrite[key].is_a? Hash and target[key].is_a? Hash + if (overwrite[key].is_a?(Hash) or overwrite[key].is_a?(Drops::Drop)) and + (target[key].is_a?(Hash) or target[key].is_a?(Drops::Drop)) target[key] = Utils.deep_merge_hashes(target[key], overwrite[key]) next end @@ -39,7 +40,7 @@ def deep_merge_hashes!(target, overwrite) target[key] = overwrite[key] end - if target.default_proc.nil? + if target.respond_to?(:default_proc) && overwrite.respond_to?(:default_proc) && target.default_proc.nil? target.default_proc = overwrite.default_proc end diff --git a/test/test_utils.rb b/test/test_utils.rb index 42d4f3ed8b0..bf7e8957aed 100644 --- a/test/test_utils.rb +++ b/test/test_utils.rb @@ -4,15 +4,25 @@ class TestUtils < JekyllUnitTest context "The \`Utils.deep_merge_hashes\` method" do setup do clear_dest - config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir}) - - @site = fixture_site(config) + @site = fixture_site @site.process end - should "merge a page into the site" do + should "merge a drop into a hash" do + data = {"page" => {}} + merged = Utils.deep_merge_hashes(data, @site.site_payload) + assert merged.is_a? Hash + assert merged["site"].is_a? Drops::SiteDrop + assert_equal data["page"], {} + end + + should "merge a hash into a drop" do data = {"page" => {}} - assert Utils.deep_merge_hashes(data, @site.site_payload) + assert_nil @site.site_payload["page"] + merged = Utils.deep_merge_hashes(@site.site_payload, data) + assert merged.is_a? Drops::UnifiedPayloadDrop + assert merged["site"].is_a? Drops::SiteDrop + assert_equal data["page"], {} end end From 8e887dcd8b13bbce8d7feb0e3c81cd4d2c6be246 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 27 Dec 2015 08:23:50 -0500 Subject: [PATCH 0139/4996] markdown: minor style fixes ref: #3771 --- lib/jekyll/converters/markdown.rb | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb index e3c89934856..711c0a31ebf 100644 --- a/lib/jekyll/converters/markdown.rb +++ b/lib/jekyll/converters/markdown.rb @@ -14,8 +14,7 @@ def setup raise Errors::FatalException, "Bailing out; invalid Markdown processor." end - @setup = \ - true + @setup = true end def get_processor @@ -33,8 +32,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. @@ -55,9 +53,7 @@ def extname_list end def matches(ext) - extname_list.include?( - ext.downcase - ) + extname_list.include?(ext.downcase) end def output_ext(ext) @@ -65,19 +61,15 @@ def output_ext(ext) end def convert(content) - setup - @parser.convert( - content - ) + setup + @parser.convert(content) end private def get_custom_processor - md = @config["markdown"] - if custom_class_allowed?(md) - self.class.const_get(md).new( - @config - ) + converter_name = @config["markdown"] + if custom_class_allowed?(converter_name) + self.class.const_get(converter_name).new(@config) end end From e302873203cefc40019d17eb09bec837e09b15c7 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 27 Dec 2015 08:25:29 -0500 Subject: [PATCH 0140/4996] Update history to reflect merge of #3771 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 52d7053835a..33bc08309c0 100644 --- a/History.markdown +++ b/History.markdown @@ -35,6 +35,7 @@ * Modernize Kramdown for Markdown converter. (#4109) * Change TestDoctorCommand to JekyllUnitTest... (#4263) * Create namespaced rake tasks in separate `.rake` files under `lib/tasks` (#4282) + * markdown: refactor for greater readability & efficiency (#3771) ### Site Enhancements From cb342c375dee00cb3b90872de55c3530173cbb53 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 27 Dec 2015 08:27:37 -0500 Subject: [PATCH 0141/4996] Update history to reflect merge of #4289 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 33bc08309c0..9a2b4acad90 100644 --- a/History.markdown +++ b/History.markdown @@ -27,6 +27,7 @@ * Avoid using `Dir.glob` with absolute path to allow special characters in the path (#4150) * Handle empty config files (#4052) * Rename `@options` so that it does not impact Liquid. (#4173) + * utils/drops: update Drop to support `Utils.deep_merge_hashes` (#4289) ### Development Fixes From 5034216637c79a412b3366cbcc10f81db1724b60 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 27 Dec 2015 08:32:08 -0500 Subject: [PATCH 0142/4996] Release :gem: 3.1.0.pre.beta1 --- lib/jekyll/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index 7907aaa5590..2d2bf2c6a06 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,3 +1,3 @@ module Jekyll - VERSION = '3.0.1' + VERSION = '3.1.0.pre.beta1' end From f2f88dbd9f1f4035d7fc51e2dbb6e75d07cd64e7 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 27 Dec 2015 12:48:21 -0600 Subject: [PATCH 0143/4996] Move require "jekyll/drops/drop" to "jekyll.rb" Linux does not read files in alphanumeric order, this can lead to Jekyll drops not working on Linux because the assumption here is that the collection drop will be required first. --- lib/jekyll.rb | 1 + lib/jekyll/drops/collection_drop.rb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index e3fca10b1f6..3d33e52c572 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -169,6 +169,7 @@ def sanitized_path(base_directory, questionable_path) end end +require "jekyll/drops/drop" require_all 'jekyll/commands' require_all 'jekyll/converters' require_all 'jekyll/converters/markdown' diff --git a/lib/jekyll/drops/collection_drop.rb b/lib/jekyll/drops/collection_drop.rb index 009635a427e..26913230471 100644 --- a/lib/jekyll/drops/collection_drop.rb +++ b/lib/jekyll/drops/collection_drop.rb @@ -1,5 +1,4 @@ # encoding: UTF-8 -require "jekyll/drops/drop" module Jekyll module Drops From e048e428d19d32fad645051cde93073c06727488 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 27 Dec 2015 12:56:42 -0600 Subject: [PATCH 0144/4996] Update History.markdown --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 9a2b4acad90..4b2cb3fa1c6 100644 --- a/History.markdown +++ b/History.markdown @@ -28,6 +28,7 @@ * Handle empty config files (#4052) * Rename `@options` so that it does not impact Liquid. (#4173) * utils/drops: update Drop to support `Utils.deep_merge_hashes` (#4289) + * Make sure jekyll/drops/drop is loaded first. (#4292) ### Development Fixes From e98f543513465971bf8aba71e1c51807a052016e Mon Sep 17 00:00:00 2001 From: Alfred Xing Date: Sun, 27 Dec 2015 19:44:08 -0800 Subject: [PATCH 0145/4996] Add some documentation for incremental regeneration --- site/_docs/configuration.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md index 0e4f57590e1..6bf17766c61 100644 --- a/site/_docs/configuration.md +++ b/site/_docs/configuration.md @@ -712,3 +712,35 @@ in the `_plugins` folder or as a gem, specify it in your `_config.yml`: {% highlight yaml %} markdown: MyCustomProcessor {% endhighlight %} + +## Incremental Regeneration +
+
Incremental regeneration is still an experimental feature
+

+ While incremental regeneration will work for the most common cases, it will + not work correctly in every scenario. Please be extremely cautious when + using the feature, and report any problems not listed below by + opening an issue on GitHub. +

+
+ +Incremental regeneration helps shorten build times by only generating documents +and pages that were updated since the previous build. It does this by keeping +track of both file modification times and inter-document dependencies in the +`.jekyll-metadata` file. + +Under the current implementation, incremental regeneration will only generate a +document or page if either it, or one of its dependencies, is modified. Currently, +the only types of dependencies tracked are includes (using the +{% raw %}`{% include %}`{% endraw %} tag) and layouts. This means that plain +references to other documents (for example, the common case of iterating over +`site.posts` in a post listings page) will not be detected as a dependency. + +To remedy some of these shortfalls, putting `regenerate: true` in the front-matter +of a document will force Jekyll to regenerate it regardless of whether it has been +modified. Note that this will generate the specified document only; references +to other documents' contents will not work since they won't be re-rendered. + +Incremental regeneration can be enabled via the `--incremental` flag (`-I` for +short) from the command-line or by setting `incremental: true` in your +configuration file. From 0309c940dfbe2f60560656bc3b8a80d974135e21 Mon Sep 17 00:00:00 2001 From: Kakoma Date: Mon, 28 Dec 2015 18:48:52 +0300 Subject: [PATCH 0146/4996] Use permalink Front Matter variable for clean URLs Add pro Tip to use permalink front matter variable to get clean URLs --- site/_docs/pages.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/site/_docs/pages.md b/site/_docs/pages.md index 2299c83c8dd..a2080868e03 100644 --- a/site/_docs/pages.md +++ b/site/_docs/pages.md @@ -87,3 +87,15 @@ might look like: This approach may not suit everyone, but for people who like clean URLs it’s simple and it works. In the end the decision is yours! + +
+
ProTip™: Use permalink Front Matter Variable
+

+ Clean URLs can also be achieved using the permalink Front Matter variable. In the example above, using the first method, you can get URL http://example.com/other for the file other.md by adding this to the top of the file. + 

+    ---
+    permalink: /other/
+    ---
+
+

+
From bf4bfcf4f08d342a7f2971e8a85e94cb6eed100b Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Tue, 29 Dec 2015 18:02:59 -0800 Subject: [PATCH 0147/4996] Add link to jekyll-commonmark --- site/_docs/plugins.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index 57f7d51583d..2aff0b959d0 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -761,6 +761,7 @@ LESS.js files during generation. - [Bigfootnotes Plugin](https://github.com/TheFox/jekyll-bigfootnotes): Enables big footnotes for Kramdown. - [AsciiDoc Plugin](https://github.com/asciidoctor/jekyll-asciidoc): AsciiDoc convertor for Jekyll using [Asciidoctor](http://asciidoctor.org/). - [Lazy Tweet Embedding](https://github.com/takuti/jekyll-lazy-tweet-embedding): Automatically convert tweet urls into twitter cards. +- [jekyll-commonmark](https://github.com/pathawks/jekyll-commonmark): Markdown converter that uses [libcmark](https://github.com/jgm/CommonMark), the reference parser for CommonMark. #### Filters From a1c97c66fbdc87cc4148c7ac50d6790622100051 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 30 Dec 2015 09:26:18 -0800 Subject: [PATCH 0148/4996] Update history to reflect merge of #4299 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 4b2cb3fa1c6..c590832fb67 100644 --- a/History.markdown +++ b/History.markdown @@ -56,6 +56,7 @@ * Add Markdown examples to Pages docs (#4275) * Add jekyll-paginate-category to list of third-party plugins (#4273) * Add `jekyll-responsive_image` to list of third-party plugins (#4286) + * Add `jekyll-commonmark` to list of third-party plugins (#4299) ## 3.0.1 / 2015-11-17 From 519c0f1b3849eac0c3e094ffb13dff6330ce63e2 Mon Sep 17 00:00:00 2001 From: Alfred Xing Date: Wed, 30 Dec 2015 10:43:01 -0800 Subject: [PATCH 0149/4996] Update history to reflect merge of #4293 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index c590832fb67..b45e565b28d 100644 --- a/History.markdown +++ b/History.markdown @@ -57,6 +57,7 @@ * Add jekyll-paginate-category to list of third-party plugins (#4273) * Add `jekyll-responsive_image` to list of third-party plugins (#4286) * Add `jekyll-commonmark` to list of third-party plugins (#4299) + * Add documentation for incremental regeneration (#4293) ## 3.0.1 / 2015-11-17 From 13f520f2b40079c3293d199a2672c62ad60aec38 Mon Sep 17 00:00:00 2001 From: Alistair Calder Date: Wed, 30 Dec 2015 16:07:15 -0800 Subject: [PATCH 0150/4996] Added content on relative permalinks Could not find documentation on issues with relative permalinks. Added what fixed it for me. --- site/_docs/upgrading/2-to-3.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md index cdc69fd044b..c01be517960 100644 --- a/site/_docs/upgrading/2-to-3.md +++ b/site/_docs/upgrading/2-to-3.md @@ -71,4 +71,15 @@ go back to using Pygments, set `highlighter: pygments` in your `_config.yml` file and run `gem install pygments.rb` or add `gem 'pygments.rb'` to your project's `Gemfile`. +### Relative Permalinks deprecated + +In Jekyll 3 and above, relative permalinks have been deprecated. If you created your site using Jekyll 2 and below, you may receive the following error when trying to **serve** or **build**: + + Since v3.0, permalinks for pages in subfolders must be relative to the site source directory, not the parent directory. Check http://jekyllrb.com/docs/upgrading/ for more info. + +This can be fixed by removing the following line from your _config.yml file: + + relative_permalinks: true + + _Did we miss something? Please click "Improve this page" above and add a section. Thanks!_ From 2a280b7f626bf4e415062291a3b86e2f68ba927e Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sat, 2 Jan 2016 23:58:59 -0600 Subject: [PATCH 0151/4996] Reduce our surface, extend self is useful for some modules. We should handle extend self and module_function on a case-by-case basis because there are times when extend self is useful, especially when you wish a module to be included but also available on itself. `module_function` does not allow this. --- .codeclimate.yml | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index 29ed62d0cda..ae7e3d26db8 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -2,24 +2,25 @@ engines: rubocop: enabled: true checks: - Rubocop/Style/SpaceInsideBrackets: { enabled: false } - Rubocop/Style/BracesAroundHashParameters: { enabled: false} + Rubocop/Style/SpaceInsideBrackets: { enabled: false } + Rubocop/Style/BracesAroundHashParameters: { enabled: false} Rubocop/Style/EmptyLinesAroundAccessModifier: { enabled: false } - Rubocop/Style/EmptyLinesAroundModuleBody: { enabled: false } - Rubocop/Lint/FormatParameterMismatch: { enabled: false } - Rubocop/Lint/UselessAccessModifier: { enabled: false } - Rubocop/Lint/AssignmentInCondition: { enabled: false } - Rubocop/Style/SpaceAroundOperators: { enabled: false } - Rubocop/Style/AlignParameters: { enabled: false } - Rubocop/Style/SignalException: { enabled: false } - Rubocop/Style/Documentation: { enabled: false } - Rubocop/Style/DoubleNegation: { enabled: false } - Rubocop/Style/UnneededCapitalW: { enabled: false } - Rubocop/Style/IfUnlessModifier: { enabled: false } - Rubocop/Style/RescueModifier: { enabled: false } - Rubocop/Style/RegexpLiteral: { enabled: false } - Rubocop/Style/GuardClause: { enabled: false } - Rubocop/Style/FileName: { enabled: false } + Rubocop/Style/EmptyLinesAroundModuleBody: { enabled: false } + Rubocop/Lint/FormatParameterMismatch: { enabled: false } + Rubocop/Lint/UselessAccessModifier: { enabled: false } + Rubocop/Lint/AssignmentInCondition: { enabled: false } + Rubocop/Style/SpaceAroundOperators: { enabled: false } + Rubocop/Style/AlignParameters: { enabled: false } + Rubocop/Style/SignalException: { enabled: false } + Rubocop/Style/Documentation: { enabled: false } + Rubocop/Style/DoubleNegation: { enabled: false } + Rubocop/Style/UnneededCapitalW: { enabled: false } + Rubocop/Style/IfUnlessModifier: { enabled: false } + Rubocop/Style/RescueModifier: { enabled: false } + Rubocop/Style/RegexpLiteral: { enabled: false } + Rubocop/Style/GuardClause: { enabled: false } + Rubocop/Style/FileName: { enabled: false } + Rubocop/Style/ModuleFunction: { enabled: false } fixme: enabled: false exclude_paths: From a2623be3da72313d47ac1e203d54c7230e8d72c7 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 3 Jan 2016 00:15:31 -0600 Subject: [PATCH 0152/4996] Be consistent with your hashes and arrays. ``` val = %W(hello world world) ``` ``` var = %W( hello world ) ``` ``` var = %W(hello world) ``` --- .rubocop.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index 66b8552d634..478837c345d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,7 @@ Style/IndentHash: { EnforcedStyle: align_braces } Style/StringLiteralsInInterpolation: { EnforcedStyle: double_quotes } +Style/IndentArray: { EnforcedStyle: consistent } +Style/IndentHash: { EnforcedStyle: consistent } Style/StringLiterals: { EnforcedStyle: none } Metrics/MethodLength: { Max: 24 } Metrics/ClassLength: { Max: 240 } From b7d5a26d53300616937c92aa42fba7c7527db01d Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 3 Jan 2016 02:19:42 -0600 Subject: [PATCH 0153/4996] Move around CodeClimate so people can do `bundle exec rubocop`. /cc @pathawks -- This is why you were not getting the custom settings we had made and some things were showing up as broken when they weren't. Sorry. --- .codeclimate.yml | 30 ++++------------------- .rubocop.yml | 64 +++++++++++++++++++++++++++++++++++++----------- Gemfile | 1 + 3 files changed, 56 insertions(+), 39 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index ae7e3d26db8..27b8728d48d 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,28 +1,6 @@ engines: - rubocop: - enabled: true - checks: - Rubocop/Style/SpaceInsideBrackets: { enabled: false } - Rubocop/Style/BracesAroundHashParameters: { enabled: false} - Rubocop/Style/EmptyLinesAroundAccessModifier: { enabled: false } - Rubocop/Style/EmptyLinesAroundModuleBody: { enabled: false } - Rubocop/Lint/FormatParameterMismatch: { enabled: false } - Rubocop/Lint/UselessAccessModifier: { enabled: false } - Rubocop/Lint/AssignmentInCondition: { enabled: false } - Rubocop/Style/SpaceAroundOperators: { enabled: false } - Rubocop/Style/AlignParameters: { enabled: false } - Rubocop/Style/SignalException: { enabled: false } - Rubocop/Style/Documentation: { enabled: false } - Rubocop/Style/DoubleNegation: { enabled: false } - Rubocop/Style/UnneededCapitalW: { enabled: false } - Rubocop/Style/IfUnlessModifier: { enabled: false } - Rubocop/Style/RescueModifier: { enabled: false } - Rubocop/Style/RegexpLiteral: { enabled: false } - Rubocop/Style/GuardClause: { enabled: false } - Rubocop/Style/FileName: { enabled: false } - Rubocop/Style/ModuleFunction: { enabled: false } - fixme: - enabled: false + rubocop: { enabled: true } + fixme: { enabled: false } exclude_paths: - .rubocop.yml - .codeclimate.yml @@ -40,8 +18,10 @@ exclude_paths: - LICENSE - test/**/* +- vendor/**/* +- features/**/* - script/**/* - spec/**/* ratings: paths: - - lib/**/* + - lib/**/*.rb diff --git a/.rubocop.yml b/.rubocop.yml index 478837c345d..1bd98b26b62 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,22 +1,18 @@ -Style/IndentHash: { EnforcedStyle: align_braces } -Style/StringLiteralsInInterpolation: { EnforcedStyle: double_quotes } -Style/IndentArray: { EnforcedStyle: consistent } -Style/IndentHash: { EnforcedStyle: consistent } -Style/StringLiterals: { EnforcedStyle: none } Metrics/MethodLength: { Max: 24 } Metrics/ClassLength: { Max: 240 } Metrics/ModuleLength: { Max: 240 } Metrics/LineLength: { Max: 112 } -Style/HashSyntax: - UseHashRocketsWithSymbolValues: false - SupportedStyles: [ruby19 ruby19_no_mixed_keys, hash_rockets] - EnforcedStyle: ruby19 - -Style/MultilineOperationIndentation: - EnforcedStyle: indented - SupportedStyles: - - indented +Style/IndentHash: { EnforcedStyle: consistent } +Style/HashSyntax: { EnforcedStyle: hash_rockets } +Style/SignalException: { EnforcedStyle: only_raise } +Style/SpaceAroundOperators: { AllowForAlignment: true } +Style/AlignParameters: { EnforcedStyle: with_fixed_indentation } +Style/StringLiteralsInInterpolation: { EnforcedStyle: double_quotes } +Style/MultilineOperationIndentation: { EnforcedStyle: indented } +# Style/StringLiterals: { EnforcedStyle: double_quotes } +Style/RegexpLiteral: { EnforcedStyle: percent_r } +Style/IndentArray: { EnforcedStyle: consistent } Style/PercentLiteralDelimiters: PreferredDelimiters: @@ -27,3 +23,43 @@ Style/PercentLiteralDelimiters: '%w': '()' '%W': '()' '%x': '()' + +Style/StringLiterals: { Enabled: false } +Style/Documentation: { Enabled: false } +Style/DoubleNegation: { Enabled: false } +Style/UnneededCapitalW: { Enabled: false } +Style/EmptyLinesAroundModuleBody: { Enabled: false } +Style/EmptyLinesAroundAccessModifier: { Enabled: false } +Style/BracesAroundHashParameters: { Enabled: false } +Style/SpaceInsideBrackets: { Enabled: false } +Style/IfUnlessModifier: { Enabled: false } +Style/ModuleFunction: { Enabled: false } +Style/RescueModifier: { Enabled: false } +Style/GuardClause: { Enabled: false } +Style/FileName: { Enabled: false } + +AllCops: + Include: + - lib/**/*.rb + + Exclude: + - .rubocop.yml + - .codeclimate.yml + - .travis.yml + - .gitignore + - .rspec + + - Gemfile.lock + - CHANGELOG.md + - readme.md + - README.md + - Readme.md + - ReadMe.md + - COPYING + - LICENSE + + - test/**/* + - vendor/**/* + - features/**/* + - script/**/* + - spec/**/* diff --git a/Gemfile b/Gemfile index cdafdc9b5fa..750c461b132 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,7 @@ group :development do gem 'rdoc', '~> 4.2' gem 'launchy', '~> 2.3' gem 'toml', '~> 0.1.0' + gem "rubocop" gem 'pry' end From 8e00301fcacf19f8f06e569c851e3fe0850ae8da Mon Sep 17 00:00:00 2001 From: Atul Bhosale Date: Fri, 1 Jan 2016 11:24:00 +0530 Subject: [PATCH 0154/4996] Update copyright notices to 2016 [ci skip] --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 527166b60b2..94dbfc391f0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2008-2015 Tom Preston-Werner +Copyright (c) 2008-2016 Tom Preston-Werner Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 22a0be3f7b743ec42844edfb8d6359e28287774d Mon Sep 17 00:00:00 2001 From: William Entriken Date: Sun, 3 Jan 2016 16:10:38 -0500 Subject: [PATCH 0155/4996] Escape html from site.title and page.title --- lib/site_template/_includes/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/site_template/_includes/head.html b/lib/site_template/_includes/head.html index 41340ae57b4..1598d6fe77a 100644 --- a/lib/site_template/_includes/head.html +++ b/lib/site_template/_includes/head.html @@ -3,7 +3,7 @@ - {% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} + {% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %} From ffdbeb89dd06d361396afff5f2254004d332f1fc Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 3 Jan 2016 15:57:47 -0600 Subject: [PATCH 0156/4996] Further refine our Rubocop to the current styles. --- .rubocop.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 1bd98b26b62..345bec1df0f 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -6,13 +6,15 @@ Metrics/LineLength: { Max: 112 } Style/IndentHash: { EnforcedStyle: consistent } Style/HashSyntax: { EnforcedStyle: hash_rockets } Style/SignalException: { EnforcedStyle: only_raise } -Style/SpaceAroundOperators: { AllowForAlignment: true } Style/AlignParameters: { EnforcedStyle: with_fixed_indentation } Style/StringLiteralsInInterpolation: { EnforcedStyle: double_quotes } +Style/RegexpLiteral: { EnforcedStyle: slashes, AllowInnerSlashes: true } +Style/MultilineMethodCallIndentation: { EnforcedStyle: indented } Style/MultilineOperationIndentation: { EnforcedStyle: indented } -# Style/StringLiterals: { EnforcedStyle: double_quotes } -Style/RegexpLiteral: { EnforcedStyle: percent_r } +Style/FirstParameterIndentation: { EnforcedStyle: consistent } +Style/StringLiterals: { EnforcedStyle: double_quotes } Style/IndentArray: { EnforcedStyle: consistent } +Style/ExtraSpacing: { AllowForAlignment: true } Style/PercentLiteralDelimiters: PreferredDelimiters: @@ -24,6 +26,7 @@ Style/PercentLiteralDelimiters: '%W': '()' '%x': '()' +Style/AlignArray: { Enabled: false } Style/StringLiterals: { Enabled: false } Style/Documentation: { Enabled: false } Style/DoubleNegation: { Enabled: false } @@ -37,8 +40,12 @@ Style/ModuleFunction: { Enabled: false } Style/RescueModifier: { Enabled: false } Style/GuardClause: { Enabled: false } Style/FileName: { Enabled: false } +Lint/UselessAccessModifier: { Enabled: false } +Style/SpaceAroundOperators: { Enabled: false } +Style/RedundantReturn: { Enabled: false } AllCops: + TargetRubyVersion: 2.0 Include: - lib/**/*.rb From 31dd0ebed5faa79d68307222403de85db9177f16 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 14:39:01 -0800 Subject: [PATCH 0157/4996] Rubocop: Style/EmptyLiteral - Use array literal [] instead of Array.new - Use hash literal {} instead of Hash.new --- lib/jekyll.rb | 2 +- lib/jekyll/collection.rb | 6 +++--- lib/jekyll/commands/doctor.rb | 2 +- lib/jekyll/document.rb | 2 +- lib/jekyll/readers/page_reader.rb | 2 +- lib/jekyll/readers/static_file_reader.rb | 2 +- lib/jekyll/static_file.rb | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 3d33e52c572..24448c26940 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -95,7 +95,7 @@ def env # list of option names and their defaults. # # Returns the final configuration Hash. - def configuration(override = Hash.new) + def configuration(override = {}) config = Configuration[Configuration::DEFAULTS] override = Configuration[override].stringify_keys unless override.delete('skip_config_files') diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb index f74ccf6f791..a68fbfec84d 100644 --- a/lib/jekyll/collection.rb +++ b/lib/jekyll/collection.rb @@ -76,7 +76,7 @@ def read # Returns an Array of file paths to the documents in this collection # relative to the collection's directory def entries - return Array.new unless exists? + return [] unless exists? @entries ||= Utils.safe_glob(collection_dir, ["**", "*.*"]).map do |entry| entry["#{collection_dir}/"] = ''; entry @@ -88,7 +88,7 @@ def entries # # Returns a list of filtered entry paths. def filtered_entries - return Array.new unless exists? + return [] unless exists? @filtered_entries ||= Dir.chdir(directory) do entry_filter.filter(entries).reject do |f| @@ -195,7 +195,7 @@ def url_template # Returns the metadata for this collection def extract_metadata if site.config['collections'].is_a?(Hash) - site.config['collections'][label] || Hash.new + site.config['collections'][label] || {} else {} end diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index 02e1967d0d4..8ce2c4732ee 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -105,7 +105,7 @@ def collect_urls(urls, things, destination) end def case_insensitive_urls(things, destination) - things.inject(Hash.new) do |memo, thing| + things.inject({}) do |memo, thing| dest = thing.destination(destination) (memo[dest.downcase] ||= []) << dest memo diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 14a0a92e224..c906e149842 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -52,7 +52,7 @@ def content=(content) # Returns a Hash containing the data. An empty hash is returned if # no data was read. def data - @data ||= Hash.new + @data ||= {} end # Merge some data in with this document's data. diff --git a/lib/jekyll/readers/page_reader.rb b/lib/jekyll/readers/page_reader.rb index 099ebf133ed..12e7074814f 100644 --- a/lib/jekyll/readers/page_reader.rb +++ b/lib/jekyll/readers/page_reader.rb @@ -4,7 +4,7 @@ class PageReader def initialize(site, dir) @site = site @dir = dir - @unfiltered_content = Array.new + @unfiltered_content = [] end # Read all the files in // for Yaml header and create a new Page diff --git a/lib/jekyll/readers/static_file_reader.rb b/lib/jekyll/readers/static_file_reader.rb index 279bea46d5e..b95981a8f39 100644 --- a/lib/jekyll/readers/static_file_reader.rb +++ b/lib/jekyll/readers/static_file_reader.rb @@ -4,7 +4,7 @@ class StaticFileReader def initialize(site, dir) @site = site @dir = dir - @unfiltered_content = Array.new + @unfiltered_content = [] end # Read all the files in // for Yaml header and create a new Page diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb index 48fa34c5990..6f24f7d2b38 100644 --- a/lib/jekyll/static_file.rb +++ b/lib/jekyll/static_file.rb @@ -1,7 +1,7 @@ module Jekyll class StaticFile # The cache of last modification times [path] -> mtime. - @@mtimes = Hash.new + @@mtimes = {} attr_reader :relative_path, :extname @@ -90,7 +90,7 @@ def write(dest) # # Returns nothing. def self.reset_cache - @@mtimes = Hash.new + @@mtimes = {} nil end From 44d2995277276e3e34ae2931a90c29b291c0ca8b Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 14:40:45 -0800 Subject: [PATCH 0158/4996] Rubocop: Style/Semicolon - Do not use semicolons to terminate expressions --- lib/jekyll/collection.rb | 3 ++- lib/jekyll/commands/serve.rb | 3 ++- lib/jekyll/tags/include.rb | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb index a68fbfec84d..9b9f6593ab4 100644 --- a/lib/jekyll/collection.rb +++ b/lib/jekyll/collection.rb @@ -79,7 +79,8 @@ def entries return [] unless exists? @entries ||= Utils.safe_glob(collection_dir, ["**", "*.*"]).map do |entry| - entry["#{collection_dir}/"] = ''; entry + entry["#{collection_dir}/"] = '' + entry end end diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index aa8fc6a882e..4dad7600002 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -168,7 +168,8 @@ def enable_ssl(opts) raise RuntimeError, "--ssl-cert or --ssl-key missing." end - require "openssl"; require "webrick/https" + require "openssl" + require "webrick/https" source_key = Jekyll.sanitized_path(opts[:JekyllOptions]["source"], opts[:JekyllOptions]["ssl_key" ]) source_certificate = Jekyll.sanitized_path(opts[:JekyllOptions]["source"], opts[:JekyllOptions]["ssl_cert"]) opts[:SSLCertificate] = OpenSSL::X509::Certificate.new(File.read(source_certificate)) diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb index 2e39738e0aa..6082a4cca6a 100644 --- a/lib/jekyll/tags/include.rb +++ b/lib/jekyll/tags/include.rb @@ -25,7 +25,7 @@ def initialize(tag_name, markup, tokens) @file = matched['variable'].strip @params = matched['params'].strip else - @file, @params = markup.strip.split(' ', 2); + @file, @params = markup.strip.split(' ', 2) end validate_params if @params @tag_name = tag_name From 0eae36aec2b6ce7043277ff463e780b4e85fbf78 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 14:41:49 -0800 Subject: [PATCH 0159/4996] Rubocop: Style/LineEndConcatenation - Use \ instead of + or << to concatenate those strings --- lib/jekyll/commands/doctor.rb | 10 ++++----- lib/jekyll/configuration.rb | 38 +++++++++++++++++------------------ lib/jekyll/filters.rb | 2 +- lib/jekyll/hooks.rb | 2 +- lib/jekyll/plugin_manager.rb | 4 ++-- lib/jekyll/site.rb | 8 ++++---- lib/jekyll/tags/highlight.rb | 2 +- lib/jekyll/tags/post_url.rb | 6 +++--- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index 8ce2c4732ee..a29cbf7e6fc 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -39,8 +39,8 @@ def healthy?(site) def deprecated_relative_permalinks(site) if site.config['relative_permalinks'] - Jekyll::Deprecator.deprecation_message "Your site still uses relative" + - " permalinks, which was removed in" + + Jekyll::Deprecator.deprecation_message "Your site still uses relative" \ + " permalinks, which was removed in" \ " Jekyll v3.0.0." return true end @@ -54,7 +54,7 @@ def conflicting_urls(site) urls.each do |url, paths| if paths.size > 1 conflicting_urls = true - Jekyll.logger.warn "Conflict:", "The URL '#{url}' is the destination" + + Jekyll.logger.warn "Conflict:", "The URL '#{url}' is the destination" \ " for the following pages: #{paths.join(", ")}" end end @@ -83,8 +83,8 @@ def urls_only_differ_by_case(site) urls.each do |case_insensitive_url, real_urls| if real_urls.uniq.size > 1 urls_only_differ_by_case = true - Jekyll.logger.warn "Warning:", "The following URLs only differ" + - " by case. On a case-insensitive file system one of the URLs" + + Jekyll.logger.warn "Warning:", "The following URLs only differ" \ + " by case. On a case-insensitive file system one of the URLs" \ " will be overwritten by the other: #{real_urls.join(", ")}" end end diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index e01f798cb67..21929f3fe65 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -173,7 +173,7 @@ def read_config_files(files) configuration = Utils.deep_merge_hashes(configuration, new_config) end rescue ArgumentError => err - Jekyll.logger.warn "WARNING:", "Error reading configuration. " + + Jekyll.logger.warn "WARNING:", "Error reading configuration. " \ "Using defaults (and options)." $stderr.puts "#{err}" end @@ -198,16 +198,16 @@ def backwards_compatibilize config = clone # Provide backwards-compatibility if config.key?('auto') || config.key?('watch') - Jekyll::Deprecator.deprecation_message "Auto-regeneration can no longer" + - " be set from your configuration file(s). Use the"+ + Jekyll::Deprecator.deprecation_message "Auto-regeneration can no longer" \ + " be set from your configuration file(s). Use the"\ " --[no-]watch/-w command-line option instead." config.delete('auto') config.delete('watch') end if config.key? 'server' - Jekyll::Deprecator.deprecation_message "The 'server' configuration option" + - " is no longer accepted. Use the 'jekyll serve'" + + Jekyll::Deprecator.deprecation_message "The 'server' configuration option" \ + " is no longer accepted. Use the 'jekyll serve'" \ " subcommand to serve your site with WEBrick." config.delete('server') end @@ -218,9 +218,9 @@ def backwards_compatibilize renamed_key 'data_source', 'data_dir', config if config.key? 'pygments' - Jekyll::Deprecator.deprecation_message "The 'pygments' configuration option" + - " has been renamed to 'highlighter'. Please update your" + - " config file accordingly. The allowed values are 'rouge', " + + Jekyll::Deprecator.deprecation_message "The 'pygments' configuration option" \ + " has been renamed to 'highlighter'. Please update your" \ + " config file accordingly. The allowed values are 'rouge', " \ "'pygments' or null." config['highlighter'] = 'pygments' if config['pygments'] @@ -230,9 +230,9 @@ def backwards_compatibilize %w[include exclude].each do |option| config[option] ||= [] if config[option].is_a?(String) - Jekyll::Deprecator.deprecation_message "The '#{option}' configuration option" + - " must now be specified as an array, but you specified" + - " a string. For now, we've treated the string you provided" + + Jekyll::Deprecator.deprecation_message "The '#{option}' configuration option" \ + " must now be specified as an array, but you specified" \ + " a string. For now, we've treated the string you provided" \ " as a list of comma-separated values." config[option] = csv_to_array(config[option]) end @@ -240,16 +240,16 @@ def backwards_compatibilize end if (config['kramdown'] || {}).key?('use_coderay') - Jekyll::Deprecator.deprecation_message "Please change 'use_coderay'" + + Jekyll::Deprecator.deprecation_message "Please change 'use_coderay'" \ " to 'enable_coderay' in your configuration file." config['kramdown']['use_coderay'] = config['kramdown'].delete('enable_coderay') end if config.fetch('markdown', 'kramdown').to_s.downcase.eql?("maruku") - Jekyll.logger.abort_with "Error:", "You're using the 'maruku' " + - "Markdown processor, which has been removed as of 3.0.0. " + - "We recommend you switch to Kramdown. To do this, replace " + - "`markdown: maruku` with `markdown: kramdown` in your " + + Jekyll.logger.abort_with "Error:", "You're using the 'maruku' " \ + "Markdown processor, which has been removed as of 3.0.0. " \ + "We recommend you switch to Kramdown. To do this, replace " \ + "`markdown: maruku` with `markdown: kramdown` in your " \ "`_config.yml` file." end @@ -260,7 +260,7 @@ def fix_common_issues config = clone if config.key?('paginate') && (!config['paginate'].is_a?(Integer) || config['paginate'] < 1) - Jekyll.logger.warn "Config Warning:", "The `paginate` key must be a" + + Jekyll.logger.warn "Config Warning:", "The `paginate` key must be a" \ " positive integer or nil. It's currently set to '#{config['paginate'].inspect}'." config['paginate'] = nil end @@ -285,8 +285,8 @@ def add_default_collections def renamed_key(old, new, config, allowed_values = nil) if config.key?(old) - Jekyll::Deprecator.deprecation_message "The '#{old}' configuration" + - "option has been renamed to '#{new}'. Please update your config " + + Jekyll::Deprecator.deprecation_message "The '#{old}' configuration" \ + "option has been renamed to '#{new}'. Please update your config " \ "file accordingly." config[new] = config.delete(old) end diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb index 2b1bf1afbd8..2ba0fac323d 100644 --- a/lib/jekyll/filters.rb +++ b/lib/jekyll/filters.rb @@ -234,7 +234,7 @@ def sort(input, property = nil, nils = "first") when nils == "last" order = + 1 else - raise ArgumentError.new("Invalid nils order: " + + raise ArgumentError.new("Invalid nils order: " \ "'#{nils}' is not a valid nils order. It must be 'first' or 'last'.") end diff --git a/lib/jekyll/hooks.rb b/lib/jekyll/hooks.rb index a9a5e73529c..74c01bbbbcc 100644 --- a/lib/jekyll/hooks.rb +++ b/lib/jekyll/hooks.rb @@ -67,7 +67,7 @@ def self.register_one(owner, event, priority, &block) } unless @registry[owner][event] - raise NotAvailable, "Invalid hook. #{owner} supports only the " << + raise NotAvailable, "Invalid hook. #{owner} supports only the " \ "following hooks #{@registry[owner].keys.inspect}" end diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb index 11db89d1772..da7bf121509 100644 --- a/lib/jekyll/plugin_manager.rb +++ b/lib/jekyll/plugin_manager.rb @@ -86,8 +86,8 @@ def plugins_path def deprecation_checks pagination_included = (site.config['gems'] || []).include?('jekyll-paginate') || defined?(Jekyll::Paginate) if site.config['paginate'] && !pagination_included - Jekyll::Deprecator.deprecation_message "You appear to have pagination " + - "turned on, but you haven't included the `jekyll-paginate` gem. " + + Jekyll::Deprecator.deprecation_message "You appear to have pagination " \ + "turned on, but you haven't included the `jekyll-paginate` gem. " \ "Ensure you have `gems: [jekyll-paginate]` in your configuration file." end end diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index 4dc3ac847e6..2575eba224c 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -292,10 +292,10 @@ def instantiate_subclasses(klass) # Returns def relative_permalinks_are_deprecated if config['relative_permalinks'] - Jekyll.logger.abort_with "Since v3.0, permalinks for pages" + - " in subfolders must be relative to the" + - " site source directory, not the parent" + - " directory. Check http://jekyllrb.com/docs/upgrading/"+ + Jekyll.logger.abort_with "Since v3.0, permalinks for pages" \ + " in subfolders must be relative to the" \ + " site source directory, not the parent" \ + " directory. Check http://jekyllrb.com/docs/upgrading/"\ " for more info." end end diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index 3e64bc8bc52..616dfdbf9db 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -88,7 +88,7 @@ def render_pygments(code, is_safe) puts Jekyll.logger.error code puts - Jekyll.logger.error "While attempting to convert the above code, Pygments.rb" + + Jekyll.logger.error "While attempting to convert the above code, Pygments.rb" \ " returned an unacceptable value." Jekyll.logger.error "This is usually a timeout problem solved by running `jekyll build` again." raise ArgumentError.new("Pygments.rb returned an unacceptable value when attempting to highlight some code.") diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb index 5b0d6479f76..2da26ec0d28 100644 --- a/lib/jekyll/tags/post_url.rb +++ b/lib/jekyll/tags/post_url.rb @@ -70,9 +70,9 @@ def render(context) site.posts.docs.each do |p| if @post.deprecated_equality p - Jekyll::Deprecator.deprecation_message "A call to '{{ post_url #{@post.name} }}' did not match " + - "a post using the new matching method of checking name " + - "(path-date-slug) equality. Please make sure that you " + + Jekyll::Deprecator.deprecation_message "A call to '{{ post_url #{@post.name} }}' did not match " \ + "a post using the new matching method of checking name " \ + "(path-date-slug) equality. Please make sure that you " \ "change this tag to match the post's name exactly." return p.url end From 8223ebd86109c9b13339c93b660ef7e1215fd0fa Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 15:24:18 -0800 Subject: [PATCH 0160/4996] Use select and find instead of conditional loop --- lib/jekyll/commands/doctor.rb | 22 +++++++++------------- lib/jekyll/tags/post_url.rb | 22 ++++++++++------------ 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index a29cbf7e6fc..953c2623a13 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -51,12 +51,10 @@ def conflicting_urls(site) urls = {} urls = collect_urls(urls, site.pages, site.dest) urls = collect_urls(urls, site.posts.docs, site.dest) - urls.each do |url, paths| - if paths.size > 1 - conflicting_urls = true - Jekyll.logger.warn "Conflict:", "The URL '#{url}' is the destination" \ - " for the following pages: #{paths.join(", ")}" - end + urls.select { |_, p| p.size > 1 }.each do |url, paths| + conflicting_urls = true + Jekyll.logger.warn "Conflict:", "The URL '#{url}' is the destination" \ + " for the following pages: #{paths.join(", ")}" end conflicting_urls end @@ -80,13 +78,11 @@ 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| - if real_urls.uniq.size > 1 - urls_only_differ_by_case = true - Jekyll.logger.warn "Warning:", "The following URLs only differ" \ - " by case. On a case-insensitive file system one of the URLs" \ - " will be overwritten by the other: #{real_urls.join(", ")}" - end + urls.select { |_, p| p.size > 1 }.each do |_, real_urls| + urls_only_differ_by_case = true + Jekyll.logger.warn "Warning:", "The following URLs only differ" \ + " by case. On a case-insensitive file system one of the URLs" \ + " will be overwritten by the other: #{real_urls.join(", ")}" end urls_only_differ_by_case end diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb index 2da26ec0d28..723eafd7a6f 100644 --- a/lib/jekyll/tags/post_url.rb +++ b/lib/jekyll/tags/post_url.rb @@ -59,23 +59,21 @@ def initialize(tag_name, post, tokens) def render(context) site = context.registers[:site] - site.posts.docs.each do |p| - if @post == p - return p.url - end + post = site.posts.docs.find { |p| @post == p } + if post + return post.url end # New matching method did not match, fall back to old method # with deprecation warning if this matches - site.posts.docs.each do |p| - if @post.deprecated_equality p - Jekyll::Deprecator.deprecation_message "A call to '{{ post_url #{@post.name} }}' did not match " \ - "a post using the new matching method of checking name " \ - "(path-date-slug) equality. Please make sure that you " \ - "change this tag to match the post's name exactly." - return p.url - end + post = site.posts.docs.find { |p| @post.deprecated_equality p } + if post + Jekyll::Deprecator.deprecation_message "A call to '{{ post_url #{@post.name} }}' did not match " \ + "a post using the new matching method of checking name " \ + "(path-date-slug) equality. Please make sure that you " \ + "change this tag to match the post's name exactly." + return post.url end raise ArgumentError.new <<-eos From 6550867051f54f879ea71305f3751c637e04f0b9 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 15:29:49 -0800 Subject: [PATCH 0161/4996] Rubocop: Style/SpecialGlobalVars - Prefer $LOAD_PATH over $: --- bin/jekyll | 2 +- lib/jekyll.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/jekyll b/bin/jekyll index 67705b515d7..26754040d55 100755 --- a/bin/jekyll +++ b/bin/jekyll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby STDOUT.sync = true -$:.unshift File.join(File.dirname(__FILE__), *%w{ .. lib }) +$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w{ .. lib }) require 'jekyll' require 'mercenary' diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 24448c26940..ad8a3395f47 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -1,4 +1,4 @@ -$:.unshift File.dirname(__FILE__) # For use/testing when no gem is installed +$LOAD_PATH.unshift File.dirname(__FILE__) # For use/testing when no gem is installed # Require all of the Ruby files in the given directory. # From fb0457bf3d863cc2eacdb14960265affba88cced Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 15:30:26 -0800 Subject: [PATCH 0162/4996] Rubocop: Style/AndOr - Use && instead of and - Use || instead of or --- lib/jekyll/regenerator.rb | 2 +- lib/jekyll/static_file.rb | 2 +- lib/jekyll/stevenson.rb | 2 +- lib/jekyll/tags/highlight.rb | 2 +- lib/jekyll/tags/include.rb | 2 +- lib/jekyll/utils.rb | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb index 2d84ee34951..c7d47c59a9d 100644 --- a/lib/jekyll/regenerator.rb +++ b/lib/jekyll/regenerator.rb @@ -76,7 +76,7 @@ def clear_cache # # returns a boolean def source_modified_or_dest_missing?(source_path, dest_path) - modified?(source_path) || (dest_path and !File.exist?(dest_path)) + modified?(source_path) || (dest_path && !File.exist?(dest_path)) end # Checks if a path's (or one of its dependencies) diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb index 6f24f7d2b38..efa836d1f3b 100644 --- a/lib/jekyll/static_file.rb +++ b/lib/jekyll/static_file.rb @@ -75,7 +75,7 @@ def write? def write(dest) dest_path = destination(dest) - return false if File.exist?(dest_path) and !modified? + return false if File.exist?(dest_path) && !modified? @@mtimes[path] = mtime FileUtils.mkdir_p(File.dirname(dest_path)) diff --git a/lib/jekyll/stevenson.rb b/lib/jekyll/stevenson.rb index 9a9f412ec96..ea26c8b56c7 100644 --- a/lib/jekyll/stevenson.rb +++ b/lib/jekyll/stevenson.rb @@ -14,7 +14,7 @@ def add(severity, message = nil, progname = nil, &block) severity ||= UNKNOWN @logdev = set_logdevice(severity) - if @logdev.nil? or severity < @level + if @logdev.nil? || severity < @level return true end progname ||= @progname diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index 616dfdbf9db..13c4e8e89ab 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -27,7 +27,7 @@ def initialize(tag_name, markup, tokens) @highlight_options[key.to_sym] = value || true end end - @highlight_options[:linenos] = "inline" if @highlight_options.key?(:linenos) and @highlight_options[:linenos] == true + @highlight_options[:linenos] = "inline" if @highlight_options.key?(:linenos) && @highlight_options[:linenos] == true else raise SyntaxError.new <<-eos Syntax Error in tag 'highlight' while parsing the following markup: diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb index 6082a4cca6a..e3bee1158fd 100644 --- a/lib/jekyll/tags/include.rb +++ b/lib/jekyll/tags/include.rb @@ -115,7 +115,7 @@ def render(context) validate_path(path, dir, site.safe) # Add include to dependency tree - if context.registers[:page] and context.registers[:page].has_key? "path" + if context.registers[:page] && context.registers[:page].has_key?("path") site.regenerator.add_dependency( site.in_source_dir(context.registers[:page]["path"]), path diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index c0c56579d2e..d18b41c7c57 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -31,8 +31,8 @@ def deep_merge_hashes(master_hash, other_hash) # Thanks to whoever made it. def deep_merge_hashes!(target, overwrite) overwrite.each_key do |key| - if (overwrite[key].is_a?(Hash) or overwrite[key].is_a?(Drops::Drop)) and - (target[key].is_a?(Hash) or target[key].is_a?(Drops::Drop)) + if (overwrite[key].is_a?(Hash) || overwrite[key].is_a?(Drops::Drop)) && + (target[key].is_a?(Hash) || target[key].is_a?(Drops::Drop)) target[key] = Utils.deep_merge_hashes(target[key], overwrite[key]) next end From 98a19cdf2b24fbf9d18ea38ee183929eabc032d0 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 15:32:11 -0800 Subject: [PATCH 0163/4996] Rubocop: Style/PercentLiteralDelimiters - %w-literals should be delimited by ( and ) Rubocop: Style/WordArray - Use %w or %W for array of words --- bin/jekyll | 2 +- lib/jekyll/configuration.rb | 4 ++-- lib/jekyll/converters/markdown.rb | 2 +- lib/jekyll/converters/markdown/redcarpet_parser.rb | 4 ++-- lib/jekyll/convertible.rb | 2 +- lib/jekyll/deprecator.rb | 2 +- lib/jekyll/document.rb | 4 ++-- lib/jekyll/external.rb | 4 ++-- lib/jekyll/liquid_renderer/table.rb | 2 +- lib/jekyll/page.rb | 4 ++-- lib/jekyll/readers/collection_reader.rb | 2 +- lib/jekyll/site.rb | 4 ++-- lib/jekyll/utils.rb | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bin/jekyll b/bin/jekyll index 26754040d55..297e1175038 100755 --- a/bin/jekyll +++ b/bin/jekyll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby STDOUT.sync = true -$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w{ .. lib }) +$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w( .. lib )) require 'jekyll' require 'mercenary' diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 21929f3fe65..a2e5e381a40 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -128,7 +128,7 @@ def config_files(override) # Get configuration from /_config.yml or / config_files = override.delete('config') if config_files.to_s.empty? - default = %w[yml yaml].find(Proc.new { 'yml' }) do |ext| + default = %w(yml yaml).find(Proc.new { 'yml' }) do |ext| File.exist?(Jekyll.sanitized_path(source(override), "_config.#{ext}")) end config_files = Jekyll.sanitized_path(source(override), "_config.#{default}") @@ -227,7 +227,7 @@ def backwards_compatibilize config.delete('pygments') end - %w[include exclude].each do |option| + %w(include exclude).each do |option| config[option] ||= [] if config[option].is_a?(String) Jekyll::Deprecator.deprecation_message "The '#{option}' configuration option" \ diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb index 711c0a31ebf..8e297dca8a9 100644 --- a/lib/jekyll/converters/markdown.rb +++ b/lib/jekyll/converters/markdown.rb @@ -41,7 +41,7 @@ def valid_processors def third_party_processors self.class.constants - \ - %w[KramdownParser RDiscountParser RedcarpetParser PRIORITIES].map( + %w(KramdownParser RDiscountParser RedcarpetParser PRIORITIES).map( &:to_sym ) end diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb index 6788d96e0e8..7f5adcee069 100644 --- a/lib/jekyll/converters/markdown/redcarpet_parser.rb +++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb @@ -71,10 +71,10 @@ def class_with_proper_highlighter(highlighter) end when "rouge" Class.new(Redcarpet::Render::HTML) do - Jekyll::External.require_with_graceful_fail(%w[ + Jekyll::External.require_with_graceful_fail(%w( rouge rouge/plugins/redcarpet - ]) + )) unless Gem::Version.new(Rouge.version) > Gem::Version.new("1.3.0") abort "Please install Rouge 1.3.0 or greater and try running Jekyll again." diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index db34307ab61..b510d306555 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -160,7 +160,7 @@ def asset_file? # # Returns true if extname == .sass or .scss, false otherwise. def sass_file? - %w[.sass .scss].include?(ext) + %w(.sass .scss).include?(ext) end # Determine whether the document is a CoffeeScript file. diff --git a/lib/jekyll/deprecator.rb b/lib/jekyll/deprecator.rb index 8fda510bb3a..d4ea3c882c2 100644 --- a/lib/jekyll/deprecator.rb +++ b/lib/jekyll/deprecator.rb @@ -21,7 +21,7 @@ def process(args) end def no_subcommand(args) - if args.size > 0 && args.first =~ /^--/ && !%w[--help --version].include?(args.first) + if args.size > 0 && args.first =~ /^--/ && !%w(--help --version).include?(args.first) deprecation_message "Jekyll now uses subcommands instead of just switches. Run `jekyll --help` to find out more." abort end diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index c906e149842..f3eda04f123 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -127,7 +127,7 @@ def cleaned_relative_path # # Returns true if the extname is either .yml or .yaml, false otherwise. def yaml_file? - %w[.yaml .yml].include?(extname) + %w(.yaml .yml).include?(extname) end # Determine whether the document is an asset file. @@ -143,7 +143,7 @@ def asset_file? # # Returns true if extname == .sass or .scss, false otherwise. def sass_file? - %w[.sass .scss].include?(extname) + %w(.sass .scss).include?(extname) end # Determine whether the document is a CoffeeScript file. diff --git a/lib/jekyll/external.rb b/lib/jekyll/external.rb index 04dbb6f2f01..8124805163a 100644 --- a/lib/jekyll/external.rb +++ b/lib/jekyll/external.rb @@ -7,10 +7,10 @@ class << self # Usually contain subcommands. # def blessed_gems - %w{ + %w( jekyll-docs jekyll-import - } + ) end # diff --git a/lib/jekyll/liquid_renderer/table.rb b/lib/jekyll/liquid_renderer/table.rb index 32b09cb3f04..15a802b0382 100644 --- a/lib/jekyll/liquid_renderer/table.rb +++ b/lib/jekyll/liquid_renderer/table.rb @@ -72,7 +72,7 @@ def data_for_table(n) sorted = @stats.sort_by{ |filename, file_stats| -file_stats[:time] } sorted = sorted.slice(0, n) - table = [[ 'Filename', 'Count', 'Bytes', 'Time' ]] + table = [%w(Filename Count Bytes Time)] sorted.each do |filename, file_stats| row = [] diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb index 0644e1b650e..fb46f32463c 100644 --- a/lib/jekyll/page.rb +++ b/lib/jekyll/page.rb @@ -8,13 +8,13 @@ class Page attr_accessor :data, :content, :output # Attributes for Liquid templates - ATTRIBUTES_FOR_LIQUID = %w[ + ATTRIBUTES_FOR_LIQUID = %w( content dir name path url - ] + ) # A set of extensions that are considered HTML or HTML-like so we # should not alter them, this includes .xhtml through XHTM5. diff --git a/lib/jekyll/readers/collection_reader.rb b/lib/jekyll/readers/collection_reader.rb index 6a54321d45d..8d522551255 100644 --- a/lib/jekyll/readers/collection_reader.rb +++ b/lib/jekyll/readers/collection_reader.rb @@ -1,6 +1,6 @@ module Jekyll class CollectionReader - SPECIAL_COLLECTIONS = %w{posts data}.freeze + SPECIAL_COLLECTIONS = %w(posts data).freeze attr_reader :site, :content def initialize(site) diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index 2575eba224c..2859355cfc4 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -19,8 +19,8 @@ class Site def initialize(config) @config = config.clone - %w[safe lsi highlighter baseurl exclude include future unpublished - show_drafts limit_posts keep_files gems].each do |opt| + %w(safe lsi highlighter baseurl exclude include future unpublished + show_drafts limit_posts keep_files gems).each do |opt| self.send("#{opt}=", config[opt]) end diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index d18b41c7c57..d5c68ae4a48 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -4,7 +4,7 @@ module Utils extend self autoload :Ansi, "jekyll/utils/ansi" # Constants for use in #slugify - SLUGIFY_MODES = %w{raw default pretty} + SLUGIFY_MODES = %w(raw default pretty) SLUGIFY_RAW_REGEXP = Regexp.new('\\s+').freeze SLUGIFY_DEFAULT_REGEXP = Regexp.new('[^[:alnum:]]+').freeze SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze From ff5f7b71202663e5c693cec41f2108fbbb73ff2d Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 15:41:04 -0800 Subject: [PATCH 0164/4996] Rubocop: Style/DeprecatedHashMethods - Hash#has_key? is deprecated in favor of Hash#key? Add method `key?` to Drop --- lib/jekyll/drops/drop.rb | 13 +++++++++++++ lib/jekyll/frontmatter_defaults.rb | 4 ++-- lib/jekyll/regenerator.rb | 2 +- lib/jekyll/tags/include.rb | 4 ++-- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb index 98eb864acfa..23237a08193 100644 --- a/lib/jekyll/drops/drop.rb +++ b/lib/jekyll/drops/drop.rb @@ -83,6 +83,19 @@ def content_methods end end + # Check if key exists in Drop + # + # key - the string key whose value to fetch + # + # Returns true if the given key is present + def key?(key) + if self.class.mutable && @mutations.key?(key) + true + else + respond_to?(key) || fallback_data.key?(key) + end + end + # Generates a list of keys with user content as their values. # This gathers up the Drop methods and keys of the mutations and # underlying data hashes and performs a set union to ensure a list diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb index 673d9a99f69..edf70969165 100644 --- a/lib/jekyll/frontmatter_defaults.rb +++ b/lib/jekyll/frontmatter_defaults.rb @@ -90,7 +90,7 @@ def applies?(scope, path, type) end def applies_path?(scope, path) - return true if !scope.has_key?('path') || scope['path'].empty? + return true if !scope.key?('path') || scope['path'].empty? scope_path = Pathname.new(scope['path']) Pathname.new(sanitize_path(path)).ascend do |path| @@ -150,7 +150,7 @@ def has_precedence?(old_scope, new_scope) # Returns an array of hashes def matching_sets(path, type) valid_sets.select do |set| - !set.has_key?('scope') || applies?(set['scope'], path, type) + !set.key?('scope') || applies?(set['scope'], path, type) end end diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb index c7d47c59a9d..52ff5178f86 100644 --- a/lib/jekyll/regenerator.rb +++ b/lib/jekyll/regenerator.rb @@ -90,7 +90,7 @@ def modified?(path) return true if path.nil? # Check for path in cache - if cache.has_key? path + if cache.key? path return cache[path] end diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb index e3bee1158fd..4152e7efe10 100644 --- a/lib/jekyll/tags/include.rb +++ b/lib/jekyll/tags/include.rb @@ -115,7 +115,7 @@ def render(context) validate_path(path, dir, site.safe) # Add include to dependency tree - if context.registers[:page] && context.registers[:page].has_key?("path") + if context.registers[:page] && context.registers[:page].key?("path") site.regenerator.add_dependency( site.in_source_dir(context.registers[:page]["path"]), path @@ -138,7 +138,7 @@ def load_cached_partial(path, context) context.registers[:cached_partials] ||= {} cached_partial = context.registers[:cached_partials] - if cached_partial.has_key?(path) + if cached_partial.key?(path) cached_partial[path] else cached_partial[path] = context.registers[:site].liquid_renderer.file(path).parse(read_file(path, context)) From d157a04c6d4f3c0d23ec5cf396003b321e245ca3 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 15:47:31 -0800 Subject: [PATCH 0165/4996] Rubocop: Performance/StringReplacement - Use delete! instead of gsub! - Use tr instead of gsub --- lib/jekyll/tags/highlight.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index 13c4e8e89ab..575fb57e7bd 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -21,7 +21,7 @@ def initialize(tag_name, markup, tokens) key, value = opt.split('=') # If a quoted list, convert to array if value && value.include?("\"") - value.gsub!(/"/, "") + value.delete!('"') value = value.split end @highlight_options[key.to_sym] = value || true @@ -110,7 +110,7 @@ def render_codehighlighter(code) def add_code_tag(code) code_attributes = [ - "class=\"language-#{@lang.to_s.gsub('+', '-')}\"", + "class=\"language-#{@lang.to_s.tr('+', '-')}\"", "data-lang=\"#{@lang.to_s}\"" ].join(" ") "
#{code.chomp}
" From 2530a8cdfc4e0112e7642349b4a718ec95493b09 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 15:49:22 -0800 Subject: [PATCH 0166/4996] Rubocop: Style/HashSyntax - Use hash rockets syntax --- lib/jekyll/collection.rb | 2 +- lib/jekyll/document.rb | 6 ++-- lib/jekyll/drops/url_drop.rb | 4 +-- lib/jekyll/filters.rb | 2 +- lib/jekyll/hooks.rb | 48 +++++++++++++++---------------- lib/jekyll/readers/post_reader.rb | 4 +-- lib/jekyll/renderer.rb | 4 +-- lib/jekyll/static_file.rb | 14 ++++----- lib/jekyll/tags/highlight.rb | 2 +- 9 files changed, 43 insertions(+), 43 deletions(-) diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb index 9b9f6593ab4..5d6b272848e 100644 --- a/lib/jekyll/collection.rb +++ b/lib/jekyll/collection.rb @@ -56,7 +56,7 @@ def read full_path = collection_dir(file_path) next if File.directory?(full_path) if Utils.has_yaml_header? full_path - doc = Jekyll::Document.new(full_path, { site: site, collection: self }) + doc = Jekyll::Document.new(full_path, { :site => site, :collection => self }) doc.read if site.publisher.publish?(doc) || !write? docs << doc diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index f3eda04f123..d757839f1d6 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -197,9 +197,9 @@ def permalink # Returns the computed URL for the document. def url @url = URL.new({ - template: url_template, - placeholders: url_placeholders, - permalink: permalink + :template => url_template, + :placeholders => url_placeholders, + :permalink => permalink }).to_s end diff --git a/lib/jekyll/drops/url_drop.rb b/lib/jekyll/drops/url_drop.rb index a2bf6262c55..32aae194239 100644 --- a/lib/jekyll/drops/url_drop.rb +++ b/lib/jekyll/drops/url_drop.rb @@ -19,8 +19,8 @@ def name end def title - Utils.slugify(@obj.data['slug'], mode: "pretty", cased: true) || - Utils.slugify(@obj.basename_without_ext, mode: "pretty", cased: true) + Utils.slugify(@obj.data['slug'], :mode => "pretty", :cased => true) || + Utils.slugify(@obj.basename_without_ext, :mode => "pretty", :cased => true) end def slug diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb index 2ba0fac323d..ef40adb9775 100644 --- a/lib/jekyll/filters.rb +++ b/lib/jekyll/filters.rb @@ -45,7 +45,7 @@ def scssify(input) # Returns the given filename or title as a lowercase URL String. # See Utils.slugify for more detail. def slugify(input, mode=nil) - Utils.slugify(input, mode: mode) + Utils.slugify(input, :mode => mode) end # Format a date in short format e.g. "27 Jan 2011". diff --git a/lib/jekyll/hooks.rb b/lib/jekyll/hooks.rb index 74c01bbbbcc..a9bf79f5f67 100644 --- a/lib/jekyll/hooks.rb +++ b/lib/jekyll/hooks.rb @@ -4,37 +4,37 @@ module Hooks # compatibility layer for octopress-hooks users PRIORITY_MAP = { - low: 10, - normal: 20, - high: 30, + :low => 10, + :normal => 20, + :high => 30, }.freeze # initial empty hooks @registry = { :site => { - after_reset: [], - post_read: [], - pre_render: [], - post_render: [], - post_write: [], + :after_reset => [], + :post_read => [], + :pre_render => [], + :post_render => [], + :post_write => [], }, :pages => { - post_init: [], - pre_render: [], - post_render: [], - post_write: [], + :post_init => [], + :pre_render => [], + :post_render => [], + :post_write => [], }, :posts => { - post_init: [], - pre_render: [], - post_render: [], - post_write: [], + :post_init => [], + :pre_render => [], + :post_render => [], + :post_write => [], }, :documents => { - post_init: [], - pre_render: [], - post_render: [], - post_write: [], + :post_init => [], + :pre_render => [], + :post_render => [], + :post_write => [], }, } @@ -60,10 +60,10 @@ def self.priority_value(priority) # register a single hook to be called later, internal API def self.register_one(owner, event, priority, &block) @registry[owner] ||={ - post_init: [], - pre_render: [], - post_render: [], - post_write: [], + :post_init => [], + :pre_render => [], + :post_render => [], + :post_write => [], } unless @registry[owner][event] diff --git a/lib/jekyll/readers/post_reader.rb b/lib/jekyll/readers/post_reader.rb index c41ef10aaaf..1bf8ca290d7 100644 --- a/lib/jekyll/readers/post_reader.rb +++ b/lib/jekyll/readers/post_reader.rb @@ -53,8 +53,8 @@ def read_content(dir, magic_dir, matcher) next unless entry =~ matcher path = @site.in_source_dir(File.join(dir, magic_dir, entry)) Document.new(path, { - site: @site, - collection: @site.posts + :site => @site, + :collection => @site.posts }) end.reject(&:nil?) end diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb index 09763cca529..f7bfed3dc83 100644 --- a/lib/jekyll/renderer.rb +++ b/lib/jekyll/renderer.rb @@ -43,8 +43,8 @@ def run document.trigger_hooks(:pre_render, payload) info = { - filters: [Jekyll::Filters], - registers: { :site => site, :page => payload.page } + :filters => [Jekyll::Filters], + :registers => { :site => site, :page => payload.page } } # render and transform content (this becomes the final content of the object) diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb index efa836d1f3b..881e44b10c1 100644 --- a/lib/jekyll/static_file.rb +++ b/lib/jekyll/static_file.rb @@ -104,12 +104,12 @@ def to_liquid def placeholders { - collection: @collection.label, - path: relative_path[ + :collection => @collection.label, + :path => relative_path[ @collection.relative_directory.size..relative_path.size], - output_ext: '', - name: '', - title: '', + :output_ext => '', + :name => '', + :title => '', } end @@ -121,8 +121,8 @@ def url relative_path else ::Jekyll::URL.new({ - template: @collection.url_template, - placeholders: placeholders, + :template => @collection.url_template, + :placeholders => placeholders, }) end.to_s.gsub /\/$/, '' end diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index 575fb57e7bd..a487b40424e 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -99,7 +99,7 @@ def render_pygments(code, is_safe) def render_rouge(code) Jekyll::External.require_with_graceful_fail('rouge') - formatter = Rouge::Formatters::HTML.new(line_numbers: @highlight_options[:linenos], wrap: false) + formatter = Rouge::Formatters::HTML.new(:line_numbers => @highlight_options[:linenos], :wrap => false) lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText formatter.format(lexer.lex(code)) end From cda226de45cd052e89210ec70ed0364ee632bdd0 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 15:55:33 -0800 Subject: [PATCH 0167/4996] Rubocop: Style/EmptyLinesAroundClassBody - Extra empty line detected at class body end --- lib/jekyll.rb | 1 - lib/jekyll/command.rb | 4 ---- lib/jekyll/commands/build.rb | 4 ---- lib/jekyll/commands/clean.rb | 2 -- lib/jekyll/commands/doctor.rb | 2 -- lib/jekyll/commands/help.rb | 2 -- lib/jekyll/configuration.rb | 1 - lib/jekyll/converters/markdown/redcarpet_parser.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/site_drop.rb | 1 - lib/jekyll/drops/unified_payload_drop.rb | 1 - lib/jekyll/external.rb | 2 -- lib/jekyll/plugin_manager.rb | 1 - lib/jekyll/readers/collection_reader.rb | 1 - lib/jekyll/related_posts.rb | 1 - lib/jekyll/renderer.rb | 2 -- lib/jekyll/tags/highlight.rb | 1 - lib/jekyll/tags/include.rb | 1 - lib/jekyll/url.rb | 1 - 21 files changed, 32 deletions(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index ad8a3395f47..6c5d8f103b0 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -165,7 +165,6 @@ def sanitized_path(base_directory, questionable_path) # Conditional optimizations Jekyll::External.require_if_present('liquid-c') - end end diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb index f3c89dfd2e3..afe72a5b44f 100644 --- a/lib/jekyll/command.rb +++ b/lib/jekyll/command.rb @@ -1,8 +1,6 @@ module Jekyll class Command - class << self - # A list of subclasses of Jekyll::Command def subclasses @subclasses ||= [] @@ -62,8 +60,6 @@ def add_build_options(c) c.option 'verbose', '-V', '--verbose', 'Print verbose output.' c.option 'incremental', '-I', '--incremental', 'Enable incremental rebuild.' end - end - end end diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb index de0cc8bcab8..b75194efe8d 100644 --- a/lib/jekyll/commands/build.rb +++ b/lib/jekyll/commands/build.rb @@ -1,9 +1,7 @@ module Jekyll module Commands class Build < Command - class << self - # Create the Mercenary command for the Jekyll CLI for this Command def init_with_program(prog) prog.command(:build) do |c| @@ -71,9 +69,7 @@ def watch(site, options) External.require_with_graceful_fail 'jekyll-watch' Jekyll::Watcher.watch(options) end - end # end of class << self - end end end diff --git a/lib/jekyll/commands/clean.rb b/lib/jekyll/commands/clean.rb index 94f9bf97844..b7f9a95396f 100644 --- a/lib/jekyll/commands/clean.rb +++ b/lib/jekyll/commands/clean.rb @@ -2,7 +2,6 @@ module Jekyll module Commands class Clean < Command class << self - def init_with_program(prog) prog.command(:clean) do |c| c.syntax 'clean [subcommand]' @@ -37,7 +36,6 @@ def process(options) Jekyll.logger.info "Nothing to do for #{metadata_file}." end end - end end end diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index 953c2623a13..ba98e6539a8 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -2,7 +2,6 @@ module Jekyll module Commands class Doctor < Command class << self - def init_with_program(prog) prog.command(:doctor) do |c| c.syntax 'doctor' @@ -108,7 +107,6 @@ def case_insensitive_urls(things, destination) end end end - end end end diff --git a/lib/jekyll/commands/help.rb b/lib/jekyll/commands/help.rb index 421d87e580a..01bf3280141 100644 --- a/lib/jekyll/commands/help.rb +++ b/lib/jekyll/commands/help.rb @@ -2,7 +2,6 @@ module Jekyll module Commands class Help < Command class << self - def init_with_program(prog) prog.command(:help) do |c| c.syntax 'help [subcommand]' @@ -26,7 +25,6 @@ def invalid_command(prog, cmd) Jekyll.logger.error "Error:", "Hmm... we don't know what the '#{cmd}' command is." Jekyll.logger.info "Valid commands:", prog.commands.keys.join(", ") end - end end end diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index a2e5e381a40..f8ecd3ed31e 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -2,7 +2,6 @@ module Jekyll class Configuration < Hash - # Default options. Overridden by values in _config.yml. # Strings rather than symbols are used for compatibility with YAML. DEFAULTS = Configuration[{ diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb index 7f5adcee069..8378cb5defc 100644 --- a/lib/jekyll/converters/markdown/redcarpet_parser.rb +++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb @@ -2,7 +2,6 @@ module Jekyll module Converters class Markdown class RedcarpetParser - module CommonMethods def add_code_tags(code, lang) code = code.to_s diff --git a/lib/jekyll/drops/collection_drop.rb b/lib/jekyll/drops/collection_drop.rb index 26913230471..5f5025b1f2d 100644 --- a/lib/jekyll/drops/collection_drop.rb +++ b/lib/jekyll/drops/collection_drop.rb @@ -17,7 +17,6 @@ def to_s private def_delegator :@obj, :metadata, :fallback_data - end end end diff --git a/lib/jekyll/drops/document_drop.rb b/lib/jekyll/drops/document_drop.rb index f6e03fec546..69933752b3d 100644 --- a/lib/jekyll/drops/document_drop.rb +++ b/lib/jekyll/drops/document_drop.rb @@ -22,7 +22,6 @@ def excerpt private def_delegator :@obj, :data, :fallback_data - end end end diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb index 23237a08193..2ad107e8e35 100644 --- a/lib/jekyll/drops/drop.rb +++ b/lib/jekyll/drops/drop.rb @@ -135,7 +135,6 @@ def inspect def each_key(&block) keys.each(&block) end - end end end diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb index ec4f0910189..4d07ebe8f4a 100644 --- a/lib/jekyll/drops/site_drop.rb +++ b/lib/jekyll/drops/site_drop.rb @@ -33,7 +33,6 @@ def collections private def_delegator :@obj, :config, :fallback_data - end end end diff --git a/lib/jekyll/drops/unified_payload_drop.rb b/lib/jekyll/drops/unified_payload_drop.rb index 26b9104b6d9..b642bda2620 100644 --- a/lib/jekyll/drops/unified_payload_drop.rb +++ b/lib/jekyll/drops/unified_payload_drop.rb @@ -20,7 +20,6 @@ def site def fallback_data @fallback_data ||= {} end - end end end diff --git a/lib/jekyll/external.rb b/lib/jekyll/external.rb index 8124805163a..d213364bb68 100644 --- a/lib/jekyll/external.rb +++ b/lib/jekyll/external.rb @@ -1,7 +1,6 @@ module Jekyll module External class << self - # # Gems that, if installed, should be loaded. # Usually contain subcommands. @@ -54,7 +53,6 @@ def require_with_graceful_fail(names) end end end - end end end diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb index da7bf121509..d4ad99515fc 100644 --- a/lib/jekyll/plugin_manager.rb +++ b/lib/jekyll/plugin_manager.rb @@ -91,6 +91,5 @@ def deprecation_checks "Ensure you have `gems: [jekyll-paginate]` in your configuration file." end end - end end diff --git a/lib/jekyll/readers/collection_reader.rb b/lib/jekyll/readers/collection_reader.rb index 8d522551255..062be42a4b4 100644 --- a/lib/jekyll/readers/collection_reader.rb +++ b/lib/jekyll/readers/collection_reader.rb @@ -16,6 +16,5 @@ def read collection.read unless SPECIAL_COLLECTIONS.include?(collection.label) end end - end end diff --git a/lib/jekyll/related_posts.rb b/lib/jekyll/related_posts.rb index fbc2837bf4e..eb57a7fc981 100644 --- a/lib/jekyll/related_posts.rb +++ b/lib/jekyll/related_posts.rb @@ -1,6 +1,5 @@ module Jekyll class RelatedPosts - class << self attr_accessor :lsi end diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb index f7bfed3dc83..f9c1b88c630 100644 --- a/lib/jekyll/renderer.rb +++ b/lib/jekyll/renderer.rb @@ -2,7 +2,6 @@ module Jekyll class Renderer - attr_reader :document, :site, :payload def initialize(site, document, site_payload = nil) @@ -161,6 +160,5 @@ def place_in_layouts(content, payload, info) output end - end end diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index a487b40424e..0a5b790bd1d 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -115,7 +115,6 @@ def add_code_tag(code) ].join(" ") "
#{code.chomp}
" end - end end end diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb index 4152e7efe10..c8f08a6c166 100644 --- a/lib/jekyll/tags/include.rb +++ b/lib/jekyll/tags/include.rb @@ -12,7 +12,6 @@ def initialize(msg, path) end class IncludeTag < Liquid::Tag - attr_reader :includes_dir VALID_SYNTAX = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/ diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb index 3f00cfd337b..367872c0a4c 100644 --- a/lib/jekyll/url.rb +++ b/lib/jekyll/url.rb @@ -11,7 +11,6 @@ # module Jekyll class URL - # options - One of :permalink or :template must be supplied. # :template - The String used as template for URL generation, # for example "/:path/:basename:output_ext", where From a70d89a86231ddff7d518248ac615521a5324c3d Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 15:56:44 -0800 Subject: [PATCH 0168/4996] Rubocop: Style/SpaceAfterComma - Space missing after comma --- lib/jekyll/commands/serve.rb | 2 +- lib/jekyll/configuration.rb | 4 ++-- lib/jekyll/converters/markdown/redcarpet_parser.rb | 2 +- lib/jekyll/reader.rb | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index 4dad7600002..507a8c7131b 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -103,7 +103,7 @@ def file_handler_opts WEBrick::Config::FileHandler.merge({ :FancyIndexing => true, :NondisclosureName => [ - '.ht*','~*' + '.ht*', '~*' ] }) end diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index f8ecd3ed31e..1b459eb7736 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -18,7 +18,7 @@ class Configuration < Hash 'safe' => false, 'include' => ['.htaccess'], 'exclude' => [], - 'keep_files' => ['.git','.svn'], + 'keep_files' => ['.git', '.svn'], 'encoding' => 'utf-8', 'markdown_ext' => 'markdown,mkdown,mkdn,mkd,md', @@ -77,7 +77,7 @@ class Configuration < Hash # # Return a copy of the hash where all its keys are strings def stringify_keys - reduce({}) { |hsh,(k,v)| hsh.merge(k.to_s => v) } + reduce({}) { |hsh, (k, v)| hsh.merge(k.to_s => v) } end def get_config_value_with_override(config_key, override) diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb index 8378cb5defc..64e69eccbbc 100644 --- a/lib/jekyll/converters/markdown/redcarpet_parser.rb +++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb @@ -6,7 +6,7 @@ module CommonMethods def add_code_tags(code, lang) code = code.to_s code = code.sub(/
/, "
")
-            code = code.sub(/<\/pre>/,"
")
+            code = code.sub(/<\/pre>/, "
") end end diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb index 45a204228bc..92d2528c0ed 100644 --- a/lib/jekyll/reader.rb +++ b/lib/jekyll/reader.rb @@ -38,9 +38,9 @@ def read_directories(dir = '') base = site.in_source_dir(dir) dot = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) } - dot_dirs = dot.select{ |file| File.directory?(@site.in_source_dir(base,file)) } + dot_dirs = dot.select{ |file| File.directory?(@site.in_source_dir(base, file)) } dot_files = (dot - dot_dirs) - dot_pages = dot_files.select{ |file| Utils.has_yaml_header?(@site.in_source_dir(base,file)) } + dot_pages = dot_files.select{ |file| Utils.has_yaml_header?(@site.in_source_dir(base, file)) } dot_static_files = dot_files - dot_pages retrieve_posts(dir) @@ -69,7 +69,7 @@ def retrieve_posts(dir) # Returns nothing. def retrieve_dirs(base, dir, dot_dirs) dot_dirs.map { |file| - dir_path = site.in_source_dir(dir,file) + dir_path = site.in_source_dir(dir, file) rel_path = File.join(dir, file) @site.reader.read_directories(rel_path) unless @site.dest.sub(/\/$/, '') == dir_path } From 663a2d3279ac8ac569a3b5ec6f48c71ff93481ff Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 15:58:02 -0800 Subject: [PATCH 0169/4996] Rubocop: Style/SpaceBeforeBlockBraces Rubocop: Style/SpaceInsideBlockBraces --- lib/jekyll/configuration.rb | 2 +- lib/jekyll/document.rb | 6 +++--- lib/jekyll/filters.rb | 2 +- lib/jekyll/liquid_renderer/table.rb | 2 +- lib/jekyll/reader.rb | 6 +++--- lib/jekyll/readers/page_reader.rb | 4 ++-- lib/jekyll/readers/static_file_reader.rb | 2 +- lib/jekyll/tags/highlight.rb | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 1b459eb7736..089c231a174 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -273,7 +273,7 @@ def add_default_collections return config if config['collections'].nil? if config['collections'].is_a?(Array) - config['collections'] = Hash[config['collections'].map{|c| [c, {}]}] + config['collections'] = Hash[config['collections'].map { |c| [c, {}] }] end config['collections']['posts'] ||= {} config['collections']['posts']['output'] = true diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index d757839f1d6..4ec701272d5 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -291,7 +291,7 @@ def post_read "ext" => ext }) merge_data!({"date" => date}) if data['date'].nil? || data['date'].to_i == site.time.to_i - data['title'] ||= slug.split('-').select {|w| w.capitalize! || w }.join(' ') + data['title'] ||= slug.split('-').select { |w| w.capitalize! || w }.join(' ') end populate_categories populate_tags @@ -386,7 +386,7 @@ def generate_excerpt? end def next_doc - pos = collection.docs.index {|post| post.equal?(self) } + pos = collection.docs.index { |post| post.equal?(self) } if pos && pos < collection.docs.length - 1 collection.docs[pos + 1] else @@ -395,7 +395,7 @@ def next_doc end def previous_doc - pos = collection.docs.index {|post| post.equal?(self) } + pos = collection.docs.index { |post| post.equal?(self) } if pos && pos > 0 collection.docs[pos - 1] else diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb index ef40adb9775..be3efa62012 100644 --- a/lib/jekyll/filters.rb +++ b/lib/jekyll/filters.rb @@ -337,7 +337,7 @@ def as_liquid(item) pairs = item.map { |k, v| as_liquid([k, v]) } Hash[pairs] when Array - item.map{ |i| as_liquid(i) } + item.map { |i| as_liquid(i) } else if item.respond_to?(:to_liquid) liquidated = item.to_liquid diff --git a/lib/jekyll/liquid_renderer/table.rb b/lib/jekyll/liquid_renderer/table.rb index 15a802b0382..74ec606654a 100644 --- a/lib/jekyll/liquid_renderer/table.rb +++ b/lib/jekyll/liquid_renderer/table.rb @@ -69,7 +69,7 @@ def table_widths(data) end def data_for_table(n) - sorted = @stats.sort_by{ |filename, file_stats| -file_stats[:time] } + sorted = @stats.sort_by { |filename, file_stats| -file_stats[:time] } sorted = sorted.slice(0, n) table = [%w(Filename Count Bytes Time)] diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb index 92d2528c0ed..bc72c6579da 100644 --- a/lib/jekyll/reader.rb +++ b/lib/jekyll/reader.rb @@ -22,7 +22,7 @@ def read # Sorts posts, pages, and static files. def sort_files! - site.collections.values.each{|c| c.docs.sort!} + site.collections.values.each { |c| c.docs.sort! } site.pages.sort_by!(&:name) site.static_files.sort_by!(&:relative_path) end @@ -38,9 +38,9 @@ def read_directories(dir = '') base = site.in_source_dir(dir) dot = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) } - dot_dirs = dot.select{ |file| File.directory?(@site.in_source_dir(base, file)) } + dot_dirs = dot.select { |file| File.directory?(@site.in_source_dir(base, file)) } dot_files = (dot - dot_dirs) - dot_pages = dot_files.select{ |file| Utils.has_yaml_header?(@site.in_source_dir(base, file)) } + dot_pages = dot_files.select { |file| Utils.has_yaml_header?(@site.in_source_dir(base, file)) } dot_static_files = dot_files - dot_pages retrieve_posts(dir) diff --git a/lib/jekyll/readers/page_reader.rb b/lib/jekyll/readers/page_reader.rb index 12e7074814f..97748c01e58 100644 --- a/lib/jekyll/readers/page_reader.rb +++ b/lib/jekyll/readers/page_reader.rb @@ -14,8 +14,8 @@ def initialize(site, dir) # # Returns an array of static pages. def read(files) - files.map{ |page| @unfiltered_content << Page.new(@site, @site.source, @dir, page) } - @unfiltered_content.select{ |page| site.publisher.publish?(page) } + files.map { |page| @unfiltered_content << Page.new(@site, @site.source, @dir, page) } + @unfiltered_content.select { |page| site.publisher.publish?(page) } end end end diff --git a/lib/jekyll/readers/static_file_reader.rb b/lib/jekyll/readers/static_file_reader.rb index b95981a8f39..8def1365ab0 100644 --- a/lib/jekyll/readers/static_file_reader.rb +++ b/lib/jekyll/readers/static_file_reader.rb @@ -14,7 +14,7 @@ def initialize(site, dir) # # Returns an array of static files. def read(files) - files.map{ |file| @unfiltered_content << StaticFile.new(@site, @site.source, @dir, file)} + files.map { |file| @unfiltered_content << StaticFile.new(@site, @site.source, @dir, file) } @unfiltered_content end end diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index 0a5b790bd1d..d0d7088222f 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -68,7 +68,7 @@ def sanitized_opts(opts, is_safe) [:linenos, opts.fetch(:linenos, nil)], [:encoding, opts.fetch(:encoding, 'utf-8')], [:cssclass, opts.fetch(:cssclass, nil)] - ].reject {|f| f.last.nil? }] + ].reject { |f| f.last.nil? }] else opts end From 704ca6b8cc4eee5e263f088ca91c383c6ec7f0fa Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 15:59:12 -0800 Subject: [PATCH 0170/4996] Rubocop: Style/NegatedIf - Favor unless over if for negative conditions --- lib/jekyll/cleaner.rb | 2 +- lib/jekyll/commands/doctor.rb | 2 +- lib/jekyll/commands/serve/servlet.rb | 2 +- lib/jekyll/converters/markdown.rb | 2 +- lib/jekyll/regenerator.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb index ca8a0ca99f6..6c89e2bce78 100644 --- a/lib/jekyll/cleaner.rb +++ b/lib/jekyll/cleaner.rb @@ -13,7 +13,7 @@ def initialize(site) # Cleans up the site's destination directory def cleanup! FileUtils.rm_rf(obsolete_files) - FileUtils.rm_rf(metadata_file) if !@site.incremental? + FileUtils.rm_rf(metadata_file) unless @site.incremental? end private diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index ba98e6539a8..42bb0110278 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -59,7 +59,7 @@ def conflicting_urls(site) end def fsnotify_buggy?(site) - return true if !Utils::Platforms.osx? + return true unless Utils::Platforms.osx? if Dir.pwd != `pwd`.strip Jekyll.logger.error " " + <<-STR.strip.gsub(/\n\s+/, "\n ") We have detected that there might be trouble using fsevent on your diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb index fa376f6118d..7930eb6131c 100644 --- a/lib/jekyll/commands/serve/servlet.rb +++ b/lib/jekyll/commands/serve/servlet.rb @@ -52,7 +52,7 @@ def validate_and_ensure_charset(req, res) def set_defaults hash_ = @jekyll_opts.fetch("webrick", {}).fetch("headers", {}) DEFAULTS.each_with_object(@headers = hash_) do |(key, val), hash| - hash[key] = val if !hash.key?(key) + hash[key] = val unless hash.key?(key) end end end diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb index 8e297dca8a9..07675427931 100644 --- a/lib/jekyll/converters/markdown.rb +++ b/lib/jekyll/converters/markdown.rb @@ -7,7 +7,7 @@ class Markdown < Converter def setup return if @setup - if (!@parser = get_processor) + unless (@parser = get_processor) Jekyll.logger.error "Invalid Markdown processor given:", @config["markdown"] Jekyll.logger.info "", "Custom processors are not loaded in safe mode" if @config["safe"] Jekyll.logger.error "", "Available processors are: #{valid_processors.join(", ")}" diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb index 52ff5178f86..cd672830fa4 100644 --- a/lib/jekyll/regenerator.rb +++ b/lib/jekyll/regenerator.rb @@ -119,7 +119,7 @@ def modified?(path) def add_dependency(path, dependency) return if (metadata[path].nil? || @disabled) - if !metadata[path]["deps"].include? dependency + unless metadata[path]["deps"].include? dependency metadata[path]["deps"] << dependency add(dependency) unless metadata.include?(dependency) end From af5d51289f6c425f48be89a9064200f222b0eb29 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 16:02:32 -0800 Subject: [PATCH 0171/4996] Rubocop: Style/SymbolProc - Pass &:to_sym as an argument to map instead of a block - Pass &:capitalize as an argument to select instead of a block - Pass &:to_s as an argument to map instead of a block --- lib/jekyll/converters/markdown/rdiscount_parser.rb | 2 +- lib/jekyll/document.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/converters/markdown/rdiscount_parser.rb b/lib/jekyll/converters/markdown/rdiscount_parser.rb index fb5172e7a5e..daf8874edd6 100644 --- a/lib/jekyll/converters/markdown/rdiscount_parser.rb +++ b/lib/jekyll/converters/markdown/rdiscount_parser.rb @@ -5,7 +5,7 @@ class RDiscountParser def initialize(config) Jekyll::External.require_with_graceful_fail "rdiscount" @config = config - @rdiscount_extensions = @config['rdiscount']['extensions'].map { |e| e.to_sym } + @rdiscount_extensions = @config['rdiscount']['extensions'].map(&:to_sym) end def convert(content) diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 4ec701272d5..9e588dedb65 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -291,7 +291,7 @@ def post_read "ext" => ext }) merge_data!({"date" => date}) if data['date'].nil? || data['date'].to_i == site.time.to_i - data['title'] ||= slug.split('-').select { |w| w.capitalize! || w }.join(' ') + data['title'] ||= slug.split('-').select(&:capitalize).join(' ') end populate_categories populate_tags @@ -317,7 +317,7 @@ def populate_categories merge_data!({ 'categories' => ( Array(data['categories']) + Utils.pluralized_array_from_hash(data, 'category', 'categories') - ).map { |c| c.to_s }.flatten.uniq + ).map(&:to_s).flatten.uniq }) end From 7ca4f7cd62d5d9d6a6375d96cbda8bc223cd4abe Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 16:18:26 -0800 Subject: [PATCH 0172/4996] Rubocop: Style/Proc - Use proc instead of Proc.new ...and use lambda instead of proc --- lib/jekyll/configuration.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 089c231a174..353e437a0c0 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -127,7 +127,7 @@ def config_files(override) # Get configuration from /_config.yml or / config_files = override.delete('config') if config_files.to_s.empty? - default = %w(yml yaml).find(Proc.new { 'yml' }) do |ext| + default = %w(yml yaml).find(-> { 'yml' }) do |ext| File.exist?(Jekyll.sanitized_path(source(override), "_config.#{ext}")) end config_files = Jekyll.sanitized_path(source(override), "_config.#{default}") From 11f0aab4b1c257fa87f73d87c71af41268dc127a Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 16:24:13 -0800 Subject: [PATCH 0173/4996] Rubocop: Lint/UnusedBlockArgument - Unused block argument --- bin/jekyll | 2 +- lib/jekyll/commands/build.rb | 2 +- lib/jekyll/commands/clean.rb | 2 +- lib/jekyll/commands/doctor.rb | 2 +- lib/jekyll/document.rb | 2 +- lib/jekyll/drops/drop.rb | 2 +- lib/jekyll/liquid_renderer.rb | 2 +- lib/jekyll/liquid_renderer/table.rb | 2 +- lib/jekyll/page.rb | 2 +- lib/jekyll/site.rb | 2 +- lib/jekyll/stevenson.rb | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bin/jekyll b/bin/jekyll index 297e1175038..173a58d3842 100755 --- a/bin/jekyll +++ b/bin/jekyll @@ -28,7 +28,7 @@ Mercenary.program(:jekyll) do |p| Jekyll::Command.subclasses.each { |c| c.init_with_program(p) } - p.action do |args, options| + p.action do |args, _| if args.empty? Jekyll.logger.error "A subcommand is required." puts p diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb index b75194efe8d..cf6d7ea0996 100644 --- a/lib/jekyll/commands/build.rb +++ b/lib/jekyll/commands/build.rb @@ -11,7 +11,7 @@ def init_with_program(prog) add_build_options(c) - c.action do |args, options| + c.action do |_, options| options["serving"] = false Jekyll::Commands::Build.process(options) end diff --git a/lib/jekyll/commands/clean.rb b/lib/jekyll/commands/clean.rb index b7f9a95396f..371b7043ab6 100644 --- a/lib/jekyll/commands/clean.rb +++ b/lib/jekyll/commands/clean.rb @@ -9,7 +9,7 @@ def init_with_program(prog) add_build_options(c) - c.action do |args, options| + c.action do |_, options| Jekyll::Commands::Clean.process(options) end end diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index 42bb0110278..32600741e00 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -10,7 +10,7 @@ def init_with_program(prog) c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file' - c.action do |args, options| + c.action do |_, options| Jekyll::Commands::Doctor.process(options) end end diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 9e588dedb65..5b8c904441d 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -32,7 +32,7 @@ def initialize(path, relations = {}) categories_from_path(collection.relative_directory) end - data.default_proc = proc do |hash, key| + data.default_proc = proc do |_, key| site.frontmatter_defaults.find(relative_path, collection.label, key) end diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb index 2ad107e8e35..c194a5baada 100644 --- a/lib/jekyll/drops/drop.rb +++ b/lib/jekyll/drops/drop.rb @@ -114,7 +114,7 @@ def keys # # Returns a Hash with all the keys and values resolved. def to_h - keys.each_with_object({}) do |(key, val), result| + keys.each_with_object({}) do |(key, _), result| result[key] = self[key] end end diff --git a/lib/jekyll/liquid_renderer.rb b/lib/jekyll/liquid_renderer.rb index 0edeb44b367..70f7b0d194e 100644 --- a/lib/jekyll/liquid_renderer.rb +++ b/lib/jekyll/liquid_renderer.rb @@ -15,7 +15,7 @@ def reset def file(filename) filename = @site.in_source_dir(filename).sub(/\A#{Regexp.escape(@site.source)}\//, '') - LiquidRenderer::File.new(self, filename).tap do |file| + LiquidRenderer::File.new(self, filename).tap do @stats[filename] ||= {} @stats[filename][:count] ||= 0 @stats[filename][:count] += 1 diff --git a/lib/jekyll/liquid_renderer/table.rb b/lib/jekyll/liquid_renderer/table.rb index 74ec606654a..e3e0c8af09f 100644 --- a/lib/jekyll/liquid_renderer/table.rb +++ b/lib/jekyll/liquid_renderer/table.rb @@ -69,7 +69,7 @@ def table_widths(data) end def data_for_table(n) - sorted = @stats.sort_by { |filename, file_stats| -file_stats[:time] } + sorted = @stats.sort_by { |_, file_stats| -file_stats[:time] } sorted = sorted.slice(0, n) table = [%w(Filename Count Bytes Time)] diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb index fb46f32463c..aaf472cfe04 100644 --- a/lib/jekyll/page.rb +++ b/lib/jekyll/page.rb @@ -41,7 +41,7 @@ def initialize(site, base, dir, name) process(name) read_yaml(File.join(base, dir), name) - data.default_proc = proc do |hash, key| + data.default_proc = proc do |_, key| site.frontmatter_defaults.find(File.join(dir, name), type, key) end diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index 2859355cfc4..3ed60c121a2 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -165,7 +165,7 @@ def render Jekyll::Hooks.trigger :site, :pre_render, self, payload - collections.each do |label, collection| + collections.each 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/stevenson.rb b/lib/jekyll/stevenson.rb index ea26c8b56c7..d6dd5434fdb 100644 --- a/lib/jekyll/stevenson.rb +++ b/lib/jekyll/stevenson.rb @@ -5,7 +5,7 @@ def initialize @level = DEBUG @default_formatter = Formatter.new @logdev = $stdout - @formatter = proc do |severity, datetime, progname, msg| + @formatter = proc do |_, _, _, msg| "#{msg}" end end From e3189e38282d17b894d6984dfb35f9c86dd33a80 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 17:07:39 -0800 Subject: [PATCH 0174/4996] Rubocop: Lint/UnusedMethodArgument --- lib/jekyll/commands/build.rb | 2 +- lib/jekyll/commands/doctor.rb | 2 +- lib/jekyll/commands/serve/servlet.rb | 2 +- lib/jekyll/configuration.rb | 2 +- lib/jekyll/converters/identity.rb | 2 +- lib/jekyll/converters/markdown.rb | 2 +- lib/jekyll/converters/markdown/redcarpet_parser.rb | 2 +- lib/jekyll/reader.rb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb index cf6d7ea0996..d505e2fb3ff 100644 --- a/lib/jekyll/commands/build.rb +++ b/lib/jekyll/commands/build.rb @@ -65,7 +65,7 @@ def build(site, options) # options - A Hash of options passed to the command # # Returns nothing. - def watch(site, options) + def watch(_site, options) External.require_with_graceful_fail 'jekyll-watch' Jekyll::Watcher.watch(options) end diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index 32600741e00..c6ba4fd4452 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -58,7 +58,7 @@ def conflicting_urls(site) conflicting_urls end - def fsnotify_buggy?(site) + def fsnotify_buggy?(_site) return true unless Utils::Platforms.osx? if Dir.pwd != `pwd`.strip Jekyll.logger.error " " + <<-STR.strip.gsub(/\n\s+/, "\n ") diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb index 7930eb6131c..cf4952168b2 100644 --- a/lib/jekyll/commands/serve/servlet.rb +++ b/lib/jekyll/commands/serve/servlet.rb @@ -37,7 +37,7 @@ def do_GET(req, res) # private - def validate_and_ensure_charset(req, res) + def validate_and_ensure_charset(_req, res) key = res.header.keys.grep(/content-type/i).first typ = res.header[key] diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 353e437a0c0..0229e073e5c 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -282,7 +282,7 @@ def add_default_collections config end - def renamed_key(old, new, config, allowed_values = nil) + def renamed_key(old, new, config, _ = nil) if config.key?(old) Jekyll::Deprecator.deprecation_message "The '#{old}' configuration" \ "option has been renamed to '#{new}'. Please update your config " \ diff --git a/lib/jekyll/converters/identity.rb b/lib/jekyll/converters/identity.rb index 69171b008ab..9574769d1a9 100644 --- a/lib/jekyll/converters/identity.rb +++ b/lib/jekyll/converters/identity.rb @@ -5,7 +5,7 @@ class Identity < Converter priority :lowest - def matches(ext) + def matches(_ext) true end diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb index 07675427931..e6efabf5be7 100644 --- a/lib/jekyll/converters/markdown.rb +++ b/lib/jekyll/converters/markdown.rb @@ -56,7 +56,7 @@ def matches(ext) extname_list.include?(ext.downcase) end - def output_ext(ext) + def output_ext(_ext) ".html" end diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb index 64e69eccbbc..fd1b0461921 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 protected - def rouge_formatter(lexer) + def rouge_formatter(_lexer) Rouge::Formatters::HTML.new(:wrap => false) end end diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb index bc72c6579da..2926971b773 100644 --- a/lib/jekyll/reader.rb +++ b/lib/jekyll/reader.rb @@ -67,7 +67,7 @@ def retrieve_posts(dir) # dot_dirs - The Array of subdirectories in the dir. # # Returns nothing. - def retrieve_dirs(base, dir, dot_dirs) + def retrieve_dirs(_base, dir, dot_dirs) dot_dirs.map { |file| dir_path = site.in_source_dir(dir, file) rel_path = File.join(dir, file) From fd8fdd87d32f2be1a9bdccfd475c32e291969163 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 17:10:39 -0800 Subject: [PATCH 0175/4996] Rubocop: Style/RegexpLiteral --- lib/jekyll/static_file.rb | 2 +- lib/jekyll/url.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb index 881e44b10c1..72c267411ba 100644 --- a/lib/jekyll/static_file.rb +++ b/lib/jekyll/static_file.rb @@ -124,7 +124,7 @@ def url :template => @collection.url_template, :placeholders => placeholders, }) - end.to_s.gsub /\/$/, '' + end.to_s.gsub(/\/$/, '') end # Returns the type of the collection if present, nil otherwise. diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb index 367872c0a4c..950945a7714 100644 --- a/lib/jekyll/url.rb +++ b/lib/jekyll/url.rb @@ -92,7 +92,7 @@ def generate_url_from_drop(template) # as well as the beginning "/" so we can enforce and ensure it. def sanitize_url(str) - "/" + str.gsub(/\/{2,}/, "/").gsub(%r!\.+\/|\A/+!, "") + "/" + str.gsub(/\/{2,}/, "/").gsub(/\.+\/|\A\/+/, "") end # Escapes a path to be a valid URL path segment From 4c5d77a4b54866df0d6d862a68a5fa22b4f98cf1 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 17:14:41 -0800 Subject: [PATCH 0176/4996] Rubocop: Style/EmptyLines --- lib/jekyll/converters/markdown/redcarpet_parser.rb | 1 - lib/jekyll/page.rb | 1 - lib/jekyll/regenerator.rb | 2 -- lib/jekyll/related_posts.rb | 1 - lib/jekyll/utils.rb | 1 - 5 files changed, 6 deletions(-) diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb index fd1b0461921..12b4f3fb9cb 100644 --- a/lib/jekyll/converters/markdown/redcarpet_parser.rb +++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb @@ -52,7 +52,6 @@ def rouge_formatter(_lexer) end end - def initialize(config) External.require_with_graceful_fail("redcarpet") @config = config diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb index aaf472cfe04..019cb0956c2 100644 --- a/lib/jekyll/page.rb +++ b/lib/jekyll/page.rb @@ -37,7 +37,6 @@ def initialize(site, base, dir, name) @dir = dir @name = name - process(name) read_yaml(File.join(base, dir), name) diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb index cd672830fa4..1e751f7da63 100644 --- a/lib/jekyll/regenerator.rb +++ b/lib/jekyll/regenerator.rb @@ -62,7 +62,6 @@ def clear clear_cache end - # Clear just the cache # # Returns nothing @@ -70,7 +69,6 @@ def clear_cache @cache = {} end - # Checks if the source has been modified or the # destination is missing # diff --git a/lib/jekyll/related_posts.rb b/lib/jekyll/related_posts.rb index eb57a7fc981..51ae8d8f4af 100644 --- a/lib/jekyll/related_posts.rb +++ b/lib/jekyll/related_posts.rb @@ -23,7 +23,6 @@ def build end end - def build_index self.class.lsi ||= begin lsi = ClassifierReborn::LSI.new(:auto_rebuild => false) diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index d5c68ae4a48..0760d9e3194 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -225,7 +225,6 @@ def add_permalink_suffix(template, permalink_style) template end - # Work the same way as Dir.glob but seperating the input into two parts # ('dir' + '/' + 'pattern') to make sure the first part('dir') does not act # as a pattern. From 13c980c8967bb0d6e7e65868908be32d4e05e633 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 17:16:17 -0800 Subject: [PATCH 0177/4996] Rubocop: Style/TrailingComma --- lib/jekyll/hooks.rb | 14 +++++++------- lib/jekyll/static_file.rb | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/jekyll/hooks.rb b/lib/jekyll/hooks.rb index a9bf79f5f67..869bcc1f380 100644 --- a/lib/jekyll/hooks.rb +++ b/lib/jekyll/hooks.rb @@ -6,7 +6,7 @@ module Hooks PRIORITY_MAP = { :low => 10, :normal => 20, - :high => 30, + :high => 30 }.freeze # initial empty hooks @@ -16,26 +16,26 @@ module Hooks :post_read => [], :pre_render => [], :post_render => [], - :post_write => [], + :post_write => [] }, :pages => { :post_init => [], :pre_render => [], :post_render => [], - :post_write => [], + :post_write => [] }, :posts => { :post_init => [], :pre_render => [], :post_render => [], - :post_write => [], + :post_write => [] }, :documents => { :post_init => [], :pre_render => [], :post_render => [], - :post_write => [], - }, + :post_write => [] + } } # map of all hooks and their priorities @@ -63,7 +63,7 @@ def self.register_one(owner, event, priority, &block) :post_init => [], :pre_render => [], :post_render => [], - :post_write => [], + :post_write => [] } unless @registry[owner][event] diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb index 72c267411ba..7938a0505ae 100644 --- a/lib/jekyll/static_file.rb +++ b/lib/jekyll/static_file.rb @@ -109,7 +109,7 @@ def placeholders @collection.relative_directory.size..relative_path.size], :output_ext => '', :name => '', - :title => '', + :title => '' } end @@ -122,7 +122,7 @@ def url else ::Jekyll::URL.new({ :template => @collection.url_template, - :placeholders => placeholders, + :placeholders => placeholders }) end.to_s.gsub(/\/$/, '') end From f221b925b4fee632ec62653f3f9848e2d7763c22 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 3 Jan 2016 17:16:58 -0800 Subject: [PATCH 0178/4996] Rubocop: Lint/StringConversionInInterpolation - Redundant use of Object#to_s in interpolation --- lib/jekyll/tags/highlight.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index d0d7088222f..027865cde17 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -111,7 +111,7 @@ def render_codehighlighter(code) def add_code_tag(code) code_attributes = [ "class=\"language-#{@lang.to_s.tr('+', '-')}\"", - "data-lang=\"#{@lang.to_s}\"" + "data-lang=\"#{@lang}\"" ].join(" ") "
#{code.chomp}
" end From 2c9a349f9aafab1fff4ea15bd4cf52f4cf33d00e Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Mon, 4 Jan 2016 11:06:12 -0800 Subject: [PATCH 0179/4996] Rubocop: Style/Next - Use next to skip iteration --- lib/jekyll/commands/doctor.rb | 6 ++++-- lib/jekyll/tags/post_url.rb | 12 ++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index c6ba4fd4452..3a263501568 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -50,7 +50,8 @@ def conflicting_urls(site) urls = {} urls = collect_urls(urls, site.pages, site.dest) urls = collect_urls(urls, site.posts.docs, site.dest) - urls.select { |_, p| p.size > 1 }.each do |url, paths| + urls.each do |url, paths| + next unless paths.size > 1 conflicting_urls = true Jekyll.logger.warn "Conflict:", "The URL '#{url}' is the destination" \ " for the following pages: #{paths.join(", ")}" @@ -77,7 +78,8 @@ 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.select { |_, p| p.size > 1 }.each do |_, real_urls| + urls.each do |case_insensitive_url, real_urls| + next unless real_urls.uniq.size > 1 urls_only_differ_by_case = true Jekyll.logger.warn "Warning:", "The following URLs only differ" \ " by case. On a case-insensitive file system one of the URLs" \ diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb index 723eafd7a6f..5b3df093f8c 100644 --- a/lib/jekyll/tags/post_url.rb +++ b/lib/jekyll/tags/post_url.rb @@ -59,21 +59,21 @@ def initialize(tag_name, post, tokens) def render(context) site = context.registers[:site] - post = site.posts.docs.find { |p| @post == p } - if post - return post.url + site.posts.docs.each do |p| + return p.url if @post == p end # New matching method did not match, fall back to old method # with deprecation warning if this matches - post = site.posts.docs.find { |p| @post.deprecated_equality p } - if post + + site.posts.docs.each do |p| + next unless @post.deprecated_equality p Jekyll::Deprecator.deprecation_message "A call to '{{ post_url #{@post.name} }}' did not match " \ "a post using the new matching method of checking name " \ "(path-date-slug) equality. Please make sure that you " \ "change this tag to match the post's name exactly." - return post.url + return p.url end raise ArgumentError.new <<-eos From 046928e39584e3d15a9b9a4a73a2e8e35ff51bee Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 4 Jan 2016 11:14:19 -0800 Subject: [PATCH 0180/4996] upgrading docs: add note about removing relative permalinks support (2 to 3) Ref: #4303. --- site/_docs/upgrading/2-to-3.md | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md index c01be517960..e3529f63164 100644 --- a/site/_docs/upgrading/2-to-3.md +++ b/site/_docs/upgrading/2-to-3.md @@ -71,15 +71,22 @@ go back to using Pygments, set `highlighter: pygments` in your `_config.yml` file and run `gem install pygments.rb` or add `gem 'pygments.rb'` to your project's `Gemfile`. -### Relative Permalinks deprecated +### Relative Permalink support removed -In Jekyll 3 and above, relative permalinks have been deprecated. If you created your site using Jekyll 2 and below, you may receive the following error when trying to **serve** or **build**: +In Jekyll 3 and above, relative permalinks have been deprecated. If you +created your site using Jekyll 2 and below, you may receive the following +error when trying to **serve** or **build**: - Since v3.0, permalinks for pages in subfolders must be relative to the site source directory, not the parent directory. Check http://jekyllrb.com/docs/upgrading/ for more info. - -This can be fixed by removing the following line from your _config.yml file: +{% highlight text %} +Since v3.0, permalinks for pages in subfolders must be relative to the site +source directory, not the parent directory. Check +http://jekyllrb.com/docs/upgrading/ for more info. +{% endhighlight %} - relative_permalinks: true +This can be fixed by removing the following line from your `_config.yml` file: +{% highlight yaml %} +relative_permalinks: true +{% endhighlight %} _Did we miss something? Please click "Improve this page" above and add a section. Thanks!_ From f6fd9014bae10df4404a3bab0b4b607146ccd743 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Mon, 4 Jan 2016 11:15:37 -0800 Subject: [PATCH 0181/4996] Rubocop: Style/CaseIndentation - Indent when as deep as case --- lib/jekyll/converters/markdown.rb | 6 +++--- lib/jekyll/frontmatter_defaults.rb | 27 ++++++++++++++------------- lib/jekyll/readers/data_reader.rb | 14 +++++++------- lib/jekyll/utils.rb | 21 +++++++++++---------- 4 files changed, 35 insertions(+), 33 deletions(-) diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb index e6efabf5be7..bb7b7ffa2b5 100644 --- a/lib/jekyll/converters/markdown.rb +++ b/lib/jekyll/converters/markdown.rb @@ -19,9 +19,9 @@ def setup def get_processor case @config["markdown"].downcase - when "redcarpet" then return RedcarpetParser.new(@config) - when "kramdown" then return KramdownParser.new(@config) - when "rdiscount" then return RDiscountParser.new(@config) + when "redcarpet" then return RedcarpetParser.new(@config) + when "kramdown" then return KramdownParser.new(@config) + when "rdiscount" then return RDiscountParser.new(@config) else get_custom_processor end diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb index edf70969165..877f517ef08 100644 --- a/lib/jekyll/frontmatter_defaults.rb +++ b/lib/jekyll/frontmatter_defaults.rb @@ -13,19 +13,20 @@ def initialize(site) def update_deprecated_types(set) return set unless set.key?('scope') && set['scope'].key?('type') - set['scope']['type'] = case set['scope']['type'] - when 'page' - Deprecator.defaults_deprecate_type('page', 'pages') - 'pages' - when 'post' - Deprecator.defaults_deprecate_type('post', 'posts') - 'posts' - when 'draft' - Deprecator.defaults_deprecate_type('draft', 'drafts') - 'drafts' - else - set['scope']['type'] - end + set['scope']['type'] = + case set['scope']['type'] + when 'page' + Deprecator.defaults_deprecate_type('page', 'pages') + 'pages' + when 'post' + Deprecator.defaults_deprecate_type('post', 'posts') + 'posts' + when 'draft' + Deprecator.defaults_deprecate_type('draft', 'drafts') + 'drafts' + else + set['scope']['type'] + end set end diff --git a/lib/jekyll/readers/data_reader.rb b/lib/jekyll/readers/data_reader.rb index cbb24be3053..870fc2dc46d 100644 --- a/lib/jekyll/readers/data_reader.rb +++ b/lib/jekyll/readers/data_reader.rb @@ -50,13 +50,13 @@ def read_data_to(dir, data) # Returns the contents of the data file. def read_data_file(path) case File.extname(path).downcase - when '.csv' - CSV.read(path, { - :headers => true, - :encoding => site.config['encoding'] - }).map(&:to_hash) - else - SafeYAML.load_file(path) + when '.csv' + CSV.read(path, { + :headers => true, + :encoding => site.config['encoding'] + }).map(&:to_hash) + else + SafeYAML.load_file(path) end end diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index 0760d9e3194..1d81e0f0435 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -164,16 +164,17 @@ def slugify(string, mode: nil, cased: false) 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 - end + 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 + end # Strip according to the mode slug = string.gsub(re, '-') From c4047c37b2186adc89743e6ccafc3d2e4472b980 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 4 Jan 2016 11:16:05 -0800 Subject: [PATCH 0182/4996] Update history to reflect merge of #4303 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index b45e565b28d..cb91e071f05 100644 --- a/History.markdown +++ b/History.markdown @@ -58,6 +58,7 @@ * Add `jekyll-responsive_image` to list of third-party plugins (#4286) * Add `jekyll-commonmark` to list of third-party plugins (#4299) * Add documentation for incremental regeneration (#4293) + * Add note about removal of relative permalink support in upgrading docs (#4303) ## 3.0.1 / 2015-11-17 From af9ec6831d7652c423e29a32aff418da783757d0 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Mon, 4 Jan 2016 11:23:06 -0800 Subject: [PATCH 0183/4996] Rubocop: Style/ElseAlignment - Align else with if Rubocop: Lint/EndAlignment - Align end with if --- lib/jekyll/regenerator.rb | 25 +++++++++++++------------ lib/jekyll/static_file.rb | 14 +++++++------- lib/jekyll/tags/include.rb | 12 ++++++------ 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb index 1e751f7da63..bb9284aa11f 100644 --- a/lib/jekyll/regenerator.rb +++ b/lib/jekyll/regenerator.rb @@ -155,20 +155,21 @@ def disabled? # # Returns the read metadata. def read_metadata - @metadata = if !disabled? && File.file?(metadata_file) - content = File.binread(metadata_file) - - begin - Marshal.load(content) - rescue TypeError - SafeYAML.load(content) - rescue ArgumentError => e - Jekyll.logger.warn("Failed to load #{metadata_file}: #{e}") + @metadata = + if !disabled? && File.file?(metadata_file) + content = File.binread(metadata_file) + + begin + Marshal.load(content) + rescue TypeError + SafeYAML.load(content) + rescue ArgumentError => e + Jekyll.logger.warn("Failed to load #{metadata_file}: #{e}") + {} + end + else {} end - else - {} - end end end end diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb index 7938a0505ae..0ed0fbfec4b 100644 --- a/lib/jekyll/static_file.rb +++ b/lib/jekyll/static_file.rb @@ -118,13 +118,13 @@ def placeholders # be overriden in the collection's configuration in _config.yml. def url @url ||= if @collection.nil? - relative_path - else - ::Jekyll::URL.new({ - :template => @collection.url_template, - :placeholders => placeholders - }) - end.to_s.gsub(/\/$/, '') + relative_path + else + ::Jekyll::URL.new({ + :template => @collection.url_template, + :placeholders => placeholders + }) + end.to_s.gsub(/\/$/, '') end # Returns the type of the collection if present, nil otherwise. diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb index c8f08a6c166..b92e5b85449 100644 --- a/lib/jekyll/tags/include.rb +++ b/lib/jekyll/tags/include.rb @@ -42,12 +42,12 @@ def parse_params(context) markup = markup[match.end(0)..-1] value = if match[2] - match[2].gsub(/\\"/, '"') - elsif match[3] - match[3].gsub(/\\'/, "'") - elsif match[4] - context[match[4]] - end + match[2].gsub(/\\"/, '"') + elsif match[3] + match[3].gsub(/\\'/, "'") + elsif match[4] + context[match[4]] + end params[match[1]] = value end From f9926edbc44a2b5ef74b693e2da186577ed5eb02 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Mon, 4 Jan 2016 11:39:14 -0800 Subject: [PATCH 0184/4996] Rubocop: Style/TrivialAccessors - Use `attr_writer` to define trivial writer methods --- lib/jekyll/document.rb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 5b8c904441d..0d23ac88d1e 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -4,7 +4,8 @@ module Jekyll class Document include Comparable - attr_reader :path, :site, :extname, :output_ext, :content, :output, :collection + attr_reader :path, :site, :extname, :output_ext, :collection + attr_accessor :content, :output YAML_FRONT_MATTER_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m DATELESS_FILENAME_MATCHER = /^(.*)(\.[^.]+)$/ @@ -39,14 +40,6 @@ def initialize(path, relations = {}) trigger_hooks(:post_init) end - def output=(output) - @output = output - end - - def content=(content) - @content = content - end - # Fetch the Document's data. # # Returns a Hash containing the data. An empty hash is returned if From 78e9f3389e17231ef0c3af934a63a3a8ef8fbe93 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Mon, 4 Jan 2016 11:42:17 -0800 Subject: [PATCH 0185/4996] Rubocop: Style/IndentationWidth --- lib/jekyll/collection.rb | 2 +- lib/jekyll/document.rb | 2 +- lib/jekyll/filters.rb | 2 +- lib/jekyll/tags/highlight.rb | 2 +- lib/jekyll/tags/include.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb index 5d6b272848e..ea6a81b6fc6 100644 --- a/lib/jekyll/collection.rb +++ b/lib/jekyll/collection.rb @@ -187,7 +187,7 @@ def write? # Returns the URL template to render collection's documents at. def url_template metadata.fetch('permalink') do - Utils.add_permalink_suffix("/:collection/:path", site.permalink_style) + Utils.add_permalink_suffix("/:collection/:path", site.permalink_style) end end diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 0d23ac88d1e..7d7e6bb4aa6 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -60,7 +60,7 @@ def merge_data!(other) end Utils.deep_merge_hashes!(data, other) if data.key?('date') && !data['date'].is_a?(Time) - data['date'] = Utils.parse_date(data['date'].to_s, "Document '#{relative_path}' does not have a valid date in the YAML front matter.") + data['date'] = Utils.parse_date(data['date'].to_s, "Document '#{relative_path}' does not have a valid date in the YAML front matter.") end data end diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb index be3efa62012..734457cb682 100644 --- a/lib/jekyll/filters.rb +++ b/lib/jekyll/filters.rb @@ -223,7 +223,7 @@ def where(input, property, value) # Returns the filtered array of objects def sort(input, property = nil, nils = "first") if input.nil? - raise ArgumentError.new("Cannot sort a null object.") + raise ArgumentError.new("Cannot sort a null object.") end if property.nil? input.sort diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index 027865cde17..5881fa58ea9 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -21,7 +21,7 @@ def initialize(tag_name, markup, tokens) key, value = opt.split('=') # If a quoted list, convert to array if value && value.include?("\"") - value.delete!('"') + value.delete!('"') value = value.split end @highlight_options[key.to_sym] = value || true diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb index b92e5b85449..847e66380e0 100644 --- a/lib/jekyll/tags/include.rb +++ b/lib/jekyll/tags/include.rb @@ -56,7 +56,7 @@ def parse_params(context) def validate_file_name(file) if file !~ /^[a-zA-Z0-9_\/\.-]+$/ || file =~ /\.\// || file =~ /\/\./ - raise ArgumentError.new <<-eos + raise ArgumentError.new <<-eos Invalid syntax for include tag. File contains invalid characters or sequences: #{file} From 085a778b0a9b7e87f9b1698e31fc745ac9de2118 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Mon, 4 Jan 2016 11:46:25 -0800 Subject: [PATCH 0186/4996] Rubocop: Style/NestedTernaryOperator - Ternary operators must not be nested. Prefer if/else constructs instead. --- lib/jekyll/commands/serve.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index 507a8c7131b..29408fe2336 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -123,7 +123,14 @@ def server_address(server, opts) private def launch_browser(server, opts) - command = Utils::Platforms.windows?? "start" : Utils::Platforms.osx?? "open" : "xdg-open" + command = + if Utils::Platforms.windows? + "start" + elsif Utils::Platforms.osx? + "open" + else + "xdg-open" + end system command, server_address(server, opts) end From ec83ef60b5731cf6fac391f9c7f889a0f35bd7df Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Mon, 4 Jan 2016 11:49:54 -0800 Subject: [PATCH 0187/4996] Rubocop: Lint/UselessAssignment --- lib/jekyll/converters/markdown/redcarpet_parser.rb | 1 + lib/jekyll/document.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb index 12b4f3fb9cb..79133a2abcf 100644 --- a/lib/jekyll/converters/markdown/redcarpet_parser.rb +++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb @@ -7,6 +7,7 @@ def add_code_tags(code, lang) code = code.to_s code = code.sub(/
/, "
")
             code = code.sub(/<\/pre>/, "
")
+            code
           end
         end
 
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 7d7e6bb4aa6..42881309282 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -278,7 +278,7 @@ def read(opts = {})
 
     def post_read
       if DATE_FILENAME_MATCHER =~ relative_path
-        m, cats, date, slug, ext = *relative_path.match(DATE_FILENAME_MATCHER)
+        _, _, date, slug, ext = *relative_path.match(DATE_FILENAME_MATCHER)
         merge_data!({
           "slug" => slug,
           "ext"  => ext

From be3666fcf05b3f61208df606911000071e7d895f Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Mon, 4 Jan 2016 11:51:14 -0800
Subject: [PATCH 0188/4996] Rubocop: Do not use unless with else  - Rewrite
 these with the positive case first

---
 lib/jekyll.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 6c5d8f103b0..8b92a045f61 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -156,10 +156,10 @@ def sanitized_path(base_directory, questionable_path)
       clean_path = File.expand_path(questionable_path, "/")
       clean_path = clean_path.sub(/\A\w\:\//, '/')
 
-      unless clean_path.start_with?(base_directory.sub(/\A\w\:\//, '/'))
-        File.join(base_directory, clean_path)
-      else
+      if clean_path.start_with?(base_directory.sub(/\A\w\:\//, '/'))
         clean_path
+      else
+        File.join(base_directory, clean_path)
       end
     end
 

From 086e85ca9eab3c5a6f78babd3452428afa88089b Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Mon, 4 Jan 2016 12:01:23 -0800
Subject: [PATCH 0189/4996] Rubocop: Style/PerlBackrefs  - Avoid the use of
 Perl-style backrefs

---
 lib/jekyll/convertible.rb    | 2 +-
 lib/jekyll/document.rb       | 2 +-
 lib/jekyll/tags/highlight.rb | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index b510d306555..d9298f4f621 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -47,7 +47,7 @@ def read_yaml(base, name, opts = {})
                                  merged_file_read_opts(opts))
         if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
           self.content = $POSTMATCH
-          self.data = SafeYAML.load($1)
+          self.data = SafeYAML.load(Regexp.last_match(1))
         end
       rescue SyntaxError => e
         Jekyll.logger.warn "YAML Exception reading #{File.join(base, name)}: #{e.message}"
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 42881309282..8d7c92f49dd 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -263,7 +263,7 @@ def read(opts = {})
           self.content = File.read(path, merged_file_read_opts(opts))
           if content =~ YAML_FRONT_MATTER_REGEXP
             self.content = $POSTMATCH
-            data_file = SafeYAML.load($1)
+            data_file = SafeYAML.load(Regexp.last_match(1))
             merge_data!(data_file) if data_file
           end
 
diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index 5881fa58ea9..a7dbd5193bc 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -13,11 +13,11 @@ class HighlightBlock < Liquid::Block
       def initialize(tag_name, markup, tokens)
         super
         if markup.strip =~ SYNTAX
-          @lang = $1.downcase
+          @lang = Regexp.last_match(1).downcase
           @highlight_options = {}
-          if defined?($2) && $2 != ''
+          if defined?(Regexp.last_match(2)) && Regexp.last_match(2) != ''
             # Split along 3 possible forms -- key="", key=value, or key
-            $2.scan(/(?:\w="[^"]*"|\w=\w|\w)+/) do |opt|
+            Regexp.last_match(2).scan(/(?:\w="[^"]*"|\w=\w|\w)+/) do |opt|
               key, value = opt.split('=')
               # If a quoted list, convert to array
               if value && value.include?("\"")

From 6711234d5fba1419e89ae442519e4bbb7c89985e Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Mon, 4 Jan 2016 12:05:54 -0800
Subject: [PATCH 0190/4996] Rubocop: Style/BlockDelimiters  - Avoid using {...}
 for multi-line blocks

---
 lib/jekyll/convertible.rb | 8 ++++----
 lib/jekyll/filters.rb     | 4 ++--
 lib/jekyll/reader.rb      | 4 ++--
 lib/jekyll/site.rb        | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index d9298f4f621..c61807f983e 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -87,9 +87,9 @@ def output_ext
       if converters.all? { |c| c.is_a?(Jekyll::Converters::Identity) }
         ext
       else
-        converters.map { |c|
+        converters.map do |c|
           c.output_ext(ext) unless c.is_a?(Jekyll::Converters::Identity)
-        }.compact.last
+        end.compact.last
       end
     end
 
@@ -122,9 +122,9 @@ def render_liquid(content, payload, info, path)
     #
     # Returns the Hash representation of this Convertible.
     def to_liquid(attrs = nil)
-      further_data = Hash[(attrs || self.class::ATTRIBUTES_FOR_LIQUID).map { |attribute|
+      further_data = Hash[(attrs || self.class::ATTRIBUTES_FOR_LIQUID).map do |attribute|
         [attribute, send(attribute)]
-      }]
+      end]
 
       defaults = site.frontmatter_defaults.all(relative_path, type)
       Utils.deep_merge_hashes defaults, Utils.deep_merge_hashes(data, further_data)
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 734457cb682..9b2cad9daf7 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -238,7 +238,7 @@ def sort(input, property = nil, nils = "first")
             "'#{nils}' is not a valid nils order. It must be 'first' or 'last'.")
         end
 
-        input.sort { |apple, orange|
+        input.sort do |apple, orange|
           apple_property = item_property(apple, property)
           orange_property = item_property(orange, property)
 
@@ -249,7 +249,7 @@ def sort(input, property = nil, nils = "first")
           else
             apple_property <=> orange_property
           end
-        }
+        end
       end
     end
 
diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 2926971b773..c9ded560936 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -68,11 +68,11 @@ def retrieve_posts(dir)
     #
     # Returns nothing.
     def retrieve_dirs(_base, dir, dot_dirs)
-      dot_dirs.map { |file|
+      dot_dirs.map do |file|
         dir_path = site.in_source_dir(dir, file)
         rel_path = File.join(dir, file)
         @site.reader.read_directories(rel_path) unless @site.dest.sub(/\/$/, '') == dir_path
-      }
+      end
     end
 
     # Retrieve all the pages from the current directory,
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 3ed60c121a2..fcd4bf778c8 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -196,9 +196,9 @@ def cleanup
     #
     # Returns nothing.
     def write
-      each_site_file { |item|
+      each_site_file do |item|
         item.write(dest) if regenerator.regenerate?(item)
-      }
+      end
       regenerator.write_metadata
       Jekyll::Hooks.trigger :site, :post_write, self
     end

From 04e635b10cc991a742e210079be776cda133f34b Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Mon, 4 Jan 2016 12:06:40 -0800
Subject: [PATCH 0191/4996] Rubocop: Style/SpaceInsideRangeLiteral  - Space
 inside range literal

---
 lib/jekyll/document.rb | 2 +-
 lib/jekyll/page.rb     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 8d7c92f49dd..3b41076ceff 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -113,7 +113,7 @@ def basename
     # Returns the cleaned relative path of the document.
     def cleaned_relative_path
       @cleaned_relative_path ||=
-        relative_path[0 .. -extname.length - 1].sub(collection.relative_directory, "")
+        relative_path[0..-extname.length - 1].sub(collection.relative_directory, "")
     end
 
     # Determine whether the document is a YAML file.
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 019cb0956c2..78f7e041ab5 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -106,7 +106,7 @@ def url_placeholders
     # Returns nothing.
     def process(name)
       self.ext = File.extname(name)
-      self.basename = name[0 .. -ext.length - 1]
+      self.basename = name[0..-ext.length - 1]
     end
 
     # Add any necessary layouts to this post

From c1c8b6dbf733ccacfe1b260e7c23927aeb7aa34f Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Mon, 4 Jan 2016 12:07:34 -0800
Subject: [PATCH 0192/4996] Rubocop: Style/SpaceInsideHashLiteralBraces

---
 lib/jekyll/document.rb | 2 +-
 lib/jekyll/filters.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 3b41076ceff..38ced6751a8 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -283,7 +283,7 @@ def post_read
           "slug" => slug,
           "ext"  => ext
         })
-        merge_data!({"date" => date}) if data['date'].nil? || data['date'].to_i == site.time.to_i
+        merge_data!({ "date" => date }) if data['date'].nil? || data['date'].to_i == site.time.to_i
         data['title'] ||= slug.split('-').select(&:capitalize).join(' ')
       end
       populate_categories
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 9b2cad9daf7..36760d65391 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -194,7 +194,7 @@ def group_by(input, property)
         input.group_by do |item|
           item_property(item, property).to_s
         end.inject([]) do |memo, i|
-          memo << {"name" => i.first, "items" => i.last}
+          memo << { "name" => i.first, "items" => i.last }
         end
       else
         input

From c273d91df13227f04908198ff91df01cf7c2d284 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 12:08:02 -0800
Subject: [PATCH 0193/4996] cucumber: fix issue where an undefined step would
 cause an exception

---
 features/step_definitions/jekyll_steps.rb | 4 ++--
 features/support/overview.rb              | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index 9164d549b28..b38397fbe55 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -150,14 +150,14 @@ def file_content_from_hash(input_hash)
 When /^I run jekyll(.*)$/ do |args|
   status = run_jekyll(args)
   if args.include?("--verbose") || ENV['DEBUG']
-    puts jekyll_run_output
+    STDERR.puts "\n#{jekyll_run_output}\n"
   end
 end
 
 When /^I run bundle(.*)$/ do |args|
   status = run_bundle(args)
   if args.include?("--verbose") || ENV['DEBUG']
-    puts jekyll_run_output
+    STDERR.puts "\n#{jekyll_run_output}\n"
   end
 end
 
diff --git a/features/support/overview.rb b/features/support/overview.rb
index 9550969b39c..9045eafbf5a 100644
--- a/features/support/overview.rb
+++ b/features/support/overview.rb
@@ -25,6 +25,7 @@ def initialize(runtime, path_or_io, options)
         @indent = 0
         @prefixes = options[:prefixes] || {}
         @delayed_messages = []
+        @snippets_input = []
       end
 
       def before_features(features)
@@ -115,6 +116,10 @@ def exception(exception, status)
         @io.flush
       end
 
+      def after_test_step(test_step, result)
+        collect_snippet_data(test_step, result)
+      end
+
       private
 
       def print_feature_element_name(keyword, name, file_colon_line, source_indent)

From cce848d3d81b1b6a992911289bf634bb9abffdea Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Mon, 4 Jan 2016 12:12:17 -0800
Subject: [PATCH 0194/4996] Rubocop: Avoid single-line method definitions

---
 lib/jekyll/drops/url_drop.rb | 54 ++++++++++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 11 deletions(-)

diff --git a/lib/jekyll/drops/url_drop.rb b/lib/jekyll/drops/url_drop.rb
index 32aae194239..2815edf7557 100644
--- a/lib/jekyll/drops/url_drop.rb
+++ b/lib/jekyll/drops/url_drop.rb
@@ -35,17 +35,49 @@ def categories
         category_set.to_a.join('/')
       end
 
-      def year;        @obj.date.strftime("%Y"); end
-      def month;       @obj.date.strftime("%m"); end
-      def day;         @obj.date.strftime("%d"); end
-      def hour;        @obj.date.strftime("%H"); end
-      def minute;      @obj.date.strftime("%M"); end
-      def second;      @obj.date.strftime("%S"); end
-      def i_day;       @obj.date.strftime("%-d"); end
-      def i_month;     @obj.date.strftime("%-m"); end
-      def short_month; @obj.date.strftime("%b"); end
-      def short_year;  @obj.date.strftime("%y"); end
-      def y_day;       @obj.date.strftime("%j"); end
+      def year
+        @obj.date.strftime("%Y")
+      end
+
+      def month
+        @obj.date.strftime("%m")
+      end
+
+      def day
+        @obj.date.strftime("%d")
+      end
+
+      def hour
+        @obj.date.strftime("%H")
+      end
+
+      def minute
+        @obj.date.strftime("%M")
+      end
+
+      def second
+        @obj.date.strftime("%S")
+      end
+
+      def i_day
+        @obj.date.strftime("%-d")
+      end
+
+      def i_month
+        @obj.date.strftime("%-m")
+      end
+
+      def short_month
+        @obj.date.strftime("%b")
+      end
+
+      def short_year
+        @obj.date.strftime("%y")
+      end
+
+      def y_day
+        @obj.date.strftime("%j")
+      end
     end
   end
 end

From ab3d906e04dc21bc8385829e2d356f0f4a814ac2 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Mon, 4 Jan 2016 12:14:00 -0800
Subject: [PATCH 0195/4996] Rubocop: Style/ParenthesesAroundCondition  - Don't
 use parentheses around the condition of an if

---
 lib/jekyll/plugin_manager.rb | 2 +-
 lib/jekyll/regenerator.rb    | 2 +-
 lib/jekyll/utils.rb          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb
index d4ad99515fc..502c4a731b1 100644
--- a/lib/jekyll/plugin_manager.rb
+++ b/lib/jekyll/plugin_manager.rb
@@ -76,7 +76,7 @@ def require_plugin_files
     #
     # Returns an Array of plugin search paths
     def plugins_path
-      if (site.config['plugins_dir'] == Jekyll::Configuration::DEFAULTS['plugins_dir'])
+      if site.config['plugins_dir'] == Jekyll::Configuration::DEFAULTS['plugins_dir']
         [site.in_source_dir(site.config['plugins_dir'])]
       else
         Array(site.config['plugins_dir']).map { |d| File.expand_path(d) }
diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb
index bb9284aa11f..205223509a9 100644
--- a/lib/jekyll/regenerator.rb
+++ b/lib/jekyll/regenerator.rb
@@ -115,7 +115,7 @@ def modified?(path)
     #
     # Returns nothing.
     def add_dependency(path, dependency)
-      return if (metadata[path].nil? || @disabled)
+      return if metadata[path].nil? || @disabled
 
       unless metadata[path]["deps"].include? dependency
         metadata[path]["deps"] << dependency
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 1d81e0f0435..6b6e8f1cd91 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -62,7 +62,7 @@ def pluralized_array_from_hash(hash, singular_key, plural_key)
     end
 
     def value_from_singular_key(hash, key)
-      hash[key] if (hash.key?(key) || (hash.default_proc && hash[key]))
+      hash[key] if hash.key?(key) || (hash.default_proc && hash[key])
     end
 
     def value_from_plural_key(hash, key)

From 060904d8096a691e73d87fd4784993f358036bdb Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Mon, 4 Jan 2016 12:16:36 -0800
Subject: [PATCH 0196/4996] Rubocop: Style/TrailingWhitespace  - Trailing
 whitespace detected Rubocop: Style/EmptyLines  - Extra blank line detected
 Rubocop: Style/EmptyLinesAroundBlockBody  - Extra empty line detected at
 block body beginning

---
 lib/jekyll/tags/post_url.rb   | 1 -
 lib/jekyll/utils/ansi.rb      | 2 +-
 lib/jekyll/utils/platforms.rb | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb
index 5b3df093f8c..6c4c9f8eb6e 100644
--- a/lib/jekyll/tags/post_url.rb
+++ b/lib/jekyll/tags/post_url.rb
@@ -66,7 +66,6 @@ def render(context)
         # New matching method did not match, fall back to old method
         # with deprecation warning if this matches
 
-
         site.posts.docs.each do |p|
           next unless @post.deprecated_equality p
           Jekyll::Deprecator.deprecation_message "A call to '{{ post_url #{@post.name} }}' did not match " \
diff --git a/lib/jekyll/utils/ansi.rb b/lib/jekyll/utils/ansi.rb
index 05f38429b3f..933b4323018 100644
--- a/lib/jekyll/utils/ansi.rb
+++ b/lib/jekyll/utils/ansi.rb
@@ -33,7 +33,7 @@ def strip(str)
       def has?(str)
         !!(str =~ MATCH)
       end
-      
+
       # Reset the color back to the default color so that you do not leak any
       # colors when you move onto the next line. This is probably normally
       # used as part of a wrapper so that we don't leak colors.
diff --git a/lib/jekyll/utils/platforms.rb b/lib/jekyll/utils/platforms.rb
index abc1598cb42..d431021f767 100644
--- a/lib/jekyll/utils/platforms.rb
+++ b/lib/jekyll/utils/platforms.rb
@@ -19,7 +19,6 @@ module Platforms
 
       { :windows? => /mswin|mingw|cygwin/, :linux? => /linux/, \
           :osx? => /darwin|mac os/, :unix? => /solaris|bsd/ }.each do |k, v|
-
         define_method k do
           !!(
             RbConfig::CONFIG["host_os"] =~ v

From eaade1e49aad40a216ce9ad4900cfe7fd2681652 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 12:32:15 -0800
Subject: [PATCH 0197/4996] Update history to reflect merge of #4301

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index cb91e071f05..42e152d9d48 100644
--- a/History.markdown
+++ b/History.markdown
@@ -38,6 +38,7 @@
   * Change TestDoctorCommand to JekyllUnitTest... (#4263)
   * Create namespaced rake tasks in separate `.rake` files under `lib/tasks` (#4282)
   * markdown: refactor for greater readability & efficiency (#3771)
+  * Fix many Rubocop style errors (#4301)
 
 ### Site Enhancements
 

From 87978e79f43278366d1ee002e6bc3c5046f473eb Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 12:36:04 -0800
Subject: [PATCH 0198/4996] features/step_definitions: use $stderr instead of
 STDERR

Fixes https://github.com/jekyll/jekyll/commit/c273d91df13227f04908198ff91df01cf7c2d284#commitcomment-15251676
---
 features/step_definitions/jekyll_steps.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index b38397fbe55..c9ae0567b2f 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -150,14 +150,14 @@ def file_content_from_hash(input_hash)
 When /^I run jekyll(.*)$/ do |args|
   status = run_jekyll(args)
   if args.include?("--verbose") || ENV['DEBUG']
-    STDERR.puts "\n#{jekyll_run_output}\n"
+    $stderr.puts "\n#{jekyll_run_output}\n"
   end
 end
 
 When /^I run bundle(.*)$/ do |args|
   status = run_bundle(args)
   if args.include?("--verbose") || ENV['DEBUG']
-    STDERR.puts "\n#{jekyll_run_output}\n"
+    $stderr.puts "\n#{jekyll_run_output}\n"
   end
 end
 

From 735194ccaf7f7b9079f31ea09aa4fb8ad856b3c3 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 12:00:18 -0800
Subject: [PATCH 0199/4996] Convertible/Page/Renderer: use payload hash
 accessor & setter syntax

---
 lib/jekyll/convertible.rb | 12 ++++++------
 lib/jekyll/page.rb        |  4 ++--
 lib/jekyll/renderer.rb    | 18 +++++++++---------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index c61807f983e..746f4bd1529 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -210,8 +210,8 @@ def render_all_layouts(layouts, payload, info)
 
       while layout
         Jekyll.logger.debug "Rendering Layout:", path
-        payload.content = output
-        payload.layout  = layout.data
+        payload["content"] = output
+        payload["layout"]  = Utils.deep_merge_hashes(payload["layout"] || {}, layout.data)
 
         self.output = render_liquid(layout.content,
                                          payload,
@@ -236,7 +236,7 @@ def render_all_layouts(layouts, payload, info)
 
     # Add any necessary layouts to this convertible document.
     #
-    # payload - The site payload Hash.
+    # payload - The site payload Drop or Hash.
     # layouts - A Hash of {"name" => "layout"}.
     #
     # Returns nothing.
@@ -245,11 +245,11 @@ def do_layout(payload, layouts)
 
       Jekyll.logger.debug "Pre-Render Hooks:", self.relative_path
       Jekyll::Hooks.trigger hook_owner, :pre_render, self, payload
-      info = { :filters => [Jekyll::Filters], :registers => { :site => site, :page => payload.page } }
+      info = { :filters => [Jekyll::Filters], :registers => { :site => site, :page => payload["page"] } }
 
       # render and transform content (this becomes the final content of the object)
-      payload.highlighter_prefix = converters.first.highlighter_prefix
-      payload.highlighter_suffix = converters.first.highlighter_suffix
+      payload["highlighter_prefix"] = converters.first.highlighter_prefix
+      payload["highlighter_suffix"] = converters.first.highlighter_suffix
 
       if render_with_liquid?
         Jekyll.logger.debug "Rendering Liquid:", self.relative_path
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 78f7e041ab5..1d29e354979 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -116,8 +116,8 @@ def process(name)
     #
     # Returns nothing.
     def render(layouts, site_payload)
-      site_payload.page = to_liquid
-      site_payload.paginator = pager.to_liquid
+      site_payload["page"] = to_liquid
+      site_payload["paginator"] = pager.to_liquid
 
       do_layout(site_payload, layouts)
     end
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index f9c1b88c630..c17ba4b2785 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -32,23 +32,23 @@ def output_ext
     def run
       Jekyll.logger.debug "Rendering:", document.relative_path
 
-      payload.page = document.to_liquid
+      payload["page"] = document.to_liquid
 
       if document.collection.label == 'posts' && document.is_a?(Document)
-        payload.site['related_posts'] = document.related_posts
+        payload['site']['related_posts'] = document.related_posts
       end
 
       Jekyll.logger.debug "Pre-Render Hooks:", document.relative_path
       document.trigger_hooks(:pre_render, payload)
 
       info = {
-        :filters => [Jekyll::Filters],
-        :registers => { :site => site, :page => payload.page }
+        :filters   => [Jekyll::Filters],
+        :registers => { :site => site, :page => payload['page'] }
       }
 
       # render and transform content (this becomes the final content of the object)
-      payload.highlighter_prefix = converters.first.highlighter_prefix
-      payload.highlighter_suffix = converters.first.highlighter_suffix
+      payload['highlighter_prefix'] = converters.first.highlighter_prefix
+      payload['highlighter_suffix'] = converters.first.highlighter_suffix
 
       output = document.content
 
@@ -132,9 +132,9 @@ def place_in_layouts(content, payload, info)
       used   = Set.new([layout])
 
       while layout
-        payload.content = output
-        payload.page = document.to_liquid
-        payload.layout = layout.data
+        payload['content'] = output
+        payload['page']    = document.to_liquid
+        payload['layout']  = Utils.deep_merge_hashes(payload['layout'] || {}, layout.data)
 
         output = render_liquid(
           layout.content,

From 2756503e7b32f9fa819e2652fa4932a6cc700401 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 12:18:02 -0800
Subject: [PATCH 0200/4996] features/hooks: use hash syntax to access page

---
 features/hooks.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/hooks.feature b/features/hooks.feature
index b561c00c77e..5252d562160 100644
--- a/features/hooks.feature
+++ b/features/hooks.feature
@@ -89,7 +89,7 @@ Feature: Hooks
     And I have a "_plugins/ext.rb" file with content:
     """
     Jekyll::Hooks.register :pages, :pre_render do |page, payload|
-      payload.page['myparam'] = 'special' if page.name == 'page1.html'
+      payload['page']['myparam'] = 'special' if page.name == 'page1.html'
     end
     """
     And I have a "page1.html" page that contains "{{ page.myparam }}"

From 06c45df8c3181fa2967dcc7952939e90b11af23a Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 12:09:19 -0800
Subject: [PATCH 0201/4996] Drop: hash syntax should use setter method for a
 property if it's defined

---
 lib/jekyll/drops/drop.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index c194a5baada..af249996d2e 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -62,7 +62,9 @@ def [](key)
       # and the key matches a method in which case it raises a
       # DropMutationException.
       def []=(key, val)
-        if self.class.mutable
+        if respond_to?("#{key}=")
+          public_send("#{key}=", val)
+        elsif self.class.mutable
           @mutations[key] = val
         elsif respond_to? key
           raise Errors::DropMutationException, "Key #{key} cannot be set in the drop."

From 62d7f5ecade234b07fe51fda22ed4ffd1e391bcc Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 12:10:05 -0800
Subject: [PATCH 0202/4996] Add feature test for layout data

Fixes issue defined here:
https://github.com/jekyll/jekyll/issues/4246#issuecomment-168367510
---
 features/layout_data.feature | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 features/layout_data.feature

diff --git a/features/layout_data.feature b/features/layout_data.feature
new file mode 100644
index 00000000000..a06502c89b2
--- /dev/null
+++ b/features/layout_data.feature
@@ -0,0 +1,18 @@
+Feature: Layout data
+  As a hacker who likes to avoid repetition
+  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/custom.html" file with content:
+      """
+      ---
+      foo: my custom data
+      ---
+      {{ content }} foo: {{ layout.foo }}
+      """
+    And I have an "index.html" page with layout "custom" that contains "page content"
+    When I run jekyll build
+    Then the "_site/index.html" file should exist
+    And I should see "page content\n foo: my custom data" in "_site/index.html"

From 95a3c54ddb374a757cec468caed3d413dd2ea9e9 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 12:41:40 -0800
Subject: [PATCH 0203/4996] drop: only check mutable if the key is a method

---
 lib/jekyll/drops/drop.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index af249996d2e..b4a07fc7c1b 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -64,10 +64,12 @@ def [](key)
       def []=(key, val)
         if respond_to?("#{key}=")
           public_send("#{key}=", val)
-        elsif self.class.mutable
-          @mutations[key] = val
         elsif respond_to? key
-          raise Errors::DropMutationException, "Key #{key} cannot be set in the drop."
+          if self.class.mutable
+            @mutations[key] = val
+          else
+            raise Errors::DropMutationException, "Key #{key} cannot be set in the drop."
+          end
         else
           fallback_data[key] = val
         end

From e10c483ec3734fbf2eeff1a1edb71f6f23c5f205 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell 
Date: Mon, 4 Jan 2016 14:44:13 -0600
Subject: [PATCH 0204/4996] Adjust Rubocop to fit in a bit better.

---
 .rubocop.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 345bec1df0f..aa9f765f279 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,17 +2,22 @@ Metrics/MethodLength: { Max:  24 }
 Metrics/ClassLength:  { Max: 240 }
 Metrics/ModuleLength: { Max: 240 }
 Metrics/LineLength:   { Max: 112 }
+Metrics/CyclomaticComplexity: { Max: 8 }
+Metrics/PerceivedComplexity: { Max: 8 }
+Metrics/ParameterLists: { Max: 4 }
+Metrics/MethodLength: { Max: 24 }
+Metrics/AbcSize: { Max: 20 }
 
 Style/IndentHash: { EnforcedStyle: consistent }
 Style/HashSyntax: { EnforcedStyle: hash_rockets }
 Style/SignalException: { EnforcedStyle: only_raise }
 Style/AlignParameters: { EnforcedStyle: with_fixed_indentation }
 Style/StringLiteralsInInterpolation: { EnforcedStyle: double_quotes }
-Style/RegexpLiteral: { EnforcedStyle: slashes, AllowInnerSlashes: true }
 Style/MultilineMethodCallIndentation: { EnforcedStyle: indented }
 Style/MultilineOperationIndentation: { EnforcedStyle: indented }
 Style/FirstParameterIndentation: { EnforcedStyle: consistent }
 Style/StringLiterals: { EnforcedStyle: double_quotes }
+Style/RegexpLiteral: { EnforcedStyle: slashes }
 Style/IndentArray: { EnforcedStyle: consistent }
 Style/ExtraSpacing: { AllowForAlignment: true }
 
@@ -43,6 +48,7 @@ Style/FileName:                       { Enabled: false }
 Lint/UselessAccessModifier:           { Enabled: false }
 Style/SpaceAroundOperators:           { Enabled: false }
 Style/RedundantReturn:                { Enabled: false }
+Style/SingleLineMethods:              { Enabled: false }
 
 AllCops:
   TargetRubyVersion: 2.0

From a62e085ea051617c0669aa22b732882d8eec8720 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 13:04:38 -0800
Subject: [PATCH 0205/4996] Update history to reflect merge of #4311

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 42e152d9d48..993ed5e9386 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * Rename `@options` so that it does not impact Liquid. (#4173)
   * utils/drops: update Drop to support `Utils.deep_merge_hashes` (#4289)
   * Make sure jekyll/drops/drop is loaded first. (#4292)
+  * Convertible/Page/Renderer: use payload hash accessor & setter syntax for backwards-compatibility (#4311)
 
 ### Development Fixes
 

From ee2db21202db086936c478504068c3cda98a9c1f Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 13:05:19 -0800
Subject: [PATCH 0206/4996] Update history to reflect merge of #4312

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 993ed5e9386..b317e8d3c65 100644
--- a/History.markdown
+++ b/History.markdown
@@ -30,6 +30,7 @@
   * utils/drops: update Drop to support `Utils.deep_merge_hashes` (#4289)
   * Make sure jekyll/drops/drop is loaded first. (#4292)
   * Convertible/Page/Renderer: use payload hash accessor & setter syntax for backwards-compatibility (#4311)
+  * Drop: fix hash setter precendence (#4312)
 
 ### Development Fixes
 

From ed815b0d2c302f91e4985137afd674cf102cec37 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 13:07:33 -0800
Subject: [PATCH 0207/4996] Update history to reflect merge of #4296

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index b317e8d3c65..9e5185268d0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -62,6 +62,7 @@
   * Add `jekyll-commonmark` to list of third-party plugins (#4299)
   * Add documentation for incremental regeneration (#4293)
   * Add note about removal of relative permalink support in upgrading docs (#4303)
+  * Add Pro Tip to use front matter variable to create clean URLs (#4296)
 
 ## 3.0.1 / 2015-11-17
 

From 1ea667474b8c82bcaccda08dc4e58b46649b3ae4 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 13:24:14 -0800
Subject: [PATCH 0208/4996] Clean up the permalink front matter protip

Ref #4296.
---
 site/_docs/pages.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/site/_docs/pages.md b/site/_docs/pages.md
index a2080868e03..59b827e2013 100644
--- a/site/_docs/pages.md
+++ b/site/_docs/pages.md
@@ -91,11 +91,10 @@ simple and it works. In the end the decision is yours!
 

   
ProTip™: Use permalink Front Matter Variable

   

-    Clean URLs can also be achieved using the permalink Front Matter variable. In the example above, using the first method, you can get URL http://example.com/other for the file other.md by adding this to the top of the file.
-    
-    ---
-    permalink: /other/
-    ---
-    

+    Clean URLs can also be achieved using the permalink front
+    matter variable. In the example above, using the first method, you can
+    get URL http://example.com/other for the file
+    other.md by setting this at the top of the file:
+    permalink: /other
   

 


From cb5bc1093e2e7c3db63a76c096ce86a4c2eef02c Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sun, 27 Dec 2015 10:56:47 -0500
Subject: [PATCH 0209/4996] utils: has_yaml_header? should accept files with
 extraneous spaces

Occasionally, extra spaces at the end of the YAML front matter prologue are
saved to a file and it goes missing without telling the user why. This
should simply accept those changes without any detriment to the user,
allowing anyone to add as many spaces as they like to the end of their
front matter prologues.
---
 lib/jekyll/utils.rb                            |  4 +++-
 .../_posts/2015-12-27-extra-spaces.markdown    |  3 +++
 test/test_generated_site.rb                    |  2 +-
 test/test_utils.rb                             | 18 ++++++++++++++++++
 4 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 test/source/_posts/2015-12-27-extra-spaces.markdown

diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 6b6e8f1cd91..b878d4d6b0e 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -120,7 +120,9 @@ def parse_date(input, msg = "Input could not be parsed.")
     #
     # Returns true if the YAML front matter is present.
     def has_yaml_header?(file)
-      !!(File.open(file, 'rb') { |f| f.read(5) } =~ /\A---\r?\n/)
+      !!(File.open(file, 'rb') { |f| f.readline } =~ /\A---\s*\r?\n/)
+    rescue EOFError
+      false
     end
 
     # Slugify a filename or title.
diff --git a/test/source/_posts/2015-12-27-extra-spaces.markdown b/test/source/_posts/2015-12-27-extra-spaces.markdown
new file mode 100644
index 00000000000..595a9cd9afe
--- /dev/null
+++ b/test/source/_posts/2015-12-27-extra-spaces.markdown
@@ -0,0 +1,3 @@
+---  
+extra: spaces
+---
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 32999aba9b1..9a289dd3c8c 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -12,7 +12,7 @@ class TestGeneratedSite < JekyllUnitTest
     end
 
     should "ensure post count is as expected" do
-      assert_equal 48, @site.posts.size
+      assert_equal 49, @site.posts.size
     end
 
     should "insert site.posts into the index" do
diff --git a/test/test_utils.rb b/test/test_utils.rb
index bf7e8957aed..7d499f9ba15 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -259,4 +259,22 @@ class TestUtils < JekyllUnitTest
     end
   end
 
+  context "The \`Utils.has_yaml_header?\` method" do
+    should "accept files with yaml front matter" do
+      file = source_dir("_posts", "2008-10-18-foo-bar.markdown")
+      assert_equal "---\n", File.open(file, 'rb') { |f| f.read(4) }
+      assert Utils.has_yaml_header?(file)
+    end
+    should "accept files with extraneous spaces after yaml front matter" do
+      file = source_dir("_posts", "2015-12-27-extra-spaces.markdown")
+      assert_equal "---  \n", File.open(file, 'rb') { |f| f.read(6) }
+      assert Utils.has_yaml_header?(file)
+    end
+    should "reject pgp files and the like which resemble front matter" do
+      file = source_dir("pgp.key")
+      assert_equal "-----B", File.open(file, 'rb') { |f| f.read(6) }
+      refute Utils.has_yaml_header?(file)
+    end
+  end
+
 end

From 10a1b9451a270a24e3465c15aaaa115d2917db01 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 14:57:59 -0800
Subject: [PATCH 0210/4996] Update history to reflect merge of #4290

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 9e5185268d0..715b8bc3279 100644
--- a/History.markdown
+++ b/History.markdown
@@ -31,6 +31,7 @@
   * Make sure jekyll/drops/drop is loaded first. (#4292)
   * Convertible/Page/Renderer: use payload hash accessor & setter syntax for backwards-compatibility (#4311)
   * Drop: fix hash setter precendence (#4312)
+  * utils: `has_yaml_header?` should accept files with extraneous spaces (#4290)
 
 ### Development Fixes
 

From 4fe9eecf053eb5d6047011372d8a195e88fb8614 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 11 Dec 2015 14:45:13 -0800
Subject: [PATCH 0211/4996] For blessed gems, shim their commands so users know
 how to use them.

---
 bin/jekyll             | 14 ++++++++++----
 lib/jekyll/external.rb |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/bin/jekyll b/bin/jekyll
index 173a58d3842..96e157272ea 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -6,10 +6,6 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w( .. lib ))
 require 'jekyll'
 require 'mercenary'
 
-Jekyll::External.require_if_present(
-  Jekyll::External.blessed_gems
-)
-
 Jekyll::PluginManager.require_from_bundler
 
 Jekyll::Deprecator.process(ARGV)
@@ -26,6 +22,16 @@ Mercenary.program(:jekyll) do |p|
   p.option 'layouts_dir', '--layouts DIR', String, 'Layouts directory (defaults to ./_layouts)'
   p.option 'profile', '--profile', 'Generate a Liquid rendering profile'
 
+  Jekyll::External.require_if_present(Jekyll::External.blessed_gems) do |g|
+    cmd = g.split('-').last
+    p.command(cmd.to_sym) do |c|
+      c.syntax cmd
+      c.action do
+        Jekyll.logger.abort_with "You must install the '#{g}' gem to use the 'jekyll #{cmd}' command."
+      end
+    end
+  end
+
   Jekyll::Command.subclasses.each { |c| c.init_with_program(p) }
 
   p.action do |args, _|
diff --git a/lib/jekyll/external.rb b/lib/jekyll/external.rb
index d213364bb68..2996d24b635 100644
--- a/lib/jekyll/external.rb
+++ b/lib/jekyll/external.rb
@@ -17,12 +17,13 @@ def blessed_gems
       #
       # names - a string gem name or array of gem names
       #
-      def require_if_present(names)
+      def require_if_present(names, &block)
         Array(names).each do |name|
           begin
             require name
           rescue LoadError
             Jekyll.logger.debug "Couldn't load #{name}. Skipping."
+            block.call(name) if block
             false
           end
         end

From d37de5c8dfdcd10b4a2a48ae3498e954f4327c7e Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 16:17:48 -0800
Subject: [PATCH 0212/4996] If the subcommand cannot be found, suggest the
 installation of a gem.

---
 bin/jekyll | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/jekyll b/bin/jekyll
index 96e157272ea..43364b9960c 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -40,8 +40,11 @@ Mercenary.program(:jekyll) do |p|
       puts p
       abort
     else
-      unless p.has_command?(args.first)
-        Jekyll.logger.abort_with "Invalid command. Use --help for more information"
+      subcommand = args.first
+      unless p.has_command? subcommand
+        Jekyll.logger.abort_with "fatal: 'jekyll #{args.first}' could not" \
+          " be found. You may need to install the jekyll-#{args.first} gem" \
+          " or a related gem to be able to use this subcommand."
       end
     end
   end

From a9b80b2f06580efa144a09da0f139759db180630 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 16:21:53 -0800
Subject: [PATCH 0213/4996] features/layout_data: add scenario for inheriting
 layout data from child to parent

Ref: https://github.com/jekyll/jekyll/pull/4312#discussion_r48781985
---
 features/layout_data.feature | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/features/layout_data.feature b/features/layout_data.feature
index a06502c89b2..789986651b4 100644
--- a/features/layout_data.feature
+++ b/features/layout_data.feature
@@ -16,3 +16,22 @@ Feature: Layout data
     When I run jekyll build
     Then the "_site/index.html" file should exist
     And I should see "page content\n foo: my custom data" in "_site/index.html"
+
+  Scenario: Inherit custom layout data
+    Given I have a _layouts directory
+    And I have a "_layouts/custom.html" file with content:
+      """
+      ---
+      layout: base
+      foo: my custom data
+      ---
+      {{ content }}
+      """
+    And I have a "_layouts/base.html" file with content:
+      """
+      {{ content }} foo: {{ layout.foo }}
+      """
+    And I have an "index.html" page with layout "custom" that contains "page content"
+    When I run jekyll build
+    Then the "_site/index.html" file should exist
+    And I should see "page content\n foo: my custom data" in "_site/index.html"

From 657b6b328cdb270894120cd68e46e4b87af9f017 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 16:26:02 -0800
Subject: [PATCH 0214/4996] Update history to reflect merge of #4307

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 715b8bc3279..343dc08c5e4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -32,6 +32,7 @@
   * Convertible/Page/Renderer: use payload hash accessor & setter syntax for backwards-compatibility (#4311)
   * Drop: fix hash setter precendence (#4312)
   * utils: `has_yaml_header?` should accept files with extraneous spaces (#4290)
+  * Escape html from site.title and page.title in site template (#4307)
 
 ### Development Fixes
 

From 935e5563e16eaa2ab15fdf0a01352516cddd7b47 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 16:31:06 -0800
Subject: [PATCH 0215/4996] Update history to reflect merge of #4254

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 343dc08c5e4..454ddc78e09 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
   * Add a Jekyll doctor warning for URLs that only differ by case (#3171)
   * drops: create one base Drop class which can be set as mutable or not (#4285)
   * drops: provide `#to_h` to allow for hash introspection (#4281)
+  * Shim subcommands with indication of gem possibly required so users know how to use them (#4254)
 
 ### Bug Fixes
 

From b6c283a4aee531a06ba6b3c9cde5e972889c7471 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 16:10:11 -0800
Subject: [PATCH 0216/4996] wip: allow custom extensions

---
 lib/jekyll/configuration.rb            |  6 ++---
 lib/jekyll/document.rb                 | 12 +++++++---
 lib/jekyll/page.rb                     |  2 +-
 lib/jekyll/renderer.rb                 |  6 ++++-
 lib/jekyll/utils.rb                    |  5 ++++-
 test/source/_slides/example-slide-7.md |  6 +++++
 test/source/dynamic_file.php           |  4 ++++
 test/test_document.rb                  | 31 ++++++++++++++++++++++----
 test/test_filters.rb                   |  2 +-
 test/test_generated_site.rb            |  5 +++--
 test/test_page.rb                      |  9 ++++++++
 test/test_site.rb                      |  1 +
 test/test_utils.rb                     |  1 -
 13 files changed, 73 insertions(+), 17 deletions(-)
 create mode 100644 test/source/_slides/example-slide-7.md
 create mode 100644 test/source/dynamic_file.php

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 0229e073e5c..0f8618a1b8b 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -298,11 +298,11 @@ def style_to_permalink(permalink_style)
       when :pretty
         "/:categories/:year/:month/:day/:title/"
       when :none
-        "/:categories/:title.html"
+        "/:categories/:title:output_ext"
       when :date
-        "/:categories/:year/:month/:day/:title.html"
+        "/:categories/:year/:month/:day/:title:output_ext"
       when :ordinal
-        "/:categories/:year/:y_day/:title.html"
+        "/:categories/:year/:y_day/:title:output_ext"
       else
         permalink_style.to_s
       end
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 38ced6751a8..c3fff329e17 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -4,7 +4,7 @@ module Jekyll
   class Document
     include Comparable
 
-    attr_reader :path, :site, :extname, :output_ext, :collection
+    attr_reader :path, :site, :extname, :collection
     attr_accessor :content, :output
 
     YAML_FRONT_MATTER_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
@@ -23,7 +23,6 @@ def initialize(path, relations = {})
       @site = relations[:site]
       @path = path
       @extname = File.extname(path)
-      @output_ext = Jekyll::Renderer.new(site, self).output_ext
       @collection = relations[:collection]
       @has_yaml_header = nil
 
@@ -86,6 +85,13 @@ def relative_path
       @relative_path ||= Pathname.new(path).relative_path_from(Pathname.new(site.source)).to_s
     end
 
+    # The output extension of the document.
+    #
+    # Returns the output extension
+    def output_ext
+      @output_ext ||= Jekyll::Renderer.new(site, self).output_ext
+    end
+
     # The base filename of the document, without the file extname.
     #
     # Returns the basename without the file extname.
@@ -209,7 +215,7 @@ def destination(base_directory)
       dest = site.in_dest_dir(base_directory)
       path = site.in_dest_dir(dest, URL.unescape_path(url))
       path = File.join(path, "index.html") if url.end_with?("/")
-      path << output_ext unless path.end_with?(output_ext)
+      path << output_ext unless path.end_with? output_ext
       path
     end
 
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 1d29e354979..a3519f57f53 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -142,7 +142,7 @@ def relative_path
     def destination(dest)
       path = site.in_dest_dir(dest, URL.unescape_path(url))
       path = File.join(path, "index") if url.end_with?("/")
-      path <<  output_ext unless path.end_with?(output_ext)
+      path << output_ext unless path.end_with? output_ext
       path
     end
 
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index c17ba4b2785..e6a41aead3c 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -22,7 +22,11 @@ def converters
     #
     # Returns the output extname including the leading period.
     def output_ext
-      @output_ext ||= converters.first.output_ext(document.extname)
+      @output_ext ||= if document.permalink
+        File.extname(document.permalink)
+      else
+        converters.first.output_ext(document.extname)
+      end
     end
 
     ######################
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index b878d4d6b0e..635b5d107d9 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -1,5 +1,8 @@
+require 'mime/types'
+
 module Jekyll
-  module Utils extend self
+  module Utils
+    extend self
     autoload :Platforms, 'jekyll/utils/platforms'
     autoload :Ansi, "jekyll/utils/ansi"
 
diff --git a/test/source/_slides/example-slide-7.md b/test/source/_slides/example-slide-7.md
new file mode 100644
index 00000000000..a17c79fe8c3
--- /dev/null
+++ b/test/source/_slides/example-slide-7.md
@@ -0,0 +1,6 @@
+---
+am_i_convertible: yes
+permalink: /slides/example-slide-7.php
+---
+
+Am I convertible? {{ page.am_i_convertible }}
diff --git a/test/source/dynamic_file.php b/test/source/dynamic_file.php
new file mode 100644
index 00000000000..823bb47fab0
--- /dev/null
+++ b/test/source/dynamic_file.php
@@ -0,0 +1,4 @@
+---
+---
+
+I'm a Jekyll file! I should be output as dynamic_file.php, no .html to be found.
diff --git a/test/test_document.rb b/test/test_document.rb
index 6689e506652..7c6f7bef6b8 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -47,9 +47,7 @@ def assert_equal_value(key, one, other)
     context "with YAML ending in three dots" do
 
       setup do
-        @site = fixture_site({
-          "collections" => ["methods"],
-        })
+        @site = fixture_site({"collections" => ["methods"]})
         @site.process
         @document = @site.collections["methods"].docs.last
       end
@@ -195,6 +193,7 @@ def assert_equal_value(key, one, other)
             "permalink" => "/slides/test/:name"
           }
         },
+        "permalink" => "pretty"
       })
       @site.process
       @document = @site.collections["slides"].docs[0]
@@ -245,7 +244,7 @@ def assert_equal_value(key, one, other)
       })
       @site.permalink_style = :pretty
       @site.process
-      @document = @site.collections["slides"].docs[6]
+      @document = @site.collections["slides"].docs[7]
       @dest_file = dest_dir("slides/example-slide-Upper-Cased/index.html")
     end
 
@@ -254,6 +253,29 @@ def assert_equal_value(key, one, other)
     end
   end
 
+  context "a document in a collection with cased file name" do
+    setup do
+      @site = fixture_site({
+        "collections" => {
+          "slides" => {
+            "output" => true
+          }
+        }
+      })
+      @site.process
+      @document = @site.collections["slides"].docs[6]
+      @dest_file = dest_dir("slides/example-slide-7.php")
+    end
+
+    should "produce the permalink as the url" do
+      assert_equal "/slides/example-slide-7.php", @document.url
+    end
+
+    should "be written to the proper directory" do
+      assert_equal @dest_file, @document.destination(dest_dir)
+    end
+  end
+
   context "documents in a collection with custom title permalinks" do
     setup do
       @site = fixture_site({
@@ -273,6 +295,7 @@ def assert_equal_value(key, one, other)
     should "produce the right URL if they have a slug" do
       assert_equal "/slides/so-what-is-jekyll-exactly", @document.url
     end
+
     should "produce the right destination file if they have a slug" do
       dest_file = dest_dir("slides/so-what-is-jekyll-exactly.html")
       assert_equal dest_file, @document.destination(dest_dir)
diff --git a/test/test_filters.rb b/test/test_filters.rb
index dc51252e68e..a2eb5bf0f7e 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -257,7 +257,7 @@ def to_liquid
             assert_equal 2, g["items"].size
           when ""
             assert g["items"].is_a?(Array), "The list of grouped items for '' is not an Array."
-            assert_equal 11, g["items"].size
+            assert_equal 12, g["items"].size
           end
         end
       end
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 9a289dd3c8c..39a8b3d9669 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -39,8 +39,9 @@ class TestGeneratedSite < JekyllUnitTest
     end
 
     should "process other static files and generate correct permalinks" do
-      assert File.exist?(dest_dir('/about/index.html'))
-      assert File.exist?(dest_dir('/contacts.html'))
+      assert File.exist?(dest_dir('/about/index.html')), "about/index.html should exist"
+      assert File.exist?(dest_dir('/contacts.html')), "contacts.html should exist"
+      assert File.exist?(dest_dir('/dynamic_file.php')), "dynamic_file.php should exist"
     end
 
     should "print a nice list of static files" do
diff --git a/test/test_page.rb b/test/test_page.rb
index 16b9e06031c..904f5bd5d78 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -55,6 +55,15 @@ def do_render(page)
         assert_equal ".html", @page.ext
       end
 
+      should "deal properly with non-html extensions" do
+        @page = setup_page('dynamic_page.php')
+        @dest_file = dest_dir("dynamic_page.php")
+        assert_equal ".php", @page.ext
+        assert_equal "dynamic_page", @page.basename
+        assert_equal "/dynamic_page.php", @page.url
+        assert_equal @dest_file, @page.destination(dest_dir)
+      end
+
       should "deal properly with dots" do
         @page = setup_page('deal.with.dots.html')
         @dest_file = dest_dir("deal.with.dots.html")
diff --git a/test/test_site.rb b/test/test_site.rb
index a638a3498ae..970084cf165 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -174,6 +174,7 @@ def generate(site)
         coffeescript.coffee
         contacts.html
         deal.with.dots.html
+        dynamic_file.php
         environment.html
         exploit.md
         foo.md
diff --git a/test/test_utils.rb b/test/test_utils.rb
index 7d499f9ba15..49844038229 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -276,5 +276,4 @@ class TestUtils < JekyllUnitTest
       refute Utils.has_yaml_header?(file)
     end
   end
-
 end

From dab53a697b8f58db9bef819dc9b6f5c3a592fe56 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 18:17:51 -0800
Subject: [PATCH 0217/4996] collection: tiny optimization to #url_template

---
 lib/jekyll/collection.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index ea6a81b6fc6..c76071712e7 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -186,9 +186,7 @@ def write?
     #
     # Returns the URL template to render collection's documents at.
     def url_template
-      metadata.fetch('permalink') do
-        Utils.add_permalink_suffix("/:collection/:path", site.permalink_style)
-      end
+      metadata['permalink'] ||= Utils.add_permalink_suffix("/:collection/:path", site.permalink_style)
     end
 
     # Extract options for this collection from the site configuration.

From 9579924f8a7dc6f43829065021d63096b8a5dc3e Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 18:18:12 -0800
Subject: [PATCH 0218/4996] drop: tiny optimization to .mutable to create fewer
 objects

---
 lib/jekyll/drops/drop.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index b4a07fc7c1b..a8342c14b44 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -15,8 +15,13 @@ class Drop < Liquid::Drop
       def self.mutable(is_mutable = nil)
         if is_mutable
           @is_mutable = is_mutable
+        else
+          @is_mutable = false
         end
-        @is_mutable || false
+      end
+
+      def self.mutable?
+        @is_mutable
       end
 
       # Create a new Drop
@@ -39,7 +44,7 @@ def initialize(obj)
       #
       # Returns the value for the given key, or nil if none exists
       def [](key)
-        if self.class.mutable && @mutations.key?(key)
+        if self.class.mutable? && @mutations.key?(key)
           @mutations[key]
         elsif respond_to? key
           public_send key
@@ -65,7 +70,7 @@ def []=(key, val)
         if respond_to?("#{key}=")
           public_send("#{key}=", val)
         elsif respond_to? key
-          if self.class.mutable
+          if self.class.mutable?
             @mutations[key] = val
           else
             raise Errors::DropMutationException, "Key #{key} cannot be set in the drop."

From dc31264160ecc8d0e7e21020098bf0010d1ba22e Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 18:18:28 -0800
Subject: [PATCH 0219/4996] url: tiny optimization to #generate_url_from_drop

---
 lib/jekyll/url.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 950945a7714..09975e3d404 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -78,14 +78,14 @@ def generate_url_from_hash(template)
     end
 
     def generate_url_from_drop(template)
-      template.gsub(/:([a-z_]+)/) do |match|
-        replacement = @placeholders.public_send(match.sub(':', ''))
+      template.gsub(/:([a-z_]+)/.freeze) do |match|
+        replacement = @placeholders.public_send(match.sub(':'.freeze, ''.freeze))
         if replacement.nil?
           ''.freeze
         else
           self.class.escape_path(replacement)
         end
-      end.gsub(/\/\//, '/')
+      end.gsub(/\/\//.freeze, '/'.freeze)
     end
 
     # Returns a sanitized String URL, stripping "../../" and multiples of "/",

From 8e68de27400d51edb8fd03aa72ee0801632b8fd1 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 4 Jan 2016 18:22:55 -0800
Subject: [PATCH 0220/4996] site: redirect /docs/ to /docs/home/

---
 Gemfile             | 3 ++-
 site/_config.yml    | 1 +
 site/_docs/index.md | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 750c461b132..b253e8bf543 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,8 @@ end
 
 gem 'jekyll-paginate', '~> 1.0'
 gem 'jekyll-coffeescript', '~> 1.0'
-gem 'jekyll-feed'
+gem 'jekyll-feed', '~> 0.1.3'
+gem 'jekyll-redirect-from', '~> 0.9.1'
 gem 'jekyll-gist', '~> 1.0'
 gem 'mime-types', '~> 3.0'
 gem 'kramdown', '~> 1.9'
diff --git a/site/_config.yml b/site/_config.yml
index e09c4857045..c065f9f7015 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -21,3 +21,4 @@ url: http://jekyllrb.com
 
 gems:
   - jekyll-feed
+  - jekyll-redirect-from
diff --git a/site/_docs/index.md b/site/_docs/index.md
index bbb180871c3..ceae4749fb7 100644
--- a/site/_docs/index.md
+++ b/site/_docs/index.md
@@ -2,6 +2,7 @@
 layout: docs
 title: Welcome
 permalink: /docs/home/
+redirect_from: /docs/index.html
 ---
 
 This site aims to be a comprehensive guide to Jekyll. We’ll cover topics such

From 4cde2ad41cd31f42ac8e4c98f456be0726b16418 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell 
Date: Tue, 5 Jan 2016 12:30:23 -0600
Subject: [PATCH 0221/4996] Remove rake analysis, use bundle exec rubocop now.

---
 rake/analysis.rake | 42 ------------------------------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 rake/analysis.rake

diff --git a/rake/analysis.rake b/rake/analysis.rake
deleted file mode 100644
index 4fcc6af5563..00000000000
--- a/rake/analysis.rake
+++ /dev/null
@@ -1,42 +0,0 @@
-#############################################################################
-#
-# Analyze the quality of the Jekyll source code (requires Docker)
-#
-#############################################################################
-
-task :analysis do
-  require "jekyll/utils/ansi"
-  require "open3"
-
-  cmd = [
-    "docker", "run", "--rm", "--env=CODE_PATH=#{Dir.pwd}", \
-    "--volume='#{Dir.pwd}:/code'", "--volume=/var/run/docker.sock:/var/run/docker.sock", \
-    "--volume=/tmp/cc:/tmp/cc", "-i", "codeclimate/codeclimate", "analyze"
-  ]
-
-  ansi = Jekyll::Utils::Ansi
-  file = File.open(".analysis", "w+")
-  Open3.popen3(cmd.shelljoin) do |_, out, err, _|
-    while data = out.gets
-      file.write data
-      if data =~ /\A==/
-        $stdout.print ansi.yellow(data)
-
-      elsif data !~ %r!\A[0-9\-]+!
-        $stdout.puts data
-
-      else
-        h, d = data.split(":", 2)
-        $stdout.print ansi.cyan(h)
-        $stdout.print ":", d
-      end
-    end
-
-    while data = err.gets
-      file.write data
-      $stderr.print ansi.red(data)
-    end
-  end
-
-  file.close
-end
\ No newline at end of file

From a48c02a8895542efc2667eb2778d5eec5227b447 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell 
Date: Tue, 5 Jan 2016 12:27:27 -0600
Subject: [PATCH 0222/4996] Reorganize and cleanup the Gemfile, shorten depends
 on Travis.

---
 .travis.yml |  1 +
 Gemfile     | 96 ++++++++++++++++++++++++++++-------------------------
 2 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 58980f41c2f..560fbb3df86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+bundler_args: --without doc:util:site:benchmark:development
 language: ruby
 cache: bundler
 sudo: false
diff --git a/Gemfile b/Gemfile
index b253e8bf543..c694a089886 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,58 +1,62 @@
-source 'https://rubygems.org'
-gemspec name: 'jekyll'
+source "https://rubygems.org"
+gemspec :name => :jekyll
 
-gem 'rake', '~> 10.1'
+gem "rake", "~> 10.1"
 group :development do
-  gem 'rdoc', '~> 4.2'
-  gem 'launchy', '~> 2.3'
-  gem 'toml', '~> 0.1.0'
-  gem "rubocop"
-  gem 'pry'
+  unless ENV["CI"]
+    gem "pry", :require => false
+    gem "rubocop", {
+      :github => "bbatsov/rubocop",
+      :branch => :master, :require => false
+    }
+  end
 end
 
-group :test do
-  gem 'redgreen', '~> 1.2'
-  gem 'shoulda', '~> 3.5'
-  gem 'cucumber', '~> 2.1'
-  gem 'simplecov', '~> 0.9'
-  gem 'jekyll_test_plugin'
-  gem 'jekyll_test_plugin_malicious'
-  gem 'minitest-reporters'
-  gem 'minitest-profile'
-  gem 'rspec-mocks'
-  gem 'minitest'
-  gem 'nokogiri'
-
-  if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2")
-    gem 'test-unit'
-  end
+group( :doc) { gem "rdoc", "~> 4.2" } # `--without doc`
+group(:util) { gem "launchy", "~> 2.3" } # `--without util`
+group(:site) { gem "html-proofer" } # `--without site`
 
-  if ENV['PROOF']
-    gem 'html-proofer', '~> 2.0'
-  end
+# `--without benchmark`
+group :benchmark do
+  gem "rbtrace"
+  gem "ruby-prof"
+  gem "benchmark-ips"
+  gem "stackprof"
 end
 
-group :benchmark do
-  if ENV['BENCHMARK']
-    gem 'ruby-prof'
-    gem 'rbtrace'
-    gem 'stackprof'
-    gem 'benchmark-ips'
+group :test do
+  gem "redgreen", "~> 1.2"
+  gem "shoulda", "~> 3.5"
+  gem "cucumber", "~> 2.1"
+  gem "simplecov", "~> 0.9"
+  gem "jekyll_test_plugin"
+  gem "jekyll_test_plugin_malicious"
+  gem "minitest-reporters"
+  gem "minitest-profile"
+  gem "rspec-mocks"
+  gem "minitest"
+  gem "nokogiri"
+
+  if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2")
+    gem "test-unit"
   end
 end
 
-gem 'jekyll-paginate', '~> 1.0'
-gem 'jekyll-coffeescript', '~> 1.0'
-gem 'jekyll-feed', '~> 0.1.3'
-gem 'jekyll-redirect-from', '~> 0.9.1'
-gem 'jekyll-gist', '~> 1.0'
-gem 'mime-types', '~> 3.0'
-gem 'kramdown', '~> 1.9'
+group :optional_jekyll_dependencies do
+  gem "toml", "~> 0.1.0"
+  gem "jekyll-paginate", "~> 1.0"
+  gem "jekyll-coffeescript", "~> 1.0"
+  gem "jekyll-feed", "~> 0.1.3"
+  gem "jekyll-redirect-from", "~> 0.9.1"
+  gem "jekyll-gist", "~> 1.0"
+  gem "mime-types", "~> 3.0"
+  gem "kramdown", "~> 1.9"
 
-platform :ruby, :mswin, :mingw do
-  gem 'rdiscount', '~> 2.0'
-  gem 'pygments.rb', '~> 0.6.0'
-  gem 'redcarpet', '~> 3.2', '>= 3.2.3'
-  gem 'classifier-reborn', '~> 2.0'
-  gem 'liquid-c', '~> 3.0'
+  platform :ruby, :mswin, :mingw do
+    gem "rdiscount", "~> 2.0"
+    gem "pygments.rb", "~> 0.6.0"
+    gem "redcarpet", "~> 3.2", ">= 3.2.3"
+    gem "classifier-reborn", "~> 2.0"
+    gem "liquid-c", "~> 3.0"
+  end
 end

From b1a21159483401567ebffcc25909a957d8d96596 Mon Sep 17 00:00:00 2001
From: Peter Suschlik 
Date: Wed, 6 Jan 2016 17:19:25 +0100
Subject: [PATCH 0223/4996] Fix spelling of GitHub in docs and history

* Github -> GitHub
* GitHub pages -> GitHub Pages
---
 History.markdown                     | 2 +-
 lib/jekyll/commands/serve/servlet.rb | 2 +-
 lib/jekyll/converters/markdown.rb    | 2 +-
 site/_docs/configuration.md          | 2 +-
 site/_docs/deployment-methods.md     | 2 +-
 site/_docs/github-pages.md           | 2 +-
 site/_docs/history.md                | 2 +-
 site/_docs/plugins.md                | 4 ++--
 site/_docs/variables.md              | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/History.markdown b/History.markdown
index 454ddc78e09..ec921ff2a2f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -495,7 +495,7 @@
   * Add Big Footnotes for Kramdown plugin to list of third-party plugins (#2916)
   * Remove warning regarding GHP use of singular types for front matter defaults (#2919)
   * Fix quote character typo in site documentation for templates (#2917)
-  * Point Liquid links to Liquid’s Github wiki (#2887)
+  * Point Liquid links to Liquid’s GitHub wiki (#2887)
   * Add HTTP Basic Auth (.htaccess) plugin to list of third-party plugins (#2931)
   * (Minor) Grammar & `_config.yml` filename fixes (#2911)
   * Added `mathml.rb` to the list of third-party plugins. (#2937)
diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb
index cf4952168b2..bb4afe5a57b 100644
--- a/lib/jekyll/commands/serve/servlet.rb
+++ b/lib/jekyll/commands/serve/servlet.rb
@@ -17,7 +17,7 @@ def initialize(server, root, callbacks)
         end
 
         # Add the ability to tap file.html the same way that Nginx does on our
-        # Docker images (or on Github pages.) The difference is that we might end
+        # Docker images (or on GitHub Pages.) The difference is that we might end
         # up with a different preference on which comes first.
 
         def search_file(req, res, basename)
diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb
index bb7b7ffa2b5..aed906d7493 100644
--- a/lib/jekyll/converters/markdown.rb
+++ b/lib/jekyll/converters/markdown.rb
@@ -37,7 +37,7 @@ def valid_processors
 
       # Public: A list of processors that you provide via plugins.
       # This is really only available if you are not in safe mode, if you are
-      # in safe mode (re: Github) then there will be none.
+      # in safe mode (re: GitHub) then there will be none.
 
       def third_party_processors
         self.class.constants - \
diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index 6bf17766c61..1b1b707c5dc 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -678,7 +678,7 @@ extensions are:
 ### Kramdown
 
 In addition to the defaults mentioned above, you can also turn on recognition
-of Github Flavored Markdown by passing an `input` option with a value of "GFM".
+of GitHub Flavored Markdown by passing an `input` option with a value of "GFM".
 
 For example, in your `_config.yml`:
 
diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md
index 54c51ae1589..ad4ea93c283 100644
--- a/site/_docs/deployment-methods.md
+++ b/site/_docs/deployment-methods.md
@@ -206,7 +206,7 @@ for that](https://github.com/openshift-cartridges/openshift-jekyll-cartridge).
 
 ## Kickster
 
-Use [Kickster](http://kickster.nielsenramon.com/) for easy (automated) deploys to Github Pages when using unsupported plugins on Github Pages.
+Use [Kickster](http://kickster.nielsenramon.com/) for easy (automated) deploys to GitHub Pages when using unsupported plugins on GitHub Pages.
 
 Kickster provides a basic Jekyll project setup packed with web best practises and useful optimization tools increasing your overall project quality. Kickster ships with automated and worry-free deployment scripts for GitHub Pages.
 
diff --git a/site/_docs/github-pages.md b/site/_docs/github-pages.md
index c9a4644ca5a..e19cdb2d24e 100644
--- a/site/_docs/github-pages.md
+++ b/site/_docs/github-pages.md
@@ -92,7 +92,7 @@ branch]({{ site.repository }}/tree/gh-pages) of the same repository.
 

   
Source Files Must be in the Root Directory

   

-Github Pages overrides the “Site Source” configuration value, so if you locate your files anywhere other than the root directory, your site may not build correctly.
+GitHub Pages overrides the “Site Source” configuration value, so if you locate your files anywhere other than the root directory, your site may not build correctly.
   

 

 
diff --git a/site/_docs/history.md b/site/_docs/history.md
index 6a6404015a4..a99932fb88f 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -463,7 +463,7 @@ permalink: "/docs/history/"
 - Add Big Footnotes for Kramdown plugin to list of third-party plugins ([#2916]({{ site.repository }}/issues/2916))
 - Remove warning regarding GHP use of singular types for front matter defaults ([#2919]({{ site.repository }}/issues/2919))
 - Fix quote character typo in site documentation for templates ([#2917]({{ site.repository }}/issues/2917))
-- Point Liquid links to Liquid’s Github wiki ([#2887]({{ site.repository }}/issues/2887))
+- Point Liquid links to Liquid’s GitHub wiki ([#2887]({{ site.repository }}/issues/2887))
 - Add HTTP Basic Auth (.htaccess) plugin to list of third-party plugins ([#2931]({{ site.repository }}/issues/2931))
 - (Minor) Grammar & `_config.yml` filename fixes ([#2911]({{ site.repository }}/issues/2911))
 - Added `mathml.rb` to the list of third-party plugins. ([#2937]({{ site.repository }}/issues/2937))
diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 2aff0b959d0..067fb6e7b26 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -828,7 +828,7 @@ LESS.js files during generation.
 - [Lychee Gallery Tag](https://gist.github.com/tobru/9171700) by [tobru](https://github.com/tobru): Include [Lychee](http://lychee.electerious.com/) albums into a post. For an introduction, see [Jekyll meets Lychee - A Liquid Tag plugin](https://tobrunet.ch/articles/jekyll-meets-lychee-a-liquid-tag-plugin/)
 - [Image Set/Gallery Tag](https://github.com/callmeed/jekyll-image-set) by [callmeed](https://github.com/callmeed): Renders HTML for an image gallery from a folder in your Jekyll site. Just pass it a folder name and class/tag options.
 - [jekyll_figure](https://github.com/lmullen/jekyll_figure): Generate figures and captions with links to the figure in a variety of formats
-- [Jekyll Github Sample Tag](https://github.com/bwillis/jekyll-github-sample): A liquid tag to include a sample of a github repo file in your Jekyll site.
+- [Jekyll GitHub Sample Tag](https://github.com/bwillis/jekyll-github-sample): A liquid tag to include a sample of a github repo file in your Jekyll site.
 - [Jekyll Project Version Tag](https://github.com/rob-murray/jekyll-version-plugin): A Liquid tag plugin that renders a version identifier for your Jekyll site sourced from the git repository containing your code.
 - [Piwigo Gallery](https://github.com/AlessandroLorenzi/piwigo_gallery) by [Alessandro Lorenzi](http://www.alorenzi.eu/): Jekyll plugin to generate thumbnails from a Piwigo gallery and display them with a Liquid tag
 - [mathml.rb](https://github.com/tmthrgd/jekyll-plugins) by Tom Thorogood: A plugin to convert TeX mathematics into MathML for display.
@@ -873,7 +873,7 @@ LESS.js files during generation.
 - [generator-jekyllrb](https://github.com/robwierzbowski/generator-jekyllrb): A generator that wraps Jekyll in [Yeoman](http://yeoman.io/), a tool collection and workflow for builing modern web apps.
 - [grunt-jekyll](https://github.com/dannygarcia/grunt-jekyll): A straightforward [Grunt](http://gruntjs.com/) plugin for Jekyll.
 - [jekyll-postfiles](https://github.com/indirect/jekyll-postfiles): Add `_postfiles` directory and {% raw %}`{{ postfile }}`{% endraw %} tag so the files a post refers to will always be right there inside your repo.
-- [A layout that compresses HTML](http://jch.penibelst.de/): Github Pages compatible, configurable way to compress HTML files on site build.
+- [A layout that compresses HTML](http://jch.penibelst.de/): GitHub Pages compatible, configurable way to compress HTML files on site build.
 - [Jekyll CO₂](https://github.com/wdenton/jekyll-co2): Generates HTML showing the monthly change in atmospheric CO₂ at the Mauna Loa observatory in Hawaii.
 - [remote-include](http://www.northfieldx.co.uk/remote-include/): Includes files using remote URLs
 - [jekyll-minifier](https://github.com/digitalsparky/jekyll-minifier): Minifies HTML, XML, CSS, and Javascript both inline and as separate files utilising yui-compressor and htmlcompressor.
diff --git a/site/_docs/variables.md b/site/_docs/variables.md
index d4fb5293ddf..33b99fa54d9 100644
--- a/site/_docs/variables.md
+++ b/site/_docs/variables.md
@@ -106,7 +106,7 @@ following is a reference of the available data.
         related Posts. By default, these are the ten most recent posts.
         For high quality but slow to compute results, run the
         jekyll command with the --lsi (latent semantic
-        indexing) option. Also note Github pages does not support the lsi option when generating sites.
+        indexing) option. Also note GitHub Pages does not support the lsi option when generating sites.
 
       

     

From 3061f2d2041103b6fd4662c787e1c094fe1a3b91 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 6 Jan 2016 09:51:10 -0800
Subject: [PATCH 0224/4996] Update history to reflect merge of #4322

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index ec921ff2a2f..dcfd3ab5dbc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -44,6 +44,7 @@
   * Create namespaced rake tasks in separate `.rake` files under `lib/tasks` (#4282)
   * markdown: refactor for greater readability & efficiency (#3771)
   * Fix many Rubocop style errors (#4301)
+  * Fix spelling of "GitHub" in docs and history (#4322)
 
 ### Site Enhancements
 

From a1b39840bbf00d2acf1f5c84213d6e5692dfe0a4 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 6 Jan 2016 10:13:13 -0800
Subject: [PATCH 0225/4996] Revert change to Collection#url_template which
 caused test breakage.

Reverts dab53a697b8f58db9bef819dc9b6f5c3a592fe56
---
 lib/jekyll/collection.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index c76071712e7..f0e3333d6a9 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -186,7 +186,9 @@ def write?
     #
     # Returns the URL template to render collection's documents at.
     def url_template
-      metadata['permalink'] ||= Utils.add_permalink_suffix("/:collection/:path", site.permalink_style)
+      @url_template ||= metadata.fetch('permalink') do
+        Utils.add_permalink_suffix("/:collection/:path", site.permalink_style)
+      end
     end
 
     # Extract options for this collection from the site configuration.

From 7eefa0ffd71dfea3f65ce9db6e8c2f3354727710 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 6 Jan 2016 11:12:55 -0800
Subject: [PATCH 0226/4996] docs: remove profanity from installation page

Fixes #4321
---
 site/_docs/installation.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/site/_docs/installation.md b/site/_docs/installation.md
index f0c091f0d30..3720d043872 100644
--- a/site/_docs/installation.md
+++ b/site/_docs/installation.md
@@ -4,10 +4,10 @@ title: Installation
 permalink: /docs/installation/
 ---
 
-Getting Jekyll installed and ready-to-go should only take a few minutes. If it
-ever becomes a pain in the ass, please [file an
-issue]({{ site.repository }}/issues/new) (or submit a pull request)
-describing the issue you encountered and how we might make the process easier.
+Getting Jekyll installed and ready-to-go should only take a few minutes.
+If it ever becomes a pain, please [file an issue]({{ site.repository }}/issues/new)
+(or submit a pull request) describing the issue you
+encountered and how we might make the process easier
 
 ### Requirements
 

From acb2263f51af818ed74734b8843ddb0a18ac4532 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 7 Jan 2016 02:36:24 -0800
Subject: [PATCH 0227/4996] Add smartify filter

---
 lib/jekyll/converters/smartypants.rb | 34 ++++++++++++++++++++++++++++
 lib/jekyll/filters.rb                | 11 +++++++++
 test/test_filters.rb                 |  5 ++++
 3 files changed, 50 insertions(+)
 create mode 100644 lib/jekyll/converters/smartypants.rb

diff --git a/lib/jekyll/converters/smartypants.rb b/lib/jekyll/converters/smartypants.rb
new file mode 100644
index 00000000000..7af9d297e9a
--- /dev/null
+++ b/lib/jekyll/converters/smartypants.rb
@@ -0,0 +1,34 @@
+class Kramdown::Parser::SmartyPants < Kramdown::Parser::Kramdown
+  def initialize(source, options)
+    super
+    @block_parsers = []
+    @span_parsers =  [:smart_quotes, :html_entity, :typographic_syms, :escaped_chars]
+  end
+end
+
+module Jekyll
+  module Converters
+    class SmartyPants < Converter
+      safe true
+      priority :low
+
+      def initialize(config)
+        Jekyll::External.require_with_graceful_fail "kramdown"
+        @config = config["kramdown"].dup || {}
+        @config[:input] = :SmartyPants
+      end
+
+      def matches(_)
+        false
+      end
+
+      def output_ext(_)
+        nil
+      end
+
+      def convert(content)
+        Kramdown::Document.new(content, @config).to_html.chomp
+      end
+    end
+  end
+end
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 36760d65391..986bfdee1f6 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -15,6 +15,17 @@ def markdownify(input)
       converter.convert(input)
     end
 
+    # Convert a Markdown string into HTML output.
+    #
+    # input - The Markdown String to convert.
+    #
+    # Returns the HTML formatted String.
+    def smartify(input)
+      site = @context.registers[:site]
+      converter = site.find_converter_instance(Jekyll::Converters::SmartyPants)
+      converter.convert(input)
+    end
+
     # Convert a Sass string into CSS output.
     #
     # input - The Sass String to convert.
diff --git a/test/test_filters.rb b/test/test_filters.rb
index dc51252e68e..63e5267280d 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -31,6 +31,11 @@ def initialize(opts = {})
       assert_equal "
something really simple
\n", @filter.markdownify("something **really** simple")
     end
 
+    should "smartify with simple string" do
+      assert_equal "SmartyPants is *not* Markdown", @filter.smartify("SmartyPants is *not* Markdown")
+      assert_equal "“This filter’s test…”", @filter.smartify(%q{"This filter's test..."})
+    end
+
     should "sassify with simple string" do
       assert_equal "p {\n  color: #123456; }\n", @filter.sassify("$blue:#123456\np\n  color: $blue")
     end

From ab2cdac97961781e88f2f8331458d5ab36afa52e Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 7 Jan 2016 18:29:11 -0800
Subject: [PATCH 0228/4996] Update history to reflect merge of #4318

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index dcfd3ab5dbc..a1ad1b896bf 100644
--- a/History.markdown
+++ b/History.markdown
@@ -45,6 +45,7 @@
   * markdown: refactor for greater readability & efficiency (#3771)
   * Fix many Rubocop style errors (#4301)
   * Fix spelling of "GitHub" in docs and history (#4322)
+  * Reorganize and cleanup the Gemfile, shorten required depends. (#4318)
 
 ### Site Enhancements
 

From 3ca451a855ab8f57913c12e1300508fbe3769ed6 Mon Sep 17 00:00:00 2001
From: "Craig P. Motlin" 
Date: Thu, 7 Jan 2016 23:23:43 -0500
Subject: [PATCH 0229/4996] Fix a typo in the documentation for configuration
 defaults.

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

diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index 1b1b707c5dc..a12b2e265d3 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -397,7 +397,7 @@ webrick:
 
 ### Defaults
 
-We only provide on default and that's a Content-Type header that disables
+We only provide one default and that's a Content-Type header that disables
 caching in development so that you don't have to fight with Chrome's aggressive
 caching when you are in development mode.
 

From 754bf14e230aa40fe0e42944a0f75faf2a61afd6 Mon Sep 17 00:00:00 2001
From: "Craig P. Motlin" 
Date: Fri, 8 Jan 2016 00:14:33 -0500
Subject: [PATCH 0230/4996] Fix grammar in the documentation for posts.

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

diff --git a/site/_docs/posts.md b/site/_docs/posts.md
index f16bd2021cc..47f60f3c320 100644
--- a/site/_docs/posts.md
+++ b/site/_docs/posts.md
@@ -84,7 +84,7 @@ 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
 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
+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.
 

From a12ee551399eadd2b970f08629b39cb02f8381f8 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 7 Jan 2016 22:26:41 -0800
Subject: [PATCH 0231/4996] Update history to reflect merge of #4330 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a1ad1b896bf..7db11b3ef9e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,1916 +1 @@
-## HEAD
-
-### Minor Enhancements
-
-  * Use `Liquid::Drop`s instead of `Hash`es in `#to_liquid` (#4277)
-  * Add 'sample' Liquid filter Equivalent to Array#sample functionality (#4223)
-  * Cache parsed include file to save liquid parsing time. (#4120)
-  * Slightly speed up url sanitization and handle multiples of ///. (#4168)
-  * Print debug message when a document is skipped from reading (#4180)
-  * Include tag should accept multiple variables in the include name (#4183)
-  * Add `-o` option to serve command which opens server URL (#4144)
-  * Add CodeClimate platform for better code quality. (#4220)
-  * General improvements for WEBrick via jekyll serve such as SSL & custom headers (#4224, #4228)
-  * Add a default charset to content-type on webrick. (#4231)
-  * Switch `PluginManager` to use `require_with_graceful_fail` for better UX (#4233)
-  * Allow quoted date in front matter defaults (#4184)
-  * Add a Jekyll doctor warning for URLs that only differ by case (#3171)
-  * drops: create one base Drop class which can be set as mutable or not (#4285)
-  * drops: provide `#to_h` to allow for hash introspection (#4281)
-  * Shim subcommands with indication of gem possibly required so users know how to use them (#4254)
-
-### Bug Fixes
-
-  * Pass build options into `clean` command (#4177)
-  * Allow users to use .htm and .xhtml (XHTML5.) (#4160)
-  * Prevent Shell Injection. (#4200)
-  * Convertible should make layout data accessible via `layout` instead of `page` (#4205)
-  * Avoid using `Dir.glob` with absolute path to allow special characters in the path (#4150)
-  * Handle empty config files (#4052)
-  * Rename `@options` so that it does not impact Liquid. (#4173)
-  * utils/drops: update Drop to support `Utils.deep_merge_hashes` (#4289)
-  * Make sure jekyll/drops/drop is loaded first. (#4292)
-  * Convertible/Page/Renderer: use payload hash accessor & setter syntax for backwards-compatibility (#4311)
-  * Drop: fix hash setter precendence (#4312)
-  * utils: `has_yaml_header?` should accept files with extraneous spaces (#4290)
-  * Escape html from site.title and page.title in site template (#4307)
-
-### Development Fixes
-
-  * `jekyll-docs` should be easily release-able (#4152)
-  * Allow use of Cucumber 2.1 or greater (#4181)
-  * Modernize Kramdown for Markdown converter. (#4109)
-  * Change TestDoctorCommand to JekyllUnitTest... (#4263)
-  * Create namespaced rake tasks in separate `.rake` files under `lib/tasks` (#4282)
-  * markdown: refactor for greater readability & efficiency (#3771)
-  * Fix many Rubocop style errors (#4301)
-  * Fix spelling of "GitHub" in docs and history (#4322)
-  * Reorganize and cleanup the Gemfile, shorten required depends. (#4318)
-
-### Site Enhancements
-
-  * Add three plugins to directory (#4163)
-  * Add upgrading docs from 2.x to 3.x (#4157)
-  * Add `protect_email` to the plugins index. (#4169)
-  * Add `jekyll-deploy` to list of third-party plugins (#4179)
-  * Clarify plugin docs (#4154)
-  * Add Kickster to deployment methods in documentation (#4190)
-  * Add DavidBurela's tutorial for Windows to Windows docs page (#4210)
-  * Change GitHub code block to highlight tag to avoid it overlaps parent div (#4121)
-  * Update FormKeep link to be something more specific to Jekyll (#4243)
-  * Remove example Roger Chapman site, as the domain doesn't exist (#4249)
-  * Added configuration options for `draft_posts` to configuration docs (#4251)
-  * Fix checklist in `_assets.md` (#4259)
-  * Add Markdown examples to Pages docs (#4275)
-  * Add jekyll-paginate-category to list of third-party plugins (#4273)
-  * Add `jekyll-responsive_image` to list of third-party plugins (#4286)
-  * Add `jekyll-commonmark` to list of third-party plugins (#4299)
-  * Add documentation for incremental regeneration (#4293)
-  * Add note about removal of relative permalink support in upgrading docs (#4303)
-  * Add Pro Tip to use front matter variable to create clean URLs (#4296)
-
-## 3.0.1 / 2015-11-17
-
-### Bug Fixes
-
-  * Document: only superdirectories of the collection are categories (#4110)
-  * `Convertible#render_liquid` should use `render!` to cause failure on bad Liquid (#4077)
-  * Don't generate `.jekyll-metadata` in non-incremental build (#4079)
-  * Set `highlighter` config val to `kramdown.syntax_highlighter` (#4090)
-  * Align hooks implementation with documentation (#4104)
-  * Fix the deprecation warning in the doctor command (#4114)
-  * Fix case in `:title` and add `:slug` which is downcased (#4100)
-
-### Development Fixes
-
-  * Fix test warnings when doing rake {test,spec} or script/test (#4078)
-
-### Site Enhancements
-
-  * Update normalize.css to v3.0.3. (#4085)
-  * Update Font Awesome to v4.4.0. (#4086)
-  * Adds a note about installing the jekyll-gist gem to make gist tag work (#4101)
-  * Align hooks documentation with implementation (#4104)
-  * Add Jekyll Flickr Plugin to the list of third party plugins (#4111)
-  * Remove link to now-deleted blog post (#4125)
-  * Update the liquid syntax in the pagination docs (#4130)
-  * Add jekyll-language-plugin to plugins.md (#4134)
-  * Updated to reflect feedback in #4129 (#4137)
-  * Clarify assets.md based on feedback of #4129 (#4142)
-  * Re-correct the liquid syntax in the pagination docs (#4140)
-
-## 3.0.0 / 2015-10-26
-
-### Major Enhancements
-
-  * Liquid profiler (i.e. know how fast or slow your templates render) (#3762)
-  * Incremental regeneration (#3116)
-  * Add Hooks: a new kind of plugin (#3553)
-  * Upgrade to Liquid 3.0.0 (#3002)
-  * `site.posts` is now a Collection instead of an Array (#4055)
-  * Add basic support for JRuby (commit: 0f4477)
-  * Drop support for Ruby 1.9.3. (#3235)
-  * Support Ruby v2.2 (#3234)
-  * Support RDiscount 2 (#2767)
-  * Remove most runtime deps (#3323)
-  * Move to Rouge as default highlighter (#3323)
-  * Mimic GitHub Pages `.html` extension stripping behavior in WEBrick (#3452)
-  * Always include file extension on output files (#3490)
-  * Improved permalinks for pages and collections (#3538)
-  * Sunset (i.e. remove) Maruku (#3655)
-  * Remove support for relative permalinks (#3679)
-  * Iterate over `site.collections` as an array instead of a hash. (#3670)
-  * Adapt StaticFile for collections, config defaults (#3823)
-  * Add a Code of Conduct for the Jekyll project (#3925)
-  * Added permalink time variables (#3990)
-  * Add `--incremental` flag to enable incremental regen (disabled by default) (#4059)
-
-### Minor Enhancements
-
-  * Deprecate access to Document#data properties and Collection#docs methods (#4058)
-  * Sort static files just once, and call `site_payload` once for all collections (#3204)
-  * Separate `jekyll docs` and optimize external gem handling (#3241)
-  * Improve `Site#getConverterImpl` and call it `Site#find_converter_instance` (#3240)
-  * Use relative path for `path` Liquid variable in Documents for consistency (#2908)
-  * Generalize `Utils#slugify` for any scripts (#3047)
-  * Added basic microdata to post template in site template (#3189)
-  * Store log messages in an array of messages. (#3244)
-  * Allow collection documents to override `output` property in front matter (#3172)
-  * Keep file modification times between builds for static files (#3220)
-  * Only downcase mixed-case categories for the URL (#2571)
-  * Added per post `excerpt_separator` functionality (#3274)
-  * Allow collections YAML to end with three dots (#3134)
-  * Add mode parameter to `slugify` Liquid filter (#2918)
-  * Perf: `Markdown#matches` should avoid regexp (#3321)
-  * Perf: Use frozen regular expressions for `Utils#slugify` (#3321)
-  * Split off Textile support into jekyll-textile-converter (#3319)
-  * Improve the navigation menu alignment in the site template on small
-    screens (#3331)
-  * Show the regeneration time after the initial generation (#3378)
-  * Site template: Switch default font to Helvetica Neue (#3376)
-  * Make the `include` tag a teensy bit faster. (#3391)
-  * Add `pkill -f jekyll` to ways to kill. (#3397)
-  * Site template: collapsed, variable-driven font declaration (#3360)
-  * Site template: Don't always show the scrollbar in code blocks (#3419)
-  * Site template: Remove undefined `text` class from `p` element (#3440)
-  * Site template: Optimize text rendering for legibility (#3382)
-  * Add `draft?` method to identify if Post is a Draft & expose to Liquid (#3456)
-  * Write regeneration metadata even on full rebuild (#3464)
-  * Perf: Use `String#end_with?("/")` instead of regexp when checking paths (#3516)
-  * Docs: document 'ordinal' built-in permalink style (#3532)
-  * Upgrade liquid-c to 3.x (#3531)
-  * Use consistent syntax for deprecation warning (#3535)
-  * Added build --destination and --source flags (#3418)
-  * Site template: remove unused `page.meta` attribute (#3537)
-  * Improve the error message when sorting null objects (#3520)
-  * Added liquid-md5 plugin (#3598)
-  * Documentation: RR replaced with RSpec Mocks (#3600)
-  * Documentation: Fix subpath. (#3599)
-  * Create 'tmp' dir for test_tags if it doesn't exist (#3609)
-  * Extract reading of data from `Site` to reduce responsibilities. (#3545)
-  * Removed the word 'Jekyll' a few times from the comments (#3617)
-  * `bin/jekyll`: with no args, exit with exit code 1 (#3619)
-  * Incremental build if destination file missing (#3614)
-  * Static files `mtime` liquid should return a `Time` obj (#3596)
-  * Use `Jekyll::Post`s for both LSI indexing and lookup. (#3629)
-  * Add `charset=utf-8` for HTML and XML pages in WEBrick (#3649)
-  * Set log level to debug when verbose flag is set (#3665)
-  * Added a mention on the Gemfile to complete the instructions (#3671)
-  * Perf: Cache `Document#to_liquid` and invalidate where necessary (#3693)
-  * Perf: `Jekyll::Cleaner#existing_files`: Call `keep_file_regex` and
-    `keep_dirs` only once, not once per iteration (#3696)
-  * Omit jekyll/jekyll-help from list of resources. (#3698)
-  * Add basic `jekyll doctor` test to detect fsnotify (OSX) anomalies. (#3704)
-  * Added talk.jekyllrb.com to "Have questions?" (#3694)
-  * Performance: Sort files only once (#3707)
-  * Performance: Marshal metadata (#3706)
-  * Upgrade highlight wrapper from `div` to `figure` (#3779)
-  * Upgrade mime-types to `~> 2.6` (#3795)
-  * Update windows.md with Ruby version info (#3818)
-  * Make the directory for includes configurable (#3782)
-  * Rename directory configurations to match `*_dir` convention for consistency (#3782)
-  * Internal: trigger hooks by owner symbol (#3871)
-  * Update MIME types from mime-db (#3933)
-  * Add header to site template `_config.yml` for clarity & direction (#3997)
-  * Site template: add timezone offset to post date frontmatter (#4001)
-  * Make a constant for the regex to find hidden files (#4032)
-  * Site template: refactor github & twitter icons into includes (#4049)
-  * Site template: add background to Kramdown Rouge-ified backtick code blocks (#4053)
-
-### Bug Fixes
-
-  * `post_url`: fix access deprecation warning & fix deprecation msg (#4060)
-  * Perform jekyll-paginate deprecation warning correctly. (#3580)
-  * Make permalink parsing consistent with pages (#3014)
-  * `time()`pre-filter method should accept a `Date` object (#3299)
-  * Remove unneeded end tag for `link` in site template (#3236)
-  * Kramdown: Use `enable_coderay` key instead of `use_coderay` (#3237)
-  * Unescape `Document` output path (#2924)
-  * Fix nav items alignment when on multiple rows (#3264)
-  * Highlight: Only Strip Newlines/Carriage Returns, not Spaces (#3278)
-  * Find variables in front matter defaults by searching with relative file path. (#2774)
-  * Allow variables (e.g `:categories`) in YAML front matter permalinks (#3320)
-  * Handle nil URL placeholders in permalinks (#3325)
-  * Template: Fix nav items alignment when in "burger" mode (#3329)
-  * Template: Remove `!important` from nav SCSS introduced in #3329 (#3375)
-  * The `:title` URL placeholder for collections should be the filename slug. (#3383)
-  * Trim the generate time diff to just 3 places past the decimal place (#3415)
-  * The highlight tag should only clip the newlines before and after the *entire* block, not in between (#3401)
-  * highlight: fix problem with linenos and rouge. (#3436)
-  * `Site#read_data_file`: read CSV's with proper file encoding (#3455)
-  * Ignore `.jekyll-metadata` in site template (#3496)
-  * Template: Point documentation link to the documentation pages (#3502)
-  * Removed the trailing slash from the example `/blog` baseurl comment (#3485)
-  * Clear the regenerator cache every time we process (#3592)
-  * Readd (bring back) minitest-profile (#3628)
-  * Add WOFF2 font MIME type to Jekyll server MIME types (#3647)
-  * Be smarter about extracting the extname in `StaticFile` (#3632)
-  * Process metadata for all dependencies (#3608)
-  * Show error message if the YAML front matter on a page/post is invalid. (#3643)
-  * Upgrade redcarpet to 3.2 (Security fix: OSVDB-120415) (#3652)
-  * Create #mock_expects that goes directly to RSpec Mocks. (#3658)
-  * Open `.jekyll-metadata` in binary mode to read binary Marshal data (#3713)
-  * Incremental regeneration: handle deleted, renamed, and moved dependencies (#3717)
-  * Fix typo on line 19 of pagination.md (#3760)
-  * Fix it so that 'blog.html' matches 'blog.html' (#3732)
-  * Remove occasionally-problematic `ensure` in `LiquidRenderer` (#3811)
-  * Fixed an unclear code comment in site template SCSS (#3837)
-  * Fix reading of binary metadata file (#3845)
-  * Remove var collision with site template header menu iteration variable (#3838)
-  * Change non-existent `hl_linenos` to `hl_lines` to allow passthrough in safe mode (#3787)
-  * Add missing flag to disable the watcher (#3820)
-  * Update CI guide to include more direct explanations of the flow (#3891)
-  * Set `future` to `false` in the default config (#3892)
-  * filters: `where` should compare stringified versions of input & comparator (#3935)
-  * Read build options for `jekyll clean` command (#3828)
-  * Fix #3970: Use Gem::Version to compare versions, not `>`.
-  * Abort if no subcommand. Fixes confusing message. (#3992)
-  * Whole-post excerpts should match the post content (#4004)
-  * Change default font weight to 400 to fix bold/strong text issues (#4050)
-  * Document: Only auto-generate the excerpt if it's not overridden (#4062)
-  * Utils: `deep_merge_hashes` should also merge `default_proc` (45f69bb)
-  * Defaults: compare paths in `applies_path?` as `String`s to avoid confusion (7b81f00)
-
-### Development Fixes
-
-  * Remove loader.rb and "modernize" `script/test`. (#3574)
-  * Improve the grammar in the documentation (#3233)
-  * Update the LICENSE text to match the MIT license exactly (#3253)
-  * Update rake task `site:publish` to fix minor bugs. (#3254)
-  * Switch to shields.io for the README badges. (#3255)
-  * Use `FileList` instead of `Dir.glob` in `site:publish` rake task (#3261)
-  * Fix test script to be platform-independent (#3279)
-  * Instead of symlinking `/tmp`, create and symlink a local `tmp` in the tests (#3258)
-  * Fix some spacing (#3312)
-  * Fix comment typo in `lib/jekyll/frontmatter_defaults.rb` (#3322)
-  * Move all `regenerate?` checking to `Regenerator` (#3326)
-  * Factor out a `read_data_file` call to keep things clean (#3380)
-  * Proof the site with CircleCI. (#3427)
-  * Update LICENSE to 2015. (#3477)
-  * Upgrade tests to use Minitest (#3492)
-  * Remove trailing whitespace (#3497)
-  * Use `fixture_site` for Document tests (#3511)
-  * Remove adapters deprecation warning (#3529)
-  * Minor fixes to `url.rb` to follow GitHub style guide (#3544)
-  * Minor changes to resolve deprecation warnings (#3547)
-  * Convert remaining textile test documents to markdown (#3528)
-  * Migrate the tests to use rspec-mocks (#3552)
-  * Remove `activesupport` (#3612)
-  * Added tests for `Jekyll:StaticFile` (#3633)
-  * Force minitest version to 5.5.1 (#3657)
-  * Update the way cucumber accesses Minitest assertions (#3678)
-  * Add `script/rubyprof` to generate cachegrind callgraphs (#3692)
-  * Upgrade cucumber to 2.x (#3795)
-  * Update Kramdown. (#3853)
-  * Updated the scripts shebang for portability (#3858)
-  * Update JRuby testing to 9K ([3ab386f](https://github.com/jekyll/jekyll/commit/3ab386f1b096be25a24fe038fc70fd0fb08d545d))
-  * Organize dependencies into dev and test groups. (#3852)
-  * Contributing.md should refer to `script/cucumber` (#3894)
-  * Update contributing documentation to reflect workflow updates (#3895)
-  * Add script to vendor mime types (#3933)
-  * Ignore .bundle dir in SimpleCov (#4033)
-
-### Site Enhancements
-
-  * Add 'info' labels to certain notes in collections docs (#3601)
-  * Remove extra spaces, make the last sentence less awkward in permalink docs (#3603)
-  * Update the permalinks documentation to reflect the updates for 3.0 (#3556)
-  * Add blog post announcing Jekyll Help (#3523)
-  * Add Jekyll Talk to Help page on site (#3518)
-  * Change Ajax pagination resource link to use HTTPS (#3570)
-  * Fixing the default host on docs (#3229)
-  * Add `jekyll-thumbnail-filter` to list of third-party plugins (#2790)
-  * Add link to 'Adding Ajax pagination to Jekyll' to Resources page (#3186)
-  * Add a Resources link to tutorial on building dynamic navbars (#3185)
-  * Semantic structure improvements to the post and page layouts (#3251)
-  * Add new AsciiDoc plugin to list of third-party plugins. (#3277)
-  * Specify that all transformable collection documents must contain YAML front matter (#3271)
-  * Assorted accessibility fixes (#3256)
-  * Update configuration docs to mention `keep_files` for `destination` (#3288, #3296)
-  * Break when we successfully generate nav link to save CPU cycles. (#3291)
-  * Update usage docs to mention `keep_files` and a warning about `destination` cleaning (#3295)
-  * Add logic to automatically generate the `next_section` and `prev_section` navigation items (#3292)
-  * Some small fixes for the Plugins TOC. (#3306)
-  * Added versioning comment to configuration file (#3314)
-  * Add `jekyll-minifier` to list of third-party plugins (#3333)
-  * Add blog post about the Jekyll meet-up (#3332)
-  * Use `highlight` Liquid tag instead of the four-space tabs for code (#3336)
-  * 3.0.0.beta1 release post (#3346)
-  * Add `twa` to the list of third-party plugins (#3384)
-  * Remove extra spaces (#3388)
-  * Fix small grammar errors on a couple pages (#3396)
-  * Fix typo on Templates docs page (#3420)
-  * s/three/four for plugin type list (#3424)
-  * Release jekyllrb.com as a locally-compiled site. (#3426)
-  * Add a jekyllrb.com/help page which elucidates places from which to get help (#3428)
-  * Remove extraneous dash on Plugins doc page which caused a formatting error (#3431)
-  * Fix broken link to Jordan Thornquest's website. (#3438)
-  * Change the link to an extension (#3457)
-  * Fix Twitter link on the help page (#3466)
-  * Fix wording in code snippet highlighting section (#3475)
-  * Add a `/` to `paginate_path` in the Pagination documentation (#3479)
-  * Add a link on all the docs pages to "Improve this page". (#3510)
-  * Add jekyll-auto-image generator to the list of third-party plugins (#3489)
-  * Replace link to the proposed `picture` element spec (#3530)
-  * Add frontmatter date formatting information (#3469)
-  * Improve consistency and clarity of plugins options note (#3546)
-  * Add permalink warning to pagination docs (#3551)
-  * Fix grammar in Collections docs API stability warning (#3560)
-  * Restructure `excerpt_separator` documentation for clarity (#3550)
-  * Fix accidental line break in collections docs (#3585)
-  * Add information about the `.jekyll-metadata` file (#3597)
-  * Document addition of variable parameters to an include (#3581)
-  * Add `jekyll-files` to the list of third-party plugins. (#3586)
-  * Define the `install` step in the CI example `.travis.yml` (#3622)
-  * Expand collections documentation. (#3638)
-  * Add the "warning" note label to excluding `vendor` in the CI docs page (#3623)
-  * Upgrade pieces of the Ugrading guide for Jekyll 3 (#3607)
-  * Showing how to access specific data items (#3468)
-  * Clarify pagination works from within HTML files (#3467)
-  * Add note to `excerpt_separator` documentation that it can be set globally (#3667)
-  * Fix some names on Troubleshooting page (#3683)
-  * Add `remote_file_content` tag plugin to list of third-party plugins (#3691)
-  * Update the Redcarpet version on the Configuration page. (#3743)
-  * Update the link in the welcome post to point to Jekyll Talk (#3745)
-  * Update link for navbars with data attributes tutorial (#3728)
-  * Add `jekyll-asciinema` to list of third-party plugins (#3750)
-  * Update pagination example to be agnostic to first pagination dir (#3763)
-  * Detailed instructions for rsync deployment method (#3848)
-  * Add Jekyll Portfolio Generator to list of plugins (#3883)
-  * Add `site.html_files` to variables docs (#3880)
-  * Add Static Publisher tool to list of deployment methods (#3865)
-  * Fix a few typos. (#3897)
-  * Add `jekyll-youtube` to the list of third-party plugins (#3931)
-  * Add Views Router plugin (#3950)
-  * Update install docs (Core dependencies, Windows reqs, etc) (#3769)
-  * Use Jekyll Feed for jekyllrb.com (#3736)
-  * Add jekyll-umlauts to plugins.md ($3966)
-  * Troubleshooting: fix broken link, add other mac-specific info (#3968)
-  * Add a new site for learning purposes (#3917)
-  * Added documentation for Jekyll environment variables (#3989)
-  * Fix broken configuration documentation page (#3994)
-  * Add troubleshooting docs for installing on El Capitan (#3999)
-  * Add Lazy Tweet Embedding to the list of third-party plugins (#4015)
-  * Add installation instructions for 2 of 3 options for plugins (#4013)
-  * Add alternative jekyll gem installation instructions (#4018)
-  * Fix a few typos and formatting problems. (#4022)
-  * Fix pretty permalink example (#4029)
-  * Note that `_config.yml` is not reloaded during regeneration (#4034)
-  * Apply code block figure syntax to blocks in CONTRIBUTING (#4046)
-  * Add jekyll-smartify to the list of third-party plugins (#3572)
-
-## 2.5.3 / 2014-12-22
-
-### Bug Fixes
-
-  * When checking a Markdown extname, include position of the `.` (#3147)
-  * Fix `jsonify` Liquid filter handling of boolean values (#3154)
-  * Add comma to value of `viewport` meta tag (#3170)
-  * Set the link type for the RSS feed to `application/rss+xml` (#3176)
-  * Refactor `#as_liquid` (#3158)
-
-### Development Fixes
-
-  * Exclude built-in bundles from being added to coverage report (#3180)
-
-### Site Enhancements
-
-  * 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)
-  * Repeat warning about cleaning of the `destination` directory (#3161)
-  * Add jekyll-500px-embed to list of third-party plugins (#3163)
-  * Simplified platform detection in Gemfile example for Windows (#3177)
-  * Add the `jekyll-jalali` plugin added to the list of third-party plugins. (#3198)
-  * Add Table of Contents to Troubleshooting page (#3196)
-  * Add `inline_highlight` plugin to list of third-party plugins (#3212)
-  * Add `jekyll-mermaid` plugin to list of third-party plugins (#3222)
-
-## 2.5.2 / 2014-11-17
-
-### Minor Enhancements
-
-  * `post_url` should match `post.name` instead of slugs and dates (#3058)
-
-### Bug Fixes
-
-  * Fix bundle require for `:jekyll_plugins` (#3119)
-  * Remove duplicate regexp phrase: `^\A` (#3089)
-  * Remove duplicate `Conversion error:` message in `Convertible` (#3088)
-  * Print full conversion error message in `Renderer#convert` (#3090)
-
-### Site Enhancements
-
-  * Change variable names in Google Analytics script (#3093)
-  * Mention CSV files in the docs for data files (#3101)
-  * Add trailing slash to `paginate_path` example. (#3091)
-  * Get rid of noifniof (`excerpt_separator`) (#3094)
-  * Sass improvements, around nesting mostly. (#3123)
-  * Add webmentions.io plugin to the list of third-party plugins (#3127)
-  * Add Sass mixins and use them. (#2904)
-  * Slightly compress jekyll-sticker.jpg. (#3133)
-  * Update gridism and separate out related but custom styles. (#3132)
-  * Add remote-include plugin to list of third-party plugins (#3136)
-
-## 2.5.1 / 2014-11-09
-
-### Bug Fixes
-
-  * Fix path sanitation bug related to Windows drive names (#3077)
-
-### Development Fixes
-
-  * Add development time dependencies on minitest and test-unit to gemspec for cygwin (#3064)
-  * Use Travis's built-in caching. (#3075)
-
-## 2.5.0 / 2014-11-06
-
-### Minor Enhancements
-
-  * Require gems in `:jekyll_plugins` Gemfile group unless `JEKYLL_NO_BUNDLER_REQUIRE` is specified in the environment. (#2865)
-  * Centralize path sanitation in the `Site` object (#2882)
-  * Allow placeholders in permalinks (#3031)
-  * Allow users to specify the log level via `JEKYLL_LOG_LEVEL`. (#3067)
-  * Fancy Indexing with WEBrick (#3018)
-  * Allow Enumerables to be used with `where` filter. (#2986)
-  * Meta descriptions in the site template now use `page.excerpt` if it's available (#2964)
-  * Change indentation in `head.html` of site template to 2 spaces from 4 (#2973)
-  * Use a `$content-width` variable instead of a fixed value in the site template CSS (#2972)
-  * Strip newlines in site template `` description. (#2982)
-  * Add link to atom feed in `head` of site template files (#2996)
-  * Performance optimizations (#2994)
-  * Use `Hash#each_key` instead of `Hash#keys.each` to speed up iteration
-    over hash keys. (#3017)
-  * Further minor performance enhancements. (#3022)
-  * Add 'b' and 's' aliases for build and serve, respectively (#3065)
-
-### Bug Fixes
-
-  * Fix Rouge's RedCarpet plugin interface integration (#2951)
-  * Remove `--watch` from the site template blog post since it defaults
-    to watching in in 2.4.0 (#2922)
-  * Fix code for media query mixin in site template (#2946)
-  * Allow post URL's to have `.htm` extensions (#2925)
-  * `Utils.slugify`: Don't create new objects when gsubbing (#2997)
-  * The jsonify filter should deep-convert to Liquid when given an Array. (#3032)
-  * Apply `jsonify` filter to Hashes deeply and effectively (#3063)
-  * Use `127.0.0.1` as default host instead of `0.0.0.0` (#3053)
-  * In the case that a Gemfile does not exist, ensure Jekyll doesn't fail on requiring the Gemfile group (#3066)
-
-### Development Fixes
-
-  * Fix a typo in the doc block for `Jekyll::URL.escape_path` (#3052)
-  * Add integration test for `jekyll new --blank` in TestUnit (#2913)
-  * Add unit test for `jekyll new --force` logic (#2929)
-  * Update outdated comment for `Convertible#transform` (#2957)
-  * Add Hakiri badge to README. (#2953)
-  * Add some simple benchmarking tools. (#2993)
-
-### Site Enhancements
-
-  * `NOKOGIRI_USE_SYSTEM_LIBRARIES=true` **decreases** installation time. (#3040)
-  * Add FormKeep to resources as Jekyll form backend (#3010)
-  * Fixing a mistake in the name of the new Liquid tag (#2969)
-  * Update Font Awesome to v4.2.0. (#2898)
-  * Fix link to #2895 in 2.4.0 release post. (#2899)
-  * Add Big Footnotes for Kramdown plugin to list of third-party plugins (#2916)
-  * Remove warning regarding GHP use of singular types for front matter defaults (#2919)
-  * Fix quote character typo in site documentation for templates (#2917)
-  * Point Liquid links to Liquid’s GitHub wiki (#2887)
-  * Add HTTP Basic Auth (.htaccess) plugin to list of third-party plugins (#2931)
-  * (Minor) Grammar & `_config.yml` filename fixes (#2911)
-  * Added `mathml.rb` to the list of third-party plugins. (#2937)
-  * Add `--force_polling` to the list of configuration options (#2943)
-  * Escape unicode characters in site CSS (#2906)
-  * Add note about using the github-pages gem via pages.github.com/versions.json (#2939)
-  * Update usage documentation to reflect 2.4 auto-enabling of `--watch`. (#2954)
-  * Add `--skip-initial-build` to configuration docs (#2949)
-  * Fix a minor typo in Templates docs page (#2959)
-  * Add a ditaa-ditaa plugin under Other section on the Plugins page (#2967)
-  * Add `build/serve -V` option to configuration documentation (#2948)
-  * Add 'Jekyll Twitter Plugin' to list of third-party plugins (#2979)
-  * Docs: Update normalize.css to v3.0.2. (#2981)
-  * Fix typo in Continuous Integration documentation (#2984)
-  * Clarify behavior of `:categories` in permalinks (#3011)
-
-## 2.4.0 / 2014-09-09
-
-### Minor Enhancements
-
-  * Support a new `relative_include` tag (#2870)
-  * Auto-enable watch on 'serve' (#2858)
-  * Render Liquid in CoffeeScript files (#2830)
-  * Array Liquid filters: `push`, `pop`, `unshift`, `shift` (#2895)
-  * Add `:title` to collection URL template fillers (#2864)
-  * Add support for CSV files in the `_data` directory (#2761)
-  * Add the `name` variable to collection permalinks (#2799)
-  * Add `inspect` liquid filter. (#2867)
-  * Add a `slugify` Liquid filter (#2880)
-
-### Bug Fixes
-
-  * Use `Jekyll.sanitized_path` when adding static files to Collections (#2849)
-  * Fix encoding of `main.scss` in site template (#2771)
-  * Fix orientation bugs in default site template (#2862)
-
-### Development Fixes
-
-  * Update simplecov gem to 0.9 (#2748)
-  * Remove `docs/` dir (#2768)
-  * add class `<< self` idiom to `New` command (#2817)
-  * Allow Travis to 'parallelize' our tests (#2859)
-  * Fix test for Liquid rendering in Sass (#2856)
-  * Fixing "vertycal" typo in site template's `_base.scss` (#2889)
-
-### Site Enhancements
-
-  * Document the `name` variable for collection permalinks (#2829)
-  * Adds info about installing jekyll in current dir (#2839)
-  * Remove deprecated `jekyll-projectlist` plugin from list of third-party
-    plugins (#2742)
-  * Remove tag plugins that are built in to Jekyll (#2751)
-  * Add `markdown-writer` package for Atom Editor to list of third-party
-    plugins (#2763)
-  * Fix typo in site documentation for collections (#2764)
-  * Fix minor typo on plugins docs page (#2765)
-  * Replace markdown with HTML in `sass_dir` note on assets page (#2791)
-  * Fixed "bellow" typo in datafiles docs (#2879)
-  * Fix code/markdown issue in documentation for variables (#2877)
-  * Remove Good Include third-party plugin from plugins page (#2881)
-  * Add some more docs on `include_relative` (#2884)
-
-## 2.3.0 / 2014-08-10
-
-### Minor Enhancements
-
-  * Allow Convertibles to be converted by >= 1 converters (#2704)
-  * Allow Sass files to be rendered in Liquid, but never place them in layouts. (#2733)
-  * Add `jekyll help` command (#2707)
-  * Use `.scss` for `site_template` styles. (#2667)
-  * Don't require the `scope` key in front matter defaults (#2659)
-  * No longer set `permalink: pretty` in the `_config.yml` for the site template (#2680)
-  * Rework site template to utilize Sass (#2687)
-  * Notify the user when auto-regeneration is disabled. (#2696)
-  * Allow partial variables in include tag filename argument (#2693)
-  * Move instances of `Time.parse` into a Utils method (#2682)
-  * Ignore subfolders in the `_posts` folder (#2705) REVERTS (#2633)
-  * Front Matter default types should always be pluralized (#2732)
-  * Read in static files into `collection.files` as `StaticFile`s (#2737)
-  * Add `sassify` and `scssify` Liquid filters (#2739)
-  * Replace `classifier` gem with `classifier-reborn` (#2721)
-
-### Bug Fixes
-
-  * Use only the last extname when multiple converters exist (#2722)
-  * Call `#to_liquid` before calling `#to_json` in jsonify filter (#2729)
-  * Use non padded config in `strftime` to avoid parse string twice (#2673)
-  * Replace deprecated Ruby methods with undeprecated ones (#2664)
-  * Catch errors when parsing Post `date` front matter value & produce nice error message (#2649)
-  * Allow static files in Collections (#2615)
-  * Fixed typo in `Deprecator#gracefully_require` error message (#2694)
-  * Remove preemptive loading of the 'classifier' gem. (#2697)
-  * Use case-insensitive checking for the file extensions when loading config files (#2718)
-  * When Reading Documents, Respect `encoding` Option (#2720)
-  * Refactor based on jekyll-watch clean-up. (#2716)
-  * `Document#to_s` should produce just the content of the document (#2731)
-
-### Development Fixes
-
-  * Only include lib files in the gem (#2671)
-  * Fix `git diff` command in `proof` script (#2672)
-  * Make default rake task a multitask so tests run in parallel (#2735)
-
-### Site Enhancements
-
-  * Use Sass and a Docs Collection (#2651)
-  * Add `latest_version.txt` file to the site (#2740)
-  * Be more ambiguous about `page.content`. But more transparent. (#2522)
-  * Streamlining front matter wording (instead of front-matter/frontmatter) (#2674)
-  * Add note that source directory cannot be modified in GitHub Pages (#2669)
-  * Fix links from #2669 to be actual HTML. Whoops. (#2679)
-  * Add link to `jekyll-slim` in list of third-party plugins (#2689)
-  * Add Barry Clark's Smashing Magazine tutorial to resources page (#2688)
-  * Reorganize and update default configuration settings (#2456)
-  * Fixing indentation in the configuration docs about Redcarpet exts (#2717)
-  * Use `null` in YAML instead of `nil` in default config list (#2719)
-  * Fix typo in Continuous Integration docs (#2708)
-
-## 2.2.0 / 2014-07-29
-
-### Minor Enhancements
-
-  * Throw a warning if the specified layout does not exist (#2620)
-  * Whitelist Pygments options in safe mode (#2642)
-
-### Bug Fixes
-
-  * Remove unnecessary `Jekyll::Tags::IncludeTag#blank?` method (#2625)
-  * Categories in the path are ignored (#2633)
-
-### Development Fixes
-
-  * Refactoring Errors & Requires of Third-Party stuff (#2591)
-  * Add further tests for categories (#2584)
-  * Proof site with html-proofer on change (#2605)
-  * Fix up bug in #2605 which caused proofing the site not to function (#2608)
-  * Use `bundle exec` in `script/proof` (#2610)
-
-### Site Enhancements
-
-  * Update Kramdown urls (#2588)
-  * Add `Jekyll::AutolinkEmail` and `Jekyll::GitMetadata` to the list of
-    third-party plugins (#2596)
-  * Fix a bunch of broken links in the site (#2601)
-  * Replace dead links with working links (#2611)
-  * Add jekyll-hook to deployment methods (#2617)
-  * Added kramdown-with-pygments plugin to the list of third-party plugins (#2623)
-  * Update outdated "Extras" page and remove duplicate documentation (#2622)
-  * Add co2 plugin to list of third-party plugins (#2639)
-  * Attempt to clarify the way Sass imports happen (#2642)
-
-## 2.1.1 / 2014-07-01
-
-### Bug Fixes
-
-  * Patch read vulnerabilities for data & confirm none for layouts (#2563)
-  * Update Maruku dependency to allow use of the latest version (#2576)
-  * Remove conditional assignment from document URL to prevent stale urls (#2575)
-
-### Site Enhancements
-
-  * Add vertical margin to `highlight` to separate code blocks (#2558)
-  * Add `html_pages` to Variables docs (#2567)
-  * Fixed broken link to Permalinks page (#2572)
-  * Update link to Windows installation guide (#2578)
-
-## 2.1.0 / 2014-06-28
-
-### Minor Enhancements
-
-  * Bump to the latest Liquid version, 2.6.1 (#2495)
-  * Add support for JSON files in the `_data` directory (#2369)
-  * Allow subclasses to override `EXCERPT_ATTRIBUTES_FOR_LIQUID` (#2408)
-  * Add `Jekyll.env` and `jekyll.environment` (the Liquid var) (#2417)
-  * Use `_config.yaml` or `_config.yml` (`.yml` takes precedence) (#2406)
-  * Override collection url template (#2418)
-  * Allow subdirectories in `_data` (#2395)
-  * Extract Pagination Generator into gem: `jekyll-paginate` (#2455)
-  * Utilize `date_to_rfc822` filter in site template (#2437)
-  * Add categories, last build datetime, and generator to site template
-    feed (#2438)
-  * Configurable, replaceable Logger-compliant logger (#2444)
-  * Extract `gist` tag into a separate gem (#2469)
-  * Add `collection` attribute to `Document#to_liquid` to access the
-    document's collection label. (#2436)
-  * Upgrade listen to `2.7.6 <= x < 3.0.0` (#2492)
-  * Allow configuration of different Twitter and GitHub usernames in site template (#2485)
-  * Bump Pygments to v0.6.0 (#2504)
-  * Front matter defaults for documents in collections (#2419)
-  * Include files with a url which ends in `/` in the `site.html_pages` list (#2524)
-  * Make `highlight` tag use `language-` prefix in CSS class (#2511)
-  * Lookup item property via `item#to_liquid` before `#data` or `#[]` in filters (#2493)
-  * Skip initial build of site on serve with flag (#2477)
-  * Add support for `hl_lines` in `highlight` tag (#2532)
-  * Spike out `--watch` flag into a separate gem (#2550)
-
-### Bug Fixes
-
-  * Liquid `sort` filter should sort even if one of the values is `nil` (#2345)
-  * Remove padding on `pre code` in the site template CSS (#2383)
-  * Set `log_level` earlier to silence info level configuration output (#2393)
-  * Only list pages which have `title` in site template (#2411)
-  * Accept `Numeric` values for dates, not `Number` values (#2377)
-  * Prevent code from overflowing container in site template (#2429)
-  * Encode URLs in UTF-8 when escaping and unescaping (#2420)
-  * No Layouts or Liquid for Asset Files (#2431)
-  * Allow front matter defaults to set post categories (#2373)
-  * Fix command in subcommand deprecation warning (#2457)
-  * Keep all parent directories of files/dirs in `keep_files` (#2458)
-  * When using RedCarpet and Rouge without Rouge installed, fixed erroneous
-    error which stated that redcarpet was missing, not rouge. (#2464)
-  * Ignore *all* directories and files that merit it on auto-generation (#2459)
-  * Before copying file, explicitly remove the old one (#2535)
-  * Merge file system categories with categories from YAML. (#2531)
-  * Deep merge front matter defaults (#2490)
-  * Ensure exclude and include arrays are arrays of strings (#2542)
-  * Allow collections to have dots in their filenames (#2552)
-  * Collections shouldn't try to read in directories as files (#2552)
-  * Be quiet very quickly. (#2520)
-
-### Development Fixes
-
-  * Test Ruby 2.1.2 instead of 2.1.1 (#2374)
-  * Add test for sorting UTF-8 characters (#2384)
-  * Use `https` for GitHub links in documentation (#2470)
-  * Remove coverage reporting with Coveralls (#2494)
-  * Fix a bit of missing TomDoc to `Jekyll::Commands::Build#build` (#2554)
-
-### Site Enhancements
-
-  * Set `timezone` to `America/Los_Angeles` (#2394)
-  * Improve JavaScript in `anchor_links.html` (#2368)
-  * Remove note on Quickstart page about default markdown converter (#2387)
-  * Remove broken link in extras.md to a Maruku fork (#2401)
-  * Update Font Awesome to v4.1.0. (#2410)
-  * Fix broken link on Installation page to Templates page (#2421)
-  * Prevent table from extending parent width in permalink style table (#2424)
-  * Add collections to info about pagination support (#2389)
-  * Add `jekyll_github_sample` plugin to list of third-party plugins (#2463)
-  * Clarify documentation around front matter defaults and add details
-    about defaults for collections. (#2439)
-  * Add Jekyll Project Version Tag to list of third-party plugins (#2468)
-  * Use `https` for GitHub links across whole site (#2470)
-  * Add StickerMule + Jekyll post (#2476)
-  * Add Jekyll Asset Pipeline Reborn to list of third-party plugins (#2479)
-  * Add link to jekyll-compress-html to list of third-party plugins (#2514)
-  * Add Piwigo Gallery to list of third-party plugins (#2526)
-  * Set `show_drafts` to `false` in default configuration listing (#2536)
-  * Provide an updated link for Windows installation instructions (#2544)
-  * Remove `url` from configuration docs (#2547)
-  * Documentation for Continuous Integration for your Jekyll Site (#2432)
-
-## 2.0.3 / 2014-05-08
-
-### Bug Fixes
-
-  * Properly prefix links in site template with URL or baseurl depending upon
-    need. (#2319)
-  * Update gist tag comments and error message to require username (#2326)
-  * Fix `permalink` setting in site template (#2331)
-  * Don't fail if any of the path objects are nil (#2325)
-  * Instantiate all descendants for converters and generators, not just
-    direct subclasses (#2334)
-  * Replace all instances of `site.name` with `site.title` in site template (#2324)
-  * `Jekyll::Filters#time` now accepts UNIX timestamps in string or number form (#2339)
-  * Use `item_property` for `where` filter so it doesn't break on collections (#2359)
-  * Rescue errors thrown so `--watch` doesn't fail (#2364)
-
-### Site Enhancements
-
-  * Add missing "as" to assets docs page (#2337)
-  * Update docs to reflect new `baseurl` default (#2341)
-  * Add links to headers who have an ID. (#2342)
-  * Use symbol instead of HTML number in `upgrading.md` (#2351)
-  * Fix link to front matter defaults docs (#2353)
-  * Fix for `History.markdown` in order to fix history page in docs (#2363)
-
-## 2.0.2 / 2014-05-07
-
-### Bug Fixes
-
-  * Correct use of `url` and `baseurl` in the site template. (#2317)
-  * Default `baseurl` to `""` (#2317)
-
-### Site Enhancements
-
-  * Correct docs for the `gist` plugin so it always includes the username. (#2314)
-  * Clarify new (defaults, `where` filter) features in docs (#2316)
-
-## 2.0.1 / 2014-05-06
-
-### Bug Fixes
-
-  * Require `kramdown` gem instead of `maruku` gem
-
-## 2.0.0 / 2014-05-06
-
-### Major Enhancements
-  * Add "Collections" feature (#2199)
-  * Add gem-based plugin whitelist to safe mode (#1657)
-  * Replace the commander command line parser with a more robust
-    solution for our needs called `mercenary` (#1706)
-  * Remove support for Ruby 1.8.x (#1780)
-  * Move to jekyll/jekyll from mojombo/jekyll (#1817)
-  * Allow custom markdown processors (#1872)
-  * Provide support for the Rouge syntax highlighter (#1859)
-  * Provide support for Sass (#1932)
-  * Provide a 300% improvement when generating sites that use
-    `Post#next` or `Post#previous` (#1983)
-  * Provide support for CoffeeScript (#1991)
-  * Replace Maruku with Kramdown as Default Markdown Processor (#1988)
-  * Expose `site.static_files` to Liquid (#2075)
-  * Complete redesign of the template site generated by `jekyll new` (#2050)
-  * Update Listen from 1.x to 2.x (#2097)
-  * Front matter defaults (#2205)
-  * Deprecate `relative_permalinks` configuration option (default to `false`) (#2307)
-  * Exclude files based on prefix as well as `fnmatch?` (#2303)
-
-### Minor Enhancements
-  * Move the EntryFilter class into the Jekyll module to avoid polluting the
-    global namespace (#1800)
-  * Add `group_by` Liquid filter create lists of items grouped by a common
-    property's value (#1788)
-  * Add support for Maruku's `fenced_code_blocks` option (#1799)
-  * Update Redcarpet dependency to ~> 3.0 (#1815)
-  * Automatically sort all pages by name (#1848)
-  * Better error message when time is not parseable (#1847)
-  * Allow `include` tag variable arguments to use filters (#1841)
-  * `post_url` tag should raise `ArgumentError` for invalid name (#1825)
-  * Bump dependency `mercenary` to `~> 0.2.0` (#1879)
-  * Bump dependency `safe_yaml` to `~> 1.0` (#1886)
-  * Allow sorting of content by custom properties (#1849)
-  * Add `--quiet` flag to silence output during build and serve (#1898)
-  * Add a `where` filter to filter arrays based on a key/value pair
-    (#1875)
-  * Route 404 errors to a custom 404 page in development (#1899)
-  * Excludes are now relative to the site source (#1916)
-  * Bring MIME Types file for `jekyll serve` to complete parity with GH Pages
-    servers (#1993)
-  * Adding Breakpoint to make new site template more responsive (#2038)
-  * Default to using the UTF-8 encoding when reading files. (#2031)
-  * Update Redcarpet dependency to ~> 3.1 (#2044)
-  * Remove support for Ruby 1.9.2 (#2045)
-  * Add `.mkdown` as valid Markdown extension (#2048)
-  * Add `index.xml` to the list of WEBrick directory index files (#2041)
-  * Make the `layouts` config key relative to CWD or to source (#2058)
-  * Update Kramdown to `~> 1.3` (#1894)
-  * Remove unnecessary references to `self` (#2090)
-  * Update to Mercenary v0.3.x (#2085)
-  * Ship Sass support as a separate gem (#2098)
-  * Extract core extensions into a Utils module (#2112)
-  * Refactor CLI & Commands For Greater Happiness (#2143)
-  * Provide useful error when Pygments returns `nil` and error out (#2148)
-  * Add support for unpublished drafts (#2164)
-  * Add `force_polling` option to the `serve` command (#2165)
-  * Clean up the `` in the site template (#2186)
-  * Permit YAML blocks to end with three dots to better conform with the
-    YAML spec (#2110)
-  * Use `File.exist?` instead of deprecated `File.exists?` (#2214)
-  * Require newline after start of YAML Front Matter header (#2211)
-  * Add the ability for pages to be marked as `published: false` (#1492)
-  * Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy
-    looking up of variable values in a Liquid context. (#2253)
-  * Remove literal lang name from class (#2292)
-  * Return `utf-8` encoding in header for webrick error page response (#2289)
-  * Make template site easier to customize (#2268)
-  * Add two-digit year to permalink template option (#2301)
-  * Add `site.documents` to Liquid payload (list of all docs) (#2295)
-  * Take into account missing values in the Liquid sort filter (#2299)
-
-### Bug Fixes
-  * Don't allow nil entries when loading posts (#1796)
-  * Remove the scrollbar that's always displayed in new sites generated
-    from the site template (#1805)
-  * Add `#path` to required methods in `Jekyll::Convertible` (#1866)
-  * Default Maruku fenced code blocks to ON for 2.0.0-dev (#1831)
-  * Change short opts for host and port for `jekyll docs` to be consistent with
-    other subcommands (#1877)
-  * Fix typos (#1910)
-  * Lock Maruku at 0.7.0 to prevent bugs caused by Maruku 0.7.1 (#1958)
-  * Fixes full path leak to source directory when using include tag (#1951)
-  * Don't generate pages that aren't being published (#1931)
-  * Use `SafeYAML.load` to avoid conflicts with other projects (#1982)
-  * Relative posts should never fail to build (#1976)
-  * Remove executable bits of non executable files (#2056)
-  * `#path` for a draft is now `_drafts` instead of `_posts` (#2042)
-  * Patch a couple show-stopping security vulnerabilities (#1946)
-  * Sanitize paths uniformly, in a Windows-friendly way (#2065, #2109)
-  * Update gem build steps to work correctly on Windows (#2118)
-  * Remove obsolete `normalize_options` method call from `bin/jekyll` (#2121).
-  * Remove `+` characters from Pygments lexer names when adding as a CSS
-    class (#994)
-  * Remove some code that caused Ruby interpreter warnings (#2178)
-  * Only strip the drive name if it begins the string (#2175)
-  * Remove default post with invalid date from site template (#2200)
-  * Fix `Post#url` and `Page#url` escape (#1568)
-  * Strip newlines from the `{% highlight %}` block content (#1823)
-  * Load in `rouge` only when it's been requested as the highlighter (#2189)
-  * Convert input to string before XML escaping (`xml_escape` liquid filter) (#2244)
-  * Modify configuration key for Collections and reset properly. (#2238)
-  * Avoid duplicated output using `highlight` tag (#2264)
-  * Only use Jekyll.logger for output (#2307)
-  * Close the file descriptor in `has_yaml_header?` (#2310)
-  * Add `output` to `Document` liquid output hash (#2309)
-
-### Development Fixes
-  * Add a link to the site in the README.md file (#1795)
-  * Add in History and site changes from `v1-stable` branch (#1836)
-  * Testing additions on the Excerpt class (#1893)
-  * Fix the `highlight` tag feature (#1859)
-  * Test Jekyll under Ruby 2.1.0 (#1900)
-  * Add script/cibuild for fun and profit (#1912)
-  * Use `Forwardable` for delegation between `Excerpt` and `Post`
-    (#1927)
-  * Rename `read_things` to `read_content` (#1928)
-  * Add `script/branding` script for ASCII art lovin' (#1936)
-  * Update the README to reflect the repo move (#1943)
-  * Add the project vision to the README (#1935)
-  * Speed up Travis CI builds by using Rebund (#1985)
-  * Use Yarp as a Gem proxy for Travis CI (#1984)
-  * Remove Yarp as a Gem proxy for Travis CI (#2004)
-  * Move the reading of layouts into its own class (#2020)
-  * Test Sass import (#2009)
-  * Switch Maruku and Kramdown in lists of Runtime vs. Development dependencies (#2049)
-  * Clean up the gemspec for the project (#2095)
-  * Add Japanese translation of README and CONTRIBUTING docs. (#2081)
-  * Re-align the tables in Cucumber (#2108)
-  * Trim trailing spaces and convert tabs to spaces (#2122)
-  * Fix the failing Travis scenarios due to Cucumber issues (#2155)
-  * Wrap `bundle install` in `travis_retry` to retry when RubyGems fails (#2160)
-  * Refactor tags and categories (#1639)
-  * Extract plugin management into its own class (#2197)
-  * Add missing tests for `Command` (#2216)
-  * Update `rr` link in CONTRIBUTING doc (#2247)
-  * Streamline Cucumber execution of `jekyll` subcommands (#2258)
-  * Refactor `Commands::Serve`. (#2269)
-  * Refactor `highlight` tag (#2154)
-  * Update `Util` hash functions with latest from Rails (#2273)
-  * Workaround for Travis bug (#2290)
-
-### Site Enhancements
-  * Document Kramdown's GFM parser option (#1791)
-  * Move CSS to includes & update normalize.css to v2.1.3 (#1787)
-  * Minify CSS only in production (#1803)
-  * Fix broken link to installation of Ruby on Mountain Lion blog post on
-    Troubleshooting docs page (#1797)
-  * Fix issues with 1.4.1 release blog post (#1804)
-  * Add note about deploying to OpenShift (#1812)
-  * Collect all Windows-related docs onto one page (#1818)
-  * Fixed typo in datafiles doc page (#1854)
-  * Clarify how to access `site` in docs (#1864)
-  * Add closing `` tag to `context.registers[:site]` note (#1867)
-  * Fix link to @mojombo's site source (#1897)
-  * Add `paginate: nil` to default configuration in docs (#1896)
-  * Add link to our License in the site footer (#1889)
-  * Add a charset note in "Writing Posts" doc page (#1902)
-  * Disallow selection of path and prompt in bash examples
-  * Add jekyll-compass to the plugin list (#1923)
-  * Add note in Posts docs about stripping `
` tags from excerpt (#1933)
-  * Add additional info about the new exclude behavior (#1938)
-  * Linkify 'awesome contributors' to point to the contributors graph on
-    GitHub (#1940)
-  * Update `docs/sites.md` link to GitHub Training materials (#1949)
-  * Update `master` with the release info from 1.4.3 (#1947)
-  * Define docs nav in datafile (#1953)
-  * Clarify the docs around the naming convention for posts (#1971)
-  * Add missing `next` and `previous` docs for post layouts and templates (#1970)
-  * Add note to `Writing posts` page about how to strip html from excerpt (#1962)
-  * Add `jekyll-humanize` plugin to plugin list (#1998)
-  * Add `jekyll-font-awesome` plugin to plugin list (#1999)
-  * Add `sublime-jekyll` to list of Editor plugins (#2001)
-  * Add `vim-jekyll` to the list of Editor plugins (#2005)
-  * Fix non-semantic nesting of `p` tags in `news_item` layout (#2013)
-  * Document destination folder cleaning (#2016)
-  * Updated instructions for NearlyFreeSpeech.NET installation (#2015)
-  * Update link to rack-jekyll on "Deployment Methods" page (#2047)
-  * Fix typo in /docs/configuration (#2073)
-  * Fix count in docs for `site.static_files` (#2077)
-  * Update configuration docs to indicate utf-8 is the default for 2.0.0
-    and ASCII for 1.9.3 (#2074)
-  * Add info about unreleased feature to the site (#2061)
-  * Add whitespace to liquid example in GitHub Pages docs (#2084)
-  * Clarify the way Sass and CoffeeScript files are read in and output (#2067)
-  * Add lyche gallery tag plugin link to list of plugins (#2094)
-  * Add Jekyll Pages Directory plugin to list of plugins (#2096)
-  * Update Configuration docs page with new markdown extension (#2102)
-  * Add `jekyll-image-set` to the list of third-party plugins (#2105)
-  * Losslessly compress images (#2128)
-  * Update normalize.css to 3.0.0 (#2126)
-  * Update modernizr to v2.7.1 (#2129)
-  * Add `jekyll-ordinal` to list of third-party plugins (#2150)
-  * Add `jekyll_figure` to list of third-party plugins (#2158)
-  * Clarify the documentation for safe mode (#2163)
-  * Some HTML tidying (#2130)
-  * Remove modernizr and use html5shiv.js directly for IE less than v9 (#2131)
-  * Remove unused images (#2187)
-  * Use `array_to_sentence_string` filter when outputting news item
-    categories (#2191)
-  * Add link to Help repo in primary navigation bar (#2177)
-  * Switch to using an ico file for the shortcut icon (#2193)
-  * Use numbers to specify font weights and only bring in font weights used (#2185)
-  * Add a link to the list of all tz database time zones (#1824)
-  * Clean-up and improve documentation `feed.xml` (#2192)
-  * Remove duplicate entry in list of third-party plugins (#2206)
-  * Reduce the whitespace in the favicon. (#2213)
-  * Add `jekyll-page-collections` to list of third-party plugins (#2215)
-  * Add a cross-reference about `post_url` (#2243)
-  * Add `jekyll-live-tiles` to list of third-party plugins (#2250)
-  * Fixed broken link to GitHub training material site source (#2257)
-  * Update link to help repo, now called `jekyll-help` (#2277)
-  * Fix capitalization of 'Jekyll' on Deployment Methods page (#2291)
-  * Include plugins by sonnym in list of third-party plugins (#2297)
-  * Add deprecated articles keeper filter to list of third-party plugins (#2300)
-  * Simplify and improve our CSS. (#2127)
-  * Use black text color for the mobile navbar (#2306)
-  * Use the built in date filter and `site.time` for the copyright year. (#2305)
-  * Update html5shiv to v3.7.2 (#2304)
-  * Add 2.0.0 release post (#2298)
-  * Add docs for custom markdown processors (#2298)
-  * Add docs for `where` and `group_by` Liquid filters (#2298)
-  * Remove notes in docs for unreleased features (#2309)
-
-## 1.5.1 / 2014-03-27
-
-### Bug Fixes
-
-  * Only strip the drive name if it begins the string (#2176)
-
-## 1.5.0 / 2014-03-24
-
-### Minor Enhancements
-
-  * Loosen `safe_yaml` dependency to `~> 1.0` (#2167)
-  * Bump `safe_yaml` dependency to `~> 1.0.0` (#1942)
-
-### Bug Fixes
-
-  * Fix issue where filesystem traversal restriction broke Windows (#2167)
-  * Lock `maruku` at `0.7.0` (#2167)
-
-### Development Fixes
-
-  * Lock `cucumber` at `1.3.11` (#2167)
-
-## 1.4.3 / 2014-01-13
-
-### Bug Fixes
-  * Patch show-stopping security vulnerabilities (#1944)
-
-## 1.4.2 / 2013-12-16
-
-### Bug Fixes
-  * Turn on Maruku fenced code blocks by default (#1830)
-
-## 1.4.1 / 2013-12-09
-
-### Bug Fixes
-  * Don't allow nil entries when loading posts (#1796)
-
-## 1.4.0 / 2013-12-07
-
-### Major Enhancements
-  * Add support for TOML config files (#1765)
-
-### Minor Enhancements
-  * Sort plugins as a way to establish a load order (#1682)
-  * Update Maruku to 0.7.0 (#1775)
-
-### Bug Fixes
-  * Add a space between two words in a Pagination warning message (#1769)
-  * Upgrade `toml` gem to `v0.1.0` to maintain compat with Ruby 1.8.7 (#1778)
-
-### Development Fixes
-  * Remove some whitespace in the code (#1755)
-  * Remove some duplication in the reading of posts and drafts (#1779)
-
-### Site Enhancements
-  * Fixed case of a word in the Jekyll v1.3.0 release post (#1762)
-  * Fixed the mime type for the favicon (#1772)
-
-## 1.3.1 / 2013-11-26
-
-### Minor Enhancements
-  * Add a `--prefix` option to passthrough for the importers (#1669)
-  * Push the paginator plugin lower in the plugin priority order so
-    other plugins run before it (#1759)
-
-### Bug Fixes
-  * Fix the include tag when ran in a loop (#1726)
-  * Fix errors when using `--watch` on 1.8.7 (#1730)
-  * Specify where the include is called from if an included file is
-    missing (#1746)
-
-### Development Fixes
-  * Extract `Site#filter_entries` into its own object (#1697)
-  * Enable Travis' bundle caching (#1734)
-  * Remove trailing whitespace in some files (#1736)
-  * Fix a duplicate test name (#1754)
-
-### Site Enhancements
-  * Update link to example Rakefile to point to specific commit (#1741)
-  * Fix drafts docs to indicate that draft time is based on file modification
-    time, not `Time.now` (#1695)
-  * Add `jekyll-monthly-archive-plugin` and `jekyll-category-archive-plugin` to
-    list of third-party plugins (#1693)
-  * Add `jekyll-asset-path-plugin` to list of third-party plugins (#1670)
-  * Add `emoji-for-jekyll` to list of third-part plugins (#1708)
-  * Fix previous section link on plugins page to point to pagination page (#1707)
-  * Add `org-mode` converter plugin to third-party plugins (#1711)
-  * Point "Blog migrations" page to http://import.jekyllrb.com (#1732)
-  * Add docs for `post_url` when posts are in subdirectories (#1718)
-  * Update the docs to point to `example.com` (#1448)
-
-## 1.3.0 / 2013-11-04
-
-### Major Enhancements
-  * Add support for adding data as YAML files under a site's `_data`
-    directory (#1003)
-  * Allow variables to be used with `include` tags (#1495)
-  * Allow using gems for plugin management (#1557)
-
-### Minor Enhancements
-  * Decrease the specificity in the site template CSS (#1574)
-  * Add `encoding` configuration option (#1449)
-  * Provide better error handling for Jekyll's custom Liquid tags
-    (#1514)
-  * If an included file causes a Liquid error, add the path to the
-    include file that caused the error to the error message (#1596)
-  * If a layout causes a Liquid error, change the error message so that
-    we know it comes from the layout (#1601)
-  * Update Kramdown dependency to `~> 1.2` (#1610)
-  * Update `safe_yaml` dependency to `~> 0.9.7` (#1602)
-  * Allow layouts to be in subfolders like includes (#1622)
-  * Switch to listen for site watching while serving (#1589)
-  * Add a `json` liquid filter to be used in sites (#1651)
-  * Point people to the migration docs when the `jekyll-import` gem is
-    missing (#1662)
-
-### Bug Fixes
-  * Fix up matching against source and destination when the two
-    locations are similar (#1556)
-  * Fix the missing `pathname` require in certain cases (#1255)
-  * Use `+` instead of `Array#concat` when building `Post` attribute list (#1571)
-  * Print server address when launching a server (#1586)
-  * Downgrade to Maruku `~> 0.6.0` in order to avoid changes in rendering (#1598)
-  * Fix error with failing include tag when variable was file name (#1613)
-  * Downcase lexers before passing them to pygments (#1615)
-  * Capitalize the short verbose switch because it conflicts with the
-    built-in Commander switch (#1660)
-  * Fix compatibility with 1.8.x (#1665)
-  * Fix an error with the new file watching code due to library version
-    incompatibilities (#1687)
-
-### Development Fixes
-  * Add coverage reporting with Coveralls (#1539)
-  * Refactor the Liquid `include` tag (#1490)
-  * Update launchy dependency to `~> 2.3` (#1608)
-  * Update rr dependency to `~> 1.1` (#1604)
-  * Update cucumber dependency to `~> 1.3` (#1607)
-  * Update coveralls dependency to `~> 0.7.0` (#1606)
-  * Update rake dependency to `~> 10.1` (#1603)
-  * Clean up `site.rb` comments to be more concise/uniform (#1616)
-  * Use the master branch for the build badge in the readme (#1636)
-  * Refactor Site#render (#1638)
-  * Remove duplication in command line options (#1637)
-  * Add tests for all the coderay options (#1543)
-  * Improve some of the Cucumber test code (#1493)
-  * Improve comparisons of timestamps by ignoring the seconds (#1582)
-
-### Site Enhancements
-  * Fix params for `JekyllImport::WordPress.process` arguments (#1554)
-  * Add `jekyll-suggested-tweet` to list of third-party plugins (#1555)
-  * Link to Liquid's docs for tags and filters (#1553)
-  * Add note about installing Xcode on the Mac in the Installation docs (#1561)
-  * Simplify/generalize pagination docs (#1577)
-  * Add documentation for the new data sources feature (#1503)
-  * Add more information on how to create generators (#1590, #1592)
-  * Improve the instructions for mimicking GitHub Flavored Markdown
-    (#1614)
-  * Add `jekyll-import` warning note of missing dependencies (#1626)
-  * Fix grammar in the Usage section (#1635)
-  * Add documentation for the use of gems as plugins (#1656)
-  * Document the existence of a few additional plugins (#1405)
-  * Document that the `date_to_string` always returns a two digit day (#1663)
-  * Fix navigation in the "Working with Drafts" page (#1667)
-  * Fix an error with the data documentation (#1691)
-
-## 1.2.1 / 2013-09-14
-
-### Minor Enhancements
-  * Print better messages for detached server. Mute output on detach. (#1518)
-  * Disable reverse lookup when running `jekyll serve` (#1363)
-  * Upgrade RedCarpet dependency to `~> 2.3.0` (#1515)
-  * Upgrade to Liquid `>= 2.5.2, < 2.6` (#1536)
-
-### Bug Fixes
-  * Fix file discrepancy in gemspec (#1522)
-  * Force rendering of Include tag (#1525)
-
-### Development Fixes
-  * Add a rake task to generate a new release post (#1404)
-  * Mute LSI output in tests (#1531)
-  * Update contributor documentation (#1537)
-
-### Site Enhancements
-  * Fix a couple of validation errors on the site (#1511)
-  * Make navigation menus reusable (#1507)
-  * Fix link to History page from Release v1.2.0 notes post.
-  * Fix markup in History file for command line options (#1512)
-  * Expand 1.2 release post title to 1.2.0 (#1516)
-
-## 1.2.0 / 2013-09-06
-
-### Major Enhancements
-  * Disable automatically-generated excerpts when `excerpt_separator` is `""`. (#1386)
-  * Add checking for URL conflicts when running `jekyll doctor` (#1389)
-
-### Minor Enhancements
-  * Catch and fix invalid `paginate` values (#1390)
-  * Remove superfluous `div.container` from the default html template for
-    `jekyll new` (#1315)
-  * Add `-D` short-form switch for the drafts option (#1394)
-  * Update the links in the site template for Twitter and GitHub (#1400)
-  * Update dummy email address to example.com domain (#1408)
-  * Update normalize.css to v2.1.2 and minify; add rake task to update
-    normalize.css with greater ease. (#1430)
-  * Add the ability to detach the server ran by `jekyll serve` from it's
-    controlling terminal (#1443)
-  * Improve permalink generation for URLs with special characters (#944)
-  * Expose the current Jekyll version to posts and pages via a new
-    `jekyll.version` variable (#1481)
-
-### Bug Fixes
-  * Markdown extension matching matches only exact matches (#1382)
-  * Fixed NoMethodError when message passed to `Stevenson#message` is nil (#1388)
-  * Use binary mode when writing file (#1364)
-  * Fix 'undefined method `encoding` for "mailto"' errors w/ Ruby 1.8 and
-    Kramdown > 0.14.0 (#1397)
-  * Do not force the permalink to be a dir if it ends on .html (#963)
-  * When a Liquid Exception is caught, show the full path rel. to site source (#1415)
-  * Properly read in the config options when serving the docs locally
-    (#1444)
-  * Fixed `--layouts` option for `build` and `serve` commands (#1458)
-  * Remove kramdown as a runtime dependency since it's optional (#1498)
-  * Provide proper error handling for invalid file names in the include
-    tag (#1494)
-
-### Development Fixes
-  * Remove redundant argument to
-    Jekyll::Commands::New#scaffold_post_content (#1356)
-  * Add new dependencies to the README (#1360)
-  * Fix link to contributing page in README (#1424)
-  * Update TomDoc in Pager#initialize to match params (#1441)
-  * Refactor `Site#cleanup` into `Jekyll::Site::Cleaner` class (#1429)
-  * Several other small minor refactorings (#1341)
-  * Ignore `_site` in jekyllrb.com deploy (#1480)
-  * Add Gem version and dependency badge to README (#1497)
-
-### Site Enhancements
-  * Add info about new releases (#1353)
-  * Update plugin list with jekyll-rss plugin (#1354)
-  * Update the site list page with Ruby's official site (#1358)
-  * Add `jekyll-ditaa` to list of third-party plugins (#1370)
-  * Add `postfiles` to list of third-party plugins (#1373)
-  * For internal links, use full path including trailing `/` (#1411)
-  * Use curly apostrophes in the docs (#1419)
-  * Update the docs for Redcarpet in Jekyll (#1418)
-  * Add `pluralize` and `reading_time` filters to docs (#1439)
-  * Fix markup for the Kramdown options (#1445)
-  * Fix typos in the History file (#1454)
-  * Add trailing slash to site's post URL (#1462)
-  * Clarify that `--config` will take multiple files (#1474)
-  * Fix docs/templates.md private gist example (#1477)
-  * Use `site.repository` for Jekyll's GitHub URL (#1463)
-  * Add `jekyll-pageless-redirects` to list of third-party plugins (#1486)
-  * Clarify that `date_to_xmlschema` returns an ISO 8601 string (#1488)
-  * Add `jekyll-good-include` to list of third-party plugins (#1491)
-  * XML escape the blog post title in our feed (#1501)
-  * Add `jekyll-toc-generator` to list of third-party plugins (#1506)
-
-## 1.1.2 / 2013-07-25
-
-### Bug Fixes
-  * Require Liquid 2.5.1 (#1349)
-
-## 1.1.1 / 2013-07-24
-
-### Minor Enhancements
-  * Remove superfluous `table` selector from main.css in `jekyll new` template (#1328)
-  * Abort with non-zero exit codes (#1338)
-
-### Bug Fixes
-  * Fix up the rendering of excerpts (#1339)
-
-### Site Enhancements
-  * Add Jekyll Image Tag to the plugins list (#1306)
-  * Remove erroneous statement that `site.pages` are sorted alphabetically.
-  * Add info about the `_drafts` directory to the directory structure
-    docs (#1320)
-  * Improve the layout of the plugin listing by organizing it into
-    categories (#1310)
-  * Add generator-jekyllrb and grunt-jekyll to plugins page (#1330)
-  * Mention Kramdown as option for markdown parser on Extras page (#1318)
-  * Update Quick-Start page to include reminder that all requirements must be installed (#1327)
-  * Change filename in `include` example to an HTML file so as not to indicate that Jekyll
-    will automatically convert them. (#1303)
-  * Add an RSS feed for commits to Jekyll (#1343)
-
-## 1.1.0 / 2013-07-14
-
-### Major Enhancements
-  * Add `docs` subcommand to read Jekyll's docs when offline. (#1046)
-  * Support passing parameters to templates in `include` tag (#1204)
-  * Add support for Liquid tags to post excerpts (#1302)
-
-### Minor Enhancements
-  * Search the hierarchy of pagination path up to site root to determine template page for
-    pagination. (#1198)
-  * Add the ability to generate a new Jekyll site without a template (#1171)
-  * Use redcarpet as the default markdown engine in newly generated
-    sites (#1245, #1247)
-  * Add `redcarpet` as a runtime dependency so `jekyll build` works out-of-the-box for new
-    sites. (#1247)
-  * In the generated site, remove files that will be replaced by a
-    directory (#1118)
-  * Fail loudly if a user-specified configuration file doesn't exist (#1098)
-  * Allow for all options for Kramdown HTML Converter (#1201)
-
-### Bug Fixes
-  * Fix pagination in subdirectories. (#1198)
-  * Fix an issue with directories and permalinks that have a plus sign
-    (+) in them (#1215)
-  * Provide better error reporting when generating sites (#1253)
-  * Latest posts first in non-LSI `related_posts` (#1271)
-
-### Development Fixes
-  * Merge the theme and layout Cucumber steps into one step (#1151)
-  * Restrict activesupport dependency to pre-4.0.0 to maintain compatibility with `<= 1.9.2`
-  * Include/exclude deprecation handling simplification (#1284)
-  * Convert README to Markdown. (#1267)
-  * Refactor Jekyll::Site (#1144)
-
-### Site Enhancements
-  * Add "News" section for release notes, along with an RSS feed (#1093, #1285, #1286)
-  * Add "History" page.
-  * Restructured docs sections to include "Meta" section.
-  * Add message to "Templates" page that specifies that Python must be installed in order
-    to use Pygments. (#1182)
-  * Update link to the official Maruku repo (#1175)
-  * Add documentation about `paginate_path` to "Templates" page in docs (#1129)
-  * Give the quick-start guide its own page (#1191)
-  * Update ProTip on Installation page in docs to point to all the info about Pygments and
-    the 'highlight' tag. (#1196)
-  * Run `site/img` through ImageOptim (thanks @qrush!) (#1208)
-  * Added Jade Converter to `site/docs/plugins` (#1210)
-  * Fix location of docs pages in Contributing pages (#1214)
-  * Add ReadInXMinutes plugin to the plugin list (#1222)
-  * Remove plugins from the plugin list that have equivalents in Jekyll
-    proper (#1223)
-  * Add jekyll-assets to the plugin list (#1225)
-  * Add jekyll-pandoc-mulitple-formats to the plugin list (#1229)
-  * Remove dead link to "Using Git to maintain your blog" (#1227)
-  * Tidy up the third-party plugins listing (#1228)
-  * Update contributor information (#1192)
-  * Update URL of article about Blogger migration (#1242)
-  * Specify that RedCarpet is the default for new Jekyll sites on Quickstart page (#1247)
-  * Added `site.pages` to Variables page in docs (#1251)
-  * Add Youku and Tudou Embed link on Plugins page. (#1250)
-  * Add note that `gist` tag supports private gists. (#1248)
-  * Add `jekyll-timeago` to list of third-party plugins. (#1260)
-  * Add `jekyll-swfobject` to list of third-party plugins. (#1263)
-  * Add `jekyll-picture-tag` to list of third-party plugins. (#1280)
-  * Update the GitHub Pages documentation regarding relative URLs
-    (#1291)
-  * Update the S3 deployment documentation (#1294)
-  * Add suggestion for Xcode CLT install to troubleshooting page in docs (#1296)
-  * Add 'Working with drafts' page to docs (#1289)
-  * Add information about time zones to the documentation for a page's
-    date (#1304)
-
-## 1.0.3 / 2013-06-07
-
-### Minor Enhancements
-  * Add support to gist tag for private gists. (#1189)
-  * Fail loudly when Maruku errors out (#1190)
-  * Move the building of related posts into their own class (#1057)
-  * Removed trailing spaces in several places throughout the code (#1116)
-  * Add a `--force` option to `jekyll new` (#1115)
-  * Convert IDs in the site template to classes (#1170)
-
-### Bug Fixes
-  * Fix typo in Stevenson constant "ERROR". (#1166)
-  * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)
-  * Exit with a non-zero exit code when dealing with a Liquid error (#1121)
-  * Make the `exclude` and `include` options backwards compatible with
-    versions of Jekyll prior to 1.0 (#1114)
-  * Fix pagination on Windows (#1063)
-  * Fix the application of Pygments' Generic Output style to Go code
-    (#1156)
-
-### Site Enhancements
-  * Add a Pro Tip to docs about front matter variables being optional (#1147)
-  * Add changelog to site as History page in /docs/ (#1065)
-  * Add note to Upgrading page about new config options in 1.0.x (#1146)
-  * Documentation for `date_to_rfc822` and `uri_escape` (#1142)
-  * Documentation highlight boxes shouldn't show scrollbars if not necessary (#1123)
-  * Add link to jekyll-minibundle in the doc's plugins list (#1035)
-  * Quick patch for importers documentation
-  * Fix prefix for WordpressDotCom importer in docs (#1107)
-  * Add jekyll-contentblocks plugin to docs (#1068)
-  * Make code bits in notes look more natural, more readable (#1089)
-  * Fix logic for `relative_permalinks` instructions on Upgrading page (#1101)
-  * Add docs for post excerpt (#1072)
-  * Add docs for gist tag (#1072)
-  * Add docs indicating that Pygments does not need to be installed
-    separately (#1099, #1119)
-  * Update the migrator docs to be current (#1136)
-  * Add the Jekyll Gallery Plugin to the plugin list (#1143)
-
-### Development Fixes
-  * Use Jekyll.logger instead of Jekyll::Stevenson to log things (#1149)
-  * Fix pesky Cucumber infinite loop (#1139)
-  * Do not write posts with timezones in Cucumber tests (#1124)
-  * Use ISO formatted dates in Cucumber features (#1150)
-
-## 1.0.2 / 2013-05-12
-
-### Major Enhancements
-  * Add `jekyll doctor` command to check site for any known compatibility problems (#1081)
-  * Backwards-compatibilize relative permalinks (#1081)
-
-### Minor Enhancements
-  * Add a `data-lang=""` attribute to Redcarpet code blocks (#1066)
-  * Deprecate old config `server_port`, match to `port` if `port` isn't set (#1084)
-  * Update pygments.rb version to 0.5.0 (#1061)
-  * Update Kramdown version to 1.0.2 (#1067)
-
-### Bug Fixes
-  * Fix issue when categories are numbers (#1078)
-  * Catching that Redcarpet gem isn't installed (#1059)
-
-### Site Enhancements
-  * Add documentation about `relative_permalinks` (#1081)
-  * Remove pygments-installation instructions, as pygments.rb is bundled with it (#1079)
-  * Move pages to be Pages for realz (#985)
-  * Updated links to Liquid documentation (#1073)
-
-## 1.0.1 / 2013-05-08
-
-### Minor Enhancements
-  * Do not force use of `toc_token` when using `generate_tok` in RDiscount (#1048)
-  * Add newer `language-` class name prefix to code blocks (#1037)
-  * Commander error message now preferred over process abort with incorrect args (#1040)
-
-### Bug Fixes
-  * Make Redcarpet respect the pygments configuration option (#1053)
-  * Fix the index build with LSI (#1045)
-  * Don't print deprecation warning when no arguments are specified. (#1041)
-  * Add missing `
` to site template used by `new` subcommand, fixed typos in code (#1032) - -### Site Enhancements - * Changed https to http in the GitHub Pages link (#1051) - * Remove CSS cruft, fix typos, fix HTML errors (#1028) - * Removing manual install of Pip and Distribute (#1025) - * Updated URL for Markdown references plugin (#1022) - -### Development Fixes - * Markdownify history file (#1027) - * Update links on README to point to new jekyllrb.com (#1018) - -## 1.0.0 / 2013-05-06 - -### Major Enhancements - * Add `jekyll new` subcommand: generate a Jekyll scaffold (#764) - * Refactored Jekyll commands into subcommands: build, serve, and migrate. (#690) - * Removed importers/migrators from main project, migrated to jekyll-import sub-gem (#793) - * Added ability to render drafts in `_drafts` folder via command line (#833) - * Add ordinal date permalink style (/:categories/:year/:y_day/:title.html) (#928) - -### Minor Enhancements - * Site template HTML5-ified (#964) - * Use post's directory path when matching for the `post_url` tag (#998) - * Loosen dependency on Pygments so it's only required when it's needed (#1015) - * Parse strings into Time objects for date-related Liquid filters (#1014) - * Tell the user if there is no subcommand specified (#1008) - * Freak out if the destination of `jekyll new` exists and is non-empty (#981) - * Add `timezone` configuration option for compilation (#957) - * Add deprecation messages for pre-1.0 CLI options (#959) - * Refactor and colorize logging (#959) - * Refactor Markdown parsing (#955) - * Added application/vnd.apple.pkpass to mime.types served by WEBrick (#907) - * Move template site to default markdown renderer (#961) - * Expose new attribute to Liquid via `page`: `page.path` (#951) - * Accept multiple config files from command line (#945) - * Add page variable to liquid custom tags and blocks (#413) - * Add `paginator.previous_page_path` and `paginator.next_page_path` (#942) - * Backwards compatibility for 'auto' (#821, #934) - * Added date_to_rfc822 used on RSS feeds (#892) - * Upgrade version of pygments.rb to 0.4.2 (#927) - * Added short month (e.g. "Sep") to permalink style options for posts (#890) - * Expose site.baseurl to Liquid templates (#869) - * Adds excerpt attribute to posts which contains first paragraph of content (#837) - * Accept custom configuration file via CLI (#863) - * Load in GitHub Pages MIME Types on `jekyll serve` (#847, #871) - * Improve debugability of error message for a malformed highlight tag (#785) - * Allow symlinked files in unsafe mode (#824) - * Add 'gist' Liquid tag to core (#822, #861) - * New format of Jekyll output (#795) - * Reinstate `--limit_posts` and `--future` switches (#788) - * Remove ambiguity from command descriptions (#815) - * Fix SafeYAML Warnings (#807) - * Relaxed Kramdown version to 0.14 (#808) - * Aliased `jekyll server` to `jekyll serve`. (#792) - * Updated gem versions for Kramdown, Rake, Shoulda, Cucumber, and RedCarpet. (#744) - * Refactored Jekyll subcommands into Jekyll::Commands submodule, which now contains them (#768) - * Rescue from import errors in Wordpress.com migrator (#671) - * Massively accelerate LSI performance (#664) - * Truncate post slugs when importing from Tumblr (#496) - * Add glob support to include, exclude option (#743) - * Layout of Page or Post defaults to 'page' or 'post', respectively (#580) - REPEALED by (#977) - * "Keep files" feature (#685) - * Output full path & name for files that don't parse (#745) - * Add source and destination directory protection (#535) - * Better YAML error message (#718) - * Bug Fixes - * Paginate in subdirectories properly (#1016) - * Ensure post and page URLs have a leading slash (#992) - * Catch all exceptions, not just StandardError descendents (#1007) - * Bullet-proof `limit_posts` option (#1004) - * Read in YAML as UTF-8 to accept non-ASCII chars (#836) - * Fix the CLI option `--plugins` to actually accept dirs and files (#993) - * Allow 'excerpt' in YAML front matter to override the extracted excerpt (#946) - * Fix cascade problem with site.baseurl, site.port and site.host. (#935) - * Filter out directories with valid post names (#875) - * Fix symlinked static files not being correctly built in unsafe mode (#909) - * Fix integration with directory_watcher 1.4.x (#916) - * Accepting strings as arguments to jekyll-import command (#910) - * Force usage of older directory_watcher gem as 1.5 is broken (#883) - * Ensure all Post categories are downcase (#842, #872) - * Force encoding of the rdiscount TOC to UTF8 to avoid conversion errors (#555) - * Patch for multibyte URI problem with `jekyll serve` (#723) - * Order plugin execution by priority (#864) - * Fixed Page#dir and Page#url for edge cases (#536) - * Fix broken `post_url` with posts with a time in their YAML front matter (#831) - * Look for plugins under the source directory (#654) - * Tumblr Migrator: finds `_posts` dir correctly, fixes truncation of long - post names (#775) - * Force Categories to be Strings (#767) - * Safe YAML plugin to prevent vulnerability (#777) - * Add SVG support to Jekyll/WEBrick. (#407, #406) - * Prevent custom destination from causing continuous regen on watch (#528, #820, #862) - -### Site Enhancements - * Responsify (#860) - * Fix spelling, punctuation and phrasal errors (#989) - * Update quickstart instructions with `new` command (#966) - * Add docs for page.excerpt (#956) - * Add docs for page.path (#951) - * Clean up site docs to prepare for 1.0 release (#918) - * Bring site into master branch with better preview/deploy (#709) - * Redesigned site (#583) - -### Development Fixes - * Exclude Cucumber 1.2.4, which causes tests to fail in 1.9.2 (#938) - * Added "features:html" rake task for debugging purposes, cleaned up - Cucumber profiles (#832) - * Explicitly require HTTPS rubygems source in Gemfile (#826) - * Changed Ruby version for development to 1.9.3-p374 from p362 (#801) - * Including a link to the GitHub Ruby style guide in CONTRIBUTING.md (#806) - * Added script/bootstrap (#776) - * Running Simplecov under 2 conditions: ENV(COVERAGE)=true and with Ruby version - of greater than 1.9 (#771) - * Switch to Simplecov for coverage report (#765) - -## 0.12.1 / 2013-02-19 - -### Minor Enhancements - * Update Kramdown version to 0.14.1 (#744) - * Test Enhancements - * Update Rake version to 10.0.3 (#744) - * Update Shoulda version to 3.3.2 (#744) - * Update Redcarpet version to 2.2.2 (#744) - -## 0.12.0 / 2012-12-22 - -### Minor Enhancements - * Add ability to explicitly specify included files (#261) - * Add `--default-mimetype` option (#279) - * Allow setting of RedCloth options (#284) - * Add `post_url` Liquid tag for internal post linking (#369) - * Allow multiple plugin dirs to be specified (#438) - * Inline TOC token support for RDiscount (#333) - * Add the option to specify the paginated url format (#342) - * Swap out albino for pygments.rb (#569) - * Support Redcarpet 2 and fenced code blocks (#619) - * Better reporting of Liquid errors (#624) - * Bug Fixes - * Allow some special characters in highlight names - * URL escape category names in URL generation (#360) - * Fix error with `limit_posts` (#442) - * Properly select dotfile during directory scan (#363, #431, #377) - * Allow setting of Kramdown `smart_quotes` (#482) - * Ensure front matter is at start of file (#562) - -## 0.11.2 / 2011-12-27 - * Bug Fixes - * Fix gemspec - -## 0.11.1 / 2011-12-27 - * Bug Fixes - * Fix extra blank line in highlight blocks (#409) - * Update dependencies - -## 0.11.0 / 2011-07-10 - -### Major Enhancements - * Add command line importer functionality (#253) - * Add Redcarpet Markdown support (#318) - * Make markdown/textile extensions configurable (#312) - * Add `markdownify` filter - -### Minor Enhancements - * Switch to Albino gem - * Bundler support - * Use English library to avoid hoops (#292) - * Add Posterous importer (#254) - * Fixes for Wordpress importer (#274, #252, #271) - * Better error message for invalid post date (#291) - * Print formatted fatal exceptions to stdout on build failure - * Add Tumblr importer (#323) - * Add Enki importer (#320) - * Bug Fixes - * Secure additional path exploits - -## 0.10.0 / 2010-12-16 - * Bug Fixes - * Add `--no-server` option. - -## 0.9.0 / 2010-12-15 - -### Minor Enhancements - * Use OptionParser's `[no-]` functionality for better boolean parsing. - * Add Drupal migrator (#245) - * Complain about YAML and Liquid errors (#249) - * Remove orphaned files during regeneration (#247) - * Add Marley migrator (#28) - -## 0.8.0 / 2010-11-22 - -### Minor Enhancements - * Add wordpress.com importer (#207) - * Add `--limit-posts` cli option (#212) - * Add `uri_escape` filter (#234) - * Add `--base-url` cli option (#235) - * Improve MT migrator (#238) - * Add kramdown support (#239) - * Bug Fixes - * Fixed filename basename generation (#208) - * Set mode to UTF8 on Sequel connections (#237) - * Prevent `_includes` dir from being a symlink - -## 0.7.0 / 2010-08-24 - -### Minor Enhancements - * Add support for rdiscount extensions (#173) - * Bug Fixes - * Highlight should not be able to render local files - * The site configuration may not always provide a 'time' setting (#184) - -## 0.6.2 / 2010-06-25 - * Bug Fixes - * Fix Rakefile 'release' task (tag pushing was missing origin) - * Ensure that RedCloth is loaded when textilize filter is used (#183) - * Expand source, destination, and plugin paths (#180) - * Fix `page.url` to include full relative path (#181) - -## 0.6.1 / 2010-06-24 - * Bug Fixes - * Fix Markdown Pygments prefix and suffix (#178) - -## 0.6.0 / 2010-06-23 - -### Major Enhancements - * Proper plugin system (#19, #100) - * Add safe mode so unsafe converters/generators can be added - * Maruku is now the only processor dependency installed by default. - Other processors will be lazy-loaded when necessary (and prompt the - user to install them when necessary) (#57) - -### Minor Enhancements - * Inclusion/exclusion of future dated posts (#59) - * Generation for a specific time (#59) - * Allocate `site.time` on render not per site_payload invocation (#59) - * Pages now present in the site payload and can be used through the - `site.pages` and `site.html_pages` variables - * Generate phase added to site#process and pagination is now a generator - * Switch to RakeGem for build/test process - * Only regenerate static files when they have changed (#142) - * Allow arbitrary options to Pygments (#31) - * Allow URL to be set via command line option (#147) - * Bug Fixes - * Render highlighted code for non markdown/textile pages (#116) - * Fix highlighting on Ruby 1.9 (#65) - * Fix extension munging when pretty permalinks are enabled (#64) - * Stop sorting categories (#33) - * Preserve generated attributes over front matter (#119) - * Fix source directory binding using `Dir.pwd` (#75) - -## 0.5.7 / 2010-01-12 - -### Minor Enhancements - * Allow overriding of post date in the front matter (#62, #38) - * Bug Fixes - * Categories isn't always an array (#73) - * Empty tags causes error in read_posts (#84) - * Fix pagination to adhere to read/render/write paradigm - * Test Enhancement - * Cucumber features no longer use site.posts.first where a better - alternative is available - -## 0.5.6 / 2010-01-08 - * Bug Fixes - * Require redcloth >= 4.2.1 in tests (#92) - * Don't break on triple dashes in yaml front matter (#93) - -### Minor Enhancements - * Allow .mkd as markdown extension - * Use $stdout/err instead of constants (#99) - * Properly wrap code blocks (#91) - * Add javascript mime type for webrick (#98) - -## 0.5.5 / 2010-01-08 - * Bug Fixes - * Fix pagination % 0 bug (#78) - * Ensure all posts are processed first (#71) - -## NOTE - * After this point I will no longer be giving credit in the history; - that is what the commit log is for. - -## 0.5.4 / 2009-08-23 - * Bug Fixes - * Do not allow symlinks (security vulnerability) - -## 0.5.3 / 2009-07-14 - * Bug Fixes - * Solving the permalink bug where non-html files wouldn't work - (@jeffrydegrande) - -## 0.5.2 / 2009-06-24 - * Enhancements - * Added --paginate option to the executable along with a paginator object - for the payload (@calavera) - * Upgraded RedCloth to 4.2.1, which makes `` tags work once - again. - * 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) - * 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) - * Added Date#xmlschema for Ruby versions < 1.9 - -## 0.5.1 / 2009-05-06 - -### Major Enhancements - * 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) - * Bug Fixes - * Making sure config.yaml references are all gone, using only config.yml - * 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 - -### Minor Enhancements - * 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) - * 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) - * Fix tests and convert to Shoulda (@qrush, @technicalpickles) - * Add Cucumber acceptance test suite (@qrush, @technicalpickles) - -## 0.4.1 - -### Minor Enhancements - * Changed date format on wordpress converter (zeropadding) (@dysinger) - * Bug Fixes - * Add Jekyll binary as executable to gemspec (@dysinger) - -## 0.4.0 / 2009-02-03 - -### Major Enhancements - * Switch to Jeweler for packaging tasks - -### Minor Enhancements - * 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) - * 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 - -### Major Enhancements - * Added `--server` option to start a simple WEBrick server on destination - directory (@johnreilly and @mchung) - -### Minor Enhancements - * 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) - * 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) - * Fix bug that meant page data (such as the date) was not available in - templates (@mreid) - * Properly reject directories in `_layouts` - -## 0.2.1 / 2008-12-15 - * Major Changes - * Use Maruku (pure Ruby) for Markdown by default (@mreid) - * Allow use of RDiscount with `--rdiscount` flag - -### Minor Enhancements - * Don't load directory_watcher unless it's needed (@pjhyett) - -## 0.2.0 / 2008-12-14 - * Major Changes - * related_posts is now found in `site.related_posts` - -## 0.1.6 / 2008-12-13 - * Major Features - * Include files in `_includes` with `{% include x.textile %}` - -## 0.1.5 / 2008-12-12 - -### Major Enhancements - * Code highlighting with Pygments if `--pygments` is specified - * Disable true LSI by default, enable with `--lsi` - -### Minor Enhancements - * Output informative message if RDiscount is not available (@JackDanger) - * Bug Fixes - * 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 - * Bug Fixes - * DATA does not work properly with rubygems - -## 0.1.3 / 2008-12-06 - * Major Features - * Markdown support (@vanpelt) - * Mephisto and CSV converters (@vanpelt) - * Code hilighting (@vanpelt) - * Autobuild - * Bug Fixes - * Accept both `\r\n` and `\n` in YAML header (@vanpelt) - -## 0.1.2 / 2008-11-22 - * Major Features - * Add a real "related posts" implementation using Classifier - * Command Line Changes - * Allow cli to be called with 0, 1, or 2 args intuiting dir paths - if they are omitted - -## 0.1.1 / 2008-11-22 - * Minor Additions - * Posts now support introspectional data e.g. `{{ page.url }}` - -## 0.1.0 / 2008-11-05 - * First release - * Converts posts written in Textile - * Converts regular site pages - * Simple copy of binary files - -## 0.0.0 / 2008-10-19 - * Birthday! +IyMgSEVBRAoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFVzZSBgTGlxdWlkOjpEcm9wYHMgaW5zdGVhZCBvZiBgSGFzaGBlcyBpbiBgI3RvX2xpcXVpZGAgKCM0Mjc3KQogICogQWRkICdzYW1wbGUnIExpcXVpZCBmaWx0ZXIgRXF1aXZhbGVudCB0byBBcnJheSNzYW1wbGUgZnVuY3Rpb25hbGl0eSAoIzQyMjMpCiAgKiBDYWNoZSBwYXJzZWQgaW5jbHVkZSBmaWxlIHRvIHNhdmUgbGlxdWlkIHBhcnNpbmcgdGltZS4gKCM0MTIwKQogICogU2xpZ2h0bHkgc3BlZWQgdXAgdXJsIHNhbml0aXphdGlvbiBhbmQgaGFuZGxlIG11bHRpcGxlcyBvZiAvLy8uICgjNDE2OCkKICAqIFByaW50IGRlYnVnIG1lc3NhZ2Ugd2hlbiBhIGRvY3VtZW50IGlzIHNraXBwZWQgZnJvbSByZWFkaW5nICgjNDE4MCkKICAqIEluY2x1ZGUgdGFnIHNob3VsZCBhY2NlcHQgbXVsdGlwbGUgdmFyaWFibGVzIGluIHRoZSBpbmNsdWRlIG5hbWUgKCM0MTgzKQogICogQWRkIGAtb2Agb3B0aW9uIHRvIHNlcnZlIGNvbW1hbmQgd2hpY2ggb3BlbnMgc2VydmVyIFVSTCAoIzQxNDQpCiAgKiBBZGQgQ29kZUNsaW1hdGUgcGxhdGZvcm0gZm9yIGJldHRlciBjb2RlIHF1YWxpdHkuICgjNDIyMCkKICAqIEdlbmVyYWwgaW1wcm92ZW1lbnRzIGZvciBXRUJyaWNrIHZpYSBqZWt5bGwgc2VydmUgc3VjaCBhcyBTU0wgJiBjdXN0b20gaGVhZGVycyAoIzQyMjQsICM0MjI4KQogICogQWRkIGEgZGVmYXVsdCBjaGFyc2V0IHRvIGNvbnRlbnQtdHlwZSBvbiB3ZWJyaWNrLiAoIzQyMzEpCiAgKiBTd2l0Y2ggYFBsdWdpbk1hbmFnZXJgIHRvIHVzZSBgcmVxdWlyZV93aXRoX2dyYWNlZnVsX2ZhaWxgIGZvciBiZXR0ZXIgVVggKCM0MjMzKQogICogQWxsb3cgcXVvdGVkIGRhdGUgaW4gZnJvbnQgbWF0dGVyIGRlZmF1bHRzICgjNDE4NCkKICAqIEFkZCBhIEpla3lsbCBkb2N0b3Igd2FybmluZyBmb3IgVVJMcyB0aGF0IG9ubHkgZGlmZmVyIGJ5IGNhc2UgKCMzMTcxKQogICogZHJvcHM6IGNyZWF0ZSBvbmUgYmFzZSBEcm9wIGNsYXNzIHdoaWNoIGNhbiBiZSBzZXQgYXMgbXV0YWJsZSBvciBub3QgKCM0Mjg1KQogICogZHJvcHM6IHByb3ZpZGUgYCN0b19oYCB0byBhbGxvdyBmb3IgaGFzaCBpbnRyb3NwZWN0aW9uICgjNDI4MSkKICAqIFNoaW0gc3ViY29tbWFuZHMgd2l0aCBpbmRpY2F0aW9uIG9mIGdlbSBwb3NzaWJseSByZXF1aXJlZCBzbyB1c2VycyBrbm93IGhvdyB0byB1c2UgdGhlbSAoIzQyNTQpCgojIyMgQnVnIEZpeGVzCgogICogUGFzcyBidWlsZCBvcHRpb25zIGludG8gYGNsZWFuYCBjb21tYW5kICgjNDE3NykKICAqIEFsbG93IHVzZXJzIHRvIHVzZSAuaHRtIGFuZCAueGh0bWwgKFhIVE1MNS4pICgjNDE2MCkKICAqIFByZXZlbnQgU2hlbGwgSW5qZWN0aW9uLiAoIzQyMDApCiAgKiBDb252ZXJ0aWJsZSBzaG91bGQgbWFrZSBsYXlvdXQgZGF0YSBhY2Nlc3NpYmxlIHZpYSBgbGF5b3V0YCBpbnN0ZWFkIG9mIGBwYWdlYCAoIzQyMDUpCiAgKiBBdm9pZCB1c2luZyBgRGlyLmdsb2JgIHdpdGggYWJzb2x1dGUgcGF0aCB0byBhbGxvdyBzcGVjaWFsIGNoYXJhY3RlcnMgaW4gdGhlIHBhdGggKCM0MTUwKQogICogSGFuZGxlIGVtcHR5IGNvbmZpZyBmaWxlcyAoIzQwNTIpCiAgKiBSZW5hbWUgYEBvcHRpb25zYCBzbyB0aGF0IGl0IGRvZXMgbm90IGltcGFjdCBMaXF1aWQuICgjNDE3MykKICAqIHV0aWxzL2Ryb3BzOiB1cGRhdGUgRHJvcCB0byBzdXBwb3J0IGBVdGlscy5kZWVwX21lcmdlX2hhc2hlc2AgKCM0Mjg5KQogICogTWFrZSBzdXJlIGpla3lsbC9kcm9wcy9kcm9wIGlzIGxvYWRlZCBmaXJzdC4gKCM0MjkyKQogICogQ29udmVydGlibGUvUGFnZS9SZW5kZXJlcjogdXNlIHBheWxvYWQgaGFzaCBhY2Nlc3NvciAmIHNldHRlciBzeW50YXggZm9yIGJhY2t3YXJkcy1jb21wYXRpYmlsaXR5ICgjNDMxMSkKICAqIERyb3A6IGZpeCBoYXNoIHNldHRlciBwcmVjZW5kZW5jZSAoIzQzMTIpCiAgKiB1dGlsczogYGhhc195YW1sX2hlYWRlcj9gIHNob3VsZCBhY2NlcHQgZmlsZXMgd2l0aCBleHRyYW5lb3VzIHNwYWNlcyAoIzQyOTApCiAgKiBFc2NhcGUgaHRtbCBmcm9tIHNpdGUudGl0bGUgYW5kIHBhZ2UudGl0bGUgaW4gc2l0ZSB0ZW1wbGF0ZSAoIzQzMDcpCgojIyMgRGV2ZWxvcG1lbnQgRml4ZXMKCiAgKiBgamVreWxsLWRvY3NgIHNob3VsZCBiZSBlYXNpbHkgcmVsZWFzZS1hYmxlICgjNDE1MikKICAqIEFsbG93IHVzZSBvZiBDdWN1bWJlciAyLjEgb3IgZ3JlYXRlciAoIzQxODEpCiAgKiBNb2Rlcm5pemUgS3JhbWRvd24gZm9yIE1hcmtkb3duIGNvbnZlcnRlci4gKCM0MTA5KQogICogQ2hhbmdlIFRlc3REb2N0b3JDb21tYW5kIHRvIEpla3lsbFVuaXRUZXN0Li4uICgjNDI2MykKICAqIENyZWF0ZSBuYW1lc3BhY2VkIHJha2UgdGFza3MgaW4gc2VwYXJhdGUgYC5yYWtlYCBmaWxlcyB1bmRlciBgbGliL3Rhc2tzYCAoIzQyODIpCiAgKiBtYXJrZG93bjogcmVmYWN0b3IgZm9yIGdyZWF0ZXIgcmVhZGFiaWxpdHkgJiBlZmZpY2llbmN5ICgjMzc3MSkKICAqIEZpeCBtYW55IFJ1Ym9jb3Agc3R5bGUgZXJyb3JzICgjNDMwMSkKICAqIEZpeCBzcGVsbGluZyBvZiAiR2l0SHViIiBpbiBkb2NzIGFuZCBoaXN0b3J5ICgjNDMyMikKICAqIFJlb3JnYW5pemUgYW5kIGNsZWFudXAgdGhlIEdlbWZpbGUsIHNob3J0ZW4gcmVxdWlyZWQgZGVwZW5kcy4gKCM0MzE4KQoKIyMjIFNpdGUgRW5oYW5jZW1lbnRzCgogICogQWRkIHRocmVlIHBsdWdpbnMgdG8gZGlyZWN0b3J5ICgjNDE2MykKICAqIEFkZCB1cGdyYWRpbmcgZG9jcyBmcm9tIDIueCB0byAzLnggKCM0MTU3KQogICogQWRkIGBwcm90ZWN0X2VtYWlsYCB0byB0aGUgcGx1Z2lucyBpbmRleC4gKCM0MTY5KQogICogQWRkIGBqZWt5bGwtZGVwbG95YCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCM0MTc5KQogICogQ2xhcmlmeSBwbHVnaW4gZG9jcyAoIzQxNTQpCiAgKiBBZGQgS2lja3N0ZXIgdG8gZGVwbG95bWVudCBtZXRob2RzIGluIGRvY3VtZW50YXRpb24gKCM0MTkwKQogICogQWRkIERhdmlkQnVyZWxhJ3MgdHV0b3JpYWwgZm9yIFdpbmRvd3MgdG8gV2luZG93cyBkb2NzIHBhZ2UgKCM0MjEwKQogICogQ2hhbmdlIEdpdEh1YiBjb2RlIGJsb2NrIHRvIGhpZ2hsaWdodCB0YWcgdG8gYXZvaWQgaXQgb3ZlcmxhcHMgcGFyZW50IGRpdiAoIzQxMjEpCiAgKiBVcGRhdGUgRm9ybUtlZXAgbGluayB0byBiZSBzb21ldGhpbmcgbW9yZSBzcGVjaWZpYyB0byBKZWt5bGwgKCM0MjQzKQogICogUmVtb3ZlIGV4YW1wbGUgUm9nZXIgQ2hhcG1hbiBzaXRlLCBhcyB0aGUgZG9tYWluIGRvZXNuJ3QgZXhpc3QgKCM0MjQ5KQogICogQWRkZWQgY29uZmlndXJhdGlvbiBvcHRpb25zIGZvciBgZHJhZnRfcG9zdHNgIHRvIGNvbmZpZ3VyYXRpb24gZG9jcyAoIzQyNTEpCiAgKiBGaXggY2hlY2tsaXN0IGluIGBfYXNzZXRzLm1kYCAoIzQyNTkpCiAgKiBBZGQgTWFya2Rvd24gZXhhbXBsZXMgdG8gUGFnZXMgZG9jcyAoIzQyNzUpCiAgKiBBZGQgamVreWxsLXBhZ2luYXRlLWNhdGVnb3J5IHRvIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzQyNzMpCiAgKiBBZGQgYGpla3lsbC1yZXNwb25zaXZlX2ltYWdlYCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCM0Mjg2KQogICogQWRkIGBqZWt5bGwtY29tbW9ubWFya2AgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjNDI5OSkKICAqIEFkZCBkb2N1bWVudGF0aW9uIGZvciBpbmNyZW1lbnRhbCByZWdlbmVyYXRpb24gKCM0MjkzKQogICogQWRkIG5vdGUgYWJvdXQgcmVtb3ZhbCBvZiByZWxhdGl2ZSBwZXJtYWxpbmsgc3VwcG9ydCBpbiB1cGdyYWRpbmcgZG9jcyAoIzQzMDMpCiAgKiBBZGQgUHJvIFRpcCB0byB1c2UgZnJvbnQgbWF0dGVyIHZhcmlhYmxlIHRvIGNyZWF0ZSBjbGVhbiBVUkxzICgjNDI5NikKICAqIEZpeCBncmFtbWFyIGluIHRoZSBkb2N1bWVudGF0aW9uIGZvciBwb3N0cy4gKCM0MzMwKQoKIyMgMy4wLjEgLyAyMDE1LTExLTE3CgojIyMgQnVnIEZpeGVzCgogICogRG9jdW1lbnQ6IG9ubHkgc3VwZXJkaXJlY3RvcmllcyBvZiB0aGUgY29sbGVjdGlvbiBhcmUgY2F0ZWdvcmllcyAoIzQxMTApCiAgKiBgQ29udmVydGlibGUjcmVuZGVyX2xpcXVpZGAgc2hvdWxkIHVzZSBgcmVuZGVyIWAgdG8gY2F1c2UgZmFpbHVyZSBvbiBiYWQgTGlxdWlkICgjNDA3NykKICAqIERvbid0IGdlbmVyYXRlIGAuamVreWxsLW1ldGFkYXRhYCBpbiBub24taW5jcmVtZW50YWwgYnVpbGQgKCM0MDc5KQogICogU2V0IGBoaWdobGlnaHRlcmAgY29uZmlnIHZhbCB0byBga3JhbWRvd24uc3ludGF4X2hpZ2hsaWdodGVyYCAoIzQwOTApCiAgKiBBbGlnbiBob29rcyBpbXBsZW1lbnRhdGlvbiB3aXRoIGRvY3VtZW50YXRpb24gKCM0MTA0KQogICogRml4IHRoZSBkZXByZWNhdGlvbiB3YXJuaW5nIGluIHRoZSBkb2N0b3IgY29tbWFuZCAoIzQxMTQpCiAgKiBGaXggY2FzZSBpbiBgOnRpdGxlYCBhbmQgYWRkIGA6c2x1Z2Agd2hpY2ggaXMgZG93bmNhc2VkICgjNDEwMCkKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIEZpeCB0ZXN0IHdhcm5pbmdzIHdoZW4gZG9pbmcgcmFrZSB7dGVzdCxzcGVjfSBvciBzY3JpcHQvdGVzdCAoIzQwNzgpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBVcGRhdGUgbm9ybWFsaXplLmNzcyB0byB2My4wLjMuICgjNDA4NSkKICAqIFVwZGF0ZSBGb250IEF3ZXNvbWUgdG8gdjQuNC4wLiAoIzQwODYpCiAgKiBBZGRzIGEgbm90ZSBhYm91dCBpbnN0YWxsaW5nIHRoZSBqZWt5bGwtZ2lzdCBnZW0gdG8gbWFrZSBnaXN0IHRhZyB3b3JrICgjNDEwMSkKICAqIEFsaWduIGhvb2tzIGRvY3VtZW50YXRpb24gd2l0aCBpbXBsZW1lbnRhdGlvbiAoIzQxMDQpCiAgKiBBZGQgSmVreWxsIEZsaWNrciBQbHVnaW4gdG8gdGhlIGxpc3Qgb2YgdGhpcmQgcGFydHkgcGx1Z2lucyAoIzQxMTEpCiAgKiBSZW1vdmUgbGluayB0byBub3ctZGVsZXRlZCBibG9nIHBvc3QgKCM0MTI1KQogICogVXBkYXRlIHRoZSBsaXF1aWQgc3ludGF4IGluIHRoZSBwYWdpbmF0aW9uIGRvY3MgKCM0MTMwKQogICogQWRkIGpla3lsbC1sYW5ndWFnZS1wbHVnaW4gdG8gcGx1Z2lucy5tZCAoIzQxMzQpCiAgKiBVcGRhdGVkIHRvIHJlZmxlY3QgZmVlZGJhY2sgaW4gIzQxMjkgKCM0MTM3KQogICogQ2xhcmlmeSBhc3NldHMubWQgYmFzZWQgb24gZmVlZGJhY2sgb2YgIzQxMjkgKCM0MTQyKQogICogUmUtY29ycmVjdCB0aGUgbGlxdWlkIHN5bnRheCBpbiB0aGUgcGFnaW5hdGlvbiBkb2NzICgjNDE0MCkKCiMjIDMuMC4wIC8gMjAxNS0xMC0yNgoKIyMjIE1ham9yIEVuaGFuY2VtZW50cwoKICAqIExpcXVpZCBwcm9maWxlciAoaS5lLiBrbm93IGhvdyBmYXN0IG9yIHNsb3cgeW91ciB0ZW1wbGF0ZXMgcmVuZGVyKSAoIzM3NjIpCiAgKiBJbmNyZW1lbnRhbCByZWdlbmVyYXRpb24gKCMzMTE2KQogICogQWRkIEhvb2tzOiBhIG5ldyBraW5kIG9mIHBsdWdpbiAoIzM1NTMpCiAgKiBVcGdyYWRlIHRvIExpcXVpZCAzLjAuMCAoIzMwMDIpCiAgKiBgc2l0ZS5wb3N0c2AgaXMgbm93IGEgQ29sbGVjdGlvbiBpbnN0ZWFkIG9mIGFuIEFycmF5ICgjNDA1NSkKICAqIEFkZCBiYXNpYyBzdXBwb3J0IGZvciBKUnVieSAoY29tbWl0OiAwZjQ0NzcpCiAgKiBEcm9wIHN1cHBvcnQgZm9yIFJ1YnkgMS45LjMuICgjMzIzNSkKICAqIFN1cHBvcnQgUnVieSB2Mi4yICgjMzIzNCkKICAqIFN1cHBvcnQgUkRpc2NvdW50IDIgKCMyNzY3KQogICogUmVtb3ZlIG1vc3QgcnVudGltZSBkZXBzICgjMzMyMykKICAqIE1vdmUgdG8gUm91Z2UgYXMgZGVmYXVsdCBoaWdobGlnaHRlciAoIzMzMjMpCiAgKiBNaW1pYyBHaXRIdWIgUGFnZXMgYC5odG1sYCBleHRlbnNpb24gc3RyaXBwaW5nIGJlaGF2aW9yIGluIFdFQnJpY2sgKCMzNDUyKQogICogQWx3YXlzIGluY2x1ZGUgZmlsZSBleHRlbnNpb24gb24gb3V0cHV0IGZpbGVzICgjMzQ5MCkKICAqIEltcHJvdmVkIHBlcm1hbGlua3MgZm9yIHBhZ2VzIGFuZCBjb2xsZWN0aW9ucyAoIzM1MzgpCiAgKiBTdW5zZXQgKGkuZS4gcmVtb3ZlKSBNYXJ1a3UgKCMzNjU1KQogICogUmVtb3ZlIHN1cHBvcnQgZm9yIHJlbGF0aXZlIHBlcm1hbGlua3MgKCMzNjc5KQogICogSXRlcmF0ZSBvdmVyIGBzaXRlLmNvbGxlY3Rpb25zYCBhcyBhbiBhcnJheSBpbnN0ZWFkIG9mIGEgaGFzaC4gKCMzNjcwKQogICogQWRhcHQgU3RhdGljRmlsZSBmb3IgY29sbGVjdGlvbnMsIGNvbmZpZyBkZWZhdWx0cyAoIzM4MjMpCiAgKiBBZGQgYSBDb2RlIG9mIENvbmR1Y3QgZm9yIHRoZSBKZWt5bGwgcHJvamVjdCAoIzM5MjUpCiAgKiBBZGRlZCBwZXJtYWxpbmsgdGltZSB2YXJpYWJsZXMgKCMzOTkwKQogICogQWRkIGAtLWluY3JlbWVudGFsYCBmbGFnIHRvIGVuYWJsZSBpbmNyZW1lbnRhbCByZWdlbiAoZGlzYWJsZWQgYnkgZGVmYXVsdCkgKCM0MDU5KQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIERlcHJlY2F0ZSBhY2Nlc3MgdG8gRG9jdW1lbnQjZGF0YSBwcm9wZXJ0aWVzIGFuZCBDb2xsZWN0aW9uI2RvY3MgbWV0aG9kcyAoIzQwNTgpCiAgKiBTb3J0IHN0YXRpYyBmaWxlcyBqdXN0IG9uY2UsIGFuZCBjYWxsIGBzaXRlX3BheWxvYWRgIG9uY2UgZm9yIGFsbCBjb2xsZWN0aW9ucyAoIzMyMDQpCiAgKiBTZXBhcmF0ZSBgamVreWxsIGRvY3NgIGFuZCBvcHRpbWl6ZSBleHRlcm5hbCBnZW0gaGFuZGxpbmcgKCMzMjQxKQogICogSW1wcm92ZSBgU2l0ZSNnZXRDb252ZXJ0ZXJJbXBsYCBhbmQgY2FsbCBpdCBgU2l0ZSNmaW5kX2NvbnZlcnRlcl9pbnN0YW5jZWAgKCMzMjQwKQogICogVXNlIHJlbGF0aXZlIHBhdGggZm9yIGBwYXRoYCBMaXF1aWQgdmFyaWFibGUgaW4gRG9jdW1lbnRzIGZvciBjb25zaXN0ZW5jeSAoIzI5MDgpCiAgKiBHZW5lcmFsaXplIGBVdGlscyNzbHVnaWZ5YCBmb3IgYW55IHNjcmlwdHMgKCMzMDQ3KQogICogQWRkZWQgYmFzaWMgbWljcm9kYXRhIHRvIHBvc3QgdGVtcGxhdGUgaW4gc2l0ZSB0ZW1wbGF0ZSAoIzMxODkpCiAgKiBTdG9yZSBsb2cgbWVzc2FnZXMgaW4gYW4gYXJyYXkgb2YgbWVzc2FnZXMuICgjMzI0NCkKICAqIEFsbG93IGNvbGxlY3Rpb24gZG9jdW1lbnRzIHRvIG92ZXJyaWRlIGBvdXRwdXRgIHByb3BlcnR5IGluIGZyb250IG1hdHRlciAoIzMxNzIpCiAgKiBLZWVwIGZpbGUgbW9kaWZpY2F0aW9uIHRpbWVzIGJldHdlZW4gYnVpbGRzIGZvciBzdGF0aWMgZmlsZXMgKCMzMjIwKQogICogT25seSBkb3duY2FzZSBtaXhlZC1jYXNlIGNhdGVnb3JpZXMgZm9yIHRoZSBVUkwgKCMyNTcxKQogICogQWRkZWQgcGVyIHBvc3QgYGV4Y2VycHRfc2VwYXJhdG9yYCBmdW5jdGlvbmFsaXR5ICgjMzI3NCkKICAqIEFsbG93IGNvbGxlY3Rpb25zIFlBTUwgdG8gZW5kIHdpdGggdGhyZWUgZG90cyAoIzMxMzQpCiAgKiBBZGQgbW9kZSBwYXJhbWV0ZXIgdG8gYHNsdWdpZnlgIExpcXVpZCBmaWx0ZXIgKCMyOTE4KQogICogUGVyZjogYE1hcmtkb3duI21hdGNoZXNgIHNob3VsZCBhdm9pZCByZWdleHAgKCMzMzIxKQogICogUGVyZjogVXNlIGZyb3plbiByZWd1bGFyIGV4cHJlc3Npb25zIGZvciBgVXRpbHMjc2x1Z2lmeWAgKCMzMzIxKQogICogU3BsaXQgb2ZmIFRleHRpbGUgc3VwcG9ydCBpbnRvIGpla3lsbC10ZXh0aWxlLWNvbnZlcnRlciAoIzMzMTkpCiAgKiBJbXByb3ZlIHRoZSBuYXZpZ2F0aW9uIG1lbnUgYWxpZ25tZW50IGluIHRoZSBzaXRlIHRlbXBsYXRlIG9uIHNtYWxsIHNjcmVlbnMgKCMzMzMxKQogICogU2hvdyB0aGUgcmVnZW5lcmF0aW9uIHRpbWUgYWZ0ZXIgdGhlIGluaXRpYWwgZ2VuZXJhdGlvbiAoIzMzNzgpCiAgKiBTaXRlIHRlbXBsYXRlOiBTd2l0Y2ggZGVmYXVsdCBmb250IHRvIEhlbHZldGljYSBOZXVlICgjMzM3NikKICAqIE1ha2UgdGhlIGBpbmNsdWRlYCB0YWcgYSB0ZWVuc3kgYml0IGZhc3Rlci4gKCMzMzkxKQogICogQWRkIGBwa2lsbCAtZiBqZWt5bGxgIHRvIHdheXMgdG8ga2lsbC4gKCMzMzk3KQogICogU2l0ZSB0ZW1wbGF0ZTogY29sbGFwc2VkLCB2YXJpYWJsZS1kcml2ZW4gZm9udCBkZWNsYXJhdGlvbiAoIzMzNjApCiAgKiBTaXRlIHRlbXBsYXRlOiBEb24ndCBhbHdheXMgc2hvdyB0aGUgc2Nyb2xsYmFyIGluIGNvZGUgYmxvY2tzICgjMzQxOSkKICAqIFNpdGUgdGVtcGxhdGU6IFJlbW92ZSB1bmRlZmluZWQgYHRleHRgIGNsYXNzIGZyb20gYHBgIGVsZW1lbnQgKCMzNDQwKQogICogU2l0ZSB0ZW1wbGF0ZTogT3B0aW1pemUgdGV4dCByZW5kZXJpbmcgZm9yIGxlZ2liaWxpdHkgKCMzMzgyKQogICogQWRkIGBkcmFmdD9gIG1ldGhvZCB0byBpZGVudGlmeSBpZiBQb3N0IGlzIGEgRHJhZnQgJiBleHBvc2UgdG8gTGlxdWlkICgjMzQ1NikKICAqIFdyaXRlIHJlZ2VuZXJhdGlvbiBtZXRhZGF0YSBldmVuIG9uIGZ1bGwgcmVidWlsZCAoIzM0NjQpCiAgKiBQZXJmOiBVc2UgYFN0cmluZyNlbmRfd2l0aD8oIi8iKWAgaW5zdGVhZCBvZiByZWdleHAgd2hlbiBjaGVja2luZyBwYXRocyAoIzM1MTYpCiAgKiBEb2NzOiBkb2N1bWVudCAnb3JkaW5hbCcgYnVpbHQtaW4gcGVybWFsaW5rIHN0eWxlICgjMzUzMikKICAqIFVwZ3JhZGUgbGlxdWlkLWMgdG8gMy54ICgjMzUzMSkKICAqIFVzZSBjb25zaXN0ZW50IHN5bnRheCBmb3IgZGVwcmVjYXRpb24gd2FybmluZyAoIzM1MzUpCiAgKiBBZGRlZCBidWlsZCAtLWRlc3RpbmF0aW9uIGFuZCAtLXNvdXJjZSBmbGFncyAoIzM0MTgpCiAgKiBTaXRlIHRlbXBsYXRlOiByZW1vdmUgdW51c2VkIGBwYWdlLm1ldGFgIGF0dHJpYnV0ZSAoIzM1MzcpCiAgKiBJbXByb3ZlIHRoZSBlcnJvciBtZXNzYWdlIHdoZW4gc29ydGluZyBudWxsIG9iamVjdHMgKCMzNTIwKQogICogQWRkZWQgbGlxdWlkLW1kNSBwbHVnaW4gKCMzNTk4KQogICogRG9jdW1lbnRhdGlvbjogUlIgcmVwbGFjZWQgd2l0aCBSU3BlYyBNb2NrcyAoIzM2MDApCiAgKiBEb2N1bWVudGF0aW9uOiBGaXggc3VicGF0aC4gKCMzNTk5KQogICogQ3JlYXRlICd0bXAnIGRpciBmb3IgdGVzdF90YWdzIGlmIGl0IGRvZXNuJ3QgZXhpc3QgKCMzNjA5KQogICogRXh0cmFjdCByZWFkaW5nIG9mIGRhdGEgZnJvbSBgU2l0ZWAgdG8gcmVkdWNlIHJlc3BvbnNpYmlsaXRpZXMuICgjMzU0NSkKICAqIFJlbW92ZWQgdGhlIHdvcmQgJ0pla3lsbCcgYSBmZXcgdGltZXMgZnJvbSB0aGUgY29tbWVudHMgKCMzNjE3KQogICogYGJpbi9qZWt5bGxgOiB3aXRoIG5vIGFyZ3MsIGV4aXQgd2l0aCBleGl0IGNvZGUgMSAoIzM2MTkpCiAgKiBJbmNyZW1lbnRhbCBidWlsZCBpZiBkZXN0aW5hdGlvbiBmaWxlIG1pc3NpbmcgKCMzNjE0KQogICogU3RhdGljIGZpbGVzIGBtdGltZWAgbGlxdWlkIHNob3VsZCByZXR1cm4gYSBgVGltZWAgb2JqICgjMzU5NikKICAqIFVzZSBgSmVreWxsOjpQb3N0YHMgZm9yIGJvdGggTFNJIGluZGV4aW5nIGFuZCBsb29rdXAuICgjMzYyOSkKICAqIEFkZCBgY2hhcnNldD11dGYtOGAgZm9yIEhUTUwgYW5kIFhNTCBwYWdlcyBpbiBXRUJyaWNrICgjMzY0OSkKICAqIFNldCBsb2cgbGV2ZWwgdG8gZGVidWcgd2hlbiB2ZXJib3NlIGZsYWcgaXMgc2V0ICgjMzY2NSkKICAqIEFkZGVkIGEgbWVudGlvbiBvbiB0aGUgR2VtZmlsZSB0byBjb21wbGV0ZSB0aGUgaW5zdHJ1Y3Rpb25zICgjMzY3MSkKICAqIFBlcmY6IENhY2hlIGBEb2N1bWVudCN0b19saXF1aWRgIGFuZCBpbnZhbGlkYXRlIHdoZXJlIG5lY2Vzc2FyeSAoIzM2OTMpCiAgKiBQZXJmOiBgSmVreWxsOjpDbGVhbmVyI2V4aXN0aW5nX2ZpbGVzYDogQ2FsbCBga2VlcF9maWxlX3JlZ2V4YCBhbmQgYGtlZXBfZGlyc2Agb25seSBvbmNlLCBub3Qgb25jZSBwZXIgaXRlcmF0aW9uICgjMzY5NikKICAqIE9taXQgamVreWxsL2pla3lsbC1oZWxwIGZyb20gbGlzdCBvZiByZXNvdXJjZXMuICgjMzY5OCkKICAqIEFkZCBiYXNpYyBgamVreWxsIGRvY3RvcmAgdGVzdCB0byBkZXRlY3QgZnNub3RpZnkgKE9TWCkgYW5vbWFsaWVzLiAoIzM3MDQpCiAgKiBBZGRlZCB0YWxrLmpla3lsbHJiLmNvbSB0byAiSGF2ZSBxdWVzdGlvbnM/IiAoIzM2OTQpCiAgKiBQZXJmb3JtYW5jZTogU29ydCBmaWxlcyBvbmx5IG9uY2UgKCMzNzA3KQogICogUGVyZm9ybWFuY2U6IE1hcnNoYWwgbWV0YWRhdGEgKCMzNzA2KQogICogVXBncmFkZSBoaWdobGlnaHQgd3JhcHBlciBmcm9tIGBkaXZgIHRvIGBmaWd1cmVgICgjMzc3OSkKICAqIFVwZ3JhZGUgbWltZS10eXBlcyB0byBgfj4gMi42YCAoIzM3OTUpCiAgKiBVcGRhdGUgd2luZG93cy5tZCB3aXRoIFJ1YnkgdmVyc2lvbiBpbmZvICgjMzgxOCkKICAqIE1ha2UgdGhlIGRpcmVjdG9yeSBmb3IgaW5jbHVkZXMgY29uZmlndXJhYmxlICgjMzc4MikKICAqIFJlbmFtZSBkaXJlY3RvcnkgY29uZmlndXJhdGlvbnMgdG8gbWF0Y2ggYCpfZGlyYCBjb252ZW50aW9uIGZvciBjb25zaXN0ZW5jeSAoIzM3ODIpCiAgKiBJbnRlcm5hbDogdHJpZ2dlciBob29rcyBieSBvd25lciBzeW1ib2wgKCMzODcxKQogICogVXBkYXRlIE1JTUUgdHlwZXMgZnJvbSBtaW1lLWRiICgjMzkzMykKICAqIEFkZCBoZWFkZXIgdG8gc2l0ZSB0ZW1wbGF0ZSBgX2NvbmZpZy55bWxgIGZvciBjbGFyaXR5ICYgZGlyZWN0aW9uICgjMzk5NykKICAqIFNpdGUgdGVtcGxhdGU6IGFkZCB0aW1lem9uZSBvZmZzZXQgdG8gcG9zdCBkYXRlIGZyb250bWF0dGVyICgjNDAwMSkKICAqIE1ha2UgYSBjb25zdGFudCBmb3IgdGhlIHJlZ2V4IHRvIGZpbmQgaGlkZGVuIGZpbGVzICgjNDAzMikKICAqIFNpdGUgdGVtcGxhdGU6IHJlZmFjdG9yIGdpdGh1YiAmIHR3aXR0ZXIgaWNvbnMgaW50byBpbmNsdWRlcyAoIzQwNDkpCiAgKiBTaXRlIHRlbXBsYXRlOiBhZGQgYmFja2dyb3VuZCB0byBLcmFtZG93biBSb3VnZS1pZmllZCBiYWNrdGljayBjb2RlIGJsb2NrcyAoIzQwNTMpCgojIyMgQnVnIEZpeGVzCgogICogYHBvc3RfdXJsYDogZml4IGFjY2VzcyBkZXByZWNhdGlvbiB3YXJuaW5nICYgZml4IGRlcHJlY2F0aW9uIG1zZyAoIzQwNjApCiAgKiBQZXJmb3JtIGpla3lsbC1wYWdpbmF0ZSBkZXByZWNhdGlvbiB3YXJuaW5nIGNvcnJlY3RseS4gKCMzNTgwKQogICogTWFrZSBwZXJtYWxpbmsgcGFyc2luZyBjb25zaXN0ZW50IHdpdGggcGFnZXMgKCMzMDE0KQogICogYHRpbWUoKWBwcmUtZmlsdGVyIG1ldGhvZCBzaG91bGQgYWNjZXB0IGEgYERhdGVgIG9iamVjdCAoIzMyOTkpCiAgKiBSZW1vdmUgdW5uZWVkZWQgZW5kIHRhZyBmb3IgYGxpbmtgIGluIHNpdGUgdGVtcGxhdGUgKCMzMjM2KQogICogS3JhbWRvd246IFVzZSBgZW5hYmxlX2NvZGVyYXlgIGtleSBpbnN0ZWFkIG9mIGB1c2VfY29kZXJheWAgKCMzMjM3KQogICogVW5lc2NhcGUgYERvY3VtZW50YCBvdXRwdXQgcGF0aCAoIzI5MjQpCiAgKiBGaXggbmF2IGl0ZW1zIGFsaWdubWVudCB3aGVuIG9uIG11bHRpcGxlIHJvd3MgKCMzMjY0KQogICogSGlnaGxpZ2h0OiBPbmx5IFN0cmlwIE5ld2xpbmVzL0NhcnJpYWdlIFJldHVybnMsIG5vdCBTcGFjZXMgKCMzMjc4KQogICogRmluZCB2YXJpYWJsZXMgaW4gZnJvbnQgbWF0dGVyIGRlZmF1bHRzIGJ5IHNlYXJjaGluZyB3aXRoIHJlbGF0aXZlIGZpbGUgcGF0aC4gKCMyNzc0KQogICogQWxsb3cgdmFyaWFibGVzIChlLmcgYDpjYXRlZ29yaWVzYCkgaW4gWUFNTCBmcm9udCBtYXR0ZXIgcGVybWFsaW5rcyAoIzMzMjApCiAgKiBIYW5kbGUgbmlsIFVSTCBwbGFjZWhvbGRlcnMgaW4gcGVybWFsaW5rcyAoIzMzMjUpCiAgKiBUZW1wbGF0ZTogRml4IG5hdiBpdGVtcyBhbGlnbm1lbnQgd2hlbiBpbiAiYnVyZ2VyIiBtb2RlICgjMzMyOSkKICAqIFRlbXBsYXRlOiBSZW1vdmUgYCFpbXBvcnRhbnRgIGZyb20gbmF2IFNDU1MgaW50cm9kdWNlZCBpbiAjMzMyOSAoIzMzNzUpCiAgKiBUaGUgYDp0aXRsZWAgVVJMIHBsYWNlaG9sZGVyIGZvciBjb2xsZWN0aW9ucyBzaG91bGQgYmUgdGhlIGZpbGVuYW1lIHNsdWcuICgjMzM4MykKICAqIFRyaW0gdGhlIGdlbmVyYXRlIHRpbWUgZGlmZiB0byBqdXN0IDMgcGxhY2VzIHBhc3QgdGhlIGRlY2ltYWwgcGxhY2UgKCMzNDE1KQogICogVGhlIGhpZ2hsaWdodCB0YWcgc2hvdWxkIG9ubHkgY2xpcCB0aGUgbmV3bGluZXMgYmVmb3JlIGFuZCBhZnRlciB0aGUgKmVudGlyZSogYmxvY2ssIG5vdCBpbiBiZXR3ZWVuICgjMzQwMSkKICAqIGhpZ2hsaWdodDogZml4IHByb2JsZW0gd2l0aCBsaW5lbm9zIGFuZCByb3VnZS4gKCMzNDM2KQogICogYFNpdGUjcmVhZF9kYXRhX2ZpbGVgOiByZWFkIENTVidzIHdpdGggcHJvcGVyIGZpbGUgZW5jb2RpbmcgKCMzNDU1KQogICogSWdub3JlIGAuamVreWxsLW1ldGFkYXRhYCBpbiBzaXRlIHRlbXBsYXRlICgjMzQ5NikKICAqIFRlbXBsYXRlOiBQb2ludCBkb2N1bWVudGF0aW9uIGxpbmsgdG8gdGhlIGRvY3VtZW50YXRpb24gcGFnZXMgKCMzNTAyKQogICogUmVtb3ZlZCB0aGUgdHJhaWxpbmcgc2xhc2ggZnJvbSB0aGUgZXhhbXBsZSBgL2Jsb2dgIGJhc2V1cmwgY29tbWVudCAoIzM0ODUpCiAgKiBDbGVhciB0aGUgcmVnZW5lcmF0b3IgY2FjaGUgZXZlcnkgdGltZSB3ZSBwcm9jZXNzICgjMzU5MikKICAqIFJlYWRkIChicmluZyBiYWNrKSBtaW5pdGVzdC1wcm9maWxlICgjMzYyOCkKICAqIEFkZCBXT0ZGMiBmb250IE1JTUUgdHlwZSB0byBKZWt5bGwgc2VydmVyIE1JTUUgdHlwZXMgKCMzNjQ3KQogICogQmUgc21hcnRlciBhYm91dCBleHRyYWN0aW5nIHRoZSBleHRuYW1lIGluIGBTdGF0aWNGaWxlYCAoIzM2MzIpCiAgKiBQcm9jZXNzIG1ldGFkYXRhIGZvciBhbGwgZGVwZW5kZW5jaWVzICgjMzYwOCkKICAqIFNob3cgZXJyb3IgbWVzc2FnZSBpZiB0aGUgWUFNTCBmcm9udCBtYXR0ZXIgb24gYSBwYWdlL3Bvc3QgaXMgaW52YWxpZC4gKCMzNjQzKQogICogVXBncmFkZSByZWRjYXJwZXQgdG8gMy4yIChTZWN1cml0eSBmaXg6IE9TVkRCLTEyMDQxNSkgKCMzNjUyKQogICogQ3JlYXRlICNtb2NrX2V4cGVjdHMgdGhhdCBnb2VzIGRpcmVjdGx5IHRvIFJTcGVjIE1vY2tzLiAoIzM2NTgpCiAgKiBPcGVuIGAuamVreWxsLW1ldGFkYXRhYCBpbiBiaW5hcnkgbW9kZSB0byByZWFkIGJpbmFyeSBNYXJzaGFsIGRhdGEgKCMzNzEzKQogICogSW5jcmVtZW50YWwgcmVnZW5lcmF0aW9uOiBoYW5kbGUgZGVsZXRlZCwgcmVuYW1lZCwgYW5kIG1vdmVkIGRlcGVuZGVuY2llcyAoIzM3MTcpCiAgKiBGaXggdHlwbyBvbiBsaW5lIDE5IG9mIHBhZ2luYXRpb24ubWQgKCMzNzYwKQogICogRml4IGl0IHNvIHRoYXQgJ2Jsb2cuaHRtbCcgbWF0Y2hlcyAnYmxvZy5odG1sJyAoIzM3MzIpCiAgKiBSZW1vdmUgb2NjYXNpb25hbGx5LXByb2JsZW1hdGljIGBlbnN1cmVgIGluIGBMaXF1aWRSZW5kZXJlcmAgKCMzODExKQogICogRml4ZWQgYW4gdW5jbGVhciBjb2RlIGNvbW1lbnQgaW4gc2l0ZSB0ZW1wbGF0ZSBTQ1NTICgjMzgzNykKICAqIEZpeCByZWFkaW5nIG9mIGJpbmFyeSBtZXRhZGF0YSBmaWxlICgjMzg0NSkKICAqIFJlbW92ZSB2YXIgY29sbGlzaW9uIHdpdGggc2l0ZSB0ZW1wbGF0ZSBoZWFkZXIgbWVudSBpdGVyYXRpb24gdmFyaWFibGUgKCMzODM4KQogICogQ2hhbmdlIG5vbi1leGlzdGVudCBgaGxfbGluZW5vc2AgdG8gYGhsX2xpbmVzYCB0byBhbGxvdyBwYXNzdGhyb3VnaCBpbiBzYWZlIG1vZGUgKCMzNzg3KQogICogQWRkIG1pc3NpbmcgZmxhZyB0byBkaXNhYmxlIHRoZSB3YXRjaGVyICgjMzgyMCkKICAqIFVwZGF0ZSBDSSBndWlkZSB0byBpbmNsdWRlIG1vcmUgZGlyZWN0IGV4cGxhbmF0aW9ucyBvZiB0aGUgZmxvdyAoIzM4OTEpCiAgKiBTZXQgYGZ1dHVyZWAgdG8gYGZhbHNlYCBpbiB0aGUgZGVmYXVsdCBjb25maWcgKCMzODkyKQogICogZmlsdGVyczogYHdoZXJlYCBzaG91bGQgY29tcGFyZSBzdHJpbmdpZmllZCB2ZXJzaW9ucyBvZiBpbnB1dCAmIGNvbXBhcmF0b3IgKCMzOTM1KQogICogUmVhZCBidWlsZCBvcHRpb25zIGZvciBgamVreWxsIGNsZWFuYCBjb21tYW5kICgjMzgyOCkKICAqIEZpeCAjMzk3MDogVXNlIEdlbTo6VmVyc2lvbiB0byBjb21wYXJlIHZlcnNpb25zLCBub3QgYD5gLgogICogQWJvcnQgaWYgbm8gc3ViY29tbWFuZC4gRml4ZXMgY29uZnVzaW5nIG1lc3NhZ2UuICgjMzk5MikKICAqIFdob2xlLXBvc3QgZXhjZXJwdHMgc2hvdWxkIG1hdGNoIHRoZSBwb3N0IGNvbnRlbnQgKCM0MDA0KQogICogQ2hhbmdlIGRlZmF1bHQgZm9udCB3ZWlnaHQgdG8gNDAwIHRvIGZpeCBib2xkL3N0cm9uZyB0ZXh0IGlzc3VlcyAoIzQwNTApCiAgKiBEb2N1bWVudDogT25seSBhdXRvLWdlbmVyYXRlIHRoZSBleGNlcnB0IGlmIGl0J3Mgbm90IG92ZXJyaWRkZW4gKCM0MDYyKQogICogVXRpbHM6IGBkZWVwX21lcmdlX2hhc2hlc2Agc2hvdWxkIGFsc28gbWVyZ2UgYGRlZmF1bHRfcHJvY2AgKDQ1ZjY5YmIpCiAgKiBEZWZhdWx0czogY29tcGFyZSBwYXRocyBpbiBgYXBwbGllc19wYXRoP2AgYXMgYFN0cmluZ2BzIHRvIGF2b2lkIGNvbmZ1c2lvbiAoN2I4MWYwMCkKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIFJlbW92ZSBsb2FkZXIucmIgYW5kICJtb2Rlcm5pemUiIGBzY3JpcHQvdGVzdGAuICgjMzU3NCkKICAqIEltcHJvdmUgdGhlIGdyYW1tYXIgaW4gdGhlIGRvY3VtZW50YXRpb24gKCMzMjMzKQogICogVXBkYXRlIHRoZSBMSUNFTlNFIHRleHQgdG8gbWF0Y2ggdGhlIE1JVCBsaWNlbnNlIGV4YWN0bHkgKCMzMjUzKQogICogVXBkYXRlIHJha2UgdGFzayBgc2l0ZTpwdWJsaXNoYCB0byBmaXggbWlub3IgYnVncy4gKCMzMjU0KQogICogU3dpdGNoIHRvIHNoaWVsZHMuaW8gZm9yIHRoZSBSRUFETUUgYmFkZ2VzLiAoIzMyNTUpCiAgKiBVc2UgYEZpbGVMaXN0YCBpbnN0ZWFkIG9mIGBEaXIuZ2xvYmAgaW4gYHNpdGU6cHVibGlzaGAgcmFrZSB0YXNrICgjMzI2MSkKICAqIEZpeCB0ZXN0IHNjcmlwdCB0byBiZSBwbGF0Zm9ybS1pbmRlcGVuZGVudCAoIzMyNzkpCiAgKiBJbnN0ZWFkIG9mIHN5bWxpbmtpbmcgYC90bXBgLCBjcmVhdGUgYW5kIHN5bWxpbmsgYSBsb2NhbCBgdG1wYCBpbiB0aGUgdGVzdHMgKCMzMjU4KQogICogRml4IHNvbWUgc3BhY2luZyAoIzMzMTIpCiAgKiBGaXggY29tbWVudCB0eXBvIGluIGBsaWIvamVreWxsL2Zyb250bWF0dGVyX2RlZmF1bHRzLnJiYCAoIzMzMjIpCiAgKiBNb3ZlIGFsbCBgcmVnZW5lcmF0ZT9gIGNoZWNraW5nIHRvIGBSZWdlbmVyYXRvcmAgKCMzMzI2KQogICogRmFjdG9yIG91dCBhIGByZWFkX2RhdGFfZmlsZWAgY2FsbCB0byBrZWVwIHRoaW5ncyBjbGVhbiAoIzMzODApCiAgKiBQcm9vZiB0aGUgc2l0ZSB3aXRoIENpcmNsZUNJLiAoIzM0MjcpCiAgKiBVcGRhdGUgTElDRU5TRSB0byAyMDE1LiAoIzM0NzcpCiAgKiBVcGdyYWRlIHRlc3RzIHRvIHVzZSBNaW5pdGVzdCAoIzM0OTIpCiAgKiBSZW1vdmUgdHJhaWxpbmcgd2hpdGVzcGFjZSAoIzM0OTcpCiAgKiBVc2UgYGZpeHR1cmVfc2l0ZWAgZm9yIERvY3VtZW50IHRlc3RzICgjMzUxMSkKICAqIFJlbW92ZSBhZGFwdGVycyBkZXByZWNhdGlvbiB3YXJuaW5nICgjMzUyOSkKICAqIE1pbm9yIGZpeGVzIHRvIGB1cmwucmJgIHRvIGZvbGxvdyBHaXRIdWIgc3R5bGUgZ3VpZGUgKCMzNTQ0KQogICogTWlub3IgY2hhbmdlcyB0byByZXNvbHZlIGRlcHJlY2F0aW9uIHdhcm5pbmdzICgjMzU0NykKICAqIENvbnZlcnQgcmVtYWluaW5nIHRleHRpbGUgdGVzdCBkb2N1bWVudHMgdG8gbWFya2Rvd24gKCMzNTI4KQogICogTWlncmF0ZSB0aGUgdGVzdHMgdG8gdXNlIHJzcGVjLW1vY2tzICgjMzU1MikKICAqIFJlbW92ZSBgYWN0aXZlc3VwcG9ydGAgKCMzNjEyKQogICogQWRkZWQgdGVzdHMgZm9yIGBKZWt5bGw6U3RhdGljRmlsZWAgKCMzNjMzKQogICogRm9yY2UgbWluaXRlc3QgdmVyc2lvbiB0byA1LjUuMSAoIzM2NTcpCiAgKiBVcGRhdGUgdGhlIHdheSBjdWN1bWJlciBhY2Nlc3NlcyBNaW5pdGVzdCBhc3NlcnRpb25zICgjMzY3OCkKICAqIEFkZCBgc2NyaXB0L3J1Ynlwcm9mYCB0byBnZW5lcmF0ZSBjYWNoZWdyaW5kIGNhbGxncmFwaHMgKCMzNjkyKQogICogVXBncmFkZSBjdWN1bWJlciB0byAyLnggKCMzNzk1KQogICogVXBkYXRlIEtyYW1kb3duLiAoIzM4NTMpCiAgKiBVcGRhdGVkIHRoZSBzY3JpcHRzIHNoZWJhbmcgZm9yIHBvcnRhYmlsaXR5ICgjMzg1OCkKICAqIFVwZGF0ZSBKUnVieSB0ZXN0aW5nIHRvIDlLIChbM2FiMzg2Zl0oaHR0cHM6Ly9naXRodWIuY29tL2pla3lsbC9qZWt5bGwvY29tbWl0LzNhYjM4NmYxYjA5NmJlMjVhMjRmZTAzOGZjNzBmZDBmYjA4ZDU0NWQpKQogICogT3JnYW5pemUgZGVwZW5kZW5jaWVzIGludG8gZGV2IGFuZCB0ZXN0IGdyb3Vwcy4gKCMzODUyKQogICogQ29udHJpYnV0aW5nLm1kIHNob3VsZCByZWZlciB0byBgc2NyaXB0L2N1Y3VtYmVyYCAoIzM4OTQpCiAgKiBVcGRhdGUgY29udHJpYnV0aW5nIGRvY3VtZW50YXRpb24gdG8gcmVmbGVjdCB3b3JrZmxvdyB1cGRhdGVzICgjMzg5NSkKICAqIEFkZCBzY3JpcHQgdG8gdmVuZG9yIG1pbWUgdHlwZXMgKCMzOTMzKQogICogSWdub3JlIC5idW5kbGUgZGlyIGluIFNpbXBsZUNvdiAoIzQwMzMpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBBZGQgJ2luZm8nIGxhYmVscyB0byBjZXJ0YWluIG5vdGVzIGluIGNvbGxlY3Rpb25zIGRvY3MgKCMzNjAxKQogICogUmVtb3ZlIGV4dHJhIHNwYWNlcywgbWFrZSB0aGUgbGFzdCBzZW50ZW5jZSBsZXNzIGF3a3dhcmQgaW4gcGVybWFsaW5rIGRvY3MgKCMzNjAzKQogICogVXBkYXRlIHRoZSBwZXJtYWxpbmtzIGRvY3VtZW50YXRpb24gdG8gcmVmbGVjdCB0aGUgdXBkYXRlcyBmb3IgMy4wICgjMzU1NikKICAqIEFkZCBibG9nIHBvc3QgYW5ub3VuY2luZyBKZWt5bGwgSGVscCAoIzM1MjMpCiAgKiBBZGQgSmVreWxsIFRhbGsgdG8gSGVscCBwYWdlIG9uIHNpdGUgKCMzNTE4KQogICogQ2hhbmdlIEFqYXggcGFnaW5hdGlvbiByZXNvdXJjZSBsaW5rIHRvIHVzZSBIVFRQUyAoIzM1NzApCiAgKiBGaXhpbmcgdGhlIGRlZmF1bHQgaG9zdCBvbiBkb2NzICgjMzIyOSkKICAqIEFkZCBgamVreWxsLXRodW1ibmFpbC1maWx0ZXJgIHRvIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzI3OTApCiAgKiBBZGQgbGluayB0byAnQWRkaW5nIEFqYXggcGFnaW5hdGlvbiB0byBKZWt5bGwnIHRvIFJlc291cmNlcyBwYWdlICgjMzE4NikKICAqIEFkZCBhIFJlc291cmNlcyBsaW5rIHRvIHR1dG9yaWFsIG9uIGJ1aWxkaW5nIGR5bmFtaWMgbmF2YmFycyAoIzMxODUpCiAgKiBTZW1hbnRpYyBzdHJ1Y3R1cmUgaW1wcm92ZW1lbnRzIHRvIHRoZSBwb3N0IGFuZCBwYWdlIGxheW91dHMgKCMzMjUxKQogICogQWRkIG5ldyBBc2NpaURvYyBwbHVnaW4gdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zLiAoIzMyNzcpCiAgKiBTcGVjaWZ5IHRoYXQgYWxsIHRyYW5zZm9ybWFibGUgY29sbGVjdGlvbiBkb2N1bWVudHMgbXVzdCBjb250YWluIFlBTUwgZnJvbnQgbWF0dGVyICgjMzI3MSkKICAqIEFzc29ydGVkIGFjY2Vzc2liaWxpdHkgZml4ZXMgKCMzMjU2KQogICogVXBkYXRlIGNvbmZpZ3VyYXRpb24gZG9jcyB0byBtZW50aW9uIGBrZWVwX2ZpbGVzYCBmb3IgYGRlc3RpbmF0aW9uYCAoIzMyODgsICMzMjk2KQogICogQnJlYWsgd2hlbiB3ZSBzdWNjZXNzZnVsbHkgZ2VuZXJhdGUgbmF2IGxpbmsgdG8gc2F2ZSBDUFUgY3ljbGVzLiAoIzMyOTEpCiAgKiBVcGRhdGUgdXNhZ2UgZG9jcyB0byBtZW50aW9uIGBrZWVwX2ZpbGVzYCBhbmQgYSB3YXJuaW5nIGFib3V0IGBkZXN0aW5hdGlvbmAgY2xlYW5pbmcgKCMzMjk1KQogICogQWRkIGxvZ2ljIHRvIGF1dG9tYXRpY2FsbHkgZ2VuZXJhdGUgdGhlIGBuZXh0X3NlY3Rpb25gIGFuZCBgcHJldl9zZWN0aW9uYCBuYXZpZ2F0aW9uIGl0ZW1zICgjMzI5MikKICAqIFNvbWUgc21hbGwgZml4ZXMgZm9yIHRoZSBQbHVnaW5zIFRPQy4gKCMzMzA2KQogICogQWRkZWQgdmVyc2lvbmluZyBjb21tZW50IHRvIGNvbmZpZ3VyYXRpb24gZmlsZSAoIzMzMTQpCiAgKiBBZGQgYGpla3lsbC1taW5pZmllcmAgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMzMzMykKICAqIEFkZCBibG9nIHBvc3QgYWJvdXQgdGhlIEpla3lsbCBtZWV0LXVwICgjMzMzMikKICAqIFVzZSBgaGlnaGxpZ2h0YCBMaXF1aWQgdGFnIGluc3RlYWQgb2YgdGhlIGZvdXItc3BhY2UgdGFicyBmb3IgY29kZSAoIzMzMzYpCiAgKiAzLjAuMC5iZXRhMSByZWxlYXNlIHBvc3QgKCMzMzQ2KQogICogQWRkIGB0d2FgIHRvIHRoZSBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMzMzg0KQogICogUmVtb3ZlIGV4dHJhIHNwYWNlcyAoIzMzODgpCiAgKiBGaXggc21hbGwgZ3JhbW1hciBlcnJvcnMgb24gYSBjb3VwbGUgcGFnZXMgKCMzMzk2KQogICogRml4IHR5cG8gb24gVGVtcGxhdGVzIGRvY3MgcGFnZSAoIzM0MjApCiAgKiBzL3RocmVlL2ZvdXIgZm9yIHBsdWdpbiB0eXBlIGxpc3QgKCMzNDI0KQogICogUmVsZWFzZSBqZWt5bGxyYi5jb20gYXMgYSBsb2NhbGx5LWNvbXBpbGVkIHNpdGUuICgjMzQyNikKICAqIEFkZCBhIGpla3lsbHJiLmNvbS9oZWxwIHBhZ2Ugd2hpY2ggZWx1Y2lkYXRlcyBwbGFjZXMgZnJvbSB3aGljaCB0byBnZXQgaGVscCAoIzM0MjgpCiAgKiBSZW1vdmUgZXh0cmFuZW91cyBkYXNoIG9uIFBsdWdpbnMgZG9jIHBhZ2Ugd2hpY2ggY2F1c2VkIGEgZm9ybWF0dGluZyBlcnJvciAoIzM0MzEpCiAgKiBGaXggYnJva2VuIGxpbmsgdG8gSm9yZGFuIFRob3JucXVlc3QncyB3ZWJzaXRlLiAoIzM0MzgpCiAgKiBDaGFuZ2UgdGhlIGxpbmsgdG8gYW4gZXh0ZW5zaW9uICgjMzQ1NykKICAqIEZpeCBUd2l0dGVyIGxpbmsgb24gdGhlIGhlbHAgcGFnZSAoIzM0NjYpCiAgKiBGaXggd29yZGluZyBpbiBjb2RlIHNuaXBwZXQgaGlnaGxpZ2h0aW5nIHNlY3Rpb24gKCMzNDc1KQogICogQWRkIGEgYC9gIHRvIGBwYWdpbmF0ZV9wYXRoYCBpbiB0aGUgUGFnaW5hdGlvbiBkb2N1bWVudGF0aW9uICgjMzQ3OSkKICAqIEFkZCBhIGxpbmsgb24gYWxsIHRoZSBkb2NzIHBhZ2VzIHRvICJJbXByb3ZlIHRoaXMgcGFnZSIuICgjMzUxMCkKICAqIEFkZCBqZWt5bGwtYXV0by1pbWFnZSBnZW5lcmF0b3IgdG8gdGhlIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzM0ODkpCiAgKiBSZXBsYWNlIGxpbmsgdG8gdGhlIHByb3Bvc2VkIGBwaWN0dXJlYCBlbGVtZW50IHNwZWMgKCMzNTMwKQogICogQWRkIGZyb250bWF0dGVyIGRhdGUgZm9ybWF0dGluZyBpbmZvcm1hdGlvbiAoIzM0NjkpCiAgKiBJbXByb3ZlIGNvbnNpc3RlbmN5IGFuZCBjbGFyaXR5IG9mIHBsdWdpbnMgb3B0aW9ucyBub3RlICgjMzU0NikKICAqIEFkZCBwZXJtYWxpbmsgd2FybmluZyB0byBwYWdpbmF0aW9uIGRvY3MgKCMzNTUxKQogICogRml4IGdyYW1tYXIgaW4gQ29sbGVjdGlvbnMgZG9jcyBBUEkgc3RhYmlsaXR5IHdhcm5pbmcgKCMzNTYwKQogICogUmVzdHJ1Y3R1cmUgYGV4Y2VycHRfc2VwYXJhdG9yYCBkb2N1bWVudGF0aW9uIGZvciBjbGFyaXR5ICgjMzU1MCkKICAqIEZpeCBhY2NpZGVudGFsIGxpbmUgYnJlYWsgaW4gY29sbGVjdGlvbnMgZG9jcyAoIzM1ODUpCiAgKiBBZGQgaW5mb3JtYXRpb24gYWJvdXQgdGhlIGAuamVreWxsLW1ldGFkYXRhYCBmaWxlICgjMzU5NykKICAqIERvY3VtZW50IGFkZGl0aW9uIG9mIHZhcmlhYmxlIHBhcmFtZXRlcnMgdG8gYW4gaW5jbHVkZSAoIzM1ODEpCiAgKiBBZGQgYGpla3lsbC1maWxlc2AgdG8gdGhlIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucy4gKCMzNTg2KQogICogRGVmaW5lIHRoZSBgaW5zdGFsbGAgc3RlcCBpbiB0aGUgQ0kgZXhhbXBsZSBgLnRyYXZpcy55bWxgICgjMzYyMikKICAqIEV4cGFuZCBjb2xsZWN0aW9ucyBkb2N1bWVudGF0aW9uLiAoIzM2MzgpCiAgKiBBZGQgdGhlICJ3YXJuaW5nIiBub3RlIGxhYmVsIHRvIGV4Y2x1ZGluZyBgdmVuZG9yYCBpbiB0aGUgQ0kgZG9jcyBwYWdlICgjMzYyMykKICAqIFVwZ3JhZGUgcGllY2VzIG9mIHRoZSBVZ3JhZGluZyBndWlkZSBmb3IgSmVreWxsIDMgKCMzNjA3KQogICogU2hvd2luZyBob3cgdG8gYWNjZXNzIHNwZWNpZmljIGRhdGEgaXRlbXMgKCMzNDY4KQogICogQ2xhcmlmeSBwYWdpbmF0aW9uIHdvcmtzIGZyb20gd2l0aGluIEhUTUwgZmlsZXMgKCMzNDY3KQogICogQWRkIG5vdGUgdG8gYGV4Y2VycHRfc2VwYXJhdG9yYCBkb2N1bWVudGF0aW9uIHRoYXQgaXQgY2FuIGJlIHNldCBnbG9iYWxseSAoIzM2NjcpCiAgKiBGaXggc29tZSBuYW1lcyBvbiBUcm91Ymxlc2hvb3RpbmcgcGFnZSAoIzM2ODMpCiAgKiBBZGQgYHJlbW90ZV9maWxlX2NvbnRlbnRgIHRhZyBwbHVnaW4gdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMzY5MSkKICAqIFVwZGF0ZSB0aGUgUmVkY2FycGV0IHZlcnNpb24gb24gdGhlIENvbmZpZ3VyYXRpb24gcGFnZS4gKCMzNzQzKQogICogVXBkYXRlIHRoZSBsaW5rIGluIHRoZSB3ZWxjb21lIHBvc3QgdG8gcG9pbnQgdG8gSmVreWxsIFRhbGsgKCMzNzQ1KQogICogVXBkYXRlIGxpbmsgZm9yIG5hdmJhcnMgd2l0aCBkYXRhIGF0dHJpYnV0ZXMgdHV0b3JpYWwgKCMzNzI4KQogICogQWRkIGBqZWt5bGwtYXNjaWluZW1hYCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMzNzUwKQogICogVXBkYXRlIHBhZ2luYXRpb24gZXhhbXBsZSB0byBiZSBhZ25vc3RpYyB0byBmaXJzdCBwYWdpbmF0aW9uIGRpciAoIzM3NjMpCiAgKiBEZXRhaWxlZCBpbnN0cnVjdGlvbnMgZm9yIHJzeW5jIGRlcGxveW1lbnQgbWV0aG9kICgjMzg0OCkKICAqIEFkZCBKZWt5bGwgUG9ydGZvbGlvIEdlbmVyYXRvciB0byBsaXN0IG9mIHBsdWdpbnMgKCMzODgzKQogICogQWRkIGBzaXRlLmh0bWxfZmlsZXNgIHRvIHZhcmlhYmxlcyBkb2NzICgjMzg4MCkKICAqIEFkZCBTdGF0aWMgUHVibGlzaGVyIHRvb2wgdG8gbGlzdCBvZiBkZXBsb3ltZW50IG1ldGhvZHMgKCMzODY1KQogICogRml4IGEgZmV3IHR5cG9zLiAoIzM4OTcpCiAgKiBBZGQgYGpla3lsbC15b3V0dWJlYCB0byB0aGUgbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMzkzMSkKICAqIEFkZCBWaWV3cyBSb3V0ZXIgcGx1Z2luICgjMzk1MCkKICAqIFVwZGF0ZSBpbnN0YWxsIGRvY3MgKENvcmUgZGVwZW5kZW5jaWVzLCBXaW5kb3dzIHJlcXMsIGV0YykgKCMzNzY5KQogICogVXNlIEpla3lsbCBGZWVkIGZvciBqZWt5bGxyYi5jb20gKCMzNzM2KQogICogQWRkIGpla3lsbC11bWxhdXRzIHRvIHBsdWdpbnMubWQgKCQzOTY2KQogICogVHJvdWJsZXNob290aW5nOiBmaXggYnJva2VuIGxpbmssIGFkZCBvdGhlciBtYWMtc3BlY2lmaWMgaW5mbyAoIzM5NjgpCiAgKiBBZGQgYSBuZXcgc2l0ZSBmb3IgbGVhcm5pbmcgcHVycG9zZXMgKCMzOTE3KQogICogQWRkZWQgZG9jdW1lbnRhdGlvbiBmb3IgSmVreWxsIGVudmlyb25tZW50IHZhcmlhYmxlcyAoIzM5ODkpCiAgKiBGaXggYnJva2VuIGNvbmZpZ3VyYXRpb24gZG9jdW1lbnRhdGlvbiBwYWdlICgjMzk5NCkKICAqIEFkZCB0cm91Ymxlc2hvb3RpbmcgZG9jcyBmb3IgaW5zdGFsbGluZyBvbiBFbCBDYXBpdGFuICgjMzk5OSkKICAqIEFkZCBMYXp5IFR3ZWV0IEVtYmVkZGluZyB0byB0aGUgbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjNDAxNSkKICAqIEFkZCBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGZvciAyIG9mIDMgb3B0aW9ucyBmb3IgcGx1Z2lucyAoIzQwMTMpCiAgKiBBZGQgYWx0ZXJuYXRpdmUgamVreWxsIGdlbSBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zICgjNDAxOCkKICAqIEZpeCBhIGZldyB0eXBvcyBhbmQgZm9ybWF0dGluZyBwcm9ibGVtcy4gKCM0MDIyKQogICogRml4IHByZXR0eSBwZXJtYWxpbmsgZXhhbXBsZSAoIzQwMjkpCiAgKiBOb3RlIHRoYXQgYF9jb25maWcueW1sYCBpcyBub3QgcmVsb2FkZWQgZHVyaW5nIHJlZ2VuZXJhdGlvbiAoIzQwMzQpCiAgKiBBcHBseSBjb2RlIGJsb2NrIGZpZ3VyZSBzeW50YXggdG8gYmxvY2tzIGluIENPTlRSSUJVVElORyAoIzQwNDYpCiAgKiBBZGQgamVreWxsLXNtYXJ0aWZ5IHRvIHRoZSBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMzNTcyKQoKIyMgMi41LjMgLyAyMDE0LTEyLTIyCgojIyMgQnVnIEZpeGVzCgogICogV2hlbiBjaGVja2luZyBhIE1hcmtkb3duIGV4dG5hbWUsIGluY2x1ZGUgcG9zaXRpb24gb2YgdGhlIGAuYCAoIzMxNDcpCiAgKiBGaXggYGpzb25pZnlgIExpcXVpZCBmaWx0ZXIgaGFuZGxpbmcgb2YgYm9vbGVhbiB2YWx1ZXMgKCMzMTU0KQogICogQWRkIGNvbW1hIHRvIHZhbHVlIG9mIGB2aWV3cG9ydGAgbWV0YSB0YWcgKCMzMTcwKQogICogU2V0IHRoZSBsaW5rIHR5cGUgZm9yIHRoZSBSU1MgZmVlZCB0byBgYXBwbGljYXRpb24vcnNzK3htbGAgKCMzMTc2KQogICogUmVmYWN0b3IgYCNhc19saXF1aWRgICgjMzE1OCkKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIEV4Y2x1ZGUgYnVpbHQtaW4gYnVuZGxlcyBmcm9tIGJlaW5nIGFkZGVkIHRvIGNvdmVyYWdlIHJlcG9ydCAoIzMxODApCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBBZGQgYEBhbGZyZWR4aW5nYCB0byB0aGUgYEBqZWt5bGwvY29yZWAgdGVhbS4gOnRhZGE6ICgjMzIxOCkKICAqIERvY3VtZW50IHRoZSBgLXFgIG9wdGlvbiBmb3IgdGhlIGBidWlsZGAgYW5kIGBzZXJ2ZWAgY29tbWFuZHMgKCMzMTQ5KQogICogRml4IHNvbWUgbWlub3IgdHlwb3MvZmxvdyBmaXhlcyBpbiBkb2N1bWVudGF0aW9uIHdlYnNpdGUgY29udGVudCAoIzMxNjUpCiAgKiBBZGQgYGtlZXBfZmlsZXNgIHRvIGNvbmZpZ3VyYXRpb24gZG9jdW1lbnRhdGlvbiAoIzMxNjIpCiAgKiBSZXBlYXQgd2FybmluZyBhYm91dCBjbGVhbmluZyBvZiB0aGUgYGRlc3RpbmF0aW9uYCBkaXJlY3RvcnkgKCMzMTYxKQogICogQWRkIGpla3lsbC01MDBweC1lbWJlZCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMzMTYzKQogICogU2ltcGxpZmllZCBwbGF0Zm9ybSBkZXRlY3Rpb24gaW4gR2VtZmlsZSBleGFtcGxlIGZvciBXaW5kb3dzICgjMzE3NykKICAqIEFkZCB0aGUgYGpla3lsbC1qYWxhbGlgIHBsdWdpbiBhZGRlZCB0byB0aGUgbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zLiAoIzMxOTgpCiAgKiBBZGQgVGFibGUgb2YgQ29udGVudHMgdG8gVHJvdWJsZXNob290aW5nIHBhZ2UgKCMzMTk2KQogICogQWRkIGBpbmxpbmVfaGlnaGxpZ2h0YCBwbHVnaW4gdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMzIxMikKICAqIEFkZCBgamVreWxsLW1lcm1haWRgIHBsdWdpbiB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMzMjIyKQoKIyMgMi41LjIgLyAyMDE0LTExLTE3CgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogYHBvc3RfdXJsYCBzaG91bGQgbWF0Y2ggYHBvc3QubmFtZWAgaW5zdGVhZCBvZiBzbHVncyBhbmQgZGF0ZXMgKCMzMDU4KQoKIyMjIEJ1ZyBGaXhlcwoKICAqIEZpeCBidW5kbGUgcmVxdWlyZSBmb3IgYDpqZWt5bGxfcGx1Z2luc2AgKCMzMTE5KQogICogUmVtb3ZlIGR1cGxpY2F0ZSByZWdleHAgcGhyYXNlOiBgXlxBYCAoIzMwODkpCiAgKiBSZW1vdmUgZHVwbGljYXRlIGBDb252ZXJzaW9uIGVycm9yOmAgbWVzc2FnZSBpbiBgQ29udmVydGlibGVgICgjMzA4OCkKICAqIFByaW50IGZ1bGwgY29udmVyc2lvbiBlcnJvciBtZXNzYWdlIGluIGBSZW5kZXJlciNjb252ZXJ0YCAoIzMwOTApCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBDaGFuZ2UgdmFyaWFibGUgbmFtZXMgaW4gR29vZ2xlIEFuYWx5dGljcyBzY3JpcHQgKCMzMDkzKQogICogTWVudGlvbiBDU1YgZmlsZXMgaW4gdGhlIGRvY3MgZm9yIGRhdGEgZmlsZXMgKCMzMTAxKQogICogQWRkIHRyYWlsaW5nIHNsYXNoIHRvIGBwYWdpbmF0ZV9wYXRoYCBleGFtcGxlLiAoIzMwOTEpCiAgKiBHZXQgcmlkIG9mIG5vaWZuaW9mIChgZXhjZXJwdF9zZXBhcmF0b3JgKSAoIzMwOTQpCiAgKiBTYXNzIGltcHJvdmVtZW50cywgYXJvdW5kIG5lc3RpbmcgbW9zdGx5LiAoIzMxMjMpCiAgKiBBZGQgd2VibWVudGlvbnMuaW8gcGx1Z2luIHRvIHRoZSBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMzMTI3KQogICogQWRkIFNhc3MgbWl4aW5zIGFuZCB1c2UgdGhlbS4gKCMyOTA0KQogICogU2xpZ2h0bHkgY29tcHJlc3MgamVreWxsLXN0aWNrZXIuanBnLiAoIzMxMzMpCiAgKiBVcGRhdGUgZ3JpZGlzbSBhbmQgc2VwYXJhdGUgb3V0IHJlbGF0ZWQgYnV0IGN1c3RvbSBzdHlsZXMuICgjMzEzMikKICAqIEFkZCByZW1vdGUtaW5jbHVkZSBwbHVnaW4gdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMzEzNikKCiMjIDIuNS4xIC8gMjAxNC0xMS0wOQoKIyMjIEJ1ZyBGaXhlcwoKICAqIEZpeCBwYXRoIHNhbml0YXRpb24gYnVnIHJlbGF0ZWQgdG8gV2luZG93cyBkcml2ZSBuYW1lcyAoIzMwNzcpCgojIyMgRGV2ZWxvcG1lbnQgRml4ZXMKCiAgKiBBZGQgZGV2ZWxvcG1lbnQgdGltZSBkZXBlbmRlbmNpZXMgb24gbWluaXRlc3QgYW5kIHRlc3QtdW5pdCB0byBnZW1zcGVjIGZvciBjeWd3aW4gKCMzMDY0KQogICogVXNlIFRyYXZpcydzIGJ1aWx0LWluIGNhY2hpbmcuICgjMzA3NSkKCiMjIDIuNS4wIC8gMjAxNC0xMS0wNgoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFJlcXVpcmUgZ2VtcyBpbiBgOmpla3lsbF9wbHVnaW5zYCBHZW1maWxlIGdyb3VwIHVubGVzcyBgSkVLWUxMX05PX0JVTkRMRVJfUkVRVUlSRWAgaXMgc3BlY2lmaWVkIGluIHRoZSBlbnZpcm9ubWVudC4gKCMyODY1KQogICogQ2VudHJhbGl6ZSBwYXRoIHNhbml0YXRpb24gaW4gdGhlIGBTaXRlYCBvYmplY3QgKCMyODgyKQogICogQWxsb3cgcGxhY2Vob2xkZXJzIGluIHBlcm1hbGlua3MgKCMzMDMxKQogICogQWxsb3cgdXNlcnMgdG8gc3BlY2lmeSB0aGUgbG9nIGxldmVsIHZpYSBgSkVLWUxMX0xPR19MRVZFTGAuICgjMzA2NykKICAqIEZhbmN5IEluZGV4aW5nIHdpdGggV0VCcmljayAoIzMwMTgpCiAgKiBBbGxvdyBFbnVtZXJhYmxlcyB0byBiZSB1c2VkIHdpdGggYHdoZXJlYCBmaWx0ZXIuICgjMjk4NikKICAqIE1ldGEgZGVzY3JpcHRpb25zIGluIHRoZSBzaXRlIHRlbXBsYXRlIG5vdyB1c2UgYHBhZ2UuZXhjZXJwdGAgaWYgaXQncyBhdmFpbGFibGUgKCMyOTY0KQogICogQ2hhbmdlIGluZGVudGF0aW9uIGluIGBoZWFkLmh0bWxgIG9mIHNpdGUgdGVtcGxhdGUgdG8gMiBzcGFjZXMgZnJvbSA0ICgjMjk3MykKICAqIFVzZSBhIGAkY29udGVudC13aWR0aGAgdmFyaWFibGUgaW5zdGVhZCBvZiBhIGZpeGVkIHZhbHVlIGluIHRoZSBzaXRlIHRlbXBsYXRlIENTUyAoIzI5NzIpCiAgKiBTdHJpcCBuZXdsaW5lcyBpbiBzaXRlIHRlbXBsYXRlIGA8bWV0YT5gIGRlc2NyaXB0aW9uLiAoIzI5ODIpCiAgKiBBZGQgbGluayB0byBhdG9tIGZlZWQgaW4gYGhlYWRgIG9mIHNpdGUgdGVtcGxhdGUgZmlsZXMgKCMyOTk2KQogICogUGVyZm9ybWFuY2Ugb3B0aW1pemF0aW9ucyAoIzI5OTQpCiAgKiBVc2UgYEhhc2gjZWFjaF9rZXlgIGluc3RlYWQgb2YgYEhhc2gja2V5cy5lYWNoYCB0byBzcGVlZCB1cCBpdGVyYXRpb24gb3ZlciBoYXNoIGtleXMuICgjMzAxNykKICAqIEZ1cnRoZXIgbWlub3IgcGVyZm9ybWFuY2UgZW5oYW5jZW1lbnRzLiAoIzMwMjIpCiAgKiBBZGQgJ2InIGFuZCAncycgYWxpYXNlcyBmb3IgYnVpbGQgYW5kIHNlcnZlLCByZXNwZWN0aXZlbHkgKCMzMDY1KQoKIyMjIEJ1ZyBGaXhlcwoKICAqIEZpeCBSb3VnZSdzIFJlZENhcnBldCBwbHVnaW4gaW50ZXJmYWNlIGludGVncmF0aW9uICgjMjk1MSkKICAqIFJlbW92ZSBgLS13YXRjaGAgZnJvbSB0aGUgc2l0ZSB0ZW1wbGF0ZSBibG9nIHBvc3Qgc2luY2UgaXQgZGVmYXVsdHMgdG8gd2F0Y2hpbmcgaW4gaW4gMi40LjAgKCMyOTIyKQogICogRml4IGNvZGUgZm9yIG1lZGlhIHF1ZXJ5IG1peGluIGluIHNpdGUgdGVtcGxhdGUgKCMyOTQ2KQogICogQWxsb3cgcG9zdCBVUkwncyB0byBoYXZlIGAuaHRtYCBleHRlbnNpb25zICgjMjkyNSkKICAqIGBVdGlscy5zbHVnaWZ5YDogRG9uJ3QgY3JlYXRlIG5ldyBvYmplY3RzIHdoZW4gZ3N1YmJpbmcgKCMyOTk3KQogICogVGhlIGpzb25pZnkgZmlsdGVyIHNob3VsZCBkZWVwLWNvbnZlcnQgdG8gTGlxdWlkIHdoZW4gZ2l2ZW4gYW4gQXJyYXkuICgjMzAzMikKICAqIEFwcGx5IGBqc29uaWZ5YCBmaWx0ZXIgdG8gSGFzaGVzIGRlZXBseSBhbmQgZWZmZWN0aXZlbHkgKCMzMDYzKQogICogVXNlIGAxMjcuMC4wLjFgIGFzIGRlZmF1bHQgaG9zdCBpbnN0ZWFkIG9mIGAwLjAuMC4wYCAoIzMwNTMpCiAgKiBJbiB0aGUgY2FzZSB0aGF0IGEgR2VtZmlsZSBkb2VzIG5vdCBleGlzdCwgZW5zdXJlIEpla3lsbCBkb2Vzbid0IGZhaWwgb24gcmVxdWlyaW5nIHRoZSBHZW1maWxlIGdyb3VwICgjMzA2NikKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIEZpeCBhIHR5cG8gaW4gdGhlIGRvYyBibG9jayBmb3IgYEpla3lsbDo6VVJMLmVzY2FwZV9wYXRoYCAoIzMwNTIpCiAgKiBBZGQgaW50ZWdyYXRpb24gdGVzdCBmb3IgYGpla3lsbCBuZXcgLS1ibGFua2AgaW4gVGVzdFVuaXQgKCMyOTEzKQogICogQWRkIHVuaXQgdGVzdCBmb3IgYGpla3lsbCBuZXcgLS1mb3JjZWAgbG9naWMgKCMyOTI5KQogICogVXBkYXRlIG91dGRhdGVkIGNvbW1lbnQgZm9yIGBDb252ZXJ0aWJsZSN0cmFuc2Zvcm1gICgjMjk1NykKICAqIEFkZCBIYWtpcmkgYmFkZ2UgdG8gUkVBRE1FLiAoIzI5NTMpCiAgKiBBZGQgc29tZSBzaW1wbGUgYmVuY2htYXJraW5nIHRvb2xzLiAoIzI5OTMpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBgTk9LT0dJUklfVVNFX1NZU1RFTV9MSUJSQVJJRVM9dHJ1ZWAgKipkZWNyZWFzZXMqKiBpbnN0YWxsYXRpb24gdGltZS4gKCMzMDQwKQogICogQWRkIEZvcm1LZWVwIHRvIHJlc291cmNlcyBhcyBKZWt5bGwgZm9ybSBiYWNrZW5kICgjMzAxMCkKICAqIEZpeGluZyBhIG1pc3Rha2UgaW4gdGhlIG5hbWUgb2YgdGhlIG5ldyBMaXF1aWQgdGFnICgjMjk2OSkKICAqIFVwZGF0ZSBGb250IEF3ZXNvbWUgdG8gdjQuMi4wLiAoIzI4OTgpCiAgKiBGaXggbGluayB0byAjMjg5NSBpbiAyLjQuMCByZWxlYXNlIHBvc3QuICgjMjg5OSkKICAqIEFkZCBCaWcgRm9vdG5vdGVzIGZvciBLcmFtZG93biBwbHVnaW4gdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjkxNikKICAqIFJlbW92ZSB3YXJuaW5nIHJlZ2FyZGluZyBHSFAgdXNlIG9mIHNpbmd1bGFyIHR5cGVzIGZvciBmcm9udCBtYXR0ZXIgZGVmYXVsdHMgKCMyOTE5KQogICogRml4IHF1b3RlIGNoYXJhY3RlciB0eXBvIGluIHNpdGUgZG9jdW1lbnRhdGlvbiBmb3IgdGVtcGxhdGVzICgjMjkxNykKICAqIFBvaW50IExpcXVpZCBsaW5rcyB0byBMaXF1aWTigJlzIEdpdEh1YiB3aWtpICgjMjg4NykKICAqIEFkZCBIVFRQIEJhc2ljIEF1dGggKC5odGFjY2VzcykgcGx1Z2luIHRvIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzI5MzEpCiAgKiAoTWlub3IpIEdyYW1tYXIgJiBgX2NvbmZpZy55bWxgIGZpbGVuYW1lIGZpeGVzICgjMjkxMSkKICAqIEFkZGVkIGBtYXRobWwucmJgIHRvIHRoZSBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMuICgjMjkzNykKICAqIEFkZCBgLS1mb3JjZV9wb2xsaW5nYCB0byB0aGUgbGlzdCBvZiBjb25maWd1cmF0aW9uIG9wdGlvbnMgKCMyOTQzKQogICogRXNjYXBlIHVuaWNvZGUgY2hhcmFjdGVycyBpbiBzaXRlIENTUyAoIzI5MDYpCiAgKiBBZGQgbm90ZSBhYm91dCB1c2luZyB0aGUgZ2l0aHViLXBhZ2VzIGdlbSB2aWEgcGFnZXMuZ2l0aHViLmNvbS92ZXJzaW9ucy5qc29uICgjMjkzOSkKICAqIFVwZGF0ZSB1c2FnZSBkb2N1bWVudGF0aW9uIHRvIHJlZmxlY3QgMi40IGF1dG8tZW5hYmxpbmcgb2YgYC0td2F0Y2hgLiAoIzI5NTQpCiAgKiBBZGQgYC0tc2tpcC1pbml0aWFsLWJ1aWxkYCB0byBjb25maWd1cmF0aW9uIGRvY3MgKCMyOTQ5KQogICogRml4IGEgbWlub3IgdHlwbyBpbiBUZW1wbGF0ZXMgZG9jcyBwYWdlICgjMjk1OSkKICAqIEFkZCBhIGRpdGFhLWRpdGFhIHBsdWdpbiB1bmRlciBPdGhlciBzZWN0aW9uIG9uIHRoZSBQbHVnaW5zIHBhZ2UgKCMyOTY3KQogICogQWRkIGBidWlsZC9zZXJ2ZSAtVmAgb3B0aW9uIHRvIGNvbmZpZ3VyYXRpb24gZG9jdW1lbnRhdGlvbiAoIzI5NDgpCiAgKiBBZGQgJ0pla3lsbCBUd2l0dGVyIFBsdWdpbicgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjk3OSkKICAqIERvY3M6IFVwZGF0ZSBub3JtYWxpemUuY3NzIHRvIHYzLjAuMi4gKCMyOTgxKQogICogRml4IHR5cG8gaW4gQ29udGludW91cyBJbnRlZ3JhdGlvbiBkb2N1bWVudGF0aW9uICgjMjk4NCkKICAqIENsYXJpZnkgYmVoYXZpb3Igb2YgYDpjYXRlZ29yaWVzYCBpbiBwZXJtYWxpbmtzICgjMzAxMSkKCiMjIDIuNC4wIC8gMjAxNC0wOS0wOQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFN1cHBvcnQgYSBuZXcgYHJlbGF0aXZlX2luY2x1ZGVgIHRhZyAoIzI4NzApCiAgKiBBdXRvLWVuYWJsZSB3YXRjaCBvbiAnc2VydmUnICgjMjg1OCkKICAqIFJlbmRlciBMaXF1aWQgaW4gQ29mZmVlU2NyaXB0IGZpbGVzICgjMjgzMCkKICAqIEFycmF5IExpcXVpZCBmaWx0ZXJzOiBgcHVzaGAsIGBwb3BgLCBgdW5zaGlmdGAsIGBzaGlmdGAgKCMyODk1KQogICogQWRkIGA6dGl0bGVgIHRvIGNvbGxlY3Rpb24gVVJMIHRlbXBsYXRlIGZpbGxlcnMgKCMyODY0KQogICogQWRkIHN1cHBvcnQgZm9yIENTViBmaWxlcyBpbiB0aGUgYF9kYXRhYCBkaXJlY3RvcnkgKCMyNzYxKQogICogQWRkIHRoZSBgbmFtZWAgdmFyaWFibGUgdG8gY29sbGVjdGlvbiBwZXJtYWxpbmtzICgjMjc5OSkKICAqIEFkZCBgaW5zcGVjdGAgbGlxdWlkIGZpbHRlci4gKCMyODY3KQogICogQWRkIGEgYHNsdWdpZnlgIExpcXVpZCBmaWx0ZXIgKCMyODgwKQoKIyMjIEJ1ZyBGaXhlcwoKICAqIFVzZSBgSmVreWxsLnNhbml0aXplZF9wYXRoYCB3aGVuIGFkZGluZyBzdGF0aWMgZmlsZXMgdG8gQ29sbGVjdGlvbnMgKCMyODQ5KQogICogRml4IGVuY29kaW5nIG9mIGBtYWluLnNjc3NgIGluIHNpdGUgdGVtcGxhdGUgKCMyNzcxKQogICogRml4IG9yaWVudGF0aW9uIGJ1Z3MgaW4gZGVmYXVsdCBzaXRlIHRlbXBsYXRlICgjMjg2MikKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIFVwZGF0ZSBzaW1wbGVjb3YgZ2VtIHRvIDAuOSAoIzI3NDgpCiAgKiBSZW1vdmUgYGRvY3MvYCBkaXIgKCMyNzY4KQogICogYWRkIGNsYXNzIGA8PCBzZWxmYCBpZGlvbSB0byBgTmV3YCBjb21tYW5kICgjMjgxNykKICAqIEFsbG93IFRyYXZpcyB0byAncGFyYWxsZWxpemUnIG91ciB0ZXN0cyAoIzI4NTkpCiAgKiBGaXggdGVzdCBmb3IgTGlxdWlkIHJlbmRlcmluZyBpbiBTYXNzICgjMjg1NikKICAqIEZpeGluZyAidmVydHljYWwiIHR5cG8gaW4gc2l0ZSB0ZW1wbGF0ZSdzIGBfYmFzZS5zY3NzYCAoIzI4ODkpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBEb2N1bWVudCB0aGUgYG5hbWVgIHZhcmlhYmxlIGZvciBjb2xsZWN0aW9uIHBlcm1hbGlua3MgKCMyODI5KQogICogQWRkcyBpbmZvIGFib3V0IGluc3RhbGxpbmcgamVreWxsIGluIGN1cnJlbnQgZGlyICgjMjgzOSkKICAqIFJlbW92ZSBkZXByZWNhdGVkIGBqZWt5bGwtcHJvamVjdGxpc3RgIHBsdWdpbiBmcm9tIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzI3NDIpCiAgKiBSZW1vdmUgdGFnIHBsdWdpbnMgdGhhdCBhcmUgYnVpbHQgaW4gdG8gSmVreWxsICgjMjc1MSkKICAqIEFkZCBgbWFya2Rvd24td3JpdGVyYCBwYWNrYWdlIGZvciBBdG9tIEVkaXRvciB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMyNzYzKQogICogRml4IHR5cG8gaW4gc2l0ZSBkb2N1bWVudGF0aW9uIGZvciBjb2xsZWN0aW9ucyAoIzI3NjQpCiAgKiBGaXggbWlub3IgdHlwbyBvbiBwbHVnaW5zIGRvY3MgcGFnZSAoIzI3NjUpCiAgKiBSZXBsYWNlIG1hcmtkb3duIHdpdGggSFRNTCBpbiBgc2Fzc19kaXJgIG5vdGUgb24gYXNzZXRzIHBhZ2UgKCMyNzkxKQogICogRml4ZWQgImJlbGxvdyIgdHlwbyBpbiBkYXRhZmlsZXMgZG9jcyAoIzI4NzkpCiAgKiBGaXggY29kZS9tYXJrZG93biBpc3N1ZSBpbiBkb2N1bWVudGF0aW9uIGZvciB2YXJpYWJsZXMgKCMyODc3KQogICogUmVtb3ZlIEdvb2QgSW5jbHVkZSB0aGlyZC1wYXJ0eSBwbHVnaW4gZnJvbSBwbHVnaW5zIHBhZ2UgKCMyODgxKQogICogQWRkIHNvbWUgbW9yZSBkb2NzIG9uIGBpbmNsdWRlX3JlbGF0aXZlYCAoIzI4ODQpCgojIyAyLjMuMCAvIDIwMTQtMDgtMTAKCiMjIyBNaW5vciBFbmhhbmNlbWVudHMKCiAgKiBBbGxvdyBDb252ZXJ0aWJsZXMgdG8gYmUgY29udmVydGVkIGJ5ID49IDEgY29udmVydGVycyAoIzI3MDQpCiAgKiBBbGxvdyBTYXNzIGZpbGVzIHRvIGJlIHJlbmRlcmVkIGluIExpcXVpZCwgYnV0IG5ldmVyIHBsYWNlIHRoZW0gaW4gbGF5b3V0cy4gKCMyNzMzKQogICogQWRkIGBqZWt5bGwgaGVscGAgY29tbWFuZCAoIzI3MDcpCiAgKiBVc2UgYC5zY3NzYCBmb3IgYHNpdGVfdGVtcGxhdGVgIHN0eWxlcy4gKCMyNjY3KQogICogRG9uJ3QgcmVxdWlyZSB0aGUgYHNjb3BlYCBrZXkgaW4gZnJvbnQgbWF0dGVyIGRlZmF1bHRzICgjMjY1OSkKICAqIE5vIGxvbmdlciBzZXQgYHBlcm1hbGluazogcHJldHR5YCBpbiB0aGUgYF9jb25maWcueW1sYCBmb3IgdGhlIHNpdGUgdGVtcGxhdGUgKCMyNjgwKQogICogUmV3b3JrIHNpdGUgdGVtcGxhdGUgdG8gdXRpbGl6ZSBTYXNzICgjMjY4NykKICAqIE5vdGlmeSB0aGUgdXNlciB3aGVuIGF1dG8tcmVnZW5lcmF0aW9uIGlzIGRpc2FibGVkLiAoIzI2OTYpCiAgKiBBbGxvdyBwYXJ0aWFsIHZhcmlhYmxlcyBpbiBpbmNsdWRlIHRhZyBmaWxlbmFtZSBhcmd1bWVudCAoIzI2OTMpCiAgKiBNb3ZlIGluc3RhbmNlcyBvZiBgVGltZS5wYXJzZWAgaW50byBhIFV0aWxzIG1ldGhvZCAoIzI2ODIpCiAgKiBJZ25vcmUgc3ViZm9sZGVycyBpbiB0aGUgYF9wb3N0c2AgZm9sZGVyICgjMjcwNSkgUkVWRVJUUyAoIzI2MzMpCiAgKiBGcm9udCBNYXR0ZXIgZGVmYXVsdCB0eXBlcyBzaG91bGQgYWx3YXlzIGJlIHBsdXJhbGl6ZWQgKCMyNzMyKQogICogUmVhZCBpbiBzdGF0aWMgZmlsZXMgaW50byBgY29sbGVjdGlvbi5maWxlc2AgYXMgYFN0YXRpY0ZpbGVgcyAoIzI3MzcpCiAgKiBBZGQgYHNhc3NpZnlgIGFuZCBgc2Nzc2lmeWAgTGlxdWlkIGZpbHRlcnMgKCMyNzM5KQogICogUmVwbGFjZSBgY2xhc3NpZmllcmAgZ2VtIHdpdGggYGNsYXNzaWZpZXItcmVib3JuYCAoIzI3MjEpCgojIyMgQnVnIEZpeGVzCgogICogVXNlIG9ubHkgdGhlIGxhc3QgZXh0bmFtZSB3aGVuIG11bHRpcGxlIGNvbnZlcnRlcnMgZXhpc3QgKCMyNzIyKQogICogQ2FsbCBgI3RvX2xpcXVpZGAgYmVmb3JlIGNhbGxpbmcgYCN0b19qc29uYCBpbiBqc29uaWZ5IGZpbHRlciAoIzI3MjkpCiAgKiBVc2Ugbm9uIHBhZGRlZCBjb25maWcgaW4gYHN0cmZ0aW1lYCB0byBhdm9pZCBwYXJzZSBzdHJpbmcgdHdpY2UgKCMyNjczKQogICogUmVwbGFjZSBkZXByZWNhdGVkIFJ1YnkgbWV0aG9kcyB3aXRoIHVuZGVwcmVjYXRlZCBvbmVzICgjMjY2NCkKICAqIENhdGNoIGVycm9ycyB3aGVuIHBhcnNpbmcgUG9zdCBgZGF0ZWAgZnJvbnQgbWF0dGVyIHZhbHVlICYgcHJvZHVjZSBuaWNlIGVycm9yIG1lc3NhZ2UgKCMyNjQ5KQogICogQWxsb3cgc3RhdGljIGZpbGVzIGluIENvbGxlY3Rpb25zICgjMjYxNSkKICAqIEZpeGVkIHR5cG8gaW4gYERlcHJlY2F0b3IjZ3JhY2VmdWxseV9yZXF1aXJlYCBlcnJvciBtZXNzYWdlICgjMjY5NCkKICAqIFJlbW92ZSBwcmVlbXB0aXZlIGxvYWRpbmcgb2YgdGhlICdjbGFzc2lmaWVyJyBnZW0uICgjMjY5NykKICAqIFVzZSBjYXNlLWluc2Vuc2l0aXZlIGNoZWNraW5nIGZvciB0aGUgZmlsZSBleHRlbnNpb25zIHdoZW4gbG9hZGluZyBjb25maWcgZmlsZXMgKCMyNzE4KQogICogV2hlbiBSZWFkaW5nIERvY3VtZW50cywgUmVzcGVjdCBgZW5jb2RpbmdgIE9wdGlvbiAoIzI3MjApCiAgKiBSZWZhY3RvciBiYXNlZCBvbiBqZWt5bGwtd2F0Y2ggY2xlYW4tdXAuICgjMjcxNikKICAqIGBEb2N1bWVudCN0b19zYCBzaG91bGQgcHJvZHVjZSBqdXN0IHRoZSBjb250ZW50IG9mIHRoZSBkb2N1bWVudCAoIzI3MzEpCgojIyMgRGV2ZWxvcG1lbnQgRml4ZXMKCiAgKiBPbmx5IGluY2x1ZGUgbGliIGZpbGVzIGluIHRoZSBnZW0gKCMyNjcxKQogICogRml4IGBnaXQgZGlmZmAgY29tbWFuZCBpbiBgcHJvb2ZgIHNjcmlwdCAoIzI2NzIpCiAgKiBNYWtlIGRlZmF1bHQgcmFrZSB0YXNrIGEgbXVsdGl0YXNrIHNvIHRlc3RzIHJ1biBpbiBwYXJhbGxlbCAoIzI3MzUpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBVc2UgU2FzcyBhbmQgYSBEb2NzIENvbGxlY3Rpb24gKCMyNjUxKQogICogQWRkIGBsYXRlc3RfdmVyc2lvbi50eHRgIGZpbGUgdG8gdGhlIHNpdGUgKCMyNzQwKQogICogQmUgbW9yZSBhbWJpZ3VvdXMgYWJvdXQgYHBhZ2UuY29udGVudGAuIEJ1dCBtb3JlIHRyYW5zcGFyZW50LiAoIzI1MjIpCiAgKiBTdHJlYW1saW5pbmcgZnJvbnQgbWF0dGVyIHdvcmRpbmcgKGluc3RlYWQgb2YgZnJvbnQtbWF0dGVyL2Zyb250bWF0dGVyKSAoIzI2NzQpCiAgKiBBZGQgbm90ZSB0aGF0IHNvdXJjZSBkaXJlY3RvcnkgY2Fubm90IGJlIG1vZGlmaWVkIGluIEdpdEh1YiBQYWdlcyAoIzI2NjkpCiAgKiBGaXggbGlua3MgZnJvbSAjMjY2OSB0byBiZSBhY3R1YWwgSFRNTC4gV2hvb3BzLiAoIzI2NzkpCiAgKiBBZGQgbGluayB0byBgamVreWxsLXNsaW1gIGluIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzI2ODkpCiAgKiBBZGQgQmFycnkgQ2xhcmsncyBTbWFzaGluZyBNYWdhemluZSB0dXRvcmlhbCB0byByZXNvdXJjZXMgcGFnZSAoIzI2ODgpCiAgKiBSZW9yZ2FuaXplIGFuZCB1cGRhdGUgZGVmYXVsdCBjb25maWd1cmF0aW9uIHNldHRpbmdzICgjMjQ1NikKICAqIEZpeGluZyBpbmRlbnRhdGlvbiBpbiB0aGUgY29uZmlndXJhdGlvbiBkb2NzIGFib3V0IFJlZGNhcnBldCBleHRzICgjMjcxNykKICAqIFVzZSBgbnVsbGAgaW4gWUFNTCBpbnN0ZWFkIG9mIGBuaWxgIGluIGRlZmF1bHQgY29uZmlnIGxpc3QgKCMyNzE5KQogICogRml4IHR5cG8gaW4gQ29udGludW91cyBJbnRlZ3JhdGlvbiBkb2NzICgjMjcwOCkKCiMjIDIuMi4wIC8gMjAxNC0wNy0yOQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFRocm93IGEgd2FybmluZyBpZiB0aGUgc3BlY2lmaWVkIGxheW91dCBkb2VzIG5vdCBleGlzdCAoIzI2MjApCiAgKiBXaGl0ZWxpc3QgUHlnbWVudHMgb3B0aW9ucyBpbiBzYWZlIG1vZGUgKCMyNjQyKQoKIyMjIEJ1ZyBGaXhlcwoKICAqIFJlbW92ZSB1bm5lY2Vzc2FyeSBgSmVreWxsOjpUYWdzOjpJbmNsdWRlVGFnI2JsYW5rP2AgbWV0aG9kICgjMjYyNSkKICAqIENhdGVnb3JpZXMgaW4gdGhlIHBhdGggYXJlIGlnbm9yZWQgKCMyNjMzKQoKIyMjIERldmVsb3BtZW50IEZpeGVzCgogICogUmVmYWN0b3JpbmcgRXJyb3JzICYgUmVxdWlyZXMgb2YgVGhpcmQtUGFydHkgc3R1ZmYgKCMyNTkxKQogICogQWRkIGZ1cnRoZXIgdGVzdHMgZm9yIGNhdGVnb3JpZXMgKCMyNTg0KQogICogUHJvb2Ygc2l0ZSB3aXRoIGh0bWwtcHJvb2ZlciBvbiBjaGFuZ2UgKCMyNjA1KQogICogRml4IHVwIGJ1ZyBpbiAjMjYwNSB3aGljaCBjYXVzZWQgcHJvb2ZpbmcgdGhlIHNpdGUgbm90IHRvIGZ1bmN0aW9uICgjMjYwOCkKICAqIFVzZSBgYnVuZGxlIGV4ZWNgIGluIGBzY3JpcHQvcHJvb2ZgICgjMjYxMCkKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIFVwZGF0ZSBLcmFtZG93biB1cmxzICgjMjU4OCkKICAqIEFkZCBgSmVreWxsOjpBdXRvbGlua0VtYWlsYCBhbmQgYEpla3lsbDo6R2l0TWV0YWRhdGFgIHRvIHRoZSBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMyNTk2KQogICogRml4IGEgYnVuY2ggb2YgYnJva2VuIGxpbmtzIGluIHRoZSBzaXRlICgjMjYwMSkKICAqIFJlcGxhY2UgZGVhZCBsaW5rcyB3aXRoIHdvcmtpbmcgbGlua3MgKCMyNjExKQogICogQWRkIGpla3lsbC1ob29rIHRvIGRlcGxveW1lbnQgbWV0aG9kcyAoIzI2MTcpCiAgKiBBZGRlZCBrcmFtZG93bi13aXRoLXB5Z21lbnRzIHBsdWdpbiB0byB0aGUgbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjYyMykKICAqIFVwZGF0ZSBvdXRkYXRlZCAiRXh0cmFzIiBwYWdlIGFuZCByZW1vdmUgZHVwbGljYXRlIGRvY3VtZW50YXRpb24gKCMyNjIyKQogICogQWRkIGNvMiBwbHVnaW4gdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjYzOSkKICAqIEF0dGVtcHQgdG8gY2xhcmlmeSB0aGUgd2F5IFNhc3MgaW1wb3J0cyBoYXBwZW4gKCMyNjQyKQoKIyMgMi4xLjEgLyAyMDE0LTA3LTAxCgojIyMgQnVnIEZpeGVzCgogICogUGF0Y2ggcmVhZCB2dWxuZXJhYmlsaXRpZXMgZm9yIGRhdGEgJiBjb25maXJtIG5vbmUgZm9yIGxheW91dHMgKCMyNTYzKQogICogVXBkYXRlIE1hcnVrdSBkZXBlbmRlbmN5IHRvIGFsbG93IHVzZSBvZiB0aGUgbGF0ZXN0IHZlcnNpb24gKCMyNTc2KQogICogUmVtb3ZlIGNvbmRpdGlvbmFsIGFzc2lnbm1lbnQgZnJvbSBkb2N1bWVudCBVUkwgdG8gcHJldmVudCBzdGFsZSB1cmxzICgjMjU3NSkKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIEFkZCB2ZXJ0aWNhbCBtYXJnaW4gdG8gYGhpZ2hsaWdodGAgdG8gc2VwYXJhdGUgY29kZSBibG9ja3MgKCMyNTU4KQogICogQWRkIGBodG1sX3BhZ2VzYCB0byBWYXJpYWJsZXMgZG9jcyAoIzI1NjcpCiAgKiBGaXhlZCBicm9rZW4gbGluayB0byBQZXJtYWxpbmtzIHBhZ2UgKCMyNTcyKQogICogVXBkYXRlIGxpbmsgdG8gV2luZG93cyBpbnN0YWxsYXRpb24gZ3VpZGUgKCMyNTc4KQoKIyMgMi4xLjAgLyAyMDE0LTA2LTI4CgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogQnVtcCB0byB0aGUgbGF0ZXN0IExpcXVpZCB2ZXJzaW9uLCAyLjYuMSAoIzI0OTUpCiAgKiBBZGQgc3VwcG9ydCBmb3IgSlNPTiBmaWxlcyBpbiB0aGUgYF9kYXRhYCBkaXJlY3RvcnkgKCMyMzY5KQogICogQWxsb3cgc3ViY2xhc3NlcyB0byBvdmVycmlkZSBgRVhDRVJQVF9BVFRSSUJVVEVTX0ZPUl9MSVFVSURgICgjMjQwOCkKICAqIEFkZCBgSmVreWxsLmVudmAgYW5kIGBqZWt5bGwuZW52aXJvbm1lbnRgICh0aGUgTGlxdWlkIHZhcikgKCMyNDE3KQogICogVXNlIGBfY29uZmlnLnlhbWxgIG9yIGBfY29uZmlnLnltbGAgKGAueW1sYCB0YWtlcyBwcmVjZWRlbmNlKSAoIzI0MDYpCiAgKiBPdmVycmlkZSBjb2xsZWN0aW9uIHVybCB0ZW1wbGF0ZSAoIzI0MTgpCiAgKiBBbGxvdyBzdWJkaXJlY3RvcmllcyBpbiBgX2RhdGFgICgjMjM5NSkKICAqIEV4dHJhY3QgUGFnaW5hdGlvbiBHZW5lcmF0b3IgaW50byBnZW06IGBqZWt5bGwtcGFnaW5hdGVgICgjMjQ1NSkKICAqIFV0aWxpemUgYGRhdGVfdG9fcmZjODIyYCBmaWx0ZXIgaW4gc2l0ZSB0ZW1wbGF0ZSAoIzI0MzcpCiAgKiBBZGQgY2F0ZWdvcmllcywgbGFzdCBidWlsZCBkYXRldGltZSwgYW5kIGdlbmVyYXRvciB0byBzaXRlIHRlbXBsYXRlIGZlZWQgKCMyNDM4KQogICogQ29uZmlndXJhYmxlLCByZXBsYWNlYWJsZSBMb2dnZXItY29tcGxpYW50IGxvZ2dlciAoIzI0NDQpCiAgKiBFeHRyYWN0IGBnaXN0YCB0YWcgaW50byBhIHNlcGFyYXRlIGdlbSAoIzI0NjkpCiAgKiBBZGQgYGNvbGxlY3Rpb25gIGF0dHJpYnV0ZSB0byBgRG9jdW1lbnQjdG9fbGlxdWlkYCB0byBhY2Nlc3MgdGhlIGRvY3VtZW50J3MgY29sbGVjdGlvbiBsYWJlbC4gKCMyNDM2KQogICogVXBncmFkZSBsaXN0ZW4gdG8gYDIuNy42IDw9IHggPCAzLjAuMGAgKCMyNDkyKQogICogQWxsb3cgY29uZmlndXJhdGlvbiBvZiBkaWZmZXJlbnQgVHdpdHRlciBhbmQgR2l0SHViIHVzZXJuYW1lcyBpbiBzaXRlIHRlbXBsYXRlICgjMjQ4NSkKICAqIEJ1bXAgUHlnbWVudHMgdG8gdjAuNi4wICgjMjUwNCkKICAqIEZyb250IG1hdHRlciBkZWZhdWx0cyBmb3IgZG9jdW1lbnRzIGluIGNvbGxlY3Rpb25zICgjMjQxOSkKICAqIEluY2x1ZGUgZmlsZXMgd2l0aCBhIHVybCB3aGljaCBlbmRzIGluIGAvYCBpbiB0aGUgYHNpdGUuaHRtbF9wYWdlc2AgbGlzdCAoIzI1MjQpCiAgKiBNYWtlIGBoaWdobGlnaHRgIHRhZyB1c2UgYGxhbmd1YWdlLWAgcHJlZml4IGluIENTUyBjbGFzcyAoIzI1MTEpCiAgKiBMb29rdXAgaXRlbSBwcm9wZXJ0eSB2aWEgYGl0ZW0jdG9fbGlxdWlkYCBiZWZvcmUgYCNkYXRhYCBvciBgI1tdYCBpbiBmaWx0ZXJzICgjMjQ5MykKICAqIFNraXAgaW5pdGlhbCBidWlsZCBvZiBzaXRlIG9uIHNlcnZlIHdpdGggZmxhZyAoIzI0NzcpCiAgKiBBZGQgc3VwcG9ydCBmb3IgYGhsX2xpbmVzYCBpbiBgaGlnaGxpZ2h0YCB0YWcgKCMyNTMyKQogICogU3Bpa2Ugb3V0IGAtLXdhdGNoYCBmbGFnIGludG8gYSBzZXBhcmF0ZSBnZW0gKCMyNTUwKQoKIyMjIEJ1ZyBGaXhlcwoKICAqIExpcXVpZCBgc29ydGAgZmlsdGVyIHNob3VsZCBzb3J0IGV2ZW4gaWYgb25lIG9mIHRoZSB2YWx1ZXMgaXMgYG5pbGAgKCMyMzQ1KQogICogUmVtb3ZlIHBhZGRpbmcgb24gYHByZSBjb2RlYCBpbiB0aGUgc2l0ZSB0ZW1wbGF0ZSBDU1MgKCMyMzgzKQogICogU2V0IGBsb2dfbGV2ZWxgIGVhcmxpZXIgdG8gc2lsZW5jZSBpbmZvIGxldmVsIGNvbmZpZ3VyYXRpb24gb3V0cHV0ICgjMjM5MykKICAqIE9ubHkgbGlzdCBwYWdlcyB3aGljaCBoYXZlIGB0aXRsZWAgaW4gc2l0ZSB0ZW1wbGF0ZSAoIzI0MTEpCiAgKiBBY2NlcHQgYE51bWVyaWNgIHZhbHVlcyBmb3IgZGF0ZXMsIG5vdCBgTnVtYmVyYCB2YWx1ZXMgKCMyMzc3KQogICogUHJldmVudCBjb2RlIGZyb20gb3ZlcmZsb3dpbmcgY29udGFpbmVyIGluIHNpdGUgdGVtcGxhdGUgKCMyNDI5KQogICogRW5jb2RlIFVSTHMgaW4gVVRGLTggd2hlbiBlc2NhcGluZyBhbmQgdW5lc2NhcGluZyAoIzI0MjApCiAgKiBObyBMYXlvdXRzIG9yIExpcXVpZCBmb3IgQXNzZXQgRmlsZXMgKCMyNDMxKQogICogQWxsb3cgZnJvbnQgbWF0dGVyIGRlZmF1bHRzIHRvIHNldCBwb3N0IGNhdGVnb3JpZXMgKCMyMzczKQogICogRml4IGNvbW1hbmQgaW4gc3ViY29tbWFuZCBkZXByZWNhdGlvbiB3YXJuaW5nICgjMjQ1NykKICAqIEtlZXAgYWxsIHBhcmVudCBkaXJlY3RvcmllcyBvZiBmaWxlcy9kaXJzIGluIGBrZWVwX2ZpbGVzYCAoIzI0NTgpCiAgKiBXaGVuIHVzaW5nIFJlZENhcnBldCBhbmQgUm91Z2Ugd2l0aG91dCBSb3VnZSBpbnN0YWxsZWQsIGZpeGVkIGVycm9uZW91cyBlcnJvciB3aGljaCBzdGF0ZWQgdGhhdCByZWRjYXJwZXQgd2FzIG1pc3NpbmcsIG5vdCByb3VnZS4gKCMyNDY0KQogICogSWdub3JlICphbGwqIGRpcmVjdG9yaWVzIGFuZCBmaWxlcyB0aGF0IG1lcml0IGl0IG9uIGF1dG8tZ2VuZXJhdGlvbiAoIzI0NTkpCiAgKiBCZWZvcmUgY29weWluZyBmaWxlLCBleHBsaWNpdGx5IHJlbW92ZSB0aGUgb2xkIG9uZSAoIzI1MzUpCiAgKiBNZXJnZSBmaWxlIHN5c3RlbSBjYXRlZ29yaWVzIHdpdGggY2F0ZWdvcmllcyBmcm9tIFlBTUwuICgjMjUzMSkKICAqIERlZXAgbWVyZ2UgZnJvbnQgbWF0dGVyIGRlZmF1bHRzICgjMjQ5MCkKICAqIEVuc3VyZSBleGNsdWRlIGFuZCBpbmNsdWRlIGFycmF5cyBhcmUgYXJyYXlzIG9mIHN0cmluZ3MgKCMyNTQyKQogICogQWxsb3cgY29sbGVjdGlvbnMgdG8gaGF2ZSBkb3RzIGluIHRoZWlyIGZpbGVuYW1lcyAoIzI1NTIpCiAgKiBDb2xsZWN0aW9ucyBzaG91bGRuJ3QgdHJ5IHRvIHJlYWQgaW4gZGlyZWN0b3JpZXMgYXMgZmlsZXMgKCMyNTUyKQogICogQmUgcXVpZXQgdmVyeSBxdWlja2x5LiAoIzI1MjApCgojIyMgRGV2ZWxvcG1lbnQgRml4ZXMKCiAgKiBUZXN0IFJ1YnkgMi4xLjIgaW5zdGVhZCBvZiAyLjEuMSAoIzIzNzQpCiAgKiBBZGQgdGVzdCBmb3Igc29ydGluZyBVVEYtOCBjaGFyYWN0ZXJzICgjMjM4NCkKICAqIFVzZSBgaHR0cHNgIGZvciBHaXRIdWIgbGlua3MgaW4gZG9jdW1lbnRhdGlvbiAoIzI0NzApCiAgKiBSZW1vdmUgY292ZXJhZ2UgcmVwb3J0aW5nIHdpdGggQ292ZXJhbGxzICgjMjQ5NCkKICAqIEZpeCBhIGJpdCBvZiBtaXNzaW5nIFRvbURvYyB0byBgSmVreWxsOjpDb21tYW5kczo6QnVpbGQjYnVpbGRgICgjMjU1NCkKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIFNldCBgdGltZXpvbmVgIHRvIGBBbWVyaWNhL0xvc19BbmdlbGVzYCAoIzIzOTQpCiAgKiBJbXByb3ZlIEphdmFTY3JpcHQgaW4gYGFuY2hvcl9saW5rcy5odG1sYCAoIzIzNjgpCiAgKiBSZW1vdmUgbm90ZSBvbiBRdWlja3N0YXJ0IHBhZ2UgYWJvdXQgZGVmYXVsdCBtYXJrZG93biBjb252ZXJ0ZXIgKCMyMzg3KQogICogUmVtb3ZlIGJyb2tlbiBsaW5rIGluIGV4dHJhcy5tZCB0byBhIE1hcnVrdSBmb3JrICgjMjQwMSkKICAqIFVwZGF0ZSBGb250IEF3ZXNvbWUgdG8gdjQuMS4wLiAoIzI0MTApCiAgKiBGaXggYnJva2VuIGxpbmsgb24gSW5zdGFsbGF0aW9uIHBhZ2UgdG8gVGVtcGxhdGVzIHBhZ2UgKCMyNDIxKQogICogUHJldmVudCB0YWJsZSBmcm9tIGV4dGVuZGluZyBwYXJlbnQgd2lkdGggaW4gcGVybWFsaW5rIHN0eWxlIHRhYmxlICgjMjQyNCkKICAqIEFkZCBjb2xsZWN0aW9ucyB0byBpbmZvIGFib3V0IHBhZ2luYXRpb24gc3VwcG9ydCAoIzIzODkpCiAgKiBBZGQgYGpla3lsbF9naXRodWJfc2FtcGxlYCBwbHVnaW4gdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjQ2MykKICAqIENsYXJpZnkgZG9jdW1lbnRhdGlvbiBhcm91bmQgZnJvbnQgbWF0dGVyIGRlZmF1bHRzIGFuZCBhZGQgZGV0YWlscyBhYm91dCBkZWZhdWx0cyBmb3IgY29sbGVjdGlvbnMuICgjMjQzOSkKICAqIEFkZCBKZWt5bGwgUHJvamVjdCBWZXJzaW9uIFRhZyB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMyNDY4KQogICogVXNlIGBodHRwc2AgZm9yIEdpdEh1YiBsaW5rcyBhY3Jvc3Mgd2hvbGUgc2l0ZSAoIzI0NzApCiAgKiBBZGQgU3RpY2tlck11bGUgKyBKZWt5bGwgcG9zdCAoIzI0NzYpCiAgKiBBZGQgSmVreWxsIEFzc2V0IFBpcGVsaW5lIFJlYm9ybiB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMyNDc5KQogICogQWRkIGxpbmsgdG8gamVreWxsLWNvbXByZXNzLWh0bWwgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjUxNCkKICAqIEFkZCBQaXdpZ28gR2FsbGVyeSB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMyNTI2KQogICogU2V0IGBzaG93X2RyYWZ0c2AgdG8gYGZhbHNlYCBpbiBkZWZhdWx0IGNvbmZpZ3VyYXRpb24gbGlzdGluZyAoIzI1MzYpCiAgKiBQcm92aWRlIGFuIHVwZGF0ZWQgbGluayBmb3IgV2luZG93cyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zICgjMjU0NCkKICAqIFJlbW92ZSBgdXJsYCBmcm9tIGNvbmZpZ3VyYXRpb24gZG9jcyAoIzI1NDcpCiAgKiBEb2N1bWVudGF0aW9uIGZvciBDb250aW51b3VzIEludGVncmF0aW9uIGZvciB5b3VyIEpla3lsbCBTaXRlICgjMjQzMikKCiMjIDIuMC4zIC8gMjAxNC0wNS0wOAoKIyMjIEJ1ZyBGaXhlcwoKICAqIFByb3Blcmx5IHByZWZpeCBsaW5rcyBpbiBzaXRlIHRlbXBsYXRlIHdpdGggVVJMIG9yIGJhc2V1cmwgZGVwZW5kaW5nIHVwb24gbmVlZC4gKCMyMzE5KQogICogVXBkYXRlIGdpc3QgdGFnIGNvbW1lbnRzIGFuZCBlcnJvciBtZXNzYWdlIHRvIHJlcXVpcmUgdXNlcm5hbWUgKCMyMzI2KQogICogRml4IGBwZXJtYWxpbmtgIHNldHRpbmcgaW4gc2l0ZSB0ZW1wbGF0ZSAoIzIzMzEpCiAgKiBEb24ndCBmYWlsIGlmIGFueSBvZiB0aGUgcGF0aCBvYmplY3RzIGFyZSBuaWwgKCMyMzI1KQogICogSW5zdGFudGlhdGUgYWxsIGRlc2NlbmRhbnRzIGZvciBjb252ZXJ0ZXJzIGFuZCBnZW5lcmF0b3JzLCBub3QganVzdCBkaXJlY3Qgc3ViY2xhc3NlcyAoIzIzMzQpCiAgKiBSZXBsYWNlIGFsbCBpbnN0YW5jZXMgb2YgYHNpdGUubmFtZWAgd2l0aCBgc2l0ZS50aXRsZWAgaW4gc2l0ZSB0ZW1wbGF0ZSAoIzIzMjQpCiAgKiBgSmVreWxsOjpGaWx0ZXJzI3RpbWVgIG5vdyBhY2NlcHRzIFVOSVggdGltZXN0YW1wcyBpbiBzdHJpbmcgb3IgbnVtYmVyIGZvcm0gKCMyMzM5KQogICogVXNlIGBpdGVtX3Byb3BlcnR5YCBmb3IgYHdoZXJlYCBmaWx0ZXIgc28gaXQgZG9lc24ndCBicmVhayBvbiBjb2xsZWN0aW9ucyAoIzIzNTkpCiAgKiBSZXNjdWUgZXJyb3JzIHRocm93biBzbyBgLS13YXRjaGAgZG9lc24ndCBmYWlsICgjMjM2NCkKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIEFkZCBtaXNzaW5nICJhcyIgdG8gYXNzZXRzIGRvY3MgcGFnZSAoIzIzMzcpCiAgKiBVcGRhdGUgZG9jcyB0byByZWZsZWN0IG5ldyBgYmFzZXVybGAgZGVmYXVsdCAoIzIzNDEpCiAgKiBBZGQgbGlua3MgdG8gaGVhZGVycyB3aG8gaGF2ZSBhbiBJRC4gKCMyMzQyKQogICogVXNlIHN5bWJvbCBpbnN0ZWFkIG9mIEhUTUwgbnVtYmVyIGluIGB1cGdyYWRpbmcubWRgICgjMjM1MSkKICAqIEZpeCBsaW5rIHRvIGZyb250IG1hdHRlciBkZWZhdWx0cyBkb2NzICgjMjM1MykKICAqIEZpeCBmb3IgYEhpc3RvcnkubWFya2Rvd25gIGluIG9yZGVyIHRvIGZpeCBoaXN0b3J5IHBhZ2UgaW4gZG9jcyAoIzIzNjMpCgojIyAyLjAuMiAvIDIwMTQtMDUtMDcKCiMjIyBCdWcgRml4ZXMKCiAgKiBDb3JyZWN0IHVzZSBvZiBgdXJsYCBhbmQgYGJhc2V1cmxgIGluIHRoZSBzaXRlIHRlbXBsYXRlLiAoIzIzMTcpCiAgKiBEZWZhdWx0IGBiYXNldXJsYCB0byBgIiJgICgjMjMxNykKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIENvcnJlY3QgZG9jcyBmb3IgdGhlIGBnaXN0YCBwbHVnaW4gc28gaXQgYWx3YXlzIGluY2x1ZGVzIHRoZSB1c2VybmFtZS4gKCMyMzE0KQogICogQ2xhcmlmeSBuZXcgKGRlZmF1bHRzLCBgd2hlcmVgIGZpbHRlcikgZmVhdHVyZXMgaW4gZG9jcyAoIzIzMTYpCgojIyAyLjAuMSAvIDIwMTQtMDUtMDYKCiMjIyBCdWcgRml4ZXMKCiAgKiBSZXF1aXJlIGBrcmFtZG93bmAgZ2VtIGluc3RlYWQgb2YgYG1hcnVrdWAgZ2VtCgojIyAyLjAuMCAvIDIwMTQtMDUtMDYKCiMjIyBNYWpvciBFbmhhbmNlbWVudHMKCiAgKiBBZGQgIkNvbGxlY3Rpb25zIiBmZWF0dXJlICgjMjE5OSkKICAqIEFkZCBnZW0tYmFzZWQgcGx1Z2luIHdoaXRlbGlzdCB0byBzYWZlIG1vZGUgKCMxNjU3KQogICogUmVwbGFjZSB0aGUgY29tbWFuZGVyIGNvbW1hbmQgbGluZSBwYXJzZXIgd2l0aCBhIG1vcmUgcm9idXN0IHNvbHV0aW9uIGZvciBvdXIgbmVlZHMgY2FsbGVkIGBtZXJjZW5hcnlgICgjMTcwNikKICAqIFJlbW92ZSBzdXBwb3J0IGZvciBSdWJ5IDEuOC54ICgjMTc4MCkKICAqIE1vdmUgdG8gamVreWxsL2pla3lsbCBmcm9tIG1vam9tYm8vamVreWxsICgjMTgxNykKICAqIEFsbG93IGN1c3RvbSBtYXJrZG93biBwcm9jZXNzb3JzICgjMTg3MikKICAqIFByb3ZpZGUgc3VwcG9ydCBmb3IgdGhlIFJvdWdlIHN5bnRheCBoaWdobGlnaHRlciAoIzE4NTkpCiAgKiBQcm92aWRlIHN1cHBvcnQgZm9yIFNhc3MgKCMxOTMyKQogICogUHJvdmlkZSBhIDMwMCUgaW1wcm92ZW1lbnQgd2hlbiBnZW5lcmF0aW5nIHNpdGVzIHRoYXQgdXNlIGBQb3N0I25leHRgIG9yIGBQb3N0I3ByZXZpb3VzYCAoIzE5ODMpCiAgKiBQcm92aWRlIHN1cHBvcnQgZm9yIENvZmZlZVNjcmlwdCAoIzE5OTEpCiAgKiBSZXBsYWNlIE1hcnVrdSB3aXRoIEtyYW1kb3duIGFzIERlZmF1bHQgTWFya2Rvd24gUHJvY2Vzc29yICgjMTk4OCkKICAqIEV4cG9zZSBgc2l0ZS5zdGF0aWNfZmlsZXNgIHRvIExpcXVpZCAoIzIwNzUpCiAgKiBDb21wbGV0ZSByZWRlc2lnbiBvZiB0aGUgdGVtcGxhdGUgc2l0ZSBnZW5lcmF0ZWQgYnkgYGpla3lsbCBuZXdgICgjMjA1MCkKICAqIFVwZGF0ZSBMaXN0ZW4gZnJvbSAxLnggdG8gMi54ICgjMjA5NykKICAqIEZyb250IG1hdHRlciBkZWZhdWx0cyAoIzIyMDUpCiAgKiBEZXByZWNhdGUgYHJlbGF0aXZlX3Blcm1hbGlua3NgIGNvbmZpZ3VyYXRpb24gb3B0aW9uIChkZWZhdWx0IHRvIGBmYWxzZWApICgjMjMwNykKICAqIEV4Y2x1ZGUgZmlsZXMgYmFzZWQgb24gcHJlZml4IGFzIHdlbGwgYXMgYGZubWF0Y2g/YCAoIzIzMDMpCgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogTW92ZSB0aGUgRW50cnlGaWx0ZXIgY2xhc3MgaW50byB0aGUgSmVreWxsIG1vZHVsZSB0byBhdm9pZCBwb2xsdXRpbmcgdGhlIGdsb2JhbCBuYW1lc3BhY2UgKCMxODAwKQogICogQWRkIGBncm91cF9ieWAgTGlxdWlkIGZpbHRlciBjcmVhdGUgbGlzdHMgb2YgaXRlbXMgZ3JvdXBlZCBieSBhIGNvbW1vbiBwcm9wZXJ0eSdzIHZhbHVlICgjMTc4OCkKICAqIEFkZCBzdXBwb3J0IGZvciBNYXJ1a3UncyBgZmVuY2VkX2NvZGVfYmxvY2tzYCBvcHRpb24gKCMxNzk5KQogICogVXBkYXRlIFJlZGNhcnBldCBkZXBlbmRlbmN5IHRvIH4+IDMuMCAoIzE4MTUpCiAgKiBBdXRvbWF0aWNhbGx5IHNvcnQgYWxsIHBhZ2VzIGJ5IG5hbWUgKCMxODQ4KQogICogQmV0dGVyIGVycm9yIG1lc3NhZ2Ugd2hlbiB0aW1lIGlzIG5vdCBwYXJzZWFibGUgKCMxODQ3KQogICogQWxsb3cgYGluY2x1ZGVgIHRhZyB2YXJpYWJsZSBhcmd1bWVudHMgdG8gdXNlIGZpbHRlcnMgKCMxODQxKQogICogYHBvc3RfdXJsYCB0YWcgc2hvdWxkIHJhaXNlIGBBcmd1bWVudEVycm9yYCBmb3IgaW52YWxpZCBuYW1lICgjMTgyNSkKICAqIEJ1bXAgZGVwZW5kZW5jeSBgbWVyY2VuYXJ5YCB0byBgfj4gMC4yLjBgICgjMTg3OSkKICAqIEJ1bXAgZGVwZW5kZW5jeSBgc2FmZV95YW1sYCB0byBgfj4gMS4wYCAoIzE4ODYpCiAgKiBBbGxvdyBzb3J0aW5nIG9mIGNvbnRlbnQgYnkgY3VzdG9tIHByb3BlcnRpZXMgKCMxODQ5KQogICogQWRkIGAtLXF1aWV0YCBmbGFnIHRvIHNpbGVuY2Ugb3V0cHV0IGR1cmluZyBidWlsZCBhbmQgc2VydmUgKCMxODk4KQogICogQWRkIGEgYHdoZXJlYCBmaWx0ZXIgdG8gZmlsdGVyIGFycmF5cyBiYXNlZCBvbiBhIGtleS92YWx1ZSBwYWlyICgjMTg3NSkKICAqIFJvdXRlIDQwNCBlcnJvcnMgdG8gYSBjdXN0b20gNDA0IHBhZ2UgaW4gZGV2ZWxvcG1lbnQgKCMxODk5KQogICogRXhjbHVkZXMgYXJlIG5vdyByZWxhdGl2ZSB0byB0aGUgc2l0ZSBzb3VyY2UgKCMxOTE2KQogICogQnJpbmcgTUlNRSBUeXBlcyBmaWxlIGZvciBgamVreWxsIHNlcnZlYCB0byBjb21wbGV0ZSBwYXJpdHkgd2l0aCBHSCBQYWdlcyBzZXJ2ZXJzICgjMTk5MykKICAqIEFkZGluZyBCcmVha3BvaW50IHRvIG1ha2UgbmV3IHNpdGUgdGVtcGxhdGUgbW9yZSByZXNwb25zaXZlICgjMjAzOCkKICAqIERlZmF1bHQgdG8gdXNpbmcgdGhlIFVURi04IGVuY29kaW5nIHdoZW4gcmVhZGluZyBmaWxlcy4gKCMyMDMxKQogICogVXBkYXRlIFJlZGNhcnBldCBkZXBlbmRlbmN5IHRvIH4+IDMuMSAoIzIwNDQpCiAgKiBSZW1vdmUgc3VwcG9ydCBmb3IgUnVieSAxLjkuMiAoIzIwNDUpCiAgKiBBZGQgYC5ta2Rvd25gIGFzIHZhbGlkIE1hcmtkb3duIGV4dGVuc2lvbiAoIzIwNDgpCiAgKiBBZGQgYGluZGV4LnhtbGAgdG8gdGhlIGxpc3Qgb2YgV0VCcmljayBkaXJlY3RvcnkgaW5kZXggZmlsZXMgKCMyMDQxKQogICogTWFrZSB0aGUgYGxheW91dHNgIGNvbmZpZyBrZXkgcmVsYXRpdmUgdG8gQ1dEIG9yIHRvIHNvdXJjZSAoIzIwNTgpCiAgKiBVcGRhdGUgS3JhbWRvd24gdG8gYH4+IDEuM2AgKCMxODk0KQogICogUmVtb3ZlIHVubmVjZXNzYXJ5IHJlZmVyZW5jZXMgdG8gYHNlbGZgICgjMjA5MCkKICAqIFVwZGF0ZSB0byBNZXJjZW5hcnkgdjAuMy54ICgjMjA4NSkKICAqIFNoaXAgU2FzcyBzdXBwb3J0IGFzIGEgc2VwYXJhdGUgZ2VtICgjMjA5OCkKICAqIEV4dHJhY3QgY29yZSBleHRlbnNpb25zIGludG8gYSBVdGlscyBtb2R1bGUgKCMyMTEyKQogICogUmVmYWN0b3IgQ0xJICYgQ29tbWFuZHMgRm9yIEdyZWF0ZXIgSGFwcGluZXNzICgjMjE0MykKICAqIFByb3ZpZGUgdXNlZnVsIGVycm9yIHdoZW4gUHlnbWVudHMgcmV0dXJucyBgbmlsYCBhbmQgZXJyb3Igb3V0ICgjMjE0OCkKICAqIEFkZCBzdXBwb3J0IGZvciB1bnB1Ymxpc2hlZCBkcmFmdHMgKCMyMTY0KQogICogQWRkIGBmb3JjZV9wb2xsaW5nYCBvcHRpb24gdG8gdGhlIGBzZXJ2ZWAgY29tbWFuZCAoIzIxNjUpCiAgKiBDbGVhbiB1cCB0aGUgYDxoZWFkPmAgaW4gdGhlIHNpdGUgdGVtcGxhdGUgKCMyMTg2KQogICogUGVybWl0IFlBTUwgYmxvY2tzIHRvIGVuZCB3aXRoIHRocmVlIGRvdHMgdG8gYmV0dGVyIGNvbmZvcm0gd2l0aCB0aGUgWUFNTCBzcGVjICgjMjExMCkKICAqIFVzZSBgRmlsZS5leGlzdD9gIGluc3RlYWQgb2YgZGVwcmVjYXRlZCBgRmlsZS5leGlzdHM/YCAoIzIyMTQpCiAgKiBSZXF1aXJlIG5ld2xpbmUgYWZ0ZXIgc3RhcnQgb2YgWUFNTCBGcm9udCBNYXR0ZXIgaGVhZGVyICgjMjIxMSkKICAqIEFkZCB0aGUgYWJpbGl0eSBmb3IgcGFnZXMgdG8gYmUgbWFya2VkIGFzIGBwdWJsaXNoZWQ6IGZhbHNlYCAoIzE0OTIpCiAgKiBBZGQgYEpla3lsbDo6TGlxdWlkRXh0ZW5zaW9uc2Agd2l0aCBgLmxvb2t1cF92YXJpYWJsZWAgbWV0aG9kIGZvciBlYXN5IGxvb2tpbmcgdXAgb2YgdmFyaWFibGUgdmFsdWVzIGluIGEgTGlxdWlkIGNvbnRleHQuICgjMjI1MykKICAqIFJlbW92ZSBsaXRlcmFsIGxhbmcgbmFtZSBmcm9tIGNsYXNzICgjMjI5MikKICAqIFJldHVybiBgdXRmLThgIGVuY29kaW5nIGluIGhlYWRlciBmb3Igd2VicmljayBlcnJvciBwYWdlIHJlc3BvbnNlICgjMjI4OSkKICAqIE1ha2UgdGVtcGxhdGUgc2l0ZSBlYXNpZXIgdG8gY3VzdG9taXplICgjMjI2OCkKICAqIEFkZCB0d28tZGlnaXQgeWVhciB0byBwZXJtYWxpbmsgdGVtcGxhdGUgb3B0aW9uICgjMjMwMSkKICAqIEFkZCBgc2l0ZS5kb2N1bWVudHNgIHRvIExpcXVpZCBwYXlsb2FkIChsaXN0IG9mIGFsbCBkb2NzKSAoIzIyOTUpCiAgKiBUYWtlIGludG8gYWNjb3VudCBtaXNzaW5nIHZhbHVlcyBpbiB0aGUgTGlxdWlkIHNvcnQgZmlsdGVyICgjMjI5OSkKCiMjIyBCdWcgRml4ZXMKCiAgKiBEb24ndCBhbGxvdyBuaWwgZW50cmllcyB3aGVuIGxvYWRpbmcgcG9zdHMgKCMxNzk2KQogICogUmVtb3ZlIHRoZSBzY3JvbGxiYXIgdGhhdCdzIGFsd2F5cyBkaXNwbGF5ZWQgaW4gbmV3IHNpdGVzIGdlbmVyYXRlZCBmcm9tIHRoZSBzaXRlIHRlbXBsYXRlICgjMTgwNSkKICAqIEFkZCBgI3BhdGhgIHRvIHJlcXVpcmVkIG1ldGhvZHMgaW4gYEpla3lsbDo6Q29udmVydGlibGVgICgjMTg2NikKICAqIERlZmF1bHQgTWFydWt1IGZlbmNlZCBjb2RlIGJsb2NrcyB0byBPTiBmb3IgMi4wLjAtZGV2ICgjMTgzMSkKICAqIENoYW5nZSBzaG9ydCBvcHRzIGZvciBob3N0IGFuZCBwb3J0IGZvciBgamVreWxsIGRvY3NgIHRvIGJlIGNvbnNpc3RlbnQgd2l0aCBvdGhlciBzdWJjb21tYW5kcyAoIzE4NzcpCiAgKiBGaXggdHlwb3MgKCMxOTEwKQogICogTG9jayBNYXJ1a3UgYXQgMC43LjAgdG8gcHJldmVudCBidWdzIGNhdXNlZCBieSBNYXJ1a3UgMC43LjEgKCMxOTU4KQogICogRml4ZXMgZnVsbCBwYXRoIGxlYWsgdG8gc291cmNlIGRpcmVjdG9yeSB3aGVuIHVzaW5nIGluY2x1ZGUgdGFnICgjMTk1MSkKICAqIERvbid0IGdlbmVyYXRlIHBhZ2VzIHRoYXQgYXJlbid0IGJlaW5nIHB1Ymxpc2hlZCAoIzE5MzEpCiAgKiBVc2UgYFNhZmVZQU1MLmxvYWRgIHRvIGF2b2lkIGNvbmZsaWN0cyB3aXRoIG90aGVyIHByb2plY3RzICgjMTk4MikKICAqIFJlbGF0aXZlIHBvc3RzIHNob3VsZCBuZXZlciBmYWlsIHRvIGJ1aWxkICgjMTk3NikKICAqIFJlbW92ZSBleGVjdXRhYmxlIGJpdHMgb2Ygbm9uIGV4ZWN1dGFibGUgZmlsZXMgKCMyMDU2KQogICogYCNwYXRoYCBmb3IgYSBkcmFmdCBpcyBub3cgYF9kcmFmdHNgIGluc3RlYWQgb2YgYF9wb3N0c2AgKCMyMDQyKQogICogUGF0Y2ggYSBjb3VwbGUgc2hvdy1zdG9wcGluZyBzZWN1cml0eSB2dWxuZXJhYmlsaXRpZXMgKCMxOTQ2KQogICogU2FuaXRpemUgcGF0aHMgdW5pZm9ybWx5LCBpbiBhIFdpbmRvd3MtZnJpZW5kbHkgd2F5ICgjMjA2NSwgIzIxMDkpCiAgKiBVcGRhdGUgZ2VtIGJ1aWxkIHN0ZXBzIHRvIHdvcmsgY29ycmVjdGx5IG9uIFdpbmRvd3MgKCMyMTE4KQogICogUmVtb3ZlIG9ic29sZXRlIGBub3JtYWxpemVfb3B0aW9uc2AgbWV0aG9kIGNhbGwgZnJvbSBgYmluL2pla3lsbGAgKCMyMTIxKS4KICAqIFJlbW92ZSBgK2AgY2hhcmFjdGVycyBmcm9tIFB5Z21lbnRzIGxleGVyIG5hbWVzIHdoZW4gYWRkaW5nIGFzIGEgQ1NTIGNsYXNzICgjOTk0KQogICogUmVtb3ZlIHNvbWUgY29kZSB0aGF0IGNhdXNlZCBSdWJ5IGludGVycHJldGVyIHdhcm5pbmdzICgjMjE3OCkKICAqIE9ubHkgc3RyaXAgdGhlIGRyaXZlIG5hbWUgaWYgaXQgYmVnaW5zIHRoZSBzdHJpbmcgKCMyMTc1KQogICogUmVtb3ZlIGRlZmF1bHQgcG9zdCB3aXRoIGludmFsaWQgZGF0ZSBmcm9tIHNpdGUgdGVtcGxhdGUgKCMyMjAwKQogICogRml4IGBQb3N0I3VybGAgYW5kIGBQYWdlI3VybGAgZXNjYXBlICgjMTU2OCkKICAqIFN0cmlwIG5ld2xpbmVzIGZyb20gdGhlIGB7JSBoaWdobGlnaHQgJX1gIGJsb2NrIGNvbnRlbnQgKCMxODIzKQogICogTG9hZCBpbiBgcm91Z2VgIG9ubHkgd2hlbiBpdCdzIGJlZW4gcmVxdWVzdGVkIGFzIHRoZSBoaWdobGlnaHRlciAoIzIxODkpCiAgKiBDb252ZXJ0IGlucHV0IHRvIHN0cmluZyBiZWZvcmUgWE1MIGVzY2FwaW5nIChgeG1sX2VzY2FwZWAgbGlxdWlkIGZpbHRlcikgKCMyMjQ0KQogICogTW9kaWZ5IGNvbmZpZ3VyYXRpb24ga2V5IGZvciBDb2xsZWN0aW9ucyBhbmQgcmVzZXQgcHJvcGVybHkuICgjMjIzOCkKICAqIEF2b2lkIGR1cGxpY2F0ZWQgb3V0cHV0IHVzaW5nIGBoaWdobGlnaHRgIHRhZyAoIzIyNjQpCiAgKiBPbmx5IHVzZSBKZWt5bGwubG9nZ2VyIGZvciBvdXRwdXQgKCMyMzA3KQogICogQ2xvc2UgdGhlIGZpbGUgZGVzY3JpcHRvciBpbiBgaGFzX3lhbWxfaGVhZGVyP2AgKCMyMzEwKQogICogQWRkIGBvdXRwdXRgIHRvIGBEb2N1bWVudGAgbGlxdWlkIG91dHB1dCBoYXNoICgjMjMwOSkKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIEFkZCBhIGxpbmsgdG8gdGhlIHNpdGUgaW4gdGhlIFJFQURNRS5tZCBmaWxlICgjMTc5NSkKICAqIEFkZCBpbiBIaXN0b3J5IGFuZCBzaXRlIGNoYW5nZXMgZnJvbSBgdjEtc3RhYmxlYCBicmFuY2ggKCMxODM2KQogICogVGVzdGluZyBhZGRpdGlvbnMgb24gdGhlIEV4Y2VycHQgY2xhc3MgKCMxODkzKQogICogRml4IHRoZSBgaGlnaGxpZ2h0YCB0YWcgZmVhdHVyZSAoIzE4NTkpCiAgKiBUZXN0IEpla3lsbCB1bmRlciBSdWJ5IDIuMS4wICgjMTkwMCkKICAqIEFkZCBzY3JpcHQvY2lidWlsZCBmb3IgZnVuIGFuZCBwcm9maXQgKCMxOTEyKQogICogVXNlIGBGb3J3YXJkYWJsZWAgZm9yIGRlbGVnYXRpb24gYmV0d2VlbiBgRXhjZXJwdGAgYW5kIGBQb3N0YCAoIzE5MjcpCiAgKiBSZW5hbWUgYHJlYWRfdGhpbmdzYCB0byBgcmVhZF9jb250ZW50YCAoIzE5MjgpCiAgKiBBZGQgYHNjcmlwdC9icmFuZGluZ2Agc2NyaXB0IGZvciBBU0NJSSBhcnQgbG92aW4nICgjMTkzNikKICAqIFVwZGF0ZSB0aGUgUkVBRE1FIHRvIHJlZmxlY3QgdGhlIHJlcG8gbW92ZSAoIzE5NDMpCiAgKiBBZGQgdGhlIHByb2plY3QgdmlzaW9uIHRvIHRoZSBSRUFETUUgKCMxOTM1KQogICogU3BlZWQgdXAgVHJhdmlzIENJIGJ1aWxkcyBieSB1c2luZyBSZWJ1bmQgKCMxOTg1KQogICogVXNlIFlhcnAgYXMgYSBHZW0gcHJveHkgZm9yIFRyYXZpcyBDSSAoIzE5ODQpCiAgKiBSZW1vdmUgWWFycCBhcyBhIEdlbSBwcm94eSBmb3IgVHJhdmlzIENJICgjMjAwNCkKICAqIE1vdmUgdGhlIHJlYWRpbmcgb2YgbGF5b3V0cyBpbnRvIGl0cyBvd24gY2xhc3MgKCMyMDIwKQogICogVGVzdCBTYXNzIGltcG9ydCAoIzIwMDkpCiAgKiBTd2l0Y2ggTWFydWt1IGFuZCBLcmFtZG93biBpbiBsaXN0cyBvZiBSdW50aW1lIHZzLiBEZXZlbG9wbWVudCBkZXBlbmRlbmNpZXMgKCMyMDQ5KQogICogQ2xlYW4gdXAgdGhlIGdlbXNwZWMgZm9yIHRoZSBwcm9qZWN0ICgjMjA5NSkKICAqIEFkZCBKYXBhbmVzZSB0cmFuc2xhdGlvbiBvZiBSRUFETUUgYW5kIENPTlRSSUJVVElORyBkb2NzLiAoIzIwODEpCiAgKiBSZS1hbGlnbiB0aGUgdGFibGVzIGluIEN1Y3VtYmVyICgjMjEwOCkKICAqIFRyaW0gdHJhaWxpbmcgc3BhY2VzIGFuZCBjb252ZXJ0IHRhYnMgdG8gc3BhY2VzICgjMjEyMikKICAqIEZpeCB0aGUgZmFpbGluZyBUcmF2aXMgc2NlbmFyaW9zIGR1ZSB0byBDdWN1bWJlciBpc3N1ZXMgKCMyMTU1KQogICogV3JhcCBgYnVuZGxlIGluc3RhbGxgIGluIGB0cmF2aXNfcmV0cnlgIHRvIHJldHJ5IHdoZW4gUnVieUdlbXMgZmFpbHMgKCMyMTYwKQogICogUmVmYWN0b3IgdGFncyBhbmQgY2F0ZWdvcmllcyAoIzE2MzkpCiAgKiBFeHRyYWN0IHBsdWdpbiBtYW5hZ2VtZW50IGludG8gaXRzIG93biBjbGFzcyAoIzIxOTcpCiAgKiBBZGQgbWlzc2luZyB0ZXN0cyBmb3IgYENvbW1hbmRgICgjMjIxNikKICAqIFVwZGF0ZSBgcnJgIGxpbmsgaW4gQ09OVFJJQlVUSU5HIGRvYyAoIzIyNDcpCiAgKiBTdHJlYW1saW5lIEN1Y3VtYmVyIGV4ZWN1dGlvbiBvZiBgamVreWxsYCBzdWJjb21tYW5kcyAoIzIyNTgpCiAgKiBSZWZhY3RvciBgQ29tbWFuZHM6OlNlcnZlYC4gKCMyMjY5KQogICogUmVmYWN0b3IgYGhpZ2hsaWdodGAgdGFnICgjMjE1NCkKICAqIFVwZGF0ZSBgVXRpbGAgaGFzaCBmdW5jdGlvbnMgd2l0aCBsYXRlc3QgZnJvbSBSYWlscyAoIzIyNzMpCiAgKiBXb3JrYXJvdW5kIGZvciBUcmF2aXMgYnVnICgjMjI5MCkKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIERvY3VtZW50IEtyYW1kb3duJ3MgR0ZNIHBhcnNlciBvcHRpb24gKCMxNzkxKQogICogTW92ZSBDU1MgdG8gaW5jbHVkZXMgJiB1cGRhdGUgbm9ybWFsaXplLmNzcyB0byB2Mi4xLjMgKCMxNzg3KQogICogTWluaWZ5IENTUyBvbmx5IGluIHByb2R1Y3Rpb24gKCMxODAzKQogICogRml4IGJyb2tlbiBsaW5rIHRvIGluc3RhbGxhdGlvbiBvZiBSdWJ5IG9uIE1vdW50YWluIExpb24gYmxvZyBwb3N0IG9uIFRyb3VibGVzaG9vdGluZyBkb2NzIHBhZ2UgKCMxNzk3KQogICogRml4IGlzc3VlcyB3aXRoIDEuNC4xIHJlbGVhc2UgYmxvZyBwb3N0ICgjMTgwNCkKICAqIEFkZCBub3RlIGFib3V0IGRlcGxveWluZyB0byBPcGVuU2hpZnQgKCMxODEyKQogICogQ29sbGVjdCBhbGwgV2luZG93cy1yZWxhdGVkIGRvY3Mgb250byBvbmUgcGFnZSAoIzE4MTgpCiAgKiBGaXhlZCB0eXBvIGluIGRhdGFmaWxlcyBkb2MgcGFnZSAoIzE4NTQpCiAgKiBDbGFyaWZ5IGhvdyB0byBhY2Nlc3MgYHNpdGVgIGluIGRvY3MgKCMxODY0KQogICogQWRkIGNsb3NpbmcgYDxjb2RlPmAgdGFnIHRvIGBjb250ZXh0LnJlZ2lzdGVyc1s6c2l0ZV1gIG5vdGUgKCMxODY3KQogICogRml4IGxpbmsgdG8gQG1vam9tYm8ncyBzaXRlIHNvdXJjZSAoIzE4OTcpCiAgKiBBZGQgYHBhZ2luYXRlOiBuaWxgIHRvIGRlZmF1bHQgY29uZmlndXJhdGlvbiBpbiBkb2NzICgjMTg5NikKICAqIEFkZCBsaW5rIHRvIG91ciBMaWNlbnNlIGluIHRoZSBzaXRlIGZvb3RlciAoIzE4ODkpCiAgKiBBZGQgYSBjaGFyc2V0IG5vdGUgaW4gIldyaXRpbmcgUG9zdHMiIGRvYyBwYWdlICgjMTkwMikKICAqIERpc2FsbG93IHNlbGVjdGlvbiBvZiBwYXRoIGFuZCBwcm9tcHQgaW4gYmFzaCBleGFtcGxlcwogICogQWRkIGpla3lsbC1jb21wYXNzIHRvIHRoZSBwbHVnaW4gbGlzdCAoIzE5MjMpCiAgKiBBZGQgbm90ZSBpbiBQb3N0cyBkb2NzIGFib3V0IHN0cmlwcGluZyBgPHA+YCB0YWdzIGZyb20gZXhjZXJwdCAoIzE5MzMpCiAgKiBBZGQgYWRkaXRpb25hbCBpbmZvIGFib3V0IHRoZSBuZXcgZXhjbHVkZSBiZWhhdmlvciAoIzE5MzgpCiAgKiBMaW5raWZ5ICdhd2Vzb21lIGNvbnRyaWJ1dG9ycycgdG8gcG9pbnQgdG8gdGhlIGNvbnRyaWJ1dG9ycyBncmFwaCBvbiBHaXRIdWIgKCMxOTQwKQogICogVXBkYXRlIGBkb2NzL3NpdGVzLm1kYCBsaW5rIHRvIEdpdEh1YiBUcmFpbmluZyBtYXRlcmlhbHMgKCMxOTQ5KQogICogVXBkYXRlIGBtYXN0ZXJgIHdpdGggdGhlIHJlbGVhc2UgaW5mbyBmcm9tIDEuNC4zICgjMTk0NykKICAqIERlZmluZSBkb2NzIG5hdiBpbiBkYXRhZmlsZSAoIzE5NTMpCiAgKiBDbGFyaWZ5IHRoZSBkb2NzIGFyb3VuZCB0aGUgbmFtaW5nIGNvbnZlbnRpb24gZm9yIHBvc3RzICgjMTk3MSkKICAqIEFkZCBtaXNzaW5nIGBuZXh0YCBhbmQgYHByZXZpb3VzYCBkb2NzIGZvciBwb3N0IGxheW91dHMgYW5kIHRlbXBsYXRlcyAoIzE5NzApCiAgKiBBZGQgbm90ZSB0byBgV3JpdGluZyBwb3N0c2AgcGFnZSBhYm91dCBob3cgdG8gc3RyaXAgaHRtbCBmcm9tIGV4Y2VycHQgKCMxOTYyKQogICogQWRkIGBqZWt5bGwtaHVtYW5pemVgIHBsdWdpbiB0byBwbHVnaW4gbGlzdCAoIzE5OTgpCiAgKiBBZGQgYGpla3lsbC1mb250LWF3ZXNvbWVgIHBsdWdpbiB0byBwbHVnaW4gbGlzdCAoIzE5OTkpCiAgKiBBZGQgYHN1YmxpbWUtamVreWxsYCB0byBsaXN0IG9mIEVkaXRvciBwbHVnaW5zICgjMjAwMSkKICAqIEFkZCBgdmltLWpla3lsbGAgdG8gdGhlIGxpc3Qgb2YgRWRpdG9yIHBsdWdpbnMgKCMyMDA1KQogICogRml4IG5vbi1zZW1hbnRpYyBuZXN0aW5nIG9mIGBwYCB0YWdzIGluIGBuZXdzX2l0ZW1gIGxheW91dCAoIzIwMTMpCiAgKiBEb2N1bWVudCBkZXN0aW5hdGlvbiBmb2xkZXIgY2xlYW5pbmcgKCMyMDE2KQogICogVXBkYXRlZCBpbnN0cnVjdGlvbnMgZm9yIE5lYXJseUZyZWVTcGVlY2guTkVUIGluc3RhbGxhdGlvbiAoIzIwMTUpCiAgKiBVcGRhdGUgbGluayB0byByYWNrLWpla3lsbCBvbiAiRGVwbG95bWVudCBNZXRob2RzIiBwYWdlICgjMjA0NykKICAqIEZpeCB0eXBvIGluIC9kb2NzL2NvbmZpZ3VyYXRpb24gKCMyMDczKQogICogRml4IGNvdW50IGluIGRvY3MgZm9yIGBzaXRlLnN0YXRpY19maWxlc2AgKCMyMDc3KQogICogVXBkYXRlIGNvbmZpZ3VyYXRpb24gZG9jcyB0byBpbmRpY2F0ZSB1dGYtOCBpcyB0aGUgZGVmYXVsdCBmb3IgMi4wLjAgYW5kIEFTQ0lJIGZvciAxLjkuMyAoIzIwNzQpCiAgKiBBZGQgaW5mbyBhYm91dCB1bnJlbGVhc2VkIGZlYXR1cmUgdG8gdGhlIHNpdGUgKCMyMDYxKQogICogQWRkIHdoaXRlc3BhY2UgdG8gbGlxdWlkIGV4YW1wbGUgaW4gR2l0SHViIFBhZ2VzIGRvY3MgKCMyMDg0KQogICogQ2xhcmlmeSB0aGUgd2F5IFNhc3MgYW5kIENvZmZlZVNjcmlwdCBmaWxlcyBhcmUgcmVhZCBpbiBhbmQgb3V0cHV0ICgjMjA2NykKICAqIEFkZCBseWNoZSBnYWxsZXJ5IHRhZyBwbHVnaW4gbGluayB0byBsaXN0IG9mIHBsdWdpbnMgKCMyMDk0KQogICogQWRkIEpla3lsbCBQYWdlcyBEaXJlY3RvcnkgcGx1Z2luIHRvIGxpc3Qgb2YgcGx1Z2lucyAoIzIwOTYpCiAgKiBVcGRhdGUgQ29uZmlndXJhdGlvbiBkb2NzIHBhZ2Ugd2l0aCBuZXcgbWFya2Rvd24gZXh0ZW5zaW9uICgjMjEwMikKICAqIEFkZCBgamVreWxsLWltYWdlLXNldGAgdG8gdGhlIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzIxMDUpCiAgKiBMb3NzbGVzc2x5IGNvbXByZXNzIGltYWdlcyAoIzIxMjgpCiAgKiBVcGRhdGUgbm9ybWFsaXplLmNzcyB0byAzLjAuMCAoIzIxMjYpCiAgKiBVcGRhdGUgbW9kZXJuaXpyIHRvIHYyLjcuMSAoIzIxMjkpCiAgKiBBZGQgYGpla3lsbC1vcmRpbmFsYCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMyMTUwKQogICogQWRkIGBqZWt5bGxfZmlndXJlYCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMyMTU4KQogICogQ2xhcmlmeSB0aGUgZG9jdW1lbnRhdGlvbiBmb3Igc2FmZSBtb2RlICgjMjE2MykKICAqIFNvbWUgSFRNTCB0aWR5aW5nICgjMjEzMCkKICAqIFJlbW92ZSBtb2Rlcm5penIgYW5kIHVzZSBodG1sNXNoaXYuanMgZGlyZWN0bHkgZm9yIElFIGxlc3MgdGhhbiB2OSAoIzIxMzEpCiAgKiBSZW1vdmUgdW51c2VkIGltYWdlcyAoIzIxODcpCiAgKiBVc2UgYGFycmF5X3RvX3NlbnRlbmNlX3N0cmluZ2AgZmlsdGVyIHdoZW4gb3V0cHV0dGluZyBuZXdzIGl0ZW0gY2F0ZWdvcmllcyAoIzIxOTEpCiAgKiBBZGQgbGluayB0byBIZWxwIHJlcG8gaW4gcHJpbWFyeSBuYXZpZ2F0aW9uIGJhciAoIzIxNzcpCiAgKiBTd2l0Y2ggdG8gdXNpbmcgYW4gaWNvIGZpbGUgZm9yIHRoZSBzaG9ydGN1dCBpY29uICgjMjE5MykKICAqIFVzZSBudW1iZXJzIHRvIHNwZWNpZnkgZm9udCB3ZWlnaHRzIGFuZCBvbmx5IGJyaW5nIGluIGZvbnQgd2VpZ2h0cyB1c2VkICgjMjE4NSkKICAqIEFkZCBhIGxpbmsgdG8gdGhlIGxpc3Qgb2YgYWxsIHR6IGRhdGFiYXNlIHRpbWUgem9uZXMgKCMxODI0KQogICogQ2xlYW4tdXAgYW5kIGltcHJvdmUgZG9jdW1lbnRhdGlvbiBgZmVlZC54bWxgICgjMjE5MikKICAqIFJlbW92ZSBkdXBsaWNhdGUgZW50cnkgaW4gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjIwNikKICAqIFJlZHVjZSB0aGUgd2hpdGVzcGFjZSBpbiB0aGUgZmF2aWNvbi4gKCMyMjEzKQogICogQWRkIGBqZWt5bGwtcGFnZS1jb2xsZWN0aW9uc2AgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjIxNSkKICAqIEFkZCBhIGNyb3NzLXJlZmVyZW5jZSBhYm91dCBgcG9zdF91cmxgICgjMjI0MykKICAqIEFkZCBgamVreWxsLWxpdmUtdGlsZXNgIHRvIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzIyNTApCiAgKiBGaXhlZCBicm9rZW4gbGluayB0byBHaXRIdWIgdHJhaW5pbmcgbWF0ZXJpYWwgc2l0ZSBzb3VyY2UgKCMyMjU3KQogICogVXBkYXRlIGxpbmsgdG8gaGVscCByZXBvLCBub3cgY2FsbGVkIGBqZWt5bGwtaGVscGAgKCMyMjc3KQogICogRml4IGNhcGl0YWxpemF0aW9uIG9mICdKZWt5bGwnIG9uIERlcGxveW1lbnQgTWV0aG9kcyBwYWdlICgjMjI5MSkKICAqIEluY2x1ZGUgcGx1Z2lucyBieSBzb25ueW0gaW4gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjI5NykKICAqIEFkZCBkZXByZWNhdGVkIGFydGljbGVzIGtlZXBlciBmaWx0ZXIgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjMwMCkKICAqIFNpbXBsaWZ5IGFuZCBpbXByb3ZlIG91ciBDU1MuICgjMjEyNykKICAqIFVzZSBibGFjayB0ZXh0IGNvbG9yIGZvciB0aGUgbW9iaWxlIG5hdmJhciAoIzIzMDYpCiAgKiBVc2UgdGhlIGJ1aWx0IGluIGRhdGUgZmlsdGVyIGFuZCBgc2l0ZS50aW1lYCBmb3IgdGhlIGNvcHlyaWdodCB5ZWFyLiAoIzIzMDUpCiAgKiBVcGRhdGUgaHRtbDVzaGl2IHRvIHYzLjcuMiAoIzIzMDQpCiAgKiBBZGQgMi4wLjAgcmVsZWFzZSBwb3N0ICgjMjI5OCkKICAqIEFkZCBkb2NzIGZvciBjdXN0b20gbWFya2Rvd24gcHJvY2Vzc29ycyAoIzIyOTgpCiAgKiBBZGQgZG9jcyBmb3IgYHdoZXJlYCBhbmQgYGdyb3VwX2J5YCBMaXF1aWQgZmlsdGVycyAoIzIyOTgpCiAgKiBSZW1vdmUgbm90ZXMgaW4gZG9jcyBmb3IgdW5yZWxlYXNlZCBmZWF0dXJlcyAoIzIzMDkpCgojIyAxLjUuMSAvIDIwMTQtMDMtMjcKCiMjIyBCdWcgRml4ZXMKCiAgKiBPbmx5IHN0cmlwIHRoZSBkcml2ZSBuYW1lIGlmIGl0IGJlZ2lucyB0aGUgc3RyaW5nICgjMjE3NikKCiMjIDEuNS4wIC8gMjAxNC0wMy0yNAoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIExvb3NlbiBgc2FmZV95YW1sYCBkZXBlbmRlbmN5IHRvIGB+PiAxLjBgICgjMjE2NykKICAqIEJ1bXAgYHNhZmVfeWFtbGAgZGVwZW5kZW5jeSB0byBgfj4gMS4wLjBgICgjMTk0MikKCiMjIyBCdWcgRml4ZXMKCiAgKiBGaXggaXNzdWUgd2hlcmUgZmlsZXN5c3RlbSB0cmF2ZXJzYWwgcmVzdHJpY3Rpb24gYnJva2UgV2luZG93cyAoIzIxNjcpCiAgKiBMb2NrIGBtYXJ1a3VgIGF0IGAwLjcuMGAgKCMyMTY3KQoKIyMjIERldmVsb3BtZW50IEZpeGVzCgogICogTG9jayBgY3VjdW1iZXJgIGF0IGAxLjMuMTFgICgjMjE2NykKCiMjIDEuNC4zIC8gMjAxNC0wMS0xMwoKIyMjIEJ1ZyBGaXhlcwoKICAqIFBhdGNoIHNob3ctc3RvcHBpbmcgc2VjdXJpdHkgdnVsbmVyYWJpbGl0aWVzICgjMTk0NCkKCiMjIDEuNC4yIC8gMjAxMy0xMi0xNgoKIyMjIEJ1ZyBGaXhlcwoKICAqIFR1cm4gb24gTWFydWt1IGZlbmNlZCBjb2RlIGJsb2NrcyBieSBkZWZhdWx0ICgjMTgzMCkKCiMjIDEuNC4xIC8gMjAxMy0xMi0wOQoKIyMjIEJ1ZyBGaXhlcwoKICAqIERvbid0IGFsbG93IG5pbCBlbnRyaWVzIHdoZW4gbG9hZGluZyBwb3N0cyAoIzE3OTYpCgojIyAxLjQuMCAvIDIwMTMtMTItMDcKCiMjIyBNYWpvciBFbmhhbmNlbWVudHMKCiAgKiBBZGQgc3VwcG9ydCBmb3IgVE9NTCBjb25maWcgZmlsZXMgKCMxNzY1KQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFNvcnQgcGx1Z2lucyBhcyBhIHdheSB0byBlc3RhYmxpc2ggYSBsb2FkIG9yZGVyICgjMTY4MikKICAqIFVwZGF0ZSBNYXJ1a3UgdG8gMC43LjAgKCMxNzc1KQoKIyMjIEJ1ZyBGaXhlcwoKICAqIEFkZCBhIHNwYWNlIGJldHdlZW4gdHdvIHdvcmRzIGluIGEgUGFnaW5hdGlvbiB3YXJuaW5nIG1lc3NhZ2UgKCMxNzY5KQogICogVXBncmFkZSBgdG9tbGAgZ2VtIHRvIGB2MC4xLjBgIHRvIG1haW50YWluIGNvbXBhdCB3aXRoIFJ1YnkgMS44LjcgKCMxNzc4KQoKIyMjIERldmVsb3BtZW50IEZpeGVzCgogICogUmVtb3ZlIHNvbWUgd2hpdGVzcGFjZSBpbiB0aGUgY29kZSAoIzE3NTUpCiAgKiBSZW1vdmUgc29tZSBkdXBsaWNhdGlvbiBpbiB0aGUgcmVhZGluZyBvZiBwb3N0cyBhbmQgZHJhZnRzICgjMTc3OSkKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIEZpeGVkIGNhc2Ugb2YgYSB3b3JkIGluIHRoZSBKZWt5bGwgdjEuMy4wIHJlbGVhc2UgcG9zdCAoIzE3NjIpCiAgKiBGaXhlZCB0aGUgbWltZSB0eXBlIGZvciB0aGUgZmF2aWNvbiAoIzE3NzIpCgojIyAxLjMuMSAvIDIwMTMtMTEtMjYKCiMjIyBNaW5vciBFbmhhbmNlbWVudHMKCiAgKiBBZGQgYSBgLS1wcmVmaXhgIG9wdGlvbiB0byBwYXNzdGhyb3VnaCBmb3IgdGhlIGltcG9ydGVycyAoIzE2NjkpCiAgKiBQdXNoIHRoZSBwYWdpbmF0b3IgcGx1Z2luIGxvd2VyIGluIHRoZSBwbHVnaW4gcHJpb3JpdHkgb3JkZXIgc28gb3RoZXIgcGx1Z2lucyBydW4gYmVmb3JlIGl0ICgjMTc1OSkKCiMjIyBCdWcgRml4ZXMKCiAgKiBGaXggdGhlIGluY2x1ZGUgdGFnIHdoZW4gcmFuIGluIGEgbG9vcCAoIzE3MjYpCiAgKiBGaXggZXJyb3JzIHdoZW4gdXNpbmcgYC0td2F0Y2hgIG9uIDEuOC43ICgjMTczMCkKICAqIFNwZWNpZnkgd2hlcmUgdGhlIGluY2x1ZGUgaXMgY2FsbGVkIGZyb20gaWYgYW4gaW5jbHVkZWQgZmlsZSBpcyBtaXNzaW5nICgjMTc0NikKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIEV4dHJhY3QgYFNpdGUjZmlsdGVyX2VudHJpZXNgIGludG8gaXRzIG93biBvYmplY3QgKCMxNjk3KQogICogRW5hYmxlIFRyYXZpcycgYnVuZGxlIGNhY2hpbmcgKCMxNzM0KQogICogUmVtb3ZlIHRyYWlsaW5nIHdoaXRlc3BhY2UgaW4gc29tZSBmaWxlcyAoIzE3MzYpCiAgKiBGaXggYSBkdXBsaWNhdGUgdGVzdCBuYW1lICgjMTc1NCkKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIFVwZGF0ZSBsaW5rIHRvIGV4YW1wbGUgUmFrZWZpbGUgdG8gcG9pbnQgdG8gc3BlY2lmaWMgY29tbWl0ICgjMTc0MSkKICAqIEZpeCBkcmFmdHMgZG9jcyB0byBpbmRpY2F0ZSB0aGF0IGRyYWZ0IHRpbWUgaXMgYmFzZWQgb24gZmlsZSBtb2RpZmljYXRpb24gdGltZSwgbm90IGBUaW1lLm5vd2AgKCMxNjk1KQogICogQWRkIGBqZWt5bGwtbW9udGhseS1hcmNoaXZlLXBsdWdpbmAgYW5kIGBqZWt5bGwtY2F0ZWdvcnktYXJjaGl2ZS1wbHVnaW5gIHRvIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzE2OTMpCiAgKiBBZGQgYGpla3lsbC1hc3NldC1wYXRoLXBsdWdpbmAgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMTY3MCkKICAqIEFkZCBgZW1vamktZm9yLWpla3lsbGAgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0IHBsdWdpbnMgKCMxNzA4KQogICogRml4IHByZXZpb3VzIHNlY3Rpb24gbGluayBvbiBwbHVnaW5zIHBhZ2UgdG8gcG9pbnQgdG8gcGFnaW5hdGlvbiBwYWdlICgjMTcwNykKICAqIEFkZCBgb3JnLW1vZGVgIGNvbnZlcnRlciBwbHVnaW4gdG8gdGhpcmQtcGFydHkgcGx1Z2lucyAoIzE3MTEpCiAgKiBQb2ludCAiQmxvZyBtaWdyYXRpb25zIiBwYWdlIHRvIGh0dHA6Ly9pbXBvcnQuamVreWxscmIuY29tICgjMTczMikKICAqIEFkZCBkb2NzIGZvciBgcG9zdF91cmxgIHdoZW4gcG9zdHMgYXJlIGluIHN1YmRpcmVjdG9yaWVzICgjMTcxOCkKICAqIFVwZGF0ZSB0aGUgZG9jcyB0byBwb2ludCB0byBgZXhhbXBsZS5jb21gICgjMTQ0OCkKCiMjIDEuMy4wIC8gMjAxMy0xMS0wNAoKIyMjIE1ham9yIEVuaGFuY2VtZW50cwoKICAqIEFkZCBzdXBwb3J0IGZvciBhZGRpbmcgZGF0YSBhcyBZQU1MIGZpbGVzIHVuZGVyIGEgc2l0ZSdzIGBfZGF0YWAgZGlyZWN0b3J5ICgjMTAwMykKICAqIEFsbG93IHZhcmlhYmxlcyB0byBiZSB1c2VkIHdpdGggYGluY2x1ZGVgIHRhZ3MgKCMxNDk1KQogICogQWxsb3cgdXNpbmcgZ2VtcyBmb3IgcGx1Z2luIG1hbmFnZW1lbnQgKCMxNTU3KQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIERlY3JlYXNlIHRoZSBzcGVjaWZpY2l0eSBpbiB0aGUgc2l0ZSB0ZW1wbGF0ZSBDU1MgKCMxNTc0KQogICogQWRkIGBlbmNvZGluZ2AgY29uZmlndXJhdGlvbiBvcHRpb24gKCMxNDQ5KQogICogUHJvdmlkZSBiZXR0ZXIgZXJyb3IgaGFuZGxpbmcgZm9yIEpla3lsbCdzIGN1c3RvbSBMaXF1aWQgdGFncyAoIzE1MTQpCiAgKiBJZiBhbiBpbmNsdWRlZCBmaWxlIGNhdXNlcyBhIExpcXVpZCBlcnJvciwgYWRkIHRoZSBwYXRoIHRvIHRoZSBpbmNsdWRlIGZpbGUgdGhhdCBjYXVzZWQgdGhlIGVycm9yIHRvIHRoZSBlcnJvciBtZXNzYWdlICgjMTU5NikKICAqIElmIGEgbGF5b3V0IGNhdXNlcyBhIExpcXVpZCBlcnJvciwgY2hhbmdlIHRoZSBlcnJvciBtZXNzYWdlIHNvIHRoYXQgd2Uga25vdyBpdCBjb21lcyBmcm9tIHRoZSBsYXlvdXQgKCMxNjAxKQogICogVXBkYXRlIEtyYW1kb3duIGRlcGVuZGVuY3kgdG8gYH4+IDEuMmAgKCMxNjEwKQogICogVXBkYXRlIGBzYWZlX3lhbWxgIGRlcGVuZGVuY3kgdG8gYH4+IDAuOS43YCAoIzE2MDIpCiAgKiBBbGxvdyBsYXlvdXRzIHRvIGJlIGluIHN1YmZvbGRlcnMgbGlrZSBpbmNsdWRlcyAoIzE2MjIpCiAgKiBTd2l0Y2ggdG8gbGlzdGVuIGZvciBzaXRlIHdhdGNoaW5nIHdoaWxlIHNlcnZpbmcgKCMxNTg5KQogICogQWRkIGEgYGpzb25gIGxpcXVpZCBmaWx0ZXIgdG8gYmUgdXNlZCBpbiBzaXRlcyAoIzE2NTEpCiAgKiBQb2ludCBwZW9wbGUgdG8gdGhlIG1pZ3JhdGlvbiBkb2NzIHdoZW4gdGhlIGBqZWt5bGwtaW1wb3J0YCBnZW0gaXMgbWlzc2luZyAoIzE2NjIpCgojIyMgQnVnIEZpeGVzCgogICogRml4IHVwIG1hdGNoaW5nIGFnYWluc3Qgc291cmNlIGFuZCBkZXN0aW5hdGlvbiB3aGVuIHRoZSB0d28gbG9jYXRpb25zIGFyZSBzaW1pbGFyICgjMTU1NikKICAqIEZpeCB0aGUgbWlzc2luZyBgcGF0aG5hbWVgIHJlcXVpcmUgaW4gY2VydGFpbiBjYXNlcyAoIzEyNTUpCiAgKiBVc2UgYCtgIGluc3RlYWQgb2YgYEFycmF5I2NvbmNhdGAgd2hlbiBidWlsZGluZyBgUG9zdGAgYXR0cmlidXRlIGxpc3QgKCMxNTcxKQogICogUHJpbnQgc2VydmVyIGFkZHJlc3Mgd2hlbiBsYXVuY2hpbmcgYSBzZXJ2ZXIgKCMxNTg2KQogICogRG93bmdyYWRlIHRvIE1hcnVrdSBgfj4gMC42LjBgIGluIG9yZGVyIHRvIGF2b2lkIGNoYW5nZXMgaW4gcmVuZGVyaW5nICgjMTU5OCkKICAqIEZpeCBlcnJvciB3aXRoIGZhaWxpbmcgaW5jbHVkZSB0YWcgd2hlbiB2YXJpYWJsZSB3YXMgZmlsZSBuYW1lICgjMTYxMykKICAqIERvd25jYXNlIGxleGVycyBiZWZvcmUgcGFzc2luZyB0aGVtIHRvIHB5Z21lbnRzICgjMTYxNSkKICAqIENhcGl0YWxpemUgdGhlIHNob3J0IHZlcmJvc2Ugc3dpdGNoIGJlY2F1c2UgaXQgY29uZmxpY3RzIHdpdGggdGhlIGJ1aWx0LWluIENvbW1hbmRlciBzd2l0Y2ggKCMxNjYwKQogICogRml4IGNvbXBhdGliaWxpdHkgd2l0aCAxLjgueCAoIzE2NjUpCiAgKiBGaXggYW4gZXJyb3Igd2l0aCB0aGUgbmV3IGZpbGUgd2F0Y2hpbmcgY29kZSBkdWUgdG8gbGlicmFyeSB2ZXJzaW9uIGluY29tcGF0aWJpbGl0aWVzICgjMTY4NykKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIEFkZCBjb3ZlcmFnZSByZXBvcnRpbmcgd2l0aCBDb3ZlcmFsbHMgKCMxNTM5KQogICogUmVmYWN0b3IgdGhlIExpcXVpZCBgaW5jbHVkZWAgdGFnICgjMTQ5MCkKICAqIFVwZGF0ZSBsYXVuY2h5IGRlcGVuZGVuY3kgdG8gYH4+IDIuM2AgKCMxNjA4KQogICogVXBkYXRlIHJyIGRlcGVuZGVuY3kgdG8gYH4+IDEuMWAgKCMxNjA0KQogICogVXBkYXRlIGN1Y3VtYmVyIGRlcGVuZGVuY3kgdG8gYH4+IDEuM2AgKCMxNjA3KQogICogVXBkYXRlIGNvdmVyYWxscyBkZXBlbmRlbmN5IHRvIGB+PiAwLjcuMGAgKCMxNjA2KQogICogVXBkYXRlIHJha2UgZGVwZW5kZW5jeSB0byBgfj4gMTAuMWAgKCMxNjAzKQogICogQ2xlYW4gdXAgYHNpdGUucmJgIGNvbW1lbnRzIHRvIGJlIG1vcmUgY29uY2lzZS91bmlmb3JtICgjMTYxNikKICAqIFVzZSB0aGUgbWFzdGVyIGJyYW5jaCBmb3IgdGhlIGJ1aWxkIGJhZGdlIGluIHRoZSByZWFkbWUgKCMxNjM2KQogICogUmVmYWN0b3IgU2l0ZSNyZW5kZXIgKCMxNjM4KQogICogUmVtb3ZlIGR1cGxpY2F0aW9uIGluIGNvbW1hbmQgbGluZSBvcHRpb25zICgjMTYzNykKICAqIEFkZCB0ZXN0cyBmb3IgYWxsIHRoZSBjb2RlcmF5IG9wdGlvbnMgKCMxNTQzKQogICogSW1wcm92ZSBzb21lIG9mIHRoZSBDdWN1bWJlciB0ZXN0IGNvZGUgKCMxNDkzKQogICogSW1wcm92ZSBjb21wYXJpc29ucyBvZiB0aW1lc3RhbXBzIGJ5IGlnbm9yaW5nIHRoZSBzZWNvbmRzICgjMTU4MikKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIEZpeCBwYXJhbXMgZm9yIGBKZWt5bGxJbXBvcnQ6OldvcmRQcmVzcy5wcm9jZXNzYCBhcmd1bWVudHMgKCMxNTU0KQogICogQWRkIGBqZWt5bGwtc3VnZ2VzdGVkLXR3ZWV0YCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMxNTU1KQogICogTGluayB0byBMaXF1aWQncyBkb2NzIGZvciB0YWdzIGFuZCBmaWx0ZXJzICgjMTU1MykKICAqIEFkZCBub3RlIGFib3V0IGluc3RhbGxpbmcgWGNvZGUgb24gdGhlIE1hYyBpbiB0aGUgSW5zdGFsbGF0aW9uIGRvY3MgKCMxNTYxKQogICogU2ltcGxpZnkvZ2VuZXJhbGl6ZSBwYWdpbmF0aW9uIGRvY3MgKCMxNTc3KQogICogQWRkIGRvY3VtZW50YXRpb24gZm9yIHRoZSBuZXcgZGF0YSBzb3VyY2VzIGZlYXR1cmUgKCMxNTAzKQogICogQWRkIG1vcmUgaW5mb3JtYXRpb24gb24gaG93IHRvIGNyZWF0ZSBnZW5lcmF0b3JzICgjMTU5MCwgIzE1OTIpCiAgKiBJbXByb3ZlIHRoZSBpbnN0cnVjdGlvbnMgZm9yIG1pbWlja2luZyBHaXRIdWIgRmxhdm9yZWQgTWFya2Rvd24gKCMxNjE0KQogICogQWRkIGBqZWt5bGwtaW1wb3J0YCB3YXJuaW5nIG5vdGUgb2YgbWlzc2luZyBkZXBlbmRlbmNpZXMgKCMxNjI2KQogICogRml4IGdyYW1tYXIgaW4gdGhlIFVzYWdlIHNlY3Rpb24gKCMxNjM1KQogICogQWRkIGRvY3VtZW50YXRpb24gZm9yIHRoZSB1c2Ugb2YgZ2VtcyBhcyBwbHVnaW5zICgjMTY1NikKICAqIERvY3VtZW50IHRoZSBleGlzdGVuY2Ugb2YgYSBmZXcgYWRkaXRpb25hbCBwbHVnaW5zICgjMTQwNSkKICAqIERvY3VtZW50IHRoYXQgdGhlIGBkYXRlX3RvX3N0cmluZ2AgYWx3YXlzIHJldHVybnMgYSB0d28gZGlnaXQgZGF5ICgjMTY2MykKICAqIEZpeCBuYXZpZ2F0aW9uIGluIHRoZSAiV29ya2luZyB3aXRoIERyYWZ0cyIgcGFnZSAoIzE2NjcpCiAgKiBGaXggYW4gZXJyb3Igd2l0aCB0aGUgZGF0YSBkb2N1bWVudGF0aW9uICgjMTY5MSkKCiMjIDEuMi4xIC8gMjAxMy0wOS0xNAoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFByaW50IGJldHRlciBtZXNzYWdlcyBmb3IgZGV0YWNoZWQgc2VydmVyLiBNdXRlIG91dHB1dCBvbiBkZXRhY2guICgjMTUxOCkKICAqIERpc2FibGUgcmV2ZXJzZSBsb29rdXAgd2hlbiBydW5uaW5nIGBqZWt5bGwgc2VydmVgICgjMTM2MykKICAqIFVwZ3JhZGUgUmVkQ2FycGV0IGRlcGVuZGVuY3kgdG8gYH4+IDIuMy4wYCAoIzE1MTUpCiAgKiBVcGdyYWRlIHRvIExpcXVpZCBgPj0gMi41LjIsIDwgMi42YCAoIzE1MzYpCgojIyMgQnVnIEZpeGVzCgogICogRml4IGZpbGUgZGlzY3JlcGFuY3kgaW4gZ2Vtc3BlYyAoIzE1MjIpCiAgKiBGb3JjZSByZW5kZXJpbmcgb2YgSW5jbHVkZSB0YWcgKCMxNTI1KQoKIyMjIERldmVsb3BtZW50IEZpeGVzCgogICogQWRkIGEgcmFrZSB0YXNrIHRvIGdlbmVyYXRlIGEgbmV3IHJlbGVhc2UgcG9zdCAoIzE0MDQpCiAgKiBNdXRlIExTSSBvdXRwdXQgaW4gdGVzdHMgKCMxNTMxKQogICogVXBkYXRlIGNvbnRyaWJ1dG9yIGRvY3VtZW50YXRpb24gKCMxNTM3KQoKIyMjIFNpdGUgRW5oYW5jZW1lbnRzCgogICogRml4IGEgY291cGxlIG9mIHZhbGlkYXRpb24gZXJyb3JzIG9uIHRoZSBzaXRlICgjMTUxMSkKICAqIE1ha2UgbmF2aWdhdGlvbiBtZW51cyByZXVzYWJsZSAoIzE1MDcpCiAgKiBGaXggbGluayB0byBIaXN0b3J5IHBhZ2UgZnJvbSBSZWxlYXNlIHYxLjIuMCBub3RlcyBwb3N0LgogICogRml4IG1hcmt1cCBpbiBIaXN0b3J5IGZpbGUgZm9yIGNvbW1hbmQgbGluZSBvcHRpb25zICgjMTUxMikKICAqIEV4cGFuZCAxLjIgcmVsZWFzZSBwb3N0IHRpdGxlIHRvIDEuMi4wICgjMTUxNikKCiMjIDEuMi4wIC8gMjAxMy0wOS0wNgoKIyMjIE1ham9yIEVuaGFuY2VtZW50cwoKICAqIERpc2FibGUgYXV0b21hdGljYWxseS1nZW5lcmF0ZWQgZXhjZXJwdHMgd2hlbiBgZXhjZXJwdF9zZXBhcmF0b3JgIGlzIGAiImAuICgjMTM4NikKICAqIEFkZCBjaGVja2luZyBmb3IgVVJMIGNvbmZsaWN0cyB3aGVuIHJ1bm5pbmcgYGpla3lsbCBkb2N0b3JgICgjMTM4OSkKCiMjIyBNaW5vciBFbmhhbmNlbWVudHMKCiAgKiBDYXRjaCBhbmQgZml4IGludmFsaWQgYHBhZ2luYXRlYCB2YWx1ZXMgKCMxMzkwKQogICogUmVtb3ZlIHN1cGVyZmx1b3VzIGBkaXYuY29udGFpbmVyYCBmcm9tIHRoZSBkZWZhdWx0IGh0bWwgdGVtcGxhdGUgZm9yIGBqZWt5bGwgbmV3YCAoIzEzMTUpCiAgKiBBZGQgYC1EYCBzaG9ydC1mb3JtIHN3aXRjaCBmb3IgdGhlIGRyYWZ0cyBvcHRpb24gKCMxMzk0KQogICogVXBkYXRlIHRoZSBsaW5rcyBpbiB0aGUgc2l0ZSB0ZW1wbGF0ZSBmb3IgVHdpdHRlciBhbmQgR2l0SHViICgjMTQwMCkKICAqIFVwZGF0ZSBkdW1teSBlbWFpbCBhZGRyZXNzIHRvIGV4YW1wbGUuY29tIGRvbWFpbiAoIzE0MDgpCiAgKiBVcGRhdGUgbm9ybWFsaXplLmNzcyB0byB2Mi4xLjIgYW5kIG1pbmlmeTsgYWRkIHJha2UgdGFzayB0byB1cGRhdGUgbm9ybWFsaXplLmNzcyB3aXRoIGdyZWF0ZXIgZWFzZS4gKCMxNDMwKQogICogQWRkIHRoZSBhYmlsaXR5IHRvIGRldGFjaCB0aGUgc2VydmVyIHJhbiBieSBgamVreWxsIHNlcnZlYCBmcm9tIGl0J3MgY29udHJvbGxpbmcgdGVybWluYWwgKCMxNDQzKQogICogSW1wcm92ZSBwZXJtYWxpbmsgZ2VuZXJhdGlvbiBmb3IgVVJMcyB3aXRoIHNwZWNpYWwgY2hhcmFjdGVycyAoIzk0NCkKICAqIEV4cG9zZSB0aGUgY3VycmVudCBKZWt5bGwgdmVyc2lvbiB0byBwb3N0cyBhbmQgcGFnZXMgdmlhIGEgbmV3IGBqZWt5bGwudmVyc2lvbmAgdmFyaWFibGUgKCMxNDgxKQoKIyMjIEJ1ZyBGaXhlcwoKICAqIE1hcmtkb3duIGV4dGVuc2lvbiBtYXRjaGluZyBtYXRjaGVzIG9ubHkgZXhhY3QgbWF0Y2hlcyAoIzEzODIpCiAgKiBGaXhlZCBOb01ldGhvZEVycm9yIHdoZW4gbWVzc2FnZSBwYXNzZWQgdG8gYFN0ZXZlbnNvbiNtZXNzYWdlYCBpcyBuaWwgKCMxMzg4KQogICogVXNlIGJpbmFyeSBtb2RlIHdoZW4gd3JpdGluZyBmaWxlICgjMTM2NCkKICAqIEZpeCAndW5kZWZpbmVkIG1ldGhvZCBgZW5jb2RpbmdgIGZvciAibWFpbHRvIicgZXJyb3JzIHcvIFJ1YnkgMS44IGFuZCBLcmFtZG93biA+IDAuMTQuMCAoIzEzOTcpCiAgKiBEbyBub3QgZm9yY2UgdGhlIHBlcm1hbGluayB0byBiZSBhIGRpciBpZiBpdCBlbmRzIG9uIC5odG1sICgjOTYzKQogICogV2hlbiBhIExpcXVpZCBFeGNlcHRpb24gaXMgY2F1Z2h0LCBzaG93IHRoZSBmdWxsIHBhdGggcmVsLiB0byBzaXRlIHNvdXJjZSAoIzE0MTUpCiAgKiBQcm9wZXJseSByZWFkIGluIHRoZSBjb25maWcgb3B0aW9ucyB3aGVuIHNlcnZpbmcgdGhlIGRvY3MgbG9jYWxseSAoIzE0NDQpCiAgKiBGaXhlZCBgLS1sYXlvdXRzYCBvcHRpb24gZm9yIGBidWlsZGAgYW5kIGBzZXJ2ZWAgY29tbWFuZHMgKCMxNDU4KQogICogUmVtb3ZlIGtyYW1kb3duIGFzIGEgcnVudGltZSBkZXBlbmRlbmN5IHNpbmNlIGl0J3Mgb3B0aW9uYWwgKCMxNDk4KQogICogUHJvdmlkZSBwcm9wZXIgZXJyb3IgaGFuZGxpbmcgZm9yIGludmFsaWQgZmlsZSBuYW1lcyBpbiB0aGUgaW5jbHVkZSB0YWcgKCMxNDk0KQoKIyMjIERldmVsb3BtZW50IEZpeGVzCgogICogUmVtb3ZlIHJlZHVuZGFudCBhcmd1bWVudCB0byBKZWt5bGw6OkNvbW1hbmRzOjpOZXcjc2NhZmZvbGRfcG9zdF9jb250ZW50ICgjMTM1NikKICAqIEFkZCBuZXcgZGVwZW5kZW5jaWVzIHRvIHRoZSBSRUFETUUgKCMxMzYwKQogICogRml4IGxpbmsgdG8gY29udHJpYnV0aW5nIHBhZ2UgaW4gUkVBRE1FICgjMTQyNCkKICAqIFVwZGF0ZSBUb21Eb2MgaW4gUGFnZXIjaW5pdGlhbGl6ZSB0byBtYXRjaCBwYXJhbXMgKCMxNDQxKQogICogUmVmYWN0b3IgYFNpdGUjY2xlYW51cGAgaW50byBgSmVreWxsOjpTaXRlOjpDbGVhbmVyYCBjbGFzcyAoIzE0MjkpCiAgKiBTZXZlcmFsIG90aGVyIHNtYWxsIG1pbm9yIHJlZmFjdG9yaW5ncyAoIzEzNDEpCiAgKiBJZ25vcmUgYF9zaXRlYCBpbiBqZWt5bGxyYi5jb20gZGVwbG95ICgjMTQ4MCkKICAqIEFkZCBHZW0gdmVyc2lvbiBhbmQgZGVwZW5kZW5jeSBiYWRnZSB0byBSRUFETUUgKCMxNDk3KQoKIyMjIFNpdGUgRW5oYW5jZW1lbnRzCgogICogQWRkIGluZm8gYWJvdXQgbmV3IHJlbGVhc2VzICgjMTM1MykKICAqIFVwZGF0ZSBwbHVnaW4gbGlzdCB3aXRoIGpla3lsbC1yc3MgcGx1Z2luICgjMTM1NCkKICAqIFVwZGF0ZSB0aGUgc2l0ZSBsaXN0IHBhZ2Ugd2l0aCBSdWJ5J3Mgb2ZmaWNpYWwgc2l0ZSAoIzEzNTgpCiAgKiBBZGQgYGpla3lsbC1kaXRhYWAgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMTM3MCkKICAqIEFkZCBgcG9zdGZpbGVzYCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMxMzczKQogICogRm9yIGludGVybmFsIGxpbmtzLCB1c2UgZnVsbCBwYXRoIGluY2x1ZGluZyB0cmFpbGluZyBgL2AgKCMxNDExKQogICogVXNlIGN1cmx5IGFwb3N0cm9waGVzIGluIHRoZSBkb2NzICgjMTQxOSkKICAqIFVwZGF0ZSB0aGUgZG9jcyBmb3IgUmVkY2FycGV0IGluIEpla3lsbCAoIzE0MTgpCiAgKiBBZGQgYHBsdXJhbGl6ZWAgYW5kIGByZWFkaW5nX3RpbWVgIGZpbHRlcnMgdG8gZG9jcyAoIzE0MzkpCiAgKiBGaXggbWFya3VwIGZvciB0aGUgS3JhbWRvd24gb3B0aW9ucyAoIzE0NDUpCiAgKiBGaXggdHlwb3MgaW4gdGhlIEhpc3RvcnkgZmlsZSAoIzE0NTQpCiAgKiBBZGQgdHJhaWxpbmcgc2xhc2ggdG8gc2l0ZSdzIHBvc3QgVVJMICgjMTQ2MikKICAqIENsYXJpZnkgdGhhdCBgLS1jb25maWdgIHdpbGwgdGFrZSBtdWx0aXBsZSBmaWxlcyAoIzE0NzQpCiAgKiBGaXggZG9jcy90ZW1wbGF0ZXMubWQgcHJpdmF0ZSBnaXN0IGV4YW1wbGUgKCMxNDc3KQogICogVXNlIGBzaXRlLnJlcG9zaXRvcnlgIGZvciBKZWt5bGwncyBHaXRIdWIgVVJMICgjMTQ2MykKICAqIEFkZCBgamVreWxsLXBhZ2VsZXNzLXJlZGlyZWN0c2AgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMTQ4NikKICAqIENsYXJpZnkgdGhhdCBgZGF0ZV90b194bWxzY2hlbWFgIHJldHVybnMgYW4gSVNPIDg2MDEgc3RyaW5nICgjMTQ4OCkKICAqIEFkZCBgamVreWxsLWdvb2QtaW5jbHVkZWAgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMTQ5MSkKICAqIFhNTCBlc2NhcGUgdGhlIGJsb2cgcG9zdCB0aXRsZSBpbiBvdXIgZmVlZCAoIzE1MDEpCiAgKiBBZGQgYGpla3lsbC10b2MtZ2VuZXJhdG9yYCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMxNTA2KQoKIyMgMS4xLjIgLyAyMDEzLTA3LTI1CgojIyMgQnVnIEZpeGVzCgogICogUmVxdWlyZSBMaXF1aWQgMi41LjEgKCMxMzQ5KQoKIyMgMS4xLjEgLyAyMDEzLTA3LTI0CgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogUmVtb3ZlIHN1cGVyZmx1b3VzIGB0YWJsZWAgc2VsZWN0b3IgZnJvbSBtYWluLmNzcyBpbiBgamVreWxsIG5ld2AgdGVtcGxhdGUgKCMxMzI4KQogICogQWJvcnQgd2l0aCBub24temVybyBleGl0IGNvZGVzICgjMTMzOCkKCiMjIyBCdWcgRml4ZXMKCiAgKiBGaXggdXAgdGhlIHJlbmRlcmluZyBvZiBleGNlcnB0cyAoIzEzMzkpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBBZGQgSmVreWxsIEltYWdlIFRhZyB0byB0aGUgcGx1Z2lucyBsaXN0ICgjMTMwNikKICAqIFJlbW92ZSBlcnJvbmVvdXMgc3RhdGVtZW50IHRoYXQgYHNpdGUucGFnZXNgIGFyZSBzb3J0ZWQgYWxwaGFiZXRpY2FsbHkuCiAgKiBBZGQgaW5mbyBhYm91dCB0aGUgYF9kcmFmdHNgIGRpcmVjdG9yeSB0byB0aGUgZGlyZWN0b3J5IHN0cnVjdHVyZSBkb2NzICgjMTMyMCkKICAqIEltcHJvdmUgdGhlIGxheW91dCBvZiB0aGUgcGx1Z2luIGxpc3RpbmcgYnkgb3JnYW5pemluZyBpdCBpbnRvIGNhdGVnb3JpZXMgKCMxMzEwKQogICogQWRkIGdlbmVyYXRvci1qZWt5bGxyYiBhbmQgZ3J1bnQtamVreWxsIHRvIHBsdWdpbnMgcGFnZSAoIzEzMzApCiAgKiBNZW50aW9uIEtyYW1kb3duIGFzIG9wdGlvbiBmb3IgbWFya2Rvd24gcGFyc2VyIG9uIEV4dHJhcyBwYWdlICgjMTMxOCkKICAqIFVwZGF0ZSBRdWljay1TdGFydCBwYWdlIHRvIGluY2x1ZGUgcmVtaW5kZXIgdGhhdCBhbGwgcmVxdWlyZW1lbnRzIG11c3QgYmUgaW5zdGFsbGVkICgjMTMyNykKICAqIENoYW5nZSBmaWxlbmFtZSBpbiBgaW5jbHVkZWAgZXhhbXBsZSB0byBhbiBIVE1MIGZpbGUgc28gYXMgbm90IHRvIGluZGljYXRlIHRoYXQgSmVreWxsIHdpbGwgYXV0b21hdGljYWxseSBjb252ZXJ0IHRoZW0uICgjMTMwMykKICAqIEFkZCBhbiBSU1MgZmVlZCBmb3IgY29tbWl0cyB0byBKZWt5bGwgKCMxMzQzKQoKIyMgMS4xLjAgLyAyMDEzLTA3LTE0CgojIyMgTWFqb3IgRW5oYW5jZW1lbnRzCgogICogQWRkIGBkb2NzYCBzdWJjb21tYW5kIHRvIHJlYWQgSmVreWxsJ3MgZG9jcyB3aGVuIG9mZmxpbmUuICgjMTA0NikKICAqIFN1cHBvcnQgcGFzc2luZyBwYXJhbWV0ZXJzIHRvIHRlbXBsYXRlcyBpbiBgaW5jbHVkZWAgdGFnICgjMTIwNCkKICAqIEFkZCBzdXBwb3J0IGZvciBMaXF1aWQgdGFncyB0byBwb3N0IGV4Y2VycHRzICgjMTMwMikKCiMjIyBNaW5vciBFbmhhbmNlbWVudHMKCiAgKiBTZWFyY2ggdGhlIGhpZXJhcmNoeSBvZiBwYWdpbmF0aW9uIHBhdGggdXAgdG8gc2l0ZSByb290IHRvIGRldGVybWluZSB0ZW1wbGF0ZSBwYWdlIGZvciBwYWdpbmF0aW9uLiAoIzExOTgpCiAgKiBBZGQgdGhlIGFiaWxpdHkgdG8gZ2VuZXJhdGUgYSBuZXcgSmVreWxsIHNpdGUgd2l0aG91dCBhIHRlbXBsYXRlICgjMTE3MSkKICAqIFVzZSByZWRjYXJwZXQgYXMgdGhlIGRlZmF1bHQgbWFya2Rvd24gZW5naW5lIGluIG5ld2x5IGdlbmVyYXRlZCBzaXRlcyAoIzEyNDUsICMxMjQ3KQogICogQWRkIGByZWRjYXJwZXRgIGFzIGEgcnVudGltZSBkZXBlbmRlbmN5IHNvIGBqZWt5bGwgYnVpbGRgIHdvcmtzIG91dC1vZi10aGUtYm94IGZvciBuZXcgc2l0ZXMuICgjMTI0NykKICAqIEluIHRoZSBnZW5lcmF0ZWQgc2l0ZSwgcmVtb3ZlIGZpbGVzIHRoYXQgd2lsbCBiZSByZXBsYWNlZCBieSBhIGRpcmVjdG9yeSAoIzExMTgpCiAgKiBGYWlsIGxvdWRseSBpZiBhIHVzZXItc3BlY2lmaWVkIGNvbmZpZ3VyYXRpb24gZmlsZSBkb2Vzbid0IGV4aXN0ICgjMTA5OCkKICAqIEFsbG93IGZvciBhbGwgb3B0aW9ucyBmb3IgS3JhbWRvd24gSFRNTCBDb252ZXJ0ZXIgKCMxMjAxKQoKIyMjIEJ1ZyBGaXhlcwoKICAqIEZpeCBwYWdpbmF0aW9uIGluIHN1YmRpcmVjdG9yaWVzLiAoIzExOTgpCiAgKiBGaXggYW4gaXNzdWUgd2l0aCBkaXJlY3RvcmllcyBhbmQgcGVybWFsaW5rcyB0aGF0IGhhdmUgYSBwbHVzIHNpZ24gKCspIGluIHRoZW0gKCMxMjE1KQogICogUHJvdmlkZSBiZXR0ZXIgZXJyb3IgcmVwb3J0aW5nIHdoZW4gZ2VuZXJhdGluZyBzaXRlcyAoIzEyNTMpCiAgKiBMYXRlc3QgcG9zdHMgZmlyc3QgaW4gbm9uLUxTSSBgcmVsYXRlZF9wb3N0c2AgKCMxMjcxKQoKIyMjIERldmVsb3BtZW50IEZpeGVzCgogICogTWVyZ2UgdGhlIHRoZW1lIGFuZCBsYXlvdXQgQ3VjdW1iZXIgc3RlcHMgaW50byBvbmUgc3RlcCAoIzExNTEpCiAgKiBSZXN0cmljdCBhY3RpdmVzdXBwb3J0IGRlcGVuZGVuY3kgdG8gcHJlLTQuMC4wIHRvIG1haW50YWluIGNvbXBhdGliaWxpdHkgd2l0aCBgPD0gMS45LjJgCiAgKiBJbmNsdWRlL2V4Y2x1ZGUgZGVwcmVjYXRpb24gaGFuZGxpbmcgc2ltcGxpZmljYXRpb24gKCMxMjg0KQogICogQ29udmVydCBSRUFETUUgdG8gTWFya2Rvd24uICgjMTI2NykKICAqIFJlZmFjdG9yIEpla3lsbDo6U2l0ZSAoIzExNDQpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBBZGQgIk5ld3MiIHNlY3Rpb24gZm9yIHJlbGVhc2Ugbm90ZXMsIGFsb25nIHdpdGggYW4gUlNTIGZlZWQgKCMxMDkzLCAjMTI4NSwgIzEyODYpCiAgKiBBZGQgIkhpc3RvcnkiIHBhZ2UuCiAgKiBSZXN0cnVjdHVyZWQgZG9jcyBzZWN0aW9ucyB0byBpbmNsdWRlICJNZXRhIiBzZWN0aW9uLgogICogQWRkIG1lc3NhZ2UgdG8gIlRlbXBsYXRlcyIgcGFnZSB0aGF0IHNwZWNpZmllcyB0aGF0IFB5dGhvbiBtdXN0IGJlIGluc3RhbGxlZCBpbiBvcmRlciB0byB1c2UgUHlnbWVudHMuICgjMTE4MikKICAqIFVwZGF0ZSBsaW5rIHRvIHRoZSBvZmZpY2lhbCBNYXJ1a3UgcmVwbyAoIzExNzUpCiAgKiBBZGQgZG9jdW1lbnRhdGlvbiBhYm91dCBgcGFnaW5hdGVfcGF0aGAgdG8gIlRlbXBsYXRlcyIgcGFnZSBpbiBkb2NzICgjMTEyOSkKICAqIEdpdmUgdGhlIHF1aWNrLXN0YXJ0IGd1aWRlIGl0cyBvd24gcGFnZSAoIzExOTEpCiAgKiBVcGRhdGUgUHJvVGlwIG9uIEluc3RhbGxhdGlvbiBwYWdlIGluIGRvY3MgdG8gcG9pbnQgdG8gYWxsIHRoZSBpbmZvIGFib3V0IFB5Z21lbnRzIGFuZCB0aGUgJ2hpZ2hsaWdodCcgdGFnLiAoIzExOTYpCiAgKiBSdW4gYHNpdGUvaW1nYCB0aHJvdWdoIEltYWdlT3B0aW0gKHRoYW5rcyBAcXJ1c2ghKSAoIzEyMDgpCiAgKiBBZGRlZCBKYWRlIENvbnZlcnRlciB0byBgc2l0ZS9kb2NzL3BsdWdpbnNgICgjMTIxMCkKICAqIEZpeCBsb2NhdGlvbiBvZiBkb2NzIHBhZ2VzIGluIENvbnRyaWJ1dGluZyBwYWdlcyAoIzEyMTQpCiAgKiBBZGQgUmVhZEluWE1pbnV0ZXMgcGx1Z2luIHRvIHRoZSBwbHVnaW4gbGlzdCAoIzEyMjIpCiAgKiBSZW1vdmUgcGx1Z2lucyBmcm9tIHRoZSBwbHVnaW4gbGlzdCB0aGF0IGhhdmUgZXF1aXZhbGVudHMgaW4gSmVreWxsIHByb3BlciAoIzEyMjMpCiAgKiBBZGQgamVreWxsLWFzc2V0cyB0byB0aGUgcGx1Z2luIGxpc3QgKCMxMjI1KQogICogQWRkIGpla3lsbC1wYW5kb2MtbXVsaXRwbGUtZm9ybWF0cyB0byB0aGUgcGx1Z2luIGxpc3QgKCMxMjI5KQogICogUmVtb3ZlIGRlYWQgbGluayB0byAiVXNpbmcgR2l0IHRvIG1haW50YWluIHlvdXIgYmxvZyIgKCMxMjI3KQogICogVGlkeSB1cCB0aGUgdGhpcmQtcGFydHkgcGx1Z2lucyBsaXN0aW5nICgjMTIyOCkKICAqIFVwZGF0ZSBjb250cmlidXRvciBpbmZvcm1hdGlvbiAoIzExOTIpCiAgKiBVcGRhdGUgVVJMIG9mIGFydGljbGUgYWJvdXQgQmxvZ2dlciBtaWdyYXRpb24gKCMxMjQyKQogICogU3BlY2lmeSB0aGF0IFJlZENhcnBldCBpcyB0aGUgZGVmYXVsdCBmb3IgbmV3IEpla3lsbCBzaXRlcyBvbiBRdWlja3N0YXJ0IHBhZ2UgKCMxMjQ3KQogICogQWRkZWQgYHNpdGUucGFnZXNgIHRvIFZhcmlhYmxlcyBwYWdlIGluIGRvY3MgKCMxMjUxKQogICogQWRkIFlvdWt1IGFuZCBUdWRvdSBFbWJlZCBsaW5rIG9uIFBsdWdpbnMgcGFnZS4gKCMxMjUwKQogICogQWRkIG5vdGUgdGhhdCBgZ2lzdGAgdGFnIHN1cHBvcnRzIHByaXZhdGUgZ2lzdHMuICgjMTI0OCkKICAqIEFkZCBgamVreWxsLXRpbWVhZ29gIHRvIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucy4gKCMxMjYwKQogICogQWRkIGBqZWt5bGwtc3dmb2JqZWN0YCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMuICgjMTI2MykKICAqIEFkZCBgamVreWxsLXBpY3R1cmUtdGFnYCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMuICgjMTI4MCkKICAqIFVwZGF0ZSB0aGUgR2l0SHViIFBhZ2VzIGRvY3VtZW50YXRpb24gcmVnYXJkaW5nIHJlbGF0aXZlIFVSTHMgKCMxMjkxKQogICogVXBkYXRlIHRoZSBTMyBkZXBsb3ltZW50IGRvY3VtZW50YXRpb24gKCMxMjk0KQogICogQWRkIHN1Z2dlc3Rpb24gZm9yIFhjb2RlIENMVCBpbnN0YWxsIHRvIHRyb3VibGVzaG9vdGluZyBwYWdlIGluIGRvY3MgKCMxMjk2KQogICogQWRkICdXb3JraW5nIHdpdGggZHJhZnRzJyBwYWdlIHRvIGRvY3MgKCMxMjg5KQogICogQWRkIGluZm9ybWF0aW9uIGFib3V0IHRpbWUgem9uZXMgdG8gdGhlIGRvY3VtZW50YXRpb24gZm9yIGEgcGFnZSdzIGRhdGUgKCMxMzA0KQoKIyMgMS4wLjMgLyAyMDEzLTA2LTA3CgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogQWRkIHN1cHBvcnQgdG8gZ2lzdCB0YWcgZm9yIHByaXZhdGUgZ2lzdHMuICgjMTE4OSkKICAqIEZhaWwgbG91ZGx5IHdoZW4gTWFydWt1IGVycm9ycyBvdXQgKCMxMTkwKQogICogTW92ZSB0aGUgYnVpbGRpbmcgb2YgcmVsYXRlZCBwb3N0cyBpbnRvIHRoZWlyIG93biBjbGFzcyAoIzEwNTcpCiAgKiBSZW1vdmVkIHRyYWlsaW5nIHNwYWNlcyBpbiBzZXZlcmFsIHBsYWNlcyB0aHJvdWdob3V0IHRoZSBjb2RlICgjMTExNikKICAqIEFkZCBhIGAtLWZvcmNlYCBvcHRpb24gdG8gYGpla3lsbCBuZXdgICgjMTExNSkKICAqIENvbnZlcnQgSURzIGluIHRoZSBzaXRlIHRlbXBsYXRlIHRvIGNsYXNzZXMgKCMxMTcwKQoKIyMjIEJ1ZyBGaXhlcwoKICAqIEZpeCB0eXBvIGluIFN0ZXZlbnNvbiBjb25zdGFudCAiRVJST1IiLiAoIzExNjYpCiAgKiBSZW5hbWUgSmVreWxsOjpMb2dnZXIgdG8gSmVreWxsOjpTdGV2ZW5zb24gdG8gZml4IGluaGVyaXRhbmNlIGlzc3VlICgjMTEwNikKICAqIEV4aXQgd2l0aCBhIG5vbi16ZXJvIGV4aXQgY29kZSB3aGVuIGRlYWxpbmcgd2l0aCBhIExpcXVpZCBlcnJvciAoIzExMjEpCiAgKiBNYWtlIHRoZSBgZXhjbHVkZWAgYW5kIGBpbmNsdWRlYCBvcHRpb25zIGJhY2t3YXJkcyBjb21wYXRpYmxlIHdpdGggdmVyc2lvbnMgb2YgSmVreWxsIHByaW9yIHRvIDEuMCAoIzExMTQpCiAgKiBGaXggcGFnaW5hdGlvbiBvbiBXaW5kb3dzICgjMTA2MykKICAqIEZpeCB0aGUgYXBwbGljYXRpb24gb2YgUHlnbWVudHMnIEdlbmVyaWMgT3V0cHV0IHN0eWxlIHRvIEdvIGNvZGUgKCMxMTU2KQoKIyMjIFNpdGUgRW5oYW5jZW1lbnRzCgogICogQWRkIGEgUHJvIFRpcCB0byBkb2NzIGFib3V0IGZyb250IG1hdHRlciB2YXJpYWJsZXMgYmVpbmcgb3B0aW9uYWwgKCMxMTQ3KQogICogQWRkIGNoYW5nZWxvZyB0byBzaXRlIGFzIEhpc3RvcnkgcGFnZSBpbiAvZG9jcy8gKCMxMDY1KQogICogQWRkIG5vdGUgdG8gVXBncmFkaW5nIHBhZ2UgYWJvdXQgbmV3IGNvbmZpZyBvcHRpb25zIGluIDEuMC54ICgjMTE0NikKICAqIERvY3VtZW50YXRpb24gZm9yIGBkYXRlX3RvX3JmYzgyMmAgYW5kIGB1cmlfZXNjYXBlYCAoIzExNDIpCiAgKiBEb2N1bWVudGF0aW9uIGhpZ2hsaWdodCBib3hlcyBzaG91bGRuJ3Qgc2hvdyBzY3JvbGxiYXJzIGlmIG5vdCBuZWNlc3NhcnkgKCMxMTIzKQogICogQWRkIGxpbmsgdG8gamVreWxsLW1pbmlidW5kbGUgaW4gdGhlIGRvYydzIHBsdWdpbnMgbGlzdCAoIzEwMzUpCiAgKiBRdWljayBwYXRjaCBmb3IgaW1wb3J0ZXJzIGRvY3VtZW50YXRpb24KICAqIEZpeCBwcmVmaXggZm9yIFdvcmRwcmVzc0RvdENvbSBpbXBvcnRlciBpbiBkb2NzICgjMTEwNykKICAqIEFkZCBqZWt5bGwtY29udGVudGJsb2NrcyBwbHVnaW4gdG8gZG9jcyAoIzEwNjgpCiAgKiBNYWtlIGNvZGUgYml0cyBpbiBub3RlcyBsb29rIG1vcmUgbmF0dXJhbCwgbW9yZSByZWFkYWJsZSAoIzEwODkpCiAgKiBGaXggbG9naWMgZm9yIGByZWxhdGl2ZV9wZXJtYWxpbmtzYCBpbnN0cnVjdGlvbnMgb24gVXBncmFkaW5nIHBhZ2UgKCMxMTAxKQogICogQWRkIGRvY3MgZm9yIHBvc3QgZXhjZXJwdCAoIzEwNzIpCiAgKiBBZGQgZG9jcyBmb3IgZ2lzdCB0YWcgKCMxMDcyKQogICogQWRkIGRvY3MgaW5kaWNhdGluZyB0aGF0IFB5Z21lbnRzIGRvZXMgbm90IG5lZWQgdG8gYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgKCMxMDk5LCAjMTExOSkKICAqIFVwZGF0ZSB0aGUgbWlncmF0b3IgZG9jcyB0byBiZSBjdXJyZW50ICgjMTEzNikKICAqIEFkZCB0aGUgSmVreWxsIEdhbGxlcnkgUGx1Z2luIHRvIHRoZSBwbHVnaW4gbGlzdCAoIzExNDMpCgojIyMgRGV2ZWxvcG1lbnQgRml4ZXMKCiAgKiBVc2UgSmVreWxsLmxvZ2dlciBpbnN0ZWFkIG9mIEpla3lsbDo6U3RldmVuc29uIHRvIGxvZyB0aGluZ3MgKCMxMTQ5KQogICogRml4IHBlc2t5IEN1Y3VtYmVyIGluZmluaXRlIGxvb3AgKCMxMTM5KQogICogRG8gbm90IHdyaXRlIHBvc3RzIHdpdGggdGltZXpvbmVzIGluIEN1Y3VtYmVyIHRlc3RzICgjMTEyNCkKICAqIFVzZSBJU08gZm9ybWF0dGVkIGRhdGVzIGluIEN1Y3VtYmVyIGZlYXR1cmVzICgjMTE1MCkKCiMjIDEuMC4yIC8gMjAxMy0wNS0xMgoKIyMjIE1ham9yIEVuaGFuY2VtZW50cwoKICAqIEFkZCBgamVreWxsIGRvY3RvcmAgY29tbWFuZCB0byBjaGVjayBzaXRlIGZvciBhbnkga25vd24gY29tcGF0aWJpbGl0eSBwcm9ibGVtcyAoIzEwODEpCiAgKiBCYWNrd2FyZHMtY29tcGF0aWJpbGl6ZSByZWxhdGl2ZSBwZXJtYWxpbmtzICgjMTA4MSkKCiMjIyBNaW5vciBFbmhhbmNlbWVudHMKCiAgKiBBZGQgYSBgZGF0YS1sYW5nPSI8bGFuZz4iYCBhdHRyaWJ1dGUgdG8gUmVkY2FycGV0IGNvZGUgYmxvY2tzICgjMTA2NikKICAqIERlcHJlY2F0ZSBvbGQgY29uZmlnIGBzZXJ2ZXJfcG9ydGAsIG1hdGNoIHRvIGBwb3J0YCBpZiBgcG9ydGAgaXNuJ3Qgc2V0ICgjMTA4NCkKICAqIFVwZGF0ZSBweWdtZW50cy5yYiB2ZXJzaW9uIHRvIDAuNS4wICgjMTA2MSkKICAqIFVwZGF0ZSBLcmFtZG93biB2ZXJzaW9uIHRvIDEuMC4yICgjMTA2NykKCiMjIyBCdWcgRml4ZXMKCiAgKiBGaXggaXNzdWUgd2hlbiBjYXRlZ29yaWVzIGFyZSBudW1iZXJzICgjMTA3OCkKICAqIENhdGNoaW5nIHRoYXQgUmVkY2FycGV0IGdlbSBpc24ndCBpbnN0YWxsZWQgKCMxMDU5KQoKIyMjIFNpdGUgRW5oYW5jZW1lbnRzCgogICogQWRkIGRvY3VtZW50YXRpb24gYWJvdXQgYHJlbGF0aXZlX3Blcm1hbGlua3NgICgjMTA4MSkKICAqIFJlbW92ZSBweWdtZW50cy1pbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zLCBhcyBweWdtZW50cy5yYiBpcyBidW5kbGVkIHdpdGggaXQgKCMxMDc5KQogICogTW92ZSBwYWdlcyB0byBiZSBQYWdlcyBmb3IgcmVhbHogKCM5ODUpCiAgKiBVcGRhdGVkIGxpbmtzIHRvIExpcXVpZCBkb2N1bWVudGF0aW9uICgjMTA3MykKCiMjIDEuMC4xIC8gMjAxMy0wNS0wOAoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIERvIG5vdCBmb3JjZSB1c2Ugb2YgYHRvY190b2tlbmAgd2hlbiB1c2luZyBgZ2VuZXJhdGVfdG9rYCBpbiBSRGlzY291bnQgKCMxMDQ4KQogICogQWRkIG5ld2VyIGBsYW5ndWFnZS1gIGNsYXNzIG5hbWUgcHJlZml4IHRvIGNvZGUgYmxvY2tzICgjMTAzNykKICAqIENvbW1hbmRlciBlcnJvciBtZXNzYWdlIG5vdyBwcmVmZXJyZWQgb3ZlciBwcm9jZXNzIGFib3J0IHdpdGggaW5jb3JyZWN0IGFyZ3MgKCMxMDQwKQoKIyMjIEJ1ZyBGaXhlcwoKICAqIE1ha2UgUmVkY2FycGV0IHJlc3BlY3QgdGhlIHB5Z21lbnRzIGNvbmZpZ3VyYXRpb24gb3B0aW9uICgjMTA1MykKICAqIEZpeCB0aGUgaW5kZXggYnVpbGQgd2l0aCBMU0kgKCMxMDQ1KQogICogRG9uJ3QgcHJpbnQgZGVwcmVjYXRpb24gd2FybmluZyB3aGVuIG5vIGFyZ3VtZW50cyBhcmUgc3BlY2lmaWVkLiAoIzEwNDEpCiAgKiBBZGQgbWlzc2luZyBgPC9kaXY+YCB0byBzaXRlIHRlbXBsYXRlIHVzZWQgYnkgYG5ld2Agc3ViY29tbWFuZCwgZml4ZWQgdHlwb3MgaW4gY29kZSAoIzEwMzIpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBDaGFuZ2VkIGh0dHBzIHRvIGh0dHAgaW4gdGhlIEdpdEh1YiBQYWdlcyBsaW5rICgjMTA1MSkKICAqIFJlbW92ZSBDU1MgY3J1ZnQsIGZpeCB0eXBvcywgZml4IEhUTUwgZXJyb3JzICgjMTAyOCkKICAqIFJlbW92aW5nIG1hbnVhbCBpbnN0YWxsIG9mIFBpcCBhbmQgRGlzdHJpYnV0ZSAoIzEwMjUpCiAgKiBVcGRhdGVkIFVSTCBmb3IgTWFya2Rvd24gcmVmZXJlbmNlcyBwbHVnaW4gKCMxMDIyKQoKIyMjIERldmVsb3BtZW50IEZpeGVzCgogICogTWFya2Rvd25pZnkgaGlzdG9yeSBmaWxlICgjMTAyNykKICAqIFVwZGF0ZSBsaW5rcyBvbiBSRUFETUUgdG8gcG9pbnQgdG8gbmV3IGpla3lsbHJiLmNvbSAoIzEwMTgpCgojIyAxLjAuMCAvIDIwMTMtMDUtMDYKCiMjIyBNYWpvciBFbmhhbmNlbWVudHMKCiAgKiBBZGQgYGpla3lsbCBuZXdgIHN1YmNvbW1hbmQ6IGdlbmVyYXRlIGEgSmVreWxsIHNjYWZmb2xkICgjNzY0KQogICogUmVmYWN0b3JlZCBKZWt5bGwgY29tbWFuZHMgaW50byBzdWJjb21tYW5kczogYnVpbGQsIHNlcnZlLCBhbmQgbWlncmF0ZS4gKCM2OTApCiAgKiBSZW1vdmVkIGltcG9ydGVycy9taWdyYXRvcnMgZnJvbSBtYWluIHByb2plY3QsIG1pZ3JhdGVkIHRvIGpla3lsbC1pbXBvcnQgc3ViLWdlbSAoIzc5MykKICAqIEFkZGVkIGFiaWxpdHkgdG8gcmVuZGVyIGRyYWZ0cyBpbiBgX2RyYWZ0c2AgZm9sZGVyIHZpYSBjb21tYW5kIGxpbmUgKCM4MzMpCiAgKiBBZGQgb3JkaW5hbCBkYXRlIHBlcm1hbGluayBzdHlsZSAoLzpjYXRlZ29yaWVzLzp5ZWFyLzp5X2RheS86dGl0bGUuaHRtbCkgKCM5MjgpCgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogU2l0ZSB0ZW1wbGF0ZSBIVE1MNS1pZmllZCAoIzk2NCkKICAqIFVzZSBwb3N0J3MgZGlyZWN0b3J5IHBhdGggd2hlbiBtYXRjaGluZyBmb3IgdGhlIGBwb3N0X3VybGAgdGFnICgjOTk4KQogICogTG9vc2VuIGRlcGVuZGVuY3kgb24gUHlnbWVudHMgc28gaXQncyBvbmx5IHJlcXVpcmVkIHdoZW4gaXQncyBuZWVkZWQgKCMxMDE1KQogICogUGFyc2Ugc3RyaW5ncyBpbnRvIFRpbWUgb2JqZWN0cyBmb3IgZGF0ZS1yZWxhdGVkIExpcXVpZCBmaWx0ZXJzICgjMTAxNCkKICAqIFRlbGwgdGhlIHVzZXIgaWYgdGhlcmUgaXMgbm8gc3ViY29tbWFuZCBzcGVjaWZpZWQgKCMxMDA4KQogICogRnJlYWsgb3V0IGlmIHRoZSBkZXN0aW5hdGlvbiBvZiBgamVreWxsIG5ld2AgZXhpc3RzIGFuZCBpcyBub24tZW1wdHkgKCM5ODEpCiAgKiBBZGQgYHRpbWV6b25lYCBjb25maWd1cmF0aW9uIG9wdGlvbiBmb3IgY29tcGlsYXRpb24gKCM5NTcpCiAgKiBBZGQgZGVwcmVjYXRpb24gbWVzc2FnZXMgZm9yIHByZS0xLjAgQ0xJIG9wdGlvbnMgKCM5NTkpCiAgKiBSZWZhY3RvciBhbmQgY29sb3JpemUgbG9nZ2luZyAoIzk1OSkKICAqIFJlZmFjdG9yIE1hcmtkb3duIHBhcnNpbmcgKCM5NTUpCiAgKiBBZGRlZCBhcHBsaWNhdGlvbi92bmQuYXBwbGUucGtwYXNzIHRvIG1pbWUudHlwZXMgc2VydmVkIGJ5IFdFQnJpY2sgKCM5MDcpCiAgKiBNb3ZlIHRlbXBsYXRlIHNpdGUgdG8gZGVmYXVsdCBtYXJrZG93biByZW5kZXJlciAoIzk2MSkKICAqIEV4cG9zZSBuZXcgYXR0cmlidXRlIHRvIExpcXVpZCB2aWEgYHBhZ2VgOiBgcGFnZS5wYXRoYCAoIzk1MSkKICAqIEFjY2VwdCBtdWx0aXBsZSBjb25maWcgZmlsZXMgZnJvbSBjb21tYW5kIGxpbmUgKCM5NDUpCiAgKiBBZGQgcGFnZSB2YXJpYWJsZSB0byBsaXF1aWQgY3VzdG9tIHRhZ3MgYW5kIGJsb2NrcyAoIzQxMykKICAqIEFkZCBgcGFnaW5hdG9yLnByZXZpb3VzX3BhZ2VfcGF0aGAgYW5kIGBwYWdpbmF0b3IubmV4dF9wYWdlX3BhdGhgICgjOTQyKQogICogQmFja3dhcmRzIGNvbXBhdGliaWxpdHkgZm9yICdhdXRvJyAoIzgyMSwgIzkzNCkKICAqIEFkZGVkIGRhdGVfdG9fcmZjODIyIHVzZWQgb24gUlNTIGZlZWRzICgjODkyKQogICogVXBncmFkZSB2ZXJzaW9uIG9mIHB5Z21lbnRzLnJiIHRvIDAuNC4yICgjOTI3KQogICogQWRkZWQgc2hvcnQgbW9udGggKGUuZy4gIlNlcCIpIHRvIHBlcm1hbGluayBzdHlsZSBvcHRpb25zIGZvciBwb3N0cyAoIzg5MCkKICAqIEV4cG9zZSBzaXRlLmJhc2V1cmwgdG8gTGlxdWlkIHRlbXBsYXRlcyAoIzg2OSkKICAqIEFkZHMgZXhjZXJwdCBhdHRyaWJ1dGUgdG8gcG9zdHMgd2hpY2ggY29udGFpbnMgZmlyc3QgcGFyYWdyYXBoIG9mIGNvbnRlbnQgKCM4MzcpCiAgKiBBY2NlcHQgY3VzdG9tIGNvbmZpZ3VyYXRpb24gZmlsZSB2aWEgQ0xJICgjODYzKQogICogTG9hZCBpbiBHaXRIdWIgUGFnZXMgTUlNRSBUeXBlcyBvbiBgamVreWxsIHNlcnZlYCAoIzg0NywgIzg3MSkKICAqIEltcHJvdmUgZGVidWdhYmlsaXR5IG9mIGVycm9yIG1lc3NhZ2UgZm9yIGEgbWFsZm9ybWVkIGhpZ2hsaWdodCB0YWcgKCM3ODUpCiAgKiBBbGxvdyBzeW1saW5rZWQgZmlsZXMgaW4gdW5zYWZlIG1vZGUgKCM4MjQpCiAgKiBBZGQgJ2dpc3QnIExpcXVpZCB0YWcgdG8gY29yZSAoIzgyMiwgIzg2MSkKICAqIE5ldyBmb3JtYXQgb2YgSmVreWxsIG91dHB1dCAoIzc5NSkKICAqIFJlaW5zdGF0ZSBgLS1saW1pdF9wb3N0c2AgYW5kIGAtLWZ1dHVyZWAgc3dpdGNoZXMgKCM3ODgpCiAgKiBSZW1vdmUgYW1iaWd1aXR5IGZyb20gY29tbWFuZCBkZXNjcmlwdGlvbnMgKCM4MTUpCiAgKiBGaXggU2FmZVlBTUwgV2FybmluZ3MgKCM4MDcpCiAgKiBSZWxheGVkIEtyYW1kb3duIHZlcnNpb24gdG8gMC4xNCAoIzgwOCkKICAqIEFsaWFzZWQgYGpla3lsbCBzZXJ2ZXJgIHRvIGBqZWt5bGwgc2VydmVgLiAoIzc5MikKICAqIFVwZGF0ZWQgZ2VtIHZlcnNpb25zIGZvciBLcmFtZG93biwgUmFrZSwgU2hvdWxkYSwgQ3VjdW1iZXIsIGFuZCBSZWRDYXJwZXQuICgjNzQ0KQogICogUmVmYWN0b3JlZCBKZWt5bGwgc3ViY29tbWFuZHMgaW50byBKZWt5bGw6OkNvbW1hbmRzIHN1Ym1vZHVsZSwgd2hpY2ggbm93IGNvbnRhaW5zIHRoZW0gKCM3NjgpCiAgKiBSZXNjdWUgZnJvbSBpbXBvcnQgZXJyb3JzIGluIFdvcmRwcmVzcy5jb20gbWlncmF0b3IgKCM2NzEpCiAgKiBNYXNzaXZlbHkgYWNjZWxlcmF0ZSBMU0kgcGVyZm9ybWFuY2UgKCM2NjQpCiAgKiBUcnVuY2F0ZSBwb3N0IHNsdWdzIHdoZW4gaW1wb3J0aW5nIGZyb20gVHVtYmxyICgjNDk2KQogICogQWRkIGdsb2Igc3VwcG9ydCB0byBpbmNsdWRlLCBleGNsdWRlIG9wdGlvbiAoIzc0MykKICAqIExheW91dCBvZiBQYWdlIG9yIFBvc3QgZGVmYXVsdHMgdG8gJ3BhZ2UnIG9yICdwb3N0JywgcmVzcGVjdGl2ZWx5ICgjNTgwKSBSRVBFQUxFRCBieSAoIzk3NykKICAqICJLZWVwIGZpbGVzIiBmZWF0dXJlICgjNjg1KQogICogT3V0cHV0IGZ1bGwgcGF0aCAmIG5hbWUgZm9yIGZpbGVzIHRoYXQgZG9uJ3QgcGFyc2UgKCM3NDUpCiAgKiBBZGQgc291cmNlIGFuZCBkZXN0aW5hdGlvbiBkaXJlY3RvcnkgcHJvdGVjdGlvbiAoIzUzNSkKICAqIEJldHRlciBZQU1MIGVycm9yIG1lc3NhZ2UgKCM3MTgpCiAgKiBCdWcgRml4ZXMKICAqIFBhZ2luYXRlIGluIHN1YmRpcmVjdG9yaWVzIHByb3Blcmx5ICgjMTAxNikKICAqIEVuc3VyZSBwb3N0IGFuZCBwYWdlIFVSTHMgaGF2ZSBhIGxlYWRpbmcgc2xhc2ggKCM5OTIpCiAgKiBDYXRjaCBhbGwgZXhjZXB0aW9ucywgbm90IGp1c3QgU3RhbmRhcmRFcnJvciBkZXNjZW5kZW50cyAoIzEwMDcpCiAgKiBCdWxsZXQtcHJvb2YgYGxpbWl0X3Bvc3RzYCBvcHRpb24gKCMxMDA0KQogICogUmVhZCBpbiBZQU1MIGFzIFVURi04IHRvIGFjY2VwdCBub24tQVNDSUkgY2hhcnMgKCM4MzYpCiAgKiBGaXggdGhlIENMSSBvcHRpb24gYC0tcGx1Z2luc2AgdG8gYWN0dWFsbHkgYWNjZXB0IGRpcnMgYW5kIGZpbGVzICgjOTkzKQogICogQWxsb3cgJ2V4Y2VycHQnIGluIFlBTUwgZnJvbnQgbWF0dGVyIHRvIG92ZXJyaWRlIHRoZSBleHRyYWN0ZWQgZXhjZXJwdCAoIzk0NikKICAqIEZpeCBjYXNjYWRlIHByb2JsZW0gd2l0aCBzaXRlLmJhc2V1cmwsIHNpdGUucG9ydCBhbmQgc2l0ZS5ob3N0LiAoIzkzNSkKICAqIEZpbHRlciBvdXQgZGlyZWN0b3JpZXMgd2l0aCB2YWxpZCBwb3N0IG5hbWVzICgjODc1KQogICogRml4IHN5bWxpbmtlZCBzdGF0aWMgZmlsZXMgbm90IGJlaW5nIGNvcnJlY3RseSBidWlsdCBpbiB1bnNhZmUgbW9kZSAoIzkwOSkKICAqIEZpeCBpbnRlZ3JhdGlvbiB3aXRoIGRpcmVjdG9yeV93YXRjaGVyIDEuNC54ICgjOTE2KQogICogQWNjZXB0aW5nIHN0cmluZ3MgYXMgYXJndW1lbnRzIHRvIGpla3lsbC1pbXBvcnQgY29tbWFuZCAoIzkxMCkKICAqIEZvcmNlIHVzYWdlIG9mIG9sZGVyIGRpcmVjdG9yeV93YXRjaGVyIGdlbSBhcyAxLjUgaXMgYnJva2VuICgjODgzKQogICogRW5zdXJlIGFsbCBQb3N0IGNhdGVnb3JpZXMgYXJlIGRvd25jYXNlICgjODQyLCAjODcyKQogICogRm9yY2UgZW5jb2Rpbmcgb2YgdGhlIHJkaXNjb3VudCBUT0MgdG8gVVRGOCB0byBhdm9pZCBjb252ZXJzaW9uIGVycm9ycyAoIzU1NSkKICAqIFBhdGNoIGZvciBtdWx0aWJ5dGUgVVJJIHByb2JsZW0gd2l0aCBgamVreWxsIHNlcnZlYCAoIzcyMykKICAqIE9yZGVyIHBsdWdpbiBleGVjdXRpb24gYnkgcHJpb3JpdHkgKCM4NjQpCiAgKiBGaXhlZCBQYWdlI2RpciBhbmQgUGFnZSN1cmwgZm9yIGVkZ2UgY2FzZXMgKCM1MzYpCiAgKiBGaXggYnJva2VuIGBwb3N0X3VybGAgd2l0aCBwb3N0cyB3aXRoIGEgdGltZSBpbiB0aGVpciBZQU1MIGZyb250IG1hdHRlciAoIzgzMSkKICAqIExvb2sgZm9yIHBsdWdpbnMgdW5kZXIgdGhlIHNvdXJjZSBkaXJlY3RvcnkgKCM2NTQpCiAgKiBUdW1ibHIgTWlncmF0b3I6IGZpbmRzIGBfcG9zdHNgIGRpciBjb3JyZWN0bHksIGZpeGVzIHRydW5jYXRpb24gb2YgbG9uZyBwb3N0IG5hbWVzICgjNzc1KQogICogRm9yY2UgQ2F0ZWdvcmllcyB0byBiZSBTdHJpbmdzICgjNzY3KQogICogU2FmZSBZQU1MIHBsdWdpbiB0byBwcmV2ZW50IHZ1bG5lcmFiaWxpdHkgKCM3NzcpCiAgKiBBZGQgU1ZHIHN1cHBvcnQgdG8gSmVreWxsL1dFQnJpY2suICgjNDA3LCAjNDA2KQogICogUHJldmVudCBjdXN0b20gZGVzdGluYXRpb24gZnJvbSBjYXVzaW5nIGNvbnRpbnVvdXMgcmVnZW4gb24gd2F0Y2ggKCM1MjgsICM4MjAsICM4NjIpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBSZXNwb25zaWZ5ICgjODYwKQogICogRml4IHNwZWxsaW5nLCBwdW5jdHVhdGlvbiBhbmQgcGhyYXNhbCBlcnJvcnMgKCM5ODkpCiAgKiBVcGRhdGUgcXVpY2tzdGFydCBpbnN0cnVjdGlvbnMgd2l0aCBgbmV3YCBjb21tYW5kICgjOTY2KQogICogQWRkIGRvY3MgZm9yIHBhZ2UuZXhjZXJwdCAoIzk1NikKICAqIEFkZCBkb2NzIGZvciBwYWdlLnBhdGggKCM5NTEpCiAgKiBDbGVhbiB1cCBzaXRlIGRvY3MgdG8gcHJlcGFyZSBmb3IgMS4wIHJlbGVhc2UgKCM5MTgpCiAgKiBCcmluZyBzaXRlIGludG8gbWFzdGVyIGJyYW5jaCB3aXRoIGJldHRlciBwcmV2aWV3L2RlcGxveSAoIzcwOSkKICAqIFJlZGVzaWduZWQgc2l0ZSAoIzU4MykKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIEV4Y2x1ZGUgQ3VjdW1iZXIgMS4yLjQsIHdoaWNoIGNhdXNlcyB0ZXN0cyB0byBmYWlsIGluIDEuOS4yICgjOTM4KQogICogQWRkZWQgImZlYXR1cmVzOmh0bWwiIHJha2UgdGFzayBmb3IgZGVidWdnaW5nIHB1cnBvc2VzLCBjbGVhbmVkIHVwIEN1Y3VtYmVyIHByb2ZpbGVzICgjODMyKQogICogRXhwbGljaXRseSByZXF1aXJlIEhUVFBTIHJ1YnlnZW1zIHNvdXJjZSBpbiBHZW1maWxlICgjODI2KQogICogQ2hhbmdlZCBSdWJ5IHZlcnNpb24gZm9yIGRldmVsb3BtZW50IHRvIDEuOS4zLXAzNzQgZnJvbSBwMzYyICgjODAxKQogICogSW5jbHVkaW5nIGEgbGluayB0byB0aGUgR2l0SHViIFJ1Ynkgc3R5bGUgZ3VpZGUgaW4gQ09OVFJJQlVUSU5HLm1kICgjODA2KQogICogQWRkZWQgc2NyaXB0L2Jvb3RzdHJhcCAoIzc3NikKICAqIFJ1bm5pbmcgU2ltcGxlY292IHVuZGVyIDIgY29uZGl0aW9uczogRU5WKENPVkVSQUdFKT10cnVlIGFuZCB3aXRoIFJ1YnkgdmVyc2lvbiBvZiBncmVhdGVyIHRoYW4gMS45ICgjNzcxKQogICogU3dpdGNoIHRvIFNpbXBsZWNvdiBmb3IgY292ZXJhZ2UgcmVwb3J0ICgjNzY1KQoKIyMgMC4xMi4xIC8gMjAxMy0wMi0xOQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFVwZGF0ZSBLcmFtZG93biB2ZXJzaW9uIHRvIDAuMTQuMSAoIzc0NCkKICAqIFRlc3QgRW5oYW5jZW1lbnRzCiAgKiBVcGRhdGUgUmFrZSB2ZXJzaW9uIHRvIDEwLjAuMyAoIzc0NCkKICAqIFVwZGF0ZSBTaG91bGRhIHZlcnNpb24gdG8gMy4zLjIgKCM3NDQpCiAgKiBVcGRhdGUgUmVkY2FycGV0IHZlcnNpb24gdG8gMi4yLjIgKCM3NDQpCgojIyAwLjEyLjAgLyAyMDEyLTEyLTIyCgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogQWRkIGFiaWxpdHkgdG8gZXhwbGljaXRseSBzcGVjaWZ5IGluY2x1ZGVkIGZpbGVzICgjMjYxKQogICogQWRkIGAtLWRlZmF1bHQtbWltZXR5cGVgIG9wdGlvbiAoIzI3OSkKICAqIEFsbG93IHNldHRpbmcgb2YgUmVkQ2xvdGggb3B0aW9ucyAoIzI4NCkKICAqIEFkZCBgcG9zdF91cmxgIExpcXVpZCB0YWcgZm9yIGludGVybmFsIHBvc3QgbGlua2luZyAoIzM2OSkKICAqIEFsbG93IG11bHRpcGxlIHBsdWdpbiBkaXJzIHRvIGJlIHNwZWNpZmllZCAoIzQzOCkKICAqIElubGluZSBUT0MgdG9rZW4gc3VwcG9ydCBmb3IgUkRpc2NvdW50ICgjMzMzKQogICogQWRkIHRoZSBvcHRpb24gdG8gc3BlY2lmeSB0aGUgcGFnaW5hdGVkIHVybCBmb3JtYXQgKCMzNDIpCiAgKiBTd2FwIG91dCBhbGJpbm8gZm9yIHB5Z21lbnRzLnJiICgjNTY5KQogICogU3VwcG9ydCBSZWRjYXJwZXQgMiBhbmQgZmVuY2VkIGNvZGUgYmxvY2tzICgjNjE5KQogICogQmV0dGVyIHJlcG9ydGluZyBvZiBMaXF1aWQgZXJyb3JzICgjNjI0KQogICogQnVnIEZpeGVzCiAgKiBBbGxvdyBzb21lIHNwZWNpYWwgY2hhcmFjdGVycyBpbiBoaWdobGlnaHQgbmFtZXMKICAqIFVSTCBlc2NhcGUgY2F0ZWdvcnkgbmFtZXMgaW4gVVJMIGdlbmVyYXRpb24gKCMzNjApCiAgKiBGaXggZXJyb3Igd2l0aCBgbGltaXRfcG9zdHNgICgjNDQyKQogICogUHJvcGVybHkgc2VsZWN0IGRvdGZpbGUgZHVyaW5nIGRpcmVjdG9yeSBzY2FuICgjMzYzLCAjNDMxLCAjMzc3KQogICogQWxsb3cgc2V0dGluZyBvZiBLcmFtZG93biBgc21hcnRfcXVvdGVzYCAoIzQ4MikKICAqIEVuc3VyZSBmcm9udCBtYXR0ZXIgaXMgYXQgc3RhcnQgb2YgZmlsZSAoIzU2MikKCiMjIDAuMTEuMiAvIDIwMTEtMTItMjcKCiAgKiBCdWcgRml4ZXMKICAqIEZpeCBnZW1zcGVjCgojIyAwLjExLjEgLyAyMDExLTEyLTI3CgogICogQnVnIEZpeGVzCiAgKiBGaXggZXh0cmEgYmxhbmsgbGluZSBpbiBoaWdobGlnaHQgYmxvY2tzICgjNDA5KQogICogVXBkYXRlIGRlcGVuZGVuY2llcwoKIyMgMC4xMS4wIC8gMjAxMS0wNy0xMAoKIyMjIE1ham9yIEVuaGFuY2VtZW50cwoKICAqIEFkZCBjb21tYW5kIGxpbmUgaW1wb3J0ZXIgZnVuY3Rpb25hbGl0eSAoIzI1MykKICAqIEFkZCBSZWRjYXJwZXQgTWFya2Rvd24gc3VwcG9ydCAoIzMxOCkKICAqIE1ha2UgbWFya2Rvd24vdGV4dGlsZSBleHRlbnNpb25zIGNvbmZpZ3VyYWJsZSAoIzMxMikKICAqIEFkZCBgbWFya2Rvd25pZnlgIGZpbHRlcgoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFN3aXRjaCB0byBBbGJpbm8gZ2VtCiAgKiBCdW5kbGVyIHN1cHBvcnQKICAqIFVzZSBFbmdsaXNoIGxpYnJhcnkgdG8gYXZvaWQgaG9vcHMgKCMyOTIpCiAgKiBBZGQgUG9zdGVyb3VzIGltcG9ydGVyICgjMjU0KQogICogRml4ZXMgZm9yIFdvcmRwcmVzcyBpbXBvcnRlciAoIzI3NCwgIzI1MiwgIzI3MSkKICAqIEJldHRlciBlcnJvciBtZXNzYWdlIGZvciBpbnZhbGlkIHBvc3QgZGF0ZSAoIzI5MSkKICAqIFByaW50IGZvcm1hdHRlZCBmYXRhbCBleGNlcHRpb25zIHRvIHN0ZG91dCBvbiBidWlsZCBmYWlsdXJlCiAgKiBBZGQgVHVtYmxyIGltcG9ydGVyICgjMzIzKQogICogQWRkIEVua2kgaW1wb3J0ZXIgKCMzMjApCiAgKiBCdWcgRml4ZXMKICAqIFNlY3VyZSBhZGRpdGlvbmFsIHBhdGggZXhwbG9pdHMKCiMjIDAuMTAuMCAvIDIwMTAtMTItMTYKCiAgKiBCdWcgRml4ZXMKICAqIEFkZCBgLS1uby1zZXJ2ZXJgIG9wdGlvbi4KCiMjIDAuOS4wIC8gMjAxMC0xMi0xNQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFVzZSBPcHRpb25QYXJzZXIncyBgW25vLV1gIGZ1bmN0aW9uYWxpdHkgZm9yIGJldHRlciBib29sZWFuIHBhcnNpbmcuCiAgKiBBZGQgRHJ1cGFsIG1pZ3JhdG9yICgjMjQ1KQogICogQ29tcGxhaW4gYWJvdXQgWUFNTCBhbmQgTGlxdWlkIGVycm9ycyAoIzI0OSkKICAqIFJlbW92ZSBvcnBoYW5lZCBmaWxlcyBkdXJpbmcgcmVnZW5lcmF0aW9uICgjMjQ3KQogICogQWRkIE1hcmxleSBtaWdyYXRvciAoIzI4KQoKIyMgMC44LjAgLyAyMDEwLTExLTIyCgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogQWRkIHdvcmRwcmVzcy5jb20gaW1wb3J0ZXIgKCMyMDcpCiAgKiBBZGQgYC0tbGltaXQtcG9zdHNgIGNsaSBvcHRpb24gKCMyMTIpCiAgKiBBZGQgYHVyaV9lc2NhcGVgIGZpbHRlciAoIzIzNCkKICAqIEFkZCBgLS1iYXNlLXVybGAgY2xpIG9wdGlvbiAoIzIzNSkKICAqIEltcHJvdmUgTVQgbWlncmF0b3IgKCMyMzgpCiAgKiBBZGQga3JhbWRvd24gc3VwcG9ydCAoIzIzOSkKICAqIEJ1ZyBGaXhlcwogICogRml4ZWQgZmlsZW5hbWUgYmFzZW5hbWUgZ2VuZXJhdGlvbiAoIzIwOCkKICAqIFNldCBtb2RlIHRvIFVURjggb24gU2VxdWVsIGNvbm5lY3Rpb25zICgjMjM3KQogICogUHJldmVudCBgX2luY2x1ZGVzYCBkaXIgZnJvbSBiZWluZyBhIHN5bWxpbmsKCiMjIDAuNy4wIC8gMjAxMC0wOC0yNAoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIEFkZCBzdXBwb3J0IGZvciByZGlzY291bnQgZXh0ZW5zaW9ucyAoIzE3MykKICAqIEJ1ZyBGaXhlcwogICogSGlnaGxpZ2h0IHNob3VsZCBub3QgYmUgYWJsZSB0byByZW5kZXIgbG9jYWwgZmlsZXMKICAqIFRoZSBzaXRlIGNvbmZpZ3VyYXRpb24gbWF5IG5vdCBhbHdheXMgcHJvdmlkZSBhICd0aW1lJyBzZXR0aW5nICgjMTg0KQoKIyMgMC42LjIgLyAyMDEwLTA2LTI1CgogICogQnVnIEZpeGVzCiAgKiBGaXggUmFrZWZpbGUgJ3JlbGVhc2UnIHRhc2sgKHRhZyBwdXNoaW5nIHdhcyBtaXNzaW5nIG9yaWdpbikKICAqIEVuc3VyZSB0aGF0IFJlZENsb3RoIGlzIGxvYWRlZCB3aGVuIHRleHRpbGl6ZSBmaWx0ZXIgaXMgdXNlZCAoIzE4MykKICAqIEV4cGFuZCBzb3VyY2UsIGRlc3RpbmF0aW9uLCBhbmQgcGx1Z2luIHBhdGhzICgjMTgwKQogICogRml4IGBwYWdlLnVybGAgdG8gaW5jbHVkZSBmdWxsIHJlbGF0aXZlIHBhdGggKCMxODEpCgojIyAwLjYuMSAvIDIwMTAtMDYtMjQKCiAgKiBCdWcgRml4ZXMKICAqIEZpeCBNYXJrZG93biBQeWdtZW50cyBwcmVmaXggYW5kIHN1ZmZpeCAoIzE3OCkKCiMjIDAuNi4wIC8gMjAxMC0wNi0yMwoKIyMjIE1ham9yIEVuaGFuY2VtZW50cwoKICAqIFByb3BlciBwbHVnaW4gc3lzdGVtICgjMTksICMxMDApCiAgKiBBZGQgc2FmZSBtb2RlIHNvIHVuc2FmZSBjb252ZXJ0ZXJzL2dlbmVyYXRvcnMgY2FuIGJlIGFkZGVkCiAgKiBNYXJ1a3UgaXMgbm93IHRoZSBvbmx5IHByb2Nlc3NvciBkZXBlbmRlbmN5IGluc3RhbGxlZCBieSBkZWZhdWx0LiBPdGhlciBwcm9jZXNzb3JzIHdpbGwgYmUgbGF6eS1sb2FkZWQgd2hlbiBuZWNlc3NhcnkgKGFuZCBwcm9tcHQgdGhlIHVzZXIgdG8gaW5zdGFsbCB0aGVtIHdoZW4gbmVjZXNzYXJ5KSAoIzU3KQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIEluY2x1c2lvbi9leGNsdXNpb24gb2YgZnV0dXJlIGRhdGVkIHBvc3RzICgjNTkpCiAgKiBHZW5lcmF0aW9uIGZvciBhIHNwZWNpZmljIHRpbWUgKCM1OSkKICAqIEFsbG9jYXRlIGBzaXRlLnRpbWVgIG9uIHJlbmRlciBub3QgcGVyIHNpdGVfcGF5bG9hZCBpbnZvY2F0aW9uICgjNTkpCiAgKiBQYWdlcyBub3cgcHJlc2VudCBpbiB0aGUgc2l0ZSBwYXlsb2FkIGFuZCBjYW4gYmUgdXNlZCB0aHJvdWdoIHRoZSBgc2l0ZS5wYWdlc2AgYW5kIGBzaXRlLmh0bWxfcGFnZXNgIHZhcmlhYmxlcwogICogR2VuZXJhdGUgcGhhc2UgYWRkZWQgdG8gc2l0ZSNwcm9jZXNzIGFuZCBwYWdpbmF0aW9uIGlzIG5vdyBhIGdlbmVyYXRvcgogICogU3dpdGNoIHRvIFJha2VHZW0gZm9yIGJ1aWxkL3Rlc3QgcHJvY2VzcwogICogT25seSByZWdlbmVyYXRlIHN0YXRpYyBmaWxlcyB3aGVuIHRoZXkgaGF2ZSBjaGFuZ2VkICgjMTQyKQogICogQWxsb3cgYXJiaXRyYXJ5IG9wdGlvbnMgdG8gUHlnbWVudHMgKCMzMSkKICAqIEFsbG93IFVSTCB0byBiZSBzZXQgdmlhIGNvbW1hbmQgbGluZSBvcHRpb24gKCMxNDcpCiAgKiBCdWcgRml4ZXMKICAqIFJlbmRlciBoaWdobGlnaHRlZCBjb2RlIGZvciBub24gbWFya2Rvd24vdGV4dGlsZSBwYWdlcyAoIzExNikKICAqIEZpeCBoaWdobGlnaHRpbmcgb24gUnVieSAxLjkgKCM2NSkKICAqIEZpeCBleHRlbnNpb24gbXVuZ2luZyB3aGVuIHByZXR0eSBwZXJtYWxpbmtzIGFyZSBlbmFibGVkICgjNjQpCiAgKiBTdG9wIHNvcnRpbmcgY2F0ZWdvcmllcyAoIzMzKQogICogUHJlc2VydmUgZ2VuZXJhdGVkIGF0dHJpYnV0ZXMgb3ZlciBmcm9udCBtYXR0ZXIgKCMxMTkpCiAgKiBGaXggc291cmNlIGRpcmVjdG9yeSBiaW5kaW5nIHVzaW5nIGBEaXIucHdkYCAoIzc1KQoKIyMgMC41LjcgLyAyMDEwLTAxLTEyCgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogQWxsb3cgb3ZlcnJpZGluZyBvZiBwb3N0IGRhdGUgaW4gdGhlIGZyb250IG1hdHRlciAoIzYyLCAjMzgpCiAgKiBCdWcgRml4ZXMKICAqIENhdGVnb3JpZXMgaXNuJ3QgYWx3YXlzIGFuIGFycmF5ICgjNzMpCiAgKiBFbXB0eSB0YWdzIGNhdXNlcyBlcnJvciBpbiByZWFkX3Bvc3RzICgjODQpCiAgKiBGaXggcGFnaW5hdGlvbiB0byBhZGhlcmUgdG8gcmVhZC9yZW5kZXIvd3JpdGUgcGFyYWRpZ20KICAqIFRlc3QgRW5oYW5jZW1lbnQKICAqIEN1Y3VtYmVyIGZlYXR1cmVzIG5vIGxvbmdlciB1c2Ugc2l0ZS5wb3N0cy5maXJzdCB3aGVyZSBhIGJldHRlciBhbHRlcm5hdGl2ZSBpcyBhdmFpbGFibGUKCiMjIDAuNS42IC8gMjAxMC0wMS0wOAoKICAqIEJ1ZyBGaXhlcwogICogUmVxdWlyZSByZWRjbG90aCA+PSA0LjIuMSBpbiB0ZXN0cyAoIzkyKQogICogRG9uJ3QgYnJlYWsgb24gdHJpcGxlIGRhc2hlcyBpbiB5YW1sIGZyb250IG1hdHRlciAoIzkzKQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIEFsbG93IC5ta2QgYXMgbWFya2Rvd24gZXh0ZW5zaW9uCiAgKiBVc2UgJHN0ZG91dC9lcnIgaW5zdGVhZCBvZiBjb25zdGFudHMgKCM5OSkKICAqIFByb3Blcmx5IHdyYXAgY29kZSBibG9ja3MgKCM5MSkKICAqIEFkZCBqYXZhc2NyaXB0IG1pbWUgdHlwZSBmb3Igd2VicmljayAoIzk4KQoKIyMgMC41LjUgLyAyMDEwLTAxLTA4CgogICogQnVnIEZpeGVzCiAgKiBGaXggcGFnaW5hdGlvbiAlIDAgYnVnICgjNzgpCiAgKiBFbnN1cmUgYWxsIHBvc3RzIGFyZSBwcm9jZXNzZWQgZmlyc3QgKCM3MSkgIyMgTk9URQogICogQWZ0ZXIgdGhpcyBwb2ludCBJIHdpbGwgbm8gbG9uZ2VyIGJlIGdpdmluZyBjcmVkaXQgaW4gdGhlIGhpc3Rvcnk7IHRoYXQgaXMgd2hhdCB0aGUgY29tbWl0IGxvZyBpcyBmb3IuCgojIyAwLjUuNCAvIDIwMDktMDgtMjMKCiAgKiBCdWcgRml4ZXMKICAqIERvIG5vdCBhbGxvdyBzeW1saW5rcyAoc2VjdXJpdHkgdnVsbmVyYWJpbGl0eSkKCiMjIDAuNS4zIC8gMjAwOS0wNy0xNAoKICAqIEJ1ZyBGaXhlcwogICogU29sdmluZyB0aGUgcGVybWFsaW5rIGJ1ZyB3aGVyZSBub24taHRtbCBmaWxlcyB3b3VsZG4ndCB3b3JrIChAamVmZnJ5ZGVncmFuZGUpCgojIyAwLjUuMiAvIDIwMDktMDYtMjQKCiAgKiBFbmhhbmNlbWVudHMKICAqIEFkZGVkIC0tcGFnaW5hdGUgb3B0aW9uIHRvIHRoZSBleGVjdXRhYmxlIGFsb25nIHdpdGggYSBwYWdpbmF0b3Igb2JqZWN0IGZvciB0aGUgcGF5bG9hZCAoQGNhbGF2ZXJhKQogICogVXBncmFkZWQgUmVkQ2xvdGggdG8gNC4yLjEsIHdoaWNoIG1ha2VzIGA8bm90ZXh0aWxlPmAgdGFncyB3b3JrIG9uY2UgYWdhaW4uCiAgKiBDb25maWd1cmF0aW9uIG9wdGlvbnMgc2V0IGluIGNvbmZpZy55bWwgYXJlIG5vdyBhdmFpbGFibGUgdGhyb3VnaCB0aGUgc2l0ZSBwYXlsb2FkIChAdmlsY2FucykKICAqIFBvc3RzIGNhbiBub3cgaGF2ZSBhbiBlbXB0eSBZQU1MIGZyb250IG1hdHRlciBvciBub25lIGF0IGFsbCAoQCBiYWh1dnJpaGkpCiAgKiBCdWcgRml4ZXMKICAqIEZpeGluZyBSdWJ5IDEuOSBpc3N1ZSB0aGF0IHJlcXVpcmVzIGAjdG9fc2Agb24gdGhlIGVyciBvYmplY3QgKEBDaHJvbm9uYXV0KQogICogRml4ZXMgZm9yIHBhZ2luYXRpb24gYW5kIG9yZGVyaW5nIHBvc3RzIG9uIHRoZSBzYW1lIGRheSAoQHVqaCkKICAqIE1hZGUgcGFnZXMgcmVzcGVjdCBwZXJtYWxpbmtzIHN0eWxlIGFuZCBwZXJtYWxpbmtzIGluIHltbCBmcm9udCBtYXR0ZXIgKEBldWdlbmVib2xzaGFrb3YpCiAgKiBJbmRleC5odG1sIGZpbGUgc2hvdWxkIGFsd2F5cyBoYXZlIGluZGV4Lmh0bWwgcGVybWFsaW5rIChAZXVnZW5lYm9sc2hha292KQogICogQWRkZWQgdHJhaWxpbmcgc2xhc2ggdG8gcHJldHR5IHBlcm1hbGluayBzdHlsZSBzbyBBcGFjaGUgaXMgaGFwcHkgKEBldWdlbmVib2xzaGFrb3YpCiAgKiBCYWQgbWFya2Rvd24gcHJvY2Vzc29yIGluIGNvbmZpZyBmYWlscyBzb29uZXIgYW5kIHdpdGggYmV0dGVyIG1lc3NhZ2UgKEAgZ2Nub3Z1cykKICAqIEFsbG93IENSTEZzIGluIHlhbWwgZnJvbnQgbWF0dGVyIChAanVyZXR0YSkKICAqIEFkZGVkIERhdGUjeG1sc2NoZW1hIGZvciBSdWJ5IHZlcnNpb25zIDwgMS45CgojIyAwLjUuMSAvIDIwMDktMDUtMDYKCiMjIyBNYWpvciBFbmhhbmNlbWVudHMKCiAgKiBOZXh0L3ByZXZpb3VzIHBvc3RzIGluIHNpdGUgcGF5bG9hZCAoQHBhbnR1bGlzLCBAdG9tbykKICAqIFBlcm1hbGluayB0ZW1wbGF0aW5nIHN5c3RlbQogICogTW92ZWQgbW9zdCBvZiB0aGUgUkVBRE1FIG91dCB0byB0aGUgR2l0SHViIHdpa2kKICAqIEV4Y2x1ZGUgb3B0aW9uIGluIGNvbmZpZ3VyYXRpb24gc28gc3BlY2lmaWVkIGZpbGVzIHdvbid0IGJlIGJyb3VnaHQgb3ZlciB3aXRoIGdlbmVyYXRlZCBzaXRlIChAZHVyaXRvbmcpCiAgKiBCdWcgRml4ZXMKICAqIE1ha2luZyBzdXJlIGNvbmZpZy55YW1sIHJlZmVyZW5jZXMgYXJlIGFsbCBnb25lLCB1c2luZyBvbmx5IGNvbmZpZy55bWwKICAqIEZpeGVkIHN5bnRheCBoaWdobGlnaHRpbmcgYnJlYWtpbmcgZm9yIFVURi04IGNvZGUgKEBoZW5yaWspCiAgKiBXb3JrZWQgYXJvdW5kIFJEaXNjb3VudCBidWcgdGhhdCBwcmV2ZW50cyBNYXJrZG93biBmcm9tIGdldHRpbmcgcGFyc2VkIGFmdGVyIGhpZ2hsaWdodCAoQGhlbnJpaykKICAqIENHSSBlc2NhcGVkIHBvc3QgdGl0bGVzIChAQ2hyb25vbmF1dCkKCiMjIDAuNS4wIC8gMjAwOS0wNC0wNwoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIEFiaWxpdHkgdG8gc2V0IHBvc3QgY2F0ZWdvcmllcyB2aWEgWUFNTCAoQHFydXNoKQogICogQWJpbGl0eSB0byBzZXQgcHJldmVudCBhIHBvc3QgZnJvbSBwdWJsaXNoaW5nIHZpYSBZQU1MIChAcXJ1c2gpCiAgKiBBZGQgdGV4dGlsaXplIGZpbHRlciAoQHdpbGxjb2RlZm9yZm9vKQogICogQWRkICdwcmV0dHknIHBlcm1hbGluayBzdHlsZSBmb3Igd29yZHByZXNzLWxpa2UgdXJscyAoQGR5c2luZ2VyKQogICogTWFkZSBpdCBwb3NzaWJsZSB0byBlbnRlciBjYXRlZ29yaWVzIGZyb20gWUFNTCBhcyBhbiBhcnJheSAoQENocm9ub25hdXQpCiAgKiBJZ25vcmUgRW1hY3MgYXV0b3NhdmUgZmlsZXMgKEBDaHJvbm9uYXV0KQogICogQnVnIEZpeGVzCiAgKiBVc2UgYmxvY2sgc3ludGF4IG9mIHBvcGVuNCB0byBlbnN1cmUgdGhhdCBzdWJwcm9jZXNzZXMgYXJlIHByb3Blcmx5IGRpc3Bvc2VkIChAanFyKQogICogQ2xvc2Ugb3BlbjQgc3RyZWFtcyB0byBwcmV2ZW50IHpvbWJpZXMgKEBydG9tYXlrbykKICAqIE9ubHkgcXVlcnkgcmVxdWlyZWQgZmllbGRzIGZyb20gdGhlIFdQIERhdGFiYXNlIChAYXJpZWphbikKICAqIFByZXZlbnQgYF9wb3N0c2AgZnJvbSBiZWluZyBjb3BpZWQgdG8gdGhlIGRlc3RpbmF0aW9uIGRpcmVjdG9yeSAoQGJkaW1jaGVmZikKICAqIFJlZmFjdG9ycwogICogRmFjdG9yZWQgdGhlIGZpbHRlcmluZyBjb2RlIGludG8gYSBtZXRob2QgKEBDaHJvbm9uYXV0KQogICogRml4IHRlc3RzIGFuZCBjb252ZXJ0IHRvIFNob3VsZGEgKEBxcnVzaCwgQHRlY2huaWNhbHBpY2tsZXMpCiAgKiBBZGQgQ3VjdW1iZXIgYWNjZXB0YW5jZSB0ZXN0IHN1aXRlIChAcXJ1c2gsIEB0ZWNobmljYWxwaWNrbGVzKQoKIyMgMC40LjEKCiMjIyBNaW5vciBFbmhhbmNlbWVudHMKCiAgKiBDaGFuZ2VkIGRhdGUgZm9ybWF0IG9uIHdvcmRwcmVzcyBjb252ZXJ0ZXIgKHplcm9wYWRkaW5nKSAoQGR5c2luZ2VyKQogICogQnVnIEZpeGVzCiAgKiBBZGQgSmVreWxsIGJpbmFyeSBhcyBleGVjdXRhYmxlIHRvIGdlbXNwZWMgKEBkeXNpbmdlcikKCiMjIDAuNC4wIC8gMjAwOS0wMi0wMwoKIyMjIE1ham9yIEVuaGFuY2VtZW50cwoKICAqIFN3aXRjaCB0byBKZXdlbGVyIGZvciBwYWNrYWdpbmcgdGFza3MKCiMjIyBNaW5vciBFbmhhbmNlbWVudHMKCiAgKiBUeXBlIGltcG9ydGVyIChAY29kZXNsaW5nZXIpCiAgKiBgc2l0ZS50b3BpY3NgIGFjY2Vzc29yIChAYmF6KQogICogQWRkIGBhcnJheV90b19zZW50ZW5jZV9zdHJpbmdgIGZpbHRlciAoQG1jaHVuZykKICAqIEFkZCBhIGNvbnZlcnRlciBmb3IgdGV4dHBhdHRlcm4gKEBQZXJmZWN0bHlOb3JtYWwpCiAgKiBBZGQgYSB3b3JraW5nIE1lcGhpc3RvIC8gTXlTUUwgY29udmVydGVyIChAaXZleSkKICAqIEFsbG93aW5nIC5odGFjY2VzcyBmaWxlcyB0byBiZSBjb3BpZWQgb3ZlciBpbnRvIHRoZSBnZW5lcmF0ZWQgc2l0ZSAoQGJyaWFuZG9sbCkKICAqIEFkZCBvcHRpb24gdG8gbm90IHB1dCBmaWxlIGRhdGUgaW4gcGVybWFsaW5rIFVSTCAoQG1yZWlkKQogICogQWRkIGxpbmUgbnVtYmVyIGNhcGFiaWxpdGllcyB0byBoaWdobGlnaHQgYmxvY2tzIChAamNvbikKICAqIEJ1ZyBGaXhlcwogICogRml4IHBlcm1hbGluayBiZWhhdmlvciAoQGNhdmFsbGUpCiAgKiBGaXhlZCBhbiBpc3N1ZSB3aXRoIHB5Z21lbnRzLCBtYXJrZG93biwgYW5kIG5ld2xpbmVzIChAenBpbnRlcikKICAqIEFtcGVyc2FuZHMgbmVlZCB0byBiZSBlc2NhcGVkIChAcHVmdXdvenUsIEBhcCkKICAqIFRlc3QgYW5kIGZpeCB0aGUgc2l0ZS5jYXRlZ29yaWVzIGhhc2ggKEB6em90KQogICogRml4IHNpdGUgcGF5bG9hZCBhdmFpbGFibGUgdG8gZmlsZXMgKEBtYXRyaXg5MTgwKQoKIyMgMC4zLjAgLyAyMDA4LTEyLTI0CgojIyMgTWFqb3IgRW5oYW5jZW1lbnRzCgogICogQWRkZWQgYC0tc2VydmVyYCBvcHRpb24gdG8gc3RhcnQgYSBzaW1wbGUgV0VCcmljayBzZXJ2ZXIgb24gZGVzdGluYXRpb24gZGlyZWN0b3J5IChAam9obnJlaWxseSBhbmQgQG1jaHVuZykKCiMjIyBNaW5vciBFbmhhbmNlbWVudHMKCiAgKiBBZGRlZCBwb3N0IGNhdGVnb3JpZXMgYmFzZWQgb24gZGlyZWN0b3JpZXMgY29udGFpbmluZyBgX3Bvc3RzYCAoQG1yZWlkKQogICogQWRkZWQgcG9zdCB0b3BpY3MgYmFzZWQgb24gZGlyZWN0b3JpZXMgdW5kZXJuZWF0aCBgX3Bvc3RzYAogICogQWRkZWQgbmV3IGRhdGUgZmlsdGVyIHRoYXQgc2hvd3MgdGhlIGZ1bGwgbW9udGggbmFtZSAoQG1yZWlkKQogICogTWVyZ2UgUG9zdCdzIFlBTUwgZnJvbnQgbWF0dGVyIGludG8gaXRzIHRvX2xpcXVpZCBwYXlsb2FkIChAcmVtaSkKICAqIFJlc3RyaWN0IGluY2x1ZGVzIHRvIHJlZ3VsYXIgZmlsZXMgdW5kZXJuZWF0aCBgX2luY2x1ZGVzYAogICogQnVnIEZpeGVzCiAgKiBDaGFuZ2UgWUFNTCBkZWxpbWl0ZXIgbWF0Y2hlciBzbyBhcyB0byBub3QgY2hldyB1cCAybmQgbGV2ZWwgbWFya2Rvd24gaGVhZGVycyAoQG1yZWlkKQogICogRml4IGJ1ZyB0aGF0IG1lYW50IHBhZ2UgZGF0YSAoc3VjaCBhcyB0aGUgZGF0ZSkgd2FzIG5vdCBhdmFpbGFibGUgaW4gdGVtcGxhdGVzIChAbXJlaWQpCiAgKiBQcm9wZXJseSByZWplY3QgZGlyZWN0b3JpZXMgaW4gYF9sYXlvdXRzYAoKIyMgMC4yLjEgLyAyMDA4LTEyLTE1CgogICogTWFqb3IgQ2hhbmdlcwogICogVXNlIE1hcnVrdSAocHVyZSBSdWJ5KSBmb3IgTWFya2Rvd24gYnkgZGVmYXVsdCAoQG1yZWlkKQogICogQWxsb3cgdXNlIG9mIFJEaXNjb3VudCB3aXRoIGAtLXJkaXNjb3VudGAgZmxhZwoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIERvbid0IGxvYWQgZGlyZWN0b3J5X3dhdGNoZXIgdW5sZXNzIGl0J3MgbmVlZGVkIChAcGpoeWV0dCkKCiMjIDAuMi4wIC8gMjAwOC0xMi0xNAoKICAqIE1ham9yIENoYW5nZXMKICAqIHJlbGF0ZWRfcG9zdHMgaXMgbm93IGZvdW5kIGluIGBzaXRlLnJlbGF0ZWRfcG9zdHNgCgojIyAwLjEuNiAvIDIwMDgtMTItMTMKCiAgKiBNYWpvciBGZWF0dXJlcwogICogSW5jbHVkZSBmaWxlcyBpbiBgX2luY2x1ZGVzYCB3aXRoIGB7JSBpbmNsdWRlIHgudGV4dGlsZSAlfWAKCiMjIDAuMS41IC8gMjAwOC0xMi0xMgoKIyMjIE1ham9yIEVuaGFuY2VtZW50cwoKICAqIENvZGUgaGlnaGxpZ2h0aW5nIHdpdGggUHlnbWVudHMgaWYgYC0tcHlnbWVudHNgIGlzIHNwZWNpZmllZAogICogRGlzYWJsZSB0cnVlIExTSSBieSBkZWZhdWx0LCBlbmFibGUgd2l0aCBgLS1sc2lgCgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogT3V0cHV0IGluZm9ybWF0aXZlIG1lc3NhZ2UgaWYgUkRpc2NvdW50IGlzIG5vdCBhdmFpbGFibGUgKEBKYWNrRGFuZ2VyKQogICogQnVnIEZpeGVzCiAgKiBQcmV2ZW50IEpla3lsbCBmcm9tIHBpY2tpbmcgdXAgdGhlIG91dHB1dCBkaXJlY3RvcnkgYXMgYSBzb3VyY2UgKEBKYWNrRGFuZ2VyKQogICogU2tpcCBgcmVsYXRlZF9wb3N0c2Agd2hlbiB0aGVyZSBpcyBvbmx5IG9uZSBwb3N0IChASmFja0RhbmdlcikKCiMjIDAuMS40IC8gMjAwOC0xMi0wOAoKICAqIEJ1ZyBGaXhlcwogICogREFUQSBkb2VzIG5vdCB3b3JrIHByb3Blcmx5IHdpdGggcnVieWdlbXMKCiMjIDAuMS4zIC8gMjAwOC0xMi0wNgoKICAqIE1ham9yIEZlYXR1cmVzCiAgKiBNYXJrZG93biBzdXBwb3J0IChAdmFucGVsdCkKICAqIE1lcGhpc3RvIGFuZCBDU1YgY29udmVydGVycyAoQHZhbnBlbHQpCiAgKiBDb2RlIGhpbGlnaHRpbmcgKEB2YW5wZWx0KQogICogQXV0b2J1aWxkCiAgKiBCdWcgRml4ZXMKICAqIEFjY2VwdCBib3RoIGBcclxuYCBhbmQgYFxuYCBpbiBZQU1MIGhlYWRlciAoQHZhbnBlbHQpCgojIyAwLjEuMiAvIDIwMDgtMTEtMjIKCiAgKiBNYWpvciBGZWF0dXJlcwogICogQWRkIGEgcmVhbCAicmVsYXRlZCBwb3N0cyIgaW1wbGVtZW50YXRpb24gdXNpbmcgQ2xhc3NpZmllcgogICogQ29tbWFuZCBMaW5lIENoYW5nZXMKICAqIEFsbG93IGNsaSB0byBiZSBjYWxsZWQgd2l0aCAwLCAxLCBvciAyIGFyZ3MgaW50dWl0aW5nIGRpciBwYXRocyBpZiB0aGV5IGFyZSBvbWl0dGVkCgojIyAwLjEuMSAvIDIwMDgtMTEtMjIKCiAgKiBNaW5vciBBZGRpdGlvbnMKICAqIFBvc3RzIG5vdyBzdXBwb3J0IGludHJvc3BlY3Rpb25hbCBkYXRhIGUuZy4gYHt7IHBhZ2UudXJsIH19YAoKIyMgMC4xLjAgLyAyMDA4LTExLTA1CgogICogRmlyc3QgcmVsZWFzZQogICogQ29udmVydHMgcG9zdHMgd3JpdHRlbiBpbiBUZXh0aWxlCiAgKiBDb252ZXJ0cyByZWd1bGFyIHNpdGUgcGFnZXMKICAqIFNpbXBsZSBjb3B5IG9mIGJpbmFyeSBmaWxlcwoKIyMgMC4wLjAgLyAyMDA4LTEwLTE5CgogICogQmlydGhkYXkhCg== \ No newline at end of file From 97a6a312ac232f629b38b8bafec0786d6e037800 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 7 Jan 2016 22:27:47 -0800 Subject: [PATCH 0232/4996] Revert "Update history to reflect merge of #4330 [ci skip]" This reverts commit a12ee551399eadd2b970f08629b39cb02f8381f8. --- History.markdown | 1917 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 1916 insertions(+), 1 deletion(-) diff --git a/History.markdown b/History.markdown index 7db11b3ef9e..a1ad1b896bf 100644 --- a/History.markdown +++ b/History.markdown @@ -1 +1,1916 @@ -IyMgSEVBRAoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFVzZSBgTGlxdWlkOjpEcm9wYHMgaW5zdGVhZCBvZiBgSGFzaGBlcyBpbiBgI3RvX2xpcXVpZGAgKCM0Mjc3KQogICogQWRkICdzYW1wbGUnIExpcXVpZCBmaWx0ZXIgRXF1aXZhbGVudCB0byBBcnJheSNzYW1wbGUgZnVuY3Rpb25hbGl0eSAoIzQyMjMpCiAgKiBDYWNoZSBwYXJzZWQgaW5jbHVkZSBmaWxlIHRvIHNhdmUgbGlxdWlkIHBhcnNpbmcgdGltZS4gKCM0MTIwKQogICogU2xpZ2h0bHkgc3BlZWQgdXAgdXJsIHNhbml0aXphdGlvbiBhbmQgaGFuZGxlIG11bHRpcGxlcyBvZiAvLy8uICgjNDE2OCkKICAqIFByaW50IGRlYnVnIG1lc3NhZ2Ugd2hlbiBhIGRvY3VtZW50IGlzIHNraXBwZWQgZnJvbSByZWFkaW5nICgjNDE4MCkKICAqIEluY2x1ZGUgdGFnIHNob3VsZCBhY2NlcHQgbXVsdGlwbGUgdmFyaWFibGVzIGluIHRoZSBpbmNsdWRlIG5hbWUgKCM0MTgzKQogICogQWRkIGAtb2Agb3B0aW9uIHRvIHNlcnZlIGNvbW1hbmQgd2hpY2ggb3BlbnMgc2VydmVyIFVSTCAoIzQxNDQpCiAgKiBBZGQgQ29kZUNsaW1hdGUgcGxhdGZvcm0gZm9yIGJldHRlciBjb2RlIHF1YWxpdHkuICgjNDIyMCkKICAqIEdlbmVyYWwgaW1wcm92ZW1lbnRzIGZvciBXRUJyaWNrIHZpYSBqZWt5bGwgc2VydmUgc3VjaCBhcyBTU0wgJiBjdXN0b20gaGVhZGVycyAoIzQyMjQsICM0MjI4KQogICogQWRkIGEgZGVmYXVsdCBjaGFyc2V0IHRvIGNvbnRlbnQtdHlwZSBvbiB3ZWJyaWNrLiAoIzQyMzEpCiAgKiBTd2l0Y2ggYFBsdWdpbk1hbmFnZXJgIHRvIHVzZSBgcmVxdWlyZV93aXRoX2dyYWNlZnVsX2ZhaWxgIGZvciBiZXR0ZXIgVVggKCM0MjMzKQogICogQWxsb3cgcXVvdGVkIGRhdGUgaW4gZnJvbnQgbWF0dGVyIGRlZmF1bHRzICgjNDE4NCkKICAqIEFkZCBhIEpla3lsbCBkb2N0b3Igd2FybmluZyBmb3IgVVJMcyB0aGF0IG9ubHkgZGlmZmVyIGJ5IGNhc2UgKCMzMTcxKQogICogZHJvcHM6IGNyZWF0ZSBvbmUgYmFzZSBEcm9wIGNsYXNzIHdoaWNoIGNhbiBiZSBzZXQgYXMgbXV0YWJsZSBvciBub3QgKCM0Mjg1KQogICogZHJvcHM6IHByb3ZpZGUgYCN0b19oYCB0byBhbGxvdyBmb3IgaGFzaCBpbnRyb3NwZWN0aW9uICgjNDI4MSkKICAqIFNoaW0gc3ViY29tbWFuZHMgd2l0aCBpbmRpY2F0aW9uIG9mIGdlbSBwb3NzaWJseSByZXF1aXJlZCBzbyB1c2VycyBrbm93IGhvdyB0byB1c2UgdGhlbSAoIzQyNTQpCgojIyMgQnVnIEZpeGVzCgogICogUGFzcyBidWlsZCBvcHRpb25zIGludG8gYGNsZWFuYCBjb21tYW5kICgjNDE3NykKICAqIEFsbG93IHVzZXJzIHRvIHVzZSAuaHRtIGFuZCAueGh0bWwgKFhIVE1MNS4pICgjNDE2MCkKICAqIFByZXZlbnQgU2hlbGwgSW5qZWN0aW9uLiAoIzQyMDApCiAgKiBDb252ZXJ0aWJsZSBzaG91bGQgbWFrZSBsYXlvdXQgZGF0YSBhY2Nlc3NpYmxlIHZpYSBgbGF5b3V0YCBpbnN0ZWFkIG9mIGBwYWdlYCAoIzQyMDUpCiAgKiBBdm9pZCB1c2luZyBgRGlyLmdsb2JgIHdpdGggYWJzb2x1dGUgcGF0aCB0byBhbGxvdyBzcGVjaWFsIGNoYXJhY3RlcnMgaW4gdGhlIHBhdGggKCM0MTUwKQogICogSGFuZGxlIGVtcHR5IGNvbmZpZyBmaWxlcyAoIzQwNTIpCiAgKiBSZW5hbWUgYEBvcHRpb25zYCBzbyB0aGF0IGl0IGRvZXMgbm90IGltcGFjdCBMaXF1aWQuICgjNDE3MykKICAqIHV0aWxzL2Ryb3BzOiB1cGRhdGUgRHJvcCB0byBzdXBwb3J0IGBVdGlscy5kZWVwX21lcmdlX2hhc2hlc2AgKCM0Mjg5KQogICogTWFrZSBzdXJlIGpla3lsbC9kcm9wcy9kcm9wIGlzIGxvYWRlZCBmaXJzdC4gKCM0MjkyKQogICogQ29udmVydGlibGUvUGFnZS9SZW5kZXJlcjogdXNlIHBheWxvYWQgaGFzaCBhY2Nlc3NvciAmIHNldHRlciBzeW50YXggZm9yIGJhY2t3YXJkcy1jb21wYXRpYmlsaXR5ICgjNDMxMSkKICAqIERyb3A6IGZpeCBoYXNoIHNldHRlciBwcmVjZW5kZW5jZSAoIzQzMTIpCiAgKiB1dGlsczogYGhhc195YW1sX2hlYWRlcj9gIHNob3VsZCBhY2NlcHQgZmlsZXMgd2l0aCBleHRyYW5lb3VzIHNwYWNlcyAoIzQyOTApCiAgKiBFc2NhcGUgaHRtbCBmcm9tIHNpdGUudGl0bGUgYW5kIHBhZ2UudGl0bGUgaW4gc2l0ZSB0ZW1wbGF0ZSAoIzQzMDcpCgojIyMgRGV2ZWxvcG1lbnQgRml4ZXMKCiAgKiBgamVreWxsLWRvY3NgIHNob3VsZCBiZSBlYXNpbHkgcmVsZWFzZS1hYmxlICgjNDE1MikKICAqIEFsbG93IHVzZSBvZiBDdWN1bWJlciAyLjEgb3IgZ3JlYXRlciAoIzQxODEpCiAgKiBNb2Rlcm5pemUgS3JhbWRvd24gZm9yIE1hcmtkb3duIGNvbnZlcnRlci4gKCM0MTA5KQogICogQ2hhbmdlIFRlc3REb2N0b3JDb21tYW5kIHRvIEpla3lsbFVuaXRUZXN0Li4uICgjNDI2MykKICAqIENyZWF0ZSBuYW1lc3BhY2VkIHJha2UgdGFza3MgaW4gc2VwYXJhdGUgYC5yYWtlYCBmaWxlcyB1bmRlciBgbGliL3Rhc2tzYCAoIzQyODIpCiAgKiBtYXJrZG93bjogcmVmYWN0b3IgZm9yIGdyZWF0ZXIgcmVhZGFiaWxpdHkgJiBlZmZpY2llbmN5ICgjMzc3MSkKICAqIEZpeCBtYW55IFJ1Ym9jb3Agc3R5bGUgZXJyb3JzICgjNDMwMSkKICAqIEZpeCBzcGVsbGluZyBvZiAiR2l0SHViIiBpbiBkb2NzIGFuZCBoaXN0b3J5ICgjNDMyMikKICAqIFJlb3JnYW5pemUgYW5kIGNsZWFudXAgdGhlIEdlbWZpbGUsIHNob3J0ZW4gcmVxdWlyZWQgZGVwZW5kcy4gKCM0MzE4KQoKIyMjIFNpdGUgRW5oYW5jZW1lbnRzCgogICogQWRkIHRocmVlIHBsdWdpbnMgdG8gZGlyZWN0b3J5ICgjNDE2MykKICAqIEFkZCB1cGdyYWRpbmcgZG9jcyBmcm9tIDIueCB0byAzLnggKCM0MTU3KQogICogQWRkIGBwcm90ZWN0X2VtYWlsYCB0byB0aGUgcGx1Z2lucyBpbmRleC4gKCM0MTY5KQogICogQWRkIGBqZWt5bGwtZGVwbG95YCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCM0MTc5KQogICogQ2xhcmlmeSBwbHVnaW4gZG9jcyAoIzQxNTQpCiAgKiBBZGQgS2lja3N0ZXIgdG8gZGVwbG95bWVudCBtZXRob2RzIGluIGRvY3VtZW50YXRpb24gKCM0MTkwKQogICogQWRkIERhdmlkQnVyZWxhJ3MgdHV0b3JpYWwgZm9yIFdpbmRvd3MgdG8gV2luZG93cyBkb2NzIHBhZ2UgKCM0MjEwKQogICogQ2hhbmdlIEdpdEh1YiBjb2RlIGJsb2NrIHRvIGhpZ2hsaWdodCB0YWcgdG8gYXZvaWQgaXQgb3ZlcmxhcHMgcGFyZW50IGRpdiAoIzQxMjEpCiAgKiBVcGRhdGUgRm9ybUtlZXAgbGluayB0byBiZSBzb21ldGhpbmcgbW9yZSBzcGVjaWZpYyB0byBKZWt5bGwgKCM0MjQzKQogICogUmVtb3ZlIGV4YW1wbGUgUm9nZXIgQ2hhcG1hbiBzaXRlLCBhcyB0aGUgZG9tYWluIGRvZXNuJ3QgZXhpc3QgKCM0MjQ5KQogICogQWRkZWQgY29uZmlndXJhdGlvbiBvcHRpb25zIGZvciBgZHJhZnRfcG9zdHNgIHRvIGNvbmZpZ3VyYXRpb24gZG9jcyAoIzQyNTEpCiAgKiBGaXggY2hlY2tsaXN0IGluIGBfYXNzZXRzLm1kYCAoIzQyNTkpCiAgKiBBZGQgTWFya2Rvd24gZXhhbXBsZXMgdG8gUGFnZXMgZG9jcyAoIzQyNzUpCiAgKiBBZGQgamVreWxsLXBhZ2luYXRlLWNhdGVnb3J5IHRvIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzQyNzMpCiAgKiBBZGQgYGpla3lsbC1yZXNwb25zaXZlX2ltYWdlYCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCM0Mjg2KQogICogQWRkIGBqZWt5bGwtY29tbW9ubWFya2AgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjNDI5OSkKICAqIEFkZCBkb2N1bWVudGF0aW9uIGZvciBpbmNyZW1lbnRhbCByZWdlbmVyYXRpb24gKCM0MjkzKQogICogQWRkIG5vdGUgYWJvdXQgcmVtb3ZhbCBvZiByZWxhdGl2ZSBwZXJtYWxpbmsgc3VwcG9ydCBpbiB1cGdyYWRpbmcgZG9jcyAoIzQzMDMpCiAgKiBBZGQgUHJvIFRpcCB0byB1c2UgZnJvbnQgbWF0dGVyIHZhcmlhYmxlIHRvIGNyZWF0ZSBjbGVhbiBVUkxzICgjNDI5NikKICAqIEZpeCBncmFtbWFyIGluIHRoZSBkb2N1bWVudGF0aW9uIGZvciBwb3N0cy4gKCM0MzMwKQoKIyMgMy4wLjEgLyAyMDE1LTExLTE3CgojIyMgQnVnIEZpeGVzCgogICogRG9jdW1lbnQ6IG9ubHkgc3VwZXJkaXJlY3RvcmllcyBvZiB0aGUgY29sbGVjdGlvbiBhcmUgY2F0ZWdvcmllcyAoIzQxMTApCiAgKiBgQ29udmVydGlibGUjcmVuZGVyX2xpcXVpZGAgc2hvdWxkIHVzZSBgcmVuZGVyIWAgdG8gY2F1c2UgZmFpbHVyZSBvbiBiYWQgTGlxdWlkICgjNDA3NykKICAqIERvbid0IGdlbmVyYXRlIGAuamVreWxsLW1ldGFkYXRhYCBpbiBub24taW5jcmVtZW50YWwgYnVpbGQgKCM0MDc5KQogICogU2V0IGBoaWdobGlnaHRlcmAgY29uZmlnIHZhbCB0byBga3JhbWRvd24uc3ludGF4X2hpZ2hsaWdodGVyYCAoIzQwOTApCiAgKiBBbGlnbiBob29rcyBpbXBsZW1lbnRhdGlvbiB3aXRoIGRvY3VtZW50YXRpb24gKCM0MTA0KQogICogRml4IHRoZSBkZXByZWNhdGlvbiB3YXJuaW5nIGluIHRoZSBkb2N0b3IgY29tbWFuZCAoIzQxMTQpCiAgKiBGaXggY2FzZSBpbiBgOnRpdGxlYCBhbmQgYWRkIGA6c2x1Z2Agd2hpY2ggaXMgZG93bmNhc2VkICgjNDEwMCkKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIEZpeCB0ZXN0IHdhcm5pbmdzIHdoZW4gZG9pbmcgcmFrZSB7dGVzdCxzcGVjfSBvciBzY3JpcHQvdGVzdCAoIzQwNzgpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBVcGRhdGUgbm9ybWFsaXplLmNzcyB0byB2My4wLjMuICgjNDA4NSkKICAqIFVwZGF0ZSBGb250IEF3ZXNvbWUgdG8gdjQuNC4wLiAoIzQwODYpCiAgKiBBZGRzIGEgbm90ZSBhYm91dCBpbnN0YWxsaW5nIHRoZSBqZWt5bGwtZ2lzdCBnZW0gdG8gbWFrZSBnaXN0IHRhZyB3b3JrICgjNDEwMSkKICAqIEFsaWduIGhvb2tzIGRvY3VtZW50YXRpb24gd2l0aCBpbXBsZW1lbnRhdGlvbiAoIzQxMDQpCiAgKiBBZGQgSmVreWxsIEZsaWNrciBQbHVnaW4gdG8gdGhlIGxpc3Qgb2YgdGhpcmQgcGFydHkgcGx1Z2lucyAoIzQxMTEpCiAgKiBSZW1vdmUgbGluayB0byBub3ctZGVsZXRlZCBibG9nIHBvc3QgKCM0MTI1KQogICogVXBkYXRlIHRoZSBsaXF1aWQgc3ludGF4IGluIHRoZSBwYWdpbmF0aW9uIGRvY3MgKCM0MTMwKQogICogQWRkIGpla3lsbC1sYW5ndWFnZS1wbHVnaW4gdG8gcGx1Z2lucy5tZCAoIzQxMzQpCiAgKiBVcGRhdGVkIHRvIHJlZmxlY3QgZmVlZGJhY2sgaW4gIzQxMjkgKCM0MTM3KQogICogQ2xhcmlmeSBhc3NldHMubWQgYmFzZWQgb24gZmVlZGJhY2sgb2YgIzQxMjkgKCM0MTQyKQogICogUmUtY29ycmVjdCB0aGUgbGlxdWlkIHN5bnRheCBpbiB0aGUgcGFnaW5hdGlvbiBkb2NzICgjNDE0MCkKCiMjIDMuMC4wIC8gMjAxNS0xMC0yNgoKIyMjIE1ham9yIEVuaGFuY2VtZW50cwoKICAqIExpcXVpZCBwcm9maWxlciAoaS5lLiBrbm93IGhvdyBmYXN0IG9yIHNsb3cgeW91ciB0ZW1wbGF0ZXMgcmVuZGVyKSAoIzM3NjIpCiAgKiBJbmNyZW1lbnRhbCByZWdlbmVyYXRpb24gKCMzMTE2KQogICogQWRkIEhvb2tzOiBhIG5ldyBraW5kIG9mIHBsdWdpbiAoIzM1NTMpCiAgKiBVcGdyYWRlIHRvIExpcXVpZCAzLjAuMCAoIzMwMDIpCiAgKiBgc2l0ZS5wb3N0c2AgaXMgbm93IGEgQ29sbGVjdGlvbiBpbnN0ZWFkIG9mIGFuIEFycmF5ICgjNDA1NSkKICAqIEFkZCBiYXNpYyBzdXBwb3J0IGZvciBKUnVieSAoY29tbWl0OiAwZjQ0NzcpCiAgKiBEcm9wIHN1cHBvcnQgZm9yIFJ1YnkgMS45LjMuICgjMzIzNSkKICAqIFN1cHBvcnQgUnVieSB2Mi4yICgjMzIzNCkKICAqIFN1cHBvcnQgUkRpc2NvdW50IDIgKCMyNzY3KQogICogUmVtb3ZlIG1vc3QgcnVudGltZSBkZXBzICgjMzMyMykKICAqIE1vdmUgdG8gUm91Z2UgYXMgZGVmYXVsdCBoaWdobGlnaHRlciAoIzMzMjMpCiAgKiBNaW1pYyBHaXRIdWIgUGFnZXMgYC5odG1sYCBleHRlbnNpb24gc3RyaXBwaW5nIGJlaGF2aW9yIGluIFdFQnJpY2sgKCMzNDUyKQogICogQWx3YXlzIGluY2x1ZGUgZmlsZSBleHRlbnNpb24gb24gb3V0cHV0IGZpbGVzICgjMzQ5MCkKICAqIEltcHJvdmVkIHBlcm1hbGlua3MgZm9yIHBhZ2VzIGFuZCBjb2xsZWN0aW9ucyAoIzM1MzgpCiAgKiBTdW5zZXQgKGkuZS4gcmVtb3ZlKSBNYXJ1a3UgKCMzNjU1KQogICogUmVtb3ZlIHN1cHBvcnQgZm9yIHJlbGF0aXZlIHBlcm1hbGlua3MgKCMzNjc5KQogICogSXRlcmF0ZSBvdmVyIGBzaXRlLmNvbGxlY3Rpb25zYCBhcyBhbiBhcnJheSBpbnN0ZWFkIG9mIGEgaGFzaC4gKCMzNjcwKQogICogQWRhcHQgU3RhdGljRmlsZSBmb3IgY29sbGVjdGlvbnMsIGNvbmZpZyBkZWZhdWx0cyAoIzM4MjMpCiAgKiBBZGQgYSBDb2RlIG9mIENvbmR1Y3QgZm9yIHRoZSBKZWt5bGwgcHJvamVjdCAoIzM5MjUpCiAgKiBBZGRlZCBwZXJtYWxpbmsgdGltZSB2YXJpYWJsZXMgKCMzOTkwKQogICogQWRkIGAtLWluY3JlbWVudGFsYCBmbGFnIHRvIGVuYWJsZSBpbmNyZW1lbnRhbCByZWdlbiAoZGlzYWJsZWQgYnkgZGVmYXVsdCkgKCM0MDU5KQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIERlcHJlY2F0ZSBhY2Nlc3MgdG8gRG9jdW1lbnQjZGF0YSBwcm9wZXJ0aWVzIGFuZCBDb2xsZWN0aW9uI2RvY3MgbWV0aG9kcyAoIzQwNTgpCiAgKiBTb3J0IHN0YXRpYyBmaWxlcyBqdXN0IG9uY2UsIGFuZCBjYWxsIGBzaXRlX3BheWxvYWRgIG9uY2UgZm9yIGFsbCBjb2xsZWN0aW9ucyAoIzMyMDQpCiAgKiBTZXBhcmF0ZSBgamVreWxsIGRvY3NgIGFuZCBvcHRpbWl6ZSBleHRlcm5hbCBnZW0gaGFuZGxpbmcgKCMzMjQxKQogICogSW1wcm92ZSBgU2l0ZSNnZXRDb252ZXJ0ZXJJbXBsYCBhbmQgY2FsbCBpdCBgU2l0ZSNmaW5kX2NvbnZlcnRlcl9pbnN0YW5jZWAgKCMzMjQwKQogICogVXNlIHJlbGF0aXZlIHBhdGggZm9yIGBwYXRoYCBMaXF1aWQgdmFyaWFibGUgaW4gRG9jdW1lbnRzIGZvciBjb25zaXN0ZW5jeSAoIzI5MDgpCiAgKiBHZW5lcmFsaXplIGBVdGlscyNzbHVnaWZ5YCBmb3IgYW55IHNjcmlwdHMgKCMzMDQ3KQogICogQWRkZWQgYmFzaWMgbWljcm9kYXRhIHRvIHBvc3QgdGVtcGxhdGUgaW4gc2l0ZSB0ZW1wbGF0ZSAoIzMxODkpCiAgKiBTdG9yZSBsb2cgbWVzc2FnZXMgaW4gYW4gYXJyYXkgb2YgbWVzc2FnZXMuICgjMzI0NCkKICAqIEFsbG93IGNvbGxlY3Rpb24gZG9jdW1lbnRzIHRvIG92ZXJyaWRlIGBvdXRwdXRgIHByb3BlcnR5IGluIGZyb250IG1hdHRlciAoIzMxNzIpCiAgKiBLZWVwIGZpbGUgbW9kaWZpY2F0aW9uIHRpbWVzIGJldHdlZW4gYnVpbGRzIGZvciBzdGF0aWMgZmlsZXMgKCMzMjIwKQogICogT25seSBkb3duY2FzZSBtaXhlZC1jYXNlIGNhdGVnb3JpZXMgZm9yIHRoZSBVUkwgKCMyNTcxKQogICogQWRkZWQgcGVyIHBvc3QgYGV4Y2VycHRfc2VwYXJhdG9yYCBmdW5jdGlvbmFsaXR5ICgjMzI3NCkKICAqIEFsbG93IGNvbGxlY3Rpb25zIFlBTUwgdG8gZW5kIHdpdGggdGhyZWUgZG90cyAoIzMxMzQpCiAgKiBBZGQgbW9kZSBwYXJhbWV0ZXIgdG8gYHNsdWdpZnlgIExpcXVpZCBmaWx0ZXIgKCMyOTE4KQogICogUGVyZjogYE1hcmtkb3duI21hdGNoZXNgIHNob3VsZCBhdm9pZCByZWdleHAgKCMzMzIxKQogICogUGVyZjogVXNlIGZyb3plbiByZWd1bGFyIGV4cHJlc3Npb25zIGZvciBgVXRpbHMjc2x1Z2lmeWAgKCMzMzIxKQogICogU3BsaXQgb2ZmIFRleHRpbGUgc3VwcG9ydCBpbnRvIGpla3lsbC10ZXh0aWxlLWNvbnZlcnRlciAoIzMzMTkpCiAgKiBJbXByb3ZlIHRoZSBuYXZpZ2F0aW9uIG1lbnUgYWxpZ25tZW50IGluIHRoZSBzaXRlIHRlbXBsYXRlIG9uIHNtYWxsIHNjcmVlbnMgKCMzMzMxKQogICogU2hvdyB0aGUgcmVnZW5lcmF0aW9uIHRpbWUgYWZ0ZXIgdGhlIGluaXRpYWwgZ2VuZXJhdGlvbiAoIzMzNzgpCiAgKiBTaXRlIHRlbXBsYXRlOiBTd2l0Y2ggZGVmYXVsdCBmb250IHRvIEhlbHZldGljYSBOZXVlICgjMzM3NikKICAqIE1ha2UgdGhlIGBpbmNsdWRlYCB0YWcgYSB0ZWVuc3kgYml0IGZhc3Rlci4gKCMzMzkxKQogICogQWRkIGBwa2lsbCAtZiBqZWt5bGxgIHRvIHdheXMgdG8ga2lsbC4gKCMzMzk3KQogICogU2l0ZSB0ZW1wbGF0ZTogY29sbGFwc2VkLCB2YXJpYWJsZS1kcml2ZW4gZm9udCBkZWNsYXJhdGlvbiAoIzMzNjApCiAgKiBTaXRlIHRlbXBsYXRlOiBEb24ndCBhbHdheXMgc2hvdyB0aGUgc2Nyb2xsYmFyIGluIGNvZGUgYmxvY2tzICgjMzQxOSkKICAqIFNpdGUgdGVtcGxhdGU6IFJlbW92ZSB1bmRlZmluZWQgYHRleHRgIGNsYXNzIGZyb20gYHBgIGVsZW1lbnQgKCMzNDQwKQogICogU2l0ZSB0ZW1wbGF0ZTogT3B0aW1pemUgdGV4dCByZW5kZXJpbmcgZm9yIGxlZ2liaWxpdHkgKCMzMzgyKQogICogQWRkIGBkcmFmdD9gIG1ldGhvZCB0byBpZGVudGlmeSBpZiBQb3N0IGlzIGEgRHJhZnQgJiBleHBvc2UgdG8gTGlxdWlkICgjMzQ1NikKICAqIFdyaXRlIHJlZ2VuZXJhdGlvbiBtZXRhZGF0YSBldmVuIG9uIGZ1bGwgcmVidWlsZCAoIzM0NjQpCiAgKiBQZXJmOiBVc2UgYFN0cmluZyNlbmRfd2l0aD8oIi8iKWAgaW5zdGVhZCBvZiByZWdleHAgd2hlbiBjaGVja2luZyBwYXRocyAoIzM1MTYpCiAgKiBEb2NzOiBkb2N1bWVudCAnb3JkaW5hbCcgYnVpbHQtaW4gcGVybWFsaW5rIHN0eWxlICgjMzUzMikKICAqIFVwZ3JhZGUgbGlxdWlkLWMgdG8gMy54ICgjMzUzMSkKICAqIFVzZSBjb25zaXN0ZW50IHN5bnRheCBmb3IgZGVwcmVjYXRpb24gd2FybmluZyAoIzM1MzUpCiAgKiBBZGRlZCBidWlsZCAtLWRlc3RpbmF0aW9uIGFuZCAtLXNvdXJjZSBmbGFncyAoIzM0MTgpCiAgKiBTaXRlIHRlbXBsYXRlOiByZW1vdmUgdW51c2VkIGBwYWdlLm1ldGFgIGF0dHJpYnV0ZSAoIzM1MzcpCiAgKiBJbXByb3ZlIHRoZSBlcnJvciBtZXNzYWdlIHdoZW4gc29ydGluZyBudWxsIG9iamVjdHMgKCMzNTIwKQogICogQWRkZWQgbGlxdWlkLW1kNSBwbHVnaW4gKCMzNTk4KQogICogRG9jdW1lbnRhdGlvbjogUlIgcmVwbGFjZWQgd2l0aCBSU3BlYyBNb2NrcyAoIzM2MDApCiAgKiBEb2N1bWVudGF0aW9uOiBGaXggc3VicGF0aC4gKCMzNTk5KQogICogQ3JlYXRlICd0bXAnIGRpciBmb3IgdGVzdF90YWdzIGlmIGl0IGRvZXNuJ3QgZXhpc3QgKCMzNjA5KQogICogRXh0cmFjdCByZWFkaW5nIG9mIGRhdGEgZnJvbSBgU2l0ZWAgdG8gcmVkdWNlIHJlc3BvbnNpYmlsaXRpZXMuICgjMzU0NSkKICAqIFJlbW92ZWQgdGhlIHdvcmQgJ0pla3lsbCcgYSBmZXcgdGltZXMgZnJvbSB0aGUgY29tbWVudHMgKCMzNjE3KQogICogYGJpbi9qZWt5bGxgOiB3aXRoIG5vIGFyZ3MsIGV4aXQgd2l0aCBleGl0IGNvZGUgMSAoIzM2MTkpCiAgKiBJbmNyZW1lbnRhbCBidWlsZCBpZiBkZXN0aW5hdGlvbiBmaWxlIG1pc3NpbmcgKCMzNjE0KQogICogU3RhdGljIGZpbGVzIGBtdGltZWAgbGlxdWlkIHNob3VsZCByZXR1cm4gYSBgVGltZWAgb2JqICgjMzU5NikKICAqIFVzZSBgSmVreWxsOjpQb3N0YHMgZm9yIGJvdGggTFNJIGluZGV4aW5nIGFuZCBsb29rdXAuICgjMzYyOSkKICAqIEFkZCBgY2hhcnNldD11dGYtOGAgZm9yIEhUTUwgYW5kIFhNTCBwYWdlcyBpbiBXRUJyaWNrICgjMzY0OSkKICAqIFNldCBsb2cgbGV2ZWwgdG8gZGVidWcgd2hlbiB2ZXJib3NlIGZsYWcgaXMgc2V0ICgjMzY2NSkKICAqIEFkZGVkIGEgbWVudGlvbiBvbiB0aGUgR2VtZmlsZSB0byBjb21wbGV0ZSB0aGUgaW5zdHJ1Y3Rpb25zICgjMzY3MSkKICAqIFBlcmY6IENhY2hlIGBEb2N1bWVudCN0b19saXF1aWRgIGFuZCBpbnZhbGlkYXRlIHdoZXJlIG5lY2Vzc2FyeSAoIzM2OTMpCiAgKiBQZXJmOiBgSmVreWxsOjpDbGVhbmVyI2V4aXN0aW5nX2ZpbGVzYDogQ2FsbCBga2VlcF9maWxlX3JlZ2V4YCBhbmQgYGtlZXBfZGlyc2Agb25seSBvbmNlLCBub3Qgb25jZSBwZXIgaXRlcmF0aW9uICgjMzY5NikKICAqIE9taXQgamVreWxsL2pla3lsbC1oZWxwIGZyb20gbGlzdCBvZiByZXNvdXJjZXMuICgjMzY5OCkKICAqIEFkZCBiYXNpYyBgamVreWxsIGRvY3RvcmAgdGVzdCB0byBkZXRlY3QgZnNub3RpZnkgKE9TWCkgYW5vbWFsaWVzLiAoIzM3MDQpCiAgKiBBZGRlZCB0YWxrLmpla3lsbHJiLmNvbSB0byAiSGF2ZSBxdWVzdGlvbnM/IiAoIzM2OTQpCiAgKiBQZXJmb3JtYW5jZTogU29ydCBmaWxlcyBvbmx5IG9uY2UgKCMzNzA3KQogICogUGVyZm9ybWFuY2U6IE1hcnNoYWwgbWV0YWRhdGEgKCMzNzA2KQogICogVXBncmFkZSBoaWdobGlnaHQgd3JhcHBlciBmcm9tIGBkaXZgIHRvIGBmaWd1cmVgICgjMzc3OSkKICAqIFVwZ3JhZGUgbWltZS10eXBlcyB0byBgfj4gMi42YCAoIzM3OTUpCiAgKiBVcGRhdGUgd2luZG93cy5tZCB3aXRoIFJ1YnkgdmVyc2lvbiBpbmZvICgjMzgxOCkKICAqIE1ha2UgdGhlIGRpcmVjdG9yeSBmb3IgaW5jbHVkZXMgY29uZmlndXJhYmxlICgjMzc4MikKICAqIFJlbmFtZSBkaXJlY3RvcnkgY29uZmlndXJhdGlvbnMgdG8gbWF0Y2ggYCpfZGlyYCBjb252ZW50aW9uIGZvciBjb25zaXN0ZW5jeSAoIzM3ODIpCiAgKiBJbnRlcm5hbDogdHJpZ2dlciBob29rcyBieSBvd25lciBzeW1ib2wgKCMzODcxKQogICogVXBkYXRlIE1JTUUgdHlwZXMgZnJvbSBtaW1lLWRiICgjMzkzMykKICAqIEFkZCBoZWFkZXIgdG8gc2l0ZSB0ZW1wbGF0ZSBgX2NvbmZpZy55bWxgIGZvciBjbGFyaXR5ICYgZGlyZWN0aW9uICgjMzk5NykKICAqIFNpdGUgdGVtcGxhdGU6IGFkZCB0aW1lem9uZSBvZmZzZXQgdG8gcG9zdCBkYXRlIGZyb250bWF0dGVyICgjNDAwMSkKICAqIE1ha2UgYSBjb25zdGFudCBmb3IgdGhlIHJlZ2V4IHRvIGZpbmQgaGlkZGVuIGZpbGVzICgjNDAzMikKICAqIFNpdGUgdGVtcGxhdGU6IHJlZmFjdG9yIGdpdGh1YiAmIHR3aXR0ZXIgaWNvbnMgaW50byBpbmNsdWRlcyAoIzQwNDkpCiAgKiBTaXRlIHRlbXBsYXRlOiBhZGQgYmFja2dyb3VuZCB0byBLcmFtZG93biBSb3VnZS1pZmllZCBiYWNrdGljayBjb2RlIGJsb2NrcyAoIzQwNTMpCgojIyMgQnVnIEZpeGVzCgogICogYHBvc3RfdXJsYDogZml4IGFjY2VzcyBkZXByZWNhdGlvbiB3YXJuaW5nICYgZml4IGRlcHJlY2F0aW9uIG1zZyAoIzQwNjApCiAgKiBQZXJmb3JtIGpla3lsbC1wYWdpbmF0ZSBkZXByZWNhdGlvbiB3YXJuaW5nIGNvcnJlY3RseS4gKCMzNTgwKQogICogTWFrZSBwZXJtYWxpbmsgcGFyc2luZyBjb25zaXN0ZW50IHdpdGggcGFnZXMgKCMzMDE0KQogICogYHRpbWUoKWBwcmUtZmlsdGVyIG1ldGhvZCBzaG91bGQgYWNjZXB0IGEgYERhdGVgIG9iamVjdCAoIzMyOTkpCiAgKiBSZW1vdmUgdW5uZWVkZWQgZW5kIHRhZyBmb3IgYGxpbmtgIGluIHNpdGUgdGVtcGxhdGUgKCMzMjM2KQogICogS3JhbWRvd246IFVzZSBgZW5hYmxlX2NvZGVyYXlgIGtleSBpbnN0ZWFkIG9mIGB1c2VfY29kZXJheWAgKCMzMjM3KQogICogVW5lc2NhcGUgYERvY3VtZW50YCBvdXRwdXQgcGF0aCAoIzI5MjQpCiAgKiBGaXggbmF2IGl0ZW1zIGFsaWdubWVudCB3aGVuIG9uIG11bHRpcGxlIHJvd3MgKCMzMjY0KQogICogSGlnaGxpZ2h0OiBPbmx5IFN0cmlwIE5ld2xpbmVzL0NhcnJpYWdlIFJldHVybnMsIG5vdCBTcGFjZXMgKCMzMjc4KQogICogRmluZCB2YXJpYWJsZXMgaW4gZnJvbnQgbWF0dGVyIGRlZmF1bHRzIGJ5IHNlYXJjaGluZyB3aXRoIHJlbGF0aXZlIGZpbGUgcGF0aC4gKCMyNzc0KQogICogQWxsb3cgdmFyaWFibGVzIChlLmcgYDpjYXRlZ29yaWVzYCkgaW4gWUFNTCBmcm9udCBtYXR0ZXIgcGVybWFsaW5rcyAoIzMzMjApCiAgKiBIYW5kbGUgbmlsIFVSTCBwbGFjZWhvbGRlcnMgaW4gcGVybWFsaW5rcyAoIzMzMjUpCiAgKiBUZW1wbGF0ZTogRml4IG5hdiBpdGVtcyBhbGlnbm1lbnQgd2hlbiBpbiAiYnVyZ2VyIiBtb2RlICgjMzMyOSkKICAqIFRlbXBsYXRlOiBSZW1vdmUgYCFpbXBvcnRhbnRgIGZyb20gbmF2IFNDU1MgaW50cm9kdWNlZCBpbiAjMzMyOSAoIzMzNzUpCiAgKiBUaGUgYDp0aXRsZWAgVVJMIHBsYWNlaG9sZGVyIGZvciBjb2xsZWN0aW9ucyBzaG91bGQgYmUgdGhlIGZpbGVuYW1lIHNsdWcuICgjMzM4MykKICAqIFRyaW0gdGhlIGdlbmVyYXRlIHRpbWUgZGlmZiB0byBqdXN0IDMgcGxhY2VzIHBhc3QgdGhlIGRlY2ltYWwgcGxhY2UgKCMzNDE1KQogICogVGhlIGhpZ2hsaWdodCB0YWcgc2hvdWxkIG9ubHkgY2xpcCB0aGUgbmV3bGluZXMgYmVmb3JlIGFuZCBhZnRlciB0aGUgKmVudGlyZSogYmxvY2ssIG5vdCBpbiBiZXR3ZWVuICgjMzQwMSkKICAqIGhpZ2hsaWdodDogZml4IHByb2JsZW0gd2l0aCBsaW5lbm9zIGFuZCByb3VnZS4gKCMzNDM2KQogICogYFNpdGUjcmVhZF9kYXRhX2ZpbGVgOiByZWFkIENTVidzIHdpdGggcHJvcGVyIGZpbGUgZW5jb2RpbmcgKCMzNDU1KQogICogSWdub3JlIGAuamVreWxsLW1ldGFkYXRhYCBpbiBzaXRlIHRlbXBsYXRlICgjMzQ5NikKICAqIFRlbXBsYXRlOiBQb2ludCBkb2N1bWVudGF0aW9uIGxpbmsgdG8gdGhlIGRvY3VtZW50YXRpb24gcGFnZXMgKCMzNTAyKQogICogUmVtb3ZlZCB0aGUgdHJhaWxpbmcgc2xhc2ggZnJvbSB0aGUgZXhhbXBsZSBgL2Jsb2dgIGJhc2V1cmwgY29tbWVudCAoIzM0ODUpCiAgKiBDbGVhciB0aGUgcmVnZW5lcmF0b3IgY2FjaGUgZXZlcnkgdGltZSB3ZSBwcm9jZXNzICgjMzU5MikKICAqIFJlYWRkIChicmluZyBiYWNrKSBtaW5pdGVzdC1wcm9maWxlICgjMzYyOCkKICAqIEFkZCBXT0ZGMiBmb250IE1JTUUgdHlwZSB0byBKZWt5bGwgc2VydmVyIE1JTUUgdHlwZXMgKCMzNjQ3KQogICogQmUgc21hcnRlciBhYm91dCBleHRyYWN0aW5nIHRoZSBleHRuYW1lIGluIGBTdGF0aWNGaWxlYCAoIzM2MzIpCiAgKiBQcm9jZXNzIG1ldGFkYXRhIGZvciBhbGwgZGVwZW5kZW5jaWVzICgjMzYwOCkKICAqIFNob3cgZXJyb3IgbWVzc2FnZSBpZiB0aGUgWUFNTCBmcm9udCBtYXR0ZXIgb24gYSBwYWdlL3Bvc3QgaXMgaW52YWxpZC4gKCMzNjQzKQogICogVXBncmFkZSByZWRjYXJwZXQgdG8gMy4yIChTZWN1cml0eSBmaXg6IE9TVkRCLTEyMDQxNSkgKCMzNjUyKQogICogQ3JlYXRlICNtb2NrX2V4cGVjdHMgdGhhdCBnb2VzIGRpcmVjdGx5IHRvIFJTcGVjIE1vY2tzLiAoIzM2NTgpCiAgKiBPcGVuIGAuamVreWxsLW1ldGFkYXRhYCBpbiBiaW5hcnkgbW9kZSB0byByZWFkIGJpbmFyeSBNYXJzaGFsIGRhdGEgKCMzNzEzKQogICogSW5jcmVtZW50YWwgcmVnZW5lcmF0aW9uOiBoYW5kbGUgZGVsZXRlZCwgcmVuYW1lZCwgYW5kIG1vdmVkIGRlcGVuZGVuY2llcyAoIzM3MTcpCiAgKiBGaXggdHlwbyBvbiBsaW5lIDE5IG9mIHBhZ2luYXRpb24ubWQgKCMzNzYwKQogICogRml4IGl0IHNvIHRoYXQgJ2Jsb2cuaHRtbCcgbWF0Y2hlcyAnYmxvZy5odG1sJyAoIzM3MzIpCiAgKiBSZW1vdmUgb2NjYXNpb25hbGx5LXByb2JsZW1hdGljIGBlbnN1cmVgIGluIGBMaXF1aWRSZW5kZXJlcmAgKCMzODExKQogICogRml4ZWQgYW4gdW5jbGVhciBjb2RlIGNvbW1lbnQgaW4gc2l0ZSB0ZW1wbGF0ZSBTQ1NTICgjMzgzNykKICAqIEZpeCByZWFkaW5nIG9mIGJpbmFyeSBtZXRhZGF0YSBmaWxlICgjMzg0NSkKICAqIFJlbW92ZSB2YXIgY29sbGlzaW9uIHdpdGggc2l0ZSB0ZW1wbGF0ZSBoZWFkZXIgbWVudSBpdGVyYXRpb24gdmFyaWFibGUgKCMzODM4KQogICogQ2hhbmdlIG5vbi1leGlzdGVudCBgaGxfbGluZW5vc2AgdG8gYGhsX2xpbmVzYCB0byBhbGxvdyBwYXNzdGhyb3VnaCBpbiBzYWZlIG1vZGUgKCMzNzg3KQogICogQWRkIG1pc3NpbmcgZmxhZyB0byBkaXNhYmxlIHRoZSB3YXRjaGVyICgjMzgyMCkKICAqIFVwZGF0ZSBDSSBndWlkZSB0byBpbmNsdWRlIG1vcmUgZGlyZWN0IGV4cGxhbmF0aW9ucyBvZiB0aGUgZmxvdyAoIzM4OTEpCiAgKiBTZXQgYGZ1dHVyZWAgdG8gYGZhbHNlYCBpbiB0aGUgZGVmYXVsdCBjb25maWcgKCMzODkyKQogICogZmlsdGVyczogYHdoZXJlYCBzaG91bGQgY29tcGFyZSBzdHJpbmdpZmllZCB2ZXJzaW9ucyBvZiBpbnB1dCAmIGNvbXBhcmF0b3IgKCMzOTM1KQogICogUmVhZCBidWlsZCBvcHRpb25zIGZvciBgamVreWxsIGNsZWFuYCBjb21tYW5kICgjMzgyOCkKICAqIEZpeCAjMzk3MDogVXNlIEdlbTo6VmVyc2lvbiB0byBjb21wYXJlIHZlcnNpb25zLCBub3QgYD5gLgogICogQWJvcnQgaWYgbm8gc3ViY29tbWFuZC4gRml4ZXMgY29uZnVzaW5nIG1lc3NhZ2UuICgjMzk5MikKICAqIFdob2xlLXBvc3QgZXhjZXJwdHMgc2hvdWxkIG1hdGNoIHRoZSBwb3N0IGNvbnRlbnQgKCM0MDA0KQogICogQ2hhbmdlIGRlZmF1bHQgZm9udCB3ZWlnaHQgdG8gNDAwIHRvIGZpeCBib2xkL3N0cm9uZyB0ZXh0IGlzc3VlcyAoIzQwNTApCiAgKiBEb2N1bWVudDogT25seSBhdXRvLWdlbmVyYXRlIHRoZSBleGNlcnB0IGlmIGl0J3Mgbm90IG92ZXJyaWRkZW4gKCM0MDYyKQogICogVXRpbHM6IGBkZWVwX21lcmdlX2hhc2hlc2Agc2hvdWxkIGFsc28gbWVyZ2UgYGRlZmF1bHRfcHJvY2AgKDQ1ZjY5YmIpCiAgKiBEZWZhdWx0czogY29tcGFyZSBwYXRocyBpbiBgYXBwbGllc19wYXRoP2AgYXMgYFN0cmluZ2BzIHRvIGF2b2lkIGNvbmZ1c2lvbiAoN2I4MWYwMCkKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIFJlbW92ZSBsb2FkZXIucmIgYW5kICJtb2Rlcm5pemUiIGBzY3JpcHQvdGVzdGAuICgjMzU3NCkKICAqIEltcHJvdmUgdGhlIGdyYW1tYXIgaW4gdGhlIGRvY3VtZW50YXRpb24gKCMzMjMzKQogICogVXBkYXRlIHRoZSBMSUNFTlNFIHRleHQgdG8gbWF0Y2ggdGhlIE1JVCBsaWNlbnNlIGV4YWN0bHkgKCMzMjUzKQogICogVXBkYXRlIHJha2UgdGFzayBgc2l0ZTpwdWJsaXNoYCB0byBmaXggbWlub3IgYnVncy4gKCMzMjU0KQogICogU3dpdGNoIHRvIHNoaWVsZHMuaW8gZm9yIHRoZSBSRUFETUUgYmFkZ2VzLiAoIzMyNTUpCiAgKiBVc2UgYEZpbGVMaXN0YCBpbnN0ZWFkIG9mIGBEaXIuZ2xvYmAgaW4gYHNpdGU6cHVibGlzaGAgcmFrZSB0YXNrICgjMzI2MSkKICAqIEZpeCB0ZXN0IHNjcmlwdCB0byBiZSBwbGF0Zm9ybS1pbmRlcGVuZGVudCAoIzMyNzkpCiAgKiBJbnN0ZWFkIG9mIHN5bWxpbmtpbmcgYC90bXBgLCBjcmVhdGUgYW5kIHN5bWxpbmsgYSBsb2NhbCBgdG1wYCBpbiB0aGUgdGVzdHMgKCMzMjU4KQogICogRml4IHNvbWUgc3BhY2luZyAoIzMzMTIpCiAgKiBGaXggY29tbWVudCB0eXBvIGluIGBsaWIvamVreWxsL2Zyb250bWF0dGVyX2RlZmF1bHRzLnJiYCAoIzMzMjIpCiAgKiBNb3ZlIGFsbCBgcmVnZW5lcmF0ZT9gIGNoZWNraW5nIHRvIGBSZWdlbmVyYXRvcmAgKCMzMzI2KQogICogRmFjdG9yIG91dCBhIGByZWFkX2RhdGFfZmlsZWAgY2FsbCB0byBrZWVwIHRoaW5ncyBjbGVhbiAoIzMzODApCiAgKiBQcm9vZiB0aGUgc2l0ZSB3aXRoIENpcmNsZUNJLiAoIzM0MjcpCiAgKiBVcGRhdGUgTElDRU5TRSB0byAyMDE1LiAoIzM0NzcpCiAgKiBVcGdyYWRlIHRlc3RzIHRvIHVzZSBNaW5pdGVzdCAoIzM0OTIpCiAgKiBSZW1vdmUgdHJhaWxpbmcgd2hpdGVzcGFjZSAoIzM0OTcpCiAgKiBVc2UgYGZpeHR1cmVfc2l0ZWAgZm9yIERvY3VtZW50IHRlc3RzICgjMzUxMSkKICAqIFJlbW92ZSBhZGFwdGVycyBkZXByZWNhdGlvbiB3YXJuaW5nICgjMzUyOSkKICAqIE1pbm9yIGZpeGVzIHRvIGB1cmwucmJgIHRvIGZvbGxvdyBHaXRIdWIgc3R5bGUgZ3VpZGUgKCMzNTQ0KQogICogTWlub3IgY2hhbmdlcyB0byByZXNvbHZlIGRlcHJlY2F0aW9uIHdhcm5pbmdzICgjMzU0NykKICAqIENvbnZlcnQgcmVtYWluaW5nIHRleHRpbGUgdGVzdCBkb2N1bWVudHMgdG8gbWFya2Rvd24gKCMzNTI4KQogICogTWlncmF0ZSB0aGUgdGVzdHMgdG8gdXNlIHJzcGVjLW1vY2tzICgjMzU1MikKICAqIFJlbW92ZSBgYWN0aXZlc3VwcG9ydGAgKCMzNjEyKQogICogQWRkZWQgdGVzdHMgZm9yIGBKZWt5bGw6U3RhdGljRmlsZWAgKCMzNjMzKQogICogRm9yY2UgbWluaXRlc3QgdmVyc2lvbiB0byA1LjUuMSAoIzM2NTcpCiAgKiBVcGRhdGUgdGhlIHdheSBjdWN1bWJlciBhY2Nlc3NlcyBNaW5pdGVzdCBhc3NlcnRpb25zICgjMzY3OCkKICAqIEFkZCBgc2NyaXB0L3J1Ynlwcm9mYCB0byBnZW5lcmF0ZSBjYWNoZWdyaW5kIGNhbGxncmFwaHMgKCMzNjkyKQogICogVXBncmFkZSBjdWN1bWJlciB0byAyLnggKCMzNzk1KQogICogVXBkYXRlIEtyYW1kb3duLiAoIzM4NTMpCiAgKiBVcGRhdGVkIHRoZSBzY3JpcHRzIHNoZWJhbmcgZm9yIHBvcnRhYmlsaXR5ICgjMzg1OCkKICAqIFVwZGF0ZSBKUnVieSB0ZXN0aW5nIHRvIDlLIChbM2FiMzg2Zl0oaHR0cHM6Ly9naXRodWIuY29tL2pla3lsbC9qZWt5bGwvY29tbWl0LzNhYjM4NmYxYjA5NmJlMjVhMjRmZTAzOGZjNzBmZDBmYjA4ZDU0NWQpKQogICogT3JnYW5pemUgZGVwZW5kZW5jaWVzIGludG8gZGV2IGFuZCB0ZXN0IGdyb3Vwcy4gKCMzODUyKQogICogQ29udHJpYnV0aW5nLm1kIHNob3VsZCByZWZlciB0byBgc2NyaXB0L2N1Y3VtYmVyYCAoIzM4OTQpCiAgKiBVcGRhdGUgY29udHJpYnV0aW5nIGRvY3VtZW50YXRpb24gdG8gcmVmbGVjdCB3b3JrZmxvdyB1cGRhdGVzICgjMzg5NSkKICAqIEFkZCBzY3JpcHQgdG8gdmVuZG9yIG1pbWUgdHlwZXMgKCMzOTMzKQogICogSWdub3JlIC5idW5kbGUgZGlyIGluIFNpbXBsZUNvdiAoIzQwMzMpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBBZGQgJ2luZm8nIGxhYmVscyB0byBjZXJ0YWluIG5vdGVzIGluIGNvbGxlY3Rpb25zIGRvY3MgKCMzNjAxKQogICogUmVtb3ZlIGV4dHJhIHNwYWNlcywgbWFrZSB0aGUgbGFzdCBzZW50ZW5jZSBsZXNzIGF3a3dhcmQgaW4gcGVybWFsaW5rIGRvY3MgKCMzNjAzKQogICogVXBkYXRlIHRoZSBwZXJtYWxpbmtzIGRvY3VtZW50YXRpb24gdG8gcmVmbGVjdCB0aGUgdXBkYXRlcyBmb3IgMy4wICgjMzU1NikKICAqIEFkZCBibG9nIHBvc3QgYW5ub3VuY2luZyBKZWt5bGwgSGVscCAoIzM1MjMpCiAgKiBBZGQgSmVreWxsIFRhbGsgdG8gSGVscCBwYWdlIG9uIHNpdGUgKCMzNTE4KQogICogQ2hhbmdlIEFqYXggcGFnaW5hdGlvbiByZXNvdXJjZSBsaW5rIHRvIHVzZSBIVFRQUyAoIzM1NzApCiAgKiBGaXhpbmcgdGhlIGRlZmF1bHQgaG9zdCBvbiBkb2NzICgjMzIyOSkKICAqIEFkZCBgamVreWxsLXRodW1ibmFpbC1maWx0ZXJgIHRvIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzI3OTApCiAgKiBBZGQgbGluayB0byAnQWRkaW5nIEFqYXggcGFnaW5hdGlvbiB0byBKZWt5bGwnIHRvIFJlc291cmNlcyBwYWdlICgjMzE4NikKICAqIEFkZCBhIFJlc291cmNlcyBsaW5rIHRvIHR1dG9yaWFsIG9uIGJ1aWxkaW5nIGR5bmFtaWMgbmF2YmFycyAoIzMxODUpCiAgKiBTZW1hbnRpYyBzdHJ1Y3R1cmUgaW1wcm92ZW1lbnRzIHRvIHRoZSBwb3N0IGFuZCBwYWdlIGxheW91dHMgKCMzMjUxKQogICogQWRkIG5ldyBBc2NpaURvYyBwbHVnaW4gdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zLiAoIzMyNzcpCiAgKiBTcGVjaWZ5IHRoYXQgYWxsIHRyYW5zZm9ybWFibGUgY29sbGVjdGlvbiBkb2N1bWVudHMgbXVzdCBjb250YWluIFlBTUwgZnJvbnQgbWF0dGVyICgjMzI3MSkKICAqIEFzc29ydGVkIGFjY2Vzc2liaWxpdHkgZml4ZXMgKCMzMjU2KQogICogVXBkYXRlIGNvbmZpZ3VyYXRpb24gZG9jcyB0byBtZW50aW9uIGBrZWVwX2ZpbGVzYCBmb3IgYGRlc3RpbmF0aW9uYCAoIzMyODgsICMzMjk2KQogICogQnJlYWsgd2hlbiB3ZSBzdWNjZXNzZnVsbHkgZ2VuZXJhdGUgbmF2IGxpbmsgdG8gc2F2ZSBDUFUgY3ljbGVzLiAoIzMyOTEpCiAgKiBVcGRhdGUgdXNhZ2UgZG9jcyB0byBtZW50aW9uIGBrZWVwX2ZpbGVzYCBhbmQgYSB3YXJuaW5nIGFib3V0IGBkZXN0aW5hdGlvbmAgY2xlYW5pbmcgKCMzMjk1KQogICogQWRkIGxvZ2ljIHRvIGF1dG9tYXRpY2FsbHkgZ2VuZXJhdGUgdGhlIGBuZXh0X3NlY3Rpb25gIGFuZCBgcHJldl9zZWN0aW9uYCBuYXZpZ2F0aW9uIGl0ZW1zICgjMzI5MikKICAqIFNvbWUgc21hbGwgZml4ZXMgZm9yIHRoZSBQbHVnaW5zIFRPQy4gKCMzMzA2KQogICogQWRkZWQgdmVyc2lvbmluZyBjb21tZW50IHRvIGNvbmZpZ3VyYXRpb24gZmlsZSAoIzMzMTQpCiAgKiBBZGQgYGpla3lsbC1taW5pZmllcmAgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMzMzMykKICAqIEFkZCBibG9nIHBvc3QgYWJvdXQgdGhlIEpla3lsbCBtZWV0LXVwICgjMzMzMikKICAqIFVzZSBgaGlnaGxpZ2h0YCBMaXF1aWQgdGFnIGluc3RlYWQgb2YgdGhlIGZvdXItc3BhY2UgdGFicyBmb3IgY29kZSAoIzMzMzYpCiAgKiAzLjAuMC5iZXRhMSByZWxlYXNlIHBvc3QgKCMzMzQ2KQogICogQWRkIGB0d2FgIHRvIHRoZSBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMzMzg0KQogICogUmVtb3ZlIGV4dHJhIHNwYWNlcyAoIzMzODgpCiAgKiBGaXggc21hbGwgZ3JhbW1hciBlcnJvcnMgb24gYSBjb3VwbGUgcGFnZXMgKCMzMzk2KQogICogRml4IHR5cG8gb24gVGVtcGxhdGVzIGRvY3MgcGFnZSAoIzM0MjApCiAgKiBzL3RocmVlL2ZvdXIgZm9yIHBsdWdpbiB0eXBlIGxpc3QgKCMzNDI0KQogICogUmVsZWFzZSBqZWt5bGxyYi5jb20gYXMgYSBsb2NhbGx5LWNvbXBpbGVkIHNpdGUuICgjMzQyNikKICAqIEFkZCBhIGpla3lsbHJiLmNvbS9oZWxwIHBhZ2Ugd2hpY2ggZWx1Y2lkYXRlcyBwbGFjZXMgZnJvbSB3aGljaCB0byBnZXQgaGVscCAoIzM0MjgpCiAgKiBSZW1vdmUgZXh0cmFuZW91cyBkYXNoIG9uIFBsdWdpbnMgZG9jIHBhZ2Ugd2hpY2ggY2F1c2VkIGEgZm9ybWF0dGluZyBlcnJvciAoIzM0MzEpCiAgKiBGaXggYnJva2VuIGxpbmsgdG8gSm9yZGFuIFRob3JucXVlc3QncyB3ZWJzaXRlLiAoIzM0MzgpCiAgKiBDaGFuZ2UgdGhlIGxpbmsgdG8gYW4gZXh0ZW5zaW9uICgjMzQ1NykKICAqIEZpeCBUd2l0dGVyIGxpbmsgb24gdGhlIGhlbHAgcGFnZSAoIzM0NjYpCiAgKiBGaXggd29yZGluZyBpbiBjb2RlIHNuaXBwZXQgaGlnaGxpZ2h0aW5nIHNlY3Rpb24gKCMzNDc1KQogICogQWRkIGEgYC9gIHRvIGBwYWdpbmF0ZV9wYXRoYCBpbiB0aGUgUGFnaW5hdGlvbiBkb2N1bWVudGF0aW9uICgjMzQ3OSkKICAqIEFkZCBhIGxpbmsgb24gYWxsIHRoZSBkb2NzIHBhZ2VzIHRvICJJbXByb3ZlIHRoaXMgcGFnZSIuICgjMzUxMCkKICAqIEFkZCBqZWt5bGwtYXV0by1pbWFnZSBnZW5lcmF0b3IgdG8gdGhlIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzM0ODkpCiAgKiBSZXBsYWNlIGxpbmsgdG8gdGhlIHByb3Bvc2VkIGBwaWN0dXJlYCBlbGVtZW50IHNwZWMgKCMzNTMwKQogICogQWRkIGZyb250bWF0dGVyIGRhdGUgZm9ybWF0dGluZyBpbmZvcm1hdGlvbiAoIzM0NjkpCiAgKiBJbXByb3ZlIGNvbnNpc3RlbmN5IGFuZCBjbGFyaXR5IG9mIHBsdWdpbnMgb3B0aW9ucyBub3RlICgjMzU0NikKICAqIEFkZCBwZXJtYWxpbmsgd2FybmluZyB0byBwYWdpbmF0aW9uIGRvY3MgKCMzNTUxKQogICogRml4IGdyYW1tYXIgaW4gQ29sbGVjdGlvbnMgZG9jcyBBUEkgc3RhYmlsaXR5IHdhcm5pbmcgKCMzNTYwKQogICogUmVzdHJ1Y3R1cmUgYGV4Y2VycHRfc2VwYXJhdG9yYCBkb2N1bWVudGF0aW9uIGZvciBjbGFyaXR5ICgjMzU1MCkKICAqIEZpeCBhY2NpZGVudGFsIGxpbmUgYnJlYWsgaW4gY29sbGVjdGlvbnMgZG9jcyAoIzM1ODUpCiAgKiBBZGQgaW5mb3JtYXRpb24gYWJvdXQgdGhlIGAuamVreWxsLW1ldGFkYXRhYCBmaWxlICgjMzU5NykKICAqIERvY3VtZW50IGFkZGl0aW9uIG9mIHZhcmlhYmxlIHBhcmFtZXRlcnMgdG8gYW4gaW5jbHVkZSAoIzM1ODEpCiAgKiBBZGQgYGpla3lsbC1maWxlc2AgdG8gdGhlIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucy4gKCMzNTg2KQogICogRGVmaW5lIHRoZSBgaW5zdGFsbGAgc3RlcCBpbiB0aGUgQ0kgZXhhbXBsZSBgLnRyYXZpcy55bWxgICgjMzYyMikKICAqIEV4cGFuZCBjb2xsZWN0aW9ucyBkb2N1bWVudGF0aW9uLiAoIzM2MzgpCiAgKiBBZGQgdGhlICJ3YXJuaW5nIiBub3RlIGxhYmVsIHRvIGV4Y2x1ZGluZyBgdmVuZG9yYCBpbiB0aGUgQ0kgZG9jcyBwYWdlICgjMzYyMykKICAqIFVwZ3JhZGUgcGllY2VzIG9mIHRoZSBVZ3JhZGluZyBndWlkZSBmb3IgSmVreWxsIDMgKCMzNjA3KQogICogU2hvd2luZyBob3cgdG8gYWNjZXNzIHNwZWNpZmljIGRhdGEgaXRlbXMgKCMzNDY4KQogICogQ2xhcmlmeSBwYWdpbmF0aW9uIHdvcmtzIGZyb20gd2l0aGluIEhUTUwgZmlsZXMgKCMzNDY3KQogICogQWRkIG5vdGUgdG8gYGV4Y2VycHRfc2VwYXJhdG9yYCBkb2N1bWVudGF0aW9uIHRoYXQgaXQgY2FuIGJlIHNldCBnbG9iYWxseSAoIzM2NjcpCiAgKiBGaXggc29tZSBuYW1lcyBvbiBUcm91Ymxlc2hvb3RpbmcgcGFnZSAoIzM2ODMpCiAgKiBBZGQgYHJlbW90ZV9maWxlX2NvbnRlbnRgIHRhZyBwbHVnaW4gdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMzY5MSkKICAqIFVwZGF0ZSB0aGUgUmVkY2FycGV0IHZlcnNpb24gb24gdGhlIENvbmZpZ3VyYXRpb24gcGFnZS4gKCMzNzQzKQogICogVXBkYXRlIHRoZSBsaW5rIGluIHRoZSB3ZWxjb21lIHBvc3QgdG8gcG9pbnQgdG8gSmVreWxsIFRhbGsgKCMzNzQ1KQogICogVXBkYXRlIGxpbmsgZm9yIG5hdmJhcnMgd2l0aCBkYXRhIGF0dHJpYnV0ZXMgdHV0b3JpYWwgKCMzNzI4KQogICogQWRkIGBqZWt5bGwtYXNjaWluZW1hYCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMzNzUwKQogICogVXBkYXRlIHBhZ2luYXRpb24gZXhhbXBsZSB0byBiZSBhZ25vc3RpYyB0byBmaXJzdCBwYWdpbmF0aW9uIGRpciAoIzM3NjMpCiAgKiBEZXRhaWxlZCBpbnN0cnVjdGlvbnMgZm9yIHJzeW5jIGRlcGxveW1lbnQgbWV0aG9kICgjMzg0OCkKICAqIEFkZCBKZWt5bGwgUG9ydGZvbGlvIEdlbmVyYXRvciB0byBsaXN0IG9mIHBsdWdpbnMgKCMzODgzKQogICogQWRkIGBzaXRlLmh0bWxfZmlsZXNgIHRvIHZhcmlhYmxlcyBkb2NzICgjMzg4MCkKICAqIEFkZCBTdGF0aWMgUHVibGlzaGVyIHRvb2wgdG8gbGlzdCBvZiBkZXBsb3ltZW50IG1ldGhvZHMgKCMzODY1KQogICogRml4IGEgZmV3IHR5cG9zLiAoIzM4OTcpCiAgKiBBZGQgYGpla3lsbC15b3V0dWJlYCB0byB0aGUgbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMzkzMSkKICAqIEFkZCBWaWV3cyBSb3V0ZXIgcGx1Z2luICgjMzk1MCkKICAqIFVwZGF0ZSBpbnN0YWxsIGRvY3MgKENvcmUgZGVwZW5kZW5jaWVzLCBXaW5kb3dzIHJlcXMsIGV0YykgKCMzNzY5KQogICogVXNlIEpla3lsbCBGZWVkIGZvciBqZWt5bGxyYi5jb20gKCMzNzM2KQogICogQWRkIGpla3lsbC11bWxhdXRzIHRvIHBsdWdpbnMubWQgKCQzOTY2KQogICogVHJvdWJsZXNob290aW5nOiBmaXggYnJva2VuIGxpbmssIGFkZCBvdGhlciBtYWMtc3BlY2lmaWMgaW5mbyAoIzM5NjgpCiAgKiBBZGQgYSBuZXcgc2l0ZSBmb3IgbGVhcm5pbmcgcHVycG9zZXMgKCMzOTE3KQogICogQWRkZWQgZG9jdW1lbnRhdGlvbiBmb3IgSmVreWxsIGVudmlyb25tZW50IHZhcmlhYmxlcyAoIzM5ODkpCiAgKiBGaXggYnJva2VuIGNvbmZpZ3VyYXRpb24gZG9jdW1lbnRhdGlvbiBwYWdlICgjMzk5NCkKICAqIEFkZCB0cm91Ymxlc2hvb3RpbmcgZG9jcyBmb3IgaW5zdGFsbGluZyBvbiBFbCBDYXBpdGFuICgjMzk5OSkKICAqIEFkZCBMYXp5IFR3ZWV0IEVtYmVkZGluZyB0byB0aGUgbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjNDAxNSkKICAqIEFkZCBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGZvciAyIG9mIDMgb3B0aW9ucyBmb3IgcGx1Z2lucyAoIzQwMTMpCiAgKiBBZGQgYWx0ZXJuYXRpdmUgamVreWxsIGdlbSBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zICgjNDAxOCkKICAqIEZpeCBhIGZldyB0eXBvcyBhbmQgZm9ybWF0dGluZyBwcm9ibGVtcy4gKCM0MDIyKQogICogRml4IHByZXR0eSBwZXJtYWxpbmsgZXhhbXBsZSAoIzQwMjkpCiAgKiBOb3RlIHRoYXQgYF9jb25maWcueW1sYCBpcyBub3QgcmVsb2FkZWQgZHVyaW5nIHJlZ2VuZXJhdGlvbiAoIzQwMzQpCiAgKiBBcHBseSBjb2RlIGJsb2NrIGZpZ3VyZSBzeW50YXggdG8gYmxvY2tzIGluIENPTlRSSUJVVElORyAoIzQwNDYpCiAgKiBBZGQgamVreWxsLXNtYXJ0aWZ5IHRvIHRoZSBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMzNTcyKQoKIyMgMi41LjMgLyAyMDE0LTEyLTIyCgojIyMgQnVnIEZpeGVzCgogICogV2hlbiBjaGVja2luZyBhIE1hcmtkb3duIGV4dG5hbWUsIGluY2x1ZGUgcG9zaXRpb24gb2YgdGhlIGAuYCAoIzMxNDcpCiAgKiBGaXggYGpzb25pZnlgIExpcXVpZCBmaWx0ZXIgaGFuZGxpbmcgb2YgYm9vbGVhbiB2YWx1ZXMgKCMzMTU0KQogICogQWRkIGNvbW1hIHRvIHZhbHVlIG9mIGB2aWV3cG9ydGAgbWV0YSB0YWcgKCMzMTcwKQogICogU2V0IHRoZSBsaW5rIHR5cGUgZm9yIHRoZSBSU1MgZmVlZCB0byBgYXBwbGljYXRpb24vcnNzK3htbGAgKCMzMTc2KQogICogUmVmYWN0b3IgYCNhc19saXF1aWRgICgjMzE1OCkKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIEV4Y2x1ZGUgYnVpbHQtaW4gYnVuZGxlcyBmcm9tIGJlaW5nIGFkZGVkIHRvIGNvdmVyYWdlIHJlcG9ydCAoIzMxODApCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBBZGQgYEBhbGZyZWR4aW5nYCB0byB0aGUgYEBqZWt5bGwvY29yZWAgdGVhbS4gOnRhZGE6ICgjMzIxOCkKICAqIERvY3VtZW50IHRoZSBgLXFgIG9wdGlvbiBmb3IgdGhlIGBidWlsZGAgYW5kIGBzZXJ2ZWAgY29tbWFuZHMgKCMzMTQ5KQogICogRml4IHNvbWUgbWlub3IgdHlwb3MvZmxvdyBmaXhlcyBpbiBkb2N1bWVudGF0aW9uIHdlYnNpdGUgY29udGVudCAoIzMxNjUpCiAgKiBBZGQgYGtlZXBfZmlsZXNgIHRvIGNvbmZpZ3VyYXRpb24gZG9jdW1lbnRhdGlvbiAoIzMxNjIpCiAgKiBSZXBlYXQgd2FybmluZyBhYm91dCBjbGVhbmluZyBvZiB0aGUgYGRlc3RpbmF0aW9uYCBkaXJlY3RvcnkgKCMzMTYxKQogICogQWRkIGpla3lsbC01MDBweC1lbWJlZCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMzMTYzKQogICogU2ltcGxpZmllZCBwbGF0Zm9ybSBkZXRlY3Rpb24gaW4gR2VtZmlsZSBleGFtcGxlIGZvciBXaW5kb3dzICgjMzE3NykKICAqIEFkZCB0aGUgYGpla3lsbC1qYWxhbGlgIHBsdWdpbiBhZGRlZCB0byB0aGUgbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zLiAoIzMxOTgpCiAgKiBBZGQgVGFibGUgb2YgQ29udGVudHMgdG8gVHJvdWJsZXNob290aW5nIHBhZ2UgKCMzMTk2KQogICogQWRkIGBpbmxpbmVfaGlnaGxpZ2h0YCBwbHVnaW4gdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMzIxMikKICAqIEFkZCBgamVreWxsLW1lcm1haWRgIHBsdWdpbiB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMzMjIyKQoKIyMgMi41LjIgLyAyMDE0LTExLTE3CgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogYHBvc3RfdXJsYCBzaG91bGQgbWF0Y2ggYHBvc3QubmFtZWAgaW5zdGVhZCBvZiBzbHVncyBhbmQgZGF0ZXMgKCMzMDU4KQoKIyMjIEJ1ZyBGaXhlcwoKICAqIEZpeCBidW5kbGUgcmVxdWlyZSBmb3IgYDpqZWt5bGxfcGx1Z2luc2AgKCMzMTE5KQogICogUmVtb3ZlIGR1cGxpY2F0ZSByZWdleHAgcGhyYXNlOiBgXlxBYCAoIzMwODkpCiAgKiBSZW1vdmUgZHVwbGljYXRlIGBDb252ZXJzaW9uIGVycm9yOmAgbWVzc2FnZSBpbiBgQ29udmVydGlibGVgICgjMzA4OCkKICAqIFByaW50IGZ1bGwgY29udmVyc2lvbiBlcnJvciBtZXNzYWdlIGluIGBSZW5kZXJlciNjb252ZXJ0YCAoIzMwOTApCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBDaGFuZ2UgdmFyaWFibGUgbmFtZXMgaW4gR29vZ2xlIEFuYWx5dGljcyBzY3JpcHQgKCMzMDkzKQogICogTWVudGlvbiBDU1YgZmlsZXMgaW4gdGhlIGRvY3MgZm9yIGRhdGEgZmlsZXMgKCMzMTAxKQogICogQWRkIHRyYWlsaW5nIHNsYXNoIHRvIGBwYWdpbmF0ZV9wYXRoYCBleGFtcGxlLiAoIzMwOTEpCiAgKiBHZXQgcmlkIG9mIG5vaWZuaW9mIChgZXhjZXJwdF9zZXBhcmF0b3JgKSAoIzMwOTQpCiAgKiBTYXNzIGltcHJvdmVtZW50cywgYXJvdW5kIG5lc3RpbmcgbW9zdGx5LiAoIzMxMjMpCiAgKiBBZGQgd2VibWVudGlvbnMuaW8gcGx1Z2luIHRvIHRoZSBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMzMTI3KQogICogQWRkIFNhc3MgbWl4aW5zIGFuZCB1c2UgdGhlbS4gKCMyOTA0KQogICogU2xpZ2h0bHkgY29tcHJlc3MgamVreWxsLXN0aWNrZXIuanBnLiAoIzMxMzMpCiAgKiBVcGRhdGUgZ3JpZGlzbSBhbmQgc2VwYXJhdGUgb3V0IHJlbGF0ZWQgYnV0IGN1c3RvbSBzdHlsZXMuICgjMzEzMikKICAqIEFkZCByZW1vdGUtaW5jbHVkZSBwbHVnaW4gdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMzEzNikKCiMjIDIuNS4xIC8gMjAxNC0xMS0wOQoKIyMjIEJ1ZyBGaXhlcwoKICAqIEZpeCBwYXRoIHNhbml0YXRpb24gYnVnIHJlbGF0ZWQgdG8gV2luZG93cyBkcml2ZSBuYW1lcyAoIzMwNzcpCgojIyMgRGV2ZWxvcG1lbnQgRml4ZXMKCiAgKiBBZGQgZGV2ZWxvcG1lbnQgdGltZSBkZXBlbmRlbmNpZXMgb24gbWluaXRlc3QgYW5kIHRlc3QtdW5pdCB0byBnZW1zcGVjIGZvciBjeWd3aW4gKCMzMDY0KQogICogVXNlIFRyYXZpcydzIGJ1aWx0LWluIGNhY2hpbmcuICgjMzA3NSkKCiMjIDIuNS4wIC8gMjAxNC0xMS0wNgoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFJlcXVpcmUgZ2VtcyBpbiBgOmpla3lsbF9wbHVnaW5zYCBHZW1maWxlIGdyb3VwIHVubGVzcyBgSkVLWUxMX05PX0JVTkRMRVJfUkVRVUlSRWAgaXMgc3BlY2lmaWVkIGluIHRoZSBlbnZpcm9ubWVudC4gKCMyODY1KQogICogQ2VudHJhbGl6ZSBwYXRoIHNhbml0YXRpb24gaW4gdGhlIGBTaXRlYCBvYmplY3QgKCMyODgyKQogICogQWxsb3cgcGxhY2Vob2xkZXJzIGluIHBlcm1hbGlua3MgKCMzMDMxKQogICogQWxsb3cgdXNlcnMgdG8gc3BlY2lmeSB0aGUgbG9nIGxldmVsIHZpYSBgSkVLWUxMX0xPR19MRVZFTGAuICgjMzA2NykKICAqIEZhbmN5IEluZGV4aW5nIHdpdGggV0VCcmljayAoIzMwMTgpCiAgKiBBbGxvdyBFbnVtZXJhYmxlcyB0byBiZSB1c2VkIHdpdGggYHdoZXJlYCBmaWx0ZXIuICgjMjk4NikKICAqIE1ldGEgZGVzY3JpcHRpb25zIGluIHRoZSBzaXRlIHRlbXBsYXRlIG5vdyB1c2UgYHBhZ2UuZXhjZXJwdGAgaWYgaXQncyBhdmFpbGFibGUgKCMyOTY0KQogICogQ2hhbmdlIGluZGVudGF0aW9uIGluIGBoZWFkLmh0bWxgIG9mIHNpdGUgdGVtcGxhdGUgdG8gMiBzcGFjZXMgZnJvbSA0ICgjMjk3MykKICAqIFVzZSBhIGAkY29udGVudC13aWR0aGAgdmFyaWFibGUgaW5zdGVhZCBvZiBhIGZpeGVkIHZhbHVlIGluIHRoZSBzaXRlIHRlbXBsYXRlIENTUyAoIzI5NzIpCiAgKiBTdHJpcCBuZXdsaW5lcyBpbiBzaXRlIHRlbXBsYXRlIGA8bWV0YT5gIGRlc2NyaXB0aW9uLiAoIzI5ODIpCiAgKiBBZGQgbGluayB0byBhdG9tIGZlZWQgaW4gYGhlYWRgIG9mIHNpdGUgdGVtcGxhdGUgZmlsZXMgKCMyOTk2KQogICogUGVyZm9ybWFuY2Ugb3B0aW1pemF0aW9ucyAoIzI5OTQpCiAgKiBVc2UgYEhhc2gjZWFjaF9rZXlgIGluc3RlYWQgb2YgYEhhc2gja2V5cy5lYWNoYCB0byBzcGVlZCB1cCBpdGVyYXRpb24gb3ZlciBoYXNoIGtleXMuICgjMzAxNykKICAqIEZ1cnRoZXIgbWlub3IgcGVyZm9ybWFuY2UgZW5oYW5jZW1lbnRzLiAoIzMwMjIpCiAgKiBBZGQgJ2InIGFuZCAncycgYWxpYXNlcyBmb3IgYnVpbGQgYW5kIHNlcnZlLCByZXNwZWN0aXZlbHkgKCMzMDY1KQoKIyMjIEJ1ZyBGaXhlcwoKICAqIEZpeCBSb3VnZSdzIFJlZENhcnBldCBwbHVnaW4gaW50ZXJmYWNlIGludGVncmF0aW9uICgjMjk1MSkKICAqIFJlbW92ZSBgLS13YXRjaGAgZnJvbSB0aGUgc2l0ZSB0ZW1wbGF0ZSBibG9nIHBvc3Qgc2luY2UgaXQgZGVmYXVsdHMgdG8gd2F0Y2hpbmcgaW4gaW4gMi40LjAgKCMyOTIyKQogICogRml4IGNvZGUgZm9yIG1lZGlhIHF1ZXJ5IG1peGluIGluIHNpdGUgdGVtcGxhdGUgKCMyOTQ2KQogICogQWxsb3cgcG9zdCBVUkwncyB0byBoYXZlIGAuaHRtYCBleHRlbnNpb25zICgjMjkyNSkKICAqIGBVdGlscy5zbHVnaWZ5YDogRG9uJ3QgY3JlYXRlIG5ldyBvYmplY3RzIHdoZW4gZ3N1YmJpbmcgKCMyOTk3KQogICogVGhlIGpzb25pZnkgZmlsdGVyIHNob3VsZCBkZWVwLWNvbnZlcnQgdG8gTGlxdWlkIHdoZW4gZ2l2ZW4gYW4gQXJyYXkuICgjMzAzMikKICAqIEFwcGx5IGBqc29uaWZ5YCBmaWx0ZXIgdG8gSGFzaGVzIGRlZXBseSBhbmQgZWZmZWN0aXZlbHkgKCMzMDYzKQogICogVXNlIGAxMjcuMC4wLjFgIGFzIGRlZmF1bHQgaG9zdCBpbnN0ZWFkIG9mIGAwLjAuMC4wYCAoIzMwNTMpCiAgKiBJbiB0aGUgY2FzZSB0aGF0IGEgR2VtZmlsZSBkb2VzIG5vdCBleGlzdCwgZW5zdXJlIEpla3lsbCBkb2Vzbid0IGZhaWwgb24gcmVxdWlyaW5nIHRoZSBHZW1maWxlIGdyb3VwICgjMzA2NikKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIEZpeCBhIHR5cG8gaW4gdGhlIGRvYyBibG9jayBmb3IgYEpla3lsbDo6VVJMLmVzY2FwZV9wYXRoYCAoIzMwNTIpCiAgKiBBZGQgaW50ZWdyYXRpb24gdGVzdCBmb3IgYGpla3lsbCBuZXcgLS1ibGFua2AgaW4gVGVzdFVuaXQgKCMyOTEzKQogICogQWRkIHVuaXQgdGVzdCBmb3IgYGpla3lsbCBuZXcgLS1mb3JjZWAgbG9naWMgKCMyOTI5KQogICogVXBkYXRlIG91dGRhdGVkIGNvbW1lbnQgZm9yIGBDb252ZXJ0aWJsZSN0cmFuc2Zvcm1gICgjMjk1NykKICAqIEFkZCBIYWtpcmkgYmFkZ2UgdG8gUkVBRE1FLiAoIzI5NTMpCiAgKiBBZGQgc29tZSBzaW1wbGUgYmVuY2htYXJraW5nIHRvb2xzLiAoIzI5OTMpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBgTk9LT0dJUklfVVNFX1NZU1RFTV9MSUJSQVJJRVM9dHJ1ZWAgKipkZWNyZWFzZXMqKiBpbnN0YWxsYXRpb24gdGltZS4gKCMzMDQwKQogICogQWRkIEZvcm1LZWVwIHRvIHJlc291cmNlcyBhcyBKZWt5bGwgZm9ybSBiYWNrZW5kICgjMzAxMCkKICAqIEZpeGluZyBhIG1pc3Rha2UgaW4gdGhlIG5hbWUgb2YgdGhlIG5ldyBMaXF1aWQgdGFnICgjMjk2OSkKICAqIFVwZGF0ZSBGb250IEF3ZXNvbWUgdG8gdjQuMi4wLiAoIzI4OTgpCiAgKiBGaXggbGluayB0byAjMjg5NSBpbiAyLjQuMCByZWxlYXNlIHBvc3QuICgjMjg5OSkKICAqIEFkZCBCaWcgRm9vdG5vdGVzIGZvciBLcmFtZG93biBwbHVnaW4gdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjkxNikKICAqIFJlbW92ZSB3YXJuaW5nIHJlZ2FyZGluZyBHSFAgdXNlIG9mIHNpbmd1bGFyIHR5cGVzIGZvciBmcm9udCBtYXR0ZXIgZGVmYXVsdHMgKCMyOTE5KQogICogRml4IHF1b3RlIGNoYXJhY3RlciB0eXBvIGluIHNpdGUgZG9jdW1lbnRhdGlvbiBmb3IgdGVtcGxhdGVzICgjMjkxNykKICAqIFBvaW50IExpcXVpZCBsaW5rcyB0byBMaXF1aWTigJlzIEdpdEh1YiB3aWtpICgjMjg4NykKICAqIEFkZCBIVFRQIEJhc2ljIEF1dGggKC5odGFjY2VzcykgcGx1Z2luIHRvIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzI5MzEpCiAgKiAoTWlub3IpIEdyYW1tYXIgJiBgX2NvbmZpZy55bWxgIGZpbGVuYW1lIGZpeGVzICgjMjkxMSkKICAqIEFkZGVkIGBtYXRobWwucmJgIHRvIHRoZSBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMuICgjMjkzNykKICAqIEFkZCBgLS1mb3JjZV9wb2xsaW5nYCB0byB0aGUgbGlzdCBvZiBjb25maWd1cmF0aW9uIG9wdGlvbnMgKCMyOTQzKQogICogRXNjYXBlIHVuaWNvZGUgY2hhcmFjdGVycyBpbiBzaXRlIENTUyAoIzI5MDYpCiAgKiBBZGQgbm90ZSBhYm91dCB1c2luZyB0aGUgZ2l0aHViLXBhZ2VzIGdlbSB2aWEgcGFnZXMuZ2l0aHViLmNvbS92ZXJzaW9ucy5qc29uICgjMjkzOSkKICAqIFVwZGF0ZSB1c2FnZSBkb2N1bWVudGF0aW9uIHRvIHJlZmxlY3QgMi40IGF1dG8tZW5hYmxpbmcgb2YgYC0td2F0Y2hgLiAoIzI5NTQpCiAgKiBBZGQgYC0tc2tpcC1pbml0aWFsLWJ1aWxkYCB0byBjb25maWd1cmF0aW9uIGRvY3MgKCMyOTQ5KQogICogRml4IGEgbWlub3IgdHlwbyBpbiBUZW1wbGF0ZXMgZG9jcyBwYWdlICgjMjk1OSkKICAqIEFkZCBhIGRpdGFhLWRpdGFhIHBsdWdpbiB1bmRlciBPdGhlciBzZWN0aW9uIG9uIHRoZSBQbHVnaW5zIHBhZ2UgKCMyOTY3KQogICogQWRkIGBidWlsZC9zZXJ2ZSAtVmAgb3B0aW9uIHRvIGNvbmZpZ3VyYXRpb24gZG9jdW1lbnRhdGlvbiAoIzI5NDgpCiAgKiBBZGQgJ0pla3lsbCBUd2l0dGVyIFBsdWdpbicgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjk3OSkKICAqIERvY3M6IFVwZGF0ZSBub3JtYWxpemUuY3NzIHRvIHYzLjAuMi4gKCMyOTgxKQogICogRml4IHR5cG8gaW4gQ29udGludW91cyBJbnRlZ3JhdGlvbiBkb2N1bWVudGF0aW9uICgjMjk4NCkKICAqIENsYXJpZnkgYmVoYXZpb3Igb2YgYDpjYXRlZ29yaWVzYCBpbiBwZXJtYWxpbmtzICgjMzAxMSkKCiMjIDIuNC4wIC8gMjAxNC0wOS0wOQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFN1cHBvcnQgYSBuZXcgYHJlbGF0aXZlX2luY2x1ZGVgIHRhZyAoIzI4NzApCiAgKiBBdXRvLWVuYWJsZSB3YXRjaCBvbiAnc2VydmUnICgjMjg1OCkKICAqIFJlbmRlciBMaXF1aWQgaW4gQ29mZmVlU2NyaXB0IGZpbGVzICgjMjgzMCkKICAqIEFycmF5IExpcXVpZCBmaWx0ZXJzOiBgcHVzaGAsIGBwb3BgLCBgdW5zaGlmdGAsIGBzaGlmdGAgKCMyODk1KQogICogQWRkIGA6dGl0bGVgIHRvIGNvbGxlY3Rpb24gVVJMIHRlbXBsYXRlIGZpbGxlcnMgKCMyODY0KQogICogQWRkIHN1cHBvcnQgZm9yIENTViBmaWxlcyBpbiB0aGUgYF9kYXRhYCBkaXJlY3RvcnkgKCMyNzYxKQogICogQWRkIHRoZSBgbmFtZWAgdmFyaWFibGUgdG8gY29sbGVjdGlvbiBwZXJtYWxpbmtzICgjMjc5OSkKICAqIEFkZCBgaW5zcGVjdGAgbGlxdWlkIGZpbHRlci4gKCMyODY3KQogICogQWRkIGEgYHNsdWdpZnlgIExpcXVpZCBmaWx0ZXIgKCMyODgwKQoKIyMjIEJ1ZyBGaXhlcwoKICAqIFVzZSBgSmVreWxsLnNhbml0aXplZF9wYXRoYCB3aGVuIGFkZGluZyBzdGF0aWMgZmlsZXMgdG8gQ29sbGVjdGlvbnMgKCMyODQ5KQogICogRml4IGVuY29kaW5nIG9mIGBtYWluLnNjc3NgIGluIHNpdGUgdGVtcGxhdGUgKCMyNzcxKQogICogRml4IG9yaWVudGF0aW9uIGJ1Z3MgaW4gZGVmYXVsdCBzaXRlIHRlbXBsYXRlICgjMjg2MikKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIFVwZGF0ZSBzaW1wbGVjb3YgZ2VtIHRvIDAuOSAoIzI3NDgpCiAgKiBSZW1vdmUgYGRvY3MvYCBkaXIgKCMyNzY4KQogICogYWRkIGNsYXNzIGA8PCBzZWxmYCBpZGlvbSB0byBgTmV3YCBjb21tYW5kICgjMjgxNykKICAqIEFsbG93IFRyYXZpcyB0byAncGFyYWxsZWxpemUnIG91ciB0ZXN0cyAoIzI4NTkpCiAgKiBGaXggdGVzdCBmb3IgTGlxdWlkIHJlbmRlcmluZyBpbiBTYXNzICgjMjg1NikKICAqIEZpeGluZyAidmVydHljYWwiIHR5cG8gaW4gc2l0ZSB0ZW1wbGF0ZSdzIGBfYmFzZS5zY3NzYCAoIzI4ODkpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBEb2N1bWVudCB0aGUgYG5hbWVgIHZhcmlhYmxlIGZvciBjb2xsZWN0aW9uIHBlcm1hbGlua3MgKCMyODI5KQogICogQWRkcyBpbmZvIGFib3V0IGluc3RhbGxpbmcgamVreWxsIGluIGN1cnJlbnQgZGlyICgjMjgzOSkKICAqIFJlbW92ZSBkZXByZWNhdGVkIGBqZWt5bGwtcHJvamVjdGxpc3RgIHBsdWdpbiBmcm9tIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzI3NDIpCiAgKiBSZW1vdmUgdGFnIHBsdWdpbnMgdGhhdCBhcmUgYnVpbHQgaW4gdG8gSmVreWxsICgjMjc1MSkKICAqIEFkZCBgbWFya2Rvd24td3JpdGVyYCBwYWNrYWdlIGZvciBBdG9tIEVkaXRvciB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMyNzYzKQogICogRml4IHR5cG8gaW4gc2l0ZSBkb2N1bWVudGF0aW9uIGZvciBjb2xsZWN0aW9ucyAoIzI3NjQpCiAgKiBGaXggbWlub3IgdHlwbyBvbiBwbHVnaW5zIGRvY3MgcGFnZSAoIzI3NjUpCiAgKiBSZXBsYWNlIG1hcmtkb3duIHdpdGggSFRNTCBpbiBgc2Fzc19kaXJgIG5vdGUgb24gYXNzZXRzIHBhZ2UgKCMyNzkxKQogICogRml4ZWQgImJlbGxvdyIgdHlwbyBpbiBkYXRhZmlsZXMgZG9jcyAoIzI4NzkpCiAgKiBGaXggY29kZS9tYXJrZG93biBpc3N1ZSBpbiBkb2N1bWVudGF0aW9uIGZvciB2YXJpYWJsZXMgKCMyODc3KQogICogUmVtb3ZlIEdvb2QgSW5jbHVkZSB0aGlyZC1wYXJ0eSBwbHVnaW4gZnJvbSBwbHVnaW5zIHBhZ2UgKCMyODgxKQogICogQWRkIHNvbWUgbW9yZSBkb2NzIG9uIGBpbmNsdWRlX3JlbGF0aXZlYCAoIzI4ODQpCgojIyAyLjMuMCAvIDIwMTQtMDgtMTAKCiMjIyBNaW5vciBFbmhhbmNlbWVudHMKCiAgKiBBbGxvdyBDb252ZXJ0aWJsZXMgdG8gYmUgY29udmVydGVkIGJ5ID49IDEgY29udmVydGVycyAoIzI3MDQpCiAgKiBBbGxvdyBTYXNzIGZpbGVzIHRvIGJlIHJlbmRlcmVkIGluIExpcXVpZCwgYnV0IG5ldmVyIHBsYWNlIHRoZW0gaW4gbGF5b3V0cy4gKCMyNzMzKQogICogQWRkIGBqZWt5bGwgaGVscGAgY29tbWFuZCAoIzI3MDcpCiAgKiBVc2UgYC5zY3NzYCBmb3IgYHNpdGVfdGVtcGxhdGVgIHN0eWxlcy4gKCMyNjY3KQogICogRG9uJ3QgcmVxdWlyZSB0aGUgYHNjb3BlYCBrZXkgaW4gZnJvbnQgbWF0dGVyIGRlZmF1bHRzICgjMjY1OSkKICAqIE5vIGxvbmdlciBzZXQgYHBlcm1hbGluazogcHJldHR5YCBpbiB0aGUgYF9jb25maWcueW1sYCBmb3IgdGhlIHNpdGUgdGVtcGxhdGUgKCMyNjgwKQogICogUmV3b3JrIHNpdGUgdGVtcGxhdGUgdG8gdXRpbGl6ZSBTYXNzICgjMjY4NykKICAqIE5vdGlmeSB0aGUgdXNlciB3aGVuIGF1dG8tcmVnZW5lcmF0aW9uIGlzIGRpc2FibGVkLiAoIzI2OTYpCiAgKiBBbGxvdyBwYXJ0aWFsIHZhcmlhYmxlcyBpbiBpbmNsdWRlIHRhZyBmaWxlbmFtZSBhcmd1bWVudCAoIzI2OTMpCiAgKiBNb3ZlIGluc3RhbmNlcyBvZiBgVGltZS5wYXJzZWAgaW50byBhIFV0aWxzIG1ldGhvZCAoIzI2ODIpCiAgKiBJZ25vcmUgc3ViZm9sZGVycyBpbiB0aGUgYF9wb3N0c2AgZm9sZGVyICgjMjcwNSkgUkVWRVJUUyAoIzI2MzMpCiAgKiBGcm9udCBNYXR0ZXIgZGVmYXVsdCB0eXBlcyBzaG91bGQgYWx3YXlzIGJlIHBsdXJhbGl6ZWQgKCMyNzMyKQogICogUmVhZCBpbiBzdGF0aWMgZmlsZXMgaW50byBgY29sbGVjdGlvbi5maWxlc2AgYXMgYFN0YXRpY0ZpbGVgcyAoIzI3MzcpCiAgKiBBZGQgYHNhc3NpZnlgIGFuZCBgc2Nzc2lmeWAgTGlxdWlkIGZpbHRlcnMgKCMyNzM5KQogICogUmVwbGFjZSBgY2xhc3NpZmllcmAgZ2VtIHdpdGggYGNsYXNzaWZpZXItcmVib3JuYCAoIzI3MjEpCgojIyMgQnVnIEZpeGVzCgogICogVXNlIG9ubHkgdGhlIGxhc3QgZXh0bmFtZSB3aGVuIG11bHRpcGxlIGNvbnZlcnRlcnMgZXhpc3QgKCMyNzIyKQogICogQ2FsbCBgI3RvX2xpcXVpZGAgYmVmb3JlIGNhbGxpbmcgYCN0b19qc29uYCBpbiBqc29uaWZ5IGZpbHRlciAoIzI3MjkpCiAgKiBVc2Ugbm9uIHBhZGRlZCBjb25maWcgaW4gYHN0cmZ0aW1lYCB0byBhdm9pZCBwYXJzZSBzdHJpbmcgdHdpY2UgKCMyNjczKQogICogUmVwbGFjZSBkZXByZWNhdGVkIFJ1YnkgbWV0aG9kcyB3aXRoIHVuZGVwcmVjYXRlZCBvbmVzICgjMjY2NCkKICAqIENhdGNoIGVycm9ycyB3aGVuIHBhcnNpbmcgUG9zdCBgZGF0ZWAgZnJvbnQgbWF0dGVyIHZhbHVlICYgcHJvZHVjZSBuaWNlIGVycm9yIG1lc3NhZ2UgKCMyNjQ5KQogICogQWxsb3cgc3RhdGljIGZpbGVzIGluIENvbGxlY3Rpb25zICgjMjYxNSkKICAqIEZpeGVkIHR5cG8gaW4gYERlcHJlY2F0b3IjZ3JhY2VmdWxseV9yZXF1aXJlYCBlcnJvciBtZXNzYWdlICgjMjY5NCkKICAqIFJlbW92ZSBwcmVlbXB0aXZlIGxvYWRpbmcgb2YgdGhlICdjbGFzc2lmaWVyJyBnZW0uICgjMjY5NykKICAqIFVzZSBjYXNlLWluc2Vuc2l0aXZlIGNoZWNraW5nIGZvciB0aGUgZmlsZSBleHRlbnNpb25zIHdoZW4gbG9hZGluZyBjb25maWcgZmlsZXMgKCMyNzE4KQogICogV2hlbiBSZWFkaW5nIERvY3VtZW50cywgUmVzcGVjdCBgZW5jb2RpbmdgIE9wdGlvbiAoIzI3MjApCiAgKiBSZWZhY3RvciBiYXNlZCBvbiBqZWt5bGwtd2F0Y2ggY2xlYW4tdXAuICgjMjcxNikKICAqIGBEb2N1bWVudCN0b19zYCBzaG91bGQgcHJvZHVjZSBqdXN0IHRoZSBjb250ZW50IG9mIHRoZSBkb2N1bWVudCAoIzI3MzEpCgojIyMgRGV2ZWxvcG1lbnQgRml4ZXMKCiAgKiBPbmx5IGluY2x1ZGUgbGliIGZpbGVzIGluIHRoZSBnZW0gKCMyNjcxKQogICogRml4IGBnaXQgZGlmZmAgY29tbWFuZCBpbiBgcHJvb2ZgIHNjcmlwdCAoIzI2NzIpCiAgKiBNYWtlIGRlZmF1bHQgcmFrZSB0YXNrIGEgbXVsdGl0YXNrIHNvIHRlc3RzIHJ1biBpbiBwYXJhbGxlbCAoIzI3MzUpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBVc2UgU2FzcyBhbmQgYSBEb2NzIENvbGxlY3Rpb24gKCMyNjUxKQogICogQWRkIGBsYXRlc3RfdmVyc2lvbi50eHRgIGZpbGUgdG8gdGhlIHNpdGUgKCMyNzQwKQogICogQmUgbW9yZSBhbWJpZ3VvdXMgYWJvdXQgYHBhZ2UuY29udGVudGAuIEJ1dCBtb3JlIHRyYW5zcGFyZW50LiAoIzI1MjIpCiAgKiBTdHJlYW1saW5pbmcgZnJvbnQgbWF0dGVyIHdvcmRpbmcgKGluc3RlYWQgb2YgZnJvbnQtbWF0dGVyL2Zyb250bWF0dGVyKSAoIzI2NzQpCiAgKiBBZGQgbm90ZSB0aGF0IHNvdXJjZSBkaXJlY3RvcnkgY2Fubm90IGJlIG1vZGlmaWVkIGluIEdpdEh1YiBQYWdlcyAoIzI2NjkpCiAgKiBGaXggbGlua3MgZnJvbSAjMjY2OSB0byBiZSBhY3R1YWwgSFRNTC4gV2hvb3BzLiAoIzI2NzkpCiAgKiBBZGQgbGluayB0byBgamVreWxsLXNsaW1gIGluIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzI2ODkpCiAgKiBBZGQgQmFycnkgQ2xhcmsncyBTbWFzaGluZyBNYWdhemluZSB0dXRvcmlhbCB0byByZXNvdXJjZXMgcGFnZSAoIzI2ODgpCiAgKiBSZW9yZ2FuaXplIGFuZCB1cGRhdGUgZGVmYXVsdCBjb25maWd1cmF0aW9uIHNldHRpbmdzICgjMjQ1NikKICAqIEZpeGluZyBpbmRlbnRhdGlvbiBpbiB0aGUgY29uZmlndXJhdGlvbiBkb2NzIGFib3V0IFJlZGNhcnBldCBleHRzICgjMjcxNykKICAqIFVzZSBgbnVsbGAgaW4gWUFNTCBpbnN0ZWFkIG9mIGBuaWxgIGluIGRlZmF1bHQgY29uZmlnIGxpc3QgKCMyNzE5KQogICogRml4IHR5cG8gaW4gQ29udGludW91cyBJbnRlZ3JhdGlvbiBkb2NzICgjMjcwOCkKCiMjIDIuMi4wIC8gMjAxNC0wNy0yOQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFRocm93IGEgd2FybmluZyBpZiB0aGUgc3BlY2lmaWVkIGxheW91dCBkb2VzIG5vdCBleGlzdCAoIzI2MjApCiAgKiBXaGl0ZWxpc3QgUHlnbWVudHMgb3B0aW9ucyBpbiBzYWZlIG1vZGUgKCMyNjQyKQoKIyMjIEJ1ZyBGaXhlcwoKICAqIFJlbW92ZSB1bm5lY2Vzc2FyeSBgSmVreWxsOjpUYWdzOjpJbmNsdWRlVGFnI2JsYW5rP2AgbWV0aG9kICgjMjYyNSkKICAqIENhdGVnb3JpZXMgaW4gdGhlIHBhdGggYXJlIGlnbm9yZWQgKCMyNjMzKQoKIyMjIERldmVsb3BtZW50IEZpeGVzCgogICogUmVmYWN0b3JpbmcgRXJyb3JzICYgUmVxdWlyZXMgb2YgVGhpcmQtUGFydHkgc3R1ZmYgKCMyNTkxKQogICogQWRkIGZ1cnRoZXIgdGVzdHMgZm9yIGNhdGVnb3JpZXMgKCMyNTg0KQogICogUHJvb2Ygc2l0ZSB3aXRoIGh0bWwtcHJvb2ZlciBvbiBjaGFuZ2UgKCMyNjA1KQogICogRml4IHVwIGJ1ZyBpbiAjMjYwNSB3aGljaCBjYXVzZWQgcHJvb2ZpbmcgdGhlIHNpdGUgbm90IHRvIGZ1bmN0aW9uICgjMjYwOCkKICAqIFVzZSBgYnVuZGxlIGV4ZWNgIGluIGBzY3JpcHQvcHJvb2ZgICgjMjYxMCkKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIFVwZGF0ZSBLcmFtZG93biB1cmxzICgjMjU4OCkKICAqIEFkZCBgSmVreWxsOjpBdXRvbGlua0VtYWlsYCBhbmQgYEpla3lsbDo6R2l0TWV0YWRhdGFgIHRvIHRoZSBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMyNTk2KQogICogRml4IGEgYnVuY2ggb2YgYnJva2VuIGxpbmtzIGluIHRoZSBzaXRlICgjMjYwMSkKICAqIFJlcGxhY2UgZGVhZCBsaW5rcyB3aXRoIHdvcmtpbmcgbGlua3MgKCMyNjExKQogICogQWRkIGpla3lsbC1ob29rIHRvIGRlcGxveW1lbnQgbWV0aG9kcyAoIzI2MTcpCiAgKiBBZGRlZCBrcmFtZG93bi13aXRoLXB5Z21lbnRzIHBsdWdpbiB0byB0aGUgbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjYyMykKICAqIFVwZGF0ZSBvdXRkYXRlZCAiRXh0cmFzIiBwYWdlIGFuZCByZW1vdmUgZHVwbGljYXRlIGRvY3VtZW50YXRpb24gKCMyNjIyKQogICogQWRkIGNvMiBwbHVnaW4gdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjYzOSkKICAqIEF0dGVtcHQgdG8gY2xhcmlmeSB0aGUgd2F5IFNhc3MgaW1wb3J0cyBoYXBwZW4gKCMyNjQyKQoKIyMgMi4xLjEgLyAyMDE0LTA3LTAxCgojIyMgQnVnIEZpeGVzCgogICogUGF0Y2ggcmVhZCB2dWxuZXJhYmlsaXRpZXMgZm9yIGRhdGEgJiBjb25maXJtIG5vbmUgZm9yIGxheW91dHMgKCMyNTYzKQogICogVXBkYXRlIE1hcnVrdSBkZXBlbmRlbmN5IHRvIGFsbG93IHVzZSBvZiB0aGUgbGF0ZXN0IHZlcnNpb24gKCMyNTc2KQogICogUmVtb3ZlIGNvbmRpdGlvbmFsIGFzc2lnbm1lbnQgZnJvbSBkb2N1bWVudCBVUkwgdG8gcHJldmVudCBzdGFsZSB1cmxzICgjMjU3NSkKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIEFkZCB2ZXJ0aWNhbCBtYXJnaW4gdG8gYGhpZ2hsaWdodGAgdG8gc2VwYXJhdGUgY29kZSBibG9ja3MgKCMyNTU4KQogICogQWRkIGBodG1sX3BhZ2VzYCB0byBWYXJpYWJsZXMgZG9jcyAoIzI1NjcpCiAgKiBGaXhlZCBicm9rZW4gbGluayB0byBQZXJtYWxpbmtzIHBhZ2UgKCMyNTcyKQogICogVXBkYXRlIGxpbmsgdG8gV2luZG93cyBpbnN0YWxsYXRpb24gZ3VpZGUgKCMyNTc4KQoKIyMgMi4xLjAgLyAyMDE0LTA2LTI4CgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogQnVtcCB0byB0aGUgbGF0ZXN0IExpcXVpZCB2ZXJzaW9uLCAyLjYuMSAoIzI0OTUpCiAgKiBBZGQgc3VwcG9ydCBmb3IgSlNPTiBmaWxlcyBpbiB0aGUgYF9kYXRhYCBkaXJlY3RvcnkgKCMyMzY5KQogICogQWxsb3cgc3ViY2xhc3NlcyB0byBvdmVycmlkZSBgRVhDRVJQVF9BVFRSSUJVVEVTX0ZPUl9MSVFVSURgICgjMjQwOCkKICAqIEFkZCBgSmVreWxsLmVudmAgYW5kIGBqZWt5bGwuZW52aXJvbm1lbnRgICh0aGUgTGlxdWlkIHZhcikgKCMyNDE3KQogICogVXNlIGBfY29uZmlnLnlhbWxgIG9yIGBfY29uZmlnLnltbGAgKGAueW1sYCB0YWtlcyBwcmVjZWRlbmNlKSAoIzI0MDYpCiAgKiBPdmVycmlkZSBjb2xsZWN0aW9uIHVybCB0ZW1wbGF0ZSAoIzI0MTgpCiAgKiBBbGxvdyBzdWJkaXJlY3RvcmllcyBpbiBgX2RhdGFgICgjMjM5NSkKICAqIEV4dHJhY3QgUGFnaW5hdGlvbiBHZW5lcmF0b3IgaW50byBnZW06IGBqZWt5bGwtcGFnaW5hdGVgICgjMjQ1NSkKICAqIFV0aWxpemUgYGRhdGVfdG9fcmZjODIyYCBmaWx0ZXIgaW4gc2l0ZSB0ZW1wbGF0ZSAoIzI0MzcpCiAgKiBBZGQgY2F0ZWdvcmllcywgbGFzdCBidWlsZCBkYXRldGltZSwgYW5kIGdlbmVyYXRvciB0byBzaXRlIHRlbXBsYXRlIGZlZWQgKCMyNDM4KQogICogQ29uZmlndXJhYmxlLCByZXBsYWNlYWJsZSBMb2dnZXItY29tcGxpYW50IGxvZ2dlciAoIzI0NDQpCiAgKiBFeHRyYWN0IGBnaXN0YCB0YWcgaW50byBhIHNlcGFyYXRlIGdlbSAoIzI0NjkpCiAgKiBBZGQgYGNvbGxlY3Rpb25gIGF0dHJpYnV0ZSB0byBgRG9jdW1lbnQjdG9fbGlxdWlkYCB0byBhY2Nlc3MgdGhlIGRvY3VtZW50J3MgY29sbGVjdGlvbiBsYWJlbC4gKCMyNDM2KQogICogVXBncmFkZSBsaXN0ZW4gdG8gYDIuNy42IDw9IHggPCAzLjAuMGAgKCMyNDkyKQogICogQWxsb3cgY29uZmlndXJhdGlvbiBvZiBkaWZmZXJlbnQgVHdpdHRlciBhbmQgR2l0SHViIHVzZXJuYW1lcyBpbiBzaXRlIHRlbXBsYXRlICgjMjQ4NSkKICAqIEJ1bXAgUHlnbWVudHMgdG8gdjAuNi4wICgjMjUwNCkKICAqIEZyb250IG1hdHRlciBkZWZhdWx0cyBmb3IgZG9jdW1lbnRzIGluIGNvbGxlY3Rpb25zICgjMjQxOSkKICAqIEluY2x1ZGUgZmlsZXMgd2l0aCBhIHVybCB3aGljaCBlbmRzIGluIGAvYCBpbiB0aGUgYHNpdGUuaHRtbF9wYWdlc2AgbGlzdCAoIzI1MjQpCiAgKiBNYWtlIGBoaWdobGlnaHRgIHRhZyB1c2UgYGxhbmd1YWdlLWAgcHJlZml4IGluIENTUyBjbGFzcyAoIzI1MTEpCiAgKiBMb29rdXAgaXRlbSBwcm9wZXJ0eSB2aWEgYGl0ZW0jdG9fbGlxdWlkYCBiZWZvcmUgYCNkYXRhYCBvciBgI1tdYCBpbiBmaWx0ZXJzICgjMjQ5MykKICAqIFNraXAgaW5pdGlhbCBidWlsZCBvZiBzaXRlIG9uIHNlcnZlIHdpdGggZmxhZyAoIzI0NzcpCiAgKiBBZGQgc3VwcG9ydCBmb3IgYGhsX2xpbmVzYCBpbiBgaGlnaGxpZ2h0YCB0YWcgKCMyNTMyKQogICogU3Bpa2Ugb3V0IGAtLXdhdGNoYCBmbGFnIGludG8gYSBzZXBhcmF0ZSBnZW0gKCMyNTUwKQoKIyMjIEJ1ZyBGaXhlcwoKICAqIExpcXVpZCBgc29ydGAgZmlsdGVyIHNob3VsZCBzb3J0IGV2ZW4gaWYgb25lIG9mIHRoZSB2YWx1ZXMgaXMgYG5pbGAgKCMyMzQ1KQogICogUmVtb3ZlIHBhZGRpbmcgb24gYHByZSBjb2RlYCBpbiB0aGUgc2l0ZSB0ZW1wbGF0ZSBDU1MgKCMyMzgzKQogICogU2V0IGBsb2dfbGV2ZWxgIGVhcmxpZXIgdG8gc2lsZW5jZSBpbmZvIGxldmVsIGNvbmZpZ3VyYXRpb24gb3V0cHV0ICgjMjM5MykKICAqIE9ubHkgbGlzdCBwYWdlcyB3aGljaCBoYXZlIGB0aXRsZWAgaW4gc2l0ZSB0ZW1wbGF0ZSAoIzI0MTEpCiAgKiBBY2NlcHQgYE51bWVyaWNgIHZhbHVlcyBmb3IgZGF0ZXMsIG5vdCBgTnVtYmVyYCB2YWx1ZXMgKCMyMzc3KQogICogUHJldmVudCBjb2RlIGZyb20gb3ZlcmZsb3dpbmcgY29udGFpbmVyIGluIHNpdGUgdGVtcGxhdGUgKCMyNDI5KQogICogRW5jb2RlIFVSTHMgaW4gVVRGLTggd2hlbiBlc2NhcGluZyBhbmQgdW5lc2NhcGluZyAoIzI0MjApCiAgKiBObyBMYXlvdXRzIG9yIExpcXVpZCBmb3IgQXNzZXQgRmlsZXMgKCMyNDMxKQogICogQWxsb3cgZnJvbnQgbWF0dGVyIGRlZmF1bHRzIHRvIHNldCBwb3N0IGNhdGVnb3JpZXMgKCMyMzczKQogICogRml4IGNvbW1hbmQgaW4gc3ViY29tbWFuZCBkZXByZWNhdGlvbiB3YXJuaW5nICgjMjQ1NykKICAqIEtlZXAgYWxsIHBhcmVudCBkaXJlY3RvcmllcyBvZiBmaWxlcy9kaXJzIGluIGBrZWVwX2ZpbGVzYCAoIzI0NTgpCiAgKiBXaGVuIHVzaW5nIFJlZENhcnBldCBhbmQgUm91Z2Ugd2l0aG91dCBSb3VnZSBpbnN0YWxsZWQsIGZpeGVkIGVycm9uZW91cyBlcnJvciB3aGljaCBzdGF0ZWQgdGhhdCByZWRjYXJwZXQgd2FzIG1pc3NpbmcsIG5vdCByb3VnZS4gKCMyNDY0KQogICogSWdub3JlICphbGwqIGRpcmVjdG9yaWVzIGFuZCBmaWxlcyB0aGF0IG1lcml0IGl0IG9uIGF1dG8tZ2VuZXJhdGlvbiAoIzI0NTkpCiAgKiBCZWZvcmUgY29weWluZyBmaWxlLCBleHBsaWNpdGx5IHJlbW92ZSB0aGUgb2xkIG9uZSAoIzI1MzUpCiAgKiBNZXJnZSBmaWxlIHN5c3RlbSBjYXRlZ29yaWVzIHdpdGggY2F0ZWdvcmllcyBmcm9tIFlBTUwuICgjMjUzMSkKICAqIERlZXAgbWVyZ2UgZnJvbnQgbWF0dGVyIGRlZmF1bHRzICgjMjQ5MCkKICAqIEVuc3VyZSBleGNsdWRlIGFuZCBpbmNsdWRlIGFycmF5cyBhcmUgYXJyYXlzIG9mIHN0cmluZ3MgKCMyNTQyKQogICogQWxsb3cgY29sbGVjdGlvbnMgdG8gaGF2ZSBkb3RzIGluIHRoZWlyIGZpbGVuYW1lcyAoIzI1NTIpCiAgKiBDb2xsZWN0aW9ucyBzaG91bGRuJ3QgdHJ5IHRvIHJlYWQgaW4gZGlyZWN0b3JpZXMgYXMgZmlsZXMgKCMyNTUyKQogICogQmUgcXVpZXQgdmVyeSBxdWlja2x5LiAoIzI1MjApCgojIyMgRGV2ZWxvcG1lbnQgRml4ZXMKCiAgKiBUZXN0IFJ1YnkgMi4xLjIgaW5zdGVhZCBvZiAyLjEuMSAoIzIzNzQpCiAgKiBBZGQgdGVzdCBmb3Igc29ydGluZyBVVEYtOCBjaGFyYWN0ZXJzICgjMjM4NCkKICAqIFVzZSBgaHR0cHNgIGZvciBHaXRIdWIgbGlua3MgaW4gZG9jdW1lbnRhdGlvbiAoIzI0NzApCiAgKiBSZW1vdmUgY292ZXJhZ2UgcmVwb3J0aW5nIHdpdGggQ292ZXJhbGxzICgjMjQ5NCkKICAqIEZpeCBhIGJpdCBvZiBtaXNzaW5nIFRvbURvYyB0byBgSmVreWxsOjpDb21tYW5kczo6QnVpbGQjYnVpbGRgICgjMjU1NCkKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIFNldCBgdGltZXpvbmVgIHRvIGBBbWVyaWNhL0xvc19BbmdlbGVzYCAoIzIzOTQpCiAgKiBJbXByb3ZlIEphdmFTY3JpcHQgaW4gYGFuY2hvcl9saW5rcy5odG1sYCAoIzIzNjgpCiAgKiBSZW1vdmUgbm90ZSBvbiBRdWlja3N0YXJ0IHBhZ2UgYWJvdXQgZGVmYXVsdCBtYXJrZG93biBjb252ZXJ0ZXIgKCMyMzg3KQogICogUmVtb3ZlIGJyb2tlbiBsaW5rIGluIGV4dHJhcy5tZCB0byBhIE1hcnVrdSBmb3JrICgjMjQwMSkKICAqIFVwZGF0ZSBGb250IEF3ZXNvbWUgdG8gdjQuMS4wLiAoIzI0MTApCiAgKiBGaXggYnJva2VuIGxpbmsgb24gSW5zdGFsbGF0aW9uIHBhZ2UgdG8gVGVtcGxhdGVzIHBhZ2UgKCMyNDIxKQogICogUHJldmVudCB0YWJsZSBmcm9tIGV4dGVuZGluZyBwYXJlbnQgd2lkdGggaW4gcGVybWFsaW5rIHN0eWxlIHRhYmxlICgjMjQyNCkKICAqIEFkZCBjb2xsZWN0aW9ucyB0byBpbmZvIGFib3V0IHBhZ2luYXRpb24gc3VwcG9ydCAoIzIzODkpCiAgKiBBZGQgYGpla3lsbF9naXRodWJfc2FtcGxlYCBwbHVnaW4gdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjQ2MykKICAqIENsYXJpZnkgZG9jdW1lbnRhdGlvbiBhcm91bmQgZnJvbnQgbWF0dGVyIGRlZmF1bHRzIGFuZCBhZGQgZGV0YWlscyBhYm91dCBkZWZhdWx0cyBmb3IgY29sbGVjdGlvbnMuICgjMjQzOSkKICAqIEFkZCBKZWt5bGwgUHJvamVjdCBWZXJzaW9uIFRhZyB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMyNDY4KQogICogVXNlIGBodHRwc2AgZm9yIEdpdEh1YiBsaW5rcyBhY3Jvc3Mgd2hvbGUgc2l0ZSAoIzI0NzApCiAgKiBBZGQgU3RpY2tlck11bGUgKyBKZWt5bGwgcG9zdCAoIzI0NzYpCiAgKiBBZGQgSmVreWxsIEFzc2V0IFBpcGVsaW5lIFJlYm9ybiB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMyNDc5KQogICogQWRkIGxpbmsgdG8gamVreWxsLWNvbXByZXNzLWh0bWwgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjUxNCkKICAqIEFkZCBQaXdpZ28gR2FsbGVyeSB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMyNTI2KQogICogU2V0IGBzaG93X2RyYWZ0c2AgdG8gYGZhbHNlYCBpbiBkZWZhdWx0IGNvbmZpZ3VyYXRpb24gbGlzdGluZyAoIzI1MzYpCiAgKiBQcm92aWRlIGFuIHVwZGF0ZWQgbGluayBmb3IgV2luZG93cyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zICgjMjU0NCkKICAqIFJlbW92ZSBgdXJsYCBmcm9tIGNvbmZpZ3VyYXRpb24gZG9jcyAoIzI1NDcpCiAgKiBEb2N1bWVudGF0aW9uIGZvciBDb250aW51b3VzIEludGVncmF0aW9uIGZvciB5b3VyIEpla3lsbCBTaXRlICgjMjQzMikKCiMjIDIuMC4zIC8gMjAxNC0wNS0wOAoKIyMjIEJ1ZyBGaXhlcwoKICAqIFByb3Blcmx5IHByZWZpeCBsaW5rcyBpbiBzaXRlIHRlbXBsYXRlIHdpdGggVVJMIG9yIGJhc2V1cmwgZGVwZW5kaW5nIHVwb24gbmVlZC4gKCMyMzE5KQogICogVXBkYXRlIGdpc3QgdGFnIGNvbW1lbnRzIGFuZCBlcnJvciBtZXNzYWdlIHRvIHJlcXVpcmUgdXNlcm5hbWUgKCMyMzI2KQogICogRml4IGBwZXJtYWxpbmtgIHNldHRpbmcgaW4gc2l0ZSB0ZW1wbGF0ZSAoIzIzMzEpCiAgKiBEb24ndCBmYWlsIGlmIGFueSBvZiB0aGUgcGF0aCBvYmplY3RzIGFyZSBuaWwgKCMyMzI1KQogICogSW5zdGFudGlhdGUgYWxsIGRlc2NlbmRhbnRzIGZvciBjb252ZXJ0ZXJzIGFuZCBnZW5lcmF0b3JzLCBub3QganVzdCBkaXJlY3Qgc3ViY2xhc3NlcyAoIzIzMzQpCiAgKiBSZXBsYWNlIGFsbCBpbnN0YW5jZXMgb2YgYHNpdGUubmFtZWAgd2l0aCBgc2l0ZS50aXRsZWAgaW4gc2l0ZSB0ZW1wbGF0ZSAoIzIzMjQpCiAgKiBgSmVreWxsOjpGaWx0ZXJzI3RpbWVgIG5vdyBhY2NlcHRzIFVOSVggdGltZXN0YW1wcyBpbiBzdHJpbmcgb3IgbnVtYmVyIGZvcm0gKCMyMzM5KQogICogVXNlIGBpdGVtX3Byb3BlcnR5YCBmb3IgYHdoZXJlYCBmaWx0ZXIgc28gaXQgZG9lc24ndCBicmVhayBvbiBjb2xsZWN0aW9ucyAoIzIzNTkpCiAgKiBSZXNjdWUgZXJyb3JzIHRocm93biBzbyBgLS13YXRjaGAgZG9lc24ndCBmYWlsICgjMjM2NCkKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIEFkZCBtaXNzaW5nICJhcyIgdG8gYXNzZXRzIGRvY3MgcGFnZSAoIzIzMzcpCiAgKiBVcGRhdGUgZG9jcyB0byByZWZsZWN0IG5ldyBgYmFzZXVybGAgZGVmYXVsdCAoIzIzNDEpCiAgKiBBZGQgbGlua3MgdG8gaGVhZGVycyB3aG8gaGF2ZSBhbiBJRC4gKCMyMzQyKQogICogVXNlIHN5bWJvbCBpbnN0ZWFkIG9mIEhUTUwgbnVtYmVyIGluIGB1cGdyYWRpbmcubWRgICgjMjM1MSkKICAqIEZpeCBsaW5rIHRvIGZyb250IG1hdHRlciBkZWZhdWx0cyBkb2NzICgjMjM1MykKICAqIEZpeCBmb3IgYEhpc3RvcnkubWFya2Rvd25gIGluIG9yZGVyIHRvIGZpeCBoaXN0b3J5IHBhZ2UgaW4gZG9jcyAoIzIzNjMpCgojIyAyLjAuMiAvIDIwMTQtMDUtMDcKCiMjIyBCdWcgRml4ZXMKCiAgKiBDb3JyZWN0IHVzZSBvZiBgdXJsYCBhbmQgYGJhc2V1cmxgIGluIHRoZSBzaXRlIHRlbXBsYXRlLiAoIzIzMTcpCiAgKiBEZWZhdWx0IGBiYXNldXJsYCB0byBgIiJgICgjMjMxNykKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIENvcnJlY3QgZG9jcyBmb3IgdGhlIGBnaXN0YCBwbHVnaW4gc28gaXQgYWx3YXlzIGluY2x1ZGVzIHRoZSB1c2VybmFtZS4gKCMyMzE0KQogICogQ2xhcmlmeSBuZXcgKGRlZmF1bHRzLCBgd2hlcmVgIGZpbHRlcikgZmVhdHVyZXMgaW4gZG9jcyAoIzIzMTYpCgojIyAyLjAuMSAvIDIwMTQtMDUtMDYKCiMjIyBCdWcgRml4ZXMKCiAgKiBSZXF1aXJlIGBrcmFtZG93bmAgZ2VtIGluc3RlYWQgb2YgYG1hcnVrdWAgZ2VtCgojIyAyLjAuMCAvIDIwMTQtMDUtMDYKCiMjIyBNYWpvciBFbmhhbmNlbWVudHMKCiAgKiBBZGQgIkNvbGxlY3Rpb25zIiBmZWF0dXJlICgjMjE5OSkKICAqIEFkZCBnZW0tYmFzZWQgcGx1Z2luIHdoaXRlbGlzdCB0byBzYWZlIG1vZGUgKCMxNjU3KQogICogUmVwbGFjZSB0aGUgY29tbWFuZGVyIGNvbW1hbmQgbGluZSBwYXJzZXIgd2l0aCBhIG1vcmUgcm9idXN0IHNvbHV0aW9uIGZvciBvdXIgbmVlZHMgY2FsbGVkIGBtZXJjZW5hcnlgICgjMTcwNikKICAqIFJlbW92ZSBzdXBwb3J0IGZvciBSdWJ5IDEuOC54ICgjMTc4MCkKICAqIE1vdmUgdG8gamVreWxsL2pla3lsbCBmcm9tIG1vam9tYm8vamVreWxsICgjMTgxNykKICAqIEFsbG93IGN1c3RvbSBtYXJrZG93biBwcm9jZXNzb3JzICgjMTg3MikKICAqIFByb3ZpZGUgc3VwcG9ydCBmb3IgdGhlIFJvdWdlIHN5bnRheCBoaWdobGlnaHRlciAoIzE4NTkpCiAgKiBQcm92aWRlIHN1cHBvcnQgZm9yIFNhc3MgKCMxOTMyKQogICogUHJvdmlkZSBhIDMwMCUgaW1wcm92ZW1lbnQgd2hlbiBnZW5lcmF0aW5nIHNpdGVzIHRoYXQgdXNlIGBQb3N0I25leHRgIG9yIGBQb3N0I3ByZXZpb3VzYCAoIzE5ODMpCiAgKiBQcm92aWRlIHN1cHBvcnQgZm9yIENvZmZlZVNjcmlwdCAoIzE5OTEpCiAgKiBSZXBsYWNlIE1hcnVrdSB3aXRoIEtyYW1kb3duIGFzIERlZmF1bHQgTWFya2Rvd24gUHJvY2Vzc29yICgjMTk4OCkKICAqIEV4cG9zZSBgc2l0ZS5zdGF0aWNfZmlsZXNgIHRvIExpcXVpZCAoIzIwNzUpCiAgKiBDb21wbGV0ZSByZWRlc2lnbiBvZiB0aGUgdGVtcGxhdGUgc2l0ZSBnZW5lcmF0ZWQgYnkgYGpla3lsbCBuZXdgICgjMjA1MCkKICAqIFVwZGF0ZSBMaXN0ZW4gZnJvbSAxLnggdG8gMi54ICgjMjA5NykKICAqIEZyb250IG1hdHRlciBkZWZhdWx0cyAoIzIyMDUpCiAgKiBEZXByZWNhdGUgYHJlbGF0aXZlX3Blcm1hbGlua3NgIGNvbmZpZ3VyYXRpb24gb3B0aW9uIChkZWZhdWx0IHRvIGBmYWxzZWApICgjMjMwNykKICAqIEV4Y2x1ZGUgZmlsZXMgYmFzZWQgb24gcHJlZml4IGFzIHdlbGwgYXMgYGZubWF0Y2g/YCAoIzIzMDMpCgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogTW92ZSB0aGUgRW50cnlGaWx0ZXIgY2xhc3MgaW50byB0aGUgSmVreWxsIG1vZHVsZSB0byBhdm9pZCBwb2xsdXRpbmcgdGhlIGdsb2JhbCBuYW1lc3BhY2UgKCMxODAwKQogICogQWRkIGBncm91cF9ieWAgTGlxdWlkIGZpbHRlciBjcmVhdGUgbGlzdHMgb2YgaXRlbXMgZ3JvdXBlZCBieSBhIGNvbW1vbiBwcm9wZXJ0eSdzIHZhbHVlICgjMTc4OCkKICAqIEFkZCBzdXBwb3J0IGZvciBNYXJ1a3UncyBgZmVuY2VkX2NvZGVfYmxvY2tzYCBvcHRpb24gKCMxNzk5KQogICogVXBkYXRlIFJlZGNhcnBldCBkZXBlbmRlbmN5IHRvIH4+IDMuMCAoIzE4MTUpCiAgKiBBdXRvbWF0aWNhbGx5IHNvcnQgYWxsIHBhZ2VzIGJ5IG5hbWUgKCMxODQ4KQogICogQmV0dGVyIGVycm9yIG1lc3NhZ2Ugd2hlbiB0aW1lIGlzIG5vdCBwYXJzZWFibGUgKCMxODQ3KQogICogQWxsb3cgYGluY2x1ZGVgIHRhZyB2YXJpYWJsZSBhcmd1bWVudHMgdG8gdXNlIGZpbHRlcnMgKCMxODQxKQogICogYHBvc3RfdXJsYCB0YWcgc2hvdWxkIHJhaXNlIGBBcmd1bWVudEVycm9yYCBmb3IgaW52YWxpZCBuYW1lICgjMTgyNSkKICAqIEJ1bXAgZGVwZW5kZW5jeSBgbWVyY2VuYXJ5YCB0byBgfj4gMC4yLjBgICgjMTg3OSkKICAqIEJ1bXAgZGVwZW5kZW5jeSBgc2FmZV95YW1sYCB0byBgfj4gMS4wYCAoIzE4ODYpCiAgKiBBbGxvdyBzb3J0aW5nIG9mIGNvbnRlbnQgYnkgY3VzdG9tIHByb3BlcnRpZXMgKCMxODQ5KQogICogQWRkIGAtLXF1aWV0YCBmbGFnIHRvIHNpbGVuY2Ugb3V0cHV0IGR1cmluZyBidWlsZCBhbmQgc2VydmUgKCMxODk4KQogICogQWRkIGEgYHdoZXJlYCBmaWx0ZXIgdG8gZmlsdGVyIGFycmF5cyBiYXNlZCBvbiBhIGtleS92YWx1ZSBwYWlyICgjMTg3NSkKICAqIFJvdXRlIDQwNCBlcnJvcnMgdG8gYSBjdXN0b20gNDA0IHBhZ2UgaW4gZGV2ZWxvcG1lbnQgKCMxODk5KQogICogRXhjbHVkZXMgYXJlIG5vdyByZWxhdGl2ZSB0byB0aGUgc2l0ZSBzb3VyY2UgKCMxOTE2KQogICogQnJpbmcgTUlNRSBUeXBlcyBmaWxlIGZvciBgamVreWxsIHNlcnZlYCB0byBjb21wbGV0ZSBwYXJpdHkgd2l0aCBHSCBQYWdlcyBzZXJ2ZXJzICgjMTk5MykKICAqIEFkZGluZyBCcmVha3BvaW50IHRvIG1ha2UgbmV3IHNpdGUgdGVtcGxhdGUgbW9yZSByZXNwb25zaXZlICgjMjAzOCkKICAqIERlZmF1bHQgdG8gdXNpbmcgdGhlIFVURi04IGVuY29kaW5nIHdoZW4gcmVhZGluZyBmaWxlcy4gKCMyMDMxKQogICogVXBkYXRlIFJlZGNhcnBldCBkZXBlbmRlbmN5IHRvIH4+IDMuMSAoIzIwNDQpCiAgKiBSZW1vdmUgc3VwcG9ydCBmb3IgUnVieSAxLjkuMiAoIzIwNDUpCiAgKiBBZGQgYC5ta2Rvd25gIGFzIHZhbGlkIE1hcmtkb3duIGV4dGVuc2lvbiAoIzIwNDgpCiAgKiBBZGQgYGluZGV4LnhtbGAgdG8gdGhlIGxpc3Qgb2YgV0VCcmljayBkaXJlY3RvcnkgaW5kZXggZmlsZXMgKCMyMDQxKQogICogTWFrZSB0aGUgYGxheW91dHNgIGNvbmZpZyBrZXkgcmVsYXRpdmUgdG8gQ1dEIG9yIHRvIHNvdXJjZSAoIzIwNTgpCiAgKiBVcGRhdGUgS3JhbWRvd24gdG8gYH4+IDEuM2AgKCMxODk0KQogICogUmVtb3ZlIHVubmVjZXNzYXJ5IHJlZmVyZW5jZXMgdG8gYHNlbGZgICgjMjA5MCkKICAqIFVwZGF0ZSB0byBNZXJjZW5hcnkgdjAuMy54ICgjMjA4NSkKICAqIFNoaXAgU2FzcyBzdXBwb3J0IGFzIGEgc2VwYXJhdGUgZ2VtICgjMjA5OCkKICAqIEV4dHJhY3QgY29yZSBleHRlbnNpb25zIGludG8gYSBVdGlscyBtb2R1bGUgKCMyMTEyKQogICogUmVmYWN0b3IgQ0xJICYgQ29tbWFuZHMgRm9yIEdyZWF0ZXIgSGFwcGluZXNzICgjMjE0MykKICAqIFByb3ZpZGUgdXNlZnVsIGVycm9yIHdoZW4gUHlnbWVudHMgcmV0dXJucyBgbmlsYCBhbmQgZXJyb3Igb3V0ICgjMjE0OCkKICAqIEFkZCBzdXBwb3J0IGZvciB1bnB1Ymxpc2hlZCBkcmFmdHMgKCMyMTY0KQogICogQWRkIGBmb3JjZV9wb2xsaW5nYCBvcHRpb24gdG8gdGhlIGBzZXJ2ZWAgY29tbWFuZCAoIzIxNjUpCiAgKiBDbGVhbiB1cCB0aGUgYDxoZWFkPmAgaW4gdGhlIHNpdGUgdGVtcGxhdGUgKCMyMTg2KQogICogUGVybWl0IFlBTUwgYmxvY2tzIHRvIGVuZCB3aXRoIHRocmVlIGRvdHMgdG8gYmV0dGVyIGNvbmZvcm0gd2l0aCB0aGUgWUFNTCBzcGVjICgjMjExMCkKICAqIFVzZSBgRmlsZS5leGlzdD9gIGluc3RlYWQgb2YgZGVwcmVjYXRlZCBgRmlsZS5leGlzdHM/YCAoIzIyMTQpCiAgKiBSZXF1aXJlIG5ld2xpbmUgYWZ0ZXIgc3RhcnQgb2YgWUFNTCBGcm9udCBNYXR0ZXIgaGVhZGVyICgjMjIxMSkKICAqIEFkZCB0aGUgYWJpbGl0eSBmb3IgcGFnZXMgdG8gYmUgbWFya2VkIGFzIGBwdWJsaXNoZWQ6IGZhbHNlYCAoIzE0OTIpCiAgKiBBZGQgYEpla3lsbDo6TGlxdWlkRXh0ZW5zaW9uc2Agd2l0aCBgLmxvb2t1cF92YXJpYWJsZWAgbWV0aG9kIGZvciBlYXN5IGxvb2tpbmcgdXAgb2YgdmFyaWFibGUgdmFsdWVzIGluIGEgTGlxdWlkIGNvbnRleHQuICgjMjI1MykKICAqIFJlbW92ZSBsaXRlcmFsIGxhbmcgbmFtZSBmcm9tIGNsYXNzICgjMjI5MikKICAqIFJldHVybiBgdXRmLThgIGVuY29kaW5nIGluIGhlYWRlciBmb3Igd2VicmljayBlcnJvciBwYWdlIHJlc3BvbnNlICgjMjI4OSkKICAqIE1ha2UgdGVtcGxhdGUgc2l0ZSBlYXNpZXIgdG8gY3VzdG9taXplICgjMjI2OCkKICAqIEFkZCB0d28tZGlnaXQgeWVhciB0byBwZXJtYWxpbmsgdGVtcGxhdGUgb3B0aW9uICgjMjMwMSkKICAqIEFkZCBgc2l0ZS5kb2N1bWVudHNgIHRvIExpcXVpZCBwYXlsb2FkIChsaXN0IG9mIGFsbCBkb2NzKSAoIzIyOTUpCiAgKiBUYWtlIGludG8gYWNjb3VudCBtaXNzaW5nIHZhbHVlcyBpbiB0aGUgTGlxdWlkIHNvcnQgZmlsdGVyICgjMjI5OSkKCiMjIyBCdWcgRml4ZXMKCiAgKiBEb24ndCBhbGxvdyBuaWwgZW50cmllcyB3aGVuIGxvYWRpbmcgcG9zdHMgKCMxNzk2KQogICogUmVtb3ZlIHRoZSBzY3JvbGxiYXIgdGhhdCdzIGFsd2F5cyBkaXNwbGF5ZWQgaW4gbmV3IHNpdGVzIGdlbmVyYXRlZCBmcm9tIHRoZSBzaXRlIHRlbXBsYXRlICgjMTgwNSkKICAqIEFkZCBgI3BhdGhgIHRvIHJlcXVpcmVkIG1ldGhvZHMgaW4gYEpla3lsbDo6Q29udmVydGlibGVgICgjMTg2NikKICAqIERlZmF1bHQgTWFydWt1IGZlbmNlZCBjb2RlIGJsb2NrcyB0byBPTiBmb3IgMi4wLjAtZGV2ICgjMTgzMSkKICAqIENoYW5nZSBzaG9ydCBvcHRzIGZvciBob3N0IGFuZCBwb3J0IGZvciBgamVreWxsIGRvY3NgIHRvIGJlIGNvbnNpc3RlbnQgd2l0aCBvdGhlciBzdWJjb21tYW5kcyAoIzE4NzcpCiAgKiBGaXggdHlwb3MgKCMxOTEwKQogICogTG9jayBNYXJ1a3UgYXQgMC43LjAgdG8gcHJldmVudCBidWdzIGNhdXNlZCBieSBNYXJ1a3UgMC43LjEgKCMxOTU4KQogICogRml4ZXMgZnVsbCBwYXRoIGxlYWsgdG8gc291cmNlIGRpcmVjdG9yeSB3aGVuIHVzaW5nIGluY2x1ZGUgdGFnICgjMTk1MSkKICAqIERvbid0IGdlbmVyYXRlIHBhZ2VzIHRoYXQgYXJlbid0IGJlaW5nIHB1Ymxpc2hlZCAoIzE5MzEpCiAgKiBVc2UgYFNhZmVZQU1MLmxvYWRgIHRvIGF2b2lkIGNvbmZsaWN0cyB3aXRoIG90aGVyIHByb2plY3RzICgjMTk4MikKICAqIFJlbGF0aXZlIHBvc3RzIHNob3VsZCBuZXZlciBmYWlsIHRvIGJ1aWxkICgjMTk3NikKICAqIFJlbW92ZSBleGVjdXRhYmxlIGJpdHMgb2Ygbm9uIGV4ZWN1dGFibGUgZmlsZXMgKCMyMDU2KQogICogYCNwYXRoYCBmb3IgYSBkcmFmdCBpcyBub3cgYF9kcmFmdHNgIGluc3RlYWQgb2YgYF9wb3N0c2AgKCMyMDQyKQogICogUGF0Y2ggYSBjb3VwbGUgc2hvdy1zdG9wcGluZyBzZWN1cml0eSB2dWxuZXJhYmlsaXRpZXMgKCMxOTQ2KQogICogU2FuaXRpemUgcGF0aHMgdW5pZm9ybWx5LCBpbiBhIFdpbmRvd3MtZnJpZW5kbHkgd2F5ICgjMjA2NSwgIzIxMDkpCiAgKiBVcGRhdGUgZ2VtIGJ1aWxkIHN0ZXBzIHRvIHdvcmsgY29ycmVjdGx5IG9uIFdpbmRvd3MgKCMyMTE4KQogICogUmVtb3ZlIG9ic29sZXRlIGBub3JtYWxpemVfb3B0aW9uc2AgbWV0aG9kIGNhbGwgZnJvbSBgYmluL2pla3lsbGAgKCMyMTIxKS4KICAqIFJlbW92ZSBgK2AgY2hhcmFjdGVycyBmcm9tIFB5Z21lbnRzIGxleGVyIG5hbWVzIHdoZW4gYWRkaW5nIGFzIGEgQ1NTIGNsYXNzICgjOTk0KQogICogUmVtb3ZlIHNvbWUgY29kZSB0aGF0IGNhdXNlZCBSdWJ5IGludGVycHJldGVyIHdhcm5pbmdzICgjMjE3OCkKICAqIE9ubHkgc3RyaXAgdGhlIGRyaXZlIG5hbWUgaWYgaXQgYmVnaW5zIHRoZSBzdHJpbmcgKCMyMTc1KQogICogUmVtb3ZlIGRlZmF1bHQgcG9zdCB3aXRoIGludmFsaWQgZGF0ZSBmcm9tIHNpdGUgdGVtcGxhdGUgKCMyMjAwKQogICogRml4IGBQb3N0I3VybGAgYW5kIGBQYWdlI3VybGAgZXNjYXBlICgjMTU2OCkKICAqIFN0cmlwIG5ld2xpbmVzIGZyb20gdGhlIGB7JSBoaWdobGlnaHQgJX1gIGJsb2NrIGNvbnRlbnQgKCMxODIzKQogICogTG9hZCBpbiBgcm91Z2VgIG9ubHkgd2hlbiBpdCdzIGJlZW4gcmVxdWVzdGVkIGFzIHRoZSBoaWdobGlnaHRlciAoIzIxODkpCiAgKiBDb252ZXJ0IGlucHV0IHRvIHN0cmluZyBiZWZvcmUgWE1MIGVzY2FwaW5nIChgeG1sX2VzY2FwZWAgbGlxdWlkIGZpbHRlcikgKCMyMjQ0KQogICogTW9kaWZ5IGNvbmZpZ3VyYXRpb24ga2V5IGZvciBDb2xsZWN0aW9ucyBhbmQgcmVzZXQgcHJvcGVybHkuICgjMjIzOCkKICAqIEF2b2lkIGR1cGxpY2F0ZWQgb3V0cHV0IHVzaW5nIGBoaWdobGlnaHRgIHRhZyAoIzIyNjQpCiAgKiBPbmx5IHVzZSBKZWt5bGwubG9nZ2VyIGZvciBvdXRwdXQgKCMyMzA3KQogICogQ2xvc2UgdGhlIGZpbGUgZGVzY3JpcHRvciBpbiBgaGFzX3lhbWxfaGVhZGVyP2AgKCMyMzEwKQogICogQWRkIGBvdXRwdXRgIHRvIGBEb2N1bWVudGAgbGlxdWlkIG91dHB1dCBoYXNoICgjMjMwOSkKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIEFkZCBhIGxpbmsgdG8gdGhlIHNpdGUgaW4gdGhlIFJFQURNRS5tZCBmaWxlICgjMTc5NSkKICAqIEFkZCBpbiBIaXN0b3J5IGFuZCBzaXRlIGNoYW5nZXMgZnJvbSBgdjEtc3RhYmxlYCBicmFuY2ggKCMxODM2KQogICogVGVzdGluZyBhZGRpdGlvbnMgb24gdGhlIEV4Y2VycHQgY2xhc3MgKCMxODkzKQogICogRml4IHRoZSBgaGlnaGxpZ2h0YCB0YWcgZmVhdHVyZSAoIzE4NTkpCiAgKiBUZXN0IEpla3lsbCB1bmRlciBSdWJ5IDIuMS4wICgjMTkwMCkKICAqIEFkZCBzY3JpcHQvY2lidWlsZCBmb3IgZnVuIGFuZCBwcm9maXQgKCMxOTEyKQogICogVXNlIGBGb3J3YXJkYWJsZWAgZm9yIGRlbGVnYXRpb24gYmV0d2VlbiBgRXhjZXJwdGAgYW5kIGBQb3N0YCAoIzE5MjcpCiAgKiBSZW5hbWUgYHJlYWRfdGhpbmdzYCB0byBgcmVhZF9jb250ZW50YCAoIzE5MjgpCiAgKiBBZGQgYHNjcmlwdC9icmFuZGluZ2Agc2NyaXB0IGZvciBBU0NJSSBhcnQgbG92aW4nICgjMTkzNikKICAqIFVwZGF0ZSB0aGUgUkVBRE1FIHRvIHJlZmxlY3QgdGhlIHJlcG8gbW92ZSAoIzE5NDMpCiAgKiBBZGQgdGhlIHByb2plY3QgdmlzaW9uIHRvIHRoZSBSRUFETUUgKCMxOTM1KQogICogU3BlZWQgdXAgVHJhdmlzIENJIGJ1aWxkcyBieSB1c2luZyBSZWJ1bmQgKCMxOTg1KQogICogVXNlIFlhcnAgYXMgYSBHZW0gcHJveHkgZm9yIFRyYXZpcyBDSSAoIzE5ODQpCiAgKiBSZW1vdmUgWWFycCBhcyBhIEdlbSBwcm94eSBmb3IgVHJhdmlzIENJICgjMjAwNCkKICAqIE1vdmUgdGhlIHJlYWRpbmcgb2YgbGF5b3V0cyBpbnRvIGl0cyBvd24gY2xhc3MgKCMyMDIwKQogICogVGVzdCBTYXNzIGltcG9ydCAoIzIwMDkpCiAgKiBTd2l0Y2ggTWFydWt1IGFuZCBLcmFtZG93biBpbiBsaXN0cyBvZiBSdW50aW1lIHZzLiBEZXZlbG9wbWVudCBkZXBlbmRlbmNpZXMgKCMyMDQ5KQogICogQ2xlYW4gdXAgdGhlIGdlbXNwZWMgZm9yIHRoZSBwcm9qZWN0ICgjMjA5NSkKICAqIEFkZCBKYXBhbmVzZSB0cmFuc2xhdGlvbiBvZiBSRUFETUUgYW5kIENPTlRSSUJVVElORyBkb2NzLiAoIzIwODEpCiAgKiBSZS1hbGlnbiB0aGUgdGFibGVzIGluIEN1Y3VtYmVyICgjMjEwOCkKICAqIFRyaW0gdHJhaWxpbmcgc3BhY2VzIGFuZCBjb252ZXJ0IHRhYnMgdG8gc3BhY2VzICgjMjEyMikKICAqIEZpeCB0aGUgZmFpbGluZyBUcmF2aXMgc2NlbmFyaW9zIGR1ZSB0byBDdWN1bWJlciBpc3N1ZXMgKCMyMTU1KQogICogV3JhcCBgYnVuZGxlIGluc3RhbGxgIGluIGB0cmF2aXNfcmV0cnlgIHRvIHJldHJ5IHdoZW4gUnVieUdlbXMgZmFpbHMgKCMyMTYwKQogICogUmVmYWN0b3IgdGFncyBhbmQgY2F0ZWdvcmllcyAoIzE2MzkpCiAgKiBFeHRyYWN0IHBsdWdpbiBtYW5hZ2VtZW50IGludG8gaXRzIG93biBjbGFzcyAoIzIxOTcpCiAgKiBBZGQgbWlzc2luZyB0ZXN0cyBmb3IgYENvbW1hbmRgICgjMjIxNikKICAqIFVwZGF0ZSBgcnJgIGxpbmsgaW4gQ09OVFJJQlVUSU5HIGRvYyAoIzIyNDcpCiAgKiBTdHJlYW1saW5lIEN1Y3VtYmVyIGV4ZWN1dGlvbiBvZiBgamVreWxsYCBzdWJjb21tYW5kcyAoIzIyNTgpCiAgKiBSZWZhY3RvciBgQ29tbWFuZHM6OlNlcnZlYC4gKCMyMjY5KQogICogUmVmYWN0b3IgYGhpZ2hsaWdodGAgdGFnICgjMjE1NCkKICAqIFVwZGF0ZSBgVXRpbGAgaGFzaCBmdW5jdGlvbnMgd2l0aCBsYXRlc3QgZnJvbSBSYWlscyAoIzIyNzMpCiAgKiBXb3JrYXJvdW5kIGZvciBUcmF2aXMgYnVnICgjMjI5MCkKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIERvY3VtZW50IEtyYW1kb3duJ3MgR0ZNIHBhcnNlciBvcHRpb24gKCMxNzkxKQogICogTW92ZSBDU1MgdG8gaW5jbHVkZXMgJiB1cGRhdGUgbm9ybWFsaXplLmNzcyB0byB2Mi4xLjMgKCMxNzg3KQogICogTWluaWZ5IENTUyBvbmx5IGluIHByb2R1Y3Rpb24gKCMxODAzKQogICogRml4IGJyb2tlbiBsaW5rIHRvIGluc3RhbGxhdGlvbiBvZiBSdWJ5IG9uIE1vdW50YWluIExpb24gYmxvZyBwb3N0IG9uIFRyb3VibGVzaG9vdGluZyBkb2NzIHBhZ2UgKCMxNzk3KQogICogRml4IGlzc3VlcyB3aXRoIDEuNC4xIHJlbGVhc2UgYmxvZyBwb3N0ICgjMTgwNCkKICAqIEFkZCBub3RlIGFib3V0IGRlcGxveWluZyB0byBPcGVuU2hpZnQgKCMxODEyKQogICogQ29sbGVjdCBhbGwgV2luZG93cy1yZWxhdGVkIGRvY3Mgb250byBvbmUgcGFnZSAoIzE4MTgpCiAgKiBGaXhlZCB0eXBvIGluIGRhdGFmaWxlcyBkb2MgcGFnZSAoIzE4NTQpCiAgKiBDbGFyaWZ5IGhvdyB0byBhY2Nlc3MgYHNpdGVgIGluIGRvY3MgKCMxODY0KQogICogQWRkIGNsb3NpbmcgYDxjb2RlPmAgdGFnIHRvIGBjb250ZXh0LnJlZ2lzdGVyc1s6c2l0ZV1gIG5vdGUgKCMxODY3KQogICogRml4IGxpbmsgdG8gQG1vam9tYm8ncyBzaXRlIHNvdXJjZSAoIzE4OTcpCiAgKiBBZGQgYHBhZ2luYXRlOiBuaWxgIHRvIGRlZmF1bHQgY29uZmlndXJhdGlvbiBpbiBkb2NzICgjMTg5NikKICAqIEFkZCBsaW5rIHRvIG91ciBMaWNlbnNlIGluIHRoZSBzaXRlIGZvb3RlciAoIzE4ODkpCiAgKiBBZGQgYSBjaGFyc2V0IG5vdGUgaW4gIldyaXRpbmcgUG9zdHMiIGRvYyBwYWdlICgjMTkwMikKICAqIERpc2FsbG93IHNlbGVjdGlvbiBvZiBwYXRoIGFuZCBwcm9tcHQgaW4gYmFzaCBleGFtcGxlcwogICogQWRkIGpla3lsbC1jb21wYXNzIHRvIHRoZSBwbHVnaW4gbGlzdCAoIzE5MjMpCiAgKiBBZGQgbm90ZSBpbiBQb3N0cyBkb2NzIGFib3V0IHN0cmlwcGluZyBgPHA+YCB0YWdzIGZyb20gZXhjZXJwdCAoIzE5MzMpCiAgKiBBZGQgYWRkaXRpb25hbCBpbmZvIGFib3V0IHRoZSBuZXcgZXhjbHVkZSBiZWhhdmlvciAoIzE5MzgpCiAgKiBMaW5raWZ5ICdhd2Vzb21lIGNvbnRyaWJ1dG9ycycgdG8gcG9pbnQgdG8gdGhlIGNvbnRyaWJ1dG9ycyBncmFwaCBvbiBHaXRIdWIgKCMxOTQwKQogICogVXBkYXRlIGBkb2NzL3NpdGVzLm1kYCBsaW5rIHRvIEdpdEh1YiBUcmFpbmluZyBtYXRlcmlhbHMgKCMxOTQ5KQogICogVXBkYXRlIGBtYXN0ZXJgIHdpdGggdGhlIHJlbGVhc2UgaW5mbyBmcm9tIDEuNC4zICgjMTk0NykKICAqIERlZmluZSBkb2NzIG5hdiBpbiBkYXRhZmlsZSAoIzE5NTMpCiAgKiBDbGFyaWZ5IHRoZSBkb2NzIGFyb3VuZCB0aGUgbmFtaW5nIGNvbnZlbnRpb24gZm9yIHBvc3RzICgjMTk3MSkKICAqIEFkZCBtaXNzaW5nIGBuZXh0YCBhbmQgYHByZXZpb3VzYCBkb2NzIGZvciBwb3N0IGxheW91dHMgYW5kIHRlbXBsYXRlcyAoIzE5NzApCiAgKiBBZGQgbm90ZSB0byBgV3JpdGluZyBwb3N0c2AgcGFnZSBhYm91dCBob3cgdG8gc3RyaXAgaHRtbCBmcm9tIGV4Y2VycHQgKCMxOTYyKQogICogQWRkIGBqZWt5bGwtaHVtYW5pemVgIHBsdWdpbiB0byBwbHVnaW4gbGlzdCAoIzE5OTgpCiAgKiBBZGQgYGpla3lsbC1mb250LWF3ZXNvbWVgIHBsdWdpbiB0byBwbHVnaW4gbGlzdCAoIzE5OTkpCiAgKiBBZGQgYHN1YmxpbWUtamVreWxsYCB0byBsaXN0IG9mIEVkaXRvciBwbHVnaW5zICgjMjAwMSkKICAqIEFkZCBgdmltLWpla3lsbGAgdG8gdGhlIGxpc3Qgb2YgRWRpdG9yIHBsdWdpbnMgKCMyMDA1KQogICogRml4IG5vbi1zZW1hbnRpYyBuZXN0aW5nIG9mIGBwYCB0YWdzIGluIGBuZXdzX2l0ZW1gIGxheW91dCAoIzIwMTMpCiAgKiBEb2N1bWVudCBkZXN0aW5hdGlvbiBmb2xkZXIgY2xlYW5pbmcgKCMyMDE2KQogICogVXBkYXRlZCBpbnN0cnVjdGlvbnMgZm9yIE5lYXJseUZyZWVTcGVlY2guTkVUIGluc3RhbGxhdGlvbiAoIzIwMTUpCiAgKiBVcGRhdGUgbGluayB0byByYWNrLWpla3lsbCBvbiAiRGVwbG95bWVudCBNZXRob2RzIiBwYWdlICgjMjA0NykKICAqIEZpeCB0eXBvIGluIC9kb2NzL2NvbmZpZ3VyYXRpb24gKCMyMDczKQogICogRml4IGNvdW50IGluIGRvY3MgZm9yIGBzaXRlLnN0YXRpY19maWxlc2AgKCMyMDc3KQogICogVXBkYXRlIGNvbmZpZ3VyYXRpb24gZG9jcyB0byBpbmRpY2F0ZSB1dGYtOCBpcyB0aGUgZGVmYXVsdCBmb3IgMi4wLjAgYW5kIEFTQ0lJIGZvciAxLjkuMyAoIzIwNzQpCiAgKiBBZGQgaW5mbyBhYm91dCB1bnJlbGVhc2VkIGZlYXR1cmUgdG8gdGhlIHNpdGUgKCMyMDYxKQogICogQWRkIHdoaXRlc3BhY2UgdG8gbGlxdWlkIGV4YW1wbGUgaW4gR2l0SHViIFBhZ2VzIGRvY3MgKCMyMDg0KQogICogQ2xhcmlmeSB0aGUgd2F5IFNhc3MgYW5kIENvZmZlZVNjcmlwdCBmaWxlcyBhcmUgcmVhZCBpbiBhbmQgb3V0cHV0ICgjMjA2NykKICAqIEFkZCBseWNoZSBnYWxsZXJ5IHRhZyBwbHVnaW4gbGluayB0byBsaXN0IG9mIHBsdWdpbnMgKCMyMDk0KQogICogQWRkIEpla3lsbCBQYWdlcyBEaXJlY3RvcnkgcGx1Z2luIHRvIGxpc3Qgb2YgcGx1Z2lucyAoIzIwOTYpCiAgKiBVcGRhdGUgQ29uZmlndXJhdGlvbiBkb2NzIHBhZ2Ugd2l0aCBuZXcgbWFya2Rvd24gZXh0ZW5zaW9uICgjMjEwMikKICAqIEFkZCBgamVreWxsLWltYWdlLXNldGAgdG8gdGhlIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzIxMDUpCiAgKiBMb3NzbGVzc2x5IGNvbXByZXNzIGltYWdlcyAoIzIxMjgpCiAgKiBVcGRhdGUgbm9ybWFsaXplLmNzcyB0byAzLjAuMCAoIzIxMjYpCiAgKiBVcGRhdGUgbW9kZXJuaXpyIHRvIHYyLjcuMSAoIzIxMjkpCiAgKiBBZGQgYGpla3lsbC1vcmRpbmFsYCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMyMTUwKQogICogQWRkIGBqZWt5bGxfZmlndXJlYCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMyMTU4KQogICogQ2xhcmlmeSB0aGUgZG9jdW1lbnRhdGlvbiBmb3Igc2FmZSBtb2RlICgjMjE2MykKICAqIFNvbWUgSFRNTCB0aWR5aW5nICgjMjEzMCkKICAqIFJlbW92ZSBtb2Rlcm5penIgYW5kIHVzZSBodG1sNXNoaXYuanMgZGlyZWN0bHkgZm9yIElFIGxlc3MgdGhhbiB2OSAoIzIxMzEpCiAgKiBSZW1vdmUgdW51c2VkIGltYWdlcyAoIzIxODcpCiAgKiBVc2UgYGFycmF5X3RvX3NlbnRlbmNlX3N0cmluZ2AgZmlsdGVyIHdoZW4gb3V0cHV0dGluZyBuZXdzIGl0ZW0gY2F0ZWdvcmllcyAoIzIxOTEpCiAgKiBBZGQgbGluayB0byBIZWxwIHJlcG8gaW4gcHJpbWFyeSBuYXZpZ2F0aW9uIGJhciAoIzIxNzcpCiAgKiBTd2l0Y2ggdG8gdXNpbmcgYW4gaWNvIGZpbGUgZm9yIHRoZSBzaG9ydGN1dCBpY29uICgjMjE5MykKICAqIFVzZSBudW1iZXJzIHRvIHNwZWNpZnkgZm9udCB3ZWlnaHRzIGFuZCBvbmx5IGJyaW5nIGluIGZvbnQgd2VpZ2h0cyB1c2VkICgjMjE4NSkKICAqIEFkZCBhIGxpbmsgdG8gdGhlIGxpc3Qgb2YgYWxsIHR6IGRhdGFiYXNlIHRpbWUgem9uZXMgKCMxODI0KQogICogQ2xlYW4tdXAgYW5kIGltcHJvdmUgZG9jdW1lbnRhdGlvbiBgZmVlZC54bWxgICgjMjE5MikKICAqIFJlbW92ZSBkdXBsaWNhdGUgZW50cnkgaW4gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjIwNikKICAqIFJlZHVjZSB0aGUgd2hpdGVzcGFjZSBpbiB0aGUgZmF2aWNvbi4gKCMyMjEzKQogICogQWRkIGBqZWt5bGwtcGFnZS1jb2xsZWN0aW9uc2AgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjIxNSkKICAqIEFkZCBhIGNyb3NzLXJlZmVyZW5jZSBhYm91dCBgcG9zdF91cmxgICgjMjI0MykKICAqIEFkZCBgamVreWxsLWxpdmUtdGlsZXNgIHRvIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzIyNTApCiAgKiBGaXhlZCBicm9rZW4gbGluayB0byBHaXRIdWIgdHJhaW5pbmcgbWF0ZXJpYWwgc2l0ZSBzb3VyY2UgKCMyMjU3KQogICogVXBkYXRlIGxpbmsgdG8gaGVscCByZXBvLCBub3cgY2FsbGVkIGBqZWt5bGwtaGVscGAgKCMyMjc3KQogICogRml4IGNhcGl0YWxpemF0aW9uIG9mICdKZWt5bGwnIG9uIERlcGxveW1lbnQgTWV0aG9kcyBwYWdlICgjMjI5MSkKICAqIEluY2x1ZGUgcGx1Z2lucyBieSBzb25ueW0gaW4gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjI5NykKICAqIEFkZCBkZXByZWNhdGVkIGFydGljbGVzIGtlZXBlciBmaWx0ZXIgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMjMwMCkKICAqIFNpbXBsaWZ5IGFuZCBpbXByb3ZlIG91ciBDU1MuICgjMjEyNykKICAqIFVzZSBibGFjayB0ZXh0IGNvbG9yIGZvciB0aGUgbW9iaWxlIG5hdmJhciAoIzIzMDYpCiAgKiBVc2UgdGhlIGJ1aWx0IGluIGRhdGUgZmlsdGVyIGFuZCBgc2l0ZS50aW1lYCBmb3IgdGhlIGNvcHlyaWdodCB5ZWFyLiAoIzIzMDUpCiAgKiBVcGRhdGUgaHRtbDVzaGl2IHRvIHYzLjcuMiAoIzIzMDQpCiAgKiBBZGQgMi4wLjAgcmVsZWFzZSBwb3N0ICgjMjI5OCkKICAqIEFkZCBkb2NzIGZvciBjdXN0b20gbWFya2Rvd24gcHJvY2Vzc29ycyAoIzIyOTgpCiAgKiBBZGQgZG9jcyBmb3IgYHdoZXJlYCBhbmQgYGdyb3VwX2J5YCBMaXF1aWQgZmlsdGVycyAoIzIyOTgpCiAgKiBSZW1vdmUgbm90ZXMgaW4gZG9jcyBmb3IgdW5yZWxlYXNlZCBmZWF0dXJlcyAoIzIzMDkpCgojIyAxLjUuMSAvIDIwMTQtMDMtMjcKCiMjIyBCdWcgRml4ZXMKCiAgKiBPbmx5IHN0cmlwIHRoZSBkcml2ZSBuYW1lIGlmIGl0IGJlZ2lucyB0aGUgc3RyaW5nICgjMjE3NikKCiMjIDEuNS4wIC8gMjAxNC0wMy0yNAoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIExvb3NlbiBgc2FmZV95YW1sYCBkZXBlbmRlbmN5IHRvIGB+PiAxLjBgICgjMjE2NykKICAqIEJ1bXAgYHNhZmVfeWFtbGAgZGVwZW5kZW5jeSB0byBgfj4gMS4wLjBgICgjMTk0MikKCiMjIyBCdWcgRml4ZXMKCiAgKiBGaXggaXNzdWUgd2hlcmUgZmlsZXN5c3RlbSB0cmF2ZXJzYWwgcmVzdHJpY3Rpb24gYnJva2UgV2luZG93cyAoIzIxNjcpCiAgKiBMb2NrIGBtYXJ1a3VgIGF0IGAwLjcuMGAgKCMyMTY3KQoKIyMjIERldmVsb3BtZW50IEZpeGVzCgogICogTG9jayBgY3VjdW1iZXJgIGF0IGAxLjMuMTFgICgjMjE2NykKCiMjIDEuNC4zIC8gMjAxNC0wMS0xMwoKIyMjIEJ1ZyBGaXhlcwoKICAqIFBhdGNoIHNob3ctc3RvcHBpbmcgc2VjdXJpdHkgdnVsbmVyYWJpbGl0aWVzICgjMTk0NCkKCiMjIDEuNC4yIC8gMjAxMy0xMi0xNgoKIyMjIEJ1ZyBGaXhlcwoKICAqIFR1cm4gb24gTWFydWt1IGZlbmNlZCBjb2RlIGJsb2NrcyBieSBkZWZhdWx0ICgjMTgzMCkKCiMjIDEuNC4xIC8gMjAxMy0xMi0wOQoKIyMjIEJ1ZyBGaXhlcwoKICAqIERvbid0IGFsbG93IG5pbCBlbnRyaWVzIHdoZW4gbG9hZGluZyBwb3N0cyAoIzE3OTYpCgojIyAxLjQuMCAvIDIwMTMtMTItMDcKCiMjIyBNYWpvciBFbmhhbmNlbWVudHMKCiAgKiBBZGQgc3VwcG9ydCBmb3IgVE9NTCBjb25maWcgZmlsZXMgKCMxNzY1KQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFNvcnQgcGx1Z2lucyBhcyBhIHdheSB0byBlc3RhYmxpc2ggYSBsb2FkIG9yZGVyICgjMTY4MikKICAqIFVwZGF0ZSBNYXJ1a3UgdG8gMC43LjAgKCMxNzc1KQoKIyMjIEJ1ZyBGaXhlcwoKICAqIEFkZCBhIHNwYWNlIGJldHdlZW4gdHdvIHdvcmRzIGluIGEgUGFnaW5hdGlvbiB3YXJuaW5nIG1lc3NhZ2UgKCMxNzY5KQogICogVXBncmFkZSBgdG9tbGAgZ2VtIHRvIGB2MC4xLjBgIHRvIG1haW50YWluIGNvbXBhdCB3aXRoIFJ1YnkgMS44LjcgKCMxNzc4KQoKIyMjIERldmVsb3BtZW50IEZpeGVzCgogICogUmVtb3ZlIHNvbWUgd2hpdGVzcGFjZSBpbiB0aGUgY29kZSAoIzE3NTUpCiAgKiBSZW1vdmUgc29tZSBkdXBsaWNhdGlvbiBpbiB0aGUgcmVhZGluZyBvZiBwb3N0cyBhbmQgZHJhZnRzICgjMTc3OSkKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIEZpeGVkIGNhc2Ugb2YgYSB3b3JkIGluIHRoZSBKZWt5bGwgdjEuMy4wIHJlbGVhc2UgcG9zdCAoIzE3NjIpCiAgKiBGaXhlZCB0aGUgbWltZSB0eXBlIGZvciB0aGUgZmF2aWNvbiAoIzE3NzIpCgojIyAxLjMuMSAvIDIwMTMtMTEtMjYKCiMjIyBNaW5vciBFbmhhbmNlbWVudHMKCiAgKiBBZGQgYSBgLS1wcmVmaXhgIG9wdGlvbiB0byBwYXNzdGhyb3VnaCBmb3IgdGhlIGltcG9ydGVycyAoIzE2NjkpCiAgKiBQdXNoIHRoZSBwYWdpbmF0b3IgcGx1Z2luIGxvd2VyIGluIHRoZSBwbHVnaW4gcHJpb3JpdHkgb3JkZXIgc28gb3RoZXIgcGx1Z2lucyBydW4gYmVmb3JlIGl0ICgjMTc1OSkKCiMjIyBCdWcgRml4ZXMKCiAgKiBGaXggdGhlIGluY2x1ZGUgdGFnIHdoZW4gcmFuIGluIGEgbG9vcCAoIzE3MjYpCiAgKiBGaXggZXJyb3JzIHdoZW4gdXNpbmcgYC0td2F0Y2hgIG9uIDEuOC43ICgjMTczMCkKICAqIFNwZWNpZnkgd2hlcmUgdGhlIGluY2x1ZGUgaXMgY2FsbGVkIGZyb20gaWYgYW4gaW5jbHVkZWQgZmlsZSBpcyBtaXNzaW5nICgjMTc0NikKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIEV4dHJhY3QgYFNpdGUjZmlsdGVyX2VudHJpZXNgIGludG8gaXRzIG93biBvYmplY3QgKCMxNjk3KQogICogRW5hYmxlIFRyYXZpcycgYnVuZGxlIGNhY2hpbmcgKCMxNzM0KQogICogUmVtb3ZlIHRyYWlsaW5nIHdoaXRlc3BhY2UgaW4gc29tZSBmaWxlcyAoIzE3MzYpCiAgKiBGaXggYSBkdXBsaWNhdGUgdGVzdCBuYW1lICgjMTc1NCkKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIFVwZGF0ZSBsaW5rIHRvIGV4YW1wbGUgUmFrZWZpbGUgdG8gcG9pbnQgdG8gc3BlY2lmaWMgY29tbWl0ICgjMTc0MSkKICAqIEZpeCBkcmFmdHMgZG9jcyB0byBpbmRpY2F0ZSB0aGF0IGRyYWZ0IHRpbWUgaXMgYmFzZWQgb24gZmlsZSBtb2RpZmljYXRpb24gdGltZSwgbm90IGBUaW1lLm5vd2AgKCMxNjk1KQogICogQWRkIGBqZWt5bGwtbW9udGhseS1hcmNoaXZlLXBsdWdpbmAgYW5kIGBqZWt5bGwtY2F0ZWdvcnktYXJjaGl2ZS1wbHVnaW5gIHRvIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucyAoIzE2OTMpCiAgKiBBZGQgYGpla3lsbC1hc3NldC1wYXRoLXBsdWdpbmAgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMTY3MCkKICAqIEFkZCBgZW1vamktZm9yLWpla3lsbGAgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0IHBsdWdpbnMgKCMxNzA4KQogICogRml4IHByZXZpb3VzIHNlY3Rpb24gbGluayBvbiBwbHVnaW5zIHBhZ2UgdG8gcG9pbnQgdG8gcGFnaW5hdGlvbiBwYWdlICgjMTcwNykKICAqIEFkZCBgb3JnLW1vZGVgIGNvbnZlcnRlciBwbHVnaW4gdG8gdGhpcmQtcGFydHkgcGx1Z2lucyAoIzE3MTEpCiAgKiBQb2ludCAiQmxvZyBtaWdyYXRpb25zIiBwYWdlIHRvIGh0dHA6Ly9pbXBvcnQuamVreWxscmIuY29tICgjMTczMikKICAqIEFkZCBkb2NzIGZvciBgcG9zdF91cmxgIHdoZW4gcG9zdHMgYXJlIGluIHN1YmRpcmVjdG9yaWVzICgjMTcxOCkKICAqIFVwZGF0ZSB0aGUgZG9jcyB0byBwb2ludCB0byBgZXhhbXBsZS5jb21gICgjMTQ0OCkKCiMjIDEuMy4wIC8gMjAxMy0xMS0wNAoKIyMjIE1ham9yIEVuaGFuY2VtZW50cwoKICAqIEFkZCBzdXBwb3J0IGZvciBhZGRpbmcgZGF0YSBhcyBZQU1MIGZpbGVzIHVuZGVyIGEgc2l0ZSdzIGBfZGF0YWAgZGlyZWN0b3J5ICgjMTAwMykKICAqIEFsbG93IHZhcmlhYmxlcyB0byBiZSB1c2VkIHdpdGggYGluY2x1ZGVgIHRhZ3MgKCMxNDk1KQogICogQWxsb3cgdXNpbmcgZ2VtcyBmb3IgcGx1Z2luIG1hbmFnZW1lbnQgKCMxNTU3KQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIERlY3JlYXNlIHRoZSBzcGVjaWZpY2l0eSBpbiB0aGUgc2l0ZSB0ZW1wbGF0ZSBDU1MgKCMxNTc0KQogICogQWRkIGBlbmNvZGluZ2AgY29uZmlndXJhdGlvbiBvcHRpb24gKCMxNDQ5KQogICogUHJvdmlkZSBiZXR0ZXIgZXJyb3IgaGFuZGxpbmcgZm9yIEpla3lsbCdzIGN1c3RvbSBMaXF1aWQgdGFncyAoIzE1MTQpCiAgKiBJZiBhbiBpbmNsdWRlZCBmaWxlIGNhdXNlcyBhIExpcXVpZCBlcnJvciwgYWRkIHRoZSBwYXRoIHRvIHRoZSBpbmNsdWRlIGZpbGUgdGhhdCBjYXVzZWQgdGhlIGVycm9yIHRvIHRoZSBlcnJvciBtZXNzYWdlICgjMTU5NikKICAqIElmIGEgbGF5b3V0IGNhdXNlcyBhIExpcXVpZCBlcnJvciwgY2hhbmdlIHRoZSBlcnJvciBtZXNzYWdlIHNvIHRoYXQgd2Uga25vdyBpdCBjb21lcyBmcm9tIHRoZSBsYXlvdXQgKCMxNjAxKQogICogVXBkYXRlIEtyYW1kb3duIGRlcGVuZGVuY3kgdG8gYH4+IDEuMmAgKCMxNjEwKQogICogVXBkYXRlIGBzYWZlX3lhbWxgIGRlcGVuZGVuY3kgdG8gYH4+IDAuOS43YCAoIzE2MDIpCiAgKiBBbGxvdyBsYXlvdXRzIHRvIGJlIGluIHN1YmZvbGRlcnMgbGlrZSBpbmNsdWRlcyAoIzE2MjIpCiAgKiBTd2l0Y2ggdG8gbGlzdGVuIGZvciBzaXRlIHdhdGNoaW5nIHdoaWxlIHNlcnZpbmcgKCMxNTg5KQogICogQWRkIGEgYGpzb25gIGxpcXVpZCBmaWx0ZXIgdG8gYmUgdXNlZCBpbiBzaXRlcyAoIzE2NTEpCiAgKiBQb2ludCBwZW9wbGUgdG8gdGhlIG1pZ3JhdGlvbiBkb2NzIHdoZW4gdGhlIGBqZWt5bGwtaW1wb3J0YCBnZW0gaXMgbWlzc2luZyAoIzE2NjIpCgojIyMgQnVnIEZpeGVzCgogICogRml4IHVwIG1hdGNoaW5nIGFnYWluc3Qgc291cmNlIGFuZCBkZXN0aW5hdGlvbiB3aGVuIHRoZSB0d28gbG9jYXRpb25zIGFyZSBzaW1pbGFyICgjMTU1NikKICAqIEZpeCB0aGUgbWlzc2luZyBgcGF0aG5hbWVgIHJlcXVpcmUgaW4gY2VydGFpbiBjYXNlcyAoIzEyNTUpCiAgKiBVc2UgYCtgIGluc3RlYWQgb2YgYEFycmF5I2NvbmNhdGAgd2hlbiBidWlsZGluZyBgUG9zdGAgYXR0cmlidXRlIGxpc3QgKCMxNTcxKQogICogUHJpbnQgc2VydmVyIGFkZHJlc3Mgd2hlbiBsYXVuY2hpbmcgYSBzZXJ2ZXIgKCMxNTg2KQogICogRG93bmdyYWRlIHRvIE1hcnVrdSBgfj4gMC42LjBgIGluIG9yZGVyIHRvIGF2b2lkIGNoYW5nZXMgaW4gcmVuZGVyaW5nICgjMTU5OCkKICAqIEZpeCBlcnJvciB3aXRoIGZhaWxpbmcgaW5jbHVkZSB0YWcgd2hlbiB2YXJpYWJsZSB3YXMgZmlsZSBuYW1lICgjMTYxMykKICAqIERvd25jYXNlIGxleGVycyBiZWZvcmUgcGFzc2luZyB0aGVtIHRvIHB5Z21lbnRzICgjMTYxNSkKICAqIENhcGl0YWxpemUgdGhlIHNob3J0IHZlcmJvc2Ugc3dpdGNoIGJlY2F1c2UgaXQgY29uZmxpY3RzIHdpdGggdGhlIGJ1aWx0LWluIENvbW1hbmRlciBzd2l0Y2ggKCMxNjYwKQogICogRml4IGNvbXBhdGliaWxpdHkgd2l0aCAxLjgueCAoIzE2NjUpCiAgKiBGaXggYW4gZXJyb3Igd2l0aCB0aGUgbmV3IGZpbGUgd2F0Y2hpbmcgY29kZSBkdWUgdG8gbGlicmFyeSB2ZXJzaW9uIGluY29tcGF0aWJpbGl0aWVzICgjMTY4NykKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIEFkZCBjb3ZlcmFnZSByZXBvcnRpbmcgd2l0aCBDb3ZlcmFsbHMgKCMxNTM5KQogICogUmVmYWN0b3IgdGhlIExpcXVpZCBgaW5jbHVkZWAgdGFnICgjMTQ5MCkKICAqIFVwZGF0ZSBsYXVuY2h5IGRlcGVuZGVuY3kgdG8gYH4+IDIuM2AgKCMxNjA4KQogICogVXBkYXRlIHJyIGRlcGVuZGVuY3kgdG8gYH4+IDEuMWAgKCMxNjA0KQogICogVXBkYXRlIGN1Y3VtYmVyIGRlcGVuZGVuY3kgdG8gYH4+IDEuM2AgKCMxNjA3KQogICogVXBkYXRlIGNvdmVyYWxscyBkZXBlbmRlbmN5IHRvIGB+PiAwLjcuMGAgKCMxNjA2KQogICogVXBkYXRlIHJha2UgZGVwZW5kZW5jeSB0byBgfj4gMTAuMWAgKCMxNjAzKQogICogQ2xlYW4gdXAgYHNpdGUucmJgIGNvbW1lbnRzIHRvIGJlIG1vcmUgY29uY2lzZS91bmlmb3JtICgjMTYxNikKICAqIFVzZSB0aGUgbWFzdGVyIGJyYW5jaCBmb3IgdGhlIGJ1aWxkIGJhZGdlIGluIHRoZSByZWFkbWUgKCMxNjM2KQogICogUmVmYWN0b3IgU2l0ZSNyZW5kZXIgKCMxNjM4KQogICogUmVtb3ZlIGR1cGxpY2F0aW9uIGluIGNvbW1hbmQgbGluZSBvcHRpb25zICgjMTYzNykKICAqIEFkZCB0ZXN0cyBmb3IgYWxsIHRoZSBjb2RlcmF5IG9wdGlvbnMgKCMxNTQzKQogICogSW1wcm92ZSBzb21lIG9mIHRoZSBDdWN1bWJlciB0ZXN0IGNvZGUgKCMxNDkzKQogICogSW1wcm92ZSBjb21wYXJpc29ucyBvZiB0aW1lc3RhbXBzIGJ5IGlnbm9yaW5nIHRoZSBzZWNvbmRzICgjMTU4MikKCiMjIyBTaXRlIEVuaGFuY2VtZW50cwoKICAqIEZpeCBwYXJhbXMgZm9yIGBKZWt5bGxJbXBvcnQ6OldvcmRQcmVzcy5wcm9jZXNzYCBhcmd1bWVudHMgKCMxNTU0KQogICogQWRkIGBqZWt5bGwtc3VnZ2VzdGVkLXR3ZWV0YCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMxNTU1KQogICogTGluayB0byBMaXF1aWQncyBkb2NzIGZvciB0YWdzIGFuZCBmaWx0ZXJzICgjMTU1MykKICAqIEFkZCBub3RlIGFib3V0IGluc3RhbGxpbmcgWGNvZGUgb24gdGhlIE1hYyBpbiB0aGUgSW5zdGFsbGF0aW9uIGRvY3MgKCMxNTYxKQogICogU2ltcGxpZnkvZ2VuZXJhbGl6ZSBwYWdpbmF0aW9uIGRvY3MgKCMxNTc3KQogICogQWRkIGRvY3VtZW50YXRpb24gZm9yIHRoZSBuZXcgZGF0YSBzb3VyY2VzIGZlYXR1cmUgKCMxNTAzKQogICogQWRkIG1vcmUgaW5mb3JtYXRpb24gb24gaG93IHRvIGNyZWF0ZSBnZW5lcmF0b3JzICgjMTU5MCwgIzE1OTIpCiAgKiBJbXByb3ZlIHRoZSBpbnN0cnVjdGlvbnMgZm9yIG1pbWlja2luZyBHaXRIdWIgRmxhdm9yZWQgTWFya2Rvd24gKCMxNjE0KQogICogQWRkIGBqZWt5bGwtaW1wb3J0YCB3YXJuaW5nIG5vdGUgb2YgbWlzc2luZyBkZXBlbmRlbmNpZXMgKCMxNjI2KQogICogRml4IGdyYW1tYXIgaW4gdGhlIFVzYWdlIHNlY3Rpb24gKCMxNjM1KQogICogQWRkIGRvY3VtZW50YXRpb24gZm9yIHRoZSB1c2Ugb2YgZ2VtcyBhcyBwbHVnaW5zICgjMTY1NikKICAqIERvY3VtZW50IHRoZSBleGlzdGVuY2Ugb2YgYSBmZXcgYWRkaXRpb25hbCBwbHVnaW5zICgjMTQwNSkKICAqIERvY3VtZW50IHRoYXQgdGhlIGBkYXRlX3RvX3N0cmluZ2AgYWx3YXlzIHJldHVybnMgYSB0d28gZGlnaXQgZGF5ICgjMTY2MykKICAqIEZpeCBuYXZpZ2F0aW9uIGluIHRoZSAiV29ya2luZyB3aXRoIERyYWZ0cyIgcGFnZSAoIzE2NjcpCiAgKiBGaXggYW4gZXJyb3Igd2l0aCB0aGUgZGF0YSBkb2N1bWVudGF0aW9uICgjMTY5MSkKCiMjIDEuMi4xIC8gMjAxMy0wOS0xNAoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFByaW50IGJldHRlciBtZXNzYWdlcyBmb3IgZGV0YWNoZWQgc2VydmVyLiBNdXRlIG91dHB1dCBvbiBkZXRhY2guICgjMTUxOCkKICAqIERpc2FibGUgcmV2ZXJzZSBsb29rdXAgd2hlbiBydW5uaW5nIGBqZWt5bGwgc2VydmVgICgjMTM2MykKICAqIFVwZ3JhZGUgUmVkQ2FycGV0IGRlcGVuZGVuY3kgdG8gYH4+IDIuMy4wYCAoIzE1MTUpCiAgKiBVcGdyYWRlIHRvIExpcXVpZCBgPj0gMi41LjIsIDwgMi42YCAoIzE1MzYpCgojIyMgQnVnIEZpeGVzCgogICogRml4IGZpbGUgZGlzY3JlcGFuY3kgaW4gZ2Vtc3BlYyAoIzE1MjIpCiAgKiBGb3JjZSByZW5kZXJpbmcgb2YgSW5jbHVkZSB0YWcgKCMxNTI1KQoKIyMjIERldmVsb3BtZW50IEZpeGVzCgogICogQWRkIGEgcmFrZSB0YXNrIHRvIGdlbmVyYXRlIGEgbmV3IHJlbGVhc2UgcG9zdCAoIzE0MDQpCiAgKiBNdXRlIExTSSBvdXRwdXQgaW4gdGVzdHMgKCMxNTMxKQogICogVXBkYXRlIGNvbnRyaWJ1dG9yIGRvY3VtZW50YXRpb24gKCMxNTM3KQoKIyMjIFNpdGUgRW5oYW5jZW1lbnRzCgogICogRml4IGEgY291cGxlIG9mIHZhbGlkYXRpb24gZXJyb3JzIG9uIHRoZSBzaXRlICgjMTUxMSkKICAqIE1ha2UgbmF2aWdhdGlvbiBtZW51cyByZXVzYWJsZSAoIzE1MDcpCiAgKiBGaXggbGluayB0byBIaXN0b3J5IHBhZ2UgZnJvbSBSZWxlYXNlIHYxLjIuMCBub3RlcyBwb3N0LgogICogRml4IG1hcmt1cCBpbiBIaXN0b3J5IGZpbGUgZm9yIGNvbW1hbmQgbGluZSBvcHRpb25zICgjMTUxMikKICAqIEV4cGFuZCAxLjIgcmVsZWFzZSBwb3N0IHRpdGxlIHRvIDEuMi4wICgjMTUxNikKCiMjIDEuMi4wIC8gMjAxMy0wOS0wNgoKIyMjIE1ham9yIEVuaGFuY2VtZW50cwoKICAqIERpc2FibGUgYXV0b21hdGljYWxseS1nZW5lcmF0ZWQgZXhjZXJwdHMgd2hlbiBgZXhjZXJwdF9zZXBhcmF0b3JgIGlzIGAiImAuICgjMTM4NikKICAqIEFkZCBjaGVja2luZyBmb3IgVVJMIGNvbmZsaWN0cyB3aGVuIHJ1bm5pbmcgYGpla3lsbCBkb2N0b3JgICgjMTM4OSkKCiMjIyBNaW5vciBFbmhhbmNlbWVudHMKCiAgKiBDYXRjaCBhbmQgZml4IGludmFsaWQgYHBhZ2luYXRlYCB2YWx1ZXMgKCMxMzkwKQogICogUmVtb3ZlIHN1cGVyZmx1b3VzIGBkaXYuY29udGFpbmVyYCBmcm9tIHRoZSBkZWZhdWx0IGh0bWwgdGVtcGxhdGUgZm9yIGBqZWt5bGwgbmV3YCAoIzEzMTUpCiAgKiBBZGQgYC1EYCBzaG9ydC1mb3JtIHN3aXRjaCBmb3IgdGhlIGRyYWZ0cyBvcHRpb24gKCMxMzk0KQogICogVXBkYXRlIHRoZSBsaW5rcyBpbiB0aGUgc2l0ZSB0ZW1wbGF0ZSBmb3IgVHdpdHRlciBhbmQgR2l0SHViICgjMTQwMCkKICAqIFVwZGF0ZSBkdW1teSBlbWFpbCBhZGRyZXNzIHRvIGV4YW1wbGUuY29tIGRvbWFpbiAoIzE0MDgpCiAgKiBVcGRhdGUgbm9ybWFsaXplLmNzcyB0byB2Mi4xLjIgYW5kIG1pbmlmeTsgYWRkIHJha2UgdGFzayB0byB1cGRhdGUgbm9ybWFsaXplLmNzcyB3aXRoIGdyZWF0ZXIgZWFzZS4gKCMxNDMwKQogICogQWRkIHRoZSBhYmlsaXR5IHRvIGRldGFjaCB0aGUgc2VydmVyIHJhbiBieSBgamVreWxsIHNlcnZlYCBmcm9tIGl0J3MgY29udHJvbGxpbmcgdGVybWluYWwgKCMxNDQzKQogICogSW1wcm92ZSBwZXJtYWxpbmsgZ2VuZXJhdGlvbiBmb3IgVVJMcyB3aXRoIHNwZWNpYWwgY2hhcmFjdGVycyAoIzk0NCkKICAqIEV4cG9zZSB0aGUgY3VycmVudCBKZWt5bGwgdmVyc2lvbiB0byBwb3N0cyBhbmQgcGFnZXMgdmlhIGEgbmV3IGBqZWt5bGwudmVyc2lvbmAgdmFyaWFibGUgKCMxNDgxKQoKIyMjIEJ1ZyBGaXhlcwoKICAqIE1hcmtkb3duIGV4dGVuc2lvbiBtYXRjaGluZyBtYXRjaGVzIG9ubHkgZXhhY3QgbWF0Y2hlcyAoIzEzODIpCiAgKiBGaXhlZCBOb01ldGhvZEVycm9yIHdoZW4gbWVzc2FnZSBwYXNzZWQgdG8gYFN0ZXZlbnNvbiNtZXNzYWdlYCBpcyBuaWwgKCMxMzg4KQogICogVXNlIGJpbmFyeSBtb2RlIHdoZW4gd3JpdGluZyBmaWxlICgjMTM2NCkKICAqIEZpeCAndW5kZWZpbmVkIG1ldGhvZCBgZW5jb2RpbmdgIGZvciAibWFpbHRvIicgZXJyb3JzIHcvIFJ1YnkgMS44IGFuZCBLcmFtZG93biA+IDAuMTQuMCAoIzEzOTcpCiAgKiBEbyBub3QgZm9yY2UgdGhlIHBlcm1hbGluayB0byBiZSBhIGRpciBpZiBpdCBlbmRzIG9uIC5odG1sICgjOTYzKQogICogV2hlbiBhIExpcXVpZCBFeGNlcHRpb24gaXMgY2F1Z2h0LCBzaG93IHRoZSBmdWxsIHBhdGggcmVsLiB0byBzaXRlIHNvdXJjZSAoIzE0MTUpCiAgKiBQcm9wZXJseSByZWFkIGluIHRoZSBjb25maWcgb3B0aW9ucyB3aGVuIHNlcnZpbmcgdGhlIGRvY3MgbG9jYWxseSAoIzE0NDQpCiAgKiBGaXhlZCBgLS1sYXlvdXRzYCBvcHRpb24gZm9yIGBidWlsZGAgYW5kIGBzZXJ2ZWAgY29tbWFuZHMgKCMxNDU4KQogICogUmVtb3ZlIGtyYW1kb3duIGFzIGEgcnVudGltZSBkZXBlbmRlbmN5IHNpbmNlIGl0J3Mgb3B0aW9uYWwgKCMxNDk4KQogICogUHJvdmlkZSBwcm9wZXIgZXJyb3IgaGFuZGxpbmcgZm9yIGludmFsaWQgZmlsZSBuYW1lcyBpbiB0aGUgaW5jbHVkZSB0YWcgKCMxNDk0KQoKIyMjIERldmVsb3BtZW50IEZpeGVzCgogICogUmVtb3ZlIHJlZHVuZGFudCBhcmd1bWVudCB0byBKZWt5bGw6OkNvbW1hbmRzOjpOZXcjc2NhZmZvbGRfcG9zdF9jb250ZW50ICgjMTM1NikKICAqIEFkZCBuZXcgZGVwZW5kZW5jaWVzIHRvIHRoZSBSRUFETUUgKCMxMzYwKQogICogRml4IGxpbmsgdG8gY29udHJpYnV0aW5nIHBhZ2UgaW4gUkVBRE1FICgjMTQyNCkKICAqIFVwZGF0ZSBUb21Eb2MgaW4gUGFnZXIjaW5pdGlhbGl6ZSB0byBtYXRjaCBwYXJhbXMgKCMxNDQxKQogICogUmVmYWN0b3IgYFNpdGUjY2xlYW51cGAgaW50byBgSmVreWxsOjpTaXRlOjpDbGVhbmVyYCBjbGFzcyAoIzE0MjkpCiAgKiBTZXZlcmFsIG90aGVyIHNtYWxsIG1pbm9yIHJlZmFjdG9yaW5ncyAoIzEzNDEpCiAgKiBJZ25vcmUgYF9zaXRlYCBpbiBqZWt5bGxyYi5jb20gZGVwbG95ICgjMTQ4MCkKICAqIEFkZCBHZW0gdmVyc2lvbiBhbmQgZGVwZW5kZW5jeSBiYWRnZSB0byBSRUFETUUgKCMxNDk3KQoKIyMjIFNpdGUgRW5oYW5jZW1lbnRzCgogICogQWRkIGluZm8gYWJvdXQgbmV3IHJlbGVhc2VzICgjMTM1MykKICAqIFVwZGF0ZSBwbHVnaW4gbGlzdCB3aXRoIGpla3lsbC1yc3MgcGx1Z2luICgjMTM1NCkKICAqIFVwZGF0ZSB0aGUgc2l0ZSBsaXN0IHBhZ2Ugd2l0aCBSdWJ5J3Mgb2ZmaWNpYWwgc2l0ZSAoIzEzNTgpCiAgKiBBZGQgYGpla3lsbC1kaXRhYWAgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMTM3MCkKICAqIEFkZCBgcG9zdGZpbGVzYCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMxMzczKQogICogRm9yIGludGVybmFsIGxpbmtzLCB1c2UgZnVsbCBwYXRoIGluY2x1ZGluZyB0cmFpbGluZyBgL2AgKCMxNDExKQogICogVXNlIGN1cmx5IGFwb3N0cm9waGVzIGluIHRoZSBkb2NzICgjMTQxOSkKICAqIFVwZGF0ZSB0aGUgZG9jcyBmb3IgUmVkY2FycGV0IGluIEpla3lsbCAoIzE0MTgpCiAgKiBBZGQgYHBsdXJhbGl6ZWAgYW5kIGByZWFkaW5nX3RpbWVgIGZpbHRlcnMgdG8gZG9jcyAoIzE0MzkpCiAgKiBGaXggbWFya3VwIGZvciB0aGUgS3JhbWRvd24gb3B0aW9ucyAoIzE0NDUpCiAgKiBGaXggdHlwb3MgaW4gdGhlIEhpc3RvcnkgZmlsZSAoIzE0NTQpCiAgKiBBZGQgdHJhaWxpbmcgc2xhc2ggdG8gc2l0ZSdzIHBvc3QgVVJMICgjMTQ2MikKICAqIENsYXJpZnkgdGhhdCBgLS1jb25maWdgIHdpbGwgdGFrZSBtdWx0aXBsZSBmaWxlcyAoIzE0NzQpCiAgKiBGaXggZG9jcy90ZW1wbGF0ZXMubWQgcHJpdmF0ZSBnaXN0IGV4YW1wbGUgKCMxNDc3KQogICogVXNlIGBzaXRlLnJlcG9zaXRvcnlgIGZvciBKZWt5bGwncyBHaXRIdWIgVVJMICgjMTQ2MykKICAqIEFkZCBgamVreWxsLXBhZ2VsZXNzLXJlZGlyZWN0c2AgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMTQ4NikKICAqIENsYXJpZnkgdGhhdCBgZGF0ZV90b194bWxzY2hlbWFgIHJldHVybnMgYW4gSVNPIDg2MDEgc3RyaW5nICgjMTQ4OCkKICAqIEFkZCBgamVreWxsLWdvb2QtaW5jbHVkZWAgdG8gbGlzdCBvZiB0aGlyZC1wYXJ0eSBwbHVnaW5zICgjMTQ5MSkKICAqIFhNTCBlc2NhcGUgdGhlIGJsb2cgcG9zdCB0aXRsZSBpbiBvdXIgZmVlZCAoIzE1MDEpCiAgKiBBZGQgYGpla3lsbC10b2MtZ2VuZXJhdG9yYCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMgKCMxNTA2KQoKIyMgMS4xLjIgLyAyMDEzLTA3LTI1CgojIyMgQnVnIEZpeGVzCgogICogUmVxdWlyZSBMaXF1aWQgMi41LjEgKCMxMzQ5KQoKIyMgMS4xLjEgLyAyMDEzLTA3LTI0CgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogUmVtb3ZlIHN1cGVyZmx1b3VzIGB0YWJsZWAgc2VsZWN0b3IgZnJvbSBtYWluLmNzcyBpbiBgamVreWxsIG5ld2AgdGVtcGxhdGUgKCMxMzI4KQogICogQWJvcnQgd2l0aCBub24temVybyBleGl0IGNvZGVzICgjMTMzOCkKCiMjIyBCdWcgRml4ZXMKCiAgKiBGaXggdXAgdGhlIHJlbmRlcmluZyBvZiBleGNlcnB0cyAoIzEzMzkpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBBZGQgSmVreWxsIEltYWdlIFRhZyB0byB0aGUgcGx1Z2lucyBsaXN0ICgjMTMwNikKICAqIFJlbW92ZSBlcnJvbmVvdXMgc3RhdGVtZW50IHRoYXQgYHNpdGUucGFnZXNgIGFyZSBzb3J0ZWQgYWxwaGFiZXRpY2FsbHkuCiAgKiBBZGQgaW5mbyBhYm91dCB0aGUgYF9kcmFmdHNgIGRpcmVjdG9yeSB0byB0aGUgZGlyZWN0b3J5IHN0cnVjdHVyZSBkb2NzICgjMTMyMCkKICAqIEltcHJvdmUgdGhlIGxheW91dCBvZiB0aGUgcGx1Z2luIGxpc3RpbmcgYnkgb3JnYW5pemluZyBpdCBpbnRvIGNhdGVnb3JpZXMgKCMxMzEwKQogICogQWRkIGdlbmVyYXRvci1qZWt5bGxyYiBhbmQgZ3J1bnQtamVreWxsIHRvIHBsdWdpbnMgcGFnZSAoIzEzMzApCiAgKiBNZW50aW9uIEtyYW1kb3duIGFzIG9wdGlvbiBmb3IgbWFya2Rvd24gcGFyc2VyIG9uIEV4dHJhcyBwYWdlICgjMTMxOCkKICAqIFVwZGF0ZSBRdWljay1TdGFydCBwYWdlIHRvIGluY2x1ZGUgcmVtaW5kZXIgdGhhdCBhbGwgcmVxdWlyZW1lbnRzIG11c3QgYmUgaW5zdGFsbGVkICgjMTMyNykKICAqIENoYW5nZSBmaWxlbmFtZSBpbiBgaW5jbHVkZWAgZXhhbXBsZSB0byBhbiBIVE1MIGZpbGUgc28gYXMgbm90IHRvIGluZGljYXRlIHRoYXQgSmVreWxsIHdpbGwgYXV0b21hdGljYWxseSBjb252ZXJ0IHRoZW0uICgjMTMwMykKICAqIEFkZCBhbiBSU1MgZmVlZCBmb3IgY29tbWl0cyB0byBKZWt5bGwgKCMxMzQzKQoKIyMgMS4xLjAgLyAyMDEzLTA3LTE0CgojIyMgTWFqb3IgRW5oYW5jZW1lbnRzCgogICogQWRkIGBkb2NzYCBzdWJjb21tYW5kIHRvIHJlYWQgSmVreWxsJ3MgZG9jcyB3aGVuIG9mZmxpbmUuICgjMTA0NikKICAqIFN1cHBvcnQgcGFzc2luZyBwYXJhbWV0ZXJzIHRvIHRlbXBsYXRlcyBpbiBgaW5jbHVkZWAgdGFnICgjMTIwNCkKICAqIEFkZCBzdXBwb3J0IGZvciBMaXF1aWQgdGFncyB0byBwb3N0IGV4Y2VycHRzICgjMTMwMikKCiMjIyBNaW5vciBFbmhhbmNlbWVudHMKCiAgKiBTZWFyY2ggdGhlIGhpZXJhcmNoeSBvZiBwYWdpbmF0aW9uIHBhdGggdXAgdG8gc2l0ZSByb290IHRvIGRldGVybWluZSB0ZW1wbGF0ZSBwYWdlIGZvciBwYWdpbmF0aW9uLiAoIzExOTgpCiAgKiBBZGQgdGhlIGFiaWxpdHkgdG8gZ2VuZXJhdGUgYSBuZXcgSmVreWxsIHNpdGUgd2l0aG91dCBhIHRlbXBsYXRlICgjMTE3MSkKICAqIFVzZSByZWRjYXJwZXQgYXMgdGhlIGRlZmF1bHQgbWFya2Rvd24gZW5naW5lIGluIG5ld2x5IGdlbmVyYXRlZCBzaXRlcyAoIzEyNDUsICMxMjQ3KQogICogQWRkIGByZWRjYXJwZXRgIGFzIGEgcnVudGltZSBkZXBlbmRlbmN5IHNvIGBqZWt5bGwgYnVpbGRgIHdvcmtzIG91dC1vZi10aGUtYm94IGZvciBuZXcgc2l0ZXMuICgjMTI0NykKICAqIEluIHRoZSBnZW5lcmF0ZWQgc2l0ZSwgcmVtb3ZlIGZpbGVzIHRoYXQgd2lsbCBiZSByZXBsYWNlZCBieSBhIGRpcmVjdG9yeSAoIzExMTgpCiAgKiBGYWlsIGxvdWRseSBpZiBhIHVzZXItc3BlY2lmaWVkIGNvbmZpZ3VyYXRpb24gZmlsZSBkb2Vzbid0IGV4aXN0ICgjMTA5OCkKICAqIEFsbG93IGZvciBhbGwgb3B0aW9ucyBmb3IgS3JhbWRvd24gSFRNTCBDb252ZXJ0ZXIgKCMxMjAxKQoKIyMjIEJ1ZyBGaXhlcwoKICAqIEZpeCBwYWdpbmF0aW9uIGluIHN1YmRpcmVjdG9yaWVzLiAoIzExOTgpCiAgKiBGaXggYW4gaXNzdWUgd2l0aCBkaXJlY3RvcmllcyBhbmQgcGVybWFsaW5rcyB0aGF0IGhhdmUgYSBwbHVzIHNpZ24gKCspIGluIHRoZW0gKCMxMjE1KQogICogUHJvdmlkZSBiZXR0ZXIgZXJyb3IgcmVwb3J0aW5nIHdoZW4gZ2VuZXJhdGluZyBzaXRlcyAoIzEyNTMpCiAgKiBMYXRlc3QgcG9zdHMgZmlyc3QgaW4gbm9uLUxTSSBgcmVsYXRlZF9wb3N0c2AgKCMxMjcxKQoKIyMjIERldmVsb3BtZW50IEZpeGVzCgogICogTWVyZ2UgdGhlIHRoZW1lIGFuZCBsYXlvdXQgQ3VjdW1iZXIgc3RlcHMgaW50byBvbmUgc3RlcCAoIzExNTEpCiAgKiBSZXN0cmljdCBhY3RpdmVzdXBwb3J0IGRlcGVuZGVuY3kgdG8gcHJlLTQuMC4wIHRvIG1haW50YWluIGNvbXBhdGliaWxpdHkgd2l0aCBgPD0gMS45LjJgCiAgKiBJbmNsdWRlL2V4Y2x1ZGUgZGVwcmVjYXRpb24gaGFuZGxpbmcgc2ltcGxpZmljYXRpb24gKCMxMjg0KQogICogQ29udmVydCBSRUFETUUgdG8gTWFya2Rvd24uICgjMTI2NykKICAqIFJlZmFjdG9yIEpla3lsbDo6U2l0ZSAoIzExNDQpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBBZGQgIk5ld3MiIHNlY3Rpb24gZm9yIHJlbGVhc2Ugbm90ZXMsIGFsb25nIHdpdGggYW4gUlNTIGZlZWQgKCMxMDkzLCAjMTI4NSwgIzEyODYpCiAgKiBBZGQgIkhpc3RvcnkiIHBhZ2UuCiAgKiBSZXN0cnVjdHVyZWQgZG9jcyBzZWN0aW9ucyB0byBpbmNsdWRlICJNZXRhIiBzZWN0aW9uLgogICogQWRkIG1lc3NhZ2UgdG8gIlRlbXBsYXRlcyIgcGFnZSB0aGF0IHNwZWNpZmllcyB0aGF0IFB5dGhvbiBtdXN0IGJlIGluc3RhbGxlZCBpbiBvcmRlciB0byB1c2UgUHlnbWVudHMuICgjMTE4MikKICAqIFVwZGF0ZSBsaW5rIHRvIHRoZSBvZmZpY2lhbCBNYXJ1a3UgcmVwbyAoIzExNzUpCiAgKiBBZGQgZG9jdW1lbnRhdGlvbiBhYm91dCBgcGFnaW5hdGVfcGF0aGAgdG8gIlRlbXBsYXRlcyIgcGFnZSBpbiBkb2NzICgjMTEyOSkKICAqIEdpdmUgdGhlIHF1aWNrLXN0YXJ0IGd1aWRlIGl0cyBvd24gcGFnZSAoIzExOTEpCiAgKiBVcGRhdGUgUHJvVGlwIG9uIEluc3RhbGxhdGlvbiBwYWdlIGluIGRvY3MgdG8gcG9pbnQgdG8gYWxsIHRoZSBpbmZvIGFib3V0IFB5Z21lbnRzIGFuZCB0aGUgJ2hpZ2hsaWdodCcgdGFnLiAoIzExOTYpCiAgKiBSdW4gYHNpdGUvaW1nYCB0aHJvdWdoIEltYWdlT3B0aW0gKHRoYW5rcyBAcXJ1c2ghKSAoIzEyMDgpCiAgKiBBZGRlZCBKYWRlIENvbnZlcnRlciB0byBgc2l0ZS9kb2NzL3BsdWdpbnNgICgjMTIxMCkKICAqIEZpeCBsb2NhdGlvbiBvZiBkb2NzIHBhZ2VzIGluIENvbnRyaWJ1dGluZyBwYWdlcyAoIzEyMTQpCiAgKiBBZGQgUmVhZEluWE1pbnV0ZXMgcGx1Z2luIHRvIHRoZSBwbHVnaW4gbGlzdCAoIzEyMjIpCiAgKiBSZW1vdmUgcGx1Z2lucyBmcm9tIHRoZSBwbHVnaW4gbGlzdCB0aGF0IGhhdmUgZXF1aXZhbGVudHMgaW4gSmVreWxsIHByb3BlciAoIzEyMjMpCiAgKiBBZGQgamVreWxsLWFzc2V0cyB0byB0aGUgcGx1Z2luIGxpc3QgKCMxMjI1KQogICogQWRkIGpla3lsbC1wYW5kb2MtbXVsaXRwbGUtZm9ybWF0cyB0byB0aGUgcGx1Z2luIGxpc3QgKCMxMjI5KQogICogUmVtb3ZlIGRlYWQgbGluayB0byAiVXNpbmcgR2l0IHRvIG1haW50YWluIHlvdXIgYmxvZyIgKCMxMjI3KQogICogVGlkeSB1cCB0aGUgdGhpcmQtcGFydHkgcGx1Z2lucyBsaXN0aW5nICgjMTIyOCkKICAqIFVwZGF0ZSBjb250cmlidXRvciBpbmZvcm1hdGlvbiAoIzExOTIpCiAgKiBVcGRhdGUgVVJMIG9mIGFydGljbGUgYWJvdXQgQmxvZ2dlciBtaWdyYXRpb24gKCMxMjQyKQogICogU3BlY2lmeSB0aGF0IFJlZENhcnBldCBpcyB0aGUgZGVmYXVsdCBmb3IgbmV3IEpla3lsbCBzaXRlcyBvbiBRdWlja3N0YXJ0IHBhZ2UgKCMxMjQ3KQogICogQWRkZWQgYHNpdGUucGFnZXNgIHRvIFZhcmlhYmxlcyBwYWdlIGluIGRvY3MgKCMxMjUxKQogICogQWRkIFlvdWt1IGFuZCBUdWRvdSBFbWJlZCBsaW5rIG9uIFBsdWdpbnMgcGFnZS4gKCMxMjUwKQogICogQWRkIG5vdGUgdGhhdCBgZ2lzdGAgdGFnIHN1cHBvcnRzIHByaXZhdGUgZ2lzdHMuICgjMTI0OCkKICAqIEFkZCBgamVreWxsLXRpbWVhZ29gIHRvIGxpc3Qgb2YgdGhpcmQtcGFydHkgcGx1Z2lucy4gKCMxMjYwKQogICogQWRkIGBqZWt5bGwtc3dmb2JqZWN0YCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMuICgjMTI2MykKICAqIEFkZCBgamVreWxsLXBpY3R1cmUtdGFnYCB0byBsaXN0IG9mIHRoaXJkLXBhcnR5IHBsdWdpbnMuICgjMTI4MCkKICAqIFVwZGF0ZSB0aGUgR2l0SHViIFBhZ2VzIGRvY3VtZW50YXRpb24gcmVnYXJkaW5nIHJlbGF0aXZlIFVSTHMgKCMxMjkxKQogICogVXBkYXRlIHRoZSBTMyBkZXBsb3ltZW50IGRvY3VtZW50YXRpb24gKCMxMjk0KQogICogQWRkIHN1Z2dlc3Rpb24gZm9yIFhjb2RlIENMVCBpbnN0YWxsIHRvIHRyb3VibGVzaG9vdGluZyBwYWdlIGluIGRvY3MgKCMxMjk2KQogICogQWRkICdXb3JraW5nIHdpdGggZHJhZnRzJyBwYWdlIHRvIGRvY3MgKCMxMjg5KQogICogQWRkIGluZm9ybWF0aW9uIGFib3V0IHRpbWUgem9uZXMgdG8gdGhlIGRvY3VtZW50YXRpb24gZm9yIGEgcGFnZSdzIGRhdGUgKCMxMzA0KQoKIyMgMS4wLjMgLyAyMDEzLTA2LTA3CgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogQWRkIHN1cHBvcnQgdG8gZ2lzdCB0YWcgZm9yIHByaXZhdGUgZ2lzdHMuICgjMTE4OSkKICAqIEZhaWwgbG91ZGx5IHdoZW4gTWFydWt1IGVycm9ycyBvdXQgKCMxMTkwKQogICogTW92ZSB0aGUgYnVpbGRpbmcgb2YgcmVsYXRlZCBwb3N0cyBpbnRvIHRoZWlyIG93biBjbGFzcyAoIzEwNTcpCiAgKiBSZW1vdmVkIHRyYWlsaW5nIHNwYWNlcyBpbiBzZXZlcmFsIHBsYWNlcyB0aHJvdWdob3V0IHRoZSBjb2RlICgjMTExNikKICAqIEFkZCBhIGAtLWZvcmNlYCBvcHRpb24gdG8gYGpla3lsbCBuZXdgICgjMTExNSkKICAqIENvbnZlcnQgSURzIGluIHRoZSBzaXRlIHRlbXBsYXRlIHRvIGNsYXNzZXMgKCMxMTcwKQoKIyMjIEJ1ZyBGaXhlcwoKICAqIEZpeCB0eXBvIGluIFN0ZXZlbnNvbiBjb25zdGFudCAiRVJST1IiLiAoIzExNjYpCiAgKiBSZW5hbWUgSmVreWxsOjpMb2dnZXIgdG8gSmVreWxsOjpTdGV2ZW5zb24gdG8gZml4IGluaGVyaXRhbmNlIGlzc3VlICgjMTEwNikKICAqIEV4aXQgd2l0aCBhIG5vbi16ZXJvIGV4aXQgY29kZSB3aGVuIGRlYWxpbmcgd2l0aCBhIExpcXVpZCBlcnJvciAoIzExMjEpCiAgKiBNYWtlIHRoZSBgZXhjbHVkZWAgYW5kIGBpbmNsdWRlYCBvcHRpb25zIGJhY2t3YXJkcyBjb21wYXRpYmxlIHdpdGggdmVyc2lvbnMgb2YgSmVreWxsIHByaW9yIHRvIDEuMCAoIzExMTQpCiAgKiBGaXggcGFnaW5hdGlvbiBvbiBXaW5kb3dzICgjMTA2MykKICAqIEZpeCB0aGUgYXBwbGljYXRpb24gb2YgUHlnbWVudHMnIEdlbmVyaWMgT3V0cHV0IHN0eWxlIHRvIEdvIGNvZGUgKCMxMTU2KQoKIyMjIFNpdGUgRW5oYW5jZW1lbnRzCgogICogQWRkIGEgUHJvIFRpcCB0byBkb2NzIGFib3V0IGZyb250IG1hdHRlciB2YXJpYWJsZXMgYmVpbmcgb3B0aW9uYWwgKCMxMTQ3KQogICogQWRkIGNoYW5nZWxvZyB0byBzaXRlIGFzIEhpc3RvcnkgcGFnZSBpbiAvZG9jcy8gKCMxMDY1KQogICogQWRkIG5vdGUgdG8gVXBncmFkaW5nIHBhZ2UgYWJvdXQgbmV3IGNvbmZpZyBvcHRpb25zIGluIDEuMC54ICgjMTE0NikKICAqIERvY3VtZW50YXRpb24gZm9yIGBkYXRlX3RvX3JmYzgyMmAgYW5kIGB1cmlfZXNjYXBlYCAoIzExNDIpCiAgKiBEb2N1bWVudGF0aW9uIGhpZ2hsaWdodCBib3hlcyBzaG91bGRuJ3Qgc2hvdyBzY3JvbGxiYXJzIGlmIG5vdCBuZWNlc3NhcnkgKCMxMTIzKQogICogQWRkIGxpbmsgdG8gamVreWxsLW1pbmlidW5kbGUgaW4gdGhlIGRvYydzIHBsdWdpbnMgbGlzdCAoIzEwMzUpCiAgKiBRdWljayBwYXRjaCBmb3IgaW1wb3J0ZXJzIGRvY3VtZW50YXRpb24KICAqIEZpeCBwcmVmaXggZm9yIFdvcmRwcmVzc0RvdENvbSBpbXBvcnRlciBpbiBkb2NzICgjMTEwNykKICAqIEFkZCBqZWt5bGwtY29udGVudGJsb2NrcyBwbHVnaW4gdG8gZG9jcyAoIzEwNjgpCiAgKiBNYWtlIGNvZGUgYml0cyBpbiBub3RlcyBsb29rIG1vcmUgbmF0dXJhbCwgbW9yZSByZWFkYWJsZSAoIzEwODkpCiAgKiBGaXggbG9naWMgZm9yIGByZWxhdGl2ZV9wZXJtYWxpbmtzYCBpbnN0cnVjdGlvbnMgb24gVXBncmFkaW5nIHBhZ2UgKCMxMTAxKQogICogQWRkIGRvY3MgZm9yIHBvc3QgZXhjZXJwdCAoIzEwNzIpCiAgKiBBZGQgZG9jcyBmb3IgZ2lzdCB0YWcgKCMxMDcyKQogICogQWRkIGRvY3MgaW5kaWNhdGluZyB0aGF0IFB5Z21lbnRzIGRvZXMgbm90IG5lZWQgdG8gYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgKCMxMDk5LCAjMTExOSkKICAqIFVwZGF0ZSB0aGUgbWlncmF0b3IgZG9jcyB0byBiZSBjdXJyZW50ICgjMTEzNikKICAqIEFkZCB0aGUgSmVreWxsIEdhbGxlcnkgUGx1Z2luIHRvIHRoZSBwbHVnaW4gbGlzdCAoIzExNDMpCgojIyMgRGV2ZWxvcG1lbnQgRml4ZXMKCiAgKiBVc2UgSmVreWxsLmxvZ2dlciBpbnN0ZWFkIG9mIEpla3lsbDo6U3RldmVuc29uIHRvIGxvZyB0aGluZ3MgKCMxMTQ5KQogICogRml4IHBlc2t5IEN1Y3VtYmVyIGluZmluaXRlIGxvb3AgKCMxMTM5KQogICogRG8gbm90IHdyaXRlIHBvc3RzIHdpdGggdGltZXpvbmVzIGluIEN1Y3VtYmVyIHRlc3RzICgjMTEyNCkKICAqIFVzZSBJU08gZm9ybWF0dGVkIGRhdGVzIGluIEN1Y3VtYmVyIGZlYXR1cmVzICgjMTE1MCkKCiMjIDEuMC4yIC8gMjAxMy0wNS0xMgoKIyMjIE1ham9yIEVuaGFuY2VtZW50cwoKICAqIEFkZCBgamVreWxsIGRvY3RvcmAgY29tbWFuZCB0byBjaGVjayBzaXRlIGZvciBhbnkga25vd24gY29tcGF0aWJpbGl0eSBwcm9ibGVtcyAoIzEwODEpCiAgKiBCYWNrd2FyZHMtY29tcGF0aWJpbGl6ZSByZWxhdGl2ZSBwZXJtYWxpbmtzICgjMTA4MSkKCiMjIyBNaW5vciBFbmhhbmNlbWVudHMKCiAgKiBBZGQgYSBgZGF0YS1sYW5nPSI8bGFuZz4iYCBhdHRyaWJ1dGUgdG8gUmVkY2FycGV0IGNvZGUgYmxvY2tzICgjMTA2NikKICAqIERlcHJlY2F0ZSBvbGQgY29uZmlnIGBzZXJ2ZXJfcG9ydGAsIG1hdGNoIHRvIGBwb3J0YCBpZiBgcG9ydGAgaXNuJ3Qgc2V0ICgjMTA4NCkKICAqIFVwZGF0ZSBweWdtZW50cy5yYiB2ZXJzaW9uIHRvIDAuNS4wICgjMTA2MSkKICAqIFVwZGF0ZSBLcmFtZG93biB2ZXJzaW9uIHRvIDEuMC4yICgjMTA2NykKCiMjIyBCdWcgRml4ZXMKCiAgKiBGaXggaXNzdWUgd2hlbiBjYXRlZ29yaWVzIGFyZSBudW1iZXJzICgjMTA3OCkKICAqIENhdGNoaW5nIHRoYXQgUmVkY2FycGV0IGdlbSBpc24ndCBpbnN0YWxsZWQgKCMxMDU5KQoKIyMjIFNpdGUgRW5oYW5jZW1lbnRzCgogICogQWRkIGRvY3VtZW50YXRpb24gYWJvdXQgYHJlbGF0aXZlX3Blcm1hbGlua3NgICgjMTA4MSkKICAqIFJlbW92ZSBweWdtZW50cy1pbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zLCBhcyBweWdtZW50cy5yYiBpcyBidW5kbGVkIHdpdGggaXQgKCMxMDc5KQogICogTW92ZSBwYWdlcyB0byBiZSBQYWdlcyBmb3IgcmVhbHogKCM5ODUpCiAgKiBVcGRhdGVkIGxpbmtzIHRvIExpcXVpZCBkb2N1bWVudGF0aW9uICgjMTA3MykKCiMjIDEuMC4xIC8gMjAxMy0wNS0wOAoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIERvIG5vdCBmb3JjZSB1c2Ugb2YgYHRvY190b2tlbmAgd2hlbiB1c2luZyBgZ2VuZXJhdGVfdG9rYCBpbiBSRGlzY291bnQgKCMxMDQ4KQogICogQWRkIG5ld2VyIGBsYW5ndWFnZS1gIGNsYXNzIG5hbWUgcHJlZml4IHRvIGNvZGUgYmxvY2tzICgjMTAzNykKICAqIENvbW1hbmRlciBlcnJvciBtZXNzYWdlIG5vdyBwcmVmZXJyZWQgb3ZlciBwcm9jZXNzIGFib3J0IHdpdGggaW5jb3JyZWN0IGFyZ3MgKCMxMDQwKQoKIyMjIEJ1ZyBGaXhlcwoKICAqIE1ha2UgUmVkY2FycGV0IHJlc3BlY3QgdGhlIHB5Z21lbnRzIGNvbmZpZ3VyYXRpb24gb3B0aW9uICgjMTA1MykKICAqIEZpeCB0aGUgaW5kZXggYnVpbGQgd2l0aCBMU0kgKCMxMDQ1KQogICogRG9uJ3QgcHJpbnQgZGVwcmVjYXRpb24gd2FybmluZyB3aGVuIG5vIGFyZ3VtZW50cyBhcmUgc3BlY2lmaWVkLiAoIzEwNDEpCiAgKiBBZGQgbWlzc2luZyBgPC9kaXY+YCB0byBzaXRlIHRlbXBsYXRlIHVzZWQgYnkgYG5ld2Agc3ViY29tbWFuZCwgZml4ZWQgdHlwb3MgaW4gY29kZSAoIzEwMzIpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBDaGFuZ2VkIGh0dHBzIHRvIGh0dHAgaW4gdGhlIEdpdEh1YiBQYWdlcyBsaW5rICgjMTA1MSkKICAqIFJlbW92ZSBDU1MgY3J1ZnQsIGZpeCB0eXBvcywgZml4IEhUTUwgZXJyb3JzICgjMTAyOCkKICAqIFJlbW92aW5nIG1hbnVhbCBpbnN0YWxsIG9mIFBpcCBhbmQgRGlzdHJpYnV0ZSAoIzEwMjUpCiAgKiBVcGRhdGVkIFVSTCBmb3IgTWFya2Rvd24gcmVmZXJlbmNlcyBwbHVnaW4gKCMxMDIyKQoKIyMjIERldmVsb3BtZW50IEZpeGVzCgogICogTWFya2Rvd25pZnkgaGlzdG9yeSBmaWxlICgjMTAyNykKICAqIFVwZGF0ZSBsaW5rcyBvbiBSRUFETUUgdG8gcG9pbnQgdG8gbmV3IGpla3lsbHJiLmNvbSAoIzEwMTgpCgojIyAxLjAuMCAvIDIwMTMtMDUtMDYKCiMjIyBNYWpvciBFbmhhbmNlbWVudHMKCiAgKiBBZGQgYGpla3lsbCBuZXdgIHN1YmNvbW1hbmQ6IGdlbmVyYXRlIGEgSmVreWxsIHNjYWZmb2xkICgjNzY0KQogICogUmVmYWN0b3JlZCBKZWt5bGwgY29tbWFuZHMgaW50byBzdWJjb21tYW5kczogYnVpbGQsIHNlcnZlLCBhbmQgbWlncmF0ZS4gKCM2OTApCiAgKiBSZW1vdmVkIGltcG9ydGVycy9taWdyYXRvcnMgZnJvbSBtYWluIHByb2plY3QsIG1pZ3JhdGVkIHRvIGpla3lsbC1pbXBvcnQgc3ViLWdlbSAoIzc5MykKICAqIEFkZGVkIGFiaWxpdHkgdG8gcmVuZGVyIGRyYWZ0cyBpbiBgX2RyYWZ0c2AgZm9sZGVyIHZpYSBjb21tYW5kIGxpbmUgKCM4MzMpCiAgKiBBZGQgb3JkaW5hbCBkYXRlIHBlcm1hbGluayBzdHlsZSAoLzpjYXRlZ29yaWVzLzp5ZWFyLzp5X2RheS86dGl0bGUuaHRtbCkgKCM5MjgpCgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogU2l0ZSB0ZW1wbGF0ZSBIVE1MNS1pZmllZCAoIzk2NCkKICAqIFVzZSBwb3N0J3MgZGlyZWN0b3J5IHBhdGggd2hlbiBtYXRjaGluZyBmb3IgdGhlIGBwb3N0X3VybGAgdGFnICgjOTk4KQogICogTG9vc2VuIGRlcGVuZGVuY3kgb24gUHlnbWVudHMgc28gaXQncyBvbmx5IHJlcXVpcmVkIHdoZW4gaXQncyBuZWVkZWQgKCMxMDE1KQogICogUGFyc2Ugc3RyaW5ncyBpbnRvIFRpbWUgb2JqZWN0cyBmb3IgZGF0ZS1yZWxhdGVkIExpcXVpZCBmaWx0ZXJzICgjMTAxNCkKICAqIFRlbGwgdGhlIHVzZXIgaWYgdGhlcmUgaXMgbm8gc3ViY29tbWFuZCBzcGVjaWZpZWQgKCMxMDA4KQogICogRnJlYWsgb3V0IGlmIHRoZSBkZXN0aW5hdGlvbiBvZiBgamVreWxsIG5ld2AgZXhpc3RzIGFuZCBpcyBub24tZW1wdHkgKCM5ODEpCiAgKiBBZGQgYHRpbWV6b25lYCBjb25maWd1cmF0aW9uIG9wdGlvbiBmb3IgY29tcGlsYXRpb24gKCM5NTcpCiAgKiBBZGQgZGVwcmVjYXRpb24gbWVzc2FnZXMgZm9yIHByZS0xLjAgQ0xJIG9wdGlvbnMgKCM5NTkpCiAgKiBSZWZhY3RvciBhbmQgY29sb3JpemUgbG9nZ2luZyAoIzk1OSkKICAqIFJlZmFjdG9yIE1hcmtkb3duIHBhcnNpbmcgKCM5NTUpCiAgKiBBZGRlZCBhcHBsaWNhdGlvbi92bmQuYXBwbGUucGtwYXNzIHRvIG1pbWUudHlwZXMgc2VydmVkIGJ5IFdFQnJpY2sgKCM5MDcpCiAgKiBNb3ZlIHRlbXBsYXRlIHNpdGUgdG8gZGVmYXVsdCBtYXJrZG93biByZW5kZXJlciAoIzk2MSkKICAqIEV4cG9zZSBuZXcgYXR0cmlidXRlIHRvIExpcXVpZCB2aWEgYHBhZ2VgOiBgcGFnZS5wYXRoYCAoIzk1MSkKICAqIEFjY2VwdCBtdWx0aXBsZSBjb25maWcgZmlsZXMgZnJvbSBjb21tYW5kIGxpbmUgKCM5NDUpCiAgKiBBZGQgcGFnZSB2YXJpYWJsZSB0byBsaXF1aWQgY3VzdG9tIHRhZ3MgYW5kIGJsb2NrcyAoIzQxMykKICAqIEFkZCBgcGFnaW5hdG9yLnByZXZpb3VzX3BhZ2VfcGF0aGAgYW5kIGBwYWdpbmF0b3IubmV4dF9wYWdlX3BhdGhgICgjOTQyKQogICogQmFja3dhcmRzIGNvbXBhdGliaWxpdHkgZm9yICdhdXRvJyAoIzgyMSwgIzkzNCkKICAqIEFkZGVkIGRhdGVfdG9fcmZjODIyIHVzZWQgb24gUlNTIGZlZWRzICgjODkyKQogICogVXBncmFkZSB2ZXJzaW9uIG9mIHB5Z21lbnRzLnJiIHRvIDAuNC4yICgjOTI3KQogICogQWRkZWQgc2hvcnQgbW9udGggKGUuZy4gIlNlcCIpIHRvIHBlcm1hbGluayBzdHlsZSBvcHRpb25zIGZvciBwb3N0cyAoIzg5MCkKICAqIEV4cG9zZSBzaXRlLmJhc2V1cmwgdG8gTGlxdWlkIHRlbXBsYXRlcyAoIzg2OSkKICAqIEFkZHMgZXhjZXJwdCBhdHRyaWJ1dGUgdG8gcG9zdHMgd2hpY2ggY29udGFpbnMgZmlyc3QgcGFyYWdyYXBoIG9mIGNvbnRlbnQgKCM4MzcpCiAgKiBBY2NlcHQgY3VzdG9tIGNvbmZpZ3VyYXRpb24gZmlsZSB2aWEgQ0xJICgjODYzKQogICogTG9hZCBpbiBHaXRIdWIgUGFnZXMgTUlNRSBUeXBlcyBvbiBgamVreWxsIHNlcnZlYCAoIzg0NywgIzg3MSkKICAqIEltcHJvdmUgZGVidWdhYmlsaXR5IG9mIGVycm9yIG1lc3NhZ2UgZm9yIGEgbWFsZm9ybWVkIGhpZ2hsaWdodCB0YWcgKCM3ODUpCiAgKiBBbGxvdyBzeW1saW5rZWQgZmlsZXMgaW4gdW5zYWZlIG1vZGUgKCM4MjQpCiAgKiBBZGQgJ2dpc3QnIExpcXVpZCB0YWcgdG8gY29yZSAoIzgyMiwgIzg2MSkKICAqIE5ldyBmb3JtYXQgb2YgSmVreWxsIG91dHB1dCAoIzc5NSkKICAqIFJlaW5zdGF0ZSBgLS1saW1pdF9wb3N0c2AgYW5kIGAtLWZ1dHVyZWAgc3dpdGNoZXMgKCM3ODgpCiAgKiBSZW1vdmUgYW1iaWd1aXR5IGZyb20gY29tbWFuZCBkZXNjcmlwdGlvbnMgKCM4MTUpCiAgKiBGaXggU2FmZVlBTUwgV2FybmluZ3MgKCM4MDcpCiAgKiBSZWxheGVkIEtyYW1kb3duIHZlcnNpb24gdG8gMC4xNCAoIzgwOCkKICAqIEFsaWFzZWQgYGpla3lsbCBzZXJ2ZXJgIHRvIGBqZWt5bGwgc2VydmVgLiAoIzc5MikKICAqIFVwZGF0ZWQgZ2VtIHZlcnNpb25zIGZvciBLcmFtZG93biwgUmFrZSwgU2hvdWxkYSwgQ3VjdW1iZXIsIGFuZCBSZWRDYXJwZXQuICgjNzQ0KQogICogUmVmYWN0b3JlZCBKZWt5bGwgc3ViY29tbWFuZHMgaW50byBKZWt5bGw6OkNvbW1hbmRzIHN1Ym1vZHVsZSwgd2hpY2ggbm93IGNvbnRhaW5zIHRoZW0gKCM3NjgpCiAgKiBSZXNjdWUgZnJvbSBpbXBvcnQgZXJyb3JzIGluIFdvcmRwcmVzcy5jb20gbWlncmF0b3IgKCM2NzEpCiAgKiBNYXNzaXZlbHkgYWNjZWxlcmF0ZSBMU0kgcGVyZm9ybWFuY2UgKCM2NjQpCiAgKiBUcnVuY2F0ZSBwb3N0IHNsdWdzIHdoZW4gaW1wb3J0aW5nIGZyb20gVHVtYmxyICgjNDk2KQogICogQWRkIGdsb2Igc3VwcG9ydCB0byBpbmNsdWRlLCBleGNsdWRlIG9wdGlvbiAoIzc0MykKICAqIExheW91dCBvZiBQYWdlIG9yIFBvc3QgZGVmYXVsdHMgdG8gJ3BhZ2UnIG9yICdwb3N0JywgcmVzcGVjdGl2ZWx5ICgjNTgwKSBSRVBFQUxFRCBieSAoIzk3NykKICAqICJLZWVwIGZpbGVzIiBmZWF0dXJlICgjNjg1KQogICogT3V0cHV0IGZ1bGwgcGF0aCAmIG5hbWUgZm9yIGZpbGVzIHRoYXQgZG9uJ3QgcGFyc2UgKCM3NDUpCiAgKiBBZGQgc291cmNlIGFuZCBkZXN0aW5hdGlvbiBkaXJlY3RvcnkgcHJvdGVjdGlvbiAoIzUzNSkKICAqIEJldHRlciBZQU1MIGVycm9yIG1lc3NhZ2UgKCM3MTgpCiAgKiBCdWcgRml4ZXMKICAqIFBhZ2luYXRlIGluIHN1YmRpcmVjdG9yaWVzIHByb3Blcmx5ICgjMTAxNikKICAqIEVuc3VyZSBwb3N0IGFuZCBwYWdlIFVSTHMgaGF2ZSBhIGxlYWRpbmcgc2xhc2ggKCM5OTIpCiAgKiBDYXRjaCBhbGwgZXhjZXB0aW9ucywgbm90IGp1c3QgU3RhbmRhcmRFcnJvciBkZXNjZW5kZW50cyAoIzEwMDcpCiAgKiBCdWxsZXQtcHJvb2YgYGxpbWl0X3Bvc3RzYCBvcHRpb24gKCMxMDA0KQogICogUmVhZCBpbiBZQU1MIGFzIFVURi04IHRvIGFjY2VwdCBub24tQVNDSUkgY2hhcnMgKCM4MzYpCiAgKiBGaXggdGhlIENMSSBvcHRpb24gYC0tcGx1Z2luc2AgdG8gYWN0dWFsbHkgYWNjZXB0IGRpcnMgYW5kIGZpbGVzICgjOTkzKQogICogQWxsb3cgJ2V4Y2VycHQnIGluIFlBTUwgZnJvbnQgbWF0dGVyIHRvIG92ZXJyaWRlIHRoZSBleHRyYWN0ZWQgZXhjZXJwdCAoIzk0NikKICAqIEZpeCBjYXNjYWRlIHByb2JsZW0gd2l0aCBzaXRlLmJhc2V1cmwsIHNpdGUucG9ydCBhbmQgc2l0ZS5ob3N0LiAoIzkzNSkKICAqIEZpbHRlciBvdXQgZGlyZWN0b3JpZXMgd2l0aCB2YWxpZCBwb3N0IG5hbWVzICgjODc1KQogICogRml4IHN5bWxpbmtlZCBzdGF0aWMgZmlsZXMgbm90IGJlaW5nIGNvcnJlY3RseSBidWlsdCBpbiB1bnNhZmUgbW9kZSAoIzkwOSkKICAqIEZpeCBpbnRlZ3JhdGlvbiB3aXRoIGRpcmVjdG9yeV93YXRjaGVyIDEuNC54ICgjOTE2KQogICogQWNjZXB0aW5nIHN0cmluZ3MgYXMgYXJndW1lbnRzIHRvIGpla3lsbC1pbXBvcnQgY29tbWFuZCAoIzkxMCkKICAqIEZvcmNlIHVzYWdlIG9mIG9sZGVyIGRpcmVjdG9yeV93YXRjaGVyIGdlbSBhcyAxLjUgaXMgYnJva2VuICgjODgzKQogICogRW5zdXJlIGFsbCBQb3N0IGNhdGVnb3JpZXMgYXJlIGRvd25jYXNlICgjODQyLCAjODcyKQogICogRm9yY2UgZW5jb2Rpbmcgb2YgdGhlIHJkaXNjb3VudCBUT0MgdG8gVVRGOCB0byBhdm9pZCBjb252ZXJzaW9uIGVycm9ycyAoIzU1NSkKICAqIFBhdGNoIGZvciBtdWx0aWJ5dGUgVVJJIHByb2JsZW0gd2l0aCBgamVreWxsIHNlcnZlYCAoIzcyMykKICAqIE9yZGVyIHBsdWdpbiBleGVjdXRpb24gYnkgcHJpb3JpdHkgKCM4NjQpCiAgKiBGaXhlZCBQYWdlI2RpciBhbmQgUGFnZSN1cmwgZm9yIGVkZ2UgY2FzZXMgKCM1MzYpCiAgKiBGaXggYnJva2VuIGBwb3N0X3VybGAgd2l0aCBwb3N0cyB3aXRoIGEgdGltZSBpbiB0aGVpciBZQU1MIGZyb250IG1hdHRlciAoIzgzMSkKICAqIExvb2sgZm9yIHBsdWdpbnMgdW5kZXIgdGhlIHNvdXJjZSBkaXJlY3RvcnkgKCM2NTQpCiAgKiBUdW1ibHIgTWlncmF0b3I6IGZpbmRzIGBfcG9zdHNgIGRpciBjb3JyZWN0bHksIGZpeGVzIHRydW5jYXRpb24gb2YgbG9uZyBwb3N0IG5hbWVzICgjNzc1KQogICogRm9yY2UgQ2F0ZWdvcmllcyB0byBiZSBTdHJpbmdzICgjNzY3KQogICogU2FmZSBZQU1MIHBsdWdpbiB0byBwcmV2ZW50IHZ1bG5lcmFiaWxpdHkgKCM3NzcpCiAgKiBBZGQgU1ZHIHN1cHBvcnQgdG8gSmVreWxsL1dFQnJpY2suICgjNDA3LCAjNDA2KQogICogUHJldmVudCBjdXN0b20gZGVzdGluYXRpb24gZnJvbSBjYXVzaW5nIGNvbnRpbnVvdXMgcmVnZW4gb24gd2F0Y2ggKCM1MjgsICM4MjAsICM4NjIpCgojIyMgU2l0ZSBFbmhhbmNlbWVudHMKCiAgKiBSZXNwb25zaWZ5ICgjODYwKQogICogRml4IHNwZWxsaW5nLCBwdW5jdHVhdGlvbiBhbmQgcGhyYXNhbCBlcnJvcnMgKCM5ODkpCiAgKiBVcGRhdGUgcXVpY2tzdGFydCBpbnN0cnVjdGlvbnMgd2l0aCBgbmV3YCBjb21tYW5kICgjOTY2KQogICogQWRkIGRvY3MgZm9yIHBhZ2UuZXhjZXJwdCAoIzk1NikKICAqIEFkZCBkb2NzIGZvciBwYWdlLnBhdGggKCM5NTEpCiAgKiBDbGVhbiB1cCBzaXRlIGRvY3MgdG8gcHJlcGFyZSBmb3IgMS4wIHJlbGVhc2UgKCM5MTgpCiAgKiBCcmluZyBzaXRlIGludG8gbWFzdGVyIGJyYW5jaCB3aXRoIGJldHRlciBwcmV2aWV3L2RlcGxveSAoIzcwOSkKICAqIFJlZGVzaWduZWQgc2l0ZSAoIzU4MykKCiMjIyBEZXZlbG9wbWVudCBGaXhlcwoKICAqIEV4Y2x1ZGUgQ3VjdW1iZXIgMS4yLjQsIHdoaWNoIGNhdXNlcyB0ZXN0cyB0byBmYWlsIGluIDEuOS4yICgjOTM4KQogICogQWRkZWQgImZlYXR1cmVzOmh0bWwiIHJha2UgdGFzayBmb3IgZGVidWdnaW5nIHB1cnBvc2VzLCBjbGVhbmVkIHVwIEN1Y3VtYmVyIHByb2ZpbGVzICgjODMyKQogICogRXhwbGljaXRseSByZXF1aXJlIEhUVFBTIHJ1YnlnZW1zIHNvdXJjZSBpbiBHZW1maWxlICgjODI2KQogICogQ2hhbmdlZCBSdWJ5IHZlcnNpb24gZm9yIGRldmVsb3BtZW50IHRvIDEuOS4zLXAzNzQgZnJvbSBwMzYyICgjODAxKQogICogSW5jbHVkaW5nIGEgbGluayB0byB0aGUgR2l0SHViIFJ1Ynkgc3R5bGUgZ3VpZGUgaW4gQ09OVFJJQlVUSU5HLm1kICgjODA2KQogICogQWRkZWQgc2NyaXB0L2Jvb3RzdHJhcCAoIzc3NikKICAqIFJ1bm5pbmcgU2ltcGxlY292IHVuZGVyIDIgY29uZGl0aW9uczogRU5WKENPVkVSQUdFKT10cnVlIGFuZCB3aXRoIFJ1YnkgdmVyc2lvbiBvZiBncmVhdGVyIHRoYW4gMS45ICgjNzcxKQogICogU3dpdGNoIHRvIFNpbXBsZWNvdiBmb3IgY292ZXJhZ2UgcmVwb3J0ICgjNzY1KQoKIyMgMC4xMi4xIC8gMjAxMy0wMi0xOQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFVwZGF0ZSBLcmFtZG93biB2ZXJzaW9uIHRvIDAuMTQuMSAoIzc0NCkKICAqIFRlc3QgRW5oYW5jZW1lbnRzCiAgKiBVcGRhdGUgUmFrZSB2ZXJzaW9uIHRvIDEwLjAuMyAoIzc0NCkKICAqIFVwZGF0ZSBTaG91bGRhIHZlcnNpb24gdG8gMy4zLjIgKCM3NDQpCiAgKiBVcGRhdGUgUmVkY2FycGV0IHZlcnNpb24gdG8gMi4yLjIgKCM3NDQpCgojIyAwLjEyLjAgLyAyMDEyLTEyLTIyCgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogQWRkIGFiaWxpdHkgdG8gZXhwbGljaXRseSBzcGVjaWZ5IGluY2x1ZGVkIGZpbGVzICgjMjYxKQogICogQWRkIGAtLWRlZmF1bHQtbWltZXR5cGVgIG9wdGlvbiAoIzI3OSkKICAqIEFsbG93IHNldHRpbmcgb2YgUmVkQ2xvdGggb3B0aW9ucyAoIzI4NCkKICAqIEFkZCBgcG9zdF91cmxgIExpcXVpZCB0YWcgZm9yIGludGVybmFsIHBvc3QgbGlua2luZyAoIzM2OSkKICAqIEFsbG93IG11bHRpcGxlIHBsdWdpbiBkaXJzIHRvIGJlIHNwZWNpZmllZCAoIzQzOCkKICAqIElubGluZSBUT0MgdG9rZW4gc3VwcG9ydCBmb3IgUkRpc2NvdW50ICgjMzMzKQogICogQWRkIHRoZSBvcHRpb24gdG8gc3BlY2lmeSB0aGUgcGFnaW5hdGVkIHVybCBmb3JtYXQgKCMzNDIpCiAgKiBTd2FwIG91dCBhbGJpbm8gZm9yIHB5Z21lbnRzLnJiICgjNTY5KQogICogU3VwcG9ydCBSZWRjYXJwZXQgMiBhbmQgZmVuY2VkIGNvZGUgYmxvY2tzICgjNjE5KQogICogQmV0dGVyIHJlcG9ydGluZyBvZiBMaXF1aWQgZXJyb3JzICgjNjI0KQogICogQnVnIEZpeGVzCiAgKiBBbGxvdyBzb21lIHNwZWNpYWwgY2hhcmFjdGVycyBpbiBoaWdobGlnaHQgbmFtZXMKICAqIFVSTCBlc2NhcGUgY2F0ZWdvcnkgbmFtZXMgaW4gVVJMIGdlbmVyYXRpb24gKCMzNjApCiAgKiBGaXggZXJyb3Igd2l0aCBgbGltaXRfcG9zdHNgICgjNDQyKQogICogUHJvcGVybHkgc2VsZWN0IGRvdGZpbGUgZHVyaW5nIGRpcmVjdG9yeSBzY2FuICgjMzYzLCAjNDMxLCAjMzc3KQogICogQWxsb3cgc2V0dGluZyBvZiBLcmFtZG93biBgc21hcnRfcXVvdGVzYCAoIzQ4MikKICAqIEVuc3VyZSBmcm9udCBtYXR0ZXIgaXMgYXQgc3RhcnQgb2YgZmlsZSAoIzU2MikKCiMjIDAuMTEuMiAvIDIwMTEtMTItMjcKCiAgKiBCdWcgRml4ZXMKICAqIEZpeCBnZW1zcGVjCgojIyAwLjExLjEgLyAyMDExLTEyLTI3CgogICogQnVnIEZpeGVzCiAgKiBGaXggZXh0cmEgYmxhbmsgbGluZSBpbiBoaWdobGlnaHQgYmxvY2tzICgjNDA5KQogICogVXBkYXRlIGRlcGVuZGVuY2llcwoKIyMgMC4xMS4wIC8gMjAxMS0wNy0xMAoKIyMjIE1ham9yIEVuaGFuY2VtZW50cwoKICAqIEFkZCBjb21tYW5kIGxpbmUgaW1wb3J0ZXIgZnVuY3Rpb25hbGl0eSAoIzI1MykKICAqIEFkZCBSZWRjYXJwZXQgTWFya2Rvd24gc3VwcG9ydCAoIzMxOCkKICAqIE1ha2UgbWFya2Rvd24vdGV4dGlsZSBleHRlbnNpb25zIGNvbmZpZ3VyYWJsZSAoIzMxMikKICAqIEFkZCBgbWFya2Rvd25pZnlgIGZpbHRlcgoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFN3aXRjaCB0byBBbGJpbm8gZ2VtCiAgKiBCdW5kbGVyIHN1cHBvcnQKICAqIFVzZSBFbmdsaXNoIGxpYnJhcnkgdG8gYXZvaWQgaG9vcHMgKCMyOTIpCiAgKiBBZGQgUG9zdGVyb3VzIGltcG9ydGVyICgjMjU0KQogICogRml4ZXMgZm9yIFdvcmRwcmVzcyBpbXBvcnRlciAoIzI3NCwgIzI1MiwgIzI3MSkKICAqIEJldHRlciBlcnJvciBtZXNzYWdlIGZvciBpbnZhbGlkIHBvc3QgZGF0ZSAoIzI5MSkKICAqIFByaW50IGZvcm1hdHRlZCBmYXRhbCBleGNlcHRpb25zIHRvIHN0ZG91dCBvbiBidWlsZCBmYWlsdXJlCiAgKiBBZGQgVHVtYmxyIGltcG9ydGVyICgjMzIzKQogICogQWRkIEVua2kgaW1wb3J0ZXIgKCMzMjApCiAgKiBCdWcgRml4ZXMKICAqIFNlY3VyZSBhZGRpdGlvbmFsIHBhdGggZXhwbG9pdHMKCiMjIDAuMTAuMCAvIDIwMTAtMTItMTYKCiAgKiBCdWcgRml4ZXMKICAqIEFkZCBgLS1uby1zZXJ2ZXJgIG9wdGlvbi4KCiMjIDAuOS4wIC8gMjAxMC0xMi0xNQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIFVzZSBPcHRpb25QYXJzZXIncyBgW25vLV1gIGZ1bmN0aW9uYWxpdHkgZm9yIGJldHRlciBib29sZWFuIHBhcnNpbmcuCiAgKiBBZGQgRHJ1cGFsIG1pZ3JhdG9yICgjMjQ1KQogICogQ29tcGxhaW4gYWJvdXQgWUFNTCBhbmQgTGlxdWlkIGVycm9ycyAoIzI0OSkKICAqIFJlbW92ZSBvcnBoYW5lZCBmaWxlcyBkdXJpbmcgcmVnZW5lcmF0aW9uICgjMjQ3KQogICogQWRkIE1hcmxleSBtaWdyYXRvciAoIzI4KQoKIyMgMC44LjAgLyAyMDEwLTExLTIyCgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogQWRkIHdvcmRwcmVzcy5jb20gaW1wb3J0ZXIgKCMyMDcpCiAgKiBBZGQgYC0tbGltaXQtcG9zdHNgIGNsaSBvcHRpb24gKCMyMTIpCiAgKiBBZGQgYHVyaV9lc2NhcGVgIGZpbHRlciAoIzIzNCkKICAqIEFkZCBgLS1iYXNlLXVybGAgY2xpIG9wdGlvbiAoIzIzNSkKICAqIEltcHJvdmUgTVQgbWlncmF0b3IgKCMyMzgpCiAgKiBBZGQga3JhbWRvd24gc3VwcG9ydCAoIzIzOSkKICAqIEJ1ZyBGaXhlcwogICogRml4ZWQgZmlsZW5hbWUgYmFzZW5hbWUgZ2VuZXJhdGlvbiAoIzIwOCkKICAqIFNldCBtb2RlIHRvIFVURjggb24gU2VxdWVsIGNvbm5lY3Rpb25zICgjMjM3KQogICogUHJldmVudCBgX2luY2x1ZGVzYCBkaXIgZnJvbSBiZWluZyBhIHN5bWxpbmsKCiMjIDAuNy4wIC8gMjAxMC0wOC0yNAoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIEFkZCBzdXBwb3J0IGZvciByZGlzY291bnQgZXh0ZW5zaW9ucyAoIzE3MykKICAqIEJ1ZyBGaXhlcwogICogSGlnaGxpZ2h0IHNob3VsZCBub3QgYmUgYWJsZSB0byByZW5kZXIgbG9jYWwgZmlsZXMKICAqIFRoZSBzaXRlIGNvbmZpZ3VyYXRpb24gbWF5IG5vdCBhbHdheXMgcHJvdmlkZSBhICd0aW1lJyBzZXR0aW5nICgjMTg0KQoKIyMgMC42LjIgLyAyMDEwLTA2LTI1CgogICogQnVnIEZpeGVzCiAgKiBGaXggUmFrZWZpbGUgJ3JlbGVhc2UnIHRhc2sgKHRhZyBwdXNoaW5nIHdhcyBtaXNzaW5nIG9yaWdpbikKICAqIEVuc3VyZSB0aGF0IFJlZENsb3RoIGlzIGxvYWRlZCB3aGVuIHRleHRpbGl6ZSBmaWx0ZXIgaXMgdXNlZCAoIzE4MykKICAqIEV4cGFuZCBzb3VyY2UsIGRlc3RpbmF0aW9uLCBhbmQgcGx1Z2luIHBhdGhzICgjMTgwKQogICogRml4IGBwYWdlLnVybGAgdG8gaW5jbHVkZSBmdWxsIHJlbGF0aXZlIHBhdGggKCMxODEpCgojIyAwLjYuMSAvIDIwMTAtMDYtMjQKCiAgKiBCdWcgRml4ZXMKICAqIEZpeCBNYXJrZG93biBQeWdtZW50cyBwcmVmaXggYW5kIHN1ZmZpeCAoIzE3OCkKCiMjIDAuNi4wIC8gMjAxMC0wNi0yMwoKIyMjIE1ham9yIEVuaGFuY2VtZW50cwoKICAqIFByb3BlciBwbHVnaW4gc3lzdGVtICgjMTksICMxMDApCiAgKiBBZGQgc2FmZSBtb2RlIHNvIHVuc2FmZSBjb252ZXJ0ZXJzL2dlbmVyYXRvcnMgY2FuIGJlIGFkZGVkCiAgKiBNYXJ1a3UgaXMgbm93IHRoZSBvbmx5IHByb2Nlc3NvciBkZXBlbmRlbmN5IGluc3RhbGxlZCBieSBkZWZhdWx0LiBPdGhlciBwcm9jZXNzb3JzIHdpbGwgYmUgbGF6eS1sb2FkZWQgd2hlbiBuZWNlc3NhcnkgKGFuZCBwcm9tcHQgdGhlIHVzZXIgdG8gaW5zdGFsbCB0aGVtIHdoZW4gbmVjZXNzYXJ5KSAoIzU3KQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIEluY2x1c2lvbi9leGNsdXNpb24gb2YgZnV0dXJlIGRhdGVkIHBvc3RzICgjNTkpCiAgKiBHZW5lcmF0aW9uIGZvciBhIHNwZWNpZmljIHRpbWUgKCM1OSkKICAqIEFsbG9jYXRlIGBzaXRlLnRpbWVgIG9uIHJlbmRlciBub3QgcGVyIHNpdGVfcGF5bG9hZCBpbnZvY2F0aW9uICgjNTkpCiAgKiBQYWdlcyBub3cgcHJlc2VudCBpbiB0aGUgc2l0ZSBwYXlsb2FkIGFuZCBjYW4gYmUgdXNlZCB0aHJvdWdoIHRoZSBgc2l0ZS5wYWdlc2AgYW5kIGBzaXRlLmh0bWxfcGFnZXNgIHZhcmlhYmxlcwogICogR2VuZXJhdGUgcGhhc2UgYWRkZWQgdG8gc2l0ZSNwcm9jZXNzIGFuZCBwYWdpbmF0aW9uIGlzIG5vdyBhIGdlbmVyYXRvcgogICogU3dpdGNoIHRvIFJha2VHZW0gZm9yIGJ1aWxkL3Rlc3QgcHJvY2VzcwogICogT25seSByZWdlbmVyYXRlIHN0YXRpYyBmaWxlcyB3aGVuIHRoZXkgaGF2ZSBjaGFuZ2VkICgjMTQyKQogICogQWxsb3cgYXJiaXRyYXJ5IG9wdGlvbnMgdG8gUHlnbWVudHMgKCMzMSkKICAqIEFsbG93IFVSTCB0byBiZSBzZXQgdmlhIGNvbW1hbmQgbGluZSBvcHRpb24gKCMxNDcpCiAgKiBCdWcgRml4ZXMKICAqIFJlbmRlciBoaWdobGlnaHRlZCBjb2RlIGZvciBub24gbWFya2Rvd24vdGV4dGlsZSBwYWdlcyAoIzExNikKICAqIEZpeCBoaWdobGlnaHRpbmcgb24gUnVieSAxLjkgKCM2NSkKICAqIEZpeCBleHRlbnNpb24gbXVuZ2luZyB3aGVuIHByZXR0eSBwZXJtYWxpbmtzIGFyZSBlbmFibGVkICgjNjQpCiAgKiBTdG9wIHNvcnRpbmcgY2F0ZWdvcmllcyAoIzMzKQogICogUHJlc2VydmUgZ2VuZXJhdGVkIGF0dHJpYnV0ZXMgb3ZlciBmcm9udCBtYXR0ZXIgKCMxMTkpCiAgKiBGaXggc291cmNlIGRpcmVjdG9yeSBiaW5kaW5nIHVzaW5nIGBEaXIucHdkYCAoIzc1KQoKIyMgMC41LjcgLyAyMDEwLTAxLTEyCgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogQWxsb3cgb3ZlcnJpZGluZyBvZiBwb3N0IGRhdGUgaW4gdGhlIGZyb250IG1hdHRlciAoIzYyLCAjMzgpCiAgKiBCdWcgRml4ZXMKICAqIENhdGVnb3JpZXMgaXNuJ3QgYWx3YXlzIGFuIGFycmF5ICgjNzMpCiAgKiBFbXB0eSB0YWdzIGNhdXNlcyBlcnJvciBpbiByZWFkX3Bvc3RzICgjODQpCiAgKiBGaXggcGFnaW5hdGlvbiB0byBhZGhlcmUgdG8gcmVhZC9yZW5kZXIvd3JpdGUgcGFyYWRpZ20KICAqIFRlc3QgRW5oYW5jZW1lbnQKICAqIEN1Y3VtYmVyIGZlYXR1cmVzIG5vIGxvbmdlciB1c2Ugc2l0ZS5wb3N0cy5maXJzdCB3aGVyZSBhIGJldHRlciBhbHRlcm5hdGl2ZSBpcyBhdmFpbGFibGUKCiMjIDAuNS42IC8gMjAxMC0wMS0wOAoKICAqIEJ1ZyBGaXhlcwogICogUmVxdWlyZSByZWRjbG90aCA+PSA0LjIuMSBpbiB0ZXN0cyAoIzkyKQogICogRG9uJ3QgYnJlYWsgb24gdHJpcGxlIGRhc2hlcyBpbiB5YW1sIGZyb250IG1hdHRlciAoIzkzKQoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIEFsbG93IC5ta2QgYXMgbWFya2Rvd24gZXh0ZW5zaW9uCiAgKiBVc2UgJHN0ZG91dC9lcnIgaW5zdGVhZCBvZiBjb25zdGFudHMgKCM5OSkKICAqIFByb3Blcmx5IHdyYXAgY29kZSBibG9ja3MgKCM5MSkKICAqIEFkZCBqYXZhc2NyaXB0IG1pbWUgdHlwZSBmb3Igd2VicmljayAoIzk4KQoKIyMgMC41LjUgLyAyMDEwLTAxLTA4CgogICogQnVnIEZpeGVzCiAgKiBGaXggcGFnaW5hdGlvbiAlIDAgYnVnICgjNzgpCiAgKiBFbnN1cmUgYWxsIHBvc3RzIGFyZSBwcm9jZXNzZWQgZmlyc3QgKCM3MSkgIyMgTk9URQogICogQWZ0ZXIgdGhpcyBwb2ludCBJIHdpbGwgbm8gbG9uZ2VyIGJlIGdpdmluZyBjcmVkaXQgaW4gdGhlIGhpc3Rvcnk7IHRoYXQgaXMgd2hhdCB0aGUgY29tbWl0IGxvZyBpcyBmb3IuCgojIyAwLjUuNCAvIDIwMDktMDgtMjMKCiAgKiBCdWcgRml4ZXMKICAqIERvIG5vdCBhbGxvdyBzeW1saW5rcyAoc2VjdXJpdHkgdnVsbmVyYWJpbGl0eSkKCiMjIDAuNS4zIC8gMjAwOS0wNy0xNAoKICAqIEJ1ZyBGaXhlcwogICogU29sdmluZyB0aGUgcGVybWFsaW5rIGJ1ZyB3aGVyZSBub24taHRtbCBmaWxlcyB3b3VsZG4ndCB3b3JrIChAamVmZnJ5ZGVncmFuZGUpCgojIyAwLjUuMiAvIDIwMDktMDYtMjQKCiAgKiBFbmhhbmNlbWVudHMKICAqIEFkZGVkIC0tcGFnaW5hdGUgb3B0aW9uIHRvIHRoZSBleGVjdXRhYmxlIGFsb25nIHdpdGggYSBwYWdpbmF0b3Igb2JqZWN0IGZvciB0aGUgcGF5bG9hZCAoQGNhbGF2ZXJhKQogICogVXBncmFkZWQgUmVkQ2xvdGggdG8gNC4yLjEsIHdoaWNoIG1ha2VzIGA8bm90ZXh0aWxlPmAgdGFncyB3b3JrIG9uY2UgYWdhaW4uCiAgKiBDb25maWd1cmF0aW9uIG9wdGlvbnMgc2V0IGluIGNvbmZpZy55bWwgYXJlIG5vdyBhdmFpbGFibGUgdGhyb3VnaCB0aGUgc2l0ZSBwYXlsb2FkIChAdmlsY2FucykKICAqIFBvc3RzIGNhbiBub3cgaGF2ZSBhbiBlbXB0eSBZQU1MIGZyb250IG1hdHRlciBvciBub25lIGF0IGFsbCAoQCBiYWh1dnJpaGkpCiAgKiBCdWcgRml4ZXMKICAqIEZpeGluZyBSdWJ5IDEuOSBpc3N1ZSB0aGF0IHJlcXVpcmVzIGAjdG9fc2Agb24gdGhlIGVyciBvYmplY3QgKEBDaHJvbm9uYXV0KQogICogRml4ZXMgZm9yIHBhZ2luYXRpb24gYW5kIG9yZGVyaW5nIHBvc3RzIG9uIHRoZSBzYW1lIGRheSAoQHVqaCkKICAqIE1hZGUgcGFnZXMgcmVzcGVjdCBwZXJtYWxpbmtzIHN0eWxlIGFuZCBwZXJtYWxpbmtzIGluIHltbCBmcm9udCBtYXR0ZXIgKEBldWdlbmVib2xzaGFrb3YpCiAgKiBJbmRleC5odG1sIGZpbGUgc2hvdWxkIGFsd2F5cyBoYXZlIGluZGV4Lmh0bWwgcGVybWFsaW5rIChAZXVnZW5lYm9sc2hha292KQogICogQWRkZWQgdHJhaWxpbmcgc2xhc2ggdG8gcHJldHR5IHBlcm1hbGluayBzdHlsZSBzbyBBcGFjaGUgaXMgaGFwcHkgKEBldWdlbmVib2xzaGFrb3YpCiAgKiBCYWQgbWFya2Rvd24gcHJvY2Vzc29yIGluIGNvbmZpZyBmYWlscyBzb29uZXIgYW5kIHdpdGggYmV0dGVyIG1lc3NhZ2UgKEAgZ2Nub3Z1cykKICAqIEFsbG93IENSTEZzIGluIHlhbWwgZnJvbnQgbWF0dGVyIChAanVyZXR0YSkKICAqIEFkZGVkIERhdGUjeG1sc2NoZW1hIGZvciBSdWJ5IHZlcnNpb25zIDwgMS45CgojIyAwLjUuMSAvIDIwMDktMDUtMDYKCiMjIyBNYWpvciBFbmhhbmNlbWVudHMKCiAgKiBOZXh0L3ByZXZpb3VzIHBvc3RzIGluIHNpdGUgcGF5bG9hZCAoQHBhbnR1bGlzLCBAdG9tbykKICAqIFBlcm1hbGluayB0ZW1wbGF0aW5nIHN5c3RlbQogICogTW92ZWQgbW9zdCBvZiB0aGUgUkVBRE1FIG91dCB0byB0aGUgR2l0SHViIHdpa2kKICAqIEV4Y2x1ZGUgb3B0aW9uIGluIGNvbmZpZ3VyYXRpb24gc28gc3BlY2lmaWVkIGZpbGVzIHdvbid0IGJlIGJyb3VnaHQgb3ZlciB3aXRoIGdlbmVyYXRlZCBzaXRlIChAZHVyaXRvbmcpCiAgKiBCdWcgRml4ZXMKICAqIE1ha2luZyBzdXJlIGNvbmZpZy55YW1sIHJlZmVyZW5jZXMgYXJlIGFsbCBnb25lLCB1c2luZyBvbmx5IGNvbmZpZy55bWwKICAqIEZpeGVkIHN5bnRheCBoaWdobGlnaHRpbmcgYnJlYWtpbmcgZm9yIFVURi04IGNvZGUgKEBoZW5yaWspCiAgKiBXb3JrZWQgYXJvdW5kIFJEaXNjb3VudCBidWcgdGhhdCBwcmV2ZW50cyBNYXJrZG93biBmcm9tIGdldHRpbmcgcGFyc2VkIGFmdGVyIGhpZ2hsaWdodCAoQGhlbnJpaykKICAqIENHSSBlc2NhcGVkIHBvc3QgdGl0bGVzIChAQ2hyb25vbmF1dCkKCiMjIDAuNS4wIC8gMjAwOS0wNC0wNwoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIEFiaWxpdHkgdG8gc2V0IHBvc3QgY2F0ZWdvcmllcyB2aWEgWUFNTCAoQHFydXNoKQogICogQWJpbGl0eSB0byBzZXQgcHJldmVudCBhIHBvc3QgZnJvbSBwdWJsaXNoaW5nIHZpYSBZQU1MIChAcXJ1c2gpCiAgKiBBZGQgdGV4dGlsaXplIGZpbHRlciAoQHdpbGxjb2RlZm9yZm9vKQogICogQWRkICdwcmV0dHknIHBlcm1hbGluayBzdHlsZSBmb3Igd29yZHByZXNzLWxpa2UgdXJscyAoQGR5c2luZ2VyKQogICogTWFkZSBpdCBwb3NzaWJsZSB0byBlbnRlciBjYXRlZ29yaWVzIGZyb20gWUFNTCBhcyBhbiBhcnJheSAoQENocm9ub25hdXQpCiAgKiBJZ25vcmUgRW1hY3MgYXV0b3NhdmUgZmlsZXMgKEBDaHJvbm9uYXV0KQogICogQnVnIEZpeGVzCiAgKiBVc2UgYmxvY2sgc3ludGF4IG9mIHBvcGVuNCB0byBlbnN1cmUgdGhhdCBzdWJwcm9jZXNzZXMgYXJlIHByb3Blcmx5IGRpc3Bvc2VkIChAanFyKQogICogQ2xvc2Ugb3BlbjQgc3RyZWFtcyB0byBwcmV2ZW50IHpvbWJpZXMgKEBydG9tYXlrbykKICAqIE9ubHkgcXVlcnkgcmVxdWlyZWQgZmllbGRzIGZyb20gdGhlIFdQIERhdGFiYXNlIChAYXJpZWphbikKICAqIFByZXZlbnQgYF9wb3N0c2AgZnJvbSBiZWluZyBjb3BpZWQgdG8gdGhlIGRlc3RpbmF0aW9uIGRpcmVjdG9yeSAoQGJkaW1jaGVmZikKICAqIFJlZmFjdG9ycwogICogRmFjdG9yZWQgdGhlIGZpbHRlcmluZyBjb2RlIGludG8gYSBtZXRob2QgKEBDaHJvbm9uYXV0KQogICogRml4IHRlc3RzIGFuZCBjb252ZXJ0IHRvIFNob3VsZGEgKEBxcnVzaCwgQHRlY2huaWNhbHBpY2tsZXMpCiAgKiBBZGQgQ3VjdW1iZXIgYWNjZXB0YW5jZSB0ZXN0IHN1aXRlIChAcXJ1c2gsIEB0ZWNobmljYWxwaWNrbGVzKQoKIyMgMC40LjEKCiMjIyBNaW5vciBFbmhhbmNlbWVudHMKCiAgKiBDaGFuZ2VkIGRhdGUgZm9ybWF0IG9uIHdvcmRwcmVzcyBjb252ZXJ0ZXIgKHplcm9wYWRkaW5nKSAoQGR5c2luZ2VyKQogICogQnVnIEZpeGVzCiAgKiBBZGQgSmVreWxsIGJpbmFyeSBhcyBleGVjdXRhYmxlIHRvIGdlbXNwZWMgKEBkeXNpbmdlcikKCiMjIDAuNC4wIC8gMjAwOS0wMi0wMwoKIyMjIE1ham9yIEVuaGFuY2VtZW50cwoKICAqIFN3aXRjaCB0byBKZXdlbGVyIGZvciBwYWNrYWdpbmcgdGFza3MKCiMjIyBNaW5vciBFbmhhbmNlbWVudHMKCiAgKiBUeXBlIGltcG9ydGVyIChAY29kZXNsaW5nZXIpCiAgKiBgc2l0ZS50b3BpY3NgIGFjY2Vzc29yIChAYmF6KQogICogQWRkIGBhcnJheV90b19zZW50ZW5jZV9zdHJpbmdgIGZpbHRlciAoQG1jaHVuZykKICAqIEFkZCBhIGNvbnZlcnRlciBmb3IgdGV4dHBhdHRlcm4gKEBQZXJmZWN0bHlOb3JtYWwpCiAgKiBBZGQgYSB3b3JraW5nIE1lcGhpc3RvIC8gTXlTUUwgY29udmVydGVyIChAaXZleSkKICAqIEFsbG93aW5nIC5odGFjY2VzcyBmaWxlcyB0byBiZSBjb3BpZWQgb3ZlciBpbnRvIHRoZSBnZW5lcmF0ZWQgc2l0ZSAoQGJyaWFuZG9sbCkKICAqIEFkZCBvcHRpb24gdG8gbm90IHB1dCBmaWxlIGRhdGUgaW4gcGVybWFsaW5rIFVSTCAoQG1yZWlkKQogICogQWRkIGxpbmUgbnVtYmVyIGNhcGFiaWxpdGllcyB0byBoaWdobGlnaHQgYmxvY2tzIChAamNvbikKICAqIEJ1ZyBGaXhlcwogICogRml4IHBlcm1hbGluayBiZWhhdmlvciAoQGNhdmFsbGUpCiAgKiBGaXhlZCBhbiBpc3N1ZSB3aXRoIHB5Z21lbnRzLCBtYXJrZG93biwgYW5kIG5ld2xpbmVzIChAenBpbnRlcikKICAqIEFtcGVyc2FuZHMgbmVlZCB0byBiZSBlc2NhcGVkIChAcHVmdXdvenUsIEBhcCkKICAqIFRlc3QgYW5kIGZpeCB0aGUgc2l0ZS5jYXRlZ29yaWVzIGhhc2ggKEB6em90KQogICogRml4IHNpdGUgcGF5bG9hZCBhdmFpbGFibGUgdG8gZmlsZXMgKEBtYXRyaXg5MTgwKQoKIyMgMC4zLjAgLyAyMDA4LTEyLTI0CgojIyMgTWFqb3IgRW5oYW5jZW1lbnRzCgogICogQWRkZWQgYC0tc2VydmVyYCBvcHRpb24gdG8gc3RhcnQgYSBzaW1wbGUgV0VCcmljayBzZXJ2ZXIgb24gZGVzdGluYXRpb24gZGlyZWN0b3J5IChAam9obnJlaWxseSBhbmQgQG1jaHVuZykKCiMjIyBNaW5vciBFbmhhbmNlbWVudHMKCiAgKiBBZGRlZCBwb3N0IGNhdGVnb3JpZXMgYmFzZWQgb24gZGlyZWN0b3JpZXMgY29udGFpbmluZyBgX3Bvc3RzYCAoQG1yZWlkKQogICogQWRkZWQgcG9zdCB0b3BpY3MgYmFzZWQgb24gZGlyZWN0b3JpZXMgdW5kZXJuZWF0aCBgX3Bvc3RzYAogICogQWRkZWQgbmV3IGRhdGUgZmlsdGVyIHRoYXQgc2hvd3MgdGhlIGZ1bGwgbW9udGggbmFtZSAoQG1yZWlkKQogICogTWVyZ2UgUG9zdCdzIFlBTUwgZnJvbnQgbWF0dGVyIGludG8gaXRzIHRvX2xpcXVpZCBwYXlsb2FkIChAcmVtaSkKICAqIFJlc3RyaWN0IGluY2x1ZGVzIHRvIHJlZ3VsYXIgZmlsZXMgdW5kZXJuZWF0aCBgX2luY2x1ZGVzYAogICogQnVnIEZpeGVzCiAgKiBDaGFuZ2UgWUFNTCBkZWxpbWl0ZXIgbWF0Y2hlciBzbyBhcyB0byBub3QgY2hldyB1cCAybmQgbGV2ZWwgbWFya2Rvd24gaGVhZGVycyAoQG1yZWlkKQogICogRml4IGJ1ZyB0aGF0IG1lYW50IHBhZ2UgZGF0YSAoc3VjaCBhcyB0aGUgZGF0ZSkgd2FzIG5vdCBhdmFpbGFibGUgaW4gdGVtcGxhdGVzIChAbXJlaWQpCiAgKiBQcm9wZXJseSByZWplY3QgZGlyZWN0b3JpZXMgaW4gYF9sYXlvdXRzYAoKIyMgMC4yLjEgLyAyMDA4LTEyLTE1CgogICogTWFqb3IgQ2hhbmdlcwogICogVXNlIE1hcnVrdSAocHVyZSBSdWJ5KSBmb3IgTWFya2Rvd24gYnkgZGVmYXVsdCAoQG1yZWlkKQogICogQWxsb3cgdXNlIG9mIFJEaXNjb3VudCB3aXRoIGAtLXJkaXNjb3VudGAgZmxhZwoKIyMjIE1pbm9yIEVuaGFuY2VtZW50cwoKICAqIERvbid0IGxvYWQgZGlyZWN0b3J5X3dhdGNoZXIgdW5sZXNzIGl0J3MgbmVlZGVkIChAcGpoeWV0dCkKCiMjIDAuMi4wIC8gMjAwOC0xMi0xNAoKICAqIE1ham9yIENoYW5nZXMKICAqIHJlbGF0ZWRfcG9zdHMgaXMgbm93IGZvdW5kIGluIGBzaXRlLnJlbGF0ZWRfcG9zdHNgCgojIyAwLjEuNiAvIDIwMDgtMTItMTMKCiAgKiBNYWpvciBGZWF0dXJlcwogICogSW5jbHVkZSBmaWxlcyBpbiBgX2luY2x1ZGVzYCB3aXRoIGB7JSBpbmNsdWRlIHgudGV4dGlsZSAlfWAKCiMjIDAuMS41IC8gMjAwOC0xMi0xMgoKIyMjIE1ham9yIEVuaGFuY2VtZW50cwoKICAqIENvZGUgaGlnaGxpZ2h0aW5nIHdpdGggUHlnbWVudHMgaWYgYC0tcHlnbWVudHNgIGlzIHNwZWNpZmllZAogICogRGlzYWJsZSB0cnVlIExTSSBieSBkZWZhdWx0LCBlbmFibGUgd2l0aCBgLS1sc2lgCgojIyMgTWlub3IgRW5oYW5jZW1lbnRzCgogICogT3V0cHV0IGluZm9ybWF0aXZlIG1lc3NhZ2UgaWYgUkRpc2NvdW50IGlzIG5vdCBhdmFpbGFibGUgKEBKYWNrRGFuZ2VyKQogICogQnVnIEZpeGVzCiAgKiBQcmV2ZW50IEpla3lsbCBmcm9tIHBpY2tpbmcgdXAgdGhlIG91dHB1dCBkaXJlY3RvcnkgYXMgYSBzb3VyY2UgKEBKYWNrRGFuZ2VyKQogICogU2tpcCBgcmVsYXRlZF9wb3N0c2Agd2hlbiB0aGVyZSBpcyBvbmx5IG9uZSBwb3N0IChASmFja0RhbmdlcikKCiMjIDAuMS40IC8gMjAwOC0xMi0wOAoKICAqIEJ1ZyBGaXhlcwogICogREFUQSBkb2VzIG5vdCB3b3JrIHByb3Blcmx5IHdpdGggcnVieWdlbXMKCiMjIDAuMS4zIC8gMjAwOC0xMi0wNgoKICAqIE1ham9yIEZlYXR1cmVzCiAgKiBNYXJrZG93biBzdXBwb3J0IChAdmFucGVsdCkKICAqIE1lcGhpc3RvIGFuZCBDU1YgY29udmVydGVycyAoQHZhbnBlbHQpCiAgKiBDb2RlIGhpbGlnaHRpbmcgKEB2YW5wZWx0KQogICogQXV0b2J1aWxkCiAgKiBCdWcgRml4ZXMKICAqIEFjY2VwdCBib3RoIGBcclxuYCBhbmQgYFxuYCBpbiBZQU1MIGhlYWRlciAoQHZhbnBlbHQpCgojIyAwLjEuMiAvIDIwMDgtMTEtMjIKCiAgKiBNYWpvciBGZWF0dXJlcwogICogQWRkIGEgcmVhbCAicmVsYXRlZCBwb3N0cyIgaW1wbGVtZW50YXRpb24gdXNpbmcgQ2xhc3NpZmllcgogICogQ29tbWFuZCBMaW5lIENoYW5nZXMKICAqIEFsbG93IGNsaSB0byBiZSBjYWxsZWQgd2l0aCAwLCAxLCBvciAyIGFyZ3MgaW50dWl0aW5nIGRpciBwYXRocyBpZiB0aGV5IGFyZSBvbWl0dGVkCgojIyAwLjEuMSAvIDIwMDgtMTEtMjIKCiAgKiBNaW5vciBBZGRpdGlvbnMKICAqIFBvc3RzIG5vdyBzdXBwb3J0IGludHJvc3BlY3Rpb25hbCBkYXRhIGUuZy4gYHt7IHBhZ2UudXJsIH19YAoKIyMgMC4xLjAgLyAyMDA4LTExLTA1CgogICogRmlyc3QgcmVsZWFzZQogICogQ29udmVydHMgcG9zdHMgd3JpdHRlbiBpbiBUZXh0aWxlCiAgKiBDb252ZXJ0cyByZWd1bGFyIHNpdGUgcGFnZXMKICAqIFNpbXBsZSBjb3B5IG9mIGJpbmFyeSBmaWxlcwoKIyMgMC4wLjAgLyAyMDA4LTEwLTE5CgogICogQmlydGhkYXkhCg== \ No newline at end of file +## HEAD + +### Minor Enhancements + + * Use `Liquid::Drop`s instead of `Hash`es in `#to_liquid` (#4277) + * Add 'sample' Liquid filter Equivalent to Array#sample functionality (#4223) + * Cache parsed include file to save liquid parsing time. (#4120) + * Slightly speed up url sanitization and handle multiples of ///. (#4168) + * Print debug message when a document is skipped from reading (#4180) + * Include tag should accept multiple variables in the include name (#4183) + * Add `-o` option to serve command which opens server URL (#4144) + * Add CodeClimate platform for better code quality. (#4220) + * General improvements for WEBrick via jekyll serve such as SSL & custom headers (#4224, #4228) + * Add a default charset to content-type on webrick. (#4231) + * Switch `PluginManager` to use `require_with_graceful_fail` for better UX (#4233) + * Allow quoted date in front matter defaults (#4184) + * Add a Jekyll doctor warning for URLs that only differ by case (#3171) + * drops: create one base Drop class which can be set as mutable or not (#4285) + * drops: provide `#to_h` to allow for hash introspection (#4281) + * Shim subcommands with indication of gem possibly required so users know how to use them (#4254) + +### Bug Fixes + + * Pass build options into `clean` command (#4177) + * Allow users to use .htm and .xhtml (XHTML5.) (#4160) + * Prevent Shell Injection. (#4200) + * Convertible should make layout data accessible via `layout` instead of `page` (#4205) + * Avoid using `Dir.glob` with absolute path to allow special characters in the path (#4150) + * Handle empty config files (#4052) + * Rename `@options` so that it does not impact Liquid. (#4173) + * utils/drops: update Drop to support `Utils.deep_merge_hashes` (#4289) + * Make sure jekyll/drops/drop is loaded first. (#4292) + * Convertible/Page/Renderer: use payload hash accessor & setter syntax for backwards-compatibility (#4311) + * Drop: fix hash setter precendence (#4312) + * utils: `has_yaml_header?` should accept files with extraneous spaces (#4290) + * Escape html from site.title and page.title in site template (#4307) + +### Development Fixes + + * `jekyll-docs` should be easily release-able (#4152) + * Allow use of Cucumber 2.1 or greater (#4181) + * Modernize Kramdown for Markdown converter. (#4109) + * Change TestDoctorCommand to JekyllUnitTest... (#4263) + * Create namespaced rake tasks in separate `.rake` files under `lib/tasks` (#4282) + * markdown: refactor for greater readability & efficiency (#3771) + * Fix many Rubocop style errors (#4301) + * Fix spelling of "GitHub" in docs and history (#4322) + * Reorganize and cleanup the Gemfile, shorten required depends. (#4318) + +### Site Enhancements + + * Add three plugins to directory (#4163) + * Add upgrading docs from 2.x to 3.x (#4157) + * Add `protect_email` to the plugins index. (#4169) + * Add `jekyll-deploy` to list of third-party plugins (#4179) + * Clarify plugin docs (#4154) + * Add Kickster to deployment methods in documentation (#4190) + * Add DavidBurela's tutorial for Windows to Windows docs page (#4210) + * Change GitHub code block to highlight tag to avoid it overlaps parent div (#4121) + * Update FormKeep link to be something more specific to Jekyll (#4243) + * Remove example Roger Chapman site, as the domain doesn't exist (#4249) + * Added configuration options for `draft_posts` to configuration docs (#4251) + * Fix checklist in `_assets.md` (#4259) + * Add Markdown examples to Pages docs (#4275) + * Add jekyll-paginate-category to list of third-party plugins (#4273) + * Add `jekyll-responsive_image` to list of third-party plugins (#4286) + * Add `jekyll-commonmark` to list of third-party plugins (#4299) + * Add documentation for incremental regeneration (#4293) + * Add note about removal of relative permalink support in upgrading docs (#4303) + * Add Pro Tip to use front matter variable to create clean URLs (#4296) + +## 3.0.1 / 2015-11-17 + +### Bug Fixes + + * Document: only superdirectories of the collection are categories (#4110) + * `Convertible#render_liquid` should use `render!` to cause failure on bad Liquid (#4077) + * Don't generate `.jekyll-metadata` in non-incremental build (#4079) + * Set `highlighter` config val to `kramdown.syntax_highlighter` (#4090) + * Align hooks implementation with documentation (#4104) + * Fix the deprecation warning in the doctor command (#4114) + * Fix case in `:title` and add `:slug` which is downcased (#4100) + +### Development Fixes + + * Fix test warnings when doing rake {test,spec} or script/test (#4078) + +### Site Enhancements + + * Update normalize.css to v3.0.3. (#4085) + * Update Font Awesome to v4.4.0. (#4086) + * Adds a note about installing the jekyll-gist gem to make gist tag work (#4101) + * Align hooks documentation with implementation (#4104) + * Add Jekyll Flickr Plugin to the list of third party plugins (#4111) + * Remove link to now-deleted blog post (#4125) + * Update the liquid syntax in the pagination docs (#4130) + * Add jekyll-language-plugin to plugins.md (#4134) + * Updated to reflect feedback in #4129 (#4137) + * Clarify assets.md based on feedback of #4129 (#4142) + * Re-correct the liquid syntax in the pagination docs (#4140) + +## 3.0.0 / 2015-10-26 + +### Major Enhancements + + * Liquid profiler (i.e. know how fast or slow your templates render) (#3762) + * Incremental regeneration (#3116) + * Add Hooks: a new kind of plugin (#3553) + * Upgrade to Liquid 3.0.0 (#3002) + * `site.posts` is now a Collection instead of an Array (#4055) + * Add basic support for JRuby (commit: 0f4477) + * Drop support for Ruby 1.9.3. (#3235) + * Support Ruby v2.2 (#3234) + * Support RDiscount 2 (#2767) + * Remove most runtime deps (#3323) + * Move to Rouge as default highlighter (#3323) + * Mimic GitHub Pages `.html` extension stripping behavior in WEBrick (#3452) + * Always include file extension on output files (#3490) + * Improved permalinks for pages and collections (#3538) + * Sunset (i.e. remove) Maruku (#3655) + * Remove support for relative permalinks (#3679) + * Iterate over `site.collections` as an array instead of a hash. (#3670) + * Adapt StaticFile for collections, config defaults (#3823) + * Add a Code of Conduct for the Jekyll project (#3925) + * Added permalink time variables (#3990) + * Add `--incremental` flag to enable incremental regen (disabled by default) (#4059) + +### Minor Enhancements + + * Deprecate access to Document#data properties and Collection#docs methods (#4058) + * Sort static files just once, and call `site_payload` once for all collections (#3204) + * Separate `jekyll docs` and optimize external gem handling (#3241) + * Improve `Site#getConverterImpl` and call it `Site#find_converter_instance` (#3240) + * Use relative path for `path` Liquid variable in Documents for consistency (#2908) + * Generalize `Utils#slugify` for any scripts (#3047) + * Added basic microdata to post template in site template (#3189) + * Store log messages in an array of messages. (#3244) + * Allow collection documents to override `output` property in front matter (#3172) + * Keep file modification times between builds for static files (#3220) + * Only downcase mixed-case categories for the URL (#2571) + * Added per post `excerpt_separator` functionality (#3274) + * Allow collections YAML to end with three dots (#3134) + * Add mode parameter to `slugify` Liquid filter (#2918) + * Perf: `Markdown#matches` should avoid regexp (#3321) + * Perf: Use frozen regular expressions for `Utils#slugify` (#3321) + * Split off Textile support into jekyll-textile-converter (#3319) + * Improve the navigation menu alignment in the site template on small + screens (#3331) + * Show the regeneration time after the initial generation (#3378) + * Site template: Switch default font to Helvetica Neue (#3376) + * Make the `include` tag a teensy bit faster. (#3391) + * Add `pkill -f jekyll` to ways to kill. (#3397) + * Site template: collapsed, variable-driven font declaration (#3360) + * Site template: Don't always show the scrollbar in code blocks (#3419) + * Site template: Remove undefined `text` class from `p` element (#3440) + * Site template: Optimize text rendering for legibility (#3382) + * Add `draft?` method to identify if Post is a Draft & expose to Liquid (#3456) + * Write regeneration metadata even on full rebuild (#3464) + * Perf: Use `String#end_with?("/")` instead of regexp when checking paths (#3516) + * Docs: document 'ordinal' built-in permalink style (#3532) + * Upgrade liquid-c to 3.x (#3531) + * Use consistent syntax for deprecation warning (#3535) + * Added build --destination and --source flags (#3418) + * Site template: remove unused `page.meta` attribute (#3537) + * Improve the error message when sorting null objects (#3520) + * Added liquid-md5 plugin (#3598) + * Documentation: RR replaced with RSpec Mocks (#3600) + * Documentation: Fix subpath. (#3599) + * Create 'tmp' dir for test_tags if it doesn't exist (#3609) + * Extract reading of data from `Site` to reduce responsibilities. (#3545) + * Removed the word 'Jekyll' a few times from the comments (#3617) + * `bin/jekyll`: with no args, exit with exit code 1 (#3619) + * Incremental build if destination file missing (#3614) + * Static files `mtime` liquid should return a `Time` obj (#3596) + * Use `Jekyll::Post`s for both LSI indexing and lookup. (#3629) + * Add `charset=utf-8` for HTML and XML pages in WEBrick (#3649) + * Set log level to debug when verbose flag is set (#3665) + * Added a mention on the Gemfile to complete the instructions (#3671) + * Perf: Cache `Document#to_liquid` and invalidate where necessary (#3693) + * Perf: `Jekyll::Cleaner#existing_files`: Call `keep_file_regex` and + `keep_dirs` only once, not once per iteration (#3696) + * Omit jekyll/jekyll-help from list of resources. (#3698) + * Add basic `jekyll doctor` test to detect fsnotify (OSX) anomalies. (#3704) + * Added talk.jekyllrb.com to "Have questions?" (#3694) + * Performance: Sort files only once (#3707) + * Performance: Marshal metadata (#3706) + * Upgrade highlight wrapper from `div` to `figure` (#3779) + * Upgrade mime-types to `~> 2.6` (#3795) + * Update windows.md with Ruby version info (#3818) + * Make the directory for includes configurable (#3782) + * Rename directory configurations to match `*_dir` convention for consistency (#3782) + * Internal: trigger hooks by owner symbol (#3871) + * Update MIME types from mime-db (#3933) + * Add header to site template `_config.yml` for clarity & direction (#3997) + * Site template: add timezone offset to post date frontmatter (#4001) + * Make a constant for the regex to find hidden files (#4032) + * Site template: refactor github & twitter icons into includes (#4049) + * Site template: add background to Kramdown Rouge-ified backtick code blocks (#4053) + +### Bug Fixes + + * `post_url`: fix access deprecation warning & fix deprecation msg (#4060) + * Perform jekyll-paginate deprecation warning correctly. (#3580) + * Make permalink parsing consistent with pages (#3014) + * `time()`pre-filter method should accept a `Date` object (#3299) + * Remove unneeded end tag for `link` in site template (#3236) + * Kramdown: Use `enable_coderay` key instead of `use_coderay` (#3237) + * Unescape `Document` output path (#2924) + * Fix nav items alignment when on multiple rows (#3264) + * Highlight: Only Strip Newlines/Carriage Returns, not Spaces (#3278) + * Find variables in front matter defaults by searching with relative file path. (#2774) + * Allow variables (e.g `:categories`) in YAML front matter permalinks (#3320) + * Handle nil URL placeholders in permalinks (#3325) + * Template: Fix nav items alignment when in "burger" mode (#3329) + * Template: Remove `!important` from nav SCSS introduced in #3329 (#3375) + * The `:title` URL placeholder for collections should be the filename slug. (#3383) + * Trim the generate time diff to just 3 places past the decimal place (#3415) + * The highlight tag should only clip the newlines before and after the *entire* block, not in between (#3401) + * highlight: fix problem with linenos and rouge. (#3436) + * `Site#read_data_file`: read CSV's with proper file encoding (#3455) + * Ignore `.jekyll-metadata` in site template (#3496) + * Template: Point documentation link to the documentation pages (#3502) + * Removed the trailing slash from the example `/blog` baseurl comment (#3485) + * Clear the regenerator cache every time we process (#3592) + * Readd (bring back) minitest-profile (#3628) + * Add WOFF2 font MIME type to Jekyll server MIME types (#3647) + * Be smarter about extracting the extname in `StaticFile` (#3632) + * Process metadata for all dependencies (#3608) + * Show error message if the YAML front matter on a page/post is invalid. (#3643) + * Upgrade redcarpet to 3.2 (Security fix: OSVDB-120415) (#3652) + * Create #mock_expects that goes directly to RSpec Mocks. (#3658) + * Open `.jekyll-metadata` in binary mode to read binary Marshal data (#3713) + * Incremental regeneration: handle deleted, renamed, and moved dependencies (#3717) + * Fix typo on line 19 of pagination.md (#3760) + * Fix it so that 'blog.html' matches 'blog.html' (#3732) + * Remove occasionally-problematic `ensure` in `LiquidRenderer` (#3811) + * Fixed an unclear code comment in site template SCSS (#3837) + * Fix reading of binary metadata file (#3845) + * Remove var collision with site template header menu iteration variable (#3838) + * Change non-existent `hl_linenos` to `hl_lines` to allow passthrough in safe mode (#3787) + * Add missing flag to disable the watcher (#3820) + * Update CI guide to include more direct explanations of the flow (#3891) + * Set `future` to `false` in the default config (#3892) + * filters: `where` should compare stringified versions of input & comparator (#3935) + * Read build options for `jekyll clean` command (#3828) + * Fix #3970: Use Gem::Version to compare versions, not `>`. + * Abort if no subcommand. Fixes confusing message. (#3992) + * Whole-post excerpts should match the post content (#4004) + * Change default font weight to 400 to fix bold/strong text issues (#4050) + * Document: Only auto-generate the excerpt if it's not overridden (#4062) + * Utils: `deep_merge_hashes` should also merge `default_proc` (45f69bb) + * Defaults: compare paths in `applies_path?` as `String`s to avoid confusion (7b81f00) + +### Development Fixes + + * Remove loader.rb and "modernize" `script/test`. (#3574) + * Improve the grammar in the documentation (#3233) + * Update the LICENSE text to match the MIT license exactly (#3253) + * Update rake task `site:publish` to fix minor bugs. (#3254) + * Switch to shields.io for the README badges. (#3255) + * Use `FileList` instead of `Dir.glob` in `site:publish` rake task (#3261) + * Fix test script to be platform-independent (#3279) + * Instead of symlinking `/tmp`, create and symlink a local `tmp` in the tests (#3258) + * Fix some spacing (#3312) + * Fix comment typo in `lib/jekyll/frontmatter_defaults.rb` (#3322) + * Move all `regenerate?` checking to `Regenerator` (#3326) + * Factor out a `read_data_file` call to keep things clean (#3380) + * Proof the site with CircleCI. (#3427) + * Update LICENSE to 2015. (#3477) + * Upgrade tests to use Minitest (#3492) + * Remove trailing whitespace (#3497) + * Use `fixture_site` for Document tests (#3511) + * Remove adapters deprecation warning (#3529) + * Minor fixes to `url.rb` to follow GitHub style guide (#3544) + * Minor changes to resolve deprecation warnings (#3547) + * Convert remaining textile test documents to markdown (#3528) + * Migrate the tests to use rspec-mocks (#3552) + * Remove `activesupport` (#3612) + * Added tests for `Jekyll:StaticFile` (#3633) + * Force minitest version to 5.5.1 (#3657) + * Update the way cucumber accesses Minitest assertions (#3678) + * Add `script/rubyprof` to generate cachegrind callgraphs (#3692) + * Upgrade cucumber to 2.x (#3795) + * Update Kramdown. (#3853) + * Updated the scripts shebang for portability (#3858) + * Update JRuby testing to 9K ([3ab386f](https://github.com/jekyll/jekyll/commit/3ab386f1b096be25a24fe038fc70fd0fb08d545d)) + * Organize dependencies into dev and test groups. (#3852) + * Contributing.md should refer to `script/cucumber` (#3894) + * Update contributing documentation to reflect workflow updates (#3895) + * Add script to vendor mime types (#3933) + * Ignore .bundle dir in SimpleCov (#4033) + +### Site Enhancements + + * Add 'info' labels to certain notes in collections docs (#3601) + * Remove extra spaces, make the last sentence less awkward in permalink docs (#3603) + * Update the permalinks documentation to reflect the updates for 3.0 (#3556) + * Add blog post announcing Jekyll Help (#3523) + * Add Jekyll Talk to Help page on site (#3518) + * Change Ajax pagination resource link to use HTTPS (#3570) + * Fixing the default host on docs (#3229) + * Add `jekyll-thumbnail-filter` to list of third-party plugins (#2790) + * Add link to 'Adding Ajax pagination to Jekyll' to Resources page (#3186) + * Add a Resources link to tutorial on building dynamic navbars (#3185) + * Semantic structure improvements to the post and page layouts (#3251) + * Add new AsciiDoc plugin to list of third-party plugins. (#3277) + * Specify that all transformable collection documents must contain YAML front matter (#3271) + * Assorted accessibility fixes (#3256) + * Update configuration docs to mention `keep_files` for `destination` (#3288, #3296) + * Break when we successfully generate nav link to save CPU cycles. (#3291) + * Update usage docs to mention `keep_files` and a warning about `destination` cleaning (#3295) + * Add logic to automatically generate the `next_section` and `prev_section` navigation items (#3292) + * Some small fixes for the Plugins TOC. (#3306) + * Added versioning comment to configuration file (#3314) + * Add `jekyll-minifier` to list of third-party plugins (#3333) + * Add blog post about the Jekyll meet-up (#3332) + * Use `highlight` Liquid tag instead of the four-space tabs for code (#3336) + * 3.0.0.beta1 release post (#3346) + * Add `twa` to the list of third-party plugins (#3384) + * Remove extra spaces (#3388) + * Fix small grammar errors on a couple pages (#3396) + * Fix typo on Templates docs page (#3420) + * s/three/four for plugin type list (#3424) + * Release jekyllrb.com as a locally-compiled site. (#3426) + * Add a jekyllrb.com/help page which elucidates places from which to get help (#3428) + * Remove extraneous dash on Plugins doc page which caused a formatting error (#3431) + * Fix broken link to Jordan Thornquest's website. (#3438) + * Change the link to an extension (#3457) + * Fix Twitter link on the help page (#3466) + * Fix wording in code snippet highlighting section (#3475) + * Add a `/` to `paginate_path` in the Pagination documentation (#3479) + * Add a link on all the docs pages to "Improve this page". (#3510) + * Add jekyll-auto-image generator to the list of third-party plugins (#3489) + * Replace link to the proposed `picture` element spec (#3530) + * Add frontmatter date formatting information (#3469) + * Improve consistency and clarity of plugins options note (#3546) + * Add permalink warning to pagination docs (#3551) + * Fix grammar in Collections docs API stability warning (#3560) + * Restructure `excerpt_separator` documentation for clarity (#3550) + * Fix accidental line break in collections docs (#3585) + * Add information about the `.jekyll-metadata` file (#3597) + * Document addition of variable parameters to an include (#3581) + * Add `jekyll-files` to the list of third-party plugins. (#3586) + * Define the `install` step in the CI example `.travis.yml` (#3622) + * Expand collections documentation. (#3638) + * Add the "warning" note label to excluding `vendor` in the CI docs page (#3623) + * Upgrade pieces of the Ugrading guide for Jekyll 3 (#3607) + * Showing how to access specific data items (#3468) + * Clarify pagination works from within HTML files (#3467) + * Add note to `excerpt_separator` documentation that it can be set globally (#3667) + * Fix some names on Troubleshooting page (#3683) + * Add `remote_file_content` tag plugin to list of third-party plugins (#3691) + * Update the Redcarpet version on the Configuration page. (#3743) + * Update the link in the welcome post to point to Jekyll Talk (#3745) + * Update link for navbars with data attributes tutorial (#3728) + * Add `jekyll-asciinema` to list of third-party plugins (#3750) + * Update pagination example to be agnostic to first pagination dir (#3763) + * Detailed instructions for rsync deployment method (#3848) + * Add Jekyll Portfolio Generator to list of plugins (#3883) + * Add `site.html_files` to variables docs (#3880) + * Add Static Publisher tool to list of deployment methods (#3865) + * Fix a few typos. (#3897) + * Add `jekyll-youtube` to the list of third-party plugins (#3931) + * Add Views Router plugin (#3950) + * Update install docs (Core dependencies, Windows reqs, etc) (#3769) + * Use Jekyll Feed for jekyllrb.com (#3736) + * Add jekyll-umlauts to plugins.md ($3966) + * Troubleshooting: fix broken link, add other mac-specific info (#3968) + * Add a new site for learning purposes (#3917) + * Added documentation for Jekyll environment variables (#3989) + * Fix broken configuration documentation page (#3994) + * Add troubleshooting docs for installing on El Capitan (#3999) + * Add Lazy Tweet Embedding to the list of third-party plugins (#4015) + * Add installation instructions for 2 of 3 options for plugins (#4013) + * Add alternative jekyll gem installation instructions (#4018) + * Fix a few typos and formatting problems. (#4022) + * Fix pretty permalink example (#4029) + * Note that `_config.yml` is not reloaded during regeneration (#4034) + * Apply code block figure syntax to blocks in CONTRIBUTING (#4046) + * Add jekyll-smartify to the list of third-party plugins (#3572) + +## 2.5.3 / 2014-12-22 + +### Bug Fixes + + * When checking a Markdown extname, include position of the `.` (#3147) + * Fix `jsonify` Liquid filter handling of boolean values (#3154) + * Add comma to value of `viewport` meta tag (#3170) + * Set the link type for the RSS feed to `application/rss+xml` (#3176) + * Refactor `#as_liquid` (#3158) + +### Development Fixes + + * Exclude built-in bundles from being added to coverage report (#3180) + +### Site Enhancements + + * 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) + * Repeat warning about cleaning of the `destination` directory (#3161) + * Add jekyll-500px-embed to list of third-party plugins (#3163) + * Simplified platform detection in Gemfile example for Windows (#3177) + * Add the `jekyll-jalali` plugin added to the list of third-party plugins. (#3198) + * Add Table of Contents to Troubleshooting page (#3196) + * Add `inline_highlight` plugin to list of third-party plugins (#3212) + * Add `jekyll-mermaid` plugin to list of third-party plugins (#3222) + +## 2.5.2 / 2014-11-17 + +### Minor Enhancements + + * `post_url` should match `post.name` instead of slugs and dates (#3058) + +### Bug Fixes + + * Fix bundle require for `:jekyll_plugins` (#3119) + * Remove duplicate regexp phrase: `^\A` (#3089) + * Remove duplicate `Conversion error:` message in `Convertible` (#3088) + * Print full conversion error message in `Renderer#convert` (#3090) + +### Site Enhancements + + * Change variable names in Google Analytics script (#3093) + * Mention CSV files in the docs for data files (#3101) + * Add trailing slash to `paginate_path` example. (#3091) + * Get rid of noifniof (`excerpt_separator`) (#3094) + * Sass improvements, around nesting mostly. (#3123) + * Add webmentions.io plugin to the list of third-party plugins (#3127) + * Add Sass mixins and use them. (#2904) + * Slightly compress jekyll-sticker.jpg. (#3133) + * Update gridism and separate out related but custom styles. (#3132) + * Add remote-include plugin to list of third-party plugins (#3136) + +## 2.5.1 / 2014-11-09 + +### Bug Fixes + + * Fix path sanitation bug related to Windows drive names (#3077) + +### Development Fixes + + * Add development time dependencies on minitest and test-unit to gemspec for cygwin (#3064) + * Use Travis's built-in caching. (#3075) + +## 2.5.0 / 2014-11-06 + +### Minor Enhancements + + * Require gems in `:jekyll_plugins` Gemfile group unless `JEKYLL_NO_BUNDLER_REQUIRE` is specified in the environment. (#2865) + * Centralize path sanitation in the `Site` object (#2882) + * Allow placeholders in permalinks (#3031) + * Allow users to specify the log level via `JEKYLL_LOG_LEVEL`. (#3067) + * Fancy Indexing with WEBrick (#3018) + * Allow Enumerables to be used with `where` filter. (#2986) + * Meta descriptions in the site template now use `page.excerpt` if it's available (#2964) + * Change indentation in `head.html` of site template to 2 spaces from 4 (#2973) + * Use a `$content-width` variable instead of a fixed value in the site template CSS (#2972) + * Strip newlines in site template `` description. (#2982) + * Add link to atom feed in `head` of site template files (#2996) + * Performance optimizations (#2994) + * Use `Hash#each_key` instead of `Hash#keys.each` to speed up iteration + over hash keys. (#3017) + * Further minor performance enhancements. (#3022) + * Add 'b' and 's' aliases for build and serve, respectively (#3065) + +### Bug Fixes + + * Fix Rouge's RedCarpet plugin interface integration (#2951) + * Remove `--watch` from the site template blog post since it defaults + to watching in in 2.4.0 (#2922) + * Fix code for media query mixin in site template (#2946) + * Allow post URL's to have `.htm` extensions (#2925) + * `Utils.slugify`: Don't create new objects when gsubbing (#2997) + * The jsonify filter should deep-convert to Liquid when given an Array. (#3032) + * Apply `jsonify` filter to Hashes deeply and effectively (#3063) + * Use `127.0.0.1` as default host instead of `0.0.0.0` (#3053) + * In the case that a Gemfile does not exist, ensure Jekyll doesn't fail on requiring the Gemfile group (#3066) + +### Development Fixes + + * Fix a typo in the doc block for `Jekyll::URL.escape_path` (#3052) + * Add integration test for `jekyll new --blank` in TestUnit (#2913) + * Add unit test for `jekyll new --force` logic (#2929) + * Update outdated comment for `Convertible#transform` (#2957) + * Add Hakiri badge to README. (#2953) + * Add some simple benchmarking tools. (#2993) + +### Site Enhancements + + * `NOKOGIRI_USE_SYSTEM_LIBRARIES=true` **decreases** installation time. (#3040) + * Add FormKeep to resources as Jekyll form backend (#3010) + * Fixing a mistake in the name of the new Liquid tag (#2969) + * Update Font Awesome to v4.2.0. (#2898) + * Fix link to #2895 in 2.4.0 release post. (#2899) + * Add Big Footnotes for Kramdown plugin to list of third-party plugins (#2916) + * Remove warning regarding GHP use of singular types for front matter defaults (#2919) + * Fix quote character typo in site documentation for templates (#2917) + * Point Liquid links to Liquid’s GitHub wiki (#2887) + * Add HTTP Basic Auth (.htaccess) plugin to list of third-party plugins (#2931) + * (Minor) Grammar & `_config.yml` filename fixes (#2911) + * Added `mathml.rb` to the list of third-party plugins. (#2937) + * Add `--force_polling` to the list of configuration options (#2943) + * Escape unicode characters in site CSS (#2906) + * Add note about using the github-pages gem via pages.github.com/versions.json (#2939) + * Update usage documentation to reflect 2.4 auto-enabling of `--watch`. (#2954) + * Add `--skip-initial-build` to configuration docs (#2949) + * Fix a minor typo in Templates docs page (#2959) + * Add a ditaa-ditaa plugin under Other section on the Plugins page (#2967) + * Add `build/serve -V` option to configuration documentation (#2948) + * Add 'Jekyll Twitter Plugin' to list of third-party plugins (#2979) + * Docs: Update normalize.css to v3.0.2. (#2981) + * Fix typo in Continuous Integration documentation (#2984) + * Clarify behavior of `:categories` in permalinks (#3011) + +## 2.4.0 / 2014-09-09 + +### Minor Enhancements + + * Support a new `relative_include` tag (#2870) + * Auto-enable watch on 'serve' (#2858) + * Render Liquid in CoffeeScript files (#2830) + * Array Liquid filters: `push`, `pop`, `unshift`, `shift` (#2895) + * Add `:title` to collection URL template fillers (#2864) + * Add support for CSV files in the `_data` directory (#2761) + * Add the `name` variable to collection permalinks (#2799) + * Add `inspect` liquid filter. (#2867) + * Add a `slugify` Liquid filter (#2880) + +### Bug Fixes + + * Use `Jekyll.sanitized_path` when adding static files to Collections (#2849) + * Fix encoding of `main.scss` in site template (#2771) + * Fix orientation bugs in default site template (#2862) + +### Development Fixes + + * Update simplecov gem to 0.9 (#2748) + * Remove `docs/` dir (#2768) + * add class `<< self` idiom to `New` command (#2817) + * Allow Travis to 'parallelize' our tests (#2859) + * Fix test for Liquid rendering in Sass (#2856) + * Fixing "vertycal" typo in site template's `_base.scss` (#2889) + +### Site Enhancements + + * Document the `name` variable for collection permalinks (#2829) + * Adds info about installing jekyll in current dir (#2839) + * Remove deprecated `jekyll-projectlist` plugin from list of third-party + plugins (#2742) + * Remove tag plugins that are built in to Jekyll (#2751) + * Add `markdown-writer` package for Atom Editor to list of third-party + plugins (#2763) + * Fix typo in site documentation for collections (#2764) + * Fix minor typo on plugins docs page (#2765) + * Replace markdown with HTML in `sass_dir` note on assets page (#2791) + * Fixed "bellow" typo in datafiles docs (#2879) + * Fix code/markdown issue in documentation for variables (#2877) + * Remove Good Include third-party plugin from plugins page (#2881) + * Add some more docs on `include_relative` (#2884) + +## 2.3.0 / 2014-08-10 + +### Minor Enhancements + + * Allow Convertibles to be converted by >= 1 converters (#2704) + * Allow Sass files to be rendered in Liquid, but never place them in layouts. (#2733) + * Add `jekyll help` command (#2707) + * Use `.scss` for `site_template` styles. (#2667) + * Don't require the `scope` key in front matter defaults (#2659) + * No longer set `permalink: pretty` in the `_config.yml` for the site template (#2680) + * Rework site template to utilize Sass (#2687) + * Notify the user when auto-regeneration is disabled. (#2696) + * Allow partial variables in include tag filename argument (#2693) + * Move instances of `Time.parse` into a Utils method (#2682) + * Ignore subfolders in the `_posts` folder (#2705) REVERTS (#2633) + * Front Matter default types should always be pluralized (#2732) + * Read in static files into `collection.files` as `StaticFile`s (#2737) + * Add `sassify` and `scssify` Liquid filters (#2739) + * Replace `classifier` gem with `classifier-reborn` (#2721) + +### Bug Fixes + + * Use only the last extname when multiple converters exist (#2722) + * Call `#to_liquid` before calling `#to_json` in jsonify filter (#2729) + * Use non padded config in `strftime` to avoid parse string twice (#2673) + * Replace deprecated Ruby methods with undeprecated ones (#2664) + * Catch errors when parsing Post `date` front matter value & produce nice error message (#2649) + * Allow static files in Collections (#2615) + * Fixed typo in `Deprecator#gracefully_require` error message (#2694) + * Remove preemptive loading of the 'classifier' gem. (#2697) + * Use case-insensitive checking for the file extensions when loading config files (#2718) + * When Reading Documents, Respect `encoding` Option (#2720) + * Refactor based on jekyll-watch clean-up. (#2716) + * `Document#to_s` should produce just the content of the document (#2731) + +### Development Fixes + + * Only include lib files in the gem (#2671) + * Fix `git diff` command in `proof` script (#2672) + * Make default rake task a multitask so tests run in parallel (#2735) + +### Site Enhancements + + * Use Sass and a Docs Collection (#2651) + * Add `latest_version.txt` file to the site (#2740) + * Be more ambiguous about `page.content`. But more transparent. (#2522) + * Streamlining front matter wording (instead of front-matter/frontmatter) (#2674) + * Add note that source directory cannot be modified in GitHub Pages (#2669) + * Fix links from #2669 to be actual HTML. Whoops. (#2679) + * Add link to `jekyll-slim` in list of third-party plugins (#2689) + * Add Barry Clark's Smashing Magazine tutorial to resources page (#2688) + * Reorganize and update default configuration settings (#2456) + * Fixing indentation in the configuration docs about Redcarpet exts (#2717) + * Use `null` in YAML instead of `nil` in default config list (#2719) + * Fix typo in Continuous Integration docs (#2708) + +## 2.2.0 / 2014-07-29 + +### Minor Enhancements + + * Throw a warning if the specified layout does not exist (#2620) + * Whitelist Pygments options in safe mode (#2642) + +### Bug Fixes + + * Remove unnecessary `Jekyll::Tags::IncludeTag#blank?` method (#2625) + * Categories in the path are ignored (#2633) + +### Development Fixes + + * Refactoring Errors & Requires of Third-Party stuff (#2591) + * Add further tests for categories (#2584) + * Proof site with html-proofer on change (#2605) + * Fix up bug in #2605 which caused proofing the site not to function (#2608) + * Use `bundle exec` in `script/proof` (#2610) + +### Site Enhancements + + * Update Kramdown urls (#2588) + * Add `Jekyll::AutolinkEmail` and `Jekyll::GitMetadata` to the list of + third-party plugins (#2596) + * Fix a bunch of broken links in the site (#2601) + * Replace dead links with working links (#2611) + * Add jekyll-hook to deployment methods (#2617) + * Added kramdown-with-pygments plugin to the list of third-party plugins (#2623) + * Update outdated "Extras" page and remove duplicate documentation (#2622) + * Add co2 plugin to list of third-party plugins (#2639) + * Attempt to clarify the way Sass imports happen (#2642) + +## 2.1.1 / 2014-07-01 + +### Bug Fixes + + * Patch read vulnerabilities for data & confirm none for layouts (#2563) + * Update Maruku dependency to allow use of the latest version (#2576) + * Remove conditional assignment from document URL to prevent stale urls (#2575) + +### Site Enhancements + + * Add vertical margin to `highlight` to separate code blocks (#2558) + * Add `html_pages` to Variables docs (#2567) + * Fixed broken link to Permalinks page (#2572) + * Update link to Windows installation guide (#2578) + +## 2.1.0 / 2014-06-28 + +### Minor Enhancements + + * Bump to the latest Liquid version, 2.6.1 (#2495) + * Add support for JSON files in the `_data` directory (#2369) + * Allow subclasses to override `EXCERPT_ATTRIBUTES_FOR_LIQUID` (#2408) + * Add `Jekyll.env` and `jekyll.environment` (the Liquid var) (#2417) + * Use `_config.yaml` or `_config.yml` (`.yml` takes precedence) (#2406) + * Override collection url template (#2418) + * Allow subdirectories in `_data` (#2395) + * Extract Pagination Generator into gem: `jekyll-paginate` (#2455) + * Utilize `date_to_rfc822` filter in site template (#2437) + * Add categories, last build datetime, and generator to site template + feed (#2438) + * Configurable, replaceable Logger-compliant logger (#2444) + * Extract `gist` tag into a separate gem (#2469) + * Add `collection` attribute to `Document#to_liquid` to access the + document's collection label. (#2436) + * Upgrade listen to `2.7.6 <= x < 3.0.0` (#2492) + * Allow configuration of different Twitter and GitHub usernames in site template (#2485) + * Bump Pygments to v0.6.0 (#2504) + * Front matter defaults for documents in collections (#2419) + * Include files with a url which ends in `/` in the `site.html_pages` list (#2524) + * Make `highlight` tag use `language-` prefix in CSS class (#2511) + * Lookup item property via `item#to_liquid` before `#data` or `#[]` in filters (#2493) + * Skip initial build of site on serve with flag (#2477) + * Add support for `hl_lines` in `highlight` tag (#2532) + * Spike out `--watch` flag into a separate gem (#2550) + +### Bug Fixes + + * Liquid `sort` filter should sort even if one of the values is `nil` (#2345) + * Remove padding on `pre code` in the site template CSS (#2383) + * Set `log_level` earlier to silence info level configuration output (#2393) + * Only list pages which have `title` in site template (#2411) + * Accept `Numeric` values for dates, not `Number` values (#2377) + * Prevent code from overflowing container in site template (#2429) + * Encode URLs in UTF-8 when escaping and unescaping (#2420) + * No Layouts or Liquid for Asset Files (#2431) + * Allow front matter defaults to set post categories (#2373) + * Fix command in subcommand deprecation warning (#2457) + * Keep all parent directories of files/dirs in `keep_files` (#2458) + * When using RedCarpet and Rouge without Rouge installed, fixed erroneous + error which stated that redcarpet was missing, not rouge. (#2464) + * Ignore *all* directories and files that merit it on auto-generation (#2459) + * Before copying file, explicitly remove the old one (#2535) + * Merge file system categories with categories from YAML. (#2531) + * Deep merge front matter defaults (#2490) + * Ensure exclude and include arrays are arrays of strings (#2542) + * Allow collections to have dots in their filenames (#2552) + * Collections shouldn't try to read in directories as files (#2552) + * Be quiet very quickly. (#2520) + +### Development Fixes + + * Test Ruby 2.1.2 instead of 2.1.1 (#2374) + * Add test for sorting UTF-8 characters (#2384) + * Use `https` for GitHub links in documentation (#2470) + * Remove coverage reporting with Coveralls (#2494) + * Fix a bit of missing TomDoc to `Jekyll::Commands::Build#build` (#2554) + +### Site Enhancements + + * Set `timezone` to `America/Los_Angeles` (#2394) + * Improve JavaScript in `anchor_links.html` (#2368) + * Remove note on Quickstart page about default markdown converter (#2387) + * Remove broken link in extras.md to a Maruku fork (#2401) + * Update Font Awesome to v4.1.0. (#2410) + * Fix broken link on Installation page to Templates page (#2421) + * Prevent table from extending parent width in permalink style table (#2424) + * Add collections to info about pagination support (#2389) + * Add `jekyll_github_sample` plugin to list of third-party plugins (#2463) + * Clarify documentation around front matter defaults and add details + about defaults for collections. (#2439) + * Add Jekyll Project Version Tag to list of third-party plugins (#2468) + * Use `https` for GitHub links across whole site (#2470) + * Add StickerMule + Jekyll post (#2476) + * Add Jekyll Asset Pipeline Reborn to list of third-party plugins (#2479) + * Add link to jekyll-compress-html to list of third-party plugins (#2514) + * Add Piwigo Gallery to list of third-party plugins (#2526) + * Set `show_drafts` to `false` in default configuration listing (#2536) + * Provide an updated link for Windows installation instructions (#2544) + * Remove `url` from configuration docs (#2547) + * Documentation for Continuous Integration for your Jekyll Site (#2432) + +## 2.0.3 / 2014-05-08 + +### Bug Fixes + + * Properly prefix links in site template with URL or baseurl depending upon + need. (#2319) + * Update gist tag comments and error message to require username (#2326) + * Fix `permalink` setting in site template (#2331) + * Don't fail if any of the path objects are nil (#2325) + * Instantiate all descendants for converters and generators, not just + direct subclasses (#2334) + * Replace all instances of `site.name` with `site.title` in site template (#2324) + * `Jekyll::Filters#time` now accepts UNIX timestamps in string or number form (#2339) + * Use `item_property` for `where` filter so it doesn't break on collections (#2359) + * Rescue errors thrown so `--watch` doesn't fail (#2364) + +### Site Enhancements + + * Add missing "as" to assets docs page (#2337) + * Update docs to reflect new `baseurl` default (#2341) + * Add links to headers who have an ID. (#2342) + * Use symbol instead of HTML number in `upgrading.md` (#2351) + * Fix link to front matter defaults docs (#2353) + * Fix for `History.markdown` in order to fix history page in docs (#2363) + +## 2.0.2 / 2014-05-07 + +### Bug Fixes + + * Correct use of `url` and `baseurl` in the site template. (#2317) + * Default `baseurl` to `""` (#2317) + +### Site Enhancements + + * Correct docs for the `gist` plugin so it always includes the username. (#2314) + * Clarify new (defaults, `where` filter) features in docs (#2316) + +## 2.0.1 / 2014-05-06 + +### Bug Fixes + + * Require `kramdown` gem instead of `maruku` gem + +## 2.0.0 / 2014-05-06 + +### Major Enhancements + * Add "Collections" feature (#2199) + * Add gem-based plugin whitelist to safe mode (#1657) + * Replace the commander command line parser with a more robust + solution for our needs called `mercenary` (#1706) + * Remove support for Ruby 1.8.x (#1780) + * Move to jekyll/jekyll from mojombo/jekyll (#1817) + * Allow custom markdown processors (#1872) + * Provide support for the Rouge syntax highlighter (#1859) + * Provide support for Sass (#1932) + * Provide a 300% improvement when generating sites that use + `Post#next` or `Post#previous` (#1983) + * Provide support for CoffeeScript (#1991) + * Replace Maruku with Kramdown as Default Markdown Processor (#1988) + * Expose `site.static_files` to Liquid (#2075) + * Complete redesign of the template site generated by `jekyll new` (#2050) + * Update Listen from 1.x to 2.x (#2097) + * Front matter defaults (#2205) + * Deprecate `relative_permalinks` configuration option (default to `false`) (#2307) + * Exclude files based on prefix as well as `fnmatch?` (#2303) + +### Minor Enhancements + * Move the EntryFilter class into the Jekyll module to avoid polluting the + global namespace (#1800) + * Add `group_by` Liquid filter create lists of items grouped by a common + property's value (#1788) + * Add support for Maruku's `fenced_code_blocks` option (#1799) + * Update Redcarpet dependency to ~> 3.0 (#1815) + * Automatically sort all pages by name (#1848) + * Better error message when time is not parseable (#1847) + * Allow `include` tag variable arguments to use filters (#1841) + * `post_url` tag should raise `ArgumentError` for invalid name (#1825) + * Bump dependency `mercenary` to `~> 0.2.0` (#1879) + * Bump dependency `safe_yaml` to `~> 1.0` (#1886) + * Allow sorting of content by custom properties (#1849) + * Add `--quiet` flag to silence output during build and serve (#1898) + * Add a `where` filter to filter arrays based on a key/value pair + (#1875) + * Route 404 errors to a custom 404 page in development (#1899) + * Excludes are now relative to the site source (#1916) + * Bring MIME Types file for `jekyll serve` to complete parity with GH Pages + servers (#1993) + * Adding Breakpoint to make new site template more responsive (#2038) + * Default to using the UTF-8 encoding when reading files. (#2031) + * Update Redcarpet dependency to ~> 3.1 (#2044) + * Remove support for Ruby 1.9.2 (#2045) + * Add `.mkdown` as valid Markdown extension (#2048) + * Add `index.xml` to the list of WEBrick directory index files (#2041) + * Make the `layouts` config key relative to CWD or to source (#2058) + * Update Kramdown to `~> 1.3` (#1894) + * Remove unnecessary references to `self` (#2090) + * Update to Mercenary v0.3.x (#2085) + * Ship Sass support as a separate gem (#2098) + * Extract core extensions into a Utils module (#2112) + * Refactor CLI & Commands For Greater Happiness (#2143) + * Provide useful error when Pygments returns `nil` and error out (#2148) + * Add support for unpublished drafts (#2164) + * Add `force_polling` option to the `serve` command (#2165) + * Clean up the `` in the site template (#2186) + * Permit YAML blocks to end with three dots to better conform with the + YAML spec (#2110) + * Use `File.exist?` instead of deprecated `File.exists?` (#2214) + * Require newline after start of YAML Front Matter header (#2211) + * Add the ability for pages to be marked as `published: false` (#1492) + * Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy + looking up of variable values in a Liquid context. (#2253) + * Remove literal lang name from class (#2292) + * Return `utf-8` encoding in header for webrick error page response (#2289) + * Make template site easier to customize (#2268) + * Add two-digit year to permalink template option (#2301) + * Add `site.documents` to Liquid payload (list of all docs) (#2295) + * Take into account missing values in the Liquid sort filter (#2299) + +### Bug Fixes + * Don't allow nil entries when loading posts (#1796) + * Remove the scrollbar that's always displayed in new sites generated + from the site template (#1805) + * Add `#path` to required methods in `Jekyll::Convertible` (#1866) + * Default Maruku fenced code blocks to ON for 2.0.0-dev (#1831) + * Change short opts for host and port for `jekyll docs` to be consistent with + other subcommands (#1877) + * Fix typos (#1910) + * Lock Maruku at 0.7.0 to prevent bugs caused by Maruku 0.7.1 (#1958) + * Fixes full path leak to source directory when using include tag (#1951) + * Don't generate pages that aren't being published (#1931) + * Use `SafeYAML.load` to avoid conflicts with other projects (#1982) + * Relative posts should never fail to build (#1976) + * Remove executable bits of non executable files (#2056) + * `#path` for a draft is now `_drafts` instead of `_posts` (#2042) + * Patch a couple show-stopping security vulnerabilities (#1946) + * Sanitize paths uniformly, in a Windows-friendly way (#2065, #2109) + * Update gem build steps to work correctly on Windows (#2118) + * Remove obsolete `normalize_options` method call from `bin/jekyll` (#2121). + * Remove `+` characters from Pygments lexer names when adding as a CSS + class (#994) + * Remove some code that caused Ruby interpreter warnings (#2178) + * Only strip the drive name if it begins the string (#2175) + * Remove default post with invalid date from site template (#2200) + * Fix `Post#url` and `Page#url` escape (#1568) + * Strip newlines from the `{% highlight %}` block content (#1823) + * Load in `rouge` only when it's been requested as the highlighter (#2189) + * Convert input to string before XML escaping (`xml_escape` liquid filter) (#2244) + * Modify configuration key for Collections and reset properly. (#2238) + * Avoid duplicated output using `highlight` tag (#2264) + * Only use Jekyll.logger for output (#2307) + * Close the file descriptor in `has_yaml_header?` (#2310) + * Add `output` to `Document` liquid output hash (#2309) + +### Development Fixes + * Add a link to the site in the README.md file (#1795) + * Add in History and site changes from `v1-stable` branch (#1836) + * Testing additions on the Excerpt class (#1893) + * Fix the `highlight` tag feature (#1859) + * Test Jekyll under Ruby 2.1.0 (#1900) + * Add script/cibuild for fun and profit (#1912) + * Use `Forwardable` for delegation between `Excerpt` and `Post` + (#1927) + * Rename `read_things` to `read_content` (#1928) + * Add `script/branding` script for ASCII art lovin' (#1936) + * Update the README to reflect the repo move (#1943) + * Add the project vision to the README (#1935) + * Speed up Travis CI builds by using Rebund (#1985) + * Use Yarp as a Gem proxy for Travis CI (#1984) + * Remove Yarp as a Gem proxy for Travis CI (#2004) + * Move the reading of layouts into its own class (#2020) + * Test Sass import (#2009) + * Switch Maruku and Kramdown in lists of Runtime vs. Development dependencies (#2049) + * Clean up the gemspec for the project (#2095) + * Add Japanese translation of README and CONTRIBUTING docs. (#2081) + * Re-align the tables in Cucumber (#2108) + * Trim trailing spaces and convert tabs to spaces (#2122) + * Fix the failing Travis scenarios due to Cucumber issues (#2155) + * Wrap `bundle install` in `travis_retry` to retry when RubyGems fails (#2160) + * Refactor tags and categories (#1639) + * Extract plugin management into its own class (#2197) + * Add missing tests for `Command` (#2216) + * Update `rr` link in CONTRIBUTING doc (#2247) + * Streamline Cucumber execution of `jekyll` subcommands (#2258) + * Refactor `Commands::Serve`. (#2269) + * Refactor `highlight` tag (#2154) + * Update `Util` hash functions with latest from Rails (#2273) + * Workaround for Travis bug (#2290) + +### Site Enhancements + * Document Kramdown's GFM parser option (#1791) + * Move CSS to includes & update normalize.css to v2.1.3 (#1787) + * Minify CSS only in production (#1803) + * Fix broken link to installation of Ruby on Mountain Lion blog post on + Troubleshooting docs page (#1797) + * Fix issues with 1.4.1 release blog post (#1804) + * Add note about deploying to OpenShift (#1812) + * Collect all Windows-related docs onto one page (#1818) + * Fixed typo in datafiles doc page (#1854) + * Clarify how to access `site` in docs (#1864) + * Add closing `` tag to `context.registers[:site]` note (#1867) + * Fix link to @mojombo's site source (#1897) + * Add `paginate: nil` to default configuration in docs (#1896) + * Add link to our License in the site footer (#1889) + * Add a charset note in "Writing Posts" doc page (#1902) + * Disallow selection of path and prompt in bash examples + * Add jekyll-compass to the plugin list (#1923) + * Add note in Posts docs about stripping `

` tags from excerpt (#1933) + * Add additional info about the new exclude behavior (#1938) + * Linkify 'awesome contributors' to point to the contributors graph on + GitHub (#1940) + * Update `docs/sites.md` link to GitHub Training materials (#1949) + * Update `master` with the release info from 1.4.3 (#1947) + * Define docs nav in datafile (#1953) + * Clarify the docs around the naming convention for posts (#1971) + * Add missing `next` and `previous` docs for post layouts and templates (#1970) + * Add note to `Writing posts` page about how to strip html from excerpt (#1962) + * Add `jekyll-humanize` plugin to plugin list (#1998) + * Add `jekyll-font-awesome` plugin to plugin list (#1999) + * Add `sublime-jekyll` to list of Editor plugins (#2001) + * Add `vim-jekyll` to the list of Editor plugins (#2005) + * Fix non-semantic nesting of `p` tags in `news_item` layout (#2013) + * Document destination folder cleaning (#2016) + * Updated instructions for NearlyFreeSpeech.NET installation (#2015) + * Update link to rack-jekyll on "Deployment Methods" page (#2047) + * Fix typo in /docs/configuration (#2073) + * Fix count in docs for `site.static_files` (#2077) + * Update configuration docs to indicate utf-8 is the default for 2.0.0 + and ASCII for 1.9.3 (#2074) + * Add info about unreleased feature to the site (#2061) + * Add whitespace to liquid example in GitHub Pages docs (#2084) + * Clarify the way Sass and CoffeeScript files are read in and output (#2067) + * Add lyche gallery tag plugin link to list of plugins (#2094) + * Add Jekyll Pages Directory plugin to list of plugins (#2096) + * Update Configuration docs page with new markdown extension (#2102) + * Add `jekyll-image-set` to the list of third-party plugins (#2105) + * Losslessly compress images (#2128) + * Update normalize.css to 3.0.0 (#2126) + * Update modernizr to v2.7.1 (#2129) + * Add `jekyll-ordinal` to list of third-party plugins (#2150) + * Add `jekyll_figure` to list of third-party plugins (#2158) + * Clarify the documentation for safe mode (#2163) + * Some HTML tidying (#2130) + * Remove modernizr and use html5shiv.js directly for IE less than v9 (#2131) + * Remove unused images (#2187) + * Use `array_to_sentence_string` filter when outputting news item + categories (#2191) + * Add link to Help repo in primary navigation bar (#2177) + * Switch to using an ico file for the shortcut icon (#2193) + * Use numbers to specify font weights and only bring in font weights used (#2185) + * Add a link to the list of all tz database time zones (#1824) + * Clean-up and improve documentation `feed.xml` (#2192) + * Remove duplicate entry in list of third-party plugins (#2206) + * Reduce the whitespace in the favicon. (#2213) + * Add `jekyll-page-collections` to list of third-party plugins (#2215) + * Add a cross-reference about `post_url` (#2243) + * Add `jekyll-live-tiles` to list of third-party plugins (#2250) + * Fixed broken link to GitHub training material site source (#2257) + * Update link to help repo, now called `jekyll-help` (#2277) + * Fix capitalization of 'Jekyll' on Deployment Methods page (#2291) + * Include plugins by sonnym in list of third-party plugins (#2297) + * Add deprecated articles keeper filter to list of third-party plugins (#2300) + * Simplify and improve our CSS. (#2127) + * Use black text color for the mobile navbar (#2306) + * Use the built in date filter and `site.time` for the copyright year. (#2305) + * Update html5shiv to v3.7.2 (#2304) + * Add 2.0.0 release post (#2298) + * Add docs for custom markdown processors (#2298) + * Add docs for `where` and `group_by` Liquid filters (#2298) + * Remove notes in docs for unreleased features (#2309) + +## 1.5.1 / 2014-03-27 + +### Bug Fixes + + * Only strip the drive name if it begins the string (#2176) + +## 1.5.0 / 2014-03-24 + +### Minor Enhancements + + * Loosen `safe_yaml` dependency to `~> 1.0` (#2167) + * Bump `safe_yaml` dependency to `~> 1.0.0` (#1942) + +### Bug Fixes + + * Fix issue where filesystem traversal restriction broke Windows (#2167) + * Lock `maruku` at `0.7.0` (#2167) + +### Development Fixes + + * Lock `cucumber` at `1.3.11` (#2167) + +## 1.4.3 / 2014-01-13 + +### Bug Fixes + * Patch show-stopping security vulnerabilities (#1944) + +## 1.4.2 / 2013-12-16 + +### Bug Fixes + * Turn on Maruku fenced code blocks by default (#1830) + +## 1.4.1 / 2013-12-09 + +### Bug Fixes + * Don't allow nil entries when loading posts (#1796) + +## 1.4.0 / 2013-12-07 + +### Major Enhancements + * Add support for TOML config files (#1765) + +### Minor Enhancements + * Sort plugins as a way to establish a load order (#1682) + * Update Maruku to 0.7.0 (#1775) + +### Bug Fixes + * Add a space between two words in a Pagination warning message (#1769) + * Upgrade `toml` gem to `v0.1.0` to maintain compat with Ruby 1.8.7 (#1778) + +### Development Fixes + * Remove some whitespace in the code (#1755) + * Remove some duplication in the reading of posts and drafts (#1779) + +### Site Enhancements + * Fixed case of a word in the Jekyll v1.3.0 release post (#1762) + * Fixed the mime type for the favicon (#1772) + +## 1.3.1 / 2013-11-26 + +### Minor Enhancements + * Add a `--prefix` option to passthrough for the importers (#1669) + * Push the paginator plugin lower in the plugin priority order so + other plugins run before it (#1759) + +### Bug Fixes + * Fix the include tag when ran in a loop (#1726) + * Fix errors when using `--watch` on 1.8.7 (#1730) + * Specify where the include is called from if an included file is + missing (#1746) + +### Development Fixes + * Extract `Site#filter_entries` into its own object (#1697) + * Enable Travis' bundle caching (#1734) + * Remove trailing whitespace in some files (#1736) + * Fix a duplicate test name (#1754) + +### Site Enhancements + * Update link to example Rakefile to point to specific commit (#1741) + * Fix drafts docs to indicate that draft time is based on file modification + time, not `Time.now` (#1695) + * Add `jekyll-monthly-archive-plugin` and `jekyll-category-archive-plugin` to + list of third-party plugins (#1693) + * Add `jekyll-asset-path-plugin` to list of third-party plugins (#1670) + * Add `emoji-for-jekyll` to list of third-part plugins (#1708) + * Fix previous section link on plugins page to point to pagination page (#1707) + * Add `org-mode` converter plugin to third-party plugins (#1711) + * Point "Blog migrations" page to http://import.jekyllrb.com (#1732) + * Add docs for `post_url` when posts are in subdirectories (#1718) + * Update the docs to point to `example.com` (#1448) + +## 1.3.0 / 2013-11-04 + +### Major Enhancements + * Add support for adding data as YAML files under a site's `_data` + directory (#1003) + * Allow variables to be used with `include` tags (#1495) + * Allow using gems for plugin management (#1557) + +### Minor Enhancements + * Decrease the specificity in the site template CSS (#1574) + * Add `encoding` configuration option (#1449) + * Provide better error handling for Jekyll's custom Liquid tags + (#1514) + * If an included file causes a Liquid error, add the path to the + include file that caused the error to the error message (#1596) + * If a layout causes a Liquid error, change the error message so that + we know it comes from the layout (#1601) + * Update Kramdown dependency to `~> 1.2` (#1610) + * Update `safe_yaml` dependency to `~> 0.9.7` (#1602) + * Allow layouts to be in subfolders like includes (#1622) + * Switch to listen for site watching while serving (#1589) + * Add a `json` liquid filter to be used in sites (#1651) + * Point people to the migration docs when the `jekyll-import` gem is + missing (#1662) + +### Bug Fixes + * Fix up matching against source and destination when the two + locations are similar (#1556) + * Fix the missing `pathname` require in certain cases (#1255) + * Use `+` instead of `Array#concat` when building `Post` attribute list (#1571) + * Print server address when launching a server (#1586) + * Downgrade to Maruku `~> 0.6.0` in order to avoid changes in rendering (#1598) + * Fix error with failing include tag when variable was file name (#1613) + * Downcase lexers before passing them to pygments (#1615) + * Capitalize the short verbose switch because it conflicts with the + built-in Commander switch (#1660) + * Fix compatibility with 1.8.x (#1665) + * Fix an error with the new file watching code due to library version + incompatibilities (#1687) + +### Development Fixes + * Add coverage reporting with Coveralls (#1539) + * Refactor the Liquid `include` tag (#1490) + * Update launchy dependency to `~> 2.3` (#1608) + * Update rr dependency to `~> 1.1` (#1604) + * Update cucumber dependency to `~> 1.3` (#1607) + * Update coveralls dependency to `~> 0.7.0` (#1606) + * Update rake dependency to `~> 10.1` (#1603) + * Clean up `site.rb` comments to be more concise/uniform (#1616) + * Use the master branch for the build badge in the readme (#1636) + * Refactor Site#render (#1638) + * Remove duplication in command line options (#1637) + * Add tests for all the coderay options (#1543) + * Improve some of the Cucumber test code (#1493) + * Improve comparisons of timestamps by ignoring the seconds (#1582) + +### Site Enhancements + * Fix params for `JekyllImport::WordPress.process` arguments (#1554) + * Add `jekyll-suggested-tweet` to list of third-party plugins (#1555) + * Link to Liquid's docs for tags and filters (#1553) + * Add note about installing Xcode on the Mac in the Installation docs (#1561) + * Simplify/generalize pagination docs (#1577) + * Add documentation for the new data sources feature (#1503) + * Add more information on how to create generators (#1590, #1592) + * Improve the instructions for mimicking GitHub Flavored Markdown + (#1614) + * Add `jekyll-import` warning note of missing dependencies (#1626) + * Fix grammar in the Usage section (#1635) + * Add documentation for the use of gems as plugins (#1656) + * Document the existence of a few additional plugins (#1405) + * Document that the `date_to_string` always returns a two digit day (#1663) + * Fix navigation in the "Working with Drafts" page (#1667) + * Fix an error with the data documentation (#1691) + +## 1.2.1 / 2013-09-14 + +### Minor Enhancements + * Print better messages for detached server. Mute output on detach. (#1518) + * Disable reverse lookup when running `jekyll serve` (#1363) + * Upgrade RedCarpet dependency to `~> 2.3.0` (#1515) + * Upgrade to Liquid `>= 2.5.2, < 2.6` (#1536) + +### Bug Fixes + * Fix file discrepancy in gemspec (#1522) + * Force rendering of Include tag (#1525) + +### Development Fixes + * Add a rake task to generate a new release post (#1404) + * Mute LSI output in tests (#1531) + * Update contributor documentation (#1537) + +### Site Enhancements + * Fix a couple of validation errors on the site (#1511) + * Make navigation menus reusable (#1507) + * Fix link to History page from Release v1.2.0 notes post. + * Fix markup in History file for command line options (#1512) + * Expand 1.2 release post title to 1.2.0 (#1516) + +## 1.2.0 / 2013-09-06 + +### Major Enhancements + * Disable automatically-generated excerpts when `excerpt_separator` is `""`. (#1386) + * Add checking for URL conflicts when running `jekyll doctor` (#1389) + +### Minor Enhancements + * Catch and fix invalid `paginate` values (#1390) + * Remove superfluous `div.container` from the default html template for + `jekyll new` (#1315) + * Add `-D` short-form switch for the drafts option (#1394) + * Update the links in the site template for Twitter and GitHub (#1400) + * Update dummy email address to example.com domain (#1408) + * Update normalize.css to v2.1.2 and minify; add rake task to update + normalize.css with greater ease. (#1430) + * Add the ability to detach the server ran by `jekyll serve` from it's + controlling terminal (#1443) + * Improve permalink generation for URLs with special characters (#944) + * Expose the current Jekyll version to posts and pages via a new + `jekyll.version` variable (#1481) + +### Bug Fixes + * Markdown extension matching matches only exact matches (#1382) + * Fixed NoMethodError when message passed to `Stevenson#message` is nil (#1388) + * Use binary mode when writing file (#1364) + * Fix 'undefined method `encoding` for "mailto"' errors w/ Ruby 1.8 and + Kramdown > 0.14.0 (#1397) + * Do not force the permalink to be a dir if it ends on .html (#963) + * When a Liquid Exception is caught, show the full path rel. to site source (#1415) + * Properly read in the config options when serving the docs locally + (#1444) + * Fixed `--layouts` option for `build` and `serve` commands (#1458) + * Remove kramdown as a runtime dependency since it's optional (#1498) + * Provide proper error handling for invalid file names in the include + tag (#1494) + +### Development Fixes + * Remove redundant argument to + Jekyll::Commands::New#scaffold_post_content (#1356) + * Add new dependencies to the README (#1360) + * Fix link to contributing page in README (#1424) + * Update TomDoc in Pager#initialize to match params (#1441) + * Refactor `Site#cleanup` into `Jekyll::Site::Cleaner` class (#1429) + * Several other small minor refactorings (#1341) + * Ignore `_site` in jekyllrb.com deploy (#1480) + * Add Gem version and dependency badge to README (#1497) + +### Site Enhancements + * Add info about new releases (#1353) + * Update plugin list with jekyll-rss plugin (#1354) + * Update the site list page with Ruby's official site (#1358) + * Add `jekyll-ditaa` to list of third-party plugins (#1370) + * Add `postfiles` to list of third-party plugins (#1373) + * For internal links, use full path including trailing `/` (#1411) + * Use curly apostrophes in the docs (#1419) + * Update the docs for Redcarpet in Jekyll (#1418) + * Add `pluralize` and `reading_time` filters to docs (#1439) + * Fix markup for the Kramdown options (#1445) + * Fix typos in the History file (#1454) + * Add trailing slash to site's post URL (#1462) + * Clarify that `--config` will take multiple files (#1474) + * Fix docs/templates.md private gist example (#1477) + * Use `site.repository` for Jekyll's GitHub URL (#1463) + * Add `jekyll-pageless-redirects` to list of third-party plugins (#1486) + * Clarify that `date_to_xmlschema` returns an ISO 8601 string (#1488) + * Add `jekyll-good-include` to list of third-party plugins (#1491) + * XML escape the blog post title in our feed (#1501) + * Add `jekyll-toc-generator` to list of third-party plugins (#1506) + +## 1.1.2 / 2013-07-25 + +### Bug Fixes + * Require Liquid 2.5.1 (#1349) + +## 1.1.1 / 2013-07-24 + +### Minor Enhancements + * Remove superfluous `table` selector from main.css in `jekyll new` template (#1328) + * Abort with non-zero exit codes (#1338) + +### Bug Fixes + * Fix up the rendering of excerpts (#1339) + +### Site Enhancements + * Add Jekyll Image Tag to the plugins list (#1306) + * Remove erroneous statement that `site.pages` are sorted alphabetically. + * Add info about the `_drafts` directory to the directory structure + docs (#1320) + * Improve the layout of the plugin listing by organizing it into + categories (#1310) + * Add generator-jekyllrb and grunt-jekyll to plugins page (#1330) + * Mention Kramdown as option for markdown parser on Extras page (#1318) + * Update Quick-Start page to include reminder that all requirements must be installed (#1327) + * Change filename in `include` example to an HTML file so as not to indicate that Jekyll + will automatically convert them. (#1303) + * Add an RSS feed for commits to Jekyll (#1343) + +## 1.1.0 / 2013-07-14 + +### Major Enhancements + * Add `docs` subcommand to read Jekyll's docs when offline. (#1046) + * Support passing parameters to templates in `include` tag (#1204) + * Add support for Liquid tags to post excerpts (#1302) + +### Minor Enhancements + * Search the hierarchy of pagination path up to site root to determine template page for + pagination. (#1198) + * Add the ability to generate a new Jekyll site without a template (#1171) + * Use redcarpet as the default markdown engine in newly generated + sites (#1245, #1247) + * Add `redcarpet` as a runtime dependency so `jekyll build` works out-of-the-box for new + sites. (#1247) + * In the generated site, remove files that will be replaced by a + directory (#1118) + * Fail loudly if a user-specified configuration file doesn't exist (#1098) + * Allow for all options for Kramdown HTML Converter (#1201) + +### Bug Fixes + * Fix pagination in subdirectories. (#1198) + * Fix an issue with directories and permalinks that have a plus sign + (+) in them (#1215) + * Provide better error reporting when generating sites (#1253) + * Latest posts first in non-LSI `related_posts` (#1271) + +### Development Fixes + * Merge the theme and layout Cucumber steps into one step (#1151) + * Restrict activesupport dependency to pre-4.0.0 to maintain compatibility with `<= 1.9.2` + * Include/exclude deprecation handling simplification (#1284) + * Convert README to Markdown. (#1267) + * Refactor Jekyll::Site (#1144) + +### Site Enhancements + * Add "News" section for release notes, along with an RSS feed (#1093, #1285, #1286) + * Add "History" page. + * Restructured docs sections to include "Meta" section. + * Add message to "Templates" page that specifies that Python must be installed in order + to use Pygments. (#1182) + * Update link to the official Maruku repo (#1175) + * Add documentation about `paginate_path` to "Templates" page in docs (#1129) + * Give the quick-start guide its own page (#1191) + * Update ProTip on Installation page in docs to point to all the info about Pygments and + the 'highlight' tag. (#1196) + * Run `site/img` through ImageOptim (thanks @qrush!) (#1208) + * Added Jade Converter to `site/docs/plugins` (#1210) + * Fix location of docs pages in Contributing pages (#1214) + * Add ReadInXMinutes plugin to the plugin list (#1222) + * Remove plugins from the plugin list that have equivalents in Jekyll + proper (#1223) + * Add jekyll-assets to the plugin list (#1225) + * Add jekyll-pandoc-mulitple-formats to the plugin list (#1229) + * Remove dead link to "Using Git to maintain your blog" (#1227) + * Tidy up the third-party plugins listing (#1228) + * Update contributor information (#1192) + * Update URL of article about Blogger migration (#1242) + * Specify that RedCarpet is the default for new Jekyll sites on Quickstart page (#1247) + * Added `site.pages` to Variables page in docs (#1251) + * Add Youku and Tudou Embed link on Plugins page. (#1250) + * Add note that `gist` tag supports private gists. (#1248) + * Add `jekyll-timeago` to list of third-party plugins. (#1260) + * Add `jekyll-swfobject` to list of third-party plugins. (#1263) + * Add `jekyll-picture-tag` to list of third-party plugins. (#1280) + * Update the GitHub Pages documentation regarding relative URLs + (#1291) + * Update the S3 deployment documentation (#1294) + * Add suggestion for Xcode CLT install to troubleshooting page in docs (#1296) + * Add 'Working with drafts' page to docs (#1289) + * Add information about time zones to the documentation for a page's + date (#1304) + +## 1.0.3 / 2013-06-07 + +### Minor Enhancements + * Add support to gist tag for private gists. (#1189) + * Fail loudly when Maruku errors out (#1190) + * Move the building of related posts into their own class (#1057) + * Removed trailing spaces in several places throughout the code (#1116) + * Add a `--force` option to `jekyll new` (#1115) + * Convert IDs in the site template to classes (#1170) + +### Bug Fixes + * Fix typo in Stevenson constant "ERROR". (#1166) + * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106) + * Exit with a non-zero exit code when dealing with a Liquid error (#1121) + * Make the `exclude` and `include` options backwards compatible with + versions of Jekyll prior to 1.0 (#1114) + * Fix pagination on Windows (#1063) + * Fix the application of Pygments' Generic Output style to Go code + (#1156) + +### Site Enhancements + * Add a Pro Tip to docs about front matter variables being optional (#1147) + * Add changelog to site as History page in /docs/ (#1065) + * Add note to Upgrading page about new config options in 1.0.x (#1146) + * Documentation for `date_to_rfc822` and `uri_escape` (#1142) + * Documentation highlight boxes shouldn't show scrollbars if not necessary (#1123) + * Add link to jekyll-minibundle in the doc's plugins list (#1035) + * Quick patch for importers documentation + * Fix prefix for WordpressDotCom importer in docs (#1107) + * Add jekyll-contentblocks plugin to docs (#1068) + * Make code bits in notes look more natural, more readable (#1089) + * Fix logic for `relative_permalinks` instructions on Upgrading page (#1101) + * Add docs for post excerpt (#1072) + * Add docs for gist tag (#1072) + * Add docs indicating that Pygments does not need to be installed + separately (#1099, #1119) + * Update the migrator docs to be current (#1136) + * Add the Jekyll Gallery Plugin to the plugin list (#1143) + +### Development Fixes + * Use Jekyll.logger instead of Jekyll::Stevenson to log things (#1149) + * Fix pesky Cucumber infinite loop (#1139) + * Do not write posts with timezones in Cucumber tests (#1124) + * Use ISO formatted dates in Cucumber features (#1150) + +## 1.0.2 / 2013-05-12 + +### Major Enhancements + * Add `jekyll doctor` command to check site for any known compatibility problems (#1081) + * Backwards-compatibilize relative permalinks (#1081) + +### Minor Enhancements + * Add a `data-lang=""` attribute to Redcarpet code blocks (#1066) + * Deprecate old config `server_port`, match to `port` if `port` isn't set (#1084) + * Update pygments.rb version to 0.5.0 (#1061) + * Update Kramdown version to 1.0.2 (#1067) + +### Bug Fixes + * Fix issue when categories are numbers (#1078) + * Catching that Redcarpet gem isn't installed (#1059) + +### Site Enhancements + * Add documentation about `relative_permalinks` (#1081) + * Remove pygments-installation instructions, as pygments.rb is bundled with it (#1079) + * Move pages to be Pages for realz (#985) + * Updated links to Liquid documentation (#1073) + +## 1.0.1 / 2013-05-08 + +### Minor Enhancements + * Do not force use of `toc_token` when using `generate_tok` in RDiscount (#1048) + * Add newer `language-` class name prefix to code blocks (#1037) + * Commander error message now preferred over process abort with incorrect args (#1040) + +### Bug Fixes + * Make Redcarpet respect the pygments configuration option (#1053) + * Fix the index build with LSI (#1045) + * Don't print deprecation warning when no arguments are specified. (#1041) + * Add missing `` to site template used by `new` subcommand, fixed typos in code (#1032) + +### Site Enhancements + * Changed https to http in the GitHub Pages link (#1051) + * Remove CSS cruft, fix typos, fix HTML errors (#1028) + * Removing manual install of Pip and Distribute (#1025) + * Updated URL for Markdown references plugin (#1022) + +### Development Fixes + * Markdownify history file (#1027) + * Update links on README to point to new jekyllrb.com (#1018) + +## 1.0.0 / 2013-05-06 + +### Major Enhancements + * Add `jekyll new` subcommand: generate a Jekyll scaffold (#764) + * Refactored Jekyll commands into subcommands: build, serve, and migrate. (#690) + * Removed importers/migrators from main project, migrated to jekyll-import sub-gem (#793) + * Added ability to render drafts in `_drafts` folder via command line (#833) + * Add ordinal date permalink style (/:categories/:year/:y_day/:title.html) (#928) + +### Minor Enhancements + * Site template HTML5-ified (#964) + * Use post's directory path when matching for the `post_url` tag (#998) + * Loosen dependency on Pygments so it's only required when it's needed (#1015) + * Parse strings into Time objects for date-related Liquid filters (#1014) + * Tell the user if there is no subcommand specified (#1008) + * Freak out if the destination of `jekyll new` exists and is non-empty (#981) + * Add `timezone` configuration option for compilation (#957) + * Add deprecation messages for pre-1.0 CLI options (#959) + * Refactor and colorize logging (#959) + * Refactor Markdown parsing (#955) + * Added application/vnd.apple.pkpass to mime.types served by WEBrick (#907) + * Move template site to default markdown renderer (#961) + * Expose new attribute to Liquid via `page`: `page.path` (#951) + * Accept multiple config files from command line (#945) + * Add page variable to liquid custom tags and blocks (#413) + * Add `paginator.previous_page_path` and `paginator.next_page_path` (#942) + * Backwards compatibility for 'auto' (#821, #934) + * Added date_to_rfc822 used on RSS feeds (#892) + * Upgrade version of pygments.rb to 0.4.2 (#927) + * Added short month (e.g. "Sep") to permalink style options for posts (#890) + * Expose site.baseurl to Liquid templates (#869) + * Adds excerpt attribute to posts which contains first paragraph of content (#837) + * Accept custom configuration file via CLI (#863) + * Load in GitHub Pages MIME Types on `jekyll serve` (#847, #871) + * Improve debugability of error message for a malformed highlight tag (#785) + * Allow symlinked files in unsafe mode (#824) + * Add 'gist' Liquid tag to core (#822, #861) + * New format of Jekyll output (#795) + * Reinstate `--limit_posts` and `--future` switches (#788) + * Remove ambiguity from command descriptions (#815) + * Fix SafeYAML Warnings (#807) + * Relaxed Kramdown version to 0.14 (#808) + * Aliased `jekyll server` to `jekyll serve`. (#792) + * Updated gem versions for Kramdown, Rake, Shoulda, Cucumber, and RedCarpet. (#744) + * Refactored Jekyll subcommands into Jekyll::Commands submodule, which now contains them (#768) + * Rescue from import errors in Wordpress.com migrator (#671) + * Massively accelerate LSI performance (#664) + * Truncate post slugs when importing from Tumblr (#496) + * Add glob support to include, exclude option (#743) + * Layout of Page or Post defaults to 'page' or 'post', respectively (#580) + REPEALED by (#977) + * "Keep files" feature (#685) + * Output full path & name for files that don't parse (#745) + * Add source and destination directory protection (#535) + * Better YAML error message (#718) + * Bug Fixes + * Paginate in subdirectories properly (#1016) + * Ensure post and page URLs have a leading slash (#992) + * Catch all exceptions, not just StandardError descendents (#1007) + * Bullet-proof `limit_posts` option (#1004) + * Read in YAML as UTF-8 to accept non-ASCII chars (#836) + * Fix the CLI option `--plugins` to actually accept dirs and files (#993) + * Allow 'excerpt' in YAML front matter to override the extracted excerpt (#946) + * Fix cascade problem with site.baseurl, site.port and site.host. (#935) + * Filter out directories with valid post names (#875) + * Fix symlinked static files not being correctly built in unsafe mode (#909) + * Fix integration with directory_watcher 1.4.x (#916) + * Accepting strings as arguments to jekyll-import command (#910) + * Force usage of older directory_watcher gem as 1.5 is broken (#883) + * Ensure all Post categories are downcase (#842, #872) + * Force encoding of the rdiscount TOC to UTF8 to avoid conversion errors (#555) + * Patch for multibyte URI problem with `jekyll serve` (#723) + * Order plugin execution by priority (#864) + * Fixed Page#dir and Page#url for edge cases (#536) + * Fix broken `post_url` with posts with a time in their YAML front matter (#831) + * Look for plugins under the source directory (#654) + * Tumblr Migrator: finds `_posts` dir correctly, fixes truncation of long + post names (#775) + * Force Categories to be Strings (#767) + * Safe YAML plugin to prevent vulnerability (#777) + * Add SVG support to Jekyll/WEBrick. (#407, #406) + * Prevent custom destination from causing continuous regen on watch (#528, #820, #862) + +### Site Enhancements + * Responsify (#860) + * Fix spelling, punctuation and phrasal errors (#989) + * Update quickstart instructions with `new` command (#966) + * Add docs for page.excerpt (#956) + * Add docs for page.path (#951) + * Clean up site docs to prepare for 1.0 release (#918) + * Bring site into master branch with better preview/deploy (#709) + * Redesigned site (#583) + +### Development Fixes + * Exclude Cucumber 1.2.4, which causes tests to fail in 1.9.2 (#938) + * Added "features:html" rake task for debugging purposes, cleaned up + Cucumber profiles (#832) + * Explicitly require HTTPS rubygems source in Gemfile (#826) + * Changed Ruby version for development to 1.9.3-p374 from p362 (#801) + * Including a link to the GitHub Ruby style guide in CONTRIBUTING.md (#806) + * Added script/bootstrap (#776) + * Running Simplecov under 2 conditions: ENV(COVERAGE)=true and with Ruby version + of greater than 1.9 (#771) + * Switch to Simplecov for coverage report (#765) + +## 0.12.1 / 2013-02-19 + +### Minor Enhancements + * Update Kramdown version to 0.14.1 (#744) + * Test Enhancements + * Update Rake version to 10.0.3 (#744) + * Update Shoulda version to 3.3.2 (#744) + * Update Redcarpet version to 2.2.2 (#744) + +## 0.12.0 / 2012-12-22 + +### Minor Enhancements + * Add ability to explicitly specify included files (#261) + * Add `--default-mimetype` option (#279) + * Allow setting of RedCloth options (#284) + * Add `post_url` Liquid tag for internal post linking (#369) + * Allow multiple plugin dirs to be specified (#438) + * Inline TOC token support for RDiscount (#333) + * Add the option to specify the paginated url format (#342) + * Swap out albino for pygments.rb (#569) + * Support Redcarpet 2 and fenced code blocks (#619) + * Better reporting of Liquid errors (#624) + * Bug Fixes + * Allow some special characters in highlight names + * URL escape category names in URL generation (#360) + * Fix error with `limit_posts` (#442) + * Properly select dotfile during directory scan (#363, #431, #377) + * Allow setting of Kramdown `smart_quotes` (#482) + * Ensure front matter is at start of file (#562) + +## 0.11.2 / 2011-12-27 + * Bug Fixes + * Fix gemspec + +## 0.11.1 / 2011-12-27 + * Bug Fixes + * Fix extra blank line in highlight blocks (#409) + * Update dependencies + +## 0.11.0 / 2011-07-10 + +### Major Enhancements + * Add command line importer functionality (#253) + * Add Redcarpet Markdown support (#318) + * Make markdown/textile extensions configurable (#312) + * Add `markdownify` filter + +### Minor Enhancements + * Switch to Albino gem + * Bundler support + * Use English library to avoid hoops (#292) + * Add Posterous importer (#254) + * Fixes for Wordpress importer (#274, #252, #271) + * Better error message for invalid post date (#291) + * Print formatted fatal exceptions to stdout on build failure + * Add Tumblr importer (#323) + * Add Enki importer (#320) + * Bug Fixes + * Secure additional path exploits + +## 0.10.0 / 2010-12-16 + * Bug Fixes + * Add `--no-server` option. + +## 0.9.0 / 2010-12-15 + +### Minor Enhancements + * Use OptionParser's `[no-]` functionality for better boolean parsing. + * Add Drupal migrator (#245) + * Complain about YAML and Liquid errors (#249) + * Remove orphaned files during regeneration (#247) + * Add Marley migrator (#28) + +## 0.8.0 / 2010-11-22 + +### Minor Enhancements + * Add wordpress.com importer (#207) + * Add `--limit-posts` cli option (#212) + * Add `uri_escape` filter (#234) + * Add `--base-url` cli option (#235) + * Improve MT migrator (#238) + * Add kramdown support (#239) + * Bug Fixes + * Fixed filename basename generation (#208) + * Set mode to UTF8 on Sequel connections (#237) + * Prevent `_includes` dir from being a symlink + +## 0.7.0 / 2010-08-24 + +### Minor Enhancements + * Add support for rdiscount extensions (#173) + * Bug Fixes + * Highlight should not be able to render local files + * The site configuration may not always provide a 'time' setting (#184) + +## 0.6.2 / 2010-06-25 + * Bug Fixes + * Fix Rakefile 'release' task (tag pushing was missing origin) + * Ensure that RedCloth is loaded when textilize filter is used (#183) + * Expand source, destination, and plugin paths (#180) + * Fix `page.url` to include full relative path (#181) + +## 0.6.1 / 2010-06-24 + * Bug Fixes + * Fix Markdown Pygments prefix and suffix (#178) + +## 0.6.0 / 2010-06-23 + +### Major Enhancements + * Proper plugin system (#19, #100) + * Add safe mode so unsafe converters/generators can be added + * Maruku is now the only processor dependency installed by default. + Other processors will be lazy-loaded when necessary (and prompt the + user to install them when necessary) (#57) + +### Minor Enhancements + * Inclusion/exclusion of future dated posts (#59) + * Generation for a specific time (#59) + * Allocate `site.time` on render not per site_payload invocation (#59) + * Pages now present in the site payload and can be used through the + `site.pages` and `site.html_pages` variables + * Generate phase added to site#process and pagination is now a generator + * Switch to RakeGem for build/test process + * Only regenerate static files when they have changed (#142) + * Allow arbitrary options to Pygments (#31) + * Allow URL to be set via command line option (#147) + * Bug Fixes + * Render highlighted code for non markdown/textile pages (#116) + * Fix highlighting on Ruby 1.9 (#65) + * Fix extension munging when pretty permalinks are enabled (#64) + * Stop sorting categories (#33) + * Preserve generated attributes over front matter (#119) + * Fix source directory binding using `Dir.pwd` (#75) + +## 0.5.7 / 2010-01-12 + +### Minor Enhancements + * Allow overriding of post date in the front matter (#62, #38) + * Bug Fixes + * Categories isn't always an array (#73) + * Empty tags causes error in read_posts (#84) + * Fix pagination to adhere to read/render/write paradigm + * Test Enhancement + * Cucumber features no longer use site.posts.first where a better + alternative is available + +## 0.5.6 / 2010-01-08 + * Bug Fixes + * Require redcloth >= 4.2.1 in tests (#92) + * Don't break on triple dashes in yaml front matter (#93) + +### Minor Enhancements + * Allow .mkd as markdown extension + * Use $stdout/err instead of constants (#99) + * Properly wrap code blocks (#91) + * Add javascript mime type for webrick (#98) + +## 0.5.5 / 2010-01-08 + * Bug Fixes + * Fix pagination % 0 bug (#78) + * Ensure all posts are processed first (#71) + +## NOTE + * After this point I will no longer be giving credit in the history; + that is what the commit log is for. + +## 0.5.4 / 2009-08-23 + * Bug Fixes + * Do not allow symlinks (security vulnerability) + +## 0.5.3 / 2009-07-14 + * Bug Fixes + * Solving the permalink bug where non-html files wouldn't work + (@jeffrydegrande) + +## 0.5.2 / 2009-06-24 + * Enhancements + * Added --paginate option to the executable along with a paginator object + for the payload (@calavera) + * Upgraded RedCloth to 4.2.1, which makes `` tags work once + again. + * 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) + * 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) + * Added Date#xmlschema for Ruby versions < 1.9 + +## 0.5.1 / 2009-05-06 + +### Major Enhancements + * 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) + * Bug Fixes + * Making sure config.yaml references are all gone, using only config.yml + * 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 + +### Minor Enhancements + * 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) + * 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) + * Fix tests and convert to Shoulda (@qrush, @technicalpickles) + * Add Cucumber acceptance test suite (@qrush, @technicalpickles) + +## 0.4.1 + +### Minor Enhancements + * Changed date format on wordpress converter (zeropadding) (@dysinger) + * Bug Fixes + * Add Jekyll binary as executable to gemspec (@dysinger) + +## 0.4.0 / 2009-02-03 + +### Major Enhancements + * Switch to Jeweler for packaging tasks + +### Minor Enhancements + * 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) + * 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 + +### Major Enhancements + * Added `--server` option to start a simple WEBrick server on destination + directory (@johnreilly and @mchung) + +### Minor Enhancements + * 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) + * 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) + * Fix bug that meant page data (such as the date) was not available in + templates (@mreid) + * Properly reject directories in `_layouts` + +## 0.2.1 / 2008-12-15 + * Major Changes + * Use Maruku (pure Ruby) for Markdown by default (@mreid) + * Allow use of RDiscount with `--rdiscount` flag + +### Minor Enhancements + * Don't load directory_watcher unless it's needed (@pjhyett) + +## 0.2.0 / 2008-12-14 + * Major Changes + * related_posts is now found in `site.related_posts` + +## 0.1.6 / 2008-12-13 + * Major Features + * Include files in `_includes` with `{% include x.textile %}` + +## 0.1.5 / 2008-12-12 + +### Major Enhancements + * Code highlighting with Pygments if `--pygments` is specified + * Disable true LSI by default, enable with `--lsi` + +### Minor Enhancements + * Output informative message if RDiscount is not available (@JackDanger) + * Bug Fixes + * 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 + * Bug Fixes + * DATA does not work properly with rubygems + +## 0.1.3 / 2008-12-06 + * Major Features + * Markdown support (@vanpelt) + * Mephisto and CSV converters (@vanpelt) + * Code hilighting (@vanpelt) + * Autobuild + * Bug Fixes + * Accept both `\r\n` and `\n` in YAML header (@vanpelt) + +## 0.1.2 / 2008-11-22 + * Major Features + * Add a real "related posts" implementation using Classifier + * Command Line Changes + * Allow cli to be called with 0, 1, or 2 args intuiting dir paths + if they are omitted + +## 0.1.1 / 2008-11-22 + * Minor Additions + * Posts now support introspectional data e.g. `{{ page.url }}` + +## 0.1.0 / 2008-11-05 + * First release + * Converts posts written in Textile + * Converts regular site pages + * Simple copy of binary files + +## 0.0.0 / 2008-10-19 + * Birthday! From bfc07a39c6bf1b57e88a470fc6d0334ee628c9c3 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 7 Jan 2016 23:22:07 -0800 Subject: [PATCH 0233/4996] Update history to reflect merge of #4330 [ci skip] --- History.markdown | 372 ++++++++++++++++++++++++----------------------- 1 file changed, 188 insertions(+), 184 deletions(-) diff --git a/History.markdown b/History.markdown index a1ad1b896bf..5b9898be7e5 100644 --- a/History.markdown +++ b/History.markdown @@ -68,6 +68,7 @@ * Add documentation for incremental regeneration (#4293) * Add note about removal of relative permalink support in upgrading docs (#4303) * Add Pro Tip to use front matter variable to create clean URLs (#4296) + * Fix grammar in the documentation for posts. (#4330) ## 3.0.1 / 2015-11-17 @@ -144,8 +145,7 @@ * Perf: `Markdown#matches` should avoid regexp (#3321) * Perf: Use frozen regular expressions for `Utils#slugify` (#3321) * Split off Textile support into jekyll-textile-converter (#3319) - * Improve the navigation menu alignment in the site template on small - screens (#3331) + * Improve the navigation menu alignment in the site template on small screens (#3331) * Show the regeneration time after the initial generation (#3378) * Site template: Switch default font to Helvetica Neue (#3376) * Make the `include` tag a teensy bit faster. (#3391) @@ -177,8 +177,7 @@ * Set log level to debug when verbose flag is set (#3665) * Added a mention on the Gemfile to complete the instructions (#3671) * Perf: Cache `Document#to_liquid` and invalidate where necessary (#3693) - * Perf: `Jekyll::Cleaner#existing_files`: Call `keep_file_regex` and - `keep_dirs` only once, not once per iteration (#3696) + * Perf: `Jekyll::Cleaner#existing_files`: Call `keep_file_regex` and `keep_dirs` only once, not once per iteration (#3696) * Omit jekyll/jekyll-help from list of resources. (#3698) * Add basic `jekyll doctor` test to detect fsnotify (OSX) anomalies. (#3704) * Added talk.jekyllrb.com to "Have questions?" (#3694) @@ -460,16 +459,14 @@ * Strip newlines in site template `` description. (#2982) * Add link to atom feed in `head` of site template files (#2996) * Performance optimizations (#2994) - * Use `Hash#each_key` instead of `Hash#keys.each` to speed up iteration - over hash keys. (#3017) + * Use `Hash#each_key` instead of `Hash#keys.each` to speed up iteration over hash keys. (#3017) * Further minor performance enhancements. (#3022) * Add 'b' and 's' aliases for build and serve, respectively (#3065) ### Bug Fixes * Fix Rouge's RedCarpet plugin interface integration (#2951) - * Remove `--watch` from the site template blog post since it defaults - to watching in in 2.4.0 (#2922) + * Remove `--watch` from the site template blog post since it defaults to watching in in 2.4.0 (#2922) * Fix code for media query mixin in site template (#2946) * Allow post URL's to have `.htm` extensions (#2925) * `Utils.slugify`: Don't create new objects when gsubbing (#2997) @@ -547,11 +544,9 @@ * Document the `name` variable for collection permalinks (#2829) * Adds info about installing jekyll in current dir (#2839) - * Remove deprecated `jekyll-projectlist` plugin from list of third-party - plugins (#2742) + * Remove deprecated `jekyll-projectlist` plugin from list of third-party plugins (#2742) * Remove tag plugins that are built in to Jekyll (#2751) - * Add `markdown-writer` package for Atom Editor to list of third-party - plugins (#2763) + * Add `markdown-writer` package for Atom Editor to list of third-party plugins (#2763) * Fix typo in site documentation for collections (#2764) * Fix minor typo on plugins docs page (#2765) * Replace markdown with HTML in `sass_dir` note on assets page (#2791) @@ -639,8 +634,7 @@ ### Site Enhancements * Update Kramdown urls (#2588) - * Add `Jekyll::AutolinkEmail` and `Jekyll::GitMetadata` to the list of - third-party plugins (#2596) + * Add `Jekyll::AutolinkEmail` and `Jekyll::GitMetadata` to the list of third-party plugins (#2596) * Fix a bunch of broken links in the site (#2601) * Replace dead links with working links (#2611) * Add jekyll-hook to deployment methods (#2617) @@ -677,12 +671,10 @@ * Allow subdirectories in `_data` (#2395) * Extract Pagination Generator into gem: `jekyll-paginate` (#2455) * Utilize `date_to_rfc822` filter in site template (#2437) - * Add categories, last build datetime, and generator to site template - feed (#2438) + * Add categories, last build datetime, and generator to site template feed (#2438) * Configurable, replaceable Logger-compliant logger (#2444) * Extract `gist` tag into a separate gem (#2469) - * Add `collection` attribute to `Document#to_liquid` to access the - document's collection label. (#2436) + * Add `collection` attribute to `Document#to_liquid` to access the document's collection label. (#2436) * Upgrade listen to `2.7.6 <= x < 3.0.0` (#2492) * Allow configuration of different Twitter and GitHub usernames in site template (#2485) * Bump Pygments to v0.6.0 (#2504) @@ -707,8 +699,7 @@ * Allow front matter defaults to set post categories (#2373) * Fix command in subcommand deprecation warning (#2457) * Keep all parent directories of files/dirs in `keep_files` (#2458) - * When using RedCarpet and Rouge without Rouge installed, fixed erroneous - error which stated that redcarpet was missing, not rouge. (#2464) + * When using RedCarpet and Rouge without Rouge installed, fixed erroneous error which stated that redcarpet was missing, not rouge. (#2464) * Ignore *all* directories and files that merit it on auto-generation (#2459) * Before copying file, explicitly remove the old one (#2535) * Merge file system categories with categories from YAML. (#2531) @@ -737,8 +728,7 @@ * Prevent table from extending parent width in permalink style table (#2424) * Add collections to info about pagination support (#2389) * Add `jekyll_github_sample` plugin to list of third-party plugins (#2463) - * Clarify documentation around front matter defaults and add details - about defaults for collections. (#2439) + * Clarify documentation around front matter defaults and add details about defaults for collections. (#2439) * Add Jekyll Project Version Tag to list of third-party plugins (#2468) * Use `https` for GitHub links across whole site (#2470) * Add StickerMule + Jekyll post (#2476) @@ -754,13 +744,11 @@ ### Bug Fixes - * Properly prefix links in site template with URL or baseurl depending upon - need. (#2319) + * Properly prefix links in site template with URL or baseurl depending upon need. (#2319) * Update gist tag comments and error message to require username (#2326) * Fix `permalink` setting in site template (#2331) * Don't fail if any of the path objects are nil (#2325) - * Instantiate all descendants for converters and generators, not just - direct subclasses (#2334) + * Instantiate all descendants for converters and generators, not just direct subclasses (#2334) * Replace all instances of `site.name` with `site.title` in site template (#2324) * `Jekyll::Filters#time` now accepts UNIX timestamps in string or number form (#2339) * Use `item_property` for `where` filter so it doesn't break on collections (#2359) @@ -796,17 +784,16 @@ ## 2.0.0 / 2014-05-06 ### Major Enhancements + * Add "Collections" feature (#2199) * Add gem-based plugin whitelist to safe mode (#1657) - * Replace the commander command line parser with a more robust - solution for our needs called `mercenary` (#1706) + * Replace the commander command line parser with a more robust solution for our needs called `mercenary` (#1706) * Remove support for Ruby 1.8.x (#1780) * Move to jekyll/jekyll from mojombo/jekyll (#1817) * Allow custom markdown processors (#1872) * Provide support for the Rouge syntax highlighter (#1859) * Provide support for Sass (#1932) - * Provide a 300% improvement when generating sites that use - `Post#next` or `Post#previous` (#1983) + * Provide a 300% improvement when generating sites that use `Post#next` or `Post#previous` (#1983) * Provide support for CoffeeScript (#1991) * Replace Maruku with Kramdown as Default Markdown Processor (#1988) * Expose `site.static_files` to Liquid (#2075) @@ -817,10 +804,9 @@ * Exclude files based on prefix as well as `fnmatch?` (#2303) ### Minor Enhancements - * Move the EntryFilter class into the Jekyll module to avoid polluting the - global namespace (#1800) - * Add `group_by` Liquid filter create lists of items grouped by a common - property's value (#1788) + + * Move the EntryFilter class into the Jekyll module to avoid polluting the global namespace (#1800) + * Add `group_by` Liquid filter create lists of items grouped by a common property's value (#1788) * Add support for Maruku's `fenced_code_blocks` option (#1799) * Update Redcarpet dependency to ~> 3.0 (#1815) * Automatically sort all pages by name (#1848) @@ -831,12 +817,10 @@ * Bump dependency `safe_yaml` to `~> 1.0` (#1886) * Allow sorting of content by custom properties (#1849) * Add `--quiet` flag to silence output during build and serve (#1898) - * Add a `where` filter to filter arrays based on a key/value pair - (#1875) + * Add a `where` filter to filter arrays based on a key/value pair (#1875) * Route 404 errors to a custom 404 page in development (#1899) * Excludes are now relative to the site source (#1916) - * Bring MIME Types file for `jekyll serve` to complete parity with GH Pages - servers (#1993) + * Bring MIME Types file for `jekyll serve` to complete parity with GH Pages servers (#1993) * Adding Breakpoint to make new site template more responsive (#2038) * Default to using the UTF-8 encoding when reading files. (#2031) * Update Redcarpet dependency to ~> 3.1 (#2044) @@ -854,13 +838,11 @@ * Add support for unpublished drafts (#2164) * Add `force_polling` option to the `serve` command (#2165) * Clean up the `` in the site template (#2186) - * Permit YAML blocks to end with three dots to better conform with the - YAML spec (#2110) + * Permit YAML blocks to end with three dots to better conform with the YAML spec (#2110) * Use `File.exist?` instead of deprecated `File.exists?` (#2214) * Require newline after start of YAML Front Matter header (#2211) * Add the ability for pages to be marked as `published: false` (#1492) - * Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy - looking up of variable values in a Liquid context. (#2253) + * Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy looking up of variable values in a Liquid context. (#2253) * Remove literal lang name from class (#2292) * Return `utf-8` encoding in header for webrick error page response (#2289) * Make template site easier to customize (#2268) @@ -869,13 +851,12 @@ * Take into account missing values in the Liquid sort filter (#2299) ### Bug Fixes + * Don't allow nil entries when loading posts (#1796) - * Remove the scrollbar that's always displayed in new sites generated - from the site template (#1805) + * Remove the scrollbar that's always displayed in new sites generated from the site template (#1805) * Add `#path` to required methods in `Jekyll::Convertible` (#1866) * Default Maruku fenced code blocks to ON for 2.0.0-dev (#1831) - * Change short opts for host and port for `jekyll docs` to be consistent with - other subcommands (#1877) + * Change short opts for host and port for `jekyll docs` to be consistent with other subcommands (#1877) * Fix typos (#1910) * Lock Maruku at 0.7.0 to prevent bugs caused by Maruku 0.7.1 (#1958) * Fixes full path leak to source directory when using include tag (#1951) @@ -888,8 +869,7 @@ * Sanitize paths uniformly, in a Windows-friendly way (#2065, #2109) * Update gem build steps to work correctly on Windows (#2118) * Remove obsolete `normalize_options` method call from `bin/jekyll` (#2121). - * Remove `+` characters from Pygments lexer names when adding as a CSS - class (#994) + * Remove `+` characters from Pygments lexer names when adding as a CSS class (#994) * Remove some code that caused Ruby interpreter warnings (#2178) * Only strip the drive name if it begins the string (#2175) * Remove default post with invalid date from site template (#2200) @@ -904,14 +884,14 @@ * Add `output` to `Document` liquid output hash (#2309) ### Development Fixes + * Add a link to the site in the README.md file (#1795) * Add in History and site changes from `v1-stable` branch (#1836) * Testing additions on the Excerpt class (#1893) * Fix the `highlight` tag feature (#1859) * Test Jekyll under Ruby 2.1.0 (#1900) * Add script/cibuild for fun and profit (#1912) - * Use `Forwardable` for delegation between `Excerpt` and `Post` - (#1927) + * Use `Forwardable` for delegation between `Excerpt` and `Post` (#1927) * Rename `read_things` to `read_content` (#1928) * Add `script/branding` script for ASCII art lovin' (#1936) * Update the README to reflect the repo move (#1943) @@ -939,11 +919,11 @@ * Workaround for Travis bug (#2290) ### Site Enhancements + * Document Kramdown's GFM parser option (#1791) * Move CSS to includes & update normalize.css to v2.1.3 (#1787) * Minify CSS only in production (#1803) - * Fix broken link to installation of Ruby on Mountain Lion blog post on - Troubleshooting docs page (#1797) + * Fix broken link to installation of Ruby on Mountain Lion blog post on Troubleshooting docs page (#1797) * Fix issues with 1.4.1 release blog post (#1804) * Add note about deploying to OpenShift (#1812) * Collect all Windows-related docs onto one page (#1818) @@ -958,8 +938,7 @@ * Add jekyll-compass to the plugin list (#1923) * Add note in Posts docs about stripping `

` tags from excerpt (#1933) * Add additional info about the new exclude behavior (#1938) - * Linkify 'awesome contributors' to point to the contributors graph on - GitHub (#1940) + * Linkify 'awesome contributors' to point to the contributors graph on GitHub (#1940) * Update `docs/sites.md` link to GitHub Training materials (#1949) * Update `master` with the release info from 1.4.3 (#1947) * Define docs nav in datafile (#1953) @@ -976,8 +955,7 @@ * Update link to rack-jekyll on "Deployment Methods" page (#2047) * Fix typo in /docs/configuration (#2073) * Fix count in docs for `site.static_files` (#2077) - * Update configuration docs to indicate utf-8 is the default for 2.0.0 - and ASCII for 1.9.3 (#2074) + * Update configuration docs to indicate utf-8 is the default for 2.0.0 and ASCII for 1.9.3 (#2074) * Add info about unreleased feature to the site (#2061) * Add whitespace to liquid example in GitHub Pages docs (#2084) * Clarify the way Sass and CoffeeScript files are read in and output (#2067) @@ -994,8 +972,7 @@ * Some HTML tidying (#2130) * Remove modernizr and use html5shiv.js directly for IE less than v9 (#2131) * Remove unused images (#2187) - * Use `array_to_sentence_string` filter when outputting news item - categories (#2191) + * Use `array_to_sentence_string` filter when outputting news item categories (#2191) * Add link to Help repo in primary navigation bar (#2177) * Switch to using an ico file for the shortcut icon (#2193) * Use numbers to specify font weights and only bring in font weights used (#2185) @@ -1045,64 +1022,72 @@ ## 1.4.3 / 2014-01-13 ### Bug Fixes + * Patch show-stopping security vulnerabilities (#1944) ## 1.4.2 / 2013-12-16 ### Bug Fixes + * Turn on Maruku fenced code blocks by default (#1830) ## 1.4.1 / 2013-12-09 ### Bug Fixes + * Don't allow nil entries when loading posts (#1796) ## 1.4.0 / 2013-12-07 ### Major Enhancements + * Add support for TOML config files (#1765) ### Minor Enhancements + * Sort plugins as a way to establish a load order (#1682) * Update Maruku to 0.7.0 (#1775) ### Bug Fixes + * Add a space between two words in a Pagination warning message (#1769) * Upgrade `toml` gem to `v0.1.0` to maintain compat with Ruby 1.8.7 (#1778) ### Development Fixes + * Remove some whitespace in the code (#1755) * Remove some duplication in the reading of posts and drafts (#1779) ### Site Enhancements + * Fixed case of a word in the Jekyll v1.3.0 release post (#1762) * Fixed the mime type for the favicon (#1772) ## 1.3.1 / 2013-11-26 ### Minor Enhancements + * Add a `--prefix` option to passthrough for the importers (#1669) - * Push the paginator plugin lower in the plugin priority order so - other plugins run before it (#1759) + * Push the paginator plugin lower in the plugin priority order so other plugins run before it (#1759) ### Bug Fixes + * Fix the include tag when ran in a loop (#1726) * Fix errors when using `--watch` on 1.8.7 (#1730) - * Specify where the include is called from if an included file is - missing (#1746) + * Specify where the include is called from if an included file is missing (#1746) ### Development Fixes + * Extract `Site#filter_entries` into its own object (#1697) * Enable Travis' bundle caching (#1734) * Remove trailing whitespace in some files (#1736) * Fix a duplicate test name (#1754) ### Site Enhancements + * Update link to example Rakefile to point to specific commit (#1741) - * Fix drafts docs to indicate that draft time is based on file modification - time, not `Time.now` (#1695) - * Add `jekyll-monthly-archive-plugin` and `jekyll-category-archive-plugin` to - list of third-party plugins (#1693) + * Fix drafts docs to indicate that draft time is based on file modification time, not `Time.now` (#1695) + * Add `jekyll-monthly-archive-plugin` and `jekyll-category-archive-plugin` to list of third-party plugins (#1693) * Add `jekyll-asset-path-plugin` to list of third-party plugins (#1670) * Add `emoji-for-jekyll` to list of third-part plugins (#1708) * Fix previous section link on plugins page to point to pagination page (#1707) @@ -1114,44 +1099,40 @@ ## 1.3.0 / 2013-11-04 ### Major Enhancements - * Add support for adding data as YAML files under a site's `_data` - directory (#1003) + + * Add support for adding data as YAML files under a site's `_data` directory (#1003) * Allow variables to be used with `include` tags (#1495) * Allow using gems for plugin management (#1557) ### Minor Enhancements + * Decrease the specificity in the site template CSS (#1574) * Add `encoding` configuration option (#1449) - * Provide better error handling for Jekyll's custom Liquid tags - (#1514) - * If an included file causes a Liquid error, add the path to the - include file that caused the error to the error message (#1596) - * If a layout causes a Liquid error, change the error message so that - we know it comes from the layout (#1601) + * Provide better error handling for Jekyll's custom Liquid tags (#1514) + * If an included file causes a Liquid error, add the path to the include file that caused the error to the error message (#1596) + * If a layout causes a Liquid error, change the error message so that we know it comes from the layout (#1601) * Update Kramdown dependency to `~> 1.2` (#1610) * Update `safe_yaml` dependency to `~> 0.9.7` (#1602) * Allow layouts to be in subfolders like includes (#1622) * Switch to listen for site watching while serving (#1589) * Add a `json` liquid filter to be used in sites (#1651) - * Point people to the migration docs when the `jekyll-import` gem is - missing (#1662) + * Point people to the migration docs when the `jekyll-import` gem is missing (#1662) ### Bug Fixes - * Fix up matching against source and destination when the two - locations are similar (#1556) + + * Fix up matching against source and destination when the two locations are similar (#1556) * Fix the missing `pathname` require in certain cases (#1255) * Use `+` instead of `Array#concat` when building `Post` attribute list (#1571) * Print server address when launching a server (#1586) * Downgrade to Maruku `~> 0.6.0` in order to avoid changes in rendering (#1598) * Fix error with failing include tag when variable was file name (#1613) * Downcase lexers before passing them to pygments (#1615) - * Capitalize the short verbose switch because it conflicts with the - built-in Commander switch (#1660) + * Capitalize the short verbose switch because it conflicts with the built-in Commander switch (#1660) * Fix compatibility with 1.8.x (#1665) - * Fix an error with the new file watching code due to library version - incompatibilities (#1687) + * Fix an error with the new file watching code due to library version incompatibilities (#1687) ### Development Fixes + * Add coverage reporting with Coveralls (#1539) * Refactor the Liquid `include` tag (#1490) * Update launchy dependency to `~> 2.3` (#1608) @@ -1168,6 +1149,7 @@ * Improve comparisons of timestamps by ignoring the seconds (#1582) ### Site Enhancements + * Fix params for `JekyllImport::WordPress.process` arguments (#1554) * Add `jekyll-suggested-tweet` to list of third-party plugins (#1555) * Link to Liquid's docs for tags and filters (#1553) @@ -1175,8 +1157,7 @@ * Simplify/generalize pagination docs (#1577) * Add documentation for the new data sources feature (#1503) * Add more information on how to create generators (#1590, #1592) - * Improve the instructions for mimicking GitHub Flavored Markdown - (#1614) + * Improve the instructions for mimicking GitHub Flavored Markdown (#1614) * Add `jekyll-import` warning note of missing dependencies (#1626) * Fix grammar in the Usage section (#1635) * Add documentation for the use of gems as plugins (#1656) @@ -1188,21 +1169,25 @@ ## 1.2.1 / 2013-09-14 ### Minor Enhancements + * Print better messages for detached server. Mute output on detach. (#1518) * Disable reverse lookup when running `jekyll serve` (#1363) * Upgrade RedCarpet dependency to `~> 2.3.0` (#1515) * Upgrade to Liquid `>= 2.5.2, < 2.6` (#1536) ### Bug Fixes + * Fix file discrepancy in gemspec (#1522) * Force rendering of Include tag (#1525) ### Development Fixes + * Add a rake task to generate a new release post (#1404) * Mute LSI output in tests (#1531) * Update contributor documentation (#1537) ### Site Enhancements + * Fix a couple of validation errors on the site (#1511) * Make navigation menus reusable (#1507) * Fix link to History page from Release v1.2.0 notes post. @@ -1212,42 +1197,38 @@ ## 1.2.0 / 2013-09-06 ### Major Enhancements + * Disable automatically-generated excerpts when `excerpt_separator` is `""`. (#1386) * Add checking for URL conflicts when running `jekyll doctor` (#1389) ### Minor Enhancements + * Catch and fix invalid `paginate` values (#1390) - * Remove superfluous `div.container` from the default html template for - `jekyll new` (#1315) + * Remove superfluous `div.container` from the default html template for `jekyll new` (#1315) * Add `-D` short-form switch for the drafts option (#1394) * Update the links in the site template for Twitter and GitHub (#1400) * Update dummy email address to example.com domain (#1408) - * Update normalize.css to v2.1.2 and minify; add rake task to update - normalize.css with greater ease. (#1430) - * Add the ability to detach the server ran by `jekyll serve` from it's - controlling terminal (#1443) + * Update normalize.css to v2.1.2 and minify; add rake task to update normalize.css with greater ease. (#1430) + * Add the ability to detach the server ran by `jekyll serve` from it's controlling terminal (#1443) * Improve permalink generation for URLs with special characters (#944) - * Expose the current Jekyll version to posts and pages via a new - `jekyll.version` variable (#1481) + * Expose the current Jekyll version to posts and pages via a new `jekyll.version` variable (#1481) ### Bug Fixes + * Markdown extension matching matches only exact matches (#1382) * Fixed NoMethodError when message passed to `Stevenson#message` is nil (#1388) * Use binary mode when writing file (#1364) - * Fix 'undefined method `encoding` for "mailto"' errors w/ Ruby 1.8 and - Kramdown > 0.14.0 (#1397) + * Fix 'undefined method `encoding` for "mailto"' errors w/ Ruby 1.8 and Kramdown > 0.14.0 (#1397) * Do not force the permalink to be a dir if it ends on .html (#963) * When a Liquid Exception is caught, show the full path rel. to site source (#1415) - * Properly read in the config options when serving the docs locally - (#1444) + * Properly read in the config options when serving the docs locally (#1444) * Fixed `--layouts` option for `build` and `serve` commands (#1458) * Remove kramdown as a runtime dependency since it's optional (#1498) - * Provide proper error handling for invalid file names in the include - tag (#1494) + * Provide proper error handling for invalid file names in the include tag (#1494) ### Development Fixes - * Remove redundant argument to - Jekyll::Commands::New#scaffold_post_content (#1356) + + * Remove redundant argument to Jekyll::Commands::New#scaffold_post_content (#1356) * Add new dependencies to the README (#1360) * Fix link to contributing page in README (#1424) * Update TomDoc in Pager#initialize to match params (#1441) @@ -1257,6 +1238,7 @@ * Add Gem version and dependency badge to README (#1497) ### Site Enhancements + * Add info about new releases (#1353) * Update plugin list with jekyll-rss plugin (#1354) * Update the site list page with Ruby's official site (#1358) @@ -1281,59 +1263,59 @@ ## 1.1.2 / 2013-07-25 ### Bug Fixes + * Require Liquid 2.5.1 (#1349) ## 1.1.1 / 2013-07-24 ### Minor Enhancements + * Remove superfluous `table` selector from main.css in `jekyll new` template (#1328) * Abort with non-zero exit codes (#1338) ### Bug Fixes + * Fix up the rendering of excerpts (#1339) ### Site Enhancements + * Add Jekyll Image Tag to the plugins list (#1306) * Remove erroneous statement that `site.pages` are sorted alphabetically. - * Add info about the `_drafts` directory to the directory structure - docs (#1320) - * Improve the layout of the plugin listing by organizing it into - categories (#1310) + * Add info about the `_drafts` directory to the directory structure docs (#1320) + * Improve the layout of the plugin listing by organizing it into categories (#1310) * Add generator-jekyllrb and grunt-jekyll to plugins page (#1330) * Mention Kramdown as option for markdown parser on Extras page (#1318) * Update Quick-Start page to include reminder that all requirements must be installed (#1327) - * Change filename in `include` example to an HTML file so as not to indicate that Jekyll - will automatically convert them. (#1303) + * Change filename in `include` example to an HTML file so as not to indicate that Jekyll will automatically convert them. (#1303) * Add an RSS feed for commits to Jekyll (#1343) ## 1.1.0 / 2013-07-14 ### Major Enhancements + * Add `docs` subcommand to read Jekyll's docs when offline. (#1046) * Support passing parameters to templates in `include` tag (#1204) * Add support for Liquid tags to post excerpts (#1302) ### Minor Enhancements - * Search the hierarchy of pagination path up to site root to determine template page for - pagination. (#1198) + + * Search the hierarchy of pagination path up to site root to determine template page for pagination. (#1198) * Add the ability to generate a new Jekyll site without a template (#1171) - * Use redcarpet as the default markdown engine in newly generated - sites (#1245, #1247) - * Add `redcarpet` as a runtime dependency so `jekyll build` works out-of-the-box for new - sites. (#1247) - * In the generated site, remove files that will be replaced by a - directory (#1118) + * Use redcarpet as the default markdown engine in newly generated sites (#1245, #1247) + * Add `redcarpet` as a runtime dependency so `jekyll build` works out-of-the-box for new sites. (#1247) + * In the generated site, remove files that will be replaced by a directory (#1118) * Fail loudly if a user-specified configuration file doesn't exist (#1098) * Allow for all options for Kramdown HTML Converter (#1201) ### Bug Fixes + * Fix pagination in subdirectories. (#1198) - * Fix an issue with directories and permalinks that have a plus sign - (+) in them (#1215) + * Fix an issue with directories and permalinks that have a plus sign (+) in them (#1215) * Provide better error reporting when generating sites (#1253) * Latest posts first in non-LSI `related_posts` (#1271) ### Development Fixes + * Merge the theme and layout Cucumber steps into one step (#1151) * Restrict activesupport dependency to pre-4.0.0 to maintain compatibility with `<= 1.9.2` * Include/exclude deprecation handling simplification (#1284) @@ -1341,22 +1323,20 @@ * Refactor Jekyll::Site (#1144) ### Site Enhancements + * Add "News" section for release notes, along with an RSS feed (#1093, #1285, #1286) * Add "History" page. * Restructured docs sections to include "Meta" section. - * Add message to "Templates" page that specifies that Python must be installed in order - to use Pygments. (#1182) + * Add message to "Templates" page that specifies that Python must be installed in order to use Pygments. (#1182) * Update link to the official Maruku repo (#1175) * Add documentation about `paginate_path` to "Templates" page in docs (#1129) * Give the quick-start guide its own page (#1191) - * Update ProTip on Installation page in docs to point to all the info about Pygments and - the 'highlight' tag. (#1196) + * Update ProTip on Installation page in docs to point to all the info about Pygments and the 'highlight' tag. (#1196) * Run `site/img` through ImageOptim (thanks @qrush!) (#1208) * Added Jade Converter to `site/docs/plugins` (#1210) * Fix location of docs pages in Contributing pages (#1214) * Add ReadInXMinutes plugin to the plugin list (#1222) - * Remove plugins from the plugin list that have equivalents in Jekyll - proper (#1223) + * Remove plugins from the plugin list that have equivalents in Jekyll proper (#1223) * Add jekyll-assets to the plugin list (#1225) * Add jekyll-pandoc-mulitple-formats to the plugin list (#1229) * Remove dead link to "Using Git to maintain your blog" (#1227) @@ -1370,17 +1350,16 @@ * Add `jekyll-timeago` to list of third-party plugins. (#1260) * Add `jekyll-swfobject` to list of third-party plugins. (#1263) * Add `jekyll-picture-tag` to list of third-party plugins. (#1280) - * Update the GitHub Pages documentation regarding relative URLs - (#1291) + * Update the GitHub Pages documentation regarding relative URLs (#1291) * Update the S3 deployment documentation (#1294) * Add suggestion for Xcode CLT install to troubleshooting page in docs (#1296) * Add 'Working with drafts' page to docs (#1289) - * Add information about time zones to the documentation for a page's - date (#1304) + * Add information about time zones to the documentation for a page's date (#1304) ## 1.0.3 / 2013-06-07 ### Minor Enhancements + * Add support to gist tag for private gists. (#1189) * Fail loudly when Maruku errors out (#1190) * Move the building of related posts into their own class (#1057) @@ -1389,16 +1368,16 @@ * Convert IDs in the site template to classes (#1170) ### Bug Fixes + * Fix typo in Stevenson constant "ERROR". (#1166) * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106) * Exit with a non-zero exit code when dealing with a Liquid error (#1121) - * Make the `exclude` and `include` options backwards compatible with - versions of Jekyll prior to 1.0 (#1114) + * Make the `exclude` and `include` options backwards compatible with versions of Jekyll prior to 1.0 (#1114) * Fix pagination on Windows (#1063) - * Fix the application of Pygments' Generic Output style to Go code - (#1156) + * Fix the application of Pygments' Generic Output style to Go code (#1156) ### Site Enhancements + * Add a Pro Tip to docs about front matter variables being optional (#1147) * Add changelog to site as History page in /docs/ (#1065) * Add note to Upgrading page about new config options in 1.0.x (#1146) @@ -1412,12 +1391,12 @@ * Fix logic for `relative_permalinks` instructions on Upgrading page (#1101) * Add docs for post excerpt (#1072) * Add docs for gist tag (#1072) - * Add docs indicating that Pygments does not need to be installed - separately (#1099, #1119) + * Add docs indicating that Pygments does not need to be installed separately (#1099, #1119) * Update the migrator docs to be current (#1136) * Add the Jekyll Gallery Plugin to the plugin list (#1143) ### Development Fixes + * Use Jekyll.logger instead of Jekyll::Stevenson to log things (#1149) * Fix pesky Cucumber infinite loop (#1139) * Do not write posts with timezones in Cucumber tests (#1124) @@ -1426,20 +1405,24 @@ ## 1.0.2 / 2013-05-12 ### Major Enhancements + * Add `jekyll doctor` command to check site for any known compatibility problems (#1081) * Backwards-compatibilize relative permalinks (#1081) ### Minor Enhancements + * Add a `data-lang=""` attribute to Redcarpet code blocks (#1066) * Deprecate old config `server_port`, match to `port` if `port` isn't set (#1084) * Update pygments.rb version to 0.5.0 (#1061) * Update Kramdown version to 1.0.2 (#1067) ### Bug Fixes + * Fix issue when categories are numbers (#1078) * Catching that Redcarpet gem isn't installed (#1059) ### Site Enhancements + * Add documentation about `relative_permalinks` (#1081) * Remove pygments-installation instructions, as pygments.rb is bundled with it (#1079) * Move pages to be Pages for realz (#985) @@ -1448,29 +1431,34 @@ ## 1.0.1 / 2013-05-08 ### Minor Enhancements + * Do not force use of `toc_token` when using `generate_tok` in RDiscount (#1048) * Add newer `language-` class name prefix to code blocks (#1037) * Commander error message now preferred over process abort with incorrect args (#1040) ### Bug Fixes + * Make Redcarpet respect the pygments configuration option (#1053) * Fix the index build with LSI (#1045) * Don't print deprecation warning when no arguments are specified. (#1041) * Add missing `` to site template used by `new` subcommand, fixed typos in code (#1032) ### Site Enhancements + * Changed https to http in the GitHub Pages link (#1051) * Remove CSS cruft, fix typos, fix HTML errors (#1028) * Removing manual install of Pip and Distribute (#1025) * Updated URL for Markdown references plugin (#1022) ### Development Fixes + * Markdownify history file (#1027) * Update links on README to point to new jekyllrb.com (#1018) ## 1.0.0 / 2013-05-06 ### Major Enhancements + * Add `jekyll new` subcommand: generate a Jekyll scaffold (#764) * Refactored Jekyll commands into subcommands: build, serve, and migrate. (#690) * Removed importers/migrators from main project, migrated to jekyll-import sub-gem (#793) @@ -1478,6 +1466,7 @@ * Add ordinal date permalink style (/:categories/:year/:y_day/:title.html) (#928) ### Minor Enhancements + * Site template HTML5-ified (#964) * Use post's directory path when matching for the `post_url` tag (#998) * Loosen dependency on Pygments so it's only required when it's needed (#1015) @@ -1517,8 +1506,7 @@ * Massively accelerate LSI performance (#664) * Truncate post slugs when importing from Tumblr (#496) * Add glob support to include, exclude option (#743) - * Layout of Page or Post defaults to 'page' or 'post', respectively (#580) - REPEALED by (#977) + * Layout of Page or Post defaults to 'page' or 'post', respectively (#580) REPEALED by (#977) * "Keep files" feature (#685) * Output full path & name for files that don't parse (#745) * Add source and destination directory protection (#535) @@ -1544,14 +1532,14 @@ * Fixed Page#dir and Page#url for edge cases (#536) * Fix broken `post_url` with posts with a time in their YAML front matter (#831) * Look for plugins under the source directory (#654) - * Tumblr Migrator: finds `_posts` dir correctly, fixes truncation of long - post names (#775) + * Tumblr Migrator: finds `_posts` dir correctly, fixes truncation of long post names (#775) * Force Categories to be Strings (#767) * Safe YAML plugin to prevent vulnerability (#777) * Add SVG support to Jekyll/WEBrick. (#407, #406) * Prevent custom destination from causing continuous regen on watch (#528, #820, #862) ### Site Enhancements + * Responsify (#860) * Fix spelling, punctuation and phrasal errors (#989) * Update quickstart instructions with `new` command (#966) @@ -1562,20 +1550,20 @@ * Redesigned site (#583) ### Development Fixes + * Exclude Cucumber 1.2.4, which causes tests to fail in 1.9.2 (#938) - * Added "features:html" rake task for debugging purposes, cleaned up - Cucumber profiles (#832) + * Added "features:html" rake task for debugging purposes, cleaned up Cucumber profiles (#832) * Explicitly require HTTPS rubygems source in Gemfile (#826) * Changed Ruby version for development to 1.9.3-p374 from p362 (#801) * Including a link to the GitHub Ruby style guide in CONTRIBUTING.md (#806) * Added script/bootstrap (#776) - * Running Simplecov under 2 conditions: ENV(COVERAGE)=true and with Ruby version - of greater than 1.9 (#771) + * Running Simplecov under 2 conditions: ENV(COVERAGE)=true and with Ruby version of greater than 1.9 (#771) * Switch to Simplecov for coverage report (#765) ## 0.12.1 / 2013-02-19 ### Minor Enhancements + * Update Kramdown version to 0.14.1 (#744) * Test Enhancements * Update Rake version to 10.0.3 (#744) @@ -1585,6 +1573,7 @@ ## 0.12.0 / 2012-12-22 ### Minor Enhancements + * Add ability to explicitly specify included files (#261) * Add `--default-mimetype` option (#279) * Allow setting of RedCloth options (#284) @@ -1604,10 +1593,12 @@ * Ensure front matter is at start of file (#562) ## 0.11.2 / 2011-12-27 + * Bug Fixes * Fix gemspec ## 0.11.1 / 2011-12-27 + * Bug Fixes * Fix extra blank line in highlight blocks (#409) * Update dependencies @@ -1615,12 +1606,14 @@ ## 0.11.0 / 2011-07-10 ### Major Enhancements + * Add command line importer functionality (#253) * Add Redcarpet Markdown support (#318) * Make markdown/textile extensions configurable (#312) * Add `markdownify` filter ### Minor Enhancements + * Switch to Albino gem * Bundler support * Use English library to avoid hoops (#292) @@ -1634,12 +1627,14 @@ * Secure additional path exploits ## 0.10.0 / 2010-12-16 + * Bug Fixes * Add `--no-server` option. ## 0.9.0 / 2010-12-15 ### Minor Enhancements + * Use OptionParser's `[no-]` functionality for better boolean parsing. * Add Drupal migrator (#245) * Complain about YAML and Liquid errors (#249) @@ -1649,6 +1644,7 @@ ## 0.8.0 / 2010-11-22 ### Minor Enhancements + * Add wordpress.com importer (#207) * Add `--limit-posts` cli option (#212) * Add `uri_escape` filter (#234) @@ -1663,12 +1659,14 @@ ## 0.7.0 / 2010-08-24 ### Minor Enhancements + * Add support for rdiscount extensions (#173) * Bug Fixes * Highlight should not be able to render local files * The site configuration may not always provide a 'time' setting (#184) ## 0.6.2 / 2010-06-25 + * Bug Fixes * Fix Rakefile 'release' task (tag pushing was missing origin) * Ensure that RedCloth is loaded when textilize filter is used (#183) @@ -1676,24 +1674,24 @@ * Fix `page.url` to include full relative path (#181) ## 0.6.1 / 2010-06-24 + * Bug Fixes * Fix Markdown Pygments prefix and suffix (#178) ## 0.6.0 / 2010-06-23 ### Major Enhancements + * Proper plugin system (#19, #100) * Add safe mode so unsafe converters/generators can be added - * Maruku is now the only processor dependency installed by default. - Other processors will be lazy-loaded when necessary (and prompt the - user to install them when necessary) (#57) + * Maruku is now the only processor dependency installed by default. Other processors will be lazy-loaded when necessary (and prompt the user to install them when necessary) (#57) ### Minor Enhancements + * Inclusion/exclusion of future dated posts (#59) * Generation for a specific time (#59) * Allocate `site.time` on render not per site_payload invocation (#59) - * Pages now present in the site payload and can be used through the - `site.pages` and `site.html_pages` variables + * Pages now present in the site payload and can be used through the `site.pages` and `site.html_pages` variables * Generate phase added to site#process and pagination is now a generator * Switch to RakeGem for build/test process * Only regenerate static files when they have changed (#142) @@ -1710,87 +1708,80 @@ ## 0.5.7 / 2010-01-12 ### Minor Enhancements + * Allow overriding of post date in the front matter (#62, #38) * Bug Fixes * Categories isn't always an array (#73) * Empty tags causes error in read_posts (#84) * Fix pagination to adhere to read/render/write paradigm * Test Enhancement - * Cucumber features no longer use site.posts.first where a better - alternative is available + * Cucumber features no longer use site.posts.first where a better alternative is available ## 0.5.6 / 2010-01-08 + * Bug Fixes * Require redcloth >= 4.2.1 in tests (#92) * Don't break on triple dashes in yaml front matter (#93) ### Minor Enhancements + * Allow .mkd as markdown extension * Use $stdout/err instead of constants (#99) * Properly wrap code blocks (#91) * Add javascript mime type for webrick (#98) ## 0.5.5 / 2010-01-08 + * Bug Fixes * Fix pagination % 0 bug (#78) - * Ensure all posts are processed first (#71) - -## NOTE - * After this point I will no longer be giving credit in the history; - that is what the commit log is for. + * Ensure all posts are processed first (#71) ## NOTE + * After this point I will no longer be giving credit in the history; that is what the commit log is for. ## 0.5.4 / 2009-08-23 + * Bug Fixes * Do not allow symlinks (security vulnerability) ## 0.5.3 / 2009-07-14 + * Bug Fixes - * Solving the permalink bug where non-html files wouldn't work - (@jeffrydegrande) + * Solving the permalink bug where non-html files wouldn't work (@jeffrydegrande) ## 0.5.2 / 2009-06-24 + * Enhancements - * Added --paginate option to the executable along with a paginator object - for the payload (@calavera) - * Upgraded RedCloth to 4.2.1, which makes `` tags work once - again. - * 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) + * Added --paginate option to the executable along with a paginator object for the payload (@calavera) + * Upgraded RedCloth to 4.2.1, which makes `` tags work once again. + * 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) + * 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) + * 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) * Added Date#xmlschema for Ruby versions < 1.9 ## 0.5.1 / 2009-05-06 ### Major Enhancements + * 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) + * 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) - * Worked around RDiscount bug that prevents Markdown from getting parsed - after highlight (@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 ### Minor Enhancements + * Ability to set post categories via YAML (@qrush) * Ability to set prevent a post from publishing via YAML (@qrush) * Add textilize filter (@willcodeforfoo) @@ -1810,6 +1801,7 @@ ## 0.4.1 ### Minor Enhancements + * Changed date format on wordpress converter (zeropadding) (@dysinger) * Bug Fixes * Add Jekyll binary as executable to gemspec (@dysinger) @@ -1817,9 +1809,11 @@ ## 0.4.0 / 2009-02-03 ### Major Enhancements + * Switch to Jeweler for packaging tasks ### Minor Enhancements + * Type importer (@codeslinger) * `site.topics` accessor (@baz) * Add `array_to_sentence_string` filter (@mchung) @@ -1838,55 +1832,62 @@ ## 0.3.0 / 2008-12-24 ### Major Enhancements - * Added `--server` option to start a simple WEBrick server on destination - directory (@johnreilly and @mchung) + + * Added `--server` option to start a simple WEBrick server on destination directory (@johnreilly and @mchung) ### Minor Enhancements + * 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) * 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) - * Fix bug that meant page data (such as the date) was not available in - templates (@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` ## 0.2.1 / 2008-12-15 + * Major Changes * Use Maruku (pure Ruby) for Markdown by default (@mreid) * Allow use of RDiscount with `--rdiscount` flag ### Minor Enhancements + * Don't load directory_watcher unless it's needed (@pjhyett) ## 0.2.0 / 2008-12-14 + * Major Changes * related_posts is now found in `site.related_posts` ## 0.1.6 / 2008-12-13 + * Major Features * Include files in `_includes` with `{% include x.textile %}` ## 0.1.5 / 2008-12-12 ### Major Enhancements + * Code highlighting with Pygments if `--pygments` is specified * Disable true LSI by default, enable with `--lsi` ### Minor Enhancements + * Output informative message if RDiscount is not available (@JackDanger) * Bug Fixes * 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 + * Bug Fixes * DATA does not work properly with rubygems ## 0.1.3 / 2008-12-06 + * Major Features * Markdown support (@vanpelt) * Mephisto and CSV converters (@vanpelt) @@ -1896,21 +1897,24 @@ * Accept both `\r\n` and `\n` in YAML header (@vanpelt) ## 0.1.2 / 2008-11-22 + * Major Features * Add a real "related posts" implementation using Classifier * Command Line Changes - * Allow cli to be called with 0, 1, or 2 args intuiting dir paths - if they are omitted + * Allow cli to be called with 0, 1, or 2 args intuiting dir paths if they are omitted ## 0.1.1 / 2008-11-22 + * Minor Additions * Posts now support introspectional data e.g. `{{ page.url }}` ## 0.1.0 / 2008-11-05 + * First release * Converts posts written in Textile * Converts regular site pages * Simple copy of binary files ## 0.0.0 / 2008-10-19 + * Birthday! From 6996fed26c7a02cfbb387fe43177466a8a7a89b1 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 7 Jan 2016 23:24:29 -0800 Subject: [PATCH 0234/4996] Update history to reflect merge of #4330 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 5b9898be7e5..d5dad194d33 100644 --- a/History.markdown +++ b/History.markdown @@ -69,6 +69,7 @@ * Add note about removal of relative permalink support in upgrading docs (#4303) * Add Pro Tip to use front matter variable to create clean URLs (#4296) * Fix grammar in the documentation for posts. (#4330) + * Fix grammar in the documentation for posts. (#4330) ## 3.0.1 / 2015-11-17 From bd325acc85efeebff4ee890affbfb91e6d2c4d2c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 7 Jan 2016 23:26:03 -0800 Subject: [PATCH 0235/4996] Remove duplicate reference for #4330 from History. [ci skip] --- History.markdown | 1 - 1 file changed, 1 deletion(-) diff --git a/History.markdown b/History.markdown index d5dad194d33..5b9898be7e5 100644 --- a/History.markdown +++ b/History.markdown @@ -69,7 +69,6 @@ * Add note about removal of relative permalink support in upgrading docs (#4303) * Add Pro Tip to use front matter variable to create clean URLs (#4296) * Fix grammar in the documentation for posts. (#4330) - * Fix grammar in the documentation for posts. (#4330) ## 3.0.1 / 2015-11-17 From ddf640e6bdeb0ae457faf50eacabab74f5c92183 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Fri, 8 Jan 2016 17:10:36 -0800 Subject: [PATCH 0236/4996] Test all the things --- lib/jekyll/converters/smartypants.rb | 4 ++-- test/test_filters.rb | 29 +++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/lib/jekyll/converters/smartypants.rb b/lib/jekyll/converters/smartypants.rb index 7af9d297e9a..d1bc81039a1 100644 --- a/lib/jekyll/converters/smartypants.rb +++ b/lib/jekyll/converters/smartypants.rb @@ -1,8 +1,8 @@ class Kramdown::Parser::SmartyPants < Kramdown::Parser::Kramdown def initialize(source, options) super - @block_parsers = [] - @span_parsers = [:smart_quotes, :html_entity, :typographic_syms, :escaped_chars] + @block_parsers = [:block_html] + @span_parsers = [:smart_quotes, :html_entity, :typographic_syms, :span_html] end end diff --git a/test/test_filters.rb b/test/test_filters.rb index 63e5267280d..d2d281c3978 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -31,9 +31,32 @@ def initialize(opts = {}) assert_equal "

something really simple

\n", @filter.markdownify("something **really** simple") end - should "smartify with simple string" do - assert_equal "SmartyPants is *not* Markdown", @filter.smartify("SmartyPants is *not* Markdown") - assert_equal "“This filter’s test…”", @filter.smartify(%q{"This filter's test..."}) + context "smartify filter" do + should "convert quotes and typographic characters" do + assert_equal "SmartyPants is *not* Markdown", @filter.smartify("SmartyPants is *not* Markdown") + assert_equal "“This filter’s test…”", @filter.smartify(%q{"This filter's test..."}) + end + + should "escapes special characters when configured to do so" do + kramdown = JekyllFilter.new({:kramdown => {:entity_output => :symbolic}}) + assert_equal "“This filter’s test…”", kramdown.smartify(%q{"This filter's test..."}) + end + + should "convert HTML entities to unicode characters" do + assert_equal "’", @filter.smartify("’") + assert_equal "“", @filter.smartify("“") + end + + should "allow raw HTML passthrough" do + assert_equal "Span HTML is not escaped", @filter.smartify("Span HTML is not escaped") + assert_equal "
Block HTML is not escaped
", @filter.smartify("
Block HTML is not escaped
") + end + + should "escape special characters" do + assert_equal "3 < 4", @filter.smartify("3 < 4") + assert_equal "5 > 4", @filter.smartify("5 > 4") + assert_equal "This & that", @filter.smartify("This & that") + end end should "sassify with simple string" do From 390503b2c7320f14e9e5bbb0f221e641f06a585d Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sat, 9 Jan 2016 16:19:43 -0800 Subject: [PATCH 0237/4996] Update history to reflect merge of #4323 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 5b9898be7e5..5bdda7c605c 100644 --- a/History.markdown +++ b/History.markdown @@ -18,6 +18,7 @@ * drops: create one base Drop class which can be set as mutable or not (#4285) * drops: provide `#to_h` to allow for hash introspection (#4281) * Shim subcommands with indication of gem possibly required so users know how to use them (#4254) + * Add smartify Liquid filter for SmartyPants (#4323) ### Bug Fixes From 428e4fe3b5c47c4afe45734e666d1c45cd8f936f Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sat, 9 Jan 2016 16:46:27 -0800 Subject: [PATCH 0238/4996] Add documentation for smartify Liquid filter --- site/_docs/templates.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/site/_docs/templates.md b/site/_docs/templates.md index fd42b6b1625..0ebd35f8731 100644 --- a/site/_docs/templates.md +++ b/site/_docs/templates.md @@ -186,6 +186,17 @@ common tasks easier.

+ + +

Smartify

+

Convert "quotes" into “smart quotes.”

+ + +

+ {% raw %}{{ page.title | smartify }}{% endraw %} +

+ +

Converting Sass/SCSS

From e558d0b983acf6447981256cdd242a2e2c9c868b Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sat, 9 Jan 2016 16:58:09 -0800 Subject: [PATCH 0239/4996] Update history to reflect merge of #4333 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 5bdda7c605c..03ba1bd5b6a 100644 --- a/History.markdown +++ b/History.markdown @@ -70,6 +70,7 @@ * Add note about removal of relative permalink support in upgrading docs (#4303) * Add Pro Tip to use front matter variable to create clean URLs (#4296) * Fix grammar in the documentation for posts. (#4330) + * Add documentation for smartify Liquid filter (#4333) ## 3.0.1 / 2015-11-17 From bb4f5910c969843f67385088be72055aeeba8c90 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 9 Jan 2016 18:04:13 -0800 Subject: [PATCH 0240/4996] document: don't cache @output_ext Fixes race issue. Will introduce perf issues, though... --- lib/jekyll/document.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index c3fff329e17..911cb4e6750 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -89,7 +89,7 @@ def relative_path # # Returns the output extension def output_ext - @output_ext ||= Jekyll::Renderer.new(site, self).output_ext + Jekyll::Renderer.new(site, self).output_ext end # The base filename of the document, without the file extname. From 92ba22f8fe30dc9bbe53585f60586c77e7cc3e14 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sat, 9 Jan 2016 18:11:48 -0800 Subject: [PATCH 0241/4996] Update history to reflect merge of #4314 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 03ba1bd5b6a..738185c5878 100644 --- a/History.markdown +++ b/History.markdown @@ -35,6 +35,7 @@ * Drop: fix hash setter precendence (#4312) * utils: `has_yaml_header?` should accept files with extraneous spaces (#4290) * Escape html from site.title and page.title in site template (#4307) + * Allow custom file extensions if defined in `permalink` YAML front matter (#4314) ### Development Fixes From a8fa52a81630c288bb47cc875b19384ccf3c5dab Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sat, 9 Jan 2016 21:56:28 -0600 Subject: [PATCH 0242/4996] Use newer Rubies. --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 560fbb3df86..7afed906ca6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,10 @@ language: ruby cache: bundler sudo: false rvm: -- 2.2 -- 2.1 -- 2.0 +- 2.2.4 +- 2.1.8 +- 2.3.0 +- 2.0.0-p648 - ruby-head - jruby-9.0.3.0 matrix: From 070f07d971b7f83f60990610b3c1855ca07e37ce Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sat, 9 Jan 2016 22:01:07 -0600 Subject: [PATCH 0243/4996] Test a theory and switch to Trusty beta. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7afed906ca6..957cd3e094e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ bundler_args: --without doc:util:site:benchmark:development +dist: trusty language: ruby cache: bundler sudo: false From 36a42e5c7154ffa959d7b01197e294761baa9665 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sat, 9 Jan 2016 22:08:00 -0600 Subject: [PATCH 0244/4996] Revert the experimental changes. They didn't work. --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 957cd3e094e..560fbb3df86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,11 @@ bundler_args: --without doc:util:site:benchmark:development -dist: trusty language: ruby cache: bundler sudo: false rvm: -- 2.2.4 -- 2.1.8 -- 2.3.0 -- 2.0.0-p648 +- 2.2 +- 2.1 +- 2.0 - ruby-head - jruby-9.0.3.0 matrix: From 9d98aca86a4b8bc2db48e6a37b3e76fb3a2b3833 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 10 Jan 2016 00:27:58 -0600 Subject: [PATCH 0245/4996] Revert "Reorganize and cleanup the Gemfile, shorten required depends." --- .travis.yml | 1 - Gemfile | 96 +++++++++++++++++++++++++---------------------------- 2 files changed, 46 insertions(+), 51 deletions(-) diff --git a/.travis.yml b/.travis.yml index 560fbb3df86..58980f41c2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,3 @@ -bundler_args: --without doc:util:site:benchmark:development language: ruby cache: bundler sudo: false diff --git a/Gemfile b/Gemfile index c694a089886..b253e8bf543 100644 --- a/Gemfile +++ b/Gemfile @@ -1,62 +1,58 @@ -source "https://rubygems.org" -gemspec :name => :jekyll +source 'https://rubygems.org' +gemspec name: 'jekyll' -gem "rake", "~> 10.1" +gem 'rake', '~> 10.1' group :development do - unless ENV["CI"] - gem "pry", :require => false - gem "rubocop", { - :github => "bbatsov/rubocop", - :branch => :master, :require => false - } - end -end - -group( :doc) { gem "rdoc", "~> 4.2" } # `--without doc` -group(:util) { gem "launchy", "~> 2.3" } # `--without util` -group(:site) { gem "html-proofer" } # `--without site` - -# `--without benchmark` -group :benchmark do - gem "rbtrace" - gem "ruby-prof" - gem "benchmark-ips" - gem "stackprof" + gem 'rdoc', '~> 4.2' + gem 'launchy', '~> 2.3' + gem 'toml', '~> 0.1.0' + gem "rubocop" + gem 'pry' end group :test do - gem "redgreen", "~> 1.2" - gem "shoulda", "~> 3.5" - gem "cucumber", "~> 2.1" - gem "simplecov", "~> 0.9" - gem "jekyll_test_plugin" - gem "jekyll_test_plugin_malicious" - gem "minitest-reporters" - gem "minitest-profile" - gem "rspec-mocks" - gem "minitest" - gem "nokogiri" + gem 'redgreen', '~> 1.2' + gem 'shoulda', '~> 3.5' + gem 'cucumber', '~> 2.1' + gem 'simplecov', '~> 0.9' + gem 'jekyll_test_plugin' + gem 'jekyll_test_plugin_malicious' + gem 'minitest-reporters' + gem 'minitest-profile' + gem 'rspec-mocks' + gem 'minitest' + gem 'nokogiri' if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2") - gem "test-unit" + gem 'test-unit' end -end -group :optional_jekyll_dependencies do - gem "toml", "~> 0.1.0" - gem "jekyll-paginate", "~> 1.0" - gem "jekyll-coffeescript", "~> 1.0" - gem "jekyll-feed", "~> 0.1.3" - gem "jekyll-redirect-from", "~> 0.9.1" - gem "jekyll-gist", "~> 1.0" - gem "mime-types", "~> 3.0" - gem "kramdown", "~> 1.9" + if ENV['PROOF'] + gem 'html-proofer', '~> 2.0' + end +end - platform :ruby, :mswin, :mingw do - gem "rdiscount", "~> 2.0" - gem "pygments.rb", "~> 0.6.0" - gem "redcarpet", "~> 3.2", ">= 3.2.3" - gem "classifier-reborn", "~> 2.0" - gem "liquid-c", "~> 3.0" +group :benchmark do + if ENV['BENCHMARK'] + gem 'ruby-prof' + gem 'rbtrace' + gem 'stackprof' + gem 'benchmark-ips' end end + +gem 'jekyll-paginate', '~> 1.0' +gem 'jekyll-coffeescript', '~> 1.0' +gem 'jekyll-feed', '~> 0.1.3' +gem 'jekyll-redirect-from', '~> 0.9.1' +gem 'jekyll-gist', '~> 1.0' +gem 'mime-types', '~> 3.0' +gem 'kramdown', '~> 1.9' + +platform :ruby, :mswin, :mingw do + gem 'rdiscount', '~> 2.0' + gem 'pygments.rb', '~> 0.6.0' + gem 'redcarpet', '~> 3.2', '>= 3.2.3' + gem 'classifier-reborn', '~> 2.0' + gem 'liquid-c', '~> 3.0' +end From c3e6c04af517884d1a31ee67f981f9f3fa24fb46 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 10 Jan 2016 10:32:29 -0600 Subject: [PATCH 0246/4996] Ignore site/**/* on CodeClimate. --- .codeclimate.yml | 1 + .rubocop.yml | 39 ++++++++++++++++++++------------------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index 27b8728d48d..9a8cac63009 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -17,6 +17,7 @@ exclude_paths: - COPYING - LICENSE +- site/**/* - test/**/* - vendor/**/* - features/**/* diff --git a/.rubocop.yml b/.rubocop.yml index aa9f765f279..31c2df3d4a8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -53,26 +53,27 @@ Style/SingleLineMethods: { Enabled: false } AllCops: TargetRubyVersion: 2.0 Include: - - lib/**/*.rb + - lib/**/*.rb Exclude: - - .rubocop.yml - - .codeclimate.yml - - .travis.yml - - .gitignore - - .rspec + - .rubocop.yml + - .codeclimate.yml + - .travis.yml + - .gitignore + - .rspec - - Gemfile.lock - - CHANGELOG.md - - readme.md - - README.md - - Readme.md - - ReadMe.md - - COPYING - - LICENSE + - Gemfile.lock + - CHANGELOG.md + - readme.md + - README.md + - Readme.md + - ReadMe.md + - COPYING + - LICENSE - - test/**/* - - vendor/**/* - - features/**/* - - script/**/* - - spec/**/* + - site/**/* + - test/**/* + - vendor/**/* + - features/**/* + - script/**/* + - spec/**/* From 88b970f5dca089d2db207706217d2749cd43c798 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 10 Jan 2016 10:45:52 -0600 Subject: [PATCH 0247/4996] Expand the file extensions we ignore. --- .codeclimate.yml | 11 ++++++----- .rubocop.yml | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index 9a8cac63009..6e860b7523b 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -9,11 +9,12 @@ exclude_paths: - .rspec - Gemfile.lock -- CHANGELOG.md -- readme.md -- README.md -- Readme.md -- ReadMe.md +- CHANGELOG.{md,markdown,txt,textile} +- CONTRIBUTING.{md,markdown,txt,textile} +- readme.{md,markdown,txt,textile} +- README.{md,markdown,txt,textile} +- Readme.{md,markdown,txt,textile} +- ReadMe.{md,markdown,txt,textile} - COPYING - LICENSE diff --git a/.rubocop.yml b/.rubocop.yml index 31c2df3d4a8..1f0ffeb231d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -63,11 +63,12 @@ AllCops: - .rspec - Gemfile.lock - - CHANGELOG.md - - readme.md - - README.md - - Readme.md - - ReadMe.md + - CHANGELOG.{md,markdown,txt,textile} + - CONTRIBUTING.{md,markdown,txt,textile} + - readme.{md,markdown,txt,textile} + - README.{md,markdown,txt,textile} + - Readme.{md,markdown,txt,textile} + - ReadMe.{md,markdown,txt,textile} - COPYING - LICENSE From dc6858504a927513dc2baef5899e812c4d921c2c Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 10 Jan 2016 11:02:47 -0600 Subject: [PATCH 0248/4996] Make .travis.yml a bit more readable. --- .travis.yml | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 58980f41c2f..0fa982a1ca9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,41 +1,46 @@ -language: ruby cache: bundler +script: script/cibuild +before_script: bundle update +language: ruby sudo: false + rvm: - 2.2 - 2.1 - 2.0 -- ruby-head - jruby-9.0.3.0 +- ruby-head + matrix: fast_finish: true allow_failures: - - rvm: ruby-head - rvm: jruby-9.0.3.0 + - rvm: ruby-head exclude: - - rvm: jruby-9.0.3.0 - env: TEST_SUITE=cucumber + - rvm: jruby-9.0.3.0 + env: TEST_SUITE=cucumber + env: matrix: - - TEST_SUITE=test - - TEST_SUITE=cucumber + - TEST_SUITE=test + - TEST_SUITE=cucumber + branches: only: - - master -before_script: bundle update -script: script/cibuild + - master + notifications: irc: - on_success: change - on_failure: change - channels: - - irc.freenode.org#jekyll - template: - - "%{repository}#%{build_number} (%{branch}) %{message} %{build_url}" + template: "%{repository}#%{build_number} (%{branch}) %{message} %{build_url}" + channels: irc.freenode.org#jekyll + email: recipients: - jordon@envygeeks.io - on_success: never - on_failure: always + slack: - secure: dNdKk6nahNURIUbO3ULhA09/vTEQjK0fNbgjVjeYPEvROHgQBP1cIP3AJy8aWs8rl5Yyow4YGEilNRzKPz18AsFptVXofpwyqcBxaCfmHP809NX5PHBaadydveLm+TNVao2XeLXSWu+HUNAYO1AanCUbJSEyJTju347xCBGzESU= + secure: "\ + dNdKk6nahNURIUbO3ULhA09/vTEQjK0fNbgjVjeYPEvROHgQBP1cIP3AJy8aWs8rl5Yyow4Y\ + GEilNRzKPz18AsFptVXofpwyqcBxaCfmHP809NX5PHBaadydveLm+TNVao2XeLXSWu+HUNAY\ + O1AanCUbJSEyJTju347xCBGzESU=\ + " From 86ed09ffddb182c5be3551e5032d21974c606c72 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 10 Jan 2016 11:04:53 -0600 Subject: [PATCH 0249/4996] Enable CodeClimate coverage. --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0fa982a1ca9..7777656d6bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,3 +44,12 @@ notifications: GEilNRzKPz18AsFptVXofpwyqcBxaCfmHP809NX5PHBaadydveLm+TNVao2XeLXSWu+HUNAY\ O1AanCUbJSEyJTju347xCBGzESU=\ " + +addons: + code_climate: + repo_token: + secure: "\ + mAuvDu+nrzB8dOaLqsublDGt423mGRyZYM3vsrXh4Tf1sT+L1PxsRzU4gLmcV27HtX2Oq9\ + DA4vsRURfABU0fIhwYkQuZqEcA3d8TL36BZcGEshG6MQ2AmnYsmFiTcxqV5bmlElHEqQuT\ + 5SUFXLafgZPBnL0qDwujQcHukID41sE=\ + " From 8669077daf769099ff6c6c9b31676424f0564732 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 10 Jan 2016 11:07:00 -0600 Subject: [PATCH 0250/4996] Add coverage badge. --- README.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/README.markdown b/README.markdown index d8c621d1910..9ee529f357d 100644 --- a/README.markdown +++ b/README.markdown @@ -3,6 +3,7 @@ [![Gem Version](https://img.shields.io/gem/v/jekyll.svg)](https://rubygems.org/gems/jekyll) [![Build Status](https://img.shields.io/travis/jekyll/jekyll/master.svg)](https://travis-ci.org/jekyll/jekyll) [![Code Climate](https://img.shields.io/codeclimate/github/jekyll/jekyll.svg)](https://codeclimate.com/github/jekyll/jekyll) +[![Test Coverage](https://codeclimate.com/github/jekyll/jekyll/badges/coverage.svg)](https://codeclimate.com/github/jekyll/jekyll/coverage) [![Dependency Status](https://gemnasium.com/jekyll/jekyll.svg)](https://gemnasium.com/jekyll/jekyll) [![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)](https://hakiri.io/github/jekyll/jekyll/master) From 8337da89780e51dd0ae35a48324593d6f8c26426 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 10 Jan 2016 11:13:14 -0600 Subject: [PATCH 0251/4996] Remove script/rebund. --- script/rebund | 140 -------------------------------------------------- 1 file changed, 140 deletions(-) delete mode 100755 script/rebund diff --git a/script/rebund b/script/rebund deleted file mode 100755 index d2ff79016cb..00000000000 --- a/script/rebund +++ /dev/null @@ -1,140 +0,0 @@ -#!/usr/bin/env bash -# -# rebund(1) -# -# Author: Julien Letessier -# Homepage: https://github.com/mezis/rebund -# License: -# -# Copyright (c) 2014 HouseTrip Ltd -# -# MIT License -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -# Configuration -: ${REBUND_CREDENTIALS:=user:secret} -: ${REBUND_ENDPOINT=http://keyfile-production.herokuapp.com} -: ${REBUND_TARBALL:=bundle.tbz} -: ${REBUND_BUNDLE_DIR:=vendor/bundle} - - - -log() { - echo "rebund: $*" > /dev/stderr -} - -die() { - echo "fatal: $*" > /dev/stderr - exit 1 -} - -success() { - log "$*" - exit 0 -} - -on_error() { - die 'unknown error.' -} - -get_ruby_version() { - bundle exec ruby --version -} - -get_gemfile() { - bundle exec sh -c 'echo $BUNDLE_GEMFILE' -} - -calculate_hash() { - (get_ruby_version ; cat $(get_gemfile)) | openssl sha256 | sed -e 's/.* //' -} - -build_tarball() { - test -e $REBUND_BUNDLE_DIR || die "cannot find bundle directory in ${REBUND_BUNDLE_DIR}" - test -e $REBUND_TARBALL && success 'bundle already uploaded' - tar jcf $REBUND_TARBALL $REBUND_BUNDLE_DIR -} - -upload_tarball() { - curl --fail \ - -F filedata=@${REBUND_TARBALL} \ - --digest --user $REBUND_CREDENTIALS \ - ${REBUND_ENDPOINT}/$(calculate_hash) \ - || success "could not upload bundle" -} - -expand_tarball() { - test -e $REBUND_TARBALL || success "no tarball" - tar jxf $REBUND_TARBALL -} - -download_tarball() { - curl --fail \ - --location \ - -o ${REBUND_TARBALL} \ - --digest --user $REBUND_CREDENTIALS \ - ${REBUND_ENDPOINT}/$(calculate_hash) \ - || success "could not download bundle" -} - -rebund_upload() { - build_tarball - upload_tarball -} - -rebund_download() { - download_tarball - expand_tarball -} - -rebund_usage() { - success "usage: $0 [-v] [upload|download]" -} - -# cath errors -trap on_error ERR - -# inherit the ERR trap in subprocesses -set -E - -while test $# -gt 0 ; do - case $1 in - -v) - set -x - ;; - upload) - rebund_upload - exit 0 - ;; - download) - rebund_download - exit 0 - ;; - *) - rebund_usage - exit 1 - ;; - esac - shift -done - -rebund_usage From 55423e344ea8249366ae94312a6815510f78cbcc Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 10 Jan 2016 11:18:46 -0600 Subject: [PATCH 0252/4996] Add CodeClimate to the testing stuff. --- Gemfile | 1 + test/helper.rb | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index b253e8bf543..04bd73bdb66 100644 --- a/Gemfile +++ b/Gemfile @@ -17,6 +17,7 @@ group :test do gem 'simplecov', '~> 0.9' gem 'jekyll_test_plugin' gem 'jekyll_test_plugin_malicious' + gem "codeclimate-test-reporter" gem 'minitest-reporters' gem 'minitest-profile' gem 'rspec-mocks' diff --git a/test/helper.rb b/test/helper.rb index 281f68715f6..32363369e7e 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -2,11 +2,14 @@ def jruby? defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' end -unless ENV['TRAVIS'] - require File.expand_path('../simplecov_custom_profile', __FILE__) - SimpleCov.start('gem') do - add_filter "/vendor/bundle" +if ENV["CI"] + require "codeclimate-test-reporter" + CodeClimate::TestReporter.start +else + require File.expand_path("../simplecov_custom_profile", __FILE__) + SimpleCov.start "gem" do add_filter "/vendor/gem" + add_filter "/vendor/bundle" add_filter ".bundle" end end From 1aae802ea2d35c6cf1348a990e0cbfa62c681a49 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 10 Jan 2016 11:10:10 -0800 Subject: [PATCH 0253/4996] Update history to reflect merge of #4341 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 738185c5878..3259f842034 100644 --- a/History.markdown +++ b/History.markdown @@ -48,6 +48,7 @@ * Fix many Rubocop style errors (#4301) * Fix spelling of "GitHub" in docs and history (#4322) * Reorganize and cleanup the Gemfile, shorten required depends. (#4318) + * Remove script/rebund. (#4341) ### Site Enhancements From b96b0a80eac061a61dbb24939d6db94c44489e4c Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 10 Jan 2016 11:11:19 -0800 Subject: [PATCH 0254/4996] Update history to reflect merge of #4340 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 3259f842034..5ed950eaf73 100644 --- a/History.markdown +++ b/History.markdown @@ -49,6 +49,7 @@ * Fix spelling of "GitHub" in docs and history (#4322) * Reorganize and cleanup the Gemfile, shorten required depends. (#4318) * Remove script/rebund. (#4341) + * Implement codeclimate platform (#4340) ### Site Enhancements From 70f741b86fafba6c35faf354d268b63e10d5e037 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sat, 9 Jan 2016 05:28:06 -0600 Subject: [PATCH 0255/4996] Remove ObectSpace dumping and start using inherited, it's faster. --- lib/jekyll/generator.rb | 3 +-- lib/jekyll/plugin.rb | 43 +++++++++++++++++++++++++++++------------ lib/jekyll/site.rb | 22 +++++++++------------ 3 files changed, 41 insertions(+), 27 deletions(-) diff --git a/lib/jekyll/generator.rb b/lib/jekyll/generator.rb index 57973a74eb9..bf7c0f19aba 100644 --- a/lib/jekyll/generator.rb +++ b/lib/jekyll/generator.rb @@ -1,4 +1,3 @@ module Jekyll - class Generator < Plugin - end + Generator = Class.new(Plugin) end diff --git a/lib/jekyll/plugin.rb b/lib/jekyll/plugin.rb index 0207314c8af..e2a95168b9c 100644 --- a/lib/jekyll/plugin.rb +++ b/lib/jekyll/plugin.rb @@ -1,20 +1,39 @@ module Jekyll class Plugin - PRIORITIES = { :lowest => -100, - :low => -10, - :normal => 0, - :high => 10, - :highest => 100 } + PRIORITIES = { + :low => -10, + :highest => 100, + :lowest => -100, + :normal => 0, + :high => 10 + } - # Fetch all the subclasses of this class and its subclasses' subclasses. # - # Returns an array of descendant classes. - def self.descendants - descendants = [] - ObjectSpace.each_object(singleton_class) do |k| - descendants.unshift k unless k == self + + def self.inherited(const) + return catch_inheritance(const) do |const_| + catch_inheritance(const_) + end + end + + # + + def self.catch_inheritance(const) + const.define_singleton_method :inherited do |const_| + (@children ||= Set.new).add const_ + if block_given? + yield const_ + end end - descendants + end + + # + + def self.descendants + @children ||= Set.new + out = @children.map(&:descendants) + out << self unless superclass == Plugin + Set.new(out).flatten end # Get or set the priority of this plugin. When called without an diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index fcd4bf778c8..465e154e892 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -263,25 +263,21 @@ def site_payload end # Get the implementation class for the given Converter. - # - # klass - The Class of the Converter to fetch. - # # Returns the Converter instance implementing the given Converter. + # klass - The Class of the Converter to fetch. + def find_converter_instance(klass) - converters.find { |c| c.class == klass } || proc { raise "No converter for #{klass}" }.call + converters.find { |klass_| klass_.instance_of?(klass) } || \ + raise("No Converters found for #{klass}") end + # klass - class or module containing the subclasses. + # Returns array of instances of subclasses of parameter. # Create array of instances of the subclasses of the class or module - # passed in as argument. - # - # klass - class or module containing the subclasses which should be - # instantiated - # - # Returns array of instances of subclasses of parameter + # passed in as argument. + def instantiate_subclasses(klass) - klass.descendants.select do |c| - !safe || c.safe - end.sort.map do |c| + klass.descendants.select { |c| !safe || c.safe }.sort.map do |c| c.new(config) end end From 3c9f159fb8937641541caa27e65b95251e0aa2be Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 10 Jan 2016 14:28:28 -0600 Subject: [PATCH 0256/4996] Move Cucumber to using RSpec-Expections and furthering JRuby support. * Removes posix-spawn in favor of Open3#popen3 * Encapsulates all the paths into a single easy class. * Moves to %r{} to avoid ambiguious warnings per-Cucumber suggestion. * Starts passing around Pathname to make some actions faster. * Clean's up some methods to make them easier to read. * AUTOMATIC: Add "#" between each method. --- .travis.yml | 4 - Gemfile | 1 + features/step_definitions/jekyll_steps.rb | 281 +++++++++++----------- features/support/env.rb | 151 +++++++----- 4 files changed, 239 insertions(+), 198 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7777656d6bd..4bba7a8dca9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,6 @@ matrix: allow_failures: - rvm: jruby-9.0.3.0 - rvm: ruby-head - exclude: - - rvm: jruby-9.0.3.0 - env: TEST_SUITE=cucumber - env: matrix: - TEST_SUITE=test diff --git a/Gemfile b/Gemfile index 04bd73bdb66..2c0d7e8a598 100644 --- a/Gemfile +++ b/Gemfile @@ -11,6 +11,7 @@ group :development do end group :test do + gem 'rspec-expectations' gem 'redgreen', '~> 1.2' gem 'shoulda', '~> 3.5' gem 'cucumber', '~> 2.1' diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb index c9ae0567b2f..64213ea4e27 100644 --- a/features/step_definitions/jekyll_steps.rb +++ b/features/step_definitions/jekyll_steps.rb @@ -1,131 +1,115 @@ -def file_content_from_hash(input_hash) - matter_hash = input_hash.reject { |k, v| k == "content" } - matter = matter_hash.map { |k, v| "#{k}: #{v}\n" }.join.chomp - - content = if input_hash['input'] && input_hash['filter'] - "{{ #{input_hash['input']} | #{input_hash['filter']} }}" - else - input_hash['content'] - end - - <<-EOF ---- -#{matter} ---- -#{content} -EOF -end - Before do - FileUtils.mkdir_p(TEST_DIR) unless File.exist?(TEST_DIR) - Dir.chdir(TEST_DIR) + FileUtils.mkdir_p(Paths.test_dir) unless Paths.test_dir.directory? + Dir.chdir(Paths.test_dir) end +# + After do - FileUtils.rm_rf(TEST_DIR) if File.exist?(TEST_DIR) - FileUtils.rm(JEKYLL_COMMAND_OUTPUT_FILE) if File.exist?(JEKYLL_COMMAND_OUTPUT_FILE) - FileUtils.rm(JEKYLL_COMMAND_STATUS_FILE) if File.exist?(JEKYLL_COMMAND_STATUS_FILE) - Dir.chdir(File.dirname(TEST_DIR)) + Paths.test_dir.rmtree if Paths.test_dir.exist? + Paths.output_file.delete if Paths.output_file.exist? + Paths.status_file.delete if Paths.status_file.exist? + Dir.chdir(Paths.test_dir.parent) end -World do - MinitestWorld.new +# + +Given %r{^I have a blank site in "(.*)"$} do |path| + if !File.exist?(path) + then FileUtils.mkdir_p(path) + end end -Given /^I have a blank site in "(.*)"$/ do |path| - FileUtils.mkdir_p(path) unless File.exist?(path) +# + +Given %r{^I do not have a "(.*)" directory$} do |path| + Paths.test_dir.join(path).directory? end -Given /^I do not have a "(.*)" directory$/ do |path| - File.directory?("#{TEST_DIR}/#{path}") +# + +Given %r{^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$} do |file, key, value, text| + File.write(file, Jekyll::Utils.strip_heredoc(<<-DATA)) + --- + #{key || 'layout'}: #{value || 'nil'} + --- + + #{text} + DATA end -# Like "I have a foo file" but gives a yaml front matter so jekyll actually processes it -Given /^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$/ do |file, key, value, text| - File.open(file, 'w') do |f| - f.write <<-EOF ---- -#{key || 'layout'}: #{value || 'nil'} ---- -#{text} -EOF - end +# + +Given %r{^I have an? "(.*)" file that contains "(.*)"$} do |file, text| + File.write(file, text) end -Given /^I have an? "(.*)" file that contains "(.*)"$/ do |file, text| - File.open(file, 'w') do |f| - f.write(text) - end +# + +Given %r{^I have an? (.*) (layout|theme) that contains "(.*)"$} do |name, type, text| + folder = type == "layout" ? "_layouts" : "_theme" + + destination_file = Pathname.new(File.join(folder, "#{name}.html")) + FileUtils.mkdir_p(destination_file.parent) unless destination_file.parent.directory? + File.write(destination_file, text) end -Given /^I have an? (.*) (layout|theme) that contains "(.*)"$/ do |name, type, text| - folder = if type == 'layout' - '_layouts' - else - '_theme' - end - destination_file = File.join(folder, name + '.html') - destination_path = File.dirname(destination_file) - unless File.exist?(destination_path) - FileUtils.mkdir_p(destination_path) - end - File.open(destination_file, 'w') do |f| - f.write(text) - end +# + +Given %r{^I have an? "(.*)" file with content:$} do |file, text| + File.write(file, text) end -Given /^I have an? "(.*)" file with content:$/ do |file, text| - File.open(file, 'w') do |f| - f.write(text) +# + +Given %r{^I have an? (.*) directory$} do |dir| + if !File.directory?(dir) + then FileUtils.mkdir_p(dir) end end -Given /^I have an? (.*) directory$/ do |dir| - FileUtils.mkdir_p(dir) -end +# -Given /^I have the following (draft|page|post)s?(?: (in|under) "([^"]+)")?:$/ do |status, direction, folder, table| +Given %r{^I have the following (draft|page|post)s?(?: (in|under) "([^"]+)")?:$} do |status, direction, folder, table| table.hashes.each do |input_hash| - title = slug(input_hash['title']) - ext = input_hash['type'] || 'markdown' + title = slug(input_hash["title"]) + ext = input_hash["type"] || "markdown" + filename = filename = "#{title}.#{ext}" if %w(draft page).include?(status) before, after = location(folder, direction) + dest_folder = "_drafts" if status == "draft" + dest_folder = "_posts" if status == "post" + dest_folder = "" if status == "page" - case status - when "draft" - dest_folder = '_drafts' - filename = "#{title}.#{ext}" - when "page" - dest_folder = '' - filename = "#{title}.#{ext}" - when "post" + if status == "post" parsed_date = Time.xmlschema(input_hash['date']) rescue Time.parse(input_hash['date']) - dest_folder = '_posts' filename = "#{parsed_date.strftime('%Y-%m-%d')}-#{title}.#{ext}" end path = File.join(before, dest_folder, after, filename) - File.open(path, 'w') do |f| - f.write file_content_from_hash(input_hash) - end + File.write(path, file_content_from_hash(input_hash)) end end -Given /^I have a configuration file with "(.*)" set to "(.*)"$/ do |key, value| - File.open('_config.yml', 'w') do |f| - f.write("#{key}: #{value}\n") - end +# + +Given %r{^I have a configuration file with "(.*)" set to "(.*)"$} do |key, value| + File.write("_config.yml", "#{key}: #{value}\n") end -Given /^I have a configuration file with:$/ do |table| - File.open('_config.yml', 'w') do |f| +# + +Given %r{^I have a configuration file with:$} do |table| + File.open("_config.yml", "w") do |f| table.hashes.each do |row| f.write("#{row["key"]}: #{row["value"]}\n") end end end -Given /^I have a configuration file with "([^\"]*)" set to:$/ do |key, table| - File.open('_config.yml', 'w') do |f| +# + +Given %r{^I have a configuration file with "([^\"]*)" set to:$} do |key, table| + File.open("_config.yml", "w") do |f| f.write("#{key}:\n") table.hashes.each do |row| f.write("- #{row["value"]}\n") @@ -133,102 +117,123 @@ def file_content_from_hash(input_hash) end end -Given /^I have fixture collections$/ do - FileUtils.cp_r File.join(JEKYLL_SOURCE_DIR, "test", "source", "_methods"), source_dir +# + +Given %r{^I have fixture collections$} do + FileUtils.cp_r Paths.source_dir.join("test", "source", "_methods"), source_dir end -Given /^I wait (\d+) second(s?)$/ do |time, plural| +# + +Given %r{^I wait (\d+) second(s?)$} do |time, plural| sleep(time.to_f) end -################## -# -# Changing stuff # -################## -When /^I run jekyll(.*)$/ do |args| - status = run_jekyll(args) - if args.include?("--verbose") || ENV['DEBUG'] +When %r{^I run jekyll(.*)$} do |args| + run_jekyll(args) + if args.include?("--verbose") || ENV["DEBUG"] $stderr.puts "\n#{jekyll_run_output}\n" end end -When /^I run bundle(.*)$/ do |args| - status = run_bundle(args) +# + +When %r{^I run bundle(.*)$} do |args| + run_bundle(args) if args.include?("--verbose") || ENV['DEBUG'] $stderr.puts "\n#{jekyll_run_output}\n" end end -When /^I change "(.*)" to contain "(.*)"$/ do |file, text| - File.open(file, 'a') do |f| +# + +When %r{^I change "(.*)" to contain "(.*)"$} do |file, text| + File.open(file, "a") do |f| f.write(text) end end -When /^I delete the file "(.*)"$/ do |file| +# + +When %r{^I delete the file "(.*)"$} do |file| File.delete(file) end -################## -# -# Checking stuff # -################## -Then /^the (.*) directory should +exist$/ do |dir| - assert File.directory?(dir), "The directory \"#{dir}\" does not exist" +Then %r{^the (.*) directory should +exist$} do |dir| + expect(Pathname.new(dir)).to exist end -Then /^the (.*) directory should not exist$/ do |dir| - assert !File.directory?(dir), "The directory \"#{dir}\" exists" +# + +Then %r{^the (.*) directory should not exist$} do |dir| + expect(Pathname.new(dir)).not_to exist end -Then /^I should see "(.*)" in "(.*)"$/ do |text, file| - assert_match Regexp.new(text, Regexp::MULTILINE), file_contents(file) +# +Then %r{^I should see "(.*)" in "(.*)"$} do |text, file| + regexp = Regexp.new(text, Regexp::MULTILINE) + expect(file_contents(file)).to match regexp end -Then /^I should see exactly "(.*)" in "(.*)"$/ do |text, file| - assert_equal text, file_contents(file).strip +# + +Then %r{^I should see exactly "(.*)" in "(.*)"$} do |text, file| + expect(file_contents(file).strip).to eq text end -Then /^I should not see "(.*)" in "(.*)"$/ do |text, file| - refute_match Regexp.new(text, Regexp::MULTILINE), file_contents(file) +# + +Then %r{^I should not see "(.*)" in "(.*)"$} do |text, file| + regexp = Regexp.new(text, Regexp::MULTILINE) + expect(file_contents(file)).not_to match regexp end -Then /^I should see escaped "(.*)" in "(.*)"$/ do |text, file| - assert_match Regexp.new(Regexp.escape(text)), file_contents(file) +# + +Then %r{^I should see escaped "(.*)" in "(.*)"$} do |text, file| + regexp = Regexp.new(Regexp.escape(text)) + expect(file_contents(file)).to match regexp end -Then /^the "(.*)" file should +exist$/ do |file| - file_does_exist = File.file?(file) - unless file_does_exist - all_steps_to_path(file).each do |dir| - STDERR.puts "" - STDERR.puts "Dir #{dir}:" - STDERR.puts Dir["#{dir}/**/*"] - end - end - assert file_does_exist, "The file \"#{file}\" does not exist.\n" +# + +Then %r{^the "(.*)" file should +exist$} do |file| + expect(Pathname.new(file)).to exist end -Then /^the "(.*)" file should not exist$/ do |file| - assert !File.exist?(file), "The file \"#{file}\" exists" +# + +Then %r{^the "(.*)" file should not exist$} do |file| + expect(Pathname.new(file)).to_not exist end -Then /^I should see today's time in "(.*)"$/ do |file| - assert_match Regexp.new(seconds_agnostic_time(Time.now)), file_contents(file) +# + +Then %r{^I should see today's time in "(.*)"$} do |file| + seconds = seconds_agnostic_time(Time.now) + expect(file_contents(file)).to match Regexp.new(seconds) end -Then /^I should see today's date in "(.*)"$/ do |file| - assert_match Regexp.new(Date.today.to_s), file_contents(file) +# + +Then %r{^I should see today's date in "(.*)"$} do |file| + regexp = Regexp.new(Date.today.to_s) + expect(file_contents(file)).to match regexp end -Then /^I should see "(.*)" in the build output$/ do |text| - assert_match Regexp.new(text), jekyll_run_output +# + +Then %r{^I should see "(.*)" in the build output$} do |text| + regexp = Regexp.new(text) + expect(jekyll_run_output).to match regexp end -Then /^I should get a non-zero exit(?:\-| )status$/ do - assert jekyll_run_status > 0 +# + +Then %r{^I should get a non-zero exit(?:\-| )status$} do + expect(jekyll_run_status.to_i).to be > 0 end diff --git a/features/support/env.rb b/features/support/env.rb index 76a3e70702e..62892612fbb 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -1,116 +1,155 @@ -require 'fileutils' -require 'posix-spawn' -require 'minitest/spec' -require 'time' +require "fileutils" +require "jekyll/utils" +require "open3" +require "time" + +class Paths + SOURCE_DIR = Pathname.new(File.expand_path("../..", __dir__)) + def self.test_dir; source_dir.join("tmp", "jekyll"); end + def self.output_file; test_dir.join("jekyll_output.txt"); end + def self.status_file; test_dir.join("jekyll_status.txt"); end + def self.jekyll_bin; source_dir.join("bin", "jekyll"); end + def self.source_dir; SOURCE_DIR; end +end + +# -class MinitestWorld - extend Minitest::Assertions - attr_accessor :assertions +def file_content_from_hash(input_hash) + matter_hash = input_hash.reject { |k, v| k == "content" } + matter = matter_hash.map do |k, v| "#{k}: #{v}\n" + end - def initialize - self.assertions = 0 + matter = matter.join.chomp + content = \ + if !input_hash['input'] || !input_hash['filter'] + then input_hash['content'] + else "{{ #{input_hash['input']} | " \ + "#{input_hash['filter']} }}" end + + Jekyll::Utils.strip_heredoc(<<-EOF) + --- + #{matter.gsub( + /\n/, "\n " + )} + --- + #{content} + EOF end -JEKYLL_SOURCE_DIR = File.dirname(File.dirname(File.dirname(__FILE__))) -TEST_DIR = File.expand_path(File.join('..', '..', 'tmp', 'jekyll'), File.dirname(__FILE__)) -JEKYLL_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'jekyll')) -JEKYLL_COMMAND_OUTPUT_FILE = File.join(File.dirname(TEST_DIR), 'jekyll_output.txt') -JEKYLL_COMMAND_STATUS_FILE = File.join(File.dirname(TEST_DIR), 'jekyll_status.txt') +# def source_dir(*files) - File.join(TEST_DIR, *files) + return Paths.test_dir(*files) end +# + def all_steps_to_path(path) - source = Pathname.new(source_dir('_site')).expand_path - dest = Pathname.new(path).expand_path + source = source_dir + dest = Pathname.new(path).expand_path paths = [] + dest.ascend do |f| - break if f.eql? source + break if f == source paths.unshift f.to_s end - paths -end -def jekyll_output_file - JEKYLL_COMMAND_OUTPUT_FILE + paths end -def jekyll_status_file - JEKYLL_COMMAND_STATUS_FILE -end +# def jekyll_run_output - File.read(jekyll_output_file) if File.file?(jekyll_output_file) + if Paths.output_file.file? + then return Paths.output_file.read + end end +# + def jekyll_run_status - (File.read(jekyll_status_file) rescue 0).to_i + if Paths.status_file.file? + then return Paths.status_file.read + end end +# + def run_bundle(args) - run_in_shell('bundle', *args.strip.split(' ')) + run_in_shell("bundle", *args.strip.split(' ')) end +# + def run_jekyll(args) - child = run_in_shell(JEKYLL_PATH, *args.strip.split(' '), "--trace") - child.status.exitstatus == 0 + args = args.strip.split(" ") # Shellwords? + process = run_in_shell(Paths.jekyll_bin.to_s, *args, "--trace") + process.exitstatus == 0 end -# ----------------------------------------------------------------------------- -# XXX: POSIX::Spawn::Child does not write output when the exit status is > 0 -# for example when doing [:out, :err] => [file, "w"] it will skip -# writing the file entirely, we sould switch to Open. -# ----------------------------------------------------------------------------- +# def run_in_shell(*args) - spawned = POSIX::Spawn::Child.new(*args) - status = spawned.status.exitstatus - File.write(JEKYLL_COMMAND_STATUS_FILE, status) - File.open(JEKYLL_COMMAND_OUTPUT_FILE, "w+") do |file| - status == 0 ? file.write(spawned.out) : file.write(spawned.err) + i, o, e, p = Open3.popen3(*args) + out = o.read.strip + err = e.read.strip + + [i, o, e].each do |m| + m.close end - spawned + File.write(Paths.status_file, p.value.exitstatus) + File.write(Paths.output_file, out) if p.value.exitstatus == 0 + File.write(Paths.output_file, err) if p.value.exitstatus != 0 + p.value end -def slug(title) - if title - title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-') - else - Time.now.strftime("%s%9N") # nanoseconds since the Epoch +# + +def slug(title = nil) + if !title + then Time.now.strftime("%s%9N") # nanoseconds since the Epoch + else title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-') end end +# + def location(folder, direction) if folder - before = folder if direction == "in" - after = folder if direction == "under" + before = folder if direction == "in" + after = folder if direction == "under" end - [before || '.', after || '.'] + + [before || '.', + after || '.'] end +# + def file_contents(path) - File.open(path) do |file| - file.readlines.join # avoid differences with \n and \r\n line endings - end + return Pathname.new(path).read end +# + def seconds_agnostic_datetime(datetime = Time.now) date, time, zone = datetime.to_s.split(" ") time = seconds_agnostic_time(time) + [ Regexp.escape(date), "#{time}:\\d{2}", Regexp.escape(zone) - ].join("\\ ") + ] \ + .join("\\ ") end +# + def seconds_agnostic_time(time) - if time.is_a? Time - time = time.strftime("%H:%M:%S") - end + time = time.strftime("%H:%M:%S") if time.is_a?(Time) hour, minutes, _ = time.split(":") "#{hour}:#{minutes}" end From 1d385004805542cd6756c9793321e88289f48885 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 10 Jan 2016 12:42:01 -0800 Subject: [PATCH 0257/4996] Update history to reflect merge of #4342 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 5ed950eaf73..6eb6233cbc0 100644 --- a/History.markdown +++ b/History.markdown @@ -50,6 +50,7 @@ * Reorganize and cleanup the Gemfile, shorten required depends. (#4318) * Remove script/rebund. (#4341) * Implement codeclimate platform (#4340) + * Remove ObectSpace dumping and start using inherited, it's faster. (#4342) ### Site Enhancements From 9fee9d3d3b83077dfe2d26aec2d99bfae30f5990 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 10 Jan 2016 10:30:21 -0600 Subject: [PATCH 0258/4996] Add script/travis so all people can play with Travis-CI images. --- script/travis | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 script/travis diff --git a/script/travis b/script/travis new file mode 100755 index 00000000000..826ffa767ca --- /dev/null +++ b/script/travis @@ -0,0 +1,36 @@ +#!/bin/sh +# Usage: script/travis [ruby-version [file]] +# Example: script/travis 2.0 test/failing_test.rb +# Example: script/travis 2.3.0 +set -e + +mkdir -p vendor/docker +docker rm -fv docker-travis > /dev/null 2>&1 || true +docker run --volume=$(pwd):/home/travis/builds/jekyll/jekyll \ + --workdir=/home/travis/builds/jekyll/jekyll \ + --volume=$(pwd)/vendor/docker:/home/travis/builds/jekyll/jekyll/vendor/bundle \ + --user=travis --name=docker-travis -dit quay.io/travisci/travis-ruby \ + bash > /dev/null + +status=0 +if [ $# -eq 2 ]; then + docker exec -it docker-travis bash -ilc " \ + rvm use --install --binary --fuzzy $1 + bundle install --path vendor/bundle -j 256 + script/test $2 + " || status=$? + +elif [ $# -eq 1 ]; then + docker exec -it docker-travis bash -ilc " \ + rvm use --install --binary --fuzzy $1 + bundle install --path vendor/bundle -j 256 + bundle exec rake + " || status=$? + +else + docker exec -it docker-travis \ + bash -il || status=$? +fi + +docker rm -fv docker-travis > /dev/null +exit $status From e8883750813331c83a29ce4348075e905fc2f9f8 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 10 Jan 2016 12:49:31 -0800 Subject: [PATCH 0259/4996] Update history to reflect merge of #4338 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 6eb6233cbc0..6ad35f61cac 100644 --- a/History.markdown +++ b/History.markdown @@ -51,6 +51,7 @@ * Remove script/rebund. (#4341) * Implement codeclimate platform (#4340) * Remove ObectSpace dumping and start using inherited, it's faster. (#4342) + * Add script/travis so all people can play with Travis-CI images. (#4338) ### Site Enhancements From e19258801389642ae5f355f97d50810ab97471a1 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 10 Jan 2016 14:54:45 -0600 Subject: [PATCH 0260/4996] Cleanup .jrubyrc * Remove invoked dynamic, it slows down Ruby. * Remove ObjectSpace which slows down JRuby, we use inheritance now. * Remove the compat version 9K is Ruby2 by default. --- .jrubyrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/.jrubyrc b/.jrubyrc index c4f93701522..39aa437d81f 100644 --- a/.jrubyrc +++ b/.jrubyrc @@ -1,6 +1,3 @@ backtrace.mask=true -compile.invokedynamic=true -objectspace.enabled=true backtrace.color=true -compat.version=2.2 backtrace.style=mri From 6048dcdba2e7bc650c317eaa7ddd52ce9590c5a3 Mon Sep 17 00:00:00 2001 From: Alex J Best Date: Sun, 10 Jan 2016 22:01:46 +0000 Subject: [PATCH 0261/4996] Fixed broken link to blog on using mathjax with jekyll --- site/_docs/extras.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/extras.md b/site/_docs/extras.md index b8b8bb72649..24bcafa148a 100644 --- a/site/_docs/extras.md +++ b/site/_docs/extras.md @@ -15,7 +15,7 @@ Kramdown comes with optional support for LaTeX to PNG rendering via [MathJax](ht {% endhighlight %} -For more information about getting started, check out [this excellent blog post](http://gastonsanchez.com/blog/opinion/2014/02/16/Mathjax-with-jekyll.html). +For more information about getting started, check out [this excellent blog post](http://gastonsanchez.com/opinion/2014/02/16/Mathjax-with-jekyll/). ## Alternative Markdown Processors From d58e38c1a7b6830003fd64250d2d0897091fc8c6 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 10 Jan 2016 19:55:45 -0800 Subject: [PATCH 0262/4996] Update history to reflect merge of #4344 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 6ad35f61cac..176c2d8d953 100644 --- a/History.markdown +++ b/History.markdown @@ -76,6 +76,7 @@ * Add Pro Tip to use front matter variable to create clean URLs (#4296) * Fix grammar in the documentation for posts. (#4330) * Add documentation for smartify Liquid filter (#4333) + * Fixed broken link to blog on using mathjax with jekyll (#4344) ## 3.0.1 / 2015-11-17 From 2f36e09db57fa727f8dea70d61b3300e2547a7bc Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 10 Jan 2016 19:55:59 -0800 Subject: [PATCH 0263/4996] Update history to reflect merge of #4344 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 176c2d8d953..2411714ba1b 100644 --- a/History.markdown +++ b/History.markdown @@ -77,6 +77,7 @@ * Fix grammar in the documentation for posts. (#4330) * Add documentation for smartify Liquid filter (#4333) * Fixed broken link to blog on using mathjax with jekyll (#4344) + * Fixed broken link to blog on using mathjax with jekyll (#4344) ## 3.0.1 / 2015-11-17 From 00b9f9dd620d3ce75fdeefe98e3e7fe4ddca32a3 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 10 Jan 2016 19:57:02 -0800 Subject: [PATCH 0264/4996] Revert "Update history to reflect merge of #4344 [ci skip]" This reverts commit 2f36e09db57fa727f8dea70d61b3300e2547a7bc. --- History.markdown | 1 - 1 file changed, 1 deletion(-) diff --git a/History.markdown b/History.markdown index 2411714ba1b..176c2d8d953 100644 --- a/History.markdown +++ b/History.markdown @@ -77,7 +77,6 @@ * Fix grammar in the documentation for posts. (#4330) * Add documentation for smartify Liquid filter (#4333) * Fixed broken link to blog on using mathjax with jekyll (#4344) - * Fixed broken link to blog on using mathjax with jekyll (#4344) ## 3.0.1 / 2015-11-17 From 597021a81334f9b0fbd49c449e094e226cbbadd9 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 11 Jan 2016 08:56:49 -0800 Subject: [PATCH 0265/4996] Update history to reflect merge of #4343 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 176c2d8d953..7318a05fa08 100644 --- a/History.markdown +++ b/History.markdown @@ -52,6 +52,7 @@ * Implement codeclimate platform (#4340) * Remove ObectSpace dumping and start using inherited, it's faster. (#4342) * Add script/travis so all people can play with Travis-CI images. (#4338) + * Move Cucumber to using RSpec-Expections and furthering JRuby support. (#4343) ### Site Enhancements From c5b8b3315f4cddda41f008cfe82ab3c03ac48fd3 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Mon, 11 Jan 2016 14:55:34 -0600 Subject: [PATCH 0266/4996] Rearrange Cucumber and add some flair. * Move step_definitions/jekyll.rb to just step_definitions.rb * Rename the formatter to Jekyll::Cucumber::Formatter, it's Jekyll's. * Add some flair; switch to checks! * Rename env.rb to helpers.rb --- .../jekyll_steps.rb => step_definitions.rb} | 0 .../support/{overview.rb => formatter.rb} | 130 +++++++++++------- features/support/{env.rb => helpers.rb} | 0 script/cucumber | 11 +- 4 files changed, 84 insertions(+), 57 deletions(-) rename features/{step_definitions/jekyll_steps.rb => step_definitions.rb} (100%) rename features/support/{overview.rb => formatter.rb} (56%) rename features/support/{env.rb => helpers.rb} (100%) diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions.rb similarity index 100% rename from features/step_definitions/jekyll_steps.rb rename to features/step_definitions.rb diff --git a/features/support/overview.rb b/features/support/formatter.rb similarity index 56% rename from features/support/overview.rb rename to features/support/formatter.rb index 9045eafbf5a..f399a3ce16c 100644 --- a/features/support/overview.rb +++ b/features/support/formatter.rb @@ -3,142 +3,176 @@ require 'cucumber/formatter/console' require 'cucumber/formatter/io' -module Features - module Support - # The formatter used for --format pretty (the default formatter). - # - # This formatter prints features to plain text - exactly how they were parsed, - # just prettier. That means with proper indentation and alignment of table columns. - # - # If the output is STDOUT (and not a file), there are bright colours to watch too. - # - class Overview +module Jekyll + module Cucumber + class Formatter + attr_accessor :indent, :runtime + include ::Cucumber::Formatter::Console + include ::Cucumber::Formatter::Io include FileUtils - include Cucumber::Formatter::Console - include Cucumber::Formatter::Io - attr_writer :indent - attr_reader :runtime + + CHARS = { + :failed => "\u2718".red, + :pending => "\u203D".yellow, + :undefined => "\u2718".red, + :passed => "\u2714".green, + :skipped => "\u203D".blue + } + + # def initialize(runtime, path_or_io, options) - @runtime, @io, @options = runtime, ensure_io(path_or_io), options - @exceptions = [] - @indent = 0 + @runtime = runtime + @snippets_input = [] + @io = ensure_io(path_or_io) @prefixes = options[:prefixes] || {} @delayed_messages = [] - @snippets_input = [] + @options = options + @exceptions = [] + @indent = 0 end + # + def before_features(features) print_profile_information end + # + def after_features(features) @io.puts print_summary(features) end + # + def before_feature(feature) @exceptions = [] @indent = 0 end - def comment_line(comment_line) - end + # - def after_tags(tags) - end + def tag_name(tag_name); end + def comment_line(comment_line); end + def after_feature_element(feature_element); end + def after_tags(tags); end - def tag_name(tag_name) - end + # def before_feature_element(feature_element) @indent = 2 @scenario_indent = 2 end - def after_feature_element(feature_element) - end + # def before_background(background) - @indent = 2 @scenario_indent = 2 @in_background = true + @indent = 2 end + # + def after_background(background) @in_background = nil end - def background_name(keyword, name, file_colon_line, source_indent) - print_feature_element_name(keyword, name, file_colon_line, source_indent) + # + + def background_name(keyword, name, source_line, indend) + print_feature_element_name( + keyword, name, source_line, indend + ) end - def scenario_name(keyword, name, file_colon_line, source_indent) - print_feature_element_name(keyword, name, file_colon_line, source_indent) + # + + def scenario_name(keyword, name, source_line, indent) + print_feature_element_name( + keyword, name, source_line, indent + ) end + # + def before_step(step) @current_step = step end - def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line) + # + + def before_step_result(keyword, step_match, multiline_arg, status, exception, \ + source_indent, background, file_colon_line) + @hide_this_step = false if exception if @exceptions.include?(exception) @hide_this_step = true return end + @exceptions << exception end + if status != :failed && @in_background ^ background @hide_this_step = true return end + @status = status end - CHARS = { - :failed => "x".red, - :pending => "?".yellow, - :undefined => "x".red, - :passed => ".".green, - :skipped => "-".blue - } + # def step_name(keyword, step_match, status, source_indent, background, file_colon_line) @io.print CHARS[status] + @io.print " " end + # + def exception(exception, status) return if @hide_this_step + @io.puts print_exception(exception, status, @indent) @io.flush end + # + def after_test_step(test_step, result) - collect_snippet_data(test_step, result) + collect_snippet_data( + test_step, result + ) end - private + # - def print_feature_element_name(keyword, name, file_colon_line, source_indent) + private + def print_feature_element_name(keyword, name, source_line, indent) @io.puts - names = name.empty? ? [name] : name.split("\n") - line = " #{keyword}: #{names[0]}" - if @options[:source] - line_comment = "#{file_colon_line}" - @io.print(line_comment) - end + + 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 " " @io.flush end + # + def cell_prefix(status) @prefixes[status] end + # + def print_summary(features) @io.puts print_stats(features, @options) diff --git a/features/support/env.rb b/features/support/helpers.rb similarity index 100% rename from features/support/env.rb rename to features/support/helpers.rb diff --git a/script/cucumber b/script/cucumber index 13508c84ee2..0f0ef0f7da1 100755 --- a/script/cucumber +++ b/script/cucumber @@ -1,11 +1,4 @@ #!/usr/bin/env bash -if ruby --version | grep -q "jruby" -then - echo "Move along, we are not testing features on JRuby right now." - exit 0 -else - time ruby -S bundle exec cucumber \ - -f Features::Support::Overview \ - "$@" -fi +time ruby -S bundle exec cucumber \ + -f Jekyll::Cucumber::Formatter "$@" From a32c77fb87f6b2bf64e52e0070b69d7f77339bc6 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 11 Jan 2016 13:10:43 -0800 Subject: [PATCH 0267/4996] Update history to reflect merge of #4347 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 7318a05fa08..ab1d5139c67 100644 --- a/History.markdown +++ b/History.markdown @@ -53,6 +53,7 @@ * Remove ObectSpace dumping and start using inherited, it's faster. (#4342) * Add script/travis so all people can play with Travis-CI images. (#4338) * Move Cucumber to using RSpec-Expections and furthering JRuby support. (#4343) + * Rearrange Cucumber and add some flair. (#4347) ### Site Enhancements From da6618c6fc85254556ec965d260a48d22f78208c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 11 Jan 2016 13:36:41 -0800 Subject: [PATCH 0268/4996] site: fix :hour, :minute, :second permalink keys to refer to date front matter value Fixes #4336 --- site/_docs/permalinks.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/site/_docs/permalinks.md b/site/_docs/permalinks.md index 5aa0449aac5..9ccf27060c5 100644 --- a/site/_docs/permalinks.md +++ b/site/_docs/permalinks.md @@ -79,7 +79,7 @@ permalink is defined according to the format `/:categories/:year/:month/:day/:ti

- Hour of the day, 24-hour clock, zero-padded from the Post’s filename. (00..23) + Hour of the day, 24-hour clock, zero-padded from the post’s date front matter. (00..23)

@@ -89,7 +89,7 @@ permalink is defined according to the format `/:categories/:year/:month/:day/:ti

- Minute of the hour from the Post’s filename. (00..59) + Minute of the hour from the post’s date front matter. (00..59)

@@ -99,7 +99,8 @@ permalink is defined according to the format `/:categories/:year/:month/:day/:ti

- Second of the minute from the Post’s filename. (00..60) + Second of the minute from the post’s date front matter. (00..59) +

From 03582c32ed39524081b843736f69dc2b538e7a24 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 11 Jan 2016 13:37:22 -0800 Subject: [PATCH 0269/4996] site: update generated history per automatic fixes to History.markdown --- site/_docs/history.md | 372 +++++++++++++++++++++--------------------- 1 file changed, 187 insertions(+), 185 deletions(-) diff --git a/site/_docs/history.md b/site/_docs/history.md index a99932fb88f..a12653f2c1c 100644 --- a/site/_docs/history.md +++ b/site/_docs/history.md @@ -87,8 +87,7 @@ permalink: "/docs/history/" - Perf: `Markdown#matches` should avoid regexp ([#3321]({{ site.repository }}/issues/3321)) - Perf: Use frozen regular expressions for `Utils#slugify` ([#3321]({{ site.repository }}/issues/3321)) - Split off Textile support into jekyll-textile-converter ([#3319]({{ site.repository }}/issues/3319)) -- Improve the navigation menu alignment in the site template on small - screens ([#3331]({{ site.repository }}/issues/3331)) +- Improve the navigation menu alignment in the site template on small screens ([#3331]({{ site.repository }}/issues/3331)) - Show the regeneration time after the initial generation ([#3378]({{ site.repository }}/issues/3378)) - Site template: Switch default font to Helvetica Neue ([#3376]({{ site.repository }}/issues/3376)) - Make the `include` tag a teensy bit faster. ([#3391]({{ site.repository }}/issues/3391)) @@ -120,8 +119,7 @@ permalink: "/docs/history/" - Set log level to debug when verbose flag is set ([#3665]({{ site.repository }}/issues/3665)) - Added a mention on the Gemfile to complete the instructions ([#3671]({{ site.repository }}/issues/3671)) - Perf: Cache `Document#to_liquid` and invalidate where necessary ([#3693]({{ site.repository }}/issues/3693)) -- Perf: `Jekyll::Cleaner#existing_files`: Call `keep_file_regex` and - `keep_dirs` only once, not once per iteration ([#3696]({{ site.repository }}/issues/3696)) +- Perf: `Jekyll::Cleaner#existing_files`: Call `keep_file_regex` and `keep_dirs` only once, not once per iteration ([#3696]({{ site.repository }}/issues/3696)) - Omit jekyll/jekyll-help from list of resources. ([#3698]({{ site.repository }}/issues/3698)) - Add basic `jekyll doctor` test to detect fsnotify (OSX) anomalies. ([#3704]({{ site.repository }}/issues/3704)) - Added talk.jekyllrb.com to "Have questions?" ([#3694]({{ site.repository }}/issues/3694)) @@ -423,8 +421,7 @@ permalink: "/docs/history/" - Strip newlines in site template `` description. ([#2982]({{ site.repository }}/issues/2982)) - Add link to atom feed in `head` of site template files ([#2996]({{ site.repository }}/issues/2996)) - Performance optimizations ([#2994]({{ site.repository }}/issues/2994)) -- Use `Hash#each_key` instead of `Hash#keys.each` to speed up iteration - over hash keys. ([#3017]({{ site.repository }}/issues/3017)) +- Use `Hash#each_key` instead of `Hash#keys.each` to speed up iteration over hash keys. ([#3017]({{ site.repository }}/issues/3017)) - Further minor performance enhancements. ([#3022]({{ site.repository }}/issues/3022)) - Add 'b' and 's' aliases for build and serve, respectively ([#3065]({{ site.repository }}/issues/3065)) @@ -432,8 +429,7 @@ permalink: "/docs/history/" {: #bug-fixes-v2-5-0} - Fix Rouge's RedCarpet plugin interface integration ([#2951]({{ site.repository }}/issues/2951)) -- Remove `--watch` from the site template blog post since it defaults - to watching in in 2.4.0 ([#2922]({{ site.repository }}/issues/2922)) +- Remove `--watch` from the site template blog post since it defaults to watching in in 2.4.0 ([#2922]({{ site.repository }}/issues/2922)) - Fix code for media query mixin in site template ([#2946]({{ site.repository }}/issues/2946)) - Allow post URL's to have `.htm` extensions ([#2925]({{ site.repository }}/issues/2925)) - `Utils.slugify`: Don't create new objects when gsubbing ([#2997]({{ site.repository }}/issues/2997)) @@ -519,11 +515,9 @@ permalink: "/docs/history/" - Document the `name` variable for collection permalinks ([#2829]({{ site.repository }}/issues/2829)) - Adds info about installing jekyll in current dir ([#2839]({{ site.repository }}/issues/2839)) -- Remove deprecated `jekyll-projectlist` plugin from list of third-party - plugins ([#2742]({{ site.repository }}/issues/2742)) +- Remove deprecated `jekyll-projectlist` plugin from list of third-party plugins ([#2742]({{ site.repository }}/issues/2742)) - Remove tag plugins that are built in to Jekyll ([#2751]({{ site.repository }}/issues/2751)) -- Add `markdown-writer` package for Atom Editor to list of third-party - plugins ([#2763]({{ site.repository }}/issues/2763)) +- Add `markdown-writer` package for Atom Editor to list of third-party plugins ([#2763]({{ site.repository }}/issues/2763)) - Fix typo in site documentation for collections ([#2764]({{ site.repository }}/issues/2764)) - Fix minor typo on plugins docs page ([#2765]({{ site.repository }}/issues/2765)) - Replace markdown with HTML in `sass_dir` note on assets page ([#2791]({{ site.repository }}/issues/2791)) @@ -623,8 +617,7 @@ permalink: "/docs/history/" {: #site-enhancements-v2-2-0} - Update Kramdown urls ([#2588]({{ site.repository }}/issues/2588)) -- Add `Jekyll::AutolinkEmail` and `Jekyll::GitMetadata` to the list of - third-party plugins ([#2596]({{ site.repository }}/issues/2596)) +- Add `Jekyll::AutolinkEmail` and `Jekyll::GitMetadata` to the list of third-party plugins ([#2596]({{ site.repository }}/issues/2596)) - Fix a bunch of broken links in the site ([#2601]({{ site.repository }}/issues/2601)) - Replace dead links with working links ([#2611]({{ site.repository }}/issues/2611)) - Add jekyll-hook to deployment methods ([#2617]({{ site.repository }}/issues/2617)) @@ -668,12 +661,10 @@ permalink: "/docs/history/" - Allow subdirectories in `_data` ([#2395]({{ site.repository }}/issues/2395)) - Extract Pagination Generator into gem: `jekyll-paginate` ([#2455]({{ site.repository }}/issues/2455)) - Utilize `date_to_rfc822` filter in site template ([#2437]({{ site.repository }}/issues/2437)) -- Add categories, last build datetime, and generator to site template - feed ([#2438]({{ site.repository }}/issues/2438)) +- Add categories, last build datetime, and generator to site template feed ([#2438]({{ site.repository }}/issues/2438)) - Configurable, replaceable Logger-compliant logger ([#2444]({{ site.repository }}/issues/2444)) - Extract `gist` tag into a separate gem ([#2469]({{ site.repository }}/issues/2469)) -- Add `collection` attribute to `Document#to_liquid` to access the - document's collection label. ([#2436]({{ site.repository }}/issues/2436)) +- Add `collection` attribute to `Document#to_liquid` to access the document's collection label. ([#2436]({{ site.repository }}/issues/2436)) - Upgrade listen to `2.7.6 <= x < 3.0.0` ([#2492]({{ site.repository }}/issues/2492)) - Allow configuration of different Twitter and GitHub usernames in site template ([#2485]({{ site.repository }}/issues/2485)) - Bump Pygments to v0.6.0 ([#2504]({{ site.repository }}/issues/2504)) @@ -699,8 +690,7 @@ permalink: "/docs/history/" - Allow front matter defaults to set post categories ([#2373]({{ site.repository }}/issues/2373)) - Fix command in subcommand deprecation warning ([#2457]({{ site.repository }}/issues/2457)) - Keep all parent directories of files/dirs in `keep_files` ([#2458]({{ site.repository }}/issues/2458)) -- When using RedCarpet and Rouge without Rouge installed, fixed erroneous - error which stated that redcarpet was missing, not rouge. ([#2464]({{ site.repository }}/issues/2464)) +- When using RedCarpet and Rouge without Rouge installed, fixed erroneous error which stated that redcarpet was missing, not rouge. ([#2464]({{ site.repository }}/issues/2464)) - Ignore *all* directories and files that merit it on auto-generation ([#2459]({{ site.repository }}/issues/2459)) - Before copying file, explicitly remove the old one ([#2535]({{ site.repository }}/issues/2535)) - Merge file system categories with categories from YAML. ([#2531]({{ site.repository }}/issues/2531)) @@ -731,8 +721,7 @@ permalink: "/docs/history/" - Prevent table from extending parent width in permalink style table ([#2424]({{ site.repository }}/issues/2424)) - Add collections to info about pagination support ([#2389]({{ site.repository }}/issues/2389)) - Add `jekyll_github_sample` plugin to list of third-party plugins ([#2463]({{ site.repository }}/issues/2463)) -- Clarify documentation around front matter defaults and add details - about defaults for collections. ([#2439]({{ site.repository }}/issues/2439)) +- Clarify documentation around front matter defaults and add details about defaults for collections. ([#2439]({{ site.repository }}/issues/2439)) - Add Jekyll Project Version Tag to list of third-party plugins ([#2468]({{ site.repository }}/issues/2468)) - Use `https` for GitHub links across whole site ([#2470]({{ site.repository }}/issues/2470)) - Add StickerMule + Jekyll post ([#2476]({{ site.repository }}/issues/2476)) @@ -751,13 +740,11 @@ permalink: "/docs/history/" ### Bug Fixes {: #bug-fixes-v2-0-3} -- Properly prefix links in site template with URL or baseurl depending upon - need. ([#2319]({{ site.repository }}/issues/2319)) +- Properly prefix links in site template with URL or baseurl depending upon need. ([#2319]({{ site.repository }}/issues/2319)) - Update gist tag comments and error message to require username ([#2326]({{ site.repository }}/issues/2326)) - Fix `permalink` setting in site template ([#2331]({{ site.repository }}/issues/2331)) - Don't fail if any of the path objects are nil ([#2325]({{ site.repository }}/issues/2325)) -- Instantiate all descendants for converters and generators, not just - direct subclasses ([#2334]({{ site.repository }}/issues/2334)) +- Instantiate all descendants for converters and generators, not just direct subclasses ([#2334]({{ site.repository }}/issues/2334)) - Replace all instances of `site.name` with `site.title` in site template ([#2324]({{ site.repository }}/issues/2324)) - `Jekyll::Filters#time` now accepts UNIX timestamps in string or number form ([#2339]({{ site.repository }}/issues/2339)) - Use `item_property` for `where` filter so it doesn't break on collections ([#2359]({{ site.repository }}/issues/2359)) @@ -804,17 +791,16 @@ permalink: "/docs/history/" ### Major Enhancements {: #major-enhancements-v2-0-0} + - Add "Collections" feature ([#2199]({{ site.repository }}/issues/2199)) - Add gem-based plugin whitelist to safe mode ([#1657]({{ site.repository }}/issues/1657)) -- Replace the commander command line parser with a more robust - solution for our needs called `mercenary` ([#1706]({{ site.repository }}/issues/1706)) +- Replace the commander command line parser with a more robust solution for our needs called `mercenary` ([#1706]({{ site.repository }}/issues/1706)) - Remove support for Ruby 1.8.x ([#1780]({{ site.repository }}/issues/1780)) - Move to jekyll/jekyll from mojombo/jekyll ([#1817]({{ site.repository }}/issues/1817)) - Allow custom markdown processors ([#1872]({{ site.repository }}/issues/1872)) - Provide support for the Rouge syntax highlighter ([#1859]({{ site.repository }}/issues/1859)) - Provide support for Sass ([#1932]({{ site.repository }}/issues/1932)) -- Provide a 300% improvement when generating sites that use - `Post#next` or `Post#previous` ([#1983]({{ site.repository }}/issues/1983)) +- Provide a 300% improvement when generating sites that use `Post#next` or `Post#previous` ([#1983]({{ site.repository }}/issues/1983)) - Provide support for CoffeeScript ([#1991]({{ site.repository }}/issues/1991)) - Replace Maruku with Kramdown as Default Markdown Processor ([#1988]({{ site.repository }}/issues/1988)) - Expose `site.static_files` to Liquid ([#2075]({{ site.repository }}/issues/2075)) @@ -826,10 +812,9 @@ permalink: "/docs/history/" ### Minor Enhancements {: #minor-enhancements-v2-0-0} -- Move the EntryFilter class into the Jekyll module to avoid polluting the - global namespace ([#1800]({{ site.repository }}/issues/1800)) -- Add `group_by` Liquid filter create lists of items grouped by a common - property's value ([#1788]({{ site.repository }}/issues/1788)) + +- Move the EntryFilter class into the Jekyll module to avoid polluting the global namespace ([#1800]({{ site.repository }}/issues/1800)) +- Add `group_by` Liquid filter create lists of items grouped by a common property's value ([#1788]({{ site.repository }}/issues/1788)) - Add support for Maruku's `fenced_code_blocks` option ([#1799]({{ site.repository }}/issues/1799)) - Update Redcarpet dependency to ~> 3.0 ([#1815]({{ site.repository }}/issues/1815)) - Automatically sort all pages by name ([#1848]({{ site.repository }}/issues/1848)) @@ -840,12 +825,10 @@ permalink: "/docs/history/" - Bump dependency `safe_yaml` to `~> 1.0` ([#1886]({{ site.repository }}/issues/1886)) - Allow sorting of content by custom properties ([#1849]({{ site.repository }}/issues/1849)) - Add `--quiet` flag to silence output during build and serve ([#1898]({{ site.repository }}/issues/1898)) -- Add a `where` filter to filter arrays based on a key/value pair - ([#1875]({{ site.repository }}/issues/1875)) +- Add a `where` filter to filter arrays based on a key/value pair ([#1875]({{ site.repository }}/issues/1875)) - Route 404 errors to a custom 404 page in development ([#1899]({{ site.repository }}/issues/1899)) - Excludes are now relative to the site source ([#1916]({{ site.repository }}/issues/1916)) -- Bring MIME Types file for `jekyll serve` to complete parity with GH Pages - servers ([#1993]({{ site.repository }}/issues/1993)) +- Bring MIME Types file for `jekyll serve` to complete parity with GH Pages servers ([#1993]({{ site.repository }}/issues/1993)) - Adding Breakpoint to make new site template more responsive ([#2038]({{ site.repository }}/issues/2038)) - Default to using the UTF-8 encoding when reading files. ([#2031]({{ site.repository }}/issues/2031)) - Update Redcarpet dependency to ~> 3.1 ([#2044]({{ site.repository }}/issues/2044)) @@ -863,13 +846,11 @@ permalink: "/docs/history/" - Add support for unpublished drafts ([#2164]({{ site.repository }}/issues/2164)) - Add `force_polling` option to the `serve` command ([#2165]({{ site.repository }}/issues/2165)) - Clean up the `` in the site template ([#2186]({{ site.repository }}/issues/2186)) -- Permit YAML blocks to end with three dots to better conform with the - YAML spec ([#2110]({{ site.repository }}/issues/2110)) +- Permit YAML blocks to end with three dots to better conform with the YAML spec ([#2110]({{ site.repository }}/issues/2110)) - Use `File.exist?` instead of deprecated `File.exists?` ([#2214]({{ site.repository }}/issues/2214)) - Require newline after start of YAML Front Matter header ([#2211]({{ site.repository }}/issues/2211)) - Add the ability for pages to be marked as `published: false` ([#1492]({{ site.repository }}/issues/1492)) -- Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy - looking up of variable values in a Liquid context. ([#2253]({{ site.repository }}/issues/2253)) +- Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy looking up of variable values in a Liquid context. ([#2253]({{ site.repository }}/issues/2253)) - Remove literal lang name from class ([#2292]({{ site.repository }}/issues/2292)) - Return `utf-8` encoding in header for webrick error page response ([#2289]({{ site.repository }}/issues/2289)) - Make template site easier to customize ([#2268]({{ site.repository }}/issues/2268)) @@ -879,13 +860,12 @@ permalink: "/docs/history/" ### Bug Fixes {: #bug-fixes-v2-0-0} + - Don't allow nil entries when loading posts ([#1796]({{ site.repository }}/issues/1796)) -- Remove the scrollbar that's always displayed in new sites generated - from the site template ([#1805]({{ site.repository }}/issues/1805)) +- Remove the scrollbar that's always displayed in new sites generated from the site template ([#1805]({{ site.repository }}/issues/1805)) - Add `#path` to required methods in `Jekyll::Convertible` ([#1866]({{ site.repository }}/issues/1866)) - Default Maruku fenced code blocks to ON for 2.0.0-dev ([#1831]({{ site.repository }}/issues/1831)) -- Change short opts for host and port for `jekyll docs` to be consistent with - other subcommands ([#1877]({{ site.repository }}/issues/1877)) +- Change short opts for host and port for `jekyll docs` to be consistent with other subcommands ([#1877]({{ site.repository }}/issues/1877)) - Fix typos ([#1910]({{ site.repository }}/issues/1910)) - Lock Maruku at 0.7.0 to prevent bugs caused by Maruku 0.7.1 ([#1958]({{ site.repository }}/issues/1958)) - Fixes full path leak to source directory when using include tag ([#1951]({{ site.repository }}/issues/1951)) @@ -898,8 +878,7 @@ permalink: "/docs/history/" - Sanitize paths uniformly, in a Windows-friendly way ([#2065]({{ site.repository }}/issues/2065), [#2109]({{ site.repository }}/issues/2109)) - Update gem build steps to work correctly on Windows ([#2118]({{ site.repository }}/issues/2118)) - Remove obsolete `normalize_options` method call from `bin/jekyll` ([#2121]({{ site.repository }}/issues/2121)). -- Remove `+` characters from Pygments lexer names when adding as a CSS - class ([#994]({{ site.repository }}/issues/994)) +- Remove `+` characters from Pygments lexer names when adding as a CSS class ([#994]({{ site.repository }}/issues/994)) - Remove some code that caused Ruby interpreter warnings ([#2178]({{ site.repository }}/issues/2178)) - Only strip the drive name if it begins the string ([#2175]({{ site.repository }}/issues/2175)) - Remove default post with invalid date from site template ([#2200]({{ site.repository }}/issues/2200)) @@ -915,14 +894,14 @@ permalink: "/docs/history/" ### Development Fixes {: #development-fixes-v2-0-0} + - Add a link to the site in the README.md file ([#1795]({{ site.repository }}/issues/1795)) - Add in History and site changes from `v1-stable` branch ([#1836]({{ site.repository }}/issues/1836)) - Testing additions on the Excerpt class ([#1893]({{ site.repository }}/issues/1893)) - Fix the `highlight` tag feature ([#1859]({{ site.repository }}/issues/1859)) - Test Jekyll under Ruby 2.1.0 ([#1900]({{ site.repository }}/issues/1900)) - Add script/cibuild for fun and profit ([#1912]({{ site.repository }}/issues/1912)) -- Use `Forwardable` for delegation between `Excerpt` and `Post` - ([#1927]({{ site.repository }}/issues/1927)) +- Use `Forwardable` for delegation between `Excerpt` and `Post` ([#1927]({{ site.repository }}/issues/1927)) - Rename `read_things` to `read_content` ([#1928]({{ site.repository }}/issues/1928)) - Add `script/branding` script for ASCII art lovin' ([#1936]({{ site.repository }}/issues/1936)) - Update the README to reflect the repo move ([#1943]({{ site.repository }}/issues/1943)) @@ -951,11 +930,11 @@ permalink: "/docs/history/" ### Site Enhancements {: #site-enhancements-v2-0-0} + - Document Kramdown's GFM parser option ([#1791]({{ site.repository }}/issues/1791)) - Move CSS to includes & update normalize.css to v2.1.3 ([#1787]({{ site.repository }}/issues/1787)) - Minify CSS only in production ([#1803]({{ site.repository }}/issues/1803)) -- Fix broken link to installation of Ruby on Mountain Lion blog post on - Troubleshooting docs page ([#1797]({{ site.repository }}/issues/1797)) +- Fix broken link to installation of Ruby on Mountain Lion blog post on Troubleshooting docs page ([#1797]({{ site.repository }}/issues/1797)) - Fix issues with 1.4.1 release blog post ([#1804]({{ site.repository }}/issues/1804)) - Add note about deploying to OpenShift ([#1812]({{ site.repository }}/issues/1812)) - Collect all Windows-related docs onto one page ([#1818]({{ site.repository }}/issues/1818)) @@ -970,8 +949,7 @@ permalink: "/docs/history/" - Add jekyll-compass to the plugin list ([#1923]({{ site.repository }}/issues/1923)) - Add note in Posts docs about stripping `

` tags from excerpt ([#1933]({{ site.repository }}/issues/1933)) - Add additional info about the new exclude behavior ([#1938]({{ site.repository }}/issues/1938)) -- Linkify 'awesome contributors' to point to the contributors graph on - GitHub ([#1940]({{ site.repository }}/issues/1940)) +- Linkify 'awesome contributors' to point to the contributors graph on GitHub ([#1940]({{ site.repository }}/issues/1940)) - Update `docs/sites.md` link to GitHub Training materials ([#1949]({{ site.repository }}/issues/1949)) - Update `master` with the release info from 1.4.3 ([#1947]({{ site.repository }}/issues/1947)) - Define docs nav in datafile ([#1953]({{ site.repository }}/issues/1953)) @@ -988,8 +966,7 @@ permalink: "/docs/history/" - Update link to rack-jekyll on "Deployment Methods" page ([#2047]({{ site.repository }}/issues/2047)) - Fix typo in /docs/configuration ([#2073]({{ site.repository }}/issues/2073)) - Fix count in docs for `site.static_files` ([#2077]({{ site.repository }}/issues/2077)) -- Update configuration docs to indicate utf-8 is the default for 2.0.0 - and ASCII for 1.9.3 ([#2074]({{ site.repository }}/issues/2074)) +- Update configuration docs to indicate utf-8 is the default for 2.0.0 and ASCII for 1.9.3 ([#2074]({{ site.repository }}/issues/2074)) - Add info about unreleased feature to the site ([#2061]({{ site.repository }}/issues/2061)) - Add whitespace to liquid example in GitHub Pages docs ([#2084]({{ site.repository }}/issues/2084)) - Clarify the way Sass and CoffeeScript files are read in and output ([#2067]({{ site.repository }}/issues/2067)) @@ -1006,8 +983,7 @@ permalink: "/docs/history/" - Some HTML tidying ([#2130]({{ site.repository }}/issues/2130)) - Remove modernizr and use html5shiv.js directly for IE less than v9 ([#2131]({{ site.repository }}/issues/2131)) - Remove unused images ([#2187]({{ site.repository }}/issues/2187)) -- Use `array_to_sentence_string` filter when outputting news item - categories ([#2191]({{ site.repository }}/issues/2191)) +- Use `array_to_sentence_string` filter when outputting news item categories ([#2191]({{ site.repository }}/issues/2191)) - Add link to Help repo in primary navigation bar ([#2177]({{ site.repository }}/issues/2177)) - Switch to using an ico file for the shortcut icon ([#2193]({{ site.repository }}/issues/2193)) - Use numbers to specify font weights and only bring in font weights used ([#2185]({{ site.repository }}/issues/2185)) @@ -1068,6 +1044,7 @@ permalink: "/docs/history/" ### Bug Fixes {: #bug-fixes-v1-4-3} + - Patch show-stopping security vulnerabilities ([#1944]({{ site.repository }}/issues/1944)) @@ -1076,6 +1053,7 @@ permalink: "/docs/history/" ### Bug Fixes {: #bug-fixes-v1-4-2} + - Turn on Maruku fenced code blocks by default ([#1830]({{ site.repository }}/issues/1830)) @@ -1084,6 +1062,7 @@ permalink: "/docs/history/" ### Bug Fixes {: #bug-fixes-v1-4-1} + - Don't allow nil entries when loading posts ([#1796]({{ site.repository }}/issues/1796)) @@ -1092,25 +1071,30 @@ permalink: "/docs/history/" ### Major Enhancements {: #major-enhancements-v1-4-0} + - Add support for TOML config files ([#1765]({{ site.repository }}/issues/1765)) ### Minor Enhancements {: #minor-enhancements-v1-4-0} + - Sort plugins as a way to establish a load order ([#1682]({{ site.repository }}/issues/1682)) - Update Maruku to 0.7.0 ([#1775]({{ site.repository }}/issues/1775)) ### Bug Fixes {: #bug-fixes-v1-4-0} + - Add a space between two words in a Pagination warning message ([#1769]({{ site.repository }}/issues/1769)) - Upgrade `toml` gem to `v0.1.0` to maintain compat with Ruby 1.8.7 ([#1778]({{ site.repository }}/issues/1778)) ### Development Fixes {: #development-fixes-v1-4-0} + - Remove some whitespace in the code ([#1755]({{ site.repository }}/issues/1755)) - Remove some duplication in the reading of posts and drafts ([#1779]({{ site.repository }}/issues/1779)) ### Site Enhancements {: #site-enhancements-v1-4-0} + - Fixed case of a word in the Jekyll v1.3.0 release post ([#1762]({{ site.repository }}/issues/1762)) - Fixed the mime type for the favicon ([#1772]({{ site.repository }}/issues/1772)) @@ -1120,19 +1104,20 @@ permalink: "/docs/history/" ### Minor Enhancements {: #minor-enhancements-v1-3-1} + - Add a `--prefix` option to passthrough for the importers ([#1669]({{ site.repository }}/issues/1669)) -- Push the paginator plugin lower in the plugin priority order so - other plugins run before it ([#1759]({{ site.repository }}/issues/1759)) +- Push the paginator plugin lower in the plugin priority order so other plugins run before it ([#1759]({{ site.repository }}/issues/1759)) ### Bug Fixes {: #bug-fixes-v1-3-1} + - Fix the include tag when ran in a loop ([#1726]({{ site.repository }}/issues/1726)) - Fix errors when using `--watch` on 1.8.7 ([#1730]({{ site.repository }}/issues/1730)) -- Specify where the include is called from if an included file is - missing ([#1746]({{ site.repository }}/issues/1746)) +- Specify where the include is called from if an included file is missing ([#1746]({{ site.repository }}/issues/1746)) ### Development Fixes {: #development-fixes-v1-3-1} + - Extract `Site#filter_entries` into its own object ([#1697]({{ site.repository }}/issues/1697)) - Enable Travis' bundle caching ([#1734]({{ site.repository }}/issues/1734)) - Remove trailing whitespace in some files ([#1736]({{ site.repository }}/issues/1736)) @@ -1140,11 +1125,10 @@ permalink: "/docs/history/" ### Site Enhancements {: #site-enhancements-v1-3-1} + - Update link to example Rakefile to point to specific commit ([#1741]({{ site.repository }}/issues/1741)) -- Fix drafts docs to indicate that draft time is based on file modification - time, not `Time.now` ([#1695]({{ site.repository }}/issues/1695)) -- Add `jekyll-monthly-archive-plugin` and `jekyll-category-archive-plugin` to - list of third-party plugins ([#1693]({{ site.repository }}/issues/1693)) +- Fix drafts docs to indicate that draft time is based on file modification time, not `Time.now` ([#1695]({{ site.repository }}/issues/1695)) +- Add `jekyll-monthly-archive-plugin` and `jekyll-category-archive-plugin` to list of third-party plugins ([#1693]({{ site.repository }}/issues/1693)) - Add `jekyll-asset-path-plugin` to list of third-party plugins ([#1670]({{ site.repository }}/issues/1670)) - Add `emoji-for-jekyll` to list of third-part plugins ([#1708]({{ site.repository }}/issues/1708)) - Fix previous section link on plugins page to point to pagination page ([#1707]({{ site.repository }}/issues/1707)) @@ -1159,47 +1143,43 @@ permalink: "/docs/history/" ### Major Enhancements {: #major-enhancements-v1-3-0} -- Add support for adding data as YAML files under a site's `_data` - directory ([#1003]({{ site.repository }}/issues/1003)) + +- Add support for adding data as YAML files under a site's `_data` directory ([#1003]({{ site.repository }}/issues/1003)) - Allow variables to be used with `include` tags ([#1495]({{ site.repository }}/issues/1495)) - Allow using gems for plugin management ([#1557]({{ site.repository }}/issues/1557)) ### Minor Enhancements {: #minor-enhancements-v1-3-0} + - Decrease the specificity in the site template CSS ([#1574]({{ site.repository }}/issues/1574)) - Add `encoding` configuration option ([#1449]({{ site.repository }}/issues/1449)) -- Provide better error handling for Jekyll's custom Liquid tags - ([#1514]({{ site.repository }}/issues/1514)) -- If an included file causes a Liquid error, add the path to the - include file that caused the error to the error message ([#1596]({{ site.repository }}/issues/1596)) -- If a layout causes a Liquid error, change the error message so that - we know it comes from the layout ([#1601]({{ site.repository }}/issues/1601)) +- Provide better error handling for Jekyll's custom Liquid tags ([#1514]({{ site.repository }}/issues/1514)) +- If an included file causes a Liquid error, add the path to the include file that caused the error to the error message ([#1596]({{ site.repository }}/issues/1596)) +- If a layout causes a Liquid error, change the error message so that we know it comes from the layout ([#1601]({{ site.repository }}/issues/1601)) - Update Kramdown dependency to `~> 1.2` ([#1610]({{ site.repository }}/issues/1610)) - Update `safe_yaml` dependency to `~> 0.9.7` ([#1602]({{ site.repository }}/issues/1602)) - Allow layouts to be in subfolders like includes ([#1622]({{ site.repository }}/issues/1622)) - Switch to listen for site watching while serving ([#1589]({{ site.repository }}/issues/1589)) - Add a `json` liquid filter to be used in sites ([#1651]({{ site.repository }}/issues/1651)) -- Point people to the migration docs when the `jekyll-import` gem is - missing ([#1662]({{ site.repository }}/issues/1662)) +- Point people to the migration docs when the `jekyll-import` gem is missing ([#1662]({{ site.repository }}/issues/1662)) ### Bug Fixes {: #bug-fixes-v1-3-0} -- Fix up matching against source and destination when the two - locations are similar ([#1556]({{ site.repository }}/issues/1556)) + +- Fix up matching against source and destination when the two locations are similar ([#1556]({{ site.repository }}/issues/1556)) - Fix the missing `pathname` require in certain cases ([#1255]({{ site.repository }}/issues/1255)) - Use `+` instead of `Array#concat` when building `Post` attribute list ([#1571]({{ site.repository }}/issues/1571)) - Print server address when launching a server ([#1586]({{ site.repository }}/issues/1586)) - Downgrade to Maruku `~> 0.6.0` in order to avoid changes in rendering ([#1598]({{ site.repository }}/issues/1598)) - Fix error with failing include tag when variable was file name ([#1613]({{ site.repository }}/issues/1613)) - Downcase lexers before passing them to pygments ([#1615]({{ site.repository }}/issues/1615)) -- Capitalize the short verbose switch because it conflicts with the - built-in Commander switch ([#1660]({{ site.repository }}/issues/1660)) +- Capitalize the short verbose switch because it conflicts with the built-in Commander switch ([#1660]({{ site.repository }}/issues/1660)) - Fix compatibility with 1.8.x ([#1665]({{ site.repository }}/issues/1665)) -- Fix an error with the new file watching code due to library version - incompatibilities ([#1687]({{ site.repository }}/issues/1687)) +- Fix an error with the new file watching code due to library version incompatibilities ([#1687]({{ site.repository }}/issues/1687)) ### Development Fixes {: #development-fixes-v1-3-0} + - Add coverage reporting with Coveralls ([#1539]({{ site.repository }}/issues/1539)) - Refactor the Liquid `include` tag ([#1490]({{ site.repository }}/issues/1490)) - Update launchy dependency to `~> 2.3` ([#1608]({{ site.repository }}/issues/1608)) @@ -1217,6 +1197,7 @@ permalink: "/docs/history/" ### Site Enhancements {: #site-enhancements-v1-3-0} + - Fix params for `JekyllImport::WordPress.process` arguments ([#1554]({{ site.repository }}/issues/1554)) - Add `jekyll-suggested-tweet` to list of third-party plugins ([#1555]({{ site.repository }}/issues/1555)) - Link to Liquid's docs for tags and filters ([#1553]({{ site.repository }}/issues/1553)) @@ -1224,8 +1205,7 @@ permalink: "/docs/history/" - Simplify/generalize pagination docs ([#1577]({{ site.repository }}/issues/1577)) - Add documentation for the new data sources feature ([#1503]({{ site.repository }}/issues/1503)) - Add more information on how to create generators ([#1590]({{ site.repository }}/issues/1590), [#1592]({{ site.repository }}/issues/1592)) -- Improve the instructions for mimicking GitHub Flavored Markdown - ([#1614]({{ site.repository }}/issues/1614)) +- Improve the instructions for mimicking GitHub Flavored Markdown ([#1614]({{ site.repository }}/issues/1614)) - Add `jekyll-import` warning note of missing dependencies ([#1626]({{ site.repository }}/issues/1626)) - Fix grammar in the Usage section ([#1635]({{ site.repository }}/issues/1635)) - Add documentation for the use of gems as plugins ([#1656]({{ site.repository }}/issues/1656)) @@ -1240,6 +1220,7 @@ permalink: "/docs/history/" ### Minor Enhancements {: #minor-enhancements-v1-2-1} + - Print better messages for detached server. Mute output on detach. ([#1518]({{ site.repository }}/issues/1518)) - Disable reverse lookup when running `jekyll serve` ([#1363]({{ site.repository }}/issues/1363)) - Upgrade RedCarpet dependency to `~> 2.3.0` ([#1515]({{ site.repository }}/issues/1515)) @@ -1247,17 +1228,20 @@ permalink: "/docs/history/" ### Bug Fixes {: #bug-fixes-v1-2-1} + - Fix file discrepancy in gemspec ([#1522]({{ site.repository }}/issues/1522)) - Force rendering of Include tag ([#1525]({{ site.repository }}/issues/1525)) ### Development Fixes {: #development-fixes-v1-2-1} + - Add a rake task to generate a new release post ([#1404]({{ site.repository }}/issues/1404)) - Mute LSI output in tests ([#1531]({{ site.repository }}/issues/1531)) - Update contributor documentation ([#1537]({{ site.repository }}/issues/1537)) ### Site Enhancements {: #site-enhancements-v1-2-1} + - Fix a couple of validation errors on the site ([#1511]({{ site.repository }}/issues/1511)) - Make navigation menus reusable ([#1507]({{ site.repository }}/issues/1507)) - Fix link to History page from Release v1.2.0 notes post. @@ -1270,45 +1254,41 @@ permalink: "/docs/history/" ### Major Enhancements {: #major-enhancements-v1-2-0} + - Disable automatically-generated excerpts when `excerpt_separator` is `""`. ([#1386]({{ site.repository }}/issues/1386)) - Add checking for URL conflicts when running `jekyll doctor` ([#1389]({{ site.repository }}/issues/1389)) ### Minor Enhancements {: #minor-enhancements-v1-2-0} + - Catch and fix invalid `paginate` values ([#1390]({{ site.repository }}/issues/1390)) -- Remove superfluous `div.container` from the default html template for - `jekyll new` ([#1315]({{ site.repository }}/issues/1315)) +- Remove superfluous `div.container` from the default html template for `jekyll new` ([#1315]({{ site.repository }}/issues/1315)) - Add `-D` short-form switch for the drafts option ([#1394]({{ site.repository }}/issues/1394)) - Update the links in the site template for Twitter and GitHub ([#1400]({{ site.repository }}/issues/1400)) - Update dummy email address to example.com domain ([#1408]({{ site.repository }}/issues/1408)) -- Update normalize.css to v2.1.2 and minify; add rake task to update - normalize.css with greater ease. ([#1430]({{ site.repository }}/issues/1430)) -- Add the ability to detach the server ran by `jekyll serve` from it's - controlling terminal ([#1443]({{ site.repository }}/issues/1443)) +- Update normalize.css to v2.1.2 and minify; add rake task to update normalize.css with greater ease. ([#1430]({{ site.repository }}/issues/1430)) +- Add the ability to detach the server ran by `jekyll serve` from it's controlling terminal ([#1443]({{ site.repository }}/issues/1443)) - Improve permalink generation for URLs with special characters ([#944]({{ site.repository }}/issues/944)) -- Expose the current Jekyll version to posts and pages via a new - `jekyll.version` variable ([#1481]({{ site.repository }}/issues/1481)) +- Expose the current Jekyll version to posts and pages via a new `jekyll.version` variable ([#1481]({{ site.repository }}/issues/1481)) ### Bug Fixes {: #bug-fixes-v1-2-0} + - Markdown extension matching matches only exact matches ([#1382]({{ site.repository }}/issues/1382)) - Fixed NoMethodError when message passed to `Stevenson#message` is nil ([#1388]({{ site.repository }}/issues/1388)) - Use binary mode when writing file ([#1364]({{ site.repository }}/issues/1364)) -- Fix 'undefined method `encoding` for "mailto"' errors w/ Ruby 1.8 and - Kramdown > 0.14.0 ([#1397]({{ site.repository }}/issues/1397)) +- Fix 'undefined method `encoding` for "mailto"' errors w/ Ruby 1.8 and Kramdown > 0.14.0 ([#1397]({{ site.repository }}/issues/1397)) - Do not force the permalink to be a dir if it ends on .html ([#963]({{ site.repository }}/issues/963)) - When a Liquid Exception is caught, show the full path rel. to site source ([#1415]({{ site.repository }}/issues/1415)) -- Properly read in the config options when serving the docs locally - ([#1444]({{ site.repository }}/issues/1444)) +- Properly read in the config options when serving the docs locally ([#1444]({{ site.repository }}/issues/1444)) - Fixed `--layouts` option for `build` and `serve` commands ([#1458]({{ site.repository }}/issues/1458)) - Remove kramdown as a runtime dependency since it's optional ([#1498]({{ site.repository }}/issues/1498)) -- Provide proper error handling for invalid file names in the include - tag ([#1494]({{ site.repository }}/issues/1494)) +- Provide proper error handling for invalid file names in the include tag ([#1494]({{ site.repository }}/issues/1494)) ### Development Fixes {: #development-fixes-v1-2-0} -- Remove redundant argument to - Jekyll::Commands::New#scaffold_post_content ([#1356]({{ site.repository }}/issues/1356)) + +- Remove redundant argument to Jekyll::Commands::New#scaffold_post_content ([#1356]({{ site.repository }}/issues/1356)) - Add new dependencies to the README ([#1360]({{ site.repository }}/issues/1360)) - Fix link to contributing page in README ([#1424]({{ site.repository }}/issues/1424)) - Update TomDoc in Pager#initialize to match params ([#1441]({{ site.repository }}/issues/1441)) @@ -1319,6 +1299,7 @@ permalink: "/docs/history/" ### Site Enhancements {: #site-enhancements-v1-2-0} + - Add info about new releases ([#1353]({{ site.repository }}/issues/1353)) - Update plugin list with jekyll-rss plugin ([#1354]({{ site.repository }}/issues/1354)) - Update the site list page with Ruby's official site ([#1358]({{ site.repository }}/issues/1358)) @@ -1346,6 +1327,7 @@ permalink: "/docs/history/" ### Bug Fixes {: #bug-fixes-v1-1-2} + - Require Liquid 2.5.1 ([#1349]({{ site.repository }}/issues/1349)) @@ -1354,26 +1336,26 @@ permalink: "/docs/history/" ### Minor Enhancements {: #minor-enhancements-v1-1-1} + - Remove superfluous `table` selector from main.css in `jekyll new` template ([#1328]({{ site.repository }}/issues/1328)) - Abort with non-zero exit codes ([#1338]({{ site.repository }}/issues/1338)) ### Bug Fixes {: #bug-fixes-v1-1-1} + - Fix up the rendering of excerpts ([#1339]({{ site.repository }}/issues/1339)) ### Site Enhancements {: #site-enhancements-v1-1-1} + - Add Jekyll Image Tag to the plugins list ([#1306]({{ site.repository }}/issues/1306)) - Remove erroneous statement that `site.pages` are sorted alphabetically. -- Add info about the `_drafts` directory to the directory structure - docs ([#1320]({{ site.repository }}/issues/1320)) -- Improve the layout of the plugin listing by organizing it into - categories ([#1310]({{ site.repository }}/issues/1310)) +- Add info about the `_drafts` directory to the directory structure docs ([#1320]({{ site.repository }}/issues/1320)) +- Improve the layout of the plugin listing by organizing it into categories ([#1310]({{ site.repository }}/issues/1310)) - Add generator-jekyllrb and grunt-jekyll to plugins page ([#1330]({{ site.repository }}/issues/1330)) - Mention Kramdown as option for markdown parser on Extras page ([#1318]({{ site.repository }}/issues/1318)) - Update Quick-Start page to include reminder that all requirements must be installed ([#1327]({{ site.repository }}/issues/1327)) -- Change filename in `include` example to an HTML file so as not to indicate that Jekyll - will automatically convert them. ([#1303]({{ site.repository }}/issues/1303)) +- Change filename in `include` example to an HTML file so as not to indicate that Jekyll will automatically convert them. ([#1303]({{ site.repository }}/issues/1303)) - Add an RSS feed for commits to Jekyll ([#1343]({{ site.repository }}/issues/1343)) @@ -1382,34 +1364,33 @@ permalink: "/docs/history/" ### Major Enhancements {: #major-enhancements-v1-1-0} + - Add `docs` subcommand to read Jekyll's docs when offline. ([#1046]({{ site.repository }}/issues/1046)) - Support passing parameters to templates in `include` tag ([#1204]({{ site.repository }}/issues/1204)) - Add support for Liquid tags to post excerpts ([#1302]({{ site.repository }}/issues/1302)) ### Minor Enhancements {: #minor-enhancements-v1-1-0} -- Search the hierarchy of pagination path up to site root to determine template page for - pagination. ([#1198]({{ site.repository }}/issues/1198)) + +- Search the hierarchy of pagination path up to site root to determine template page for pagination. ([#1198]({{ site.repository }}/issues/1198)) - Add the ability to generate a new Jekyll site without a template ([#1171]({{ site.repository }}/issues/1171)) -- Use redcarpet as the default markdown engine in newly generated - sites ([#1245]({{ site.repository }}/issues/1245), [#1247]({{ site.repository }}/issues/1247)) -- Add `redcarpet` as a runtime dependency so `jekyll build` works out-of-the-box for new - sites. ([#1247]({{ site.repository }}/issues/1247)) -- In the generated site, remove files that will be replaced by a - directory ([#1118]({{ site.repository }}/issues/1118)) +- Use redcarpet as the default markdown engine in newly generated sites ([#1245]({{ site.repository }}/issues/1245), [#1247]({{ site.repository }}/issues/1247)) +- Add `redcarpet` as a runtime dependency so `jekyll build` works out-of-the-box for new sites. ([#1247]({{ site.repository }}/issues/1247)) +- In the generated site, remove files that will be replaced by a directory ([#1118]({{ site.repository }}/issues/1118)) - Fail loudly if a user-specified configuration file doesn't exist ([#1098]({{ site.repository }}/issues/1098)) - Allow for all options for Kramdown HTML Converter ([#1201]({{ site.repository }}/issues/1201)) ### Bug Fixes {: #bug-fixes-v1-1-0} + - Fix pagination in subdirectories. ([#1198]({{ site.repository }}/issues/1198)) -- Fix an issue with directories and permalinks that have a plus sign - (+) in them ([#1215]({{ site.repository }}/issues/1215)) +- Fix an issue with directories and permalinks that have a plus sign (+) in them ([#1215]({{ site.repository }}/issues/1215)) - Provide better error reporting when generating sites ([#1253]({{ site.repository }}/issues/1253)) - Latest posts first in non-LSI `related_posts` ([#1271]({{ site.repository }}/issues/1271)) ### Development Fixes {: #development-fixes-v1-1-0} + - Merge the theme and layout Cucumber steps into one step ([#1151]({{ site.repository }}/issues/1151)) - Restrict activesupport dependency to pre-4.0.0 to maintain compatibility with `<= 1.9.2` - Include/exclude deprecation handling simplification ([#1284]({{ site.repository }}/issues/1284)) @@ -1418,22 +1399,20 @@ permalink: "/docs/history/" ### Site Enhancements {: #site-enhancements-v1-1-0} + - Add "News" section for release notes, along with an RSS feed ([#1093]({{ site.repository }}/issues/1093), [#1285]({{ site.repository }}/issues/1285), [#1286]({{ site.repository }}/issues/1286)) - Add "History" page. - Restructured docs sections to include "Meta" section. -- Add message to "Templates" page that specifies that Python must be installed in order - to use Pygments. ([#1182]({{ site.repository }}/issues/1182)) +- Add message to "Templates" page that specifies that Python must be installed in order to use Pygments. ([#1182]({{ site.repository }}/issues/1182)) - Update link to the official Maruku repo ([#1175]({{ site.repository }}/issues/1175)) - 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)) +- 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)) - 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)) -- Remove plugins from the plugin list that have equivalents in Jekyll - proper ([#1223]({{ site.repository }}/issues/1223)) +- Remove plugins from the plugin list that have equivalents in Jekyll proper ([#1223]({{ site.repository }}/issues/1223)) - Add jekyll-assets to the plugin list ([#1225]({{ site.repository }}/issues/1225)) - Add jekyll-pandoc-mulitple-formats to the plugin list ([#1229]({{ site.repository }}/issues/1229)) - Remove dead link to "Using Git to maintain your blog" ([#1227]({{ site.repository }}/issues/1227)) @@ -1447,13 +1426,11 @@ permalink: "/docs/history/" - Add `jekyll-timeago` to list of third-party plugins. ([#1260]({{ site.repository }}/issues/1260)) - Add `jekyll-swfobject` to list of third-party plugins. ([#1263]({{ site.repository }}/issues/1263)) - Add `jekyll-picture-tag` to list of third-party plugins. ([#1280]({{ site.repository }}/issues/1280)) -- Update the GitHub Pages documentation regarding relative URLs - ([#1291]({{ site.repository }}/issues/1291)) +- Update the GitHub Pages documentation regarding relative URLs ([#1291]({{ site.repository }}/issues/1291)) - Update the S3 deployment documentation ([#1294]({{ site.repository }}/issues/1294)) - Add suggestion for Xcode CLT install to troubleshooting page in docs ([#1296]({{ site.repository }}/issues/1296)) - Add 'Working with drafts' page to docs ([#1289]({{ site.repository }}/issues/1289)) -- Add information about time zones to the documentation for a page's - date ([#1304]({{ site.repository }}/issues/1304)) +- Add information about time zones to the documentation for a page's date ([#1304]({{ site.repository }}/issues/1304)) ## 1.0.3 / 2013-06-07 @@ -1461,6 +1438,7 @@ permalink: "/docs/history/" ### Minor Enhancements {: #minor-enhancements-v1-0-3} + - Add support to gist tag for private gists. ([#1189]({{ site.repository }}/issues/1189)) - Fail loudly when Maruku errors out ([#1190]({{ site.repository }}/issues/1190)) - Move the building of related posts into their own class ([#1057]({{ site.repository }}/issues/1057)) @@ -1470,17 +1448,17 @@ permalink: "/docs/history/" ### Bug Fixes {: #bug-fixes-v1-0-3} + - Fix typo in Stevenson constant "ERROR". ([#1166]({{ site.repository }}/issues/1166)) - Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue ([#1106]({{ site.repository }}/issues/1106)) - Exit with a non-zero exit code when dealing with a Liquid error ([#1121]({{ site.repository }}/issues/1121)) -- Make the `exclude` and `include` options backwards compatible with - versions of Jekyll prior to 1.0 ([#1114]({{ site.repository }}/issues/1114)) +- Make the `exclude` and `include` options backwards compatible with versions of Jekyll prior to 1.0 ([#1114]({{ site.repository }}/issues/1114)) - Fix pagination on Windows ([#1063]({{ site.repository }}/issues/1063)) -- Fix the application of Pygments' Generic Output style to Go code - ([#1156]({{ site.repository }}/issues/1156)) +- Fix the application of Pygments' Generic Output style to Go code ([#1156]({{ site.repository }}/issues/1156)) ### Site Enhancements {: #site-enhancements-v1-0-3} + - Add a Pro Tip to docs about front matter variables being optional ([#1147]({{ site.repository }}/issues/1147)) - Add changelog to site as History page in /docs/ ([#1065]({{ site.repository }}/issues/1065)) - Add note to Upgrading page about new config options in 1.0.x ([#1146]({{ site.repository }}/issues/1146)) @@ -1494,13 +1472,13 @@ permalink: "/docs/history/" - Fix logic for `relative_permalinks` instructions on Upgrading page ([#1101]({{ site.repository }}/issues/1101)) - Add docs for post excerpt ([#1072]({{ site.repository }}/issues/1072)) - Add docs for gist tag ([#1072]({{ site.repository }}/issues/1072)) -- Add docs indicating that Pygments does not need to be installed - separately ([#1099]({{ site.repository }}/issues/1099), [#1119]({{ site.repository }}/issues/1119)) +- Add docs indicating that Pygments does not need to be installed separately ([#1099]({{ site.repository }}/issues/1099), [#1119]({{ site.repository }}/issues/1119)) - Update the migrator docs to be current ([#1136]({{ site.repository }}/issues/1136)) - Add the Jekyll Gallery Plugin to the plugin list ([#1143]({{ site.repository }}/issues/1143)) ### Development Fixes {: #development-fixes-v1-0-3} + - Use Jekyll.logger instead of Jekyll::Stevenson to log things ([#1149]({{ site.repository }}/issues/1149)) - Fix pesky Cucumber infinite loop ([#1139]({{ site.repository }}/issues/1139)) - Do not write posts with timezones in Cucumber tests ([#1124]({{ site.repository }}/issues/1124)) @@ -1512,11 +1490,13 @@ permalink: "/docs/history/" ### Major Enhancements {: #major-enhancements-v1-0-2} + - Add `jekyll doctor` command to check site for any known compatibility problems ([#1081]({{ site.repository }}/issues/1081)) - Backwards-compatibilize relative permalinks ([#1081]({{ site.repository }}/issues/1081)) ### Minor Enhancements {: #minor-enhancements-v1-0-2} + - Add a `data-lang=""` attribute to Redcarpet code blocks ([#1066]({{ site.repository }}/issues/1066)) - Deprecate old config `server_port`, match to `port` if `port` isn't set ([#1084]({{ site.repository }}/issues/1084)) - Update pygments.rb version to 0.5.0 ([#1061]({{ site.repository }}/issues/1061)) @@ -1524,11 +1504,13 @@ permalink: "/docs/history/" ### Bug Fixes {: #bug-fixes-v1-0-2} + - Fix issue when categories are numbers ([#1078]({{ site.repository }}/issues/1078)) - Catching that Redcarpet gem isn't installed ([#1059]({{ site.repository }}/issues/1059)) ### Site Enhancements {: #site-enhancements-v1-0-2} + - Add documentation about `relative_permalinks` ([#1081]({{ site.repository }}/issues/1081)) - Remove pygments-installation instructions, as pygments.rb is bundled with it ([#1079]({{ site.repository }}/issues/1079)) - Move pages to be Pages for realz ([#985]({{ site.repository }}/issues/985)) @@ -1540,12 +1522,14 @@ permalink: "/docs/history/" ### Minor Enhancements {: #minor-enhancements-v1-0-1} + - Do not force use of `toc_token` when using `generate_tok` in RDiscount ([#1048]({{ site.repository }}/issues/1048)) - Add newer `language-` class name prefix to code blocks ([#1037]({{ site.repository }}/issues/1037)) - Commander error message now preferred over process abort with incorrect args ([#1040]({{ site.repository }}/issues/1040)) ### Bug Fixes {: #bug-fixes-v1-0-1} + - Make Redcarpet respect the pygments configuration option ([#1053]({{ site.repository }}/issues/1053)) - Fix the index build with LSI ([#1045]({{ site.repository }}/issues/1045)) - Don't print deprecation warning when no arguments are specified. ([#1041]({{ site.repository }}/issues/1041)) @@ -1553,6 +1537,7 @@ permalink: "/docs/history/" ### Site Enhancements {: #site-enhancements-v1-0-1} + - Changed https to http in the GitHub Pages link ([#1051]({{ site.repository }}/issues/1051)) - Remove CSS cruft, fix typos, fix HTML errors ([#1028]({{ site.repository }}/issues/1028)) - Removing manual install of Pip and Distribute ([#1025]({{ site.repository }}/issues/1025)) @@ -1560,6 +1545,7 @@ permalink: "/docs/history/" ### Development Fixes {: #development-fixes-v1-0-1} + - Markdownify history file ([#1027]({{ site.repository }}/issues/1027)) - Update links on README to point to new jekyllrb.com ([#1018]({{ site.repository }}/issues/1018)) @@ -1569,6 +1555,7 @@ permalink: "/docs/history/" ### Major Enhancements {: #major-enhancements-v1-0-0} + - Add `jekyll new` subcommand: generate a Jekyll scaffold ([#764]({{ site.repository }}/issues/764)) - Refactored Jekyll commands into subcommands: build, serve, and migrate. ([#690]({{ site.repository }}/issues/690)) - Removed importers/migrators from main project, migrated to jekyll-import sub-gem ([#793]({{ site.repository }}/issues/793)) @@ -1577,6 +1564,7 @@ permalink: "/docs/history/" ### Minor Enhancements {: #minor-enhancements-v1-0-0} + - Site template HTML5-ified ([#964]({{ site.repository }}/issues/964)) - Use post's directory path when matching for the `post_url` tag ([#998]({{ site.repository }}/issues/998)) - Loosen dependency on Pygments so it's only required when it's needed ([#1015]({{ site.repository }}/issues/1015)) @@ -1616,8 +1604,7 @@ permalink: "/docs/history/" - Massively accelerate LSI performance ([#664]({{ site.repository }}/issues/664)) - Truncate post slugs when importing from Tumblr ([#496]({{ site.repository }}/issues/496)) - Add glob support to include, exclude option ([#743]({{ site.repository }}/issues/743)) -- Layout of Page or Post defaults to 'page' or 'post', respectively ([#580]({{ site.repository }}/issues/580)) - REPEALED by ([#977]({{ site.repository }}/issues/977)) +- Layout of Page or Post defaults to 'page' or 'post', respectively ([#580]({{ site.repository }}/issues/580)) REPEALED by ([#977]({{ site.repository }}/issues/977)) - "Keep files" feature ([#685]({{ site.repository }}/issues/685)) - Output full path & name for files that don't parse ([#745]({{ site.repository }}/issues/745)) - Add source and destination directory protection ([#535]({{ site.repository }}/issues/535)) @@ -1643,8 +1630,7 @@ permalink: "/docs/history/" - Fixed Page#dir and Page#url for edge cases ([#536]({{ site.repository }}/issues/536)) - Fix broken `post_url` with posts with a time in their YAML front matter ([#831]({{ site.repository }}/issues/831)) - Look for plugins under the source directory ([#654]({{ site.repository }}/issues/654)) -- Tumblr Migrator: finds `_posts` dir correctly, fixes truncation of long - post names ([#775]({{ site.repository }}/issues/775)) +- Tumblr Migrator: finds `_posts` dir correctly, fixes truncation of long post names ([#775]({{ site.repository }}/issues/775)) - Force Categories to be Strings ([#767]({{ site.repository }}/issues/767)) - Safe YAML plugin to prevent vulnerability ([#777]({{ site.repository }}/issues/777)) - Add SVG support to Jekyll/WEBrick. ([#407]({{ site.repository }}/issues/407), [#406]({{ site.repository }}/issues/406)) @@ -1652,6 +1638,7 @@ permalink: "/docs/history/" ### Site Enhancements {: #site-enhancements-v1-0-0} + - Responsify ([#860]({{ site.repository }}/issues/860)) - Fix spelling, punctuation and phrasal errors ([#989]({{ site.repository }}/issues/989)) - Update quickstart instructions with `new` command ([#966]({{ site.repository }}/issues/966)) @@ -1663,15 +1650,14 @@ permalink: "/docs/history/" ### Development Fixes {: #development-fixes-v1-0-0} + - Exclude Cucumber 1.2.4, which causes tests to fail in 1.9.2 ([#938]({{ site.repository }}/issues/938)) -- Added "features:html" rake task for debugging purposes, cleaned up - Cucumber profiles ([#832]({{ site.repository }}/issues/832)) +- Added "features:html" rake task for debugging purposes, cleaned up Cucumber profiles ([#832]({{ site.repository }}/issues/832)) - Explicitly require HTTPS rubygems source in Gemfile ([#826]({{ site.repository }}/issues/826)) - Changed Ruby version for development to 1.9.3-p374 from p362 ([#801]({{ site.repository }}/issues/801)) - Including a link to the GitHub Ruby style guide in CONTRIBUTING.md ([#806]({{ site.repository }}/issues/806)) - Added script/bootstrap ([#776]({{ site.repository }}/issues/776)) -- Running Simplecov under 2 conditions: ENV(COVERAGE)=true and with Ruby version - of greater than 1.9 ([#771]({{ site.repository }}/issues/771)) +- Running Simplecov under 2 conditions: ENV(COVERAGE)=true and with Ruby version of greater than 1.9 ([#771]({{ site.repository }}/issues/771)) - Switch to Simplecov for coverage report ([#765]({{ site.repository }}/issues/765)) @@ -1680,6 +1666,7 @@ permalink: "/docs/history/" ### Minor Enhancements {: #minor-enhancements-v0-12-1} + - Update Kramdown version to 0.14.1 ([#744]({{ site.repository }}/issues/744)) - Test Enhancements - Update Rake version to 10.0.3 ([#744]({{ site.repository }}/issues/744)) @@ -1692,6 +1679,7 @@ permalink: "/docs/history/" ### Minor Enhancements {: #minor-enhancements-v0-12-0} + - Add ability to explicitly specify included files ([#261]({{ site.repository }}/issues/261)) - Add `--default-mimetype` option ([#279]({{ site.repository }}/issues/279)) - Allow setting of RedCloth options ([#284]({{ site.repository }}/issues/284)) @@ -1713,12 +1701,14 @@ permalink: "/docs/history/" ## 0.11.2 / 2011-12-27 {: #v0-11-2} + - Bug Fixes - Fix gemspec ## 0.11.1 / 2011-12-27 {: #v0-11-1} + - Bug Fixes - Fix extra blank line in highlight blocks ([#409]({{ site.repository }}/issues/409)) - Update dependencies @@ -1729,6 +1719,7 @@ permalink: "/docs/history/" ### Major Enhancements {: #major-enhancements-v0-11-0} + - Add command line importer functionality ([#253]({{ site.repository }}/issues/253)) - Add Redcarpet Markdown support ([#318]({{ site.repository }}/issues/318)) - Make markdown/textile extensions configurable ([#312]({{ site.repository }}/issues/312)) @@ -1736,6 +1727,7 @@ permalink: "/docs/history/" ### Minor Enhancements {: #minor-enhancements-v0-11-0} + - Switch to Albino gem - Bundler support - Use English library to avoid hoops ([#292]({{ site.repository }}/issues/292)) @@ -1751,6 +1743,7 @@ permalink: "/docs/history/" ## 0.10.0 / 2010-12-16 {: #v0-10-0} + - Bug Fixes - Add `--no-server` option. @@ -1760,6 +1753,7 @@ permalink: "/docs/history/" ### Minor Enhancements {: #minor-enhancements-v0-9-0} + - Use OptionParser's `[no-]` functionality for better boolean parsing. - Add Drupal migrator ([#245]({{ site.repository }}/issues/245)) - Complain about YAML and Liquid errors ([#249]({{ site.repository }}/issues/249)) @@ -1772,6 +1766,7 @@ permalink: "/docs/history/" ### Minor Enhancements {: #minor-enhancements-v0-8-0} + - Add wordpress.com importer ([#207]({{ site.repository }}/issues/207)) - Add `--limit-posts` cli option ([#212]({{ site.repository }}/issues/212)) - Add `uri_escape` filter ([#234]({{ site.repository }}/issues/234)) @@ -1789,6 +1784,7 @@ permalink: "/docs/history/" ### Minor Enhancements {: #minor-enhancements-v0-7-0} + - Add support for rdiscount extensions ([#173]({{ site.repository }}/issues/173)) - Bug Fixes - Highlight should not be able to render local files @@ -1797,6 +1793,7 @@ permalink: "/docs/history/" ## 0.6.2 / 2010-06-25 {: #v0-6-2} + - Bug Fixes - Fix Rakefile 'release' task (tag pushing was missing origin) - Ensure that RedCloth is loaded when textilize filter is used ([#183]({{ site.repository }}/issues/183)) @@ -1806,6 +1803,7 @@ permalink: "/docs/history/" ## 0.6.1 / 2010-06-24 {: #v0-6-1} + - Bug Fixes - Fix Markdown Pygments prefix and suffix ([#178]({{ site.repository }}/issues/178)) @@ -1815,19 +1813,18 @@ permalink: "/docs/history/" ### Major Enhancements {: #major-enhancements-v0-6-0} + - Proper plugin system ([#19]({{ site.repository }}/issues/19), [#100]({{ site.repository }}/issues/100)) - Add safe mode so unsafe converters/generators can be added -- Maruku is now the only processor dependency installed by default. - Other processors will be lazy-loaded when necessary (and prompt the - user to install them when necessary) ([#57]({{ site.repository }}/issues/57)) +- Maruku is now the only processor dependency installed by default. Other processors will be lazy-loaded when necessary (and prompt the user to install them when necessary) ([#57]({{ site.repository }}/issues/57)) ### Minor Enhancements {: #minor-enhancements-v0-6-0} + - Inclusion/exclusion of future dated posts ([#59]({{ site.repository }}/issues/59)) - Generation for a specific time ([#59]({{ site.repository }}/issues/59)) - Allocate `site.time` on render not per site_payload invocation ([#59]({{ site.repository }}/issues/59)) -- Pages now present in the site payload and can be used through the - `site.pages` and `site.html_pages` variables +- Pages now present in the site payload and can be used through the `site.pages` and `site.html_pages` variables - Generate phase added to site#process and pagination is now a generator - Switch to RakeGem for build/test process - Only regenerate static files when they have changed ([#142]({{ site.repository }}/issues/142)) @@ -1847,24 +1844,26 @@ permalink: "/docs/history/" ### Minor Enhancements {: #minor-enhancements-v0-5-7} + - Allow overriding of post date in the front matter ([#62]({{ site.repository }}/issues/62), [#38]({{ site.repository }}/issues/38)) - Bug Fixes - Categories isn't always an array ([#73]({{ site.repository }}/issues/73)) - Empty tags causes error in read_posts ([#84]({{ site.repository }}/issues/84)) - Fix pagination to adhere to read/render/write paradigm - Test Enhancement -- Cucumber features no longer use site.posts.first where a better - alternative is available +- Cucumber features no longer use site.posts.first where a better alternative is available ## 0.5.6 / 2010-01-08 {: #v0-5-6} + - Bug Fixes - Require redcloth >= 4.2.1 in tests ([#92]({{ site.repository }}/issues/92)) - Don't break on triple dashes in yaml front matter ([#93]({{ site.repository }}/issues/93)) ### Minor Enhancements {: #minor-enhancements-v0-5-6} + - Allow .mkd as markdown extension - Use $stdout/err instead of constants ([#99]({{ site.repository }}/issues/99)) - Properly wrap code blocks ([#91]({{ site.repository }}/issues/91)) @@ -1873,52 +1872,42 @@ permalink: "/docs/history/" ## 0.5.5 / 2010-01-08 {: #v0-5-5} + - Bug Fixes - Fix pagination % 0 bug ([#78]({{ site.repository }}/issues/78)) -- Ensure all posts are processed first ([#71]({{ site.repository }}/issues/71)) - - -## NOTE -- After this point I will no longer be giving credit in the history; - that is what the commit log is for. +- Ensure all posts are processed first ([#71]({{ site.repository }}/issues/71)) ## NOTE +- After this point I will no longer be giving credit in the history; that is what the commit log is for. ## 0.5.4 / 2009-08-23 {: #v0-5-4} + - Bug Fixes - Do not allow symlinks (security vulnerability) ## 0.5.3 / 2009-07-14 {: #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](https://github.com/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)) -- Upgraded RedCloth to 4.2.1, which makes `` tags work once - again. -- Configuration options set in config.yml are now available through the - site payload ([@vilcans](https://github.com/vilcans)) -- Posts can now have an empty YAML front matter or none at all - (@ bahuvrihi) +- Added --paginate option to the executable along with a paginator object for the payload ([@calavera](https://github.com/calavera)) +- Upgraded RedCloth to 4.2.1, which makes `` tags work once again. +- Configuration options set in config.yml are now available through the site payload ([@vilcans](https://github.com/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)) +- 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)) -- Bad markdown processor in config fails sooner and with better message - (@ gcnovus) +- 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)) +- Bad markdown processor in config fails sooner and with better message (@ gcnovus) - Allow CRLFs in yaml front matter ([@juretta](https://github.com/juretta)) - Added Date#xmlschema for Ruby versions < 1.9 @@ -1928,16 +1917,15 @@ permalink: "/docs/history/" ### Major Enhancements {: #major-enhancements-v0-5-1} + - Next/previous posts in site payload ([@pantulis](https://github.com/pantulis), [@tomo](https://github.com/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](https://github.com/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)) +- 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)) @@ -1946,6 +1934,7 @@ permalink: "/docs/history/" ### 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)) @@ -1967,6 +1956,7 @@ permalink: "/docs/history/" ### Minor Enhancements {: #minor-enhancements-v--} + - Changed date format on wordpress converter (zeropadding) ([@dysinger](https://github.com/dysinger)) - Bug Fixes - Add Jekyll binary as executable to gemspec ([@dysinger](https://github.com/dysinger)) @@ -1977,10 +1967,12 @@ permalink: "/docs/history/" ### Major Enhancements {: #major-enhancements-v0-4-0} + - Switch to Jeweler for packaging tasks ### 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)) @@ -2002,43 +1994,46 @@ permalink: "/docs/history/" ### 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](https://github.com/johnreilly) and [@mchung](https://github.com/mchung)) ### Minor Enhancements {: #minor-enhancements-v0-3-0} + - Added post categories based on directories containing `_posts` ([@mreid](https://github.com/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)) - 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](https://github.com/mreid)) +- Fix bug that meant page data (such as the date) was not available in templates ([@mreid](https://github.com/mreid)) - Properly reject directories in `_layouts` ## 0.2.1 / 2008-12-15 {: #v0-2-1} + - Major Changes - Use Maruku (pure Ruby) for Markdown by default ([@mreid](https://github.com/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)) ## 0.2.0 / 2008-12-14 {: #v0-2-0} + - Major Changes - related_posts is now found in `site.related_posts` ## 0.1.6 / 2008-12-13 {: #v0-1-6} + - Major Features - Include files in `_includes` with {% raw %}`{% include x.textile %}`{% endraw %} @@ -2048,11 +2043,13 @@ permalink: "/docs/history/" ### Major Enhancements {: #major-enhancements-v0-1-5} + - Code highlighting with Pygments if `--pygments` is specified - Disable true LSI by default, enable with `--lsi` ### Minor Enhancements {: #minor-enhancements-v0-1-5} + - Output informative message if RDiscount is not available ([@JackDanger](https://github.com/JackDanger)) - Bug Fixes - Prevent Jekyll from picking up the output directory as a source ([@JackDanger](https://github.com/JackDanger)) @@ -2061,12 +2058,14 @@ permalink: "/docs/history/" ## 0.1.4 / 2008-12-08 {: #v0-1-4} + - Bug Fixes - DATA does not work properly with rubygems ## 0.1.3 / 2008-12-06 {: #v0-1-3} + - Major Features - Markdown support ([@vanpelt](https://github.com/vanpelt)) - Mephisto and CSV converters ([@vanpelt](https://github.com/vanpelt)) @@ -2078,21 +2077,23 @@ permalink: "/docs/history/" ## 0.1.2 / 2008-11-22 {: #v0-1-2} + - Major Features - Add a real "related posts" implementation using Classifier - Command Line Changes -- Allow cli to be called with 0, 1, or 2 args intuiting dir paths - if they are omitted +- Allow cli to be called with 0, 1, or 2 args intuiting dir paths if they are omitted ## 0.1.1 / 2008-11-22 {: #v0-1-1} + - Minor Additions - Posts now support introspectional data e.g. {% raw %}`{{ page.url }}`{% endraw %} ## 0.1.0 / 2008-11-05 {: #v0-1-0} + - First release - Converts posts written in Textile - Converts regular site pages @@ -2101,4 +2102,5 @@ permalink: "/docs/history/" ## 0.0.0 / 2008-10-19 {: #v0-0-0} + - Birthday! From 1583b26627d948e68c32269a66dd528eda798a72 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Mon, 11 Jan 2016 16:45:50 -0600 Subject: [PATCH 0270/4996] Update jekyll-feed. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 2c0d7e8a598..0abe7065947 100644 --- a/Gemfile +++ b/Gemfile @@ -45,7 +45,7 @@ end gem 'jekyll-paginate', '~> 1.0' gem 'jekyll-coffeescript', '~> 1.0' -gem 'jekyll-feed', '~> 0.1.3' +gem 'jekyll-feed', '~> 0.4.0' gem 'jekyll-redirect-from', '~> 0.9.1' gem 'jekyll-gist', '~> 1.0' gem 'mime-types', '~> 3.0' From ba017ebb97f3eb328fdbc7dcf6e771039cf31cca Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Mon, 11 Jan 2016 22:32:04 -0800 Subject: [PATCH 0271/4996] Remove old Fixme note --- test/helper.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/helper.rb b/test/helper.rb index 32363369e7e..936638d230f 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -35,9 +35,6 @@ def jruby? include Jekyll -# FIXME: If we really need this we lost the game. -# STDERR.reopen(test(?e, '/dev/null') ? '/dev/null' : 'NUL:') - # Report with color. Minitest::Reporters.use! [ Minitest::Reporters::DefaultReporter.new( From 4595aab85583d68ef3abf728695c32ca5bf81541 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Tue, 12 Jan 2016 01:00:42 -0600 Subject: [PATCH 0272/4996] Update history.makrdown to reflect the merger of #4349. --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index ab1d5139c67..8fb5a685270 100644 --- a/History.markdown +++ b/History.markdown @@ -54,6 +54,7 @@ * Add script/travis so all people can play with Travis-CI images. (#4338) * Move Cucumber to using RSpec-Expections and furthering JRuby support. (#4343) * Rearrange Cucumber and add some flair. (#4347) + * Remove old FIXME (#4349) ### Site Enhancements From 712c16a7f10484ad9be92d612f36cbb43ec419d9 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Tue, 12 Jan 2016 06:54:45 -0600 Subject: [PATCH 0273/4996] Try to cleanup the Gemfile... again. The problem last time was that we removed Pry and Pry brings in CodeRay, we were testing legacy stuff and didn't have CodeRay in our dependencies, which resulted in those tests failing. This also quietly announces the intention to move to RSpec by moving the old test dependencies to ":test_legacy" and is slightly less agressive in it's organization than before. --- .travis.yml | 5 ++- Gemfile | 100 +++++++++++++++++++++++++++++--------------------- script/travis | 8 +++- 3 files changed, 68 insertions(+), 45 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4bba7a8dca9..fafd57c396b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ -cache: bundler -script: script/cibuild +bundler_args: --without benchmark:site:development before_script: bundle update +script: script/cibuild +cache: bundler language: ruby sudo: false diff --git a/Gemfile b/Gemfile index 0abe7065947..16470f69c0e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,60 +1,78 @@ -source 'https://rubygems.org' -gemspec name: 'jekyll' +source "https://rubygems.org" +gemspec :name => "jekyll" -gem 'rake', '~> 10.1' +gem "rake", "~> 10.1" group :development do - gem 'rdoc', '~> 4.2' - gem 'launchy', '~> 2.3' - gem 'toml', '~> 0.1.0' gem "rubocop" - gem 'pry' + gem "launchy", "~> 2.3" + gem "pry" end +# + group :test do - gem 'rspec-expectations' - gem 'redgreen', '~> 1.2' - gem 'shoulda', '~> 3.5' - gem 'cucumber', '~> 2.1' - gem 'simplecov', '~> 0.9' - gem 'jekyll_test_plugin' - gem 'jekyll_test_plugin_malicious' + gem "cucumber" + gem "jekyll_test_plugin" + gem "jekyll_test_plugin_malicious" gem "codeclimate-test-reporter" - gem 'minitest-reporters' - gem 'minitest-profile' - gem 'rspec-mocks' - gem 'minitest' - gem 'nokogiri' + gem "rspec-mocks" + gem "nokogiri" + gem "rspec" +end + +# +group :test_legacy do if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2") gem 'test-unit' end - if ENV['PROOF'] - gem 'html-proofer', '~> 2.0' - end + gem "redgreen" + gem "simplecov" + gem "minitest-reporters" + gem "minitest-profile" + gem "minitest" + gem "shoulda" end +# + group :benchmark do - if ENV['BENCHMARK'] - gem 'ruby-prof' - gem 'rbtrace' - gem 'stackprof' - gem 'benchmark-ips' + if ENV["BENCHMARK"] + gem "ruby-prof" + gem "benchmark-ips" + gem "stackprof" + gem "rbtrace" + end +end + +# + +group :jekyll_optional_dependencies do + gem "toml", "~> 0.1.0" + gem "coderay", "~> 1.1.0" + gem "jekyll-gist", "~> 1.0" + gem "jekyll-feed", "~> 0.1.3" + gem "jekyll-coffeescript", "~> 1.0" + gem "jekyll-redirect-from", "~> 0.9.1" + gem "jekyll-paginate", "~> 1.0" + gem "mime-types", "~> 3.0" + gem "kramdown", "~> 1.9" + gem "rdoc", "~> 4.2" + + platform :ruby, :mswin, :mingw do + gem "rdiscount", "~> 2.0" + gem "pygments.rb", "~> 0.6.0" + gem "redcarpet", "~> 3.2", ">= 3.2.3" + gem "classifier-reborn", "~> 2.0" + gem "liquid-c", "~> 3.0" end end -gem 'jekyll-paginate', '~> 1.0' -gem 'jekyll-coffeescript', '~> 1.0' -gem 'jekyll-feed', '~> 0.4.0' -gem 'jekyll-redirect-from', '~> 0.9.1' -gem 'jekyll-gist', '~> 1.0' -gem 'mime-types', '~> 3.0' -gem 'kramdown', '~> 1.9' - -platform :ruby, :mswin, :mingw do - gem 'rdiscount', '~> 2.0' - gem 'pygments.rb', '~> 0.6.0' - gem 'redcarpet', '~> 3.2', '>= 3.2.3' - gem 'classifier-reborn', '~> 2.0' - gem 'liquid-c', '~> 3.0' +# + +group :site do + if ENV["PROOF"] + gem "html-proofer", "~> 2.0" + end end diff --git a/script/travis b/script/travis index 826ffa767ca..4d62fa9ba78 100755 --- a/script/travis +++ b/script/travis @@ -16,14 +16,18 @@ status=0 if [ $# -eq 2 ]; then docker exec -it docker-travis bash -ilc " \ rvm use --install --binary --fuzzy $1 - bundle install --path vendor/bundle -j 256 + bundle install --path vendor/bundle -j 12 \\ + --without benchmark:site:development + bundle clean script/test $2 " || status=$? elif [ $# -eq 1 ]; then docker exec -it docker-travis bash -ilc " \ rvm use --install --binary --fuzzy $1 - bundle install --path vendor/bundle -j 256 + bundle install --path vendor/bundle -j 12 \\ + --without benchmark:site:development + bundle clean bundle exec rake " || status=$? From 5555db8c7294069b080750ae45ef2fa078404da6 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Tue, 12 Jan 2016 06:59:09 -0600 Subject: [PATCH 0274/4996] Start using Rubocop from Github, it supports our config. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 16470f69c0e..8e2d51eeafa 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,8 @@ gemspec :name => "jekyll" gem "rake", "~> 10.1" group :development do - gem "rubocop" gem "launchy", "~> 2.3" + gem "rubocop", :branch => :master, :github => "bbatsov/rubocop" gem "pry" end From 4048b8e2a735565de2f515f55036c859415a06ae Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 12 Jan 2016 08:28:10 -0800 Subject: [PATCH 0275/4996] Update history to reflect merge of #4350 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 8fb5a685270..14e016a299d 100644 --- a/History.markdown +++ b/History.markdown @@ -55,6 +55,7 @@ * Move Cucumber to using RSpec-Expections and furthering JRuby support. (#4343) * Rearrange Cucumber and add some flair. (#4347) * Remove old FIXME (#4349) + * Clean up the Gemfile (and keep all the necessary dependencies) (#4350) ### Site Enhancements From 54b63958069765c18782fec3e325658b2c9ca80f Mon Sep 17 00:00:00 2001 From: musoke Date: Fri, 15 Jan 2016 12:12:29 +1300 Subject: [PATCH 0276/4996] Correct typo in ### Precdence The Precedence section referred to the "last example" where it should have referred to the "second to last." --- site/_docs/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md index a12b2e265d3..f4327d3597c 100644 --- a/site/_docs/configuration.md +++ b/site/_docs/configuration.md @@ -506,7 +506,7 @@ In this example the `layout` is set to `default` inside the [collection](../coll 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 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 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. 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 9368e261cc7eb4bf5d23b7f15371e132b5c7c1be Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 14 Jan 2016 16:36:11 -0800 Subject: [PATCH 0277/4996] Update history to reflect merge of #4355 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 14e016a299d..e818595532a 100644 --- a/History.markdown +++ b/History.markdown @@ -81,6 +81,7 @@ * Fix grammar in the documentation for posts. (#4330) * Add documentation for smartify Liquid filter (#4333) * Fixed broken link to blog on using mathjax with jekyll (#4344) + * Documentation: correct reference in Precedence section of Configuration docs (#4355) ## 3.0.1 / 2015-11-17 From f8a63157d797d16716266f46dd29e0def64a0000 Mon Sep 17 00:00:00 2001 From: Pedro Euko Date: Mon, 28 Sep 2015 13:58:50 -0300 Subject: [PATCH 0278/4996] Empty permalink now shows an error --- lib/jekyll/convertible.rb | 13 +++++++++++++ test/fixtures/empty_permalink.erb | 4 ++++ test/test_convertible.rb | 9 +++++++++ 3 files changed, 26 insertions(+) create mode 100644 test/fixtures/empty_permalink.erb diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index 746f4bd1529..5406f13de7e 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -61,6 +61,10 @@ def read_yaml(base, name, opts = {}) Jekyll.logger.abort_with "Fatal:", "Invalid YAML front matter in #{File.join(base, name)}" end + unless valid_permalink?(self.data['permalink']) + Jekyll.logger.error "Error:", "Invalid permalink in #{File.join(base, name)}" + end + self.data end @@ -266,6 +270,15 @@ def do_layout(payload, layouts) Jekyll::Hooks.trigger hook_owner, :post_render, self end + # Check data permalink + # + # permalink - the data permalink + # + # Returns true if the permalink is valid, false if otherwise + def valid_permalink?(permalink) + permalink.nil? || permalink.length > 0 + end + # Write the generated page file to the destination directory. # # dest - The String path to the destination dir. diff --git a/test/fixtures/empty_permalink.erb b/test/fixtures/empty_permalink.erb new file mode 100644 index 00000000000..6dabf63b805 --- /dev/null +++ b/test/fixtures/empty_permalink.erb @@ -0,0 +1,4 @@ +--- +permalink: '' +--- +Empty Permalink diff --git a/test/test_convertible.rb b/test/test_convertible.rb index 09c697374db..840fa323bd4 100644 --- a/test/test_convertible.rb +++ b/test/test_convertible.rb @@ -49,5 +49,14 @@ class TestConvertible < JekyllUnitTest assert_match(/invalid byte sequence in UTF-8/, out) assert_match(/#{File.join(@base, name)}/, out) end + + should "parse the front-matter but show an error if permalink is empty" do + name = 'empty_permalink.erb' + out = capture_stderr do + @convertible.read_yaml(@base, name) + end + assert_match(/Invalid permalink/, out) + assert_match(/#{File.join(@base, name)}/, out) + end end end From 568174222382479fe7d63eee86632086d16daefa Mon Sep 17 00:00:00 2001 From: Pedro Euko Date: Fri, 15 Jan 2016 14:04:16 -0200 Subject: [PATCH 0279/4996] Check if permalink key was given --- lib/jekyll/convertible.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index 5406f13de7e..23d338a3181 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -61,7 +61,7 @@ def read_yaml(base, name, opts = {}) Jekyll.logger.abort_with "Fatal:", "Invalid YAML front matter in #{File.join(base, name)}" end - unless valid_permalink?(self.data['permalink']) + if self.data['permalink'] && empty_permalink?(self.data['permalink']) Jekyll.logger.error "Error:", "Invalid permalink in #{File.join(base, name)}" end @@ -275,8 +275,8 @@ def do_layout(payload, layouts) # permalink - the data permalink # # Returns true if the permalink is valid, false if otherwise - def valid_permalink?(permalink) - permalink.nil? || permalink.length > 0 + def empty_permalink?(permalink) + permalink.length == 0 end # Write the generated page file to the destination directory. From 156e093b5cca3b534c1bb7b3ad0493e8dbbdcc14 Mon Sep 17 00:00:00 2001 From: Pedro Euko Date: Fri, 15 Jan 2016 14:34:39 -0200 Subject: [PATCH 0280/4996] Ensure no errors when there is no permalink --- test/test_convertible.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/test_convertible.rb b/test/test_convertible.rb index 840fa323bd4..0c5acf1a9ba 100644 --- a/test/test_convertible.rb +++ b/test/test_convertible.rb @@ -58,5 +58,12 @@ class TestConvertible < JekyllUnitTest assert_match(/Invalid permalink/, out) assert_match(/#{File.join(@base, name)}/, out) end + + should "parse the front-matter correctly whitout permalink" do + out = capture_stderr do + @convertible.read_yaml(@base, 'front_matter.erb') + end + refute_match(/Invalid permalink/, out) + end end end From 3e81331af1beca5e99786f39ff3cdc73b3e017b7 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 15 Jan 2016 10:00:45 -0800 Subject: [PATCH 0281/4996] Utils: don't require mime/types --- lib/jekyll/utils.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index 635b5d107d9..b6a05ff8cf6 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -1,5 +1,3 @@ -require 'mime/types' - module Jekyll module Utils extend self From 22931f42b87e94d88216c3e08aba3d32dd91d43a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 15 Jan 2016 10:00:56 -0800 Subject: [PATCH 0282/4996] Drop: require 'json' for #inspect call --- lib/jekyll/drops/drop.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb index a8342c14b44..b13db5ef43e 100644 --- a/lib/jekyll/drops/drop.rb +++ b/lib/jekyll/drops/drop.rb @@ -133,6 +133,7 @@ def to_h # # Returns a pretty generation of the hash representation of the Drop. def inspect + require 'json' JSON.pretty_generate to_h end From 5d79c55b2cee0aa19ca57ad331333edba9db47b7 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 15 Jan 2016 10:52:18 -0800 Subject: [PATCH 0283/4996] Fix deep_merge_hashes! handling of drops and hashes --- lib/jekyll/drops/drop.rb | 26 ++++++++++++++++++++++++++ lib/jekyll/utils.rb | 16 +++++++++------- test/test_utils.rb | 4 ++-- 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb index b13db5ef43e..35f0df26e81 100644 --- a/lib/jekyll/drops/drop.rb +++ b/lib/jekyll/drops/drop.rb @@ -127,6 +127,7 @@ def to_h result[key] = self[key] end end + alias_method :to_hash, :to_h # Inspect the drop's keys and values through a JSON representation # of its keys and values. @@ -145,6 +146,31 @@ def inspect def each_key(&block) keys.each(&block) end + + def merge(other, &block) + self.dup.tap do |me| + if block.nil? + me.merge!(other) + else + me.merge!(other, block) + end + end + end + + def merge!(other) + other.each_key do |key| + if block_given? + self[key] = yield key, self[key], other[key] + else + if Utils.mergable?(self[key]) && Utils.mergable?(other[key]) + self[key] = Utils.deep_merge_hashes(self[key], other[key]) + next + end + + self[key] = other[key] unless other[key].nil? + end + end + end end end end diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index b6a05ff8cf6..9ffff548e6f 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -31,14 +31,12 @@ def deep_merge_hashes(master_hash, other_hash) # # Thanks to whoever made it. def deep_merge_hashes!(target, overwrite) - overwrite.each_key do |key| - if (overwrite[key].is_a?(Hash) || overwrite[key].is_a?(Drops::Drop)) && - (target[key].is_a?(Hash) || target[key].is_a?(Drops::Drop)) - target[key] = Utils.deep_merge_hashes(target[key], overwrite[key]) - next + target.merge!(overwrite) do |key, old_val, new_val| + if new_val.nil? + old_val + else + mergable?(old_val) && mergable?(new_val) ? deep_merge_hashes(old_val, new_val) : new_val end - - target[key] = overwrite[key] end if target.respond_to?(:default_proc) && overwrite.respond_to?(:default_proc) && target.default_proc.nil? @@ -48,6 +46,10 @@ def deep_merge_hashes!(target, overwrite) target end + def mergable?(value) + value.is_a?(Hash) || value.is_a?(Drops::Drop) + end + # Read array from the supplied hash favouring the singular key # and then the plural key, and handling any nil entries. # diff --git a/test/test_utils.rb b/test/test_utils.rb index 49844038229..d3720127098 100644 --- a/test/test_utils.rb +++ b/test/test_utils.rb @@ -13,7 +13,7 @@ class TestUtils < JekyllUnitTest merged = Utils.deep_merge_hashes(data, @site.site_payload) assert merged.is_a? Hash assert merged["site"].is_a? Drops::SiteDrop - assert_equal data["page"], {} + assert_equal data["page"], merged["page"] end should "merge a hash into a drop" do @@ -22,7 +22,7 @@ class TestUtils < JekyllUnitTest merged = Utils.deep_merge_hashes(@site.site_payload, data) assert merged.is_a? Drops::UnifiedPayloadDrop assert merged["site"].is_a? Drops::SiteDrop - assert_equal data["page"], {} + assert_equal data["page"], merged["page"] end end From 207fcbdef7ad7b0b72c48a806ba5af27525b13ca Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 15 Jan 2016 11:23:09 -0800 Subject: [PATCH 0284/4996] Add byebug for debugging purposes. --- .gitignore | 27 ++++++++++++++------------- Gemfile | 1 + 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 6441a147fd9..1d62ecc3876 100644 --- a/.gitignore +++ b/.gitignore @@ -1,21 +1,22 @@ -Gemfile.lock -test/dest *.gem -pkg/ *.swp *~ -_site/ -.bundle/ .DS_Store +.analysis +.bundle/ +.byebug_history +.jekyll-metadata +.ruby-gemset +.ruby-version +.sass-cache +/test/source/file_name.txt +/vendor +Gemfile.lock +_site/ bbin/ +coverage gh-pages/ +pkg/ site/_site/ -coverage -.ruby-version -.ruby-gemset -.sass-cache +test/dest tmp/* -.jekyll-metadata -/vendor -/test/source/file_name.txt -.analysis diff --git a/Gemfile b/Gemfile index 8e2d51eeafa..9e4796e60ee 100644 --- a/Gemfile +++ b/Gemfile @@ -18,6 +18,7 @@ group :test do gem "rspec-mocks" gem "nokogiri" gem "rspec" + gem "byebug" end # From 0587a3bb57ba7d39e8f064e618163cf5c73d8cfc Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 15 Jan 2016 11:30:02 -0800 Subject: [PATCH 0285/4996] Fix some debug logging. - excluded? should now only print when it is excluded - requiring is now properly aligned --- lib/jekyll/entry_filter.rb | 2 +- lib/jekyll/external.rb | 2 +- site/_config.yml | 4 ++++ test/test_kramdown.rb | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb index e42701875df..6d42c067c55 100644 --- a/lib/jekyll/entry_filter.rb +++ b/lib/jekyll/entry_filter.rb @@ -47,7 +47,7 @@ def backup?(entry) def excluded?(entry) excluded = glob_include?(site.exclude, relative_to_source(entry)) - Jekyll.logger.debug "EntryFilter:", "excluded?(#{relative_to_source(entry)}) ==> #{excluded}" + Jekyll.logger.debug "EntryFilter:", "excluded #{relative_to_source(entry)}" if excluded excluded end diff --git a/lib/jekyll/external.rb b/lib/jekyll/external.rb index 2996d24b635..69b8d1eb391 100644 --- a/lib/jekyll/external.rb +++ b/lib/jekyll/external.rb @@ -39,7 +39,7 @@ def require_if_present(names, &block) def require_with_graceful_fail(names) Array(names).each do |name| begin - Jekyll.logger.debug("Requiring #{name}") + Jekyll.logger.debug "Requiring:", "#{name}" require name rescue LoadError => e Jekyll.logger.error "Dependency Error:", <<-MSG diff --git a/site/_config.yml b/site/_config.yml index c065f9f7015..fc3f3484797 100644 --- a/site/_config.yml +++ b/site/_config.yml @@ -22,3 +22,7 @@ url: http://jekyllrb.com gems: - jekyll-feed - jekyll-redirect-from + +exclude: + - README.md + - CNAME diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb index 21ba5764ab1..d1668d2b31d 100644 --- a/test/test_kramdown.rb +++ b/test/test_kramdown.rb @@ -90,7 +90,7 @@ class TestKramdown < JekyllUnitTest MARKDOWN selector = "div.highlighter-coderay>div.CodeRay>div.code>pre" - refute result.css(selector).empty? + refute result.css(selector).empty?, "pre tag should exist" end end From ea9cac5214bb0bff25159421c72c2189caca31d1 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Fri, 15 Jan 2016 14:15:28 -0600 Subject: [PATCH 0286/4996] Add a nasty hack to reduce persistence until RSpec. --- test/test_kramdown.rb | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb index 21ba5764ab1..5836d369e55 100644 --- a/test/test_kramdown.rb +++ b/test/test_kramdown.rb @@ -37,6 +37,7 @@ class TestKramdown < JekyllUnitTest should "support custom types" do override = { + "highlighter" => nil, 'kramdown' => { 'smart_quotes' => 'lsaquo,rsaquo,laquo,raquo' } @@ -61,7 +62,14 @@ class TestKramdown < JekyllUnitTest context "when a custom highlighter is chosen" do should "use the chosen highlighter if it's available" do - override = { "markdown" => "kramdown", "kramdown" => { "syntax_highlighter" => :coderay }} + override = { + "highlighter" => nil, + "markdown" => "kramdown", + "kramdown" => { + "syntax_highlighter" => :coderay + } + } + markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, override)) result = nokogiri_fragment(markdown.convert(Utils.strip_heredoc <<-MARKDOWN)) ~~~ruby @@ -77,11 +85,12 @@ class TestKramdown < JekyllUnitTest override = { "markdown" => "kramdown", "kramdown" => { - "syntax_highlighter" => nil, - "enable_coderay" => true - } + "enable_coderay" => true, + } } + @config.delete("highlighter") + @config["kramdown"].delete("syntax_highlighter") markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, override)) result = nokogiri_fragment(markdown.convert(Utils.strip_heredoc <<-MARKDOWN)) ~~~ruby @@ -97,6 +106,7 @@ class TestKramdown < JekyllUnitTest should "move coderay to syntax_highlighter_opts" do original = Kramdown::Document.method(:new) markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, { + "higlighter" => nil, "markdown" => "kramdown", "kramdown" => { "syntax_highlighter" => "coderay", From 04e1768807b80f65c605cdb900ec6f7fa6ab1f45 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 15 Jan 2016 15:06:56 -0800 Subject: [PATCH 0287/4996] Update history to reflect merge of #4359 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index e818595532a..cd35e99ac9f 100644 --- a/History.markdown +++ b/History.markdown @@ -36,6 +36,7 @@ * utils: `has_yaml_header?` should accept files with extraneous spaces (#4290) * Escape html from site.title and page.title in site template (#4307) * Allow custom file extensions if defined in `permalink` YAML front matter (#4314) + * Fix deep_merge_hashes! handling of drops and hashes (#4359) ### Development Fixes From 948dcf27141744095e78a3e702b896a39134aa91 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 15 Jan 2016 15:51:32 -0800 Subject: [PATCH 0288/4996] Convertible: consolidate empty check into Convertible#read --- lib/jekyll/convertible.rb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index 23d338a3181..8edc4bfa788 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -61,8 +61,8 @@ def read_yaml(base, name, opts = {}) Jekyll.logger.abort_with "Fatal:", "Invalid YAML front matter in #{File.join(base, name)}" end - if self.data['permalink'] && empty_permalink?(self.data['permalink']) - Jekyll.logger.error "Error:", "Invalid permalink in #{File.join(base, name)}" + if self.data['permalink'] && self.data['permalink'].size == 0 + Jekyll.logger.abort_with "Fatal:", "Invalid permalink in #{File.join(base, name)}" end self.data @@ -270,15 +270,6 @@ def do_layout(payload, layouts) Jekyll::Hooks.trigger hook_owner, :post_render, self end - # Check data permalink - # - # permalink - the data permalink - # - # Returns true if the permalink is valid, false if otherwise - def empty_permalink?(permalink) - permalink.length == 0 - end - # Write the generated page file to the destination directory. # # dest - The String path to the destination dir. From 89db3c63842ed4d2a4b8101e71fbc32efa34310d Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 15 Jan 2016 15:52:54 -0800 Subject: [PATCH 0289/4996] Convertible: separate data validation out of #read --- lib/jekyll/convertible.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index 8edc4bfa788..7f3702d3846 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -56,16 +56,23 @@ def read_yaml(base, name, opts = {}) end self.data ||= {} + + validate_data! + validate_permalink! + self.data + end + + def validate_data! unless self.data.is_a?(Hash) Jekyll.logger.abort_with "Fatal:", "Invalid YAML front matter in #{File.join(base, name)}" end - + end + + def validate_permalink! if self.data['permalink'] && self.data['permalink'].size == 0 Jekyll.logger.abort_with "Fatal:", "Invalid permalink in #{File.join(base, name)}" end - - self.data end # Transform the contents based on the content type. From 06fa14c11ace8970b7fb7aad4159ffc1382d20d1 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 15 Jan 2016 16:11:08 -0800 Subject: [PATCH 0290/4996] Restructure data validation so that permalink check raises an error. --- lib/jekyll/convertible.rb | 24 +++++++++++++----------- lib/jekyll/errors.rb | 6 ++++-- test/test_convertible.rb | 4 +--- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index 7f3702d3846..a8e1d0a4444 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -42,6 +42,8 @@ def merged_file_read_opts(opts) # # Returns nothing. def read_yaml(base, name, opts = {}) + filename = File.join(base, name) + begin self.content = File.read(site.in_source_dir(base, name), merged_file_read_opts(opts)) @@ -50,28 +52,28 @@ def read_yaml(base, name, opts = {}) self.data = SafeYAML.load(Regexp.last_match(1)) end rescue SyntaxError => e - Jekyll.logger.warn "YAML Exception reading #{File.join(base, name)}: #{e.message}" + Jekyll.logger.warn "YAML Exception reading #{filename}: #{e.message}" rescue Exception => e - Jekyll.logger.warn "Error reading file #{File.join(base, name)}: #{e.message}" + Jekyll.logger.warn "Error reading file #{filename}: #{e.message}" end self.data ||= {} - - validate_data! - validate_permalink! + + validate_data! filename + validate_permalink! filename self.data end - - def validate_data! + + def validate_data!(filename) unless self.data.is_a?(Hash) - Jekyll.logger.abort_with "Fatal:", "Invalid YAML front matter in #{File.join(base, name)}" + raise Errors::InvalidYAMLFrontMatterError, "Invalid YAML front matter in #{filename}" end end - - def validate_permalink! + + def validate_permalink!(filename) if self.data['permalink'] && self.data['permalink'].size == 0 - Jekyll.logger.abort_with "Fatal:", "Invalid permalink in #{File.join(base, name)}" + raise Errors::InvalidPermalinkError, "Invalid permalink in #{filename}" end end diff --git a/lib/jekyll/errors.rb b/lib/jekyll/errors.rb index 2b0dbc0c39a..36b2643d3dc 100644 --- a/lib/jekyll/errors.rb +++ b/lib/jekyll/errors.rb @@ -2,7 +2,9 @@ module Jekyll module Errors FatalException = Class.new(::RuntimeError) - MissingDependencyException = Class.new(FatalException) - DropMutationException = Class.new(FatalException) + DropMutationException = Class.new(FatalException) + InvalidPermalinkError = Class.new(FatalException) + InvalidYAMLFrontMatterError = Class.new(FatalException) + MissingDependencyException = Class.new(FatalException) end end diff --git a/test/test_convertible.rb b/test/test_convertible.rb index 0c5acf1a9ba..524ecdf45e8 100644 --- a/test/test_convertible.rb +++ b/test/test_convertible.rb @@ -52,11 +52,9 @@ class TestConvertible < JekyllUnitTest should "parse the front-matter but show an error if permalink is empty" do name = 'empty_permalink.erb' - out = capture_stderr do + assert_raises(Errors::InvalidPermalinkError) do @convertible.read_yaml(@base, name) end - assert_match(/Invalid permalink/, out) - assert_match(/#{File.join(@base, name)}/, out) end should "parse the front-matter correctly whitout permalink" do From d9aef14063686452ba8c5221f2b300d3103f5642 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 15 Jan 2016 16:19:23 -0800 Subject: [PATCH 0291/4996] Update history to reflect merge of #4361 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index cd35e99ac9f..6eb36653eff 100644 --- a/History.markdown +++ b/History.markdown @@ -19,6 +19,7 @@ * drops: provide `#to_h` to allow for hash introspection (#4281) * Shim subcommands with indication of gem possibly required so users know how to use them (#4254) * Add smartify Liquid filter for SmartyPants (#4323) + * Raise error on empty permalink (#4361) ### Bug Fixes From c678640553b71971434bceabe7bf0514921b3cbd Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 15 Jan 2016 16:25:58 -0800 Subject: [PATCH 0292/4996] Release :gem: v3.1.0.pre.rc1 --- lib/jekyll/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index 2d2bf2c6a06..66eebc1c051 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,3 +1,3 @@ module Jekyll - VERSION = '3.1.0.pre.beta1' + VERSION = '3.1.0.pre.rc1' end From 281f75182e63998d1fb823aee4f9562aa1f6fded Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 15 Jan 2016 16:26:08 -0800 Subject: [PATCH 0293/4996] Release :gem: 3.1.0.pre.rc1 From b3b4abe80a8ed8731bf301f0f907968f4df7eda6 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 16 Jan 2016 12:09:13 -0800 Subject: [PATCH 0294/4996] Add @jmcglone's guide to github-pages doc page Nearly every day, when I get the report of visitors to jekyllrb.com, I see jmcglone's excellent guide. Reading through it today makes me think it is one of the finest if not _the_ finest guide to getting started with Git, GitHub, and Jekyll in order to publish successfully and happily on GitHub Pages. @jmcglone, mind if I add this to our GitHub Pages doc page? --- site/_docs/github-pages.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/_docs/github-pages.md b/site/_docs/github-pages.md index e19cdb2d24e..03d83b35bf2 100644 --- a/site/_docs/github-pages.md +++ b/site/_docs/github-pages.md @@ -10,6 +10,11 @@ organizations, and repositories, that are freely hosted on GitHub's 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. +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. + ## Deploying Jekyll to GitHub Pages GitHub Pages work by looking at certain branches of repositories on GitHub. From 9c6f33024f19446d37beff7c0cb9c88624603bff Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 16 Jan 2016 12:21:07 -0800 Subject: [PATCH 0295/4996] Restructure the resources page a bit --- site/_docs/resources.md | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/site/_docs/resources.md b/site/_docs/resources.md index b414c90de0b..2ba5f25eeb5 100644 --- a/site/_docs/resources.md +++ b/site/_docs/resources.md @@ -6,41 +6,33 @@ permalink: /docs/resources/ Jekyll’s growing use is producing a wide variety of tutorials, frameworks, extensions, examples, and other resources that can be very helpful. Below is a collection of links to some of the most popular Jekyll resources. -### Jekyll tips & tricks, and examples - -- [Tips for working with GitHub Pages Integration](https://gist.github.com/2890453) - - Code example reuse, and keeping documentation up to date. - -- [Use FormKeep as a backend for forms (contact forms, hiring forms, etc.)](https://formkeep.com/guides/how-to-make-a-contact-form-in-jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=contact-form-jekyll) -- [Use Simple Form to integrate a simple contact - form](http://getsimpleform.com/) -- [JekyllBootstrap.com](http://jekyllbootstrap.com) - - Provides detailed explanations, examples, and helper-code to make - getting started with Jekyll easier. - -### Tutorials - -#### Integrating Jekyll with Git +### Useful Guides +- [“Creating and Hosting a Personal Site on GitHub”](http://jmcglone.com/guides/github-pages/) +- [‘Build A Blog With Jekyll And GitHub Pages’ on Smashing Magazine](http://www.smashingmagazine.com/2014/08/01/build-blog-jekyll-github-pages/) +- Publishing to GitHub Pages? [Check out our documentation page for just that purpose](/docs/github-pages/). - [Blogging with Git, Emacs and Jekyll](http://metajack.im/2009/01/23/blogging-with-git-emacs-and-jekyll/) +- [Tips for working with GitHub Pages Integration](https://gist.github.com/jedschneider/2890453) -#### Other hacks +### Integrations +- [Use FormKeep as a backend for forms (contact forms, hiring forms, etc.)](https://formkeep.com/guides/how-to-make-a-contact-form-in-jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=contact-form-jekyll) +- [Use Simple Form to add a simple contact form](http://getsimpleform.com/) +- [Jekyll Bootstrap](http://jekyllbootstrap.com), 0 to Blog in 3 minutes. Provides detailed explanations, examples, and helper-code to make getting started with Jekyll easier. - [Integrating Twitter with Jekyll](http://www.justkez.com/integrating-twitter-with-jekyll/) > “Having migrated Justkez.com to be based on Jekyll, I was pondering how I might include my recent twitterings on the front page of the site. In the WordPress world, this would have been done via a plugin which may or may not have hung the loading of the page, might have employed caching, but would certainly have had some overheads. … Not in Jekyll.” + +### Other commentary + - [‘My Jekyll Fork’, by Mike West](http://mikewest.org/2009/11/my-jekyll-fork) + > “Jekyll is a well-architected throwback to a time before WordPress, when men were men, and HTML was static. I like the ideas it espouses, and have made a few improvements to it’s core. Here, I’ll point out some highlights of my fork in the hopes that they see usage beyond this site.” + - [‘About this Website’, by Carter Allen](http://cartera.me/2010/08/12/about-this-website/) + > “Jekyll is everything that I ever wanted in a blogging engine. Really. It isn’t perfect, but what’s excellent about it is that if there’s something wrong, I know exactly how it works and how to fix it. It runs on the your machine only, and is essentially an added”build" step between you and the browser. I coded this entire site in TextMate using standard HTML5 and CSS3, and then at the end I added just a few little variables to the markup. Presto-chango, my site is built and I am at peace with the world.” -- [‘Build A Blog With Jekyll And GitHub Pages’, by Barry Clark](http://www.smashingmagazine.com/2014/08/01/build-blog-jekyll-github-pages/) - > “I recently migrated my blog from WordPress to Jekyll, a fantastic website generator that’s designed for building minimal, static blogs to be hosted on GitHub Pages. The simplicity of Jekyll’s theming layer and writing workflow is fantastic; however, setting up my website took a lot longer than expected. In this article we'll walk through: the quickest way to set up a Jekyll powered blog, how to avoid common problems with using Jekyll, how to import your content from Wordpress, and more.” -- [Generating a Tag Cloud in Jekyll](http://www.justkez.com/generating-a-tag-cloud-in-jekyll/) -A guide to implementing a tag cloud and per-tag content pages using Jekyll. +- [Generating a Tag Cloud in Jekyll](http://www.justkez.com/generating-a-tag-cloud-in-jekyll/) – A guide to implementing a tag cloud and per-tag content pages using Jekyll. - A way to [extend Jekyll](https://github.com/rfelix/jekyll_ext) without forking and modifying the Jekyll gem codebase and some [portable Jekyll extensions](https://wiki.github.com/rfelix/jekyll_ext/extensions) that can be reused and shared. - - [Using your Rails layouts in Jekyll](http://numbers.brighterplanet.com/2010/08/09/sharing-rails-views-with-jekyll) - - [Adding Ajax pagination to Jekyll](https://eduardoboucas.com/blog/2014/11/10/adding-ajax-pagination-to-jekyll.html) From 4482f80d3496a55e54f42ee75a55dcad215f6c31 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 18 Jan 2016 07:48:11 -0800 Subject: [PATCH 0296/4996] Update history to reflect merge of #4364 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 6eb36653eff..ba8e9a81e46 100644 --- a/History.markdown +++ b/History.markdown @@ -84,6 +84,7 @@ * Add documentation for smartify Liquid filter (#4333) * Fixed broken link to blog on using mathjax with jekyll (#4344) * Documentation: correct reference in Precedence section of Configuration docs (#4355) + * Add @jmcglone's guide to github-pages doc page (#4364) ## 3.0.1 / 2015-11-17 From 9676b775de2ff78ae5331537083ae3c9d31f138c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 08:47:35 -0800 Subject: [PATCH 0297/4996] Want the readme and CNAME. --- site/_config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/site/_config.yml b/site/_config.yml index fc3f3484797..c065f9f7015 100644 --- a/site/_config.yml +++ b/site/_config.yml @@ -22,7 +22,3 @@ url: http://jekyllrb.com gems: - jekyll-feed - jekyll-redirect-from - -exclude: - - README.md - - CNAME From d343da61eb8ac5ca776842d1c4c9f2810f443ea9 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 11:41:05 -0800 Subject: [PATCH 0298/4996] Page: pipe through Renderer instead of using Convertible --- lib/jekyll/convertible.rb | 8 +------- lib/jekyll/page.rb | 6 ++++++ lib/jekyll/renderer.rb | 2 +- lib/jekyll/site.rb | 3 ++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index a8e1d0a4444..383bb024dc0 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -97,13 +97,7 @@ def transform # Returns the String extension for the output file. # e.g. ".html" for an HTML output file. def output_ext - if converters.all? { |c| c.is_a?(Jekyll::Converters::Identity) } - ext - else - converters.map do |c| - c.output_ext(ext) unless c.is_a?(Jekyll::Converters::Identity) - end.compact.last - end + Jekyll::Renderer.new(site, self).output_ext end # Determine which converter to use based on this convertible's diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb index a3519f57f53..0a93aa08ec8 100644 --- a/lib/jekyll/page.rb +++ b/lib/jekyll/page.rb @@ -7,6 +7,8 @@ class Page attr_accessor :name, :ext, :basename attr_accessor :data, :content, :output + alias_method :extname, :ext + # Attributes for Liquid templates ATTRIBUTES_FOR_LIQUID = %w( content @@ -160,5 +162,9 @@ def html? def index? basename == 'index' end + + def trigger_hooks(hook_name, *args) + Jekyll::Hooks.trigger :pages, hook_name, self, *args + end end end diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb index e6a41aead3c..5a788c8174d 100644 --- a/lib/jekyll/renderer.rb +++ b/lib/jekyll/renderer.rb @@ -38,7 +38,7 @@ def run payload["page"] = document.to_liquid - if document.collection.label == 'posts' && document.is_a?(Document) + if document.is_a?(Document) && document.collection.label == 'posts' payload['site']['related_posts'] = document.related_posts end diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index 465e154e892..15698b99d22 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -176,7 +176,8 @@ def render pages.flatten.each do |page| if regenerator.regenerate?(page) - page.render(layouts, payload) + page.output = Jekyll::Renderer.new(self, page, payload).run + page.trigger_hooks(:post_render) end end From 7d81c00b29f7e317566c0e79f7539ab04231befc Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 11:41:47 -0800 Subject: [PATCH 0299/4996] Renderer: use Convertible's way of picking the last Converter's output extension --- lib/jekyll/renderer.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb index 5a788c8174d..b4afa03cc71 100644 --- a/lib/jekyll/renderer.rb +++ b/lib/jekyll/renderer.rb @@ -25,10 +25,20 @@ def output_ext @output_ext ||= if document.permalink File.extname(document.permalink) else - converters.first.output_ext(document.extname) + if output_exts.size == 1 + output_exts.last + else + output_exts[-2] + end end end + def output_exts + @output_exts ||= converters.map do |c| + c.output_ext(document.extname) + end.compact + end + ###################### ## DAT RENDER THO ###################### From dd15e3c368f20e84206892efebc413d1cfd48843 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 11:42:34 -0800 Subject: [PATCH 0300/4996] features: write EXIT STATUS to output so it all prints when we get an exit status we aren't expecting --- features/step_definitions.rb | 9 +++++++-- features/support/helpers.rb | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/features/step_definitions.rb b/features/step_definitions.rb index 64213ea4e27..d369593513f 100644 --- a/features/step_definitions.rb +++ b/features/step_definitions.rb @@ -228,8 +228,13 @@ # Then %r{^I should see "(.*)" in the build output$} do |text| - regexp = Regexp.new(text) - expect(jekyll_run_output).to match regexp + expect(jekyll_run_output).to match Regexp.new(text) +end + +# + +Then %r{^I should get a zero exit(?:\-| )status$} do + step %(I should see "EXIT STATUS: 0" in the build output) end # diff --git a/features/support/helpers.rb b/features/support/helpers.rb index 62892612fbb..83010b9e97d 100644 --- a/features/support/helpers.rb +++ b/features/support/helpers.rb @@ -100,8 +100,13 @@ def run_in_shell(*args) end File.write(Paths.status_file, p.value.exitstatus) - File.write(Paths.output_file, out) if p.value.exitstatus == 0 - File.write(Paths.output_file, err) if p.value.exitstatus != 0 + File.open(Paths.output_file, "wb") do |f| + f.puts args.join(" ") + f.puts out + f.puts err + f.puts "EXIT STATUS: #{p.value.exitstatus}" + end + p.value end From 2adb70a247d61a16292551ab306af0e6426cd91b Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 11:42:59 -0800 Subject: [PATCH 0301/4996] features: writing a configuration file should append if it's already there --- features/step_definitions.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/features/step_definitions.rb b/features/step_definitions.rb index d369593513f..7c9281f55d7 100644 --- a/features/step_definitions.rb +++ b/features/step_definitions.rb @@ -93,7 +93,13 @@ # Given %r{^I have a configuration file with "(.*)" set to "(.*)"$} do |key, value| - File.write("_config.yml", "#{key}: #{value}\n") + config = if source_dir.join("_config.yml").exist? + SafeYAML.load_file(source_dir.join("_config.yml")) + else + {} + end + config[key] = value + File.write("_config.yml", YAML.dump(config)) end # From e9c5c45651d7f0755b88ada09ad228818d9fdd9b Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 11:43:21 -0800 Subject: [PATCH 0302/4996] features: look for lack of "EXIT STATUS: 0" for non-zero exit status --- features/step_definitions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/step_definitions.rb b/features/step_definitions.rb index 7c9281f55d7..71a92aea15a 100644 --- a/features/step_definitions.rb +++ b/features/step_definitions.rb @@ -246,5 +246,5 @@ # Then %r{^I should get a non-zero exit(?:\-| )status$} do - expect(jekyll_run_status.to_i).to be > 0 + expect(jekyll_run_status.to_i).not_to match(%r{EXIT STATUS: 0}) end From 9a6f4e08b7d073d5636e73b9b8c3c7fb2395e027 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 11:44:00 -0800 Subject: [PATCH 0303/4996] features/permalinks: add a permalink feature for non-html extension name for pages Fixes https://github.com/mpc-hc/mpc-hc.org/pull/58#issuecomment-172594526 --- features/permalinks.feature | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/features/permalinks.feature b/features/permalinks.feature index 74f2e409f7b..5e1db21d5a7 100644 --- a/features/permalinks.feature +++ b/features/permalinks.feature @@ -120,3 +120,13 @@ Feature: Fancy permalinks When I run jekyll build Then the _site directory should exist And I should see "Totally awesome" in "_site/2009/03/27/Custom_Schema/index.html" + + Scenario: Use a non-HTML file extension in the permalink + Given I have a _posts directory + And I have an "_posts/2016-01-18-i-am-php.md" page with permalink "/2016/i-am-php.php" that contains "I am PHP" + And I have a "i-am-also-php.md" page with permalink "/i-am-also-php.php" that contains "I am also PHP" + When I run jekyll build + Then I should get a zero exit status + And the _site directory should exist + And I should see "I am PHP" in "_site/2016/i-am-php.php" + And I should see "I am also PHP" in "_site/i-am-also-php.php" From 736a800f0ed0dafc5e6ae1944bf1cea1efc1191d Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 11:52:31 -0800 Subject: [PATCH 0304/4996] features: validate the exit status of 0 for successful calls --- features/collections.feature | 33 ++++++++---- features/create_sites.feature | 48 ++++++++++++------ features/drafts.feature | 12 +++-- features/embed_filters.feature | 24 ++++++--- features/frontmatter_defaults.feature | 18 ++++--- features/hooks.feature | 27 ++++++---- features/include_tag.feature | 21 +++++--- features/incremental_rebuild.feature | 24 ++++++--- features/markdown.feature | 6 ++- features/permalinks.feature | 36 +++++++++----- features/plugins.feature | 9 ++-- features/post_data.feature | 72 ++++++++++++++++++--------- features/post_excerpts.feature | 9 ++-- features/rendering.feature | 15 ++++-- features/site_configuration.feature | 42 ++++++++++------ features/site_data.feature | 33 ++++++++---- 16 files changed, 286 insertions(+), 143 deletions(-) diff --git a/features/collections.feature b/features/collections.feature index 1fcc7ccea57..888bd1c2ddc 100644 --- a/features/collections.feature +++ b/features/collections.feature @@ -8,7 +8,8 @@ Feature: Collections And I have fixture collections And I have a configuration file with "collections" set to "['methods']" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Collections:

Use Jekyll.configuration to build a full configuration for use w/Jekyll.

\n\n

Whatever: foo.bar

\n

Signs are nice

\n

Jekyll.sanitized_path is used to make sure your path is in your source.

\n

Run your generators! default

\n

Page without title.

\n

Run your generators! default

" in "_site/index.html" And the "_site/methods/configuration.html" file should not exist @@ -24,7 +25,8 @@ Feature: Collections foo: bar """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Collections: output => true" in "_site/index.html" And I should see "label => methods" in "_site/index.html" And I should see "Methods metadata: bar" in "_site/collection_metadata.html" @@ -41,7 +43,8 @@ Feature: Collections permalink: /:collection/:path/ """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "

Whatever: foo.bar

" in "_site/methods/configuration/index.html" Scenario: Rendered document in a layout @@ -56,7 +59,8 @@ Feature: Collections foo: bar """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Collections: output => true" in "_site/index.html" And I should see "label => methods" in "_site/index.html" And I should see "foo => bar" in "_site/index.html" @@ -72,7 +76,8 @@ Feature: Collections - methods """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Collections: _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" Scenario: Collections specified as an hash @@ -84,7 +89,8 @@ Feature: Collections - methods """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Collections: _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" Scenario: All the documents @@ -96,7 +102,8 @@ Feature: Collections - methods """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "All documents: _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" Scenario: Documents have an output attribute, which is the converted HTML @@ -108,7 +115,8 @@ Feature: Collections - methods """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "First document's output:

Use Jekyll.configuration to build a full configuration for use w/Jekyll.

\n\n

Whatever: foo.bar

" in "_site/index.html" Scenario: Filter documents by where @@ -120,7 +128,8 @@ Feature: Collections - methods """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Item count: 2" in "_site/index.html" Scenario: Sort by title @@ -132,7 +141,8 @@ Feature: Collections - methods """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "1. of 7:

Page without title.

" in "_site/index.html" Scenario: Sort by relative_path @@ -144,5 +154,6 @@ Feature: Collections - methods """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Collections: Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, , Site#generate," in "_site/index.html" diff --git a/features/create_sites.feature b/features/create_sites.feature index 898115c2344..031fa434cfe 100644 --- a/features/create_sites.feature +++ b/features/create_sites.feature @@ -13,7 +13,8 @@ Feature: Create sites Scenario: Basic site Given I have an "index.html" file that contains "Basic Site" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Basic Site" in "_site/index.html" Scenario: Basic site with a post @@ -22,7 +23,8 @@ Feature: Create sites | title | date | content | | Hackers | 2009-03-27 | My First Exploit | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "My First Exploit" in "_site/2009/03/27/hackers.html" Scenario: Basic site with layout and a page @@ -30,7 +32,8 @@ Feature: Create sites And I have an "index.html" page with layout "default" that contains "Basic Site with Layout" And I have a default layout that contains "Page Layout: {{ content }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Page Layout: Basic Site with Layout" in "_site/index.html" Scenario: Basic site with layout and a post @@ -41,7 +44,8 @@ Feature: Create sites | Wargames | 2009-03-27 | default | The only winning move is not to play. | And I have a default layout that contains "Post Layout: {{ content }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post Layout:

The only winning move is not to play.

" in "_site/2009/03/27/wargames.html" Scenario: Basic site with layout inside a subfolder and a post @@ -52,7 +56,8 @@ Feature: Create sites | Wargames | 2009-03-27 | post/simple | The only winning move is not to play. | And I have a post/simple layout that contains "Post Layout: {{ content }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post Layout:

The only winning move is not to play.

" in "_site/2009/03/27/wargames.html" Scenario: Basic site with layouts, pages, posts and files @@ -75,7 +80,8 @@ Feature: Create sites | entry3 | 2009-05-27 | post | content for entry3. | | entry4 | 2009-06-27 | post | content for entry4. | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Page : Site contains 2 pages and 4 posts" in "_site/index.html" And I should see "No replacement \{\{ site.posts.size \}\}" in "_site/about.html" And I should see "" in "_site/another_file" @@ -90,7 +96,8 @@ Feature: Create sites And I have an "index.html" page that contains "Basic Site with include tag: {% include about.textile %}" And I have an "_includes/about.textile" file that contains "Generated by Jekyll" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html" Scenario: Basic site with subdir include tag @@ -99,7 +106,8 @@ Feature: Create sites And I have an info directory And I have an "info/index.html" page that contains "Basic Site with subdir include tag: {% include about.textile %}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Basic Site with subdir include tag: Generated by Jekyll" in "_site/info/index.html" Scenario: Basic site with nested include tag @@ -108,7 +116,8 @@ Feature: Create sites And I have an "_includes/jekyll.textile" file that contains "Jekyll" And I have an "index.html" page that contains "Basic Site with include tag: {% include about.textile %}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html" Scenario: Basic site with internal post linking @@ -120,19 +129,22 @@ Feature: Create sites | entry1 | 2007-12-31 | post | content for entry1. | | entry2 | 2008-01-01 | post | content for entry2. | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "URL: /2008/01/01/entry2/" in "_site/index.html" Scenario: Basic site with whitelisted dotfile Given I have an ".htaccess" file that contains "SomeDirective" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "SomeDirective" in "_site/.htaccess" Scenario: File was replaced by a directory Given I have a "test" file that contains "some stuff" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist When I delete the file "test" Given I have a test directory And I have a "test/index.html" file that contains "some other stuff" @@ -146,13 +158,15 @@ Feature: Create sites And I have a "secret.html" page with published "false" that contains "Unpublished page" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And the "_site/index.html" file should exist And the "_site/public.html" file should exist But the "_site/secret.html" file should not exist When I run jekyll build --unpublished - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And the "_site/index.html" file should exist And the "_site/public.html" file should exist And the "_site/secret.html" file should exist @@ -164,9 +178,11 @@ Feature: Create sites | entry1 | 2020-12-31 | post | content for entry1. | | entry2 | 2007-12-31 | post | content for entry2. | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "content for entry2" in "_site/2007/12/31/entry2.html" And the "_site/2020/12/31/entry1.html" file should not exist When I run jekyll build --future - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And the "_site/2020/12/31/entry1.html" file should exist diff --git a/features/drafts.feature b/features/drafts.feature index 5d7982ecfc4..5a7f49f39d2 100644 --- a/features/drafts.feature +++ b/features/drafts.feature @@ -10,7 +10,8 @@ Feature: Draft Posts | title | date | layout | content | | Recipe | 2009-03-27 | default | Not baked yet. | When I run jekyll build --drafts - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Not baked yet." in "_site/recipe.html" Scenario: Don't preview a draft @@ -21,7 +22,8 @@ Feature: Draft Posts | title | date | layout | content | | Recipe | 2009-03-27 | default | Not baked yet. | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And the "_site/recipe.html" file should not exist Scenario: Don't preview a draft that is not published @@ -32,7 +34,8 @@ Feature: Draft Posts | title | date | layout | published | content | | Recipe | 2009-03-27 | default | false | Not baked yet. | When I run jekyll build --drafts - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And the "_site/recipe.html" file should not exist Scenario: Use page.path variable @@ -42,5 +45,6 @@ Feature: Draft Posts | title | date | layout | content | | Recipe | 2009-03-27 | simple | Post path: {{ page.path }} | When I run jekyll build --drafts - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post path: _drafts/recipe.markdown" in "_site/recipe.html" diff --git a/features/embed_filters.feature b/features/embed_filters.feature index d6f99fc7655..0f2d0adabd7 100644 --- a/features/embed_filters.feature +++ b/features/embed_filters.feature @@ -11,7 +11,8 @@ Feature: Embed filters | Star Wars | 2009-03-27 | default | These aren't the droids you're looking for. | And I have a default layout that contains "{{ site.time | date_to_xmlschema }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see today's date in "_site/2009/03/27/star-wars.html" Scenario: Escape text for XML @@ -22,7 +23,8 @@ Feature: Embed filters | Star & Wars | 2009-03-27 | default | These aren't the droids you're looking for. | And I have a default layout that contains "{{ page.title | xml_escape }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Star & Wars" in "_site/2009/03/27/star-wars.html" Scenario: Calculate number of words @@ -33,7 +35,8 @@ Feature: Embed filters | Star Wars | 2009-03-27 | default | These aren't the droids you're looking for. | And I have a default layout that contains "{{ content | number_of_words }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "7" in "_site/2009/03/27/star-wars.html" Scenario: Convert an array into a sentence @@ -44,7 +47,8 @@ Feature: Embed filters | Star Wars | 2009-03-27 | default | [scifi, movies, force] | These aren't the droids you're looking for. | And I have a default layout that contains "{{ page.tags | array_to_sentence_string }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "scifi, movies, and force" in "_site/2009/03/27/star-wars.html" Scenario: Markdownify a given string @@ -55,7 +59,8 @@ Feature: Embed filters | Star Wars | 2009-03-27 | default | These aren't the droids you're looking for. | And I have a default layout that contains "By {{ '_Obi-wan_' | markdownify }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "By

Obi-wan

" in "_site/2009/03/27/star-wars.html" Scenario: Sort by an arbitrary variable @@ -68,7 +73,8 @@ Feature: Embed filters | Page-2 | default | 6 | Something | And I have a default layout that contains "{{ site.pages | sort:'value' | map:'title' | join:', ' }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see exactly "Page-2, Page-1" in "_site/page-1.html" And I should see exactly "Page-2, Page-1" in "_site/page-2.html" @@ -85,7 +91,8 @@ Feature: Embed filters | default | Jump | And I have a default layout that contains "{% assign sorted_pages = site.pages | sort: 'title' %}The rule of {{ sorted_pages.size }}: {% for p in sorted_pages %}{{ p.content | strip_html | strip_newlines }}, {% endfor %}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see exactly "The rule of 3: Jump, Fly, Run," in "_site/bird.html" Scenario: Sort pages by the title ordering pages without title last @@ -101,5 +108,6 @@ Feature: Embed filters | default | Jump | And I have a default layout that contains "{% assign sorted_pages = site.pages | sort: 'title', 'last' %}The rule of {{ sorted_pages.size }}: {% for p in sorted_pages %}{{ p.content | strip_html | strip_newlines }}, {% endfor %}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see exactly "The rule of 3: Fly, Run, Jump," in "_site/bird.html" diff --git a/features/frontmatter_defaults.feature b/features/frontmatter_defaults.feature index a9a64ae2818..31aee377b40 100644 --- a/features/frontmatter_defaults.feature +++ b/features/frontmatter_defaults.feature @@ -12,7 +12,8 @@ Feature: frontmatter defaults And I have a configuration file with "defaults" set to "[{scope: {path: ""}, values: {layout: "pretty"}}]" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "THIS IS THE LAYOUT:

just some post

" in "_site/2013/09/11/default-layout.html" And I should see "THIS IS THE LAYOUT: just some page" in "_site/index.html" @@ -24,7 +25,8 @@ Feature: frontmatter defaults And I have an "index.html" page that contains "just {{page.custom}} by {{page.author}}" And I have a configuration file with "defaults" set to "[{scope: {path: ""}, values: {custom: "some special data", author: "Ben"}}]" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "

some special data

\n
Ben
" in "_site/2013/09/11/default-data.html" And I should see "just some special data by Ben" in "_site/index.html" @@ -48,7 +50,8 @@ Feature: frontmatter defaults And I have a configuration file with "defaults" set to "[{scope: {path: "special"}, values: {layout: "subfolder", description: "the special section"}}, {scope: {path: ""}, values: {layout: "root", description: "the webpage"}}]" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "root:

info on the webpage

" in "_site/2013/10/14/about.html" And I should see "subfolder:

info on the special section

" in "_site/special/2013/10/14/about.html" And I should see "root: Overview for the webpage" in "_site/index.html" @@ -71,7 +74,8 @@ Feature: frontmatter defaults And I have a configuration file with "defaults" set to "[{scope: {path: "special"}, values: {layout: "main"}}, {scope: {path: "special/_posts"}, values: {layout: "main"}}, {scope: {path: "_posts"}, values: {layout: "main"}}]" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "main:

content of site/2013/10/14/about.html

" in "_site/2013/10/14/about.html" And I should see "main:

content of site/special/2013/10/14/about1.html

" in "_site/special/2013/10/14/about1.html" And I should see "main:

content of site/special/2013/10/14/about2.html

" in "_site/special/2013/10/14/about2.html" @@ -132,7 +136,8 @@ Feature: frontmatter defaults myval: "Test" """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Value: Test" in "_site/slides/slide1.html" Scenario: Override frontmatter defaults inside a collection @@ -159,7 +164,8 @@ Feature: frontmatter defaults myval: "Test" """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Value: Override" in "_site/slides/slide2.html" Scenario: Deep merge frontmatter defaults diff --git a/features/hooks.feature b/features/hooks.feature index 5252d562160..48b2884e37a 100644 --- a/features/hooks.feature +++ b/features/hooks.feature @@ -24,7 +24,8 @@ Feature: Hooks end """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "mytinypage" in "_site/foo.html" Scenario: Modify the payload before rendering the site @@ -37,7 +38,8 @@ Feature: Hooks end """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "myparam!" in "_site/index.html" Scenario: Modify the site contents after reading @@ -51,7 +53,8 @@ Feature: Hooks end """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And the "_site/page1.html" file should not exist And I should see "page2" in "_site/page2.html" @@ -67,7 +70,8 @@ Feature: Hooks """ And I have a "page1.html" page that contains "page1" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "page1" in "_site/firstpage.html" Scenario: Alter a page right after it is initialized @@ -81,7 +85,8 @@ Feature: Hooks """ And I have a "page1.html" page that contains "page1" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "page1" in "_site/renamed.html" Scenario: Alter the payload for one page but not another @@ -138,7 +143,8 @@ Feature: Hooks | title | date | layout | content | | entry1 | 2015-03-14 | nil | {{ page.harold }} | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "pbagrag sbe ragel1." in "_site/2015/03/14/entry1.html" Scenario: Alter the payload for certain posts @@ -268,7 +274,8 @@ Feature: Hooks {{ site.memes.first.text }} """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "all your base are belong to us" in "_site/index.html" Scenario: Update a document after rendering it, but before writing it to disk @@ -294,7 +301,8 @@ Feature: Hooks {{ page.text }} """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "

all your base are belong to us" in "_site/memes/doc1.html" Scenario: Perform an action after every document is written @@ -322,5 +330,6 @@ Feature: Hooks {{ page.text }} """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Wrote document 0" in "_site/document-build.log" diff --git a/features/include_tag.feature b/features/include_tag.feature index 83ae379f8a0..c8ebf717aa6 100644 --- a/features/include_tag.feature +++ b/features/include_tag.feature @@ -19,7 +19,8 @@ Feature: Include tags | Parameter syntax | 2013-04-12 | html | {% include params.html param1_or_2="value" %} | | Pass a variable | 2013-06-22 | html | {% assign var = 'some text' %}{% include params.html local=var title=page.title %} | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "

My awesome blog header: myparam
" in "_site/2013/03/21/include-files.html" And I should not see "myparam" in "_site/2013/03/21/ignore-params-if-unused.html" And I should see "
  • date = today
    • " in "_site/2013/03/21/list-multiple-parameters.html" @@ -44,7 +45,8 @@ Feature: Include tags | include_file2 | parametrized.html | And I have an "index.html" page that contains "{% include {{site.include_file1}} %} that {% include {{site.include_file2}} what='parameters' %}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "a snippet that works with parameters" in "_site/index.html" Scenario: Include a variable file in a loop @@ -53,7 +55,8 @@ Feature: Include tags And I have an "_includes/two.html" file that contains "two" And I have an "index.html" page with files "[one.html, two.html]" that contains "{% for file in page.files %}{% include {{file}} %} {% endfor %}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "one two" in "_site/index.html" Scenario: Include a file with variables and filters @@ -64,7 +67,8 @@ Feature: Include tags | include_file | one | And I have an "index.html" page that contains "{% include {{ site.include_file | append: '.html' }} %}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "one included" in "_site/index.html" Scenario: Include a file with partial variables @@ -75,7 +79,8 @@ Feature: Include tags | include_file | one | And I have an "index.html" page that contains "{% include {{ site.include_file }}.html %}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "one included" in "_site/index.html" Scenario: Include a file and rebuild when include content is changed @@ -83,7 +88,8 @@ Feature: Include tags And I have an "_includes/one.html" file that contains "include" And I have an "index.html" page that contains "{% include one.html %}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "include" in "_site/index.html" When I wait 1 second Then I have an "_includes/one.html" file that contains "include content changed" @@ -95,5 +101,6 @@ Feature: Include tags And I have an "_includes/header-en.html" file that contains "include" And I have an "index.html" page that contains "{% assign name = 'header' %}{% assign locale = 'en' %}{% include {{name}}-{{locale}}.html %}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "include" in "_site/index.html" diff --git a/features/incremental_rebuild.feature b/features/incremental_rebuild.feature index fb95e0c5421..128f5800456 100644 --- a/features/incremental_rebuild.feature +++ b/features/incremental_rebuild.feature @@ -11,10 +11,12 @@ Feature: Incremental rebuild | Wargames | 2009-03-27 | default | The only winning move is not to play. | And I have a default layout that contains "Post Layout: {{ content }}" When I run jekyll build -I - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post Layout:

    The only winning move is not to play.

    " in "_site/2009/03/27/wargames.html" When I run jekyll build -I - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post Layout:

    The only winning move is not to play.

    " in "_site/2009/03/27/wargames.html" Scenario: Generate a metadata file @@ -25,12 +27,14 @@ Feature: Incremental rebuild Scenario: Rebuild when content is changed Given I have an "index.html" file that contains "Basic Site" When I run jekyll build -I - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Basic Site" in "_site/index.html" When I wait 1 second Then I have an "index.html" file that contains "Bacon Site" When I run jekyll build -I - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Bacon Site" in "_site/index.html" Scenario: Rebuild when layout is changed @@ -38,12 +42,14 @@ Feature: Incremental rebuild And I have an "index.html" page with layout "default" that contains "Basic Site with Layout" And I have a default layout that contains "Page Layout: {{ content }}" When I run jekyll build -I - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Page Layout: Basic Site with Layout" in "_site/index.html" When I wait 1 second Then I have a default layout that contains "Page Layout Changed: {{ content }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Page Layout Changed: Basic Site with Layout" in "_site/index.html" Scenario: Rebuild when an include is changed @@ -51,10 +57,12 @@ Feature: Incremental rebuild And I have an "index.html" page that contains "Basic Site with include tag: {% include about.textile %}" And I have an "_includes/about.textile" file that contains "Generated by Jekyll" When I run jekyll build -I - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html" When I wait 1 second Then I have an "_includes/about.textile" file that contains "Regenerated by Jekyll" When I run jekyll build -I - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Basic Site with include tag: Regenerated by Jekyll" in "_site/index.html" diff --git a/features/markdown.feature b/features/markdown.feature index c0eeb25d3f4..3649a6d1013 100644 --- a/features/markdown.feature +++ b/features/markdown.feature @@ -11,7 +11,8 @@ Feature: Markdown | title | date | content | type | | Hackers | 2009-03-27 | # My Title | markdown | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Index" in "_site/index.html" And I should see "

    My Title

    " in "_site/2009/03/27/hackers.html" And I should see "

    My Title

    " in "_site/index.html" @@ -27,6 +28,7 @@ Feature: Markdown | title | date | content | type | | Hackers | 2009-03-27 | # My Title | markdown | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Index" in "_site/index.html" And I should see "

    My Title

    " in "_site/index.html" diff --git a/features/permalinks.feature b/features/permalinks.feature index 5e1db21d5a7..ca0482fce90 100644 --- a/features/permalinks.feature +++ b/features/permalinks.feature @@ -10,7 +10,8 @@ Feature: Fancy permalinks | None Permalink Schema | 2009-03-27 | Totally nothing. | And I have a configuration file with "permalink" set to "none" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Totally nothing." in "_site/none-permalink-schema.html" Scenario: Use pretty permalink schema @@ -20,7 +21,8 @@ Feature: Fancy permalinks | Pretty Permalink Schema | 2009-03-27 | Totally wordpress. | And I have a configuration file with "permalink" set to "pretty" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Totally wordpress." in "_site/2009/03/27/pretty-permalink-schema/index.html" Scenario: Use pretty permalink schema for pages @@ -29,7 +31,8 @@ Feature: Fancy permalinks And I have an "sitemap.xml" page that contains "Totally uhm, sitemap" And I have a configuration file with "permalink" set to "pretty" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Totally index" in "_site/index.html" And I should see "Totally awesome" in "_site/awesome/index.html" And I should see "Totally uhm, sitemap" in "_site/sitemap.xml" @@ -41,7 +44,8 @@ Feature: Fancy permalinks | Custom Permalink Schema | stuff | 2009-03-27 | Totally custom. | And I have a configuration file with "permalink" set to "/blog/:year/:month/:day/:title/" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Totally custom." in "_site/blog/2009/03/27/custom-permalink-schema/index.html" Scenario: Use custom permalink schema with category @@ -51,7 +55,8 @@ Feature: Fancy permalinks | Custom Permalink Schema | stuff | 2009-03-27 | Totally custom. | And I have a configuration file with "permalink" set to "/:categories/:title.html" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Totally custom." in "_site/stuff/custom-permalink-schema.html" Scenario: Use custom permalink schema with squished date @@ -61,7 +66,8 @@ Feature: Fancy permalinks | Custom Permalink Schema | stuff | 2009-03-27 | Totally custom. | And I have a configuration file with "permalink" set to "/:month-:day-:year/:title.html" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Totally custom." in "_site/03-27-2009/custom-permalink-schema.html" Scenario: Use custom permalink schema with date and time @@ -74,7 +80,8 @@ Feature: Fancy permalinks | permalink | "/:year:month:day:hour:minute:second.html" | | timezone | UTC | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Totally custom." in "_site/20090327223107.html" Scenario: Use per-post permalink @@ -83,7 +90,8 @@ Feature: Fancy permalinks | title | date | permalink | content | | Some post | 2013-04-14 | /custom/posts/1/ | bla bla | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And the _site/custom/posts/1 directory should exist And I should see "bla bla" in "_site/custom/posts/1/index.html" @@ -93,7 +101,8 @@ Feature: Fancy permalinks | title | date | permalink | content | | Some post | 2013-04-14 | /custom/posts/some.html | bla bla | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And the _site/custom/posts directory should exist And I should see "bla bla" in "_site/custom/posts/some.html" @@ -102,7 +111,8 @@ Feature: Fancy permalinks And I have an "_posts/2009-03-27-Pretty-Permalink-Schema.md" page that contains "Totally wordpress" And I have a configuration file with "permalink" set to "pretty" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Totally wordpress." in "_site/2009/03/27/Pretty-Permalink-Schema/index.html" Scenario: Use custom permalink schema with cased file name @@ -110,7 +120,8 @@ Feature: Fancy permalinks And I have an "_posts/2009-03-27-Custom-Schema.md" page with title "Custom Schema" that contains "Totally awesome" And I have a configuration file with "permalink" set to "/:year/:month/:day/:slug/" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Totally awesome" in "_site/2009/03/27/custom-schema/index.html" Scenario: Use pretty permalink schema with title containing underscore @@ -118,7 +129,8 @@ Feature: Fancy permalinks And I have an "_posts/2009-03-27-Custom_Schema.md" page with title "Custom Schema" that contains "Totally awesome" And I have a configuration file with "permalink" set to "pretty" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Totally awesome" in "_site/2009/03/27/Custom_Schema/index.html" Scenario: Use a non-HTML file extension in the permalink diff --git a/features/plugins.feature b/features/plugins.feature index a36c6c82d1a..be01a4a918e 100644 --- a/features/plugins.feature +++ b/features/plugins.feature @@ -6,7 +6,8 @@ Feature: Configuring and using plugins Given I have an "index.html" file that contains "Whatever" And I have a configuration file with "gems" set to "[jekyll_test_plugin]" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Whatever" in "_site/index.html" And I should see "this is a test" in "_site/test.txt" @@ -17,7 +18,8 @@ Feature: Configuring and using plugins | gems | [jekyll_test_plugin] | | whitelist | [] | When I run jekyll build --safe - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Whatever" in "_site/index.html" And the "_site/test.txt" file should not exist @@ -28,7 +30,8 @@ Feature: Configuring and using plugins | gems | [jekyll_test_plugin, jekyll_test_plugin_malicious] | | whitelist | [jekyll_test_plugin] | When I run jekyll build --safe - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Whatever" in "_site/index.html" And the "_site/test.txt" file should exist And I should see "this is a test" in "_site/test.txt" diff --git a/features/post_data.feature b/features/post_data.feature index 2792a829f93..3b4f3cf7ead 100644 --- a/features/post_data.feature +++ b/features/post_data.feature @@ -11,7 +11,8 @@ Feature: Post data | Star Wars | 2009-03-27 | simple | Luke, I am your father. | And I have a simple layout that contains "Post title: {{ page.title }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post title: Star Wars" in "_site/2009/03/27/star-wars.html" Scenario: Use post.url variable @@ -22,7 +23,8 @@ Feature: Post data | Star Wars | 2009-03-27 | simple | Luke, I am your father. | And I have a simple layout that contains "Post url: {{ page.url }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post url: /2009/03/27/star-wars.html" in "_site/2009/03/27/star-wars.html" Scenario: Use post.date variable @@ -33,7 +35,8 @@ Feature: Post data | Star Wars | 2009-03-27 | simple | Luke, I am your father. | And I have a simple layout that contains "Post date: {{ page.date | date_to_string }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post date: 27 Mar 2009" in "_site/2009/03/27/star-wars.html" Scenario: Use post.id variable @@ -44,7 +47,8 @@ Feature: Post data | Star Wars | 2009-03-27 | simple | Luke, I am your father. | And I have a simple layout that contains "Post id: {{ page.id }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post id: /2009/03/27/star-wars" in "_site/2009/03/27/star-wars.html" Scenario: Use post.content variable @@ -55,7 +59,8 @@ Feature: Post data | Star Wars | 2009-03-27 | simple | Luke, I am your father. | And I have a simple layout that contains "Post content: {{ content }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post content:

    Luke, I am your father.

    " in "_site/2009/03/27/star-wars.html" Scenario: Use post.categories variable when category is in a folder @@ -67,7 +72,8 @@ Feature: Post data | Star Wars | 2009-03-27 | simple | Luke, I am your father. | And I have a simple layout that contains "Post category: {{ page.categories }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html" Scenario: Use post.categories variable when category is in a folder and has category in YAML @@ -79,7 +85,8 @@ Feature: Post data | Star Wars | 2009-03-27 | simple | film | Luke, I am your father. | And I have a simple layout that contains "Post category: {{ page.categories }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post category: movies" in "_site/movies/film/2009/03/27/star-wars.html" Scenario: Use post.categories variable when category is in a folder and has categories in YAML @@ -91,7 +98,8 @@ Feature: Post data | Star Wars | 2009-03-27 | simple | [film, scifi] | Luke, I am your father. | And I have a simple layout that contains "Post category: {{ page.categories }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post category: movies" in "_site/movies/film/scifi/2009/03/27/star-wars.html" Scenario: Use post.categories variable when category is in a folder and duplicated category is in YAML @@ -103,7 +111,8 @@ Feature: Post data | Star Wars | 2009-03-27 | simple | movies | Luke, I am your father. | And I have a simple layout that contains "Post category: {{ page.categories }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html" Scenario: Use post.tags variable @@ -114,7 +123,8 @@ Feature: Post data | Star Wars | 2009-05-18 | simple | twist | Luke, I am your father. | And I have a simple layout that contains "Post tags: {{ page.tags }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post tags: twist" in "_site/2009/05/18/star-wars.html" Scenario: Use post.categories variable when categories are in folders @@ -127,7 +137,8 @@ Feature: Post data | Star Wars | 2009-03-27 | simple | Luke, I am your father. | And I have a simple layout that contains "Post categories: {{ page.categories | array_to_sentence_string }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post categories: scifi and movies" in "_site/scifi/movies/2009/03/27/star-wars.html" Scenario: Use post.categories variable when categories are in folders with mixed case @@ -140,7 +151,8 @@ Feature: Post data | Star Wars | 2009-03-27 | simple | Luke, I am your father. | And I have a simple layout that contains "Post categories: {{ page.categories | array_to_sentence_string }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post categories: scifi and Movies" in "_site/scifi/movies/2009/03/27/star-wars.html" Scenario: Use post.categories variable when category is in YAML @@ -151,7 +163,8 @@ Feature: Post data | Star Wars | 2009-03-27 | simple | movies | Luke, I am your father. | And I have a simple layout that contains "Post category: {{ page.categories }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html" Scenario: Use post.categories variable when category is in YAML and is mixed-case @@ -162,7 +175,8 @@ Feature: Post data | Star Wars | 2009-03-27 | simple | Movies | Luke, I am your father. | And I have a simple layout that contains "Post category: {{ page.categories }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post category: Movies" in "_site/movies/2009/03/27/star-wars.html" Scenario: Use post.categories variable when categories are in YAML @@ -173,7 +187,8 @@ Feature: Post data | Star Wars | 2009-03-27 | simple | ['scifi', 'movies'] | Luke, I am your father. | And I have a simple layout that contains "Post categories: {{ page.categories | array_to_sentence_string }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post categories: scifi and movies" in "_site/scifi/movies/2009/03/27/star-wars.html" Scenario: Use post.categories variable when categories are in YAML and are duplicated @@ -184,7 +199,8 @@ Feature: Post data | Star Wars | 2009-03-27 | simple | ['movies', 'movies'] | Luke, I am your father. | And I have a simple layout that contains "Post category: {{ page.categories }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html" Scenario: Superdirectories of _posts applied to post.categories @@ -193,7 +209,8 @@ Feature: Post data And I have a _layouts directory And I have a simple layout that contains "Post category: {{ page.categories }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html" Scenario: Subdirectories of _posts not applied to post.categories @@ -202,7 +219,8 @@ Feature: Post data And I have a _layouts directory And I have a simple layout that contains "Post category: {{ page.categories }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html" Scenario: Use post.categories variable when categories are in YAML with mixed case @@ -214,7 +232,8 @@ Feature: Post data | Star Trek | 2013-03-17 | simple | ['SciFi', 'movies'] | Jean Luc, I am your father. | And I have a simple layout that contains "Post categories: {{ page.categories | array_to_sentence_string }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post categories: scifi and Movies" in "_site/scifi/movies/2009/03/27/star-wars.html" And I should see "Post categories: SciFi and movies" in "_site/scifi/movies/2013/03/17/star-trek.html" @@ -224,7 +243,8 @@ Feature: Post data | title | type | date | content | | my-post | html | 2013-04-12 | Source path: {{ page.path }} | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Source path: _posts/2013-04-12-my-post.html" in "_site/    /2013/04/12/my-post.html" Examples: @@ -239,7 +259,8 @@ Feature: Post data | title | date | path | content | | override | 2013-04-12 | override-path.html | Non-custom path: {{ page.path }} | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Non-custom path: _posts/2013-04-12-override.markdown" in "_site/2013/04/12/override.html" Scenario: Disable a post from being published @@ -249,7 +270,8 @@ Feature: Post data | title | date | layout | published | content | | Star Wars | 2009-03-27 | simple | false | Luke, I am your father. | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And the "_site/2009/03/27/star-wars.html" file should not exist And I should see "Published!" in "_site/index.html" @@ -261,7 +283,8 @@ Feature: Post data | Star Wars | 2009-03-27 | simple | Darth Vader | Luke, I am your father. | And I have a simple layout that contains "Post author: {{ page.author }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Post author: Darth Vader" in "_site/2009/03/27/star-wars.html" Scenario: Previous and next posts title @@ -274,6 +297,7 @@ Feature: Post data | Terminator | 2009-05-27 | ordered | Arnold | Sayonara, baby | And I have a ordered layout that contains "Previous post: {{ page.previous.title }} and next post: {{ page.next.title }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "next post: Some like it hot" in "_site/2009/03/27/star-wars.html" And I should see "Previous post: Some like it hot" in "_site/2009/05/27/terminator.html" diff --git a/features/post_excerpts.feature b/features/post_excerpts.feature index c66c527bb6c..7344000c2b2 100644 --- a/features/post_excerpts.feature +++ b/features/post_excerpts.feature @@ -12,7 +12,8 @@ Feature: Post excerpts | title | date | layout | content | | entry1 | 2007-12-31 | post | content for entry1. | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see exactly "

    content for entry1.

    " in "_site/index.html" Scenario: An excerpt from a post with a layout @@ -24,7 +25,8 @@ Feature: Post excerpts | title | date | layout | content | | entry1 | 2007-12-31 | post | content for entry1. | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And the _site/2007 directory should exist And the _site/2007/12 directory should exist And the _site/2007/12/31 directory should exist @@ -41,7 +43,8 @@ Feature: Post excerpts | title | date | layout | content | | entry1 | 2007-12-31 | post | content for entry1. | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And the _site/2007 directory should exist And the _site/2007/12 directory should exist And the _site/2007/12/31 directory should exist diff --git a/features/rendering.feature b/features/rendering.feature index 01507cb0b1c..5031ef06d8d 100644 --- a/features/rendering.feature +++ b/features/rendering.feature @@ -16,7 +16,8 @@ Feature: Rendering Given I have a "index.html" page with layout "simple" that contains "Hi there, Jekyll {{ jekyll.environment }}!" And I have a simple layout that contains "{{ content }}Ahoy, indeed!" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Hi there, Jekyll development!\nAhoy, indeed" in "_site/index.html" Scenario: Don't place asset files in layout @@ -25,7 +26,8 @@ Feature: Rendering And I have a configuration file with "gems" set to "[jekyll-coffeescript]" And I have a simple layout that contains "{{ content }}Ahoy, indeed!" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should not see "Ahoy, indeed!" in "_site/index.css" And I should not see "Ahoy, indeed!" in "_site/index.js" @@ -33,18 +35,21 @@ Feature: Rendering Given I have an "index.scss" page that contains ".foo-bar { color:{{site.color}}; }" And I have a configuration file with "color" set to "red" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see ".foo-bar {\n color: red; }" in "_site/index.css" Scenario: Not render liquid in CoffeeScript without explicitly including jekyll-coffeescript Given I have an "index.coffee" page with animal "cicada" that contains "hey='for {{page.animal}}'" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And the "_site/index.js" file should not exist Scenario: Render liquid in CoffeeScript with jekyll-coffeescript enabled Given I have an "index.coffee" page with animal "cicada" that contains "hey='for {{page.animal}}'" And I have a configuration file with "gems" set to "[jekyll-coffeescript]" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "hey = 'for cicada';" in "_site/index.js" diff --git a/features/site_configuration.feature b/features/site_configuration.feature index 379cea4f214..5c495356a61 100644 --- a/features/site_configuration.feature +++ b/features/site_configuration.feature @@ -8,7 +8,8 @@ Feature: Site configuration And I have an "_sourcedir/index.html" file that contains "Changing source directory" And I have a configuration file with "source" set to "_sourcedir" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Changing source directory" in "_site/index.html" Scenario: Change destination directory @@ -66,27 +67,31 @@ Feature: Site configuration Given I have an "index.markdown" page that contains "[Google](http://google.com)" And I have a configuration file with "markdown" set to "rdiscount" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Google" in "_site/index.html" Scenario: Use Kramdown for markup Given I have an "index.markdown" page that contains "[Google](http://google.com)" And I have a configuration file with "markdown" set to "kramdown" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Google" in "_site/index.html" Scenario: Use Redcarpet for markup Given I have an "index.markdown" page that contains "[Google](http://google.com)" And I have a configuration file with "markdown" set to "redcarpet" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Google" in "_site/index.html" Scenario: Highlight code with pygments Given I have an "index.html" page that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Hello world!" in "_site/index.html" And I should see "class=\"highlight\"" in "_site/index.html" @@ -94,7 +99,8 @@ Feature: Site configuration Given I have an "index.html" page that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}" And I have a configuration file with "highlighter" set to "rouge" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Hello world!" in "_site/index.html" And I should see "class=\"highlight\"" in "_site/index.html" @@ -122,7 +128,8 @@ Feature: Site configuration | entry1 | 2007-12-31 | post | content for entry1. | | entry2 | 2020-01-31 | post | content for entry2. | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Page Layout: 1 on 2010-01-01" in "_site/index.html" And I should see "Post Layout:

    content for entry1.

    " in "_site/2007/12/31/entry1.html" And the "_site/2020/01/31/entry2.html" file should not exist @@ -142,7 +149,8 @@ Feature: Site configuration | entry1 | 2007-12-31 | post | content for entry1. | | entry2 | 2020-01-31 | post | content for entry2. | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Page Layout: 2 on 2010-01-01" in "_site/index.html" And I should see "Post Layout:

    content for entry1.

    " in "_site/2007/12/31/entry1.html" And I should see "Post Layout:

    content for entry2.

    " in "_site/2020/01/31/entry2.html" @@ -161,7 +169,8 @@ Feature: Site configuration | entry1 | 2013-04-09 23:22 -0400 | post | content for entry1. | | entry2 | 2013-04-10 03:14 -0400 | post | content for entry2. | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Page Layout: 2" in "_site/index.html" And I should see "Post Layout:

    content for entry1.

    \n built at 2013-04-09T23:22:00-04:00" in "_site/2013/04/09/entry1.html" And I should see "Post Layout:

    content for entry2.

    \n built at 2013-04-10T03:14:00-04:00" in "_site/2013/04/10/entry2.html" @@ -180,7 +189,8 @@ Feature: Site configuration | entry1 | 2013-04-09 23:22 +0400 | post | content for entry1. | | entry2 | 2013-04-10 03:14 +0400 | post | content for entry2. | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Page Layout: 2" in "_site/index.html" And the "_site/2013/04/09/entry1.html" file should exist And the "_site/2013/04/09/entry2.html" file should exist @@ -198,7 +208,8 @@ Feature: Site configuration | Oranges | 2009-04-01 | An article about oranges | | Bananas | 2009-04-05 | An article about bananas | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And the "_site/2009/04/05/bananas.html" file should exist And the "_site/2009/04/01/oranges.html" file should exist And the "_site/2009/03/27/apples.html" file should not exist @@ -211,7 +222,8 @@ Feature: Site configuration | .gitignore | | .foo | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see ".DS_Store" in "_site/.gitignore" And the "_site/.htaccess" file should not exist @@ -231,7 +243,8 @@ Feature: Site configuration | entry1 | 2007-12-31 | post | content for entry1. | | entry2 | 2020-01-31 | post | content for entry2. | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Page Layout: 2 on 2010-01-01" in "_site/index.html" And I should see "Post Layout:

    content for entry1.

    " in "_site/2007/12/31/entry1.html" And I should see "Post Layout:

    content for entry2.

    " in "_site/2020/01/31/entry2.html" @@ -240,6 +253,7 @@ Feature: Site configuration Given I have an "index.html" page with layout "page" that contains "FOO" And I have a "_config.yml" file that contains "layouts: '../../../../../../../../../../../../../../usr/include'" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "FOO" in "_site/index.html" And I should not see " " in "_site/index.html" diff --git a/features/site_data.feature b/features/site_data.feature index a7fadf34d17..e3c99a64154 100644 --- a/features/site_data.feature +++ b/features/site_data.feature @@ -6,14 +6,16 @@ Feature: Site data Scenario: Use page variable in a page Given I have an "contact.html" page with title "Contact" that contains "{{ page.title }}: email@example.com" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Contact: email@example.com" in "_site/contact.html" Scenario Outline: Use page.path variable in a page Given I have a     directory And I have a "" page that contains "Source path: {{ page.path }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Source path: " in "_site/" Examples: @@ -25,13 +27,15 @@ Feature: Site data Scenario: Override page.path Given I have an "override.html" page with path "custom-override.html" that contains "Custom path: {{ page.path }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Custom path: custom-override.html" in "_site/override.html" Scenario: Use site.time variable Given I have an "index.html" page that contains "{{ site.time }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see today's time in "_site/index.html" Scenario: Use site.posts variable for latest post @@ -43,7 +47,8 @@ Feature: Site data | Second Post | 2009-03-26 | My Second Post | | Third Post | 2009-03-27 | My Third Post | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Third Post: /2009/03/27/third-post.html" in "_site/index.html" Scenario: Use site.posts variable in a loop @@ -55,7 +60,8 @@ Feature: Site data | Second Post | 2009-03-26 | My Second Post | | Third Post | 2009-03-27 | My Third Post | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Third Post Second Post First Post" in "_site/index.html" Scenario: Use site.categories.code variable @@ -66,7 +72,8 @@ Feature: Site data | Awesome Hack | 2009-03-26 | code | puts 'Hello World' | | Delicious Beer | 2009-03-26 | food | 1) Yuengling | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Awesome Hack" in "_site/index.html" Scenario: Use site.tags variable @@ -76,7 +83,8 @@ Feature: Site data | title | date | tag | content | | Delicious Beer | 2009-03-26 | beer | 1) Yuengling | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Yuengling" in "_site/index.html" Scenario: Order Posts by name when on the same date @@ -90,18 +98,21 @@ Feature: Site data | C | 2009-03-26 | C | | last | 2009-04-26 | last | When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "last:C, C:B,last B:A,C A:first,B first:,A" in "_site/index.html" Scenario: Use configuration date in site payload Given I have an "index.html" page that contains "{{ site.url }}" And I have a configuration file with "url" set to "http://example.com" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "http://example.com" in "_site/index.html" Scenario: Access Jekyll version via jekyll.version Given I have an "index.html" page that contains "{{ jekyll.version }}" When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "\d+\.\d+\.\d+" in "_site/index.html" From ae3a71ed0d82809b6e27cb50b01fa4815cdd0344 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 11:53:07 -0800 Subject: [PATCH 0305/4996] features: config writing should decode value from string to ruby --- features/step_definitions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/step_definitions.rb b/features/step_definitions.rb index 71a92aea15a..151009a618d 100644 --- a/features/step_definitions.rb +++ b/features/step_definitions.rb @@ -98,7 +98,7 @@ else {} end - config[key] = value + config[key] = YAML.load(value) File.write("_config.yml", YAML.dump(config)) end From 0a6f289ba5e7e59421194b4de36ec36ca6399574 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 11:53:16 -0800 Subject: [PATCH 0306/4996] page: write? should always be true --- lib/jekyll/page.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb index 0a93aa08ec8..fde456513d8 100644 --- a/lib/jekyll/page.rb +++ b/lib/jekyll/page.rb @@ -166,5 +166,9 @@ def index? def trigger_hooks(hook_name, *args) Jekyll::Hooks.trigger :pages, hook_name, self, *args end + + def write? + true + end end end From 66dc083ad05c3b383fbb7a6d0a408957fccf46b0 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 12:47:36 -0800 Subject: [PATCH 0307/4996] Renderer: set paginator --- lib/jekyll/renderer.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb index b4afa03cc71..539c4de8e42 100644 --- a/lib/jekyll/renderer.rb +++ b/lib/jekyll/renderer.rb @@ -48,10 +48,18 @@ def run payload["page"] = document.to_liquid + if document.respond_to? :pager + payload["paginator"] = document.pager.to_liquid + end + if document.is_a?(Document) && document.collection.label == 'posts' payload['site']['related_posts'] = document.related_posts end + # render and transform content (this becomes the final content of the object) + payload['highlighter_prefix'] = converters.first.highlighter_prefix + payload['highlighter_suffix'] = converters.first.highlighter_suffix + Jekyll.logger.debug "Pre-Render Hooks:", document.relative_path document.trigger_hooks(:pre_render, payload) @@ -60,10 +68,6 @@ def run :registers => { :site => site, :page => payload['page'] } } - # render and transform content (this becomes the final content of the object) - payload['highlighter_prefix'] = converters.first.highlighter_prefix - payload['highlighter_suffix'] = converters.first.highlighter_suffix - output = document.content if document.render_with_liquid? From e5d8bdee8fe570d1f6a055fec852af9e39ef6cc7 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 12:47:48 -0800 Subject: [PATCH 0308/4996] Page: freeze true in write? --- lib/jekyll/page.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb index fde456513d8..3760410be3d 100644 --- a/lib/jekyll/page.rb +++ b/lib/jekyll/page.rb @@ -168,7 +168,7 @@ def trigger_hooks(hook_name, *args) end def write? - true + true.freeze end end end From 1d369aada31e64ad4ffff2ac2ac71c86b117d9dd Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 12:48:12 -0800 Subject: [PATCH 0309/4996] features: some under-the-hood enhancements --- features/step_definitions.rb | 6 ++---- features/support/helpers.rb | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/features/step_definitions.rb b/features/step_definitions.rb index 151009a618d..a6790a15c94 100644 --- a/features/step_definitions.rb +++ b/features/step_definitions.rb @@ -105,10 +105,8 @@ # Given %r{^I have a configuration file with:$} do |table| - File.open("_config.yml", "w") do |f| - table.hashes.each do |row| - f.write("#{row["key"]}: #{row["value"]}\n") - end + table.hashes.each do |row| + step %(I have a configuration file with "#{row["key"]}" set to "#{row["value"]}") end end diff --git a/features/support/helpers.rb b/features/support/helpers.rb index 83010b9e97d..d65695cedab 100644 --- a/features/support/helpers.rb +++ b/features/support/helpers.rb @@ -2,6 +2,7 @@ require "jekyll/utils" require "open3" require "time" +require "safe_yaml/load" class Paths SOURCE_DIR = Pathname.new(File.expand_path("../..", __dir__)) From cc6e49a3890d7a723c217578055a6f6d607b3a7a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 13:41:41 -0800 Subject: [PATCH 0310/4996] features/embed_filters: reformat a little --- features/embed_filters.feature | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/features/embed_filters.feature b/features/embed_filters.feature index 0f2d0adabd7..e3802fe55da 100644 --- a/features/embed_filters.feature +++ b/features/embed_filters.feature @@ -80,15 +80,13 @@ Feature: Embed filters Scenario: Sort pages by the title Given I have a _layouts directory + And I have the following pages: + | title | layout | content | + | Dog | default | Run | + | Bird | default | Fly | And I have the following page: - | title | layout | content | - | Dog | default | Run | - And I have the following page: - | title | layout | content | - | Bird | default | Fly | - And I have the following page: - | layout | content | - | default | Jump | + | layout | content | + | default | Jump | And I have a default layout that contains "{% assign sorted_pages = site.pages | sort: 'title' %}The rule of {{ sorted_pages.size }}: {% for p in sorted_pages %}{{ p.content | strip_html | strip_newlines }}, {% endfor %}" When I run jekyll build Then I should get a zero exit status @@ -97,15 +95,13 @@ Feature: Embed filters Scenario: Sort pages by the title ordering pages without title last Given I have a _layouts directory + And I have the following pages: + | title | layout | content | + | Dog | default | Run | + | Bird | default | Fly | And I have the following page: - | title | layout | content | - | Dog | default | Run | - And I have the following page: - | title | layout | content | - | Bird | default | Fly | - And I have the following page: - | layout | content | - | default | Jump | + | layout | content | + | default | Jump | And I have a default layout that contains "{% assign sorted_pages = site.pages | sort: 'title', 'last' %}The rule of {{ sorted_pages.size }}: {% for p in sorted_pages %}{{ p.content | strip_html | strip_newlines }}, {% endfor %}" When I run jekyll build Then I should get a zero exit status From 2554281188dd8ab9cb6864dfd27ef209400cc0a8 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 13:41:49 -0800 Subject: [PATCH 0311/4996] document#merge_data!: reformat --- lib/jekyll/document.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 911cb4e6750..2911c4aa04b 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -59,7 +59,10 @@ def merge_data!(other) end Utils.deep_merge_hashes!(data, other) if data.key?('date') && !data['date'].is_a?(Time) - data['date'] = Utils.parse_date(data['date'].to_s, "Document '#{relative_path}' does not have a valid date in the YAML front matter.") + data['date'] = Utils.parse_date( + data['date'].to_s, + "Document '#{relative_path}' does not have a valid date in the YAML front matter." + ) end data end From 5cf5ce979f41ab0e8534171e315392d1f8b90cff Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 13:42:03 -0800 Subject: [PATCH 0312/4996] test: add assert_exist and refute_exist --- test/helper.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/helper.rb b/test/helper.rb index 936638d230f..78b1f78b375 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -42,6 +42,22 @@ def jruby? ) ] +module Minitest::Assertions + def assert_exist(filename, msg = nil) + msg = message(msg) { + "Expected '#{filename}' to exist" + } + assert File.exist?(filename), msg + end + + def refute_exist(filename, msg = nil) + msg = message(msg) { + "Expected '#{filename}' not to exist" + } + refute File.exist?(filename), msg + end +end + class JekyllUnitTest < Minitest::Test include ::RSpec::Mocks::ExampleMethods From 2de5bacb418441a508f42101e2c83b3179269970 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 13:45:17 -0800 Subject: [PATCH 0313/4996] pages' permalink' extnames must be respected MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts a bit of the work @willnorris had made to support extensionless permalinks. Using the ‘permalink’ front matter will no longer work as it must allow non-html extensions to be written. --- test/source/+/foo.md | 2 +- test/source/deal.with.dots.html | 1 - test/test_page.rb | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/test/source/+/foo.md b/test/source/+/foo.md index 30f9535f3a9..bd2d1482285 100644 --- a/test/source/+/foo.md +++ b/test/source/+/foo.md @@ -1,7 +1,7 @@ --- layout: default title : Page inside + -permalink: /+/plus+in+url +permalink: /+/plus+in+url.html --- Line 1 {{ page.title }} diff --git a/test/source/deal.with.dots.html b/test/source/deal.with.dots.html index 6c87d806207..fb3d473460f 100644 --- a/test/source/deal.with.dots.html +++ b/test/source/deal.with.dots.html @@ -1,6 +1,5 @@ --- title: Deal with dots -permalink: /deal.with.dots --- Let's test if jekyll deals properly with dots. diff --git a/test/test_page.rb b/test/test_page.rb index 904f5bd5d78..938f2fc8871 100644 --- a/test/test_page.rb +++ b/test/test_page.rb @@ -69,7 +69,6 @@ def do_render(page) @dest_file = dest_dir("deal.with.dots.html") assert_equal "deal.with.dots", @page.basename - assert_equal "/deal.with.dots", @page.url assert_equal @dest_file, @page.destination(dest_dir) end From 275d56a0fed0ce6340e9b984b551da07867a2ef4 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 13:45:36 -0800 Subject: [PATCH 0314/4996] test: use {assert,refute}_exist everywhere --- test/test_cleaner.rb | 18 +++++++++--------- test/test_coffeescript.rb | 2 +- test/test_generated_site.rb | 23 +++++++++++++++-------- test/test_new_command.rb | 8 ++++---- test/test_page.rb | 30 +++++++++++++++--------------- test/test_regenerator.rb | 2 +- test/test_site.rb | 26 +++++++++++++------------- 7 files changed, 58 insertions(+), 51 deletions(-) diff --git a/test/test_cleaner.rb b/test/test_cleaner.rb index 819dbf5cd21..43d99503a51 100644 --- a/test/test_cleaner.rb +++ b/test/test_cleaner.rb @@ -21,19 +21,19 @@ class TestCleaner < JekyllUnitTest end should "keep the parent directory" do - assert File.exist?(dest_dir('to_keep')) + assert_exist dest_dir('to_keep') end should "keep the child directory" do - assert File.exist?(dest_dir('to_keep/child_dir')) + assert_exist dest_dir('to_keep', 'child_dir') end should "keep the file in the directory in keep_files" do - assert File.exist?(File.join(dest_dir('to_keep/child_dir'), 'index.html')) + assert_exist dest_dir('to_keep', 'child_dir', 'index.html') end should "delete the file in the directory not in keep_files" do - assert !File.exist?(File.join(dest_dir('to_keep'), 'index.html')) + refute_exist dest_dir('to_keep', 'index.html') end end @@ -41,8 +41,8 @@ class TestCleaner < JekyllUnitTest setup do clear_dest - FileUtils.mkdir_p(source_dir('no_files_inside/child_dir')) - FileUtils.touch(File.join(source_dir('no_files_inside/child_dir'), 'index.html')) + FileUtils.mkdir_p(source_dir('no_files_inside', 'child_dir')) + FileUtils.touch(source_dir('no_files_inside', 'child_dir', 'index.html')) @site = fixture_site @site.process @@ -57,15 +57,15 @@ class TestCleaner < JekyllUnitTest end should "keep the parent directory" do - assert File.exist?(dest_dir('no_files_inside')) + assert_exist dest_dir('no_files_inside') end should "keep the child directory" do - assert File.exist?(dest_dir('no_files_inside/child_dir')) + assert_exist dest_dir('no_files_inside', 'child_dir') end should "keep the file" do - assert File.exist?(File.join(dest_dir('no_files_inside/child_dir'), 'index.html')) + assert_exist source_dir('no_files_inside', 'child_dir', 'index.html') end end end diff --git a/test/test_coffeescript.rb b/test/test_coffeescript.rb index 68e19a52ae5..09c9b0a87a0 100644 --- a/test/test_coffeescript.rb +++ b/test/test_coffeescript.rb @@ -37,7 +37,7 @@ class TestCoffeeScript < JekyllUnitTest end should "write a JS file in place" do - assert File.exist?(@test_coffeescript_file), "Can't find the converted CoffeeScript file in the dest_dir." + assert_exist @test_coffeescript_file, "Can't find the converted CoffeeScript file in the dest_dir." end should "produce JS" do diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb index 39a8b3d9669..400ec4d784a 100644 --- a/test/test_generated_site.rb +++ b/test/test_generated_site.rb @@ -31,17 +31,17 @@ class TestGeneratedSite < JekyllUnitTest end should "hide unpublished page" do - assert !File.exist?(dest_dir('/unpublished.html')) + refute_exist dest_dir('/unpublished.html') end should "not copy _posts directory" do - assert !File.exist?(dest_dir('_posts')) + refute_exist dest_dir('_posts') end should "process other static files and generate correct permalinks" do - assert File.exist?(dest_dir('/about/index.html')), "about/index.html should exist" - assert File.exist?(dest_dir('/contacts.html')), "contacts.html should exist" - assert File.exist?(dest_dir('/dynamic_file.php')), "dynamic_file.php should exist" + assert_exist dest_dir('about', 'index.html'), "about/index.html should exist" + assert_exist dest_dir('contacts.html'), "contacts.html should exist" + assert_exist dest_dir('dynamic_file.php'), "dynamic_file.php should exist" end should "print a nice list of static files" do @@ -72,15 +72,22 @@ class TestGeneratedSite < JekyllUnitTest should "ensure limit posts is 0 or more" do assert_raises ArgumentError do clear_dest - config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => -1}) - + config = Jekyll::Configuration::DEFAULTS.merge({ + 'source' => source_dir, + 'destination' => dest_dir, + 'limit_posts' => -1 + }) @site = fixture_site(config) end end should "acceptable limit post is 0" do clear_dest - config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 0}) + config = Jekyll::Configuration::DEFAULTS.merge({ + 'source' => source_dir, + 'destination' => dest_dir, + 'limit_posts' => 0 + }) assert Site.new(config), "Couldn't create a site with the given limit_posts." end diff --git a/test/test_new_command.rb b/test/test_new_command.rb index 33bd1044262..f0d2a389f99 100644 --- a/test/test_new_command.rb +++ b/test/test_new_command.rb @@ -24,9 +24,9 @@ def site_template end should 'create a new directory' do - assert !File.exist?(@full_path) + refute_exist @full_path Jekyll::Commands::New.process(@args) - assert File.exist?(@full_path) + assert_exist @full_path end should 'display a success message' do @@ -96,9 +96,9 @@ def site_template end should 'create a new directory' do - assert !File.exist?(@site_name_with_spaces) + refute_exist @site_name_with_spaces capture_stdout { Jekyll::Commands::New.process(@multiple_args) } - assert File.exist?(@site_name_with_spaces) + assert_exist @site_name_with_spaces end end diff --git a/test/test_page.rb b/test/test_page.rb index 938f2fc8871..2728b4e3337 100644 --- a/test/test_page.rb +++ b/test/test_page.rb @@ -213,7 +213,7 @@ def do_render(page) do_render(page) page.write(dest_dir) - assert !File.exist?(unexpected) + refute_exist unexpected end end @@ -238,7 +238,7 @@ def do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert File.exist?(File.join(dest_dir, 'contacts.html')) + assert_exist dest_dir('contacts.html') end should "write even when the folder name is plus and permalink has +" do @@ -246,8 +246,8 @@ def do_render(page) do_render(page) page.write(dest_dir) - assert File.directory?(dest_dir) - assert File.exist?(File.join(dest_dir, '+', 'plus+in+url.html')) + assert File.directory?(dest_dir), "#{dest_dir} should be a directory" + assert_exist dest_dir('+', 'plus+in+url.html') end should "write even when permalink has '%# +'" do @@ -256,7 +256,7 @@ def do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert File.exist?(File.join(dest_dir, '+', '%# +.html')) + assert_exist dest_dir('+', '%# +.html') end should "write properly without html extension" do @@ -266,7 +266,7 @@ def do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert File.exist?(File.join(dest_dir, 'contacts', 'index.html')) + assert_exist dest_dir('contacts', 'index.html') end should "support .htm extension and respects that" do @@ -276,7 +276,7 @@ def do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert File.exist?(File.join(dest_dir, 'contacts', 'index.htm')) + assert_exist dest_dir('contacts', 'index.htm') end should "support .xhtml extension and respects that" do @@ -286,7 +286,7 @@ def do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert File.exist?(File.join(dest_dir, 'contacts', 'index.xhtml')) + assert_exist dest_dir('contacts', 'index.xhtml') end should "write properly with extension different from html" do @@ -295,10 +295,10 @@ def do_render(page) do_render(page) page.write(dest_dir) - assert_equal("/sitemap.xml", page.url) - assert_nil(page.url[/\.html$/]) + assert_equal "/sitemap.xml", page.url + assert_nil page.url[/\.html$/] assert File.directory?(dest_dir) - assert File.exist?(File.join(dest_dir,'sitemap.xml')) + assert_exist dest_dir('sitemap.xml') end should "write dotfiles properly" do @@ -307,7 +307,7 @@ def do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert File.exist?(File.join(dest_dir, '.htaccess')) + assert_exist dest_dir('.htaccess') end context "in a directory hierarchy" do @@ -317,7 +317,7 @@ def do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert File.exist?(File.join(dest_dir, 'contacts', 'index.html')) + assert_exist dest_dir('contacts', 'index.html') end should "write properly" do @@ -326,7 +326,7 @@ def do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert File.exist?(File.join(dest_dir, 'contacts', 'bar.html')) + assert_exist dest_dir('contacts', 'bar.html') end should "write properly without html extension" do @@ -336,7 +336,7 @@ def do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert File.exist?(File.join(dest_dir, 'contacts', 'bar', 'index.html')) + assert_exist dest_dir('contacts', 'bar', 'index.html') end end end diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb index c9dfb5730c3..1ed212110d5 100644 --- a/test/test_regenerator.rb +++ b/test/test_regenerator.rb @@ -112,7 +112,7 @@ class TestRegenerator < JekyllUnitTest assert_equal 1, @regenerator.metadata.size path = @regenerator.metadata.keys[0] - assert File.exist?(@layout_path) + assert_exist @layout_path @regenerator.add_dependency(path, @layout_path) File.rename(@layout_path, @layout_path + ".tmp") diff --git a/test/test_site.rb b/test/test_site.rb index 970084cf165..e0883b49f90 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -275,25 +275,25 @@ def generate(site) should 'remove orphaned files in destination' do @site.process - assert !File.exist?(dest_dir('obsolete.html')) - assert !File.exist?(dest_dir('qux')) - assert !File.exist?(dest_dir('quux')) - assert File.exist?(dest_dir('.git')) - assert File.exist?(dest_dir('.git/HEAD')) + refute_exist dest_dir('obsolete.html') + refute_exist dest_dir('qux') + refute_exist dest_dir('quux') + assert_exist dest_dir('.git') + assert_exist dest_dir('.git', 'HEAD') end should 'remove orphaned files in destination - keep_files .svn' do config = site_configuration('keep_files' => %w{.svn}) @site = Site.new(config) @site.process - assert !File.exist?(dest_dir('.htpasswd')) - assert !File.exist?(dest_dir('obsolete.html')) - assert !File.exist?(dest_dir('qux')) - assert !File.exist?(dest_dir('quux')) - assert !File.exist?(dest_dir('.git')) - assert !File.exist?(dest_dir('.git/HEAD')) - assert File.exist?(dest_dir('.svn')) - assert File.exist?(dest_dir('.svn/HEAD')) + refute_exist dest_dir('.htpasswd') + refute_exist dest_dir('obsolete.html') + refute_exist dest_dir('qux') + refute_exist dest_dir('quux') + refute_exist dest_dir('.git') + refute_exist dest_dir('.git', 'HEAD') + assert_exist dest_dir('.svn') + assert_exist dest_dir('.svn', 'HEAD') end end From a351a70b030f2be33cbca4b97bb323fada9dda99 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 14:08:53 -0800 Subject: [PATCH 0315/4996] test: Slight refactor to doublecheck destination. --- test/test_generated_site.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb index 400ec4d784a..301cd8f8fea 100644 --- a/test/test_generated_site.rb +++ b/test/test_generated_site.rb @@ -38,10 +38,15 @@ class TestGeneratedSite < JekyllUnitTest refute_exist dest_dir('_posts') end + should "process a page with a folder permalink properly" do + about = @site.pages.find {|page| page.name == 'about.html' } + assert_equal dest_dir('about', 'index.html'), about.destination(dest_dir) + assert_exist dest_dir('about', 'index.html') + end + should "process other static files and generate correct permalinks" do - assert_exist dest_dir('about', 'index.html'), "about/index.html should exist" - assert_exist dest_dir('contacts.html'), "contacts.html should exist" - assert_exist dest_dir('dynamic_file.php'), "dynamic_file.php should exist" + assert_exist dest_dir('contacts.html') + assert_exist dest_dir('dynamic_file.php') end should "print a nice list of static files" do From 4de1873b56c936842c8fac550cfadd9a7e355e6f Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 14:09:14 -0800 Subject: [PATCH 0316/4996] Renderer: #output_ext should check to make sure the output extension of the permalink isn't empty --- lib/jekyll/renderer.rb | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb index 539c4de8e42..c7b6042b538 100644 --- a/lib/jekyll/renderer.rb +++ b/lib/jekyll/renderer.rb @@ -22,21 +22,7 @@ def converters # # Returns the output extname including the leading period. def output_ext - @output_ext ||= if document.permalink - File.extname(document.permalink) - else - if output_exts.size == 1 - output_exts.last - else - output_exts[-2] - end - end - end - - def output_exts - @output_exts ||= converters.map do |c| - c.output_ext(document.extname) - end.compact + @output_ext ||= (permalink_ext || converter_output_ext) end ###################### @@ -178,5 +164,28 @@ def place_in_layouts(content, payload, info) output end + + private + + def permalink_ext + if document.permalink + permalink_ext = File.extname(document.permalink) + permalink_ext unless permalink_ext.empty? + end + end + + def converter_output_ext + if output_exts.size == 1 + output_exts.last + else + output_exts[-2] + end + end + + def output_exts + @output_exts ||= converters.map do |c| + c.output_ext(document.extname) + end.compact + end end end From 2d5feab2ae45a6597a11887210f40086a59513f1 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 18 Jan 2016 15:00:47 -0800 Subject: [PATCH 0317/4996] Update history to reflect merge of #4373 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index ba8e9a81e46..5bd8a10e186 100644 --- a/History.markdown +++ b/History.markdown @@ -38,6 +38,7 @@ * Escape html from site.title and page.title in site template (#4307) * Allow custom file extensions if defined in `permalink` YAML front matter (#4314) * Fix deep_merge_hashes! handling of drops and hashes (#4359) + * Page should respect output extension of its permalink (#4373) ### Development Fixes From e75d703806574db362cbe19ee0db185b0cf4174a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 15:33:58 -0800 Subject: [PATCH 0318/4996] Page#write? shouldn't freeze 'true' --- lib/jekyll/page.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb index 3760410be3d..fde456513d8 100644 --- a/lib/jekyll/page.rb +++ b/lib/jekyll/page.rb @@ -168,7 +168,7 @@ def trigger_hooks(hook_name, *args) end def write? - true.freeze + true end end end From d27f1d95d56662935bfd5b00b0a63a4c02369547 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 15:34:50 -0800 Subject: [PATCH 0319/4996] features: #run_command should prefix command with $ --- features/support/helpers.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/support/helpers.rb b/features/support/helpers.rb index d65695cedab..b8334cfd619 100644 --- a/features/support/helpers.rb +++ b/features/support/helpers.rb @@ -102,7 +102,7 @@ def run_in_shell(*args) File.write(Paths.status_file, p.value.exitstatus) File.open(Paths.output_file, "wb") do |f| - f.puts args.join(" ") + f.puts "$ " << args.join(" ") f.puts out f.puts err f.puts "EXIT STATUS: #{p.value.exitstatus}" From be0e951bb09b8935af94c508b8b48a354c5f3ea6 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 15:35:11 -0800 Subject: [PATCH 0320/4996] features: Reorganize step definitions to reduce duplication --- features/step_definitions.rb | 64 +++++++++++++++++------------------- 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/features/step_definitions.rb b/features/step_definitions.rb index a6790a15c94..2e47e369aab 100644 --- a/features/step_definitions.rb +++ b/features/step_definitions.rb @@ -167,72 +167,68 @@ # -Then %r{^the (.*) directory should +exist$} do |dir| - expect(Pathname.new(dir)).to exist -end - -# - -Then %r{^the (.*) directory should not exist$} do |dir| - expect(Pathname.new(dir)).not_to exist +Then %r{^the (.*) directory should +(not )?exist$} do |dir, negative| + if negative.nil? + expect(Pathname.new(dir)).to exist + else + expect(Pathname.new(dir)).to_not exist + end end # -Then %r{^I should see "(.*)" in "(.*)"$} do |text, file| +Then %r{^I should (not )?see "(.*)" in "(.*)"$} do |negative, text, file| + step %(the "#{file}" file should exist) regexp = Regexp.new(text, Regexp::MULTILINE) - expect(file_contents(file)).to match regexp + if negative.nil? || negative.empty? + expect(file_contents(file)).to match regexp + else + expect(file_contents(file)).not_to match regexp + end end # Then %r{^I should see exactly "(.*)" in "(.*)"$} do |text, file| + step %(the "#{file}" file should exist) expect(file_contents(file).strip).to eq text end # -Then %r{^I should not see "(.*)" in "(.*)"$} do |text, file| - regexp = Regexp.new(text, Regexp::MULTILINE) - expect(file_contents(file)).not_to match regexp -end - -# - Then %r{^I should see escaped "(.*)" in "(.*)"$} do |text, file| - regexp = Regexp.new(Regexp.escape(text)) - expect(file_contents(file)).to match regexp -end - -# - -Then %r{^the "(.*)" file should +exist$} do |file| - expect(Pathname.new(file)).to exist + step %(I should see "#{Regexp.escape(text)}" in "#{file}") end # -Then %r{^the "(.*)" file should not exist$} do |file| - expect(Pathname.new(file)).to_not exist +Then %r{^the "(.*)" file should +(not )?exist$} do |file, negative| + if negative.nil? + expect(Pathname.new(file)).to exist + else + expect(Pathname.new(file)).to_not exist + end end # Then %r{^I should see today's time in "(.*)"$} do |file| - seconds = seconds_agnostic_time(Time.now) - expect(file_contents(file)).to match Regexp.new(seconds) + step %(I should see "#{seconds_agnostic_time(Time.now)}" in "#{file}") end # Then %r{^I should see today's date in "(.*)"$} do |file| - regexp = Regexp.new(Date.today.to_s) - expect(file_contents(file)).to match regexp + step %(I should see "#{Date.today.to_s}" in "#{file}") end # -Then %r{^I should see "(.*)" in the build output$} do |text| - expect(jekyll_run_output).to match Regexp.new(text) +Then %r{^I should (not )?see "(.*)" in the build output$} do |negative, text| + if negative.nil? || negative.empty? + expect(jekyll_run_output).to match Regexp.new(text) + else + expect(jekyll_run_output).not_to match Regexp.new(text) + end end # @@ -244,5 +240,5 @@ # Then %r{^I should get a non-zero exit(?:\-| )status$} do - expect(jekyll_run_status.to_i).not_to match(%r{EXIT STATUS: 0}) + step %(I should not see "EXIT STATUS: 0" in the build output) end From 32fba4f01a4a1c9a947e1bedc52ba86e12c6a605 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 15:39:53 -0800 Subject: [PATCH 0321/4996] Release :gem: v3.1.0.pre.rc2 --- lib/jekyll/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index 66eebc1c051..394cef78fec 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,3 +1,3 @@ module Jekyll - VERSION = '3.1.0.pre.rc1' + VERSION = '3.1.0.pre.rc2' end From 00285f7b9ae8652df69a8cc1ad052f424a1994bb Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 18 Jan 2016 15:39:56 -0800 Subject: [PATCH 0322/4996] Release :gem: 3.1.0.pre.rc2 From 56a711f1eea837b37d57a5868e222f435240d540 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Tue, 19 Jan 2016 10:11:54 -0600 Subject: [PATCH 0323/4996] Move to static Ruby versions so we can test on latest versions. --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index fafd57c396b..29b0a836f47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,16 +6,17 @@ language: ruby sudo: false rvm: -- 2.2 -- 2.1 -- 2.0 -- jruby-9.0.3.0 +- 2.0.0-p648 +- 2.1.8 +- 2.2.4 +- 2.3.0 +- jruby-9.0.4.0 - ruby-head matrix: fast_finish: true allow_failures: - - rvm: jruby-9.0.3.0 + - rvm: jruby-9.0.4.0 - rvm: ruby-head env: matrix: From ecc5121918ba6fbec97f18d766a47ee3a18328f4 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Tue, 19 Jan 2016 10:15:58 -0600 Subject: [PATCH 0324/4996] Update our badge URL's for more reliability. --- README.markdown | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/README.markdown b/README.markdown index 9ee529f357d..577e774c347 100644 --- a/README.markdown +++ b/README.markdown @@ -1,11 +1,16 @@ # [Jekyll](http://jekyllrb.com/) -[![Gem Version](https://img.shields.io/gem/v/jekyll.svg)](https://rubygems.org/gems/jekyll) -[![Build Status](https://img.shields.io/travis/jekyll/jekyll/master.svg)](https://travis-ci.org/jekyll/jekyll) -[![Code Climate](https://img.shields.io/codeclimate/github/jekyll/jekyll.svg)](https://codeclimate.com/github/jekyll/jekyll) -[![Test Coverage](https://codeclimate.com/github/jekyll/jekyll/badges/coverage.svg)](https://codeclimate.com/github/jekyll/jekyll/coverage) -[![Dependency Status](https://gemnasium.com/jekyll/jekyll.svg)](https://gemnasium.com/jekyll/jekyll) -[![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)](https://hakiri.io/github/jekyll/jekyll/master) +[![Build Status](https://travis-ci.org/jekyll/jekyll.svg?branch=master)][travis] +[![Test Coverage](https://codeclimate.com/github/jekyll/jekyll/badges/coverage.svg)][coverage] +[![Code Climate](https://codeclimate.com/github/jekyll/jekyll/badges/gpa.svg)][codeclimate] +[![Dependency Status](https://gemnasium.com/jekyll/jekyll.svg)][gemnasium] +[![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)][hakiri] + +[gemnasium]: https://gemnasium.com/jekyll/jekyll +[codeclimate]: https://codeclimate.com/github/jekyll/jekyll +[coverage]: https://codeclimate.com/github/jekyll/jekyll/coverage +[hakiri]: https://hakiri.io/github/jekyll/jekyll/master +[travis]: https://travis-ci.org/jekyll/jekyll By Tom Preston-Werner, Nick Quaranto, Parker Moore, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)! From d50656021f2ff9ea0f46bd1a58eb1b4f1cc83d1e Mon Sep 17 00:00:00 2001 From: rebornix Date: Fri, 27 Nov 2015 13:40:30 +0800 Subject: [PATCH 0325/4996] Fix #4188: Extract title from filename successfully when dateless. --- features/collections.feature | 19 +++++++++++++++++-- lib/jekyll/document.rb | 5 ++++- .../_thanksgiving/2015-11-26-thanksgiving.md | 3 +++ test/source/_thanksgiving/black-friday.md | 3 +++ 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 test/source/_thanksgiving/2015-11-26-thanksgiving.md create mode 100644 test/source/_thanksgiving/black-friday.md diff --git a/features/collections.feature b/features/collections.feature index 888bd1c2ddc..90715b57cd0 100644 --- a/features/collections.feature +++ b/features/collections.feature @@ -155,5 +155,20 @@ Feature: Collections """ When I run jekyll build Then I should get a zero exit status - And the _site directory should exist - And I should see "Collections: Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, , Site#generate," in "_site/index.html" + Then the _site directory should exist + And I should see "Collections: Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, Site#generate, YAML with Dots," in "_site/index.html" + + Scenario: Rendered collection with date/dateless filename + Given I have an "index.html" page that contains "Collections: {% for method in site.thanksgiving %}{{ method.title }} {% endfor %}" + And I have fixture collections + And I have a "_config.yml" file with content: + """ + collections: + thanksgiving: + output: true + """ + When I run jekyll build + Then the _site directory should exist + And I should see "Thanksgiving Black Friday" in "_site/index.html" + And I should see "Happy Thanksgiving" in "_site/thanksgiving/2015-11-26-thanksgiving.html" + And I should see "Black Friday" in "_site/thanksgiving/black-friday.html" diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 2911c4aa04b..d4db403cbbc 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -8,7 +8,7 @@ class Document attr_accessor :content, :output YAML_FRONT_MATTER_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m - DATELESS_FILENAME_MATCHER = /^(.*)(\.[^.]+)$/ + DATELESS_FILENAME_MATCHER = /^(.+\/)*(.*)(\.[^.]+)$/ DATE_FILENAME_MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$/ # Create a new Document. @@ -294,6 +294,9 @@ def post_read }) merge_data!({ "date" => date }) if data['date'].nil? || data['date'].to_i == site.time.to_i data['title'] ||= slug.split('-').select(&:capitalize).join(' ') + elsif DATELESS_FILENAME_MATCHER =~ relative_path + m, cats, slug, ext = *relative_path.match(DATELESS_FILENAME_MATCHER) + data['title'] ||= slug.split('-').select {|w| w.capitalize! || w }.join(' ') end populate_categories populate_tags diff --git a/test/source/_thanksgiving/2015-11-26-thanksgiving.md b/test/source/_thanksgiving/2015-11-26-thanksgiving.md new file mode 100644 index 00000000000..48d2dd58cba --- /dev/null +++ b/test/source/_thanksgiving/2015-11-26-thanksgiving.md @@ -0,0 +1,3 @@ +--- +--- +Happy {{ page.title }} ! diff --git a/test/source/_thanksgiving/black-friday.md b/test/source/_thanksgiving/black-friday.md new file mode 100644 index 00000000000..1d8ea1bbad4 --- /dev/null +++ b/test/source/_thanksgiving/black-friday.md @@ -0,0 +1,3 @@ +--- +--- +{{ page.title }} From f8e86721481eff5f12910f0be800a1e36a790381 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sat, 28 Nov 2015 01:22:24 -0600 Subject: [PATCH 0326/4996] Fix #4191: Reduce Document#post_read complexity slightly. --- lib/jekyll/document.rb | 32 ++++++++++++++++++-------------- lib/jekyll/utils.rb | 8 ++++++-- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index d4db403cbbc..51d0514ea34 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -286,24 +286,21 @@ def read(opts = {}) end def post_read - if DATE_FILENAME_MATCHER =~ relative_path - _, _, date, slug, ext = *relative_path.match(DATE_FILENAME_MATCHER) - merge_data!({ - "slug" => slug, - "ext" => ext - }) - merge_data!({ "date" => date }) if data['date'].nil? || data['date'].to_i == site.time.to_i - data['title'] ||= slug.split('-').select(&:capitalize).join(' ') + if relative_path =~ DATE_FILENAME_MATCHER + cats, date, slug, ext = $1, $2, $3, $4 + merge_data!("date" => date) if !data['date'] || data['date'].to_i == site.time.to_i elsif DATELESS_FILENAME_MATCHER =~ relative_path - m, cats, slug, ext = *relative_path.match(DATELESS_FILENAME_MATCHER) - data['title'] ||= slug.split('-').select {|w| w.capitalize! || w }.join(' ') + cats, slug, ext = $1, $2, $3 end + + merge_data!("slug" => slug, "ext" => ext) + + # Try to ensure the user gets a title. + data["title"] ||= Utils.titleize_slug(slug) + populate_categories populate_tags - - if generate_excerpt? - data['excerpt'] ||= Jekyll::Excerpt.new(self) - end + generate_excerpt end # Add superdirectories of the special_dir to categories. @@ -440,5 +437,12 @@ def method_missing(method, *args, &blck) super end end + + private # :nodoc: + def generate_excerpt + if generate_excerpt? + data["excerpt"] ||= Jekyll::Excerpt.new(self) + end + end end end diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index 9ffff548e6f..6e0023de679 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -10,8 +10,12 @@ module Utils SLUGIFY_DEFAULT_REGEXP = Regexp.new('[^[:alnum:]]+').freeze SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze - def strip_heredoc(str) - str.gsub(/^[ \t]{#{(str.scan(/^[ \t]*(?=\S)/).min || "").size}}/, "") + # Takes a slug and turns it into a simple title. + + def titleize_slug(slug) + slug.split("-").map! do |val| + val.capitalize! + end.join(" ") end # Non-destructive version of deep_merge_hashes! See that method. From 805ab6b7f8c82466bd789723d312eae1456379c1 Mon Sep 17 00:00:00 2001 From: Brenton Horne Date: Wed, 20 Jan 2016 06:59:00 +1000 Subject: [PATCH 0327/4996] Adding commit/date indicators --- site/_docs/sites.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/site/_docs/sites.md b/site/_docs/sites.md index 7eb6559f600..1c509f3653d 100644 --- a/site/_docs/sites.md +++ b/site/_docs/sites.md @@ -9,17 +9,17 @@ with. Below are some Jekyll-powered blogs which were hand-picked for learning purposes. - [Tom Preston-Werner](http://tom.preston-werner.com/) - ([source](https://github.com/mojombo/mojombo.github.io)) + ([source](https://github.com/mojombo/mojombo.github.io)) (last commit [87f9f24](https://github.com/mojombo/mojombo.github.io/commit/87f9f24) at 20 June 2015) - [Nick Quaranto](http://quaran.to/) - ([source](https://github.com/qrush/qrush.github.com)) + ([source](https://github.com/qrush/qrush.github.com)) (last commit [c569be1](https://github.com/qrush/qrush.github.com/commit/c569be159c4c1075e8bf65b1995e43b262c86899) at 2 December 2014) - [GitHub Official Teaching Materials](http://training.github.com) - ([source](https://github.com/github/training.github.com/tree/7049d7532a6856411e34046aedfce43a4afaf424)) + ([source](https://github.com/github/training.github.com/tree/7049d7532a6856411e34046aedfce43a4afaf424)) (last commit [7049d75](https://github.com/github-archive/training.github.com/commit/7049d7532a6856411e34046aedfce43a4afaf424) at 20 December 2013) - [Rasmus Andersson](http://rsms.me/) - ([source](https://github.com/rsms/rsms.github.com)) + ([source](https://github.com/rsms/rsms.github.com)) (last commit [30e0555](https://github.com/rsms/rsms.github.com/commit/30e0555d3f22af951839e308c68ee548f6c03492) at 1 December 2015) - [Scott Chacon](http://schacon.github.com) - ([source](https://github.com/schacon/schacon.github.com)) + ([source](https://github.com/schacon/schacon.github.com)) (last commit [e7396ba](https://github.com/schacon/schacon.github.com/commit/e7396ba8eb964634c24a417c8b86c5c9a251a9fd) at 2 April 2011) - [Leonard Lamprecht](http://leo.im) - ([source](https://github.com/leo/leo.github.io)) + ([source](https://github.com/leo/leo.github.io)) (frequently updated) If you would like to explore more examples, you can find a list of sites and their sources on the ["Sites" page in the Jekyll wiki][jekyll-sites]. From 8507cda6ddfaf59fc25837df111b77a6651258fe Mon Sep 17 00:00:00 2001 From: Brenton Horne Date: Wed, 20 Jan 2016 07:22:54 +1000 Subject: [PATCH 0328/4996] Rm date indicators and >1 year inactive sites --- site/_docs/sites.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/site/_docs/sites.md b/site/_docs/sites.md index 1c509f3653d..f0b1a9b218e 100644 --- a/site/_docs/sites.md +++ b/site/_docs/sites.md @@ -9,17 +9,13 @@ with. Below are some Jekyll-powered blogs which were hand-picked for learning purposes. - [Tom Preston-Werner](http://tom.preston-werner.com/) - ([source](https://github.com/mojombo/mojombo.github.io)) (last commit [87f9f24](https://github.com/mojombo/mojombo.github.io/commit/87f9f24) at 20 June 2015) -- [Nick Quaranto](http://quaran.to/) - ([source](https://github.com/qrush/qrush.github.com)) (last commit [c569be1](https://github.com/qrush/qrush.github.com/commit/c569be159c4c1075e8bf65b1995e43b262c86899) at 2 December 2014) + ([source](https://github.com/mojombo/mojombo.github.io)) - [GitHub Official Teaching Materials](http://training.github.com) - ([source](https://github.com/github/training.github.com/tree/7049d7532a6856411e34046aedfce43a4afaf424)) (last commit [7049d75](https://github.com/github-archive/training.github.com/commit/7049d7532a6856411e34046aedfce43a4afaf424) at 20 December 2013) + ([source](https://github.com/github/training-kit)) - [Rasmus Andersson](http://rsms.me/) - ([source](https://github.com/rsms/rsms.github.com)) (last commit [30e0555](https://github.com/rsms/rsms.github.com/commit/30e0555d3f22af951839e308c68ee548f6c03492) at 1 December 2015) -- [Scott Chacon](http://schacon.github.com) - ([source](https://github.com/schacon/schacon.github.com)) (last commit [e7396ba](https://github.com/schacon/schacon.github.com/commit/e7396ba8eb964634c24a417c8b86c5c9a251a9fd) at 2 April 2011) + ([source](https://github.com/rsms/rsms.github.com)) - [Leonard Lamprecht](http://leo.im) - ([source](https://github.com/leo/leo.github.io)) (frequently updated) + ([source](https://github.com/leo/leo.github.io)) If you would like to explore more examples, you can find a list of sites and their sources on the ["Sites" page in the Jekyll wiki][jekyll-sites]. From 090cf5a50b0d99d2faf4346f6a1ea81e046f558b Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Tue, 19 Jan 2016 23:12:59 -0800 Subject: [PATCH 0329/4996] Disable auto-regeneration when running server detached --- lib/jekyll/commands/build.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb index d505e2fb3ff..baa4e88a767 100644 --- a/lib/jekyll/commands/build.rb +++ b/lib/jekyll/commands/build.rb @@ -33,7 +33,9 @@ def process(options) build(site, options) end - if options.fetch('watch', false) + if options.fetch('detach', false) + Jekyll.logger.info "Auto-regeneration:", "disabled when running server detached." + elsif options.fetch('watch', false) watch(site, options) else Jekyll.logger.info "Auto-regeneration:", "disabled. Use --watch to enable." From f44a9cf401f2499cc990f6fb067e64dda61aa896 Mon Sep 17 00:00:00 2001 From: Liam Bowers Date: Wed, 20 Jan 2016 12:25:29 +0000 Subject: [PATCH 0330/4996] Added the Wordpress2Jekyll Wordpress plugin --- site/_docs/plugins.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index 067fb6e7b26..a711fd4457b 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -887,6 +887,7 @@ LESS.js files during generation. - [vim-jekyll](https://github.com/parkr/vim-jekyll): A vim plugin to generate new posts and run `jekyll build` all without leaving vim. - [markdown-writer](https://atom.io/packages/markdown-writer): An Atom package for Jekyll. It can create new posts/drafts, manage tags/categories, insert link/images and add many useful key mappings. +- [Wordpress2Jekyll](https://wordpress.org/plugins/wp2jekyll/): A Wordpress plugin that allows you to use Wordpress as your editor and (automatically) export content in to Jekyll. WordPress2Jekyll attempts to marry these two systems together in order to make a site that can be easily managed from all devices.
    Jekyll Plugins Wanted
    From 37e11016902b58b1b92466a7b5c841c49f1ff753 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Wed, 20 Jan 2016 07:04:22 -0600 Subject: [PATCH 0331/4996] Re-add Gem version after accidental removal. --- README.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.markdown b/README.markdown index 577e774c347..4401ed30c6a 100644 --- a/README.markdown +++ b/README.markdown @@ -1,11 +1,13 @@ # [Jekyll](http://jekyllrb.com/) +[![Gem Version](https://img.shields.io/gem/v/jekyll.svg)][ruby-gems] [![Build Status](https://travis-ci.org/jekyll/jekyll.svg?branch=master)][travis] [![Test Coverage](https://codeclimate.com/github/jekyll/jekyll/badges/coverage.svg)][coverage] [![Code Climate](https://codeclimate.com/github/jekyll/jekyll/badges/gpa.svg)][codeclimate] [![Dependency Status](https://gemnasium.com/jekyll/jekyll.svg)][gemnasium] [![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)][hakiri] +[ruby-gems]: https://rubygems.org/gems/jekyll [gemnasium]: https://gemnasium.com/jekyll/jekyll [codeclimate]: https://codeclimate.com/github/jekyll/jekyll [coverage]: https://codeclimate.com/github/jekyll/jekyll/coverage From 61acafe97a1189f30f8a75c0c92bdedea96757ba Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Wed, 20 Jan 2016 07:24:16 -0600 Subject: [PATCH 0332/4996] Move ByeBug to development and disallow for JRuby. --- Gemfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 9e4796e60ee..091a7564d84 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,10 @@ group :development do gem "launchy", "~> 2.3" gem "rubocop", :branch => :master, :github => "bbatsov/rubocop" gem "pry" + + UNLESS RUBY_ENGINE == "jruby" + gem "byebug" + end end # @@ -18,7 +22,6 @@ group :test do gem "rspec-mocks" gem "nokogiri" gem "rspec" - gem "byebug" end # From e50d4d6b6e1acedabedf0dfe5d34410630856193 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Wed, 20 Jan 2016 07:30:07 -0600 Subject: [PATCH 0333/4996] Fix bad UNLESS. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 091a7564d84..4e4189d2722 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ group :development do gem "rubocop", :branch => :master, :github => "bbatsov/rubocop" gem "pry" - UNLESS RUBY_ENGINE == "jruby" + unless RUBY_ENGINE == "jruby" gem "byebug" end end From af20abf1bced9bd6af40e6cd1b72d4de2a19758a Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 20 Jan 2016 11:06:31 -0800 Subject: [PATCH 0334/4996] Update history to reflect merge of #4377 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 5bd8a10e186..729d80b9ea1 100644 --- a/History.markdown +++ b/History.markdown @@ -86,6 +86,7 @@ * Fixed broken link to blog on using mathjax with jekyll (#4344) * Documentation: correct reference in Precedence section of Configuration docs (#4355) * Add @jmcglone's guide to github-pages doc page (#4364) + * Added the Wordpress2Jekyll Wordpress plugin (#4377) ## 3.0.1 / 2015-11-17 From f1ac1f21252ae7a2da405c0eb365b09fbc07086e Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 20 Jan 2016 11:07:34 -0800 Subject: [PATCH 0335/4996] Update history to reflect merge of #4376 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 729d80b9ea1..f3f6b1ba21a 100644 --- a/History.markdown +++ b/History.markdown @@ -39,6 +39,7 @@ * Allow custom file extensions if defined in `permalink` YAML front matter (#4314) * Fix deep_merge_hashes! handling of drops and hashes (#4359) * Page should respect output extension of its permalink (#4373) + * Disable auto-regeneration when running server detached (#4376) ### Development Fixes From ec0eff3315b5694be512d82bb494efd888370288 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Wed, 20 Jan 2016 13:30:49 -0600 Subject: [PATCH 0336/4996] Switch to pry-byebug so everybody gets the benefit. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 4e4189d2722..f63529e885a 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ group :development do gem "pry" unless RUBY_ENGINE == "jruby" - gem "byebug" + gem "pry-byebug" end end From 1ba23c32c69ad70721615e5b5cb82aef34606534 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 20 Jan 2016 11:46:18 -0800 Subject: [PATCH 0337/4996] add Utils.strip_heredoc --- lib/jekyll/utils.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index 6e0023de679..6dd2b117f94 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -10,6 +10,12 @@ module Utils SLUGIFY_DEFAULT_REGEXP = Regexp.new('[^[:alnum:]]+').freeze SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze + # Takes an indented string and removes the preceding spaces on each line + + def strip_heredoc(str) + str.gsub(/^[ \t]{#{(str.scan(/^[ \t]*(?=\S)/).min || "").size}}/, "") + end + # Takes a slug and turns it into a simple title. def titleize_slug(slug) From a72629908ae5c0886c4c1962df8ed0d1324f4868 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 20 Jan 2016 12:23:48 -0800 Subject: [PATCH 0338/4996] Document: throw a useful error when an invalid date is given --- features/post_data.feature | 14 ++++++++++++++ lib/jekyll/document.rb | 23 ++++++++++++++--------- lib/jekyll/site.rb | 2 +- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/features/post_data.feature b/features/post_data.feature index 3b4f3cf7ead..3692c382f53 100644 --- a/features/post_data.feature +++ b/features/post_data.feature @@ -39,6 +39,20 @@ Feature: Post data And the _site directory should exist And I should see "Post date: 27 Mar 2009" in "_site/2009/03/27/star-wars.html" + Scenario: Use post.date variable with invalid + Given I have a _posts directory + And I have a "_posts/2016-01-01-test.md" page with date "tuesday" that contains "I have a bad date." + When I run jekyll build + Then the _site directory should not exist + And I should see "Document '_posts/2016-01-01-test.md' does not have a valid date in the YAML front matter." in the build output + + Scenario: Invalid date in filename + Given I have a _posts directory + And I have a "_posts/2016-22-01-test.md" page that contains "I have a bad date." + When I run jekyll build + Then the _site directory should not exist + And I should see "Document '_posts/2016-22-01-test.md' does not have a valid date in the filename." in the build output + Scenario: Use post.id variable Given I have a _posts directory And I have a _layouts directory diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 2911c4aa04b..8e0d3e86d31 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -50,7 +50,7 @@ def data # Merge some data in with this document's data. # # Returns the merged data. - def merge_data!(other) + def merge_data!(other, source: "YAML front matter") if other.key?('categories') && !other['categories'].nil? if other['categories'].is_a?(String) other['categories'] = other['categories'].split(" ").map(&:strip) @@ -61,7 +61,7 @@ def merge_data!(other) if data.key?('date') && !data['date'].is_a?(Time) data['date'] = Utils.parse_date( data['date'].to_s, - "Document '#{relative_path}' does not have a valid date in the YAML front matter." + "Document '#{relative_path}' does not have a valid date in the #{source}." ) end data @@ -267,20 +267,23 @@ def read(opts = {}) else begin defaults = @site.frontmatter_defaults.all(url, collection.label.to_sym) - merge_data!(defaults) unless defaults.empty? + merge_data!(defaults, source: "front matter defaults") unless defaults.empty? self.content = File.read(path, merged_file_read_opts(opts)) if content =~ YAML_FRONT_MATTER_REGEXP self.content = $POSTMATCH data_file = SafeYAML.load(Regexp.last_match(1)) - merge_data!(data_file) if data_file + merge_data!(data_file, source: "YAML front matter") if data_file end post_read rescue SyntaxError => e - puts "YAML Exception reading #{path}: #{e.message}" + Jekyll.logger.error "Error:", "YAML Exception reading #{path}: #{e.message}" rescue Exception => e - puts "Error reading file #{path}: #{e.message}" + if e.is_a? Jekyll::Errors::FatalException + raise e + end + Jekyll.logger.error "Error:", "could not read file #{path}: #{e.message}" end end end @@ -291,9 +294,11 @@ def post_read merge_data!({ "slug" => slug, "ext" => ext - }) - merge_data!({ "date" => date }) if data['date'].nil? || data['date'].to_i == site.time.to_i + }, source: "filename") data['title'] ||= slug.split('-').select(&:capitalize).join(' ') + if data['date'].nil? || data['date'].to_i == site.time.to_i + merge_data!({"date" => date}, source: "filename") + end end populate_categories populate_tags @@ -312,7 +317,7 @@ def categories_from_path(special_dir) superdirs = relative_path.sub(/#{special_dir}(.*)/, '').split(File::SEPARATOR).reject do |c| c.empty? || c.eql?(special_dir) || c.eql?(basename) end - merge_data!({ 'categories' => superdirs }) + merge_data!({ 'categories' => superdirs }, source: "file path") end def populate_categories diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index 15698b99d22..72d42ad90b9 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -225,7 +225,7 @@ def post_attr_hash(post_attr) # Build a hash map based on the specified post attribute ( post attr => # array of posts ) then sort each array in reverse order. hash = Hash.new { |h, key| h[key] = [] } - posts.docs.each { |p| p.data[post_attr].each { |t| hash[t] << p } } + posts.docs.each { |p| p.data[post_attr].each { |t| hash[t] << p } if p.data[post_attr] } hash.values.each { |posts| posts.sort!.reverse! } hash end From e9be8933de5590cae81c1f15fb3c9d22a86a66b5 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 20 Jan 2016 14:10:47 -0800 Subject: [PATCH 0339/4996] Release :gem: v3.0.2 --- History.markdown | 6 ++++++ site/_docs/history.md | 9 +++++++++ .../2016-01-20-jekyll-3-0-2-released.markdown | 19 +++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 site/_posts/2016-01-20-jekyll-3-0-2-released.markdown diff --git a/History.markdown b/History.markdown index f3f6b1ba21a..6bab0a71585 100644 --- a/History.markdown +++ b/History.markdown @@ -89,6 +89,12 @@ * Add @jmcglone's guide to github-pages doc page (#4364) * Added the Wordpress2Jekyll Wordpress plugin (#4377) +## 3.0.2 / 2016-01-20 + +### Bug Fixes + + * Document: throw a useful error when an invalid date is given (#4378) + ## 3.0.1 / 2015-11-17 ### Bug Fixes diff --git a/site/_docs/history.md b/site/_docs/history.md index a12653f2c1c..7d1ff85d0bf 100644 --- a/site/_docs/history.md +++ b/site/_docs/history.md @@ -4,6 +4,15 @@ title: History permalink: "/docs/history/" --- +## 3.0.2 / 2016-01-20 +{: #v3-0-2} + +### Bug Fixes +{: #bug-fixes-v3-0-2} + +- Document: throw a useful error when an invalid date is given ([#4378]({{ site.repository }}/issues/4378)) + + ## 3.0.1 / 2015-11-17 {: #v3-0-1} diff --git a/site/_posts/2016-01-20-jekyll-3-0-2-released.markdown b/site/_posts/2016-01-20-jekyll-3-0-2-released.markdown new file mode 100644 index 00000000000..88f8888f757 --- /dev/null +++ b/site/_posts/2016-01-20-jekyll-3-0-2-released.markdown @@ -0,0 +1,19 @@ +--- +layout: news_item +title: 'Jekyll 3.0.2 Released' +date: 2016-01-20 14:08:18 -0800 +author: parkr +version: 3.0.2 +categories: [release] +--- + +A crucial bug was found in v3.0.1 which caused invalid post dates to go +unnoticed in the build chain until the error that popped up was unhelpful. +v3.0.2 [throws errors as you'd expect](https://github.com/jekyll/jekyll/issues/4375) +when there is a post like `_posts/2016-22-01-future.md` or a post has an +invalid date like `date: "tuesday"` in their front matter. + +This should make the experience of working with Jekyll just a little +better. + +Happy Jekylling! From 31ae61b419fd422b7384ab006e66814b00532657 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 21 Jan 2016 18:20:35 -0800 Subject: [PATCH 0340/4996] Drop#[]: only use public_send for keys in the content_methods array --- features/post_data.feature | 12 ++++++++++++ lib/jekyll/drops/drop.rb | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/features/post_data.feature b/features/post_data.feature index 3692c382f53..79b92c2677a 100644 --- a/features/post_data.feature +++ b/features/post_data.feature @@ -301,6 +301,18 @@ Feature: Post data And the _site directory should exist And I should see "Post author: Darth Vader" in "_site/2009/03/27/star-wars.html" + Scenario: Use a variable which is a reserved keyword in Ruby + Given I have a _posts directory + And I have a _layouts directory + And I have the following post: + | title | date | layout | class | content | + | My post | 2016-01-21 | simple | kewl-post | Luke, I am your father. | + And I have a simple layout that contains "{{page.title}} has class {{page.class}}" + When I run jekyll build + Then I should get a zero exit status + And the _site directory should exist + And I should see "My post has class kewl-post" in "_site/2016/01/21/my-post.html" + Scenario: Previous and next posts title Given I have a _posts directory And I have a _layouts directory diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb index 35f0df26e81..9e3ac329b68 100644 --- a/lib/jekyll/drops/drop.rb +++ b/lib/jekyll/drops/drop.rb @@ -46,7 +46,7 @@ def initialize(obj) def [](key) if self.class.mutable? && @mutations.key?(key) @mutations[key] - elsif respond_to? key + elsif content_methods.include? key public_send key else fallback_data[key] From 4ecdf6ce108a91c593fa9d30115f2e3d63c70830 Mon Sep 17 00:00:00 2001 From: Zshawn Syed Date: Thu, 21 Jan 2016 23:44:30 -0600 Subject: [PATCH 0341/4996] Remove extra OR condition since a missing hash key will return a nil anyway. Added a test to catch this nil condition since it was missing to begin with. Reduced line length in test_page.rb --- lib/jekyll/page.rb | 3 +-- test/test_page.rb | 9 ++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb index fde456513d8..eda87f12346 100644 --- a/lib/jekyll/page.rb +++ b/lib/jekyll/page.rb @@ -63,8 +63,7 @@ def dir # # Returns the String permalink or nil if none has been set. def permalink - return nil if data.nil? || data['permalink'].nil? - data['permalink'] + data.nil? ? nil : data['permalink'] end # The template of the permalink. diff --git a/test/test_page.rb b/test/test_page.rb index 2728b4e3337..69794107c50 100644 --- a/test/test_page.rb +++ b/test/test_page.rb @@ -8,7 +8,9 @@ def setup_page(*args) end def do_render(page) - layouts = { "default" => Layout.new(@site, source_dir('_layouts'), "simple.html")} + layouts = { + "default" => Layout.new(@site, source_dir('_layouts'), "simple.html") + } page.render(layouts, @site.site_payload) end @@ -206,6 +208,11 @@ def do_render(page) assert_equal "/about/", @page.dir end + should "return nil permalink if no permalink exists" do + @page = setup_page('') + assert_equal nil, @page.permalink + end + should "not be writable outside of destination" do unexpected = File.expand_path("../../../baddie.html", dest_dir) File.delete unexpected if File.exist?(unexpected) From 442074fdb17ca64644118b9853e4b6dd1fcdf2c0 Mon Sep 17 00:00:00 2001 From: David Litvak Bruno Date: Fri, 22 Jan 2016 10:42:52 -0300 Subject: [PATCH 0342/4996] Add Contentful Extension to Plugins --- site/_docs/plugins.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index a711fd4457b..5f1ba786584 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -880,6 +880,7 @@ LESS.js files during generation. - [Jekyll views router](https://bitbucket.org/nyufac/jekyll-views-router): Simple router between generator plugins and templates. - [Jekyll Language Plugin](https://github.com/vwochnik/jekyll-language-plugin): Jekyll 3.0-compatible multi-language plugin for posts, pages and includes. - [Jekyll Deploy](https://github.com/vwochnik/jekyll-deploy): Adds a `deploy` sub-command to Jekyll. +- [Official Contentful Jekyll Plugin](https://github.com/contentful/jekyll-contentful-data-import): Adds a `contentful` sub-command to Jekyll to import data from Contentful. #### Editors From cf51e32d0eb8d8ba3ab7785391b8526a154b5cf3 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 22 Jan 2016 08:59:48 -0800 Subject: [PATCH 0343/4996] Drop#[]: use self.class.invokable? instead of content_methods.include? for speed --- lib/jekyll/drops/drop.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb index 9e3ac329b68..d1bffcc5abd 100644 --- a/lib/jekyll/drops/drop.rb +++ b/lib/jekyll/drops/drop.rb @@ -46,7 +46,7 @@ def initialize(obj) def [](key) if self.class.mutable? && @mutations.key?(key) @mutations[key] - elsif content_methods.include? key + elsif self.class.invokable? key public_send key else fallback_data[key] From 95df35134112b073c857481ca6bf32620f13d501 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 22 Jan 2016 09:01:21 -0800 Subject: [PATCH 0344/4996] Update history to reflect merge of #4390 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 6bab0a71585..909dccd5eba 100644 --- a/History.markdown +++ b/History.markdown @@ -88,6 +88,7 @@ * Documentation: correct reference in Precedence section of Configuration docs (#4355) * Add @jmcglone's guide to github-pages doc page (#4364) * Added the Wordpress2Jekyll Wordpress plugin (#4377) + * Add Contentful Extension to list of third-party plugins (#4390) ## 3.0.2 / 2016-01-20 From c0e01597833039472d3d0e9c6b6318aa94c9fe0b Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 22 Jan 2016 09:03:44 -0800 Subject: [PATCH 0345/4996] Update history to reflect merge of #4389 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 909dccd5eba..f5b43d3264a 100644 --- a/History.markdown +++ b/History.markdown @@ -20,6 +20,7 @@ * Shim subcommands with indication of gem possibly required so users know how to use them (#4254) * Add smartify Liquid filter for SmartyPants (#4323) * Raise error on empty permalink (#4361) + * Refactor Page#permalink method (#4389) ### Bug Fixes From 1298ba6908e9beaa30462ae0d6ba45e776c7e806 Mon Sep 17 00:00:00 2001 From: rebornix Date: Fri, 27 Nov 2015 13:40:30 +0800 Subject: [PATCH 0346/4996] Fix #4188: Extract title from filename successfully when dateless. --- features/collections.feature | 19 +++++++++++++++++-- lib/jekyll/document.rb | 5 ++++- .../_thanksgiving/2015-11-26-thanksgiving.md | 3 +++ test/source/_thanksgiving/black-friday.md | 3 +++ 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 test/source/_thanksgiving/2015-11-26-thanksgiving.md create mode 100644 test/source/_thanksgiving/black-friday.md diff --git a/features/collections.feature b/features/collections.feature index 888bd1c2ddc..90715b57cd0 100644 --- a/features/collections.feature +++ b/features/collections.feature @@ -155,5 +155,20 @@ Feature: Collections """ When I run jekyll build Then I should get a zero exit status - And the _site directory should exist - And I should see "Collections: Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, , Site#generate," in "_site/index.html" + Then the _site directory should exist + And I should see "Collections: Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, Site#generate, YAML with Dots," in "_site/index.html" + + Scenario: Rendered collection with date/dateless filename + Given I have an "index.html" page that contains "Collections: {% for method in site.thanksgiving %}{{ method.title }} {% endfor %}" + And I have fixture collections + And I have a "_config.yml" file with content: + """ + collections: + thanksgiving: + output: true + """ + When I run jekyll build + Then the _site directory should exist + And I should see "Thanksgiving Black Friday" in "_site/index.html" + And I should see "Happy Thanksgiving" in "_site/thanksgiving/2015-11-26-thanksgiving.html" + And I should see "Black Friday" in "_site/thanksgiving/black-friday.html" diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 8e0d3e86d31..b8c162a5371 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -8,7 +8,7 @@ class Document attr_accessor :content, :output YAML_FRONT_MATTER_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m - DATELESS_FILENAME_MATCHER = /^(.*)(\.[^.]+)$/ + DATELESS_FILENAME_MATCHER = /^(.+\/)*(.*)(\.[^.]+)$/ DATE_FILENAME_MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$/ # Create a new Document. @@ -299,6 +299,9 @@ def post_read if data['date'].nil? || data['date'].to_i == site.time.to_i merge_data!({"date" => date}, source: "filename") end + elsif DATELESS_FILENAME_MATCHER =~ relative_path + m, cats, slug, ext = *relative_path.match(DATELESS_FILENAME_MATCHER) + data['title'] ||= slug.split('-').select {|w| w.capitalize! || w }.join(' ') end populate_categories populate_tags diff --git a/test/source/_thanksgiving/2015-11-26-thanksgiving.md b/test/source/_thanksgiving/2015-11-26-thanksgiving.md new file mode 100644 index 00000000000..48d2dd58cba --- /dev/null +++ b/test/source/_thanksgiving/2015-11-26-thanksgiving.md @@ -0,0 +1,3 @@ +--- +--- +Happy {{ page.title }} ! diff --git a/test/source/_thanksgiving/black-friday.md b/test/source/_thanksgiving/black-friday.md new file mode 100644 index 00000000000..1d8ea1bbad4 --- /dev/null +++ b/test/source/_thanksgiving/black-friday.md @@ -0,0 +1,3 @@ +--- +--- +{{ page.title }} From 67f842546efa980146778c85fb613e6c9b53dcb4 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sat, 28 Nov 2015 01:22:24 -0600 Subject: [PATCH 0347/4996] Fix #4191: Reduce Document#post_read complexity slightly. --- lib/jekyll/document.rb | 34 +++++++++++++++++++--------------- lib/jekyll/utils.rb | 8 ++++++-- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index b8c162a5371..c6f3cb876d0 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -289,26 +289,23 @@ def read(opts = {}) end def post_read - if DATE_FILENAME_MATCHER =~ relative_path - _, _, date, slug, ext = *relative_path.match(DATE_FILENAME_MATCHER) - merge_data!({ - "slug" => slug, - "ext" => ext - }, source: "filename") - data['title'] ||= slug.split('-').select(&:capitalize).join(' ') - if data['date'].nil? || data['date'].to_i == site.time.to_i + if relative_path =~ DATE_FILENAME_MATCHER + _, date, slug, ext = $1, $2, $3, $4 + if !data['date'] || data['date'].to_i == site.time.to_i merge_data!({"date" => date}, source: "filename") end - elsif DATELESS_FILENAME_MATCHER =~ relative_path - m, cats, slug, ext = *relative_path.match(DATELESS_FILENAME_MATCHER) - data['title'] ||= slug.split('-').select {|w| w.capitalize! || w }.join(' ') + elsif relative_path =~ DATELESS_FILENAME_MATCHER + _, slug, ext = $1, $2, $3 end + + merge_data!({"slug" => slug, "ext" => ext}, source: "filename") + + # Try to ensure the user gets a title. + data["title"] ||= Utils.titleize_slug(slug) + populate_categories populate_tags - - if generate_excerpt? - data['excerpt'] ||= Jekyll::Excerpt.new(self) - end + generate_excerpt end # Add superdirectories of the special_dir to categories. @@ -445,5 +442,12 @@ def method_missing(method, *args, &blck) super end end + + private # :nodoc: + def generate_excerpt + if generate_excerpt? + data["excerpt"] ||= Jekyll::Excerpt.new(self) + end + end end end diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index 9ffff548e6f..6e0023de679 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -10,8 +10,12 @@ module Utils SLUGIFY_DEFAULT_REGEXP = Regexp.new('[^[:alnum:]]+').freeze SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze - def strip_heredoc(str) - str.gsub(/^[ \t]{#{(str.scan(/^[ \t]*(?=\S)/).min || "").size}}/, "") + # Takes a slug and turns it into a simple title. + + def titleize_slug(slug) + slug.split("-").map! do |val| + val.capitalize! + end.join(" ") end # Non-destructive version of deep_merge_hashes! See that method. From 8204e479c38f2c0fafbf504b8929c74190ee145f Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 20 Jan 2016 11:46:18 -0800 Subject: [PATCH 0348/4996] add Utils.strip_heredoc --- lib/jekyll/utils.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index 6e0023de679..6dd2b117f94 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -10,6 +10,12 @@ module Utils SLUGIFY_DEFAULT_REGEXP = Regexp.new('[^[:alnum:]]+').freeze SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze + # Takes an indented string and removes the preceding spaces on each line + + def strip_heredoc(str) + str.gsub(/^[ \t]{#{(str.scan(/^[ \t]*(?=\S)/).min || "").size}}/, "") + end + # Takes a slug and turns it into a simple title. def titleize_slug(slug) From ba1cfab73c785a4153bfda14c72c7f5ac4100428 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 22 Jan 2016 09:36:25 -0800 Subject: [PATCH 0349/4996] step_definitions: fixture collections should copy _thanksgiving --- features/step_definitions.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/features/step_definitions.rb b/features/step_definitions.rb index 2e47e369aab..f609076d9b4 100644 --- a/features/step_definitions.rb +++ b/features/step_definitions.rb @@ -125,6 +125,7 @@ Given %r{^I have fixture collections$} do FileUtils.cp_r Paths.source_dir.join("test", "source", "_methods"), source_dir + FileUtils.cp_r Paths.source_dir.join("test", "source", "_thanksgiving"), source_dir end # From 6c40c7f553fca8eddd5cc42f86b141d1245e2a89 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 22 Jan 2016 09:36:37 -0800 Subject: [PATCH 0350/4996] collections.feature: check for 0 exit status always --- features/collections.feature | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/features/collections.feature b/features/collections.feature index 90715b57cd0..ad17a896b99 100644 --- a/features/collections.feature +++ b/features/collections.feature @@ -168,7 +168,8 @@ Feature: Collections output: true """ When I run jekyll build - Then the _site directory should exist + Then I should get a zero exit status + And the _site directory should exist And I should see "Thanksgiving Black Friday" in "_site/index.html" And I should see "Happy Thanksgiving" in "_site/thanksgiving/2015-11-26-thanksgiving.html" And I should see "Black Friday" in "_site/thanksgiving/black-friday.html" From 5878acaaf1a0e0883364143abde32447b4f2f771 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 22 Jan 2016 09:36:55 -0800 Subject: [PATCH 0351/4996] Document#post_read: only overwrite slug & ext if they aren't set by YAML --- lib/jekyll/document.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index c6f3cb876d0..2840ba51078 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -290,18 +290,19 @@ def read(opts = {}) def post_read if relative_path =~ DATE_FILENAME_MATCHER - _, date, slug, ext = $1, $2, $3, $4 + date, slug, ext = $2, $3, $4 if !data['date'] || data['date'].to_i == site.time.to_i merge_data!({"date" => date}, source: "filename") end elsif relative_path =~ DATELESS_FILENAME_MATCHER - _, slug, ext = $1, $2, $3 + slug, ext = $2, $3 end - merge_data!({"slug" => slug, "ext" => ext}, source: "filename") - # Try to ensure the user gets a title. data["title"] ||= Utils.titleize_slug(slug) + # Only overwrite slug & ext if they aren't specified. + data['slug'] ||= slug + data['ext'] ||= ext populate_categories populate_tags From 2b8de5971725d4fb5404566f5d572cbe32ebf83a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 22 Jan 2016 09:38:34 -0800 Subject: [PATCH 0352/4996] remove merge conflict --- lib/jekyll/document.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 94def29b69d..2840ba51078 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -443,11 +443,7 @@ def method_missing(method, *args, &blck) super end end -<<<<<<< HEAD -======= - ->>>>>>> origin/pull/cleanup-document__post_read private # :nodoc: def generate_excerpt if generate_excerpt? From 6d67e9bdd4d5dda619109fd2175f4f9719424541 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 22 Jan 2016 13:01:05 -0800 Subject: [PATCH 0353/4996] Update history to reflect merge of #4388 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index f5b43d3264a..12834ca62aa 100644 --- a/History.markdown +++ b/History.markdown @@ -41,6 +41,7 @@ * Fix deep_merge_hashes! handling of drops and hashes (#4359) * Page should respect output extension of its permalink (#4373) * Disable auto-regeneration when running server detached (#4376) + * Drop#[]: only use public_send for keys in the content_methods array (#4388) ### Development Fixes From 4d138c9ab5a20eb762835e9fd1c580961434896d Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 22 Jan 2016 13:13:19 -0800 Subject: [PATCH 0354/4996] Update history to reflect merge of #4195 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 12834ca62aa..7f1c612d6b5 100644 --- a/History.markdown +++ b/History.markdown @@ -42,6 +42,7 @@ * Page should respect output extension of its permalink (#4373) * Disable auto-regeneration when running server detached (#4376) * Drop#[]: only use public_send for keys in the content_methods array (#4388) + * Extract title from filename successfully when no date. (#4195) ### Development Fixes From 4b827e1797844044c9077d16e258f2b5a4c6fc00 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 22 Jan 2016 13:15:41 -0800 Subject: [PATCH 0355/4996] Release :gem: 3.1.0.pre.rc3 --- lib/jekyll/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index 394cef78fec..ee1f0d383e3 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,3 +1,3 @@ module Jekyll - VERSION = '3.1.0.pre.rc2' + VERSION = '3.1.0.pre.rc3' end From 96b80b1a727a92cef0108684f263dc94aff817a1 Mon Sep 17 00:00:00 2001 From: John Perry Date: Sat, 23 Jan 2016 23:27:17 -0700 Subject: [PATCH 0356/4996] Minor spelling error --- site/_docs/plugins.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index 5f1ba786584..4bcdd545cbb 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -870,7 +870,7 @@ LESS.js files during generation. - [File compressor](https://gist.github.com/2758691) by [mytharcher](https://github.com/mytharcher): Compress HTML and JavaScript files on site build. - [Jekyll-minibundle](https://github.com/tkareine/jekyll-minibundle): Asset bundling and cache busting using external minification tool of your choice. No gem dependencies. - [Singlepage-jekyll](https://github.com/JCB-K/singlepage-jekyll) by [JCB-K](https://github.com/JCB-K): Turns Jekyll into a dynamic one-page website. -- [generator-jekyllrb](https://github.com/robwierzbowski/generator-jekyllrb): A generator that wraps Jekyll in [Yeoman](http://yeoman.io/), a tool collection and workflow for builing modern web apps. +- [generator-jekyllrb](https://github.com/robwierzbowski/generator-jekyllrb): A generator that wraps Jekyll in [Yeoman](http://yeoman.io/), a tool collection and workflow for building modern web apps. - [grunt-jekyll](https://github.com/dannygarcia/grunt-jekyll): A straightforward [Grunt](http://gruntjs.com/) plugin for Jekyll. - [jekyll-postfiles](https://github.com/indirect/jekyll-postfiles): Add `_postfiles` directory and {% raw %}`{{ postfile }}`{% endraw %} tag so the files a post refers to will always be right there inside your repo. - [A layout that compresses HTML](http://jch.penibelst.de/): GitHub Pages compatible, configurable way to compress HTML files on site build. From ab8f2d6bb1cd582aaeb17d073f96b43ef7c60268 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 24 Jan 2016 08:40:31 -0600 Subject: [PATCH 0357/4996] Update History.markdown to reflect the merger of #4394 --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 7f1c612d6b5..749b03224c4 100644 --- a/History.markdown +++ b/History.markdown @@ -92,6 +92,7 @@ * Add @jmcglone's guide to github-pages doc page (#4364) * Added the Wordpress2Jekyll Wordpress plugin (#4377) * Add Contentful Extension to list of third-party plugins (#4390) + * Correct Minor spelling error (#4394) ## 3.0.2 / 2016-01-20 From c5818d18374b0b34d26a36013b964a5c64603ff5 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sun, 24 Jan 2016 09:50:02 -0600 Subject: [PATCH 0358/4996] Make our .travis.yml a little easier to maintain. --- .travis.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29b0a836f47..5c6e585511d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,31 @@ -bundler_args: --without benchmark:site:development before_script: bundle update +bundler_args: --without benchmark:site:development script: script/cibuild cache: bundler language: ruby sudo: false rvm: -- 2.0.0-p648 -- 2.1.8 -- 2.2.4 -- 2.3.0 -- jruby-9.0.4.0 -- ruby-head + - &ruby1 2.3.0 + - &ruby2 2.2.4 + - &ruby3 2.1.8 + - &ruby4 2.0.0-p648 + - &jruby jruby-9.0.4.0 + - &rhead ruby-head matrix: fast_finish: true allow_failures: - - rvm: jruby-9.0.4.0 - - rvm: ruby-head + - rvm: *jruby + - rvm: *rhead env: matrix: - - TEST_SUITE=test - - TEST_SUITE=cucumber + - TEST_SUITE=test + - TEST_SUITE=cucumber branches: only: - - master + - master notifications: irc: From 368f5b67a9a8947549b7e31a954d643018d536ce Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 24 Jan 2016 13:13:15 -0800 Subject: [PATCH 0359/4996] Release :gem: 3.1.0 --- History.markdown | 2 +- lib/jekyll/version.rb | 2 +- site/_docs/history.md | 101 ++++++++++++++++++ .../2016-01-23-jekyll-3-1-0-released.markdown | 50 +++++++++ site/latest_version.txt | 2 +- 5 files changed, 154 insertions(+), 3 deletions(-) create mode 100644 site/_posts/2016-01-23-jekyll-3-1-0-released.markdown diff --git a/History.markdown b/History.markdown index 7f1c612d6b5..d03724b4b6c 100644 --- a/History.markdown +++ b/History.markdown @@ -1,4 +1,4 @@ -## HEAD +## 3.1.0 / 2016-01-23 ### Minor Enhancements diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index ee1f0d383e3..b20df48404b 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,3 +1,3 @@ module Jekyll - VERSION = '3.1.0.pre.rc3' + VERSION = '3.1.0' end diff --git a/site/_docs/history.md b/site/_docs/history.md index 7d1ff85d0bf..b05b18b0529 100644 --- a/site/_docs/history.md +++ b/site/_docs/history.md @@ -4,6 +4,107 @@ title: History permalink: "/docs/history/" --- +## 3.1.0 / 2016-01-23 +{: #v3-1-0} + +### Minor Enhancements +{: #minor-enhancements-v3-1-0} + +- Use `Liquid::Drop`s instead of `Hash`es in `#to_liquid` ([#4277]({{ site.repository }}/issues/4277)) +- Add 'sample' Liquid filter Equivalent to Array#sample functionality ([#4223]({{ site.repository }}/issues/4223)) +- Cache parsed include file to save liquid parsing time. ([#4120]({{ site.repository }}/issues/4120)) +- Slightly speed up url sanitization and handle multiples of ///. ([#4168]({{ site.repository }}/issues/4168)) +- Print debug message when a document is skipped from reading ([#4180]({{ site.repository }}/issues/4180)) +- Include tag should accept multiple variables in the include name ([#4183]({{ site.repository }}/issues/4183)) +- Add `-o` option to serve command which opens server URL ([#4144]({{ site.repository }}/issues/4144)) +- Add CodeClimate platform for better code quality. ([#4220]({{ site.repository }}/issues/4220)) +- General improvements for WEBrick via jekyll serve such as SSL & custom headers ([#4224]({{ site.repository }}/issues/4224), [#4228]({{ site.repository }}/issues/4228)) +- Add a default charset to content-type on webrick. ([#4231]({{ site.repository }}/issues/4231)) +- Switch `PluginManager` to use `require_with_graceful_fail` for better UX ([#4233]({{ site.repository }}/issues/4233)) +- Allow quoted date in front matter defaults ([#4184]({{ site.repository }}/issues/4184)) +- Add a Jekyll doctor warning for URLs that only differ by case ([#3171]({{ site.repository }}/issues/3171)) +- drops: create one base Drop class which can be set as mutable or not ([#4285]({{ site.repository }}/issues/4285)) +- drops: provide `#to_h` to allow for hash introspection ([#4281]({{ site.repository }}/issues/4281)) +- Shim subcommands with indication of gem possibly required so users know how to use them ([#4254]({{ site.repository }}/issues/4254)) +- Add smartify Liquid filter for SmartyPants ([#4323]({{ site.repository }}/issues/4323)) +- Raise error on empty permalink ([#4361]({{ site.repository }}/issues/4361)) +- Refactor Page#permalink method ([#4389]({{ site.repository }}/issues/4389)) + +### Bug Fixes +{: #bug-fixes-v3-1-0} + +- Pass build options into `clean` command ([#4177]({{ site.repository }}/issues/4177)) +- Allow users to use .htm and .xhtml (XHTML5.) ([#4160]({{ site.repository }}/issues/4160)) +- Prevent Shell Injection. ([#4200]({{ site.repository }}/issues/4200)) +- 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)) +- 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)) +- Drop: fix hash setter precendence ([#4312]({{ site.repository }}/issues/4312)) +- utils: `has_yaml_header?` should accept files with extraneous spaces ([#4290]({{ site.repository }}/issues/4290)) +- Escape html from site.title and page.title in site template ([#4307]({{ site.repository }}/issues/4307)) +- Allow custom file extensions if defined in `permalink` YAML front matter ([#4314]({{ site.repository }}/issues/4314)) +- Fix deep_merge_hashes! handling of drops and hashes ([#4359]({{ site.repository }}/issues/4359)) +- Page should respect output extension of its permalink ([#4373]({{ site.repository }}/issues/4373)) +- Disable auto-regeneration when running server detached ([#4376]({{ site.repository }}/issues/4376)) +- Drop#[]: only use public_send for keys in the content_methods array ([#4388]({{ site.repository }}/issues/4388)) +- Extract title from filename successfully when no date. ([#4195]({{ site.repository }}/issues/4195)) + +### Development Fixes +{: #development-fixes-v3-1-0} + +- `jekyll-docs` should be easily release-able ([#4152]({{ site.repository }}/issues/4152)) +- Allow use of Cucumber 2.1 or greater ([#4181]({{ site.repository }}/issues/4181)) +- Modernize Kramdown for Markdown converter. ([#4109]({{ site.repository }}/issues/4109)) +- Change TestDoctorCommand to JekyllUnitTest... ([#4263]({{ site.repository }}/issues/4263)) +- Create namespaced rake tasks in separate `.rake` files under `lib/tasks` ([#4282]({{ site.repository }}/issues/4282)) +- markdown: refactor for greater readability & efficiency ([#3771]({{ site.repository }}/issues/3771)) +- Fix many Rubocop style errors ([#4301]({{ site.repository }}/issues/4301)) +- Fix spelling of "GitHub" in docs and history ([#4322]({{ site.repository }}/issues/4322)) +- Reorganize and cleanup the Gemfile, shorten required depends. ([#4318]({{ site.repository }}/issues/4318)) +- Remove script/rebund. ([#4341]({{ site.repository }}/issues/4341)) +- Implement codeclimate platform ([#4340]({{ site.repository }}/issues/4340)) +- Remove ObectSpace dumping and start using inherited, it's faster. ([#4342]({{ site.repository }}/issues/4342)) +- Add script/travis so all people can play with Travis-CI images. ([#4338]({{ site.repository }}/issues/4338)) +- Move Cucumber to using RSpec-Expections and furthering JRuby support. ([#4343]({{ site.repository }}/issues/4343)) +- Rearrange Cucumber and add some flair. ([#4347]({{ site.repository }}/issues/4347)) +- Remove old FIXME ([#4349]({{ site.repository }}/issues/4349)) +- Clean up the Gemfile (and keep all the necessary dependencies) ([#4350]({{ site.repository }}/issues/4350)) + +### Site Enhancements +{: #site-enhancements-v3-1-0} + +- Add three plugins to directory ([#4163]({{ site.repository }}/issues/4163)) +- Add upgrading docs from 2.x to 3.x ([#4157]({{ site.repository }}/issues/4157)) +- Add `protect_email` to the plugins index. ([#4169]({{ site.repository }}/issues/4169)) +- Add `jekyll-deploy` to list of third-party plugins ([#4179]({{ site.repository }}/issues/4179)) +- Clarify plugin docs ([#4154]({{ site.repository }}/issues/4154)) +- Add Kickster to deployment methods in documentation ([#4190]({{ site.repository }}/issues/4190)) +- Add DavidBurela's tutorial for Windows to Windows docs page ([#4210]({{ site.repository }}/issues/4210)) +- Change GitHub code block to highlight tag to avoid it overlaps parent div ([#4121]({{ site.repository }}/issues/4121)) +- Update FormKeep link to be something more specific to Jekyll ([#4243]({{ site.repository }}/issues/4243)) +- Remove example Roger Chapman site, as the domain doesn't exist ([#4249]({{ site.repository }}/issues/4249)) +- Added configuration options for `draft_posts` to configuration docs ([#4251]({{ site.repository }}/issues/4251)) +- Fix checklist in `_assets.md` ([#4259]({{ site.repository }}/issues/4259)) +- Add Markdown examples to Pages docs ([#4275]({{ site.repository }}/issues/4275)) +- Add jekyll-paginate-category to list of third-party plugins ([#4273]({{ site.repository }}/issues/4273)) +- Add `jekyll-responsive_image` to list of third-party plugins ([#4286]({{ site.repository }}/issues/4286)) +- Add `jekyll-commonmark` to list of third-party plugins ([#4299]({{ site.repository }}/issues/4299)) +- Add documentation for incremental regeneration ([#4293]({{ site.repository }}/issues/4293)) +- Add note about removal of relative permalink support in upgrading docs ([#4303]({{ site.repository }}/issues/4303)) +- Add Pro Tip to use front matter variable to create clean URLs ([#4296]({{ site.repository }}/issues/4296)) +- Fix grammar in the documentation for posts. ([#4330]({{ site.repository }}/issues/4330)) +- 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)) +- Added the Wordpress2Jekyll Wordpress plugin ([#4377]({{ site.repository }}/issues/4377)) +- Add Contentful Extension to list of third-party plugins ([#4390]({{ site.repository }}/issues/4390)) + + ## 3.0.2 / 2016-01-20 {: #v3-0-2} diff --git a/site/_posts/2016-01-23-jekyll-3-1-0-released.markdown b/site/_posts/2016-01-23-jekyll-3-1-0-released.markdown new file mode 100644 index 00000000000..4acec55cb4d --- /dev/null +++ b/site/_posts/2016-01-23-jekyll-3-1-0-released.markdown @@ -0,0 +1,50 @@ +--- +layout: news_item +title: 'Jekyll 3.1.0 Released' +date: 2016-01-23 17:32:12 -0800 +author: parkr +version: 3.1.0 +categories: [release] +--- + +Happy weekend! To make your weekend all the better, we have just released +v3.1.0 of Jekyll. + +There are _lots_ of great performance improvements, including a huge one +which is to use Liquid drops instead of hashes. Much of the slowness in +Jekyll is due to Jekyll making lots of objects it doesn't need to make. +By making these objects only as they're needed, we can speed up Jekyll +considerably! + +Some other highlights: + +* Fix: `permalink`s with non-HTML extensions will not be honored +* Fix: `jekyll clean` now accepts build flags like `--source`. +* Enhancement: `include` tags can now accept multiple liquid variables +* Feature: adds new `sample` liquid tag which gets random element from an array +* Fix: Jekyll will read in files with YAML front matter that has extraneous +spaces after the first line +* Enhancement: extract the `title` attribute from the filename for +collection items without a date +* Fix: gracefully handle empty configuration files + +... and [a whole bunch more](/docs/history/#v3-1-0)! + +Please [file a bug]({{ site.repository }}/issues/new?title=Jekyll+3.1.0+Issue:) +if you encounter any issues! As always, [Jekyll Talk](https://talk.jekyllrb.com) +is the best place to get help if you're encountering a problem. + +Special thanks to all our amazing contributors who helped make v3.1.0 a +possibility: + +Alex J Best, Alexander Köplinger, Alfred Xing, Alistair Calder, Atul +Bhosale, Ben Orenstein, Chi Trung Nguyen, Conor O'Callaghan, Craig P. +Motlin, Dan K, David Burela, David Litvak Bruno, Decider UI, Ducksan Cho, +Florian Thomas, James Wen, Jordon Bedwell, Joseph Wynn, Kakoma, Liam +Bowers, Mike Neumegen, Nick Quaranto, Nielsen Ramon, Olivér Falvai, Pat +Hawks, Paul Robert Lloyd, Pedro Euko, Peter Suschlik, Sam Volin, Samuel +Wright, Sasha Friedenberg, Tim Cuthbertson, Vincent Wochnik, William +Entriken, Zshawn Syed, chrisfinazzo, ducksan cho, leethomas, +midnightSuyama, musoke, and rebornix + +Happy Jekylling! diff --git a/site/latest_version.txt b/site/latest_version.txt index cb2b00e4f7a..fd2a01863fd 100644 --- a/site/latest_version.txt +++ b/site/latest_version.txt @@ -1 +1 @@ -3.0.1 +3.1.0 From 778fa4cc0eab5df12de73927d89df4f09e48b2c2 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 24 Jan 2016 13:13:53 -0800 Subject: [PATCH 0360/4996] Release :gem: 3.1.0 From 29da9024ca339193cada226a8915e5e83fe9af25 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 24 Jan 2016 13:17:38 -0800 Subject: [PATCH 0361/4996] Today, not yesterday. --- site/_docs/history.md | 1 + ...eased.markdown => 2016-01-24-jekyll-3-1-0-released.markdown} | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) rename site/_posts/{2016-01-23-jekyll-3-1-0-released.markdown => 2016-01-24-jekyll-3-1-0-released.markdown} (98%) diff --git a/site/_docs/history.md b/site/_docs/history.md index b05b18b0529..e93521e7736 100644 --- a/site/_docs/history.md +++ b/site/_docs/history.md @@ -103,6 +103,7 @@ permalink: "/docs/history/" - Add [@jmcglone](https://github.com/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)) ## 3.0.2 / 2016-01-20 diff --git a/site/_posts/2016-01-23-jekyll-3-1-0-released.markdown b/site/_posts/2016-01-24-jekyll-3-1-0-released.markdown similarity index 98% rename from site/_posts/2016-01-23-jekyll-3-1-0-released.markdown rename to site/_posts/2016-01-24-jekyll-3-1-0-released.markdown index 4acec55cb4d..42768b9fe3e 100644 --- a/site/_posts/2016-01-23-jekyll-3-1-0-released.markdown +++ b/site/_posts/2016-01-24-jekyll-3-1-0-released.markdown @@ -1,7 +1,7 @@ --- layout: news_item title: 'Jekyll 3.1.0 Released' -date: 2016-01-23 17:32:12 -0800 +date: 2016-01-24 13:16:12 -0800 author: parkr version: 3.1.0 categories: [release] From e940dd1be42a58da0bf383be03fe80b8aeee927f Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 25 Jan 2016 14:09:22 -0800 Subject: [PATCH 0362/4996] Site: make github-pages project page url structure refer to site.github.url --- site/_docs/github-pages.md | 48 +++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/site/_docs/github-pages.md b/site/_docs/github-pages.md index 03d83b35bf2..add661c39e4 100644 --- a/site/_docs/github-pages.md +++ b/site/_docs/github-pages.md @@ -15,6 +15,26 @@ Jonathan McGlone to get you up and running](http://jmcglone.com/guides/github-pa This guide will teach you what you need to know about Git, GitHub, and Jekyll to create your very own website on GitHub Pages. +### 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 URL's. + +{% highlight html %} +{% raw %} + + + +{{ page.title }} +{% endraw %} +{% endhighlight %} + +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 +will resolve properly. + ## Deploying Jekyll to GitHub Pages GitHub Pages work by looking at certain branches of repositories on GitHub. @@ -101,38 +121,12 @@ GitHub Pages
    GitHub Pages Documentation, Help, and Support

    For more information about what you can do with GitHub Pages, as well as for troubleshooting guides, you should check out GitHub’s Pages Help + href="https://help.github.com/categories/github-pages-basics/">GitHub’s Pages Help section. If all else fails, you should contact GitHub Support.

    From d7ff4234f0f311979225bb718a73e5c2aa84f8d6 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 25 Jan 2016 14:48:28 -0800 Subject: [PATCH 0363/4996] Renderer#output_ext: honor folders when looking for ext Previously, even if the document permalink was a folder, it would look for an extension on that. For example, if I have: permalink: "/new-version-jekyll-v3.0.0/" the output_ext would be ".0". Now, the output_ext honors the trailing slash and will report based on the converters instead. --- lib/jekyll/renderer.rb | 2 +- .../_with.dots/permalink.with.slash.tho.md | 5 +++ test/test_collections.rb | 2 +- test/test_document.rb | 35 +++++++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 test/source/_with.dots/permalink.with.slash.tho.md diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb index c7b6042b538..09815a600f8 100644 --- a/lib/jekyll/renderer.rb +++ b/lib/jekyll/renderer.rb @@ -168,7 +168,7 @@ def place_in_layouts(content, payload, info) private def permalink_ext - if document.permalink + if document.permalink && !document.permalink.end_with?("/") permalink_ext = File.extname(document.permalink) permalink_ext unless permalink_ext.empty? end diff --git a/test/source/_with.dots/permalink.with.slash.tho.md b/test/source/_with.dots/permalink.with.slash.tho.md new file mode 100644 index 00000000000..71b9b2e44a5 --- /dev/null +++ b/test/source/_with.dots/permalink.with.slash.tho.md @@ -0,0 +1,5 @@ +--- +permalink: /with.dots/permalink.with.slash.tho/ +--- + +I'm a file with dots BUT I have a permalink which ends with a slash. diff --git a/test/test_collections.rb b/test/test_collections.rb index be3a932053c..138bed6bb6b 100644 --- a/test/test_collections.rb +++ b/test/test_collections.rb @@ -203,7 +203,7 @@ class TestCollections < JekyllUnitTest end should "contain one document" do - assert_equal 2, @collection.docs.size + assert_equal 3, @collection.docs.size end should "allow dots in the filename" do diff --git a/test/test_document.rb b/test/test_document.rb index 7c6f7bef6b8..1197c4da941 100644 --- a/test/test_document.rb +++ b/test/test_document.rb @@ -207,6 +207,10 @@ def assert_equal_value(key, one, other) should "produce the right destination file" do assert_equal @dest_file, @document.destination(dest_dir) end + + should "honor the output extension of its permalink" do + assert_equal ".html", @document.output_ext + end end context "a document in a collection with pretty permalink style" do @@ -267,6 +271,10 @@ def assert_equal_value(key, one, other) @dest_file = dest_dir("slides/example-slide-7.php") end + should "be written out properly" do + assert_exist @dest_file + end + should "produce the permalink as the url" do assert_equal "/slides/example-slide-7.php", @document.url end @@ -274,6 +282,10 @@ def assert_equal_value(key, one, other) should "be written to the proper directory" do assert_equal @dest_file, @document.destination(dest_dir) end + + should "honor the output extension of its permalink" do + assert_equal ".php", @document.output_ext + end end context "documents in a collection with custom title permalinks" do @@ -318,6 +330,29 @@ def assert_equal_value(key, one, other) end end + context "document with a permalink with dots & a trailing slash" do + setup do + @site = fixture_site({"collections" => { + "with.dots" => { "output" => true } + }}) + @site.process + @document = @site.collections["with.dots"].docs.last + @dest_file = dest_dir("with.dots", "permalink.with.slash.tho", "index.html") + end + + should "yield an HTML document" do + assert_equal @dest_file, @document.destination(dest_dir) + end + + should "be written properly" do + assert_exist @dest_file + end + + should "get the right output_ext" do + assert_equal ".html", @document.output_ext + end + end + context "documents in a collection" do setup do @site = fixture_site({ From 74fb4aca1616fb8c907357505bcfbfd4072c0277 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 25 Jan 2016 15:49:23 -0800 Subject: [PATCH 0364/4996] Update history to reflect merge of #4401 [ci skip] --- History.markdown | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/History.markdown b/History.markdown index 28c16468c16..15cda096640 100644 --- a/History.markdown +++ b/History.markdown @@ -1,3 +1,9 @@ +## HEAD + +### Development Fixes + + * Renderer#output_ext: honor folders when looking for ext (#4401) + ## 3.1.0 / 2016-01-23 ### Minor Enhancements From ea5e3d56f544bee22b7f2bbfb6227c9892cb4981 Mon Sep 17 00:00:00 2001 From: David Celis Date: Mon, 25 Jan 2016 18:24:27 -0800 Subject: [PATCH 0365/4996] Update the Code of Conduct to the latest version The Contributor Code of Conduct is now at version 1.3.0 and has several changes. Many of these are simply wording changes, but an important note is added that project maintainers must maintain confidentiality when dealing with any code of conduct violations. Additionally, a note is added that states violations will be investigated and dealt with in a way that is deemed necessary and appropriate based on the circumstances. Signed-off-by: David Celis --- CONDUCT.md | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/CONDUCT.md b/CONDUCT.md index 65c05c57488..a0f06de773a 100644 --- a/CONDUCT.md +++ b/CONDUCT.md @@ -1,8 +1,14 @@ # Contributor Code of Conduct -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. +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. +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: @@ -10,13 +16,34 @@ Examples of unacceptable behavior by participants include: * 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. +* 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. 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. +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. -This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. +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. -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. -This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) \ No newline at end of file +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/ From ce77fe648874a8a0fa21d855bdfd6b369dc89155 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Tue, 26 Jan 2016 06:55:55 -0600 Subject: [PATCH 0366/4996] Update history.markdown to reflect the merger of #4402 --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 15cda096640..304bd7c877d 100644 --- a/History.markdown +++ b/History.markdown @@ -8,6 +8,7 @@ ### Minor Enhancements + * Update the Code of Conduct to the latest version (#4402) * Use `Liquid::Drop`s instead of `Hash`es in `#to_liquid` (#4277) * Add 'sample' Liquid filter Equivalent to Array#sample functionality (#4223) * Cache parsed include file to save liquid parsing time. (#4120) From 38b64faeb2823cbf0927193f28bf83673ba4cd93 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 26 Jan 2016 16:44:30 -0800 Subject: [PATCH 0367/4996] Page#dir: ensure it ends in a slash --- lib/jekyll/page.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb index eda87f12346..6bdfb6bc46e 100644 --- a/lib/jekyll/page.rb +++ b/lib/jekyll/page.rb @@ -55,7 +55,9 @@ def initialize(site, base, dir, name) # # Returns the String destination directory. def dir - url[-1, 1] == '/' ? url : File.dirname(url) + dest_dir = url[-1, 1] == '/' ? url : File.dirname(url) + dest_dir << '/' unless dest_dir.end_with?('/') + dest_dir end # The full path and filename of the post. Defined in the YAML of the post From aad54c9a8792ccf4b606cf0d2d4309ee902c65de Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 26 Jan 2016 17:08:54 -0800 Subject: [PATCH 0368/4996] Add Utils.merged_file_read_opts to unify reading & strip the BOM --- lib/jekyll/convertible.rb | 8 +------- lib/jekyll/document.rb | 12 +----------- lib/jekyll/utils.rb | 10 ++++++++++ test/test_utils.rb | 17 +++++++++++++++++ 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index 383bb024dc0..f58796f0be0 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -28,12 +28,6 @@ def published? !(data.key?('published') && data['published'] == false) end - # Returns merged option hash for File.read of self.site (if exists) - # and a given param - def merged_file_read_opts(opts) - (site ? site.file_read_opts : {}).merge(opts) - end - # Read the YAML frontmatter. # # base - The String path to the dir containing the file. @@ -46,7 +40,7 @@ def read_yaml(base, name, opts = {}) begin self.content = File.read(site.in_source_dir(base, name), - merged_file_read_opts(opts)) + Utils.merged_file_read_opts(site, opts)) if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m self.content = $POSTMATCH self.data = SafeYAML.load(Regexp.last_match(1)) diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 2840ba51078..fc3633d8e09 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -237,16 +237,6 @@ def write(dest) trigger_hooks(:post_write) end - # Returns merged option hash for File.read of self.site (if exists) - # and a given param - # - # opts - override options - # - # Return the file read options hash. - def merged_file_read_opts(opts) - site ? site.file_read_opts.merge(opts) : opts - end - # Whether the file is published or not, as indicated in YAML front-matter # # Returns true if the 'published' key is specified in the YAML front-matter and not `false`. @@ -269,7 +259,7 @@ def read(opts = {}) defaults = @site.frontmatter_defaults.all(url, collection.label.to_sym) merge_data!(defaults, source: "front matter defaults") unless defaults.empty? - self.content = File.read(path, merged_file_read_opts(opts)) + self.content = File.read(path, Utils.merged_file_read_opts(site, opts)) if content =~ YAML_FRONT_MATTER_REGEXP self.content = $POSTMATCH data_file = SafeYAML.load(Regexp.last_match(1)) diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index 6dd2b117f94..e5d45c6d5e6 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -273,5 +273,15 @@ def safe_glob(dir, patterns, flags = 0) end end + # Returns merged option hash for File.read of self.site (if exists) + # 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"].insert(0, "bom|") + end + merged + end + end end diff --git a/test/test_utils.rb b/test/test_utils.rb index d3720127098..a2335391dbe 100644 --- a/test/test_utils.rb +++ b/test/test_utils.rb @@ -276,4 +276,21 @@ class TestUtils < JekyllUnitTest refute Utils.has_yaml_header?(file) end end + + context "The \`Utils.merged_file_read_opts\` method" do + should "ignore encoding if it's not there" do + opts = Utils.merged_file_read_opts(nil, {}) + 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"] + 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"] + end + end end From b70ee10198d0d43187b8071e838194a6cb90cc28 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 27 Jan 2016 08:28:41 -0800 Subject: [PATCH 0369/4996] Add benchmarks for Page#dir --- benchmark/end-with-vs-regexp | 2 + benchmark/file-dir-ensure-trailing-slash | 54 ++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 benchmark/file-dir-ensure-trailing-slash diff --git a/benchmark/end-with-vs-regexp b/benchmark/end-with-vs-regexp index cb849f42267..76f0312b93b 100644 --- a/benchmark/end-with-vs-regexp +++ b/benchmark/end-with-vs-regexp @@ -4,10 +4,12 @@ Benchmark.ips do |x| path_without_ending_slash = '/some/very/very/long/path/to/a/file/i/like' x.report('no slash regexp') { path_without_ending_slash =~ /\/$/ } x.report('no slash end_with?') { path_without_ending_slash.end_with?("/") } + x.report('no slash [-1, 1]') { path_without_ending_slash[-1, 1] == "/" } end Benchmark.ips do |x| path_with_ending_slash = '/some/very/very/long/path/to/a/file/i/like/' x.report('slash regexp') { path_with_ending_slash =~ /\/$/ } x.report('slash end_with?') { path_with_ending_slash.end_with?("/") } + x.report('slash [-1, 1]') { path_with_ending_slash[-1, 1] == "/" } end diff --git a/benchmark/file-dir-ensure-trailing-slash b/benchmark/file-dir-ensure-trailing-slash new file mode 100644 index 00000000000..aecfc039519 --- /dev/null +++ b/benchmark/file-dir-ensure-trailing-slash @@ -0,0 +1,54 @@ +#!/usr/bin/env ruby +require 'benchmark/ips' + +# For this pull request, which changes Page#dir +# https://github.com/jekyll/jekyll/pull/4403 + +FORWARD_SLASH = '/'.freeze + +def pre_pr(url) + url[-1, 1] == FORWARD_SLASH ? url : File.dirname(url) +end + +def pr(url) + if url.end_with?(FORWARD_SLASH) + url + else + url_dir = File.dirname(url) + url_dir.end_with?(FORWARD_SLASH) ? url_dir : "#{url_dir}/" + end +end + +def envygeeks(url) + return url if url.end_with?(FORWARD_SLASH) || url == FORWARD_SLASH + + url = File.dirname(url) + url == FORWARD_SLASH ? url : "#{url}/" +end + +# Just a slash +Benchmark.ips do |x| + path = '/' + x.report("pre_pr:#{path}") { pre_pr(path) } + x.report("pr:#{path}") { pr(path) } + x.report("envygeeks:#{path}") { pr(path) } + x.compare! +end + +# No trailing slash +Benchmark.ips do |x| + path = '/some/very/very/long/path/to/a/file/i/like' + x.report("pre_pr:#{path}") { pre_pr(path) } + x.report("pr:#{path}") { pr(path) } + x.report("envygeeks:#{path}") { pr(path) } + x.compare! +end + +# No trailing slash +Benchmark.ips do |x| + path = '/some/very/very/long/path/to/a/file/i/like/' + x.report("pre_pr:#{path}") { pre_pr(path) } + x.report("pr:#{path}") { pr(path) } + x.report("envygeeks:#{path}") { pr(path) } + x.compare! +end From 9daebe8dd253156893829cec335a18f8a2849bbb Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 27 Jan 2016 08:28:47 -0800 Subject: [PATCH 0370/4996] Use improved Page#dir --- lib/jekyll/page.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb index 6bdfb6bc46e..6c402ee37d9 100644 --- a/lib/jekyll/page.rb +++ b/lib/jekyll/page.rb @@ -9,6 +9,8 @@ class Page alias_method :extname, :ext + FORWARD_SLASH = '/'.freeze + # Attributes for Liquid templates ATTRIBUTES_FOR_LIQUID = %w( content @@ -55,9 +57,12 @@ def initialize(site, base, dir, name) # # Returns the String destination directory. def dir - dest_dir = url[-1, 1] == '/' ? url : File.dirname(url) - dest_dir << '/' unless dest_dir.end_with?('/') - dest_dir + if url.end_with?(FORWARD_SLASH) + url + else + url_dir = File.dirname(url) + url_dir.end_with?(FORWARD_SLASH) ? url_dir : "#{url_dir}/" + end end # The full path and filename of the post. Defined in the YAML of the post From b1868983c778b3a056b87a35300fa6f95daf2c6e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 27 Jan 2016 08:44:59 -0800 Subject: [PATCH 0371/4996] Add test for Page#dir in :date/nil modes --- test/test_page.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/test/test_page.rb b/test/test_page.rb index 69794107c50..8930095db87 100644 --- a/test/test_page.rb +++ b/test/test_page.rb @@ -150,6 +150,12 @@ def do_render(page) assert_equal '/contacts.html', @page.url assert_equal @dest_file, @page.destination(dest_dir) end + + should "return dir correctly" do + assert_equal '/', setup_page('contacts.html').dir + assert_equal '/contacts/', setup_page('contacts/bar.html').dir + assert_equal '/contacts/', setup_page('contacts/index.html').dir + end end context "with custom permalink style with trailing slash" do @@ -194,8 +200,9 @@ def do_render(page) context "with any other permalink style" do should "return dir correctly" do @site.permalink_style = nil - @page = setup_page('contacts.html') - assert_equal '/', @page.dir + assert_equal '/', setup_page('contacts.html').dir + assert_equal '/contacts/', setup_page('contacts/index.html').dir + assert_equal '/contacts/', setup_page('contacts/bar.html').dir end end From e898b6e8bd8ae6a28bbf92b943f7ebb680c4ff3f Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 27 Jan 2016 11:01:26 -0800 Subject: [PATCH 0372/4996] Update history to reflect merge of #4403 [ci skip] --- History.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.markdown b/History.markdown index 304bd7c877d..8e1844b2b84 100644 --- a/History.markdown +++ b/History.markdown @@ -1,5 +1,9 @@ ## HEAD +### Bug Fixes + + * Page#dir: ensure it ends in a slash (#4403) + ### Development Fixes * Renderer#output_ext: honor folders when looking for ext (#4401) From 5fc48ffcb96f7880b036ea02e8794d975bd74082 Mon Sep 17 00:00:00 2001 From: Alfred Xing Date: Wed, 27 Jan 2016 13:41:40 -0800 Subject: [PATCH 0373/4996] Suppress stdout in liquid profiling test The test was spewing out some whitespace --- test/test_site.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/test_site.rb b/test/test_site.rb index e0883b49f90..c06c218e60c 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -465,6 +465,14 @@ def convert(*args) @site = Site.new(site_configuration('profile' => true)) end + # Suppress output while testing + setup do + $stdout = StringIO.new + end + teardown do + $stdout = STDOUT + end + should "print profile table" do expect(@site.liquid_renderer).to receive(:stats_table) @site.process From 6c4a1bf00ed3ec0fa9508b53b3e7cd19e5da6166 Mon Sep 17 00:00:00 2001 From: Michael Lee Date: Wed, 27 Jan 2016 22:22:12 -0500 Subject: [PATCH 0374/4996] Docs: Quickstart - added documentation about the `--force` option if directory is not empty --- site/_docs/quickstart.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/_docs/quickstart.md b/site/_docs/quickstart.md index d8ad5511943..8f5ffe8a96e 100644 --- a/site/_docs/quickstart.md +++ b/site/_docs/quickstart.md @@ -14,8 +14,8 @@ For the impatient, here's how to get a boilerplate Jekyll site up and running. # => Now browse to http://localhost:4000 {% endhighlight %} -If you wish to install jekyll into the current directory, you can do so by -alternatively running `jekyll new .` instead of a new directory name. +If you wish to install jekyll into an existing directory, you can do so by +alternatively running `jekyll new .` from within the directory instead of creating a new one. If the existing directory isn't empty, you'll also have to pass the `--force` option like so `jekyll new . --force`. That's nothing, though. The real magic happens when you start creating blog posts, using the front matter to control templates and layouts, and taking From 8592aed284cc13ed6d86165ef99be44edd91fbd7 Mon Sep 17 00:00:00 2001 From: chrisfinazzo Date: Thu, 28 Jan 2016 10:45:16 -0500 Subject: [PATCH 0375/4996] Small style fix --- site/_docs/assets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/assets.md b/site/_docs/assets.md index 66023147b87..10f094bd5bd 100644 --- a/site/_docs/assets.md +++ b/site/_docs/assets.md @@ -86,7 +86,7 @@ here, too. To enable Coffeescript in Jekyll 3.0 and up you must * Install the `jekyll-coffeescript` gem -* Ensure that your `_config.yml` is up-to-date and includes the following +* Ensure that your `_config.yml` is up-to-date and includes the following: {% highlight yaml %} gems: From 5d126350d68810fe738529f55558642f6e95a37d Mon Sep 17 00:00:00 2001 From: Kroum Tzanev Date: Thu, 28 Jan 2016 22:20:40 +0100 Subject: [PATCH 0376/4996] Correct indent in yaml preamble --- site/_docs/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md index f4327d3597c..4e78ab7ad9c 100644 --- a/site/_docs/configuration.md +++ b/site/_docs/configuration.md @@ -489,7 +489,7 @@ With these defaults, all posts would use the `my-site` layout. Any html files th {% highlight yaml %} collections: - my_collection: - output: true + output: true defaults: - From 0deae96a7503bfddb9e8232c1dc7f7803ccebbf2 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 28 Jan 2016 14:21:41 -0800 Subject: [PATCH 0377/4996] Update history to reflect merge of #4409 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 8e1844b2b84..28d061de481 100644 --- a/History.markdown +++ b/History.markdown @@ -7,6 +7,7 @@ ### Development Fixes * Renderer#output_ext: honor folders when looking for ext (#4401) + * Suppress stdout in liquid profiling test (#4409) ## 3.1.0 / 2016-01-23 From eb5be62cba5b6ab3eadcbf154a2958fd59ea3f14 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 28 Jan 2016 17:19:06 -0800 Subject: [PATCH 0378/4996] Upgrade 2-3 docs, include note about getting one single collection Yay, @pathawks! https://github.com/jekyll/jekyll/issues/4392#issuecomment-174369983 --- site/_docs/history.md | 1 + site/_docs/upgrading/2-to-3.md | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/site/_docs/history.md b/site/_docs/history.md index e93521e7736..ab87f5698f5 100644 --- a/site/_docs/history.md +++ b/site/_docs/history.md @@ -10,6 +10,7 @@ permalink: "/docs/history/" ### Minor Enhancements {: #minor-enhancements-v3-1-0} +- Update the Code of Conduct to the latest version ([#4402]({{ site.repository }}/issues/4402)) - Use `Liquid::Drop`s instead of `Hash`es in `#to_liquid` ([#4277]({{ site.repository }}/issues/4277)) - Add 'sample' Liquid filter Equivalent to Array#sample functionality ([#4223]({{ site.repository }}/issues/4223)) - Cache parsed include file to save liquid parsing time. ([#4120]({{ site.repository }}/issues/4120)) diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md index e3529f63164..d3ff4a38781 100644 --- a/site/_docs/upgrading/2-to-3.md +++ b/site/_docs/upgrading/2-to-3.md @@ -32,6 +32,16 @@ A simple conversion must be made in your templates: When iterating over `site.collections`, ensure the above conversions are made. +For `site.collections.myCollection` in Jekyll 2, you now do: + +{% highlight liquid %} +{% raw %} +{% assign myCollection = site.collections | where: "label", "myCollection" | first %} +{% endraw %} +{% endhighlight %} + +This is a bit cumbersome at first, but is easier than a big `for` loop. + ### Dropped dependencies We dropped a number of dependencies the Core Team felt were optional. As such, in 3.0, they must be explicitly installed and included if you use any of the features. They are: From 1d1ffdff9b5d655bf0a65ca8ee0cef38e9c88615 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 28 Jan 2016 17:20:34 -0800 Subject: [PATCH 0379/4996] Update history to reflect merge of #4404 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 28d061de481..e25582710b1 100644 --- a/History.markdown +++ b/History.markdown @@ -3,6 +3,7 @@ ### Bug Fixes * Page#dir: ensure it ends in a slash (#4403) + * Add Utils.merged_file_read_opts to unify reading & strip the BOM (#4404) ### Development Fixes From bfee5c5b59166ee7405e8147d1f38c836156d406 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 28 Jan 2016 20:36:51 -0800 Subject: [PATCH 0380/4996] Release :gem: v3.1.1 --- History.markdown | 13 +++-- lib/jekyll/version.rb | 2 +- rake/site.rake | 27 ++++++++- site/_data/docs.yml | 1 + site/_docs/conduct.md | 55 +++++++++++++++++++ site/_docs/history.md | 21 ++++++- .../2016-01-28-jekyll-3-1-1-released.markdown | 31 +++++++++++ 7 files changed, 140 insertions(+), 10 deletions(-) create mode 100644 site/_docs/conduct.md create mode 100644 site/_posts/2016-01-28-jekyll-3-1-1-released.markdown diff --git a/History.markdown b/History.markdown index e25582710b1..ecbd1794bb2 100644 --- a/History.markdown +++ b/History.markdown @@ -1,20 +1,23 @@ -## HEAD +## 3.1.1 / 2016-01-29 + +### Meta + + * Update the Code of Conduct to the latest version (#4402) ### Bug Fixes - * Page#dir: ensure it ends in a slash (#4403) - * Add Utils.merged_file_read_opts to unify reading & strip the BOM (#4404) + * `Page#dir`: ensure it ends in a slash (#4403) + * Add `Utils.merged_file_read_opts` to unify reading & strip the BOM (#4404) + * `Renderer#output_ext`: honor folders when looking for ext (#4401) ### Development Fixes - * Renderer#output_ext: honor folders when looking for ext (#4401) * Suppress stdout in liquid profiling test (#4409) ## 3.1.0 / 2016-01-23 ### Minor Enhancements - * Update the Code of Conduct to the latest version (#4402) * Use `Liquid::Drop`s instead of `Hash`es in `#to_liquid` (#4277) * Add 'sample' Liquid filter Equivalent to Array#sample functionality (#4223) * Cache parsed include file to save liquid parsing time. (#4120) diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index b20df48404b..925e0b442d8 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,3 +1,3 @@ module Jekyll - VERSION = '3.1.0' + VERSION = '3.1.1' end diff --git a/rake/site.rake b/rake/site.rake index eb5b263b8d1..2a6f8186478 100644 --- a/rake/site.rake +++ b/rake/site.rake @@ -5,8 +5,10 @@ ############################################################################# namespace :site do + task :generated_pages => [:history, :version_file, :conduct] + desc "Generate and view the site locally" - task :preview => [:history, :version_file] do + task :preview => :generated_pages do require "launchy" require "jekyll" @@ -31,7 +33,7 @@ namespace :site do end desc "Generate the site" - task :generate => [:history, :version_file] do + task :generate => :generated_pages do require "jekyll" Jekyll::Commands::Build.process({ "source" => File.expand_path("site"), @@ -50,7 +52,7 @@ namespace :site do end desc "Commit the local site to the gh-pages branch and publish to GitHub Pages" - task :publish => [:history, :version_file] do + task :publish => :generated_pages do # Ensure the gh-pages dir exists so we can generate into it. puts "Checking for gh-pages dir..." unless File.exist?("./gh-pages") @@ -119,6 +121,25 @@ namespace :site do end end + desc "Copy the Code of Conduct" + task :conduct do + code_of_conduct = File.read("CONDUCT.md") + header, _, body = code_of_conduct.partition("\n\n") + front_matter = { + "layout" => "docs", + "title" => header.sub('# Contributor ', ''), + "permalink" => "/docs/conduct/", + "redirect_from" => "/conduct/index.html", + "editable" => false + } + Dir.chdir('site/_docs') do + File.open("conduct.md", "w") do |file| + file.write("#{front_matter.to_yaml}---\n\n") + file.write(body) + end + end + end + desc "Write the site latest_version.txt file" task :version_file do File.open('site/latest_version.txt', 'wb') { |f| f.puts(version) } unless version =~ /(beta|rc|alpha)/i diff --git a/site/_data/docs.yml b/site/_data/docs.yml index dcd9ac2cb35..7cb8519893c 100644 --- a/site/_data/docs.yml +++ b/site/_data/docs.yml @@ -45,4 +45,5 @@ - title: Meta docs: - contributing + - conduct - history diff --git a/site/_docs/conduct.md b/site/_docs/conduct.md new file mode 100644 index 00000000000..d25c32c9d86 --- /dev/null +++ b/site/_docs/conduct.md @@ -0,0 +1,55 @@ +--- +layout: docs +title: Code of Conduct +permalink: "/docs/conduct/" +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/site/_docs/history.md b/site/_docs/history.md index ab87f5698f5..7943203b12b 100644 --- a/site/_docs/history.md +++ b/site/_docs/history.md @@ -4,13 +4,32 @@ title: History permalink: "/docs/history/" --- +## 3.1.1 / 2016-01-29 +{: #v3-1-1} + +### Meta + +- Update the Code of Conduct to the latest version ([#4402]({{ site.repository }}/issues/4402)) + +### Bug Fixes +{: #bug-fixes-v3-1-1} + +- `Page#dir`: ensure it ends in a slash ([#4403]({{ site.repository }}/issues/4403)) +- Add `Utils.merged_file_read_opts` to unify reading & strip the BOM ([#4404]({{ site.repository }}/issues/4404)) +- `Renderer#output_ext`: honor folders when looking for ext ([#4401]({{ site.repository }}/issues/4401)) + +### Development Fixes +{: #development-fixes-v3-1-1} + +- Suppress stdout in liquid profiling test ([#4409]({{ site.repository }}/issues/4409)) + + ## 3.1.0 / 2016-01-23 {: #v3-1-0} ### Minor Enhancements {: #minor-enhancements-v3-1-0} -- Update the Code of Conduct to the latest version ([#4402]({{ site.repository }}/issues/4402)) - Use `Liquid::Drop`s instead of `Hash`es in `#to_liquid` ([#4277]({{ site.repository }}/issues/4277)) - Add 'sample' Liquid filter Equivalent to Array#sample functionality ([#4223]({{ site.repository }}/issues/4223)) - Cache parsed include file to save liquid parsing time. ([#4120]({{ site.repository }}/issues/4120)) diff --git a/site/_posts/2016-01-28-jekyll-3-1-1-released.markdown b/site/_posts/2016-01-28-jekyll-3-1-1-released.markdown new file mode 100644 index 00000000000..cddabd22a30 --- /dev/null +++ b/site/_posts/2016-01-28-jekyll-3-1-1-released.markdown @@ -0,0 +1,31 @@ +--- +layout: news_item +title: 'Jekyll 3.1.1 Released' +date: 2016-01-28 17:21:50 -0800 +author: parkr +version: 3.1.1 +categories: [release] +--- + +This release squashes a few bugs :bug: :bug: :bug: noticed by a few +wonderful Jekyll users: + +* If your `permalink` ended with a `/`, your URL didn't have any extension, +even if you wanted one +* We now strip the BOM by default per Ruby's `IO.open`. +* `page.dir` will not always end in a slash. + +We also updated our [Code of Conduct](/conduct/) to the latest version of +the Contributor Covenant. The update includes language to ensure that the +reporter of the incident remains confidential to non-maintainers and that +all complaints will result in an appropriate response. I care deeply about +Jekyll's community and will do everything in my power to ensure it is a +welcoming community. Feel free to reach out to me directly if you feel +there is a way we can improve the community for everyone! + +See links to the PR's on [the history page](/docs/history/#v3-1-1). + +Thanks to Jordon Bedwell, chrisfinazzo, Kroum Tzanev, David Celis, and +Alfred Xing for their commits on this latest release! :sparkles: + +Happy Jekylling! From 6fbd965509d2049bb34004e7f69a03baeda3498c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 28 Jan 2016 21:08:26 -0800 Subject: [PATCH 0381/4996] Update site/latest_version.txt --- site/_docs/conduct.md | 2 +- site/latest_version.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/_docs/conduct.md b/site/_docs/conduct.md index d25c32c9d86..8b9ac2c5041 100644 --- a/site/_docs/conduct.md +++ b/site/_docs/conduct.md @@ -2,7 +2,7 @@ layout: docs title: Code of Conduct permalink: "/docs/conduct/" -redirect_from: "/conduct/index.html" +redirect_from: "/conduct/" editable: false --- diff --git a/site/latest_version.txt b/site/latest_version.txt index fd2a01863fd..94ff29cc4de 100644 --- a/site/latest_version.txt +++ b/site/latest_version.txt @@ -1 +1 @@ -3.1.0 +3.1.1 From 39ac364b2ccec3132df0a7cd6028eecdc695e6f7 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 29 Jan 2016 15:12:17 -0800 Subject: [PATCH 0382/4996] CoC must be redirected from an HTML link due to bug in jekyll-redirect-from https://github.com/jekyll/jekyll-redirect-from/pull/96 --- site/_docs/conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/conduct.md b/site/_docs/conduct.md index 8b9ac2c5041..d25c32c9d86 100644 --- a/site/_docs/conduct.md +++ b/site/_docs/conduct.md @@ -2,7 +2,7 @@ layout: docs title: Code of Conduct permalink: "/docs/conduct/" -redirect_from: "/conduct/" +redirect_from: "/conduct/index.html" editable: false --- From 9dc273ca50246afd3cf58fdd1b0640f6451b227c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 29 Jan 2016 15:12:29 -0800 Subject: [PATCH 0383/4996] Release :gem: 3.1.1 From 932d6641bcd0ce2ca61f5c186d9e7e8c02234eba Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 29 Jan 2016 16:00:04 -0800 Subject: [PATCH 0384/4996] Add link to diff between CoC's in release post. --- site/_posts/2016-01-28-jekyll-3-1-1-released.markdown | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/site/_posts/2016-01-28-jekyll-3-1-1-released.markdown b/site/_posts/2016-01-28-jekyll-3-1-1-released.markdown index cddabd22a30..18c693cfca4 100644 --- a/site/_posts/2016-01-28-jekyll-3-1-1-released.markdown +++ b/site/_posts/2016-01-28-jekyll-3-1-1-released.markdown @@ -21,7 +21,9 @@ reporter of the incident remains confidential to non-maintainers and that all complaints will result in an appropriate response. I care deeply about Jekyll's community and will do everything in my power to ensure it is a welcoming community. Feel free to reach out to me directly if you feel -there is a way we can improve the community for everyone! +there is a way we can improve the community for everyone! If you're +interested in more details, [there is a diff for +that](https://github.com/ContributorCovenant/contributor_covenant/blob/v1_4/diffs/1_3_vs_1_4.patch). See links to the PR's on [the history page](/docs/history/#v3-1-1). From 6e93dbbbd1147d80076eaa3bc7d20503f56e9700 Mon Sep 17 00:00:00 2001 From: Suriyaa Kudo Date: Sat, 30 Jan 2016 13:08:12 +0100 Subject: [PATCH 0385/4996] Rename CONDUCT.md to CONDUCT.markdown --- CONDUCT.md => CONDUCT.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CONDUCT.md => CONDUCT.markdown (100%) diff --git a/CONDUCT.md b/CONDUCT.markdown similarity index 100% rename from CONDUCT.md rename to CONDUCT.markdown From 183ea08de6ce1d51fff29034fa79526fce37a28c Mon Sep 17 00:00:00 2001 From: toshi Date: Sun, 31 Jan 2016 00:47:06 +0900 Subject: [PATCH 0386/4996] Add jekyll-toc plugin --- site/_docs/plugins.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index 4bcdd545cbb..050cec0fe40 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -775,6 +775,7 @@ LESS.js files during generation. - [pluralize](https://github.com/bdesham/pluralize): Easily combine a number and a word into a grammatically-correct amount like “1 minute” or “2 minute**s**”. - [reading_time](https://github.com/bdesham/reading_time): Count words and estimate reading time for a piece of text, ignoring HTML elements that are unlikely to contain running text. - [Table of Content Generator](https://github.com/dafi/jekyll-toc-generator): Generate the HTML code containing a table of content (TOC), the TOC can be customized in many way, for example you can decide which pages can be without TOC. +- [jekyll-toc](https://github.com/toshimaru/jekyll-toc): A liquid filter plugin for Jekyll which generates a table of contents. - [jekyll-humanize](https://github.com/23maverick23/jekyll-humanize): This is a port of the Django app humanize which adds a "human touch" to data. Each method represents a Fluid type filter that can be used in your Jekyll site templates. Given that Jekyll produces static sites, some of the original methods do not make logical sense to port (e.g. naturaltime). - [Jekyll-Ordinal](https://github.com/PatrickC8t/Jekyll-Ordinal): Jekyll liquid filter to output a date ordinal such as "st", "nd", "rd", or "th". - [Deprecated articles keeper](https://github.com/kzykbys/JekyllPlugins) by [Kazuya Kobayashi](http://blog.kazuya.co/): A simple Jekyll filter which monitor how old an article is. From 4d805e29bc4b1c0df1bf6a44b00331de90643f27 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sat, 30 Jan 2016 09:42:31 -0600 Subject: [PATCH 0387/4996] Fix #4427: Make our @config hash symbol accessible. --- .../converters/markdown/kramdown_parser.rb | 44 ++++++++++++++++--- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb index 05b94337e55..d9c9c222ebe 100644 --- a/lib/jekyll/converters/markdown/kramdown_parser.rb +++ b/lib/jekyll/converters/markdown/kramdown_parser.rb @@ -12,7 +12,7 @@ class KramdownParser "line_number_start" => 1, "tab_width" => 4, "wrap" => "div" - } + }.freeze def initialize(config) Jekyll::External.require_with_graceful_fail "kramdown" @@ -32,22 +32,44 @@ def setup @config["syntax_highlighter_opts"] ||= {} @config["coderay"] ||= {} # XXX: Legacy. modernize_coderay_config + make_accessible end def convert(content) Kramdown::Document.new(content, @config).to_html end + private + def make_accessible(hash = @config) + proc_ = proc { |hash_, key| hash_[key.to_s] if key.is_a?(Symbol) } + hash.default_proc = proc_ + + hash.each do |_, val| + make_accessible val if val.is_a?( + Hash + ) + end + end + # config[kramdown][syntax_higlighter] > config[kramdown][enable_coderay] > config[highlighter] # Where `enable_coderay` is now deprecated because Kramdown # supports Rouge now too. private def highlighter - @highlighter ||= begin - if highlighter = @config["syntax_highlighter"] then highlighter - elsif @config.key?("enable_coderay") && @config["enable_coderay"] - Jekyll::Deprecator.deprecation_message "You are using 'enable_coderay', use syntax_highlighter: coderay in your configuration file." + return @highlighter if @highlighter + + if @config["syntax_highlighter"] + return @highlighter = @config[ + "syntax_highlighter" + ] + end + + @highlighter = begin + if @config.key?("enable_coderay") && @config["enable_coderay"] + Jekyll::Deprecator.deprecation_message "You are using 'enable_coderay', " \ + "use syntax_highlighter: coderay in your configuration file." + "coderay" else @main_fallback_highlighter @@ -59,7 +81,13 @@ def highlighter def strip_coderay_prefix(hash) hash.each_with_object({}) do |(key, val), hsh| cleaned_key = key.gsub(/\Acoderay_/, "") - Jekyll::Deprecator.deprecation_message "You are using '#{key}'. Normalizing to #{cleaned_key}." if key != cleaned_key + + if key != cleaned_key + Jekyll::Deprecator.deprecation_message( + "You are using '#{key}'. Normalizing to #{cleaned_key}." + ) + end + hsh[cleaned_key] = val end end @@ -71,7 +99,9 @@ def strip_coderay_prefix(hash) private def modernize_coderay_config if highlighter == "coderay" - Jekyll::Deprecator.deprecation_message "You are using 'kramdown.coderay' in your configuration, please use 'syntax_highlighter_opts' instead." + Jekyll::Deprecator.deprecation_message "You are using 'kramdown.coderay' in your configuration, " \ + "please use 'syntax_highlighter_opts' instead." + @config["syntax_highlighter_opts"] = begin strip_coderay_prefix( @config["syntax_highlighter_opts"] \ From 99aabaaf16e08a4c60a4c2711f0ff928c4ebb894 Mon Sep 17 00:00:00 2001 From: Michael Lee Date: Mon, 1 Feb 2016 10:22:31 -0500 Subject: [PATCH 0388/4996] Docs: Quickstart - removed alternatively --- site/_docs/quickstart.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/site/_docs/quickstart.md b/site/_docs/quickstart.md index 8f5ffe8a96e..8a63cb33508 100644 --- a/site/_docs/quickstart.md +++ b/site/_docs/quickstart.md @@ -14,8 +14,7 @@ For the impatient, here's how to get a boilerplate Jekyll site up and running. # => Now browse to http://localhost:4000 {% endhighlight %} -If you wish to install jekyll into an existing directory, you can do so by -alternatively running `jekyll new .` from within the directory instead of creating a new one. If the existing directory isn't empty, you'll also have to pass the `--force` option like so `jekyll new . --force`. +If you wish to install jekyll into an existing directory, you can do so by running `jekyll new .` from within the directory instead of creating a new one. If the existing directory isn't empty, you'll also have to pass the `--force` option like so `jekyll new . --force`. That's nothing, though. The real magic happens when you start creating blog posts, using the front matter to control templates and layouts, and taking From 1d58938f4bbb898cdff1422a2ef3da7a11d6dff0 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 1 Feb 2016 10:49:44 -0800 Subject: [PATCH 0389/4996] Update history to reflect merge of #4429 [ci skip] --- History.markdown | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/History.markdown b/History.markdown index ecbd1794bb2..d928f530e96 100644 --- a/History.markdown +++ b/History.markdown @@ -1,3 +1,9 @@ +## HEAD + +### Site Enhancements + + * Add jekyll-toc plugin (#4429) + ## 3.1.1 / 2016-01-29 ### Meta From 28148384063db9cfbfbf46568cd8d9edd165e658 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 1 Feb 2016 11:42:21 -0800 Subject: [PATCH 0390/4996] Update history to reflect merge of #4410 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index d928f530e96..e0b87a5f75d 100644 --- a/History.markdown +++ b/History.markdown @@ -3,6 +3,7 @@ ### Site Enhancements * Add jekyll-toc plugin (#4429) + * Docs: Quickstart - added documentation about the `--force` option (#4410) ## 3.1.1 / 2016-01-29 From 6e76f85b521fb1148d1304cf510ae2e30ae52f2b Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 1 Feb 2016 15:44:20 -0600 Subject: [PATCH 0391/4996] fix broken link to CONDUCT.markdown in README.markdown --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 4401ed30c6a..50ec363e2ad 100644 --- a/README.markdown +++ b/README.markdown @@ -37,7 +37,7 @@ See: http://jekyllrb.com/docs/troubleshooting/#jekyll-amp-mac-os-x-1011 ## Code of Conduct In order to have a more open and welcoming community, Jekyll adheres to a -[code of conduct](CONDUCT.md) adapted from the Ruby on Rails code of +[code of conduct](CONDUCT.markdown) adapted from the Ruby on Rails code of conduct. Please adhere to this code of conduct in any interactions you have in the From e32daaedb46d500fa6ff8df8987dc505c23db6f7 Mon Sep 17 00:00:00 2001 From: Daniel Schildt Date: Tue, 2 Feb 2016 02:17:48 +0200 Subject: [PATCH 0392/4996] fix(rake) fix broken site generation - Fix broken site generation caused by renamed CONDUCT.markdown file. --- rake/site.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rake/site.rake b/rake/site.rake index 2a6f8186478..08ad12b3ac6 100644 --- a/rake/site.rake +++ b/rake/site.rake @@ -123,7 +123,7 @@ namespace :site do desc "Copy the Code of Conduct" task :conduct do - code_of_conduct = File.read("CONDUCT.md") + code_of_conduct = File.read("CONDUCT.markdown") header, _, body = code_of_conduct.partition("\n\n") front_matter = { "layout" => "docs", From 8234c01d5819b9a7cba488c0d95d0a92dfb7b0d0 Mon Sep 17 00:00:00 2001 From: Daniel Schildt Date: Tue, 2 Feb 2016 02:19:50 +0200 Subject: [PATCH 0393/4996] fix(docs) update link to the Code of Conduct - Update links to use `[Code of Conduct](/docs/conduct/)` - Fix old URL that was pointing to a missing file in GitHub. --- site/_posts/2015-10-26-jekyll-3-0-released.markdown | 2 +- site/_posts/2016-01-28-jekyll-3-1-1-released.markdown | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/_posts/2015-10-26-jekyll-3-0-released.markdown b/site/_posts/2015-10-26-jekyll-3-0-released.markdown index 0d27a458c19..e7cf9db4e8f 100644 --- a/site/_posts/2015-10-26-jekyll-3-0-released.markdown +++ b/site/_posts/2015-10-26-jekyll-3-0-released.markdown @@ -22,7 +22,7 @@ The much-anticipated Jekyll 3.0 has been released! Key changes: - Lots of performance improvements - ... and lots more! -We also added a [Code of Conduct]({{ site.repository }}/blob/master/CONDUCT.md) to encourage a happier, nicer community where contributions and discussion is protected from negative behaviour. +We also added a [Code of Conduct](/docs/conduct/) to encourage a happier, nicer community where contributions and discussion is protected from negative behaviour. A huge shout-out to the amazing Jekyll Core Team members Jordon Bedwell, Alfred Xing, and Matt Rogers for all their hard work in making Jekyll 3 the best release yet. diff --git a/site/_posts/2016-01-28-jekyll-3-1-1-released.markdown b/site/_posts/2016-01-28-jekyll-3-1-1-released.markdown index 18c693cfca4..b5932b0aefe 100644 --- a/site/_posts/2016-01-28-jekyll-3-1-1-released.markdown +++ b/site/_posts/2016-01-28-jekyll-3-1-1-released.markdown @@ -15,7 +15,7 @@ even if you wanted one * We now strip the BOM by default per Ruby's `IO.open`. * `page.dir` will not always end in a slash. -We also updated our [Code of Conduct](/conduct/) to the latest version of +We also updated our [Code of Conduct](/docs/conduct/) to the latest version of the Contributor Covenant. The update includes language to ensure that the reporter of the incident remains confidential to non-maintainers and that all complaints will result in an appropriate response. I care deeply about From 198103ce7a999ff8ee5060ae6dbc7756ab79a4e1 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Mon, 1 Feb 2016 17:46:31 -0800 Subject: [PATCH 0394/4996] Include .rubocop.yml in Gem --- jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index 470781c7834..167e424c4d4 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.homepage = 'https://github.com/jekyll/jekyll' all_files = `git ls-files -z`.split("\x0") - s.files = all_files.grep(%r{^(bin|lib)/}) + s.files = all_files.grep(%r{^(bin|lib)/|^.rubocop.yml$}) s.executables = all_files.grep(%r{^bin/}) { |f| File.basename(f) } s.require_paths = ['lib'] From b1b409433c119aec17806c64a8552b4d79170f4b Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 2 Feb 2016 07:41:16 -0800 Subject: [PATCH 0395/4996] Update history to reflect merge of #4436 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index e0b87a5f75d..8564082fc4b 100644 --- a/History.markdown +++ b/History.markdown @@ -4,6 +4,7 @@ * Add jekyll-toc plugin (#4429) * Docs: Quickstart - added documentation about the `--force` option (#4410) + * Fix broken links to the Code of Conduct (#4436) ## 3.1.1 / 2016-01-29 From 7ae4973788217deef5af8e1ec6a7504e014568ca Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 2 Feb 2016 07:42:38 -0800 Subject: [PATCH 0396/4996] Update history to reflect merge of #4437 [ci skip] --- History.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.markdown b/History.markdown index 8564082fc4b..4f5005a5162 100644 --- a/History.markdown +++ b/History.markdown @@ -1,5 +1,9 @@ ## HEAD +### Minor Enhancements + + * Include .rubocop.yml in Gem (#4437) + ### Site Enhancements * Add jekyll-toc plugin (#4429) From 65a1fc4120bf5b39e0474ac6ac5c3726bd821b60 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Tue, 2 Feb 2016 12:25:50 -0600 Subject: [PATCH 0397/4996] Mispell Rouge intentionally. --- lib/jekyll/converters/markdown/kramdown_parser.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb index d9c9c222ebe..93605cdd181 100644 --- a/lib/jekyll/converters/markdown/kramdown_parser.rb +++ b/lib/jekyll/converters/markdown/kramdown_parser.rb @@ -16,7 +16,7 @@ class KramdownParser def initialize(config) Jekyll::External.require_with_graceful_fail "kramdown" - @main_fallback_highlighter = config["highlighter"] || "rogue" + @main_fallback_highlighter = config["highlighter"] || "rouge" @config = config["kramdown"] || {} setup end From bbefef20cd09c9cd9ab46439ec6a74f70d927dbc Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 2 Feb 2016 14:02:00 -0800 Subject: [PATCH 0398/4996] Update history to reflect merge of #4428 [ci skip] --- History.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.markdown b/History.markdown index 4f5005a5162..cd9c3c3d0a4 100644 --- a/History.markdown +++ b/History.markdown @@ -1,5 +1,9 @@ ## HEAD +### Bug Fixes + + * Fix #4427: Make our @config hash symbol accessible. (#4428) + ### Minor Enhancements * Include .rubocop.yml in Gem (#4437) From 5058382d5ad9c7724cae558bfb114859708a2bc2 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 2 Feb 2016 14:43:45 -0800 Subject: [PATCH 0399/4996] LiquidRenderer#parse: parse with line numbers. --- lib/jekyll/liquid_renderer/file.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/liquid_renderer/file.rb b/lib/jekyll/liquid_renderer/file.rb index f91a5a2c625..7dcca1b62a1 100644 --- a/lib/jekyll/liquid_renderer/file.rb +++ b/lib/jekyll/liquid_renderer/file.rb @@ -8,7 +8,7 @@ def initialize(renderer, filename) def parse(content) measure_time do - @template = Liquid::Template.parse(content) + @template = Liquid::Template.parse(content, line_numbers: true) end self From 7886fdb166786e2fe63cf3cd9fd72c0c6dd4b485 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 2 Feb 2016 15:19:08 -0800 Subject: [PATCH 0400/4996] Update history to reflect merge of #4452 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index cd9c3c3d0a4..6f0ea19ec2b 100644 --- a/History.markdown +++ b/History.markdown @@ -7,6 +7,7 @@ ### Minor Enhancements * Include .rubocop.yml in Gem (#4437) + * LiquidRenderer#parse: parse with line numbers. (#4452) ### Site Enhancements From 75b55ff4f26ee04f9b664ba354804d6b40685e6b Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Tue, 2 Feb 2016 16:16:12 -0800 Subject: [PATCH 0401/4996] upgrade notes: mention trailing slash in permalink; fixes #4440 --- site/_docs/upgrading/2-to-3.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md index d3ff4a38781..dbbda9a9e3f 100644 --- a/site/_docs/upgrading/2-to-3.md +++ b/site/_docs/upgrading/2-to-3.md @@ -99,4 +99,9 @@ This can be fixed by removing the following line from your `_config.yml` file: relative_permalinks: true {% endhighlight %} +### Permalinks no longer automatically add a trailing slash + +In Jekyll 2, any URL constructed from the `permalink:` field had a trailing slash (`/`) added to it automatically. Jekyll 3 no longer adds a trailing slash automatically to `permalink:` URLs. This can potentially result in old links to pages returning a 404 error. For example, suppose a page previously contained the YAML `permalink: /:year-:month-:day-:title` that resulted in the URL `example.com/2016-02-01-test/` (notice the trailing slash). In Jekyll 3, the URL for the same page is `example.com/2016-02-01-test`, and consequently any links to the old URL will result in a 404 error. In order to maintain the same URLs and avoid this problem, a trailing slash should be added to the `permalink:` field, for example `permalink: /:year-:month-:day-:title/`. + + _Did we miss something? Please click "Improve this page" above and add a section. Thanks!_ From 7df8f502487f3b6476b5ce0f296be28f70df59cb Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 2 Feb 2016 16:59:25 -0800 Subject: [PATCH 0402/4996] Update history to reflect merge of #4455 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 6f0ea19ec2b..665982a8219 100644 --- a/History.markdown +++ b/History.markdown @@ -14,6 +14,7 @@ * Add jekyll-toc plugin (#4429) * Docs: Quickstart - added documentation about the `--force` option (#4410) * Fix broken links to the Code of Conduct (#4436) + * upgrade notes: mention trailing slash in permalink; fixes #4440 (#4455) ## 3.1.1 / 2016-01-29 From 49e3180607a7bcb71c4c752d3b8454efd2b3d44c Mon Sep 17 00:00:00 2001 From: Robert Martin Date: Tue, 2 Feb 2016 23:31:21 -0500 Subject: [PATCH 0403/4996] Update structure.md --- site/_docs/structure.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/structure.md b/site/_docs/structure.md index eb6a0892784..f571aea8deb 100644 --- a/site/_docs/structure.md +++ b/site/_docs/structure.md @@ -132,7 +132,7 @@ An overview of what each of these does:

    - Well-formatted site data should be placed here. The jekyll engine + Well-formatted site data should be placed here. The Jekyll engine will autoload all YAML files in this directory (using either the .yml, .yaml, .json or .csv formats and extensions) and they will be From 53bb262fed1d397683c3ee49d6a77013e2edf905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Garc=C3=A9s?= Date: Wed, 3 Feb 2016 11:42:18 +0100 Subject: [PATCH 0404/4996] Added details about permalinks problem Small description about how Jekyll generated the files based on a permalink --- site/_docs/upgrading/2-to-3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md index dbbda9a9e3f..9b9cedc4dd9 100644 --- a/site/_docs/upgrading/2-to-3.md +++ b/site/_docs/upgrading/2-to-3.md @@ -101,7 +101,7 @@ relative_permalinks: true ### Permalinks no longer automatically add a trailing slash -In Jekyll 2, any URL constructed from the `permalink:` field had a trailing slash (`/`) added to it automatically. Jekyll 3 no longer adds a trailing slash automatically to `permalink:` URLs. This can potentially result in old links to pages returning a 404 error. For example, suppose a page previously contained the YAML `permalink: /:year-:month-:day-:title` that resulted in the URL `example.com/2016-02-01-test/` (notice the trailing slash). In Jekyll 3, the URL for the same page is `example.com/2016-02-01-test`, and consequently any links to the old URL will result in a 404 error. In order to maintain the same URLs and avoid this problem, a trailing slash should be added to the `permalink:` field, for example `permalink: /:year-:month-:day-:title/`. +In Jekyll 2, any URL constructed from the `permalink:` field had a trailing slash (`/`) added to it automatically. Jekyll 3 no longer adds a trailing slash automatically to `permalink:` URLs. This can potentially result in old links to pages returning a 404 error. For example, suppose a page previously contained the YAML `permalink: /:year-:month-:day-:title` that resulted in the URL `example.com/2016-02-01-test/` (notice the trailing slash), Jekyll internaly generates a folder named `2016-02-01-test`. In Jekyll 3, the same `permalink:` generate the file `2016-02-01-test.html` and the URL for the same page will be `example.com/2016-02-01-test`, and consequently any links to the old URL will result in a 404 error. In order to maintain the same URLs and avoid this problem, a trailing slash should be added to the `permalink:` field, for example `permalink: /:year-:month-:day-:title/`. _Did we miss something? Please click "Improve this page" above and add a section. Thanks!_ From b4deb79392322ab1249dbdfd7cb6f3fc76c79239 Mon Sep 17 00:00:00 2001 From: Mitesh Shah Date: Wed, 3 Feb 2016 17:01:01 +0530 Subject: [PATCH 0405/4996] [add note] Jekyll 3 requires newer ver. of Ruby. Adding a note that Jekyll 3 requires Ruby version >= 2.0.0. --- site/_docs/upgrading/2-to-3.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md index dbbda9a9e3f..86cd910c499 100644 --- a/site/_docs/upgrading/2-to-3.md +++ b/site/_docs/upgrading/2-to-3.md @@ -13,6 +13,8 @@ Before we dive in, go ahead and fetch the latest version of Jekyll: $ gem update jekyll {% endhighlight %} +Please note: Jekyll 3 requires Ruby version >= 2.0.0. +

    Diving in

    Want to get a new Jekyll site up and running quickly? Simply From aa284d90ccafc100082af4c5812966d87c9a3ee7 Mon Sep 17 00:00:00 2001 From: Nicolas Hoizey Date: Wed, 3 Feb 2016 16:39:20 +0100 Subject: [PATCH 0406/4996] Add hooks to the plugin categories toc --- site/_docs/plugins.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index 050cec0fe40..e7823465447 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -60,12 +60,13 @@ values of the gem names of the plugins you'd like to use. An example:

    -In general, plugins you make will fall into one of four categories: +In general, plugins you make will fall into one of five categories: 1. [Generators](#generators) 2. [Converters](#converters) 3. [Commands](#commands) 4. [Tags](#tags) +5. [Hooks](#hooks) ## Generators From d18769aff0fae47da54ce548de270b8593d23921 Mon Sep 17 00:00:00 2001 From: chrisfinazzo Date: Wed, 3 Feb 2016 11:31:07 -0500 Subject: [PATCH 0407/4996] Remove old flag which breaks htmlproof --- script/proof | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/proof b/script/proof index c8fff90819b..01da501651e 100755 --- a/script/proof +++ b/script/proof @@ -27,7 +27,7 @@ bundle install -j8 > /dev/null || bundle install > /dev/null # 2. msg "Building..." -bundle exec jekyll build -s $SOURCE -d $DESTINATION --full-rebuild --trace +bundle exec jekyll build -s $SOURCE -d $DESTINATION --trace # 3. msg "Proofing..." From 53c1107eaa3ffa6f576b8dcdade543f0b6fa436d Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 3 Feb 2016 09:37:12 -0800 Subject: [PATCH 0408/4996] Update history to reflect merge of #4463 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 665982a8219..40ba3406e5a 100644 --- a/History.markdown +++ b/History.markdown @@ -15,6 +15,7 @@ * Docs: Quickstart - added documentation about the `--force` option (#4410) * Fix broken links to the Code of Conduct (#4436) * upgrade notes: mention trailing slash in permalink; fixes #4440 (#4455) + * Add hooks to the plugin categories toc (#4463) ## 3.1.1 / 2016-01-29 From 1671c989755c3eb414de4acc6719276fc0e19d01 Mon Sep 17 00:00:00 2001 From: chrisfinazzo Date: Wed, 3 Feb 2016 12:45:18 -0500 Subject: [PATCH 0409/4996] Remove broken link --- site/_docs/plugins.md | 1 - 1 file changed, 1 deletion(-) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index 050cec0fe40..5e34b488e99 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -838,7 +838,6 @@ LESS.js files during generation. - [inline\_highlight](https://github.com/bdesham/inline_highlight): A tag for inline syntax highlighting. - [jekyll-mermaid](https://github.com/jasonbellamy/jekyll-mermaid): Simplify the creation of mermaid diagrams and flowcharts in your posts and pages. - [twa](https://github.com/Ezmyrelda/twa): Twemoji Awesome plugin for Jekyll. Liquid tag allowing you to use twitter emoji in your jekyll pages. -- [jekyll-files](https://github.com/x43x61x69/jekyll-files) by [Zhi-Wei Cai](http://vox.vg/): Output relative path strings and other info regarding specific assets. - [Fetch remote file content](https://github.com/dimitri-koenig/jekyll-plugins) by [Dimitri König](https://www.dimitrikoenig.net/): Using `remote_file_content` tag you can fetch the content of a remote file and include it as if you would put the content right into your markdown file yourself. Very useful for including code from github repo's to always have a current repo version. - [jekyll-asciinema](https://github.com/mnuessler/jekyll-asciinema): A tag for embedding asciicasts recorded with [asciinema](https://asciinema.org) in your Jekyll pages. - [Jekyll-Youtube](https://github.com/dommmel/jekyll-youtube) A Liquid tag that embeds Youtube videos. The default emded markup is responsive but you can also specify your own by using an include/partial. From d47ae6ce9511f9274d5a4f1534c68eddcad18bcf Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 3 Feb 2016 19:57:37 -0800 Subject: [PATCH 0410/4996] Update history to reflect merge of #4461 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 40ba3406e5a..850be8de2c5 100644 --- a/History.markdown +++ b/History.markdown @@ -16,6 +16,7 @@ * Fix broken links to the Code of Conduct (#4436) * upgrade notes: mention trailing slash in permalink; fixes #4440 (#4455) * Add hooks to the plugin categories toc (#4463) + * [add note] Jekyll 3 requires newer version of Ruby. (#4461) ## 3.1.1 / 2016-01-29 From 71e04760c94d0988d4a895d6898d437f8d1d20b1 Mon Sep 17 00:00:00 2001 From: Manabu Sakai Date: Fri, 5 Feb 2016 16:11:16 +0900 Subject: [PATCH 0411/4996] Fix typo --- site/_docs/upgrading/2-to-3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md index 4a2c638f8c6..8a29ae086ac 100644 --- a/site/_docs/upgrading/2-to-3.md +++ b/site/_docs/upgrading/2-to-3.md @@ -67,7 +67,7 @@ generate when running `jekyll build` or `jekyll serve`. ### Layout metadata -Introducing: `layout`. In Jekyll 2 and below, any metadata in the layout was munged onto +Introducing: `layout`. In Jekyll 2 and below, any metadata in the layout was merged onto the `page` variable in Liquid. This caused a lot of confusion in the way the data was merged and some unexpected behaviour. In Jekyll 3, all layout data is accessible via `layout` in Liquid. For example, if your layout has `class: my-layout` in its YAML front matter, From ac463bb397d4d2eaf4169bf925b76f4e4815d98a Mon Sep 17 00:00:00 2001 From: Alfred Xing Date: Fri, 5 Feb 2016 09:22:42 -0800 Subject: [PATCH 0412/4996] Update history to reflect merge of #4473 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 850be8de2c5..ca9cc4c2e19 100644 --- a/History.markdown +++ b/History.markdown @@ -17,6 +17,7 @@ * upgrade notes: mention trailing slash in permalink; fixes #4440 (#4455) * Add hooks to the plugin categories toc (#4463) * [add note] Jekyll 3 requires newer version of Ruby. (#4461) + * Fix typo in upgrading docs (#4473) ## 3.1.1 / 2016-01-29 From fd121e2a5e060ed35c245a97ec8255988bd7c09d Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Feb 2016 19:04:47 -0800 Subject: [PATCH 0413/4996] Add note about upgrading documentation on jekyllrb.com/help/ --- site/help/index.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/help/index.md b/site/help/index.md index 5ce0846c71d..ba15959974e 100644 --- a/site/help/index.md +++ b/site/help/index.md @@ -5,6 +5,11 @@ title: Getting Help Need help with Jekyll? Try these resources. +### [Upgrading Documentation](/docs/upgrading/) + +Did you recently upgrade from Jekyll 1 to 2 or from Jekyll 2 to 3? +Known breaking changes are listed in the upgrading docs. + ### [Google](https://google.com) Add **jekyll** to almost any query, and you'll find just what you need. From 9366a90d385d0fe779ce9d3d951a026c5fd135ae Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sat, 6 Feb 2016 19:05:13 -0800 Subject: [PATCH 0414/4996] Update history to reflect merge of #4484 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index ca9cc4c2e19..122901cf010 100644 --- a/History.markdown +++ b/History.markdown @@ -18,6 +18,7 @@ * Add hooks to the plugin categories toc (#4463) * [add note] Jekyll 3 requires newer version of Ruby. (#4461) * Fix typo in upgrading docs (#4473) + * Add note about upgrading documentation on jekyllrb.com/help/ (#4484) ## 3.1.1 / 2016-01-29 From 38bc4f55e4b926f05d92ff589d8681414da84da3 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Feb 2016 19:17:35 -0800 Subject: [PATCH 0415/4996] Add note about dates without timezones --- site/_docs/upgrading/2-to-3.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md index 8a29ae086ac..d4b105c9b99 100644 --- a/site/_docs/upgrading/2-to-3.md +++ b/site/_docs/upgrading/2-to-3.md @@ -105,5 +105,22 @@ relative_permalinks: true In Jekyll 2, any URL constructed from the `permalink:` field had a trailing slash (`/`) added to it automatically. Jekyll 3 no longer adds a trailing slash automatically to `permalink:` URLs. This can potentially result in old links to pages returning a 404 error. For example, suppose a page previously contained the YAML `permalink: /:year-:month-:day-:title` that resulted in the URL `example.com/2016-02-01-test/` (notice the trailing slash), Jekyll internaly generates a folder named `2016-02-01-test`. In Jekyll 3, the same `permalink:` generate the file `2016-02-01-test.html` and the URL for the same page will be `example.com/2016-02-01-test`, and consequently any links to the old URL will result in a 404 error. In order to maintain the same URLs and avoid this problem, a trailing slash should be added to the `permalink:` field, for example `permalink: /:year-:month-:day-:title/`. +### All my posts are gone! Where'd they go! + +Try adding `future: true` to your `_config.yml` file. Are they showing up now? If they are, then you were ensnared by an issue with the way Ruby parses times. Each of your posts is being read in a different timezone than you might expect and, when compared to the computer's current time, is "in the future." The fix for this is to add [a timezone offset](https://en.wikipedia.org/wiki/List_of_UTC_time_offsets) to each post (and make sure you emove `future: true` from your `_config.yml` file). If you're writing from California, for example, you would change this: + +```yaml +--- +date: 2016-02-06 19:32:10 +--- +``` + +to this (note the offset): + +```yaml +--- +date: 2016-02-06 19:32:10 -0800 +--- +``` _Did we miss something? Please click "Improve this page" above and add a section. Thanks!_ From b0797c30353f6bdfaf1d76ee0436a8f5faaac2cb Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Feb 2016 19:18:30 -0800 Subject: [PATCH 0416/4996] Fix typo in upgrading docs --- site/_docs/upgrading/2-to-3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md index d4b105c9b99..058152fcefa 100644 --- a/site/_docs/upgrading/2-to-3.md +++ b/site/_docs/upgrading/2-to-3.md @@ -107,7 +107,7 @@ In Jekyll 2, any URL constructed from the `permalink:` field had a trailing slas ### All my posts are gone! Where'd they go! -Try adding `future: true` to your `_config.yml` file. Are they showing up now? If they are, then you were ensnared by an issue with the way Ruby parses times. Each of your posts is being read in a different timezone than you might expect and, when compared to the computer's current time, is "in the future." The fix for this is to add [a timezone offset](https://en.wikipedia.org/wiki/List_of_UTC_time_offsets) to each post (and make sure you emove `future: true` from your `_config.yml` file). If you're writing from California, for example, you would change this: +Try adding `future: true` to your `_config.yml` file. Are they showing up now? If they are, then you were ensnared by an issue with the way Ruby parses times. Each of your posts is being read in a different timezone than you might expect and, when compared to the computer's current time, is "in the future." The fix for this is to add [a timezone offset](https://en.wikipedia.org/wiki/List_of_UTC_time_offsets) to each post (and make sure you remove `future: true` from your `_config.yml` file). If you're writing from California, for example, you would change this: ```yaml --- From 2d0c572d2934ef7924734444a23d449006bba64e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 6 Feb 2016 19:21:11 -0800 Subject: [PATCH 0417/4996] use the highlight tag for upgrading docs code block --- site/_docs/upgrading/2-to-3.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md index 058152fcefa..33d9c364d88 100644 --- a/site/_docs/upgrading/2-to-3.md +++ b/site/_docs/upgrading/2-to-3.md @@ -103,24 +103,24 @@ relative_permalinks: true ### Permalinks no longer automatically add a trailing slash -In Jekyll 2, any URL constructed from the `permalink:` field had a trailing slash (`/`) added to it automatically. Jekyll 3 no longer adds a trailing slash automatically to `permalink:` URLs. This can potentially result in old links to pages returning a 404 error. For example, suppose a page previously contained the YAML `permalink: /:year-:month-:day-:title` that resulted in the URL `example.com/2016-02-01-test/` (notice the trailing slash), Jekyll internaly generates a folder named `2016-02-01-test`. In Jekyll 3, the same `permalink:` generate the file `2016-02-01-test.html` and the URL for the same page will be `example.com/2016-02-01-test`, and consequently any links to the old URL will result in a 404 error. In order to maintain the same URLs and avoid this problem, a trailing slash should be added to the `permalink:` field, for example `permalink: /:year-:month-:day-:title/`. +In Jekyll 2, any URL constructed from the `permalink:` field had a trailing slash (`/`) added to it automatically. Jekyll 3 no longer adds a trailing slash automatically to `permalink:` URLs. This can potentially result in old links to pages returning a 404 error. For example, suppose a page previously contained the YAML `permalink: /:year-:month-:day-:title` that resulted in the URL `example.com/2016-02-01-test/` (notice the trailing slash), Jekyll internaly generates a folder named `2016-02-01-test`. In Jekyll 3, the same `permalink:` generate the file `2016-02-01-test.html` and the URL for the same page will be `example.com/2016-02-01-test`, and consequently any links to the old URL will result in a 404 error. In order to maintain the same URLs and avoid this problem, a trailing slash should be added to the `permalink:` field, for example `permalink: /:year-:month-:day-:title/`. ### All my posts are gone! Where'd they go! Try adding `future: true` to your `_config.yml` file. Are they showing up now? If they are, then you were ensnared by an issue with the way Ruby parses times. Each of your posts is being read in a different timezone than you might expect and, when compared to the computer's current time, is "in the future." The fix for this is to add [a timezone offset](https://en.wikipedia.org/wiki/List_of_UTC_time_offsets) to each post (and make sure you remove `future: true` from your `_config.yml` file). If you're writing from California, for example, you would change this: -```yaml +{% highlight yaml %} --- date: 2016-02-06 19:32:10 --- -``` +{% endhighlight %} to this (note the offset): -```yaml +{% highlight yaml %} --- date: 2016-02-06 19:32:10 -0800 --- -``` +{% endhighlight %} _Did we miss something? Please click "Improve this page" above and add a section. Thanks!_ From 3950408e393989610a85abaf4f31b7bd62903659 Mon Sep 17 00:00:00 2001 From: Prayag Verma Date: Sun, 7 Feb 2016 13:18:19 +0530 Subject: [PATCH 0418/4996] Fix a typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Found a spelling mistake - `internaly` → `internally` --- site/_docs/upgrading/2-to-3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md index 33d9c364d88..330228de706 100644 --- a/site/_docs/upgrading/2-to-3.md +++ b/site/_docs/upgrading/2-to-3.md @@ -103,7 +103,7 @@ relative_permalinks: true ### Permalinks no longer automatically add a trailing slash -In Jekyll 2, any URL constructed from the `permalink:` field had a trailing slash (`/`) added to it automatically. Jekyll 3 no longer adds a trailing slash automatically to `permalink:` URLs. This can potentially result in old links to pages returning a 404 error. For example, suppose a page previously contained the YAML `permalink: /:year-:month-:day-:title` that resulted in the URL `example.com/2016-02-01-test/` (notice the trailing slash), Jekyll internaly generates a folder named `2016-02-01-test`. In Jekyll 3, the same `permalink:` generate the file `2016-02-01-test.html` and the URL for the same page will be `example.com/2016-02-01-test`, and consequently any links to the old URL will result in a 404 error. In order to maintain the same URLs and avoid this problem, a trailing slash should be added to the `permalink:` field, for example `permalink: /:year-:month-:day-:title/`. +In Jekyll 2, any URL constructed from the `permalink:` field had a trailing slash (`/`) added to it automatically. Jekyll 3 no longer adds a trailing slash automatically to `permalink:` URLs. This can potentially result in old links to pages returning a 404 error. For example, suppose a page previously contained the YAML `permalink: /:year-:month-:day-:title` that resulted in the URL `example.com/2016-02-01-test/` (notice the trailing slash), Jekyll internally generates a folder named `2016-02-01-test`. In Jekyll 3, the same `permalink:` generate the file `2016-02-01-test.html` and the URL for the same page will be `example.com/2016-02-01-test`, and consequently any links to the old URL will result in a 404 error. In order to maintain the same URLs and avoid this problem, a trailing slash should be added to the `permalink:` field, for example `permalink: /:year-:month-:day-:title/`. ### All my posts are gone! Where'd they go! From 3373eb65257789b62b5eafcb4512c37c7151a6ed Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 7 Feb 2016 17:28:03 -0800 Subject: [PATCH 0419/4996] EntryFilter#special?: ignore filenames which begin with '~' --- lib/jekyll/entry_filter.rb | 2 +- test/test_entry_filter.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb index 6d42c067c55..48509f9deb5 100644 --- a/lib/jekyll/entry_filter.rb +++ b/lib/jekyll/entry_filter.rb @@ -1,6 +1,6 @@ module Jekyll class EntryFilter - SPECIAL_LEADING_CHARACTERS = ['.', '_', '#'].freeze + SPECIAL_LEADING_CHARACTERS = ['.', '_', '#', '~'].freeze attr_reader :site diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb index c0ce59b38ce..546f025272b 100644 --- a/test/test_entry_filter.rb +++ b/test/test_entry_filter.rb @@ -8,7 +8,7 @@ class TestEntryFilter < JekyllUnitTest should "filter entries" do ent1 = %w[foo.markdown bar.markdown baz.markdown #baz.markdown# - .baz.markdow foo.markdown~ .htaccess _posts _pages] + .baz.markdow foo.markdown~ .htaccess _posts _pages ~$benbalter.docx] entries = EntryFilter.new(@site).filter(ent1) assert_equal %w[foo.markdown bar.markdown baz.markdown .htaccess], entries From 246e65914ffef6affb7b699de6fcd496168c332e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 7 Feb 2016 17:52:15 -0800 Subject: [PATCH 0420/4996] Jekyll.sanitized_path: sanitizing a questionable path should handle tildes --- lib/jekyll.rb | 3 ++- test/test_path_sanitization.rb | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 8b92a045f61..6896bb0b8c8 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -153,8 +153,9 @@ def sites def sanitized_path(base_directory, questionable_path) return base_directory if base_directory.eql?(questionable_path) + questionable_path.insert(0, '/') if questionable_path.start_with?('~') clean_path = File.expand_path(questionable_path, "/") - clean_path = clean_path.sub(/\A\w\:\//, '/') + clean_path.sub!(/\A\w\:\//, '/') if clean_path.start_with?(base_directory.sub(/\A\w\:\//, '/')) clean_path diff --git a/test/test_path_sanitization.rb b/test/test_path_sanitization.rb index b04a2badd37..148103eacbd 100644 --- a/test/test_path_sanitization.rb +++ b/test/test_path_sanitization.rb @@ -15,4 +15,13 @@ class TestPathSanitization < JekyllUnitTest assert_equal "/tmp/foobar/jail/..c:/..c:/..c:/etc/passwd", Jekyll.sanitized_path("/tmp/foobar/jail", "..c:/..c:/..c:/etc/passwd") end end + + should "escape tilde" do + assert_equal source_dir("~hi.txt"), Jekyll.sanitized_path(source_dir, "~hi.txt") + assert_equal source_dir("files", "~hi.txt"), Jekyll.sanitized_path(source_dir, "files/../files/~hi.txt") + end + + should "remove path traversals" do + assert_equal source_dir("files", "hi.txt"), Jekyll.sanitized_path(source_dir, "f./../../../../../../files/hi.txt") + end end From 0e89a37eaf7a426181b489fe0325081f4b7cda66 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 7 Feb 2016 17:53:09 -0800 Subject: [PATCH 0421/4996] Revert "Jekyll.sanitized_path: sanitizing a questionable path should handle tildes" This reverts commit 246e65914ffef6affb7b699de6fcd496168c332e. --- lib/jekyll.rb | 3 +-- test/test_path_sanitization.rb | 9 --------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 6896bb0b8c8..8b92a045f61 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -153,9 +153,8 @@ def sites def sanitized_path(base_directory, questionable_path) return base_directory if base_directory.eql?(questionable_path) - questionable_path.insert(0, '/') if questionable_path.start_with?('~') clean_path = File.expand_path(questionable_path, "/") - clean_path.sub!(/\A\w\:\//, '/') + clean_path = clean_path.sub(/\A\w\:\//, '/') if clean_path.start_with?(base_directory.sub(/\A\w\:\//, '/')) clean_path diff --git a/test/test_path_sanitization.rb b/test/test_path_sanitization.rb index 148103eacbd..b04a2badd37 100644 --- a/test/test_path_sanitization.rb +++ b/test/test_path_sanitization.rb @@ -15,13 +15,4 @@ class TestPathSanitization < JekyllUnitTest assert_equal "/tmp/foobar/jail/..c:/..c:/..c:/etc/passwd", Jekyll.sanitized_path("/tmp/foobar/jail", "..c:/..c:/..c:/etc/passwd") end end - - should "escape tilde" do - assert_equal source_dir("~hi.txt"), Jekyll.sanitized_path(source_dir, "~hi.txt") - assert_equal source_dir("files", "~hi.txt"), Jekyll.sanitized_path(source_dir, "files/../files/~hi.txt") - end - - should "remove path traversals" do - assert_equal source_dir("files", "hi.txt"), Jekyll.sanitized_path(source_dir, "f./../../../../../../files/hi.txt") - end end From a040af37c08c6bf3fa0b29f98bde4eb58354eab1 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 7 Feb 2016 17:52:15 -0800 Subject: [PATCH 0422/4996] Jekyll.sanitized_path: sanitizing a questionable path should handle tildes --- lib/jekyll.rb | 3 ++- test/test_path_sanitization.rb | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 8b92a045f61..6896bb0b8c8 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -153,8 +153,9 @@ def sites def sanitized_path(base_directory, questionable_path) return base_directory if base_directory.eql?(questionable_path) + questionable_path.insert(0, '/') if questionable_path.start_with?('~') clean_path = File.expand_path(questionable_path, "/") - clean_path = clean_path.sub(/\A\w\:\//, '/') + clean_path.sub!(/\A\w\:\//, '/') if clean_path.start_with?(base_directory.sub(/\A\w\:\//, '/')) clean_path diff --git a/test/test_path_sanitization.rb b/test/test_path_sanitization.rb index b04a2badd37..148103eacbd 100644 --- a/test/test_path_sanitization.rb +++ b/test/test_path_sanitization.rb @@ -15,4 +15,13 @@ class TestPathSanitization < JekyllUnitTest assert_equal "/tmp/foobar/jail/..c:/..c:/..c:/etc/passwd", Jekyll.sanitized_path("/tmp/foobar/jail", "..c:/..c:/..c:/etc/passwd") end end + + should "escape tilde" do + assert_equal source_dir("~hi.txt"), Jekyll.sanitized_path(source_dir, "~hi.txt") + assert_equal source_dir("files", "~hi.txt"), Jekyll.sanitized_path(source_dir, "files/../files/~hi.txt") + end + + should "remove path traversals" do + assert_equal source_dir("files", "hi.txt"), Jekyll.sanitized_path(source_dir, "f./../../../../../../files/hi.txt") + end end From db241c4f91727d65f2f4608c57fa5005758f7241 Mon Sep 17 00:00:00 2001 From: Katya Demidova Date: Mon, 8 Feb 2016 14:05:50 +0300 Subject: [PATCH 0423/4996] Update Rake link The https://github.com/jimweirich/rake/ repository is retired, so I've changed the link to https://github.com/ruby/rake --- site/_docs/deployment-methods.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md index ad4ea93c283..7e77ce16733 100644 --- a/site/_docs/deployment-methods.md +++ b/site/_docs/deployment-methods.md @@ -90,7 +90,7 @@ Setup steps are fully documented ### Rake -Another way to deploy your Jekyll site is to use [Rake](https://github.com/jimweirich/rake), [HighLine](https://github.com/JEG2/highline), and +Another way to deploy your Jekyll site is to use [Rake](https://github.com/ruby/rake), [HighLine](https://github.com/JEG2/highline), and [Net::SSH](https://github.com/net-ssh/net-ssh). A more complex example of deploying Jekyll with Rake that deals with multiple branches can be found in [Git Ready](https://github.com/gitready/gitready/blob/cdfbc4ec5321ff8d18c3ce936e9c749dbbc4f190/Rakefile). From b237b1f93cd8a16119d2abfc5f35bd2a2b144d0c Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 8 Feb 2016 10:28:00 -0800 Subject: [PATCH 0424/4996] Update history to reflect merge of #4496 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 122901cf010..6ffe198db46 100644 --- a/History.markdown +++ b/History.markdown @@ -19,6 +19,7 @@ * [add note] Jekyll 3 requires newer version of Ruby. (#4461) * Fix typo in upgrading docs (#4473) * Add note about upgrading documentation on jekyllrb.com/help/ (#4484) + * Update Rake link (#4496) ## 3.1.1 / 2016-01-29 From adadc2eeab8433f4de28c1568de779cc90b2d28a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 8 Feb 2016 10:52:15 -0800 Subject: [PATCH 0425/4996] Update history to reflect merge of #4374 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 6ffe198db46..9dc835f860c 100644 --- a/History.markdown +++ b/History.markdown @@ -20,6 +20,7 @@ * Fix typo in upgrading docs (#4473) * Add note about upgrading documentation on jekyllrb.com/help/ (#4484) * Update Rake link (#4496) + * Update & prune the short list of example sites (#4374) ## 3.1.1 / 2016-01-29 From f57899fdb86f86074bbb688e09643cd8d83e67a2 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 8 Feb 2016 10:52:54 -0800 Subject: [PATCH 0426/4996] Update history to reflect merge of #4492 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 9dc835f860c..170d6dab201 100644 --- a/History.markdown +++ b/History.markdown @@ -3,6 +3,7 @@ ### Bug Fixes * Fix #4427: Make our @config hash symbol accessible. (#4428) + * Jekyll.sanitized_path: sanitizing a questionable path should handle tildes (#4492) ### Minor Enhancements From 2e5e6ace3d7913dbf467afe8358c956da3b52f89 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 8 Feb 2016 10:59:24 -0800 Subject: [PATCH 0427/4996] Fix emoji support on the site. Seems to work for us, despite https://github.com/jekyll/jemoji/issues/32 ? --- Gemfile | 1 + site/_config.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index f63529e885a..cd21a668f76 100644 --- a/Gemfile +++ b/Gemfile @@ -79,4 +79,5 @@ group :site do if ENV["PROOF"] gem "html-proofer", "~> 2.0" end + gem "jemoji" end diff --git a/site/_config.yml b/site/_config.yml index c065f9f7015..241c5b01762 100644 --- a/site/_config.yml +++ b/site/_config.yml @@ -22,3 +22,4 @@ url: http://jekyllrb.com gems: - jekyll-feed - jekyll-redirect-from + - jemoji From 05d99a9c96eeebdab8e7c3c360e745dad925e69d Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 8 Feb 2016 10:47:22 -0800 Subject: [PATCH 0428/4996] Release v3.0.3 --- History.markdown | 12 ++++++- site/_docs/history.md | 13 ++++++++ .../2016-02-08-jekyll-3-0-3-released.markdown | 31 +++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 site/_posts/2016-02-08-jekyll-3-0-3-released.markdown diff --git a/History.markdown b/History.markdown index 170d6dab201..adbfb765657 100644 --- a/History.markdown +++ b/History.markdown @@ -3,7 +3,7 @@ ### Bug Fixes * Fix #4427: Make our @config hash symbol accessible. (#4428) - * Jekyll.sanitized_path: sanitizing a questionable path should handle tildes (#4492) + * `Jekyll.sanitized_path`: sanitizing a questionable path should handle tildes (#4492) ### Minor Enhancements @@ -135,6 +135,16 @@ * Add Contentful Extension to list of third-party plugins (#4390) * Correct Minor spelling error (#4394) +## 3.0.3 / 2016-02-08 + +### Bug Fixes + +* Fix extension weirdness with folders (#4493) +* EntryFilter: only include 'excluded' log on excluded files (#4479) +* `Jekyll.sanitized_path`: escape tildes before sanitizing a questionable path (#4468) +* `LiquidRenderer#parse`: parse with line numbers (#4453) +* `Document#<=>`: protect against nil comparison in dates. (#4446) + ## 3.0.2 / 2016-01-20 ### Bug Fixes diff --git a/site/_docs/history.md b/site/_docs/history.md index 7943203b12b..6514e2c40f0 100644 --- a/site/_docs/history.md +++ b/site/_docs/history.md @@ -126,6 +126,19 @@ permalink: "/docs/history/" - Correct Minor spelling error ([#4394]({{ site.repository }}/issues/4394)) +## 3.0.3 / 2016-02-08 +{: #v3-0-3} + +### Bug Fixes +{: #bug-fixes-v3-0-3} + +* Fix extension weirdness with folders ([#4493]({{ site.repository }}/issues/4493)) +* EntryFilter: only include 'excluded' log on excluded files ([#4479]({{ site.repository }}/issues/4479)) +* `Jekyll.sanitized_path`: escape tildes before sanitizing a questionable path ([#4468]({{ site.repository }}/issues/4468)) +* `LiquidRenderer#parse`: parse with line numbers ([#4453]({{ site.repository }}/issues/4453)) +* `Document#<=>`: protect against nil comparison in dates. ([#4446]({{ site.repository }}/issues/4446)) + + ## 3.0.2 / 2016-01-20 {: #v3-0-2} diff --git a/site/_posts/2016-02-08-jekyll-3-0-3-released.markdown b/site/_posts/2016-02-08-jekyll-3-0-3-released.markdown new file mode 100644 index 00000000000..f648cb28a7a --- /dev/null +++ b/site/_posts/2016-02-08-jekyll-3-0-3-released.markdown @@ -0,0 +1,31 @@ +--- +layout: news_item +title: 'Jekyll 3.0.3 Released' +date: 2016-02-08 10:39:08 -0800 +author: +version: 3.0.3 +categories: [release] +--- + +[GitHub Pages upgraded to Jekyll 3.0.2][1] last week and there has been a +joyous reception so far! This release is to address some bugs that affected +some users during the cut-over. The fixes include: + +* Fix problem where outputting to a folder would have two extensions +* Handle tildes (`~`) in filenames properly +* Fix issue when comparing documents without dates +* Include line numbers in liquid error output + +Read more on the [changelog](/docs/history/#v3-0-3) with links to the +related patches. + +Please keep [submitting bugs][2] as you find them! Please do take a look +[in our various help resources](/help/) before filing a bug and use [our +forum][3] for asking questions and getting help on a specific problem +you're having. + +Happy Jekylling! + +[1]: https://github.com/blog/2100-github-pages-now-faster-and-simpler-with-jekyll-3-0 +[2]: {{ site.repository }}/issues +[3]: https://talk.jekyllrb.com/ From b8f5b9f63e6e8a8d9c8a5e4c7809acf5374ceb28 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 8 Feb 2016 11:00:30 -0800 Subject: [PATCH 0429/4996] By me! --- site/_posts/2016-02-08-jekyll-3-0-3-released.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_posts/2016-02-08-jekyll-3-0-3-released.markdown b/site/_posts/2016-02-08-jekyll-3-0-3-released.markdown index f648cb28a7a..a3dd93c97dc 100644 --- a/site/_posts/2016-02-08-jekyll-3-0-3-released.markdown +++ b/site/_posts/2016-02-08-jekyll-3-0-3-released.markdown @@ -2,7 +2,7 @@ layout: news_item title: 'Jekyll 3.0.3 Released' date: 2016-02-08 10:39:08 -0800 -author: +author: parkr version: 3.0.3 categories: [release] --- From 29a5a3c303c64abf90100cb6928c096c1cf8dc63 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 8 Feb 2016 11:09:42 -0800 Subject: [PATCH 0430/4996] site: A bit better wording on the 3.0.3 release post :tophat: tip to @benbalter for his generous and kind thoughts on my writing. --- site/_posts/2016-02-08-jekyll-3-0-3-released.markdown | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/site/_posts/2016-02-08-jekyll-3-0-3-released.markdown b/site/_posts/2016-02-08-jekyll-3-0-3-released.markdown index a3dd93c97dc..0c260cc696b 100644 --- a/site/_posts/2016-02-08-jekyll-3-0-3-released.markdown +++ b/site/_posts/2016-02-08-jekyll-3-0-3-released.markdown @@ -7,9 +7,10 @@ version: 3.0.3 categories: [release] --- -[GitHub Pages upgraded to Jekyll 3.0.2][1] last week and there has been a -joyous reception so far! This release is to address some bugs that affected -some users during the cut-over. The fixes include: +[GitHub Pages upgraded to Jekyll 3.0.2][1] last week. With a testbed of +over a million sites, this really put Jekyll 3 through the wringer. This +release addresses a handful of bugs that were surfaced as a result. The +fixes: * Fix problem where outputting to a folder would have two extensions * Handle tildes (`~`) in filenames properly From fd0e99ceac011c471a4845398c01d7edeb2883ac Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Mon, 8 Feb 2016 21:08:48 -0500 Subject: [PATCH 0431/4996] fixes parenthesis typo in configuration docs --- site/_docs/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md index 4e78ab7ad9c..7a602b19e94 100644 --- a/site/_docs/configuration.md +++ b/site/_docs/configuration.md @@ -120,7 +120,7 @@ class="flag">flags     (specified on the command-line) that control them.

    Encoding

    - Set the encoding of files by name. Only available for Ruby + Set the encoding of files by name (only available for Ruby 1.9 or later). The default value is utf-8 starting in 2.0.0, and nil before 2.0.0, which will yield the Ruby From e19110954960ae127bf5a4e61807bc6683ae90f4 Mon Sep 17 00:00:00 2001 From: lonnen Date: Tue, 9 Feb 2016 23:46:45 -0800 Subject: [PATCH 0432/4996] add consistency to the deprecation message --- lib/jekyll/deprecator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/deprecator.rb b/lib/jekyll/deprecator.rb index d4ea3c882c2..21449400b28 100644 --- a/lib/jekyll/deprecator.rb +++ b/lib/jekyll/deprecator.rb @@ -22,7 +22,7 @@ def process(args) def no_subcommand(args) if args.size > 0 && args.first =~ /^--/ && !%w(--help --version).include?(args.first) - deprecation_message "Jekyll now uses subcommands instead of just switches. Run `jekyll --help` to find out more." + deprecation_message "Jekyll now uses subcommands instead of just switches. Run `jekyll help` to find out more." abort end end From 99b9c8486cb5fe1984a7a5979422d292aeb366c8 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 10 Feb 2016 15:26:54 -0800 Subject: [PATCH 0433/4996] Update history to reflect merge of #4505 [ci skip] --- History.markdown | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/History.markdown b/History.markdown index adbfb765657..36dc54b6f92 100644 --- a/History.markdown +++ b/History.markdown @@ -9,6 +9,7 @@ * Include .rubocop.yml in Gem (#4437) * LiquidRenderer#parse: parse with line numbers. (#4452) + * add consistency to the deprecation message (#4505) ### Site Enhancements @@ -139,11 +140,11 @@ ### Bug Fixes -* Fix extension weirdness with folders (#4493) -* EntryFilter: only include 'excluded' log on excluded files (#4479) -* `Jekyll.sanitized_path`: escape tildes before sanitizing a questionable path (#4468) -* `LiquidRenderer#parse`: parse with line numbers (#4453) -* `Document#<=>`: protect against nil comparison in dates. (#4446) + * Fix extension weirdness with folders (#4493) + * EntryFilter: only include 'excluded' log on excluded files (#4479) + * `Jekyll.sanitized_path`: escape tildes before sanitizing a questionable path (#4468) + * `LiquidRenderer#parse`: parse with line numbers (#4453) + * `Document#<=>`: protect against nil comparison in dates. (#4446) ## 3.0.2 / 2016-01-20 From 769331d8c24661fd7535752fc70ea45c2dae2917 Mon Sep 17 00:00:00 2001 From: chrisfinazzo Date: Thu, 11 Feb 2016 22:12:02 -0500 Subject: [PATCH 0434/4996] A few grammar fixes --- site/_docs/configuration.md | 3 ++- site/_docs/pages.md | 2 +- site/_docs/posts.md | 10 +++++----- site/_docs/windows.md | 8 ++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md index 7a602b19e94..57044184121 100644 --- a/site/_docs/configuration.md +++ b/site/_docs/configuration.md @@ -500,7 +500,8 @@ defaults: layout: "default" {% endhighlight %} -In this example the `layout` is set to `default` inside the [collection](../collections/) with the name `my_collection`. +In this example, the `layout` is set to `default` inside the +[collection](../collections/) with the name `my_collection`. ### Precedence diff --git a/site/_docs/pages.md b/site/_docs/pages.md index 59b827e2013..32f7f9b85af 100644 --- a/site/_docs/pages.md +++ b/site/_docs/pages.md @@ -86,7 +86,7 @@ might look like: {% endhighlight %} This approach may not suit everyone, but for people who like clean URLs it’s -simple and it works. In the end the decision is yours! +simple and it works. In the end, the decision is yours!

    ProTip™: Use permalink Front Matter Variable
    diff --git a/site/_docs/posts.md b/site/_docs/posts.md index 47f60f3c320..1b3e322b233 100644 --- a/site/_docs/posts.md +++ b/site/_docs/posts.md @@ -6,10 +6,10 @@ permalink: /docs/posts/ One of Jekyll’s best aspects is that it is “blog aware”. What does this mean, exactly? Well, simply put, it means that blogging is baked into Jekyll’s -functionality. If you write articles and publish them online, this means that -you can publish and maintain a blog simply by managing a folder of text-files on -your computer. Compared to the hassle of configuring and maintaining databases -and web-based CMS systems, this will be a welcome change! +functionality. If you write articles and publish them online, you can publish +and maintain a blog simply by managing a folder of text-files on your computer. +Compared to the hassle of configuring and maintaining databases and web-based +CMS systems, this will be a welcome change! ## The Posts Folder @@ -23,7 +23,7 @@ static site. ### Creating Post Files -To create a new post, all you need to do is create a new file in the `_posts` +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: diff --git a/site/_docs/windows.md b/site/_docs/windows.md index 5a1a0a56ffa..ddb0892662b 100644 --- a/site/_docs/windows.md +++ b/site/_docs/windows.md @@ -11,11 +11,11 @@ knowledge and lessons that have been unearthed by Windows users. ## Installation Julian Thilo has written up instructions to get -[Jekyll running on Windows][windows-installation] and it seems to work for most. -The instructions were written for Ruby 2.0.0, but should work for later versions -[prior to 2.2][hitimes-issue]. +[Jekyll running on Windows][windows-installation] and it seems to work for most +people. The instructions were written for Ruby 2.0.0, but should work for later +versions [prior to 2.2][hitimes-issue]. -Alternatively David Burela has written instructions on [how to install Jekyll via Chocolately with 3 command prompt entries](https://davidburela.wordpress.com/2015/11/28/easily-install-jekyll-on-windows-with-3-command-prompt-entries-and-chocolatey/) +Alternatively David Burela has written instructions on [how to install Jekyll via Chocolately with 3 command prompt entries](https://davidburela.wordpress.com/2015/11/28/easily-install-jekyll-on-windows-with-3-command-prompt-entries-and-chocolatey/). ## Encoding From 8d8021e0ac3ac9a3088f39e826cc6283c8bd0104 Mon Sep 17 00:00:00 2001 From: Florian Thomas Date: Sat, 13 Feb 2016 00:06:03 +0100 Subject: [PATCH 0435/4996] require at least cucumber version 2.1.0 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index cd21a668f76..520616be4ee 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ end # group :test do - gem "cucumber" + gem "cucumber", "~> 2.1" gem "jekyll_test_plugin" gem "jekyll_test_plugin_malicious" gem "codeclimate-test-reporter" From bbdbcefbbba4b7cfdcf3de7c935f89b00ddd12f2 Mon Sep 17 00:00:00 2001 From: Juuso Mikkonen Date: Sat, 13 Feb 2016 20:16:09 +0200 Subject: [PATCH 0436/4996] Added amp-jekyll plugin to plugins docs --- site/_docs/plugins.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index 4695f4874c6..7249a8e8d9c 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -738,6 +738,7 @@ LESS.js files during generation. - [Jekyll-Umlauts by Arne Gockeln](https://github.com/webchef/jekyll-umlauts): This generator replaces all german umlauts (äöüß) case sensitive with html. - [Jekyll Flickr Plugin](https://github.com/lawmurray/indii-jekyll-flickr) by [Lawrence Murray](http://www.indii.org): Generates posts for photos uploaded to a Flickr photostream. - [Jekyll::Paginate::Category](https://github.com/midnightSuyama/jekyll-paginate-category): Pagination Generator for Jekyll Category. +- [AMP-Jekyll by Juuso Mikkonen](https://github.com/juusaw/amp-jekyll): Generate [Accelerated Mobile Pages](https://www.ampproject.org) of Jekyll posts. #### Converters From 5fa5c54c1ebd485f10644f7778f9013c2365dc77 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sat, 13 Feb 2016 14:04:36 -0800 Subject: [PATCH 0437/4996] Update history to reflect merge of #4517 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 36dc54b6f92..9719fd2b4c7 100644 --- a/History.markdown +++ b/History.markdown @@ -23,6 +23,7 @@ * Add note about upgrading documentation on jekyllrb.com/help/ (#4484) * Update Rake link (#4496) * Update & prune the short list of example sites (#4374) + * Added amp-jekyll plugin to plugins docs (#4517) ## 3.1.1 / 2016-01-29 From 13bea15bbef75d19a25d28b34bfe2a8dc056af4e Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sat, 13 Feb 2016 14:41:20 -0800 Subject: [PATCH 0438/4996] Update history to reflect merge of #4514 [ci skip] --- History.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.markdown b/History.markdown index 9719fd2b4c7..b4ee67cb308 100644 --- a/History.markdown +++ b/History.markdown @@ -1,5 +1,9 @@ ## HEAD +### Development Fixes + + * require at least cucumber version 2.1.0 (#4514) + ### Bug Fixes * Fix #4427: Make our @config hash symbol accessible. (#4428) From 4c8c59dfcb8b80c8dd3d8df562a9d664be10348c Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sat, 13 Feb 2016 14:42:46 -0800 Subject: [PATCH 0439/4996] Update history to reflect merge of #4512 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index b4ee67cb308..fdea67adbee 100644 --- a/History.markdown +++ b/History.markdown @@ -28,6 +28,7 @@ * Update Rake link (#4496) * Update & prune the short list of example sites (#4374) * Added amp-jekyll plugin to plugins docs (#4517) + * A few grammar fixes (#4512) ## 3.1.1 / 2016-01-29 From abd8fef19bc71a5bc7b770e52c12c427e948bc30 Mon Sep 17 00:00:00 2001 From: bojanland Date: Mon, 15 Feb 2016 00:39:53 -0500 Subject: [PATCH 0440/4996] Update structure.md Two grammatical corrections. :) --- site/_docs/structure.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/_docs/structure.md b/site/_docs/structure.md index f571aea8deb..d4ba3ade6cf 100644 --- a/site/_docs/structure.md +++ b/site/_docs/structure.md @@ -7,9 +7,9 @@ permalink: /docs/structure/ Jekyll is, at its core, a text transformation engine. The concept behind the system is this: you give it text written in your favorite markup language, be that Markdown, Textile, or just plain HTML, and it churns that through a layout -or series of layout files. Throughout that process you can tweak how you want +or a series of layout files. Throughout that process you can tweak how you want the site URLs to look, what data gets displayed in the layout, and more. This -is all done through editing text files, and the static web site is the final +is all done through editing text files; the static web site is the final product. A basic Jekyll site usually looks something like this: From 4cb707960166c6148554b408f3c78c3c2a2d7631 Mon Sep 17 00:00:00 2001 From: toshi Date: Tue, 16 Feb 2016 00:33:28 +0900 Subject: [PATCH 0441/4996] Add jekyll-tagging-related_posts plugin --- site/_docs/plugins.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index 7249a8e8d9c..3236c03bad9 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -860,6 +860,7 @@ LESS.js files during generation. - [Growl Notification Generator by Tate Johnson](https://gist.github.com/490101): Send Jekyll notifications to Growl. - [Growl Notification Hook by Tate Johnson](https://gist.github.com/525267): Better alternative to the above, but requires his “hook” fork. - [Related Posts by Lawrence Woodman](https://github.com/LawrenceWoodman/related_posts-jekyll_plugin): Overrides `site.related_posts` to use categories to assess relationship. +- [jekyll-tagging-related_posts](https://github.com/toshimaru/jekyll-tagging-related_posts): Jekyll related_posts function based on tags (works on Jekyll3). - [Tiered Archives by Eli Naeher](https://gist.github.com/88cda643aa7e3b0ca1e5): Create tiered template variable that allows you to group archives by year and month. - [Jekyll-localization](https://github.com/blackwinter/jekyll-localization): Jekyll plugin that adds localization features to the rendering engine. - [Jekyll-rendering](https://github.com/blackwinter/jekyll-rendering): Jekyll plugin to provide alternative rendering engines. From e4aa45b03f0791068368252169079e5cf3f06258 Mon Sep 17 00:00:00 2001 From: atomicules Date: Mon, 15 Feb 2016 14:33:01 +0000 Subject: [PATCH 0442/4996] Fix titleize_slug so already capitalized words are not dropped Previously `titleize` used `capitalize!` which has the side effect of returning `nil` for anything already starting with a capital letter. This commit changes it to just `capitalize`. Example, before: A file "2016-01-01-This-is-a-title-with-Capitals.markdown" would return "Is A Title With" for `post.title` Example, after: A file "2016-01-01-This-is-a-title-with-Capitals.markdown" will return "This Is A Title With Capitals" for `post.title` Tests added for `titleize_slug` in test_utils.rb Fix problem introduced in 67f842546efa980146778c85fb613e6c9b53dcb4 References #4525 --- lib/jekyll/utils.rb | 2 +- test/test_utils.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index e5d45c6d5e6..5d0dda2e0d9 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -20,7 +20,7 @@ def strip_heredoc(str) def titleize_slug(slug) slug.split("-").map! do |val| - val.capitalize! + val.capitalize end.join(" ") end diff --git a/test/test_utils.rb b/test/test_utils.rb index a2335391dbe..eab0ca1ec41 100644 --- a/test/test_utils.rb +++ b/test/test_utils.rb @@ -206,6 +206,14 @@ class TestUtils < JekyllUnitTest end end + context "The \`Utils.titleize_slug\` method" do + should "capitalize all words and not drop any words" do + assert_equal "This Is A Long Title With Mixed Capitalization", Utils.titleize_slug("This-is-a-Long-title-with-Mixed-capitalization") + assert_equal "This Is A Title With Just The Initial Word Capitalized", Utils.titleize_slug("This-is-a-title-with-just-the-initial-word-capitalized") + assert_equal "This Is A Title With No Capitalization", Utils.titleize_slug("this-is-a-title-with-no-capitalization") + end + end + context "The \`Utils.add_permalink_suffix\` method" do should "handle built-in permalink styles" do assert_equal "/:basename/", Utils.add_permalink_suffix("/:basename", :pretty) From 4d648c85581dbdc646bc7f32985806195e2e1e44 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 15 Feb 2016 20:50:43 -0800 Subject: [PATCH 0443/4996] Update history to reflect merge of #4525 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index fdea67adbee..1e50da10e16 100644 --- a/History.markdown +++ b/History.markdown @@ -8,6 +8,7 @@ * Fix #4427: Make our @config hash symbol accessible. (#4428) * `Jekyll.sanitized_path`: sanitizing a questionable path should handle tildes (#4492) + * Fix titleize so already capitalized words are not dropped (#4525) ### Minor Enhancements From 22f5b1988452974a1e30ced6d694bb8a532a5fdb Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 15 Feb 2016 20:58:11 -0800 Subject: [PATCH 0444/4996] Update history to reflect merge of #4522 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 1e50da10e16..d2dc51a5382 100644 --- a/History.markdown +++ b/History.markdown @@ -30,6 +30,7 @@ * Update & prune the short list of example sites (#4374) * Added amp-jekyll plugin to plugins docs (#4517) * A few grammar fixes (#4512) + * Update structure.md (#4522) ## 3.1.1 / 2016-01-29 From 40928364d495615259560666eb657eea82ac1885 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 15 Feb 2016 20:58:55 -0800 Subject: [PATCH 0445/4996] Updaet history message for #4522 [ci skip] --- History.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/History.markdown b/History.markdown index d2dc51a5382..1341cbd3993 100644 --- a/History.markdown +++ b/History.markdown @@ -30,7 +30,7 @@ * Update & prune the short list of example sites (#4374) * Added amp-jekyll plugin to plugins docs (#4517) * A few grammar fixes (#4512) - * Update structure.md (#4522) + * Correct a couple mistakes in structure.md (#4522) ## 3.1.1 / 2016-01-29 From 84f9bcdd426e5a73ec3e3a94986a786779c24c6a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 15 Feb 2016 21:58:22 -0800 Subject: [PATCH 0446/4996] Update the site history --- README.markdown | 2 -- site/_docs/datafiles.md | 6 +++--- site/_docs/history.md | 10 +++++----- site/_includes/footer.html | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/README.markdown b/README.markdown index 50ec363e2ad..0e37c531468 100644 --- a/README.markdown +++ b/README.markdown @@ -14,8 +14,6 @@ [hakiri]: https://hakiri.io/github/jekyll/jekyll/master [travis]: https://travis-ci.org/jekyll/jekyll -By Tom Preston-Werner, Nick Quaranto, Parker Moore, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)! - Jekyll is a simple, blog-aware, static site generator perfect for personal, project, or organization sites. Think of it like a file-based CMS, without all the complexity. Jekyll takes your content, renders Markdown and Liquid templates, and spits out a complete, static website ready to be served by Apache, Nginx or another web server. Jekyll is the engine behind [GitHub Pages](http://pages.github.com), which you can use to host sites right from your GitHub repositories. ## Philosophy diff --git a/site/_docs/datafiles.md b/site/_docs/datafiles.md index afa54b8fc67..4fd85b4848c 100644 --- a/site/_docs/datafiles.md +++ b/site/_docs/datafiles.md @@ -33,8 +33,8 @@ of code in your Jekyll templates: In `_data/members.yml`: {% highlight yaml %} -- name: Tom Preston-Werner - github: mojombo +- name: Eric Mill + github: konklone - name: Parker Moore github: parkr @@ -47,7 +47,7 @@ Or `_data/members.csv`: {% highlight text %} name,github -Tom Preston-Werner,mojombo +Eric Mill,konklone Parker Moore,parkr Liu Fengyun,liufengyun {% endhighlight %} diff --git a/site/_docs/history.md b/site/_docs/history.md index 6514e2c40f0..c7086d00cfc 100644 --- a/site/_docs/history.md +++ b/site/_docs/history.md @@ -132,11 +132,11 @@ permalink: "/docs/history/" ### Bug Fixes {: #bug-fixes-v3-0-3} -* Fix extension weirdness with folders ([#4493]({{ site.repository }}/issues/4493)) -* EntryFilter: only include 'excluded' log on excluded files ([#4479]({{ site.repository }}/issues/4479)) -* `Jekyll.sanitized_path`: escape tildes before sanitizing a questionable path ([#4468]({{ site.repository }}/issues/4468)) -* `LiquidRenderer#parse`: parse with line numbers ([#4453]({{ site.repository }}/issues/4453)) -* `Document#<=>`: protect against nil comparison in dates. ([#4446]({{ site.repository }}/issues/4446)) +- Fix extension weirdness with folders ([#4493]({{ site.repository }}/issues/4493)) +- EntryFilter: only include 'excluded' log on excluded files ([#4479]({{ site.repository }}/issues/4479)) +- `Jekyll.sanitized_path`: escape tildes before sanitizing a questionable path ([#4468]({{ site.repository }}/issues/4468)) +- `LiquidRenderer#parse`: parse with line numbers ([#4453]({{ site.repository }}/issues/4453)) +- `Document#<=>`: protect against nil comparison in dates. ([#4446]({{ site.repository }}/issues/4446)) ## 3.0.2 / 2016-01-20 diff --git a/site/_includes/footer.html b/site/_includes/footer.html index 09bab7375da..4893510685d 100644 --- a/site/_includes/footer.html +++ b/site/_includes/footer.html @@ -1,7 +1,7 @@
    -

    The contents of this website are © {{ site.time | date: '%Y' }} Tom Preston-Werner under the terms of the MIT License.

    +

    The contents of this website are
    © {{ site.time | date: '%Y' }} under the terms of the MIT License.

    From 5e6aef6138794c6c69e74e8e111d093f4c3db2af Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 15 Feb 2016 21:59:44 -0800 Subject: [PATCH 0447/4996] Update some links on the index page --- site/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/index.html b/site/index.html index a8bda742851..faa87cb380b 100644 --- a/site/index.html +++ b/site/index.html @@ -30,7 +30,7 @@

    Blog-aware

    Permalinks, categories, pages, posts, and custom layouts are all first-class citizens here.

    - Migrate your blog → + Migrate your blog →
    @@ -79,7 +79,7 @@

    Get up and running in seconds.

    Free Jekyll hosting on GitHub Pages

    Free hosting with GitHub Pages

    -

    Sick of dealing with hosting companies? GitHub Pages are powered by Jekyll, so you can easily deploy your site using GitHub for free—custom domain name and all.

    +

    Sick of dealing with hosting companies? GitHub Pages are powered by Jekyll, so you can easily deploy your site using GitHub for free—custom domain name and all.

    Learn more about GitHub Pages →
    From d38d90f2782e630660d3db55ebb3a60f810b0b1d Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 16 Feb 2016 12:54:41 -0800 Subject: [PATCH 0448/4996] Add some redirects. --- site/redirects/github.html | 4 ++++ site/redirects/issues.html | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 site/redirects/github.html create mode 100644 site/redirects/issues.html diff --git a/site/redirects/github.html b/site/redirects/github.html new file mode 100644 index 00000000000..6042d0d068a --- /dev/null +++ b/site/redirects/github.html @@ -0,0 +1,4 @@ +--- +permalink: /github.html +redirect_to: https://github.com/jekyll/jekyll +--- diff --git a/site/redirects/issues.html b/site/redirects/issues.html new file mode 100644 index 00000000000..677605101a1 --- /dev/null +++ b/site/redirects/issues.html @@ -0,0 +1,4 @@ +--- +permalink: /issues.html +redirect_to: https://github.com/jekyll/jekyll/issues +--- From 2bd0d062e11ee2b6bc4187fc00dec7f47f731515 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 17 Feb 2016 10:27:18 -0800 Subject: [PATCH 0449/4996] Add an issue template for new issues --- ISSUE_TEMPLATE.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 ISSUE_TEMPLATE.md diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md new file mode 100644 index 00000000000..37235ea3666 --- /dev/null +++ b/ISSUE_TEMPLATE.md @@ -0,0 +1,18 @@ +###### What version of Jekyll are you using (`jekyll -v`)? + + +###### What operating system are you using? + + + +###### What did you do? + + + +###### What did you expect to see? + + + +###### What did you see instead? + + From 65e7605342bcb08b2582fbe241792bdbb5266c1c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 17 Feb 2016 10:27:48 -0800 Subject: [PATCH 0450/4996] Update ISSUE_TEMPLATE.md --- ISSUE_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 37235ea3666..3a30fdbfc39 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -1,6 +1,7 @@ ###### What version of Jekyll are you using (`jekyll -v`)? + ###### What operating system are you using? From b440d478ea904c6a9a622835629c3e8ae1929211 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 17 Feb 2016 10:33:17 -0800 Subject: [PATCH 0451/4996] Add hint to "What did you do?" --- ISSUE_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 3a30fdbfc39..614de1c9412 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -7,6 +7,7 @@ ###### What did you do? +(Please include the content causing the issue, any relevant configuration settings, and the command you ran) From d387fd0baab65675dbd973189db14359d36e4d54 Mon Sep 17 00:00:00 2001 From: Henry Goodman Date: Wed, 17 Feb 2016 00:29:57 -0800 Subject: [PATCH 0452/4996] Add show_dir_listing option for serve command --- lib/jekyll/commands/serve.rb | 4 ++++ lib/jekyll/configuration.rb | 1 + test/test_commands_serve.rb | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index 29408fe2336..69ea8ba7c3d 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -10,6 +10,8 @@ class << self "ssl_key" => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."], "port" => ["-P", "--port [PORT]", "Port to listen on"], "baseurl" => ["-b", "--baseurl [URL]", "Base URL"], + "show_dir_listing" => ["--show-dir-listing", + "Show a directory listing instead of loading your index file."], "skip_initial_build" => ["skip_initial_build", "--skip-initial-build", "Skips the initial site build which occurs before the server is started."] } @@ -91,6 +93,8 @@ def webrick_opts(opts) ) } + opts[:DirectoryIndex] = [] if opts[:JekyllOptions]['show_dir_listing'] + enable_ssl(opts) enable_logging(opts) opts diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 0f8618a1b8b..cf499aa21f3 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -44,6 +44,7 @@ class Configuration < Hash 'port' => '4000', 'host' => '127.0.0.1', 'baseurl' => '', + 'show_dir_listing' => false, # Output Configuration 'permalink' => 'date', diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb index 87472c3df06..9fd3c1db8e9 100644 --- a/test/test_commands_serve.rb +++ b/test/test_commands_serve.rb @@ -68,6 +68,11 @@ def custom_opts(what) ] end + should "use empty directory index list when show_dir_listing is true" do + opts = { "show_dir_listing" => true } + assert custom_opts(opts)[:DirectoryIndex].empty? + end + context "verbose" do should "debug when verbose" do assert_equal custom_opts({ "verbose" => true })[:Logger].level, 5 From 551f8b751fbe1da8c920ecfd81cf747ce3c1ed74 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 18 Feb 2016 16:56:39 -0800 Subject: [PATCH 0453/4996] `jekyll new` should create a Gemfile which is educational --- lib/jekyll/commands/new.rb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb index 433d33b79f2..0af8553bbfb 100644 --- a/lib/jekyll/commands/new.rb +++ b/lib/jekyll/commands/new.rb @@ -35,6 +35,10 @@ def process(args, options = {}) File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f| f.write(scaffold_post_content) end + + File.open(File.expand_path("Gemfile", new_blog_path), "w") do |f| + f.write(gemfile_contents) + end end Jekyll.logger.info "New jekyll site installed in #{new_blog_path}." @@ -59,6 +63,27 @@ def initialized_post_name end private + + def gemfile_contents + <<-RUBY +source 'https://rubygems.org' + +# Hello! This is where you manage which Jekyll version is used to run. +# When you wwant to use a different version, change it below, save the +# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: +# +# bundle exec jekyll serve +# +# This will help ensure the proper Jekyll version is running. +# Happy Jekylling! +gem 'jekyll', '#{Jekyll::VERSION}' + +# If you have any plugins, put them here! +# group :jekyll_plugins do +# gem 'jekyll-github-metadata', '~> 1.0' +# end +RUBY + end def preserve_source_location?(path, options) !options["force"] && !Dir["#{path}/**/*"].empty? From 7897a1842cd97fa9e602b256129a8862a2737693 Mon Sep 17 00:00:00 2001 From: Michael Lyons Date: Fri, 19 Feb 2016 11:27:46 -0800 Subject: [PATCH 0454/4996] Updated "custom domain name" link on homepage --- site/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/index.html b/site/index.html index faa87cb380b..cda453f11e2 100644 --- a/site/index.html +++ b/site/index.html @@ -79,7 +79,7 @@

    Get up and running in seconds.

    Free Jekyll hosting on GitHub Pages

    Free hosting with GitHub Pages

    -

    Sick of dealing with hosting companies? GitHub Pages are powered by Jekyll, so you can easily deploy your site using GitHub for free—custom domain name and all.

    +

    Sick of dealing with hosting companies? GitHub Pages are powered by Jekyll, so you can easily deploy your site using GitHub for free—custom domain name and all.

    Learn more about GitHub Pages →
    From 3aa80b7d048edcddb246468b6e10c477764f874a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 19 Feb 2016 13:31:18 -0800 Subject: [PATCH 0455/4996] Allow collections to have documents that have no file extension --- features/collections.feature | 27 ++++++++++++------------- lib/jekyll/collection.rb | 2 +- test/source/_methods/collection/entries | 5 +++++ test/test_collections.rb | 1 + test/test_document.rb | 4 ++-- 5 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 test/source/_methods/collection/entries diff --git a/features/collections.feature b/features/collections.feature index ad17a896b99..ac67611edd6 100644 --- a/features/collections.feature +++ b/features/collections.feature @@ -10,7 +10,6 @@ Feature: Collections When I run jekyll build Then I should get a zero exit status And the _site directory should exist - And I should see "Collections:

    Use Jekyll.configuration to build a full configuration for use w/Jekyll.

    \n\n

    Whatever: foo.bar

    \n

    Signs are nice

    \n

    Jekyll.sanitized_path is used to make sure your path is in your source.

    \n

    Run your generators! default

    \n

    Page without title.

    \n

    Run your generators! default

    " in "_site/index.html" And the "_site/methods/configuration.html" file should not exist Scenario: Rendered collection @@ -77,8 +76,8 @@ Feature: Collections """ When I run jekyll build Then I should get a zero exit status - And the _site directory should exist - And I should see "Collections: _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" + Then the _site directory should exist + And I should see "Collections: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" Scenario: Collections specified as an hash Given I have an "index.html" page that contains "Collections: {% for method in site.methods %}{{ method.relative_path }} {% endfor %}" @@ -90,8 +89,8 @@ Feature: Collections """ When I run jekyll build Then I should get a zero exit status - And the _site directory should exist - And I should see "Collections: _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" + Then the _site directory should exist + And I should see "Collections: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" 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 %}" @@ -103,11 +102,11 @@ Feature: Collections """ When I run jekyll build Then I should get a zero exit status - And the _site directory should exist - And I should see "All documents: _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" + Then the _site directory should exist + And I should see "All documents: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" Scenario: Documents have an output attribute, which is the converted HTML - Given I have an "index.html" page that contains "First document's output: {{ site.documents.first.output }}" + Given I have an "index.html" page that contains "Second document's output: {{ site.documents[1].output }}" And I have fixture collections And I have a "_config.yml" file with content: """ @@ -116,8 +115,8 @@ Feature: Collections """ When I run jekyll build Then I should get a zero exit status - And the _site directory should exist - And I should see "First document's output:

    Use Jekyll.configuration to build a full configuration for use w/Jekyll.

    \n\n

    Whatever: foo.bar

    " in "_site/index.html" + Then the _site directory should exist + And I should see "Second document's output:

    Use Jekyll.configuration to build a full configuration for use w/Jekyll.

    \n\n

    Whatever: foo.bar

    " in "_site/index.html" Scenario: Filter documents by where Given I have an "index.html" page that contains "{% assign items = site.methods | where: 'whatever','foo.bar' %}Item count: {{ items.size }}" @@ -133,7 +132,7 @@ Feature: Collections And I should see "Item count: 2" in "_site/index.html" Scenario: Sort by title - Given I have an "index.html" page that contains "{% assign items = site.methods | sort: 'title' %}1. of {{ items.size }}: {{ items.first.output }}" + Given I have an "index.html" page that contains "{% assign items = site.methods | sort: 'title' %}2. of {{ items.size }}: {{ items[1].output }}" And I have fixture collections And I have a "_config.yml" file with content: """ @@ -143,10 +142,10 @@ Feature: Collections When I run jekyll build Then I should get a zero exit status And the _site directory should exist - And I should see "1. of 7:

    Page without title.

    " in "_site/index.html" + And I should see "2. of 8:

    Page without title.

    " in "_site/index.html" Scenario: Sort by relative_path - Given I have an "index.html" page that contains "Collections: {% assign methods = site.methods | sort: 'relative_path' %}{% for method in methods %}{{ method.title }}, {% endfor %}" + Given I have an "index.html" page that contains "Collections: {% assign methods = site.methods | sort: 'relative_path' %}{{ methods | map:"title" | join: ", " }}" And I have fixture collections And I have a "_config.yml" file with content: """ @@ -156,7 +155,7 @@ Feature: Collections When I run jekyll build Then I should get a zero exit status Then the _site directory should exist - And I should see "Collections: Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, Site#generate, YAML with Dots," in "_site/index.html" + And I should see "Collections: Collection#entries, Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, Site#generate," in "_site/index.html" Scenario: Rendered collection with date/dateless filename Given I have an "index.html" page that contains "Collections: {% for method in site.thanksgiving %}{{ method.title }} {% endfor %}" diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb index f0e3333d6a9..11a4f06fe69 100644 --- a/lib/jekyll/collection.rb +++ b/lib/jekyll/collection.rb @@ -78,7 +78,7 @@ def read def entries return [] unless exists? @entries ||= - Utils.safe_glob(collection_dir, ["**", "*.*"]).map do |entry| + Utils.safe_glob(collection_dir, ["**", "*"]).map do |entry| entry["#{collection_dir}/"] = '' entry end diff --git a/test/source/_methods/collection/entries b/test/source/_methods/collection/entries new file mode 100644 index 00000000000..7622ac9ac81 --- /dev/null +++ b/test/source/_methods/collection/entries @@ -0,0 +1,5 @@ +--- +title: "Collection#entries" +--- + +I have no file extension but I should still be a part of the collection. diff --git a/test/test_collections.rb b/test/test_collections.rb index 138bed6bb6b..1ae8696cc7d 100644 --- a/test/test_collections.rb +++ b/test/test_collections.rb @@ -126,6 +126,7 @@ class TestCollections < JekyllUnitTest assert_includes %w[ _methods/configuration.md _methods/sanitized_path.md + _methods/collection/entries _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md diff --git a/test/test_document.rb b/test/test_document.rb index 1197c4da941..d3fac02f1e1 100644 --- a/test/test_document.rb +++ b/test/test_document.rb @@ -12,7 +12,7 @@ def assert_equal_value(key, one, other) "collections" => ["methods"] }) @site.process - @document = @site.collections["methods"].docs.first + @document = @site.collections["methods"].docs.detect {|d| d.relative_path == "_methods/configuration.md" } end should "exist" do @@ -49,7 +49,7 @@ def assert_equal_value(key, one, other) setup do @site = fixture_site({"collections" => ["methods"]}) @site.process - @document = @site.collections["methods"].docs.last + @document = @site.collections["methods"].docs.detect {|d| d.relative_path == "_methods/yaml_with_dots.md" } end should "know its data" do From d929242e2b3db510ff4d23d7c0ef7daa83ab1cb6 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 19 Feb 2016 15:00:28 -0800 Subject: [PATCH 0456/4996] Permalinks which end in a slash should always output HTML Duplicates #4493 for 3.1.1. /cc @jekyll/core --- lib/jekyll/document.rb | 7 +++++-- test/source/_with.dots/mit.txt | 4 ++++ test/source/contacts/humans.txt | 5 +++++ test/test_collections.rb | 2 +- test/test_filters.rb | 2 +- test/test_site.rb | 1 + 6 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 test/source/_with.dots/mit.txt create mode 100644 test/source/contacts/humans.txt diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index fc3633d8e09..10f1203e99a 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -217,8 +217,11 @@ def [](key) def destination(base_directory) dest = site.in_dest_dir(base_directory) path = site.in_dest_dir(dest, URL.unescape_path(url)) - path = File.join(path, "index.html") if url.end_with?("/") - path << output_ext unless path.end_with? output_ext + if url.end_with? "/" + path = File.join(path, "index.html") + else + path << output_ext unless path.end_with? output_ext + end path end diff --git a/test/source/_with.dots/mit.txt b/test/source/_with.dots/mit.txt new file mode 100644 index 00000000000..c366b0df4ed --- /dev/null +++ b/test/source/_with.dots/mit.txt @@ -0,0 +1,4 @@ +--- +--- + +I should be output to `/with.dots/mit/index.html`. diff --git a/test/source/contacts/humans.txt b/test/source/contacts/humans.txt new file mode 100644 index 00000000000..84e2982b561 --- /dev/null +++ b/test/source/contacts/humans.txt @@ -0,0 +1,5 @@ +--- +permalink: /contacts/humans/ +--- + +I should be output to `/contacts/humans/index.html`. diff --git a/test/test_collections.rb b/test/test_collections.rb index 138bed6bb6b..d6d7d7de36d 100644 --- a/test/test_collections.rb +++ b/test/test_collections.rb @@ -203,7 +203,7 @@ class TestCollections < JekyllUnitTest end should "contain one document" do - assert_equal 3, @collection.docs.size + assert_equal 4, @collection.docs.size end should "allow dots in the filename" do diff --git a/test/test_filters.rb b/test/test_filters.rb index ca7cd49d8d8..e9035b96bda 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -285,7 +285,7 @@ def to_liquid assert_equal 2, g["items"].size when "" assert g["items"].is_a?(Array), "The list of grouped items for '' is not an Array." - assert_equal 12, g["items"].size + assert_equal 13, g["items"].size end end end diff --git a/test/test_site.rb b/test/test_site.rb index c06c218e60c..3bb93c35bf0 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -178,6 +178,7 @@ def generate(site) environment.html exploit.md foo.md + humans.txt index.html index.html main.scss From 32c5ac35dd22b00d3ba3770b7747f41ba8335325 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 19 Feb 2016 15:13:15 -0800 Subject: [PATCH 0457/4996] Update history to reflect merge of #4546 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 1341cbd3993..6990ded9dba 100644 --- a/History.markdown +++ b/History.markdown @@ -9,6 +9,7 @@ * Fix #4427: Make our @config hash symbol accessible. (#4428) * `Jekyll.sanitized_path`: sanitizing a questionable path should handle tildes (#4492) * Fix titleize so already capitalized words are not dropped (#4525) + * Permalinks which end in a slash should always output HTML (#4546) ### Minor Enhancements From 05d753f4e00dac7bbdcae98fc86c4118f0f686bc Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 19 Feb 2016 15:40:57 -0800 Subject: [PATCH 0458/4996] Release :gem: v3.1.2 --- History.markdown | 20 ++++----- lib/jekyll/version.rb | 2 +- site/_docs/history.md | 41 +++++++++++++++++++ .../2016-02-19-jekyll-3-1-2-released.markdown | 20 +++++++++ site/latest_version.txt | 2 +- 5 files changed, 73 insertions(+), 12 deletions(-) create mode 100644 site/_posts/2016-02-19-jekyll-3-1-2-released.markdown diff --git a/History.markdown b/History.markdown index 6990ded9dba..14e8e235b3c 100644 --- a/History.markdown +++ b/History.markdown @@ -1,28 +1,28 @@ -## HEAD +## 3.1.2 / 2016-02-19 -### Development Fixes +### Minor Enhancements - * require at least cucumber version 2.1.0 (#4514) + * Include `.rubocop.yml` in Gem (#4437) + * `LiquidRenderer#parse`: parse with line numbers. (#4452) + * Add consistency to the no-subcommand deprecation message (#4505) ### Bug Fixes - * Fix #4427: Make our @config hash symbol accessible. (#4428) + * Fix syntax highlighting in kramdown by making `@config` accessible in the Markdown converter. (#4428) * `Jekyll.sanitized_path`: sanitizing a questionable path should handle tildes (#4492) - * Fix titleize so already capitalized words are not dropped (#4525) + * Fix `titleize` so already capitalized words are not dropped (#4525) * Permalinks which end in a slash should always output HTML (#4546) -### Minor Enhancements +### Development Fixes - * Include .rubocop.yml in Gem (#4437) - * LiquidRenderer#parse: parse with line numbers. (#4452) - * add consistency to the deprecation message (#4505) + * Require at least cucumber version 2.1.0 (#4514) ### Site Enhancements * Add jekyll-toc plugin (#4429) * Docs: Quickstart - added documentation about the `--force` option (#4410) * Fix broken links to the Code of Conduct (#4436) - * upgrade notes: mention trailing slash in permalink; fixes #4440 (#4455) + * Upgrade notes: mention trailing slash in permalink; fixes #4440 (#4455) * Add hooks to the plugin categories toc (#4463) * [add note] Jekyll 3 requires newer version of Ruby. (#4461) * Fix typo in upgrading docs (#4473) diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index 925e0b442d8..ba9ee23828d 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,3 +1,3 @@ module Jekyll - VERSION = '3.1.1' + VERSION = '3.1.2' end diff --git a/site/_docs/history.md b/site/_docs/history.md index c7086d00cfc..b98ea83e94b 100644 --- a/site/_docs/history.md +++ b/site/_docs/history.md @@ -4,6 +4,47 @@ title: History permalink: "/docs/history/" --- +## 3.1.2 / 2016-02-19 +{: #v3-1-2} + +### Minor Enhancements +{: #minor-enhancements-v3-1-2} + +- Include `.rubocop.yml` in Gem ([#4437]({{ site.repository }}/issues/4437)) +- `LiquidRenderer#parse`: parse with line numbers. ([#4452]({{ site.repository }}/issues/4452)) +- Add consistency to the no-subcommand deprecation message ([#4505]({{ site.repository }}/issues/4505)) + +### 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)) +- `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)) + +### Development Fixes +{: #development-fixes-v3-1-2} + +- Require at least cucumber version 2.1.0 ([#4514]({{ site.repository }}/issues/4514)) + +### Site Enhancements +{: #site-enhancements-v3-1-2} + +- Add jekyll-toc plugin ([#4429]({{ site.repository }}/issues/4429)) +- Docs: Quickstart - added documentation about the `--force` option ([#4410]({{ site.repository }}/issues/4410)) +- Fix broken links to the Code of Conduct ([#4436]({{ site.repository }}/issues/4436)) +- Upgrade notes: mention trailing slash in permalink; fixes [#4440]({{ site.repository }}/issues/4440) ([#4455]({{ site.repository }}/issues/4455)) +- Add hooks to the plugin categories toc ([#4463]({{ site.repository }}/issues/4463)) +- [add note] Jekyll 3 requires newer version of Ruby. ([#4461]({{ site.repository }}/issues/4461)) +- Fix typo in upgrading docs ([#4473]({{ site.repository }}/issues/4473)) +- Add note about upgrading documentation on jekyllrb.com/help/ ([#4484]({{ site.repository }}/issues/4484)) +- Update Rake link ([#4496]({{ site.repository }}/issues/4496)) +- Update & prune the short list of example sites ([#4374]({{ site.repository }}/issues/4374)) +- Added amp-jekyll plugin to plugins docs ([#4517]({{ site.repository }}/issues/4517)) +- A few grammar fixes ([#4512]({{ site.repository }}/issues/4512)) +- Correct a couple mistakes in structure.md ([#4522]({{ site.repository }}/issues/4522)) + + ## 3.1.1 / 2016-01-29 {: #v3-1-1} diff --git a/site/_posts/2016-02-19-jekyll-3-1-2-released.markdown b/site/_posts/2016-02-19-jekyll-3-1-2-released.markdown new file mode 100644 index 00000000000..775445107d0 --- /dev/null +++ b/site/_posts/2016-02-19-jekyll-3-1-2-released.markdown @@ -0,0 +1,20 @@ +--- +layout: news_item +title: 'Jekyll 3.1.2 Released!' +date: 2016-02-19 15:24:00 -0800 +author: parkr +version: 3.1.2 +categories: [release] +--- + +Happy Friday from sunny California! Today, we're excited to announce the release of Jekyll v3.1.2, which comes with some crucial bug fixes: + +* If a syntax error is encountered by Liquid, it will now print the line number. +* A nasty war between symbols and strings in our configuration hash caused kramdown syntax highlighting to break. That has been resolved; you stand victorious! +* A tilde at the beginning of a filename will no longer crash Jekyll. +* The `titleize` filter mistakenly dropped words that were already capitalized. Fixed! +* Permalinks which end in a slash will now always output as a folder with an `index.html` inside. + +Nitty-gritty details, like always, are available in the [history](/docs/history/). + +Thanks to those who contributed to this release: Alfred Xing, atomicules, bojanland, Brenton Horne, Carlos Garcés, Cash Costello, Chris, chrisfinazzo, Daniel Schildt, Dean Attali, Florian Thomas, Jordon Bedwell, Juuso Mikkonen, Katya Demidova, lonnen, Manabu Sakai, Michael Lee, Michael Lyons, Mitesh Shah, Nicolas Hoizey, Parker Moore, Pat Hawks, Prayag Verma, Robert Martin, Suriyaa Kudo, and toshi. diff --git a/site/latest_version.txt b/site/latest_version.txt index 94ff29cc4de..ef538c28109 100644 --- a/site/latest_version.txt +++ b/site/latest_version.txt @@ -1 +1 @@ -3.1.1 +3.1.2 From 5d66a12ed4c34e73a4fb6cee5c14c967a0f295f7 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 19 Feb 2016 16:47:24 -0800 Subject: [PATCH 0459/4996] Ship jekyll-docs properly --- jekyll-docs/.gitignore | 3 +++ jekyll-docs/Gemfile | 2 ++ jekyll-docs/Rakefile | 19 ++++++++++++++++++ jekyll-docs/jekyll-docs.gemspec | 21 ++++++++++++++++++++ jekyll-docs/lib/jekyll-docs.rb | 34 +++++++++++++++++++++++++++++++++ 5 files changed, 79 insertions(+) create mode 100644 jekyll-docs/.gitignore create mode 100644 jekyll-docs/Gemfile create mode 100644 jekyll-docs/Rakefile create mode 100644 jekyll-docs/jekyll-docs.gemspec create mode 100644 jekyll-docs/lib/jekyll-docs.rb diff --git a/jekyll-docs/.gitignore b/jekyll-docs/.gitignore new file mode 100644 index 00000000000..70c3dadcdcf --- /dev/null +++ b/jekyll-docs/.gitignore @@ -0,0 +1,3 @@ +jekyll +site +Gemfile.lock diff --git a/jekyll-docs/Gemfile b/jekyll-docs/Gemfile new file mode 100644 index 00000000000..851fabc21dd --- /dev/null +++ b/jekyll-docs/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gemspec diff --git a/jekyll-docs/Rakefile b/jekyll-docs/Rakefile new file mode 100644 index 00000000000..0d103d5293e --- /dev/null +++ b/jekyll-docs/Rakefile @@ -0,0 +1,19 @@ +require "bundler/gem_tasks" +task :build => :init +task :default => :init + +def jekyll_version + ENV.fetch('JEKYLL_VERSION') +end + +task :init do + sh "git clone git://github.com/jekyll/jekyll.git jekyll" unless Dir.exist? "jekyll/.git" + Dir.chdir("jekyll") { sh "git checkout v#{jekyll_version}" } + rm_rf "site" + cp_r "jekyll/site", "site" +end + +task :teardown do + rm_rf "site" + rm_rf "jekyll" +end diff --git a/jekyll-docs/jekyll-docs.gemspec b/jekyll-docs/jekyll-docs.gemspec new file mode 100644 index 00000000000..02c373ccd89 --- /dev/null +++ b/jekyll-docs/jekyll-docs.gemspec @@ -0,0 +1,21 @@ +# coding: utf-8 +require File.expand_path('../../lib/jekyll/version', __FILE__) + +Gem::Specification.new do |spec| + spec.name = 'jekyll-docs' + spec.version = ENV.fetch('JEKYLL_VERSION') + spec.authors = ['Parker Moore'] + spec.email = ['parkrmoore@gmail.com'] + spec.summary = %q{Offline usage documentation for Jekyll.} + spec.homepage = 'http://jekyllrb.com' + spec.license = 'MIT' + + spec.files = `git ls-files -z`.split("\x0").grep(%r{^site/}) + spec.files << "lib/jekyll-docs.rb" + spec.require_paths = ['lib'] + + spec.add_dependency 'jekyll', Jekyll::VERSION + + spec.add_development_dependency 'bundler', '~> 1.7' + spec.add_development_dependency 'rake', '~> 10.0' +end diff --git a/jekyll-docs/lib/jekyll-docs.rb b/jekyll-docs/lib/jekyll-docs.rb new file mode 100644 index 00000000000..76ed922d72e --- /dev/null +++ b/jekyll-docs/lib/jekyll-docs.rb @@ -0,0 +1,34 @@ +require 'rubygems' +require 'jekyll' + +module JekyllDocs + class DocsCommand < Jekyll::Command + class << self + def init_with_program(prog) + prog.command(:docs) do |cmd| + cmd.description "Start a local server for the Jekyll documentation" + cmd.syntax "docs [options]" + cmd.alias :d + + cmd.option "port", "-P", "--port", "Port to listen on." + + cmd.action do |_, opts| + JekyllDocs::DocsCommand.process(opts) + end + end + end + + def process(opts) + Dir.mktmpdir do |dest_dir| + Jekyll::Commands::Serve.process(opts.merge({ + "serving" => true, + "watch" => false, + "config" => File.expand_path("../../site/_config.yml", __FILE__), + "source" => File.expand_path("../../site/", __FILE__), + "destination" => dest_dir + })) + end + end + end + end +end From 391960b55f3c786775ea8d78ac387f97e3f6bc2b Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 19 Feb 2016 16:54:00 -0800 Subject: [PATCH 0460/4996] Add the ability to release jekyll-docs with the right site. --- jekyll-docs/Rakefile | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/jekyll-docs/Rakefile b/jekyll-docs/Rakefile index 0d103d5293e..a86fd4f8b3d 100644 --- a/jekyll-docs/Rakefile +++ b/jekyll-docs/Rakefile @@ -1,14 +1,24 @@ -require "bundler/gem_tasks" -task :build => :init task :default => :init -def jekyll_version +def name + "jekyll-docs".freeze +end + +def gemspec_file + "#{name}.gemspec" +end + +def gem_file + "#{name}-#{version}.gem" +end + +def version ENV.fetch('JEKYLL_VERSION') end task :init do sh "git clone git://github.com/jekyll/jekyll.git jekyll" unless Dir.exist? "jekyll/.git" - Dir.chdir("jekyll") { sh "git checkout v#{jekyll_version}" } + Dir.chdir("jekyll") { sh "git checkout v#{version}" } rm_rf "site" cp_r "jekyll/site", "site" end @@ -17,3 +27,29 @@ task :teardown do rm_rf "site" rm_rf "jekyll" end + +############################################################################# +# +# Packaging tasks +# +############################################################################# + +desc "Release #{name} v#{version}" +task :release => :build do + unless `git branch` =~ /^\* master$/ + puts "You must be on the master branch to release!" + exit! + end + unless `git diff`.empty? + puts "We cannot proceed with uncommitted changes!" + exit! + end + sh "gem push pkg/#{name}-#{version}.gem" +end + +desc "Build #{name} v#{version} into pkg/" +task :build => :init do + mkdir_p "pkg" + sh "gem build #{gemspec_file}" + sh "mv #{gem_file} pkg" +end From 8d7e329a6e62af4373a7f8911b8d76baef7a7652 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 19 Feb 2016 16:54:24 -0800 Subject: [PATCH 0461/4996] Get jekyll-docs working. --- Gemfile | 1 + jekyll-docs.gemspec | 22 ---------------------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 jekyll-docs.gemspec diff --git a/Gemfile b/Gemfile index 520616be4ee..1aa5c5e4205 100644 --- a/Gemfile +++ b/Gemfile @@ -55,6 +55,7 @@ end group :jekyll_optional_dependencies do gem "toml", "~> 0.1.0" gem "coderay", "~> 1.1.0" + gem "jekyll-docs", path: './jekyll-docs' gem "jekyll-gist", "~> 1.0" gem "jekyll-feed", "~> 0.1.3" gem "jekyll-coffeescript", "~> 1.0" diff --git a/jekyll-docs.gemspec b/jekyll-docs.gemspec deleted file mode 100644 index 0a7975a351b..00000000000 --- a/jekyll-docs.gemspec +++ /dev/null @@ -1,22 +0,0 @@ -# coding: utf-8 -lib = File.expand_path('../lib', __FILE__) -$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -require 'jekyll/version' - -Gem::Specification.new do |spec| - spec.name = 'jekyll-docs' - spec.version = Jekyll::VERSION - spec.authors = ['Parker Moore'] - spec.email = ['parkrmoore@gmail.com'] - spec.summary = %q{Offline usage documentation for Jekyll.} - spec.homepage = 'http://jekyllrb.com' - spec.license = 'MIT' - - spec.files = `git ls-files -z`.split("\x0").grep(%r{^site/}) - spec.require_paths = ['lib'] - - spec.add_dependency 'jekyll', Jekyll::VERSION - - spec.add_development_dependency 'bundler', '~> 1.7' - spec.add_development_dependency 'rake', '~> 10.0' -end From 18126d0ebd93568617dc4d38e817ab1b64e54c29 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 19 Feb 2016 16:57:21 -0800 Subject: [PATCH 0462/4996] Fix jekyll-docs command. --- jekyll-docs/jekyll-docs.gemspec | 1 - jekyll-docs/lib/jekyll-docs.rb | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jekyll-docs/jekyll-docs.gemspec b/jekyll-docs/jekyll-docs.gemspec index 02c373ccd89..9751ff52eec 100644 --- a/jekyll-docs/jekyll-docs.gemspec +++ b/jekyll-docs/jekyll-docs.gemspec @@ -1,5 +1,4 @@ # coding: utf-8 -require File.expand_path('../../lib/jekyll/version', __FILE__) Gem::Specification.new do |spec| spec.name = 'jekyll-docs' diff --git a/jekyll-docs/lib/jekyll-docs.rb b/jekyll-docs/lib/jekyll-docs.rb index 76ed922d72e..df8a9b024da 100644 --- a/jekyll-docs/lib/jekyll-docs.rb +++ b/jekyll-docs/lib/jekyll-docs.rb @@ -20,13 +20,15 @@ def init_with_program(prog) def process(opts) Dir.mktmpdir do |dest_dir| - Jekyll::Commands::Serve.process(opts.merge({ + options = opts.merge({ "serving" => true, "watch" => false, "config" => File.expand_path("../../site/_config.yml", __FILE__), - "source" => File.expand_path("../../site/", __FILE__), + "source" => File.expand_path("../../site", __FILE__), "destination" => dest_dir - })) + }) + Jekyll::Commands::Build.process(options) + Jekyll::Commands::Serve.process(options) end end end From fa4d327ddbaaf20a0e7efe35558150861baa242d Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 19 Feb 2016 16:58:40 -0800 Subject: [PATCH 0463/4996] jekyll-docs: use env var --- jekyll-docs/jekyll-docs.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll-docs/jekyll-docs.gemspec b/jekyll-docs/jekyll-docs.gemspec index 9751ff52eec..fcb4ed627b3 100644 --- a/jekyll-docs/jekyll-docs.gemspec +++ b/jekyll-docs/jekyll-docs.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |spec| spec.files << "lib/jekyll-docs.rb" spec.require_paths = ['lib'] - spec.add_dependency 'jekyll', Jekyll::VERSION + spec.add_dependency 'jekyll', ENV.fetch('JEKYLL_VERSION') spec.add_development_dependency 'bundler', '~> 1.7' spec.add_development_dependency 'rake', '~> 10.0' From e9ecb93dec25f3086cc50c9dc53508a1b04d3569 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 19 Feb 2016 17:07:22 -0800 Subject: [PATCH 0464/4996] fix up jekyll-docs --- jekyll-docs/Rakefile | 5 +++++ jekyll-docs/jekyll-docs.gemspec | 3 +-- jekyll-docs/lib/jekyll-docs.rb | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/jekyll-docs/Rakefile b/jekyll-docs/Rakefile index a86fd4f8b3d..770446b7c37 100644 --- a/jekyll-docs/Rakefile +++ b/jekyll-docs/Rakefile @@ -53,3 +53,8 @@ task :build => :init do sh "gem build #{gemspec_file}" sh "mv #{gem_file} pkg" end + +desc "Install #{name} v#{version} into your gem folder." +task :install => :build do + sh "gem install -l pkg/#{gem_file}" +end diff --git a/jekyll-docs/jekyll-docs.gemspec b/jekyll-docs/jekyll-docs.gemspec index fcb4ed627b3..11699172056 100644 --- a/jekyll-docs/jekyll-docs.gemspec +++ b/jekyll-docs/jekyll-docs.gemspec @@ -9,8 +9,7 @@ Gem::Specification.new do |spec| spec.homepage = 'http://jekyllrb.com' spec.license = 'MIT' - spec.files = `git ls-files -z`.split("\x0").grep(%r{^site/}) - spec.files << "lib/jekyll-docs.rb" + spec.files = Dir['**/*'].grep(%r{^(lib|site)/}) spec.require_paths = ['lib'] spec.add_dependency 'jekyll', ENV.fetch('JEKYLL_VERSION') diff --git a/jekyll-docs/lib/jekyll-docs.rb b/jekyll-docs/lib/jekyll-docs.rb index df8a9b024da..8e62f3de55a 100644 --- a/jekyll-docs/lib/jekyll-docs.rb +++ b/jekyll-docs/lib/jekyll-docs.rb @@ -1,5 +1,6 @@ require 'rubygems' require 'jekyll' +require 'tmpdir' module JekyllDocs class DocsCommand < Jekyll::Command From f05e3f340ef5d0c32c20b190521764d4390df142 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 19 Feb 2016 17:16:49 -0800 Subject: [PATCH 0465/4996] Remove jekyll-docs and move to a separate repo. https://github.com/jekyll/jekyll-docs/commit/22ee87af88d4d0f3b7316ed6be0de3a087b99c82 --- jekyll-docs/.gitignore | 3 -- jekyll-docs/Gemfile | 2 -- jekyll-docs/Rakefile | 60 --------------------------------- jekyll-docs/jekyll-docs.gemspec | 19 ----------- jekyll-docs/lib/jekyll-docs.rb | 37 -------------------- 5 files changed, 121 deletions(-) delete mode 100644 jekyll-docs/.gitignore delete mode 100644 jekyll-docs/Gemfile delete mode 100644 jekyll-docs/Rakefile delete mode 100644 jekyll-docs/jekyll-docs.gemspec delete mode 100644 jekyll-docs/lib/jekyll-docs.rb diff --git a/jekyll-docs/.gitignore b/jekyll-docs/.gitignore deleted file mode 100644 index 70c3dadcdcf..00000000000 --- a/jekyll-docs/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -jekyll -site -Gemfile.lock diff --git a/jekyll-docs/Gemfile b/jekyll-docs/Gemfile deleted file mode 100644 index 851fabc21dd..00000000000 --- a/jekyll-docs/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source 'https://rubygems.org' -gemspec diff --git a/jekyll-docs/Rakefile b/jekyll-docs/Rakefile deleted file mode 100644 index 770446b7c37..00000000000 --- a/jekyll-docs/Rakefile +++ /dev/null @@ -1,60 +0,0 @@ -task :default => :init - -def name - "jekyll-docs".freeze -end - -def gemspec_file - "#{name}.gemspec" -end - -def gem_file - "#{name}-#{version}.gem" -end - -def version - ENV.fetch('JEKYLL_VERSION') -end - -task :init do - sh "git clone git://github.com/jekyll/jekyll.git jekyll" unless Dir.exist? "jekyll/.git" - Dir.chdir("jekyll") { sh "git checkout v#{version}" } - rm_rf "site" - cp_r "jekyll/site", "site" -end - -task :teardown do - rm_rf "site" - rm_rf "jekyll" -end - -############################################################################# -# -# Packaging tasks -# -############################################################################# - -desc "Release #{name} v#{version}" -task :release => :build do - unless `git branch` =~ /^\* master$/ - puts "You must be on the master branch to release!" - exit! - end - unless `git diff`.empty? - puts "We cannot proceed with uncommitted changes!" - exit! - end - sh "gem push pkg/#{name}-#{version}.gem" -end - -desc "Build #{name} v#{version} into pkg/" -task :build => :init do - mkdir_p "pkg" - sh "gem build #{gemspec_file}" - sh "mv #{gem_file} pkg" -end - -desc "Install #{name} v#{version} into your gem folder." -task :install => :build do - sh "gem install -l pkg/#{gem_file}" -end diff --git a/jekyll-docs/jekyll-docs.gemspec b/jekyll-docs/jekyll-docs.gemspec deleted file mode 100644 index 11699172056..00000000000 --- a/jekyll-docs/jekyll-docs.gemspec +++ /dev/null @@ -1,19 +0,0 @@ -# coding: utf-8 - -Gem::Specification.new do |spec| - spec.name = 'jekyll-docs' - spec.version = ENV.fetch('JEKYLL_VERSION') - spec.authors = ['Parker Moore'] - spec.email = ['parkrmoore@gmail.com'] - spec.summary = %q{Offline usage documentation for Jekyll.} - spec.homepage = 'http://jekyllrb.com' - spec.license = 'MIT' - - spec.files = Dir['**/*'].grep(%r{^(lib|site)/}) - spec.require_paths = ['lib'] - - spec.add_dependency 'jekyll', ENV.fetch('JEKYLL_VERSION') - - spec.add_development_dependency 'bundler', '~> 1.7' - spec.add_development_dependency 'rake', '~> 10.0' -end diff --git a/jekyll-docs/lib/jekyll-docs.rb b/jekyll-docs/lib/jekyll-docs.rb deleted file mode 100644 index 8e62f3de55a..00000000000 --- a/jekyll-docs/lib/jekyll-docs.rb +++ /dev/null @@ -1,37 +0,0 @@ -require 'rubygems' -require 'jekyll' -require 'tmpdir' - -module JekyllDocs - class DocsCommand < Jekyll::Command - class << self - def init_with_program(prog) - prog.command(:docs) do |cmd| - cmd.description "Start a local server for the Jekyll documentation" - cmd.syntax "docs [options]" - cmd.alias :d - - cmd.option "port", "-P", "--port", "Port to listen on." - - cmd.action do |_, opts| - JekyllDocs::DocsCommand.process(opts) - end - end - end - - def process(opts) - Dir.mktmpdir do |dest_dir| - options = opts.merge({ - "serving" => true, - "watch" => false, - "config" => File.expand_path("../../site/_config.yml", __FILE__), - "source" => File.expand_path("../../site", __FILE__), - "destination" => dest_dir - }) - Jekyll::Commands::Build.process(options) - Jekyll::Commands::Serve.process(options) - end - end - end - end -end From d1c08d85d2e63a63ab476e7b2471e566107b79d9 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 19 Feb 2016 17:18:08 -0800 Subject: [PATCH 0466/4996] Look for local docs if the dir exists. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 1aa5c5e4205..bad462bce52 100644 --- a/Gemfile +++ b/Gemfile @@ -55,7 +55,7 @@ end group :jekyll_optional_dependencies do gem "toml", "~> 0.1.0" gem "coderay", "~> 1.1.0" - gem "jekyll-docs", path: './jekyll-docs' + gem "jekyll-docs", path: '../docs' if Dir.exist?('../docs') gem "jekyll-gist", "~> 1.0" gem "jekyll-feed", "~> 0.1.3" gem "jekyll-coffeescript", "~> 1.0" From 0fd3c2d64c91255e29c28f2755193c7dad64b41c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 19 Feb 2016 17:44:52 -0800 Subject: [PATCH 0467/4996] Release :gem: 3.1.2 From 7bffb3924417b34669a7cf3c34736027c398db1e Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Sat, 20 Feb 2016 12:54:28 -0500 Subject: [PATCH 0468/4996] add jekyll-seo-tag, jekyll-avatar, jekyll-sitemap --- Gemfile | 3 +++ site/_config.yml | 8 ++++++++ site/_includes/news_item.html | 2 +- site/_includes/top.html | 2 +- site/_layouts/news_item.html | 2 +- site/index.html | 1 - 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index bad462bce52..d78513f5cdf 100644 --- a/Gemfile +++ b/Gemfile @@ -81,4 +81,7 @@ group :site do gem "html-proofer", "~> 2.0" end gem "jemoji" + gem "jekyll-sitemap" + gem "jekyll-seo-tag" + gem "jekyll-avatar" end diff --git a/site/_config.yml b/site/_config.yml index 241c5b01762..fe02703acc4 100644 --- a/site/_config.yml +++ b/site/_config.yml @@ -19,7 +19,15 @@ name: Jekyll • Simple, blog-aware, static sites description: Transform your plain text into static websites and blogs url: http://jekyllrb.com +twitter: + username: jekyllrb + +logo: img/logo-2x.png + gems: - jekyll-feed - jekyll-redirect-from - jemoji + - jekyll-sitemap + - jekyll-seo-tag + - jekyll-avatar diff --git a/site/_includes/news_item.html b/site/_includes/news_item.html index aaf0521742d..3ded9925abd 100644 --- a/site/_includes/news_item.html +++ b/site/_includes/news_item.html @@ -14,7 +14,7 @@

    {{ post.date | date_to_string }} - {{ post.author }} avatar + {% avatar {{ post.author}} size=24 %} {{ post.author }} diff --git a/site/_includes/top.html b/site/_includes/top.html index 2d12d1bd929..155ffbcacaf 100644 --- a/site/_includes/top.html +++ b/site/_includes/top.html @@ -2,7 +2,6 @@ - {{ page.title }} {% feed_meta %} @@ -10,6 +9,7 @@ + {% seo %} +- [ ] I believe this to be a bug, not a question about using Jekyll. +- [ ] I Read the CONTRIBUTION file at https://github.com/jekyll/jekyll/blob/master/.github/CONTRIBUTING.markdown +- [ ] I Updated to the latest Jekyll (or) if on Github Pages to the latest `github-pages` +--- -###### What operating system are you using? +- [ ] I am on ***MacOS*** 10+ +- [ ] I am on ***Ubuntu*** GNU/Linux +- [ ] I am on ***Fedora*** GNU/Linux +- [ ] I am on ***Arch*** GNU/Linux +- [ ] I am on ***Other*** GNU/Linux +- [ ] I am on ***Windows*** 10+ + -###### What did you do? -(Please include the content causing the issue, any relevant configuration settings, and the command you ran) +--- +- [ ] I was trying to install. +- [ ] There is a broken Plugin API. +- [ ] I was trying to build. +- [ ] It was another bug. +## My Reproduction Steps -###### What did you expect to see? + +## The Output I Got - -###### What did you see instead? + From 035352feff52725656a8114f4ff85a7fae161bd2 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Thu, 28 Apr 2016 04:28:15 -0500 Subject: [PATCH 0741/4996] Update the ISSUE_TEMPLATE.md file. * Link to jekyllrb.com as @parkr suggested. * Add a few more directions and hints for Github Pages users who have errors. * Add words that were missing and made stuff make no sense. --- .github/ISSUE_TEMPLATE.md | 52 +++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 125a851675d..5265bea4826 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,9 +1,9 @@ - [ ] I believe this to be a bug, not a question about using Jekyll. -- [ ] I Read the CONTRIBUTION file at https://github.com/jekyll/jekyll/blob/master/.github/CONTRIBUTING.markdown - [ ] I Updated to the latest Jekyll (or) if on Github Pages to the latest `github-pages` +- [ ] I Read the CONTRIBUTION file at https://jekyllrb.com/docs/contributing/ +- [ ] This is a feature request. --- -- [ ] I am on ***MacOS*** 10+ -- [ ] I am on ***Ubuntu*** GNU/Linux -- [ ] I am on ***Fedora*** GNU/Linux -- [ ] I am on ***Arch*** GNU/Linux -- [ ] I am on ***Other*** GNU/Linux -- [ ] I am on ***Windows*** 10+ - +- [ ] I am on (or have tested on) ***Mac OS*** 10+ +- [ ] I am on (or have tested on) ***Debian/Ubuntu*** GNU/Linux +- [ ] I am on (or have tested on) ***Fedora*** GNU/Linux +- [ ] I am on (or have tested on) ***Arch*** GNU/Linux +- [ ] I am on (or have tested on) ***Other*** GNU/Linux +- [ ] I am on (or have tested on) ***Windows*** 10+ + + -## The Output I Got +## The Output I Wanted - From d74f8d6dd941b507aa714679d0a2106c7ec657fb Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 28 Apr 2016 17:55:15 -0700 Subject: [PATCH 0742/4996] Fix spacing on the msg in Configuration#renamed_key --- lib/jekyll/configuration.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 735b2c6745d..87bfeb46015 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -286,8 +286,8 @@ def add_default_collections def renamed_key(old, new, config, _ = nil) if config.key?(old) Jekyll::Deprecator.deprecation_message "The '#{old}' configuration" \ - "option has been renamed to '#{new}'. Please update your config " \ - "file accordingly." + " option has been renamed to '#{new}'. Please update your config" \ + " file accordingly." config[new] = config.delete(old) end end From 19b566e6ea22548e4d2540ec56ee375ca2f2b672 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 28 Apr 2016 18:26:29 -0700 Subject: [PATCH 0743/4996] site: use rouge instead of pygments --- site/_config.yml | 2 +- site/_docs/continuous-integration.md | 4 +-- site/_docs/deployment-methods.md | 14 ++++---- site/_docs/installation.md | 8 ++--- site/_docs/pages.md | 4 +-- site/_docs/posts.md | 4 +-- site/_docs/quickstart.md | 2 +- site/_docs/structure.md | 2 +- site/_docs/templates.md | 22 ++++++------ site/_docs/troubleshooting.md | 34 +++++++++---------- site/_docs/upgrading/0-to-2.md | 2 +- site/_docs/upgrading/2-to-3.md | 2 +- site/_docs/usage.md | 8 ++--- site/_docs/windows.md | 2 +- ...01-24-jekyll-3-0-0-beta1-released.markdown | 2 +- 15 files changed, 56 insertions(+), 56 deletions(-) diff --git a/site/_config.yml b/site/_config.yml index a7c596534ca..e284a81bedd 100644 --- a/site/_config.yml +++ b/site/_config.yml @@ -1,5 +1,5 @@ markdown: kramdown -highlighter: pygments +highlighter: rouge permalink: /news/:year/:month/:day/:title/ excerpt_separator: "" diff --git a/site/_docs/continuous-integration.md b/site/_docs/continuous-integration.md index 15e498986c0..8a50afa768d 100644 --- a/site/_docs/continuous-integration.md +++ b/site/_docs/continuous-integration.md @@ -38,7 +38,7 @@ Save the commands you want to run and succeed in a file: `./script/cibuild` ### The HTML Proofer Executable -{% highlight bash %} +{% highlight shell %} #!/usr/bin/env bash set -e # halt script on error @@ -52,7 +52,7 @@ Some options can be specified via command-line switches. Check out the For example to avoid testing external sites, use this command: -{% highlight bash %} +{% highlight shell %} $ bundle exec htmlproofer ./_site --disable-external {% endhighlight %} diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md index 7ec7546fc9b..b516c931b19 100644 --- a/site/_docs/deployment-methods.md +++ b/site/_docs/deployment-methods.md @@ -35,7 +35,7 @@ this](http://web.archive.org/web/20091223025644/http://www.taknado.com/en/2009/0 To have a remote server handle the deploy for you every time you push changes using Git, you can create a user account which has all the public keys that are authorized to deploy in its `authorized_keys` file. With that in place, setting up the post-receive hook is done as follows: -{% highlight bash %} +{% highlight shell %} laptop$ ssh deployer@example.com server$ mkdir myrepo.git server$ cd myrepo.git @@ -47,7 +47,7 @@ server$ mkdir /var/www/myrepo Next, add the following lines to hooks/post-receive and be sure Jekyll is installed on the server: -{% highlight bash %} +{% highlight shell %} GIT_REPO=$HOME/myrepo.git TMP_GIT_CLONE=$HOME/tmp/myrepo PUBLIC_WWW=/var/www/myrepo @@ -61,14 +61,14 @@ exit Finally, run the following command on any users laptop that needs to be able to deploy using this hook: -{% highlight bash %} +{% highlight shell %} laptops$ git remote add deploy deployer@example.com:~/myrepo.git {% endhighlight %} Deploying is now as easy as telling nginx or Apache to look at `/var/www/myrepo` and running the following: -{% highlight bash %} +{% highlight shell %} laptops$ git push deploy master {% endhighlight %} @@ -129,7 +129,7 @@ is to put the restriction to certificate-based authorization in `~/.ssh/authorized_keys`. Then, launch `rrsync` and supply it with the folder it shall have read-write access to: -{% highlight bash %} +{% highlight shell %} command="$HOME/bin/rrsync ",no-agent-forwarding,no-port-forwarding,no-pty,no-user-rc,no-X11-forwarding ssh-rsa {% endhighlight %} @@ -139,7 +139,7 @@ command="$HOME/bin/rrsync ",no-agent-forwarding,no-port-forwarding,no-pt Add the `deploy` script to the site source folder: -{% highlight bash %} +{% highlight shell %} #!/bin/sh rsync -crvz --rsh='ssh -p2222' --delete-after --delete-excluded @: @@ -155,7 +155,7 @@ your host uses a different port than the default (e.g, HostGator) Using this setup, you might run the following command: -{% highlight bash %} +{% highlight shell %} rsync -crvz --rsh='ssh -p2222' --delete-after --delete-excluded _site/ hostuser@example.org: {% endhighlight %} diff --git a/site/_docs/installation.md b/site/_docs/installation.md index e557cb76960..f608a29908f 100644 --- a/site/_docs/installation.md +++ b/site/_docs/installation.md @@ -37,7 +37,7 @@ The best way to install Jekyll is via [RubyGems](http://rubygems.org/pages/download). At the terminal prompt, simply run the following command to install Jekyll: -{% highlight bash %} +{% highlight shell %} $ gem install jekyll {% endhighlight %} @@ -62,14 +62,14 @@ community can improve the experience for everyone. In order to install a pre-release, make sure you have all the requirements installed properly and run: -{% highlight bash %} +{% highlight shell %} gem install jekyll --pre {% endhighlight %} This will install the latest pre-release. If you want a particular pre-release, use the `-v` switch to indicate the version you'd like to install: -{% highlight bash %} +{% highlight shell %} gem install jekyll -v '2.0.0.alpha.1' {% endhighlight %} @@ -77,7 +77,7 @@ If you'd like to install a development version of Jekyll, the process is a bit more involved. This gives you the advantage of having the latest and greatest, but may be unstable. -{% highlight bash %} +{% highlight shell %} $ git clone git://github.com/jekyll/jekyll.git $ cd jekyll $ script/bootstrap diff --git a/site/_docs/pages.md b/site/_docs/pages.md index aaed2e14ba6..48ba3de67bc 100644 --- a/site/_docs/pages.md +++ b/site/_docs/pages.md @@ -46,7 +46,7 @@ directory with a suitable name for the page you want to create. For a site with a homepage, an about page, and a contact page, here’s what the root directory and associated URLs might look like: -{% highlight bash %} +{% highlight shell %} . |-- _config.yml |-- _includes/ @@ -69,7 +69,7 @@ the page URL ends up being the folder name, and the web server will serve up the respective `index.html` file. Here's an example of what this structure might look like: -{% highlight bash %} +{% highlight shell %} . ├── _config.yml ├── _includes/ diff --git a/site/_docs/posts.md b/site/_docs/posts.md index 33710b53e23..2a9bf3faed8 100644 --- a/site/_docs/posts.md +++ b/site/_docs/posts.md @@ -27,7 +27,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: -{% highlight bash %} +{% highlight shell %} YEAR-MONTH-DAY-title.MARKUP {% endhighlight %} @@ -35,7 +35,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: -{% highlight bash %} +{% highlight shell %} 2011-12-31-new-years-eve-is-awesome.md 2012-09-12-how-to-write-a-blog.textile {% endhighlight %} diff --git a/site/_docs/quickstart.md b/site/_docs/quickstart.md index 8a63cb33508..9d3800f5f15 100644 --- a/site/_docs/quickstart.md +++ b/site/_docs/quickstart.md @@ -6,7 +6,7 @@ permalink: /docs/quickstart/ For the impatient, here's how to get a boilerplate Jekyll site up and running. -{% highlight bash %} +{% highlight shell %} ~ $ gem install jekyll ~ $ jekyll new myblog ~ $ cd myblog diff --git a/site/_docs/structure.md b/site/_docs/structure.md index d4ba3ade6cf..227b8491ce9 100644 --- a/site/_docs/structure.md +++ b/site/_docs/structure.md @@ -14,7 +14,7 @@ product. A basic Jekyll site usually looks something like this: -{% highlight bash %} +{% highlight shell %} . ├── _config.yml ├── _drafts diff --git a/site/_docs/templates.md b/site/_docs/templates.md index 663a060db92..1c09cab0787 100644 --- a/site/_docs/templates.md +++ b/site/_docs/templates.md @@ -341,7 +341,7 @@ The default is `default`. They are as follows (with what they filter): If you have small page fragments that you wish to include in multiple places on your site, you can use the `include` tag. -{% highlight ruby %} +{% highlight liquid %} {% raw %}{% include footer.html %}{% endraw %} {% endhighlight %} @@ -362,13 +362,13 @@ root of your source directory. This will embed the contents of You can also pass parameters to an include. Omit the quotation marks to send a variable's value. Liquid curly brackets should not be used here: -{% highlight ruby %} +{% highlight liquid %} {% raw %}{% include footer.html param="value" variable-param=page.variable %}{% endraw %} {% endhighlight %} These parameters are available via Liquid in the include: -{% highlight ruby %} +{% highlight liquid %} {% raw %}{{ include.param }}{% endraw %} {% endhighlight %} @@ -376,7 +376,7 @@ These parameters are available via Liquid in the include: You can also choose to include file fragments relative to the current file: -{% highlight ruby %} +{% highlight liquid %} {% raw %}{% include_relative somedir/footer.html %}{% endraw %} {% endhighlight %} @@ -404,7 +404,7 @@ languages](http://pygments.org/languages/) To render a code block with syntax highlighting, surround your code as follows: -{% highlight text %} +{% highlight liquid %} {% raw %} {% highlight ruby %} def foo @@ -427,7 +427,7 @@ 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: -{% highlight text %} +{% highlight liquid %} {% raw %} {% highlight ruby linenos %} def foo @@ -452,7 +452,7 @@ numbers from the highlighted code. If you would like 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. -{% highlight text %} +{% highlight liquid %} {% raw %} {% post_url 2010-07-21-name-of-post %} {% endraw %} @@ -461,7 +461,7 @@ will generate the correct permalink URL for the post you specify. If you organize your posts in subdirectories, you need to include subdirectory path to the post: -{% highlight text %} +{% highlight liquid %} {% raw %} {% post_url /subdir/2010-07-21-name-of-post %} {% endraw %} @@ -471,7 +471,7 @@ 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: -{% highlight text %} +{% highlight liquid %} {% raw %} [Name of Link]({% post_url 2010-07-21-name-of-post %}) {% endraw %} @@ -482,7 +482,7 @@ You can also use this tag to create a link to a post in Markdown as follows: Use the `gist` tag to easily embed a GitHub Gist onto your site. This works with public or secret gists: -{% highlight text %} +{% highlight liquid %} {% raw %} {% gist parkr/931c1c8d465a04042403 %} {% endraw %} @@ -490,7 +490,7 @@ with public or secret gists: You may also optionally specify the filename in the gist to display: -{% highlight text %} +{% highlight liquid %} {% raw %} {% gist parkr/931c1c8d465a04042403 jekyll-private-gist.markdown %} {% endraw %} diff --git a/site/_docs/troubleshooting.md b/site/_docs/troubleshooting.md index 899f129e05a..c78e7a060dc 100644 --- a/site/_docs/troubleshooting.md +++ b/site/_docs/troubleshooting.md @@ -20,19 +20,19 @@ If you encounter errors during gem installation, you may need to install the header files for compiling extension modules for Ruby 2.0.0. This can be done on Ubuntu or Debian by running: -{% highlight bash %} +{% highlight shell %} sudo apt-get install ruby2.0.0-dev {% endhighlight %} On Red Hat, CentOS, and Fedora systems you can do this by running: -{% highlight bash %} +{% highlight shell %} sudo yum install ruby-devel {% endhighlight %} If you installed the above - specifically on Fedora 23 - but the extensions would still not compile, you are probably running a Fedora image that misses the `redhat-rpm-config` package. To solve this, simply run: -{% highlight bash %} +{% highlight shell %} sudo dnf install redhat-rpm-config {% endhighlight %} @@ -40,7 +40,7 @@ sudo dnf install redhat-rpm-config On [NearlyFreeSpeech](https://www.nearlyfreespeech.net/) you need to run the following commands before installing Jekyll: -{% highlight bash %} +{% highlight shell %} export GEM_HOME=/home/private/gems export GEM_PATH=/home/private/gems:/usr/local/lib/ruby/gems/1.8/ export PATH=$PATH:/home/private/gems/bin @@ -49,7 +49,7 @@ export RB_USER_INSTALL='true' To install RubyGems on Gentoo: -{% highlight bash %} +{% highlight shell %} sudo emerge -av dev-ruby/rubygems {% endhighlight %} @@ -58,21 +58,21 @@ DevKit](https://wiki.github.com/oneclick/rubyinstaller/development-kit). On Mac OS X, you may need to update RubyGems (using `sudo` only if necessary): -{% highlight bash %} +{% highlight shell %} sudo gem update --system {% endhighlight %} If you still have issues, you can download and install new Command Line Tools (such as `gcc`) using the command -{% highlight bash %} +{% highlight shell %} xcode-select --install {% endhighlight %} which may allow you to install native gems using this command (again using `sudo` only if necessary): -{% highlight bash %} +{% highlight shell %} sudo gem install jekyll {% endhighlight %} @@ -90,20 +90,20 @@ 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): -{% highlight bash %} +{% highlight shell %} sudo gem install -n /usr/local/bin jekyll {% endhighlight %} Alternatively, Homebrew can be installed and used to set up Ruby. This can be done as follows: -{% highlight bash %} +{% highlight shell %} ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" {% endhighlight %} Once Homebrew is installed, the second step is easy: -{% highlight bash %} +{% highlight shell %} brew install ruby {% endhighlight %} @@ -119,13 +119,13 @@ which to install Jekyll. If you elect to use one of the above methods to install Ruby, it might be necessary to modify your `$PATH` variable using the following command: -{% highlight bash %} +{% highlight shell %} export PATH=/usr/local/bin:$PATH {% endhighlight %} GUI apps can modify the `$PATH` as follows: -{% highlight bash %} +{% highlight shell %} launchctl setenv PATH "/usr/local/bin:$PATH" {% endhighlight %} @@ -151,19 +151,19 @@ in order to have the `jekyll` executable be available in your Terminal. If you are using base-url option like: -{% highlight bash %} +{% highlight shell %} jekyll serve --baseurl '/blog' {% endhighlight %} … then make sure that you access the site at: -{% highlight bash %} +{% highlight shell %} http://localhost:4000/blog/index.html {% endhighlight %} It won’t work to just access: -{% highlight bash %} +{% highlight shell %} http://localhost:4000/blog {% endhighlight %} @@ -192,7 +192,7 @@ The latest version, version 2.0, seems to break the use of `{{ "{{" }}` in templates. Unlike previous versions, using `{{ "{{" }}` in 2.0 triggers the following error: -{% highlight bash %} +{% highlight shell %} '{{ "{{" }}' was not properly terminated with regexp: /\}\}/ (Liquid::SyntaxError) {% endhighlight %} diff --git a/site/_docs/upgrading/0-to-2.md b/site/_docs/upgrading/0-to-2.md index 84ec90e71b7..9d91b01948a 100644 --- a/site/_docs/upgrading/0-to-2.md +++ b/site/_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: -{% highlight bash %} +{% highlight shell %} $ gem update jekyll {% endhighlight %} diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md index e6fb2366f3d..775937fd07e 100644 --- a/site/_docs/upgrading/2-to-3.md +++ b/site/_docs/upgrading/2-to-3.md @@ -9,7 +9,7 @@ that you'll want to know about. Before we dive in, go ahead and fetch the latest version of Jekyll: -{% highlight bash %} +{% highlight shell %} $ gem update jekyll {% endhighlight %} diff --git a/site/_docs/usage.md b/site/_docs/usage.md index 28c4efb0a06..ee02b508e14 100644 --- a/site/_docs/usage.md +++ b/site/_docs/usage.md @@ -7,7 +7,7 @@ permalink: /docs/usage/ The Jekyll gem makes a `jekyll` executable available to you in your Terminal window. You can use this command in a number of ways: -{% highlight bash %} +{% highlight shell %} $ jekyll build # => The current folder will be generated into ./_site @@ -52,7 +52,7 @@ $ jekyll build --watch 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. -{% highlight bash %} +{% highlight shell %} $ jekyll serve # => A development server will run at http://localhost:4000/ # Auto-regeneration: enabled. Use `--no-watch` to disable. @@ -70,7 +70,7 @@ $ jekyll serve --detach

    -{% highlight bash %} +{% highlight shell %} $ jekyll serve --no-watch # => Same as `jekyll serve` but will not watch for changes. {% endhighlight %} @@ -89,7 +89,7 @@ destination: _deploy Then the following two commands will be equivalent: -{% highlight bash %} +{% highlight shell %} $ jekyll build $ jekyll build --source _source --destination _deploy {% endhighlight %} diff --git a/site/_docs/windows.md b/site/_docs/windows.md index c573747dfc0..ec98dcdeda0 100644 --- a/site/_docs/windows.md +++ b/site/_docs/windows.md @@ -27,7 +27,7 @@ Additionally, you might need to change the code page of the console window to UT in case you get a "Liquid Exception: Incompatible character encoding" error during the site generation process. It can be done with the following command: -{% highlight bash %} +{% highlight shell %} $ chcp 65001 {% endhighlight %} diff --git a/site/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown b/site/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown index 49b35b77d76..9ba83b045a0 100644 --- a/site/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown +++ b/site/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown @@ -20,7 +20,7 @@ to get a feel for what changes are afoot. Key features: To install just run: -{% highlight bash %} +{% highlight shell %} $ gem install jekyll --pre {% endhighlight %} From 342d5a425054cfba494d584fdf44b29efe5690f3 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 28 Apr 2016 18:26:44 -0700 Subject: [PATCH 0744/4996] site: optimize liquid for whitespace removal --- site/_includes/docs_option.html | 12 +++--------- site/_includes/docs_ul.html | 16 +++------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/site/_includes/docs_option.html b/site/_includes/docs_option.html index c2593971921..e7afcc88aa1 100644 --- a/site/_includes/docs_option.html +++ b/site/_includes/docs_option.html @@ -1,11 +1,5 @@ -{% assign items = include.items %} - -{% for item in items %} +{% for item in include.items %} {% assign item_url = item | prepend:"/docs/" | append:"/" %} - - {% for p in site.docs %} - {% if p.url == item_url %} - - {% endif %} - {% endfor %} + {% assign doc = site.docs | where: "url", item_url | first %} + {% endfor %} diff --git a/site/_includes/docs_ul.html b/site/_includes/docs_ul.html index 34b6278a84f..7688328fc20 100644 --- a/site/_includes/docs_ul.html +++ b/site/_includes/docs_ul.html @@ -1,17 +1,7 @@ -{% assign items = include.items %} -
      -{% for item in items %} +{% for item in include.items %} {% assign item_url = item | prepend:"/docs/" | append:"/" %} - - {% if item_url == page.url %} - {% assign c = "current" %} - {% else %} - {% assign c = "" %} - {% endif %} - - {% assign p = site.docs | where:"url",item_url | first %} -
    • {{ p.title }}
      • - + {% assign p = site.docs | where:"url", item_url | first %} +
    • {{ p.title }}
      • {% endfor %}
    From 0ee1a75d16265abc250d0747c5f93bf2ad2daa05 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 28 Apr 2016 18:27:57 -0700 Subject: [PATCH 0745/4996] Update history to reflect merge of #4854 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 7525ba4972d..b7922ae2d03 100644 --- a/History.markdown +++ b/History.markdown @@ -84,6 +84,7 @@ * Organize Form Platforms-as-a-Service into unified list & add FormSpree.io (#4754) * Fixed typo on Configuration page (#4804) * Update FormKeep URL on the Resources doc (#4844) + * site: use liquid & reduce some whitespace noise (#4854) ## 3.1.3 / 2016-04-18 From 46f54e6b94f69d668b372d75722c147a1c3641a0 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Thu, 28 Apr 2016 20:58:05 -0500 Subject: [PATCH 0746/4996] Update Colorator to 1.0 --- jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index 167e424c4d4..62c944148db 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency('kramdown', '~> 1.3') s.add_runtime_dependency('mercenary', '~> 0.3.3') s.add_runtime_dependency('safe_yaml', '~> 1.0') - s.add_runtime_dependency('colorator', '~> 0.1') + s.add_runtime_dependency('colorator', '~> 1.0') s.add_runtime_dependency('rouge', '~> 1.7') s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0') s.add_runtime_dependency('jekyll-watch', '~> 1.1') From b8e7669228ab24342b87d0a480b75f4e68c30a5f Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 28 Apr 2016 19:07:17 -0700 Subject: [PATCH 0747/4996] Update history to reflect merge of #4855 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index b7922ae2d03..83af4a44b6a 100644 --- a/History.markdown +++ b/History.markdown @@ -23,6 +23,7 @@ * Globalize Jekyll's Filters. (#4792) * Gem-based themes (#4595) * Allow symlinks if they point to stuff inside site.source (#4710) + * Update colorator dependency to v1.x (#4855) ### Bug Fixes From 44cf61d241013ad72d616d85624f9202ceb661b4 Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Fri, 29 Apr 2016 06:35:58 -0500 Subject: [PATCH 0748/4996] Fix #4856: Don't rescue LoadError or bundler load errors for Bundler. When it comes to bundler it's smart enough to know what to require, and in casees it's not, it's smart enough to accept :require. In most cases when bundler has a LoadError (or otherwise) it's because there is a problem inside of the Gem itself and when this happens, Jekyll will happily let that error slip when it shouldn't, resulting in a badly placed error that is actually wrong. This corrects that so errors can surface properly. --- lib/jekyll/plugin_manager.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb index 502c4a731b1..45eeaa79506 100644 --- a/lib/jekyll/plugin_manager.rb +++ b/lib/jekyll/plugin_manager.rb @@ -30,16 +30,16 @@ def require_gems def self.require_from_bundler if !ENV["JEKYLL_NO_BUNDLER_REQUIRE"] && File.file?("Gemfile") require "bundler" - Bundler.setup # puts all groups on the load path - required_gems = Bundler.require(:jekyll_plugins) # requires the gems in this group only + + Bundler.setup + required_gems = Bundler.require(:jekyll_plugins) Jekyll.logger.debug("PluginManager:", "Required #{required_gems.map(&:name).join(', ')}") ENV["JEKYLL_NO_BUNDLER_REQUIRE"] = "true" + true else false end - rescue LoadError, Bundler::GemfileNotFound - false end # Check whether a gem plugin is allowed to be used during this build. From 53d6b91fc86c30f18db40fa5defa8f28d73358b1 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 29 Apr 2016 12:22:47 -0700 Subject: [PATCH 0749/4996] Update history to reflect merge of #4857 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 83af4a44b6a..5967f2a6ac4 100644 --- a/History.markdown +++ b/History.markdown @@ -39,6 +39,7 @@ * convertible: use Document::YAML_FRONT_MATTER_REGEXP to parse transformable files (#4786) * Example in the site template should be IANA-approved example.com (#4793) * 3.2.x/master: Fix defaults for Documents (posts/collection docs) (#4808) + * Don't rescue LoadError or bundler load errors for Bundler. (#4857) ### Development Fixes From 55734ee482e58019ca4aedc9ad386de810a4b91d Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 3 May 2016 12:27:37 -0700 Subject: [PATCH 0750/4996] Add jekyll-ideal-image-slider --- site/_docs/plugins.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index 17de8fdc62d..ead3861f090 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -859,6 +859,7 @@ LESS.js files during generation. - [jekyll-figure](https://github.com/paulrobertlloyd/jekyll-figure): A liquid tag for Jekyll that generates `
    ` elements. - [Jekyll Video Embed](https://github.com/eug/jekyll-video-embed): It provides several tags to easily embed videos (e.g. Youtube, Vimeo, UStream and Ted Talks) - [jekyll-i18n_tags](https://github.com/KrzysiekJ/jekyll-i18n_tags): Translate your templates. +- [Jekyll Ideal Image Slider](https://github.com/xHN35RQ/jekyll-ideal-image-slider): Liquid tag plugin to create image sliders using [Ideal Image Slider](https://github.com/gilbitron/Ideal-Image-Slider). #### Collections From 2d8a228b599e7f62e691410d191261f4c25c3bad Mon Sep 17 00:00:00 2001 From: Andrew Artajos Date: Thu, 5 May 2016 09:14:03 +1000 Subject: [PATCH 0751/4996] Fixed a typo Fixed a typo from indend to indent. Just making the code more readable. --- features/support/formatter.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/features/support/formatter.rb b/features/support/formatter.rb index f399a3ce16c..9e82a4e5c95 100644 --- a/features/support/formatter.rb +++ b/features/support/formatter.rb @@ -82,9 +82,9 @@ def after_background(background) # - def background_name(keyword, name, source_line, indend) + def background_name(keyword, name, source_line, indent) print_feature_element_name( - keyword, name, source_line, indend + keyword, name, source_line, indent ) end From 770b6ab0734436876a1eecbc737fee06a33a0152 Mon Sep 17 00:00:00 2001 From: Josh Waller Date: Sat, 7 May 2016 08:37:34 -0400 Subject: [PATCH 0752/4996] Adding pug plugin Jade has been moved to Pug https://github.com/pugjs/pug This was forked from the previous Jade plugin and merged the pug update to maintain the newer version and avoid deprecation usage. --- site/_docs/plugins.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index 17de8fdc62d..80688b53cc2 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -757,6 +757,7 @@ LESS.js files during generation. - [Textile converter](https://github.com/jekyll/jekyll-textile-converter): Convert `.textile` files into HTML. Also includes the `textilize` Liquid filter. - [Slim plugin](https://github.com/slim-template/jekyll-slim): Slim converter and includes for Jekyll with support for Liquid tags. - [Jade plugin by John Papandriopoulos](https://github.com/snappylabs/jade-jekyll-plugin): Jade converter for Jekyll. +- [Pug plugin by Josh Waller](https://github.com/mdxprograms/pug-jekyll-plugin): Pug (previously Jade) converter for Jekyll. - [HAML plugin by Sam Z](https://gist.github.com/517556): HAML converter for Jekyll. - [HAML-Sass Converter by Adam Pearson](https://gist.github.com/481456): Simple HAML-Sass converter for Jekyll. [Fork](https://gist.github.com/528642) by Sam X. - [Sass SCSS Converter by Mark Wolfe](https://gist.github.com/960150): Sass converter which uses the new CSS compatible syntax, based Sam X’s fork above. From d9ab71cb59dfdd98128dee77c788db079d22a490 Mon Sep 17 00:00:00 2001 From: No Date: Sat, 7 May 2016 20:15:16 +0200 Subject: [PATCH 0753/4996] Breadcrumbs integration for Jekyll 3.x --- site/_docs/plugins.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index 17de8fdc62d..e7c0ecffd0d 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -901,6 +901,7 @@ LESS.js files during generation. - [jekyll-paspagon](https://github.com/KrzysiekJ/jekyll-paspagon): Sell your posts in various formats for cryptocurrencies. - [Hawkins](https://github.com/awood/hawkins): Adds a `liveserve` sub-command to Jekyll that incorporates [LiveReload](http://livereload.com/) into your pages while you preview them. No more hitting the refresh button in your browser! - [Jekyll Autoprefixer](https://github.com/vwochnik/jekyll-autoprefixer): Autoprefixer integration for Jekyll +- [Jekyll-breadcrumbs](https://github.com/git-no/jekyll-breadcrumbs): Creates breadcrumbs for Jekyll 3.x, includes features like SEO optimization, optional breadcrumb item translation and more. #### Editors From 4dab3dd4230774f8ae0a5ee0177ec7d19f00a28d Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 10 May 2016 12:33:15 -0700 Subject: [PATCH 0754/4996] Update history to reflect merge of #4874 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 5967f2a6ac4..0549a9fa8b1 100644 --- a/History.markdown +++ b/History.markdown @@ -87,6 +87,7 @@ * Fixed typo on Configuration page (#4804) * Update FormKeep URL on the Resources doc (#4844) * site: use liquid & reduce some whitespace noise (#4854) + * Add jekyll-breadcrumbs to list of third-party plugins (#4874) ## 3.1.3 / 2016-04-18 From 7f3a9e1f40aea6283664bd851d78c5e630f636fa Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 10 May 2016 12:34:02 -0700 Subject: [PATCH 0755/4996] Update history to reflect merge of #4872 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 0549a9fa8b1..034b69a662c 100644 --- a/History.markdown +++ b/History.markdown @@ -88,6 +88,7 @@ * Update FormKeep URL on the Resources doc (#4844) * site: use liquid & reduce some whitespace noise (#4854) * Add jekyll-breadcrumbs to list of third-party plugins (#4874) + * Added Pug converter to list of third-party plugins (#4872) ## 3.1.3 / 2016-04-18 From 92720363e1f8a4b0a5baf1f0f9a3e0e5c6c8ce14 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 10 May 2016 12:35:42 -0700 Subject: [PATCH 0756/4996] Update history to reflect merge of #4863 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 034b69a662c..39b9d91a423 100644 --- a/History.markdown +++ b/History.markdown @@ -89,6 +89,7 @@ * site: use liquid & reduce some whitespace noise (#4854) * Add jekyll-breadcrumbs to list of third-party plugins (#4874) * Added Pug converter to list of third-party plugins (#4872) + * Add jekyll-ideal-image-slider to list of third-party plugins (#4863) ## 3.1.3 / 2016-04-18 From 3751b47c504fe80fff5acd51a58904b5975eff4c Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Sat, 30 Apr 2016 01:16:43 -0500 Subject: [PATCH 0757/4996] Cleanup EntryFilter and make it far more robust. * Allow users to filter directories by ending their path with "/" * Allow users to filter with a Regexp, some scenariors can really require it. * Use Pathutil#in_path? for Symlink verification, it real/expand. This also requires some downstream work in "jekyll-watch" which at this time is not very robust, it doesn't recognize the difference either, and should probably start doing so (what I mean is detecting "/" and using the full path.) --- jekyll.gemspec | 1 + lib/jekyll.rb | 1 + lib/jekyll/entry_filter.rb | 76 +++++++++++++++++++++++++++++--------- test/test_entry_filter.rb | 11 ++++++ 4 files changed, 72 insertions(+), 17 deletions(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index 62c944148db..3f32f0a96d3 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -36,4 +36,5 @@ Gem::Specification.new do |s| s.add_runtime_dependency('rouge', '~> 1.7') s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0') s.add_runtime_dependency('jekyll-watch', '~> 1.1') + s.add_runtime_dependency("pathutil", "~> 0.9") end diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 8afdf06ad4c..ffc1539f373 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -16,6 +16,7 @@ def require_all(path) require 'rubygems' # stdlib +require "pathutil" require 'forwardable' require 'fileutils' require 'time' diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb index cccd05f9117..496bf56f2ad 100644 --- a/lib/jekyll/entry_filter.rb +++ b/lib/jekyll/entry_filter.rb @@ -1,12 +1,15 @@ module Jekyll class EntryFilter - SPECIAL_LEADING_CHARACTERS = ['.', '_', '#', '~'].freeze - attr_reader :site + SPECIAL_LEADING_CHARACTERS = [ + '.', '_', '#', '~' + ].freeze def initialize(site, base_directory = nil) @site = site - @base_directory = derive_base_directory(@site, base_directory.to_s.dup) + @base_directory = derive_base_directory( + @site, base_directory.to_s.dup + ) end def base_directory @@ -14,14 +17,14 @@ def base_directory end def derive_base_directory(site, base_dir) - if base_dir.start_with?(site.source) - base_dir[site.source] = "" - end + base_dir[site.source] = "" if base_dir.start_with?(site.source) base_dir end def relative_to_source(entry) - File.join(base_directory, entry) + File.join( + base_directory, entry + ) end def filter(entries) @@ -33,7 +36,9 @@ def filter(entries) end def included?(entry) - glob_include?(site.include, entry) + glob_include?(site.include, + entry + ) end def special?(entry) @@ -51,25 +56,62 @@ def excluded?(entry) excluded end + # -- + # Check if a file is a symlink. + # NOTE: This can be converted to allowing even in safe, + # since we use Pathutil#in_path? now. + # -- def symlink?(entry) site.safe && File.symlink?(entry) && symlink_outside_site_source?(entry) end + # -- + # NOTE: Pathutil#in_path? gets the realpath. + # @param [] entry the entry you want to validate. + # Check if a path is outside of our given root. + # -- def symlink_outside_site_source?(entry) - ! File.realpath(entry).start_with?(File.realpath(@site.source)) - end - - def ensure_leading_slash(path) - path[0..0] == "/" ? path : "/#{path}" + !Pathutil.new(entry).in_path?( + site.in_source_dir + ) end + # -- + # Check if an entry matches a specific pattern and return true,false. # Returns true if path matches against any glob pattern. - # Look for more detail about glob pattern in method File::fnmatch. + # -- def glob_include?(enum, e) - entry = ensure_leading_slash(e) + entry = Pathutil.new(site.in_source_dir).join(e) enum.any? do |exp| - item = ensure_leading_slash(exp) - File.fnmatch?(item, entry) || entry.start_with?(item) + + # Users who send a Regexp knows what they want to + # exclude, so let them send a Regexp to exclude files, + # we will not bother caring if it works or not, it's + # on them at this point. + + if exp.is_a?(Regexp) + entry =~ exp + + else + item = Pathutil.new(site.in_source_dir).join(exp) + + # If it's a directory they want to exclude, AKA + # ends with a "/" then we will go on to check and + # see if the entry falls within that path and + # exclude it if that's the case. + + if e.end_with?("/") + entry.in_path?( + item + ) + + else + File.fnmatch?(item, entry) || + entry.to_path.start_with?( + item + ) + end + end end end end diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb index d20c9be2d0f..d9e38300bca 100644 --- a/test/test_entry_filter.rb +++ b/test/test_entry_filter.rb @@ -14,6 +14,17 @@ class TestEntryFilter < JekyllUnitTest assert_equal %w[foo.markdown bar.markdown baz.markdown .htaccess], entries end + should "allow regexp filtering" do + files = %w(README.md) + @site.exclude = excludes = [ + /README/ + ] + + assert_empty @site.reader.filter_entries( + files + ) + end + should "filter entries with exclude" do excludes = %w[README TODO vendor/bundle] files = %w[index.html site.css .htaccess vendor] From 209cd6b7296b20e0cf579c219beec59fd0a81cab Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 12 May 2016 12:16:35 -0500 Subject: [PATCH 0758/4996] Update history to reflect merge of #4859 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 39b9d91a423..b0a9c7bad9c 100644 --- a/History.markdown +++ b/History.markdown @@ -24,6 +24,7 @@ * Gem-based themes (#4595) * Allow symlinks if they point to stuff inside site.source (#4710) * Update colorator dependency to v1.x (#4855) + * Move EntryFilter to use Pathutil & fix `glob_include?` (#4859) ### Bug Fixes From 1ae4f513d887c32c335a286ca5373e710095de53 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 12 May 2016 12:19:46 -0500 Subject: [PATCH 0759/4996] Add 'ruby' to pre-filled Gemfile for 'jekyll new' Fixes #4839 --- lib/jekyll/commands/new.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb index 689895be9cf..50838f41e1c 100644 --- a/lib/jekyll/commands/new.rb +++ b/lib/jekyll/commands/new.rb @@ -35,7 +35,7 @@ def process(args, options = {}) File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f| f.write(scaffold_post_content) end - + File.open(File.expand_path("Gemfile", new_blog_path), "w") do |f| f.write(gemfile_contents) end @@ -63,11 +63,12 @@ def initialized_post_name end private - + def gemfile_contents <<-RUBY source "https://rubygems.org" - +ruby RUBY_VERSION + # Hello! This is where you manage which Jekyll version is used to run. # When you want to use a different version, change it below, save the # file and run `bundle install`. Run Jekyll with `bundle exec`, like so: @@ -81,7 +82,7 @@ def gemfile_contents # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. # gem "github-pages", group: :jekyll_plugins - + # If you have any plugins, put them here! # group :jekyll_plugins do # gem "jekyll-github-metadata", "~> 1.0" From 917b47045922a58ad1d85f450137f00b59a0ad46 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 12 May 2016 13:41:53 -0500 Subject: [PATCH 0760/4996] merge rubocop rules with the ones from pages-gem --- .rubocop.yml | 267 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 193 insertions(+), 74 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 1f0ffeb231d..8821744604c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,80 +1,199 @@ -Metrics/MethodLength: { Max: 24 } -Metrics/ClassLength: { Max: 240 } -Metrics/ModuleLength: { Max: 240 } -Metrics/LineLength: { Max: 112 } -Metrics/CyclomaticComplexity: { Max: 8 } -Metrics/PerceivedComplexity: { Max: 8 } -Metrics/ParameterLists: { Max: 4 } -Metrics/MethodLength: { Max: 24 } -Metrics/AbcSize: { Max: 20 } - -Style/IndentHash: { EnforcedStyle: consistent } -Style/HashSyntax: { EnforcedStyle: hash_rockets } -Style/SignalException: { EnforcedStyle: only_raise } -Style/AlignParameters: { EnforcedStyle: with_fixed_indentation } -Style/StringLiteralsInInterpolation: { EnforcedStyle: double_quotes } -Style/MultilineMethodCallIndentation: { EnforcedStyle: indented } -Style/MultilineOperationIndentation: { EnforcedStyle: indented } -Style/FirstParameterIndentation: { EnforcedStyle: consistent } -Style/StringLiterals: { EnforcedStyle: double_quotes } -Style/RegexpLiteral: { EnforcedStyle: slashes } -Style/IndentArray: { EnforcedStyle: consistent } -Style/ExtraSpacing: { AllowForAlignment: true } - -Style/PercentLiteralDelimiters: - PreferredDelimiters: - '%q': '{}' - '%Q': '{}' - '%r': '!!' - '%s': '()' - '%w': '()' - '%W': '()' - '%x': '()' - -Style/AlignArray: { Enabled: false } -Style/StringLiterals: { Enabled: false } -Style/Documentation: { Enabled: false } -Style/DoubleNegation: { Enabled: false } -Style/UnneededCapitalW: { Enabled: false } -Style/EmptyLinesAroundModuleBody: { Enabled: false } -Style/EmptyLinesAroundAccessModifier: { Enabled: false } -Style/BracesAroundHashParameters: { Enabled: false } -Style/SpaceInsideBrackets: { Enabled: false } -Style/IfUnlessModifier: { Enabled: false } -Style/ModuleFunction: { Enabled: false } -Style/RescueModifier: { Enabled: false } -Style/GuardClause: { Enabled: false } -Style/FileName: { Enabled: false } -Lint/UselessAccessModifier: { Enabled: false } -Style/SpaceAroundOperators: { Enabled: false } -Style/RedundantReturn: { Enabled: false } -Style/SingleLineMethods: { Enabled: false } - +--- AllCops: TargetRubyVersion: 2.0 Include: - lib/**/*.rb - Exclude: - - .rubocop.yml - - .codeclimate.yml - - .travis.yml - - .gitignore - - .rspec - - - Gemfile.lock - - CHANGELOG.{md,markdown,txt,textile} - - CONTRIBUTING.{md,markdown,txt,textile} - - readme.{md,markdown,txt,textile} - - README.{md,markdown,txt,textile} - - Readme.{md,markdown,txt,textile} - - ReadMe.{md,markdown,txt,textile} - - COPYING - - LICENSE - - - site/**/* - - test/**/* - - vendor/**/* - - features/**/* + - lib/jekyll/cleaner.rb + - lib/jekyll/collection.rb + - lib/jekyll/command.rb + - lib/jekyll/commands/build.rb + - lib/jekyll/commands/clean.rb + - lib/jekyll/commands/doctor.rb + - lib/jekyll/commands/help.rb + - lib/jekyll/commands/new.rb + - lib/jekyll/commands/serve + - lib/jekyll/commands/serve/servlet.rb + - lib/jekyll/commands/serve.rb + - lib/jekyll/configuration.rb + - lib/jekyll/converter.rb + - lib/jekyll/converters/identity.rb + - lib/jekyll/converters/markdown + - lib/jekyll/converters/markdown/kramdown_parser.rb + - lib/jekyll/converters/markdown/rdiscount_parser.rb + - lib/jekyll/converters/markdown/redcarpet_parser.rb + - lib/jekyll/converters/markdown.rb + - lib/jekyll/converters/smartypants.rb + - lib/jekyll/convertible.rb + - lib/jekyll/deprecator.rb + - lib/jekyll/document.rb + - lib/jekyll/drops/collection_drop.rb + - lib/jekyll/drops/document_drop.rb + - lib/jekyll/drops/drop.rb + - lib/jekyll/drops/jekyll_drop.rb + - lib/jekyll/drops/site_drop.rb + - lib/jekyll/drops/unified_payload_drop.rb + - lib/jekyll/drops/url_drop.rb + - lib/jekyll/entry_filter.rb + - lib/jekyll/errors.rb + - lib/jekyll/excerpt.rb + - lib/jekyll/external.rb + - lib/jekyll/filters.rb + - lib/jekyll/frontmatter_defaults.rb + - lib/jekyll/generator.rb + - lib/jekyll/hooks.rb + - lib/jekyll/layout.rb + - lib/jekyll/liquid_extensions.rb + - lib/jekyll/liquid_renderer/file.rb + - lib/jekyll/liquid_renderer/table.rb + - lib/jekyll/liquid_renderer.rb + - lib/jekyll/log_adapter.rb + - lib/jekyll/page.rb + - lib/jekyll/plugin.rb + - lib/jekyll/plugin_manager.rb + - lib/jekyll/publisher.rb + - lib/jekyll/reader.rb + - lib/jekyll/readers/collection_reader.rb + - lib/jekyll/readers/data_reader.rb + - lib/jekyll/readers/layout_reader.rb + - lib/jekyll/readers/page_reader.rb + - lib/jekyll/readers/post_reader.rb + - lib/jekyll/readers/static_file_reader.rb + - lib/jekyll/regenerator.rb + - lib/jekyll/related_posts.rb + - lib/jekyll/renderer.rb + - lib/jekyll/site.rb + - lib/jekyll/static_file.rb + - lib/jekyll/stevenson.rb + - lib/jekyll/tags/highlight.rb + - lib/jekyll/tags/include.rb + - lib/jekyll/tags/link.rb + - lib/jekyll/tags/post_url.rb + - lib/jekyll/theme.rb + - lib/jekyll/url.rb + - lib/jekyll/utils/ansi.rb + - lib/jekyll/utils/platforms.rb + - lib/jekyll/utils.rb + - lib/jekyll/version.rb + - lib/jekyll.rb + - bin/**/* - script/**/* - - spec/**/* + - vendor/**/* +Lint/AmbiguousRegexpLiteral: + Exclude: + - features/step_definitions.rb +Lint/EndAlignment: + Severity: error +Lint/UnreachableCode: + Severity: error +Lint/UselessAccessModifier: + Enabled: false +Metrics/AbcSize: + Max: 20 +Metrics/ClassLength: + Max: 240 + Exclude: + - !ruby/regexp /features\/.*.rb$/ +Metrics/CyclomaticComplexity: + Max: 8 +Metrics/LineLength: + Max: 90 + Severity: warning + Exclude: + - !ruby/regexp /features\/.*.rb/ +Metrics/MethodLength: + Max: 20 + CountComments: false + Severity: error +Metrics/ModuleLength: + Max: 240 +Metrics/ParameterLists: + Max: 4 +Metrics/PerceivedComplexity: + Max: 8 +Style/Alias: + Enabled: false +Style/AlignArray: + Enabled: false +Style/AlignHash: + SupportedLastArgumentHashStyles: always_ignore +Style/AlignParameters: + EnforcedStyle: with_fixed_indentation + Enabled: false +Style/AndOr: + Severity: error +Style/Attr: + Enabled: false +Style/BracesAroundHashParameters: + Enabled: false +Style/ClassAndModuleChildren: + Enabled: false +Style/Documentation: + Enabled: false + Exclude: + - !ruby/regexp /features\/.*.rb$/ +Style/DoubleNegation: + Enabled: false +Style/EmptyLinesAroundAccessModifier: + Enabled: false +Style/EmptyLinesAroundModuleBody: + Enabled: false +Style/ExtraSpacing: + AllowForAlignment: true +Style/FileName: + Enabled: false +Style/FirstParameterIndentation: + EnforcedStyle: consistent +Style/GuardClause: + Enabled: false +Style/HashSyntax: + EnforcedStyle: hash_rockets + Severity: error +Style/IfUnlessModifier: + Enabled: false +Style/IndentArray: + EnforcedStyle: consistent +Style/IndentHash: + EnforcedStyle: consistent +Style/IndentationWidth: + Severity: error +Style/ModuleFunction: + Enabled: false +Style/MultilineMethodCallIndentation: + EnforcedStyle: indented +Style/MultilineOperationIndentation: + EnforcedStyle: indented +Style/MultilineTernaryOperator: + Severity: error +Style/PercentLiteralDelimiters: + PreferredDelimiters: + "%q": "{}" + "%Q": "{}" + "%r": "{}" + "%s": "()" + "%w": "()" + "%W": "()" + "%x": "()" +Style/RedundantReturn: + Enabled: false +Style/RedundantSelf: + Enabled: false +Style/RegexpLiteral: + EnforcedStyle: slashes +Style/RescueModifier: + Enabled: false +Style/SignalException: + EnforcedStyle: only_raise +Style/SingleLineMethods: + Enabled: false +Style/SpaceAroundOperators: + Enabled: false +Style/SpaceInsideBrackets: + Enabled: false +Style/StringLiterals: + Enabled: false + EnforcedStyle: double_quotes +Style/StringLiteralsInInterpolation: + EnforcedStyle: double_quotes +Style/UnneededCapitalW: + Enabled: false From b28e14bcd6fd8a77aa73a6b5f36ac071f9a248e8 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 12 May 2016 13:42:05 -0500 Subject: [PATCH 0761/4996] create script/fmt to format the code --- script/fmt | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 script/fmt diff --git a/script/fmt b/script/fmt new file mode 100755 index 00000000000..360b6e53419 --- /dev/null +++ b/script/fmt @@ -0,0 +1,3 @@ +#!/bin/sh + +bundle exec rubocop -D $@ From ffe6e0d996b9255277d04131d3ab83024b69bd27 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 12 May 2016 14:00:49 -0500 Subject: [PATCH 0762/4996] rubocop: enforce Style/StringLiterals --- .rubocop.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 8821744604c..92909eec4db 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -191,7 +191,6 @@ Style/SpaceAroundOperators: Style/SpaceInsideBrackets: Enabled: false Style/StringLiterals: - Enabled: false EnforcedStyle: double_quotes Style/StringLiteralsInInterpolation: EnforcedStyle: double_quotes From fa3323ec922ddbf8c0acdb9c4fdcc553ca66b174 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 12 May 2016 14:05:16 -0500 Subject: [PATCH 0763/4996] rubocop: default for Lint/AmbiguousRegexpLiteral --- .rubocop.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 92909eec4db..bee896e680c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -79,9 +79,6 @@ AllCops: - bin/**/* - script/**/* - vendor/**/* -Lint/AmbiguousRegexpLiteral: - Exclude: - - features/step_definitions.rb Lint/EndAlignment: Severity: error Lint/UnreachableCode: From 85e3ce37af98c6e1766bc23caba352aa22768361 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 12 May 2016 14:11:59 -0500 Subject: [PATCH 0764/4996] rubocop: %r should use exclamation marks as delimeters --- .rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index bee896e680c..2aca1299479 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -166,7 +166,7 @@ Style/PercentLiteralDelimiters: PreferredDelimiters: "%q": "{}" "%Q": "{}" - "%r": "{}" + "%r": "!!" "%s": "()" "%w": "()" "%W": "()" From cddc40fef4af06a3e4c46636726af867f474ea43 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 12 May 2016 14:14:44 -0500 Subject: [PATCH 0765/4996] rubocop: exclude test and features files that fail --- .rubocop.yml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index 2aca1299479..7bf38d38ae7 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -76,7 +76,48 @@ AllCops: - lib/jekyll/utils.rb - lib/jekyll/version.rb - lib/jekyll.rb + - features/step_definitions.rb + - features/support/formatter.rb + - features/support/helpers.rb + - test/helper.rb + - test/simplecov_custom_profile.rb + - test/test_ansi.rb + - test/test_cleaner.rb + - test/test_coffeescript.rb + - test/test_collections.rb + - test/test_command.rb + - test/test_commands_serve.rb + - test/test_configuration.rb + - test/test_convertible.rb + - test/test_doctor_command.rb + - test/test_document.rb + - test/test_entry_filter.rb + - test/test_excerpt.rb + - test/test_filters.rb + - test/test_front_matter_defaults.rb + - test/test_generated_site.rb + - test/test_kramdown.rb + - test/test_layout_reader.rb + - test/test_liquid_extensions.rb + - test/test_liquid_renderer.rb + - test/test_log_adapter.rb + - test/test_new_command.rb + - test/test_page.rb + - test/test_path_sanitization.rb + - test/test_plugin_manager.rb + - test/test_rdiscount.rb + - test/test_redcarpet.rb + - test/test_regenerator.rb + - test/test_related_posts.rb + - test/test_sass.rb + - test/test_site.rb + - test/test_static_file.rb + - test/test_tags.rb + - test/test_theme.rb + - test/test_url.rb + - test/test_utils.rb - bin/**/* + - benchmark/**/* - script/**/* - vendor/**/* Lint/EndAlignment: From 419c67094765468a6f96f90c0ea2c78b69c634db Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 12 May 2016 14:17:45 -0500 Subject: [PATCH 0766/4996] travis: run one script/fmt job --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index d88446d60b3..6b24b213938 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,9 @@ matrix: allow_failures: - rvm: *jruby - rvm: *rhead + include: + - rvm: 2.3.0 + env: TEST_SUITE=fmt env: matrix: - TEST_SUITE=test From 3b021c6046b4b981184a985d3d92b7b0538a22f8 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 12 May 2016 14:33:48 -0500 Subject: [PATCH 0767/4996] Move Rubocop gem to :test group in Gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 2d5e86dffa8..54983415f45 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,6 @@ gemspec :name => "jekyll" gem "rake", "~> 11.0" group :development do gem "launchy", "~> 2.3" - gem "rubocop" gem "pry" unless RUBY_ENGINE == "jruby" @@ -15,6 +14,7 @@ end # group :test do + gem "rubocop" gem "cucumber", "~> 2.1" gem "jekyll_test_plugin" gem "jekyll_test_plugin_malicious" From 73ae01b4e5c5bce4966e2b5d2e49868b0827f740 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 12 May 2016 14:45:02 -0500 Subject: [PATCH 0768/4996] Update history to reflect merge of #4886 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index b0a9c7bad9c..de4a4b640d5 100644 --- a/History.markdown +++ b/History.markdown @@ -53,6 +53,7 @@ * Fix many warnings (#4537) * Don't blindly assume the last system when determining "open" cmd (#4717) * Fix "locally" typo in contributing documentation (#4756) + * Update Rubocop rules (#4886) ### Site Enhancements From 5258f78a51620adc84f95d48b460eeaca264adcd Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 12 May 2016 14:54:40 -0500 Subject: [PATCH 0769/4996] Add Jekyll Tips and the Cheatsheet to the list of resources --- site/_docs/resources.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/_docs/resources.md b/site/_docs/resources.md index 64f250ecd89..6d585a599dd 100644 --- a/site/_docs/resources.md +++ b/site/_docs/resources.md @@ -8,6 +8,8 @@ Jekyll’s growing use is producing a wide variety of tutorials, frameworks, ext ### Useful Guides +- [Jekyll Tips](http://jekyll.tips) is a set of resources created by [CloudCannon](https://cloudcannon.com) to help folks get up and running with Jekyll. The cover all skill levels, and even include some great video tutorials. +- [Jekyll Cheatsheet](http://cheat.jekyll.tips) is a single-page resource for Jekyll filters, variables, and the like. - [“Creating and Hosting a Personal Site on GitHub”](http://jmcglone.com/guides/github-pages/) - [‘Build A Blog With Jekyll And GitHub Pages’ on Smashing Magazine](http://www.smashingmagazine.com/2014/08/01/build-blog-jekyll-github-pages/) - Publishing to GitHub Pages? [Check out our documentation page for just that purpose](/docs/github-pages/). From 207e4df3de9c8da6b02c38f5e8ed9c570869929b Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 12 May 2016 14:56:49 -0500 Subject: [PATCH 0770/4996] Update history to reflect merge of #4887 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index de4a4b640d5..552f0c10bee 100644 --- a/History.markdown +++ b/History.markdown @@ -92,6 +92,7 @@ * Add jekyll-breadcrumbs to list of third-party plugins (#4874) * Added Pug converter to list of third-party plugins (#4872) * Add jekyll-ideal-image-slider to list of third-party plugins (#4863) + * Add Jekyll Tips and the Cheatsheet to the list of resources (#4887) ## 3.1.3 / 2016-04-18 From f2bad8524fd2cd1501b2d72cb4ac899f416fb4ef Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 12 May 2016 15:25:10 -0500 Subject: [PATCH 0771/4996] Update history to reflect merge of #4849 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 552f0c10bee..7068efe00d5 100644 --- a/History.markdown +++ b/History.markdown @@ -54,6 +54,7 @@ * Don't blindly assume the last system when determining "open" cmd (#4717) * Fix "locally" typo in contributing documentation (#4756) * Update Rubocop rules (#4886) + * Flesh out the issue template to be much more detailed (#4849) ### Site Enhancements From 6f89fd5f3fb27ff13230c67d40b8d8cb4f1dd2c9 Mon Sep 17 00:00:00 2001 From: TheLucasMoore Date: Thu, 12 May 2016 16:58:17 -0500 Subject: [PATCH 0772/4996] clean.rb passing rubocop --- .rubocop.yml | 1 - lib/jekyll/commands/clean.rb | 17 +++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 7bf38d38ae7..b6fe2cc3187 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -8,7 +8,6 @@ AllCops: - lib/jekyll/collection.rb - lib/jekyll/command.rb - lib/jekyll/commands/build.rb - - lib/jekyll/commands/clean.rb - lib/jekyll/commands/doctor.rb - lib/jekyll/commands/help.rb - lib/jekyll/commands/new.rb diff --git a/lib/jekyll/commands/clean.rb b/lib/jekyll/commands/clean.rb index ca19d9b581c..addf11a2f95 100644 --- a/lib/jekyll/commands/clean.rb +++ b/lib/jekyll/commands/clean.rb @@ -4,8 +4,9 @@ class Clean < Command class << self def init_with_program(prog) prog.command(:clean) do |c| - c.syntax 'clean [subcommand]' - c.description 'Clean the site (removes site output and metadata file) without building.' + c.syntax "clean [subcommand]" + c.description "Clean the site + (removes site output and metadata file) without building." add_build_options(c) @@ -17,13 +18,13 @@ def init_with_program(prog) 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') + destination = options["destination"] + metadata_file = File.join(options["source"], ".jekyll-metadata") + sass_cache = File.join(options["source"], ".sass-cache") - remove(destination, checker_func: :directory?) - remove(metadata_file, checker_func: :file?) - remove(sass_cache, checker_func: :directory?) + remove(destination, :checker_func => :directory?) + remove(metadata_file, :checker_func => :file?) + remove(sass_cache, :checker_func => :directory?) end def remove(filename, checker_func: :file?) From 26d0a8db77086f69d3ae279a785844ee8ca098fa Mon Sep 17 00:00:00 2001 From: TheLucasMoore Date: Thu, 12 May 2016 19:11:58 -0500 Subject: [PATCH 0773/4996] Passing RuboCop for commands --- .rubocop.yml | 7 ---- lib/jekyll/commands/build.rb | 27 ++++++++------- lib/jekyll/commands/clean.rb | 4 +-- lib/jekyll/commands/doctor.rb | 13 ++++---- lib/jekyll/commands/help.rb | 7 ++-- lib/jekyll/commands/new.rb | 49 +++++++++++++++------------- lib/jekyll/commands/serve.rb | 26 +++++++-------- lib/jekyll/commands/serve/servlet.rb | 4 +-- 8 files changed, 70 insertions(+), 67 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index b6fe2cc3187..dc57b94d715 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,13 +7,6 @@ AllCops: - lib/jekyll/cleaner.rb - lib/jekyll/collection.rb - lib/jekyll/command.rb - - lib/jekyll/commands/build.rb - - lib/jekyll/commands/doctor.rb - - lib/jekyll/commands/help.rb - - lib/jekyll/commands/new.rb - - lib/jekyll/commands/serve - - lib/jekyll/commands/serve/servlet.rb - - lib/jekyll/commands/serve.rb - lib/jekyll/configuration.rb - lib/jekyll/converter.rb - lib/jekyll/converters/identity.rb diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb index baa4e88a767..cef13c91bdf 100644 --- a/lib/jekyll/commands/build.rb +++ b/lib/jekyll/commands/build.rb @@ -5,8 +5,8 @@ class << self # Create the Mercenary command for the Jekyll CLI for this Command def init_with_program(prog) prog.command(:build) do |c| - c.syntax 'build [options]' - c.description 'Build your site' + c.syntax "build [options]" + c.description "Build your site" c.alias :b add_build_options(c) @@ -27,15 +27,17 @@ def process(options) options = configuration_from_options(options) site = Jekyll::Site.new(options) - if options.fetch('skip_initial_build', false) - Jekyll.logger.warn "Build Warning:", "Skipping the initial build. This may result in an out-of-date site." + if options.fetch("skip_initial_build", false) + Jekyll.logger.warn "Build Warning:", "Skipping the initial build." \ + " This may result in an out-of-date site." else build(site, options) end - if options.fetch('detach', false) - Jekyll.logger.info "Auto-regeneration:", "disabled when running server detached." - elsif options.fetch('watch', false) + if options.fetch("detach", false) + Jekyll.logger.info "Auto-regeneration:", + "disabled when running server detached." + elsif options.fetch("watch", false) watch(site, options) else Jekyll.logger.info "Auto-regeneration:", "disabled. Use --watch to enable." @@ -50,12 +52,13 @@ def process(options) # Returns nothing. def build(site, options) t = Time.now - source = options['source'] - destination = options['destination'] - incremental = options['incremental'] + source = options["source"] + destination = options["destination"] + incremental = options["incremental"] Jekyll.logger.info "Source:", source Jekyll.logger.info "Destination:", destination - Jekyll.logger.info "Incremental build:", (incremental ? "enabled" : "disabled. Enable with --incremental") + Jekyll.logger.info "Incremental build:", + (incremental ? "enabled" : "disabled. Enable with --incremental") Jekyll.logger.info "Generating..." process_site(site) Jekyll.logger.info "", "done in #{(Time.now - t).round(3)} seconds." @@ -68,7 +71,7 @@ def build(site, options) # # Returns nothing. def watch(_site, options) - External.require_with_graceful_fail 'jekyll-watch' + External.require_with_graceful_fail "jekyll-watch" Jekyll::Watcher.watch(options) end end # end of class << self diff --git a/lib/jekyll/commands/clean.rb b/lib/jekyll/commands/clean.rb index addf11a2f95..3a44d59683e 100644 --- a/lib/jekyll/commands/clean.rb +++ b/lib/jekyll/commands/clean.rb @@ -5,8 +5,8 @@ class << self def init_with_program(prog) prog.command(:clean) do |c| c.syntax "clean [subcommand]" - c.description "Clean the site - (removes site output and metadata file) without building." + c.description "Clean the site " \ + "(removes site output and metadata file) without building." add_build_options(c) diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index 5c48d5bebc9..68caa2e014f 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -4,11 +4,12 @@ class Doctor < Command class << self def init_with_program(prog) prog.command(:doctor) do |c| - c.syntax 'doctor' - c.description 'Search site and print specific deprecation warnings' + c.syntax "doctor" + c.description "Search site and print specific deprecation warnings" c.alias(:hyde) - c.option 'config', '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file' + c.option "config", "--config CONFIG_FILE[,CONFIG_FILE2,...]", Array, + "Custom configuration file" c.action do |_, options| Jekyll::Commands::Doctor.process(options) @@ -37,7 +38,7 @@ def healthy?(site) end def deprecated_relative_permalinks(site) - if site.config['relative_permalinks'] + if site.config["relative_permalinks"] Jekyll::Deprecator.deprecation_message "Your site still uses relative" \ " permalinks, which was removed in" \ " Jekyll v3.0.0." @@ -78,7 +79,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 do |_case_insensitive_url, real_urls| next unless real_urls.uniq.size > 1 urls_only_differ_by_case = true Jekyll.logger.warn "Warning:", "The following URLs only differ" \ @@ -102,7 +103,7 @@ def collect_urls(urls, things, destination) end def case_insensitive_urls(things, destination) - things.inject({}) do |memo, thing| + things.each_with_object({}) do |memo, thing| dest = thing.destination(destination) (memo[dest.downcase] ||= []) << dest memo diff --git a/lib/jekyll/commands/help.rb b/lib/jekyll/commands/help.rb index 01bf3280141..b4f136bf3e5 100644 --- a/lib/jekyll/commands/help.rb +++ b/lib/jekyll/commands/help.rb @@ -4,8 +4,8 @@ class Help < Command class << self def init_with_program(prog) prog.command(:help) do |c| - c.syntax 'help [subcommand]' - c.description 'Show the help message, optionally for a given subcommand.' + c.syntax "help [subcommand]" + c.description "Show the help message, optionally for a given subcommand." c.action do |args, _| cmd = (args.first || "").to_sym @@ -22,7 +22,8 @@ def init_with_program(prog) end def invalid_command(prog, cmd) - Jekyll.logger.error "Error:", "Hmm... we don't know what the '#{cmd}' command is." + Jekyll.logger.error "Error:", + "Hmm... we don't know what the '#{cmd}' command is." Jekyll.logger.info "Valid commands:", prog.commands.keys.join(", ") end end diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb index 50838f41e1c..c44379eb6df 100644 --- a/lib/jekyll/commands/new.rb +++ b/lib/jekyll/commands/new.rb @@ -1,4 +1,4 @@ -require 'erb' +require "erb" module Jekyll module Commands @@ -6,11 +6,11 @@ class New < Command class << self def init_with_program(prog) prog.command(:new) do |c| - c.syntax 'new PATH' - c.description 'Creates a new Jekyll site scaffold in PATH' + c.syntax "new PATH" + c.description "Creates a new Jekyll site scaffold in PATH" - c.option 'force', '--force', 'Force creation even if PATH already exists' - c.option 'blank', '--blank', 'Creates scaffolding but with empty files' + c.option "force", "--force", "Force creation even if PATH already exists" + c.option "blank", "--blank", "Creates scaffolding but with empty files" c.action do |args, options| Jekyll::Commands::New.process(args, options) @@ -19,27 +19,16 @@ def init_with_program(prog) end def process(args, options = {}) - raise ArgumentError.new('You must specify a path.') if args.empty? + raise ArgumentError, "You must specify a path." if args.empty? new_blog_path = File.expand_path(args.join(" "), Dir.pwd) FileUtils.mkdir_p new_blog_path if preserve_source_location?(new_blog_path, options) - Jekyll.logger.abort_with "Conflict:", "#{new_blog_path} exists and is not empty." + Jekyll.logger.abort_with "Conflict:", + "#{new_blog_path} exists and is not empty." end - if options["blank"] - create_blank_site new_blog_path - else - create_sample_files new_blog_path - - File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f| - f.write(scaffold_post_content) - end - - File.open(File.expand_path("Gemfile", new_blog_path), "w") do |f| - f.write(gemfile_contents) - end - end + if_blank_options Jekyll.logger.info "New jekyll site installed in #{new_blog_path}." end @@ -59,7 +48,7 @@ def scaffold_post_content # # Returns the filename of the sample post, as a String def initialized_post_name - "_posts/#{Time.now.strftime('%Y-%m-%d')}-welcome-to-jekyll.markdown" + "_posts/#{Time.now.strftime("%Y-%m-%d")}-welcome-to-jekyll.markdown" end private @@ -95,7 +84,7 @@ def preserve_source_location?(path, options) end def create_sample_files(path) - FileUtils.cp_r site_template + '/.', path + FileUtils.cp_r site_template + "/.", path FileUtils.rm File.expand_path(scaffold_path, path) end @@ -106,6 +95,22 @@ def site_template def scaffold_path "_posts/0000-00-00-welcome-to-jekyll.markdown.erb" end + + def if_blank_options + if options["blank"] + create_blank_site new_blog_path + else + create_sample_files new_blog_path + + File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f| + f.write(scaffold_post_content) + end + + File.open(File.expand_path("Gemfile", new_blog_path), "w") do |f| + f.write(gemfile_contents) + end + end + end end end end diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index 1482dbed0fd..7f0d0f842f4 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -14,7 +14,7 @@ class << self "Show a directory listing instead of loading your index file."], "skip_initial_build" => ["skip_initial_build", "--skip-initial-build", "Skips the initial site build which occurs before the server is started."] - } + }.freeze # @@ -93,7 +93,7 @@ def webrick_opts(opts) ) } - opts[:DirectoryIndex] = [] if opts[:JekyllOptions]['show_dir_listing'] + opts[:DirectoryIndex] = [] if opts[:JekyllOptions]["show_dir_listing"] enable_ssl(opts) enable_logging(opts) @@ -107,7 +107,7 @@ def file_handler_opts WEBrick::Config::FileHandler.merge({ :FancyIndexing => true, :NondisclosureName => [ - '.ht*', '~*' + ".ht*", "~*" ] }) end @@ -116,12 +116,12 @@ def file_handler_opts private def server_address(server, opts) - "%{prefix}://%{address}:%{port}%{baseurl}" % { + format("%{prefix}://%{address}:%{port}%{baseurl}", { :prefix => server.config[:SSLEnable] ? "https" : "http", :baseurl => opts["baseurl"] ? "#{opts["baseurl"]}/" : "", :address => server.config[:BindAddress], :port => server.config[:Port] - } + }) end # @@ -173,20 +173,20 @@ def enable_logging(opts) private def enable_ssl(opts) return if !opts[:JekyllOptions]["ssl_cert"] && !opts[:JekyllOptions]["ssl_key"] - if !opts[:JekyllOptions]["ssl_cert"] || !opts[:JekyllOptions]["ssl_key"] - raise RuntimeError, "--ssl-cert or --ssl-key missing." - end - require "openssl" require "webrick/https" - source_key = Jekyll.sanitized_path(opts[:JekyllOptions]["source"], opts[:JekyllOptions]["ssl_key" ]) - source_certificate = Jekyll.sanitized_path(opts[:JekyllOptions]["source"], opts[:JekyllOptions]["ssl_cert"]) - opts[:SSLCertificate] = OpenSSL::X509::Certificate.new(File.read(source_certificate)) + source_key = Jekyll.sanitized_path(opts[:JekyllOptions]["source"], \ + opts[:JekyllOptions]["ssl_key" ]) + source_certificate = Jekyll.sanitized_path(opts[:JekyllOptions]["source"], \ + opts[:JekyllOptions]["ssl_cert"]) + opts[:SSLCertificate] = + OpenSSL::X509::Certificate.new(File.read(source_certificate)) opts[:SSLPrivateKey ] = OpenSSL::PKey::RSA.new(File.read(source_key)) opts[:SSLEnable] = true end private + def start_callback(detached) unless detached proc do @@ -197,7 +197,7 @@ def start_callback(detached) private def mime_types - file = File.expand_path('../mime.types', File.dirname(__FILE__)) + file = File.expand_path("../mime.types", File.dirname(__FILE__)) WEBrick::HTTPUtils.load_mime_types(file) end end diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb index bb4afe5a57b..d7c52af9f88 100644 --- a/lib/jekyll/commands/serve/servlet.rb +++ b/lib/jekyll/commands/serve/servlet.rb @@ -7,7 +7,7 @@ class Servlet < WEBrick::HTTPServlet::FileHandler DEFAULTS = { "Cache-Control" => "private, max-age=0, proxy-revalidate, " \ "no-store, no-cache, must-revalidate" - } + }.freeze def initialize(server, root, callbacks) # So we can access them easily. @@ -27,7 +27,7 @@ def search_file(req, res, basename) # - def do_GET(req, res) + def do_get(req, res) rtn = super validate_and_ensure_charset(req, res) res.header.merge!(@headers) From 894d1fe21e32aae70b5f1a63850cc9cb8ffb7fb5 Mon Sep 17 00:00:00 2001 From: TheLucasMoore Date: Thu, 12 May 2016 19:42:04 -0500 Subject: [PATCH 0774/4996] Tests Passing. Three RuboCop revisions remain --- lib/jekyll/commands/doctor.rb | 3 +-- lib/jekyll/commands/new.rb | 30 +++++++++++++----------------- lib/jekyll/commands/serve.rb | 3 +++ 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index 68caa2e014f..0c4f52f867e 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -103,10 +103,9 @@ def collect_urls(urls, things, destination) end def case_insensitive_urls(things, destination) - things.each_with_object({}) do |memo, thing| + things.each_with_object({}) do |thing, memo| dest = thing.destination(destination) (memo[dest.downcase] ||= []) << dest - memo end end end diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb index c44379eb6df..4bfcca0fad7 100644 --- a/lib/jekyll/commands/new.rb +++ b/lib/jekyll/commands/new.rb @@ -28,7 +28,19 @@ def process(args, options = {}) "#{new_blog_path} exists and is not empty." end - if_blank_options + if options["blank"] + create_blank_site new_blog_path + else + create_sample_files new_blog_path + + File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f| + f.write(scaffold_post_content) + end + + File.open(File.expand_path("Gemfile", new_blog_path), "w") do |f| + f.write(gemfile_contents) + end + end Jekyll.logger.info "New jekyll site installed in #{new_blog_path}." end @@ -95,22 +107,6 @@ def site_template def scaffold_path "_posts/0000-00-00-welcome-to-jekyll.markdown.erb" end - - def if_blank_options - if options["blank"] - create_blank_site new_blog_path - else - create_sample_files new_blog_path - - File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f| - f.write(scaffold_post_content) - end - - File.open(File.expand_path("Gemfile", new_blog_path), "w") do |f| - f.write(gemfile_contents) - end - end - end end end end diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index 7f0d0f842f4..3f63006516e 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -173,6 +173,9 @@ def enable_logging(opts) private def enable_ssl(opts) return if !opts[:JekyllOptions]["ssl_cert"] && !opts[:JekyllOptions]["ssl_key"] + if !opts[:JekyllOptions]["ssl_cert"] || !opts[:JekyllOptions]["ssl_key"] + raise RuntimeError, "--ssl-cert or --ssl-key missing." + end require "openssl" require "webrick/https" source_key = Jekyll.sanitized_path(opts[:JekyllOptions]["source"], \ From 451881efcf969b379af068a4f0d6b93c47d12bee Mon Sep 17 00:00:00 2001 From: TheLucasMoore Date: Thu, 12 May 2016 20:21:19 -0500 Subject: [PATCH 0775/4996] ABC Condition Size too high --- lib/jekyll/commands/serve.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index 3f63006516e..8813ac0475d 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -174,7 +174,7 @@ def enable_logging(opts) def enable_ssl(opts) return if !opts[:JekyllOptions]["ssl_cert"] && !opts[:JekyllOptions]["ssl_key"] if !opts[:JekyllOptions]["ssl_cert"] || !opts[:JekyllOptions]["ssl_key"] - raise RuntimeError, "--ssl-cert or --ssl-key missing." + raise RuntimeError end require "openssl" require "webrick/https" From a4369ea7e564fb1f8e7b0ee4889343492069c05c Mon Sep 17 00:00:00 2001 From: ajhit406 Date: Wed, 11 May 2016 13:16:56 -0700 Subject: [PATCH 0776/4996] added pubstorm deployment instructions --- site/_docs/deployment-methods.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md index b516c931b19..af57119b64c 100644 --- a/site/_docs/deployment-methods.md +++ b/site/_docs/deployment-methods.md @@ -225,3 +225,13 @@ Setting up Kickster is very easy, just install the gem and you are good to go. M [Aerobatic](https://www.aerobatic.com) is an add-on for Bitbucket that brings GitHub Pages style functionality to Bitbucket users. It includes continuous deployment, custom domains with a wildcard SSL cert, CDN, basic auth, and staging branches all in the box. Automating the build and deployment of a Jekyll site is just as simple as GitHub Pages - push your changes to your repo (excluding the `_site` directory) and within seconds a build will be triggered and your built site deployed to our highly- available, globally distributed hosting service. The build process will even install and execute custom Ruby plugins. See our [Jekyll docs](https://www.aerobatic.com/docs/static-generators#jekyll) for more details. + +## PubStorm + +[PubStorm](https://www.pubstorm.com) is a free front-end and static-site publishing platform built by [Nitrous](https://www.nitrous.io). PubStorm is distributed as a node package and can be installed by running `npm install -g pubstorm`. You can create a free account by running `storm signup`. + +To publish your site, run `storm init` from the root of your project and enter `_site` as the project path when prompted. You can the run `jekyll build` to build your site and then run `storm deploy` to publish your site in seconds. + +PubStorm offers a pre-configured CDN, free custom domains, SSL certs, rollbacks, collaboration and more. To configure additional features, [follow the instructions on the PubStorm help site](http://help.pubstorm.com). + +You can also use the [Nitrous Jekyll Template](https://www.nitrous.io/quickstarts) to develop your Jekyll project and deploy to PubStorm directly from Nitrous. This is a great option for developing Jekyll projects on Windows. From 1e89aa7a130163c3e7f6e76677f0b3fcfe37b6a9 Mon Sep 17 00:00:00 2001 From: Marcos Brito Date: Fri, 13 May 2016 14:39:56 +0200 Subject: [PATCH 0777/4996] Removed extra

    from site/_docs/permalinks.md It seems there's an extra

    in the html code, in the line number 103. --- site/_docs/permalinks.md | 1 - 1 file changed, 1 deletion(-) diff --git a/site/_docs/permalinks.md b/site/_docs/permalinks.md index 9ccf27060c5..254c5d6dd98 100644 --- a/site/_docs/permalinks.md +++ b/site/_docs/permalinks.md @@ -101,7 +101,6 @@ permalink is defined according to the format `/:categories/:year/:month/:day/:ti

    Second of the minute from the post’s date front matter. (00..59)

    -

    From 64219cc11a01bc8048c0bb387c0a4fc036449285 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 13 May 2016 10:12:36 -0500 Subject: [PATCH 0778/4996] Update history to reflect merge of #4890 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 7068efe00d5..f2e9f7c323b 100644 --- a/History.markdown +++ b/History.markdown @@ -94,6 +94,7 @@ * Added Pug converter to list of third-party plugins (#4872) * Add jekyll-ideal-image-slider to list of third-party plugins (#4863) * Add Jekyll Tips and the Cheatsheet to the list of resources (#4887) + * Removed extra `

    ` from `site/_docs/permalinks.md` (#4890) ## 3.1.3 / 2016-04-18 From 6a2ffbac62bccf6eb4e85a8465c5bad8047e5d92 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 13 May 2016 11:49:59 -0500 Subject: [PATCH 0779/4996] Add note about being unreleased to the Themes documentation. Fixes #4510. --- site/_docs/themes.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/site/_docs/themes.md b/site/_docs/themes.md index 2b7155bb63d..02e1ebf577c 100644 --- a/site/_docs/themes.md +++ b/site/_docs/themes.md @@ -4,6 +4,15 @@ title: Themes permalink: /docs/themes/ --- +
    +
    This feature is unreleased!
    +

    + Jekyll 3.0 and 3.1 do NOT have the ability to add themes in this way. + The documentation below is for an unreleased version of Jekyll and + cannot be used at the moment. +

    +
    + Jekyll has an extensive theme system, which allows you to leverage community-maintained templates and styles to customize your site's presentation. Jekyll themes package layouts, includes, and stylesheets in a way that can be overridden by your site's content. ## Installing a theme From 83f8df49abd00e876e0e0d63753639aea3c9b31e Mon Sep 17 00:00:00 2001 From: Derek Gottlieb Date: Fri, 13 May 2016 12:34:11 -0500 Subject: [PATCH 0780/4996] Fixing rubocop offenses in lib/jekyll/cleaner.rb --- .rubocop.yml | 1 - lib/jekyll/cleaner.rb | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 7bf38d38ae7..12e6553fdb1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,7 +4,6 @@ AllCops: Include: - lib/**/*.rb Exclude: - - lib/jekyll/cleaner.rb - lib/jekyll/collection.rb - lib/jekyll/command.rb - lib/jekyll/commands/build.rb diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb index cab94d55aa1..db8a9180f94 100644 --- a/lib/jekyll/cleaner.rb +++ b/lib/jekyll/cleaner.rb @@ -1,9 +1,9 @@ -require 'set' +require "set" module Jekyll # Handles the cleanup of a site's destination before it is built. class Cleaner - HIDDEN_FILE_REGEX = /\/\.{1,2}$/ + HIDDEN_FILE_REGEX = %r!\/\.{1,2}$! attr_reader :site def initialize(site) @@ -32,7 +32,8 @@ def metadata_file [site.regenerator.metadata_file] end - # Private: The list of existing files, apart from those included in keep_files and hidden files. + # Private: The list of existing files, apart from those included in + # keep_files and hidden files. # # Returns a Set with the file paths def existing_files @@ -77,15 +78,16 @@ def parent_dirs(file) end end - # Private: The list of existing files that will be replaced by a directory during build + # Private: The list of existing files that will be replaced by a directory + # during build # # Returns a Set with the file paths def replaced_files new_dirs.select { |dir| File.file?(dir) }.to_set end - # Private: The list of directories that need to be kept because they are parent directories - # of files specified in keep_files + # Private: The list of directories that need to be kept because they are + # parent directories of files specified in keep_files # # Returns a Set with the directory paths def keep_dirs @@ -95,12 +97,12 @@ def keep_dirs # Private: Creates a regular expression from the config's keep_files array # # Examples - # ['.git','.svn'] with site.dest "/myblog/_site" creates + # ['.git','.svn'] with site.dest "/myblog/_site" creates # the following regex: /\A\/myblog\/_site\/(\.git|\/.svn)/ # # Returns the regular expression def keep_file_regex - /\A#{Regexp.quote(site.dest)}\/(#{Regexp.union(site.keep_files).source})/ + %r!\A#{Regexp.quote(site.dest)}\/(#{Regexp.union(site.keep_files).source})! end end end From 96ac1185a1f1e5d00a3bbd3a147c1b27c1e5879e Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 13 May 2016 12:50:41 -0500 Subject: [PATCH 0781/4996] Update history to reflect merge of #4892 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index f2e9f7c323b..53942209d24 100644 --- a/History.markdown +++ b/History.markdown @@ -55,6 +55,7 @@ * Fix "locally" typo in contributing documentation (#4756) * Update Rubocop rules (#4886) * Flesh out the issue template to be much more detailed (#4849) + * Fixing rubocop offenses in lib/jekyll/cleaner.rb (#4892) ### Site Enhancements From 465e7dd8b0c0ebf38a15ef1c6e4eb388439395ba Mon Sep 17 00:00:00 2001 From: TheLucasMoore Date: Fri, 13 May 2016 13:46:42 -0500 Subject: [PATCH 0782/4996] Added Exceptions and Passing ABC Metric --- lib/jekyll/commands/new.rb | 30 ++++++++++++++++------------ lib/jekyll/commands/serve.rb | 4 +++- lib/jekyll/commands/serve/servlet.rb | 5 ++--- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb index 4bfcca0fad7..af336e9ca98 100644 --- a/lib/jekyll/commands/new.rb +++ b/lib/jekyll/commands/new.rb @@ -28,19 +28,7 @@ def process(args, options = {}) "#{new_blog_path} exists and is not empty." end - if options["blank"] - create_blank_site new_blog_path - else - create_sample_files new_blog_path - - File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f| - f.write(scaffold_post_content) - end - - File.open(File.expand_path("Gemfile", new_blog_path), "w") do |f| - f.write(gemfile_contents) - end - end + if_options_blank(new_blog_path, options) Jekyll.logger.info "New jekyll site installed in #{new_blog_path}." end @@ -91,6 +79,22 @@ def gemfile_contents RUBY end + def if_options_blank(new_blog_path, options) + if options["blank"] + create_blank_site new_blog_path + else + create_sample_files new_blog_path + + File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f| + f.write(scaffold_post_content) + end + + File.open(File.expand_path("Gemfile", new_blog_path), "w") do |f| + f.write(gemfile_contents) + end + end + end + def preserve_source_location?(path, options) !options["force"] && !Dir["#{path}/**/*"].empty? end diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index 8813ac0475d..8c63339772e 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -171,10 +171,12 @@ def enable_logging(opts) # forget to add one of the certificates. private + # rubocop:disable Metrics/AbcSize def enable_ssl(opts) return if !opts[:JekyllOptions]["ssl_cert"] && !opts[:JekyllOptions]["ssl_key"] if !opts[:JekyllOptions]["ssl_cert"] || !opts[:JekyllOptions]["ssl_key"] - raise RuntimeError + # rubocop:disable Style/RedundantException + raise RuntimeError, "--ssl-cert or --ssl-key missing." end require "openssl" require "webrick/https" diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb index d7c52af9f88..5f258e6eda7 100644 --- a/lib/jekyll/commands/serve/servlet.rb +++ b/lib/jekyll/commands/serve/servlet.rb @@ -25,9 +25,8 @@ def search_file(req, res, basename) super || super(req, res, "#{basename}.html") end - # - - def do_get(req, res) + # rubocop:disable Style/MethodName + def do_GET(req, res) rtn = super validate_and_ensure_charset(req, res) res.header.merge!(@headers) From b64b6aa52601025e5fddf4b8c68588f120536612 Mon Sep 17 00:00:00 2001 From: TheLucasMoore Date: Fri, 13 May 2016 15:10:59 -0500 Subject: [PATCH 0783/4996] Refactor if/else for new.rb process method --- lib/jekyll/commands/new.rb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb index af336e9ca98..2658383c1c6 100644 --- a/lib/jekyll/commands/new.rb +++ b/lib/jekyll/commands/new.rb @@ -28,7 +28,11 @@ def process(args, options = {}) "#{new_blog_path} exists and is not empty." end - if_options_blank(new_blog_path, options) + if options["blank"] + create_blank_site new_blog_path + else + create_site new_blog_path + end Jekyll.logger.info "New jekyll site installed in #{new_blog_path}." end @@ -79,19 +83,15 @@ def gemfile_contents RUBY end - def if_options_blank(new_blog_path, options) - if options["blank"] - create_blank_site new_blog_path - else - create_sample_files new_blog_path + def create_site(new_blog_path) + create_sample_files new_blog_path - File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f| - f.write(scaffold_post_content) - end + File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f| + f.write(scaffold_post_content) + end - File.open(File.expand_path("Gemfile", new_blog_path), "w") do |f| - f.write(gemfile_contents) - end + File.open(File.expand_path("Gemfile", new_blog_path), "w") do |f| + f.write(gemfile_contents) end end From 2a81fef9969b65104cc4a0b1a6d876766696e974 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 15 May 2016 12:14:51 -0500 Subject: [PATCH 0784/4996] Update history to reflect merge of #4881 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 53942209d24..f2a50b9e428 100644 --- a/History.markdown +++ b/History.markdown @@ -96,6 +96,7 @@ * Add jekyll-ideal-image-slider to list of third-party plugins (#4863) * Add Jekyll Tips and the Cheatsheet to the list of resources (#4887) * Removed extra `

    ` from `site/_docs/permalinks.md` (#4890) + * Add pubstorm deployment instructions to docs (#4881) ## 3.1.3 / 2016-04-18 From 3611ae99d9c42f4eb87d0357a0c1bb5d7afeb984 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 26 Apr 2016 18:45:05 -0700 Subject: [PATCH 0785/4996] WIP: Add 'jekyll new-theme' command --- lib/jekyll/commands/new_theme.rb | 82 ++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 lib/jekyll/commands/new_theme.rb diff --git a/lib/jekyll/commands/new_theme.rb b/lib/jekyll/commands/new_theme.rb new file mode 100644 index 00000000000..3e37bd84391 --- /dev/null +++ b/lib/jekyll/commands/new_theme.rb @@ -0,0 +1,82 @@ +require 'erb' + +module Jekyll + module Commands + class NewTheme < Command + class << self + def init_with_program(prog) + prog.command(:"new-theme") do |c| + c.syntax 'new-theme NAME' + c.description 'Creates a new Jekyll theme scaffold' + + c.action do |args, _| + Jekyll::Commands::NewTheme.process(args) + end + end + end + + def process(args) + raise InvalidThemeName, 'You must specify a theme name.' if args.empty? + + new_theme_name = args.join("_") + theme = ThemeBuilder.new(new_theme_name) + if theme.path.exist? + Jekyll.logger.abort_with "Conflict:", "#{theme.path} already exists." + end + + theme.create! + Jekyll.logger.info "Your new Jekyll theme, #{theme.name} is ready for you in #{theme.path}." + end + + class ThemeBuilder + attr_reader :name, :path + def initialize(theme_name) + @name = theme_name + @path = Pathname.new(File.expand_path(theme_name, Dir.pwd)) + end + + def create! + create_directories + create_gemspec + create_readme + end + + private + + def create_directories + Dir.chdir(path) do + FileUtils.mkdir_p(%w{_includes _layouts _sass}) + end + end + end + + private + + def gemfile_contents + <<-RUBY +source "https://rubygems.org" + +# Hello! This is where you manage which Jekyll version is used to run. +# When you want to use a different version, change it below, save the +# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: +# +# bundle exec jekyll serve +# +# This will help ensure the proper Jekyll version is running. +# Happy Jekylling! +gem "jekyll", "#{Jekyll::VERSION}" + +# If you want to use GitHub Pages, remove the "gem "jekyll"" above and +# uncomment the line below. To upgrade, run `bundle update github-pages`. +# gem "github-pages", group: :jekyll_plugins + +# If you have any plugins, put them here! +# group :jekyll_plugins do +# gem "jekyll-github-metadata", "~> 1.0" +# end +RUBY + end + end + end + end +end From e3df910533eeb808325a326d0bd1a79f9cd31c4f Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 16 May 2016 09:07:22 -0700 Subject: [PATCH 0786/4996] Add more template files and add a ThemeBuilder which can create the site --- lib/jekyll.rb | 1 + lib/jekyll/commands/new_theme.rb | 94 +++++----------------- lib/jekyll/theme_builder.rb | 108 ++++++++++++++++++++++++++ lib/theme_template/CODE_OF_CONDUCT.md | 0 lib/theme_template/Gemfile | 2 + lib/theme_template/LICENSE.txt.erb | 21 +++++ lib/theme_template/README.md | 0 lib/theme_template/theme.gemspec.erb | 21 +++++ 8 files changed, 174 insertions(+), 73 deletions(-) create mode 100644 lib/jekyll/theme_builder.rb create mode 100644 lib/theme_template/CODE_OF_CONDUCT.md create mode 100644 lib/theme_template/Gemfile create mode 100644 lib/theme_template/LICENSE.txt.erb create mode 100644 lib/theme_template/README.md create mode 100644 lib/theme_template/theme.gemspec.erb diff --git a/lib/jekyll.rb b/lib/jekyll.rb index ffc1539f373..e9f4547b3c6 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -68,6 +68,7 @@ module Jekyll autoload :StaticFile, 'jekyll/static_file' autoload :Stevenson, 'jekyll/stevenson' autoload :Theme, 'jekyll/theme' + autoload :ThemeBuilder, 'jekyll/theme_builder' autoload :URL, 'jekyll/url' autoload :Utils, 'jekyll/utils' autoload :VERSION, 'jekyll/version' diff --git a/lib/jekyll/commands/new_theme.rb b/lib/jekyll/commands/new_theme.rb index 3e37bd84391..3855c3f8cc2 100644 --- a/lib/jekyll/commands/new_theme.rb +++ b/lib/jekyll/commands/new_theme.rb @@ -1,82 +1,30 @@ require 'erb' -module Jekyll - module Commands - class NewTheme < Command - class << self - def init_with_program(prog) - prog.command(:"new-theme") do |c| - c.syntax 'new-theme NAME' - c.description 'Creates a new Jekyll theme scaffold' - - c.action do |args, _| - Jekyll::Commands::NewTheme.process(args) - end - end - end - - def process(args) - raise InvalidThemeName, 'You must specify a theme name.' if args.empty? - - new_theme_name = args.join("_") - theme = ThemeBuilder.new(new_theme_name) - if theme.path.exist? - Jekyll.logger.abort_with "Conflict:", "#{theme.path} already exists." - end - - theme.create! - Jekyll.logger.info "Your new Jekyll theme, #{theme.name} is ready for you in #{theme.path}." +class Jekyll::Commands::NewTheme < Jekyll::Command + class << self + def init_with_program(prog) + prog.command(:"new-theme") do |c| + c.syntax 'new-theme NAME' + c.description 'Creates a new Jekyll theme scaffold' + + c.action do |args, _| + Jekyll::Commands::NewTheme.process(args) end + end + end - class ThemeBuilder - attr_reader :name, :path - def initialize(theme_name) - @name = theme_name - @path = Pathname.new(File.expand_path(theme_name, Dir.pwd)) - end - - def create! - create_directories - create_gemspec - create_readme - end - - private - - def create_directories - Dir.chdir(path) do - FileUtils.mkdir_p(%w{_includes _layouts _sass}) - end - end - end - - private - - def gemfile_contents - <<-RUBY -source "https://rubygems.org" - -# Hello! This is where you manage which Jekyll version is used to run. -# When you want to use a different version, change it below, save the -# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: -# -# bundle exec jekyll serve -# -# This will help ensure the proper Jekyll version is running. -# Happy Jekylling! -gem "jekyll", "#{Jekyll::VERSION}" - -# If you want to use GitHub Pages, remove the "gem "jekyll"" above and -# uncomment the line below. To upgrade, run `bundle update github-pages`. -# gem "github-pages", group: :jekyll_plugins + def process(args) + raise InvalidThemeName, 'You must specify a theme name.' if args.empty? -# If you have any plugins, put them here! -# group :jekyll_plugins do -# gem "jekyll-github-metadata", "~> 1.0" -# end -RUBY - end + new_theme_name = args.join("_") + theme = Jekyll::ThemeBuilder.new(new_theme_name) + if theme.path.exist? + Jekyll.logger.abort_with "Conflict:", "#{theme.path} already exists." end + + theme.create! + Jekyll.logger.info "Your new Jekyll theme, #{theme.name}, is ready for you in #{theme.path}!" + Jekyll.logger.info "For help getting started, read #{theme.path}/README.md." end end end diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb new file mode 100644 index 00000000000..8b352865c2d --- /dev/null +++ b/lib/jekyll/theme_builder.rb @@ -0,0 +1,108 @@ +class Jekyll::ThemeBuilder + SCAFFOLD_DIRECTORIES = %w{ + _layouts _includes _sass + }.freeze + + attr_reader :name, :path + + def initialize(theme_name) + @name = theme_name.to_s.gsub(/ /, "_").gsub(/_+/, "_") + @path = Pathname.new(File.expand_path(name, Dir.pwd)) + end + + def create! + create_directories + create_gemspec + create_accessories + initialize_git_repo + end + + private + + def root + @root ||= Pathname.new(File.expand_path("../", __dir__)) + end + + def template_file(filename) + [ + root.join("theme_template", "#{filename}.erb"), + root.join("theme_template", "#{filename}") + ].find do |pathname| + pathname.exist? + end + end + + def template(filename) + erb.render(template_file(filename).read) + end + + def erb + @erb ||= ERBRenderer.new(self) + end + + def mkdir_p(directories) + Array(directories).each do |directory| + full_path = path.join(directory) + Jekyll.logger.info "create", "#{full_path}" + FileUtils.mkdir_p(full_path) + end + end + + def write_file(filename, contents) + full_path = path.join(filename) + Jekyll.logger.info "create", "#{full_path}" + File.write(full_path, contents) + end + + def create_directories + mkdir_p(SCAFFOLD_DIRECTORIES) + end + + def create_gemspec + write_file("Gemfile", template("Gemfile")) + write_file("#{name}.gemspec", template("theme.gemspec")) + end + + def create_accessories + %w{README.md CODE_OF_CONDUCT.md LICENSE.txt}.each do |filename| + write_file(filename, template(filename)) + end + end + + def initialize_git_repo + Jekyll.logger.info "initialize", "#{path.join(".git")}" + Dir.chdir(path.to_s) { `git init` } + end + + def user_name + @user_name ||= `git config user.name`.chomp + end + + def user_email + @user_email ||= `git config user.email`.chomp + end + + class ERBRenderer + extend Forwardable + + def_delegator :@theme_builder, :name, :theme_name + def_delegator :@theme_builder, :user_name, :user_name + def_delegator :@theme_builder, :user_email, :user_email + + def initialize(theme_builder) + @theme_builder = theme_builder + end + + def jekyll_pessimistic_version + Jekyll::VERSION.split(".").take(2).join(".") + end + + def theme_directories + SCAFFOLD_DIRECTORIES + end + + def render(contents) + ERB.new(contents).result binding + end + end +end diff --git a/lib/theme_template/CODE_OF_CONDUCT.md b/lib/theme_template/CODE_OF_CONDUCT.md new file mode 100644 index 00000000000..e69de29bb2d diff --git a/lib/theme_template/Gemfile b/lib/theme_template/Gemfile new file mode 100644 index 00000000000..3be9c3cd812 --- /dev/null +++ b/lib/theme_template/Gemfile @@ -0,0 +1,2 @@ +source "https://rubygems.org" +gemspec diff --git a/lib/theme_template/LICENSE.txt.erb b/lib/theme_template/LICENSE.txt.erb new file mode 100644 index 00000000000..df80313502d --- /dev/null +++ b/lib/theme_template/LICENSE.txt.erb @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2016 <%= user_name %> + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/lib/theme_template/README.md b/lib/theme_template/README.md new file mode 100644 index 00000000000..e69de29bb2d diff --git a/lib/theme_template/theme.gemspec.erb b/lib/theme_template/theme.gemspec.erb new file mode 100644 index 00000000000..507a7c52a85 --- /dev/null +++ b/lib/theme_template/theme.gemspec.erb @@ -0,0 +1,21 @@ +# coding: utf-8 + +Gem::Specification.new do |spec| + spec.name = <%= theme_name.inspect %> + spec.version = "0.1.0" + spec.authors = [<%= user_name.inspect %>] + spec.email = [<%= user_email.inspect %>] + + spec.summary = %q{TODO: Write a short summary, because Rubygems requires one.} + spec.description = %q{TODO: Write a longer description or delete this line.} + spec.homepage = "TODO: Put your gem's website or public repo URL here." + spec.license = "MIT" + + spec.metadata["jekyll"] = { "theme" => true } + + spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(exe|<%= theme_directories.join("|") %>)/}) } + spec.bindir = "exe" + spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } + + spec.add_development_dependency "jekyll", "~> <%= jekyll_pessimistic_version %>" +end From 583fe84edc7e4a80803907317edc29275cef7b37 Mon Sep 17 00:00:00 2001 From: EricH Date: Mon, 16 May 2016 14:06:27 -0400 Subject: [PATCH 0787/4996] Corrected pagination docs for hidden: true feature --- site/_docs/pagination.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/_docs/pagination.md b/site/_docs/pagination.md index 25482d01a32..35361b2bf80 100644 --- a/site/_docs/pagination.md +++ b/site/_docs/pagination.md @@ -133,8 +133,8 @@ attributes:
    Pagination does not support tags or categories

    Pagination pages through every post in the posts - variable regardless of variables defined in the YAML Front Matter of - each. It does not currently allow paging over groups of posts linked + variable unless a post has `hidden: true` in its YAML Front Matter. + It does not currently allow paging over groups of posts linked by a common tag or category. It cannot include any collection of documents because it is restricted to posts.

    From 473d85b580bb755476cec61ffead3cb6131ce6df Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 16 May 2016 11:06:47 -0700 Subject: [PATCH 0788/4996] Add CoC and README for theme; make standard with Rubocop --- lib/jekyll/commands/new_theme.rb | 11 ++-- lib/jekyll/errors.rb | 2 + lib/jekyll/theme_builder.rb | 20 +++--- lib/theme_template/CODE_OF_CONDUCT.md | 0 lib/theme_template/CODE_OF_CONDUCT.md.erb | 74 +++++++++++++++++++++++ lib/theme_template/README.md | 0 lib/theme_template/README.md.erb | 40 ++++++++++++ 7 files changed, 131 insertions(+), 16 deletions(-) delete mode 100644 lib/theme_template/CODE_OF_CONDUCT.md create mode 100644 lib/theme_template/CODE_OF_CONDUCT.md.erb delete mode 100644 lib/theme_template/README.md create mode 100644 lib/theme_template/README.md.erb diff --git a/lib/jekyll/commands/new_theme.rb b/lib/jekyll/commands/new_theme.rb index 3855c3f8cc2..e8919ae3816 100644 --- a/lib/jekyll/commands/new_theme.rb +++ b/lib/jekyll/commands/new_theme.rb @@ -1,11 +1,11 @@ -require 'erb' +require "erb" class Jekyll::Commands::NewTheme < Jekyll::Command class << self def init_with_program(prog) prog.command(:"new-theme") do |c| - c.syntax 'new-theme NAME' - c.description 'Creates a new Jekyll theme scaffold' + c.syntax "new-theme NAME" + c.description "Creates a new Jekyll theme scaffold" c.action do |args, _| Jekyll::Commands::NewTheme.process(args) @@ -14,7 +14,7 @@ def init_with_program(prog) end def process(args) - raise InvalidThemeName, 'You must specify a theme name.' if args.empty? + raise Jekyll::Errors::InvalidThemeName, "You must specify a theme name." if args.empty? new_theme_name = args.join("_") theme = Jekyll::ThemeBuilder.new(new_theme_name) @@ -23,7 +23,8 @@ def process(args) end theme.create! - Jekyll.logger.info "Your new Jekyll theme, #{theme.name}, is ready for you in #{theme.path}!" + Jekyll.logger.info "Your new Jekyll theme, #{theme.name}," \ + " is ready for you in #{theme.path}!" Jekyll.logger.info "For help getting started, read #{theme.path}/README.md." end end diff --git a/lib/jekyll/errors.rb b/lib/jekyll/errors.rb index 322eb6af9f9..01bc99b3d12 100644 --- a/lib/jekyll/errors.rb +++ b/lib/jekyll/errors.rb @@ -2,6 +2,8 @@ module Jekyll module Errors FatalException = Class.new(::RuntimeError) + InvalidThemeName = Class.new(FatalException) + DropMutationException = Class.new(FatalException) InvalidPermalinkError = Class.new(FatalException) InvalidYAMLFrontMatterError = Class.new(FatalException) diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb index 8b352865c2d..cde4eaff31e 100644 --- a/lib/jekyll/theme_builder.rb +++ b/lib/jekyll/theme_builder.rb @@ -1,12 +1,12 @@ class Jekyll::ThemeBuilder - SCAFFOLD_DIRECTORIES = %w{ + SCAFFOLD_DIRECTORIES = %w( _layouts _includes _sass - }.freeze + ).freeze attr_reader :name, :path def initialize(theme_name) - @name = theme_name.to_s.gsub(/ /, "_").gsub(/_+/, "_") + @name = theme_name.to_s.tr(" ", "_").gsub(/_+/, "_") @path = Pathname.new(File.expand_path(name, Dir.pwd)) end @@ -26,10 +26,8 @@ def root def template_file(filename) [ root.join("theme_template", "#{filename}.erb"), - root.join("theme_template", "#{filename}") - ].find do |pathname| - pathname.exist? - end + root.join("theme_template", filename.to_s) + ].find(&:exist?) end def template(filename) @@ -43,14 +41,14 @@ def erb def mkdir_p(directories) Array(directories).each do |directory| full_path = path.join(directory) - Jekyll.logger.info "create", "#{full_path}" + Jekyll.logger.info "create", full_path.to_s FileUtils.mkdir_p(full_path) end end def write_file(filename, contents) full_path = path.join(filename) - Jekyll.logger.info "create", "#{full_path}" + Jekyll.logger.info "create", full_path.to_s File.write(full_path, contents) end @@ -64,13 +62,13 @@ def create_gemspec end def create_accessories - %w{README.md CODE_OF_CONDUCT.md LICENSE.txt}.each do |filename| + %w(README.md CODE_OF_CONDUCT.md LICENSE.txt).each do |filename| write_file(filename, template(filename)) end end def initialize_git_repo - Jekyll.logger.info "initialize", "#{path.join(".git")}" + Jekyll.logger.info "initialize", path.join(".git").to_s Dir.chdir(path.to_s) { `git init` } end diff --git a/lib/theme_template/CODE_OF_CONDUCT.md b/lib/theme_template/CODE_OF_CONDUCT.md deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/theme_template/CODE_OF_CONDUCT.md.erb b/lib/theme_template/CODE_OF_CONDUCT.md.erb new file mode 100644 index 00000000000..2b2c7734f87 --- /dev/null +++ b/lib/theme_template/CODE_OF_CONDUCT.md.erb @@ -0,0 +1,74 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or +advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +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. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at <%= user_email %>. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ diff --git a/lib/theme_template/README.md b/lib/theme_template/README.md deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/theme_template/README.md.erb b/lib/theme_template/README.md.erb new file mode 100644 index 00000000000..75909a4946e --- /dev/null +++ b/lib/theme_template/README.md.erb @@ -0,0 +1,40 @@ +# <%= theme_name %> + +Welcome to your new Jekyll theme! In this directory, you'll find the files you need to be able to package up your theme into a gem. Put your layouts in `_layouts`, your includes in `_includes` and your sass in `_sass`. To experiment with this code, add some sample content and run `bundle exec jekyll serve` – this directory is setup just like a Jekyll site! + +TODO: Delete this and the text above, and describe your gem + +## Installation + +Add this line to your Jekyll site's Gemfile: + +```ruby +gem <%= theme_name.inspect %> +``` + +And add this line to your Jekyll site: + +```yaml +theme: <%= theme_name %> +``` + +And then execute: + + $ bundle + +Or install it yourself as: + + $ gem install <%= theme_name %> + +## Usage + +TODO: Write usage instructions here. Describe your available layouts, includes, and/or sass. + +## Contributing + +Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/hello. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct. + +## License + +The theme is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT). + From eb56ca8c4190bfe520bdc1a97596be55c8261e80 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 16 May 2016 16:04:41 -0700 Subject: [PATCH 0789/4996] Update history to reflect merge of #4888 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index f2a50b9e428..f4948c57503 100644 --- a/History.markdown +++ b/History.markdown @@ -56,6 +56,7 @@ * Update Rubocop rules (#4886) * Flesh out the issue template to be much more detailed (#4849) * Fixing rubocop offenses in lib/jekyll/cleaner.rb (#4892) + * Update `jekyll/commands*` to pass rubocop rules (#4888) ### Site Enhancements From 2caff755c4f9e9c6bb5818d9d38cb106f39a56c8 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 16 May 2016 16:24:01 -0700 Subject: [PATCH 0790/4996] Set Style/AlignHash EnforcedHashRocketStyle to 'table' --- .rubocop.yml | 2 +- lib/jekyll/commands/serve.rb | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 99e1e2b3d79..2ceac7c46b4 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -145,7 +145,7 @@ Style/Alias: Style/AlignArray: Enabled: false Style/AlignHash: - SupportedLastArgumentHashStyles: always_ignore + EnforcedHashRocketStyle: table Style/AlignParameters: EnforcedStyle: with_fixed_indentation Enabled: false diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index 8c63339772e..134991b4616 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -3,14 +3,14 @@ module Commands class Serve < Command class << self COMMAND_OPTIONS = { - "ssl_cert" => ["--ssl-cert [CERT]", "X.509 (SSL) certificate."], - "host" => ["host", "-H", "--host [HOST]", "Host to bind to"], - "open_url" => ["-o", "--open-url", "Launch your browser with your site."], - "detach" => ["-B", "--detach", "Run the server in the background (detach)"], - "ssl_key" => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."], - "port" => ["-P", "--port [PORT]", "Port to listen on"], - "baseurl" => ["-b", "--baseurl [URL]", "Base URL"], - "show_dir_listing" => ["--show-dir-listing", + "ssl_cert" => ["--ssl-cert [CERT]", "X.509 (SSL) certificate."], + "host" => ["host", "-H", "--host [HOST]", "Host to bind to"], + "open_url" => ["-o", "--open-url", "Launch your site in a browser"], + "detach" => ["-B", "--detach", "Run the server in the background"], + "ssl_key" => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."], + "port" => ["-P", "--port [PORT]", "Port to listen on"], + "baseurl" => ["-b", "--baseurl [URL]", "Base URL"], + "show_dir_listing" => ["--show-dir-listing", "Show a directory listing instead of loading your index file."], "skip_initial_build" => ["skip_initial_build", "--skip-initial-build", "Skips the initial site build which occurs before the server is started."] @@ -117,10 +117,10 @@ def file_handler_opts private def server_address(server, opts) format("%{prefix}://%{address}:%{port}%{baseurl}", { - :prefix => server.config[:SSLEnable] ? "https" : "http", + :prefix => server.config[:SSLEnable] ? "https" : "http", :baseurl => opts["baseurl"] ? "#{opts["baseurl"]}/" : "", :address => server.config[:BindAddress], - :port => server.config[:Port] + :port => server.config[:Port] }) end From 146d49dc8f1eb3a7d903e7af2d8d2a9ddb3243cf Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 16:51:06 -0500 Subject: [PATCH 0791/4996] Rubocop test cleanups for #4885 This commit cleans up rubocop violations for the following files: test/test_ansi.rb test/test_cleaner.rb test/test_coffeescript.rb test/test_collections.rb test/test_command.rb test/test_commands_serve.rb --- .rubocop.yml | 6 ---- test/test_ansi.rb | 2 +- test/test_cleaner.rb | 57 +++++++++++++++++++------------------ test/test_coffeescript.rb | 7 +++-- test/test_collections.rb | 31 +++++++++++--------- test/test_command.rb | 2 +- test/test_commands_serve.rb | 5 ++-- 7 files changed, 55 insertions(+), 55 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 2ceac7c46b4..acdd1022736 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -72,12 +72,6 @@ AllCops: - features/support/helpers.rb - test/helper.rb - test/simplecov_custom_profile.rb - - test/test_ansi.rb - - test/test_cleaner.rb - - test/test_coffeescript.rb - - test/test_collections.rb - - test/test_command.rb - - test/test_commands_serve.rb - test/test_configuration.rb - test/test_convertible.rb - test/test_doctor_command.rb diff --git a/test/test_ansi.rb b/test/test_ansi.rb index b209e23775c..8f18f56ec7b 100644 --- a/test/test_ansi.rb +++ b/test/test_ansi.rb @@ -6,7 +6,7 @@ class TestAnsi < JekyllUnitTest @subject = Jekyll::Utils::Ansi end - Jekyll::Utils::Ansi::COLORS.each do |color, val| + Jekyll::Utils::Ansi::COLORS.each do |color, _val| should "respond_to? #{color}" do assert @subject.respond_to?(color) end diff --git a/test/test_cleaner.rb b/test/test_cleaner.rb index 2118c4f4dee..5e421c07672 100644 --- a/test/test_cleaner.rb +++ b/test/test_cleaner.rb @@ -1,73 +1,74 @@ -require 'helper' +require "helper" class TestCleaner < JekyllUnitTest context "directory in keep_files" do setup do clear_dest - FileUtils.mkdir_p(dest_dir('to_keep/child_dir')) - FileUtils.touch(File.join(dest_dir('to_keep'), 'index.html')) - FileUtils.touch(File.join(dest_dir('to_keep/child_dir'), 'index.html')) + FileUtils.mkdir_p(dest_dir("to_keep/child_dir")) + FileUtils.touch(File.join(dest_dir("to_keep"), "index.html")) + FileUtils.touch(File.join(dest_dir("to_keep/child_dir"), "index.html")) @site = fixture_site - @site.keep_files = ['to_keep/child_dir'] + @site.keep_files = ["to_keep/child_dir"] @cleaner = Cleaner.new(@site) @cleaner.cleanup! end teardown do - FileUtils.rm_rf(dest_dir('to_keep')) + FileUtils.rm_rf(dest_dir("to_keep")) end should "keep the parent directory" do - assert_exist dest_dir('to_keep') + assert_exist dest_dir("to_keep") end should "keep the child directory" do - assert_exist dest_dir('to_keep', 'child_dir') + assert_exist dest_dir("to_keep", "child_dir") end should "keep the file in the directory in keep_files" do - assert_exist dest_dir('to_keep', 'child_dir', 'index.html') + assert_exist dest_dir("to_keep", "child_dir", "index.html") end should "delete the file in the directory not in keep_files" do - refute_exist dest_dir('to_keep', 'index.html') + refute_exist dest_dir("to_keep", "index.html") end end - context "not-nested directory in keep_files and similary named directory not in keep_files" do + context "not-nested directory in keep_files and similary named directory not "\ + "in keep_files" do setup do clear_dest - FileUtils.mkdir_p(dest_dir('.git/child_dir')) - FileUtils.mkdir_p(dest_dir('username.github.io')) - FileUtils.touch(File.join(dest_dir('.git'), 'index.html')) - FileUtils.touch(File.join(dest_dir('username.github.io'), 'index.html')) + FileUtils.mkdir_p(dest_dir(".git/child_dir")) + FileUtils.mkdir_p(dest_dir("username.github.io")) + FileUtils.touch(File.join(dest_dir(".git"), "index.html")) + FileUtils.touch(File.join(dest_dir("username.github.io"), "index.html")) @site = fixture_site - @site.keep_files = ['.git'] + @site.keep_files = [".git"] @cleaner = Cleaner.new(@site) @cleaner.cleanup! end teardown do - FileUtils.rm_rf(dest_dir('.git')) - FileUtils.rm_rf(dest_dir('username.github.io')) + FileUtils.rm_rf(dest_dir(".git")) + FileUtils.rm_rf(dest_dir("username.github.io")) end should "keep the file in the directory in keep_files" do - assert File.exist?(File.join(dest_dir('.git'), 'index.html')) + assert File.exist?(File.join(dest_dir(".git"), "index.html")) end should "delete the file in the directory not in keep_files" do - assert !File.exist?(File.join(dest_dir('username.github.io'), 'index.html')) + assert !File.exist?(File.join(dest_dir("username.github.io"), "index.html")) end should "delete the directory not in keep_files" do - assert !File.exist?(dest_dir('username.github.io')) + assert !File.exist?(dest_dir("username.github.io")) end end @@ -75,8 +76,8 @@ class TestCleaner < JekyllUnitTest setup do clear_dest - FileUtils.mkdir_p(source_dir('no_files_inside', 'child_dir')) - FileUtils.touch(source_dir('no_files_inside', 'child_dir', 'index.html')) + FileUtils.mkdir_p(source_dir("no_files_inside", "child_dir")) + FileUtils.touch(source_dir("no_files_inside", "child_dir", "index.html")) @site = fixture_site @site.process @@ -86,20 +87,20 @@ class TestCleaner < JekyllUnitTest end teardown do - FileUtils.rm_rf(source_dir('no_files_inside')) - FileUtils.rm_rf(dest_dir('no_files_inside')) + FileUtils.rm_rf(source_dir("no_files_inside")) + FileUtils.rm_rf(dest_dir("no_files_inside")) end should "keep the parent directory" do - assert_exist dest_dir('no_files_inside') + assert_exist dest_dir("no_files_inside") end should "keep the child directory" do - assert_exist dest_dir('no_files_inside', 'child_dir') + assert_exist dest_dir("no_files_inside", "child_dir") end should "keep the file" do - assert_exist source_dir('no_files_inside', 'child_dir', 'index.html') + assert_exist source_dir("no_files_inside", "child_dir", "index.html") end end end diff --git a/test/test_coffeescript.rb b/test/test_coffeescript.rb index 09c9b0a87a0..95c06db8983 100644 --- a/test/test_coffeescript.rb +++ b/test/test_coffeescript.rb @@ -1,9 +1,9 @@ -require 'helper' +require "helper" class TestCoffeeScript < JekyllUnitTest context "converting CoffeeScript" do setup do - External.require_with_graceful_fail('jekyll-coffeescript') + External.require_with_graceful_fail("jekyll-coffeescript") @site = fixture_site @site.process @test_coffeescript_file = dest_dir("js/coffeescript.js") @@ -37,7 +37,8 @@ class TestCoffeeScript < JekyllUnitTest end should "write a JS file in place" do - assert_exist @test_coffeescript_file, "Can't find the converted CoffeeScript file in the dest_dir." + assert_exist @test_coffeescript_file, "Can't find the converted CoffeeScript file "\ + "in the dest_dir." end should "produce JS" do diff --git a/test/test_collections.rb b/test/test_collections.rb index 82175bc5498..4c0b8379aca 100644 --- a/test/test_collections.rb +++ b/test/test_collections.rb @@ -1,4 +1,4 @@ -require 'helper' +require "helper" class TestCollections < JekyllUnitTest context "an evil collection" do @@ -50,7 +50,7 @@ class TestCollections < JekyllUnitTest end should "have a docs attribute" do - assert_equal @collection.to_liquid["docs"], Array.new + assert_equal @collection.to_liquid["docs"], [] end should "have a directory attribute" do @@ -68,9 +68,9 @@ class TestCollections < JekyllUnitTest should "know whether it should be written or not" do assert_equal @collection.write?, false - @collection.metadata['output'] = true + @collection.metadata["output"] = true assert_equal @collection.write?, true - @collection.metadata.delete 'output' + @collection.metadata.delete "output" end end @@ -80,8 +80,8 @@ class TestCollections < JekyllUnitTest @site.process end - should "contain only the defaul collections" do - refute_equal Hash.new, @site.collections + should "contain only the default collections" do + refute_equal @site.collections, {} refute_nil @site.collections end end @@ -113,7 +113,8 @@ class TestCollections < JekyllUnitTest @collection = @site.collections["methods"] end - should "create a Hash on Site with the label mapped to the instance of the Collection" do + should "create a Hash on Site with the label mapped to the instance of the "\ + "Collection" do assert @site.collections.is_a?(Hash) refute_nil @site.collections["methods"] assert @site.collections["methods"].is_a? Jekyll::Collection @@ -123,7 +124,7 @@ class TestCollections < JekyllUnitTest assert @site.collections["methods"].docs.is_a? Array @site.collections["methods"].docs.each do |doc| assert doc.is_a? Jekyll::Document - assert_includes %w[ + assert_includes %w( _methods/configuration.md _methods/sanitized_path.md _methods/collection/entries @@ -132,11 +133,12 @@ class TestCollections < JekyllUnitTest _methods/um_hi.md _methods/escape-+\ #%20[].md _methods/yaml_with_dots.md - ], doc.relative_path + ), doc.relative_path end end - should "not include files which start with an underscore in the base collection directory" do + should "not include files which start with an underscore in the base collection "\ + "directory" do refute_includes @collection.filtered_entries, "_do_not_read_me.md" end @@ -146,7 +148,8 @@ class TestCollections < JekyllUnitTest should "not include the underscored files in the list of docs" do refute_includes @collection.docs.map(&:relative_path), "_methods/_do_not_read_me.md" - refute_includes @collection.docs.map(&:relative_path), "_methods/site/_dont_include_me_either.md" + refute_includes @collection.docs.map(&:relative_path), + "_methods/site/_dont_include_me_either.md" end end @@ -165,7 +168,7 @@ class TestCollections < JekyllUnitTest end should "extract the configuration collection information as metadata" do - assert_equal @collection.metadata, {"foo" => "bar", "baz" => "whoo"} + assert_equal @collection.metadata, { "foo" => "bar", "baz" => "whoo" } end end @@ -184,7 +187,8 @@ class TestCollections < JekyllUnitTest refute_includes @collection.filtered_entries, "/um_hi.md" end - should "include the symlinked file in the list of docs as it resolves to inside site.source" do + should "include the symlinked file in the list of docs as it resolves to inside "\ + "site.source" do assert_includes @collection.docs.map(&:relative_path), "_methods/um_hi.md" end end @@ -215,5 +219,4 @@ class TestCollections < JekyllUnitTest assert @collection.docs.any? { |d| d.path.include?("all.dots") } end end - end diff --git a/test/test_command.rb b/test/test_command.rb index 7d1211e893b..90767013b92 100644 --- a/test/test_command.rb +++ b/test/test_command.rb @@ -1,4 +1,4 @@ -require 'helper' +require "helper" class TestCommand < JekyllUnitTest context "when calling .add_build_options" do diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb index 0db8bdf9b31..b02232b9fa6 100644 --- a/test/test_commands_serve.rb +++ b/test/test_commands_serve.rb @@ -11,7 +11,8 @@ def custom_opts(what) context "with a program" do setup do - @merc, @cmd = nil, Jekyll::Commands::Serve + @merc = nil + @cmd = Jekyll::Commands::Serve Mercenary.program(:jekyll) do |p| @merc = @cmd.init_with_program( p @@ -63,7 +64,7 @@ def custom_opts(what) should "use user port" do # WHAT?!?!1 Over 9000? That's impossible. - assert_equal 9001, custom_opts( { "port" => 9001 })[ + assert_equal 9001, custom_opts({ "port" => 9001 })[ :Port ] end From aad587ca2f924895bd434c6c8bcc53110d9cb5be Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 19:20:29 -0500 Subject: [PATCH 0792/4996] Rubocop fixes for test/helper.rb --- .rubocop.yml | 1 - test/helper.rb | 44 ++++++++++++++++++++------------------------ 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index acdd1022736..fc8fcb6cf66 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -70,7 +70,6 @@ AllCops: - features/step_definitions.rb - features/support/formatter.rb - features/support/helpers.rb - - test/helper.rb - test/simplecov_custom_profile.rb - test/test_configuration.rb - test/test_convertible.rb diff --git a/test/helper.rb b/test/helper.rb index ade8b77d3ea..3a3dafa27ae 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -6,7 +6,7 @@ $VERBOSE = nil def jruby? - defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' + defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby" end if ENV["CI"] @@ -22,23 +22,23 @@ def jruby? end require "nokogiri" -require 'rubygems' -require 'ostruct' -require 'minitest/autorun' -require 'minitest/reporters' -require 'minitest/profile' -require 'rspec/mocks' -require 'jekyll' +require "rubygems" +require "ostruct" +require "minitest/autorun" +require "minitest/reporters" +require "minitest/profile" +require "rspec/mocks" +require "jekyll" Jekyll.logger = Logger.new(StringIO.new) unless jruby? - require 'rdiscount' - require 'redcarpet' + require "rdiscount" + require "redcarpet" end -require 'kramdown' -require 'shoulda' +require "kramdown" +require "shoulda" include Jekyll @@ -51,16 +51,12 @@ def jruby? module Minitest::Assertions def assert_exist(filename, msg = nil) - msg = message(msg) { - "Expected '#{filename}' to exist" - } + msg = message(msg) { "Expected '#{filename}' to exist" } assert File.exist?(filename), msg end def refute_exist(filename, msg = nil) - msg = message(msg) { - "Expected '#{filename}' not to exist" - } + msg = message(msg) { "Expected '#{filename}' not to exist" } refute File.exist?(filename), msg end end @@ -69,8 +65,8 @@ class JekyllUnitTest < Minitest::Test include ::RSpec::Mocks::ExampleMethods def mocks_expect(*args) - RSpec::Mocks::ExampleMethods::ExpectHost.instance_method(:expect).\ - bind(self).call(*args) + RSpec::Mocks::ExampleMethods::ExpectHost.instance_method(:expect)\ + .bind(self).call(*args) end def before_setup @@ -105,16 +101,16 @@ def site_configuration(overrides = {}) end def dest_dir(*subdirs) - test_dir('dest', *subdirs) + test_dir("dest", *subdirs) end def source_dir(*subdirs) - test_dir('source', *subdirs) + test_dir("source", *subdirs) end def clear_dest FileUtils.rm_rf(dest_dir) - FileUtils.rm_rf(source_dir('.jekyll-metadata')) + FileUtils.rm_rf(source_dir(".jekyll-metadata")) end def test_dir(*subdirs) @@ -124,7 +120,7 @@ def test_dir(*subdirs) def directory_with_contents(path) FileUtils.rm_rf(path) FileUtils.mkdir(path) - File.open("#{path}/index.html", "w"){ |f| f.write("I was previously generated.") } + File.open("#{path}/index.html", "w") { |f| f.write("I was previously generated.") } end def with_env(key, value) From 5034cc377a86f884aa3466aff71ccac730193d57 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 19:22:52 -0500 Subject: [PATCH 0793/4996] Rubocop fixes for test/simplecov_custom_profile.rb --- .rubocop.yml | 1 - test/simplecov_custom_profile.rb | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index fc8fcb6cf66..588e630c006 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -70,7 +70,6 @@ AllCops: - features/step_definitions.rb - features/support/formatter.rb - features/support/helpers.rb - - test/simplecov_custom_profile.rb - test/test_configuration.rb - test/test_convertible.rb - test/test_doctor_command.rb diff --git a/test/simplecov_custom_profile.rb b/test/simplecov_custom_profile.rb index d7f4914cbce..0aaec88a58c 100644 --- a/test/simplecov_custom_profile.rb +++ b/test/simplecov_custom_profile.rb @@ -1,10 +1,10 @@ -require 'simplecov' +require "simplecov" -SimpleCov.profiles.define 'gem' do - add_filter '/test/' - add_filter '/features/' - add_filter '/autotest/' +SimpleCov.profiles.define "gem" do + add_filter "/test/" + add_filter "/features/" + add_filter "/autotest/" - add_group 'Binaries', '/bin/' - add_group 'Libraries', '/lib/' + add_group "Binaries", "/bin/" + add_group "Libraries", "/lib/" end From 454a1e415cd822d02922f7c70afe736c5aec9907 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 19:36:00 -0500 Subject: [PATCH 0794/4996] Rubocop fixes for test/test_convertible.rb --- .rubocop.yml | 1 - test/test_convertible.rb | 28 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 588e630c006..b6e5b25a615 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -71,7 +71,6 @@ AllCops: - features/support/formatter.rb - features/support/helpers.rb - test/test_configuration.rb - - test/test_convertible.rb - test/test_doctor_command.rb - test/test_document.rb - test/test_entry_filter.rb diff --git a/test/test_convertible.rb b/test/test_convertible.rb index 517f5c3b13f..4509ed36f0b 100644 --- a/test/test_convertible.rb +++ b/test/test_convertible.rb @@ -1,30 +1,30 @@ -require 'helper' -require 'ostruct' +require "helper" +require "ostruct" class TestConvertible < JekyllUnitTest context "yaml front-matter" do setup do @convertible = OpenStruct.new( "site" => Site.new(Jekyll.configuration( - "source" => File.expand_path('../fixtures', __FILE__) + "source" => File.expand_path("../fixtures", __FILE__) )) ) @convertible.extend Jekyll::Convertible - @base = File.expand_path('../fixtures', __FILE__) + @base = File.expand_path("../fixtures", __FILE__) end should "parse the front-matter correctly" do - ret = @convertible.read_yaml(@base, 'front_matter.erb') - assert_equal({'test' => 'good'}, ret) + ret = @convertible.read_yaml(@base, "front_matter.erb") + assert_equal({ "test" => "good" }, ret) end should "not parse if the front-matter is not at the start of the file" do - ret = @convertible.read_yaml(@base, 'broken_front_matter1.erb') + ret = @convertible.read_yaml(@base, "broken_front_matter1.erb") assert_equal({}, ret) end should "not parse if there is syntax error in front-matter" do - name = 'broken_front_matter2.erb' + name = "broken_front_matter2.erb" out = capture_stderr do ret = @convertible.read_yaml(@base, name) assert_equal({}, ret) @@ -35,15 +35,15 @@ class TestConvertible < JekyllUnitTest should "not allow ruby objects in yaml" do out = capture_stderr do - @convertible.read_yaml(@base, 'exploit_front_matter.erb') + @convertible.read_yaml(@base, "exploit_front_matter.erb") end - refute_match(/undefined class\/module DoesNotExist/, out) + refute_match(%r!undefined class\/module DoesNotExist!, out) end should "not parse if there is encoding error in file" do - name = 'broken_front_matter3.erb' + name = "broken_front_matter3.erb" out = capture_stderr do - ret = @convertible.read_yaml(@base, name, :encoding => 'utf-8') + ret = @convertible.read_yaml(@base, name, :encoding => "utf-8") assert_equal({}, ret) end assert_match(/invalid byte sequence in UTF-8/, out) @@ -51,7 +51,7 @@ class TestConvertible < JekyllUnitTest end should "parse the front-matter but show an error if permalink is empty" do - name = 'empty_permalink.erb' + name = "empty_permalink.erb" assert_raises(Errors::InvalidPermalinkError) do @convertible.read_yaml(@base, name) end @@ -59,7 +59,7 @@ class TestConvertible < JekyllUnitTest should "parse the front-matter correctly whitout permalink" do out = capture_stderr do - @convertible.read_yaml(@base, 'front_matter.erb') + @convertible.read_yaml(@base, "front_matter.erb") end refute_match(/Invalid permalink/, out) end From cfe6cf7ca1874488d15b88cbd5a2ea5d1a7855f8 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 20:54:54 -0500 Subject: [PATCH 0795/4996] Rubocop fixes for test/test_doctor_command.rb --- .rubocop.yml | 1 - test/test_doctor_command.rb | 26 ++++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index b6e5b25a615..d14330d5399 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -71,7 +71,6 @@ AllCops: - features/support/formatter.rb - features/support/helpers.rb - test/test_configuration.rb - - test/test_doctor_command.rb - test/test_document.rb - test/test_entry_filter.rb - test/test_excerpt.rb diff --git a/test/test_doctor_command.rb b/test/test_doctor_command.rb index dee50ac210f..aa6cf12507d 100644 --- a/test/test_doctor_command.rb +++ b/test/test_doctor_command.rb @@ -1,36 +1,38 @@ -require 'helper' -require 'jekyll/commands/doctor' +require "helper" +require "jekyll/commands/doctor" class TestDoctorCommand < JekyllUnitTest - context 'urls only differ by case' do + context "urls only differ by case" do setup do clear_dest end - should 'return success on a valid site/page' do + should "return success on a valid site/page" do @site = Site.new(Jekyll.configuration({ - "source" => File.join(source_dir, '/_urls_differ_by_case_valid'), + "source" => File.join(source_dir, "/_urls_differ_by_case_valid"), "destination" => dest_dir })) @site.process output = capture_stderr do - ret = Jekyll::Commands::Doctor.urls_only_differ_by_case(@site) - assert_equal false, ret + ret = Jekyll::Commands::Doctor.urls_only_differ_by_case(@site) + assert_equal false, ret end assert_equal "", output end - should 'return warning for pages only differing by case' do + should "return warning for pages only differing by case" do @site = Site.new(Jekyll.configuration({ - "source" => File.join(source_dir, '/_urls_differ_by_case_invalid'), + "source" => File.join(source_dir, "/_urls_differ_by_case_invalid"), "destination" => dest_dir })) @site.process output = capture_stderr do - ret = Jekyll::Commands::Doctor.urls_only_differ_by_case(@site) - assert_equal true, ret + ret = Jekyll::Commands::Doctor.urls_only_differ_by_case(@site) + assert_equal true, ret end - assert_includes output, "Warning: The following URLs only differ by case. On a case-insensitive file system one of the URLs will be overwritten by the other: #{dest_dir}/about/index.html, #{dest_dir}/About/index.html" + assert_includes output, "Warning: The following URLs only differ by case. "\ + "On a case-insensitive file system one of the URLs will be overwritten by the "\ + "other: #{dest_dir}/about/index.html, #{dest_dir}/About/index.html" end end end From c8cae38da6d8fbbc5d6e085904088032e2ebec8a Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 21:59:00 -0500 Subject: [PATCH 0796/4996] Rubocop fixes for test/test_excerpt.rb --- .rubocop.yml | 1 - test/test_excerpt.rb | 37 ++++++++++++++++++++----------------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index d14330d5399..5195d933bc5 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -73,7 +73,6 @@ AllCops: - test/test_configuration.rb - test/test_document.rb - test/test_entry_filter.rb - - test/test_excerpt.rb - test/test_filters.rb - test/test_front_matter_defaults.rb - test/test_generated_site.rb diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb index 61ffded302b..2314431380e 100644 --- a/test/test_excerpt.rb +++ b/test/test_excerpt.rb @@ -1,22 +1,23 @@ -require 'helper' +require "helper" class TestExcerpt < JekyllUnitTest def setup_post(file) - Document.new(@site.in_source_dir(File.join('_posts', file)), { - site: @site, - collection: @site.posts + Document.new(@site.in_source_dir(File.join("_posts", file)), { + :site => @site, + :collection => @site.posts }).tap(&:read) end def do_render(document) - @site.layouts = { "default" => Layout.new(@site, source_dir('_layouts'), "simple.html")} + @site.layouts = { "default" => Layout.new(@site, source_dir("_layouts"), + "simple.html") } document.output = Jekyll::Renderer.new(@site, document, @site.site_payload).run end context "With extraction disabled" do setup do clear_dest - @site = fixture_site('excerpt_separator' => '') + @site = fixture_site("excerpt_separator" => "") @post = setup_post("2013-07-22-post-excerpt-with-layout.markdown") end @@ -30,11 +31,10 @@ def do_render(document) clear_dest @site = fixture_site @post = setup_post("2013-07-22-post-excerpt-with-layout.markdown") - @excerpt = @post.data['excerpt'] + @excerpt = @post.data["excerpt"] end context "#include(string)" do - setup do @excerpt.output = "Here is a fake output stub" end @@ -78,19 +78,21 @@ def do_render(document) context "#to_liquid" do should "contain the proper page data to mimick the post liquid" do assert_equal "Post Excerpt with Layout", @excerpt.to_liquid["title"] - assert_equal "/bar/baz/z_category/mixedcase/2013/07/22/post-excerpt-with-layout.html", @excerpt.to_liquid["url"] + assert_equal "/bar/baz/z_category/mixedcase/2013/07/22/"\ + "post-excerpt-with-layout.html", @excerpt.to_liquid["url"] assert_equal Time.parse("2013-07-22"), @excerpt.to_liquid["date"] - assert_equal %w[bar baz z_category MixedCase], @excerpt.to_liquid["categories"] - assert_equal %w[first second third jekyllrb.com], @excerpt.to_liquid["tags"] - assert_equal "_posts/2013-07-22-post-excerpt-with-layout.markdown", @excerpt.to_liquid["path"] + assert_equal %w(bar baz z_category MixedCase), @excerpt.to_liquid["categories"] + assert_equal %w(first second third jekyllrb.com), @excerpt.to_liquid["tags"] + assert_equal "_posts/2013-07-22-post-excerpt-with-layout.markdown", + @excerpt.to_liquid["path"] end end context "#content" do - context "before render" do should "be the first paragraph of the page" do - assert_equal "First paragraph with [link ref][link].\n\n[link]: http://www.jekyllrb.com/", @excerpt.content + assert_equal "First paragraph with [link ref][link].\n\n[link]:"\ + " http://www.jekyllrb.com/", @excerpt.content end should "contain any refs at the bottom of the page" do @@ -102,11 +104,12 @@ def do_render(document) setup do @rendered_post = @post.dup do_render(@rendered_post) - @extracted_excerpt = @rendered_post.data['excerpt'] + @extracted_excerpt = @rendered_post.data["excerpt"] end should "be the first paragraph of the page" do - assert_equal "

    First paragraph with link ref.

    \n\n", @extracted_excerpt.output + assert_equal "

    First paragraph with "\ + "link ref.

    \n\n", @extracted_excerpt.output end should "link properly" do @@ -121,7 +124,7 @@ def do_render(document) clear_dest @site = fixture_site @post = setup_post("2008-02-02-published.markdown") - @excerpt = @post.data['excerpt'] + @excerpt = @post.data["excerpt"] end should "be generated" do From 555b2fbe72a2bbcba173205f465ad287dc44114c Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 22:05:28 -0500 Subject: [PATCH 0797/4996] Rubocop fixes for test/test_front_matter_defaults.rb --- .rubocop.yml | 1 - test/test_front_matter_defaults.rb | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 5195d933bc5..4a1b4feabd5 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -74,7 +74,6 @@ AllCops: - test/test_document.rb - test/test_entry_filter.rb - test/test_filters.rb - - test/test_front_matter_defaults.rb - test/test_generated_site.rb - test/test_kramdown.rb - test/test_layout_reader.rb diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb index 8eeed7f3ae0..4be4ce2f1ff 100644 --- a/test/test_front_matter_defaults.rb +++ b/test/test_front_matter_defaults.rb @@ -1,7 +1,6 @@ -require 'helper' +require "helper" class TestFrontMatterDefaults < JekyllUnitTest - context "A site with full front matter defaults" do setup do @site = Site.new(Jekyll.configuration({ @@ -69,7 +68,7 @@ class TestFrontMatterDefaults < JekyllUnitTest }] })) @site.process - @affected = @site.posts.docs.find { |page| page.relative_path =~ /win\// } + @affected = @site.posts.docs.find { |page| page.relative_path =~ %r!win\/! } @not_affected = @site.pages.find { |page| page.relative_path == "about.html" } end @@ -100,7 +99,8 @@ class TestFrontMatterDefaults < JekyllUnitTest should "affect only the specified type and all paths" do assert_equal @affected.reject { |page| page.data["key"] == "val" }, [] - assert_equal @not_affected.reject { |page| page.data["key"] == "val" }, @not_affected + assert_equal @not_affected.reject { |page| page.data["key"] == "val" }, + @not_affected end end @@ -125,7 +125,8 @@ class TestFrontMatterDefaults < JekyllUnitTest should "affect only the specified type and all paths" do assert_equal @affected.reject { |page| page.data["key"] == "val" }, [] - assert_equal @not_affected.reject { |page| page.data["key"] == "val" }, @not_affected + assert_equal @not_affected.reject { |page| page.data["key"] == "val" }, + @not_affected end end @@ -199,5 +200,4 @@ class TestFrontMatterDefaults < JekyllUnitTest assert @site.posts.find { |page| page.data["date"] == date } end end - end From 0635bbba0602a4f674ba7fc9fb9ec93923935912 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 22:14:17 -0500 Subject: [PATCH 0798/4996] Rubocop fixes for test/test_generated_site.rb --- .rubocop.yml | 1 - test/test_generated_site.rb | 45 ++++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 4a1b4feabd5..bb0f238113e 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -74,7 +74,6 @@ AllCops: - test/test_document.rb - test/test_entry_filter.rb - test/test_filters.rb - - test/test_generated_site.rb - test/test_kramdown.rb - test/test_layout_reader.rb - test/test_liquid_extensions.rb diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb index 301cd8f8fea..463748625dc 100644 --- a/test/test_generated_site.rb +++ b/test/test_generated_site.rb @@ -1,14 +1,15 @@ -require 'helper' +require "helper" class TestGeneratedSite < JekyllUnitTest context "generated sites" do setup do clear_dest - config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir}) + config = Jekyll::Configuration::DEFAULTS.merge({ "source" => source_dir, + "destination" => dest_dir }) @site = fixture_site(config) @site.process - @index = File.read(dest_dir('index.html')) + @index = File.read(dest_dir("index.html")) end should "ensure post count is as expected" do @@ -24,29 +25,29 @@ class TestGeneratedSite < JekyllUnitTest end should "hide unpublished posts" do - published = Dir[dest_dir('publish_test/2008/02/02/*.html')].map {|f| File.basename(f)} - + published = Dir[dest_dir("publish_test/2008/02/02/*.html")].map \ + { |f| File.basename(f) } assert_equal 1, published.size assert_equal "published.html", published.first end should "hide unpublished page" do - refute_exist dest_dir('/unpublished.html') + refute_exist dest_dir("/unpublished.html") end should "not copy _posts directory" do - refute_exist dest_dir('_posts') + refute_exist dest_dir("_posts") end should "process a page with a folder permalink properly" do - about = @site.pages.find {|page| page.name == 'about.html' } - assert_equal dest_dir('about', 'index.html'), about.destination(dest_dir) - assert_exist dest_dir('about', 'index.html') + about = @site.pages.find { |page| page.name == "about.html" } + assert_equal dest_dir("about", "index.html"), about.destination(dest_dir) + assert_exist dest_dir("about", "index.html") end should "process other static files and generate correct permalinks" do - assert_exist dest_dir('contacts.html') - assert_exist dest_dir('dynamic_file.php') + assert_exist dest_dir("contacts.html") + assert_exist dest_dir("dynamic_file.php") end should "print a nice list of static files" do @@ -57,17 +58,19 @@ class TestGeneratedSite < JekyllUnitTest - /products.yml last edited at #{time_regexp} with extname .yml - /symlink-test/symlinked-dir/screen.css last edited at #{time_regexp} with extname .css OUTPUT - assert_match expected_output, File.read(dest_dir('static_files.html')) + assert_match expected_output, File.read(dest_dir("static_files.html")) end end context "generating limited posts" do setup do clear_dest - config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 5}) + config = Jekyll::Configuration::DEFAULTS.merge({ "source" => source_dir, + "destination" => dest_dir, + "limit_posts" => 5 }) @site = fixture_site(config) @site.process - @index = File.read(dest_dir('index.html')) + @index = File.read(dest_dir("index.html")) end should "generate only the specified number of posts" do @@ -78,9 +81,9 @@ class TestGeneratedSite < JekyllUnitTest assert_raises ArgumentError do clear_dest config = Jekyll::Configuration::DEFAULTS.merge({ - 'source' => source_dir, - 'destination' => dest_dir, - 'limit_posts' => -1 + "source" => source_dir, + "destination" => dest_dir, + "limit_posts" => -1 }) @site = fixture_site(config) end @@ -89,9 +92,9 @@ class TestGeneratedSite < JekyllUnitTest should "acceptable limit post is 0" do clear_dest config = Jekyll::Configuration::DEFAULTS.merge({ - 'source' => source_dir, - 'destination' => dest_dir, - 'limit_posts' => 0 + "source" => source_dir, + "destination" => dest_dir, + "limit_posts" => 0 }) assert Site.new(config), "Couldn't create a site with the given limit_posts." From 271a8aebfb80c18bc02869c11840a57ae38ab78c Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 22:47:38 -0500 Subject: [PATCH 0799/4996] Rubocop fixes for test/test_layout_reader.rb --- .rubocop.yml | 1 - test/test_layout_reader.rb | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index bb0f238113e..bd088278636 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -75,7 +75,6 @@ AllCops: - test/test_entry_filter.rb - test/test_filters.rb - test/test_kramdown.rb - - test/test_layout_reader.rb - test/test_liquid_extensions.rb - test/test_liquid_renderer.rb - test/test_log_adapter.rb diff --git a/test/test_layout_reader.rb b/test/test_layout_reader.rb index 11acdb3140e..dabe29c0c7e 100644 --- a/test/test_layout_reader.rb +++ b/test/test_layout_reader.rb @@ -1,9 +1,10 @@ -require 'helper' +require "helper" class TestLayoutReader < JekyllUnitTest context "reading layouts" do setup do - config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir}) + config = Jekyll::Configuration::DEFAULTS.merge({ "source" => source_dir, + "destination" => dest_dir }) @site = fixture_site(config) end From 5a1a8c9c82adad67137a7787bb0ac365e7369aec Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 22:58:06 -0500 Subject: [PATCH 0800/4996] Rubocop fixes for test/test_liquid_extensions.rb --- .rubocop.yml | 1 - test/test_liquid_extensions.rb | 15 +++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index bd088278636..66b68f47540 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -75,7 +75,6 @@ AllCops: - test/test_entry_filter.rb - test/test_filters.rb - test/test_kramdown.rb - - test/test_liquid_extensions.rb - test/test_liquid_renderer.rb - test/test_log_adapter.rb - test/test_new_command.rb diff --git a/test/test_liquid_extensions.rb b/test/test_liquid_extensions.rb index 0ab95e94e4b..a76f378623e 100644 --- a/test/test_liquid_extensions.rb +++ b/test/test_liquid_extensions.rb @@ -1,12 +1,11 @@ -require 'helper' +require "helper" class TestLiquidExtensions < JekyllUnitTest - context "looking up a variable in a Liquid context" do class SayHi < Liquid::Tag include Jekyll::LiquidExtensions - def initialize(tag_name, markup, tokens) + def initialize(_tag_name, markup, _tokens) @markup = markup.strip end @@ -14,18 +13,18 @@ def render(context) "hi #{lookup_variable(context, @markup)}" end end - Liquid::Template.register_tag('say_hi', SayHi) + Liquid::Template.register_tag("say_hi", SayHi) setup do - @template = Liquid::Template.parse("{% say_hi page.name %}") # Parses and compiles the template + # Parses and compiles the template + @template = Liquid::Template.parse("{% say_hi page.name %}") end should "extract the var properly" do - assert_equal @template.render({'page' => {'name' => 'tobi'}}), 'hi tobi' + assert_equal @template.render({ "page" => { "name" => "tobi" } }), "hi tobi" end should "return the variable name if the value isn't there" do - assert_equal @template.render({'page' => {'title' => 'tobi'}}), 'hi page.name' + assert_equal @template.render({ "page" => { "title" => "tobi" } }), "hi page.name" end end - end From ad988838435de085cd90ca3a8ff285a74ef5eee2 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 23:16:28 -0500 Subject: [PATCH 0801/4996] Rubocop fixes for test/test_log_adapter.rb --- .rubocop.yml | 1 - test/test_log_adapter.rb | 31 +++++++++++++++++++------------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 66b68f47540..e8b111021a3 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -76,7 +76,6 @@ AllCops: - test/test_filters.rb - test/test_kramdown.rb - test/test_liquid_renderer.rb - - test/test_log_adapter.rb - test/test_new_command.rb - test/test_page.rb - test/test_path_sanitization.rb diff --git a/test/test_log_adapter.rb b/test/test_log_adapter.rb index 0160d821907..f34be99df6b 100644 --- a/test/test_log_adapter.rb +++ b/test/test_log_adapter.rb @@ -1,12 +1,15 @@ -require 'helper' +require "helper" class TestLogAdapter < JekyllUnitTest class LoggerDouble attr_accessor :level def debug(*); end + def info(*); end + def warn(*); end + def error(*); end end @@ -58,8 +61,9 @@ def error(*); end should "call #debug on writer return true" do writer = LoggerDouble.new logger = Jekyll::LogAdapter.new(writer) - allow(writer).to receive(:debug).with('topic '.rjust(20) + 'log message').and_return(true) - assert logger.debug('topic', 'log message') + allow(writer).to receive(:debug).with("topic ".rjust(20) + + "log message").and_return(true) + assert logger.debug("topic", "log message") end end @@ -67,8 +71,9 @@ def error(*); end should "call #info on writer return true" do writer = LoggerDouble.new logger = Jekyll::LogAdapter.new(writer) - allow(writer).to receive(:info).with('topic '.rjust(20) + 'log message').and_return(true) - assert logger.info('topic', 'log message') + allow(writer).to receive(:info).with("topic ".rjust(20) + + "log message").and_return(true) + assert logger.info("topic", "log message") end end @@ -76,8 +81,9 @@ def error(*); end should "call #warn on writer return true" do writer = LoggerDouble.new logger = Jekyll::LogAdapter.new(writer) - allow(writer).to receive(:warn).with('topic '.rjust(20) + 'log message').and_return(true) - assert logger.warn('topic', 'log message') + allow(writer).to receive(:warn).with("topic ".rjust(20) + + "log message").and_return(true) + assert logger.warn("topic", "log message") end end @@ -85,16 +91,17 @@ def error(*); end should "call #error on writer return true" do writer = LoggerDouble.new logger = Jekyll::LogAdapter.new(writer) - allow(writer).to receive(:error).with('topic '.rjust(20) + 'log message').and_return(true) - assert logger.error('topic', 'log message') + allow(writer).to receive(:error).with("topic ".rjust(20) + + "log message").and_return(true) + assert logger.error("topic", "log message") end end context "#abort_with" do should "call #error and abort" do logger = Jekyll::LogAdapter.new(LoggerDouble.new) - allow(logger).to receive(:error).with('topic', 'log message').and_return(true) - assert_raises(SystemExit) { logger.abort_with('topic', 'log message') } + allow(logger).to receive(:error).with("topic", "log message").and_return(true) + assert_raises(SystemExit) { logger.abort_with("topic", "log message") } end end @@ -105,7 +112,7 @@ def error(*); end should "store each log value in the array" do logger = Jekyll::LogAdapter.new(LoggerDouble.new) - values = %w{one two three four} + values = %w(one two three four) logger.debug(values[0]) logger.info(values[1]) logger.warn(values[2]) From c76b458dd5cdb8162edfefe23775699c475210f8 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 23:20:48 -0500 Subject: [PATCH 0802/4996] Rubocop fixes for test/test_new_command.rb --- .rubocop.yml | 1 - test/test_new_command.rb | 54 ++++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index e8b111021a3..e63fa50bd80 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -76,7 +76,6 @@ AllCops: - test/test_filters.rb - test/test_kramdown.rb - test/test_liquid_renderer.rb - - test/test_new_command.rb - test/test_page.rb - test/test_path_sanitization.rb - test/test_plugin_manager.rb diff --git a/test/test_new_command.rb b/test/test_new_command.rb index 451b525de47..e020940086c 100644 --- a/test/test_new_command.rb +++ b/test/test_new_command.rb @@ -1,10 +1,10 @@ -require 'helper' -require 'jekyll/commands/new' +require "helper" +require "jekyll/commands/new" class TestNewCommand < JekyllUnitTest def dir_contents(path) Dir["#{path}/**/*"].each do |file| - file.gsub! path, '' + file.gsub! path, "" end end @@ -12,9 +12,9 @@ def site_template File.expand_path("../lib/site_template", File.dirname(__FILE__)) end - context 'when args contains a path' do + context "when args contains a path" do setup do - @path = 'new-site' + @path = "new-site" @args = [@path] @full_path = File.expand_path(@path, Dir.pwd) end @@ -23,7 +23,7 @@ def site_template FileUtils.rm_r @full_path end - should 'create a new directory' do + should "create a new directory" do refute_exist @full_path Jekyll::Commands::New.process(@args) assert_exist @full_path @@ -34,43 +34,43 @@ def site_template refute_exist @full_path capture_stdout { Jekyll::Commands::New.process(@args) } assert_exist gemfile - assert_match /gem "jekyll", "#{Jekyll::VERSION}"/, File.read(gemfile) - assert_match /gem "github-pages"/, File.read(gemfile) + assert_match(/gem "jekyll", "#{Jekyll::VERSION}"/, File.read(gemfile)) + assert_match(/gem "github-pages"/, File.read(gemfile)) end - should 'display a success message' do + should "display a success message" do Jekyll::Commands::New.process(@args) output = Jekyll.logger.messages.last success_message = "New jekyll site installed in #{@full_path}." assert_includes output, success_message end - should 'copy the static files in site template to the new directory' do + should "copy the static files in site template to the new directory" do static_template_files = dir_contents(site_template).reject do |f| - File.extname(f) == '.erb' + File.extname(f) == ".erb" end static_template_files << "/Gemfile" capture_stdout { Jekyll::Commands::New.process(@args) } new_site_files = dir_contents(@full_path).reject do |f| - File.extname(f) == '.markdown' + File.extname(f) == ".markdown" end assert_same_elements static_template_files, new_site_files end - should 'process any ERB files' do + should "process any ERB files" do erb_template_files = dir_contents(site_template).select do |f| - File.extname(f) == '.erb' + File.extname(f) == ".erb" end - stubbed_date = '2013-01-01' + stubbed_date = "2013-01-01" allow_any_instance_of(Time).to receive(:strftime) { stubbed_date } erb_template_files.each do |f| - f.chomp! '.erb' - f.gsub! '0000-00-00', stubbed_date + f.chomp! ".erb" + f.gsub! "0000-00-00", stubbed_date end capture_stdout { Jekyll::Commands::New.process(@args) } @@ -82,22 +82,22 @@ def site_template assert_same_elements erb_template_files, new_site_files end - should 'create blank project' do + should "create blank project" do blank_contents = %w(/_drafts /_layouts /_posts /index.html) - capture_stdout { Jekyll::Commands::New.process(@args, '--blank') } + capture_stdout { Jekyll::Commands::New.process(@args, "--blank") } assert_same_elements blank_contents, dir_contents(@full_path) end - should 'force created folder' do + should "force created folder" do capture_stdout { Jekyll::Commands::New.process(@args) } - output = capture_stdout { Jekyll::Commands::New.process(@args, '--force') } + output = capture_stdout { Jekyll::Commands::New.process(@args, "--force") } assert_match(/New jekyll site installed in/, output) end end - context 'when multiple args are given' do + context "when multiple args are given" do setup do - @site_name_with_spaces = 'new site name' + @site_name_with_spaces = "new site name" @multiple_args = @site_name_with_spaces.split end @@ -105,23 +105,23 @@ def site_template FileUtils.rm_r File.expand_path(@site_name_with_spaces, Dir.pwd) end - should 'create a new directory' do + should "create a new directory" do refute_exist @site_name_with_spaces capture_stdout { Jekyll::Commands::New.process(@multiple_args) } assert_exist @site_name_with_spaces end end - context 'when no args are given' do + context "when no args are given" do setup do @empty_args = [] end - should 'raise an ArgumentError' do + should "raise an ArgumentError" do exception = assert_raises ArgumentError do Jekyll::Commands::New.process(@empty_args) end - assert_equal 'You must specify a path.', exception.message + assert_equal "You must specify a path.", exception.message end end end From df01b6825e731a357f7d5886be615a9b67c3c2c3 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 23:25:40 -0500 Subject: [PATCH 0803/4996] Rubocop fixes for test/test_path_sanitization.rb --- .rubocop.yml | 1 - test/test_path_sanitization.rb | 14 +++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index e63fa50bd80..368195531e4 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -77,7 +77,6 @@ AllCops: - test/test_kramdown.rb - test/test_liquid_renderer.rb - test/test_page.rb - - test/test_path_sanitization.rb - test/test_plugin_manager.rb - test/test_rdiscount.rb - test/test_redcarpet.rb diff --git a/test/test_path_sanitization.rb b/test/test_path_sanitization.rb index 148103eacbd..df7ef172d68 100644 --- a/test/test_path_sanitization.rb +++ b/test/test_path_sanitization.rb @@ -1,4 +1,4 @@ -require 'helper' +require "helper" class TestPathSanitization < JekyllUnitTest context "on Windows with absolute source" do @@ -8,20 +8,24 @@ class TestPathSanitization < JekyllUnitTest allow(Dir).to receive(:pwd).and_return("C:/Users/xmr/Desktop/mpc-hc.org") end should "strip drive name from path" do - assert_equal "C:/Users/xmr/Desktop/mpc-hc.org/_site", Jekyll.sanitized_path(@source, @dest) + assert_equal "C:/Users/xmr/Desktop/mpc-hc.org/_site", + Jekyll.sanitized_path(@source, @dest) end should "strip just the initial drive name" do - assert_equal "/tmp/foobar/jail/..c:/..c:/..c:/etc/passwd", Jekyll.sanitized_path("/tmp/foobar/jail", "..c:/..c:/..c:/etc/passwd") + assert_equal "/tmp/foobar/jail/..c:/..c:/..c:/etc/passwd", + Jekyll.sanitized_path("/tmp/foobar/jail", "..c:/..c:/..c:/etc/passwd") end end should "escape tilde" do assert_equal source_dir("~hi.txt"), Jekyll.sanitized_path(source_dir, "~hi.txt") - assert_equal source_dir("files", "~hi.txt"), Jekyll.sanitized_path(source_dir, "files/../files/~hi.txt") + assert_equal source_dir("files", "~hi.txt"), + Jekyll.sanitized_path(source_dir, "files/../files/~hi.txt") end should "remove path traversals" do - assert_equal source_dir("files", "hi.txt"), Jekyll.sanitized_path(source_dir, "f./../../../../../../files/hi.txt") + assert_equal source_dir("files", "hi.txt"), + Jekyll.sanitized_path(source_dir, "f./../../../../../../files/hi.txt") end end From df7992c62601f5514b13f446799a2ec8afa82481 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 23:31:08 -0500 Subject: [PATCH 0804/4996] Rubocop fixes for test/test_plugin_manager.rb --- .rubocop.yml | 1 - test/test_plugin_manager.rb | 13 ++++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 368195531e4..4fb11302140 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -77,7 +77,6 @@ AllCops: - test/test_kramdown.rb - test/test_liquid_renderer.rb - test/test_page.rb - - test/test_plugin_manager.rb - test/test_rdiscount.rb - test/test_redcarpet.rb - test/test_regenerator.rb diff --git a/test/test_plugin_manager.rb b/test/test_plugin_manager.rb index 9cdb45d88ce..22ad617fad5 100644 --- a/test/test_plugin_manager.rb +++ b/test/test_plugin_manager.rb @@ -1,4 +1,4 @@ -require 'helper' +require "helper" class TestPluginManager < JekyllUnitTest def with_no_gemfile @@ -10,14 +10,16 @@ def with_no_gemfile def test_requiring_from_bundler with_env("JEKYLL_NO_BUNDLER_REQUIRE", nil) do - assert Jekyll::PluginManager.require_from_bundler, 'require_from_bundler should return true.' - assert ENV["JEKYLL_NO_BUNDLER_REQUIRE"], 'Gemfile plugins were not required.' + assert Jekyll::PluginManager.require_from_bundler, + "require_from_bundler should return true." + assert ENV["JEKYLL_NO_BUNDLER_REQUIRE"], "Gemfile plugins were not required." end end def test_blocking_requiring_from_bundler with_env("JEKYLL_NO_BUNDLER_REQUIRE", "true") do - assert_equal false, Jekyll::PluginManager.require_from_bundler, "Gemfile plugins were required but shouldn't have been" + assert_equal false, Jekyll::PluginManager.require_from_bundler, + "Gemfile plugins were required but shouldn't have been" assert ENV["JEKYLL_NO_BUNDLER_REQUIRE"] end end @@ -25,7 +27,8 @@ def test_blocking_requiring_from_bundler def test_no_gemfile with_env("JEKYLL_NO_BUNDLER_REQUIRE", nil) do with_no_gemfile do - assert_equal false, Jekyll::PluginManager.require_from_bundler, "Gemfile plugins were required but shouldn't have been" + assert_equal false, Jekyll::PluginManager.require_from_bundler, + "Gemfile plugins were required but shouldn't have been" assert_nil ENV["JEKYLL_NO_BUNDLER_REQUIRE"] end end From de5d773a6abde68e451ed4adc7965f2b17cd3fc7 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 23:36:47 -0500 Subject: [PATCH 0805/4996] Rubocop fixes for test/test_rdiscount.rb --- .rubocop.yml | 1 - test/test_rdiscount.rb | 16 +++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 4fb11302140..fcb1726e9ef 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -77,7 +77,6 @@ AllCops: - test/test_kramdown.rb - test/test_liquid_renderer.rb - test/test_page.rb - - test/test_rdiscount.rb - test/test_redcarpet.rb - test/test_regenerator.rb - test/test_related_posts.rb diff --git a/test/test_rdiscount.rb b/test/test_rdiscount.rb index 96446404f18..889f96592d6 100644 --- a/test/test_rdiscount.rb +++ b/test/test_rdiscount.rb @@ -1,7 +1,6 @@ -require 'helper' +require "helper" class TestRdiscount < JekyllUnitTest - context "rdiscount" do setup do if jruby? @@ -11,12 +10,10 @@ class TestRdiscount < JekyllUnitTest end config = { - 'markdown' => 'rdiscount', - 'rdiscount' => { - 'toc_token' => '{:toc}', - 'extensions' => [ - 'smart', 'generate_toc' - ], + "markdown" => "rdiscount", + "rdiscount" => { + "toc_token" => "{:toc}", + "extensions" => %w(smart generate_toc) } } @@ -45,7 +42,8 @@ class TestRdiscount < JekyllUnitTest

    TOC - assert_equal toc.strip, @markdown.convert("# Header 1\n\n## Header 2\n\n{:toc}").strip + assert_equal toc.strip, + @markdown.convert("# Header 1\n\n## Header 2\n\n{:toc}").strip end end end From 6ef54393c2b180fdfaf9842b54fcc7c676c7e33f Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 23:46:44 -0500 Subject: [PATCH 0806/4996] Rubocop fixes for test/test_redcarpet.rb --- .rubocop.yml | 1 - test/test_redcarpet.rb | 54 +++++++++++++++++++++++++----------------- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index fcb1726e9ef..ac3c83008eb 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -77,7 +77,6 @@ AllCops: - test/test_kramdown.rb - test/test_liquid_renderer.rb - test/test_page.rb - - test/test_redcarpet.rb - test/test_regenerator.rb - test/test_related_posts.rb - test/test_sass.rb diff --git a/test/test_redcarpet.rb b/test/test_redcarpet.rb index 528bc8a3ce6..7231cff9d74 100644 --- a/test/test_redcarpet.rb +++ b/test/test_redcarpet.rb @@ -1,4 +1,4 @@ -require 'helper' +require "helper" class TestRedcarpet < JekyllUnitTest context "redcarpet" do @@ -10,11 +10,9 @@ class TestRedcarpet < JekyllUnitTest end @config = { - 'markdown' => 'redcarpet', - 'redcarpet' => { - 'extensions' => [ - 'smart', 'strikethrough', 'filter_html' - ] + "markdown" => "redcarpet", + "redcarpet" => { + "extensions" => %w(smart strikethrough filter_html) } } @@ -22,7 +20,7 @@ class TestRedcarpet < JekyllUnitTest end should "pass redcarpet options" do - assert_equal "

    Some Header

    ", @markdown.convert('# Some Header #').strip + assert_equal "

    Some Header

    ", @markdown.convert("# Some Header #").strip end should "pass redcarpet SmartyPants options" do @@ -30,58 +28,70 @@ class TestRedcarpet < JekyllUnitTest end should "pass redcarpet extensions" do - assert_equal "

    deleted

    ", @markdown.convert('~~deleted~~').strip + assert_equal "

    deleted

    ", @markdown.convert("~~deleted~~").strip end should "pass redcarpet render options" do - assert_equal "

    bad code not here: i am bad

    ", @markdown.convert('**bad code not here**: ').strip + assert_equal "

    bad code not here: i am bad

    ", + @markdown.convert("**bad code not here**: ").strip end context "with pygments enabled" do setup do - @markdown = Converters::Markdown.new @config.merge({ 'highlighter' => 'pygments' }) + @markdown = Converters::Markdown.new @config.merge( + { "highlighter" => "pygments" } + ) end should "render fenced code blocks with syntax highlighting" do - assert_equal "
    puts "Hello world"\n
    ", @markdown.convert( - <<-EOS + assert_equal "
    puts "Hello world"\n
    ", + @markdown.convert( + <<-EOS ```ruby puts "Hello world" ``` - EOS - ).strip +EOS + ).strip end end context "with rouge enabled" do setup do - @markdown = Converters::Markdown.new @config.merge({ 'highlighter' => 'rouge' }) + @markdown = Converters::Markdown.new @config.merge({ "highlighter" => "rouge" }) end should "render fenced code blocks with syntax highlighting" do - assert_equal "
    puts \"Hello world\"\n
    ", @markdown.convert( - <<-EOS + assert_equal "
    puts \"Hello world\"\n
    ", + @markdown.convert( + <<-EOS ```ruby puts "Hello world" ``` EOS - ).strip + ).strip end end context "without any highlighter" do setup do - @markdown = Converters::Markdown.new @config.merge({ 'highlighter' => nil }) + @markdown = Converters::Markdown.new @config.merge({ "highlighter" => nil }) end should "render fenced code blocks without syntax highlighting" do - assert_equal "
    puts "Hello world"\n
    ", @markdown.convert( - <<-EOS + assert_equal "
    puts "Hello world"\n
    "\ + "
    ", + @markdown.convert( + <<-EOS ```ruby puts "Hello world" ``` EOS - ).strip + ).strip end end end From bc16d13d7926ad92a911763ffe825b2f71b630a5 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Mon, 16 May 2016 19:31:43 -0500 Subject: [PATCH 0807/4996] Shortening messages to keep things down to one line where possible --- test/test_cleaner.rb | 3 +-- test/test_coffeescript.rb | 3 +-- test/test_collections.rb | 9 +++------ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/test/test_cleaner.rb b/test/test_cleaner.rb index 5e421c07672..d3072e54977 100644 --- a/test/test_cleaner.rb +++ b/test/test_cleaner.rb @@ -37,8 +37,7 @@ class TestCleaner < JekyllUnitTest end end - context "not-nested directory in keep_files and similary named directory not "\ - "in keep_files" do + context "non-nested directory & similarly-named directory *not* in keep_files" do setup do clear_dest diff --git a/test/test_coffeescript.rb b/test/test_coffeescript.rb index 95c06db8983..189ce05df3e 100644 --- a/test/test_coffeescript.rb +++ b/test/test_coffeescript.rb @@ -37,8 +37,7 @@ class TestCoffeeScript < JekyllUnitTest end should "write a JS file in place" do - assert_exist @test_coffeescript_file, "Can't find the converted CoffeeScript file "\ - "in the dest_dir." + assert_exist @test_coffeescript_file end should "produce JS" do diff --git a/test/test_collections.rb b/test/test_collections.rb index 4c0b8379aca..795c0d8b0f3 100644 --- a/test/test_collections.rb +++ b/test/test_collections.rb @@ -113,8 +113,7 @@ class TestCollections < JekyllUnitTest @collection = @site.collections["methods"] end - should "create a Hash on Site with the label mapped to the instance of the "\ - "Collection" do + should "create a Hash mapping label to Collection instance" do assert @site.collections.is_a?(Hash) refute_nil @site.collections["methods"] assert @site.collections["methods"].is_a? Jekyll::Collection @@ -137,8 +136,7 @@ class TestCollections < JekyllUnitTest end end - should "not include files which start with an underscore in the base collection "\ - "directory" do + should "not include files from base dir which start with an underscore" do refute_includes @collection.filtered_entries, "_do_not_read_me.md" end @@ -187,8 +185,7 @@ class TestCollections < JekyllUnitTest refute_includes @collection.filtered_entries, "/um_hi.md" end - should "include the symlinked file in the list of docs as it resolves to inside "\ - "site.source" do + should "include the symlinked file from site.source in the list of docs" do assert_includes @collection.docs.map(&:relative_path), "_methods/um_hi.md" end end From 211c16003e0b7064deabd659b3e6ac4c2ba12e68 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Mon, 16 May 2016 19:39:43 -0500 Subject: [PATCH 0808/4996] test/test_exerpt.rb variable assignment cleanup --- test/test_excerpt.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb index 2314431380e..8b29f6fd10a 100644 --- a/test/test_excerpt.rb +++ b/test/test_excerpt.rb @@ -9,8 +9,9 @@ def setup_post(file) end def do_render(document) - @site.layouts = { "default" => Layout.new(@site, source_dir("_layouts"), - "simple.html") } + @site.layouts = { + "default" => Layout.new(@site, source_dir("_layouts"), "simple.html") + } document.output = Jekyll::Renderer.new(@site, document, @site.site_payload).run end From 98eef8af95c3d1ad8566215cf2a31fa5c8ff7792 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Mon, 16 May 2016 19:48:04 -0500 Subject: [PATCH 0809/4996] Aligning hashes per 2caff75 --- test/test_commands_serve.rb | 6 +++--- test/test_doctor_command.rb | 4 ++-- test/test_excerpt.rb | 2 +- test/test_front_matter_defaults.rb | 28 ++++++++++++++-------------- test/test_generated_site.rb | 8 ++++---- test/test_layout_reader.rb | 2 +- test/test_rdiscount.rb | 4 ++-- test/test_redcarpet.rb | 2 +- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb index b02232b9fa6..7ffd0a578cd 100644 --- a/test/test_commands_serve.rb +++ b/test/test_commands_serve.rb @@ -105,10 +105,10 @@ def custom_opts(what) allow(File).to receive(:read).and_return("foo") result = custom_opts({ - "ssl_cert" => "foo", - "source" => "bar", + "ssl_cert" => "foo", + "source" => "bar", "enable_ssl" => true, - "ssl_key" => "bar" + "ssl_key" => "bar" }) assert result[:SSLEnable] diff --git a/test/test_doctor_command.rb b/test/test_doctor_command.rb index aa6cf12507d..7280b2871ee 100644 --- a/test/test_doctor_command.rb +++ b/test/test_doctor_command.rb @@ -9,7 +9,7 @@ class TestDoctorCommand < JekyllUnitTest should "return success on a valid site/page" do @site = Site.new(Jekyll.configuration({ - "source" => File.join(source_dir, "/_urls_differ_by_case_valid"), + "source" => File.join(source_dir, "/_urls_differ_by_case_valid"), "destination" => dest_dir })) @site.process @@ -22,7 +22,7 @@ class TestDoctorCommand < JekyllUnitTest should "return warning for pages only differing by case" do @site = Site.new(Jekyll.configuration({ - "source" => File.join(source_dir, "/_urls_differ_by_case_invalid"), + "source" => File.join(source_dir, "/_urls_differ_by_case_invalid"), "destination" => dest_dir })) @site.process diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb index 8b29f6fd10a..e91fb7c06a1 100644 --- a/test/test_excerpt.rb +++ b/test/test_excerpt.rb @@ -3,7 +3,7 @@ class TestExcerpt < JekyllUnitTest def setup_post(file) Document.new(@site.in_source_dir(File.join("_posts", file)), { - :site => @site, + :site => @site, :collection => @site.posts }).tap(&:read) end diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb index 4be4ce2f1ff..f1b55ac164c 100644 --- a/test/test_front_matter_defaults.rb +++ b/test/test_front_matter_defaults.rb @@ -6,8 +6,8 @@ class TestFrontMatterDefaults < JekyllUnitTest @site = Site.new(Jekyll.configuration({ "source" => source_dir, "destination" => dest_dir, - "defaults" => [{ - "scope" => { + "defaults" => [{ + "scope" => { "path" => "contacts", "type" => "page" }, @@ -32,8 +32,8 @@ class TestFrontMatterDefaults < JekyllUnitTest @site = Site.new(Jekyll.configuration({ "source" => source_dir, "destination" => dest_dir, - "defaults" => [{ - "scope" => { + "defaults" => [{ + "scope" => { "path" => "index.html" }, "values" => { @@ -58,8 +58,8 @@ class TestFrontMatterDefaults < JekyllUnitTest @site = Site.new(Jekyll.configuration({ "source" => source_dir, "destination" => dest_dir, - "defaults" => [{ - "scope" => { + "defaults" => [{ + "scope" => { "path" => "win" }, "values" => { @@ -83,8 +83,8 @@ class TestFrontMatterDefaults < JekyllUnitTest @site = Site.new(Jekyll.configuration({ "source" => source_dir, "destination" => dest_dir, - "defaults" => [{ - "scope" => { + "defaults" => [{ + "scope" => { "type" => "page" }, "values" => { @@ -109,8 +109,8 @@ class TestFrontMatterDefaults < JekyllUnitTest @site = Site.new(Jekyll.configuration({ "source" => source_dir, "destination" => dest_dir, - "defaults" => [{ - "scope" => { + "defaults" => [{ + "scope" => { "type" => "pages" }, "values" => { @@ -135,8 +135,8 @@ class TestFrontMatterDefaults < JekyllUnitTest @site = Site.new(Jekyll.configuration({ "source" => source_dir, "destination" => dest_dir, - "defaults" => [{ - "scope" => { + "defaults" => [{ + "scope" => { }, "values" => { "key" => "val" @@ -159,7 +159,7 @@ class TestFrontMatterDefaults < JekyllUnitTest @site = Site.new(Jekyll.configuration({ "source" => source_dir, "destination" => dest_dir, - "defaults" => [{ + "defaults" => [{ "values" => { "key" => "val" } @@ -181,7 +181,7 @@ class TestFrontMatterDefaults < JekyllUnitTest @site = Site.new(Jekyll.configuration({ "source" => source_dir, "destination" => dest_dir, - "defaults" => [{ + "defaults" => [{ "values" => { "date" => "2015-01-01 00:00:01" } diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb index 463748625dc..0a24172c468 100644 --- a/test/test_generated_site.rb +++ b/test/test_generated_site.rb @@ -4,7 +4,7 @@ class TestGeneratedSite < JekyllUnitTest context "generated sites" do setup do clear_dest - config = Jekyll::Configuration::DEFAULTS.merge({ "source" => source_dir, + config = Jekyll::Configuration::DEFAULTS.merge({ "source" => source_dir, "destination" => dest_dir }) @site = fixture_site(config) @@ -65,7 +65,7 @@ class TestGeneratedSite < JekyllUnitTest context "generating limited posts" do setup do clear_dest - config = Jekyll::Configuration::DEFAULTS.merge({ "source" => source_dir, + config = Jekyll::Configuration::DEFAULTS.merge({ "source" => source_dir, "destination" => dest_dir, "limit_posts" => 5 }) @site = fixture_site(config) @@ -81,7 +81,7 @@ class TestGeneratedSite < JekyllUnitTest assert_raises ArgumentError do clear_dest config = Jekyll::Configuration::DEFAULTS.merge({ - "source" => source_dir, + "source" => source_dir, "destination" => dest_dir, "limit_posts" => -1 }) @@ -92,7 +92,7 @@ class TestGeneratedSite < JekyllUnitTest should "acceptable limit post is 0" do clear_dest config = Jekyll::Configuration::DEFAULTS.merge({ - "source" => source_dir, + "source" => source_dir, "destination" => dest_dir, "limit_posts" => 0 }) diff --git a/test/test_layout_reader.rb b/test/test_layout_reader.rb index dabe29c0c7e..133cd6f219c 100644 --- a/test/test_layout_reader.rb +++ b/test/test_layout_reader.rb @@ -3,7 +3,7 @@ class TestLayoutReader < JekyllUnitTest context "reading layouts" do setup do - config = Jekyll::Configuration::DEFAULTS.merge({ "source" => source_dir, + config = Jekyll::Configuration::DEFAULTS.merge({ "source" => source_dir, "destination" => dest_dir }) @site = fixture_site(config) end diff --git a/test/test_rdiscount.rb b/test/test_rdiscount.rb index 889f96592d6..9390aaed080 100644 --- a/test/test_rdiscount.rb +++ b/test/test_rdiscount.rb @@ -10,9 +10,9 @@ class TestRdiscount < JekyllUnitTest end config = { - "markdown" => "rdiscount", + "markdown" => "rdiscount", "rdiscount" => { - "toc_token" => "{:toc}", + "toc_token" => "{:toc}", "extensions" => %w(smart generate_toc) } } diff --git a/test/test_redcarpet.rb b/test/test_redcarpet.rb index 7231cff9d74..140fabbea9b 100644 --- a/test/test_redcarpet.rb +++ b/test/test_redcarpet.rb @@ -10,7 +10,7 @@ class TestRedcarpet < JekyllUnitTest end @config = { - "markdown" => "redcarpet", + "markdown" => "redcarpet", "redcarpet" => { "extensions" => %w(smart strikethrough filter_html) } From b006810f172a94e9bd5aa9cad8440e5cd1bacac1 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Mon, 16 May 2016 19:59:13 -0500 Subject: [PATCH 0810/4996] Moving .with down one line 4x times --- test/test_log_adapter.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/test_log_adapter.rb b/test/test_log_adapter.rb index f34be99df6b..7e0873ca33f 100644 --- a/test/test_log_adapter.rb +++ b/test/test_log_adapter.rb @@ -61,8 +61,8 @@ def error(*); end should "call #debug on writer return true" do writer = LoggerDouble.new logger = Jekyll::LogAdapter.new(writer) - allow(writer).to receive(:debug).with("topic ".rjust(20) + - "log message").and_return(true) + allow(writer).to receive(:debug) + .with("topic ".rjust(20) + "log message").and_return(true) assert logger.debug("topic", "log message") end end @@ -71,8 +71,8 @@ def error(*); end should "call #info on writer return true" do writer = LoggerDouble.new logger = Jekyll::LogAdapter.new(writer) - allow(writer).to receive(:info).with("topic ".rjust(20) + - "log message").and_return(true) + allow(writer).to receive(:info) + .with("topic ".rjust(20) + "log message").and_return(true) assert logger.info("topic", "log message") end end @@ -81,8 +81,8 @@ def error(*); end should "call #warn on writer return true" do writer = LoggerDouble.new logger = Jekyll::LogAdapter.new(writer) - allow(writer).to receive(:warn).with("topic ".rjust(20) + - "log message").and_return(true) + allow(writer).to receive(:warn) + .with("topic ".rjust(20) + "log message").and_return(true) assert logger.warn("topic", "log message") end end @@ -91,8 +91,8 @@ def error(*); end should "call #error on writer return true" do writer = LoggerDouble.new logger = Jekyll::LogAdapter.new(writer) - allow(writer).to receive(:error).with("topic ".rjust(20) + - "log message").and_return(true) + allow(writer).to receive(:error) + .with("topic ".rjust(20) + "log message").and_return(true) assert logger.error("topic", "log message") end end From df585aa5c61c5e9552e32e473617be19474293e9 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Mon, 16 May 2016 20:13:50 -0500 Subject: [PATCH 0811/4996] Moving expected output into variable to make asserts more readable --- test/test_excerpt.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb index e91fb7c06a1..6e4b8cbf01e 100644 --- a/test/test_excerpt.rb +++ b/test/test_excerpt.rb @@ -92,8 +92,9 @@ def do_render(document) context "#content" do context "before render" do should "be the first paragraph of the page" do - assert_equal "First paragraph with [link ref][link].\n\n[link]:"\ - " http://www.jekyllrb.com/", @excerpt.content + expected = "First paragraph with [link ref][link].\n\n[link]: "\ + "http://www.jekyllrb.com/" + assert_equal expected, @excerpt.content end should "contain any refs at the bottom of the page" do @@ -109,8 +110,9 @@ def do_render(document) end should "be the first paragraph of the page" do - assert_equal "

    First paragraph with "\ - "link ref.

    \n\n", @extracted_excerpt.output + expected = "

    First paragraph with link "\ + "ref.

    \n\n" + assert_equal expected, @extracted_excerpt.output end should "link properly" do From ce9a8cb0f2a1dbfd4a416ad12f4c3f104cdb7e11 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Mon, 16 May 2016 20:42:59 -0500 Subject: [PATCH 0812/4996] Moving url to local var for better readability --- test/test_excerpt.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb index 6e4b8cbf01e..060323feb8b 100644 --- a/test/test_excerpt.rb +++ b/test/test_excerpt.rb @@ -79,8 +79,8 @@ def do_render(document) context "#to_liquid" do should "contain the proper page data to mimick the post liquid" do assert_equal "Post Excerpt with Layout", @excerpt.to_liquid["title"] - assert_equal "/bar/baz/z_category/mixedcase/2013/07/22/"\ - "post-excerpt-with-layout.html", @excerpt.to_liquid["url"] + url = "/bar/baz/z_category/mixedcase/2013/07/22/post-excerpt-with-layout.html" + assert_equal url, @excerpt.to_liquid["url"] assert_equal Time.parse("2013-07-22"), @excerpt.to_liquid["date"] assert_equal %w(bar baz z_category MixedCase), @excerpt.to_liquid["categories"] assert_equal %w(first second third jekyllrb.com), @excerpt.to_liquid["tags"] From 66e5453c35ee6f8e1f96d4a431f401d45f845e01 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 17 May 2016 08:00:00 -0700 Subject: [PATCH 0813/4996] Update history to reflect merge of #4902 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index f4948c57503..f1258a87ab3 100644 --- a/History.markdown +++ b/History.markdown @@ -57,6 +57,7 @@ * Flesh out the issue template to be much more detailed (#4849) * Fixing rubocop offenses in lib/jekyll/cleaner.rb (#4892) * Update `jekyll/commands*` to pass rubocop rules (#4888) + * Clean up many test files to pass Rubocop rules (#4902) ### Site Enhancements From eab2b438c958166bf034cfbf78fe17f74f3ef7d5 Mon Sep 17 00:00:00 2001 From: EricH Date: Tue, 17 May 2016 13:54:42 -0400 Subject: [PATCH 0814/4996] Replaced markdown ` with inside HTML block --- site/_docs/pagination.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/pagination.md b/site/_docs/pagination.md index 35361b2bf80..1ef2d496f15 100644 --- a/site/_docs/pagination.md +++ b/site/_docs/pagination.md @@ -133,7 +133,7 @@ attributes:
    Pagination does not support tags or categories

    Pagination pages through every post in the posts - variable unless a post has `hidden: true` in its YAML Front Matter. + variable unless a post has hidden: true in its YAML Front Matter. It does not currently allow paging over groups of posts linked by a common tag or category. It cannot include any collection of documents because it is restricted to posts.

    From 952947c65efd9ca5d4636edd8b26f5d7ac2bfdbf Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 17 May 2016 11:07:42 -0700 Subject: [PATCH 0815/4996] Update history to reflect merge of #4903 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index f1258a87ab3..7a43096c83f 100644 --- a/History.markdown +++ b/History.markdown @@ -99,6 +99,7 @@ * Add Jekyll Tips and the Cheatsheet to the list of resources (#4887) * Removed extra `

    ` from `site/_docs/permalinks.md` (#4890) * Add pubstorm deployment instructions to docs (#4881) + * Corrected pagination docs for hidden: true feature (#4903) ## 3.1.3 / 2016-04-18 From eb14b8817546b4982fc8ed7e6a45d190f070ebec Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 18 May 2016 17:16:52 -0700 Subject: [PATCH 0816/4996] Port forward the release information for v3.1.4 --- History.markdown | 11 ++++++++ lib/jekyll/version.rb | 2 +- site/_docs/history.md | 14 ++++++++++ .../2016-05-18-jekyll-3-1-4-released.markdown | 26 +++++++++++++++++++ site/latest_version.txt | 2 +- 5 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 site/_posts/2016-05-18-jekyll-3-1-4-released.markdown diff --git a/History.markdown b/History.markdown index 7a43096c83f..90ee65c0f50 100644 --- a/History.markdown +++ b/History.markdown @@ -101,6 +101,17 @@ * Add pubstorm deployment instructions to docs (#4881) * Corrected pagination docs for hidden: true feature (#4903) +## 3.1.4 / 2016-05-18 + +### Bug Fixes + + * Add `ExcerptDrop` and remove excerpt's ability to refer to itself in Liquid (#4907) + * Configuration permalink fix where `collections.posts.permalink` inherits properly from `permalink` only when it doesn't exist (#4910) + * Add `Configuration.from` to make it easier to build configs from just a hash + * Sorting `site.collections` in Liquid by label (#4910) + * Fix bug where `layout` in Liquid would inherit from previously-rendered layouts' metadatas (#4909) + * Fix bug where `layout` in Liquid would override in the wrong direction (more-specific layouts' data were overwritten by their parent layouts' data; this has now been reversed) (#4909) + ## 3.1.3 / 2016-04-18 * Fix defaults for Documents to lookup defaults based on `relative_path` instead of `url` (#4807) diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index ba9ee23828d..61f613e6fb4 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,3 +1,3 @@ module Jekyll - VERSION = '3.1.2' + VERSION = '3.1.4' end diff --git a/site/_docs/history.md b/site/_docs/history.md index 017b6d39f56..f95224aba04 100644 --- a/site/_docs/history.md +++ b/site/_docs/history.md @@ -5,6 +5,20 @@ permalink: "/docs/history/" note: This file is autogenerated. Edit /History.markdown instead. --- +## 3.1.4 / 2016-05-18 +{: #v3-1-4} + +### Bug Fixes +{: #bug-fixes-v3-1-4} + +- Add `ExcerptDrop` and remove excerpt's ability to refer to itself in Liquid ([#4907]({{ site.repository }}/issues/4907)) +- Configuration permalink fix where `collections.posts.permalink` inherits properly from `permalink` only when it doesn't exist ([#4910]({{ site.repository }}/issues/4910)) +- Add `Configuration.from` to make it easier to build configs from just a hash +- Sorting `site.collections` in Liquid by label ([#4910]({{ site.repository }}/issues/4910)) +- Fix bug where `layout` in Liquid would inherit from previously-rendered layouts' metadatas ([#4909]({{ site.repository }}/issues/4909)) +- Fix bug where `layout` in Liquid would override in the wrong direction (more-specific layouts' data were overwritten by their parent layouts' data; this has now been reversed) ([#4909]({{ site.repository }}/issues/4909)) + + ## 3.1.3 / 2016-04-18 {: #v3-1-3} diff --git a/site/_posts/2016-05-18-jekyll-3-1-4-released.markdown b/site/_posts/2016-05-18-jekyll-3-1-4-released.markdown new file mode 100644 index 00000000000..161d4746346 --- /dev/null +++ b/site/_posts/2016-05-18-jekyll-3-1-4-released.markdown @@ -0,0 +1,26 @@ +--- +layout: news_item +title: 'Jekyll 3.1.4 "Stability Sam" Released' +date: 2016-05-18 16:50:37 -0700 +author: parkr +version: 3.1.4 +categories: [release] +--- + +Hey Jekyllites! + +Today, we released v3.1.4 in an effort to bring more stability to the v3.1.x series. This bugfix release consists of: + +* A fix for `layout` in Liquid where values would carry over from one document to the next +* A fix for `layout` in Liquid where a parent layout (e.g. `default` or `base`) would overwrite the metadata of the child layout (e.g. `post` or `special`). +* A fix where `page.excerpt` referencing its excerpt would cause an infinite loop of recursive horror. +* We added `Configuration.from` and the great permalink fix from [v3.0.4](/news/2016/04/19/jekyll-3-0-4-released/) to the v3.1.x series +* `site.collections` in Liquid is now sorted alphabetically by label, so `docs` shows up before `posts` reliably. + +The fixes for `layout` may not be seamless for everyone, but we believe they will be the "right thing to do" going forward. + +We are alwawys striving to make Jekyll more straight-forward to use. Please do open an issue if you believe an aspect of Jekyll's user experience isn't up to par. + +For a full history of our changes, [see the changelog](/docs/history/#v3-1-4). + +As always, Happy Jekylling! diff --git a/site/latest_version.txt b/site/latest_version.txt index ef538c28109..0aec50e6ede 100644 --- a/site/latest_version.txt +++ b/site/latest_version.txt @@ -1 +1 @@ -3.1.2 +3.1.4 From 5949b4a5bb34cc8140d2c696a77d7778ea0f3679 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 18 May 2016 21:38:53 -0700 Subject: [PATCH 0817/4996] Add release information for v3.1.5 --- History.markdown | 6 ++++++ lib/jekyll/version.rb | 2 +- site/_docs/history.md | 9 +++++++++ .../2016-05-18-jekyll-3-1-5-released.markdown | 17 +++++++++++++++++ site/latest_version.txt | 2 +- 5 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 site/_posts/2016-05-18-jekyll-3-1-5-released.markdown diff --git a/History.markdown b/History.markdown index 90ee65c0f50..10bfc158808 100644 --- a/History.markdown +++ b/History.markdown @@ -101,6 +101,12 @@ * Add pubstorm deployment instructions to docs (#4881) * Corrected pagination docs for hidden: true feature (#4903) +## 3.1.5 / 2016-05-18 + +### Bug Fixes + + * Sort the results of the `require_all` glob (affects Linux only). (#4912) + ## 3.1.4 / 2016-05-18 ### Bug Fixes diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index 61f613e6fb4..9f900f154ae 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,3 +1,3 @@ module Jekyll - VERSION = '3.1.4' + VERSION = '3.1.5' end diff --git a/site/_docs/history.md b/site/_docs/history.md index f95224aba04..0d079a4b808 100644 --- a/site/_docs/history.md +++ b/site/_docs/history.md @@ -5,6 +5,15 @@ permalink: "/docs/history/" note: This file is autogenerated. Edit /History.markdown instead. --- +## 3.1.5 / 2016-05-18 +{: #v3-1-5} + +### Bug Fixes +{: #bug-fixes-v3-1-5} + +- Sort the results of the `require_all` glob (affects Linux only). ([#4912]({{ site.repository }}/issues/4912)) + + ## 3.1.4 / 2016-05-18 {: #v3-1-4} diff --git a/site/_posts/2016-05-18-jekyll-3-1-5-released.markdown b/site/_posts/2016-05-18-jekyll-3-1-5-released.markdown new file mode 100644 index 00000000000..c341b37b1a6 --- /dev/null +++ b/site/_posts/2016-05-18-jekyll-3-1-5-released.markdown @@ -0,0 +1,17 @@ +--- +layout: news_item +title: 'Jekyll 3.1.5 Released' +date: 2016-05-18 21:35:27 -0700 +author: parkr +version: 3.1.5 +categories: [release] +--- + +There's always at least one bug, right? :) + +Hot on the trails of [v3.1.4](/news/2016/05/18/jekyll-3-1-4-released/), we +bring you v3.1.5! It fixes one bug around requiring the `ExcerptDrop`, +which only affects Linux. For the gory details, see [the pull +request for the fix](https://github.com/jekyll/jekyll/pull/4912). + +Happy Jekylling! diff --git a/site/latest_version.txt b/site/latest_version.txt index 0aec50e6ede..3ad0595adcc 100644 --- a/site/latest_version.txt +++ b/site/latest_version.txt @@ -1 +1 @@ -3.1.4 +3.1.5 From 1d81d2087e462353b8d7371c56016a3a7df133aa Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 19 May 2016 12:54:04 -0700 Subject: [PATCH 0818/4996] Add info about 3.1.6 to master. --- History.markdown | 6 ++++++ lib/jekyll/version.rb | 2 +- site/_docs/history.md | 9 +++++++++ .../2016-05-19-jekyll-3-1-6-released.markdown | 19 +++++++++++++++++++ site/latest_version.txt | 2 +- 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 site/_posts/2016-05-19-jekyll-3-1-6-released.markdown diff --git a/History.markdown b/History.markdown index 10bfc158808..29f76125e10 100644 --- a/History.markdown +++ b/History.markdown @@ -101,6 +101,12 @@ * Add pubstorm deployment instructions to docs (#4881) * Corrected pagination docs for hidden: true feature (#4903) +## 3.1.6 / 2016-05-19 + +### Bug Fixes + + * Add ability to `jsonify` Drops such that, e.g. `site | jsonify`, works. (#4914) + ## 3.1.5 / 2016-05-18 ### Bug Fixes diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index 9f900f154ae..65a1431d673 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,3 +1,3 @@ module Jekyll - VERSION = '3.1.5' + VERSION = '3.1.6' end diff --git a/site/_docs/history.md b/site/_docs/history.md index 0d079a4b808..f02427c8ab5 100644 --- a/site/_docs/history.md +++ b/site/_docs/history.md @@ -5,6 +5,15 @@ permalink: "/docs/history/" note: This file is autogenerated. Edit /History.markdown instead. --- +## 3.1.6 / 2016-05-19 +{: #v3-1-6} + +### Bug Fixes +{: #bug-fixes-v3-1-6} + +- Add ability to `jsonify` Drops such that, e.g. `site | jsonify`, works. ([#4914]({{ site.repository }}/issues/4914)) + + ## 3.1.5 / 2016-05-18 {: #v3-1-5} diff --git a/site/_posts/2016-05-19-jekyll-3-1-6-released.markdown b/site/_posts/2016-05-19-jekyll-3-1-6-released.markdown new file mode 100644 index 00000000000..45e7312f1fe --- /dev/null +++ b/site/_posts/2016-05-19-jekyll-3-1-6-released.markdown @@ -0,0 +1,19 @@ +--- +layout: news_item +title: 'Jekyll 3.1.6 Released' +date: 2016-05-19 12:48:14 -0700 +author: parkr +version: 3.1.6 +categories: [release] +--- + +Upon releasing 3.1.5 and kicking the tires, we noticed a glaring bug: our +beloved `jsonify` filter doesn't work! With that, our work was cut out for +us and we decided a 3.1.6 was necessary. This release restores sanity to +our object-to-JSON generation in Liquid and we hope you enjoy. + +For the gory details, see [the pull +request](https://github.com/jekyll/jekyll/pull/4914) or [the +changelog](/docs/history/#v3-1-6). + +Happy Jekylling! diff --git a/site/latest_version.txt b/site/latest_version.txt index 3ad0595adcc..9cec7165ab0 100644 --- a/site/latest_version.txt +++ b/site/latest_version.txt @@ -1 +1 @@ -3.1.5 +3.1.6 From 3885057e9e4f8cdf1df40aaa55983e45e9a0110a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 19 May 2016 13:16:32 -0700 Subject: [PATCH 0819/4996] Fix rubocop offense. --- lib/jekyll/commands/new_theme.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/commands/new_theme.rb b/lib/jekyll/commands/new_theme.rb index e8919ae3816..08eb4291a44 100644 --- a/lib/jekyll/commands/new_theme.rb +++ b/lib/jekyll/commands/new_theme.rb @@ -14,7 +14,9 @@ def init_with_program(prog) end def process(args) - raise Jekyll::Errors::InvalidThemeName, "You must specify a theme name." if args.empty? + if !args || args.empty? + raise Jekyll::Errors::InvalidThemeName, "You must specify a theme name." + end new_theme_name = args.join("_") theme = Jekyll::ThemeBuilder.new(new_theme_name) From 20110571ef8a3d15d94ac19a47f474bc59f38bb4 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 19 May 2016 14:36:01 -0700 Subject: [PATCH 0820/4996] Add a Rakefile to do releases as well as adding an example website. --- lib/jekyll/theme_builder.rb | 12 +++- lib/theme_template/README.md.erb | 6 ++ lib/theme_template/Rakefile.erb | 74 ++++++++++++++++++++++ lib/theme_template/example/_config.yml.erb | 1 + lib/theme_template/example/_post.md | 13 ++++ lib/theme_template/example/index.html | 14 ++++ lib/theme_template/example/style.scss | 7 ++ lib/theme_template/theme.gemspec.erb | 4 +- 8 files changed, 128 insertions(+), 3 deletions(-) create mode 100644 lib/theme_template/Rakefile.erb create mode 100644 lib/theme_template/example/_config.yml.erb create mode 100644 lib/theme_template/example/_post.md create mode 100644 lib/theme_template/example/index.html create mode 100644 lib/theme_template/example/style.scss diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb index cde4eaff31e..413aa772b76 100644 --- a/lib/jekyll/theme_builder.rb +++ b/lib/jekyll/theme_builder.rb @@ -1,6 +1,6 @@ class Jekyll::ThemeBuilder SCAFFOLD_DIRECTORIES = %w( - _layouts _includes _sass + _layouts _includes _sass example example/_posts ).freeze attr_reader :name, :path @@ -14,6 +14,7 @@ def create! create_directories create_gemspec create_accessories + create_example_site initialize_git_repo end @@ -62,11 +63,18 @@ def create_gemspec end def create_accessories - %w(README.md CODE_OF_CONDUCT.md LICENSE.txt).each do |filename| + %w(README.md Rakefile CODE_OF_CONDUCT.md LICENSE.txt).each do |filename| write_file(filename, template(filename)) end end + def create_example_site + %w(example/_config.yml example/index.html example/style.scss).each do |filename| + write_file(filename, template(filename)) + end + write_file("example/_posts/#{Time.now.strftime("%Y-%m-%d")}-my-example-post.md", template("example/_post.md")) + end + def initialize_git_repo Jekyll.logger.info "initialize", path.join(".git").to_s Dir.chdir(path.to_s) { `git init` } diff --git a/lib/theme_template/README.md.erb b/lib/theme_template/README.md.erb index 75909a4946e..bcf0d9a0329 100644 --- a/lib/theme_template/README.md.erb +++ b/lib/theme_template/README.md.erb @@ -34,6 +34,12 @@ TODO: Write usage instructions here. Describe your available layouts, includes, Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/hello. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct. +## Development + +To set up your environment to develop this theme, run `bundle install`. + +To test your theme, run `bundle exec rake preview` and open your browser at `http://localhost:4000`. This starts a Jekyll server using your theme and the contents of the `example/` directory. As you make modifications to your theme and to the example site, your site will regenerate and you should see the changes in the browser after a refresh. + ## License The theme is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT). diff --git a/lib/theme_template/Rakefile.erb b/lib/theme_template/Rakefile.erb new file mode 100644 index 00000000000..a3eac316966 --- /dev/null +++ b/lib/theme_template/Rakefile.erb @@ -0,0 +1,74 @@ +require "bundler/gem_tasks" +require "jekyll" +require "listen" + +def listen_ignore_paths(base, options) + [ + /_config\.ya?ml/, + /_site/, + /\.jekyll-metadata/ + ] +end + +def listen_handler(base, options) + site = Jekyll::Site.new(options) + Jekyll::Command.process_site(site) + proc do |modified, added, removed| + t = Time.now + c = modified + added + removed + n = c.length + relative_paths = c.map{ |p| Pathname.new(p).relative_path_from(base).to_s } + print Jekyll.logger.message("Regenerating:", "#{relative_paths.join(", ")} changed... ") + begin + Jekyll::Command.process_site(site) + puts "regenerated in #{Time.now - t} seconds." + rescue => e + puts "error:" + Jekyll.logger.warn "Error:", e.message + Jekyll.logger.warn "Error:", "Run jekyll build --trace for more information." + end + end +end + +task :preview do + base = Pathname.new('.').expand_path + options = { + "source" => base.join('example').to_s, + "destination" => base.join('example/_site').to_s, + "force_polling" => false, + "serving" => true, + "theme" => <%= theme_name.inspect %> + } + + options = Jekyll.configuration(options) + + ENV["LISTEN_GEM_DEBUGGING"] = "1" + listener = Listen.to( + base.join("_includes"), + base.join("_layouts"), + base.join("_sass"), + options["source"], + :ignore => listen_ignore_paths(base, options), + :force_polling => options['force_polling'], + &(listen_handler(base, options)) + ) + + begin + listener.start + Jekyll.logger.info "Auto-regeneration:", "enabled for '#{options["source"]}'" + + unless options['serving'] + trap("INT") do + listener.stop + puts " Halting auto-regeneration." + exit 0 + end + + loop { sleep 1000 } + end + rescue ThreadError + # You pressed Ctrl-C, oh my! + end + + Jekyll::Commands::Serve.process(options) +end diff --git a/lib/theme_template/example/_config.yml.erb b/lib/theme_template/example/_config.yml.erb new file mode 100644 index 00000000000..82e8d42df7b --- /dev/null +++ b/lib/theme_template/example/_config.yml.erb @@ -0,0 +1 @@ +theme: <%= theme_name %> diff --git a/lib/theme_template/example/_post.md b/lib/theme_template/example/_post.md new file mode 100644 index 00000000000..cf40b7f0dea --- /dev/null +++ b/lib/theme_template/example/_post.md @@ -0,0 +1,13 @@ +--- +# Specify a layout from your theme! +# This will be the layout users specify for their posts. +--- + +Eos eu docendi tractatos sapientem, brute option menandri in vix, quando vivendo accommodare te ius. Nec melius fastidii constituam id, viderer theophrastus ad sit, hinc semper periculis cum id. Noluisse postulant assentior est in, no choro sadipscing repudiandae vix. Vis in euismod delenit dignissim. Ex quod nostrum sit, suas decore animal id ius, nobis solet detracto quo te. + +{% comment %} +Might you have an include in your theme? Why not try it here! +{% include my-themes-great-include.html %} +{% endcomment %} + +No laudem altera adolescens has, volumus lucilius eum no. Eam ei nulla audiam efficiantur. Suas affert per no, ei tale nibh sea. Sea ne magna harum, in denique scriptorem sea, cetero alienum tibique ei eos. Labores persequeris referrentur eos ei. diff --git a/lib/theme_template/example/index.html b/lib/theme_template/example/index.html new file mode 100644 index 00000000000..858e5a11c23 --- /dev/null +++ b/lib/theme_template/example/index.html @@ -0,0 +1,14 @@ +--- +# Specify a layout from your theme! +--- + +Lorem ipsum dolor sit amet, quo id prima corrumpit pertinacia, id ius dolor dolores, an veri pertinax explicari mea. Agam solum et qui, his id ludus graeco adipiscing. Duis theophrastus nam in, at his vidisse atomorum. Tantas gloriatur scripserit ne eos. Est wisi tempor habemus at, ei graeco dissentiet eos. Ne usu aliquip sanctus conceptam, te vis ignota animal, modus latine contentiones ius te. + +{% for post in site.posts %} +

    {{ post.title }}

    +
    {{ post.excerpt }}
    +{% endfor %} + +Te falli veritus sea, at molestiae scribentur deterruisset vix, et mea zril phaedrum vulputate. No cum dicit consulatu. Ut has nostro noluisse expetendis, te pro quaeque disputando, eu sed summo omnes. Eos at tale aperiam, usu cu propriae quaestio constituto, sed aperiam erroribus temporibus an. + +Quo eu liber mediocritatem, vix an delectus eleifend, iuvaret suscipit ei vel. Partem invenire per an, mea postulant dissentias eu, ius tantas audire nominavi eu. Dicunt tritani veritus ex vis, mei in case sententiae. At exerci democritum nam, cu lobortis iracundia mei. Alia eligendi consectetuer eu sed, paulo docendi noluisse sit ex. diff --git a/lib/theme_template/example/style.scss b/lib/theme_template/example/style.scss new file mode 100644 index 00000000000..7388f52b367 --- /dev/null +++ b/lib/theme_template/example/style.scss @@ -0,0 +1,7 @@ +--- +--- + +// Here, you can test out the Sass/SCSS that you include in your theme. +// Simply `@import` the necessary file(s) to get the proper styles on the site. +// E.g.: +// @import "a-file-from-my-theme"; diff --git a/lib/theme_template/theme.gemspec.erb b/lib/theme_template/theme.gemspec.erb index 507a7c52a85..8a0b97a93b1 100644 --- a/lib/theme_template/theme.gemspec.erb +++ b/lib/theme_template/theme.gemspec.erb @@ -11,11 +11,13 @@ Gem::Specification.new do |spec| spec.homepage = "TODO: Put your gem's website or public repo URL here." spec.license = "MIT" - spec.metadata["jekyll"] = { "theme" => true } + spec.metadata["plugin_type"] = "theme" spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(exe|<%= theme_directories.join("|") %>)/}) } spec.bindir = "exe" spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.add_development_dependency "jekyll", "~> <%= jekyll_pessimistic_version %>" + spec.add_development_dependency "bundler", "~> 1.12" + spec.add_development_dependency "rake", "~> 10.0" end From 12deccc51379df1c1cc33a7839078c345ff509e9 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 19 May 2016 14:39:55 -0700 Subject: [PATCH 0821/4996] Only spec.summary is needed... --- features/theme.feature | 5 +++++ lib/theme_template/theme.gemspec.erb | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/features/theme.feature b/features/theme.feature index 40877f849ee..ae18d3a6e60 100644 --- a/features/theme.feature +++ b/features/theme.feature @@ -3,6 +3,11 @@ Feature: Writing themes I want to be able to make a gemified theme In order to share my awesome style skillz with other Jekyllites + Scenario: Generating a new theme scaffold + When I run jekyll new-theme my-cool-theme + Then I should get a zero exit status + And the my-cool-theme directory should exist + Scenario: A theme with SCSS Given I have a configuration file with "theme" set to "test-theme" And I have a css directory diff --git a/lib/theme_template/theme.gemspec.erb b/lib/theme_template/theme.gemspec.erb index 8a0b97a93b1..0bd7c365732 100644 --- a/lib/theme_template/theme.gemspec.erb +++ b/lib/theme_template/theme.gemspec.erb @@ -7,7 +7,6 @@ Gem::Specification.new do |spec| spec.email = [<%= user_email.inspect %>] spec.summary = %q{TODO: Write a short summary, because Rubygems requires one.} - spec.description = %q{TODO: Write a longer description or delete this line.} spec.homepage = "TODO: Put your gem's website or public repo URL here." spec.license = "MIT" From ca0b1f7ea691012234a642d8f90e7617f21f7ffe Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 19 May 2016 14:44:00 -0700 Subject: [PATCH 0822/4996] Add note about {{ layout }} to site. --- site/_docs/variables.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/site/_docs/variables.md b/site/_docs/variables.md index 60323886a9a..f068aeb66f9 100644 --- a/site/_docs/variables.md +++ b/site/_docs/variables.md @@ -40,6 +40,16 @@ following is a reference of the available data.

    + +

    layout

    +

    + + Layout specific information + the YAML front + matter. Custom variables set via the YAML Front Matter in + layouts will be available here. + +

    +

    content

    @@ -326,6 +336,14 @@ following is a reference of the available data. page.custom_css.

    +

    + + If you specify front matter in a layout, access that via page + For example, if you specify class: full_page + in a page’s front matter, that value will be available as + layout.class in the layout and its parents. + +

    ## Paginator From f2d08cf1381044831411784b9e770d3574423baa Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 19 May 2016 17:15:33 -0700 Subject: [PATCH 0823/4996] Correct variable reference. --- site/_docs/variables.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/variables.md b/site/_docs/variables.md index f068aeb66f9..f3ead4c70c1 100644 --- a/site/_docs/variables.md +++ b/site/_docs/variables.md @@ -338,7 +338,7 @@ following is a reference of the available data.

    - If you specify front matter in a layout, access that via page + If you specify front matter in a layout, access that via layout. For example, if you specify class: full_page in a page’s front matter, that value will be available as layout.class in the layout and its parents. From f7714add1506b06a1352b17b2dedc415ea87911a Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Thu, 19 May 2016 19:59:22 -0700 Subject: [PATCH 0824/4996] Add normalize_whitepace filter --- lib/jekyll/filters.rb | 9 +++++++++ test/test_filters.rb | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb index 65fc7e41049..a996c496922 100644 --- a/lib/jekyll/filters.rb +++ b/lib/jekyll/filters.rb @@ -150,6 +150,15 @@ def uri_escape(input) URI.escape(input) end + # Replace any whitespace in the input string with a single space + # + # input - The String on which to operate. + # + # Returns the formatted String + def normalize_whitespace(input) + input.to_s.gsub(/\s+/, " ").strip + end + # Count the number of words in the input string. # # input - The String on which to operate. diff --git a/test/test_filters.rb b/test/test_filters.rb index 565e82089b8..7c10c8dff65 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -86,6 +86,30 @@ def initialize(opts = {}) assert_equal "chunky, bacon, bits, and pieces", @filter.array_to_sentence_string(["chunky", "bacon", "bits", "pieces"]) end + context "normalize_whitespace filter" do + should "replace newlines with a space" do + assert_equal "a b", @filter.normalize_whitespace("a\nb") + assert_equal "a b", @filter.normalize_whitespace("a\n\nb") + end + + should "replace tabs with a space" do + assert_equal "a b", @filter.normalize_whitespace("a\tb") + assert_equal "a b", @filter.normalize_whitespace("a\t\tb") + end + + should "replace multiple spaces with a single space" do + assert_equal "a b", @filter.normalize_whitespace("a b") + assert_equal "a b", @filter.normalize_whitespace("a\t\nb") + assert_equal "a b", @filter.normalize_whitespace("a \t \n\nb") + end + + should "strip whitespace from begining and end of string" do + assert_equal "a", @filter.normalize_whitespace("a ") + assert_equal "a", @filter.normalize_whitespace(" a") + assert_equal "a", @filter.normalize_whitespace(" a ") + end + end + context "date filters" do context "with Time object" do should "format a date with short format" do From f3a29677f9763bf935d36fa260ec36acdf126dc8 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 19 May 2016 21:34:30 -0700 Subject: [PATCH 0825/4996] Fix rubocop issues. --- lib/jekyll/theme_builder.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb index 413aa772b76..041faafe7bf 100644 --- a/lib/jekyll/theme_builder.rb +++ b/lib/jekyll/theme_builder.rb @@ -72,7 +72,10 @@ def create_example_site %w(example/_config.yml example/index.html example/style.scss).each do |filename| write_file(filename, template(filename)) end - write_file("example/_posts/#{Time.now.strftime("%Y-%m-%d")}-my-example-post.md", template("example/_post.md")) + write_file( + "example/_posts/#{Time.now.strftime("%Y-%m-%d")}-my-example-post.md", + template("example/_post.md") + ) end def initialize_git_repo From cd31761f9ac7b96a8c6faeca0edf64030ad5a45a Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 19 May 2016 22:13:05 -0700 Subject: [PATCH 0826/4996] Update history to reflect merge of #4848 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 29f76125e10..2d2494c1d7c 100644 --- a/History.markdown +++ b/History.markdown @@ -25,6 +25,7 @@ * Allow symlinks if they point to stuff inside site.source (#4710) * Update colorator dependency to v1.x (#4855) * Move EntryFilter to use Pathutil & fix `glob_include?` (#4859) + * Add 'jekyll new-theme' command to help users get up and running creating a theme (#4848) ### Bug Fixes From 8ac5b03006650f91c6ef34e071ae6af19df6461f Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 20 May 2016 19:15:46 -0700 Subject: [PATCH 0827/4996] Cleaning up site template & theme updates. --- lib/jekyll/theme_builder.rb | 3 +- lib/site_template/_config.yml | 1 + lib/site_template/_includes/footer.html | 38 --- lib/site_template/_includes/head.html | 12 - lib/site_template/_includes/header.html | 27 -- lib/site_template/_includes/icon-github.html | 1 - lib/site_template/_includes/icon-github.svg | 1 - lib/site_template/_includes/icon-twitter.html | 1 - lib/site_template/_includes/icon-twitter.svg | 1 - lib/site_template/_layouts/default.html | 20 -- lib/site_template/_layouts/page.html | 14 - lib/site_template/_layouts/post.html | 15 -- lib/site_template/_sass/_base.scss | 200 --------------- lib/site_template/_sass/_layout.scss | 242 ------------------ .../_sass/_syntax-highlighting.scss | 71 ----- lib/site_template/css/main.scss | 20 +- 16 files changed, 6 insertions(+), 661 deletions(-) delete mode 100644 lib/site_template/_includes/footer.html delete mode 100644 lib/site_template/_includes/head.html delete mode 100644 lib/site_template/_includes/header.html delete mode 100644 lib/site_template/_includes/icon-github.html delete mode 100644 lib/site_template/_includes/icon-github.svg delete mode 100644 lib/site_template/_includes/icon-twitter.html delete mode 100644 lib/site_template/_includes/icon-twitter.svg delete mode 100644 lib/site_template/_layouts/default.html delete mode 100644 lib/site_template/_layouts/page.html delete mode 100644 lib/site_template/_layouts/post.html delete mode 100644 lib/site_template/_sass/_base.scss delete mode 100644 lib/site_template/_sass/_layout.scss delete mode 100644 lib/site_template/_sass/_syntax-highlighting.scss diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb index 041faafe7bf..649df0efeee 100644 --- a/lib/jekyll/theme_builder.rb +++ b/lib/jekyll/theme_builder.rb @@ -1,6 +1,6 @@ class Jekyll::ThemeBuilder SCAFFOLD_DIRECTORIES = %w( - _layouts _includes _sass example example/_posts + _layouts _includes _sass ).freeze attr_reader :name, :path @@ -55,6 +55,7 @@ def write_file(filename, contents) def create_directories mkdir_p(SCAFFOLD_DIRECTORIES) + mkdir_p(%w{example example/_posts}) end def create_gemspec diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml index 0f5a60882c1..adbffacd2d5 100644 --- a/lib/site_template/_config.yml +++ b/lib/site_template/_config.yml @@ -25,3 +25,4 @@ github_username: jekyll # Build settings markdown: kramdown +theme: minima diff --git a/lib/site_template/_includes/footer.html b/lib/site_template/_includes/footer.html deleted file mode 100644 index 1e4b2bc9165..00000000000 --- a/lib/site_template/_includes/footer.html +++ /dev/null @@ -1,38 +0,0 @@ -

    - -
    - -

    {{ site.title | escape }}

    - -
    -
    - -
    - -
    - -
    - -
    -

    {{ site.description | escape }}

    -
    -
    - -
    - -
    diff --git a/lib/site_template/_includes/head.html b/lib/site_template/_includes/head.html deleted file mode 100644 index c6a6e0bc7c2..00000000000 --- a/lib/site_template/_includes/head.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - {% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %} - - - - - - diff --git a/lib/site_template/_includes/header.html b/lib/site_template/_includes/header.html deleted file mode 100644 index 5043f53908b..00000000000 --- a/lib/site_template/_includes/header.html +++ /dev/null @@ -1,27 +0,0 @@ - diff --git a/lib/site_template/_includes/icon-github.html b/lib/site_template/_includes/icon-github.html deleted file mode 100644 index e501a16b187..00000000000 --- a/lib/site_template/_includes/icon-github.html +++ /dev/null @@ -1 +0,0 @@ -{% include icon-github.svg %}{{ include.username }} diff --git a/lib/site_template/_includes/icon-github.svg b/lib/site_template/_includes/icon-github.svg deleted file mode 100644 index 4422c4f5dcc..00000000000 --- a/lib/site_template/_includes/icon-github.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/lib/site_template/_includes/icon-twitter.html b/lib/site_template/_includes/icon-twitter.html deleted file mode 100644 index e623dbd6efc..00000000000 --- a/lib/site_template/_includes/icon-twitter.html +++ /dev/null @@ -1 +0,0 @@ -{{ include.username }} diff --git a/lib/site_template/_includes/icon-twitter.svg b/lib/site_template/_includes/icon-twitter.svg deleted file mode 100644 index dcf660e7bb3..00000000000 --- a/lib/site_template/_includes/icon-twitter.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/lib/site_template/_layouts/default.html b/lib/site_template/_layouts/default.html deleted file mode 100644 index 81aa4ec6379..00000000000 --- a/lib/site_template/_layouts/default.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - {% include head.html %} - - - - {% include header.html %} - -
    -
    - {{ content }} -
    -
    - - {% include footer.html %} - - - - diff --git a/lib/site_template/_layouts/page.html b/lib/site_template/_layouts/page.html deleted file mode 100644 index 01e4b2a93b8..00000000000 --- a/lib/site_template/_layouts/page.html +++ /dev/null @@ -1,14 +0,0 @@ ---- -layout: default ---- -
    - -
    -

    {{ page.title | escape }}

    -
    - -
    - {{ content }} -
    - -
    diff --git a/lib/site_template/_layouts/post.html b/lib/site_template/_layouts/post.html deleted file mode 100644 index 2592391f894..00000000000 --- a/lib/site_template/_layouts/post.html +++ /dev/null @@ -1,15 +0,0 @@ ---- -layout: default ---- -
    - -
    -

    {{ page.title | escape }}

    -

    {% if page.author %} • {% endif %}

    -
    - -
    - {{ content }} -
    - -
    diff --git a/lib/site_template/_sass/_base.scss b/lib/site_template/_sass/_base.scss deleted file mode 100644 index 9b8f292dc79..00000000000 --- a/lib/site_template/_sass/_base.scss +++ /dev/null @@ -1,200 +0,0 @@ -/** - * Reset some basic elements - */ -body, h1, h2, h3, h4, h5, h6, -p, blockquote, pre, hr, -dl, dd, ol, ul, figure { - margin: 0; - padding: 0; -} - - - -/** - * Basic styling - */ -body { - font: $base-font-weight #{$base-font-size}/#{$base-line-height} $base-font-family; - color: $text-color; - background-color: $background-color; - -webkit-text-size-adjust: 100%; - -webkit-font-feature-settings: "kern" 1; - -moz-font-feature-settings: "kern" 1; - -o-font-feature-settings: "kern" 1; - font-feature-settings: "kern" 1; - font-kerning: normal; -} - - - -/** - * Set `margin-bottom` to maintain vertical rhythm - */ -h1, h2, h3, h4, h5, h6, -p, blockquote, pre, -ul, ol, dl, figure, -%vertical-rhythm { - margin-bottom: $spacing-unit / 2; -} - - - -/** - * Images - */ -img { - max-width: 100%; - vertical-align: middle; -} - - - -/** - * Figures - */ -figure > img { - display: block; -} - -figcaption { - font-size: $small-font-size; -} - - - -/** - * Lists - */ -ul, ol { - margin-left: $spacing-unit; -} - -li { - > ul, - > ol { - margin-bottom: 0; - } -} - - - -/** - * Headings - */ -h1, h2, h3, h4, h5, h6 { - font-weight: $base-font-weight; -} - - - -/** - * Links - */ -a { - color: $brand-color; - text-decoration: none; - - &:visited { - color: darken($brand-color, 15%); - } - - &:hover { - color: $text-color; - text-decoration: underline; - } -} - - - -/** - * Blockquotes - */ -blockquote { - color: $grey-color; - border-left: 4px solid $grey-color-light; - padding-left: $spacing-unit / 2; - font-size: 18px; - letter-spacing: -1px; - font-style: italic; - - > :last-child { - margin-bottom: 0; - } -} - - - -/** - * Code formatting - */ -pre, -code { - font-size: 15px; - border: 1px solid $grey-color-light; - border-radius: 3px; - background-color: #eef; -} - -code { - padding: 1px 5px; -} - -pre { - padding: 8px 12px; - overflow-x: auto; - - > code { - border: 0; - padding-right: 0; - padding-left: 0; - } -} - - - -/** - * Wrapper - */ -.wrapper { - max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2)); - max-width: calc(#{$content-width} - (#{$spacing-unit} * 2)); - margin-right: auto; - margin-left: auto; - padding-right: $spacing-unit; - padding-left: $spacing-unit; - @extend %clearfix; - - @include media-query($on-laptop) { - max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit})); - max-width: calc(#{$content-width} - (#{$spacing-unit})); - padding-right: $spacing-unit / 2; - padding-left: $spacing-unit / 2; - } -} - - - -/** - * Clearfix - */ -%clearfix:after { - content: ""; - display: table; - clear: both; -} - - - -/** - * Icons - */ -.icon > svg { - display: inline-block; - width: 16px; - height: 16px; - vertical-align: middle; - - path { - fill: $grey-color; - } -} diff --git a/lib/site_template/_sass/_layout.scss b/lib/site_template/_sass/_layout.scss deleted file mode 100644 index 9cbfddefefb..00000000000 --- a/lib/site_template/_sass/_layout.scss +++ /dev/null @@ -1,242 +0,0 @@ -/** - * Site header - */ -.site-header { - border-top: 5px solid $grey-color-dark; - border-bottom: 1px solid $grey-color-light; - min-height: 56px; - - // Positioning context for the mobile navigation icon - position: relative; -} - -.site-title { - font-size: 26px; - font-weight: 300; - line-height: 56px; - letter-spacing: -1px; - margin-bottom: 0; - float: left; - - &, - &:visited { - color: $grey-color-dark; - } -} - -.site-nav { - float: right; - line-height: 56px; - - .menu-icon { - display: none; - } - - .page-link { - color: $text-color; - line-height: $base-line-height; - - // Gaps between nav items, but not on the last one - &:not(:last-child) { - margin-right: 20px; - } - } - - @include media-query($on-palm) { - position: absolute; - top: 9px; - right: $spacing-unit / 2; - background-color: $background-color; - border: 1px solid $grey-color-light; - border-radius: 5px; - text-align: right; - - .menu-icon { - display: block; - float: right; - width: 36px; - height: 26px; - line-height: 0; - padding-top: 10px; - text-align: center; - - > svg { - width: 18px; - height: 15px; - - path { - fill: $grey-color-dark; - } - } - } - - .trigger { - clear: both; - display: none; - } - - &:hover .trigger { - display: block; - padding-bottom: 5px; - } - - .page-link { - display: block; - padding: 5px 10px; - - &:not(:last-child) { - margin-right: 0; - } - margin-left: 20px; - } - } -} - - - -/** - * Site footer - */ -.site-footer { - border-top: 1px solid $grey-color-light; - padding: $spacing-unit 0; -} - -.footer-heading { - font-size: 18px; - margin-bottom: $spacing-unit / 2; -} - -.contact-list, -.social-media-list { - list-style: none; - margin-left: 0; -} - -.footer-col-wrapper { - font-size: 15px; - color: $grey-color; - margin-left: -$spacing-unit / 2; - @extend %clearfix; -} - -.footer-col { - float: left; - margin-bottom: $spacing-unit / 2; - padding-left: $spacing-unit / 2; -} - -.footer-col-1 { - width: -webkit-calc(35% - (#{$spacing-unit} / 2)); - width: calc(35% - (#{$spacing-unit} / 2)); -} - -.footer-col-2 { - width: -webkit-calc(20% - (#{$spacing-unit} / 2)); - width: calc(20% - (#{$spacing-unit} / 2)); -} - -.footer-col-3 { - width: -webkit-calc(45% - (#{$spacing-unit} / 2)); - width: calc(45% - (#{$spacing-unit} / 2)); -} - -@include media-query($on-laptop) { - .footer-col-1, - .footer-col-2 { - width: -webkit-calc(50% - (#{$spacing-unit} / 2)); - width: calc(50% - (#{$spacing-unit} / 2)); - } - - .footer-col-3 { - width: -webkit-calc(100% - (#{$spacing-unit} / 2)); - width: calc(100% - (#{$spacing-unit} / 2)); - } -} - -@include media-query($on-palm) { - .footer-col { - float: none; - width: -webkit-calc(100% - (#{$spacing-unit} / 2)); - width: calc(100% - (#{$spacing-unit} / 2)); - } -} - - - -/** - * Page content - */ -.page-content { - padding: $spacing-unit 0; -} - -.page-heading { - font-size: 20px; -} - -.post-list { - margin-left: 0; - list-style: none; - - > li { - margin-bottom: $spacing-unit; - } -} - -.post-meta { - font-size: $small-font-size; - color: $grey-color; -} - -.post-link { - display: block; - font-size: 24px; -} - - - -/** - * Posts - */ -.post-header { - margin-bottom: $spacing-unit; -} - -.post-title { - font-size: 42px; - letter-spacing: -1px; - line-height: 1; - - @include media-query($on-laptop) { - font-size: 36px; - } -} - -.post-content { - margin-bottom: $spacing-unit; - - h2 { - font-size: 32px; - - @include media-query($on-laptop) { - font-size: 28px; - } - } - - h3 { - font-size: 26px; - - @include media-query($on-laptop) { - font-size: 22px; - } - } - - h4 { - font-size: 20px; - - @include media-query($on-laptop) { - font-size: 18px; - } - } -} diff --git a/lib/site_template/_sass/_syntax-highlighting.scss b/lib/site_template/_sass/_syntax-highlighting.scss deleted file mode 100644 index 8fac59776d5..00000000000 --- a/lib/site_template/_sass/_syntax-highlighting.scss +++ /dev/null @@ -1,71 +0,0 @@ -/** - * Syntax highlighting styles - */ -.highlight { - background: #fff; - @extend %vertical-rhythm; - - .highlighter-rouge & { - background: #eef; - } - - .c { color: #998; font-style: italic } // Comment - .err { color: #a61717; background-color: #e3d2d2 } // Error - .k { font-weight: bold } // Keyword - .o { font-weight: bold } // Operator - .cm { color: #998; font-style: italic } // Comment.Multiline - .cp { color: #999; font-weight: bold } // Comment.Preproc - .c1 { color: #998; font-style: italic } // Comment.Single - .cs { color: #999; font-weight: bold; font-style: italic } // Comment.Special - .gd { color: #000; background-color: #fdd } // Generic.Deleted - .gd .x { color: #000; background-color: #faa } // Generic.Deleted.Specific - .ge { font-style: italic } // Generic.Emph - .gr { color: #a00 } // Generic.Error - .gh { color: #999 } // Generic.Heading - .gi { color: #000; background-color: #dfd } // Generic.Inserted - .gi .x { color: #000; background-color: #afa } // Generic.Inserted.Specific - .go { color: #888 } // Generic.Output - .gp { color: #555 } // Generic.Prompt - .gs { font-weight: bold } // Generic.Strong - .gu { color: #aaa } // Generic.Subheading - .gt { color: #a00 } // Generic.Traceback - .kc { font-weight: bold } // Keyword.Constant - .kd { font-weight: bold } // Keyword.Declaration - .kp { font-weight: bold } // Keyword.Pseudo - .kr { font-weight: bold } // Keyword.Reserved - .kt { color: #458; font-weight: bold } // Keyword.Type - .m { color: #099 } // Literal.Number - .s { color: #d14 } // Literal.String - .na { color: #008080 } // Name.Attribute - .nb { color: #0086B3 } // Name.Builtin - .nc { color: #458; font-weight: bold } // Name.Class - .no { color: #008080 } // Name.Constant - .ni { color: #800080 } // Name.Entity - .ne { color: #900; font-weight: bold } // Name.Exception - .nf { color: #900; font-weight: bold } // Name.Function - .nn { color: #555 } // Name.Namespace - .nt { color: #000080 } // Name.Tag - .nv { color: #008080 } // Name.Variable - .ow { font-weight: bold } // Operator.Word - .w { color: #bbb } // Text.Whitespace - .mf { color: #099 } // Literal.Number.Float - .mh { color: #099 } // Literal.Number.Hex - .mi { color: #099 } // Literal.Number.Integer - .mo { color: #099 } // Literal.Number.Oct - .sb { color: #d14 } // Literal.String.Backtick - .sc { color: #d14 } // Literal.String.Char - .sd { color: #d14 } // Literal.String.Doc - .s2 { color: #d14 } // Literal.String.Double - .se { color: #d14 } // Literal.String.Escape - .sh { color: #d14 } // Literal.String.Heredoc - .si { color: #d14 } // Literal.String.Interpol - .sx { color: #d14 } // Literal.String.Other - .sr { color: #009926 } // Literal.String.Regex - .s1 { color: #d14 } // Literal.String.Single - .ss { color: #990073 } // Literal.String.Symbol - .bp { color: #999 } // Name.Builtin.Pseudo - .vc { color: #008080 } // Name.Variable.Class - .vg { color: #008080 } // Name.Variable.Global - .vi { color: #008080 } // Name.Variable.Instance - .il { color: #099 } // Literal.Number.Integer.Long -} diff --git a/lib/site_template/css/main.scss b/lib/site_template/css/main.scss index f2e566e2a19..c91fac8d134 100644 --- a/lib/site_template/css/main.scss +++ b/lib/site_template/css/main.scss @@ -3,8 +3,6 @@ --- @charset "utf-8"; - - // Our variables $base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; $base-font-size: 16px; @@ -28,8 +26,7 @@ $content-width: 800px; $on-palm: 600px; $on-laptop: 800px; - - +// Minima also includes a mixin for defining media queries. // Use media queries like this: // @include media-query($on-palm) { // .wrapper { @@ -37,17 +34,6 @@ $on-laptop: 800px; // padding-left: $spacing-unit / 2; // } // } -@mixin media-query($device) { - @media screen and (max-width: $device) { - @content; - } -} - - -// Import partials from `sass_dir` (defaults to `_sass`) -@import - "base", - "layout", - "syntax-highlighting" -; +// Import partials from the `minima` theme. +@import "minima"; From 51c415291932502ea7f1bfb2867a1bf5c047b3a2 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 20 May 2016 19:19:21 -0700 Subject: [PATCH 0828/4996] Release a beta. --- lib/jekyll/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index 65a1431d673..e482bd23564 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,3 +1,3 @@ module Jekyll - VERSION = '3.1.6' + VERSION = '3.2.0.pre.beta1' end From 498324bbffc282ca0503c6a0f18ca63df7a2db8a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 20 May 2016 19:19:26 -0700 Subject: [PATCH 0829/4996] Release :gem: 3.2.0.pre.beta1 From 013e2f159d583cf635448e6cdf8fc050d572b7a1 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Thu, 19 May 2016 20:32:56 -0500 Subject: [PATCH 0830/4996] Rubocop fixes for test/test_url.rb --- .rubocop.yml | 1 - test/test_url.rb | 46 ++++++++++++++++++++++------------------------ 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index ac3c83008eb..020e4f92ea3 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -84,7 +84,6 @@ AllCops: - test/test_static_file.rb - test/test_tags.rb - test/test_theme.rb - - test/test_url.rb - test/test_utils.rb - bin/**/* - benchmark/**/* diff --git a/test/test_url.rb b/test/test_url.rb index 99ee5e6125e..fc9a46eb0a3 100644 --- a/test/test_url.rb +++ b/test/test_url.rb @@ -1,8 +1,7 @@ -require 'helper' +require "helper" class TestURL < JekyllUnitTest context "The URL class" do - should "throw an exception if neither permalink or template is specified" do assert_raises ArgumentError do URL.new(:placeholders => {}) @@ -11,46 +10,46 @@ class TestURL < JekyllUnitTest should "replace placeholders in templates" do assert_equal "/foo/bar", URL.new( - :template => "/:x/:y", - :placeholders => {:x => "foo", :y => "bar"} + :template => "/:x/:y", + :placeholders => { :x => "foo", :y => "bar" } ).to_s end should "handle multiple of the same key in the template" do - assert_equal '/foo/bar/foo/', URL.new( - :template => "/:x/:y/:x/", - :placeholders => {:x => "foo", :y => "bar"} + assert_equal "/foo/bar/foo/", URL.new( + :template => "/:x/:y/:x/", + :placeholders => { :x => "foo", :y => "bar" } ).to_s end should "use permalink if given" do assert_equal "/le/perma/link", URL.new( - :template => "/:x/:y", - :placeholders => {:x => "foo", :y => "bar"}, - :permalink => "/le/perma/link" + :template => "/:x/:y", + :placeholders => { :x => "foo", :y => "bar" }, + :permalink => "/le/perma/link" ).to_s end should "replace placeholders in permalinks" do assert_equal "/foo/bar", URL.new( - :template => "/baz", - :permalink => "/:x/:y", - :placeholders => {:x => "foo", :y => "bar"} + :template => "/baz", + :permalink => "/:x/:y", + :placeholders => { :x => "foo", :y => "bar" } ).to_s end should "handle multiple of the same key in the permalink" do - assert_equal '/foo/bar/foo/', URL.new( - :template => "/baz", - :permalink => "/:x/:y/:x/", - :placeholders => {:x => "foo", :y => "bar"} + assert_equal "/foo/bar/foo/", URL.new( + :template => "/baz", + :permalink => "/:x/:y/:x/", + :placeholders => { :x => "foo", :y => "bar" } ).to_s end should "handle nil values for keys in the template" do - assert_equal '/foo/bar/', URL.new( - :template => "/:x/:y/:z/", - :placeholders => {:x => "foo", :y => "bar", :z => nil} + assert_equal "/foo/bar/", URL.new( + :template => "/:x/:y/:z/", + :placeholders => { :x => "foo", :y => "bar", :z => nil } ).to_s end @@ -60,17 +59,16 @@ class TestURL < JekyllUnitTest "methods" => { "output" => true } - }, + } }) site.read matching_doc = site.collections["methods"].docs.find do |doc| doc.relative_path == "_methods/escape-+ #%20[].md" end - assert_equal '/methods/escape-+-20/escape-20.html', URL.new( - :template => '/methods/:title/:name:output_ext', + assert_equal "/methods/escape-+-20/escape-20.html", URL.new( + :template => "/methods/:title/:name:output_ext", :placeholders => matching_doc.url_placeholders ).to_s end - end end From 1380836a4bf5a3e8be8eb2ddf74318718f3979d2 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Thu, 19 May 2016 20:36:07 -0500 Subject: [PATCH 0831/4996] Rubocop fixes for test/test_theme.rb --- .rubocop.yml | 1 - test/test_theme.rb | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 020e4f92ea3..47ad23534db 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -83,7 +83,6 @@ AllCops: - test/test_site.rb - test/test_static_file.rb - test/test_tags.rb - - test/test_theme.rb - test/test_utils.rb - bin/**/* - benchmark/**/* diff --git a/test/test_theme.rb b/test/test_theme.rb index 9767946ef11..a448ce30735 100644 --- a/test/test_theme.rb +++ b/test/test_theme.rb @@ -1,14 +1,14 @@ -require 'helper' +require "helper" class TestTheme < JekyllUnitTest def setup - @theme = Theme.new('test-theme') + @theme = Theme.new("test-theme") @expected_root = File.expand_path "./fixtures/test-theme", File.dirname(__FILE__) end context "initializing" do should "normalize the theme name" do - theme = Theme.new(' Test-Theme ') + theme = Theme.new(" Test-Theme ") assert_equal "test-theme", theme.name end @@ -28,7 +28,8 @@ def setup should "add itself to sass's load path" do @theme.configure_sass - assert Sass.load_paths.include?(@theme.sass_path), "Sass load paths should include the theme sass dir" + message = "Sass load paths should include the theme sass dir" + assert Sass.load_paths.include?(@theme.sass_path), message end end From 16c1146b4f55f2047367a28946b02015adca3e6e Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Thu, 19 May 2016 20:48:30 -0500 Subject: [PATCH 0832/4996] Rubocop fixes for test/test_static_file.rb --- .rubocop.yml | 1 - test/test_static_file.rb | 42 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 47ad23534db..24816dc7daf 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -81,7 +81,6 @@ AllCops: - test/test_related_posts.rb - test/test_sass.rb - test/test_site.rb - - test/test_static_file.rb - test/test_tags.rb - test/test_utils.rb - bin/**/* diff --git a/test/test_static_file.rb b/test/test_static_file.rb index 85512ab449b..b705ff05666 100644 --- a/test/test_static_file.rb +++ b/test/test_static_file.rb @@ -1,4 +1,4 @@ -require 'helper' +require "helper" class TestStaticFile < JekyllUnitTest def make_dummy_file(filename) @@ -6,7 +6,8 @@ def make_dummy_file(filename) end def modify_dummy_file(filename) - offset = "some content".size + string = "some content" + offset = string.size File.write(source_dir(filename), "more content", offset) end @@ -18,13 +19,13 @@ def setup_static_file(base, dir, name) StaticFile.new(@site, base, dir, name) end - def setup_static_file_with_collection(base, dir, name, label, metadata) - site = fixture_site('collections' => {label => metadata}) - StaticFile.new(site, base, dir, name, site.collections[label]) + def setup_static_file_with_collection(base, dir, name, metadata) + site = fixture_site("collections" => { "foo" => metadata }) + StaticFile.new(site, base, dir, name, site.collections["foo"]) end def setup_static_file_with_defaults(base, dir, name, defaults) - site = fixture_site('defaults' => defaults) + site = fixture_site("defaults" => defaults) StaticFile.new(site, base, dir, name) end @@ -62,17 +63,16 @@ def setup_static_file_with_defaults(base, dir, name, defaults) end should "have a destination relative directory with a collection" do - static_file = setup_static_file_with_collection( - "root", "_foo/dir/subdir", "file.html", "foo", {"output" => true}) + static_file = setup_static_file_with_collection("root", "_foo/dir/subdir", + "file.html", { "output" => true }) assert_equal :foo, static_file.type assert_equal "/foo/dir/subdir/file.html", static_file.url assert_equal "/foo/dir/subdir", static_file.destination_rel_dir end - should "use its collection's permalink template for the destination relative directory" do - static_file = setup_static_file_with_collection( - "root", "_foo/dir/subdir", "file.html", "foo", - {"output" => true, "permalink" => "/:path/"}) + should "use its collection's permalink template for destination relative directory" do + static_file = setup_static_file_with_collection("root", "_foo/dir/subdir", + "file.html", { "output" => true, "permalink" => "/:path/" }) assert_equal :foo, static_file.type assert_equal "/dir/subdir/file.html", static_file.url assert_equal "/dir/subdir", static_file.destination_rel_dir @@ -86,13 +86,13 @@ def setup_static_file_with_defaults(base, dir, name, defaults) should "use the _config.yml defaults to determine writability" do defaults = [{ - "scope" => {"path" => "private"}, - "values" => {"published" => false} + "scope" => { "path" => "private" }, + "values" => { "published" => false } }] - static_file = setup_static_file_with_defaults( - "root", "private/dir/subdir", "file.html", defaults) + static_file = setup_static_file_with_defaults("root", "private/dir/subdir", + "file.html", defaults) assert(!static_file.write?, - "static_file.write? should return false when _config.yml sets " + + "static_file.write? should return false when _config.yml sets " \ "`published: false`") end @@ -116,15 +116,15 @@ def setup_static_file_with_defaults(base, dir, name, defaults) assert @static_file.write?, "always true, with current implementation" end - should "be able to write itself to the desitination direcotry" do + should "be able to write itself to the desitination directory" do assert @static_file.write(dest_dir) end should "be able to convert to liquid" do expected = { - "extname" => ".txt", - "modified_time" => @static_file.modified_time, - "path" => "/static_file.txt", + "extname" => ".txt", + "modified_time" => @static_file.modified_time, + "path" => "/static_file.txt" } assert_equal expected, @static_file.to_liquid end From a9f110b861bed10cc3f01e145956aa6343e00d0a Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Thu, 19 May 2016 20:51:58 -0500 Subject: [PATCH 0833/4996] Rubocop fixes for test/test_sass.rb --- .rubocop.yml | 1 - test/test_sass.rb | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 24816dc7daf..9680ee72a05 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -79,7 +79,6 @@ AllCops: - test/test_page.rb - test/test_regenerator.rb - test/test_related_posts.rb - - test/test_sass.rb - test/test_site.rb - test/test_tags.rb - test/test_utils.rb diff --git a/test/test_sass.rb b/test/test_sass.rb index 153c339af1c..f5241790497 100644 --- a/test/test_sass.rb +++ b/test/test_sass.rb @@ -1,10 +1,10 @@ -require 'helper' +require "helper" class TestSass < JekyllUnitTest context "importing partials" do setup do @site = Jekyll::Site.new(Jekyll.configuration({ - "source" => source_dir, + "source" => source_dir, "destination" => dest_dir })) @site.process @@ -16,11 +16,13 @@ class TestSass < JekyllUnitTest end should "register the SCSS converter" do - assert !!@site.find_converter_instance(Jekyll::Converters::Scss), "SCSS converter implementation should exist." + message = "SCSS converter implementation should exist." + assert !!@site.find_converter_instance(Jekyll::Converters::Scss), message end should "register the Sass converter" do - assert !!@site.find_converter_instance(Jekyll::Converters::Sass), "Sass converter implementation should exist." + message = "Sass converter implementation should exist." + assert !!@site.find_converter_instance(Jekyll::Converters::Sass), message end end end From 8f07affe2ad162ea72c7074c627223c53dad925e Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Thu, 19 May 2016 20:55:44 -0500 Subject: [PATCH 0834/4996] Rubocop fixes for test/test_related_posts.rb --- .rubocop.yml | 1 - test/test_related_posts.rb | 13 ++++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 9680ee72a05..9aeca7021f9 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -78,7 +78,6 @@ AllCops: - test/test_liquid_renderer.rb - test/test_page.rb - test/test_regenerator.rb - - test/test_related_posts.rb - test/test_site.rb - test/test_tags.rb - test/test_utils.rb diff --git a/test/test_related_posts.rb b/test/test_related_posts.rb index cd114c044f2..cda18dfcb3b 100644 --- a/test/test_related_posts.rb +++ b/test/test_related_posts.rb @@ -1,4 +1,4 @@ -require 'helper' +require "helper" class TestRelatedPosts < JekyllUnitTest context "building related posts without lsi" do @@ -33,26 +33,29 @@ class TestRelatedPosts < JekyllUnitTest @site.reset @site.read - require 'classifier-reborn' + require "classifier-reborn" Jekyll::RelatedPosts.lsi = nil end should "index Jekyll::Post objects" do @site.posts.docs = @site.posts.docs.first(1) - expect_any_instance_of(::ClassifierReborn::LSI).to receive(:add_item).with(kind_of(Jekyll::Document)) + expect_any_instance_of(::ClassifierReborn::LSI).to \ + receive(:add_item).with(kind_of(Jekyll::Document)) Jekyll::RelatedPosts.new(@site.posts.last).build_index end should "find related Jekyll::Post objects, given a Jekyll::Post object" do post = @site.posts.last allow_any_instance_of(::ClassifierReborn::LSI).to receive(:build_index) - expect_any_instance_of(::ClassifierReborn::LSI).to receive(:find_related).with(post, 11).and_return(@site.posts[-1..-9]) + expect_any_instance_of(::ClassifierReborn::LSI).to \ + receive(:find_related).with(post, 11).and_return(@site.posts[-1..-9]) Jekyll::RelatedPosts.new(post).build end should "use lsi for the related posts" do - allow_any_instance_of(::ClassifierReborn::LSI).to receive(:find_related).and_return(@site.posts[-1..-9]) + allow_any_instance_of(::ClassifierReborn::LSI).to \ + receive(:find_related).and_return(@site.posts[-1..-9]) allow_any_instance_of(::ClassifierReborn::LSI).to receive(:build_index) assert_equal @site.posts[-1..-9], Jekyll::RelatedPosts.new(@site.posts.last).build From e85f2a0ee9be3cfe7805976541280c4b93d97a1c Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Thu, 19 May 2016 20:58:09 -0500 Subject: [PATCH 0835/4996] Rubocop fixes for lib/jekyll/version.rb --- .rubocop.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 9aeca7021f9..0e65424cc0e 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -65,7 +65,6 @@ AllCops: - lib/jekyll/utils/ansi.rb - lib/jekyll/utils/platforms.rb - lib/jekyll/utils.rb - - lib/jekyll/version.rb - lib/jekyll.rb - features/step_definitions.rb - features/support/formatter.rb From d743c8035793ea0ddf87e4849a617db179da6fc9 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Thu, 19 May 2016 21:06:35 -0500 Subject: [PATCH 0836/4996] Rubocop fixes for lib/jekyll/utils/ansi.rb --- .rubocop.yml | 1 - lib/jekyll/utils/ansi.rb | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 0e65424cc0e..56b29b9c92f 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -62,7 +62,6 @@ AllCops: - lib/jekyll/tags/post_url.rb - lib/jekyll/theme.rb - lib/jekyll/url.rb - - lib/jekyll/utils/ansi.rb - lib/jekyll/utils/platforms.rb - lib/jekyll/utils.rb - lib/jekyll.rb diff --git a/lib/jekyll/utils/ansi.rb b/lib/jekyll/utils/ansi.rb index 933b4323018..715cb277c59 100644 --- a/lib/jekyll/utils/ansi.rb +++ b/lib/jekyll/utils/ansi.rb @@ -8,17 +8,17 @@ module Ansi extend self ESCAPE = format("%c", 27) - MATCH = /#{ESCAPE}\[(?:\d+)(?:;\d+)*(j|k|m|s|u|A|B|G)|\e\(B\e\[m/ix.freeze + MATCH = /#{ESCAPE}\[(?:\d+)(?:;\d+)*(j|k|m|s|u|A|B|G)|\e\(B\e\[m/ix COLORS = { - :red => 31, - :green => 32, - :black => 30, + :red => 31, + :green => 32, + :black => 30, :magenta => 35, - :yellow => 33, - :white => 37, - :blue => 34, - :cyan => 36 - } + :yellow => 33, + :white => 37, + :blue => 34, + :cyan => 36 + }.freeze # Strip ANSI from the current string. It also strips cursor stuff, # well some of it, and it also strips some other stuff that a lot of From 281a873c7156f9700c3c143e8deba37c0f528d49 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Thu, 19 May 2016 21:07:44 -0500 Subject: [PATCH 0837/4996] lib/jekyll/utils/platforms.rb didn't have any rubocop errors --- .rubocop.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 56b29b9c92f..4189be7bb14 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -62,7 +62,6 @@ AllCops: - lib/jekyll/tags/post_url.rb - lib/jekyll/theme.rb - lib/jekyll/url.rb - - lib/jekyll/utils/platforms.rb - lib/jekyll/utils.rb - lib/jekyll.rb - features/step_definitions.rb From 6db52725288b35bedb6a4442b9f1c2c13e28aae3 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Fri, 20 May 2016 20:36:49 -0500 Subject: [PATCH 0838/4996] Splitting args onto own lines in test/test_static_file.rb For functions where the character limit was exceeded and line wrapping was needed, this commit just splits each arg into it's own line. --- test/test_static_file.rb | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/test/test_static_file.rb b/test/test_static_file.rb index b705ff05666..7019a1073b3 100644 --- a/test/test_static_file.rb +++ b/test/test_static_file.rb @@ -63,16 +63,24 @@ def setup_static_file_with_defaults(base, dir, name, defaults) end should "have a destination relative directory with a collection" do - static_file = setup_static_file_with_collection("root", "_foo/dir/subdir", - "file.html", { "output" => true }) + static_file = setup_static_file_with_collection( + "root", + "_foo/dir/subdir", + "file.html", + { "output" => true } + ) assert_equal :foo, static_file.type assert_equal "/foo/dir/subdir/file.html", static_file.url assert_equal "/foo/dir/subdir", static_file.destination_rel_dir end should "use its collection's permalink template for destination relative directory" do - static_file = setup_static_file_with_collection("root", "_foo/dir/subdir", - "file.html", { "output" => true, "permalink" => "/:path/" }) + static_file = setup_static_file_with_collection( + "root", + "_foo/dir/subdir", + "file.html", + { "output" => true, "permalink" => "/:path/" } + ) assert_equal :foo, static_file.type assert_equal "/dir/subdir/file.html", static_file.url assert_equal "/dir/subdir", static_file.destination_rel_dir @@ -89,8 +97,12 @@ def setup_static_file_with_defaults(base, dir, name, defaults) "scope" => { "path" => "private" }, "values" => { "published" => false } }] - static_file = setup_static_file_with_defaults("root", "private/dir/subdir", - "file.html", defaults) + static_file = setup_static_file_with_defaults( + "root", + "private/dir/subdir", + "file.html", + defaults + ) assert(!static_file.write?, "static_file.write? should return false when _config.yml sets " \ "`published: false`") From dbda462c2f001f0d69e581f3c4664696b43e96ba Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Fri, 20 May 2016 21:51:16 -0500 Subject: [PATCH 0839/4996] Adding double quotes & freeze back to version after rebase --- lib/jekyll/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index e482bd23564..a8d86cb3320 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,3 +1,3 @@ module Jekyll - VERSION = '3.2.0.pre.beta1' + VERSION = "3.2.0.pre.beta1".freeze end From e02049727b8414a8a1e7b6baeebd306f1384566e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 23 May 2016 13:44:00 -0700 Subject: [PATCH 0840/4996] Update history to reflect merge of #4916 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 2d2494c1d7c..8bf867494a4 100644 --- a/History.markdown +++ b/History.markdown @@ -59,6 +59,7 @@ * Fixing rubocop offenses in lib/jekyll/cleaner.rb (#4892) * Update `jekyll/commands*` to pass rubocop rules (#4888) * Clean up many test files to pass Rubocop rules (#4902) + * Rubocop cleanup for some utils and further test files (#4916) ### Site Enhancements From a8d27e5788c67504908e392c5cf6a53f1492254e Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Mon, 23 May 2016 22:10:49 -0500 Subject: [PATCH 0841/4996] Rubocop: Low hanging fruit --- .rubocop.yml | 23 ---------- .../converters/markdown/rdiscount_parser.rb | 8 ++-- lib/jekyll/drops/document_drop.rb | 6 +-- lib/jekyll/drops/drop.rb | 12 +++--- lib/jekyll/drops/url_drop.rb | 8 ++-- lib/jekyll/excerpt.rb | 4 +- lib/jekyll/external.rb | 6 +-- lib/jekyll/hooks.rb | 42 +++++++++---------- lib/jekyll/liquid_renderer/file.rb | 2 +- lib/jekyll/log_adapter.rb | 4 +- lib/jekyll/plugin.rb | 10 ++--- lib/jekyll/publisher.rb | 2 +- lib/jekyll/readers/data_reader.rb | 16 +++---- lib/jekyll/related_posts.rb | 2 +- 14 files changed, 61 insertions(+), 84 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 4189be7bb14..198cb1e6e34 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,51 +7,28 @@ AllCops: - lib/jekyll/collection.rb - lib/jekyll/command.rb - lib/jekyll/configuration.rb - - lib/jekyll/converter.rb - lib/jekyll/converters/identity.rb - - lib/jekyll/converters/markdown - lib/jekyll/converters/markdown/kramdown_parser.rb - - lib/jekyll/converters/markdown/rdiscount_parser.rb - lib/jekyll/converters/markdown/redcarpet_parser.rb - lib/jekyll/converters/markdown.rb - - lib/jekyll/converters/smartypants.rb - lib/jekyll/convertible.rb - lib/jekyll/deprecator.rb - lib/jekyll/document.rb - - lib/jekyll/drops/collection_drop.rb - - lib/jekyll/drops/document_drop.rb - - lib/jekyll/drops/drop.rb - - lib/jekyll/drops/jekyll_drop.rb - lib/jekyll/drops/site_drop.rb - - lib/jekyll/drops/unified_payload_drop.rb - - lib/jekyll/drops/url_drop.rb - lib/jekyll/entry_filter.rb - - lib/jekyll/errors.rb - - lib/jekyll/excerpt.rb - - lib/jekyll/external.rb - lib/jekyll/filters.rb - lib/jekyll/frontmatter_defaults.rb - - lib/jekyll/generator.rb - - lib/jekyll/hooks.rb - lib/jekyll/layout.rb - - lib/jekyll/liquid_extensions.rb - - lib/jekyll/liquid_renderer/file.rb - lib/jekyll/liquid_renderer/table.rb - lib/jekyll/liquid_renderer.rb - - lib/jekyll/log_adapter.rb - lib/jekyll/page.rb - - lib/jekyll/plugin.rb - lib/jekyll/plugin_manager.rb - - lib/jekyll/publisher.rb - lib/jekyll/reader.rb - - lib/jekyll/readers/collection_reader.rb - - lib/jekyll/readers/data_reader.rb - lib/jekyll/readers/layout_reader.rb - lib/jekyll/readers/page_reader.rb - lib/jekyll/readers/post_reader.rb - lib/jekyll/readers/static_file_reader.rb - lib/jekyll/regenerator.rb - - lib/jekyll/related_posts.rb - lib/jekyll/renderer.rb - lib/jekyll/site.rb - lib/jekyll/static_file.rb diff --git a/lib/jekyll/converters/markdown/rdiscount_parser.rb b/lib/jekyll/converters/markdown/rdiscount_parser.rb index daf8874edd6..f1679e796c4 100644 --- a/lib/jekyll/converters/markdown/rdiscount_parser.rb +++ b/lib/jekyll/converters/markdown/rdiscount_parser.rb @@ -5,14 +5,14 @@ class RDiscountParser def initialize(config) Jekyll::External.require_with_graceful_fail "rdiscount" @config = config - @rdiscount_extensions = @config['rdiscount']['extensions'].map(&:to_sym) + @rdiscount_extensions = @config["rdiscount"]["extensions"].map(&:to_sym) end def convert(content) rd = RDiscount.new(content, *@rdiscount_extensions) html = rd.to_html - if @config['rdiscount']['toc_token'] - html = replace_generated_toc(rd, html, @config['rdiscount']['toc_token']) + if @config["rdiscount"]["toc_token"] + html = replace_generated_toc(rd, html, @config["rdiscount"]["toc_token"]) end html end @@ -21,7 +21,7 @@ def convert(content) def replace_generated_toc(rd, html, toc_token) if rd.generate_toc && html.include?(toc_token) utf8_toc = rd.toc_content - utf8_toc.force_encoding('utf-8') if utf8_toc.respond_to?(:force_encoding) + utf8_toc.force_encoding("utf-8") if utf8_toc.respond_to?(:force_encoding) html.gsub(toc_token, utf8_toc) else html diff --git a/lib/jekyll/drops/document_drop.rb b/lib/jekyll/drops/document_drop.rb index 4eb9e50c1dd..6ec840f56eb 100644 --- a/lib/jekyll/drops/document_drop.rb +++ b/lib/jekyll/drops/document_drop.rb @@ -17,13 +17,13 @@ def collection end def excerpt - fallback_data['excerpt'].to_s + fallback_data["excerpt"].to_s end def <=>(other) return nil unless other.is_a? DocumentDrop - cmp = self['date'] <=> other['date'] - cmp = self['path'] <=> other['path'] if cmp.nil? || cmp == 0 + cmp = self["date"] <=> other["date"] + cmp = self["path"] <=> other["path"] if cmp.nil? || cmp == 0 cmp end diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb index d1bffcc5abd..817143098cd 100644 --- a/lib/jekyll/drops/drop.rb +++ b/lib/jekyll/drops/drop.rb @@ -13,11 +13,11 @@ class Drop < Liquid::Drop # # Returns the mutability of the class def self.mutable(is_mutable = nil) - if is_mutable - @is_mutable = is_mutable - else - @is_mutable = false - end + @is_mutable = if is_mutable + is_mutable + else + false + end end def self.mutable? @@ -134,7 +134,7 @@ def to_h # # Returns a pretty generation of the hash representation of the Drop. def inspect - require 'json' + require "json" JSON.pretty_generate to_h end diff --git a/lib/jekyll/drops/url_drop.rb b/lib/jekyll/drops/url_drop.rb index 2815edf7557..04e48a206d8 100644 --- a/lib/jekyll/drops/url_drop.rb +++ b/lib/jekyll/drops/url_drop.rb @@ -19,20 +19,20 @@ def name end def title - Utils.slugify(@obj.data['slug'], :mode => "pretty", :cased => true) || + Utils.slugify(@obj.data["slug"], :mode => "pretty", :cased => true) || Utils.slugify(@obj.basename_without_ext, :mode => "pretty", :cased => true) end def slug - Utils.slugify(@obj.data['slug']) || Utils.slugify(@obj.basename_without_ext) + Utils.slugify(@obj.data["slug"]) || Utils.slugify(@obj.basename_without_ext) end def categories category_set = Set.new - Array(@obj.data['categories']).each do |category| + Array(@obj.data["categories"]).each do |category| category_set << category.to_s.downcase end - category_set.to_a.join('/') + category_set.to_a.join("/") end def year diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb index f5884d682d8..f642589223b 100644 --- a/lib/jekyll/excerpt.rb +++ b/lib/jekyll/excerpt.rb @@ -59,9 +59,9 @@ def to_s end def to_liquid - doc.data['excerpt'] = nil + doc.data["excerpt"] = nil @to_liquid ||= doc.to_liquid - doc.data['excerpt'] = self + doc.data["excerpt"] = self @to_liquid end diff --git a/lib/jekyll/external.rb b/lib/jekyll/external.rb index 69b8d1eb391..561cbb4d299 100644 --- a/lib/jekyll/external.rb +++ b/lib/jekyll/external.rb @@ -23,7 +23,7 @@ def require_if_present(names, &block) require name rescue LoadError Jekyll.logger.debug "Couldn't load #{name}. Skipping." - block.call(name) if block + yield(name) if block false end end @@ -39,7 +39,7 @@ def require_if_present(names, &block) def require_with_graceful_fail(names) Array(names).each do |name| begin - Jekyll.logger.debug "Requiring:", "#{name}" + Jekyll.logger.debug "Requiring:", name.to_s require name rescue LoadError => e Jekyll.logger.error "Dependency Error:", <<-MSG @@ -50,7 +50,7 @@ def require_with_graceful_fail(names) If you run into trouble, you can find helpful resources at http://jekyllrb.com/help/! MSG - raise Jekyll::Errors::MissingDependencyException.new(name) + raise Jekyll::Errors::MissingDependencyException, name end end end diff --git a/lib/jekyll/hooks.rb b/lib/jekyll/hooks.rb index 6d8fcd8ddd3..c9a4f79439a 100644 --- a/lib/jekyll/hooks.rb +++ b/lib/jekyll/hooks.rb @@ -4,38 +4,38 @@ module Hooks # compatibility layer for octopress-hooks users PRIORITY_MAP = { - :low => 10, + :low => 10, :normal => 20, - :high => 30 + :high => 30 }.freeze # initial empty hooks @registry = { - :site => { - :after_init => [], + :site => { + :after_init => [], :after_reset => [], - :post_read => [], - :pre_render => [], + :post_read => [], + :pre_render => [], :post_render => [], - :post_write => [] + :post_write => [] }, - :pages => { - :post_init => [], - :pre_render => [], + :pages => { + :post_init => [], + :pre_render => [], :post_render => [], - :post_write => [] + :post_write => [] }, - :posts => { - :post_init => [], - :pre_render => [], + :posts => { + :post_init => [], + :pre_render => [], :post_render => [], - :post_write => [] + :post_write => [] }, :documents => { - :post_init => [], - :pre_render => [], + :post_init => [], + :pre_render => [], :post_render => [], - :post_write => [] + :post_write => [] } } @@ -61,10 +61,10 @@ def self.priority_value(priority) # register a single hook to be called later, internal API def self.register_one(owner, event, priority, &block) @registry[owner] ||={ - :post_init => [], - :pre_render => [], + :post_init => [], + :pre_render => [], :post_render => [], - :post_write => [] + :post_write => [] } unless @registry[owner][event] diff --git a/lib/jekyll/liquid_renderer/file.rb b/lib/jekyll/liquid_renderer/file.rb index 7dcca1b62a1..63686d8f9ec 100644 --- a/lib/jekyll/liquid_renderer/file.rb +++ b/lib/jekyll/liquid_renderer/file.rb @@ -8,7 +8,7 @@ def initialize(renderer, filename) def parse(content) measure_time do - @template = Liquid::Template.parse(content, line_numbers: true) + @template = Liquid::Template.parse(content, :line_numbers => true) end self diff --git a/lib/jekyll/log_adapter.rb b/lib/jekyll/log_adapter.rb index df0cfdc4b10..8ac674514f6 100644 --- a/lib/jekyll/log_adapter.rb +++ b/lib/jekyll/log_adapter.rb @@ -7,7 +7,7 @@ class LogAdapter :info => ::Logger::INFO, :warn => ::Logger::WARN, :error => ::Logger::ERROR - } + }.freeze # Public: Create a new instance of a log writer # @@ -98,7 +98,7 @@ def abort_with(topic, message = nil) # # Returns the formatted message def message(topic, message) - msg = formatted_topic(topic) + message.to_s.gsub(/\s+/, ' ') + msg = formatted_topic(topic) + message.to_s.gsub(/\s+/, " ") messages << msg msg end diff --git a/lib/jekyll/plugin.rb b/lib/jekyll/plugin.rb index 1fb91058f03..bcc1bf7e990 100644 --- a/lib/jekyll/plugin.rb +++ b/lib/jekyll/plugin.rb @@ -1,12 +1,12 @@ module Jekyll class Plugin PRIORITIES = { - :low => -10, + :low => -10, :highest => 100, - :lowest => -100, - :normal => 0, - :high => 10 - } + :lowest => -100, + :normal => 0, + :high => 10 + }.freeze # diff --git a/lib/jekyll/publisher.rb b/lib/jekyll/publisher.rb index cc739627d96..0b67b8c6025 100644 --- a/lib/jekyll/publisher.rb +++ b/lib/jekyll/publisher.rb @@ -15,7 +15,7 @@ def hidden_in_the_future?(thing) private def can_be_published?(thing) - thing.data.fetch('published', true) || @site.unpublished + thing.data.fetch("published", true) || @site.unpublished end end end diff --git a/lib/jekyll/readers/data_reader.rb b/lib/jekyll/readers/data_reader.rb index 796c0d2979e..e7e46bdc346 100644 --- a/lib/jekyll/readers/data_reader.rb +++ b/lib/jekyll/readers/data_reader.rb @@ -30,14 +30,14 @@ def read_data_to(dir, data) return unless File.directory?(dir) && !@entry_filter.symlink?(dir) entries = Dir.chdir(dir) do - Dir['*.{yaml,yml,json,csv}'] + Dir['*'].select { |fn| File.directory?(fn) } + Dir["*.{yaml,yml,json,csv}"] + Dir["*"].select { |fn| File.directory?(fn) } end entries.each do |entry| path = @site.in_source_dir(dir, entry) next if @entry_filter.symlink?(path) - key = sanitize_filename(File.basename(entry, '.*')) + key = sanitize_filename(File.basename(entry, ".*")) if File.directory?(path) read_data_to(path, data[key] = {}) else @@ -51,20 +51,20 @@ def read_data_to(dir, data) # Returns the contents of the data file. def read_data_file(path) case File.extname(path).downcase - when '.csv' + when ".csv" CSV.read(path, { - :headers => true, - :encoding => site.config['encoding'] - }).map(&:to_hash) + :headers => true, + :encoding => site.config["encoding"] + }).map(&:to_hash) else SafeYAML.load_file(path) end end def sanitize_filename(name) - name.gsub!(/[^\w\s-]+/, '') + name.gsub!(/[^\w\s-]+/, "") name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2') - name.gsub(/\s+/, '_') + name.gsub(/\s+/, "_") end end end diff --git a/lib/jekyll/related_posts.rb b/lib/jekyll/related_posts.rb index 51ae8d8f4af..cde1742c081 100644 --- a/lib/jekyll/related_posts.rb +++ b/lib/jekyll/related_posts.rb @@ -9,7 +9,7 @@ class << self def initialize(post) @post = post @site = post.site - Jekyll::External.require_with_graceful_fail('classifier-reborn') if site.lsi + Jekyll::External.require_with_graceful_fail("classifier-reborn") if site.lsi end def build From 41a8b10780e7f41e05f8b2ef24a20dae29a979cc Mon Sep 17 00:00:00 2001 From: Anatoliy Yastreb Date: Tue, 24 May 2016 17:03:06 +0300 Subject: [PATCH 0842/4996] rubocop: fix highlight tag code style --- .rubocop.yml | 1 - lib/jekyll/tags/highlight.rb | 82 +++++++++++++++++++++--------------- 2 files changed, 48 insertions(+), 35 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 4189be7bb14..50e89d45ef0 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -56,7 +56,6 @@ AllCops: - lib/jekyll/site.rb - lib/jekyll/static_file.rb - lib/jekyll/stevenson.rb - - lib/jekyll/tags/highlight.rb - lib/jekyll/tags/include.rb - lib/jekyll/tags/link.rb - lib/jekyll/tags/post_url.rb diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index a7dbd5193bc..550b3522e26 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -14,22 +14,9 @@ def initialize(tag_name, markup, tokens) super if markup.strip =~ SYNTAX @lang = Regexp.last_match(1).downcase - @highlight_options = {} - if defined?(Regexp.last_match(2)) && Regexp.last_match(2) != '' - # Split along 3 possible forms -- key="", key=value, or key - Regexp.last_match(2).scan(/(?:\w="[^"]*"|\w=\w|\w)+/) do |opt| - key, value = opt.split('=') - # If a quoted list, convert to array - if value && value.include?("\"") - value.delete!('"') - value = value.split - end - @highlight_options[key.to_sym] = value || true - end - end - @highlight_options[:linenos] = "inline" if @highlight_options.key?(:linenos) && @highlight_options[:linenos] == true + @highlight_options = parse_options(Regexp.last_match(2)) else - raise SyntaxError.new <<-eos + raise SyntaxError, <<-eos Syntax Error in tag 'highlight' while parsing the following markup: #{markup} @@ -42,15 +29,15 @@ def initialize(tag_name, markup, tokens) def render(context) prefix = context["highlighter_prefix"] || "" suffix = context["highlighter_suffix"] || "" - code = super.to_s.gsub(/\A(\n|\r)+|(\n|\r)+\z/, '') + code = super.to_s.gsub(/\A(\n|\r)+|(\n|\r)+\z/, "") is_safe = !!context.registers[:site].safe output = case context.registers[:site].highlighter - when 'pygments' + when "pygments" render_pygments(code, is_safe) - when 'rouge' + when "rouge" render_rouge(code) else render_codehighlighter(code) @@ -66,7 +53,7 @@ def sanitized_opts(opts, is_safe) [:startinline, opts.fetch(:startinline, nil)], [:hl_lines, opts.fetch(:hl_lines, nil)], [:linenos, opts.fetch(:linenos, nil)], - [:encoding, opts.fetch(:encoding, 'utf-8')], + [:encoding, opts.fetch(:encoding, "utf-8")], [:cssclass, opts.fetch(:cssclass, nil)] ].reject { |f| f.last.nil? }] else @@ -74,8 +61,30 @@ def sanitized_opts(opts, is_safe) end end + private + + def parse_options(input) + options = {} + if defined?(input) && input != "" + # Split along 3 possible forms -- key="", key=value, or key + input.scan(/(?:\w="[^"]*"|\w=\w|\w)+/) do |opt| + key, value = opt.split("=") + # If a quoted list, convert to array + if value && value.include?("\"") + value.delete!('"') + value = value.split + end + options[key.to_sym] = value || true + end + end + if options.key?(:linenos) && options[:linenos] == true + options[:linenos] = "inline" + end + options + end + def render_pygments(code, is_safe) - Jekyll::External.require_with_graceful_fail('pygments') + Jekyll::External.require_with_graceful_fail("pygments") highlighted_code = Pygments.highlight( code, @@ -84,22 +93,26 @@ def render_pygments(code, is_safe) ) if highlighted_code.nil? - Jekyll.logger.error "There was an error highlighting your code:" - puts - Jekyll.logger.error code - puts - Jekyll.logger.error "While attempting to convert the above code, Pygments.rb" \ - " returned an unacceptable value." - Jekyll.logger.error "This is usually a timeout problem solved by running `jekyll build` again." - raise ArgumentError.new("Pygments.rb returned an unacceptable value when attempting to highlight some code.") + Jekyll.logger.error <<-eos +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 + raise ArgumentError, "Pygments.rb returned an unacceptable value "\ + "when attempting to highlight some code." end - highlighted_code.sub('
    ', '').sub('
    ', '') + highlighted_code.sub('
    ', "").sub("
    ", "") end def render_rouge(code) - Jekyll::External.require_with_graceful_fail('rouge') - formatter = Rouge::Formatters::HTML.new(:line_numbers => @highlight_options[:linenos], :wrap => false) + Jekyll::External.require_with_graceful_fail("rouge") + formatter = Rouge::Formatters::HTML.new( + :line_numbers => @highlight_options[:linenos], :wrap => false + ) lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText formatter.format(lexer.lex(code)) end @@ -110,13 +123,14 @@ def render_codehighlighter(code) def add_code_tag(code) code_attributes = [ - "class=\"language-#{@lang.to_s.tr('+', '-')}\"", + "class=\"language-#{@lang.to_s.tr("+", "-")}\"", "data-lang=\"#{@lang}\"" ].join(" ") - "
    #{code.chomp}
    " + "
    "\
+        "#{code.chomp}
    " end end end end -Liquid::Template.register_tag('highlight', Jekyll::Tags::HighlightBlock) +Liquid::Template.register_tag("highlight", Jekyll::Tags::HighlightBlock) From 0d1151191437e0da82a6a2cae7282cb8e137945a Mon Sep 17 00:00:00 2001 From: Anatoliy Yastreb Date: Tue, 24 May 2016 17:13:54 +0300 Subject: [PATCH 0843/4996] rubocop: fix link tag code style --- .rubocop.yml | 1 - lib/jekyll/tags/link.rb | 12 ++++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 50e89d45ef0..2dd1e114ff9 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -57,7 +57,6 @@ AllCops: - lib/jekyll/static_file.rb - lib/jekyll/stevenson.rb - lib/jekyll/tags/include.rb - - lib/jekyll/tags/link.rb - lib/jekyll/tags/post_url.rb - lib/jekyll/theme.rb - lib/jekyll/url.rb diff --git a/lib/jekyll/tags/link.rb b/lib/jekyll/tags/link.rb index f81e43b4fd1..b2be119942b 100644 --- a/lib/jekyll/tags/link.rb +++ b/lib/jekyll/tags/link.rb @@ -1,7 +1,7 @@ module Jekyll module Tags class Link < Liquid::Tag - TagName = 'link' + TAG_NAME = "link".freeze def initialize(tag_name, relative_path, tokens) super @@ -16,11 +16,15 @@ def render(context) return document.url if document.relative_path == @relative_path end - raise ArgumentError, "Could not find document '#{@relative_path}' in tag '#{TagName}'.\n\n" \ - "Make sure the document exists and the path is correct." + raise ArgumentError, < Date: Tue, 24 May 2016 17:23:25 +0300 Subject: [PATCH 0844/4996] rubocop: fix post URL tag code style --- .rubocop.yml | 1 - lib/jekyll/tags/post_url.rb | 13 +++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 2dd1e114ff9..f5dcc93aa73 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -57,7 +57,6 @@ AllCops: - lib/jekyll/static_file.rb - lib/jekyll/stevenson.rb - lib/jekyll/tags/include.rb - - lib/jekyll/tags/post_url.rb - lib/jekyll/theme.rb - lib/jekyll/url.rb - lib/jekyll/utils.rb diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb index b05d056b848..2154c0cd961 100644 --- a/lib/jekyll/tags/post_url.rb +++ b/lib/jekyll/tags/post_url.rb @@ -1,14 +1,14 @@ module Jekyll module Tags class PostComparer - MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)$/ + MATCHER = %r!^(.+/)*(\d+-\d+-\d+)-(.*)$! attr_reader :path, :date, :slug, :name def initialize(name) @name = name - all, @path, @date, @slug = *name.sub(/^\//, "").match(MATCHER) + all, @path, @date, @slug = *name.sub(%r!^/!, "").match(MATCHER) unless all raise Jekyll::Errors::InvalidPostNameError, "'#{name}' does not contain valid date and/or title." @@ -42,9 +42,9 @@ def deprecated_equality(other) def post_slug(other) path = other.basename.split("/")[0...-1].join("/") if path.nil? || path == "" - other.data['slug'] + other.data["slug"] else - path + '/' + other.data['slug'] + path + "/" + other.data["slug"] end end end @@ -78,7 +78,8 @@ def render(context) site.posts.docs.each do |p| next unless @post.deprecated_equality p - Jekyll::Deprecator.deprecation_message "A call to '{{ post_url #{@post.name} }}' did not match " \ + Jekyll::Deprecator.deprecation_message "A call to "\ + "'{{ post_url #{@post.name} }}' did not match " \ "a post using the new matching method of checking name " \ "(path-date-slug) equality. Please make sure that you " \ "change this tag to match the post's name exactly." @@ -95,4 +96,4 @@ def render(context) end end -Liquid::Template.register_tag('post_url', Jekyll::Tags::PostUrl) +Liquid::Template.register_tag("post_url", Jekyll::Tags::PostUrl) From 2c567a6dc358221b810355807a7f4df3adf3f8c1 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Tue, 24 May 2016 16:36:50 -0500 Subject: [PATCH 0845/4996] Document normalize_whitepace filter --- site/_docs/templates.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/site/_docs/templates.md b/site/_docs/templates.md index 1c09cab0787..d46911e5e95 100644 --- a/site/_docs/templates.md +++ b/site/_docs/templates.md @@ -256,6 +256,17 @@ common tasks easier.

    + + +

    Normalize Whitespace

    +

    Replace any occurance of whitespace with a single space.

    + + +

    + {% raw %}{{ "a \n b" | normalize_whitepace }}{% endraw %} +

    + +

    Sort

    From b0192340074805e97ef63160ebaa95d8dcd76ec8 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 17 May 2016 14:38:15 -0700 Subject: [PATCH 0846/4996] Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid --- lib/jekyll/drops/drop.rb | 2 +- lib/jekyll/drops/excerpt_drop.rb | 11 +++++++++++ lib/jekyll/excerpt.rb | 7 ++----- test/test_excerpt_drop.rb | 31 +++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 lib/jekyll/drops/excerpt_drop.rb create mode 100644 test/test_excerpt_drop.rb diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb index d1bffcc5abd..6694595374f 100644 --- a/lib/jekyll/drops/drop.rb +++ b/lib/jekyll/drops/drop.rb @@ -3,7 +3,7 @@ module Jekyll module Drops class Drop < Liquid::Drop - NON_CONTENT_METHODS = [:[], :[]=, :inspect, :to_h, :fallback_data].freeze + NON_CONTENT_METHODS = [:[], :[]=, :inspect, :to_h, :fallback_data, :to_s].freeze # Get or set whether the drop class is mutable. # Mutability determines whether or not pre-defined fields may be diff --git a/lib/jekyll/drops/excerpt_drop.rb b/lib/jekyll/drops/excerpt_drop.rb new file mode 100644 index 00000000000..9c95a3550df --- /dev/null +++ b/lib/jekyll/drops/excerpt_drop.rb @@ -0,0 +1,11 @@ +# encoding: UTF-8 + +module Jekyll + module Drops + class ExcerptDrop < DocumentDrop + def excerpt + nil + end + end + end +end diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb index f5884d682d8..8fef70ed944 100644 --- a/lib/jekyll/excerpt.rb +++ b/lib/jekyll/excerpt.rb @@ -7,7 +7,7 @@ class Excerpt attr_writer :output def_delegators :@doc, :site, :name, :ext, :relative_path, :extname, - :render_with_liquid?, :collection, :related_posts + :render_with_liquid?, :collection, :related_posts, :url # Initialize this Excerpt instance. # @@ -59,10 +59,7 @@ def to_s end def to_liquid - doc.data['excerpt'] = nil - @to_liquid ||= doc.to_liquid - doc.data['excerpt'] = self - @to_liquid + Jekyll::Drops::ExcerptDrop.new(self) end # Returns the shorthand String identifier of this doc. diff --git a/test/test_excerpt_drop.rb b/test/test_excerpt_drop.rb new file mode 100644 index 00000000000..2ca0f353586 --- /dev/null +++ b/test/test_excerpt_drop.rb @@ -0,0 +1,31 @@ +require 'helper' + +class TestExcerptDrop < JekyllUnitTest + context "an excerpt drop" do + setup do + @site = fixture_site + @site.read + @doc = @site.docs_to_write.first + @doc_drop = @doc.to_liquid + @excerpt = @doc.data['excerpt'] + @excerpt_drop = @excerpt.to_liquid + end + + should "have the right thing" do + assert @doc.is_a? Jekyll::Document + assert @doc_drop.is_a? Jekyll::Drops::DocumentDrop + assert @excerpt.is_a? Jekyll::Excerpt + assert @excerpt_drop.is_a? Jekyll::Drops::ExcerptDrop + end + + should "not have an excerpt" do + assert_nil @excerpt.data['excerpt'] + assert @excerpt_drop.class.invokable? 'excerpt' + assert_nil @excerpt_drop['excerpt'] + end + + should "inherit values from the document" do + assert_equal @excerpt_drop.keys, @doc_drop.keys + end + end +end From 3896f6d5d8929f3f9e14428703a769912cacb317 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 17 May 2016 16:42:35 -0700 Subject: [PATCH 0847/4996] Use require_relative --- test/helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/helper.rb b/test/helper.rb index 3a3dafa27ae..6904894f56f 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -28,7 +28,7 @@ def jruby? require "minitest/reporters" require "minitest/profile" require "rspec/mocks" -require "jekyll" +require_relative "../lib/jekyll.rb" Jekyll.logger = Logger.new(StringIO.new) From c0910f2bc553d45debf50c2438c77f009f547a9e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 17 May 2016 16:58:06 -0700 Subject: [PATCH 0848/4996] look up the content methods for drops in a smarter way --- lib/jekyll/drops/drop.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb index 6694595374f..b798c27a01c 100644 --- a/lib/jekyll/drops/drop.rb +++ b/lib/jekyll/drops/drop.rb @@ -3,7 +3,7 @@ module Jekyll module Drops class Drop < Liquid::Drop - NON_CONTENT_METHODS = [:[], :[]=, :inspect, :to_h, :fallback_data, :to_s].freeze + NON_CONTENT_METHODS = [:fallback_data].freeze # Get or set whether the drop class is mutable. # Mutability determines whether or not pre-defined fields may be @@ -86,7 +86,7 @@ def []=(key, val) # Returns an Array of strings which represent method-specific keys. def content_methods @content_methods ||= ( - self.class.instance_methods(false) - NON_CONTENT_METHODS + self.class.instance_methods - Jekyll::Drops::Drop.instance_methods - NON_CONTENT_METHODS ).map(&:to_s).reject do |method| method.end_with?("=") end From 7d3f8ac75dcb3274375c5a619d3c727f4305f1ca Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 17 May 2016 16:58:26 -0700 Subject: [PATCH 0849/4996] excerpt drop should give access to document's layout --- lib/jekyll/drops/excerpt_drop.rb | 4 ++++ test/test_excerpt_drop.rb | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/drops/excerpt_drop.rb b/lib/jekyll/drops/excerpt_drop.rb index 9c95a3550df..c70712fcf19 100644 --- a/lib/jekyll/drops/excerpt_drop.rb +++ b/lib/jekyll/drops/excerpt_drop.rb @@ -3,6 +3,10 @@ module Jekyll module Drops class ExcerptDrop < DocumentDrop + def layout + @obj.doc.data['layout'] + end + def excerpt nil end diff --git a/test/test_excerpt_drop.rb b/test/test_excerpt_drop.rb index 2ca0f353586..769aef06786 100644 --- a/test/test_excerpt_drop.rb +++ b/test/test_excerpt_drop.rb @@ -5,7 +5,7 @@ class TestExcerptDrop < JekyllUnitTest setup do @site = fixture_site @site.read - @doc = @site.docs_to_write.first + @doc = @site.docs_to_write.find { |d| !d.data['layout'].nil? } @doc_drop = @doc.to_liquid @excerpt = @doc.data['excerpt'] @excerpt_drop = @excerpt.to_liquid @@ -24,8 +24,13 @@ class TestExcerptDrop < JekyllUnitTest assert_nil @excerpt_drop['excerpt'] end + should "inherit the layout for the drop but not the excerpt" do + assert_nil @excerpt.data['layout'] + assert_equal @excerpt_drop['layout'], @doc_drop['layout'] + end + should "inherit values from the document" do - assert_equal @excerpt_drop.keys, @doc_drop.keys + assert_equal @excerpt_drop.keys.sort, @doc_drop.keys.sort end end end From 48f16974ce35c173f1c34adecba902a775b47069 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Tue, 24 May 2016 18:27:37 -0500 Subject: [PATCH 0850/4996] Rubocop fixes --- lib/jekyll/drops/excerpt_drop.rb | 2 +- test/test_excerpt_drop.rb | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/jekyll/drops/excerpt_drop.rb b/lib/jekyll/drops/excerpt_drop.rb index c70712fcf19..5d61aeb1b2d 100644 --- a/lib/jekyll/drops/excerpt_drop.rb +++ b/lib/jekyll/drops/excerpt_drop.rb @@ -4,7 +4,7 @@ module Jekyll module Drops class ExcerptDrop < DocumentDrop def layout - @obj.doc.data['layout'] + @obj.doc.data["layout"] end def excerpt diff --git a/test/test_excerpt_drop.rb b/test/test_excerpt_drop.rb index 769aef06786..f8c75f9a47c 100644 --- a/test/test_excerpt_drop.rb +++ b/test/test_excerpt_drop.rb @@ -1,13 +1,13 @@ -require 'helper' +require "helper" class TestExcerptDrop < JekyllUnitTest context "an excerpt drop" do setup do @site = fixture_site @site.read - @doc = @site.docs_to_write.find { |d| !d.data['layout'].nil? } + @doc = @site.docs_to_write.find { |d| !d.data["layout"].nil? } @doc_drop = @doc.to_liquid - @excerpt = @doc.data['excerpt'] + @excerpt = @doc.data["excerpt"] @excerpt_drop = @excerpt.to_liquid end @@ -19,14 +19,14 @@ class TestExcerptDrop < JekyllUnitTest end should "not have an excerpt" do - assert_nil @excerpt.data['excerpt'] - assert @excerpt_drop.class.invokable? 'excerpt' - assert_nil @excerpt_drop['excerpt'] + assert_nil @excerpt.data["excerpt"] + assert @excerpt_drop.class.invokable? "excerpt" + assert_nil @excerpt_drop["excerpt"] end should "inherit the layout for the drop but not the excerpt" do - assert_nil @excerpt.data['layout'] - assert_equal @excerpt_drop['layout'], @doc_drop['layout'] + assert_nil @excerpt.data["layout"] + assert_equal @excerpt_drop["layout"], @doc_drop["layout"] end should "inherit values from the document" do From c69ca4c11eac808a3cc8ec28286fea8a9ce7d7f8 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 4 Apr 2016 11:49:10 -0700 Subject: [PATCH 0851/4996] Test#build_configs shouldn't overwrite default collections --- test/helper.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/test/helper.rb b/test/helper.rb index 3a3dafa27ae..37c51d580a8 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -85,9 +85,12 @@ def fixture_site(overrides = {}) Jekyll::Site.new(site_configuration(overrides)) end - def build_configs(overrides, base_hash = Jekyll::Configuration::DEFAULTS) + def default_configuration + Marshal.load(Marshal.dump(Jekyll::Configuration::DEFAULTS)) + end + + def build_configs(overrides, base_hash = default_configuration) Utils.deep_merge_hashes(base_hash, overrides) - .fix_common_issues.backwards_compatibilize.add_default_collections end def site_configuration(overrides = {}) @@ -97,7 +100,10 @@ def site_configuration(overrides = {}) })) build_configs({ "source" => source_dir - }, full_overrides) + }, full_overrides). + fix_common_issues. + backwards_compatibilize. + add_default_collections end def dest_dir(*subdirs) From f2263a11b73091f0b94b8c6fe6f467e0a96b2d3d Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 4 Apr 2016 11:49:24 -0700 Subject: [PATCH 0852/4996] Only write collections.posts.permalink if permalink is set. --- lib/jekyll/configuration.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 87bfeb46015..5b5bb2dfad0 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -72,7 +72,7 @@ class Configuration < Hash 'hard_wrap' => false, 'footnote_nr' => 1 } - }] + }].freeze # Public: Turn all keys into string # @@ -271,14 +271,20 @@ def fix_common_issues def add_default_collections config = clone + # It defaults to `{}`, so this is only if someone sets it to null manually. return config if config['collections'].nil? + # Ensure we have a hash. if config['collections'].is_a?(Array) config['collections'] = Hash[config['collections'].map { |c| [c, {}] }] end + + # Add posts. config['collections']['posts'] ||= {} config['collections']['posts']['output'] = true - config['collections']['posts']['permalink'] = style_to_permalink(config['permalink']) + if config['permalink'] + config['collections']['posts']['permalink'] ||= style_to_permalink(config['permalink']) + end config end From dbcbf809ff6cc7b0a33f231a42523f480acd1a90 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 4 Apr 2016 13:12:30 -0700 Subject: [PATCH 0853/4996] Refactor some tests to prevent manipulation of Jekyll::Config::DEFAULTS --- test/helper.rb | 33 +++++++++----- test/test_configuration.rb | 40 +++++++++++------ test/test_front_matter_defaults.rb | 70 +++++++++++++----------------- test/test_generated_site.rb | 17 ++------ test/test_site.rb | 14 +++--- 5 files changed, 87 insertions(+), 87 deletions(-) diff --git a/test/helper.rb b/test/helper.rb index 37c51d580a8..90c806a02c6 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -58,11 +58,32 @@ def assert_exist(filename, msg = nil) def refute_exist(filename, msg = nil) msg = message(msg) { "Expected '#{filename}' not to exist" } refute File.exist?(filename), msg +end + +module DirectoryHelpers + def dest_dir(*subdirs) + test_dir('dest', *subdirs) + end + + def source_dir(*subdirs) + test_dir('source', *subdirs) + end + + def test_dir(*subdirs) + File.join(File.dirname(__FILE__), *subdirs) end end class JekyllUnitTest < Minitest::Test include ::RSpec::Mocks::ExampleMethods + include DirectoryHelpers + extend DirectoryHelpers + + def mu_pp obj + s = obj.is_a?(Hash) ? JSON.pretty_generate(obj) : obj.inspect + s = s.encode Encoding.default_external if defined? Encoding + s + end def mocks_expect(*args) RSpec::Mocks::ExampleMethods::ExpectHost.instance_method(:expect)\ @@ -106,23 +127,11 @@ def site_configuration(overrides = {}) add_default_collections end - def dest_dir(*subdirs) - test_dir("dest", *subdirs) - end - - def source_dir(*subdirs) - test_dir("source", *subdirs) - end - def clear_dest FileUtils.rm_rf(dest_dir) FileUtils.rm_rf(source_dir(".jekyll-metadata")) end - def test_dir(*subdirs) - File.join(File.dirname(__FILE__), *subdirs) - end - def directory_with_contents(path) FileUtils.rm_rf(path) FileUtils.mkdir(path) diff --git a/test/test_configuration.rb b/test/test_configuration.rb index 608dfef0c07..33800d2f13d 100644 --- a/test/test_configuration.rb +++ b/test/test_configuration.rb @@ -1,7 +1,10 @@ require 'helper' class TestConfiguration < JekyllUnitTest - @@defaults = Jekyll::Configuration::DEFAULTS.add_default_collections.freeze + @@test_config = { + "source" => new(nil).source_dir, + "destination" => dest_dir + } context "#stringify_keys" do setup do @@ -154,27 +157,27 @@ class TestConfiguration < JekyllUnitTest end context "loading configuration" do setup do - @path = File.join(Dir.pwd, '_config.yml') + @path = source_dir('_config.yml') @user_config = File.join(Dir.pwd, "my_config_file.yml") end should "fire warning with no _config.yml" do allow(SafeYAML).to receive(:load_file).with(@path) { raise SystemCallError, "No such file or directory - #{@path}" } allow($stderr).to receive(:puts).with("Configuration file: none".yellow) - assert_equal @@defaults, Jekyll.configuration({}) + assert_equal site_configuration, Jekyll.configuration(@@test_config) end should "load configuration as hash" do allow(SafeYAML).to receive(:load_file).with(@path).and_return(Hash.new) allow($stdout).to receive(:puts).with("Configuration file: #{@path}") - assert_equal @@defaults, Jekyll.configuration({}) + assert_equal site_configuration, Jekyll.configuration(@@test_config) end should "fire warning with bad config" do allow(SafeYAML).to receive(:load_file).with(@path).and_return(Array.new) allow($stderr).to receive(:puts).and_return(("WARNING: ".rjust(20) + "Error reading configuration. Using defaults (and options).").yellow) allow($stderr).to receive(:puts).and_return("Configuration file: (INVALID) #{@path}".yellow) - assert_equal @@defaults, Jekyll.configuration({}) + assert_equal site_configuration, Jekyll.configuration(@@test_config) end should "fire warning when user-specified config file isn't there" do @@ -193,8 +196,8 @@ class TestConfiguration < JekyllUnitTest context "loading config from external file" do setup do @paths = { - :default => File.join(Dir.pwd, '_config.yml'), - :other => File.join(Dir.pwd, '_config.live.yml'), + :default => source_dir('_config.yml'), + :other => source_dir('_config.live.yml'), :toml => source_dir('_config.dev.toml'), :empty => "" } @@ -203,24 +206,31 @@ class TestConfiguration < JekyllUnitTest should "load default plus posts config if no config_file is set" do allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return({}) allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}") - assert_equal @@defaults, Jekyll.configuration({}) + assert_equal site_configuration, Jekyll.configuration(@@test_config) end should "load different config if specified" do allow(SafeYAML).to receive(:load_file).with(@paths[:other]).and_return({"baseurl" => "http://wahoo.dev"}) allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}") - assert_equal Utils.deep_merge_hashes(@@defaults, { "baseurl" => "http://wahoo.dev" }), Jekyll.configuration({ "config" => @paths[:other] }) + Jekyll.configuration({ "config" => @paths[:other] }) + assert_equal \ + site_configuration({ "baseurl" => "http://wahoo.dev" }), + Jekyll.configuration(@@test_config.merge({ "config" => @paths[:other] })) end should "load default config if path passed is empty" do allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return({}) allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}") - assert_equal @@defaults, Jekyll.configuration({ "config" => @paths[:empty] }) + assert_equal \ + site_configuration, + Jekyll.configuration(@@test_config.merge({ "config" => [@paths[:empty]] })) end should "successfully load a TOML file" do Jekyll.logger.log_level = :warn - assert_equal @@defaults.clone.merge({ "baseurl" => "/you-beautiful-blog-you", "title" => "My magnificent site, wut" }), Jekyll.configuration({ "config" => [@paths[:toml]] }) + assert_equal \ + site_configuration({ "baseurl" => "/you-beautiful-blog-you", "title" => "My magnificent site, wut" }), + Jekyll.configuration(@@test_config.merge({ "config" => [@paths[:toml]] })) Jekyll.logger.log_level = :info end @@ -233,7 +243,9 @@ class TestConfiguration < JekyllUnitTest allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}") allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}") allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:toml]}") - assert_equal @@defaults, Jekyll.configuration({ "config" => [@paths[:default], @paths[:other], @paths[:toml]] }) + assert_equal \ + site_configuration, + Jekyll.configuration(@@test_config.merge({ "config" => [@paths[:default], @paths[:other], @paths[:toml]] })) end should "load multiple config files and last config should win" do @@ -241,7 +253,9 @@ class TestConfiguration < JekyllUnitTest allow(SafeYAML).to receive(:load_file).with(@paths[:other]).and_return({"baseurl" => "http://wahoo.dev"}) allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}") allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}") - assert_equal Utils.deep_merge_hashes(@@defaults, { "baseurl" => "http://wahoo.dev" }), Jekyll.configuration({ "config" => [@paths[:default], @paths[:other]] }) + assert_equal \ + site_configuration({ "baseurl" => "http://wahoo.dev" }), + Jekyll.configuration(@@test_config.merge({ "config" => [@paths[:default], @paths[:other]] })) end end end diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb index f1b55ac164c..c85314d21c1 100644 --- a/test/test_front_matter_defaults.rb +++ b/test/test_front_matter_defaults.rb @@ -3,11 +3,9 @@ class TestFrontMatterDefaults < JekyllUnitTest context "A site with full front matter defaults" do setup do - @site = Site.new(Jekyll.configuration({ - "source" => source_dir, - "destination" => dest_dir, - "defaults" => [{ - "scope" => { + @site = fixture_site({ + "defaults" => [{ + "scope" => { "path" => "contacts", "type" => "page" }, @@ -15,7 +13,7 @@ class TestFrontMatterDefaults < JekyllUnitTest "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" } @@ -29,18 +27,16 @@ class TestFrontMatterDefaults < JekyllUnitTest context "A site with front matter type pages and an extension" do setup do - @site = Site.new(Jekyll.configuration({ - "source" => source_dir, - "destination" => dest_dir, - "defaults" => [{ - "scope" => { + @site = fixture_site({ + "defaults" => [{ + "scope" => { "path" => "index.html" }, "values" => { "key" => "val" } }] - })) + }) @site.process @affected = @site.pages.find { |page| page.relative_path == "index.html" } @@ -55,18 +51,17 @@ class TestFrontMatterDefaults < JekyllUnitTest context "A site with front matter defaults with no type" do setup do - @site = Site.new(Jekyll.configuration({ - "source" => source_dir, - "destination" => dest_dir, - "defaults" => [{ - "scope" => { + @site = fixture_site({ + "defaults" => [{ + "scope" => { "path" => "win" }, "values" => { "key" => "val" } }] - })) + }) + @site.process @affected = @site.posts.docs.find { |page| page.relative_path =~ %r!win\/! } @not_affected = @site.pages.find { |page| page.relative_path == "about.html" } @@ -80,18 +75,17 @@ class TestFrontMatterDefaults < JekyllUnitTest context "A site with front matter defaults with no path and a deprecated type" do setup do - @site = Site.new(Jekyll.configuration({ - "source" => source_dir, - "destination" => dest_dir, - "defaults" => [{ - "scope" => { + @site = fixture_site({ + "defaults" => [{ + "scope" => { "type" => "page" }, "values" => { "key" => "val" } }] - })) + }) + @site.process @affected = @site.pages @not_affected = @site.posts.docs @@ -106,18 +100,16 @@ class TestFrontMatterDefaults < JekyllUnitTest context "A site with front matter defaults with no path" do setup do - @site = Site.new(Jekyll.configuration({ - "source" => source_dir, - "destination" => dest_dir, - "defaults" => [{ - "scope" => { + @site = fixture_site({ + "defaults" => [{ + "scope" => { "type" => "pages" }, "values" => { "key" => "val" } }] - })) + }) @site.process @affected = @site.pages @not_affected = @site.posts.docs @@ -132,17 +124,15 @@ class TestFrontMatterDefaults < JekyllUnitTest context "A site with front matter defaults with no path or type" do setup do - @site = Site.new(Jekyll.configuration({ - "source" => source_dir, - "destination" => dest_dir, - "defaults" => [{ - "scope" => { + @site = fixture_site({ + "defaults" => [{ + "scope" => { }, "values" => { "key" => "val" } }] - })) + }) @site.process @affected = @site.pages @not_affected = @site.posts @@ -156,15 +146,13 @@ class TestFrontMatterDefaults < JekyllUnitTest context "A site with front matter defaults with no scope" do setup do - @site = Site.new(Jekyll.configuration({ - "source" => source_dir, - "destination" => dest_dir, - "defaults" => [{ + @site = fixture_site({ + "defaults" => [{ "values" => { "key" => "val" } }] - })) + }) @site.process @affected = @site.pages @not_affected = @site.posts diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb index 0a24172c468..6b676d936f6 100644 --- a/test/test_generated_site.rb +++ b/test/test_generated_site.rb @@ -4,8 +4,6 @@ class TestGeneratedSite < JekyllUnitTest context "generated sites" do setup do clear_dest - config = Jekyll::Configuration::DEFAULTS.merge({ "source" => source_dir, - "destination" => dest_dir }) @site = fixture_site(config) @site.process @@ -80,24 +78,15 @@ class TestGeneratedSite < JekyllUnitTest should "ensure limit posts is 0 or more" do assert_raises ArgumentError do clear_dest - config = Jekyll::Configuration::DEFAULTS.merge({ - "source" => source_dir, - "destination" => dest_dir, - "limit_posts" => -1 - }) - @site = fixture_site(config) + + @site = fixture_site("limit_posts" => -1) end end should "acceptable limit post is 0" do clear_dest - config = Jekyll::Configuration::DEFAULTS.merge({ - "source" => source_dir, - "destination" => dest_dir, - "limit_posts" => 0 - }) - assert Site.new(config), "Couldn't create a site with the given limit_posts." + assert fixture_site("limit_posts" => 0), "Couldn't create a site with limit_posts=0." end end end diff --git a/test/test_site.rb b/test/test_site.rb index bce20bfa304..89f646ed2bb 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -3,7 +3,7 @@ class TestSite < JekyllUnitTest context "configuring sites" do should "have an array for plugins by default" do - site = Site.new(Jekyll::Configuration::DEFAULTS) + site = Site.new default_configuration assert_equal [File.join(Dir.pwd, '_plugins')], site.plugins end @@ -13,32 +13,32 @@ class TestSite < JekyllUnitTest end should "have an array for plugins if passed as a string" do - site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'plugins_dir' => '/tmp/plugins'})) + site = Site.new(build_configs({ 'plugins_dir' => '/tmp/plugins' })) assert_equal ['/tmp/plugins'], site.plugins end should "have an array for plugins if passed as an array" do - site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'plugins_dir' => ['/tmp/plugins', '/tmp/otherplugins']})) + site = Site.new(build_configs({ 'plugins_dir' => ['/tmp/plugins', '/tmp/otherplugins'] })) assert_equal ['/tmp/plugins', '/tmp/otherplugins'], site.plugins end should "have an empty array for plugins if nothing is passed" do - site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'plugins_dir' => []})) + site = Site.new(build_configs({ 'plugins_dir' => [] })) assert_equal [], site.plugins end should "have an empty array for plugins if nil is passed" do - site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'plugins_dir' => nil})) + site = Site.new(build_configs({ 'plugins_dir' => nil })) assert_equal [], site.plugins end should "expose default baseurl" do - site = Site.new(Jekyll::Configuration::DEFAULTS) + site = Site.new(default_configuration) assert_equal Jekyll::Configuration::DEFAULTS['baseurl'], site.baseurl end should "expose baseurl passed in from config" do - site = Site.new(Jekyll::Configuration::DEFAULTS.merge({'baseurl' => '/blog'})) + site = Site.new(build_configs({ 'baseurl' => '/blog' })) assert_equal '/blog', site.baseurl end end From 04d44731190ea19afe5547ac5b0f7928d4af1381 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 4 Apr 2016 13:13:06 -0700 Subject: [PATCH 0854/4996] Use Marshal to duplicate configuration defaults to prevent manipulation --- lib/jekyll.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index e9f4547b3c6..cee9905d4f1 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -99,7 +99,7 @@ def env # # Returns the final configuration Hash. def configuration(override = {}) - config = Configuration[Configuration::DEFAULTS] + config = Configuration[Marshal.load(Marshal.dump(Configuration::DEFAULTS))] override = Configuration[override].stringify_keys unless override.delete('skip_config_files') config = config.read_config_files(config.config_files(override)) From 6eaa8e90f8fe8fff5bac0853b5a13690745b0cdd Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 4 Apr 2016 13:13:23 -0700 Subject: [PATCH 0855/4996] Don't read a config file if the filename is empty. --- lib/jekyll/configuration.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 5b5bb2dfad0..4c36341d12c 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -169,6 +169,7 @@ def read_config_files(files) begin files.each do |config_file| + next if config_file.nil? or config_file.empty? new_config = read_config_file(config_file) configuration = Utils.deep_merge_hashes(configuration, new_config) end From 4e06f07ad436badfbc031175041c61319ba3da2e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 4 Apr 2016 13:56:40 -0700 Subject: [PATCH 0856/4996] Add tests for Configuration#add_default_collections --- test/test_configuration.rb | 54 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/test/test_configuration.rb b/test/test_configuration.rb index 33800d2f13d..fb545629f15 100644 --- a/test/test_configuration.rb +++ b/test/test_configuration.rb @@ -258,4 +258,58 @@ class TestConfiguration < JekyllUnitTest Jekyll.configuration(@@test_config.merge({ "config" => [@paths[:default], @paths[:other]] })) end end + + context "#add_default_collections" do + should "not do anything if collections is nil" do + conf = Configuration[default_configuration].tap {|c| c['collections'] = nil } + assert_equal conf.add_default_collections, conf + assert_nil conf.add_default_collections['collections'] + end + + should "converts collections to a hash if an array" do + conf = Configuration[default_configuration].tap {|c| c['collections'] = ['docs'] } + assert_equal conf.add_default_collections, conf.merge({ + "collections" => { + "docs" => {}, + "posts" => { + "output" => true, + "permalink" => "/:categories/:year/:month/:day/:title.html" + }}}) + end + + should "force collections.posts.output = true" do + conf = Configuration[default_configuration].tap {|c| c['collections'] = {'posts' => {'output' => false}} } + assert_equal conf.add_default_collections, conf.merge({ + "collections" => { + "posts" => { + "output" => true, + "permalink" => "/:categories/:year/:month/:day/:title.html" + }}}) + end + + should "set collections.posts.permalink if it's not set" do + conf = Configuration[default_configuration] + assert_equal conf.add_default_collections, conf.merge({ + "collections" => { + "posts" => { + "output" => true, + "permalink" => "/:categories/:year/:month/:day/:title.html" + }}}) + end + + should "leave collections.posts.permalink alone if it is set" do + posts_permalink = "/:year/:title/" + conf = Configuration[default_configuration].tap do |c| + c['collections'] = { + "posts" => { "permalink" => posts_permalink } + } + end + assert_equal conf.add_default_collections, conf.merge({ + "collections" => { + "posts" => { + "output" => true, + "permalink" => posts_permalink + }}}) + end + end end From fab092fcece39345b090b7301511df4bbc16591a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 4 Apr 2016 14:45:09 -0700 Subject: [PATCH 0857/4996] Remove use of Marshal in runtime code. --- lib/jekyll.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index cee9905d4f1..e9f4547b3c6 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -99,7 +99,7 @@ def env # # Returns the final configuration Hash. def configuration(override = {}) - config = Configuration[Marshal.load(Marshal.dump(Configuration::DEFAULTS))] + config = Configuration[Configuration::DEFAULTS] override = Configuration[override].stringify_keys unless override.delete('skip_config_files') config = config.read_config_files(config.config_files(override)) From d01f7943debf08dee645990ddb0e00d59cf846bb Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 8 Apr 2016 10:00:03 -0700 Subject: [PATCH 0858/4996] Add Configuration.from & use in Jekyll.configuration. This process streamlines the creation of new configurations. Creating a new site will choke if not all the correct options are given. Configuration.from will ensure the overrides have all string keys and ensures all the common issues & defaults are in place so a Site can be created. A common use: config = Configuration.from({ 'permalink' => '/:title/' }) # etc site = Jekyll::Site.new(config) --- lib/jekyll.rb | 7 +++---- lib/jekyll/configuration.rb | 19 ++++++++++++++++++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index e9f4547b3c6..0d680842f0f 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -98,15 +98,14 @@ def env # list of option names and their defaults. # # Returns the final configuration Hash. - def configuration(override = {}) - config = Configuration[Configuration::DEFAULTS] - override = Configuration[override].stringify_keys + def configuration(override = Hash.new) + config = Configuration.new unless override.delete('skip_config_files') config = config.read_config_files(config.config_files(override)) end # Merge DEFAULTS < _config.yml < override - config = Utils.deep_merge_hashes(config, override).stringify_keys + config = Configuration.from Utils.deep_merge_hashes(config, override).stringify_keys set_timezone(config['timezone']) if config['timezone'] config diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 4c36341d12c..4af19a63fb2 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -74,6 +74,23 @@ class Configuration < Hash } }].freeze + class << self + # Static: Produce a Configuration ready for use in a Site. + # It takes the input, fills in the defaults where values do not + # exist, and patches common issues including migrating options for + # backwards compatiblity. Except where a key or value is being fixed, + # the user configuration will override the defaults. + # + # user_config - a Hash or Configuration of overrides. + # + # Returns a Configuration filled with defaults and fixed for common + # problems and backwards-compatibility. + def from(user_config) + Utils.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys). + fix_common_issues.backwards_compatibilize.add_default_collections + end + end + # Public: Turn all keys into string # # Return a copy of the hash where all its keys are strings @@ -237,7 +254,7 @@ def backwards_compatibilize " as a list of comma-separated values." config[option] = csv_to_array(config[option]) end - config[option].map!(&:to_s) + config[option].map!(&:to_s) if config[option] end if (config['kramdown'] || {}).key?('use_coderay') From f52a0e7200957362d8078adc3c15cda303543e43 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 8 Apr 2016 10:49:08 -0700 Subject: [PATCH 0859/4996] Configuration#add_default_collections: fix bug where DEFAULTS['collections'] is modified --- lib/jekyll/configuration.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 4af19a63fb2..03547604d3e 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -297,11 +297,13 @@ def add_default_collections config['collections'] = Hash[config['collections'].map { |c| [c, {}] }] end - # Add posts. - config['collections']['posts'] ||= {} - config['collections']['posts']['output'] = true - if config['permalink'] - config['collections']['posts']['permalink'] ||= style_to_permalink(config['permalink']) + config['collections'] = Utils.deep_merge_hashes( + { 'posts' => {} }, config['collections'] + ).tap do |collections| + collections['posts']['output'] = true + if config['permalink'] + collections['posts']['permalink'] ||= style_to_permalink(config['permalink']) + end end config From 8af77643c5d63eb5b241f410e34e728eeeef71b2 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 8 Apr 2016 10:50:58 -0700 Subject: [PATCH 0860/4996] Site#site_payload: sort collections by label --- lib/jekyll/drops/site_drop.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb index 4d07ebe8f4a..7b083126a2f 100644 --- a/lib/jekyll/drops/site_drop.rb +++ b/lib/jekyll/drops/site_drop.rb @@ -28,7 +28,7 @@ def html_pages end def collections - @site_collections ||= @obj.collections.values.map(&:to_liquid) + @site_collections ||= @obj.collections.values.sort_by(&:label).map(&:to_liquid) end private From 59346eb2285e9b122c0efabbbe03e715382b7723 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 26 Apr 2016 17:02:16 -0700 Subject: [PATCH 0861/4996] Remove call to #backwards_compatibilize in Configuration.from --- lib/jekyll/configuration.rb | 2 +- test/test_configuration.rb | 52 +++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 03547604d3e..a08c284c635 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -87,7 +87,7 @@ class << self # problems and backwards-compatibility. def from(user_config) Utils.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys). - fix_common_issues.backwards_compatibilize.add_default_collections + fix_common_issues.add_default_collections end end diff --git a/test/test_configuration.rb b/test/test_configuration.rb index fb545629f15..6322835d552 100644 --- a/test/test_configuration.rb +++ b/test/test_configuration.rb @@ -6,6 +6,58 @@ class TestConfiguration < JekyllUnitTest "destination" => dest_dir } + context ".from" do + should "create a Configuration object" do + assert_instance_of Configuration, Configuration.from({}) + end + + should "merge input over defaults" do + result = Configuration.from({"source" => "blah"}) + refute_equal result["source"], Configuration::DEFAULTS["source"] + assert_equal result["source"], "blah" + end + + should "fix common mistakes" do + result = Configuration.from({"paginate" => 0}) + assert_nil result["paginate"], "Expected 'paginate' to be corrected to 'nil', but was #{result["paginate"].inspect}" + end + + should "add default collections" do + result = Configuration.from({}) + assert_equal result["collections"], {"posts" => {"output" => true, "permalink" => "/:categories/:year/:month/:day/:title.html"}} + end + + should "NOT backwards-compatibilize" do + assert Configuration.from("watch" => true)["watch"], "Expected the 'watch' key to not be removed." + end + end + + context "#add_default_collections" do + should "no-op if collections is nil" do + result = Configuration[{"collections" => nil}].add_default_collections + assert_nil result["collections"] + end + + should "turn an array into a hash" do + result = Configuration[{"collections" => %w{methods}}].add_default_collections + assert_instance_of Hash, result["collections"] + assert_equal result["collections"], {"posts" => {"output" => true}, "methods" => {}} + end + + should "only assign collections.posts.permalink if a permalink is specified" do + result = Configuration[{"permalink" => "pretty", "collections" => {}}].add_default_collections + assert_equal result["collections"], {"posts" => {"output" => true, "permalink" => "/:categories/:year/:month/:day/:title/"}} + + result = Configuration[{"permalink" => nil, "collections" => {}}].add_default_collections + assert_equal result["collections"], {"posts" => {"output" => true}} + end + + should "forces posts to output" do + result = Configuration[{"collections" => {"posts" => {"output" => false}}}].add_default_collections + assert_equal result["collections"]["posts"]["output"], true + end + end + context "#stringify_keys" do setup do @mixed_keys = Configuration[{ From 37b93f10dd880d6561037c916bf5571f3296f4d3 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 18 May 2016 11:31:22 -0700 Subject: [PATCH 0862/4996] Add missing 'end' to test/helper.rb --- test/helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/helper.rb b/test/helper.rb index 90c806a02c6..5668f2ec890 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -58,6 +58,7 @@ def assert_exist(filename, msg = nil) def refute_exist(filename, msg = nil) msg = message(msg) { "Expected '#{filename}' not to exist" } refute File.exist?(filename), msg + end end module DirectoryHelpers From ad59b6e62a68219ee82f3df4f45b8cb375e77457 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 18 May 2016 11:36:57 -0700 Subject: [PATCH 0863/4996] Remove merge conflicts I forgot to fix. --- test/test_generated_site.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb index 6b676d936f6..0b425b130e6 100644 --- a/test/test_generated_site.rb +++ b/test/test_generated_site.rb @@ -5,7 +5,7 @@ class TestGeneratedSite < JekyllUnitTest setup do clear_dest - @site = fixture_site(config) + @site = fixture_site @site.process @index = File.read(dest_dir("index.html")) end @@ -63,10 +63,7 @@ class TestGeneratedSite < JekyllUnitTest context "generating limited posts" do setup do clear_dest - config = Jekyll::Configuration::DEFAULTS.merge({ "source" => source_dir, - "destination" => dest_dir, - "limit_posts" => 5 }) - @site = fixture_site(config) + @site = fixture_site("limit_posts" => 5) @site.process @index = File.read(dest_dir("index.html")) end @@ -78,14 +75,12 @@ class TestGeneratedSite < JekyllUnitTest should "ensure limit posts is 0 or more" do assert_raises ArgumentError do clear_dest - @site = fixture_site("limit_posts" => -1) end end should "acceptable limit post is 0" do clear_dest - assert fixture_site("limit_posts" => 0), "Couldn't create a site with limit_posts=0." end end From d84844c2230948082de7a9270023f732a4542bb0 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 18 May 2016 12:48:42 -0700 Subject: [PATCH 0864/4996] Freeze configuration defaults & duplicate in deep_merge_hashes if need be. --- lib/jekyll/configuration.rb | 2 +- lib/jekyll/utils.rb | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index a08c284c635..475aa4e6dc8 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -72,7 +72,7 @@ class Configuration < Hash 'hard_wrap' => false, 'footnote_nr' => 1 } - }].freeze + }.map { |k, v| [k, v.freeze] }].freeze class << self # Static: Produce a Configuration ready for use in a Site. diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb index 179981ec83c..a70a7916739 100644 --- a/lib/jekyll/utils.rb +++ b/lib/jekyll/utils.rb @@ -54,6 +54,10 @@ def deep_merge_hashes!(target, overwrite) target.default_proc = overwrite.default_proc end + target.each do |key, val| + target[key] = val.dup if val.frozen? && duplicable?(val) + end + target end @@ -61,6 +65,15 @@ def mergable?(value) value.is_a?(Hash) || value.is_a?(Drops::Drop) end + def duplicable?(obj) + case obj + when nil, false, true, Symbol, Numeric + false + else + true + end + end + # Read array from the supplied hash favouring the singular key # and then the plural key, and handling any nil entries. # From de5970ae55503b0c6fb6bf72464d7fe093b306e3 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 18 May 2016 12:49:06 -0700 Subject: [PATCH 0865/4996] Fix some minor things in the tests --- lib/jekyll.rb | 7 +++---- test/test_configuration.rb | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 0d680842f0f..0786351737c 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -105,10 +105,9 @@ def configuration(override = Hash.new) end # Merge DEFAULTS < _config.yml < override - config = Configuration.from Utils.deep_merge_hashes(config, override).stringify_keys - set_timezone(config['timezone']) if config['timezone'] - - config + Configuration.from(Utils.deep_merge_hashes(config, override)).tap do |config| + set_timezone(config['timezone']) if config['timezone'] + end end # Public: Set the TZ environment variable to use the timezone specified diff --git a/test/test_configuration.rb b/test/test_configuration.rb index 6322835d552..08cc3bd9bfd 100644 --- a/test/test_configuration.rb +++ b/test/test_configuration.rb @@ -24,7 +24,7 @@ class TestConfiguration < JekyllUnitTest should "add default collections" do result = Configuration.from({}) - assert_equal result["collections"], {"posts" => {"output" => true, "permalink" => "/:categories/:year/:month/:day/:title.html"}} + assert_equal result["collections"], {"posts" => {"output" => true, "permalink" => "/:categories/:year/:month/:day/:title:output_ext"}} end should "NOT backwards-compatibilize" do @@ -325,7 +325,7 @@ class TestConfiguration < JekyllUnitTest "docs" => {}, "posts" => { "output" => true, - "permalink" => "/:categories/:year/:month/:day/:title.html" + "permalink" => "/:categories/:year/:month/:day/:title:output_ext" }}}) end @@ -335,7 +335,7 @@ class TestConfiguration < JekyllUnitTest "collections" => { "posts" => { "output" => true, - "permalink" => "/:categories/:year/:month/:day/:title.html" + "permalink" => "/:categories/:year/:month/:day/:title:output_ext" }}}) end @@ -345,7 +345,7 @@ class TestConfiguration < JekyllUnitTest "collections" => { "posts" => { "output" => true, - "permalink" => "/:categories/:year/:month/:day/:title.html" + "permalink" => "/:categories/:year/:month/:day/:title:output_ext" }}}) end From d5c3785d293bd739c9439c35eada422442c3e4e4 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 18 May 2016 12:49:23 -0700 Subject: [PATCH 0866/4996] Don't default 'include' and 'exclude' to an empty array --- lib/jekyll/configuration.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 475aa4e6dc8..a88272cc393 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -246,7 +246,6 @@ def backwards_compatibilize end %w(include exclude).each do |option| - config[option] ||= [] if config[option].is_a?(String) Jekyll::Deprecator.deprecation_message "The '#{option}' configuration option" \ " must now be specified as an array, but you specified" \ From 48274244e39c5574a8df24648a911fe672e3dcee Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 18 May 2016 12:53:08 -0700 Subject: [PATCH 0867/4996] Define Drop#each so we can use the new frozen/duping behavior --- lib/jekyll/drops/drop.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb index d1bffcc5abd..7dc829d7d78 100644 --- a/lib/jekyll/drops/drop.rb +++ b/lib/jekyll/drops/drop.rb @@ -147,6 +147,12 @@ def each_key(&block) keys.each(&block) end + def each(&block) + each_key.each do |key| + yield key, self[key] + end + end + def merge(other, &block) self.dup.tap do |me| if block.nil? From 7641971d7e355a8041bec96b8ce843b89f5daebc Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 18 May 2016 14:49:21 -0700 Subject: [PATCH 0868/4996] Fix tests for plugins in configuration. --- lib/jekyll/plugin_manager.rb | 2 +- test/test_site.rb | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb index 45eeaa79506..5acd0e46e57 100644 --- a/lib/jekyll/plugin_manager.rb +++ b/lib/jekyll/plugin_manager.rb @@ -76,7 +76,7 @@ def require_plugin_files # # Returns an Array of plugin search paths def plugins_path - if site.config['plugins_dir'] == Jekyll::Configuration::DEFAULTS['plugins_dir'] + if site.config['plugins_dir'].eql? Jekyll::Configuration::DEFAULTS['plugins_dir'] [site.in_source_dir(site.config['plugins_dir'])] else Array(site.config['plugins_dir']).map { |d| File.expand_path(d) } diff --git a/test/test_site.rb b/test/test_site.rb index 89f646ed2bb..5e52a7c9405 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -9,27 +9,27 @@ class TestSite < JekyllUnitTest should "look for plugins under the site directory by default" do site = Site.new(site_configuration) - assert_equal [File.join(source_dir, '_plugins')], site.plugins + assert_equal [source_dir('_plugins')], site.plugins end should "have an array for plugins if passed as a string" do - site = Site.new(build_configs({ 'plugins_dir' => '/tmp/plugins' })) + site = Site.new(site_configuration({ 'plugins_dir' => '/tmp/plugins' })) assert_equal ['/tmp/plugins'], site.plugins end should "have an array for plugins if passed as an array" do - site = Site.new(build_configs({ 'plugins_dir' => ['/tmp/plugins', '/tmp/otherplugins'] })) + site = Site.new(site_configuration({ 'plugins_dir' => ['/tmp/plugins', '/tmp/otherplugins'] })) assert_equal ['/tmp/plugins', '/tmp/otherplugins'], site.plugins end should "have an empty array for plugins if nothing is passed" do - site = Site.new(build_configs({ 'plugins_dir' => [] })) + site = Site.new(site_configuration({ 'plugins_dir' => [] })) assert_equal [], site.plugins end - should "have an empty array for plugins if nil is passed" do - site = Site.new(build_configs({ 'plugins_dir' => nil })) - assert_equal [], site.plugins + should "have the default for plugins if nil is passed" do + site = Site.new(site_configuration({ 'plugins_dir' => nil })) + assert_equal [source_dir('_plugins')], site.plugins end should "expose default baseurl" do @@ -38,7 +38,7 @@ class TestSite < JekyllUnitTest end should "expose baseurl passed in from config" do - site = Site.new(build_configs({ 'baseurl' => '/blog' })) + site = Site.new(site_configuration({ 'baseurl' => '/blog' })) assert_equal '/blog', site.baseurl end end From a99adcafaa01fecd4f3bda1a781b538be720084c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 18 May 2016 09:48:09 -0700 Subject: [PATCH 0869/4996] Add failing test for layout bug (#4897) --- features/layout_data.feature | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/features/layout_data.feature b/features/layout_data.feature index 789986651b4..8f085777565 100644 --- a/features/layout_data.feature +++ b/features/layout_data.feature @@ -35,3 +35,31 @@ Feature: Layout data When I run jekyll build Then the "_site/index.html" file should exist And I should see "page content\n foo: my custom data" in "_site/index.html" + + Scenario: Inherit custom layout data + Given I have a _layouts directory + And I have a "_layouts/default.html" file with content: + """ + {{ content }} foo: '{{ layout.foo }}' + """ + And I have a "_layouts/special.html" file with content: + """ + --- + layout: default + foo: my special data + --- + {{ content }} + """ + And I have a "_layouts/page.html" file with content: + """ + --- + layout: default + --- + {{ content }} + """ + And I have an "index.html" page with layout "special" that contains "page content" + And I have an "jekyll.html" page with layout "page" that contains "page content" + When I run jekyll build + Then the "_site/index.html" file should exist + And I should see "page content\n foo: 'my special data'" in "_site/index.html" + And I should see "page content\n foo: ''" in "_site/jekyll.html" From 8e939cd86e67b81ecc97108684928b4ca553dd4c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 18 May 2016 09:58:20 -0700 Subject: [PATCH 0870/4996] Add failing test for layout data inheritance bug (#4433) --- features/layout_data.feature | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/features/layout_data.feature b/features/layout_data.feature index 8f085777565..c2af5b70ebe 100644 --- a/features/layout_data.feature +++ b/features/layout_data.feature @@ -36,17 +36,21 @@ Feature: Layout data Then the "_site/index.html" file should exist And I should see "page content\n foo: my custom data" in "_site/index.html" - Scenario: Inherit custom layout data + Scenario: Inherit custom layout data and clear when not present Given I have a _layouts directory And I have a "_layouts/default.html" file with content: """ - {{ content }} foo: '{{ layout.foo }}' + --- + bar: i'm default + --- + {{ content }} foo: '{{ layout.foo }}' bar: '{{ layout.bar }}' """ And I have a "_layouts/special.html" file with content: """ --- layout: default foo: my special data + bar: im special --- {{ content }} """ @@ -54,6 +58,7 @@ Feature: Layout data """ --- layout: default + bar: im page --- {{ content }} """ @@ -61,5 +66,5 @@ Feature: Layout data And I have an "jekyll.html" page with layout "page" that contains "page content" When I run jekyll build Then the "_site/index.html" file should exist - And I should see "page content\n foo: 'my special data'" in "_site/index.html" - And I should see "page content\n foo: ''" in "_site/jekyll.html" + And I should see "page content\n foo: 'my special data' bar: 'im special'" in "_site/index.html" + And I should see "page content\n foo: '' bar: 'im page'" in "_site/jekyll.html" From db7cd6f61203b77d4b7e5e13d2c01e3afc5ed0b6 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 18 May 2016 09:58:48 -0700 Subject: [PATCH 0871/4996] Reset {{ layout }} between each render & merge layout data properly --- lib/jekyll/convertible.rb | 5 ++++- lib/jekyll/renderer.rb | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index a473b183a4a..a5d356071f1 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -209,10 +209,13 @@ def render_all_layouts(layouts, payload, info) used = Set.new([layout]) + # Reset the payload layout data to ensure it starts fresh for each page. + payload["layout"] = nil + while layout Jekyll.logger.debug "Rendering Layout:", path payload["content"] = output - payload["layout"] = Utils.deep_merge_hashes(payload["layout"] || {}, layout.data) + payload["layout"] = Utils.deep_merge_hashes(layout.data, payload["layout"] || {}) self.output = render_liquid(layout.content, payload, diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb index f116cf60151..f9eb94beceb 100644 --- a/lib/jekyll/renderer.rb +++ b/lib/jekyll/renderer.rb @@ -136,10 +136,13 @@ def place_in_layouts(content, payload, info) used = Set.new([layout]) + # Reset the payload layout data to ensure it starts fresh for each page. + payload["layout"] = nil + while layout payload['content'] = output payload['page'] = document.to_liquid - payload['layout'] = Utils.deep_merge_hashes(payload['layout'] || {}, layout.data) + payload['layout'] = Utils.deep_merge_hashes(layout.data, payload["layout"] || {}) output = render_liquid( layout.content, From cc0c5ea19e8fa1e8bd3e46f09a2063adc277d79a Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Tue, 24 May 2016 19:01:35 -0500 Subject: [PATCH 0872/4996] Rubocop fixes --- test/helper.rb | 14 +++++++------- test/test_front_matter_defaults.rb | 12 ++++++------ test/test_generated_site.rb | 5 ++++- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/test/helper.rb b/test/helper.rb index 5668f2ec890..751a14b1c25 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -63,11 +63,11 @@ def refute_exist(filename, msg = nil) module DirectoryHelpers def dest_dir(*subdirs) - test_dir('dest', *subdirs) + test_dir("dest", *subdirs) end def source_dir(*subdirs) - test_dir('source', *subdirs) + test_dir("source", *subdirs) end def test_dir(*subdirs) @@ -80,7 +80,7 @@ class JekyllUnitTest < Minitest::Test include DirectoryHelpers extend DirectoryHelpers - def mu_pp obj + def mu_pp(obj) s = obj.is_a?(Hash) ? JSON.pretty_generate(obj) : obj.inspect s = s.encode Encoding.default_external if defined? Encoding s @@ -122,10 +122,10 @@ def site_configuration(overrides = {}) })) build_configs({ "source" => source_dir - }, full_overrides). - fix_common_issues. - backwards_compatibilize. - add_default_collections + }, full_overrides) + .fix_common_issues + .backwards_compatibilize + .add_default_collections end def clear_dest diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb index c85314d21c1..fdad0930bb2 100644 --- a/test/test_front_matter_defaults.rb +++ b/test/test_front_matter_defaults.rb @@ -5,7 +5,7 @@ class TestFrontMatterDefaults < JekyllUnitTest setup do @site = fixture_site({ "defaults" => [{ - "scope" => { + "scope" => { "path" => "contacts", "type" => "page" }, @@ -29,7 +29,7 @@ class TestFrontMatterDefaults < JekyllUnitTest setup do @site = fixture_site({ "defaults" => [{ - "scope" => { + "scope" => { "path" => "index.html" }, "values" => { @@ -53,7 +53,7 @@ class TestFrontMatterDefaults < JekyllUnitTest setup do @site = fixture_site({ "defaults" => [{ - "scope" => { + "scope" => { "path" => "win" }, "values" => { @@ -77,7 +77,7 @@ class TestFrontMatterDefaults < JekyllUnitTest setup do @site = fixture_site({ "defaults" => [{ - "scope" => { + "scope" => { "type" => "page" }, "values" => { @@ -102,7 +102,7 @@ class TestFrontMatterDefaults < JekyllUnitTest setup do @site = fixture_site({ "defaults" => [{ - "scope" => { + "scope" => { "type" => "pages" }, "values" => { @@ -126,7 +126,7 @@ class TestFrontMatterDefaults < JekyllUnitTest setup do @site = fixture_site({ "defaults" => [{ - "scope" => { + "scope" => { }, "values" => { "key" => "val" diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb index 0b425b130e6..8373f0fc848 100644 --- a/test/test_generated_site.rb +++ b/test/test_generated_site.rb @@ -81,7 +81,10 @@ class TestGeneratedSite < JekyllUnitTest should "acceptable limit post is 0" do clear_dest - assert fixture_site("limit_posts" => 0), "Couldn't create a site with limit_posts=0." + assert( + fixture_site("limit_posts" => 0), + "Couldn't create a site with limit_posts=0." + ) end end end From 1a05483a6304f59bff8d30f26f53ed7a51fa3ad9 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 18 May 2016 18:54:49 -0700 Subject: [PATCH 0873/4996] Sort the results of the require_all glob. Filesystems behave differently when performing glob listings. In my environment, they are listed alphabetically. On my Mac, when asking for a list of files in a directory, those files are returned as a nicely sorted list. Alphabetized, like you'd want them to be. Like you'd expect them to be. In some environments, quite different from my own, the return of a similar operation is quite random. Perhaps q comes before a, or e before d; the filesystem will choose its order of the day and you, the fare user, tired and weary from work, must bare the brunt of this. And so, with this commit, I do hereby request that the noble makers of Dir[] provide for us, the downtrodden and ravaged users, some consistency. As a user of Ruby, I shouldn't have to know or consider the behaviour of an individual filesystem here; it should function the same for all filesystems. Truly yours, Parker --- lib/jekyll.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index e9f4547b3c6..16cedc68379 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -7,7 +7,7 @@ # Returns nothing. def require_all(path) glob = File.join(File.dirname(__FILE__), path, '*.rb') - Dir[glob].each do |f| + Dir[glob].sort.each do |f| require f end end From ad7bd8409810e361417b14ea7434a0fc12483f31 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 18 May 2016 21:11:14 -0700 Subject: [PATCH 0874/4996] lib/jekyll.rb: require document_drop to ease our pain --- lib/jekyll.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 16cedc68379..9530b2d16b2 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -173,6 +173,7 @@ def sanitized_path(base_directory, questionable_path) end require "jekyll/drops/drop" +require "jekyll/drops/document_drop" require_all 'jekyll/commands' require_all 'jekyll/converters' require_all 'jekyll/converters/markdown' From 17d8c96a630bf4c9ea932622269443a56e82a375 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 19 May 2016 11:01:09 -0700 Subject: [PATCH 0875/4996] Add ability to render drops as JSON Previously you could do, e.g. {{ site | jsonify }}, but with the introduction of Liquid Drops, this didn't work anymore. This PR adds the ability to render drops as JSON. You can safely run drop.to_json and it should Do the Right Thing. --- lib/jekyll/drops/document_drop.rb | 37 ++++++++++++++++++++++++++-- lib/jekyll/drops/drop.rb | 20 +++++++++++++++- lib/jekyll/drops/jekyll_drop.rb | 12 ++++++++++ lib/jekyll/site.rb | 1 + test/test_document.rb | 40 +++++++++++++++++++++++++++++++ test/test_filters.rb | 38 +++++++++++++++++++++++++++++ 6 files changed, 145 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/drops/document_drop.rb b/lib/jekyll/drops/document_drop.rb index 4eb9e50c1dd..b8a0d3e535f 100644 --- a/lib/jekyll/drops/document_drop.rb +++ b/lib/jekyll/drops/document_drop.rb @@ -5,10 +5,12 @@ module Drops class DocumentDrop < Drop extend Forwardable + NESTED_OBJECT_FIELD_BLACKLIST = %w{ + content output excerpt next previous + }.freeze + mutable false - def_delegator :@obj, :next_doc, :next - def_delegator :@obj, :previous_doc, :previous def_delegator :@obj, :relative_path, :path def_delegators :@obj, :id, :output, :content, :to_s, :relative_path, :url @@ -27,6 +29,37 @@ def <=>(other) cmp end + def previous + @obj.previous_doc.to_liquid + end + + def next + @obj.next_doc.to_liquid + end + + # Generate a Hash for use in generating JSON. + # This is useful if fields need to be cleared before the JSON can generate. + # + # Returns a Hash ready for JSON generation. + def hash_for_json(state = nil) + to_h.tap do |hash| + if state && state.depth >= 2 + hash["previous"] = collapse_document(hash["previous"]) if hash["previous"] + hash["next"] = collapse_document(hash["next"]) if hash["next"] + end + end + end + + # Generate a Hash which breaks the recursive chain. + # Certain fields which are normally available are omitted. + # + # Returns a Hash with only non-recursive fields present. + def collapse_document(doc) + doc.keys.each_with_object({}) do |(key, _), result| + result[key] = doc[key] unless NESTED_OBJECT_FIELD_BLACKLIST.include?(key) + end + end + private def_delegator :@obj, :data, :fallback_data end diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb index d1bffcc5abd..23ebeb4b6bb 100644 --- a/lib/jekyll/drops/drop.rb +++ b/lib/jekyll/drops/drop.rb @@ -3,7 +3,9 @@ module Jekyll module Drops class Drop < Liquid::Drop - NON_CONTENT_METHODS = [:[], :[]=, :inspect, :to_h, :fallback_data].freeze + include Enumerable + + NON_CONTENT_METHODS = [:[], :[]=, :inspect, :to_h, :fallback_data, :collapse_document].freeze # Get or set whether the drop class is mutable. # Mutability determines whether or not pre-defined fields may be @@ -138,6 +140,22 @@ def inspect JSON.pretty_generate to_h end + # Generate a Hash for use in generating JSON. + # This is useful if fields need to be cleared before the JSON can generate. + # + # Returns a Hash ready for JSON generation. + def hash_for_json(state = nil) + to_h + end + + # Generate a JSON representation of the Drop. + # + # Returns a JSON representation of the Drop in a String. + def to_json(state = nil) + require 'json' + JSON.generate(hash_for_json(state), state) + end + # Collects all the keys and passes each to the block in turn. # # block - a block which accepts one argument, the key diff --git a/lib/jekyll/drops/jekyll_drop.rb b/lib/jekyll/drops/jekyll_drop.rb index c4009da01bb..7ff19f9a3b2 100644 --- a/lib/jekyll/drops/jekyll_drop.rb +++ b/lib/jekyll/drops/jekyll_drop.rb @@ -16,6 +16,18 @@ def version def environment Jekyll.env end + + def to_h + @to_h ||= { + "version" => version, + "environment" => environment + } + end + + def to_json(state = nil) + require 'json' + JSON.generate(to_h, state) + end end end end diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index 9afdbde3bd2..f2025c13a78 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -279,6 +279,7 @@ def site_data def site_payload Drops::UnifiedPayloadDrop.new self end + alias_method :to_liquid, :site_payload # Get the implementation class for the given Converter. # Returns the Converter instance implementing the given Converter. diff --git a/test/test_document.rb b/test/test_document.rb index b9e69a7d7c6..c0b6311ceb9 100644 --- a/test/test_document.rb +++ b/test/test_document.rb @@ -44,6 +44,46 @@ def assert_equal_value(key, one, other) assert_equal "foo.bar", @document.data["whatever"] end + should "be jsonify-able" do + page_json = @document.to_liquid.to_json + parsed = JSON.parse(page_json) + + assert_equal "Jekyll.configuration", parsed["title"] + assert_equal "foo.bar", parsed["whatever"] + assert_equal nil, parsed["previous"] + + next_doc = parsed["next"] + assert_equal "_methods/escape-+ #%20[].md", next_doc["path"] + assert_equal "Jekyll.escape", next_doc["title"] + + next_prev_doc = next_doc["previous"] + assert_equal "Jekyll.configuration", next_prev_doc["title"] + assert_equal "_methods/configuration.md", next_prev_doc["path"] + assert_equal "_methods/escape-+ #%20[].md", next_prev_doc["next"]["path"] + assert_nil next_prev_doc["previous"] # nothing before Jekyll.configuration + assert_nil next_prev_doc["next"]["next"] + assert_nil next_prev_doc["next"]["previous"] + assert_nil next_prev_doc["next"]["content"] + assert_nil next_prev_doc["next"]["excerpt"] + assert_nil next_prev_doc["next"]["output"] + + next_next_doc = next_doc["next"] + assert_equal "Jekyll.sanitized_path", next_next_doc["title"] + assert_equal "_methods/sanitized_path.md", next_next_doc["path"] + assert_equal "_methods/escape-+ #%20[].md", next_next_doc["previous"]["path"] + assert_equal "_methods/site/generate.md", next_next_doc["next"]["path"] + assert_nil next_next_doc["next"]["next"] + assert_nil next_next_doc["next"]["previous"] + assert_nil next_next_doc["next"]["content"] + assert_nil next_next_doc["next"]["excerpt"] + assert_nil next_next_doc["next"]["output"] + assert_nil next_next_doc["previous"]["next"] + assert_nil next_next_doc["previous"]["previous"] + assert_nil next_next_doc["previous"]["content"] + assert_nil next_next_doc["previous"]["excerpt"] + assert_nil next_next_doc["previous"]["output"] + end + context "with YAML ending in three dots" do setup do diff --git a/test/test_filters.rb b/test/test_filters.rb index 565e82089b8..5015184d83d 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -198,6 +198,44 @@ def initialize(opts = {}) assert_equal "[{\"name\":\"Jack\"},{\"name\":\"Smith\"}]", @filter.jsonify([{:name => 'Jack'}, {:name => 'Smith'}]) end + should "convert drop to json" do + @filter.site.read + expected = { + "next" => "Categories _should_ work", + "path" => "_posts/2008-02-02-published.markdown", + "output" => nil, + "previous" => nil, + "content" => "This should be published.\n", + "id" => "/publish_test/2008/02/02/published", + "url" => "/publish_test/2008/02/02/published.html", + "relative_path" => "_posts/2008-02-02-published.markdown", + "collection" => "posts", + "excerpt" => "

    This should be published.

    \n", + "draft" => false, + "categories" => [ + "publish_test" + ], + "layout" => "default", + "title" => "Publish", + "category" => "publish_test", + "date" => "2008-02-02 00:00:00 +0000", + "slug" => "published", + "ext" => ".markdown", + "tags" => [] + } + actual = @filter.jsonify(@filter.site.docs_to_write.first.to_liquid) + assert_equal expected, JSON.parse(actual) + end + + should "convert drop with drops to json" do + @filter.site.read + actual = @filter.jsonify(@filter.site.to_liquid) + assert_equal JSON.parse(actual)["jekyll"], { + "environment" => "development", + "version" => Jekyll::VERSION + } + end + class M < Struct.new(:message) def to_liquid [message] From f8c708ffec903c9778c3568582a75a9780aa81ba Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 19 May 2016 11:40:58 -0700 Subject: [PATCH 0876/4996] Fix test to simply ensure next is an object in jsonify --- test/test_filters.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/test_filters.rb b/test/test_filters.rb index 5015184d83d..eb8170fceb8 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -201,10 +201,9 @@ def initialize(opts = {}) should "convert drop to json" do @filter.site.read expected = { - "next" => "Categories _should_ work", "path" => "_posts/2008-02-02-published.markdown", - "output" => nil, "previous" => nil, + "output" => nil, "content" => "This should be published.\n", "id" => "/publish_test/2008/02/02/published", "url" => "/publish_test/2008/02/02/published.html", @@ -223,8 +222,13 @@ def initialize(opts = {}) "ext" => ".markdown", "tags" => [] } - actual = @filter.jsonify(@filter.site.docs_to_write.first.to_liquid) - assert_equal expected, JSON.parse(actual) + actual = JSON.parse(@filter.jsonify(@filter.site.docs_to_write.first.to_liquid)) + + next_doc = actual.delete("next") + refute_nil next_doc + assert next_doc.is_a?(Hash), "doc.next should be an object" + + assert_equal expected, actual end should "convert drop with drops to json" do From 2ca80920dcf0ae72cec37c714cc158c568402989 Mon Sep 17 00:00:00 2001 From: Anatoliy Yastreb Date: Wed, 25 May 2016 13:15:04 +0300 Subject: [PATCH 0877/4996] rubocop: fix include tag code style --- .rubocop.yml | 1 - lib/jekyll/tags/include.rb | 69 ++++++++++++++++++++++---------------- 2 files changed, 40 insertions(+), 30 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index f5dcc93aa73..d57fefd1920 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -56,7 +56,6 @@ AllCops: - lib/jekyll/site.rb - lib/jekyll/static_file.rb - lib/jekyll/stevenson.rb - - lib/jekyll/tags/include.rb - lib/jekyll/theme.rb - lib/jekyll/url.rb - lib/jekyll/utils.rb diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb index d4f31f2a05b..4c4c38a3ef6 100644 --- a/lib/jekyll/tags/include.rb +++ b/lib/jekyll/tags/include.rb @@ -12,17 +12,23 @@ def initialize(msg, path) end class IncludeTag < Liquid::Tag - VALID_SYNTAX = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/ - VARIABLE_SYNTAX = /(?[^{]*(\{\{\s*[\w\-\.]+\s*(\|.*)?\}\}[^\s{}]*)+)(?.*)/ + VALID_SYNTAX = / + ([\w-]+)\s*=\s* + (?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+)) + /x + VARIABLE_SYNTAX = / + (?[^{]*(\{\{\s*[\w\-\.]+\s*(\|.*)?\}\}[^\s{}]*)+) + (?.*) + /x def initialize(tag_name, markup, tokens) super matched = markup.strip.match(VARIABLE_SYNTAX) if matched - @file = matched['variable'].strip - @params = matched['params'].strip + @file = matched["variable"].strip + @params = matched["params"].strip else - @file, @params = markup.strip.split(' ', 2) + @file, @params = markup.strip.split(" ", 2) end validate_params if @params @tag_name = tag_name @@ -36,7 +42,7 @@ def parse_params(context) params = {} markup = @params - while match = VALID_SYNTAX.match(markup) do + while (match = VALID_SYNTAX.match(markup)) markup = markup[match.end(0)..-1] value = if match[2] @@ -53,8 +59,8 @@ def parse_params(context) end def validate_file_name(file) - if file !~ /^[a-zA-Z0-9_\/\.-]+$/ || file =~ /\.\// || file =~ /\/\./ - raise ArgumentError.new <<-eos + if file !~ %r!^[a-zA-Z0-9_/\.-]+$! || file =~ %r!\./! || file =~ %r!/\.! + raise ArgumentError, <<-eos Invalid syntax for include tag. File contains invalid characters or sequences: #{file} @@ -68,9 +74,9 @@ def validate_file_name(file) end def validate_params - full_valid_syntax = Regexp.compile('\A\s*(?:' + VALID_SYNTAX.to_s + '(?=\s|\z)\s*)*\z') + full_valid_syntax = /\A\s*(?:#{VALID_SYNTAX}(?=\s|\z)\s*)*\z/ unless @params =~ full_valid_syntax - raise ArgumentError.new <<-eos + raise ArgumentError, <<-eos Invalid syntax for include tag: #{@params} @@ -91,7 +97,10 @@ def file_read_opts(context) # Render the variable if required def render_variable(context) if @file.match(VARIABLE_SYNTAX) - partial = context.registers[:site].liquid_renderer.file("(variable)").parse(@file) + partial = context.registers[:site] + .liquid_renderer + .file("(variable)") + .parse(@file) partial.render!(context) end end @@ -106,9 +115,9 @@ def locate_include_file(context, file, safe) path = File.join(dir, file) return path if valid_include_file?(path, dir, safe) end - raise IOError, "Could not locate the included file '#{file}' in any of #{includes_dirs}." \ - " Ensure it exists in one of those directories and, if it is a symlink, " \ - "does not point outside your site source." + raise IOError, "Could not locate the included file '#{file}' in any of "\ + "#{includes_dirs}. Ensure it exists in one of those directories and, "\ + "if it is a symlink, does not point outside your site source." end def render(context) @@ -120,24 +129,23 @@ def render(context) path = locate_include_file(context, file, site.safe) return unless path - # Add include to dependency tree + add_include_to_dependency(site, path, context) + + partial = load_cached_partial(path, context) + + context.stack do + context["include"] = parse_params(context) if @params + partial.render!(context) + end + end + + def add_include_to_dependency(site, path, context) if context.registers[:page] && context.registers[:page].key?("path") site.regenerator.add_dependency( site.in_source_dir(context.registers[:page]["path"]), path ) end - - #begin - partial = load_cached_partial(path, context) - - context.stack do - context['include'] = parse_params(context) if @params - partial.render!(context) - end - #rescue => e - #raise IncludeTagError.new e.message, path - #end end def load_cached_partial(path, context) @@ -147,7 +155,10 @@ def load_cached_partial(path, context) if cached_partial.key?(path) cached_partial[path] else - cached_partial[path] = context.registers[:site].liquid_renderer.file(path).parse(read_file(path, context)) + cached_partial[path] = context.registers[:site] + .liquid_renderer + .file(path) + .parse(read_file(path, context)) end end @@ -188,5 +199,5 @@ def page_path(context) end end -Liquid::Template.register_tag('include', Jekyll::Tags::IncludeTag) -Liquid::Template.register_tag('include_relative', Jekyll::Tags::IncludeRelativeTag) +Liquid::Template.register_tag("include", Jekyll::Tags::IncludeTag) +Liquid::Template.register_tag("include_relative", Jekyll::Tags::IncludeRelativeTag) From 1c937013fdf702864f8ac6f75a1ff6dd784e2f88 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 25 May 2016 08:53:40 -0700 Subject: [PATCH 0878/4996] Update history to reflect merge of #4936 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 8bf867494a4..98c7e64f365 100644 --- a/History.markdown +++ b/History.markdown @@ -60,6 +60,7 @@ * Update `jekyll/commands*` to pass rubocop rules (#4888) * Clean up many test files to pass Rubocop rules (#4902) * Rubocop cleanup for some utils and further test files (#4916) + * Rubocop: Low hanging fruit (#4936) ### Site Enhancements From 733c56a65e8844a565f8734cb352deb997cbd655 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 25 May 2016 08:55:12 -0700 Subject: [PATCH 0879/4996] External: remove &block arg, use block_given? Addresses my comment in https://github.com/jekyll/jekyll/pull/4936#discussion_r64598949 --- lib/jekyll/external.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/external.rb b/lib/jekyll/external.rb index 561cbb4d299..e84d0857bfe 100644 --- a/lib/jekyll/external.rb +++ b/lib/jekyll/external.rb @@ -17,13 +17,13 @@ def blessed_gems # # names - a string gem name or array of gem names # - def require_if_present(names, &block) + def require_if_present(names) Array(names).each do |name| begin require name rescue LoadError Jekyll.logger.debug "Couldn't load #{name}. Skipping." - yield(name) if block + yield(name) if block_given? false end end From 3a04093e5113751bbc4907c01f49412b6f94cbbd Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Mon, 23 May 2016 20:58:28 -0500 Subject: [PATCH 0880/4996] Rubocop cleanup for lib/jekyll/page.rb --- .rubocop.yml | 1 - lib/jekyll/page.rb | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 198cb1e6e34..0fdff6160ff 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -21,7 +21,6 @@ AllCops: - lib/jekyll/layout.rb - lib/jekyll/liquid_renderer/table.rb - lib/jekyll/liquid_renderer.rb - - lib/jekyll/page.rb - lib/jekyll/plugin_manager.rb - lib/jekyll/reader.rb - lib/jekyll/readers/layout_reader.rb diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb index 2bdcdf6f203..3f984709d09 100644 --- a/lib/jekyll/page.rb +++ b/lib/jekyll/page.rb @@ -9,7 +9,7 @@ class Page alias_method :extname, :ext - FORWARD_SLASH = '/'.freeze + FORWARD_SLASH = "/".freeze # Attributes for Liquid templates ATTRIBUTES_FOR_LIQUID = %w( @@ -18,7 +18,7 @@ class Page name path url - ) + ).freeze # A set of extensions that are considered HTML or HTML-like so we # should not alter them, this includes .xhtml through XHTM5. @@ -27,7 +27,7 @@ class Page .html .xhtml .htm - ) + ).freeze # Initialize a new Page. # @@ -71,7 +71,7 @@ def dir # # Returns the String permalink or nil if none has been set. def permalink - data.nil? ? nil : data['permalink'] + data.nil? ? nil : data["permalink"] end # The template of the permalink. @@ -92,9 +92,9 @@ def template # Returns the String url. def url @url ||= URL.new({ - :template => template, + :template => template, :placeholders => url_placeholders, - :permalink => permalink + :permalink => permalink }).to_s end @@ -135,7 +135,7 @@ def render(layouts, site_payload) # # Returns the path to the source file def path - data.fetch('path') { relative_path.sub(/\A\//, '') } + data.fetch("path") { relative_path.sub(%r{!\A\/!}, "") } end # The path to the page source file, relative to the site source @@ -167,7 +167,7 @@ def html? # Returns the Boolean of whether this Page is an index file or not. def index? - basename == 'index' + basename == "index" end def trigger_hooks(hook_name, *args) From 65e78b3280dc861a3560cfa1bfd7450ee965402c Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Mon, 23 May 2016 21:07:24 -0500 Subject: [PATCH 0881/4996] Rubocop cleanup for lib/jekyll/plugin_manager.rb --- .rubocop.yml | 1 - lib/jekyll/plugin_manager.rb | 20 ++++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 0fdff6160ff..51f96642fa8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -21,7 +21,6 @@ AllCops: - lib/jekyll/layout.rb - lib/jekyll/liquid_renderer/table.rb - lib/jekyll/liquid_renderer.rb - - lib/jekyll/plugin_manager.rb - lib/jekyll/reader.rb - lib/jekyll/readers/layout_reader.rb - lib/jekyll/readers/page_reader.rb diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb index 45eeaa79506..ff8def487fd 100644 --- a/lib/jekyll/plugin_manager.rb +++ b/lib/jekyll/plugin_manager.rb @@ -24,7 +24,9 @@ def conscientious_require # # Returns nothing. def require_gems - Jekyll::External.require_with_graceful_fail(site.gems.select { |gem| plugin_allowed?(gem) }) + Jekyll::External.require_with_graceful_fail( + site.gems.select { |gem| plugin_allowed?(gem) } + ) end def self.require_from_bundler @@ -33,7 +35,8 @@ def self.require_from_bundler Bundler.setup required_gems = Bundler.require(:jekyll_plugins) - Jekyll.logger.debug("PluginManager:", "Required #{required_gems.map(&:name).join(', ')}") + message = "Required #{required_gems.map(&:name).join(", ")}" + Jekyll.logger.debug("PluginManager:", message) ENV["JEKYLL_NO_BUNDLER_REQUIRE"] = "true" true @@ -57,7 +60,7 @@ def plugin_allowed?(gem_name) # Returns an array of strings, each string being the name of a gem name # that is allowed to be used. def whitelist - @whitelist ||= Array[site.config['whitelist']].flatten + @whitelist ||= Array[site.config["whitelist"]].flatten end # Require all .rb files if safe mode is off @@ -76,16 +79,17 @@ def require_plugin_files # # Returns an Array of plugin search paths def plugins_path - if site.config['plugins_dir'] == Jekyll::Configuration::DEFAULTS['plugins_dir'] - [site.in_source_dir(site.config['plugins_dir'])] + if site.config["plugins_dir"] == Jekyll::Configuration::DEFAULTS["plugins_dir"] + [site.in_source_dir(site.config["plugins_dir"])] else - Array(site.config['plugins_dir']).map { |d| File.expand_path(d) } + Array(site.config["plugins_dir"]).map { |d| File.expand_path(d) } end end def deprecation_checks - pagination_included = (site.config['gems'] || []).include?('jekyll-paginate') || defined?(Jekyll::Paginate) - if site.config['paginate'] && !pagination_included + pagination_included = (site.config["gems"] || []).include?("jekyll-paginate") || + defined?(Jekyll::Paginate) + if site.config["paginate"] && !pagination_included Jekyll::Deprecator.deprecation_message "You appear to have pagination " \ "turned on, but you haven't included the `jekyll-paginate` gem. " \ "Ensure you have `gems: [jekyll-paginate]` in your configuration file." From de39107c76f6b769ce81203c71c6931eb904176c Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Mon, 23 May 2016 21:12:31 -0500 Subject: [PATCH 0882/4996] Rubocop cleanup for lib/jekyll/layout.rb --- .rubocop.yml | 1 - lib/jekyll/layout.rb | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 51f96642fa8..b7dd25301e9 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -18,7 +18,6 @@ AllCops: - lib/jekyll/entry_filter.rb - lib/jekyll/filters.rb - lib/jekyll/frontmatter_defaults.rb - - lib/jekyll/layout.rb - lib/jekyll/liquid_renderer/table.rb - lib/jekyll/liquid_renderer.rb - lib/jekyll/reader.rb diff --git a/lib/jekyll/layout.rb b/lib/jekyll/layout.rb index 7200527738a..690d86fbd20 100644 --- a/lib/jekyll/layout.rb +++ b/lib/jekyll/layout.rb @@ -58,7 +58,9 @@ def process(name) # Returns a String path which represents the relative path # from the site source to this layout def relative_path - @relative_path ||= Pathname.new(path).relative_path_from(Pathname.new(@base_dir)).to_s + @relative_path ||= Pathname.new(path).relative_path_from( + Pathname.new(@base_dir) + ).to_s end end end From 757233754eb0d1848bb934087a9615a9ca2efe46 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 25 May 2016 09:32:51 -0700 Subject: [PATCH 0883/4996] Update history to reflect merge of #4941 [ci skip] --- History.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.markdown b/History.markdown index 98c7e64f365..62b5bee466b 100644 --- a/History.markdown +++ b/History.markdown @@ -43,6 +43,10 @@ * 3.2.x/master: Fix defaults for Documents (posts/collection docs) (#4808) * Don't rescue LoadError or bundler load errors for Bundler. (#4857) +### Forward Ports + + * From v3.1.4: Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid (#4941) + ### Development Fixes * Add project maintainer profile links (#4591) From 5c036cf3c4933f51f6a13221f11e424f862578c7 Mon Sep 17 00:00:00 2001 From: Anatoliy Yastreb Date: Wed, 25 May 2016 20:24:19 +0300 Subject: [PATCH 0884/4996] rubocop: fix code style --- lib/jekyll/tags/highlight.rb | 5 +++-- lib/jekyll/tags/link.rb | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index 550b3522e26..afbadb8553e 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -93,7 +93,7 @@ def render_pygments(code, is_safe) ) if highlighted_code.nil? - Jekyll.logger.error <<-eos + Jekyll.logger.error < @highlight_options[:linenos], :wrap => false + :line_numbers => @highlight_options[:linenos], + :wrap => false ) lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText formatter.format(lexer.lex(code)) diff --git a/lib/jekyll/tags/link.rb b/lib/jekyll/tags/link.rb index b2be119942b..e6dcde610c0 100644 --- a/lib/jekyll/tags/link.rb +++ b/lib/jekyll/tags/link.rb @@ -19,7 +19,6 @@ def render(context) raise ArgumentError, < Date: Wed, 25 May 2016 21:48:21 +0300 Subject: [PATCH 0885/4996] rubocop: fix spacing in code style --- lib/jekyll/tags/highlight.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index afbadb8553e..b22001d3b14 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -112,7 +112,7 @@ def render_rouge(code) Jekyll::External.require_with_graceful_fail("rouge") formatter = Rouge::Formatters::HTML.new( :line_numbers => @highlight_options[:linenos], - :wrap => false + :wrap => false ) lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText formatter.format(lexer.lex(code)) From a7cbb89dfca8fe367301b444e1bcbf806c3c92c3 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 25 May 2016 15:42:05 -0700 Subject: [PATCH 0886/4996] Update history to reflect merge of #4942 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 62b5bee466b..39d43f9cc38 100644 --- a/History.markdown +++ b/History.markdown @@ -46,6 +46,7 @@ ### Forward Ports * From v3.1.4: Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid (#4941) + * Forward-port: Configuration permalink fix and addition of Configuration.from and sorting `site.collections` by label (#4942) ### Development Fixes From 3c0d1a18bfff7924adabcb65b0ca39b9850f2ed9 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 25 May 2016 15:43:13 -0700 Subject: [PATCH 0887/4996] Mention where it came from. [ci skip] --- History.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/History.markdown b/History.markdown index 39d43f9cc38..96a3fb47aa9 100644 --- a/History.markdown +++ b/History.markdown @@ -46,7 +46,7 @@ ### Forward Ports * From v3.1.4: Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid (#4941) - * Forward-port: Configuration permalink fix and addition of Configuration.from and sorting `site.collections` by label (#4942) + * From v3.1.4: Configuration permalink fix and addition of Configuration.from and sorting `site.collections` by label (#4942) ### Development Fixes From 1502d0006331969736c68f74a2f08d618a453db5 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 25 May 2016 15:44:24 -0700 Subject: [PATCH 0888/4996] Update history to reflect merge of #4943 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 96a3fb47aa9..8a5098e2853 100644 --- a/History.markdown +++ b/History.markdown @@ -47,6 +47,7 @@ * From v3.1.4: Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid (#4941) * From v3.1.4: Configuration permalink fix and addition of Configuration.from and sorting `site.collections` by label (#4942) + * From v3.1.4: Fix `{{ layout }}` oddities (proper inheritance & fixing overflow of old data) (#4943) ### Development Fixes From d9c9e0238ac202a273d7526d4eb50aecb57c2378 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 25 May 2016 15:46:50 -0700 Subject: [PATCH 0889/4996] Update history to reflect merge of #4944 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 8a5098e2853..e57519174fd 100644 --- a/History.markdown +++ b/History.markdown @@ -48,6 +48,7 @@ * From v3.1.4: Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid (#4941) * From v3.1.4: Configuration permalink fix and addition of Configuration.from and sorting `site.collections` by label (#4942) * From v3.1.4: Fix `{{ layout }}` oddities (proper inheritance & fixing overflow of old data) (#4943) + * Forward-port: Sort the results of the require_all glob (#4944) ### Development Fixes From 02bf4f1032217c0a93bc38c2f937a88ebfe243de Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 25 May 2016 15:49:30 -0700 Subject: [PATCH 0890/4996] Mention where it came from. [ci skip] --- History.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/History.markdown b/History.markdown index e57519174fd..4d6f779b90a 100644 --- a/History.markdown +++ b/History.markdown @@ -48,7 +48,7 @@ * From v3.1.4: Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid (#4941) * From v3.1.4: Configuration permalink fix and addition of Configuration.from and sorting `site.collections` by label (#4942) * From v3.1.4: Fix `{{ layout }}` oddities (proper inheritance & fixing overflow of old data) (#4943) - * Forward-port: Sort the results of the require_all glob (#4944) + * From v3.1.5: Sort the results of the `require_all` glob (#4944) ### Development Fixes From aff1430608e7ddfcb73d211606c20119ec062437 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 25 May 2016 16:04:16 -0700 Subject: [PATCH 0891/4996] Fix tests for document drop JSONification based on master updates. /cc #4914 --- test/test_document.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/test_document.rb b/test/test_document.rb index c0b6311ceb9..fb503dccedb 100644 --- a/test/test_document.rb +++ b/test/test_document.rb @@ -50,7 +50,8 @@ def assert_equal_value(key, one, other) assert_equal "Jekyll.configuration", parsed["title"] assert_equal "foo.bar", parsed["whatever"] - assert_equal nil, parsed["previous"] + assert_equal "_methods/collection/entries", parsed["previous"]["path"] + assert_equal "Collection#entries", parsed["previous"]["title"] next_doc = parsed["next"] assert_equal "_methods/escape-+ #%20[].md", next_doc["path"] @@ -60,7 +61,7 @@ def assert_equal_value(key, one, other) assert_equal "Jekyll.configuration", next_prev_doc["title"] assert_equal "_methods/configuration.md", next_prev_doc["path"] assert_equal "_methods/escape-+ #%20[].md", next_prev_doc["next"]["path"] - assert_nil next_prev_doc["previous"] # nothing before Jekyll.configuration + assert_equal "_methods/collection/entries", next_prev_doc["previous"]["path"] assert_nil next_prev_doc["next"]["next"] assert_nil next_prev_doc["next"]["previous"] assert_nil next_prev_doc["next"]["content"] From b353e181c1ad7fb51a70829725e964c156f7e0c0 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 25 May 2016 16:05:31 -0700 Subject: [PATCH 0892/4996] Update history to reflect merge of #4945 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 4d6f779b90a..95262dca657 100644 --- a/History.markdown +++ b/History.markdown @@ -49,6 +49,7 @@ * From v3.1.4: Configuration permalink fix and addition of Configuration.from and sorting `site.collections` by label (#4942) * From v3.1.4: Fix `{{ layout }}` oddities (proper inheritance & fixing overflow of old data) (#4943) * From v3.1.5: Sort the results of the `require_all` glob (#4944) + * From v3.1.6: Add ability to render drops as JSON (#4945) ### Development Fixes From 6f1e1d80cdfd4d279bc4ac7446b3152788170110 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 25 May 2016 16:10:11 -0700 Subject: [PATCH 0893/4996] Rubocop: drop changes from v3.1 forward-ports --- lib/jekyll/drops/document_drop.rb | 6 ++++-- lib/jekyll/drops/drop.rb | 12 ++++++++---- lib/jekyll/drops/jekyll_drop.rb | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/jekyll/drops/document_drop.rb b/lib/jekyll/drops/document_drop.rb index 10e069ac0d9..2600baa55a2 100644 --- a/lib/jekyll/drops/document_drop.rb +++ b/lib/jekyll/drops/document_drop.rb @@ -5,9 +5,9 @@ module Drops class DocumentDrop < Drop extend Forwardable - NESTED_OBJECT_FIELD_BLACKLIST = %w{ + NESTED_OBJECT_FIELD_BLACKLIST = %w( content output excerpt next previous - }.freeze + ).freeze mutable false @@ -40,6 +40,8 @@ def next # Generate a Hash for use in generating JSON. # This is useful if fields need to be cleared before the JSON can generate. # + # state - the JSON::State object which determines the state of current processing. + # # Returns a Hash ready for JSON generation. def hash_for_json(state = nil) to_h.tap do |hash| diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb index dcabb190276..ebd3b4d2e37 100644 --- a/lib/jekyll/drops/drop.rb +++ b/lib/jekyll/drops/drop.rb @@ -88,7 +88,9 @@ def []=(key, val) # Returns an Array of strings which represent method-specific keys. def content_methods @content_methods ||= ( - self.class.instance_methods - Jekyll::Drops::Drop.instance_methods - NON_CONTENT_METHODS + self.class.instance_methods \ + - Jekyll::Drops::Drop.instance_methods \ + - NON_CONTENT_METHODS ).map(&:to_s).reject do |method| method.end_with?("=") end @@ -144,15 +146,17 @@ def inspect # This is useful if fields need to be cleared before the JSON can generate. # # Returns a Hash ready for JSON generation. - def hash_for_json(state = nil) + def hash_for_json(*) to_h end # Generate a JSON representation of the Drop. # + # state - the JSON::State object which determines the state of current processing. + # # Returns a JSON representation of the Drop in a String. def to_json(state = nil) - require 'json' + require "json" JSON.generate(hash_for_json(state), state) end @@ -165,7 +169,7 @@ def each_key(&block) keys.each(&block) end - def each(&block) + def each each_key.each do |key| yield key, self[key] end diff --git a/lib/jekyll/drops/jekyll_drop.rb b/lib/jekyll/drops/jekyll_drop.rb index 7ff19f9a3b2..50163d7461b 100644 --- a/lib/jekyll/drops/jekyll_drop.rb +++ b/lib/jekyll/drops/jekyll_drop.rb @@ -19,13 +19,13 @@ def environment def to_h @to_h ||= { - "version" => version, + "version" => version, "environment" => environment } end def to_json(state = nil) - require 'json' + require "json" JSON.generate(to_h, state) end end From cceb8c58769d3facddf1e9be5dee9b208c6d2543 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 25 May 2016 16:24:30 -0700 Subject: [PATCH 0894/4996] Update history to reflect merge of #4949 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 95262dca657..a6f5405f0c9 100644 --- a/History.markdown +++ b/History.markdown @@ -69,6 +69,7 @@ * Clean up many test files to pass Rubocop rules (#4902) * Rubocop cleanup for some utils and further test files (#4916) * Rubocop: Low hanging fruit (#4936) + * Rubocop: `Drop` changes from v3.1 forward-ports (#4949) ### Site Enhancements From 4fbbeddae20fa52732f30ef001bb1f80258bc5d7 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 25 May 2016 17:57:09 -0700 Subject: [PATCH 0895/4996] Fix Page#relative_path so that it consistently does NOT have the prepending slash (previously inconsistent) Fixes for #4946 --- lib/jekyll/page.rb | 4 ++-- test/test_front_matter_defaults.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb index 3f984709d09..1542e986e3b 100644 --- a/lib/jekyll/page.rb +++ b/lib/jekyll/page.rb @@ -135,12 +135,12 @@ def render(layouts, site_payload) # # Returns the path to the source file def path - data.fetch("path") { relative_path.sub(%r{!\A\/!}, "") } + data.fetch("path") { relative_path } end # The path to the page source file, relative to the site source def relative_path - File.join(*[@dir, @name].map(&:to_s).reject(&:empty?)) + File.join(*[@dir, @name].map(&:to_s).reject(&:empty?)).sub(%r{\A\/}, "") end # Obtain destination path. diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb index f1b55ac164c..51308016019 100644 --- a/test/test_front_matter_defaults.rb +++ b/test/test_front_matter_defaults.rb @@ -17,7 +17,7 @@ class TestFrontMatterDefaults < JekyllUnitTest }] })) @site.process - @affected = @site.pages.find { |page| page.relative_path == "/contacts/bar.html" } + @affected = @site.pages.find { |page| page.relative_path == "contacts/bar.html" } @not_affected = @site.pages.find { |page| page.relative_path == "about.html" } end From b950e7dd90c4a2c289893b21aff7d32d16597fa4 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 25 May 2016 17:58:32 -0700 Subject: [PATCH 0896/4996] Update history to reflect merge of #4946 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index a6f5405f0c9..0d8ee320ce4 100644 --- a/History.markdown +++ b/History.markdown @@ -70,6 +70,7 @@ * Rubocop cleanup for some utils and further test files (#4916) * Rubocop: Low hanging fruit (#4936) * Rubocop: `Drop` changes from v3.1 forward-ports (#4949) + * Rubocop: cleanup for misc files (#4946) ### Site Enhancements From 746e360c63d47a34bbe9d36be25d8370ab25f53a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 25 May 2016 18:03:25 -0700 Subject: [PATCH 0897/4996] Delimeters, delimeters, delimeters. --- lib/jekyll/page.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb index 1542e986e3b..aa773ebfb7d 100644 --- a/lib/jekyll/page.rb +++ b/lib/jekyll/page.rb @@ -140,7 +140,7 @@ def path # The path to the page source file, relative to the site source def relative_path - File.join(*[@dir, @name].map(&:to_s).reject(&:empty?)).sub(%r{\A\/}, "") + File.join(*[@dir, @name].map(&:to_s).reject(&:empty?)).sub(%r!\A\/!, "") end # Obtain destination path. From 6ef2bcb29a930de0eeced78ef8e88f504080ef98 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Wed, 25 May 2016 21:59:11 -0500 Subject: [PATCH 0898/4996] Rubocop: test/test_filters.rb --- test/test_filters.rb | 278 ++++++++++++++++++++++++++++++------------- 1 file changed, 192 insertions(+), 86 deletions(-) diff --git a/test/test_filters.rb b/test/test_filters.rb index eb8170fceb8..a2184c371d7 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -1,6 +1,6 @@ # coding: utf-8 -require 'helper' +require "helper" class TestFilters < JekyllUnitTest class JekyllFilter @@ -8,18 +8,24 @@ class JekyllFilter attr_accessor :site, :context def initialize(opts = {}) - @site = Jekyll::Site.new(Jekyll.configuration(opts.merge('skip_config_files' => true))) + @site = Jekyll::Site.new( + Jekyll.configuration(opts.merge("skip_config_files" => true)) + ) @context = Liquid::Context.new({}, {}, { :site => @site }) end end context "filters" do setup do - @filter = JekyllFilter.new({"source" => source_dir, "destination" => dest_dir, "timezone" => "UTC"}) + @filter = JekyllFilter.new({ + "source" => source_dir, + "destination" => dest_dir, + "timezone" => "UTC" + }) @sample_time = Time.utc(2013, 03, 27, 11, 22, 33) @sample_date = Date.parse("2013-03-27") @time_as_string = "September 11, 2001 12:46:30 -0000" - @time_as_numeric = 1399680607 + @time_as_numeric = 1_399_680_607 @array_of_objects = [ { "color" => "red", "size" => "large" }, { "color" => "red", "size" => "medium" }, @@ -28,18 +34,30 @@ def initialize(opts = {}) end should "markdownify with simple string" do - assert_equal "

    something really simple

    \n", @filter.markdownify("something **really** simple") + assert_equal( + "

    something really simple

    \n", + @filter.markdownify("something **really** simple") + ) end context "smartify filter" do should "convert quotes and typographic characters" do - assert_equal "SmartyPants is *not* Markdown", @filter.smartify("SmartyPants is *not* Markdown") - assert_equal "“This filter’s test…”", @filter.smartify(%q{"This filter's test..."}) + assert_equal( + "SmartyPants is *not* Markdown", + @filter.smartify("SmartyPants is *not* Markdown") + ) + assert_equal( + "“This filter’s test…”", + @filter.smartify(%q{"This filter's test..."}) + ) end should "escapes special characters when configured to do so" do - kramdown = JekyllFilter.new({:kramdown => {:entity_output => :symbolic}}) - assert_equal "“This filter’s test…”", kramdown.smartify(%q{"This filter's test..."}) + kramdown = JekyllFilter.new({ :kramdown => { :entity_output => :symbolic } }) + assert_equal( + "“This filter’s test…”", + kramdown.smartify(%q{"This filter's test..."}) + ) end should "convert HTML entities to unicode characters" do @@ -48,8 +66,14 @@ def initialize(opts = {}) end should "allow raw HTML passthrough" do - assert_equal "Span HTML is not escaped", @filter.smartify("Span HTML is not escaped") - assert_equal "
    Block HTML is not escaped
    ", @filter.smartify("
    Block HTML is not escaped
    ") + assert_equal( + "Span HTML is not escaped", + @filter.smartify("Span HTML is not escaped") + ) + assert_equal( + "
    Block HTML is not escaped
    ", + @filter.smartify("
    Block HTML is not escaped
    ") + ) end should "escape special characters" do @@ -60,11 +84,17 @@ def initialize(opts = {}) end should "sassify with simple string" do - assert_equal "p {\n color: #123456; }\n", @filter.sassify("$blue:#123456\np\n color: $blue") + assert_equal( + "p {\n color: #123456; }\n", + @filter.sassify("$blue:#123456\np\n color: $blue") + ) end should "scssify with simple string" do - assert_equal "p {\n color: #123456; }\n", @filter.scssify("$blue:#123456; p{color: $blue}") + assert_equal( + "p {\n color: #123456; }\n", + @filter.scssify("$blue:#123456; p{color: $blue}") + ) end should "convert array to sentence string with no args" do @@ -78,12 +108,15 @@ def initialize(opts = {}) should "convert array to sentence string with two args" do assert_equal "1 and 2", @filter.array_to_sentence_string([1, 2]) - assert_equal "chunky and bacon", @filter.array_to_sentence_string(["chunky", "bacon"]) + assert_equal "chunky and bacon", @filter.array_to_sentence_string(%w(chunky bacon)) end should "convert array to sentence string with multiple args" do assert_equal "1, 2, 3, and 4", @filter.array_to_sentence_string([1, 2, 3, 4]) - assert_equal "chunky, bacon, bits, and pieces", @filter.array_to_sentence_string(["chunky", "bacon", "bits", "pieces"]) + assert_equal( + "chunky, bacon, bits, and pieces", + @filter.array_to_sentence_string(%w(chunky bacon bits pieces)) + ) end context "date filters" do @@ -97,11 +130,17 @@ def initialize(opts = {}) end should "format a time with xmlschema" do - assert_equal "2013-03-27T11:22:33+00:00", @filter.date_to_xmlschema(@sample_time) + assert_equal( + "2013-03-27T11:22:33+00:00", + @filter.date_to_xmlschema(@sample_time) + ) end should "format a time according to RFC-822" do - assert_equal "Wed, 27 Mar 2013 11:22:33 +0000", @filter.date_to_rfc822(@sample_time) + assert_equal( + "Wed, 27 Mar 2013 11:22:33 +0000", + @filter.date_to_rfc822(@sample_time) + ) end should "not modify a time in-place when using filters" do @@ -122,11 +161,17 @@ def initialize(opts = {}) end should "format a time with xmlschema" do - assert_equal "2013-03-27T00:00:00+00:00", @filter.date_to_xmlschema(@sample_date) + assert_equal( + "2013-03-27T00:00:00+00:00", + @filter.date_to_xmlschema(@sample_date) + ) end should "format a time according to RFC-822" do - assert_equal "Wed, 27 Mar 2013 00:00:00 +0000", @filter.date_to_rfc822(@sample_date) + assert_equal( + "Wed, 27 Mar 2013 00:00:00 +0000", + @filter.date_to_rfc822(@sample_date) + ) end end @@ -140,11 +185,17 @@ def initialize(opts = {}) end should "format a time with xmlschema" do - assert_equal "2001-09-11T12:46:30+00:00", @filter.date_to_xmlschema(@time_as_string) + assert_equal( + "2001-09-11T12:46:30+00:00", + @filter.date_to_xmlschema(@time_as_string) + ) end should "format a time according to RFC-822" do - assert_equal "Tue, 11 Sep 2001 12:46:30 +0000", @filter.date_to_rfc822(@time_as_string) + assert_equal( + "Tue, 11 Sep 2001 12:46:30 +0000", + @filter.date_to_rfc822(@time_as_string) + ) end end @@ -158,18 +209,27 @@ def initialize(opts = {}) end should "format a time with xmlschema" do - assert_match(/2014-05-10T00:10:07/, @filter.date_to_xmlschema(@time_as_numeric)) + assert_match( + "2014-05-10T00:10:07", + @filter.date_to_xmlschema(@time_as_numeric) + ) end should "format a time according to RFC-822" do - assert_equal "Sat, 10 May 2014 00:10:07 +0000", @filter.date_to_rfc822(@time_as_numeric) + assert_equal( + "Sat, 10 May 2014 00:10:07 +0000", + @filter.date_to_rfc822(@time_as_numeric) + ) end end end should "escape xml with ampersands" do assert_equal "AT&T", @filter.xml_escape("AT&T") - assert_equal "<code>command &lt;filename&gt;</code>", @filter.xml_escape("command <filename>") + assert_equal( + "<code>command &lt;filename&gt;</code>", + @filter.xml_escape("command <filename>") + ) end should "not error when xml escaping nil" do @@ -190,37 +250,40 @@ def initialize(opts = {}) context "jsonify filter" do should "convert hash to json" do - assert_equal "{\"age\":18}", @filter.jsonify({:age => 18}) + assert_equal "{\"age\":18}", @filter.jsonify({ :age => 18 }) end should "convert array to json" do assert_equal "[1,2]", @filter.jsonify([1, 2]) - assert_equal "[{\"name\":\"Jack\"},{\"name\":\"Smith\"}]", @filter.jsonify([{:name => 'Jack'}, {:name => 'Smith'}]) + assert_equal( + "[{\"name\":\"Jack\"},{\"name\":\"Smith\"}]", + @filter.jsonify([{ :name => "Jack" }, { :name => "Smith" }]) + ) end should "convert drop to json" do @filter.site.read expected = { - "path" => "_posts/2008-02-02-published.markdown", - "previous" => nil, - "output" => nil, - "content" => "This should be published.\n", - "id" => "/publish_test/2008/02/02/published", - "url" => "/publish_test/2008/02/02/published.html", + "path" => "_posts/2008-02-02-published.markdown", + "previous" => nil, + "output" => nil, + "content" => "This should be published.\n", + "id" => "/publish_test/2008/02/02/published", + "url" => "/publish_test/2008/02/02/published.html", "relative_path" => "_posts/2008-02-02-published.markdown", - "collection" => "posts", - "excerpt" => "

    This should be published.

    \n", - "draft" => false, - "categories" => [ + "collection" => "posts", + "excerpt" => "

    This should be published.

    \n", + "draft" => false, + "categories" => [ "publish_test" ], - "layout" => "default", - "title" => "Publish", - "category" => "publish_test", - "date" => "2008-02-02 00:00:00 +0000", - "slug" => "published", - "ext" => ".markdown", - "tags" => [] + "layout" => "default", + "title" => "Publish", + "category" => "publish_test", + "date" => "2008-02-02 00:00:00 +0000", + "slug" => "published", + "ext" => ".markdown", + "tags" => [] } actual = JSON.parse(@filter.jsonify(@filter.site.docs_to_write.first.to_liquid)) @@ -236,10 +299,11 @@ def initialize(opts = {}) actual = @filter.jsonify(@filter.site.to_liquid) assert_equal JSON.parse(actual)["jekyll"], { "environment" => "development", - "version" => Jekyll::VERSION + "version" => Jekyll::VERSION } end + # rubocop:disable Style/StructInheritance class M < Struct.new(:message) def to_liquid [message] @@ -247,7 +311,12 @@ def to_liquid end class T < Struct.new(:name) def to_liquid - { "name" => name, :v => 1, :thing => M.new({:kay => "jewelers"}), :stuff => true } + { + "name" => name, + :v => 1, + :thing => M.new({ :kay => "jewelers" }), + :stuff => true + } end end @@ -277,6 +346,7 @@ def to_liquid result = @filter.jsonify([T.new("Jeremiah"), T.new("Smathers")]) assert_equal expected, JSON.parse(result) end + # rubocop:enable Style/StructInheritance should "handle hashes with all sorts of weird keys and values" do my_hash = { "posts" => Array.new(3) { |i| T.new(i) } } @@ -324,16 +394,28 @@ def to_liquid @filter.site.process grouping = @filter.group_by(@filter.site.pages, "layout") grouping.each do |g| - assert ["default", "nil", ""].include?(g["name"]), "#{g['name']} isn't a valid grouping." + assert( + ["default", "nil", ""].include?(g["name"]), + "#{g["name"]} isn't a valid grouping." + ) case g["name"] when "default" - assert g["items"].is_a?(Array), "The list of grouped items for 'default' is not an Array." + assert( + g["items"].is_a?(Array), + "The list of grouped items for 'default' is not an Array." + ) assert_equal 5, g["items"].size when "nil" - assert g["items"].is_a?(Array), "The list of grouped items for 'nil' is not an Array." + assert( + g["items"].is_a?(Array), + "The list of grouped items for 'nil' is not an Array." + ) assert_equal 2, g["items"].size when "" - assert g["items"].is_a?(Array), "The list of grouped items for '' is not an Array." + assert( + g["items"].is_a?(Array), + "The list of grouped items for '' is not an Array." + ) assert_equal 13, g["items"].size end end @@ -343,7 +425,11 @@ def to_liquid grouping = @filter.group_by(@filter.site.pages, "layout") grouping.each do |g| p g - assert_equal g["items"].size, g["size"], "The size property for '#{g["name"]}' doesn't match the size of the Array." + assert_equal( + g["items"].size, + g["size"], + "The size property for '#{g["name"]}' doesn't match the size of the Array." + ) end end end @@ -354,9 +440,9 @@ def to_liquid end should "filter objects in a hash appropriately" do - hash = {"a"=>{"color"=>"red"}, "b"=>{"color"=>"blue"}} + hash = { "a"=>{ "color"=>"red" }, "b"=>{ "color"=>"blue" } } assert_equal 1, @filter.where(hash, "color", "red").length - assert_equal [{"color"=>"red"}], @filter.where(hash, "color", "red") + assert_equal [{ "color"=>"red" }], @filter.where(hash, "color", "red") end should "filter objects appropriately" do @@ -364,25 +450,37 @@ def to_liquid end should "filter array properties appropriately" do - hash = {"a"=>{"tags"=>["x","y"]}, "b"=>{"tags"=>["x"]}, "c"=>{"tags"=>["y","z"]}} + hash = { + "a" => { "tags"=>%w(x y) }, + "b" => { "tags"=>["x"] }, + "c" => { "tags"=>%w(y z) } + } assert_equal 2, @filter.where(hash, "tags", "x").length end should "filter array properties alongside string properties" do - hash = {"a"=>{"tags"=>["x","y"]}, "b"=>{"tags"=>"x"}, "c"=>{"tags"=>["y","z"]}} + hash = { + "a" => { "tags"=>%w(x y) }, + "b" => { "tags"=>"x" }, + "c" => { "tags"=>%w(y z) } + } assert_equal 2, @filter.where(hash, "tags", "x").length end should "not match substrings" do - hash = {"a"=>{"category"=>"bear"}, "b"=>{"category"=>"wolf"}, "c"=>{"category"=>["bear","lion"]}} + hash = { + "a" => { "category"=>"bear" }, + "b" => { "category"=>"wolf" }, + "c" => { "category"=>%w(bear lion) } + } assert_equal 0, @filter.where(hash, "category", "ear").length end should "stringify during comparison for compatibility with liquid parsing" do hash = { - "The Words" => {"rating" => 1.2, "featured" => false}, - "Limitless" => {"rating" => 9.2, "featured" => true}, - "Hustle" => {"rating" => 4.7, "featured" => true}, + "The Words" => { "rating" => 1.2, "featured" => false }, + "Limitless" => { "rating" => 9.2, "featured" => true }, + "Hustle" => { "rating" => 4.7, "featured" => true } } results = @filter.where(hash, "featured", "true") @@ -402,20 +500,26 @@ def to_liquid end should "filter objects in a hash appropriately" do - hash = {"a"=>{"color"=>"red"}, "b"=>{"color"=>"blue"}} + hash = { "a"=>{ "color"=>"red" }, "b"=>{ "color"=>"blue" } } assert_equal 1, @filter.where_exp(hash, "item", "item.color == 'red'").length - assert_equal [{"color"=>"red"}], @filter.where_exp(hash, "item", "item.color == 'red'") + assert_equal( + [{ "color"=>"red" }], + @filter.where_exp(hash, "item", "item.color == 'red'") + ) end should "filter objects appropriately" do - assert_equal 2, @filter.where_exp(@array_of_objects, "item", "item.color == 'red'").length + assert_equal( + 2, + @filter.where_exp(@array_of_objects, "item", "item.color == 'red'").length + ) end should "stringify during comparison for compatibility with liquid parsing" do hash = { - "The Words" => {"rating" => 1.2, "featured" => false}, - "Limitless" => {"rating" => 9.2, "featured" => true}, - "Hustle" => {"rating" => 4.7, "featured" => true}, + "The Words" => { "rating" => 1.2, "featured" => false }, + "Limitless" => { "rating" => 9.2, "featured" => true }, + "Hustle" => { "rating" => 4.7, "featured" => true } } results = @filter.where_exp(hash, "item", "item.featured == true") @@ -465,28 +569,31 @@ def to_liquid assert_equal [1, 2, 2.2, 3], @filter.sort([3, 2.2, 2, 1]) end should "return sorted strings" do - assert_equal ["10", "2"], @filter.sort(["10", "2"]) - assert_equal [{"a" => "10"}, {"a" => "2"}], @filter.sort([{"a" => "10"}, {"a" => "2"}], "a") - assert_equal ["FOO", "Foo", "foo"], @filter.sort(["foo", "Foo", "FOO"]) - assert_equal ["_foo", "foo", "foo_"], @filter.sort(["foo_", "_foo", "foo"]) + assert_equal %w(10 2), @filter.sort(%w(10 2)) + assert_equal( + [{ "a" => "10" }, { "a" => "2" }], + @filter.sort([{ "a" => "10" }, { "a" => "2" }], "a") + ) + assert_equal %w(FOO Foo foo), @filter.sort(%w(foo Foo FOO)) + assert_equal %w(_foo foo foo_), @filter.sort(%w(foo_ _foo foo)) # Cyrillic - assert_equal ["ВУЗ", "Вуз", "вуз"], @filter.sort(["Вуз", "вуз", "ВУЗ"]) - assert_equal ["_вуз", "вуз", "вуз_"], @filter.sort(["вуз_", "_вуз", "вуз"]) + assert_equal %w(ВУЗ Вуз вуз), @filter.sort(%w(Вуз вуз ВУЗ)) + assert_equal %w(_вуз вуз вуз_), @filter.sort(%w(вуз_ _вуз вуз)) # Hebrew - assert_equal ["אלף", "בית"], @filter.sort(["בית", "אלף"]) + assert_equal %w(אלף בית), @filter.sort(%w(בית אלף)) end should "return sorted by property array" do - assert_equal [{"a" => 1}, {"a" => 2}, {"a" => 3}, {"a" => 4}], - @filter.sort([{"a" => 4}, {"a" => 3}, {"a" => 1}, {"a" => 2}], "a") + assert_equal [{ "a" => 1 }, { "a" => 2 }, { "a" => 3 }, { "a" => 4 }], + @filter.sort([{ "a" => 4 }, { "a" => 3 }, { "a" => 1 }, { "a" => 2 }], "a") end should "return sorted by property array with nils first" do - ary = [{"a" => 2}, {"b" => 1}, {"a" => 1}] - assert_equal [{"b" => 1}, {"a" => 1}, {"a" => 2}], @filter.sort(ary, "a") + ary = [{ "a" => 2 }, { "b" => 1 }, { "a" => 1 }] + assert_equal [{ "b" => 1 }, { "a" => 1 }, { "a" => 2 }], @filter.sort(ary, "a") assert_equal @filter.sort(ary, "a"), @filter.sort(ary, "a", "first") end should "return sorted by property array with nils last" do - assert_equal [{"a" => 1}, {"a" => 2}, {"b" => 1}], - @filter.sort([{"a" => 2}, {"b" => 1}, {"a" => 1}], "a", "last") + assert_equal [{ "a" => 1 }, { "a" => 2 }, { "b" => 1 }], + @filter.sort([{ "a" => 2 }, { "b" => 1 }, { "a" => 1 }], "a", "last") end end @@ -512,41 +619,41 @@ def to_liquid context "push filter" do should "return a new array with the element pushed to the end" do - assert_equal %w{hi there bernie}, @filter.push(%w{hi there}, "bernie") + assert_equal %w(hi there bernie), @filter.push(%w(hi there), "bernie") end end context "pop filter" do should "return a new array with the last element popped" do - assert_equal %w{hi there}, @filter.pop(%w{hi there bernie}) + assert_equal %w(hi there), @filter.pop(%w(hi there bernie)) end should "allow multiple els to be popped" do - assert_equal %w{hi there bert}, @filter.pop(%w{hi there bert and ernie}, 2) + assert_equal %w(hi there bert), @filter.pop(%w(hi there bert and ernie), 2) end should "cast string inputs for # into nums" do - assert_equal %w{hi there bert}, @filter.pop(%w{hi there bert and ernie}, "2") + assert_equal %w(hi there bert), @filter.pop(%w(hi there bert and ernie), "2") end end context "shift filter" do should "return a new array with the element removed from the front" do - assert_equal %w{a friendly greeting}, @filter.shift(%w{just a friendly greeting}) + assert_equal %w(a friendly greeting), @filter.shift(%w(just a friendly greeting)) end should "allow multiple els to be shifted" do - assert_equal %w{bert and ernie}, @filter.shift(%w{hi there bert and ernie}, 2) + assert_equal %w(bert and ernie), @filter.shift(%w(hi there bert and ernie), 2) end should "cast string inputs for # into nums" do - assert_equal %w{bert and ernie}, @filter.shift(%w{hi there bert and ernie}, "2") + assert_equal %w(bert and ernie), @filter.shift(%w(hi there bert and ernie), "2") end end context "unshift filter" do should "return a new array with the element put at the front" do - assert_equal %w{aloha there bernie}, @filter.unshift(%w{there bernie}, "aloha") + assert_equal %w(aloha there bernie), @filter.unshift(%w(there bernie), "aloha") end end @@ -563,6 +670,5 @@ def to_liquid end end end - end end From fd75f0f7b15880fdb13199d508074cd0ea414ccf Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Wed, 25 May 2016 21:59:23 -0500 Subject: [PATCH 0899/4996] Rubocop: test/test_configuration.rb --- test/test_configuration.rb | 297 ++++++++++++++++++++++++------------- 1 file changed, 195 insertions(+), 102 deletions(-) diff --git a/test/test_configuration.rb b/test/test_configuration.rb index 08cc3bd9bfd..eddb2c96d0d 100644 --- a/test/test_configuration.rb +++ b/test/test_configuration.rb @@ -1,8 +1,8 @@ -require 'helper' +require "helper" class TestConfiguration < JekyllUnitTest - @@test_config = { - "source" => new(nil).source_dir, + test_config = { + "source" => new(nil).source_dir, "destination" => dest_dir } @@ -12,48 +12,77 @@ class TestConfiguration < JekyllUnitTest end should "merge input over defaults" do - result = Configuration.from({"source" => "blah"}) + result = Configuration.from({ "source" => "blah" }) refute_equal result["source"], Configuration::DEFAULTS["source"] assert_equal result["source"], "blah" end should "fix common mistakes" do - result = Configuration.from({"paginate" => 0}) - assert_nil result["paginate"], "Expected 'paginate' to be corrected to 'nil', but was #{result["paginate"].inspect}" + result = Configuration.from({ "paginate" => 0 }) + assert_nil( + result["paginate"], + "Expected 'paginate' to be corrected to 'nil', " \ + "but was #{result["paginate"].inspect}" + ) end should "add default collections" do result = Configuration.from({}) - assert_equal result["collections"], {"posts" => {"output" => true, "permalink" => "/:categories/:year/:month/:day/:title:output_ext"}} + assert_equal( + result["collections"], + { + "posts" => { + "output" => true, + "permalink" => "/:categories/:year/:month/:day/:title:output_ext" + } + } + ) end should "NOT backwards-compatibilize" do - assert Configuration.from("watch" => true)["watch"], "Expected the 'watch' key to not be removed." + assert( + Configuration.from("watch" => true)["watch"], + "Expected the 'watch' key to not be removed." + ) end end context "#add_default_collections" do should "no-op if collections is nil" do - result = Configuration[{"collections" => nil}].add_default_collections + result = Configuration[{ "collections" => nil }].add_default_collections assert_nil result["collections"] end should "turn an array into a hash" do - result = Configuration[{"collections" => %w{methods}}].add_default_collections + result = Configuration[{ "collections" => %w(methods) }].add_default_collections assert_instance_of Hash, result["collections"] - assert_equal result["collections"], {"posts" => {"output" => true}, "methods" => {}} + assert_equal( + result["collections"], + { "posts" => { "output" => true }, "methods" => {} } + ) end should "only assign collections.posts.permalink if a permalink is specified" do - result = Configuration[{"permalink" => "pretty", "collections" => {}}].add_default_collections - assert_equal result["collections"], {"posts" => {"output" => true, "permalink" => "/:categories/:year/:month/:day/:title/"}} + result = Configuration[{ "permalink" => "pretty", "collections" => {} }] + .add_default_collections + assert_equal( + result["collections"], + { + "posts" => { + "output" => true, + "permalink" => "/:categories/:year/:month/:day/:title/" + } + } + ) - result = Configuration[{"permalink" => nil, "collections" => {}}].add_default_collections - assert_equal result["collections"], {"posts" => {"output" => true}} + result = Configuration[{ "permalink" => nil, "collections" => {} }] + .add_default_collections + assert_equal result["collections"], { "posts" => { "output" => true } } end should "forces posts to output" do - result = Configuration[{"collections" => {"posts" => {"output" => false}}}].add_default_collections + result = Configuration[{ "collections" => { "posts" => { "output" => false } } }] + .add_default_collections assert_equal result["collections"]["posts"]["output"], true end end @@ -61,18 +90,18 @@ class TestConfiguration < JekyllUnitTest context "#stringify_keys" do setup do @mixed_keys = Configuration[{ - 'markdown' => 'kramdown', - :permalink => 'date', - 'baseurl' => '/', - :include => ['.htaccess'], - :source => './' + "markdown" => "kramdown", + :permalink => "date", + "baseurl" => "/", + :include => [".htaccess"], + :source => "./" }] @string_keys = Configuration[{ - 'markdown' => 'kramdown', - 'permalink' => 'date', - 'baseurl' => '/', - 'include' => ['.htaccess'], - 'source' => './' + "markdown" => "kramdown", + "permalink" => "date", + "baseurl" => "/", + "include" => [".htaccess"], + "source" => "./" }] end should "stringify symbol keys" do @@ -84,10 +113,12 @@ class TestConfiguration < JekyllUnitTest end context "#config_files" do setup do - @config = Configuration[{"source" => source_dir}] + @config = Configuration[{ "source" => source_dir }] @no_override = {} - @one_config_file = {"config" => "config.yml"} - @multiple_files = {"config" => %w[config/site.yml config/deploy.toml configuration.yml]} + @one_config_file = { "config" => "config.yml" } + @multiple_files = { + "config" => %w(config/site.yml config/deploy.toml configuration.yml) + } end should "always return an array" do @@ -108,52 +139,58 @@ class TestConfiguration < JekyllUnitTest assert_equal [source_dir("_config.yml")], @config.config_files(@no_override) end should "return the config if given one config file" do - assert_equal %w[config.yml], @config.config_files(@one_config_file) + assert_equal %w(config.yml), @config.config_files(@one_config_file) end should "return an array of the config files if given many config files" do - assert_equal %w[config/site.yml config/deploy.toml configuration.yml], @config.config_files(@multiple_files) + assert_equal( + %w(config/site.yml config/deploy.toml configuration.yml), + @config.config_files(@multiple_files) + ) end end context "#read_config_file" do setup do - @config = Configuration[{"source" => source_dir('empty.yml')}] + @config = Configuration[{ "source" => source_dir("empty.yml") }] end should "not raise an error on empty files" do - allow(SafeYAML).to receive(:load_file).with('empty.yml').and_return(false) + allow(SafeYAML).to receive(:load_file).with("empty.yml").and_return(false) Jekyll.logger.log_level = :warn - @config.read_config_file('empty.yml') + @config.read_config_file("empty.yml") Jekyll.logger.log_level = :info end end context "#read_config_files" do setup do - @config = Configuration[{"source" => source_dir}] + @config = Configuration[{ "source" => source_dir }] end should "continue to read config files if one is empty" do - allow(SafeYAML).to receive(:load_file).with('empty.yml').and_return(false) - allow(SafeYAML).to receive(:load_file).with('not_empty.yml').and_return({'foo' => 'bar', 'include' => '', 'exclude' => ''}) + allow(SafeYAML).to receive(:load_file).with("empty.yml").and_return(false) + allow(SafeYAML) + .to receive(:load_file) + .with("not_empty.yml") + .and_return({ "foo" => "bar", "include" => "", "exclude" => "" }) Jekyll.logger.log_level = :warn - read_config = @config.read_config_files(['empty.yml', 'not_empty.yml']) + read_config = @config.read_config_files(["empty.yml", "not_empty.yml"]) Jekyll.logger.log_level = :info - assert_equal 'bar', read_config['foo'] + assert_equal "bar", read_config["foo"] end end context "#backwards_compatibilize" do setup do @config = Configuration[{ - "auto" => true, - "watch" => true, - "server" => true, - "exclude" => "READ-ME.md, Gemfile,CONTRIBUTING.hello.markdown", - "include" => "STOP_THE_PRESSES.txt,.heloses, .git", - "pygments" => true, - "plugins" => true, - "layouts" => true, - "data_source" => true, + "auto" => true, + "watch" => true, + "server" => true, + "exclude" => "READ-ME.md, Gemfile,CONTRIBUTING.hello.markdown", + "include" => "STOP_THE_PRESSES.txt,.heloses, .git", + "pygments" => true, + "plugins" => true, + "layouts" => true, + "data_source" => true }] end should "unset 'auto' and 'watch'" do @@ -169,12 +206,18 @@ class TestConfiguration < JekyllUnitTest should "transform string exclude into an array" do assert @config.key?("exclude") assert @config.backwards_compatibilize.key?("exclude") - assert_equal @config.backwards_compatibilize["exclude"], %w[READ-ME.md Gemfile CONTRIBUTING.hello.markdown] + assert_equal( + @config.backwards_compatibilize["exclude"], + %w(READ-ME.md Gemfile CONTRIBUTING.hello.markdown) + ) end should "transform string include into an array" do assert @config.key?("include") assert @config.backwards_compatibilize.key?("include") - assert_equal @config.backwards_compatibilize["include"], %w[STOP_THE_PRESSES.txt .heloses .git] + assert_equal( + @config.backwards_compatibilize["include"], + %w(STOP_THE_PRESSES.txt .heloses .git) + ) end should "set highlighter to pygments" do assert @config.key?("pygments") @@ -195,62 +238,79 @@ class TestConfiguration < JekyllUnitTest end context "#fix_common_issues" do setup do - @config = Proc.new do |val| + @config = proc do |val| Configuration[{ - 'paginate' => val + "paginate" => val }] end end should "sets an invalid 'paginate' value to nil" do - assert_nil @config.call(0).fix_common_issues['paginate'] - assert_nil @config.call(-1).fix_common_issues['paginate'] - assert_nil @config.call(true).fix_common_issues['paginate'] + assert_nil @config.call(0).fix_common_issues["paginate"] + assert_nil @config.call(-1).fix_common_issues["paginate"] + assert_nil @config.call(true).fix_common_issues["paginate"] end end context "loading configuration" do setup do - @path = source_dir('_config.yml') + @path = source_dir("_config.yml") @user_config = File.join(Dir.pwd, "my_config_file.yml") end should "fire warning with no _config.yml" do - allow(SafeYAML).to receive(:load_file).with(@path) { raise SystemCallError, "No such file or directory - #{@path}" } + allow(SafeYAML).to receive(:load_file).with(@path) do + raise SystemCallError, "No such file or directory - #{@path}" + end allow($stderr).to receive(:puts).with("Configuration file: none".yellow) - assert_equal site_configuration, Jekyll.configuration(@@test_config) + assert_equal site_configuration, Jekyll.configuration(test_config) end should "load configuration as hash" do - allow(SafeYAML).to receive(:load_file).with(@path).and_return(Hash.new) + allow(SafeYAML).to receive(:load_file).with(@path).and_return({}) allow($stdout).to receive(:puts).with("Configuration file: #{@path}") - assert_equal site_configuration, Jekyll.configuration(@@test_config) + assert_equal site_configuration, Jekyll.configuration(test_config) end should "fire warning with bad config" do - allow(SafeYAML).to receive(:load_file).with(@path).and_return(Array.new) - allow($stderr).to receive(:puts).and_return(("WARNING: ".rjust(20) + "Error reading configuration. Using defaults (and options).").yellow) - allow($stderr).to receive(:puts).and_return("Configuration file: (INVALID) #{@path}".yellow) - assert_equal site_configuration, Jekyll.configuration(@@test_config) + allow(SafeYAML).to receive(:load_file).with(@path).and_return([]) + allow($stderr) + .to receive(:puts) + .and_return( + ("WARNING: " + .rjust(20) + "Error reading configuration. Using defaults (and options).") + .yellow + ) + allow($stderr) + .to receive(:puts) + .and_return("Configuration file: (INVALID) #{@path}".yellow) + assert_equal site_configuration, Jekyll.configuration(test_config) end should "fire warning when user-specified config file isn't there" do - allow(SafeYAML).to receive(:load_file).with(@user_config) { raise SystemCallError, "No such file or directory - #{@user_config}" } - allow($stderr).to receive(:puts).with(("Fatal: ".rjust(20) + "The configuration file '#{@user_config}' could not be found.").red) + allow(SafeYAML).to receive(:load_file).with(@user_config) do + raise SystemCallError, "No such file or directory - #{@user_config}" + end + allow($stderr) + .to receive(:puts) + .with(( + "Fatal: ".rjust(20) + \ + "The configuration file '#{@user_config}' could not be found." + ).red) assert_raises LoadError do - Jekyll.configuration({'config' => [@user_config]}) + Jekyll.configuration({ "config" => [@user_config] }) end end should "not clobber YAML.load to the dismay of other libraries" do - assert_equal :foo, YAML.load(':foo') + assert_equal :foo, YAML.load(":foo") # as opposed to: assert_equal ':foo', SafeYAML.load(':foo') end end context "loading config from external file" do setup do @paths = { - :default => source_dir('_config.yml'), - :other => source_dir('_config.live.yml'), - :toml => source_dir('_config.dev.toml'), + :default => source_dir("_config.yml"), + :other => source_dir("_config.live.yml"), + :toml => source_dir("_config.dev.toml"), :empty => "" } end @@ -258,16 +318,19 @@ class TestConfiguration < JekyllUnitTest should "load default plus posts config if no config_file is set" do allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return({}) allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}") - assert_equal site_configuration, Jekyll.configuration(@@test_config) + assert_equal site_configuration, Jekyll.configuration(test_config) end should "load different config if specified" do - allow(SafeYAML).to receive(:load_file).with(@paths[:other]).and_return({"baseurl" => "http://wahoo.dev"}) + allow(SafeYAML) + .to receive(:load_file) + .with(@paths[:other]) + .and_return({ "baseurl" => "http://wahoo.dev" }) allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}") Jekyll.configuration({ "config" => @paths[:other] }) assert_equal \ site_configuration({ "baseurl" => "http://wahoo.dev" }), - Jekyll.configuration(@@test_config.merge({ "config" => @paths[:other] })) + Jekyll.configuration(test_config.merge({ "config" => @paths[:other] })) end should "load default config if path passed is empty" do @@ -275,68 +338,94 @@ class TestConfiguration < JekyllUnitTest allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}") assert_equal \ site_configuration, - Jekyll.configuration(@@test_config.merge({ "config" => [@paths[:empty]] })) + Jekyll.configuration(test_config.merge({ "config" => [@paths[:empty]] })) end should "successfully load a TOML file" do Jekyll.logger.log_level = :warn assert_equal \ - site_configuration({ "baseurl" => "/you-beautiful-blog-you", "title" => "My magnificent site, wut" }), - Jekyll.configuration(@@test_config.merge({ "config" => [@paths[:toml]] })) + site_configuration({ "baseurl" => "/you-beautiful-blog-you", + "title" => "My magnificent site, wut" }), + Jekyll.configuration(test_config.merge({ "config" => [@paths[:toml]] })) Jekyll.logger.log_level = :info end should "load multiple config files" do - External.require_with_graceful_fail('toml') + External.require_with_graceful_fail("toml") - allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return(Hash.new) - allow(SafeYAML).to receive(:load_file).with(@paths[:other]).and_return(Hash.new) - allow(TOML).to receive(:load_file).with(@paths[:toml]).and_return(Hash.new) + allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return({}) + allow(SafeYAML).to receive(:load_file).with(@paths[:other]).and_return({}) + allow(TOML).to receive(:load_file).with(@paths[:toml]).and_return({}) allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}") allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}") allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:toml]}") - assert_equal \ + assert_equal( site_configuration, - Jekyll.configuration(@@test_config.merge({ "config" => [@paths[:default], @paths[:other], @paths[:toml]] })) + Jekyll.configuration( + test_config.merge( + { "config" => [@paths[:default], @paths[:other], @paths[:toml]] } + ) + ) + ) end should "load multiple config files and last config should win" do - allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return({"baseurl" => "http://example.dev"}) - allow(SafeYAML).to receive(:load_file).with(@paths[:other]).and_return({"baseurl" => "http://wahoo.dev"}) - allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}") - allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}") + allow(SafeYAML) + .to receive(:load_file) + .with(@paths[:default]) + .and_return({ "baseurl" => "http://example.dev" }) + allow(SafeYAML) + .to receive(:load_file) + .with(@paths[:other]) + .and_return({ "baseurl" => "http://wahoo.dev" }) + allow($stdout) + .to receive(:puts) + .with("Configuration file: #{@paths[:default]}") + allow($stdout) + .to receive(:puts) + .with("Configuration file: #{@paths[:other]}") assert_equal \ site_configuration({ "baseurl" => "http://wahoo.dev" }), - Jekyll.configuration(@@test_config.merge({ "config" => [@paths[:default], @paths[:other]] })) + Jekyll.configuration( + test_config.merge({ "config" => [@paths[:default], @paths[:other]] }) + ) end end context "#add_default_collections" do should "not do anything if collections is nil" do - conf = Configuration[default_configuration].tap {|c| c['collections'] = nil } + conf = Configuration[default_configuration].tap { |c| c["collections"] = nil } assert_equal conf.add_default_collections, conf - assert_nil conf.add_default_collections['collections'] + assert_nil conf.add_default_collections["collections"] end should "converts collections to a hash if an array" do - conf = Configuration[default_configuration].tap {|c| c['collections'] = ['docs'] } + conf = Configuration[default_configuration].tap do |c| + c["collections"] = ["docs"] + end assert_equal conf.add_default_collections, conf.merge({ "collections" => { - "docs" => {}, + "docs" => {}, "posts" => { - "output" => true, + "output" => true, "permalink" => "/:categories/:year/:month/:day/:title:output_ext" - }}}) + } + } + }) end should "force collections.posts.output = true" do - conf = Configuration[default_configuration].tap {|c| c['collections'] = {'posts' => {'output' => false}} } + conf = Configuration[default_configuration].tap do |c| + c["collections"] = { "posts" => { "output" => false } } + end assert_equal conf.add_default_collections, conf.merge({ "collections" => { "posts" => { - "output" => true, + "output" => true, "permalink" => "/:categories/:year/:month/:day/:title:output_ext" - }}}) + } + } + }) end should "set collections.posts.permalink if it's not set" do @@ -344,24 +433,28 @@ class TestConfiguration < JekyllUnitTest assert_equal conf.add_default_collections, conf.merge({ "collections" => { "posts" => { - "output" => true, + "output" => true, "permalink" => "/:categories/:year/:month/:day/:title:output_ext" - }}}) + } + } + }) end should "leave collections.posts.permalink alone if it is set" do posts_permalink = "/:year/:title/" conf = Configuration[default_configuration].tap do |c| - c['collections'] = { + c["collections"] = { "posts" => { "permalink" => posts_permalink } } end assert_equal conf.add_default_collections, conf.merge({ "collections" => { "posts" => { - "output" => true, + "output" => true, "permalink" => posts_permalink - }}}) + } + } + }) end end end From 5291bd0498a34da19f99e11469411c930a461e12 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Wed, 25 May 2016 21:59:33 -0500 Subject: [PATCH 0900/4996] Rubocop: test/test_document.rb --- test/test_document.rb | 115 +++++++++++++++++++++++------------------- 1 file changed, 64 insertions(+), 51 deletions(-) diff --git a/test/test_document.rb b/test/test_document.rb index fb503dccedb..808ef2e7d56 100644 --- a/test/test_document.rb +++ b/test/test_document.rb @@ -1,7 +1,6 @@ -require 'helper' +require "helper" class TestDocument < JekyllUnitTest - def assert_equal_value(key, one, other) assert_equal(one[key], other[key]) end @@ -12,7 +11,9 @@ def assert_equal_value(key, one, other) "collections" => ["methods"] }) @site.process - @document = @site.collections["methods"].docs.detect {|d| d.relative_path == "_methods/configuration.md" } + @document = @site.collections["methods"].docs.detect do |d| + d.relative_path == "_methods/configuration.md" + end end should "exist" do @@ -86,11 +87,12 @@ def assert_equal_value(key, one, other) end context "with YAML ending in three dots" do - setup do - @site = fixture_site({"collections" => ["methods"]}) + @site = fixture_site({ "collections" => ["methods"] }) @site.process - @document = @site.collections["methods"].docs.detect {|d| d.relative_path == "_methods/yaml_with_dots.md" } + @document = @site.collections["methods"].docs.detect do |d| + d.relative_path == "_methods/yaml_with_dots.md" + end end should "know its data" do @@ -100,36 +102,35 @@ def assert_equal_value(key, one, other) end should "output the collection name in the #to_liquid method" do - assert_equal @document.to_liquid['collection'], "methods" + assert_equal @document.to_liquid["collection"], "methods" end should "output its relative path as path in Liquid" do - assert_equal @document.to_liquid['path'], "_methods/configuration.md" + assert_equal @document.to_liquid["path"], "_methods/configuration.md" end - end context "a document as part of a collection with frontmatter defaults" do setup do @site = fixture_site({ "collections" => ["slides"], - "defaults" => [{ - "scope"=> {"path"=>"", "type"=>"slides"}, - "values"=> { - "nested"=> { - "key"=>"myval", + "defaults" => [{ + "scope" => { "path"=>"", "type"=>"slides" }, + "values" => { + "nested" => { + "key" => "myval" } } }] }) @site.process - @document = @site.collections["slides"].docs.select{|d| d.is_a?(Document) }.first + @document = @site.collections["slides"].docs.select { |d| d.is_a?(Document) }.first end should "know the frontmatter defaults" do assert_equal "Example slide", @document.data["title"] assert_equal "slide", @document.data["layout"] - assert_equal({"key"=>"myval"}, @document.data["nested"]) + assert_equal({ "key"=>"myval" }, @document.data["nested"]) end end @@ -137,12 +138,12 @@ def assert_equal_value(key, one, other) setup do @site = fixture_site({ "collections" => ["slides"], - "defaults" => [{ - "scope"=> {"path"=>"", "type"=>"slides"}, - "values"=> { - "nested"=> { - "test1"=>"default1", - "test2"=>"default1" + "defaults" => [{ + "scope" => { "path"=>"", "type"=>"slides" }, + "values" => { + "nested" => { + "test1" => "default1", + "test2" => "default1" } } }] @@ -154,7 +155,10 @@ def assert_equal_value(key, one, other) should "override default values in the document frontmatter" do assert_equal "Override title", @document.data["title"] assert_equal "slide", @document.data["layout"] - assert_equal({"test1"=>"override1","test2"=>"override2"}, @document.data["nested"]) + assert_equal( + { "test1"=>"override1", "test2"=>"override2" }, + @document.data["nested"] + ) end end @@ -162,11 +166,11 @@ def assert_equal_value(key, one, other) setup do @site = fixture_site({ "collections" => ["slides"], - "defaults" => [{ - "scope"=> {"path"=>"_slides", "type"=>"slides"}, - "values"=> { - "nested"=> { - "key"=>"value123", + "defaults" => [{ + "scope" => { "path"=>"_slides", "type"=>"slides" }, + "values" => { + "nested" => { + "key" => "value123" } } }] @@ -178,7 +182,7 @@ def assert_equal_value(key, one, other) should "know the frontmatter defaults" do assert_equal "Example slide", @document.data["title"] assert_equal "slide", @document.data["layout"] - assert_equal({"key"=>"value123"}, @document.data["nested"]) + assert_equal({ "key"=>"value123" }, @document.data["nested"]) end end @@ -186,11 +190,11 @@ def assert_equal_value(key, one, other) setup do @site = fixture_site({ "collections" => ["slides"], - "defaults" => [{ - "scope"=> {"path"=>"somepath", "type"=>"slides"}, - "values"=> { - "nested"=> { - "key"=>"myval", + "defaults" => [{ + "scope" => { "path"=>"somepath", "type"=>"slides" }, + "values" => { + "nested" => { + "key" => "myval" } } }] @@ -234,7 +238,7 @@ def assert_equal_value(key, one, other) "permalink" => "/slides/test/:name" } }, - "permalink" => "pretty" + "permalink" => "pretty" }) @site.process @document = @site.collections["slides"].docs[0] @@ -259,9 +263,9 @@ def assert_equal_value(key, one, other) @site = fixture_site({ "collections" => { "slides" => { - "output" => true, + "output" => true } - }, + } }) @site.permalink_style = :pretty @site.process @@ -283,9 +287,9 @@ def assert_equal_value(key, one, other) @site = fixture_site({ "collections" => { "slides" => { - "output" => true, + "output" => true } - }, + } }) @site.permalink_style = :pretty @site.process @@ -337,7 +341,7 @@ def assert_equal_value(key, one, other) "output" => true, "permalink" => "/slides/:title" } - }, + } }) @site.process @document = @site.collections["slides"].docs[3] @@ -363,7 +367,10 @@ def assert_equal_value(key, one, other) end should "produce the right URL if they have a wild slug" do - assert_equal "/slides/Well,-so-what-is-Jekyll,-then", @document_with_strange_slug.url + assert_equal( + "/slides/Well,-so-what-is-Jekyll,-then", + @document_with_strange_slug.url + ) end should "produce the right destination file if they have a wild slug" do dest_file = dest_dir("/slides/Well,-so-what-is-Jekyll,-then.html") @@ -373,9 +380,9 @@ def assert_equal_value(key, one, other) context "document with a permalink with dots & a trailing slash" do setup do - @site = fixture_site({"collections" => { + @site = fixture_site({ "collections" => { "with.dots" => { "output" => true } - }}) + } }) @site.process @document = @site.collections["with.dots"].docs.last @dest_file = dest_dir("with.dots", "permalink.with.slash.tho", "index.html") @@ -401,7 +408,7 @@ def assert_equal_value(key, one, other) "slides" => { "output" => true } - }, + } }) @site.process @files = @site.collections["slides"].docs @@ -409,13 +416,17 @@ def assert_equal_value(key, one, other) context "without output overrides" do should "be output according to collection defaults" do - refute_nil @files.find { |doc| doc.relative_path == "_slides/example-slide-4.html" } + refute_nil @files.find do |doc| + doc.relative_path == "_slides/example-slide-4.html" + end end end context "with output overrides" do should "be output according its front matter" do - assert_nil @files.find { |doc| doc.relative_path == "_slides/non-outputted-slide.html" } + assert_nil @files.find { |doc| + doc.relative_path == "_slides/non-outputted-slide.html" + } end end end @@ -430,7 +441,9 @@ def assert_equal_value(key, one, other) } }) @site.process - @document = @site.collections["slides"].files.find { |doc| doc.relative_path == "_slides/octojekyll.png" } + @document = @site.collections["slides"].files.find do |doc| + doc.relative_path == "_slides/octojekyll.png" + end @dest_file = dest_dir("slides/octojekyll.png") end @@ -458,10 +471,12 @@ def assert_equal_value(key, one, other) "methods" => { "output" => true } - }, + } }) @site.process - @document = @site.collections["methods"].docs.find { |doc| doc.relative_path == "_methods/escape-+ #%20[].md" } + @document = @site.collections["methods"].docs.find do |doc| + doc.relative_path == "_methods/escape-+ #%20[].md" + end @dest_file = dest_dir("methods/escape-+ #%20[].html") end @@ -476,7 +491,5 @@ def assert_equal_value(key, one, other) should "be output in the correct place" do assert_equal true, File.file?(@dest_file) end - end - end From c00c761e1d277139ce4a493cfebb39c8e2fbb042 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Wed, 25 May 2016 21:59:43 -0500 Subject: [PATCH 0901/4996] Rubocop: test/test_entry_filter.rb --- test/test_entry_filter.rb | 60 +++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb index d9e38300bca..0b1d7134a4d 100644 --- a/test/test_entry_filter.rb +++ b/test/test_entry_filter.rb @@ -1,4 +1,4 @@ -require 'helper' +require "helper" class TestEntryFilter < JekyllUnitTest context "Filtering entries" do @@ -7,16 +7,16 @@ class TestEntryFilter < JekyllUnitTest end should "filter entries" do - ent1 = %w[foo.markdown bar.markdown baz.markdown #baz.markdown# - .baz.markdow foo.markdown~ .htaccess _posts _pages ~$benbalter.docx] + ent1 = %w(foo.markdown bar.markdown baz.markdown #baz.markdown# + .baz.markdow foo.markdown~ .htaccess _posts _pages ~$benbalter.docx) entries = EntryFilter.new(@site).filter(ent1) - assert_equal %w[foo.markdown bar.markdown baz.markdown .htaccess], entries + assert_equal %w(foo.markdown bar.markdown baz.markdown .htaccess), entries end should "allow regexp filtering" do files = %w(README.md) - @site.exclude = excludes = [ + @site.exclude = [ /README/ ] @@ -26,63 +26,69 @@ class TestEntryFilter < JekyllUnitTest end should "filter entries with exclude" do - excludes = %w[README TODO vendor/bundle] - files = %w[index.html site.css .htaccess vendor] + excludes = %w(README TODO vendor/bundle) + files = %w(index.html site.css .htaccess vendor) @site.exclude = excludes + ["exclude*"] assert_equal files, @site.reader.filter_entries(excludes + files + ["excludeA"]) end should "filter entries with exclude relative to site source" do - excludes = %w[README TODO css] - files = %w[index.html vendor/css .htaccess] + excludes = %w(README TODO css) + files = %w(index.html vendor/css .htaccess) @site.exclude = excludes assert_equal files, @site.reader.filter_entries(excludes + files + ["css"]) end should "filter excluded directory and contained files" do - excludes = %w[README TODO css] - files = %w[index.html .htaccess] + excludes = %w(README TODO css) + files = %w(index.html .htaccess) @site.exclude = excludes - assert_equal files, @site.reader.filter_entries(excludes + files + ["css", "css/main.css", "css/vendor.css"]) + assert_equal( + files, + @site.reader.filter_entries( + excludes + files + ["css", "css/main.css", "css/vendor.css"] + ) + ) end should "not filter entries within include" do - includes = %w[_index.html .htaccess include*] - files = %w[index.html _index.html .htaccess includeA] + includes = %w(_index.html .htaccess include*) + files = %w(index.html _index.html .htaccess includeA) @site.include = includes assert_equal files, @site.reader.filter_entries(files) end should "keep safe symlink entries when safe mode enabled" do - site = Site.new(site_configuration('safe' => true)) - allow(File).to receive(:symlink?).with('symlink.js').and_return(true) - files = %w[symlink.js] + allow(File).to receive(:symlink?).with("symlink.js").and_return(true) + files = %w(symlink.js) assert_equal files, @site.reader.filter_entries(files) end should "not filter symlink entries when safe mode disabled" do - allow(File).to receive(:symlink?).with('symlink.js').and_return(true) - files = %w[symlink.js] + allow(File).to receive(:symlink?).with("symlink.js").and_return(true) + files = %w(symlink.js) assert_equal files, @site.reader.filter_entries(files) end should "filter symlink pointing outside site source" do - ent1 = %w[_includes/tmp] + ent1 = %w(_includes/tmp) entries = EntryFilter.new(@site).filter(ent1) - assert_equal %w[], entries + assert_equal %w(), entries end + # rubocop:disable Performance/FixedSize should "include only safe symlinks in safe mode" do - site = Site.new(site_configuration('safe' => true)) - + site = Site.new(site_configuration("safe" => true)) site.reader.read_directories("symlink-test") - assert_equal %w[main.scss symlinked-file].length, site.pages.length + + assert_equal %w(main.scss symlinked-file).length, site.pages.length refute_equal [], site.static_files end + # rubocop:enable Performance/FixedSize should "include symlinks in unsafe mode" do site = Site.new(site_configuration) @@ -118,9 +124,9 @@ class TestEntryFilter < JekyllUnitTest end should "match even if there is no leading slash" do - data = ['vendor/bundle'] - assert @filter.glob_include?(data, '/vendor/bundle') - assert @filter.glob_include?(data, 'vendor/bundle') + data = ["vendor/bundle"] + assert @filter.glob_include?(data, "/vendor/bundle") + assert @filter.glob_include?(data, "vendor/bundle") end end end From 23646549c44f80e3549b44b52fb512b1c0f01d78 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Wed, 25 May 2016 21:59:54 -0500 Subject: [PATCH 0902/4996] Rubocop: test/test_kramdown.rb --- test/test_kramdown.rb | 53 +++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb index c9316936b13..e8d494ae217 100644 --- a/test/test_kramdown.rb +++ b/test/test_kramdown.rb @@ -1,22 +1,22 @@ # encoding: UTF-8 -require 'helper' +require "helper" class TestKramdown < JekyllUnitTest context "kramdown" do setup do @config = { - 'markdown' => 'kramdown', - 'kramdown' => { - 'smart_quotes' => 'lsquo,rsquo,ldquo,rdquo', - 'entity_output' => 'as_char', - 'toc_levels' => '1..6', - 'auto_ids' => false, - 'footnote_nr' => 1, - - 'syntax_highlighter' => 'rouge', - 'syntax_highlighter_opts' => { - 'bold_every' => 8, 'css' => :class + "markdown" => "kramdown", + "kramdown" => { + "smart_quotes" => "lsquo,rsquo,ldquo,rdquo", + "entity_output" => "as_char", + "toc_levels" => "1..6", + "auto_ids" => false, + "footnote_nr" => 1, + + "syntax_highlighter" => "rouge", + "syntax_highlighter_opts" => { + "bold_every" => 8, "css" => :class } } } @@ -33,25 +33,28 @@ class TestKramdown < JekyllUnitTest context "when asked to convert smart quotes" do should "convert" do - assert_match %r!

    (“|“)Pit(’|’)hy(”|”)<\/p>!, @markdown.convert(%{"Pit'hy"}).strip + assert_match( + %r!

    (“|“)Pit(’|’)hy(”|”)<\/p>!, + @markdown.convert(%("Pit'hy")).strip + ) end should "support custom types" do override = { "highlighter" => nil, - 'kramdown' => { - 'smart_quotes' => 'lsaquo,rsaquo,laquo,raquo' + "kramdown" => { + "smart_quotes" => "lsaquo,rsaquo,laquo,raquo" } } markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, override)) assert_match %r!

    («|«)Pit(›|›)hy(»|»)<\/p>!, \ - markdown.convert(%{"Pit'hy"}).strip + markdown.convert(%("Pit'hy")).strip end end should "render fenced code blocks with syntax highlighting" do - result = nokogiri_fragment(@markdown.convert(Utils.strip_heredoc <<-MARKDOWN)) + result = nokogiri_fragment(@markdown.convert(Utils.strip_heredoc(<<-MARKDOWN))) ~~~ruby puts "Hello World" ~~~ @@ -65,14 +68,14 @@ class TestKramdown < JekyllUnitTest should "use the chosen highlighter if it's available" do override = { "highlighter" => nil, - "markdown" => "kramdown", - "kramdown" => { + "markdown" => "kramdown", + "kramdown" => { "syntax_highlighter" => :coderay } } markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, override)) - result = nokogiri_fragment(markdown.convert(Utils.strip_heredoc <<-MARKDOWN)) + result = nokogiri_fragment(markdown.convert(Utils.strip_heredoc(<<-MARKDOWN))) ~~~ruby puts "Hello World" ~~~ @@ -86,14 +89,14 @@ class TestKramdown < JekyllUnitTest override = { "markdown" => "kramdown", "kramdown" => { - "enable_coderay" => true, + "enable_coderay" => true } } @config.delete("highlighter") @config["kramdown"].delete("syntax_highlighter") markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, override)) - result = nokogiri_fragment(markdown.convert(Utils.strip_heredoc <<-MARKDOWN)) + result = nokogiri_fragment(markdown.convert(Utils.strip_heredoc(<<-MARKDOWN))) ~~~ruby puts "Hello World" ~~~ @@ -108,10 +111,10 @@ class TestKramdown < JekyllUnitTest original = Kramdown::Document.method(:new) markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, { "higlighter" => nil, - "markdown" => "kramdown", - "kramdown" => { + "markdown" => "kramdown", + "kramdown" => { "syntax_highlighter" => "coderay", - "coderay" => { + "coderay" => { "hello" => "world" } } From 7537b01e746170cae91ca416d12cf4691ff6c9fd Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Wed, 25 May 2016 22:00:05 -0500 Subject: [PATCH 0903/4996] Rubocop: test/test_liquid_renderer.rb --- test/test_liquid_renderer.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/test_liquid_renderer.rb b/test/test_liquid_renderer.rb index d727fac03cf..f6ab34d2cac 100644 --- a/test/test_liquid_renderer.rb +++ b/test/test_liquid_renderer.rb @@ -1,4 +1,4 @@ -require 'helper' +require "helper" class TestLiquidRenderer < JekyllUnitTest context "profiler" do @@ -12,11 +12,13 @@ class TestLiquidRenderer < JekyllUnitTest output = @renderer.stats_table + # rubocop:disable Metrics/LineLength expected = [ /^Filename\s+|\s+Count\s+|\s+Bytes\s+|\s+Time$/, /^-+\++-+\++-+\++-+$/, - /^_posts\/2010-01-09-date-override\.markdown\s+|\s+\d+\s+|\s+\d+\.\d{2}K\s+|\s+\d+\.\d{3}$/, + %r!^_posts/2010-01-09-date-override\.markdown\s+|\s+\d+\s+|\s+\d+\.\d{2}K\s+|\s+\d+\.\d{3}$! ] + # rubocop:enable Metrics/LineLength expected.each do |regexp| assert_match regexp, output From 474fc0a9a8a3ed90d8e7b51c3f10161d1bf2a2e5 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Wed, 25 May 2016 22:00:15 -0500 Subject: [PATCH 0904/4996] Rubocop: test/test_page.rb --- test/test_page.rb | 148 +++++++++++++++++++++++----------------------- 1 file changed, 75 insertions(+), 73 deletions(-) diff --git a/test/test_page.rb b/test/test_page.rb index 8930095db87..5b4aabebe30 100644 --- a/test/test_page.rb +++ b/test/test_page.rb @@ -1,15 +1,18 @@ -require 'helper' +require "helper" class TestPage < JekyllUnitTest def setup_page(*args) dir, file = args - dir, file = ['', dir] if file.nil? + if file.nil? + file = dir + dir = "" + end @page = Page.new(@site, source_dir, dir, file) end def do_render(page) layouts = { - "default" => Layout.new(@site, source_dir('_layouts'), "simple.html") + "default" => Layout.new(@site, source_dir("_layouts"), "simple.html") } page.render(layouts, @site.site_payload) end @@ -18,15 +21,15 @@ def do_render(page) setup do clear_dest @site = Site.new(Jekyll.configuration({ - "source" => source_dir, - "destination" => dest_dir, + "source" => source_dir, + "destination" => dest_dir, "skip_config_files" => true })) end context "processing pages" do should "create url based on filename" do - @page = setup_page('contacts.html') + @page = setup_page("contacts.html") assert_equal "/contacts.html", @page.url end @@ -36,29 +39,29 @@ def do_render(page) end should "create url with non-alphabetic characters" do - @page = setup_page('+', '%# +.md') + @page = setup_page("+", '%# +.md') assert_equal "/+/%25%23%20+.html", @page.url end context "in a directory hierarchy" do should "create url based on filename" do - @page = setup_page('/contacts', 'bar.html') + @page = setup_page("/contacts", "bar.html") assert_equal "/contacts/bar.html", @page.url end should "create index url based on filename" do - @page = setup_page('/contacts', 'index.html') + @page = setup_page("/contacts", "index.html") assert_equal "/contacts/", @page.url end end should "deal properly with extensions" do - @page = setup_page('deal.with.dots.html') + @page = setup_page("deal.with.dots.html") assert_equal ".html", @page.ext end should "deal properly with non-html extensions" do - @page = setup_page('dynamic_page.php') + @page = setup_page("dynamic_page.php") @dest_file = dest_dir("dynamic_page.php") assert_equal ".php", @page.ext assert_equal "dynamic_page", @page.basename @@ -67,7 +70,7 @@ def do_render(page) end should "deal properly with dots" do - @page = setup_page('deal.with.dots.html') + @page = setup_page("deal.with.dots.html") @dest_file = dest_dir("deal.with.dots.html") assert_equal "deal.with.dots", @page.basename @@ -75,19 +78,19 @@ def do_render(page) end should "make properties accessible through #[]" do - page = setup_page('properties.html') + page = setup_page("properties.html") attrs = { - content: "All the properties.\n", - dir: "/properties/", - excerpt: nil, - foo: 'bar', - layout: 'default', - name: "properties.html", - path: "properties.html", - permalink: '/properties/', - published: nil, - title: 'Properties Page', - url: "/properties/" + :content => "All the properties.\n", + :dir => "/properties/", + :excerpt => nil, + :foo => "bar", + :layout => "default", + :name => "properties.html", + :path => "properties.html", + :permalink => "/properties/", + :published => nil, + :title => "Properties Page", + :url => "/properties/" } attrs.each do |attr, val| @@ -103,38 +106,38 @@ def do_render(page) end should "return dir, url, and destination correctly" do - @page = setup_page('contacts.html') + @page = setup_page("contacts.html") @dest_file = dest_dir("contacts/index.html") - assert_equal '/contacts/', @page.dir - assert_equal '/contacts/', @page.url + assert_equal "/contacts/", @page.dir + assert_equal "/contacts/", @page.url assert_equal @dest_file, @page.destination(dest_dir) end should "return dir correctly for index page" do - @page = setup_page('index.html') - assert_equal '/', @page.dir + @page = setup_page("index.html") + assert_equal "/", @page.dir end context "in a directory hierarchy" do should "create url based on filename" do - @page = setup_page('/contacts', 'bar.html') + @page = setup_page("/contacts", "bar.html") assert_equal "/contacts/bar/", @page.url end should "create index url based on filename" do - @page = setup_page('/contacts', 'index.html') + @page = setup_page("/contacts", "index.html") assert_equal "/contacts/", @page.url end should "return dir correctly" do - @page = setup_page('/contacts', 'bar.html') - assert_equal '/contacts/bar/', @page.dir + @page = setup_page("/contacts", "bar.html") + assert_equal "/contacts/bar/", @page.dir end should "return dir correctly for index page" do - @page = setup_page('/contacts', 'index.html') - assert_equal '/contacts/', @page.dir + @page = setup_page("/contacts", "index.html") + assert_equal "/contacts/", @page.dir end end end @@ -145,16 +148,16 @@ def do_render(page) end should "return url and destination correctly" do - @page = setup_page('contacts.html') + @page = setup_page("contacts.html") @dest_file = dest_dir("contacts.html") - assert_equal '/contacts.html', @page.url + assert_equal "/contacts.html", @page.url assert_equal @dest_file, @page.destination(dest_dir) end should "return dir correctly" do - assert_equal '/', setup_page('contacts.html').dir - assert_equal '/contacts/', setup_page('contacts/bar.html').dir - assert_equal '/contacts/', setup_page('contacts/index.html').dir + assert_equal "/", setup_page("contacts.html").dir + assert_equal "/contacts/", setup_page("contacts/bar.html").dir + assert_equal "/contacts/", setup_page("contacts/index.html").dir end end @@ -164,9 +167,9 @@ def do_render(page) end should "return url and destination correctly" do - @page = setup_page('contacts.html') + @page = setup_page("contacts.html") @dest_file = dest_dir("contacts/index.html") - assert_equal '/contacts/', @page.url + assert_equal "/contacts/", @page.url assert_equal @dest_file, @page.destination(dest_dir) end end @@ -177,9 +180,9 @@ def do_render(page) end should "return url and destination correctly" do - @page = setup_page('contacts.html') + @page = setup_page("contacts.html") @dest_file = dest_dir("contacts.html") - assert_equal '/contacts.html', @page.url + assert_equal "/contacts.html", @page.url assert_equal @dest_file, @page.destination(dest_dir) end end @@ -190,9 +193,9 @@ def do_render(page) end should "return url and destination correctly" do - @page = setup_page('contacts.html') + @page = setup_page("contacts.html") @dest_file = dest_dir("contacts.html") - assert_equal '/contacts', @page.url + assert_equal "/contacts", @page.url assert_equal @dest_file, @page.destination(dest_dir) end end @@ -200,9 +203,9 @@ def do_render(page) context "with any other permalink style" do should "return dir correctly" do @site.permalink_style = nil - assert_equal '/', setup_page('contacts.html').dir - assert_equal '/contacts/', setup_page('contacts/index.html').dir - assert_equal '/contacts/', setup_page('contacts/bar.html').dir + assert_equal "/", setup_page("contacts.html").dir + assert_equal "/contacts/", setup_page("contacts/index.html").dir + assert_equal "/contacts/", setup_page("contacts/bar.html").dir end end @@ -216,7 +219,7 @@ def do_render(page) end should "return nil permalink if no permalink exists" do - @page = setup_page('') + @page = setup_page("") assert_equal nil, @page.permalink end @@ -233,7 +236,7 @@ def do_render(page) context "with specified layout of nil" do setup do - @page = setup_page('sitemap.xml') + @page = setup_page("sitemap.xml") end should "layout of nil is respected" do @@ -247,60 +250,60 @@ def do_render(page) end should "write properly" do - page = setup_page('contacts.html') + page = setup_page("contacts.html") do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert_exist dest_dir('contacts.html') + assert_exist dest_dir("contacts.html") end should "write even when the folder name is plus and permalink has +" do - page = setup_page('+', 'foo.md') + page = setup_page("+", "foo.md") do_render(page) page.write(dest_dir) assert File.directory?(dest_dir), "#{dest_dir} should be a directory" - assert_exist dest_dir('+', 'plus+in+url.html') + assert_exist dest_dir("+", "plus+in+url.html") end should "write even when permalink has '%# +'" do - page = setup_page('+', '%# +.md') + page = setup_page("+", '%# +.md') do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert_exist dest_dir('+', '%# +.html') + assert_exist dest_dir("+", '%# +.html') end should "write properly without html extension" do - page = setup_page('contacts.html') + page = setup_page("contacts.html") page.site.permalink_style = :pretty do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert_exist dest_dir('contacts', 'index.html') + assert_exist dest_dir("contacts", "index.html") end should "support .htm extension and respects that" do - page = setup_page('contacts.htm') + page = setup_page("contacts.htm") page.site.permalink_style = :pretty do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert_exist dest_dir('contacts', 'index.htm') + assert_exist dest_dir("contacts", "index.htm") end should "support .xhtml extension and respects that" do - page = setup_page('contacts.xhtml') + page = setup_page("contacts.xhtml") page.site.permalink_style = :pretty do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert_exist dest_dir('contacts', 'index.xhtml') + assert_exist dest_dir("contacts", "index.xhtml") end should "write properly with extension different from html" do @@ -312,48 +315,47 @@ def do_render(page) assert_equal "/sitemap.xml", page.url assert_nil page.url[/\.html$/] assert File.directory?(dest_dir) - assert_exist dest_dir('sitemap.xml') + assert_exist dest_dir("sitemap.xml") end should "write dotfiles properly" do - page = setup_page('.htaccess') + page = setup_page(".htaccess") do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert_exist dest_dir('.htaccess') + assert_exist dest_dir(".htaccess") end context "in a directory hierarchy" do should "write properly the index" do - page = setup_page('/contacts', 'index.html') + page = setup_page("/contacts", "index.html") do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert_exist dest_dir('contacts', 'index.html') + assert_exist dest_dir("contacts", "index.html") end should "write properly" do - page = setup_page('/contacts', 'bar.html') + page = setup_page("/contacts", "bar.html") do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert_exist dest_dir('contacts', 'bar.html') + assert_exist dest_dir("contacts", "bar.html") end should "write properly without html extension" do - page = setup_page('/contacts', 'bar.html') + page = setup_page("/contacts", "bar.html") page.site.permalink_style = :pretty do_render(page) page.write(dest_dir) assert File.directory?(dest_dir) - assert_exist dest_dir('contacts', 'bar', 'index.html') + assert_exist dest_dir("contacts", "bar", "index.html") end end end - end end From 98262b73d5609fbdcdb66db6055e3097d19ed47b Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Wed, 25 May 2016 22:00:29 -0500 Subject: [PATCH 0905/4996] Rubocop: test/test_regenerator.rb --- test/test_regenerator.rb | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb index 1ed212110d5..36b15949591 100644 --- a/test/test_regenerator.rb +++ b/test/test_regenerator.rb @@ -1,4 +1,4 @@ -require 'helper' +require "helper" class TestRegenerator < JekyllUnitTest context "The site regenerator" do @@ -39,11 +39,10 @@ class TestRegenerator < JekyllUnitTest # we need to create the destinations for these files, # because regenerate? checks if the destination exists [@page, @post, @document, @asset_file].each do |item| - if item.respond_to?(:destination) - dest = item.destination(@site.dest) - FileUtils.mkdir_p(File.dirname(dest)) - FileUtils.touch(dest) - end + next unless item.respond_to?(:destination) + dest = item.destination(@site.dest) + FileUtils.mkdir_p(File.dirname(dest)) + FileUtils.touch(dest) end @regenerator.write_metadata @regenerator = Regenerator.new(@site) @@ -69,7 +68,7 @@ class TestRegenerator < JekyllUnitTest [@page, @post, @document, @asset_file].each do |item| if item.respond_to?(:destination) dest = item.destination(@site.dest) - File.unlink(dest) unless !File.exist?(dest) + File.unlink(dest) if File.exist?(dest) end end @@ -128,7 +127,7 @@ class TestRegenerator < JekyllUnitTest FileUtils.rm_rf(source_dir(".jekyll-metadata")) @site = Site.new(Jekyll.configuration({ - "source" => source_dir, + "source" => source_dir, "destination" => dest_dir, "incremental" => true })) @@ -152,7 +151,7 @@ class TestRegenerator < JekyllUnitTest assert @regenerator.cache[@path] @regenerator.clear_cache - assert_equal @regenerator.cache, {} + assert_equal @regenerator.cache, {} end should "write to the metadata file" do @@ -171,7 +170,7 @@ class TestRegenerator < JekyllUnitTest metadata_file = source_dir(".jekyll-metadata") @regenerator = Regenerator.new(@site) - File.open(metadata_file, 'w') do |f| + File.open(metadata_file, "w") do |f| f.write(@regenerator.metadata.to_yaml) end @@ -182,7 +181,7 @@ class TestRegenerator < JekyllUnitTest should "not crash when reading corrupted marshal file" do metadata_file = source_dir(".jekyll-metadata") File.open(metadata_file, "w") do |file| - file.puts Marshal.dump({ foo: 'bar' })[0,5] + file.puts Marshal.dump({ :foo => "bar" })[0, 5] end @regenerator = Regenerator.new(@site) @@ -282,7 +281,7 @@ class TestRegenerator < JekyllUnitTest end should "not regenerate again if multiple dependencies" do - multi_deps = @regenerator.metadata.select {|k,v| v['deps'].length > 2} + multi_deps = @regenerator.metadata.select { |_k, v| v["deps"].length > 2 } multi_dep_path = multi_deps.keys.first assert @regenerator.metadata[multi_dep_path]["deps"].length > 2 @@ -310,7 +309,7 @@ class TestRegenerator < JekyllUnitTest setup do FileUtils.rm_rf(source_dir(".jekyll-metadata")) @site = Site.new(Jekyll.configuration({ - "source" => source_dir, + "source" => source_dir, "destination" => dest_dir, "incremental" => false })) From 8fbeb5231478602c6db03f06fb781b8b8db5b7f1 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Wed, 25 May 2016 22:00:58 -0500 Subject: [PATCH 0906/4996] Rubocop: test/test_tags.rb --- test/test_tags.rb | 498 +++++++++++++++++++++++++++++++++------------- 1 file changed, 358 insertions(+), 140 deletions(-) diff --git a/test/test_tags.rb b/test/test_tags.rb index 1dab0feb151..736d60d649e 100644 --- a/test/test_tags.rb +++ b/test/test_tags.rb @@ -1,18 +1,17 @@ # coding: utf-8 - -require 'helper' +require "helper" class TestTags < JekyllUnitTest - def setup FileUtils.mkdir_p("tmp") end + # rubocop:disable Metrics/AbcSize def create_post(content, override = {}, converter_class = Jekyll::Converters::Markdown) - site = fixture_site({"highlighter" => "rouge"}.merge(override)) + site = fixture_site({ "highlighter" => "rouge" }.merge(override)) - site.posts.docs.concat(PostReader.new(site).read_posts('')) if override['read_posts'] - CollectionReader.new(site).read if override['read_collections'] + site.posts.docs.concat(PostReader.new(site).read_posts("")) if override["read_posts"] + CollectionReader.new(site).read if override["read_collections"] info = { :filters => [Jekyll::Filters], :registers => { :site => site } } @converter = site.converters.find { |c| c.class == converter_class } @@ -22,6 +21,7 @@ def create_post(content, override = {}, converter_class = Jekyll::Converters::Ma @result = Liquid::Template.parse(content).render!(payload, info) @result = @converter.convert(@result) end + # rubocop:enable Metrics/AbcSize def fill_post(code, override = {}) content = < 'inline' }, tag.instance_variable_get(:@highlight_options)) + tag = highlight_block_with_opts("ruby linenos ") + assert_equal( + { :linenos => "inline" }, + tag.instance_variable_get(:@highlight_options) + ) end - should "set the linenos option to 'table' if the linenos key is given the table value" do - tag = highlight_block_with_opts('ruby linenos=table ') - assert_equal({ :linenos => 'table' }, tag.instance_variable_get(:@highlight_options)) + should "set the linenos option to 'table' " \ + "if the linenos key is given the table value" do + tag = highlight_block_with_opts("ruby linenos=table ") + assert_equal( + { :linenos => "table" }, + tag.instance_variable_get(:@highlight_options) + ) end should "recognize nowrap option with linenos set" do - tag = highlight_block_with_opts('ruby linenos=table nowrap ') - assert_equal({ :linenos => 'table', :nowrap => true }, tag.instance_variable_get(:@highlight_options)) + tag = highlight_block_with_opts("ruby linenos=table nowrap ") + assert_equal( + { :linenos => "table", :nowrap => true }, + tag.instance_variable_get(:@highlight_options) + ) end should "recognize the cssclass option" do - tag = highlight_block_with_opts('ruby linenos=table cssclass=hl ') - assert_equal({ :cssclass => 'hl', :linenos => 'table' }, tag.instance_variable_get(:@highlight_options)) + tag = highlight_block_with_opts("ruby linenos=table cssclass=hl ") + assert_equal( + { :cssclass => "hl", :linenos => "table" }, + tag.instance_variable_get(:@highlight_options) + ) end should "recognize the hl_linenos option and its value" do - tag = highlight_block_with_opts('ruby linenos=table cssclass=hl hl_linenos=3 ') - assert_equal({ :cssclass => 'hl', :linenos => 'table', :hl_linenos => '3' }, tag.instance_variable_get(:@highlight_options)) + tag = highlight_block_with_opts("ruby linenos=table cssclass=hl hl_linenos=3 ") + assert_equal( + { :cssclass => "hl", :linenos => "table", :hl_linenos => "3" }, + tag.instance_variable_get(:@highlight_options) + ) end should "recognize multiple values of hl_linenos" do - tag = highlight_block_with_opts('ruby linenos=table cssclass=hl hl_linenos="3 5 6" ') - assert_equal({ :cssclass => 'hl', :linenos => 'table', :hl_linenos => ['3', '5', '6'] }, tag.instance_variable_get(:@highlight_options)) + tag = highlight_block_with_opts 'ruby linenos=table cssclass=hl hl_linenos="3 5 6" ' + assert_equal( + { :cssclass => "hl", :linenos => "table", :hl_linenos => %w(3 5 6) }, + tag.instance_variable_get(:@highlight_options) + ) end should "treat language name as case insensitive" do - tag = highlight_block_with_opts('Ruby ') - assert_equal "ruby", tag.instance_variable_get(:@lang), "lexers should be case insensitive" + tag = highlight_block_with_opts("Ruby ") + assert_equal( + "ruby", + tag.instance_variable_get(:@lang), + "lexers should be case insensitive" + ) end end context "in safe mode" do setup do - @tag = highlight_block_with_opts('text ') + @tag = highlight_block_with_opts("text ") end should "allow linenos" do - sanitized = @tag.sanitized_opts({:linenos => true}, true) + sanitized = @tag.sanitized_opts({ :linenos => true }, true) assert_equal true, sanitized[:linenos] end should "allow hl_lines" do - sanitized = @tag.sanitized_opts({:hl_lines => %w[1 2 3 4]}, true) - assert_equal %w[1 2 3 4], sanitized[:hl_lines] + sanitized = @tag.sanitized_opts({ :hl_lines => %w(1 2 3 4) }, true) + assert_equal %w(1 2 3 4), sanitized[:hl_lines] end should "allow cssclass" do - sanitized = @tag.sanitized_opts({:cssclass => "ahoy"}, true) + sanitized = @tag.sanitized_opts({ :cssclass => "ahoy" }, true) assert_equal "ahoy", sanitized[:cssclass] end should "allow startinline" do - sanitized = @tag.sanitized_opts({:startinline => true}, true) + sanitized = @tag.sanitized_opts({ :startinline => true }, true) assert_equal true, sanitized[:startinline] end should "strip unknown options" do - sanitized = @tag.sanitized_opts({:light => true}, true) + sanitized = @tag.sanitized_opts({ :light => true }, true) assert_nil sanitized[:light] end end @@ -145,7 +173,7 @@ def highlight_block_with_opts(options_string) context "post content has highlight tag" do setup do - fill_post("test", {'highlighter' => 'pygments'}) + fill_post("test", { "highlighter" => "pygments" }) end should "not cause a markdown error" do @@ -153,31 +181,45 @@ def highlight_block_with_opts(options_string) end should "render markdown with pygments" do - assert_match %{

    test
    }, @result + assert_match( + %(
    test
    ), + @result + ) end should "render markdown with pygments with line numbers" do - assert_match %{
    1 test
    }, @result + assert_match( + %(
    ) +
+          %(1 test
    ), + @result + ) end end context "post content has highlight with file reference" do setup do - fill_post("./jekyll.gemspec", {'highlighter' => 'pygments'}) + fill_post("./jekyll.gemspec", { "highlighter" => "pygments" }) end should "not embed the file" do - assert_match %{
    ./jekyll.gemspec
    }, @result + assert_match( + %(
    ) +
+          %(./jekyll.gemspec
    ), + @result + ) end end context "post content has highlight tag with UTF character" do setup do - fill_post("Æ", {'highlighter' => 'pygments'}) + fill_post("Æ", { "highlighter" => "pygments" }) end should "render markdown with pygments line handling" do - assert_match %{
    Æ
    }, @result + assert_match( + %(
    Æ
    ), + @result + ) end end @@ -190,15 +232,19 @@ def highlight_block_with_opts(options_string) [1,] FALSE TRUE [2,] FALSE TRUE EOS - fill_post(code, {'highlighter' => 'pygments'}) + fill_post(code, { "highlighter" => "pygments" }) end should "only strip the preceding newlines" do - assert_match %{
         [,1] [,2]}, @result
+        assert_match(
+          %(
         [,1] [,2]),
+          @result
+        )
       end
     end
 
-    context "post content has highlight tag with preceding spaces & lines in several places" do
+    context "post content has highlight tag " \
+            "with preceding spaces & lines in several places" do
       setup do
         code = <<-EOS
 
@@ -211,21 +257,29 @@ def highlight_block_with_opts(options_string)
 
 
 EOS
-        fill_post(code, {'highlighter' => 'pygments'})
+        fill_post(code, { "highlighter" => "pygments" })
       end
 
       should "only strip the newlines which precede and succeed the entire block" do
-        assert_match "
         [,1] [,2]\n\n\n[1,] FALSE TRUE\n[2,] FALSE TRUE
    ", @result
+        assert_match(
+          "
    " \
+          "     [,1] [,2]\n\n\n[1,] FALSE TRUE\n[2,] FALSE TRUE
    ",
+          @result
+        )
       end
     end
 
-    context "post content has highlight tag with preceding spaces & Windows-style newlines" do
+    context "post content has highlight tag with " \
+            "preceding spaces & Windows-style newlines" do
       setup do
-        fill_post "\r\n\r\n\r\n     [,1] [,2]", {'highlighter' => 'pygments'}
+        fill_post "\r\n\r\n\r\n     [,1] [,2]", { "highlighter" => "pygments" }
       end
 
       should "only strip the preceding newlines" do
-        assert_match %{
         [,1] [,2]}, @result
+        assert_match(
+          %(
         [,1] [,2]),
+          @result
+        )
       end
     end
 
@@ -236,11 +290,14 @@ def highlight_block_with_opts(options_string)
 [1,] FALSE TRUE
 [2,] FALSE TRUE
 EOS
-        fill_post(code, {'highlighter' => 'pygments'})
+        fill_post(code, { "highlighter" => "pygments" })
       end
 
       should "only strip the preceding newlines" do
-        assert_match %{
         [,1] [,2]}, @result
+        assert_match(
+          %(
         [,1] [,2]),
+          @result
+        )
       end
     end
   end
@@ -252,11 +309,21 @@ def highlight_block_with_opts(options_string)
       end
 
       should "render markdown with rouge" do
-        assert_match %{
    test
    }, @result
+        assert_match(
+          %(
    test
    ),
+          @result
+        )
       end
 
       should "render markdown with rouge with line numbers" do
-        assert_match %{
    1
    test\n
    }, @result
+        assert_match(
+          %() +
+            %() +
+            %() +
+            %(
    ) +
+            %(
    1
    test\n
    ),
+          @result
+        )
       end
     end
 
@@ -266,7 +333,11 @@ def highlight_block_with_opts(options_string)
       end
 
       should "not embed the file" do
-        assert_match %{
    ./jekyll.gemspec
    }, @result
+        assert_match(
+          '
    ' \
+          "./jekyll.gemspec
    ",
+          @result
+        )
       end
     end
 
@@ -276,7 +347,10 @@ def highlight_block_with_opts(options_string)
       end
 
       should "render markdown with pygments line handling" do
-        assert_match %{
    Æ
    }, @result
+        assert_match(
+          '
    Æ
    ',
+          @result
+        )
       end
     end
 
@@ -292,11 +366,15 @@ def highlight_block_with_opts(options_string)
       end
 
       should "only strip the preceding newlines" do
-        assert_match %{
         [,1] [,2]}, @result
+        assert_match(
+          '
         [,1] [,2]',
+          @result
+        )
       end
     end
 
-    context "post content has highlight tag with preceding spaces & lines in several places" do
+    context "post content has highlight tag with " \
+            "preceding spaces & lines in several places" do
       setup do
         fill_post <<-EOS
 
@@ -312,7 +390,11 @@ def highlight_block_with_opts(options_string)
       end
 
       should "only strip the newlines which precede and succeed the entire block" do
-        assert_match "
         [,1] [,2]\n\n\n[1,] FALSE TRUE\n[2,] FALSE TRUE
    ", @result
+        assert_match(
+          "
         [,1] [,2]\n\n\n" \
+          "[1,] FALSE TRUE\n[2,] FALSE TRUE
    ",
+          @result
+        )
       end
     end
 
@@ -333,17 +415,29 @@ def highlight_block_with_opts(options_string)
       end
 
       should "should stop highlighting at boundary" do
-        assert_match "
    This is not yet highlighted
    \n\n
    1
    test\n
    \n\n
    This should not be highlighted, right?
    ", @result
+        expected = <<-EOS
+
    This is not yet highlighted
    
+
+
    1
    test
+
    
+
+
    This should not be highlighted, right?
    
+EOS
+        assert_match(expected, @result)
       end
     end
 
-    context "post content has highlight tag with preceding spaces & Windows-style newlines" do
+    context "post content has highlight tag with " \
+            "preceding spaces & Windows-style newlines" do
       setup do
         fill_post "\r\n\r\n\r\n     [,1] [,2]"
       end
 
       should "only strip the preceding newlines" do
-        assert_match %{
         [,1] [,2]}, @result
+        assert_match(
+          '
         [,1] [,2]',
+          @result
+        )
       end
     end
 
@@ -357,7 +451,10 @@ def highlight_block_with_opts(options_string)
       end
 
       should "only strip the preceding newlines" do
-        assert_match %{
         [,1] [,2]}, @result
+        assert_match(
+          '
         [,1] [,2]',
+          @result
+        )
       end
     end
   end
@@ -388,24 +485,24 @@ def highlight_block_with_opts(options_string)
         end
 
         create_post(@content, {
-          'markdown' => 'rdiscount'
+          "markdown" => "rdiscount"
         })
       end
 
       should "parse correctly" do
         assert_match %r{FIGHT!}, @result
-        assert_match %r{FINISH HIM}, @result
+        assert_match %r!FINISH HIM!, @result
       end
     end
 
     context "using Kramdown" do
       setup do
-        create_post(@content, 'markdown' => 'kramdown')
+        create_post(@content, "markdown" => "kramdown")
       end
 
       should "parse correctly" do
         assert_match %r{FIGHT!}, @result
-        assert_match %r{FINISH HIM}, @result
+        assert_match %r!FINISH HIM!, @result
       end
     end
 
@@ -418,13 +515,13 @@ def highlight_block_with_opts(options_string)
         end
 
         create_post(@content, {
-          'markdown' => 'redcarpet'
+          "markdown" => "redcarpet"
         })
       end
 
       should "parse correctly" do
         assert_match %r{FIGHT!}, @result
-        assert_match %r{FINISH HIM}, @result
+        assert_match %r!FINISH HIM!, @result
       end
     end
   end
@@ -438,7 +535,12 @@ def highlight_block_with_opts(options_string)
 
 {% post_url 2008-11-21-complex %}
 CONTENT
-      create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+      create_post(content, {
+        "permalink"   => "pretty",
+        "source"      => source_dir,
+        "destination" => dest_dir,
+        "read_posts"  => true
+      })
     end
 
     should "not cause an error" do
@@ -446,7 +548,7 @@ def highlight_block_with_opts(options_string)
     end
 
     should "have the url to the \"complex\" post from 2008-11-21" do
-      assert_match %r{/2008/11/21/complex/}, @result
+      assert_match %r!/2008/11/21/complex/!, @result
     end
   end
 
@@ -462,7 +564,12 @@ def highlight_block_with_opts(options_string)
 - 3 {% post_url es/2008-11-21-nested %}
 - 4 {% post_url /es/2008-11-21-nested %}
 CONTENT
-      create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+      create_post(content, {
+        "permalink"   => "pretty",
+        "source"      => source_dir,
+        "destination" => dest_dir,
+        "read_posts"  => true
+      })
     end
 
     should "not cause an error" do
@@ -470,13 +577,13 @@ def highlight_block_with_opts(options_string)
     end
 
     should "have the url to the \"complex\" post from 2008-11-21" do
-      assert_match %r{1\s/2008/11/21/complex/}, @result
-      assert_match %r{2\s/2008/11/21/complex/}, @result
+      assert_match %r!1\s/2008/11/21/complex/!, @result
+      assert_match %r!2\s/2008/11/21/complex/!, @result
     end
 
     should "have the url to the \"nested\" post from 2008-11-21" do
-      assert_match %r{3\s/2008/11/21/nested/}, @result
-      assert_match %r{4\s/2008/11/21/nested/}, @result
+      assert_match %r!3\s/2008/11/21/nested/!, @result
+      assert_match %r!4\s/2008/11/21/nested/!, @result
     end
   end
 
@@ -492,10 +599,10 @@ def highlight_block_with_opts(options_string)
 
       assert_raises Jekyll::Errors::PostURLError do
         create_post(content, {
-          'permalink' => 'pretty',
-          'source' => source_dir,
-          'destination' => dest_dir,
-          'read_posts' => true
+          "permalink"   => "pretty",
+          "source"      => source_dir,
+          "destination" => dest_dir,
+          "read_posts"  => true
         })
       end
     end
@@ -511,10 +618,10 @@ def highlight_block_with_opts(options_string)
 
       assert_raises Jekyll::Errors::InvalidDateError do
         create_post(content, {
-          'permalink' => 'pretty',
-          'source' => source_dir,
-          'destination' => dest_dir,
-          'read_posts' => true
+          "permalink"   => "pretty",
+          "source"      => source_dir,
+          "destination" => dest_dir,
+          "read_posts"  => true
         })
       end
     end
@@ -529,15 +636,20 @@ def highlight_block_with_opts(options_string)
 
 {% link _methods/yaml_with_dots.md %}
 CONTENT
-      create_post(content, {'source' => source_dir, 'destination' => dest_dir, 'collections' => { 'methods' => { 'output' => true }}, 'read_collections' => true})
+      create_post(content, {
+        "source"           => source_dir,
+        "destination"      => dest_dir,
+        "collections"      => { "methods" => { "output" => true } },
+        "read_collections" => true
+      })
     end
 
     should "not cause an error" do
-      refute_match /markdown\-html\-error/, @result
+      refute_match(/markdown\-html\-error/, @result)
     end
 
     should "have the url to the \"yaml_with_dots\" item" do
-      assert_match %r{/methods/yaml_with_dots\.html}, @result
+      assert_match(%r!/methods/yaml_with_dots\.html!, @result)
     end
   end
 
@@ -551,19 +663,24 @@ def highlight_block_with_opts(options_string)
 - 1 {% link _methods/sanitized_path.md %}
 - 2 {% link _methods/site/generate.md %}
 CONTENT
-      create_post(content, {'source' => source_dir, 'destination' => dest_dir, 'collections' => { 'methods' => { 'output' => true }}, 'read_collections' => true})
+      create_post(content, {
+        "source"           => source_dir,
+        "destination"      => dest_dir,
+        "collections"      => { "methods" => { "output" => true } },
+        "read_collections" => true
+      })
     end
 
     should "not cause an error" do
-      refute_match /markdown\-html\-error/, @result
+      refute_match(/markdown\-html\-error/, @result)
     end
 
     should "have the url to the \"sanitized_path\" item" do
-      assert_match %r{1\s/methods/sanitized_path\.html}, @result
+      assert_match %r!1\s/methods/sanitized_path\.html!, @result
     end
 
     should "have the url to the \"site/generate\" item" do
-      assert_match %r{2\s/methods/site/generate\.html}, @result
+      assert_match %r!2\s/methods/site/generate\.html!, @result
     end
   end
 
@@ -578,17 +695,20 @@ def highlight_block_with_opts(options_string)
 CONTENT
 
       assert_raises ArgumentError do
-        create_post(content, {'source' => source_dir, 'destination' => dest_dir, 'collections' => { 'methods' => { 'output' => true }}, 'read_collections' => true})
+        create_post(content, {
+          "source"           => source_dir,
+          "destination"      => dest_dir,
+          "collections"      => { "methods" => { "output" => true } },
+          "read_collections" => true
+        })
       end
     end
   end
 
   context "include tag with parameters" do
-
     context "with symlink'd include" do
-
       should "not allow symlink includes" do
-        File.open("tmp/pages-test", 'w') { |file| file.write("SYMLINK TEST") }
+        File.open("tmp/pages-test", "w") { |file| file.write("SYMLINK TEST") }
         assert_raises IOError do
           content = < 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true, 'safe' => true })
+          create_post(content, {
+            "permalink"   => "pretty",
+            "source"      => source_dir,
+            "destination" => dest_dir,
+            "read_posts"  => true,
+            "safe"        => true
+          })
         end
-        @result ||= ''
+        @result ||= ""
         refute_match(/SYMLINK TEST/, @result)
       end
 
@@ -614,9 +740,19 @@ def highlight_block_with_opts(options_string)
 {% include tmp/pages-test-does-not-exist %}
 
 CONTENT
-          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true, 'safe' => true })
+          create_post(content, {
+            "permalink"   => "pretty",
+            "source"      => source_dir,
+            "destination" => dest_dir,
+            "read_posts"  => true,
+            "safe"        => true
+          })
         end
-        assert_match "Could not locate the included file 'tmp/pages-test-does-not-exist' in any of [\"#{source_dir}/_includes\"].", ex.message
+        assert_match(
+          "Could not locate the included file 'tmp/pages-test-does-not-exist' " \
+          "in any of [\"#{source_dir}/_includes\"].",
+          ex.message
+        )
       end
     end
 
@@ -631,7 +767,12 @@ def highlight_block_with_opts(options_string)
 
 {% include params.html param="value" %}
 CONTENT
-        create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+        create_post(content, {
+          "permalink"   => "pretty",
+          "source"      => source_dir,
+          "destination" => dest_dir,
+          "read_posts"  => true
+        })
       end
 
       should "correctly output include variable" do
@@ -652,8 +793,14 @@ def highlight_block_with_opts(options_string)
 
 {% include params.html param s="value" %}
 CONTENT
-        assert_raises ArgumentError, 'Did not raise exception on invalid "include" syntax' do
-          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+        assert_raises ArgumentError, "Did not raise exception on invalid " \
+                                     '"include" syntax' do
+          create_post(content, {
+            "permalink"   => "pretty",
+            "source"      => source_dir,
+            "destination" => dest_dir,
+            "read_posts"  => true
+          })
         end
 
         content = < 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+        assert_raises ArgumentError, "Did not raise exception on invalid " \
+                                     '"include" syntax' do
+          create_post(content, {
+            "permalink"   => "pretty",
+            "source"      => source_dir,
+            "destination" => dest_dir,
+            "read_posts"  => true
+          })
         end
       end
     end
@@ -678,12 +831,17 @@ def highlight_block_with_opts(options_string)
 
 {% include params.html param1="new_value" param2="another" %}
 CONTENT
-        create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+        create_post(content, {
+          "permalink"   => "pretty",
+          "source"      => source_dir,
+          "destination" => dest_dir,
+          "read_posts"  => true
+        })
       end
 
       should "list all parameters" do
-        assert_match '
  • param1 = new_value
    • ', @result
-        assert_match '
  • param2 = another
    • ', @result
+        assert_match "
  • param1 = new_value
    • ", @result
+        assert_match "
  • param2 = another
    • ", @result
       end
 
       should "not include previously used parameters" do
@@ -700,7 +858,12 @@ def highlight_block_with_opts(options_string)
 
 {% include params.html %}
 CONTENT
-        create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+        create_post(content, {
+          "permalink"   => "pretty",
+          "source"      => source_dir,
+          "destination" => dest_dir,
+          "read_posts"  => true
+        })
       end
 
       should "include file with empty parameters" do
@@ -717,7 +880,13 @@ def highlight_block_with_opts(options_string)
 
 {% include custom.html %}
 CONTENT
-        create_post(content, {'includes_dir' => '_includes_custom', 'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+        create_post(content, {
+          "includes_dir" => "_includes_custom",
+          "permalink"    => "pretty",
+          "source"       => source_dir,
+          "destination"  => dest_dir,
+          "read_posts"   => true
+        })
       end
 
       should "include file from custom directory" do
@@ -734,7 +903,12 @@ def highlight_block_with_opts(options_string)
 
 {% if true %}{% include params.html %}{% endif %}
 CONTENT
-        create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+        create_post(content, {
+          "permalink"   => "pretty",
+          "source"      => source_dir,
+          "destination" => dest_dir,
+          "read_posts"  => true
+        })
       end
 
       should "include file with empty parameters within if statement" do
@@ -755,72 +929,85 @@ def highlight_block_with_opts(options_string)
 
       should "raise error relative to source directory" do
         exception = assert_raises IOError do
-          create_post(@content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+          create_post(@content, {
+            "permalink"   => "pretty",
+            "source"      => source_dir,
+            "destination" => dest_dir,
+            "read_posts"  => true
+          })
         end
-        assert_match "Could not locate the included file 'missing.html' in any of [\"#{source_dir}/_includes\"].", exception.message
+        assert_match(
+          "Could not locate the included file 'missing.html' in any of " \
+          "[\"#{source_dir}/_includes\"].",
+          exception.message
+        )
       end
     end
 
     context "include tag with variable and liquid filters" do
       setup do
-        site = fixture_site({'pygments' => true}).tap(&:read).tap(&:render)
-        post = site.posts.docs.find {|p| p.basename.eql? "2013-12-17-include-variable-filters.markdown" }
+        site = fixture_site({ "pygments" => true }).tap(&:read).tap(&:render)
+        post = site.posts.docs.find do |p|
+          p.basename.eql? "2013-12-17-include-variable-filters.markdown"
+        end
         @content = post.output
       end
 
       should "include file as variable with liquid filters" do
-        assert_match %r{1 included}, @content
-        assert_match %r{2 included}, @content
-        assert_match %r{3 included}, @content
+        assert_match(/1 included/, @content)
+        assert_match(/2 included/, @content)
+        assert_match(/3 included/, @content)
       end
 
       should "include file as variable and liquid filters with arbitrary whitespace" do
-        assert_match %r{4 included}, @content
-        assert_match %r{5 included}, @content
-        assert_match %r{6 included}, @content
+        assert_match(/4 included/, @content)
+        assert_match(/5 included/, @content)
+        assert_match(/6 included/, @content)
       end
 
       should "include file as variable and filters with additional parameters" do
-        assert_match '
  • var1 = foo
    • ', @content
-        assert_match '
  • var2 = bar
    • ', @content
+        assert_match("
  • var1 = foo
    • ", @content)
+        assert_match("
  • var2 = bar
    • ", @content)
       end
 
       should "include file as partial variable" do
-        assert_match %r{8 included}, @content
+        assert_match(/8 included/, @content)
       end
     end
   end
 
   context "relative include tag with variable and liquid filters" do
     setup do
-      site = fixture_site({'pygments' => true}).tap(&:read).tap(&:render)
-      post = site.posts.docs.find {|p| p.basename.eql? "2014-09-02-relative-includes.markdown" }
+      site = fixture_site({ "pygments" => true }).tap(&:read).tap(&:render)
+      post = site.posts.docs.find do |p|
+        p.basename.eql? "2014-09-02-relative-includes.markdown"
+      end
       @content = post.output
     end
 
     should "include file as variable with liquid filters" do
-      assert_match %r{1 relative_include}, @content
-      assert_match %r{2 relative_include}, @content
-      assert_match %r{3 relative_include}, @content
+      assert_match(/1 relative_include/, @content)
+      assert_match(/2 relative_include/, @content)
+      assert_match(/3 relative_include/, @content)
     end
 
     should "include file as variable and liquid filters with arbitrary whitespace" do
-      assert_match %r{4 relative_include}, @content
-      assert_match %r{5 relative_include}, @content
-      assert_match %r{6 relative_include}, @content
+      assert_match(/4 relative_include/, @content)
+      assert_match(/5 relative_include/, @content)
+      assert_match(/6 relative_include/, @content)
     end
 
     should "include file as variable and filters with additional parameters" do
-      assert_match '
  • var1 = foo
    • ', @content
-      assert_match '
  • var2 = bar
    • ', @content
+      assert_match("
  • var1 = foo
    • ", @content)
+      assert_match("
  • var2 = bar
    • ", @content)
     end
 
     should "include file as partial variable" do
-      assert_match %r{8 relative_include}, @content
+      assert_match(/8 relative_include/, @content)
     end
 
     should "include files relative to self" do
-      assert_match %r{9 —\ntitle: Test Post Where YAML}, @content
+      assert_match(/9 —\ntitle: Test Post Where YAML/, @content)
     end
 
     context "trying to do bad stuff" do
@@ -837,9 +1024,15 @@ def highlight_block_with_opts(options_string)
 
         should "raise error relative to source directory" do
           exception = assert_raises IOError do
-            create_post(@content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+            create_post(@content, {
+              "permalink"   => "pretty",
+              "source"      => source_dir,
+              "destination" => dest_dir,
+              "read_posts"  => true
+            })
           end
-          assert_match "Could not locate the included file 'missing.html' in any of [\"#{source_dir}\"].", exception.message
+          assert_match "Could not locate the included file 'missing.html' in any of " \
+                       "[\"#{source_dir}\"].", exception.message
         end
       end
 
@@ -856,17 +1049,26 @@ def highlight_block_with_opts(options_string)
 
         should "raise error relative to source directory" do
           exception = assert_raises ArgumentError do
-            create_post(@content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+            create_post(@content, {
+              "permalink"   => "pretty",
+              "source"      => source_dir,
+              "destination" => dest_dir,
+              "read_posts"  => true
+            })
           end
-          assert_equal "Invalid syntax for include tag. File contains invalid characters or sequences:\n\n  ../README.markdown\n\nValid syntax:\n\n  {% include_relative file.ext param='value' param2='value' %}\n\n", exception.message
+          assert_equal(
+            "Invalid syntax for include tag. File contains invalid characters or " \
+            "sequences:\n\n  ../README.markdown\n\nValid syntax:\n\n  " \
+            "{% include_relative file.ext param='value' param2='value' %}\n\n",
+            exception.message
+          )
         end
       end
     end
 
     context "with symlink'd include" do
-
       should "not allow symlink includes" do
-        File.open("tmp/pages-test", 'w') { |file| file.write("SYMLINK TEST") }
+        File.open("tmp/pages-test", "w") { |file| file.write("SYMLINK TEST") }
         assert_raises IOError do
           content = < 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true, 'safe' => true })
+          create_post(content, {
+            "permalink"   => "pretty",
+            "source"      => source_dir,
+            "destination" => dest_dir,
+            "read_posts"  => true,
+            "safe"        => true
+          })
         end
-        @result ||= ''
+        @result ||= ""
         refute_match(/SYMLINK TEST/, @result)
       end
 
@@ -892,9 +1100,19 @@ def highlight_block_with_opts(options_string)
 {% include_relative tmp/pages-test-does-not-exist %}
 
 CONTENT
-          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true, 'safe' => true })
+          create_post(content, {
+            "permalink"   => "pretty",
+            "source"      => source_dir,
+            "destination" => dest_dir,
+            "read_posts"  => true,
+            "safe"        => true
+          })
         end
-        assert_match /Ensure it exists in one of those directories and, if it is a symlink, does not point outside your site source./, ex.message
+        assert_match(
+          "Ensure it exists in one of those directories and, if it is a symlink, does " \
+          "not point outside your site source.",
+          ex.message
+        )
       end
     end
   end

From 5a23b130cee6d403846f2066920e1ca3e3dea2aa Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Wed, 25 May 2016 22:01:10 -0500
Subject: [PATCH 0907/4996] Rubocop: test/test_utils.rb

---
 test/test_utils.rb | 214 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 151 insertions(+), 63 deletions(-)

diff --git a/test/test_utils.rb b/test/test_utils.rb
index f102b7a6d11..e2a50c58332 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require "helper"
 
 class TestUtils < JekyllUnitTest
   context "The \`Utils.deep_merge_hashes\` method" do
@@ -9,7 +9,7 @@ class TestUtils < JekyllUnitTest
     end
 
     should "merge a drop into a hash" do
-      data = {"page" => {}}
+      data = { "page" => {} }
       merged = Utils.deep_merge_hashes(data, @site.site_payload)
       assert merged.is_a? Hash
       assert merged["site"].is_a? Drops::SiteDrop
@@ -17,7 +17,7 @@ class TestUtils < JekyllUnitTest
     end
 
     should "merge a hash into a drop" do
-      data = {"page" => {}}
+      data = { "page" => {} }
       assert_nil @site.site_payload["page"]
       merged = Utils.deep_merge_hashes(@site.site_payload, data)
       assert merged.is_a? Drops::UnifiedPayloadDrop
@@ -27,66 +27,64 @@ class TestUtils < JekyllUnitTest
   end
 
   context "hash" do
-
     context "pluralized_array" do
-
       should "return empty array with no values" do
         data = {}
-        assert_equal [], Utils.pluralized_array_from_hash(data, 'tag', 'tags')
+        assert_equal [], Utils.pluralized_array_from_hash(data, "tag", "tags")
       end
 
       should "return empty array with no matching values" do
-        data = { 'foo' => 'bar' }
-        assert_equal [], Utils.pluralized_array_from_hash(data, 'tag', 'tags')
+        data = { "foo" => "bar" }
+        assert_equal [], Utils.pluralized_array_from_hash(data, "tag", "tags")
       end
 
       should "return plural array with nil singular" do
-        data = { 'foo' => 'bar', 'tag' => nil, 'tags' => ['dog', 'cat'] }
-        assert_equal ['dog', 'cat'], Utils.pluralized_array_from_hash(data, 'tag', 'tags')
+        data = { "foo" => "bar", "tag" => nil, "tags" => %w(dog cat) }
+        assert_equal %w(dog cat), Utils.pluralized_array_from_hash(data, "tag", "tags")
       end
 
       should "return single value array with matching singular" do
-        data = { 'foo' => 'bar', 'tag' => 'dog', 'tags' => ['dog', 'cat'] }
-        assert_equal ['dog'], Utils.pluralized_array_from_hash(data, 'tag', 'tags')
+        data = { "foo" => "bar", "tag" => "dog", "tags" => %w(dog cat) }
+        assert_equal ["dog"], Utils.pluralized_array_from_hash(data, "tag", "tags")
       end
 
       should "return single value array with matching singular with spaces" do
-        data = { 'foo' => 'bar', 'tag' => 'dog cat', 'tags' => ['dog', 'cat'] }
-        assert_equal ['dog cat'], Utils.pluralized_array_from_hash(data, 'tag', 'tags')
+        data = { "foo" => "bar", "tag" => "dog cat", "tags" => %w(dog cat) }
+        assert_equal ["dog cat"], Utils.pluralized_array_from_hash(data, "tag", "tags")
       end
 
       should "return empty array with matching nil plural" do
-        data = { 'foo' => 'bar', 'tags' => nil }
-        assert_equal [], Utils.pluralized_array_from_hash(data, 'tag', 'tags')
+        data = { "foo" => "bar", "tags" => nil }
+        assert_equal [], Utils.pluralized_array_from_hash(data, "tag", "tags")
       end
 
       should "return empty array with matching empty array" do
-        data = { 'foo' => 'bar', 'tags' => [] }
-        assert_equal [], Utils.pluralized_array_from_hash(data, 'tag', 'tags')
+        data = { "foo" => "bar", "tags" => [] }
+        assert_equal [], Utils.pluralized_array_from_hash(data, "tag", "tags")
       end
 
       should "return single value array with matching plural with single string value" do
-        data = { 'foo' => 'bar', 'tags' => 'dog' }
-        assert_equal ['dog'], Utils.pluralized_array_from_hash(data, 'tag', 'tags')
+        data = { "foo" => "bar", "tags" => "dog" }
+        assert_equal ["dog"], Utils.pluralized_array_from_hash(data, "tag", "tags")
       end
 
-      should "return multiple value array with matching plural with single string value with spaces" do
-        data = { 'foo' => 'bar', 'tags' => 'dog cat' }
-        assert_equal ['dog', 'cat'], Utils.pluralized_array_from_hash(data, 'tag', 'tags')
+      should "return multiple value array with matching plural with " \
+             "single string value with spaces" do
+        data = { "foo" => "bar", "tags" => "dog cat" }
+        assert_equal %w(dog cat), Utils.pluralized_array_from_hash(data, "tag", "tags")
       end
 
       should "return single value array with matching plural with single value array" do
-        data = { 'foo' => 'bar', 'tags' => ['dog'] }
-        assert_equal ['dog'], Utils.pluralized_array_from_hash(data, 'tag', 'tags')
+        data = { "foo" => "bar", "tags" => ["dog"] }
+        assert_equal ["dog"], Utils.pluralized_array_from_hash(data, "tag", "tags")
       end
 
-      should "return multiple value array with matching plural with multiple value array" do
-        data = { 'foo' => 'bar', 'tags' => ['dog', 'cat'] }
-        assert_equal ['dog', 'cat'], Utils.pluralized_array_from_hash(data, 'tag', 'tags')
+      should "return multiple value array with matching plural with " \
+             "multiple value array" do
+        data = { "foo" => "bar", "tags" => %w(dog cat) }
+        assert_equal %w(dog cat), Utils.pluralized_array_from_hash(data, "tag", "tags")
       end
-
     end
-
   end
 
   context "The \`Utils.parse_date\` method" do
@@ -108,7 +106,10 @@ class TestUtils < JekyllUnitTest
 
     should "throw an error with the default message if no message is passed in" do
       date = "Blah this is invalid"
-      assert_raises Jekyll::Errors::InvalidDateError, "Invalid date '#{date}': Input could not be parsed." do
+      assert_raises(
+        Jekyll::Errors::InvalidDateError,
+        "Invalid date '#{date}': Input could not be parsed."
+      ) do
         Utils.parse_date(date)
       end
     end
@@ -116,7 +117,10 @@ class TestUtils < JekyllUnitTest
     should "throw an error with the provided message if a message is passed in" do
       date = "Blah this is invalid"
       message = "Aaaah, the world has exploded!"
-      assert_raises Jekyll::Errors::InvalidDateError, "Invalid date '#{date}': #{message}" do
+      assert_raises(
+        Jekyll::Errors::InvalidDateError,
+        "Invalid date '#{date}': #{message}"
+      ) do
         Utils.parse_date(date, message)
       end
     end
@@ -144,7 +148,10 @@ class TestUtils < JekyllUnitTest
     end
 
     should "drop trailing punctuation" do
-      assert_equal "so-what-is-jekyll-exactly", Utils.slugify("So what is Jekyll, exactly?")
+      assert_equal(
+        "so-what-is-jekyll-exactly",
+        Utils.slugify("So what is Jekyll, exactly?")
+      )
       assert_equal "كيف-حالك", Utils.slugify("كيف حالك؟")
     end
 
@@ -157,7 +164,10 @@ class TestUtils < JekyllUnitTest
     end
 
     should "combine adjacent hyphens and spaces" do
-      assert_equal "customizing-git-git-hooks", Utils.slugify("Customizing Git - Git Hooks")
+      assert_equal(
+        "customizing-git-git-hooks",
+        Utils.slugify("Customizing Git - Git Hooks")
+      )
     end
 
     should "replace punctuation in any scripts by hyphens" do
@@ -171,7 +181,10 @@ class TestUtils < JekyllUnitTest
     end
 
     should "not change behaviour if mode is default" do
-      assert_equal "the-config-yml-file", Utils.slugify("The _config.yml file?", mode: "default")
+      assert_equal(
+        "the-config-yml-file",
+        Utils.slugify("The _config.yml file?", :mode => "default")
+      )
     end
 
     should "not change behaviour if mode is nil" do
@@ -179,53 +192,128 @@ class TestUtils < JekyllUnitTest
     end
 
     should "not replace period and underscore if mode is pretty" do
-      assert_equal "the-_config.yml-file", Utils.slugify("The _config.yml file?", mode: "pretty")
+      assert_equal(
+        "the-_config.yml-file",
+        Utils.slugify("The _config.yml file?", :mode => "pretty")
+      )
     end
 
     should "only replace whitespace if mode is raw" do
-      assert_equal "the-_config.yml-file?", Utils.slugify("The _config.yml file?", mode: "raw")
+      assert_equal(
+        "the-_config.yml-file?",
+        Utils.slugify("The _config.yml file?", :mode => "raw")
+      )
     end
 
     should "return the given string if mode is none" do
-      assert_equal "the _config.yml file?", Utils.slugify("The _config.yml file?", mode: "none")
+      assert_equal(
+        "the _config.yml file?",
+        Utils.slugify("The _config.yml file?", :mode => "none")
+      )
     end
 
     should "Keep all uppercase letters if cased is true" do
-      assert_equal "Working-with-drafts", Utils.slugify("Working with drafts", cased: true)
-      assert_equal "Basic-Usage", Utils.slugify("Basic   Usage", cased: true)
-      assert_equal "Working-with-drafts", Utils.slugify("  Working with drafts   ", cased: true)
-      assert_equal "So-what-is-Jekyll-exactly", Utils.slugify("So what is Jekyll, exactly?", cased: true)
-      assert_equal "Pre-releases", Utils.slugify("Pre-releases", cased: true)
-      assert_equal "The-config-yml-file", Utils.slugify("The _config.yml file", cased: true)
-      assert_equal "Customizing-Git-Git-Hooks", Utils.slugify("Customizing Git - Git Hooks", cased: true)
-      assert_equal "The-config-yml-file", Utils.slugify("The _config.yml file?", mode: "default", cased: true)
-      assert_equal "The-config-yml-file", Utils.slugify("The _config.yml file?", cased: true)
-      assert_equal "The-_config.yml-file", Utils.slugify("The _config.yml file?", mode: "pretty", cased: true)
-      assert_equal "The-_config.yml-file?", Utils.slugify("The _config.yml file?", mode: "raw", cased: true)
-      assert_equal "The _config.yml file?", Utils.slugify("The _config.yml file?", mode: "none", cased: true)
+      assert_equal(
+        "Working-with-drafts",
+        Utils.slugify("Working with drafts", :cased => true)
+      )
+      assert_equal(
+        "Basic-Usage",
+        Utils.slugify("Basic   Usage", :cased => true)
+      )
+      assert_equal(
+        "Working-with-drafts",
+        Utils.slugify("  Working with drafts   ", :cased => true)
+      )
+      assert_equal(
+        "So-what-is-Jekyll-exactly",
+        Utils.slugify("So what is Jekyll, exactly?", :cased => true)
+      )
+      assert_equal(
+        "Pre-releases",
+        Utils.slugify("Pre-releases", :cased => true)
+      )
+      assert_equal(
+        "The-config-yml-file",
+        Utils.slugify("The _config.yml file", :cased => true)
+      )
+      assert_equal(
+        "Customizing-Git-Git-Hooks",
+        Utils.slugify("Customizing Git - Git Hooks", :cased => true)
+      )
+      assert_equal(
+        "The-config-yml-file",
+        Utils.slugify("The _config.yml file?", :mode => "default", :cased => true)
+      )
+      assert_equal(
+        "The-config-yml-file",
+        Utils.slugify("The _config.yml file?", :cased => true)
+      )
+      assert_equal(
+        "The-_config.yml-file",
+        Utils.slugify("The _config.yml file?", :mode => "pretty", :cased => true)
+      )
+      assert_equal(
+        "The-_config.yml-file?",
+        Utils.slugify("The _config.yml file?", :mode => "raw", :cased => true)
+      )
+      assert_equal(
+        "The _config.yml file?",
+        Utils.slugify("The _config.yml file?", :mode => "none", :cased => true)
+      )
     end
   end
 
   context "The \`Utils.titleize_slug\` method" do
     should "capitalize all words and not drop any words" do
-      assert_equal "This Is A Long Title With Mixed Capitalization", Utils.titleize_slug("This-is-a-Long-title-with-Mixed-capitalization")
-      assert_equal "This Is A Title With Just The Initial Word Capitalized", Utils.titleize_slug("This-is-a-title-with-just-the-initial-word-capitalized")
-      assert_equal "This Is A Title With No Capitalization", Utils.titleize_slug("this-is-a-title-with-no-capitalization")
+      assert_equal(
+        "This Is A Long Title With Mixed Capitalization",
+        Utils.titleize_slug("This-is-a-Long-title-with-Mixed-capitalization")
+      )
+      assert_equal(
+        "This Is A Title With Just The Initial Word Capitalized",
+        Utils.titleize_slug("This-is-a-title-with-just-the-initial-word-capitalized")
+      )
+      assert_equal(
+        "This Is A Title With No Capitalization",
+        Utils.titleize_slug("this-is-a-title-with-no-capitalization")
+      )
     end
   end
 
   context "The \`Utils.add_permalink_suffix\` method" do
     should "handle built-in permalink styles" do
-      assert_equal "/:basename/", Utils.add_permalink_suffix("/:basename", :pretty)
-      assert_equal "/:basename:output_ext", Utils.add_permalink_suffix("/:basename", :date)
-      assert_equal "/:basename:output_ext", Utils.add_permalink_suffix("/:basename", :ordinal)
-      assert_equal "/:basename:output_ext", Utils.add_permalink_suffix("/:basename", :none)
+      assert_equal(
+        "/:basename/",
+        Utils.add_permalink_suffix("/:basename", :pretty)
+      )
+      assert_equal(
+        "/:basename:output_ext",
+        Utils.add_permalink_suffix("/:basename", :date)
+      )
+      assert_equal(
+        "/:basename:output_ext",
+        Utils.add_permalink_suffix("/:basename", :ordinal)
+      )
+      assert_equal(
+        "/:basename:output_ext",
+        Utils.add_permalink_suffix("/:basename", :none)
+      )
     end
 
     should "handle custom permalink styles" do
-      assert_equal "/:basename/", Utils.add_permalink_suffix("/:basename", "/:title/")
-      assert_equal "/:basename:output_ext", Utils.add_permalink_suffix("/:basename", "/:title:output_ext")
-      assert_equal "/:basename", Utils.add_permalink_suffix("/:basename", "/:title")
+      assert_equal(
+        "/:basename/",
+        Utils.add_permalink_suffix("/:basename", "/:title/")
+      )
+      assert_equal(
+        "/:basename:output_ext",
+        Utils.add_permalink_suffix("/:basename", "/:title:output_ext")
+      )
+      assert_equal(
+        "/:basename",
+        Utils.add_permalink_suffix("/:basename", "/:title")
+      )
     end
   end
 
@@ -270,17 +358,17 @@ class TestUtils < JekyllUnitTest
   context "The \`Utils.has_yaml_header?\` method" do
     should "accept files with yaml front matter" do
       file = source_dir("_posts", "2008-10-18-foo-bar.markdown")
-      assert_equal "---\n", File.open(file, 'rb') { |f| f.read(4) }
+      assert_equal "---\n", File.open(file, "rb") { |f| f.read(4) }
       assert Utils.has_yaml_header?(file)
     end
     should "accept files with extraneous spaces after yaml front matter" do
       file = source_dir("_posts", "2015-12-27-extra-spaces.markdown")
-      assert_equal "---  \n", File.open(file, 'rb') { |f| f.read(6) }
+      assert_equal "---  \n", File.open(file, "rb") { |f| f.read(6) }
       assert Utils.has_yaml_header?(file)
     end
     should "reject pgp files and the like which resemble front matter" do
       file = source_dir("pgp.key")
-      assert_equal "-----B", File.open(file, 'rb') { |f| f.read(6) }
+      assert_equal "-----B", File.open(file, "rb") { |f| f.read(6) }
       refute Utils.has_yaml_header?(file)
     end
   end

From fbff506faa3d7542f7e5b80a31a2abe217355a55 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 00:00:08 -0500
Subject: [PATCH 0908/4996] Rubocop: test/test_site.rb

---
 test/test_site.rb | 254 +++++++++++++++++++++++++---------------------
 1 file changed, 140 insertions(+), 114 deletions(-)

diff --git a/test/test_site.rb b/test/test_site.rb
index 5e52a7c9405..4e9e18a57ab 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -1,45 +1,47 @@
-require 'helper'
+require "helper"
 
 class TestSite < JekyllUnitTest
   context "configuring sites" do
     should "have an array for plugins by default" do
       site = Site.new default_configuration
-      assert_equal [File.join(Dir.pwd, '_plugins')], site.plugins
+      assert_equal [File.join(Dir.pwd, "_plugins")], site.plugins
     end
 
     should "look for plugins under the site directory by default" do
       site = Site.new(site_configuration)
-      assert_equal [source_dir('_plugins')], site.plugins
+      assert_equal [source_dir("_plugins")], site.plugins
     end
 
     should "have an array for plugins if passed as a string" do
-      site = Site.new(site_configuration({ 'plugins_dir' => '/tmp/plugins' }))
-      assert_equal ['/tmp/plugins'], site.plugins
+      site = Site.new(site_configuration({ "plugins_dir" => "/tmp/plugins" }))
+      assert_equal ["/tmp/plugins"], site.plugins
     end
 
     should "have an array for plugins if passed as an array" do
-      site = Site.new(site_configuration({ 'plugins_dir' => ['/tmp/plugins', '/tmp/otherplugins'] }))
-      assert_equal ['/tmp/plugins', '/tmp/otherplugins'], site.plugins
+      site = Site.new(site_configuration({
+        "plugins_dir" => ["/tmp/plugins", "/tmp/otherplugins"]
+      }))
+      assert_equal ["/tmp/plugins", "/tmp/otherplugins"], site.plugins
     end
 
     should "have an empty array for plugins if nothing is passed" do
-      site = Site.new(site_configuration({ 'plugins_dir' => [] }))
+      site = Site.new(site_configuration({ "plugins_dir" => [] }))
       assert_equal [], site.plugins
     end
 
     should "have the default for plugins if nil is passed" do
-      site = Site.new(site_configuration({ 'plugins_dir' => nil }))
-      assert_equal [source_dir('_plugins')], site.plugins
+      site = Site.new(site_configuration({ "plugins_dir" => nil }))
+      assert_equal [source_dir("_plugins")], site.plugins
     end
 
     should "expose default baseurl" do
       site = Site.new(default_configuration)
-      assert_equal Jekyll::Configuration::DEFAULTS['baseurl'], site.baseurl
+      assert_equal Jekyll::Configuration::DEFAULTS["baseurl"], site.baseurl
     end
 
     should "expose baseurl passed in from config" do
-      site = Site.new(site_configuration({ 'baseurl' => '/blog' }))
-      assert_equal '/blog', site.baseurl
+      site = Site.new(site_configuration({ "baseurl" => "/blog" }))
+      assert_equal "/blog", site.baseurl
     end
   end
   context "creating sites" do
@@ -55,7 +57,7 @@ class TestSite < JekyllUnitTest
     end
 
     should "have an empty tag hash by default" do
-      assert_equal Hash.new, @site.tags
+      assert_equal({}, @site.tags)
     end
 
     should "give site with parsed pages and posts to generators" do
@@ -65,14 +67,14 @@ def generate(site)
             raise "#{page} isn't a page" unless page.is_a?(Page)
             raise "#{page} doesn't respond to :name" unless page.respond_to?(:name)
           end
-          site.file_read_opts[:secret_message] = 'hi'
+          site.file_read_opts[:secret_message] = "hi"
         end
       end
       @site = Site.new(site_configuration)
       @site.read
       @site.generate
       refute_equal 0, @site.pages.size
-      assert_equal 'hi', @site.file_read_opts[:secret_message]
+      assert_equal "hi", @site.file_read_opts[:secret_message]
     end
 
     should "reset data before processing" do
@@ -157,13 +159,21 @@ def generate(site)
     end
 
     should "setup plugins in priority order" do
-      assert_equal @site.converters.sort_by(&:class).map{|c|c.class.priority}, @site.converters.map{|c|c.class.priority}
-      assert_equal @site.generators.sort_by(&:class).map{|g|g.class.priority}, @site.generators.map{|g|g.class.priority}
+      assert_equal(
+        @site.converters.sort_by(&:class).map { |c| c.class.priority },
+        @site.converters.map { |c| c.class.priority }
+      )
+      assert_equal(
+        @site.generators.sort_by(&:class).map { |g| g.class.priority },
+        @site.generators.map { |g| g.class.priority }
+      )
     end
 
     should "sort pages alphabetically" do
       method = Dir.method(:entries)
-      allow(Dir).to receive(:entries) { |*args, &block| method.call(*args, &block).reverse }
+      allow(Dir).to receive(:entries) do |*args, &block|
+        method.call(*args, &block).reverse
+      end
       @site.process
       # files in symlinked directories may appear twice
       sorted_pages = %w(
@@ -192,9 +202,11 @@ 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 { |post| File.directory?(post) && !(post =~ Document::DATE_FILENAME_MATCHER) }
+      @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
       assert_equal posts.size - @num_invalid_posts, @site.posts.size
     end
 
@@ -209,11 +221,11 @@ def generate(site)
     end
 
     should "expose jekyll version to site payload" do
-      assert_equal Jekyll::VERSION, @site.site_payload['jekyll']['version']
+      assert_equal Jekyll::VERSION, @site.site_payload["jekyll"]["version"]
     end
 
     should "expose list of static files to site payload" do
-      assert_equal @site.static_files, @site.site_payload['site']['static_files']
+      assert_equal @site.static_files, @site.site_payload["site"]["static_files"]
     end
 
     should "deploy payload" do
@@ -221,118 +233,125 @@ def generate(site)
       @site.process
 
       posts = Dir[source_dir("**", "_posts", "**", "*")]
-      posts.delete_if { |post| File.directory?(post) && !(post =~ Document::DATE_FILENAME_MATCHER) }
-      categories = %w(2013 bar baz category foo z_category MixedCase Mixedcase publish_test win).sort
+      posts.delete_if do |post|
+        File.directory?(post) && !(post =~ Document::DATE_FILENAME_MATCHER)
+      end
+      categories = %w(
+        2013 bar baz category foo z_category MixedCase Mixedcase publish_test win
+      ).sort
 
       assert_equal posts.size - @num_invalid_posts, @site.posts.size
       assert_equal categories, @site.categories.keys.sort
-      assert_equal 5, @site.categories['foo'].size
+      assert_equal 5, @site.categories["foo"].size
     end
 
-    context 'error handling' do
+    context "error handling" do
       should "raise if destination is included in source" do
         assert_raises Jekyll::Errors::FatalException do
-          Site.new(site_configuration('destination' => source_dir))
+          Site.new(site_configuration("destination" => source_dir))
         end
       end
 
       should "raise if destination is source" do
         assert_raises Jekyll::Errors::FatalException do
-          Site.new(site_configuration('destination' => File.join(source_dir, "..")))
+          Site.new(site_configuration("destination" => File.join(source_dir, "..")))
         end
       end
     end
 
-    context 'with orphaned files in destination' do
+    context "with orphaned files in destination" do
       setup do
         clear_dest
         @site.regenerator.clear
         @site.process
         # generate some orphaned files:
         # single file
-        File.open(dest_dir('obsolete.html'), 'w')
+        File.open(dest_dir("obsolete.html"), "w")
         # single file in sub directory
-        FileUtils.mkdir(dest_dir('qux'))
-        File.open(dest_dir('qux/obsolete.html'), 'w')
+        FileUtils.mkdir(dest_dir("qux"))
+        File.open(dest_dir("qux/obsolete.html"), "w")
         # empty directory
-        FileUtils.mkdir(dest_dir('quux'))
-        FileUtils.mkdir(dest_dir('.git'))
-        FileUtils.mkdir(dest_dir('.svn'))
-        FileUtils.mkdir(dest_dir('.hg'))
+        FileUtils.mkdir(dest_dir("quux"))
+        FileUtils.mkdir(dest_dir(".git"))
+        FileUtils.mkdir(dest_dir(".svn"))
+        FileUtils.mkdir(dest_dir(".hg"))
         # single file in repository
-        File.open(dest_dir('.git/HEAD'), 'w')
-        File.open(dest_dir('.svn/HEAD'), 'w')
-        File.open(dest_dir('.hg/HEAD'), 'w')
+        File.open(dest_dir(".git/HEAD"), "w")
+        File.open(dest_dir(".svn/HEAD"), "w")
+        File.open(dest_dir(".hg/HEAD"), "w")
       end
 
       teardown do
-        FileUtils.rm_f(dest_dir('obsolete.html'))
-        FileUtils.rm_rf(dest_dir('qux'))
-        FileUtils.rm_f(dest_dir('quux'))
-        FileUtils.rm_rf(dest_dir('.git'))
-        FileUtils.rm_rf(dest_dir('.svn'))
-        FileUtils.rm_rf(dest_dir('.hg'))
+        FileUtils.rm_f(dest_dir("obsolete.html"))
+        FileUtils.rm_rf(dest_dir("qux"))
+        FileUtils.rm_f(dest_dir("quux"))
+        FileUtils.rm_rf(dest_dir(".git"))
+        FileUtils.rm_rf(dest_dir(".svn"))
+        FileUtils.rm_rf(dest_dir(".hg"))
       end
 
-      should 'remove orphaned files in destination' do
+      should "remove orphaned files in destination" do
         @site.process
-        refute_exist dest_dir('obsolete.html')
-        refute_exist dest_dir('qux')
-        refute_exist dest_dir('quux')
-        assert_exist dest_dir('.git')
-        assert_exist dest_dir('.git', 'HEAD')
+        refute_exist dest_dir("obsolete.html")
+        refute_exist dest_dir("qux")
+        refute_exist dest_dir("quux")
+        assert_exist dest_dir(".git")
+        assert_exist dest_dir(".git", "HEAD")
       end
 
-      should 'remove orphaned files in destination - keep_files .svn' do
-        config = site_configuration('keep_files' => %w{.svn})
+      should "remove orphaned files in destination - keep_files .svn" do
+        config = site_configuration("keep_files" => %w(.svn))
         @site = Site.new(config)
         @site.process
-        refute_exist dest_dir('.htpasswd')
-        refute_exist dest_dir('obsolete.html')
-        refute_exist dest_dir('qux')
-        refute_exist dest_dir('quux')
-        refute_exist dest_dir('.git')
-        refute_exist dest_dir('.git', 'HEAD')
-        assert_exist dest_dir('.svn')
-        assert_exist dest_dir('.svn', 'HEAD')
+        refute_exist dest_dir(".htpasswd")
+        refute_exist dest_dir("obsolete.html")
+        refute_exist dest_dir("qux")
+        refute_exist dest_dir("quux")
+        refute_exist dest_dir(".git")
+        refute_exist dest_dir(".git", "HEAD")
+        assert_exist dest_dir(".svn")
+        assert_exist dest_dir(".svn", "HEAD")
       end
     end
 
-    context 'using a non-default markdown processor in the configuration' do
-      should 'use the non-default markdown processor' do
+    context "using a non-default markdown processor in the configuration" do
+      should "use the non-default markdown processor" do
         class Jekyll::Converters::Markdown::CustomMarkdown
           def initialize(*args)
             @args = args
           end
 
-          def convert(*args)
+          def convert(*_args)
             ""
           end
         end
 
         custom_processor = "CustomMarkdown"
-        s = Site.new(site_configuration('markdown' => custom_processor))
+        s = Site.new(site_configuration("markdown" => custom_processor))
         s.process
 
         # Do some cleanup, we don't like straggling stuff's.
         Jekyll::Converters::Markdown.send(:remove_const, :CustomMarkdown)
       end
 
-      should 'ignore, if there are any bad characters in the class name' do
+      should "ignore, if there are any bad characters in the class name" do
         module Jekyll::Converters::Markdown::Custom
           class Markdown
             def initialize(*args)
               @args = args
             end
 
-            def convert(*args)
+            def convert(*_args)
               ""
             end
           end
         end
 
         bad_processor = "Custom::Markdown"
-        s = Site.new(site_configuration('markdown' => bad_processor, 'incremental' => false))
+        s = Site.new(site_configuration(
+          "markdown"    => bad_processor,
+          "incremental" => false
+        ))
         assert_raises Jekyll::Errors::FatalException do
           s.process
         end
@@ -342,96 +361,105 @@ def convert(*args)
       end
     end
 
-    context 'with an invalid markdown processor in the configuration' do
-      should 'not throw an error at initialization time' do
-        bad_processor = 'not a processor name'
-        assert Site.new(site_configuration('markdown' => bad_processor))
+    context "with an invalid markdown processor in the configuration" do
+      should "not throw an error at initialization time" do
+        bad_processor = "not a processor name"
+        assert Site.new(site_configuration("markdown" => bad_processor))
       end
 
-      should 'throw FatalException at process time' do
-        bad_processor = 'not a processor name'
-        s = Site.new(site_configuration('markdown' => bad_processor, 'incremental' => false))
+      should "throw FatalException at process time" do
+        bad_processor = "not a processor name"
+        s = Site.new(site_configuration(
+          "markdown"    => bad_processor,
+          "incremental" => false
+        ))
         assert_raises Jekyll::Errors::FatalException do
           s.process
         end
       end
     end
 
-    context 'data directory' do
-      should 'auto load yaml files' do
+    context "data directory" do
+      should "auto load yaml files" do
         site = Site.new(site_configuration)
         site.process
 
-        file_content = SafeYAML.load_file(File.join(source_dir, '_data', 'members.yaml'))
+        file_content = SafeYAML.load_file(File.join(source_dir, "_data", "members.yaml"))
 
-        assert_equal site.data['members'], file_content
-        assert_equal site.site_payload['site']['data']['members'], file_content
+        assert_equal site.data["members"], file_content
+        assert_equal site.site_payload["site"]["data"]["members"], file_content
       end
 
-      should 'load yaml files from extracted method' do
+      should "load yaml files from extracted method" do
         site = Site.new(site_configuration)
         site.process
 
-        file_content = DataReader.new(site).read_data_file(source_dir('_data', 'members.yaml'))
+        file_content = DataReader.new(site)
+          .read_data_file(source_dir("_data", "members.yaml"))
 
-        assert_equal site.data['members'], file_content
-        assert_equal site.site_payload['site']['data']['members'], file_content
+        assert_equal site.data["members"], file_content
+        assert_equal site.site_payload["site"]["data"]["members"], file_content
       end
 
-      should 'auto load yml files' do
+      should "auto load yml files" do
         site = Site.new(site_configuration)
         site.process
 
-        file_content = SafeYAML.load_file(File.join(source_dir, '_data', 'languages.yml'))
+        file_content = SafeYAML.load_file(File.join(source_dir, "_data", "languages.yml"))
 
-        assert_equal site.data['languages'], file_content
-        assert_equal site.site_payload['site']['data']['languages'], file_content
+        assert_equal site.data["languages"], file_content
+        assert_equal site.site_payload["site"]["data"]["languages"], file_content
       end
 
-      should 'auto load json files' do
+      should "auto load json files" do
         site = Site.new(site_configuration)
         site.process
 
-        file_content = SafeYAML.load_file(File.join(source_dir, '_data', 'members.json'))
+        file_content = SafeYAML.load_file(File.join(source_dir, "_data", "members.json"))
 
-        assert_equal site.data['members'], file_content
-        assert_equal site.site_payload['site']['data']['members'], file_content
+        assert_equal site.data["members"], file_content
+        assert_equal site.site_payload["site"]["data"]["members"], file_content
       end
 
-      should 'auto load yaml files in subdirectory' do
+      should "auto load yaml files in subdirectory" do
         site = Site.new(site_configuration)
         site.process
 
-        file_content = SafeYAML.load_file(File.join(source_dir, '_data', 'categories', 'dairy.yaml'))
+        file_content = SafeYAML.load_file(File.join(
+          source_dir, "_data", "categories", "dairy.yaml"
+        ))
 
-        assert_equal site.data['categories']['dairy'], file_content
-        assert_equal site.site_payload['site']['data']['categories']['dairy'], file_content
+        assert_equal site.data["categories"]["dairy"], file_content
+        assert_equal(
+          site.site_payload["site"]["data"]["categories"]["dairy"],
+          file_content
+        )
       end
 
       should "load symlink files in unsafe mode" do
-        site = Site.new(site_configuration('safe' => false))
+        site = Site.new(site_configuration("safe" => false))
         site.process
 
-        file_content = SafeYAML.load_file(File.join(source_dir, '_data', 'products.yml'))
+        file_content = SafeYAML.load_file(File.join(source_dir, "_data", "products.yml"))
 
-        assert_equal site.data['products'], file_content
-        assert_equal site.site_payload['site']['data']['products'], file_content
+        assert_equal site.data["products"], file_content
+        assert_equal site.site_payload["site"]["data"]["products"], file_content
       end
 
-      should "load the symlink files in safe mode, as they resolve to inside site.source" do
-        site = Site.new(site_configuration('safe' => true))
+      should "load the symlink files in safe mode, " \
+             "as they resolve to inside site.source" do
+        site = Site.new(site_configuration("safe" => true))
         site.process
-        file_content = SafeYAML.load_file(File.join(source_dir, '_data', 'products.yml'))
-        assert_equal site.data['products'], file_content
-        assert_equal site.site_payload['site']['data']['products'], file_content
+        file_content = SafeYAML.load_file(File.join(source_dir, "_data", "products.yml"))
+        assert_equal site.data["products"], file_content
+        assert_equal site.site_payload["site"]["data"]["products"], file_content
       end
-
     end
 
     context "manipulating the Jekyll environment" do
       setup do
         @site = Site.new(site_configuration({
-          'incremental' => false
+          "incremental" => false
         }))
         @site.process
         @page = @site.pages.find { |p| p.name == "environment.html" }
@@ -445,7 +473,7 @@ def convert(*args)
         setup do
           ENV["JEKYLL_ENV"] = "production"
           @site = Site.new(site_configuration({
-            'incremental' => false
+            "incremental" => false
           }))
           @site.process
           @page = @site.pages.find { |p| p.name == "environment.html" }
@@ -463,7 +491,7 @@ def convert(*args)
 
     context "with liquid profiling" do
       setup do
-        @site = Site.new(site_configuration('profile' => true))
+        @site = Site.new(site_configuration("profile" => true))
       end
 
       # Suppress output while testing
@@ -483,7 +511,7 @@ def convert(*args)
     context "incremental build" do
       setup do
         @site = Site.new(site_configuration({
-          'incremental' => true
+          "incremental" => true
         }))
         @site.read
       end
@@ -533,8 +561,6 @@ def convert(*args)
         mtime2 = File.stat(dest).mtime.to_i
         refute_equal mtime1, mtime2 # must be regenerated
       end
-
     end
-
   end
 end

From 1cec82062892eac3546ca1935ddd1c770b44f162 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 00:00:22 -0500
Subject: [PATCH 0909/4996] Rubocop: Tests

---
 .rubocop.yml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index b7dd25301e9..be4b52290f9 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -41,17 +41,6 @@ AllCops:
   - features/step_definitions.rb
   - features/support/formatter.rb
   - features/support/helpers.rb
-  - test/test_configuration.rb
-  - test/test_document.rb
-  - test/test_entry_filter.rb
-  - test/test_filters.rb
-  - test/test_kramdown.rb
-  - test/test_liquid_renderer.rb
-  - test/test_page.rb
-  - test/test_regenerator.rb
-  - test/test_site.rb
-  - test/test_tags.rb
-  - test/test_utils.rb
   - bin/**/*
   - benchmark/**/*
   - script/**/*
@@ -68,6 +57,7 @@ Metrics/ClassLength:
   Max: 240
   Exclude:
   - !ruby/regexp /features\/.*.rb$/
+  - !ruby/regexp /test\/.*.rb$/
 Metrics/CyclomaticComplexity:
   Max: 8
 Metrics/LineLength:

From 3e42e6d4615b91f8014bcd802a756c24fd52308d Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 00:07:43 -0500
Subject: [PATCH 0910/4996] Rubocop: lib/jekyll/liquid_renderer.rb

---
 lib/jekyll/liquid_renderer.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/liquid_renderer.rb b/lib/jekyll/liquid_renderer.rb
index 70f7b0d194e..30f798bc185 100644
--- a/lib/jekyll/liquid_renderer.rb
+++ b/lib/jekyll/liquid_renderer.rb
@@ -1,5 +1,5 @@
-require 'jekyll/liquid_renderer/file'
-require 'jekyll/liquid_renderer/table'
+require "jekyll/liquid_renderer/file"
+require "jekyll/liquid_renderer/table"
 
 module Jekyll
   class LiquidRenderer
@@ -13,7 +13,10 @@ def reset
     end
 
     def file(filename)
-      filename = @site.in_source_dir(filename).sub(/\A#{Regexp.escape(@site.source)}\//, '')
+      filename = @site.in_source_dir(filename).sub(
+        %r!\A#{Regexp.escape(@site.source)}/!,
+        ""
+      )
 
       LiquidRenderer::File.new(self, filename).tap do
         @stats[filename] ||= {}

From 4c35d15a3bea5f357e62067fe52b18b30416104c Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 00:07:52 -0500
Subject: [PATCH 0911/4996] Rubocop: lib/jekyll/liquid_renderer/table.rb

---
 lib/jekyll/liquid_renderer/table.rb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/jekyll/liquid_renderer/table.rb b/lib/jekyll/liquid_renderer/table.rb
index e3e0c8af09f..d3859647711 100644
--- a/lib/jekyll/liquid_renderer/table.rb
+++ b/lib/jekyll/liquid_renderer/table.rb
@@ -31,8 +31,8 @@ def generate_table_head_border(row_data, widths)
       str = ""
 
       row_data.each_index do |cell_index|
-        str << '-' * widths[cell_index]
-        str << '-+-' unless cell_index == row_data.length-1
+        str << "-" * widths[cell_index]
+        str << "-+-" unless cell_index == row_data.length-1
       end
 
       str << "\n"
@@ -40,16 +40,16 @@ def generate_table_head_border(row_data, widths)
     end
 
     def generate_row(row_data, widths)
-      str = ''
+      str = ""
 
       row_data.each_with_index do |cell_data, cell_index|
-        if cell_index == 0
-          str << cell_data.ljust(widths[cell_index], ' ')
-        else
-          str << cell_data.rjust(widths[cell_index], ' ')
-        end
+        str << if cell_index == 0
+                 cell_data.ljust(widths[cell_index], " ")
+               else
+                 cell_data.rjust(widths[cell_index], " ")
+               end
 
-        str << ' | ' unless cell_index == row_data.length-1
+        str << " | " unless cell_index == row_data.length-1
       end
 
       str << "\n"
@@ -79,7 +79,7 @@ def data_for_table(n)
         row << filename
         row << file_stats[:count].to_s
         row << format_bytes(file_stats[:bytes])
-        row << "%.3f" % file_stats[:time]
+        row << format("%.3f", file_stats[:time])
         table << row
       end
 
@@ -88,7 +88,7 @@ def data_for_table(n)
 
     def format_bytes(bytes)
       bytes /= 1024.0
-      "%.2fK" % bytes
+      format("%.2fK", bytes)
     end
   end
 end

From 40ec84cf61e0a9a618127e209619fca63bd80d7c Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 00:08:00 -0500
Subject: [PATCH 0912/4996] Rubocop: Liquid Renderer

---
 .rubocop.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index b7dd25301e9..26505b33708 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -18,8 +18,6 @@ AllCops:
   - lib/jekyll/entry_filter.rb
   - lib/jekyll/filters.rb
   - lib/jekyll/frontmatter_defaults.rb
-  - lib/jekyll/liquid_renderer/table.rb
-  - lib/jekyll/liquid_renderer.rb
   - lib/jekyll/reader.rb
   - lib/jekyll/readers/layout_reader.rb
   - lib/jekyll/readers/page_reader.rb

From 795bcdef686d9be7d0ec9c19c2ea3d42014a5793 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 00:09:46 -0500
Subject: [PATCH 0913/4996] Rubocop: lib/jekyll/reader.rb

---
 lib/jekyll/reader.rb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index c9ded560936..abbe923f6c4 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require 'csv'
+require "csv"
 
 module Jekyll
   class Reader
@@ -16,7 +16,7 @@ def read
       @site.layouts = LayoutReader.new(site).read
       read_directories
       sort_files!
-      @site.data = DataReader.new(site).read(site.config['data_dir'])
+      @site.data = DataReader.new(site).read(site.config["data_dir"])
       CollectionReader.new(site).read
     end
 
@@ -34,13 +34,15 @@ def sort_files!
     # dir - The String relative path of the directory to read. Default: ''.
     #
     # Returns nothing.
-    def read_directories(dir = '')
+    def read_directories(dir = "")
       base = site.in_source_dir(dir)
 
-      dot = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) }
+      dot = Dir.chdir(base) { filter_entries(Dir.entries("."), base) }
       dot_dirs = dot.select { |file| File.directory?(@site.in_source_dir(base, file)) }
       dot_files = (dot - dot_dirs)
-      dot_pages = dot_files.select { |file| Utils.has_yaml_header?(@site.in_source_dir(base, file)) }
+      dot_pages = dot_files.select do |file|
+        Utils.has_yaml_header?(@site.in_source_dir(base, file))
+      end
       dot_static_files = dot_files - dot_pages
 
       retrieve_posts(dir)
@@ -71,7 +73,9 @@ def retrieve_dirs(_base, dir, dot_dirs)
       dot_dirs.map do |file|
         dir_path = site.in_source_dir(dir, file)
         rel_path = File.join(dir, file)
-        @site.reader.read_directories(rel_path) unless @site.dest.sub(/\/$/, '') == dir_path
+        unless @site.dest.sub(%r!/$!, "") == dir_path
+          @site.reader.read_directories(rel_path)
+        end
       end
     end
 
@@ -119,7 +123,7 @@ def filter_entries(entries, base_directory = nil)
     def get_entries(dir, subfolder)
       base = site.in_source_dir(dir, subfolder)
       return [] unless File.exist?(base)
-      entries = Dir.chdir(base) { filter_entries(Dir['**/*'], base) }
+      entries = Dir.chdir(base) { filter_entries(Dir["**/*"], base) }
       entries.delete_if { |e| File.directory?(site.in_source_dir(base, e)) }
     end
   end

From e85690a61f13703da22c609d3a16f05f03c6e5d4 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 00:10:09 -0500
Subject: [PATCH 0914/4996] Rubocop: lib/jekyll/readers/layout_reader.rb

---
 lib/jekyll/readers/layout_reader.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/jekyll/readers/layout_reader.rb b/lib/jekyll/readers/layout_reader.rb
index df8931cb1da..985491c67a7 100644
--- a/lib/jekyll/readers/layout_reader.rb
+++ b/lib/jekyll/readers/layout_reader.rb
@@ -8,11 +8,13 @@ def initialize(site)
 
     def read
       layout_entries.each do |layout_file|
-        @layouts[layout_name(layout_file)] = Layout.new(site, layout_directory, layout_file)
+        @layouts[layout_name(layout_file)] = \
+          Layout.new(site, layout_directory, layout_file)
       end
 
       theme_layout_entries.each do |layout_file|
-        @layouts[layout_name(layout_file)] ||= Layout.new(site, theme_layout_directory, layout_file)
+        @layouts[layout_name(layout_file)] ||= \
+          Layout.new(site, theme_layout_directory, layout_file)
       end
 
       @layouts
@@ -39,7 +41,7 @@ def theme_layout_entries
     def entries_in(dir)
       entries = []
       within(dir) do
-        entries = EntryFilter.new(site).filter(Dir['**/*.*'])
+        entries = EntryFilter.new(site).filter(Dir["**/*.*"])
       end
       entries
     end
@@ -54,15 +56,13 @@ def within(directory)
     end
 
     def layout_directory_inside_source
-      site.in_source_dir(site.config['layouts_dir'])
+      site.in_source_dir(site.config["layouts_dir"])
     end
 
     def layout_directory_in_cwd
-      dir = Jekyll.sanitized_path(Dir.pwd, site.config['layouts_dir'])
+      dir = Jekyll.sanitized_path(Dir.pwd, site.config["layouts_dir"])
       if File.directory?(dir) && !site.safe
         dir
-      else
-        nil
       end
     end
   end

From 615a9ee9ac971668f203db76955a247b08926509 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 00:10:20 -0500
Subject: [PATCH 0915/4996] Rubocop: lib/jekyll/readers/page_reader.rb

---
 lib/jekyll/readers/page_reader.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/readers/page_reader.rb b/lib/jekyll/readers/page_reader.rb
index 97748c01e58..507c609e507 100644
--- a/lib/jekyll/readers/page_reader.rb
+++ b/lib/jekyll/readers/page_reader.rb
@@ -14,7 +14,9 @@ def initialize(site, dir)
     #
     # Returns an array of static pages.
     def read(files)
-      files.map { |page| @unfiltered_content << Page.new(@site, @site.source, @dir, page) }
+      files.map do |page|
+        @unfiltered_content << Page.new(@site, @site.source, @dir, page)
+      end
       @unfiltered_content.select { |page| site.publisher.publish?(page) }
     end
   end

From 0696e6c169ddd8643689386b3470a6130906e3a8 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 00:10:31 -0500
Subject: [PATCH 0916/4996] Rubocop: lib/jekyll/readers/post_reader.rb

---
 lib/jekyll/readers/post_reader.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/readers/post_reader.rb b/lib/jekyll/readers/post_reader.rb
index f7a44ca7131..ec5bc7ad8b9 100644
--- a/lib/jekyll/readers/post_reader.rb
+++ b/lib/jekyll/readers/post_reader.rb
@@ -12,7 +12,7 @@ def initialize(site)
     #
     # Returns nothing.
     def read_drafts(dir)
-      read_publishable(dir, '_drafts', Document::DATELESS_FILENAME_MATCHER)
+      read_publishable(dir, "_drafts", Document::DATELESS_FILENAME_MATCHER)
     end
 
     # Read all the files in /    /_posts and create a new Document
@@ -22,7 +22,7 @@ def read_drafts(dir)
     #
     # Returns nothing.
     def read_posts(dir)
-      read_publishable(dir, '_posts', Document::DATE_FILENAME_MATCHER)
+      read_publishable(dir, "_posts", Document::DATE_FILENAME_MATCHER)
     end
 
     # Read all the files in // and create a new
@@ -32,9 +32,10 @@ def read_posts(dir)
     #
     # Returns nothing.
     def read_publishable(dir, magic_dir, matcher)
-      read_content(dir, magic_dir, matcher).tap do |docs|
+      documents = read_content(dir, magic_dir, matcher).tap do |docs|
         docs.each(&:read)
-      end.select do |doc|
+      end
+      documents.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"
@@ -57,7 +58,7 @@ def read_content(dir, magic_dir, matcher)
         next unless entry =~ matcher
         path = @site.in_source_dir(File.join(dir, magic_dir, entry))
         Document.new(path, {
-          :site => @site,
+          :site       => @site,
           :collection => @site.posts
         })
       end.reject(&:nil?)

From 382be191aed931174e19da4f9edd000665532933 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 00:10:43 -0500
Subject: [PATCH 0917/4996] Rubocop: lib/jekyll/readers/static_file_reader.rb

---
 lib/jekyll/readers/static_file_reader.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/readers/static_file_reader.rb b/lib/jekyll/readers/static_file_reader.rb
index 8def1365ab0..1d43d69c659 100644
--- a/lib/jekyll/readers/static_file_reader.rb
+++ b/lib/jekyll/readers/static_file_reader.rb
@@ -14,7 +14,9 @@ def initialize(site, dir)
     #
     # Returns an array of static files.
     def read(files)
-      files.map { |file| @unfiltered_content << StaticFile.new(@site, @site.source, @dir, file) }
+      files.map do |file|
+        @unfiltered_content << StaticFile.new(@site, @site.source, @dir, file)
+      end
       @unfiltered_content
     end
   end

From 0d0ed561fdf2baa837367d04366388088dab0846 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 00:11:37 -0500
Subject: [PATCH 0918/4996] Rubocop: Readers

---
 .rubocop.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index b7dd25301e9..e4d97d3bf29 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -20,11 +20,6 @@ AllCops:
   - lib/jekyll/frontmatter_defaults.rb
   - lib/jekyll/liquid_renderer/table.rb
   - lib/jekyll/liquid_renderer.rb
-  - lib/jekyll/reader.rb
-  - lib/jekyll/readers/layout_reader.rb
-  - lib/jekyll/readers/page_reader.rb
-  - lib/jekyll/readers/post_reader.rb
-  - lib/jekyll/readers/static_file_reader.rb
   - lib/jekyll/regenerator.rb
   - lib/jekyll/renderer.rb
   - lib/jekyll/site.rb

From d58c986b2b1832a9d50b9a9d96ebc07b2176f1a2 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 00:45:54 -0500
Subject: [PATCH 0919/4996] Rubocop: lib/jekyll/entry_filter.rb

---
 .rubocop.yml               |  1 -
 lib/jekyll/entry_filter.rb | 15 +++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index b7dd25301e9..0b70ad53488 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -15,7 +15,6 @@ AllCops:
   - lib/jekyll/deprecator.rb
   - lib/jekyll/document.rb
   - lib/jekyll/drops/site_drop.rb
-  - lib/jekyll/entry_filter.rb
   - lib/jekyll/filters.rb
   - lib/jekyll/frontmatter_defaults.rb
   - lib/jekyll/liquid_renderer/table.rb
diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb
index 496bf56f2ad..9ec02dd4b09 100644
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -2,7 +2,7 @@ module Jekyll
   class EntryFilter
     attr_reader :site
     SPECIAL_LEADING_CHARACTERS = [
-      '.', '_', '#', '~'
+      ".", "_", '#', "~"
     ].freeze
 
     def initialize(site, base_directory = nil)
@@ -37,8 +37,7 @@ def filter(entries)
 
     def included?(entry)
       glob_include?(site.include,
-        entry
-      )
+        entry)
     end
 
     def special?(entry)
@@ -47,12 +46,17 @@ def special?(entry)
     end
 
     def backup?(entry)
-      entry[-1..-1] == '~'
+      entry[-1..-1] == "~"
     end
 
     def excluded?(entry)
       excluded = glob_include?(site.exclude, relative_to_source(entry))
-      Jekyll.logger.debug "EntryFilter:", "excluded #{relative_to_source(entry)}" if excluded
+      if excluded
+        Jekyll.logger.debug(
+          "EntryFilter:",
+          "excluded #{relative_to_source(entry)}"
+        )
+      end
       excluded
     end
 
@@ -83,7 +87,6 @@ def symlink_outside_site_source?(entry)
     def glob_include?(enum, e)
       entry = Pathutil.new(site.in_source_dir).join(e)
       enum.any? do |exp|
-
         # Users who send a Regexp knows what they want to
         # exclude, so let them send a Regexp to exclude files,
         # we will not bother caring if it works or not, it's

From 38eb326b7f3d5e847e7a67274e3cc33207c36169 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 00:53:15 -0500
Subject: [PATCH 0920/4996] Rubocop: lib/jekyll/converters/markdown.rb

---
 lib/jekyll/converters/markdown.rb | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb
index 6e44b3b2f8c..ab886d06e98 100644
--- a/lib/jekyll/converters/markdown.rb
+++ b/lib/jekyll/converters/markdown.rb
@@ -9,23 +9,33 @@ def setup
         return if @setup ||= false
         unless (@parser = get_processor)
           Jekyll.logger.error "Invalid Markdown processor given:", @config["markdown"]
-          Jekyll.logger.info  "", "Custom processors are not loaded in safe mode" if @config["safe"]
-          Jekyll.logger.error "", "Available processors are: #{valid_processors.join(", ")}"
+          if @config["safe"]
+            Jekyll.logger.info "", "Custom processors are not loaded in safe mode"
+          end
+          Jekyll.logger.error(
+            "",
+            "Available processors are: #{valid_processors.join(", ")}"
+          )
           raise Errors::FatalException, "Bailing out; invalid Markdown processor."
         end
 
         @setup = true
       end
 
+      # 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
       def get_processor
         case @config["markdown"].downcase
         when "redcarpet" then return RedcarpetParser.new(@config)
         when "kramdown"  then return KramdownParser.new(@config)
         when "rdiscount" then return RDiscountParser.new(@config)
         else
-          get_custom_processor
+          custom_processor
         end
       end
+      # rubocop:enable Style/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
@@ -41,13 +51,13 @@ def valid_processors
 
       def third_party_processors
         self.class.constants - \
-        %w(KramdownParser RDiscountParser RedcarpetParser PRIORITIES).map(
-          &:to_sym
-        )
+          %w(KramdownParser RDiscountParser RedcarpetParser PRIORITIES).map(
+            &:to_sym
+          )
       end
 
       def extname_list
-        @extname_list ||= @config['markdown_ext'].split(',').map do |e|
+        @extname_list ||= @config["markdown_ext"].split(",").map do |e|
           ".#{e.downcase}"
         end
       end
@@ -66,7 +76,7 @@ def convert(content)
       end
 
       private
-      def get_custom_processor
+      def custom_processor
         converter_name = @config["markdown"]
         if custom_class_allowed?(converter_name)
           self.class.const_get(converter_name).new(@config)

From 0880dc097f21b3ffd7091d4295dec174b6dde35d Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 00:53:26 -0500
Subject: [PATCH 0921/4996] Rubocop:
 lib/jekyll/converters/markdown/kramdown_parser.rb

---
 lib/jekyll/converters/markdown/kramdown_parser.rb | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index 4d84a5bcb60..6e65d43c79f 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -24,7 +24,8 @@ def initialize(config)
 
         # Setup and normalize the configuration:
         #   * Create Kramdown if it doesn't exist.
-        #   * Set syntax_highlighter, detecting enable_coderay and merging highlighter if none.
+        #   * Set syntax_highlighter, detecting enable_coderay and merging
+        #       highlighter if none.
         #   * Merge kramdown[coderay] into syntax_highlighter_opts stripping coderay_.
         #   * Make sure `syntax_highlighter_opts` exists.
 
@@ -52,7 +53,9 @@ def make_accessible(hash = @config)
           end
         end
 
-        # config[kramdown][syntax_higlighter] > config[kramdown][enable_coderay] > config[highlighter]
+        # config[kramdown][syntax_higlighter] >
+        #   config[kramdown][enable_coderay] >
+        #   config[highlighter]
         # Where `enable_coderay` is now deprecated because Kramdown
         # supports Rouge now too.
 
@@ -68,8 +71,10 @@ def highlighter
 
           @highlighter = begin
             if @config.key?("enable_coderay") && @config["enable_coderay"]
-              Jekyll::Deprecator.deprecation_message "You are using 'enable_coderay', " \
+              Jekyll::Deprecator.deprecation_message(
+                "You are using 'enable_coderay', " \
                 "use syntax_highlighter: coderay in your configuration file."
+              )
 
               "coderay"
             else
@@ -100,8 +105,10 @@ def strip_coderay_prefix(hash)
         private
         def modernize_coderay_config
           if highlighter == "coderay"
-            Jekyll::Deprecator.deprecation_message "You are using 'kramdown.coderay' in your configuration, " \
+            Jekyll::Deprecator.deprecation_message(
+              "You are using 'kramdown.coderay' in your configuration, " \
               "please use 'syntax_highlighter_opts' instead."
+            )
 
             @config["syntax_highlighter_opts"] = begin
               strip_coderay_prefix(

From d855ec03bace66336e1068f77500b0a94d928ceb Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 00:53:38 -0500
Subject: [PATCH 0922/4996] Rubocop:
 lib/jekyll/converters/markdown/redcarpet_parser.rb

---
 .../converters/markdown/redcarpet_parser.rb   | 174 +++++++++---------
 1 file changed, 90 insertions(+), 84 deletions(-)

diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb
index 79133a2abcf..8e7593856e8 100644
--- a/lib/jekyll/converters/markdown/redcarpet_parser.rb
+++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb
@@ -1,102 +1,108 @@
-module Jekyll
-  module Converters
-    class Markdown
-      class RedcarpetParser
-        module CommonMethods
-          def add_code_tags(code, lang)
-            code = code.to_s
-            code = code.sub(/
    /, "
    ")
-            code = code.sub(/<\/pre>/, "
    ")
-            code
-          end
-        end
-
-        module WithPygments
-          include CommonMethods
-          def block_code(code, lang)
-            Jekyll::External.require_with_graceful_fail("pygments")
-            lang = lang && lang.split.first || "text"
-            add_code_tags(
-              Pygments.highlight(code, :lexer => lang, :options => { :encoding => 'utf-8' }),
-              lang
-            )
-          end
-        end
+class Jekyll::Converters::Markdown::RedcarpetParser
+  module CommonMethods
+    def add_code_tags(code, lang)
+      code = code.to_s
+      code = code.sub(
+        /
    /,
+        "
    "
+      )
+      code = code.sub(%r!
    !, "
    ")
+      code
+    end
+  end
 
-        module WithoutHighlighting
-          require 'cgi'
+  module WithPygments
+    include CommonMethods
+    def block_code(code, lang)
+      Jekyll::External.require_with_graceful_fail("pygments")
+      lang = lang && lang.split.first || "text"
+      add_code_tags(
+        Pygments.highlight(
+          code,
+          {
+            :lexer   => lang,
+            :options => { :encoding => "utf-8" }
+          }
+        ),
+        lang
+      )
+    end
+  end
 
-          include CommonMethods
+  module WithoutHighlighting
+    require "cgi"
 
-          def code_wrap(code)
-            "
    #{CGI::escapeHTML(code)}
    "
-          end
+    include CommonMethods
 
-          def block_code(code, lang)
-            lang = lang && lang.split.first || "text"
-            add_code_tags(code_wrap(code), lang)
-          end
-        end
+    def code_wrap(code)
+      "
    #{CGI.escapeHTML(code)}
    "
+    end
 
-        module WithRouge
-          def block_code(code, lang)
-            code = "
    #{super}
    "
+    def block_code(code, lang)
+      lang = lang && lang.split.first || "text"
+      add_code_tags(code_wrap(code), lang)
+    end
+  end
 
-            output = "
    "
-            output << add_code_tags(code, lang)
-            output << "
    "
-          end
+  module WithRouge
+    def block_code(code, lang)
+      code = "
    #{super}
    "
 
-          protected
-          def rouge_formatter(_lexer)
-            Rouge::Formatters::HTML.new(:wrap => false)
-          end
-        end
+      output = "
    "
+      output << add_code_tags(code, lang)
+      output << "
    "
+    end
 
-        def initialize(config)
-          External.require_with_graceful_fail("redcarpet")
-          @config = config
-          @redcarpet_extensions = {}
-          @config['redcarpet']['extensions'].each { |e| @redcarpet_extensions[e.to_sym] = true }
+    protected
+    def rouge_formatter(_lexer)
+      Rouge::Formatters::HTML.new(:wrap => false)
+    end
+  end
 
-          @renderer ||= class_with_proper_highlighter(@config['highlighter'])
-        end
+  def initialize(config)
+    Jekyll::External.require_with_graceful_fail("redcarpet")
+    @config = config
+    @redcarpet_extensions = {}
+    @config["redcarpet"]["extensions"].each do |e|
+      @redcarpet_extensions[e.to_sym] = true
+    end
 
-        def class_with_proper_highlighter(highlighter)
-          case highlighter
-          when "pygments"
-            Class.new(Redcarpet::Render::HTML) do
-              include WithPygments
-            end
-          when "rouge"
-            Class.new(Redcarpet::Render::HTML) do
-              Jekyll::External.require_with_graceful_fail(%w(
-                rouge
-                rouge/plugins/redcarpet
-              ))
+    @renderer ||= class_with_proper_highlighter(@config["highlighter"])
+  end
 
-              unless Gem::Version.new(Rouge.version) > Gem::Version.new("1.3.0")
-                abort "Please install Rouge 1.3.0 or greater and try running Jekyll again."
-              end
+  def class_with_proper_highlighter(highlighter)
+    Class.new(Redcarpet::Render::HTML) do
+      case highlighter
+      when "pygments"
+        include WithPygments
+      when "rouge"
+        Jekyll::External.require_with_graceful_fail(%w(
+          rouge rouge/plugins/redcarpet
+        ))
 
-              include Rouge::Plugins::Redcarpet
-              include CommonMethods
-              include WithRouge
-            end
-          else
-            Class.new(Redcarpet::Render::HTML) do
-              include WithoutHighlighting
-            end
-          end
+        unless Gem::Version.new(Rouge.version) > Gem::Version.new("1.3.0")
+          abort "Please install Rouge 1.3.0 or greater and try running Jekyll again."
         end
 
-        def convert(content)
-          @redcarpet_extensions[:fenced_code_blocks] = !@redcarpet_extensions[:no_fenced_code_blocks]
-          @renderer.send :include, Redcarpet::Render::SmartyPants if @redcarpet_extensions[:smart]
-          markdown = Redcarpet::Markdown.new(@renderer.new(@redcarpet_extensions), @redcarpet_extensions)
-          markdown.render(content)
-        end
+        include Rouge::Plugins::Redcarpet
+        include CommonMethods
+        include WithRouge
+      else
+        include WithoutHighlighting
       end
     end
   end
+
+  def convert(content)
+    @redcarpet_extensions[:fenced_code_blocks] = \
+      !@redcarpet_extensions[:no_fenced_code_blocks]
+    if @redcarpet_extensions[:smart]
+      @renderer.send :include, Redcarpet::Render::SmartyPants
+    end
+    markdown = Redcarpet::Markdown.new(
+      @renderer.new(@redcarpet_extensions),
+      @redcarpet_extensions
+    )
+    markdown.render(content)
+  end
 end

From acc9f511c547ceba7283ff9632e62ddb4a5da7c1 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 00:53:49 -0500
Subject: [PATCH 0923/4996] Rubocop: Converters

---
 .rubocop.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index b7dd25301e9..ce51550b2c8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -7,10 +7,6 @@ AllCops:
   - lib/jekyll/collection.rb
   - lib/jekyll/command.rb
   - lib/jekyll/configuration.rb
-  - lib/jekyll/converters/identity.rb
-  - lib/jekyll/converters/markdown/kramdown_parser.rb
-  - lib/jekyll/converters/markdown/redcarpet_parser.rb
-  - lib/jekyll/converters/markdown.rb
   - lib/jekyll/convertible.rb
   - lib/jekyll/deprecator.rb
   - lib/jekyll/document.rb

From ae71db4693789e1863488cd6c7da8227bc29bfba Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 01:04:12 -0500
Subject: [PATCH 0924/4996] Rubocop: lib/jekyll/stevenson.rb

---
 .rubocop.yml            |  1 -
 lib/jekyll/stevenson.rb | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index b7dd25301e9..bc4cfb51609 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -29,7 +29,6 @@ AllCops:
   - lib/jekyll/renderer.rb
   - lib/jekyll/site.rb
   - lib/jekyll/static_file.rb
-  - lib/jekyll/stevenson.rb
   - lib/jekyll/tags/highlight.rb
   - lib/jekyll/tags/include.rb
   - lib/jekyll/tags/link.rb
diff --git a/lib/jekyll/stevenson.rb b/lib/jekyll/stevenson.rb
index d6dd5434fdb..bf20b22f752 100644
--- a/lib/jekyll/stevenson.rb
+++ b/lib/jekyll/stevenson.rb
@@ -6,13 +6,13 @@ def initialize
       @default_formatter = Formatter.new
       @logdev = $stdout
       @formatter = proc do |_, _, _, msg|
-        "#{msg}"
+        msg.to_s
       end
     end
 
-    def add(severity, message = nil, progname = nil, &block)
+    def add(severity, message = nil, progname = nil)
       severity ||= UNKNOWN
-      @logdev = set_logdevice(severity)
+      @logdev = logdevice(severity)
 
       if @logdev.nil? || severity < @level
         return true
@@ -27,7 +27,8 @@ def add(severity, message = nil, progname = nil, &block)
         end
       end
       @logdev.puts(
-        format_message(format_severity(severity), Time.now, progname, message))
+        format_message(format_severity(severity), Time.now, progname, message)
+      )
       true
     end
 
@@ -47,7 +48,7 @@ def close
 
     private
 
-    def set_logdevice(severity)
+    def logdevice(severity)
       if severity > INFO
         $stderr
       else

From 001cbf2c073301fe3dc6ffd5100b4712fb78adaf Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Thu, 26 May 2016 12:17:31 +0300
Subject: [PATCH 0925/4996] rubocop: fix code style

---
 lib/jekyll/tags/highlight.rb | 2 +-
 lib/jekyll/tags/include.rb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index b22001d3b14..af2a1e107aa 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -65,7 +65,7 @@ def sanitized_opts(opts, is_safe)
 
       def parse_options(input)
         options = {}
-        if defined?(input) && input != ""
+        unless input.empty?
           # Split along 3 possible forms -- key="", key=value, or key
           input.scan(/(?:\w="[^"]*"|\w=\w|\w)+/) do |opt|
             key, value = opt.split("=")
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index 4c4c38a3ef6..b1b02981140 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -28,7 +28,7 @@ def initialize(tag_name, markup, tokens)
           @file = matched["variable"].strip
           @params = matched["params"].strip
         else
-          @file, @params = markup.strip.split(" ", 2)
+          @file, @params = markup.strip.split(/\s+/, 2)
         end
         validate_params if @params
         @tag_name = tag_name

From b5aafc31371dfcf0296d40094da0c2d124e9e0ee Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 26 May 2016 08:24:21 -0700
Subject: [PATCH 0926/4996] Update history to reflect merge of #4951 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0d8ee320ce4..b8759f8d6d4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -71,6 +71,7 @@
   * Rubocop: Low hanging fruit (#4936)
   * Rubocop: `Drop` changes from v3.1 forward-ports (#4949)
   * Rubocop: cleanup for misc files (#4946)
+  * Rubocop: Stevenson (#4951)
 
 ### Site Enhancements
 

From 427e30c0f8a6812a71f1d907fedaf43a8af8992b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 26 May 2016 08:25:56 -0700
Subject: [PATCH 0927/4996] Update history to reflect merge of #4950 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b8759f8d6d4..f68994e5ab8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -72,6 +72,7 @@
   * Rubocop: `Drop` changes from v3.1 forward-ports (#4949)
   * Rubocop: cleanup for misc files (#4946)
   * Rubocop: Stevenson (#4951)
+  * Rubocop: lib/jekyll/entry_filter.rb (#4950)
 
 ### Site Enhancements
 

From ff591dd5dcf362682c9e14509c49819f86f27d9c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 26 May 2016 08:26:43 -0700
Subject: [PATCH 0928/4996] Update history to reflect merge of #4947 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f68994e5ab8..45237811959 100644
--- a/History.markdown
+++ b/History.markdown
@@ -73,6 +73,7 @@
   * Rubocop: cleanup for misc files (#4946)
   * Rubocop: Stevenson (#4951)
   * Rubocop: lib/jekyll/entry_filter.rb (#4950)
+  * Rubocop: test/* (#4947)
 
 ### Site Enhancements
 

From ab3cda6e5838e16a782beb6745c481a256b68e98 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 12:00:01 -0500
Subject: [PATCH 0929/4996] Rubocop: features/support/formatter.rb

---
 features/support/formatter.rb | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/features/support/formatter.rb b/features/support/formatter.rb
index 9e82a4e5c95..8ce03bd10d0 100644
--- a/features/support/formatter.rb
+++ b/features/support/formatter.rb
@@ -1,7 +1,7 @@
-require 'fileutils'
-require 'colorator'
-require 'cucumber/formatter/console'
-require 'cucumber/formatter/io'
+require "fileutils"
+require "colorator"
+require "cucumber/formatter/console"
+require "cucumber/formatter/io"
 
 module Jekyll
   module Cucumber
@@ -17,7 +17,7 @@ class Formatter
         :undefined => "\u2718".red,
         :passed    => "\u2714".green,
         :skipped   => "\u203D".blue
-      }
+      }.freeze
 
       #
 
@@ -34,7 +34,7 @@ def initialize(runtime, path_or_io, options)
 
       #
 
-      def before_features(features)
+      def before_features(_features)
         print_profile_information
       end
 
@@ -47,7 +47,7 @@ def after_features(features)
 
       #
 
-      def before_feature(feature)
+      def before_feature(_feature)
         @exceptions = []
         @indent = 0
       end
@@ -55,20 +55,23 @@ def before_feature(feature)
       #
 
       def tag_name(tag_name); end
+
       def comment_line(comment_line); end
+
       def after_feature_element(feature_element); end
+
       def after_tags(tags); end
 
       #
 
-      def before_feature_element(feature_element)
+      def before_feature_element(_feature_element)
         @indent = 2
         @scenario_indent = 2
       end
 
       #
 
-      def before_background(background)
+      def before_background(_background)
         @scenario_indent = 2
         @in_background = true
         @indent = 2
@@ -76,7 +79,7 @@ def before_background(background)
 
       #
 
-      def after_background(background)
+      def after_background(_background)
         @in_background = nil
       end
 
@@ -104,8 +107,9 @@ def before_step(step)
 
       #
 
-      def before_step_result(keyword, step_match, multiline_arg, status, exception, \
-          source_indent, background, file_colon_line)
+      # rubocop:disable Metrics/ParameterLists
+      def before_step_result(_keyword, _step_match, _multiline_arg, status, exception, \
+              _source_indent, background, _file_colon_line)
 
         @hide_this_step = false
         if exception
@@ -127,10 +131,11 @@ def before_step_result(keyword, step_match, multiline_arg, status, exception, \
 
       #
 
-      def step_name(keyword, step_match, status, source_indent, background, file_colon_line)
+      def step_name(_keyword, _step_match, status, _source_indent, _background, _file_colon_line)
         @io.print CHARS[status]
         @io.print " "
       end
+      # rubocop:enable Metrics/ParameterLists
 
       #
 
@@ -153,7 +158,7 @@ def after_test_step(test_step, result)
       #
 
       private
-      def print_feature_element_name(keyword, name, source_line, indent)
+      def print_feature_element_name(keyword, name, source_line, _indent)
         @io.puts
 
         names = name.empty? ? [name] : name.each_line.to_a

From 45a5a976f0a701021c505e46a54450f2b3522ed5 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 12:00:21 -0500
Subject: [PATCH 0930/4996] Rubocop: features/support/helpers.rb

---
 features/support/helpers.rb | 39 +++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/features/support/helpers.rb b/features/support/helpers.rb
index b8334cfd619..29333075324 100644
--- a/features/support/helpers.rb
+++ b/features/support/helpers.rb
@@ -7,26 +7,31 @@
 class Paths
   SOURCE_DIR = Pathname.new(File.expand_path("../..", __dir__))
   def self.test_dir; source_dir.join("tmp", "jekyll"); end
+
   def self.output_file; test_dir.join("jekyll_output.txt"); end
+
   def self.status_file; test_dir.join("jekyll_status.txt"); end
+
   def self.jekyll_bin; source_dir.join("bin", "jekyll"); end
+
   def self.source_dir; SOURCE_DIR; end
 end
 
 #
 
 def file_content_from_hash(input_hash)
-  matter_hash = input_hash.reject { |k, v| k == "content" }
-  matter = matter_hash.map do |k, v| "#{k}: #{v}\n"
+  matter_hash = input_hash.reject { |k, _v| k == "content" }
+  matter = matter_hash.map do |k, v|
+    "#{k}: #{v}\n"
   end
 
   matter = matter.join.chomp
   content = \
-  if !input_hash['input'] || !input_hash['filter']
-    then input_hash['content']
-    else "{{ #{input_hash['input']} | " \
-      "#{input_hash['filter']} }}"
-  end
+    if !input_hash["input"] || !input_hash["filter"]
+      then input_hash["content"]
+    else "{{ #{input_hash["input"]} | " \
+        "#{input_hash["filter"]} }}"
+    end
 
   Jekyll::Utils.strip_heredoc(<<-EOF)
     ---
@@ -78,7 +83,7 @@ def jekyll_run_status
 #
 
 def run_bundle(args)
-  run_in_shell("bundle", *args.strip.split(' '))
+  run_in_shell("bundle", *args.strip.split(" "))
 end
 
 #
@@ -91,14 +96,13 @@ def run_jekyll(args)
 
 #
 
+# rubocop:disable Metrics/AbcSize
 def run_in_shell(*args)
   i, o, e, p = Open3.popen3(*args)
   out = o.read.strip
   err = e.read.strip
 
-  [i, o, e].each do |m|
-    m.close
-  end
+  [i, o, e].each(&:close)
 
   File.write(Paths.status_file, p.value.exitstatus)
   File.open(Paths.output_file, "wb") do |f|
@@ -110,13 +114,14 @@ def run_in_shell(*args)
 
   p.value
 end
+# rubocop:enable Metrics/AbcSize
 
 #
 
 def slug(title = nil)
   if !title
     then Time.now.strftime("%s%9N") # nanoseconds since the Epoch
-    else title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
+  else title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, "-")
   end
 end
 
@@ -124,12 +129,12 @@ def slug(title = nil)
 
 def location(folder, direction)
   if folder
-    before = folder if direction ==    "in"
+    before = folder if direction == "in"
     after  = folder if direction == "under"
   end
 
-  [before || '.',
-    after || '.']
+  [before || ".",
+    after || "."]
 end
 
 #
@@ -149,13 +154,13 @@ def seconds_agnostic_datetime(datetime = Time.now)
     "#{time}:\\d{2}",
     Regexp.escape(zone)
   ] \
-  .join("\\ ")
+    .join("\\ ")
 end
 
 #
 
 def seconds_agnostic_time(time)
   time = time.strftime("%H:%M:%S") if time.is_a?(Time)
-  hour, minutes, _ = time.split(":")
+  hour, minutes, = time.split(":")
   "#{hour}:#{minutes}"
 end

From 30eebaf5e04f3115b3417b30999368ace3c553e5 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 26 May 2016 12:04:28 -0500
Subject: [PATCH 0931/4996] Rubocop: lib/jekyll/drops/site_drop.rb

---
 .rubocop.yml                  | 1 -
 lib/jekyll/drops/site_drop.rb | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index b06c96248c8..0236b293c27 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -14,7 +14,6 @@ AllCops:
   - lib/jekyll/convertible.rb
   - lib/jekyll/deprecator.rb
   - lib/jekyll/document.rb
-  - lib/jekyll/drops/site_drop.rb
   - lib/jekyll/filters.rb
   - lib/jekyll/frontmatter_defaults.rb
   - lib/jekyll/liquid_renderer/table.rb
diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb
index 7b083126a2f..66366810e62 100644
--- a/lib/jekyll/drops/site_drop.rb
+++ b/lib/jekyll/drops/site_drop.rb
@@ -24,7 +24,9 @@ def posts
       end
 
       def html_pages
-        @site_html_pages ||= @obj.pages.select { |page| page.html? || page.url.end_with?("/") }
+        @site_html_pages ||= @obj.pages.select do |page|
+          page.html? || page.url.end_with?("/")
+        end
       end
 
       def collections

From 753ff9216c243e760f43ab8429594bd834350bd6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 26 May 2016 10:20:43 -0700
Subject: [PATCH 0932/4996] Update history to reflect merge of #4934 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 45237811959..57cb725b6dc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -74,6 +74,7 @@
   * Rubocop: Stevenson (#4951)
   * Rubocop: lib/jekyll/entry_filter.rb (#4950)
   * Rubocop: test/* (#4947)
+  * Rubocop: features (#4934)
 
 ### Site Enhancements
 

From 0ac9c7fe706ba407fa693fac632281a0209cebb6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 26 May 2016 10:21:39 -0700
Subject: [PATCH 0933/4996] Update history to reflect merge of #4933 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 57cb725b6dc..21d94952aa9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -75,6 +75,7 @@
   * Rubocop: lib/jekyll/entry_filter.rb (#4950)
   * Rubocop: test/* (#4947)
   * Rubocop: features (#4934)
+  * Rubocop: Liquid renderer (#4933)
 
 ### Site Enhancements
 

From 632f3fd8de0c63813f46240216cb12905d829968 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 26 May 2016 10:28:22 -0700
Subject: [PATCH 0934/4996] Update history to reflect merge of #4931 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 21d94952aa9..66738fd5bd7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -76,6 +76,7 @@
   * Rubocop: test/* (#4947)
   * Rubocop: features (#4934)
   * Rubocop: Liquid renderer (#4933)
+  * Rubocop: converters (#4931)
 
 ### Site Enhancements
 

From 8c231ed50a22dc3344a4db955baea106d014d5f8 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 26 May 2016 16:03:53 -0700
Subject: [PATCH 0935/4996] Update history to reflect merge of #4948 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 66738fd5bd7..32e353a1116 100644
--- a/History.markdown
+++ b/History.markdown
@@ -77,6 +77,7 @@
   * Rubocop: features (#4934)
   * Rubocop: Liquid renderer (#4933)
   * Rubocop: converters (#4931)
+  * Rubocop: Site Drop (#4948)
 
 ### Site Enhancements
 

From 7a02f29e705df9061744d5dc375fe6965ae353c4 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 26 May 2016 16:06:04 -0700
Subject: [PATCH 0936/4996] Update history to reflect merge of #4938

[ci skip]
---
 History.markdown | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/History.markdown b/History.markdown
index 32e353a1116..71f34765af6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -73,11 +73,12 @@
   * Rubocop: cleanup for misc files (#4946)
   * Rubocop: Stevenson (#4951)
   * Rubocop: lib/jekyll/entry_filter.rb (#4950)
-  * Rubocop: test/* (#4947)
+  * Rubocop: `test/*` (#4947)
   * Rubocop: features (#4934)
   * Rubocop: Liquid renderer (#4933)
   * Rubocop: converters (#4931)
   * Rubocop: Site Drop (#4948)
+  * Rubocop: tags (#4938)
 
 ### Site Enhancements
 

From 3a3405fe51c8ae4510f6b50473557dd6c9ad6248 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 26 May 2016 16:09:56 -0700
Subject: [PATCH 0937/4996] I will chain blocks if I want to chain blocks.

---
 lib/jekyll/readers/post_reader.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/jekyll/readers/post_reader.rb b/lib/jekyll/readers/post_reader.rb
index ec5bc7ad8b9..123709e7374 100644
--- a/lib/jekyll/readers/post_reader.rb
+++ b/lib/jekyll/readers/post_reader.rb
@@ -32,16 +32,14 @@ def read_posts(dir)
     #
     # Returns nothing.
     def read_publishable(dir, magic_dir, matcher)
-      documents = read_content(dir, magic_dir, matcher).tap do |docs|
-        docs.each(&:read)
-      end
-      documents.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"
+      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"
+            end
           end
         end
-      end
     end
 
     # Read all the content files from /    /magic_dir

From ca2abea08618c3ae66fea148c2012876d5e273eb Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 26 May 2016 16:10:53 -0700
Subject: [PATCH 0938/4996] Update history to reflect merge of #4932

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 71f34765af6..6e3b8b31a72 100644
--- a/History.markdown
+++ b/History.markdown
@@ -79,6 +79,7 @@
   * Rubocop: converters (#4931)
   * Rubocop: Site Drop (#4948)
   * Rubocop: tags (#4938)
+  * Rubocop: Readers (#4932)
 
 ### Site Enhancements
 

From 14c1ac388f8fd324599e49ee4416fe5092265a6c Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 26 May 2016 16:18:34 -0700
Subject: [PATCH 0939/4996] Remove extraneously-checked files.

---
 .rubocop.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index f3aae6feeee..84c8d1b7c09 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -21,8 +21,6 @@ AllCops:
   - lib/jekyll/utils.rb
   - lib/jekyll.rb
   - features/step_definitions.rb
-  - features/support/formatter.rb
-  - features/support/helpers.rb
   - bin/**/*
   - benchmark/**/*
   - script/**/*

From f8c038566cd34f37373324401980159cf5735864 Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Thu, 26 May 2016 22:24:04 +0200
Subject: [PATCH 0940/4996] `Serve.process` should receive same config as
 `Build.process`

fixes #4850
---
 lib/jekyll/commands/serve.rb |  2 ++
 test/test_commands_serve.rb  | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 134991b4616..6f1c4a40314 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -33,7 +33,9 @@ def init_with_program(prog)
             cmd.action do |_, opts|
               opts["serving"] = true
               opts["watch"  ] = true unless opts.key?("watch")
+              config = opts["config"]
               Build.process(opts)
+              opts["config"] = config
               Serve.process(opts)
             end
           end
diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb
index 7ffd0a578cd..50fe9f8357e 100644
--- a/test/test_commands_serve.rb
+++ b/test/test_commands_serve.rb
@@ -74,6 +74,20 @@ def custom_opts(what)
         assert custom_opts(opts)[:DirectoryIndex].empty?
       end
 
+      should "keep config between build and serve" do
+        custom_options = {
+          "config"  => %w(_config.yml _development.yml),
+          "serving" => true,
+          "watch"   => false # for not having guard output when running the tests
+        }
+        allow(SafeYAML).to receive(:load_file).and_return({})
+        allow(Jekyll::Commands::Build).to receive(:build).and_return("")
+
+        expect(Jekyll::Commands::Serve).to receive(:process).with(custom_options)
+        @merc.execute(:serve, { "config" => %w(_config.yml _development.yml),
+                                "watch"  => false })
+      end
+
       context "verbose" do
         should "debug when verbose" do
           assert_equal custom_opts({ "verbose" => true })[:Logger].level, 5

From d5d2fd867473fe48702564932d73e58fd628a438 Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Fri, 27 May 2016 13:34:45 +0300
Subject: [PATCH 0941/4996] rubocop: fix code style

---
 .rubocop.yml                 |  1 -
 features/step_definitions.rb | 80 ++++++++++++++++++------------------
 2 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 84c8d1b7c09..d253804ba84 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -20,7 +20,6 @@ AllCops:
   - lib/jekyll/url.rb
   - lib/jekyll/utils.rb
   - lib/jekyll.rb
-  - features/step_definitions.rb
   - bin/**/*
   - benchmark/**/*
   - script/**/*
diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index f609076d9b4..6b8c493ec6c 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -14,24 +14,24 @@
 
 #
 
-Given %r{^I have a blank site in "(.*)"$} do |path|
-  if !File.exist?(path)
+Given(/^I have a blank site in "(.*)"$/) do |path|
+  unless File.exist?(path)
     then FileUtils.mkdir_p(path)
   end
 end
 
 #
 
-Given %r{^I do not have a "(.*)" directory$} do |path|
+Given(/^I do not have a "(.*)" directory$/) do |path|
   Paths.test_dir.join(path).directory?
 end
 
 #
 
-Given %r{^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$} do |file, key, value, text|
+Given(/^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$/) do |file, key, value, text|
   File.write(file, Jekyll::Utils.strip_heredoc(<<-DATA))
     ---
-    #{key || 'layout'}: #{value || 'nil'}
+    #{key || "layout"}: #{value || "nil"}
     ---
 
     #{text}
@@ -40,13 +40,13 @@
 
 #
 
-Given %r{^I have an? "(.*)" file that contains "(.*)"$} do |file, text|
+Given(/^I have an? "(.*)" file that contains "(.*)"$/) do |file, text|
   File.write(file, text)
 end
 
 #
 
-Given %r{^I have an? (.*) (layout|theme) that contains "(.*)"$} do |name, type, text|
+Given(/^I have an? (.*) (layout|theme) that contains "(.*)"$/) do |name, type, text|
   folder = type == "layout" ? "_layouts" : "_theme"
 
   destination_file = Pathname.new(File.join(folder, "#{name}.html"))
@@ -56,33 +56,33 @@
 
 #
 
-Given %r{^I have an? "(.*)" file with content:$} do |file, text|
+Given(/^I have an? "(.*)" file with content:$/) do |file, text|
   File.write(file, text)
 end
 
 #
 
-Given %r{^I have an? (.*) directory$} do |dir|
-  if !File.directory?(dir)
+Given(/^I have an? (.*) directory$/) do |dir|
+  unless File.directory?(dir)
     then FileUtils.mkdir_p(dir)
   end
 end
 
 #
 
-Given %r{^I have the following (draft|page|post)s?(?: (in|under) "([^"]+)")?:$} do |status, direction, folder, table|
+Given(/^I have the following (draft|page|post)s?(?: (in|under) "([^"]+)")?:$/) do |status, direction, folder, table|
   table.hashes.each do |input_hash|
     title = slug(input_hash["title"])
     ext = input_hash["type"] || "markdown"
-    filename = filename = "#{title}.#{ext}" if %w(draft page).include?(status)
+    filename = "#{title}.#{ext}" if %w(draft page).include?(status)
     before, after = location(folder, direction)
     dest_folder = "_drafts" if status == "draft"
-    dest_folder = "_posts"  if status ==  "post"
+    dest_folder = "_posts"  if status == "post"
     dest_folder = "" if status == "page"
 
     if status == "post"
-      parsed_date = Time.xmlschema(input_hash['date']) rescue Time.parse(input_hash['date'])
-      filename = "#{parsed_date.strftime('%Y-%m-%d')}-#{title}.#{ext}"
+      parsed_date = Time.xmlschema(input_hash["date"]) rescue Time.parse(input_hash["date"])
+      filename = "#{parsed_date.strftime("%Y-%m-%d")}-#{title}.#{ext}"
     end
 
     path = File.join(before, dest_folder, after, filename)
@@ -92,19 +92,19 @@
 
 #
 
-Given %r{^I have a configuration file with "(.*)" set to "(.*)"$} do |key, value|
+Given(/^I have a configuration file with "(.*)" set to "(.*)"$/) do |key, value|
   config = if source_dir.join("_config.yml").exist?
-    SafeYAML.load_file(source_dir.join("_config.yml"))
-  else
-    {}
-  end
+             SafeYAML.load_file(source_dir.join("_config.yml"))
+           else
+             {}
+           end
   config[key] = YAML.load(value)
   File.write("_config.yml", YAML.dump(config))
 end
 
 #
 
-Given %r{^I have a configuration file with:$} do |table|
+Given(/^I have a configuration file with:$/) do |table|
   table.hashes.each do |row|
     step %(I have a configuration file with "#{row["key"]}" set to "#{row["value"]}")
   end
@@ -112,7 +112,7 @@
 
 #
 
-Given %r{^I have a configuration file with "([^\"]*)" set to:$} do |key, table|
+Given(/^I have a configuration file with "([^\"]*)" set to:$/) do |key, table|
   File.open("_config.yml", "w") do |f|
     f.write("#{key}:\n")
     table.hashes.each do |row|
@@ -123,20 +123,20 @@
 
 #
 
-Given %r{^I have fixture collections$} do
+Given(/^I have fixture collections$/) do
   FileUtils.cp_r Paths.source_dir.join("test", "source", "_methods"), source_dir
   FileUtils.cp_r Paths.source_dir.join("test", "source", "_thanksgiving"), source_dir
 end
 
 #
 
-Given %r{^I wait (\d+) second(s?)$} do |time, plural|
+Given(/^I wait (\d+) second(s?)$/) do |time, _|
   sleep(time.to_f)
 end
 
 #
 
-When %r{^I run jekyll(.*)$} do |args|
+When(/^I run jekyll(.*)$/) do |args|
   run_jekyll(args)
   if args.include?("--verbose") || ENV["DEBUG"]
     $stderr.puts "\n#{jekyll_run_output}\n"
@@ -145,16 +145,16 @@
 
 #
 
-When %r{^I run bundle(.*)$} do |args|
+When(/^I run bundle(.*)$/) do |args|
   run_bundle(args)
-  if args.include?("--verbose") || ENV['DEBUG']
+  if args.include?("--verbose") || ENV["DEBUG"]
     $stderr.puts "\n#{jekyll_run_output}\n"
   end
 end
 
 #
 
-When %r{^I change "(.*)" to contain "(.*)"$} do |file, text|
+When(/^I change "(.*)" to contain "(.*)"$/) do |file, text|
   File.open(file, "a") do |f|
     f.write(text)
   end
@@ -162,13 +162,13 @@
 
 #
 
-When %r{^I delete the file "(.*)"$} do |file|
+When(/^I delete the file "(.*)"$/) do |file|
   File.delete(file)
 end
 
 #
 
-Then %r{^the (.*) directory should +(not )?exist$} do |dir, negative|
+Then(/^the (.*) directory should +(not )?exist$/) do |dir, negative|
   if negative.nil?
     expect(Pathname.new(dir)).to exist
   else
@@ -177,7 +177,7 @@
 end
 
 #
-Then %r{^I should (not )?see "(.*)" in "(.*)"$} do |negative, text, file|
+Then(/^I should (not )?see "(.*)" in "(.*)"$/) do |negative, text, file|
   step %(the "#{file}" file should exist)
   regexp = Regexp.new(text, Regexp::MULTILINE)
   if negative.nil? || negative.empty?
@@ -189,20 +189,20 @@
 
 #
 
-Then %r{^I should see exactly "(.*)" in "(.*)"$} do |text, file|
+Then(/^I should see exactly "(.*)" in "(.*)"$/) do |text, file|
   step %(the "#{file}" file should exist)
   expect(file_contents(file).strip).to eq text
 end
 
 #
 
-Then %r{^I should see escaped "(.*)" in "(.*)"$} do |text, file|
+Then(/^I should see escaped "(.*)" in "(.*)"$/) do |text, file|
   step %(I should see "#{Regexp.escape(text)}" in "#{file}")
 end
 
 #
 
-Then %r{^the "(.*)" file should +(not )?exist$} do |file, negative|
+Then(/^the "(.*)" file should +(not )?exist$/) do |file, negative|
   if negative.nil?
     expect(Pathname.new(file)).to exist
   else
@@ -212,19 +212,19 @@
 
 #
 
-Then %r{^I should see today's time in "(.*)"$} do |file|
+Then(/^I should see today's time in "(.*)"$/) do |file|
   step %(I should see "#{seconds_agnostic_time(Time.now)}" in "#{file}")
 end
 
 #
 
-Then %r{^I should see today's date in "(.*)"$} do |file|
-  step %(I should see "#{Date.today.to_s}" in "#{file}")
+Then(/^I should see today's date in "(.*)"$/) do |file|
+  step %(I should see "#{Date.today}" in "#{file}")
 end
 
 #
 
-Then %r{^I should (not )?see "(.*)" in the build output$} do |negative, text|
+Then(/^I should (not )?see "(.*)" in the build output$/) do |negative, text|
   if negative.nil? || negative.empty?
     expect(jekyll_run_output).to match Regexp.new(text)
   else
@@ -234,12 +234,12 @@
 
 #
 
-Then %r{^I should get a zero exit(?:\-| )status$} do
+Then(/^I should get a zero exit(?:\-| )status$/) do
   step %(I should see "EXIT STATUS: 0" in the build output)
 end
 
 #
 
-Then %r{^I should get a non-zero exit(?:\-| )status$} do
+Then(/^I should get a non-zero exit(?:\-| )status$/) do
   step %(I should not see "EXIT STATUS: 0" in the build output)
 end

From 22982ef79ea8a6c70bc64bb3c030011cc2d0b54b Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Fri, 27 May 2016 13:59:18 +0300
Subject: [PATCH 0942/4996] rubocop: fix over tabbed variable assignment

---
 features/step_definitions.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index 6b8c493ec6c..ce42725dec2 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -93,11 +93,12 @@
 #
 
 Given(/^I have a configuration file with "(.*)" set to "(.*)"$/) do |key, value|
-  config = if source_dir.join("_config.yml").exist?
-             SafeYAML.load_file(source_dir.join("_config.yml"))
-           else
-             {}
-           end
+  config = \
+    if source_dir.join("_config.yml").exist?
+      SafeYAML.load_file(source_dir.join("_config.yml"))
+    else
+      {}
+    end
   config[key] = YAML.load(value)
   File.write("_config.yml", YAML.dump(config))
 end

From b5cec7d33569772b68d6148eb97894ac4b14ec81 Mon Sep 17 00:00:00 2001
From: Derek Gottlieb 
Date: Sat, 28 May 2016 13:51:13 -0500
Subject: [PATCH 0943/4996] lib/jekyll/theme.rb passing rubocop

---
 .rubocop.yml        | 1 -
 lib/jekyll/theme.rb | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 84c8d1b7c09..2665a743c5f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -16,7 +16,6 @@ AllCops:
   - lib/jekyll/renderer.rb
   - lib/jekyll/site.rb
   - lib/jekyll/static_file.rb
-  - lib/jekyll/theme.rb
   - lib/jekyll/url.rb
   - lib/jekyll/utils.rb
   - lib/jekyll.rb
diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb
index ed9cc68dd74..90536de7068 100644
--- a/lib/jekyll/theme.rb
+++ b/lib/jekyll/theme.rb
@@ -27,7 +27,7 @@ def sass_path
 
     def configure_sass
       return unless sass_path
-      require 'sass'
+      require "sass"
       Sass.load_paths << sass_path
     end
 
@@ -38,7 +38,7 @@ def path_for(folder)
       return unless resolved_dir
 
       path = Jekyll.sanitized_path(root, resolved_dir)
-      path if Dir.exists?(path)
+      path if Dir.exist?(path)
     end
 
     def realpath_for(folder)
@@ -50,7 +50,8 @@ def realpath_for(folder)
     def gemspec
       @gemspec ||= Gem::Specification.find_by_name(name)
     rescue Gem::LoadError
-      raise Jekyll::Errors::MissingDependencyException, "The #{name} theme could not be found."
+      raise Jekyll::Errors::MissingDependencyException,
+        "The #{name} theme could not be found."
     end
   end
 end

From 5dfaa66d48b05fc4542804aece57b770389130e5 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Sat, 28 May 2016 15:18:37 -0500
Subject: [PATCH 0944/4996] Failing test: markdownify a number

---
 test/test_filters.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index a2184c371d7..66c7c55161a 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -40,6 +40,13 @@ def initialize(opts = {})
       )
     end
 
+    should "markdownify with a number" do
+      assert_equal(
+        "
    404
    \n",
+        @filter.markdownify(404)
+      )
+    end
+
     context "smartify filter" do
       should "convert quotes and typographic characters" do
         assert_equal(
@@ -81,6 +88,13 @@ def initialize(opts = {})
         assert_equal "5 > 4", @filter.smartify("5 > 4")
         assert_equal "This & that", @filter.smartify("This & that")
       end
+
+      should "convert a number to a string" do
+        assert_equal(
+          "404",
+          @filter.smartify(404)
+        )
+      end
     end
 
     should "sassify with simple string" do

From 714c99b418b03d7b131ebbafaf5e2e580d6d377d Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Sat, 28 May 2016 15:19:15 -0500
Subject: [PATCH 0945/4996] Convert input to string before markdownify or
 smartify

---
 lib/jekyll/filters.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 65fc7e41049..3c5d125d28b 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -13,7 +13,7 @@ module Filters
     def markdownify(input)
       site = @context.registers[:site]
       converter = site.find_converter_instance(Jekyll::Converters::Markdown)
-      converter.convert(input)
+      converter.convert(input.to_s)
     end
 
     # Convert quotes into smart quotes.
@@ -24,7 +24,7 @@ def markdownify(input)
     def smartify(input)
       site = @context.registers[:site]
       converter = site.find_converter_instance(Jekyll::Converters::SmartyPants)
-      converter.convert(input)
+      converter.convert(input.to_s)
     end
 
     # Convert a Sass string into CSS output.

From 03f7bc1a8c802e095aed58efe758bbc8b71e30ec Mon Sep 17 00:00:00 2001
From: Derek Gottlieb 
Date: Sat, 28 May 2016 17:15:33 -0500
Subject: [PATCH 0946/4996] lib/jekyll/url.rb passing rubocop

---
 .rubocop.yml      |  1 -
 lib/jekyll/url.rb | 24 ++++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2665a743c5f..8189e48e928 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -16,7 +16,6 @@ AllCops:
   - lib/jekyll/renderer.rb
   - lib/jekyll/site.rb
   - lib/jekyll/static_file.rb
-  - lib/jekyll/url.rb
   - lib/jekyll/utils.rb
   - lib/jekyll.rb
   - features/step_definitions.rb
diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 09975e3d404..c736c0a689d 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -1,4 +1,4 @@
-require 'uri'
+require "uri"
 
 # Public: Methods that generate a URL for a resource such as a Post or a Page.
 #
@@ -67,10 +67,10 @@ def generate_url(template)
 
     def generate_url_from_hash(template)
       @placeholders.inject(template) do |result, token|
-        break result if result.index(':').nil?
+        break result if result.index(":").nil?
         if token.last.nil?
-          # Remove leading '/' to avoid generating urls with `//`
-          result.gsub(/\/:#{token.first}/, '')
+          # Remove leading "/" to avoid generating urls with `//`
+          result.gsub(%r!/:#{token.first}!, "")
         else
           result.gsub(/:#{token.first}/, self.class.escape_path(token.last))
         end
@@ -78,21 +78,21 @@ def generate_url_from_hash(template)
     end
 
     def generate_url_from_drop(template)
-      template.gsub(/:([a-z_]+)/.freeze) do |match|
-        replacement = @placeholders.public_send(match.sub(':'.freeze, ''.freeze))
+      template.gsub(/:([a-z_]+)/) do |match|
+        replacement = @placeholders.public_send(match.sub(":".freeze, "".freeze))
         if replacement.nil?
-          ''.freeze
+          "".freeze
         else
           self.class.escape_path(replacement)
         end
-      end.gsub(/\/\//.freeze, '/'.freeze)
+      end.gsub(%r!//!, "/".freeze)
     end
 
     # Returns a sanitized String URL, stripping "../../" and multiples of "/",
     # as well as the beginning "/" so we can enforce and ensure it.
 
     def sanitize_url(str)
-      "/" + str.gsub(/\/{2,}/, "/").gsub(/\.+\/|\A\/+/, "")
+      "/" + str.gsub(%r!/{2,}!, "/").gsub(%r!\.+\/|\A\/+!, "")
     end
 
     # Escapes a path to be a valid URL path segment
@@ -106,7 +106,7 @@ def sanitize_url(str)
     #
     # Returns the escaped path.
     def self.escape_path(path)
-      # Because URI.escape doesn't escape '?', '[' and ']' by default,
+      # Because URI.escape doesn't escape "?", "[" and "]" by default,
       # specify unsafe string (except unreserved, sub-delims, ":", "@" and "/").
       #
       # URI path segment is defined in RFC 3986 as follows:
@@ -116,7 +116,7 @@ def self.escape_path(path)
       #   pct-encoded   = "%" HEXDIG HEXDIG
       #   sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
       #                 / "*" / "+" / "," / ";" / "="
-      URI.escape(path, /[^a-zA-Z\d\-._~!$&'()*+,;=:@\/]/).encode('utf-8')
+      URI.escape(path, %r{[^a-zA-Z\d\-._~!$&'()*+,;=:@\/]}).encode("utf-8")
     end
 
     # Unescapes a URL path segment
@@ -130,7 +130,7 @@ def self.escape_path(path)
     #
     # Returns the unescaped path.
     def self.unescape_path(path)
-      URI.unescape(path.encode('utf-8'))
+      URI.unescape(path.encode("utf-8"))
     end
   end
 end

From db6050768d461e3d340bb1f197a8e5716bfdf55b Mon Sep 17 00:00:00 2001
From: Derek Gottlieb 
Date: Sat, 28 May 2016 19:23:23 -0500
Subject: [PATCH 0947/4996] Feedback for flubbed regex and prefer File's
 directory check

---
 lib/jekyll/theme.rb | 2 +-
 lib/jekyll/url.rb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb
index 90536de7068..4cd2d1634c9 100644
--- a/lib/jekyll/theme.rb
+++ b/lib/jekyll/theme.rb
@@ -38,7 +38,7 @@ def path_for(folder)
       return unless resolved_dir
 
       path = Jekyll.sanitized_path(root, resolved_dir)
-      path if Dir.exist?(path)
+      path if File.directory?(path)
     end
 
     def realpath_for(folder)
diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index c736c0a689d..ba1abbd40a0 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -92,7 +92,7 @@ def generate_url_from_drop(template)
     # as well as the beginning "/" so we can enforce and ensure it.
 
     def sanitize_url(str)
-      "/" + str.gsub(%r!/{2,}!, "/").gsub(%r!\.+\/|\A\/+!, "")
+      "/" + str.gsub(%r!/{2,}!, "/").gsub(%r!\.+/|\A/+!, "")
     end
 
     # Escapes a path to be a valid URL path segment

From 5acac4a9259bd25e24eaa59fec42d7f1f37fb65a Mon Sep 17 00:00:00 2001
From: Sam Dutton 
Date: Mon, 30 May 2016 09:20:42 +0100
Subject: [PATCH 0948/4996] Minor tweak to fix missing apostrophne

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

diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index 1ff520de481..c125562dc09 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -462,7 +462,7 @@ defaults:
   
    
 
 
-Here, we are scoping the `values` to any file that exists in the scopes path. Since the path is set as an empty string, it will apply to **all files** in your project. You probably don't want to set a layout on every file in your project - like css files, for example - so you can also specify a `type` value under the `scope` key.
+Here, we are scoping the `values` to any file that exists in the path `scope`. Since the path is set as an empty string, it will apply to **all files** in your project. You probably don't want to set a layout on every file in your project - like css files, for example - so you can also specify a `type` value under the `scope` key.
 
 {% highlight yaml %}
 defaults:

From 372f350a75459e0999d7e00c4b5a7ef49cb388dc Mon Sep 17 00:00:00 2001
From: Alex Kitchens 
Date: Tue, 31 May 2016 10:44:53 -0500
Subject: [PATCH 0949/4996] Remove a Broken Link for Refheap Plugin

The refheap_tag repository no longer exists, and I am not able to find a duplicate repository to replace the link.
---
 site/_docs/plugins.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 053be71336e..18efecf4b57 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -827,7 +827,6 @@ LESS.js files during generation.
 - [Jekyll-citation](https://github.com/archome/jekyll-citation): Render BibTeX-formatted bibliographies/citations included in posts and pages (pure Ruby).
 - [Jekyll Dribbble Set Tag](https://github.com/ericdfields/Jekyll-Dribbble-Set-Tag): Builds Dribbble image galleries from any user.
 - [Debbugs](https://gist.github.com/2218470): Allows posting links to Debian BTS easily.
-- [Refheap_tag](https://github.com/aburdette/refheap_tag): Liquid tag that allows embedding pastes from [refheap](https://www.refheap.com/).
 - [Jekyll-devonly_tag](https://gist.github.com/2403522): A block tag for including markup only during development.
 - [JekyllGalleryTag](https://github.com/redwallhp/JekyllGalleryTag) by [redwallhp](https://github.com/redwallhp): Generates thumbnails from a directory of images and displays them in a grid.
 - [Youku and Tudou Embed](https://gist.github.com/Yexiaoxing/5891929): Liquid plugin for embedding Youku and Tudou videos.

From e97fd34479859f6c9e961700d93e57c8a4561d18 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 31 May 2016 08:50:28 -0700
Subject: [PATCH 0950/4996] Update history to reflect merge of #4971 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6e3b8b31a72..9b303995d79 100644
--- a/History.markdown
+++ b/History.markdown
@@ -122,6 +122,7 @@
   * Removed extra `
    ` from `site/_docs/permalinks.md` (#4890)
   * Add pubstorm deployment instructions to docs (#4881)
   * Corrected pagination docs for hidden: true feature (#4903)
+  * Remove a Broken Link for Refheap Plugin (#4971)
 
 ## 3.1.6 / 2016-05-19
 

From 06cff8f781525d0e259e7297070cdd147dd525ea Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Wed, 1 Jun 2016 18:20:35 +0300
Subject: [PATCH 0951/4996] rubocop: fix code style

---
 .rubocop.yml       |   3 +-
 lib/jekyll/site.rb | 135 +++++++++++++++++++++++++++++----------------
 2 files changed, 88 insertions(+), 50 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 84c8d1b7c09..a159185c8ff 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -14,7 +14,6 @@ AllCops:
   - lib/jekyll/frontmatter_defaults.rb
   - lib/jekyll/regenerator.rb
   - lib/jekyll/renderer.rb
-  - lib/jekyll/site.rb
   - lib/jekyll/static_file.rb
   - lib/jekyll/theme.rb
   - lib/jekyll/url.rb
@@ -34,7 +33,7 @@ Lint/UselessAccessModifier:
 Metrics/AbcSize:
   Max: 20
 Metrics/ClassLength:
-  Max: 240
+  Max: 300
   Exclude:
   - !ruby/regexp /features\/.*.rb$/
   - !ruby/regexp /test\/.*.rb$/
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index f2025c13a78..978f64a6afd 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require 'csv'
+require "csv"
 
 module Jekyll
   class Site
@@ -18,8 +18,8 @@ class Site
     # config - A Hash containing site configuration details.
     def initialize(config)
       # Source and destination may not be changed after the site has been created.
-      @source          = File.expand_path(config['source']).freeze
-      @dest            = File.expand_path(config['destination']).freeze
+      @source          = File.expand_path(config["source"]).freeze
+      @dest            = File.expand_path(config["destination"]).freeze
 
       self.config = config
 
@@ -49,19 +49,12 @@ def config=(config)
         self.send("#{opt}=", config[opt])
       end
 
-      self.plugin_manager = Jekyll::PluginManager.new(self)
-      self.plugins        = plugin_manager.plugins_path
-
-      self.theme = nil
-      self.theme = Jekyll::Theme.new(config["theme"]) if config["theme"]
-
-      @includes_load_paths = Array(in_source_dir(config["includes_dir"].to_s))
-      @includes_load_paths << theme.includes_path if self.theme
-
-      self.file_read_opts = {}
-      self.file_read_opts[:encoding] = config['encoding'] if config['encoding']
+      configure_plugins
+      configure_theme
+      configure_include_paths
+      configure_file_read_opts
 
-      self.permalink_style = config['permalink'].to_sym
+      self.permalink_style = config["permalink"].to_sym
 
       @config
     end
@@ -80,7 +73,7 @@ def process
     end
 
     def print_stats
-      if @config['profile']
+      if @config["profile"]
         puts @liquid_renderer.stats_table
       end
     end
@@ -89,7 +82,11 @@ def print_stats
     #
     # Returns nothing
     def reset
-      self.time = (config['time'] ? Utils.parse_date(config['time'].to_s, "Invalid time in _config.yml.") : Time.now)
+      if config["time"]
+        self.time = Utils.parse_date(config["time"].to_s, "Invalid time in _config.yml.")
+      else
+        self.time = Time.now
+      end
       self.layouts = {}
       self.pages = []
       self.static_files = []
@@ -123,18 +120,23 @@ def ensure_not_in_dest
       dest_pathname = Pathname.new(dest)
       Pathname.new(source).ascend do |path|
         if path == dest_pathname
-          raise Errors::FatalException.new "Destination directory cannot be or contain the Source directory."
+          raise(
+            Errors::FatalException,
+            "Destination directory cannot be or contain the Source directory."
+          )
         end
       end
     end
 
     # The list of collections and their corresponding Jekyll::Collection instances.
-    # If config['collections'] is set, a new instance is created for each item in the collection.
-    # If config['collections'] is not set, a new hash is returned.
+    # If config['collections'] is set, a new instance is created
+    # for each item in the collection, a new hash is returned otherwise.
     #
     # Returns a Hash containing collection name-to-instance pairs.
     def collections
-      @collections ||= Hash[collection_names.map { |coll| [coll, Jekyll::Collection.new(self, coll)] } ]
+      @collections ||= Hash[collection_names.map do |coll|
+        [coll, Jekyll::Collection.new(self, coll)]
+      end]
     end
 
     # The list of collection names.
@@ -142,11 +144,11 @@ def collections
     # Returns an array of collection names from the configuration,
     #   or an empty array if the `collections` key is not set.
     def collection_names
-      case config['collections']
+      case config["collections"]
       when Hash
-        config['collections'].keys
+        config["collections"].keys
       when Array
-        config['collections']
+        config["collections"]
       when nil
         []
       else
@@ -182,26 +184,15 @@ def render
 
       Jekyll::Hooks.trigger :site, :pre_render, self, payload
 
-      collections.each do |_, collection|
-        collection.docs.each do |document|
-          if regenerator.regenerate?(document)
-            document.output = Jekyll::Renderer.new(self, document, payload).run
-            document.trigger_hooks(:post_render)
-          end
-        end
-      end
-
-      pages.flatten.each do |page|
-        if regenerator.regenerate?(page)
-          page.output = Jekyll::Renderer.new(self, page, payload).run
-          page.trigger_hooks(:post_render)
-        end
-      end
+      render_docs(payload)
+      render_pages(payload)
 
       Jekyll::Hooks.trigger :site, :post_render, self, payload
+    # rubocop: disable HandleExceptions
     rescue Errno::ENOENT
       # ignore missing layout dir
     end
+    # rubocop: enable HandleExceptions
 
     # Remove orphaned files and empty directories in destination.
     #
@@ -222,7 +213,7 @@ def write
     end
 
     def posts
-      collections['posts'] ||= Collection.new(self, 'posts')
+      collections["posts"] ||= Collection.new(self, "posts")
     end
 
     # Construct a Hash of Posts indexed by the specified Post attribute.
@@ -242,17 +233,19 @@ def post_attr_hash(post_attr)
       # Build a hash map based on the specified post attribute ( post attr =>
       # array of posts ) then sort each array in reverse order.
       hash = Hash.new { |h, key| h[key] = [] }
-      posts.docs.each { |p| p.data[post_attr].each { |t| hash[t] << p } if p.data[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
     end
 
     def tags
-      post_attr_hash('tags')
+      post_attr_hash("tags")
     end
 
     def categories
-      post_attr_hash('categories')
+      post_attr_hash("categories")
     end
 
     # Prepare site data for site payload. The method maintains backward compatibility
@@ -260,7 +253,7 @@ def categories
     #
     # Returns the Hash to be hooked to site.data.
     def site_data
-      config['data'] || data
+      config["data"] || data
     end
 
     # The Hash payload containing site-wide data.
@@ -306,7 +299,7 @@ def instantiate_subclasses(klass)
     #
     # Returns
     def relative_permalinks_are_deprecated
-      if config['relative_permalinks']
+      if config["relative_permalinks"]
         Jekyll.logger.abort_with "Since v3.0, permalinks for pages" \
                                 " in subfolders must be relative to the" \
                                 " site source directory, not the parent" \
@@ -351,7 +344,7 @@ def frontmatter_defaults
     #
     # Returns a Boolean: true for a full rebuild, false for normal build
     def incremental?(override = {})
-      override['incremental'] || config['incremental']
+      override["incremental"] || config["incremental"]
     end
 
     # Returns the publisher or creates a new publisher if it doesn't
@@ -399,11 +392,10 @@ def in_dest_dir(*paths)
       end
     end
 
-    private
-
     # Limits the current posts; removes the posts which exceed the limit_posts
     #
     # Returns nothing
+    private
     def limit_posts!
       if limit_posts > 0
         limit = posts.docs.length < limit_posts ? posts.docs.length : limit_posts
@@ -415,8 +407,55 @@ def limit_posts!
     # already exist.
     #
     # Returns The Cleaner
+    private
     def site_cleaner
       @site_cleaner ||= Cleaner.new(self)
     end
+
+    private
+    def configure_plugins
+      self.plugin_manager = Jekyll::PluginManager.new(self)
+      self.plugins        = plugin_manager.plugins_path
+    end
+
+    private
+    def configure_theme
+      self.theme = nil
+      self.theme = Jekyll::Theme.new(config["theme"]) if config["theme"]
+    end
+
+    private
+    def configure_include_paths
+      @includes_load_paths = Array(in_source_dir(config["includes_dir"].to_s))
+      @includes_load_paths << theme.includes_path if self.theme
+    end
+
+    private
+    def configure_file_read_opts
+      self.file_read_opts = {}
+      self.file_read_opts[:encoding] = config["encoding"] if config["encoding"]
+    end
+
+    private
+    def render_docs(payload)
+      collections.each do |_, collection|
+        collection.docs.each do |document|
+          if regenerator.regenerate?(document)
+            document.output = Jekyll::Renderer.new(self, document, payload).run
+            document.trigger_hooks(:post_render)
+          end
+        end
+      end
+    end
+
+    private
+    def render_pages(payload)
+      pages.flatten.each do |page|
+        if regenerator.regenerate?(page)
+          page.output = Jekyll::Renderer.new(self, page, payload).run
+          page.trigger_hooks(:post_render)
+        end
+      end
+    end
   end
 end

From 597e8ee5d553ec35a23d79eae392748220709520 Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Thu, 2 Jun 2016 16:12:16 +0300
Subject: [PATCH 0952/4996] rubocop: fix code style

---
 .rubocop.yml                       |  1 -
 lib/jekyll/frontmatter_defaults.rb | 83 ++++++++++++++++--------------
 2 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 84c8d1b7c09..b85e8b99725 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -11,7 +11,6 @@ AllCops:
   - lib/jekyll/deprecator.rb
   - lib/jekyll/document.rb
   - lib/jekyll/filters.rb
-  - lib/jekyll/frontmatter_defaults.rb
   - lib/jekyll/regenerator.rb
   - lib/jekyll/renderer.rb
   - lib/jekyll/site.rb
diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb
index 22df50f2694..27dab903b07 100644
--- a/lib/jekyll/frontmatter_defaults.rb
+++ b/lib/jekyll/frontmatter_defaults.rb
@@ -11,37 +11,42 @@ def initialize(site)
     end
 
     def update_deprecated_types(set)
-      return set unless set.key?('scope') && set['scope'].key?('type')
-
-      set['scope']['type'] =
-        case set['scope']['type']
-        when 'page'
-          Deprecator.defaults_deprecate_type('page', 'pages')
-          'pages'
-        when 'post'
-          Deprecator.defaults_deprecate_type('post', 'posts')
-          'posts'
-        when 'draft'
-          Deprecator.defaults_deprecate_type('draft', 'drafts')
-          'drafts'
+      return set unless set.key?("scope") && set["scope"].key?("type")
+
+      set["scope"]["type"] =
+        case set["scope"]["type"]
+        when "page"
+          Deprecator.defaults_deprecate_type("page", "pages")
+          "pages"
+        when "post"
+          Deprecator.defaults_deprecate_type("post", "posts")
+          "posts"
+        when "draft"
+          Deprecator.defaults_deprecate_type("draft", "drafts")
+          "drafts"
         else
-          set['scope']['type']
+          set["scope"]["type"]
         end
 
       set
     end
 
     def ensure_time!(set)
-      return set unless set.key?('values') && set['values'].key?('date')
-      return set if set['values']['date'].is_a?(Time)
-      set['values']['date'] = Utils.parse_date(set['values']['date'], "An invalid date format was found in a front-matter default set: #{set}")
+      return set unless set.key?("values") && set["values"].key?("date")
+      return set if set["values"]["date"].is_a?(Time)
+      set["values"]["date"] = Utils.parse_date(
+        set["values"]["date"],
+        "An invalid date format was found in a front-matter default set: #{set}"
+      )
       set
     end
 
     # Finds a default value for a given setting, filtered by path and type
     #
-    # path - the path (relative to the source) of the page, post or :draft the default is used in
-    # type - a symbol indicating whether a :page, a :post or a :draft calls this method
+    # path - the path (relative to the source) of the page,
+    # post or :draft the default is used in
+    # type - a symbol indicating whether a :page,
+    # a :post or a :draft calls this method
     #
     # Returns the default value or nil if none was found
     def find(path, type, setting)
@@ -49,9 +54,9 @@ def find(path, type, setting)
       old_scope = nil
 
       matching_sets(path, type).each do |set|
-        if set['values'].key?(setting) && has_precedence?(old_scope, set['scope'])
-          value = set['values'][setting]
-          old_scope = set['scope']
+        if set["values"].key?(setting) && precedence?(old_scope, set["scope"])
+          value = set["values"][setting]
+          old_scope = set["scope"]
         end
       end
       value
@@ -67,11 +72,11 @@ def all(path, type)
       defaults = {}
       old_scope = nil
       matching_sets(path, type).each do |set|
-        if has_precedence?(old_scope, set['scope'])
-          defaults = Utils.deep_merge_hashes(defaults, set['values'])
-          old_scope = set['scope']
+        if precedence?(old_scope, set["scope"])
+          defaults = Utils.deep_merge_hashes(defaults, set["values"])
+          old_scope = set["scope"]
         else
-          defaults = Utils.deep_merge_hashes(set['values'], defaults)
+          defaults = Utils.deep_merge_hashes(set["values"], defaults)
         end
       end
       defaults
@@ -91,9 +96,9 @@ def applies?(scope, path, type)
     end
 
     def applies_path?(scope, path)
-      return true if !scope.key?('path') || scope['path'].empty?
+      return true if !scope.key?("path") || scope["path"].empty?
 
-      scope_path = Pathname.new(scope['path'])
+      scope_path = Pathname.new(scope["path"])
       Pathname.new(sanitize_path(path)).ascend do |ascended_path|
         if ascended_path.to_s == scope_path.to_s
           return true
@@ -113,7 +118,7 @@ def applies_path?(scope, path)
     # Returns true if either of the above conditions are satisfied,
     #   otherwise returns false
     def applies_type?(scope, type)
-      !scope.key?('type') || scope['type'].eql?(type.to_s)
+      !scope.key?("type") || scope["type"].eql?(type.to_s)
     end
 
     # Checks if a given set of default values is valid
@@ -122,7 +127,7 @@ def applies_type?(scope, type)
     #
     # Returns true if the set is valid and can be used in this class
     def valid?(set)
-      set.is_a?(Hash) && set['values'].is_a?(Hash)
+      set.is_a?(Hash) && set["values"].is_a?(Hash)
     end
 
     # Determines if a new scope has precedence over an old one
@@ -131,18 +136,18 @@ def valid?(set)
     # new_scope - the new scope hash
     #
     # Returns true if the new scope has precedence over the older
-    def has_precedence?(old_scope, new_scope)
+    def precedence?(old_scope, new_scope)
       return true if old_scope.nil?
 
-      new_path = sanitize_path(new_scope['path'])
-      old_path = sanitize_path(old_scope['path'])
+      new_path = sanitize_path(new_scope["path"])
+      old_path = sanitize_path(old_scope["path"])
 
       if new_path.length != old_path.length
         new_path.length >= old_path.length
-      elsif new_scope.key? 'type'
+      elsif new_scope.key? "type"
         true
       else
-        !old_scope.key? 'type'
+        !old_scope.key? "type"
       end
     end
 
@@ -151,7 +156,7 @@ def has_precedence?(old_scope, new_scope)
     # Returns an array of hashes
     def matching_sets(path, type)
       valid_sets.select do |set|
-        !set.key?('scope') || applies?(set['scope'], path, type)
+        !set.key?("scope") || applies?(set["scope"], path, type)
       end
     end
 
@@ -162,7 +167,7 @@ def matching_sets(path, type)
     #
     # Returns an array of hashes
     def valid_sets
-      sets = @site.config['defaults']
+      sets = @site.config["defaults"]
       return [] unless sets.is_a?(Array)
 
       sets.map do |set|
@@ -170,7 +175,7 @@ def valid_sets
           ensure_time!(update_deprecated_types(set))
         else
           Jekyll.logger.warn "Defaults:", "An invalid front-matter default set was found:"
-          Jekyll.logger.warn "#{set}"
+          Jekyll.logger.warn set.to_s
           nil
         end
       end.compact
@@ -181,7 +186,7 @@ def sanitize_path(path)
       if path.nil? || path.empty?
         ""
       else
-        path.gsub(/\A\//, '').gsub(/([^\/])\z/, '\1')
+        path.gsub(%r!\A/!, "").gsub(%r!([^/])\z!, '\1')
       end
     end
   end

From 2bc8dc53ffbb413577464c997a3884ef91babb8b Mon Sep 17 00:00:00 2001
From: Jens Willmer 
Date: Thu, 2 Jun 2016 16:32:49 +0300
Subject: [PATCH 0953/4996] Added link to windows instructions

---
 site/_docs/github-pages.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/site/_docs/github-pages.md b/site/_docs/github-pages.md
index cfe8822a220..e8c77aaa099 100644
--- a/site/_docs/github-pages.md
+++ b/site/_docs/github-pages.md
@@ -76,6 +76,8 @@ gem 'github-pages'
 {% endhighlight %}
 
     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).
   
    
 
 

From 261bc8f467ce103246df78e2e91f7369715d2afc Mon Sep 17 00:00:00 2001
From: Jens Willmer 
Date: Thu, 2 Jun 2016 16:44:21 +0300
Subject: [PATCH 0954/4996] Added topic link in the URL

---
 site/_docs/github-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/github-pages.md b/site/_docs/github-pages.md
index e8c77aaa099..b67d4873d1b 100644
--- a/site/_docs/github-pages.md
+++ b/site/_docs/github-pages.md
@@ -77,7 +77,7 @@ gem 'github-pages'
 
     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).
+    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).
   
    
 
 

From 899316f40134a69ccb2ace76495174b268cb4223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Guitton?= 
Date: Thu, 2 Jun 2016 18:43:57 +0200
Subject: [PATCH 0955/4996] Fix inaccurate HTTP response header field name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

§ Custom WEBrick headers default settings
Cf. ./lib/jekyll/commands/serve/servlet.rb
---
 site/_docs/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index 1ff520de481..5fe13ddb1b8 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -397,7 +397,7 @@ webrick:
 
 ### Defaults
 
-We only provide one default and that's a Content-Type header that disables
+We only provide one default and that's a Cache-Control header that disables
 caching in development so that you don't have to fight with Chrome's aggressive
 caching when you are in development mode.
 

From c642b84e8009a88bfa26236a436d5ae0255bb353 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 2 Jun 2016 10:54:04 -0700
Subject: [PATCH 0956/4996] Update history to reflect merge of #4958 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9b303995d79..863dc76fb2d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -80,6 +80,7 @@
   * Rubocop: Site Drop (#4948)
   * Rubocop: tags (#4938)
   * Rubocop: Readers (#4932)
+  * markdownify and smartify should convert input to string before conversion (#4958)
 
 ### Site Enhancements
 

From 97e196cb19cf11e0f79e7badf1345c783fae434c Mon Sep 17 00:00:00 2001
From: Jordon Bedwell 
Date: Thu, 2 Jun 2016 12:55:47 -0500
Subject: [PATCH 0957/4996] Correct placement of history entry for #4958.

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

diff --git a/History.markdown b/History.markdown
index 863dc76fb2d..102853bde87 100644
--- a/History.markdown
+++ b/History.markdown
@@ -26,6 +26,7 @@
   * Update colorator dependency to v1.x (#4855)
   * Move EntryFilter to use Pathutil & fix `glob_include?` (#4859)
   * Add 'jekyll new-theme' command to help users get up and running creating a theme (#4848)
+  * markdownify and smartify should convert input to string before conversion (#4958)
 
 ### Bug Fixes
 
@@ -80,7 +81,6 @@
   * Rubocop: Site Drop (#4948)
   * Rubocop: tags (#4938)
   * Rubocop: Readers (#4932)
-  * markdownify and smartify should convert input to string before conversion (#4958)
 
 ### Site Enhancements
 

From e7677bdf515a61919cb7e8c11ebd1a3c205f882a Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Thu, 2 Jun 2016 21:25:50 +0300
Subject: [PATCH 0958/4996] rubocop: revert has_precedence method rename

---
 lib/jekyll/frontmatter_defaults.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb
index 27dab903b07..0614975ab00 100644
--- a/lib/jekyll/frontmatter_defaults.rb
+++ b/lib/jekyll/frontmatter_defaults.rb
@@ -54,7 +54,7 @@ def find(path, type, setting)
       old_scope = nil
 
       matching_sets(path, type).each do |set|
-        if set["values"].key?(setting) && precedence?(old_scope, set["scope"])
+        if set["values"].key?(setting) && has_precedence?(old_scope, set["scope"])
           value = set["values"][setting]
           old_scope = set["scope"]
         end
@@ -72,7 +72,7 @@ def all(path, type)
       defaults = {}
       old_scope = nil
       matching_sets(path, type).each do |set|
-        if precedence?(old_scope, set["scope"])
+        if has_precedence?(old_scope, set["scope"])
           defaults = Utils.deep_merge_hashes(defaults, set["values"])
           old_scope = set["scope"]
         else
@@ -136,7 +136,8 @@ def valid?(set)
     # new_scope - the new scope hash
     #
     # Returns true if the new scope has precedence over the older
-    def precedence?(old_scope, new_scope)
+    # rubocop: disable PredicateName
+    def has_precedence?(old_scope, new_scope)
       return true if old_scope.nil?
 
       new_path = sanitize_path(new_scope["path"])
@@ -144,12 +145,13 @@ def precedence?(old_scope, new_scope)
 
       if new_path.length != old_path.length
         new_path.length >= old_path.length
-      elsif new_scope.key? "type"
+      elsif new_scope.key?("type")
         true
       else
         !old_scope.key? "type"
       end
     end
+    # rubocop: enable PredicateName
 
     # Collects a list of sets that match the given path and type
     #

From 675c105e8551e0c86bf9f268dc4b5e12614dde62 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 2 Jun 2016 12:06:56 -0700
Subject: [PATCH 0959/4996] Update history to reflect merge of #4974 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 102853bde87..b7252fe5006 100644
--- a/History.markdown
+++ b/History.markdown
@@ -81,6 +81,7 @@
   * Rubocop: Site Drop (#4948)
   * Rubocop: tags (#4938)
   * Rubocop: Readers (#4932)
+  * rubocop: jekyll/lib/frontmatter_defaults.rb (#4974)
 
 ### Site Enhancements
 

From c2ee828ad6cd23169ef13f279590f6e3e408cb88 Mon Sep 17 00:00:00 2001
From: Jens Willmer 
Date: Thu, 2 Jun 2016 22:19:40 +0300
Subject: [PATCH 0960/4996] Added link to windows doc page

---
 site/_docs/github-pages.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/site/_docs/github-pages.md b/site/_docs/github-pages.md
index cfe8822a220..02ec1c8dba8 100644
--- a/site/_docs/github-pages.md
+++ b/site/_docs/github-pages.md
@@ -79,6 +79,16 @@ gem 'github-pages'
   
    
 
 
+
    
+  
    Installing github-pages gem on Windows
    
+  
    
+    While Windows is not officially supported, it is possible 
+    to install github-pages gem on Windows. 
+    Special instructions can be found on our
+    Windows-specific docs page.
+  
    
+
    
+
 ### User and Organization Pages
 
 User and organization pages live in a special GitHub repository dedicated to

From bbbbb2e7044611a62fc7ea9def275767f9a837be Mon Sep 17 00:00:00 2001
From: Jens Willmer 
Date: Thu, 2 Jun 2016 22:36:07 +0300
Subject: [PATCH 0961/4996] Installation instructions for github-pages gem

---
 site/_docs/windows.md | 71 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/site/_docs/windows.md b/site/_docs/windows.md
index ec98dcdeda0..06935863b94 100644
--- a/site/_docs/windows.md
+++ b/site/_docs/windows.md
@@ -44,3 +44,74 @@ with Windows. Add the following to the Gemfile for your site:
 {% highlight ruby %}
 gem 'wdm', '~> 0.1.0' if Gem.win_platform?
 {% endhighlight %}
+
+### How to install github-gem
+
+This section is part of an article written by [Jens Willmer][jwillmerPost]. To follow the instructions you need to have [Chocolatey][] installed on your system. If you already have a version of Ruby installed you need to uninstall it before you can continue.
+
+#### Install Ruby and Ruby development kit
+
+Open a command prompt and execute the following commands:
+
+ * `choco install ruby -version 2.2.4` 
+ * `choco install ruby2.devkit` - _needed for compilation of json gem_
+ 
+#### Configure Ruby development kit 
+
+The development kit did not set the environment path for Ruby so we need to do it.
+ 
+ * Open command prompt in `C:\tools\DevKit2` 
+ * Execute `ruby dk.rb init` to create a file called `config.yml`
+ * Edit the `config.yml` file and include the path to Ruby `- C:/tools/ruby22`
+ * Execute the following command to set the path: `ruby dk.rb install`
+
+#### Nokogiri gem installation
+
+This gem is also needed in the github-gem and to get it running on Windows x64 we have to install a few things.
+
+
+**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-gem.
+
+
+`cinst -Source "https://go.microsoft.com/fwlink/?LinkID=230477" libxml2`{:.language-ruby}
+
+`cinst -Source "https://go.microsoft.com/fwlink/?LinkID=230477" libxslt`{:.language-ruby}
+
+`cinst -Source "https://go.microsoft.com/fwlink/?LinkID=230477" libiconv`{:.language-ruby}
+ 
+```language-ruby
+ 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^
+   --with-iconv-lib=C:\Chocolatey\lib\libiconv.redist.1.14.0.11\build\native\bin\v110\x64\Release\dynamic\cdecl^
+   --with-xslt-include=C:\Chocolatey\lib\libxslt.1.1.28.0\build\native\include^
+   --with-xslt-lib=C:\Chocolatey\lib\libxslt.redist.1.1.28.0\build\native\bin\v110\x64\Release\dynamic
+```
+
+#### Install github-gem
+
+ * Open command prompt and install [Bundler][]: `gem install bundler`
+ * Create a file called `Gemfile` without any extension in your root directory of your blog
+ * Copy & past the two lines into the file:
+ 
+ 
+```language-ruby
+source 'http://rubygems.org'
+gem 'github-pages'
+```
+
+ * **Note:** We use an unsecure connection because SSL throws exceptions in the version of Ruby
+ * Open a command prompt and install github-pages: `bundle install`
+
+ 
+After this process you should have github-pages installed on your system and you can host your blog again with `jekyll s`. \\
+There will be a warning on startup that you should include `gem 'wdm', '>= 0.1.0' if Gem.win_platform?` to your `Gemfile` but I could not get `jekyll s` working if I include that line so for the moment I ignore that warning.
+
+In the future the installation process of the github-gem should be as simple as the setup of the blog. But as long as the new version of the Nokogiri ([v1.6.8][nokogiriReleases]) is not stable and referenced, it is work to get it up and running on Windows. 
+ 
+[jwillmerPost]: http://jwillmer.de/blog/tutorial/how-to-install-jekyll-and-pages-gem-on-windows-10-x46 "Installation instructions by Jens Willmer"
+[Chocolatey]: https://chocolatey.org/install "Package manager for Windows"
+[Bundler]: http://bundler.io/ "Ruby Dependencie Manager"
+[nokogiriReleases]: https://github.com/sparklemotion/nokogiri/releases "Nokogiri Releases"
+[nokogiriFails]: https://github.com/sparklemotion/nokogiri/issues/1456#issuecomment-206481794 "Nokogiri fails to install on Ruby 2.3 for Windows"

From d68ddf9dace0a7ddb1a10ecf1059d6a6ab519da4 Mon Sep 17 00:00:00 2001
From: Jens Willmer 
Date: Thu, 2 Jun 2016 22:46:05 +0300
Subject: [PATCH 0962/4996] Included installation instructions

---
 site/_docs/windows.md | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/site/_docs/windows.md b/site/_docs/windows.md
index 06935863b94..d3fd8254883 100644
--- a/site/_docs/windows.md
+++ b/site/_docs/windows.md
@@ -10,12 +10,14 @@ knowledge and lessons that have been unearthed by Windows users.
 
 ## Installation
 
-Julian Thilo has written up instructions to get
-[Jekyll running on Windows][windows-installation] and it seems to work for most
-people. The instructions were written for Ruby 2.0.0, but should work for later
-versions [prior to 2.2][hitimes-issue].
+A quick way to install Jekyll it to follow the [installation instructions by David Burela](https://davidburela.wordpress.com/2015/11/28/easily-install-jekyll-on-windows-with-3-command-prompt-entries-and-chocolatey/):
+
+ 1. Install a package manager for Windows called [Chocolatey](https://chocolatey.org/install)
+ 2. Install Ruby via Chocolatey: `choco install ruby -y`
+ 3. Reopen a command prompt and install Jekyll: `gem install jekyll`
 
-Alternatively David Burela has written instructions on [how to install Jekyll via Chocolatey with 3 command prompt entries](https://davidburela.wordpress.com/2015/11/28/easily-install-jekyll-on-windows-with-3-command-prompt-entries-and-chocolatey/).
+For a more conventional way of installing Jekyll you can follow the [installation instruction by Julian Thilo][windows-installation]. The instructions were written for Ruby 2.0.0, but should work for later
+versions [prior to 2.2][hitimes-issue].
 
 ## Encoding
 

From 0212c838145e153ea2cab71616eddb3c0bb8c687 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 2 Jun 2016 12:55:15 -0700
Subject: [PATCH 0963/4996] Update history to reflect merge of #4975 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b7252fe5006..584d61a65d8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -125,6 +125,7 @@
   * Add pubstorm deployment instructions to docs (#4881)
   * Corrected pagination docs for hidden: true feature (#4903)
   * Remove a Broken Link for Refheap Plugin (#4971)
+  * Instructions on how to install github-gem on Windows (#4975)
 
 ## 3.1.6 / 2016-05-19
 

From 3a8025cb08ceb0b09c57780e0dee93cae18c199b Mon Sep 17 00:00:00 2001
From: Jens Willmer 
Date: Thu, 2 Jun 2016 23:33:20 +0300
Subject: [PATCH 0964/4996] Changed github-gem to github-pages

The gem is technically called github-pages as noted by @parkr in the [pull request](https://github.com/jekyll/jekyll/pull/4977#discussion_r65610202)
---
 site/_docs/windows.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/site/_docs/windows.md b/site/_docs/windows.md
index d3fd8254883..02ea233d685 100644
--- a/site/_docs/windows.md
+++ b/site/_docs/windows.md
@@ -47,7 +47,7 @@ with Windows. Add the following to the Gemfile for your site:
 gem 'wdm', '~> 0.1.0' if Gem.win_platform?
 {% endhighlight %}
 
-### How to install github-gem
+### How to install github-pages
 
 This section is part of an article written by [Jens Willmer][jwillmerPost]. To follow the instructions you need to have [Chocolatey][] installed on your system. If you already have a version of Ruby installed you need to uninstall it before you can continue.
 
@@ -69,10 +69,10 @@ The development kit did not set the environment path for Ruby so we need to do i
 
 #### Nokogiri gem installation
 
-This gem is also needed in the github-gem and to get it running on Windows x64 we have to install a few things.
+This gem is also needed in the github-pages and to get it running on Windows x64 we have to install a few things.
 
 
-**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-gem.
+**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.
 
 
 `cinst -Source "https://go.microsoft.com/fwlink/?LinkID=230477" libxml2`{:.language-ruby}
@@ -91,7 +91,7 @@ This gem is also needed in the github-gem and to get it running on Windows x64 w
    --with-xslt-lib=C:\Chocolatey\lib\libxslt.redist.1.1.28.0\build\native\bin\v110\x64\Release\dynamic
 ```
 
-#### Install github-gem
+#### 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
@@ -110,7 +110,7 @@ gem 'github-pages'
 After this process you should have github-pages installed on your system and you can host your blog again with `jekyll s`. \\
 There will be a warning on startup that you should include `gem 'wdm', '>= 0.1.0' if Gem.win_platform?` to your `Gemfile` but I could not get `jekyll s` working if I include that line so for the moment I ignore that warning.
 
-In the future the installation process of the github-gem should be as simple as the setup of the blog. But as long as the new version of the Nokogiri ([v1.6.8][nokogiriReleases]) is not stable and referenced, it is work to get it up and running on Windows. 
+In the future the installation process of the github-pages should be as simple as the setup of the blog. But as long as the new version of the Nokogiri ([v1.6.8][nokogiriReleases]) is not stable and referenced, it is work to get it up and running on Windows. 
  
 [jwillmerPost]: http://jwillmer.de/blog/tutorial/how-to-install-jekyll-and-pages-gem-on-windows-10-x46 "Installation instructions by Jens Willmer"
 [Chocolatey]: https://chocolatey.org/install "Package manager for Windows"

From d6e58623c6107e51d42b0642065a44a9913896d9 Mon Sep 17 00:00:00 2001
From: Jens Willmer 
Date: Fri, 3 Jun 2016 00:05:20 +0300
Subject: [PATCH 0965/4996] Fixed typo

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

diff --git a/site/_docs/windows.md b/site/_docs/windows.md
index 02ea233d685..ea4c0359f58 100644
--- a/site/_docs/windows.md
+++ b/site/_docs/windows.md
@@ -10,7 +10,7 @@ knowledge and lessons that have been unearthed by Windows users.
 
 ## Installation
 
-A quick way to install Jekyll it to follow the [installation instructions by David Burela](https://davidburela.wordpress.com/2015/11/28/easily-install-jekyll-on-windows-with-3-command-prompt-entries-and-chocolatey/):
+A quick way to install Jekyll is to follow the [installation instructions by David Burela](https://davidburela.wordpress.com/2015/11/28/easily-install-jekyll-on-windows-with-3-command-prompt-entries-and-chocolatey/):
 
  1. Install a package manager for Windows called [Chocolatey](https://chocolatey.org/install)
  2. Install Ruby via Chocolatey: `choco install ruby -y`

From b5cff52f024f0f50713efc1f1820f8b6bea56fa6 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 2 Jun 2016 14:20:29 -0700
Subject: [PATCH 0966/4996] Note that where_exp is only a v3.2 feature. Closes
 #4978.

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

diff --git a/site/_docs/templates.md b/site/_docs/templates.md
index 1c09cab0787..c81e9f6c92e 100644
--- a/site/_docs/templates.md
+++ b/site/_docs/templates.md
@@ -91,7 +91,7 @@ common tasks easier.
     
       
         
    Where Expression
    
-        
    Select all the objects in an array where the expression is true.
    
+        
    Select all the objects in an array where the expression is true. Jekyll v3.2.0 & later.
    
       
       
         
    

From 14b36aae388a96a54b7ac9493d9285fa0e1d90e9 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 17 May 2016 17:29:21 -0700
Subject: [PATCH 0967/4996] Add timings for each scenario in cucumber

---
 features/support/formatter.rb | 39 ++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/features/support/formatter.rb b/features/support/formatter.rb
index 8ce03bd10d0..b06d675fe97 100644
--- a/features/support/formatter.rb
+++ b/features/support/formatter.rb
@@ -30,6 +30,7 @@ def initialize(runtime, path_or_io, options)
         @options = options
         @exceptions = []
         @indent = 0
+        @timings = {}
       end
 
       #
@@ -42,6 +43,7 @@ def before_features(_features)
 
       def after_features(features)
         @io.puts
+        print_worst_offenders
         print_summary(features)
       end
 
@@ -54,23 +56,35 @@ def before_feature(_feature)
 
       #
 
-      def tag_name(tag_name); end
-
-      def comment_line(comment_line); end
-
-      def after_feature_element(feature_element); end
-
-      def after_tags(tags); end
+      def feature_element_timing_key(feature_element)
+        "\"#{feature_element.name.to_s.sub("Scenario: ", "")}\" (#{feature_element.location})"
+      end
 
       #
 
       def before_feature_element(_feature_element)
         @indent = 2
         @scenario_indent = 2
+        @timings[feature_element_timing_key(feature_element)] = Time.now
       end
 
       #
 
+      def after_feature_element(feature_element)
+        @timings[feature_element_timing_key(feature_element)] = Time.now - @timings[feature_element_timing_key(feature_element)]
+        @io.print " (#{@timings[feature_element_timing_key(feature_element)]}s)"
+      end
+
+      #
+
+      def tag_name(tag_name); end
+
+      def comment_line(comment_line); end
+
+      def after_tags(tags); end
+
+      #
+
       def before_background(_background)
         @scenario_indent = 2
         @in_background = true
@@ -178,6 +192,17 @@ def cell_prefix(status)
 
       #
 
+      def print_worst_offenders
+        @io.puts
+        @io.puts "Worst offenders:"
+        @timings.sort_by { |_f, t| -t }.each do |(f, t)|
+          @io.puts "  #{t}s for #{f}"
+        end
+        @io.puts
+      end
+
+      #
+
       def print_summary(features)
         @io.puts
         print_stats(features, @options)

From 6355a07d4bcfb30cb9c2408e97fa12c1d7bb9f90 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 19 May 2016 08:43:03 -0700
Subject: [PATCH 0968/4996] Only do top 10 worst offenders in cucumberland

---
 features/support/formatter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/support/formatter.rb b/features/support/formatter.rb
index b06d675fe97..a075f18c1c2 100644
--- a/features/support/formatter.rb
+++ b/features/support/formatter.rb
@@ -195,7 +195,7 @@ def cell_prefix(status)
       def print_worst_offenders
         @io.puts
         @io.puts "Worst offenders:"
-        @timings.sort_by { |_f, t| -t }.each do |(f, t)|
+        @timings.sort_by { |_f, t| -t }.take_while { |i| i < 10 }.each do |(f, t)|
           @io.puts "  #{t}s for #{f}"
         end
         @io.puts

From 4b1012537f7b67c4e4c3a690003f5cb1f3cbfc48 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 19 May 2016 09:08:25 -0700
Subject: [PATCH 0969/4996] Use #take instead of #take_while

---
 features/support/formatter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/support/formatter.rb b/features/support/formatter.rb
index a075f18c1c2..b216323f27b 100644
--- a/features/support/formatter.rb
+++ b/features/support/formatter.rb
@@ -195,7 +195,7 @@ def cell_prefix(status)
       def print_worst_offenders
         @io.puts
         @io.puts "Worst offenders:"
-        @timings.sort_by { |_f, t| -t }.take_while { |i| i < 10 }.each do |(f, t)|
+        @timings.sort_by { |_f, t| -t }.take(10).each do |(f, t)|
           @io.puts "  #{t}s for #{f}"
         end
         @io.puts

From 956495f4503d4c1f81d86c5498b9025477f16a54 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 2 Jun 2016 16:47:14 -0700
Subject: [PATCH 0970/4996] Fix typo.

---
 features/support/formatter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/support/formatter.rb b/features/support/formatter.rb
index b216323f27b..2223701012c 100644
--- a/features/support/formatter.rb
+++ b/features/support/formatter.rb
@@ -62,7 +62,7 @@ def feature_element_timing_key(feature_element)
 
       #
 
-      def before_feature_element(_feature_element)
+      def before_feature_element(feature_element)
         @indent = 2
         @scenario_indent = 2
         @timings[feature_element_timing_key(feature_element)] = Time.now

From 7cd20261ab3016d4000cc73cd7ee351cdfe91450 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 2 Jun 2016 16:59:52 -0700
Subject: [PATCH 0971/4996] Update history to reflect merge of #4953 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 584d61a65d8..d293994d7d8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -43,6 +43,7 @@
   * Example in the site template should be IANA-approved example.com (#4793)
   * 3.2.x/master: Fix defaults for Documents (posts/collection docs) (#4808)
   * Don't rescue LoadError or bundler load errors for Bundler. (#4857)
+  * `Serve.process` should receive same config as `Build.process` (#4953)
 
 ### Forward Ports
 

From 52fcd6981ff3904e97419dff077d1417f8df75de Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 2 Jun 2016 17:06:05 -0700
Subject: [PATCH 0972/4996] Update history to reflect merge of #4956 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d293994d7d8..3f63fda8262 100644
--- a/History.markdown
+++ b/History.markdown
@@ -83,6 +83,7 @@
   * Rubocop: tags (#4938)
   * Rubocop: Readers (#4932)
   * rubocop: jekyll/lib/frontmatter_defaults.rb (#4974)
+  * rubocop: features/step_definitions.rb (#4956)
 
 ### Site Enhancements
 

From 74d363f0808347f38320ddf30a114aa80f4a3a1d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 2 Jun 2016 17:08:05 -0700
Subject: [PATCH 0973/4996] Update history to reflect merge of #4959 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3f63fda8262..15df2cd2c59 100644
--- a/History.markdown
+++ b/History.markdown
@@ -84,6 +84,7 @@
   * Rubocop: Readers (#4932)
   * rubocop: jekyll/lib/frontmatter_defaults.rb (#4974)
   * rubocop: features/step_definitions.rb (#4956)
+  * Rubocop theme and url jekyll libs (#4959)
 
 ### Site Enhancements
 

From f5a0db9dccb737d9ebd90a87e9d9a4e9a6b481f0 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 2 Jun 2016 17:08:21 -0700
Subject: [PATCH 0974/4996] Rubocop: use %r for all regular expressions.

---
 .rubocop.yml                                  |  2 +-
 features/step_definitions.rb                  | 54 +++++++++----------
 features/support/helpers.rb                   |  4 +-
 lib/jekyll/commands/doctor.rb                 |  2 +-
 lib/jekyll/commands/serve/servlet.rb          |  4 +-
 lib/jekyll/converters/markdown.rb             |  2 +-
 .../converters/markdown/kramdown_parser.rb    |  2 +-
 .../converters/markdown/redcarpet_parser.rb   |  2 +-
 lib/jekyll/excerpt.rb                         |  2 +-
 lib/jekyll/log_adapter.rb                     |  2 +-
 lib/jekyll/readers/data_reader.rb             |  6 +--
 lib/jekyll/tags/highlight.rb                  |  6 +--
 lib/jekyll/tags/include.rb                    | 16 +++---
 lib/jekyll/tags/post_url.rb                   |  2 +-
 lib/jekyll/theme_builder.rb                   |  2 +-
 lib/jekyll/utils/ansi.rb                      |  2 +-
 lib/jekyll/utils/platforms.rb                 |  4 +-
 test/test_convertible.rb                      | 10 ++--
 test/test_entry_filter.rb                     |  2 +-
 test/test_liquid_renderer.rb                  |  4 +-
 test/test_new_command.rb                      |  6 +--
 test/test_page.rb                             |  2 +-
 test/test_tags.rb                             | 44 +++++++--------
 23 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 982ec43c3f0..fbe07db35bc 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -121,7 +121,7 @@ Style/RedundantReturn:
 Style/RedundantSelf:
   Enabled: false
 Style/RegexpLiteral:
-  EnforcedStyle: slashes
+  EnforcedStyle: percent_r
 Style/RescueModifier:
   Enabled: false
 Style/SignalException:
diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index ce42725dec2..731f8b7b942 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -14,7 +14,7 @@
 
 #
 
-Given(/^I have a blank site in "(.*)"$/) do |path|
+Given(%r!^I have a blank site in "(.*)"$!) do |path|
   unless File.exist?(path)
     then FileUtils.mkdir_p(path)
   end
@@ -22,13 +22,13 @@
 
 #
 
-Given(/^I do not have a "(.*)" directory$/) do |path|
+Given(%r!^I do not have a "(.*)" directory$!) do |path|
   Paths.test_dir.join(path).directory?
 end
 
 #
 
-Given(/^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$/) do |file, key, value, text|
+Given(%r!^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$!) do |file, key, value, text|
   File.write(file, Jekyll::Utils.strip_heredoc(<<-DATA))
     ---
     #{key || "layout"}: #{value || "nil"}
@@ -40,13 +40,13 @@
 
 #
 
-Given(/^I have an? "(.*)" file that contains "(.*)"$/) do |file, text|
+Given(%r!^I have an? "(.*)" file that contains "(.*)"$!) do |file, text|
   File.write(file, text)
 end
 
 #
 
-Given(/^I have an? (.*) (layout|theme) that contains "(.*)"$/) do |name, type, text|
+Given(%r!^I have an? (.*) (layout|theme) that contains "(.*)"$!) do |name, type, text|
   folder = type == "layout" ? "_layouts" : "_theme"
 
   destination_file = Pathname.new(File.join(folder, "#{name}.html"))
@@ -56,13 +56,13 @@
 
 #
 
-Given(/^I have an? "(.*)" file with content:$/) do |file, text|
+Given(%r!^I have an? "(.*)" file with content:$!) do |file, text|
   File.write(file, text)
 end
 
 #
 
-Given(/^I have an? (.*) directory$/) do |dir|
+Given(%r!^I have an? (.*) directory$!) do |dir|
   unless File.directory?(dir)
     then FileUtils.mkdir_p(dir)
   end
@@ -70,7 +70,7 @@
 
 #
 
-Given(/^I have the following (draft|page|post)s?(?: (in|under) "([^"]+)")?:$/) do |status, direction, folder, table|
+Given(%r!^I have the following (draft|page|post)s?(?: (in|under) "([^"]+)")?:$!) do |status, direction, folder, table|
   table.hashes.each do |input_hash|
     title = slug(input_hash["title"])
     ext = input_hash["type"] || "markdown"
@@ -92,7 +92,7 @@
 
 #
 
-Given(/^I have a configuration file with "(.*)" set to "(.*)"$/) do |key, value|
+Given(%r!^I have a configuration file with "(.*)" set to "(.*)"$!) do |key, value|
   config = \
     if source_dir.join("_config.yml").exist?
       SafeYAML.load_file(source_dir.join("_config.yml"))
@@ -105,7 +105,7 @@
 
 #
 
-Given(/^I have a configuration file with:$/) do |table|
+Given(%r!^I have a configuration file with:$!) do |table|
   table.hashes.each do |row|
     step %(I have a configuration file with "#{row["key"]}" set to "#{row["value"]}")
   end
@@ -113,7 +113,7 @@
 
 #
 
-Given(/^I have a configuration file with "([^\"]*)" set to:$/) do |key, table|
+Given(%r!^I have a configuration file with "([^\"]*)" set to:$!) do |key, table|
   File.open("_config.yml", "w") do |f|
     f.write("#{key}:\n")
     table.hashes.each do |row|
@@ -124,20 +124,20 @@
 
 #
 
-Given(/^I have fixture collections$/) do
+Given(%r!^I have fixture collections$!) do
   FileUtils.cp_r Paths.source_dir.join("test", "source", "_methods"), source_dir
   FileUtils.cp_r Paths.source_dir.join("test", "source", "_thanksgiving"), source_dir
 end
 
 #
 
-Given(/^I wait (\d+) second(s?)$/) do |time, _|
+Given(%r!^I wait (\d+) second(s?)$!) do |time, _|
   sleep(time.to_f)
 end
 
 #
 
-When(/^I run jekyll(.*)$/) do |args|
+When(%r!^I run jekyll(.*)$!) do |args|
   run_jekyll(args)
   if args.include?("--verbose") || ENV["DEBUG"]
     $stderr.puts "\n#{jekyll_run_output}\n"
@@ -146,7 +146,7 @@
 
 #
 
-When(/^I run bundle(.*)$/) do |args|
+When(%r!^I run bundle(.*)$!) do |args|
   run_bundle(args)
   if args.include?("--verbose") || ENV["DEBUG"]
     $stderr.puts "\n#{jekyll_run_output}\n"
@@ -155,7 +155,7 @@
 
 #
 
-When(/^I change "(.*)" to contain "(.*)"$/) do |file, text|
+When(%r!^I change "(.*)" to contain "(.*)"$!) do |file, text|
   File.open(file, "a") do |f|
     f.write(text)
   end
@@ -163,13 +163,13 @@
 
 #
 
-When(/^I delete the file "(.*)"$/) do |file|
+When(%r!^I delete the file "(.*)"$!) do |file|
   File.delete(file)
 end
 
 #
 
-Then(/^the (.*) directory should +(not )?exist$/) do |dir, negative|
+Then(%r!^the (.*) directory should +(not )?exist$!) do |dir, negative|
   if negative.nil?
     expect(Pathname.new(dir)).to exist
   else
@@ -178,7 +178,7 @@
 end
 
 #
-Then(/^I should (not )?see "(.*)" in "(.*)"$/) do |negative, text, file|
+Then(%r!^I should (not )?see "(.*)" in "(.*)"$!) do |negative, text, file|
   step %(the "#{file}" file should exist)
   regexp = Regexp.new(text, Regexp::MULTILINE)
   if negative.nil? || negative.empty?
@@ -190,20 +190,20 @@
 
 #
 
-Then(/^I should see exactly "(.*)" in "(.*)"$/) do |text, file|
+Then(%r!^I should see exactly "(.*)" in "(.*)"$!) do |text, file|
   step %(the "#{file}" file should exist)
   expect(file_contents(file).strip).to eq text
 end
 
 #
 
-Then(/^I should see escaped "(.*)" in "(.*)"$/) do |text, file|
+Then(%r!^I should see escaped "(.*)" in "(.*)"$!) do |text, file|
   step %(I should see "#{Regexp.escape(text)}" in "#{file}")
 end
 
 #
 
-Then(/^the "(.*)" file should +(not )?exist$/) do |file, negative|
+Then(%r!^the "(.*)" file should +(not )?exist$!) do |file, negative|
   if negative.nil?
     expect(Pathname.new(file)).to exist
   else
@@ -213,19 +213,19 @@
 
 #
 
-Then(/^I should see today's time in "(.*)"$/) do |file|
+Then(%r!^I should see today's time in "(.*)"$!) do |file|
   step %(I should see "#{seconds_agnostic_time(Time.now)}" in "#{file}")
 end
 
 #
 
-Then(/^I should see today's date in "(.*)"$/) do |file|
+Then(%r!^I should see today's date in "(.*)"$!) do |file|
   step %(I should see "#{Date.today}" in "#{file}")
 end
 
 #
 
-Then(/^I should (not )?see "(.*)" in the build output$/) do |negative, text|
+Then(%r!^I should (not )?see "(.*)" in the build output$!) do |negative, text|
   if negative.nil? || negative.empty?
     expect(jekyll_run_output).to match Regexp.new(text)
   else
@@ -235,12 +235,12 @@
 
 #
 
-Then(/^I should get a zero exit(?:\-| )status$/) do
+Then(%r!^I should get a zero exit(?:\-| )status$!) do
   step %(I should see "EXIT STATUS: 0" in the build output)
 end
 
 #
 
-Then(/^I should get a non-zero exit(?:\-| )status$/) do
+Then(%r!^I should get a non-zero exit(?:\-| )status$!) do
   step %(I should not see "EXIT STATUS: 0" in the build output)
 end
diff --git a/features/support/helpers.rb b/features/support/helpers.rb
index 29333075324..e7381a36229 100644
--- a/features/support/helpers.rb
+++ b/features/support/helpers.rb
@@ -36,7 +36,7 @@ def file_content_from_hash(input_hash)
   Jekyll::Utils.strip_heredoc(<<-EOF)
     ---
     #{matter.gsub(
-      /\n/, "\n    "
+      %r!\n!, "\n    "
     )}
     ---
     #{content}
@@ -121,7 +121,7 @@ def run_in_shell(*args)
 def slug(title = nil)
   if !title
     then Time.now.strftime("%s%9N") # nanoseconds since the Epoch
-  else title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, "-")
+  else title.downcase.gsub(%r![^\w]!, " ").strip.gsub(%r!\s+!, "-")
   end
 end
 
diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb
index 0c4f52f867e..4c750b1c5c5 100644
--- a/lib/jekyll/commands/doctor.rb
+++ b/lib/jekyll/commands/doctor.rb
@@ -63,7 +63,7 @@ def conflicting_urls(site)
         def fsnotify_buggy?(_site)
           return true unless Utils::Platforms.osx?
           if Dir.pwd != `pwd`.strip
-            Jekyll.logger.error "  " + <<-STR.strip.gsub(/\n\s+/, "\n  ")
+            Jekyll.logger.error "  " + <<-STR.strip.gsub(%r!\n\s+!, "\n  ")
               We have detected that there might be trouble using fsevent on your
               operating system, you can read https://github.com/thibaudgg/rb-fsevent/wiki/no-fsevents-fired-(OSX-bug)
               for possible work arounds or you can work around it immediately
diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb
index 5f258e6eda7..d0dd22af8d7 100644
--- a/lib/jekyll/commands/serve/servlet.rb
+++ b/lib/jekyll/commands/serve/servlet.rb
@@ -37,10 +37,10 @@ def do_GET(req, res)
 
         private
         def validate_and_ensure_charset(_req, res)
-          key = res.header.keys.grep(/content-type/i).first
+          key = res.header.keys.grep(%r!content-type!i).first
           typ = res.header[key]
 
-          unless typ =~ /;\s*charset=/
+          unless typ =~ %r!;\s*charset=!
             res.header[key] = "#{typ}; charset=#{@jekyll_opts["encoding"]}"
           end
         end
diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb
index ab886d06e98..c718d539b7c 100644
--- a/lib/jekyll/converters/markdown.rb
+++ b/lib/jekyll/converters/markdown.rb
@@ -93,7 +93,7 @@ def custom_processor
 
       private
       def custom_class_allowed?(parser_name)
-        parser_name !~ /[^A-Za-z0-9_]/ && self.class.constants.include?(
+        parser_name !~ %r![^A-Za-z0-9_]! && self.class.constants.include?(
           parser_name.to_sym
         )
       end
diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index 6e65d43c79f..932cf24e490 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -86,7 +86,7 @@ def highlighter
         private
         def strip_coderay_prefix(hash)
           hash.each_with_object({}) do |(key, val), hsh|
-            cleaned_key = key.gsub(/\Acoderay_/, "")
+            cleaned_key = key.gsub(%r!\Acoderay_!, "")
 
             if key != cleaned_key
               Jekyll::Deprecator.deprecation_message(
diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb
index 8e7593856e8..b5ec99f55ce 100644
--- a/lib/jekyll/converters/markdown/redcarpet_parser.rb
+++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb
@@ -3,7 +3,7 @@ module CommonMethods
     def add_code_tags(code, lang)
       code = code.to_s
       code = code.sub(
-        /
    /,
+        %r!
    !,
         "
    "
       )
       code = code.sub(%r!
    !, "
    ")
diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb
index 8fef70ed944..2d53307e312 100644
--- a/lib/jekyll/excerpt.rb
+++ b/lib/jekyll/excerpt.rb
@@ -117,7 +117,7 @@ def extract_excerpt(doc_content)
       if tail.empty?
         head
       else
-        "" << head << "\n\n" << tail.scan(/^\[[^\]]+\]:.+$/).join("\n")
+        "" << head << "\n\n" << tail.scan(%r!^\[[^\]]+\]:.+$!).join("\n")
       end
     end
   end
diff --git a/lib/jekyll/log_adapter.rb b/lib/jekyll/log_adapter.rb
index 8ac674514f6..70173b91b9a 100644
--- a/lib/jekyll/log_adapter.rb
+++ b/lib/jekyll/log_adapter.rb
@@ -98,7 +98,7 @@ def abort_with(topic, message = nil)
     #
     # Returns the formatted message
     def message(topic, message)
-      msg = formatted_topic(topic) + message.to_s.gsub(/\s+/, " ")
+      msg = formatted_topic(topic) + message.to_s.gsub(%r!\s+!, " ")
       messages << msg
       msg
     end
diff --git a/lib/jekyll/readers/data_reader.rb b/lib/jekyll/readers/data_reader.rb
index e7e46bdc346..4c6495fd697 100644
--- a/lib/jekyll/readers/data_reader.rb
+++ b/lib/jekyll/readers/data_reader.rb
@@ -62,9 +62,9 @@ def read_data_file(path)
     end
 
     def sanitize_filename(name)
-      name.gsub!(/[^\w\s-]+/, "")
-      name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
-      name.gsub(/\s+/, "_")
+      name.gsub!(%r![^\w\s-]+!, "")
+      name.gsub!(%r!(^|\b\s)\s+($|\s?\b)!, '\\1\\2')
+      name.gsub(%r!\s+!, "_")
     end
   end
 end
diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index af2a1e107aa..952fc9b46fd 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -8,7 +8,7 @@ class HighlightBlock < Liquid::Block
       # forms: name, name=value, or name=""
       #
       #  is a space-separated list of numbers
-      SYNTAX = /^([a-zA-Z0-9.+#-]+)((\s+\w+(=(\w+|"([0-9]+\s)*[0-9]+"))?)*)$/
+      SYNTAX = %r!^([a-zA-Z0-9.+#-]+)((\s+\w+(=(\w+|"([0-9]+\s)*[0-9]+"))?)*)$!
 
       def initialize(tag_name, markup, tokens)
         super
@@ -29,7 +29,7 @@ def initialize(tag_name, markup, tokens)
       def render(context)
         prefix = context["highlighter_prefix"] || ""
         suffix = context["highlighter_suffix"] || ""
-        code = super.to_s.gsub(/\A(\n|\r)+|(\n|\r)+\z/, "")
+        code = super.to_s.gsub(%r!\A(\n|\r)+|(\n|\r)+\z!, "")
 
         is_safe = !!context.registers[:site].safe
 
@@ -67,7 +67,7 @@ def parse_options(input)
         options = {}
         unless input.empty?
           # Split along 3 possible forms -- key="", key=value, or key
-          input.scan(/(?:\w="[^"]*"|\w=\w|\w)+/) do |opt|
+          input.scan(%r!(?:\w="[^"]*"|\w=\w|\w)+!) do |opt|
             key, value = opt.split("=")
             # If a quoted list, convert to array
             if value && value.include?("\"")
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index b1b02981140..674617507f2 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -12,14 +12,14 @@ def initialize(msg, path)
     end
 
     class IncludeTag < Liquid::Tag
-      VALID_SYNTAX = /
+      VALID_SYNTAX = %r!
         ([\w-]+)\s*=\s*
         (?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))
-      /x
-      VARIABLE_SYNTAX = /
+      !x
+      VARIABLE_SYNTAX = %r!
         (?[^{]*(\{\{\s*[\w\-\.]+\s*(\|.*)?\}\}[^\s{}]*)+)
         (?.*)
-      /x
+      !x
 
       def initialize(tag_name, markup, tokens)
         super
@@ -28,7 +28,7 @@ def initialize(tag_name, markup, tokens)
           @file = matched["variable"].strip
           @params = matched["params"].strip
         else
-          @file, @params = markup.strip.split(/\s+/, 2)
+          @file, @params = markup.strip.split(%r!\s+!, 2)
         end
         validate_params if @params
         @tag_name = tag_name
@@ -46,9 +46,9 @@ def parse_params(context)
           markup = markup[match.end(0)..-1]
 
           value = if match[2]
-                    match[2].gsub(/\\"/, '"')
+                    match[2].gsub(%r!\\"!, '"')
                   elsif match[3]
-                    match[3].gsub(/\\'/, "'")
+                    match[3].gsub(%r!\\'!, "'")
                   elsif match[4]
                     context[match[4]]
                   end
@@ -74,7 +74,7 @@ def validate_file_name(file)
       end
 
       def validate_params
-        full_valid_syntax = /\A\s*(?:#{VALID_SYNTAX}(?=\s|\z)\s*)*\z/
+        full_valid_syntax = %r!\A\s*(?:#{VALID_SYNTAX}(?=\s|\z)\s*)*\z!
         unless @params =~ full_valid_syntax
           raise ArgumentError, <<-eos
 Invalid syntax for include tag:
diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb
index 2154c0cd961..04c1ef2957b 100644
--- a/lib/jekyll/tags/post_url.rb
+++ b/lib/jekyll/tags/post_url.rb
@@ -14,7 +14,7 @@ def initialize(name)
             "'#{name}' does not contain valid date and/or title."
         end
 
-        @name_regex = /^#{path}#{date}-#{slug}\.[^.]+/
+        @name_regex = %r!^#{path}#{date}-#{slug}\.[^.]+!
       end
 
       def post_date
diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb
index 041faafe7bf..5f83425098e 100644
--- a/lib/jekyll/theme_builder.rb
+++ b/lib/jekyll/theme_builder.rb
@@ -6,7 +6,7 @@ class Jekyll::ThemeBuilder
   attr_reader :name, :path
 
   def initialize(theme_name)
-    @name = theme_name.to_s.tr(" ", "_").gsub(/_+/, "_")
+    @name = theme_name.to_s.tr(" ", "_").gsub(%r!_+!, "_")
     @path = Pathname.new(File.expand_path(name, Dir.pwd))
   end
 
diff --git a/lib/jekyll/utils/ansi.rb b/lib/jekyll/utils/ansi.rb
index 715cb277c59..4be163c54ad 100644
--- a/lib/jekyll/utils/ansi.rb
+++ b/lib/jekyll/utils/ansi.rb
@@ -8,7 +8,7 @@ module Ansi
       extend self
 
       ESCAPE = format("%c", 27)
-      MATCH = /#{ESCAPE}\[(?:\d+)(?:;\d+)*(j|k|m|s|u|A|B|G)|\e\(B\e\[m/ix
+      MATCH = %r!#{ESCAPE}\[(?:\d+)(?:;\d+)*(j|k|m|s|u|A|B|G)|\e\(B\e\[m!ix
       COLORS = {
         :red     => 31,
         :green   => 32,
diff --git a/lib/jekyll/utils/platforms.rb b/lib/jekyll/utils/platforms.rb
index d431021f767..b9455936e90 100644
--- a/lib/jekyll/utils/platforms.rb
+++ b/lib/jekyll/utils/platforms.rb
@@ -17,8 +17,8 @@ module Platforms
       # platforms. This is mostly useful for `jekyll doctor` and for testing
       # where we kick off certain tests based on the platform.
 
-      { :windows? => /mswin|mingw|cygwin/, :linux? => /linux/, \
-          :osx? => /darwin|mac os/, :unix? => /solaris|bsd/ }.each do |k, v|
+      { :windows? => %r!mswin|mingw|cygwin!, :linux? => %r!linux!, \
+          :osx? => %r!darwin|mac os!, :unix? => %r!solaris|bsd! }.each do |k, v|
         define_method k do
           !!(
             RbConfig::CONFIG["host_os"] =~ v
diff --git a/test/test_convertible.rb b/test/test_convertible.rb
index 4509ed36f0b..0280946f085 100644
--- a/test/test_convertible.rb
+++ b/test/test_convertible.rb
@@ -29,8 +29,8 @@ class TestConvertible < JekyllUnitTest
         ret = @convertible.read_yaml(@base, name)
         assert_equal({}, ret)
       end
-      assert_match(/YAML Exception|syntax error|Error reading file/, out)
-      assert_match(/#{File.join(@base, name)}/, out)
+      assert_match(%r!YAML Exception|syntax error|Error reading file!, out)
+      assert_match(%r!#{File.join(@base, name)}!, out)
     end
 
     should "not allow ruby objects in yaml" do
@@ -46,8 +46,8 @@ class TestConvertible < JekyllUnitTest
         ret = @convertible.read_yaml(@base, name, :encoding => "utf-8")
         assert_equal({}, ret)
       end
-      assert_match(/invalid byte sequence in UTF-8/, out)
-      assert_match(/#{File.join(@base, name)}/, out)
+      assert_match(%r!invalid byte sequence in UTF-8!, out)
+      assert_match(%r!#{File.join(@base, name)}!, out)
     end
 
     should "parse the front-matter but show an error if permalink is empty" do
@@ -61,7 +61,7 @@ class TestConvertible < JekyllUnitTest
       out = capture_stderr do
         @convertible.read_yaml(@base, "front_matter.erb")
       end
-      refute_match(/Invalid permalink/, out)
+      refute_match(%r!Invalid permalink!, out)
     end
   end
 end
diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb
index 0b1d7134a4d..eed245674a8 100644
--- a/test/test_entry_filter.rb
+++ b/test/test_entry_filter.rb
@@ -17,7 +17,7 @@ class TestEntryFilter < JekyllUnitTest
     should "allow regexp filtering" do
       files = %w(README.md)
       @site.exclude = [
-        /README/
+        %r!README!
       ]
 
       assert_empty @site.reader.filter_entries(
diff --git a/test/test_liquid_renderer.rb b/test/test_liquid_renderer.rb
index f6ab34d2cac..7d429c52a24 100644
--- a/test/test_liquid_renderer.rb
+++ b/test/test_liquid_renderer.rb
@@ -14,8 +14,8 @@ class TestLiquidRenderer < JekyllUnitTest
 
       # rubocop:disable Metrics/LineLength
       expected = [
-        /^Filename\s+|\s+Count\s+|\s+Bytes\s+|\s+Time$/,
-        /^-+\++-+\++-+\++-+$/,
+        %r!^Filename\s+|\s+Count\s+|\s+Bytes\s+|\s+Time$!,
+        %r!^-+\++-+\++-+\++-+$!,
         %r!^_posts/2010-01-09-date-override\.markdown\s+|\s+\d+\s+|\s+\d+\.\d{2}K\s+|\s+\d+\.\d{3}$!
       ]
       # rubocop:enable Metrics/LineLength
diff --git a/test/test_new_command.rb b/test/test_new_command.rb
index e020940086c..7ab638fd558 100644
--- a/test/test_new_command.rb
+++ b/test/test_new_command.rb
@@ -34,8 +34,8 @@ def site_template
       refute_exist @full_path
       capture_stdout { Jekyll::Commands::New.process(@args) }
       assert_exist gemfile
-      assert_match(/gem "jekyll", "#{Jekyll::VERSION}"/, File.read(gemfile))
-      assert_match(/gem "github-pages"/, File.read(gemfile))
+      assert_match(%r!gem "jekyll", "#{Jekyll::VERSION}"!, File.read(gemfile))
+      assert_match(%r!gem "github-pages"!, File.read(gemfile))
     end
 
     should "display a success message" do
@@ -91,7 +91,7 @@ def site_template
     should "force created folder" do
       capture_stdout { Jekyll::Commands::New.process(@args) }
       output = capture_stdout { Jekyll::Commands::New.process(@args, "--force") }
-      assert_match(/New jekyll site installed in/, output)
+      assert_match(%r!New jekyll site installed in!, output)
     end
   end
 
diff --git a/test/test_page.rb b/test/test_page.rb
index 5b4aabebe30..9b27af7f13a 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -313,7 +313,7 @@ def do_render(page)
         page.write(dest_dir)
 
         assert_equal "/sitemap.xml", page.url
-        assert_nil page.url[/\.html$/]
+        assert_nil page.url[%r!\.html$!]
         assert File.directory?(dest_dir)
         assert_exist dest_dir("sitemap.xml")
       end
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 736d60d649e..6b8fe8db78d 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -177,7 +177,7 @@ def highlight_block_with_opts(options_string)
       end
 
       should "not cause a markdown error" do
-        refute_match(/markdown\-html\-error/, @result)
+        refute_match(%r!markdown\-html\-error!, @result)
       end
 
       should "render markdown with pygments" do
@@ -544,7 +544,7 @@ def highlight_block_with_opts(options_string)
     end
 
     should "not cause an error" do
-      refute_match(/markdown\-html\-error/, @result)
+      refute_match(%r!markdown\-html\-error!, @result)
     end
 
     should "have the url to the \"complex\" post from 2008-11-21" do
@@ -573,7 +573,7 @@ def highlight_block_with_opts(options_string)
     end
 
     should "not cause an error" do
-      refute_match(/markdown\-html\-error/, @result)
+      refute_match(%r!markdown\-html\-error!, @result)
     end
 
     should "have the url to the \"complex\" post from 2008-11-21" do
@@ -645,7 +645,7 @@ def highlight_block_with_opts(options_string)
     end
 
     should "not cause an error" do
-      refute_match(/markdown\-html\-error/, @result)
+      refute_match(%r!markdown\-html\-error!, @result)
     end
 
     should "have the url to the \"yaml_with_dots\" item" do
@@ -672,7 +672,7 @@ def highlight_block_with_opts(options_string)
     end
 
     should "not cause an error" do
-      refute_match(/markdown\-html\-error/, @result)
+      refute_match(%r!markdown\-html\-error!, @result)
     end
 
     should "have the url to the \"sanitized_path\" item" do
@@ -727,7 +727,7 @@ def highlight_block_with_opts(options_string)
           })
         end
         @result ||= ""
-        refute_match(/SYMLINK TEST/, @result)
+        refute_match(%r!SYMLINK TEST!, @result)
       end
 
       should "not expose the existence of symlinked files" do
@@ -954,15 +954,15 @@ def highlight_block_with_opts(options_string)
       end
 
       should "include file as variable with liquid filters" do
-        assert_match(/1 included/, @content)
-        assert_match(/2 included/, @content)
-        assert_match(/3 included/, @content)
+        assert_match(%r!1 included!, @content)
+        assert_match(%r!2 included!, @content)
+        assert_match(%r!3 included!, @content)
       end
 
       should "include file as variable and liquid filters with arbitrary whitespace" do
-        assert_match(/4 included/, @content)
-        assert_match(/5 included/, @content)
-        assert_match(/6 included/, @content)
+        assert_match(%r!4 included!, @content)
+        assert_match(%r!5 included!, @content)
+        assert_match(%r!6 included!, @content)
       end
 
       should "include file as variable and filters with additional parameters" do
@@ -971,7 +971,7 @@ def highlight_block_with_opts(options_string)
       end
 
       should "include file as partial variable" do
-        assert_match(/8 included/, @content)
+        assert_match(%r!8 included!, @content)
       end
     end
   end
@@ -986,15 +986,15 @@ def highlight_block_with_opts(options_string)
     end
 
     should "include file as variable with liquid filters" do
-      assert_match(/1 relative_include/, @content)
-      assert_match(/2 relative_include/, @content)
-      assert_match(/3 relative_include/, @content)
+      assert_match(%r!1 relative_include!, @content)
+      assert_match(%r!2 relative_include!, @content)
+      assert_match(%r!3 relative_include!, @content)
     end
 
     should "include file as variable and liquid filters with arbitrary whitespace" do
-      assert_match(/4 relative_include/, @content)
-      assert_match(/5 relative_include/, @content)
-      assert_match(/6 relative_include/, @content)
+      assert_match(%r!4 relative_include!, @content)
+      assert_match(%r!5 relative_include!, @content)
+      assert_match(%r!6 relative_include!, @content)
     end
 
     should "include file as variable and filters with additional parameters" do
@@ -1003,11 +1003,11 @@ def highlight_block_with_opts(options_string)
     end
 
     should "include file as partial variable" do
-      assert_match(/8 relative_include/, @content)
+      assert_match(%r!8 relative_include!, @content)
     end
 
     should "include files relative to self" do
-      assert_match(/9 —\ntitle: Test Post Where YAML/, @content)
+      assert_match(%r!9 —\ntitle: Test Post Where YAML!, @content)
     end
 
     context "trying to do bad stuff" do
@@ -1087,7 +1087,7 @@ def highlight_block_with_opts(options_string)
           })
         end
         @result ||= ""
-        refute_match(/SYMLINK TEST/, @result)
+        refute_match(%r!SYMLINK TEST!, @result)
       end
 
       should "not expose the existence of symlinked files" do

From d725991237b75eca7ff5bf95f5b4d25739381c8f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 2 Jun 2016 17:12:35 -0700
Subject: [PATCH 0975/4996] Update history to reflect merge of #4962 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 15df2cd2c59..c203eb13bb1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -129,6 +129,7 @@
   * Corrected pagination docs for hidden: true feature (#4903)
   * Remove a Broken Link for Refheap Plugin (#4971)
   * Instructions on how to install github-gem on Windows (#4975)
+  * Minor tweak to fix missing apostrophne (#4962)
 
 ## 3.1.6 / 2016-05-19
 

From 6e504a0d2ea9803419c0ee16287072e8efcc1f39 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 2 Jun 2016 18:01:55 -0700
Subject: [PATCH 0976/4996] Update history to reflect merge of #4977 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c203eb13bb1..99b5abe38fe 100644
--- a/History.markdown
+++ b/History.markdown
@@ -130,6 +130,7 @@
   * Remove a Broken Link for Refheap Plugin (#4971)
   * Instructions on how to install github-gem on Windows (#4975)
   * Minor tweak to fix missing apostrophne (#4962)
+  * Instructions on how to install github-gem on Windows (v2) (#4977)
 
 ## 3.1.6 / 2016-05-19
 

From 712e77abd28c4c272aad8e1b604f06dd4a6be2c3 Mon Sep 17 00:00:00 2001
From: Praveen Kumar 
Date: Fri, 3 Jun 2016 00:28:45 +0530
Subject: [PATCH 0977/4996] lib/jekyll.rb - fix offenses reported by rubocop
 method set_timezone is ignored using rubocop:disable Style/AccessorMethodName

---
 lib/jekyll.rb | 149 +++++++++++++++++++++++++-------------------------
 1 file changed, 76 insertions(+), 73 deletions(-)

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 676f6e715ab..db1e40cd60b 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -6,79 +6,79 @@
 #
 # Returns nothing.
 def require_all(path)
-  glob = File.join(File.dirname(__FILE__), path, '*.rb')
+  glob = File.join(File.dirname(__FILE__), path, "*.rb")
   Dir[glob].sort.each do |f|
     require f
   end
 end
 
 # rubygems
-require 'rubygems'
+require "rubygems"
 
 # stdlib
 require "pathutil"
-require 'forwardable'
-require 'fileutils'
-require 'time'
-require 'English'
-require 'pathname'
-require 'logger'
-require 'set'
+require "forwardable"
+require "fileutils"
+require "time"
+require "English"
+require "pathname"
+require "logger"
+require "set"
 
 # 3rd party
-require 'safe_yaml/load'
-require 'liquid'
-require 'kramdown'
-require 'colorator'
+require "safe_yaml/load"
+require "liquid"
+require "kramdown"
+require "colorator"
 
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Jekyll
   # internal requires
-  autoload :Cleaner,             'jekyll/cleaner'
-  autoload :Collection,          'jekyll/collection'
-  autoload :Configuration,       'jekyll/configuration'
-  autoload :Convertible,         'jekyll/convertible'
-  autoload :Deprecator,          'jekyll/deprecator'
-  autoload :Document,            'jekyll/document'
-  autoload :Draft,               'jekyll/draft'
-  autoload :EntryFilter,         'jekyll/entry_filter'
-  autoload :Errors,              'jekyll/errors'
-  autoload :Excerpt,             'jekyll/excerpt'
-  autoload :External,            'jekyll/external'
-  autoload :FrontmatterDefaults, 'jekyll/frontmatter_defaults'
-  autoload :Hooks,               'jekyll/hooks'
-  autoload :Layout,              'jekyll/layout'
-  autoload :CollectionReader,    'jekyll/readers/collection_reader'
-  autoload :DataReader,          'jekyll/readers/data_reader'
-  autoload :LayoutReader,        'jekyll/readers/layout_reader'
-  autoload :PostReader,          'jekyll/readers/post_reader'
-  autoload :PageReader,          'jekyll/readers/page_reader'
-  autoload :StaticFileReader,    'jekyll/readers/static_file_reader'
-  autoload :LogAdapter,          'jekyll/log_adapter'
-  autoload :Page,                'jekyll/page'
-  autoload :PluginManager,       'jekyll/plugin_manager'
-  autoload :Publisher,           'jekyll/publisher'
-  autoload :Reader,              'jekyll/reader'
-  autoload :Regenerator,         'jekyll/regenerator'
-  autoload :RelatedPosts,        'jekyll/related_posts'
-  autoload :Renderer,            'jekyll/renderer'
-  autoload :LiquidRenderer,      'jekyll/liquid_renderer'
-  autoload :Site,                'jekyll/site'
-  autoload :StaticFile,          'jekyll/static_file'
-  autoload :Stevenson,           'jekyll/stevenson'
-  autoload :Theme,               'jekyll/theme'
-  autoload :ThemeBuilder,        'jekyll/theme_builder'
-  autoload :URL,                 'jekyll/url'
-  autoload :Utils,               'jekyll/utils'
-  autoload :VERSION,             'jekyll/version'
+  autoload :Cleaner,             "jekyll/cleaner"
+  autoload :Collection,          "jekyll/collection"
+  autoload :Configuration,       "jekyll/configuration"
+  autoload :Convertible,         "jekyll/convertible"
+  autoload :Deprecator,          "jekyll/deprecator"
+  autoload :Document,            "jekyll/document"
+  autoload :Draft,               "jekyll/draft"
+  autoload :EntryFilter,         "jekyll/entry_filter"
+  autoload :Errors,              "jekyll/errors"
+  autoload :Excerpt,             "jekyll/excerpt"
+  autoload :External,            "jekyll/external"
+  autoload :FrontmatterDefaults, "jekyll/frontmatter_defaults"
+  autoload :Hooks,               "jekyll/hooks"
+  autoload :Layout,              "jekyll/layout"
+  autoload :CollectionReader,    "jekyll/readers/collection_reader"
+  autoload :DataReader,          "jekyll/readers/data_reader"
+  autoload :LayoutReader,        "jekyll/readers/layout_reader"
+  autoload :PostReader,          "jekyll/readers/post_reader"
+  autoload :PageReader,          "jekyll/readers/page_reader"
+  autoload :StaticFileReader,    "jekyll/readers/static_file_reader"
+  autoload :LogAdapter,          "jekyll/log_adapter"
+  autoload :Page,                "jekyll/page"
+  autoload :PluginManager,       "jekyll/plugin_manager"
+  autoload :Publisher,           "jekyll/publisher"
+  autoload :Reader,              "jekyll/reader"
+  autoload :Regenerator,         "jekyll/regenerator"
+  autoload :RelatedPosts,        "jekyll/related_posts"
+  autoload :Renderer,            "jekyll/renderer"
+  autoload :LiquidRenderer,      "jekyll/liquid_renderer"
+  autoload :Site,                "jekyll/site"
+  autoload :StaticFile,          "jekyll/static_file"
+  autoload :Stevenson,           "jekyll/stevenson"
+  autoload :Theme,               "jekyll/theme"
+  autoload :ThemeBuilder,        "jekyll/theme_builder"
+  autoload :URL,                 "jekyll/url"
+  autoload :Utils,               "jekyll/utils"
+  autoload :VERSION,             "jekyll/version"
 
   # extensions
-  require 'jekyll/plugin'
-  require 'jekyll/converter'
-  require 'jekyll/generator'
-  require 'jekyll/command'
-  require 'jekyll/liquid_extensions'
+  require "jekyll/plugin"
+  require "jekyll/converter"
+  require "jekyll/generator"
+  require "jekyll/command"
+  require "jekyll/liquid_extensions"
   require "jekyll/filters"
 
   class << self
@@ -94,19 +94,20 @@ def env
     # options with anything in _config.yml, and adding the given options on top.
     #
     # override - A Hash of config directives that override any options in both
-    #            the defaults and the config file. See Jekyll::Configuration::DEFAULTS for a
+    #            the defaults and the config file.
+    #            See Jekyll::Configuration::DEFAULTS for a
     #            list of option names and their defaults.
     #
     # Returns the final configuration Hash.
-    def configuration(override = Hash.new)
+    def configuration(override = {})
       config = Configuration.new
-      unless override.delete('skip_config_files')
+      unless override.delete("skip_config_files")
         config = config.read_config_files(config.config_files(override))
       end
 
       # Merge DEFAULTS < _config.yml < override
-      Configuration.from(Utils.deep_merge_hashes(config, override)).tap do |config|
-        set_timezone(config['timezone']) if config['timezone']
+      Configuration.from(Utils.deep_merge_hashes(config, override)).tap do |obj|
+        set_timezone(obj["timezone"]) if obj["timezone"]
       end
     end
 
@@ -115,9 +116,11 @@ def configuration(override = Hash.new)
     # timezone - the IANA Time Zone
     #
     # Returns nothing
+    # rubocop:disable Style/AccessorMethodName
     def set_timezone(timezone)
-      ENV['TZ'] = timezone
+      ENV["TZ"] = timezone
     end
+    # rubocop:enable Style/AccessorMethodName
 
     # Public: Fetch the logger instance for this Jekyll process.
     #
@@ -154,11 +157,11 @@ def sites
     def sanitized_path(base_directory, questionable_path)
       return base_directory if base_directory.eql?(questionable_path)
 
-      questionable_path.insert(0, '/') if questionable_path.start_with?('~')
+      questionable_path.insert(0, "/") if questionable_path.start_with?("~")
       clean_path = File.expand_path(questionable_path, "/")
-      clean_path.sub!(/\A\w\:\//, '/')
+      clean_path.sub!(%r!\A\w:/!, "/")
 
-      if clean_path.start_with?(base_directory.sub(/\A\w\:\//, '/'))
+      if clean_path.start_with?(base_directory.sub(%r!\A\w:/!, "/"))
         clean_path
       else
         File.join(base_directory, clean_path)
@@ -166,17 +169,17 @@ def sanitized_path(base_directory, questionable_path)
     end
 
     # Conditional optimizations
-    Jekyll::External.require_if_present('liquid-c')
+    Jekyll::External.require_if_present("liquid-c")
   end
 end
 
 require "jekyll/drops/drop"
 require "jekyll/drops/document_drop"
-require_all 'jekyll/commands'
-require_all 'jekyll/converters'
-require_all 'jekyll/converters/markdown'
-require_all 'jekyll/drops'
-require_all 'jekyll/generators'
-require_all 'jekyll/tags'
-
-require 'jekyll-sass-converter'
+require_all "jekyll/commands"
+require_all "jekyll/converters"
+require_all "jekyll/converters/markdown"
+require_all "jekyll/drops"
+require_all "jekyll/generators"
+require_all "jekyll/tags"
+
+require "jekyll-sass-converter"

From 93f176f8c55ab35d5ec4f76ac0ab2e2517cc7cb2 Mon Sep 17 00:00:00 2001
From: Praveen Kumar 
Date: Fri, 3 Jun 2016 00:29:49 +0530
Subject: [PATCH 0978/4996] .rubocop.yml - remove lib/jekyll.rb

---
 .rubocop.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 6c441f9bfb3..71a5571c0b5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -16,7 +16,6 @@ AllCops:
   - lib/jekyll/site.rb
   - lib/jekyll/static_file.rb
   - lib/jekyll/utils.rb
-  - lib/jekyll.rb
   - bin/**/*
   - benchmark/**/*
   - script/**/*

From 1c6916f2378e8c40e7aaff627d430294c3085ee5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 2 Jun 2016 22:03:03 -0700
Subject: [PATCH 0979/4996] Update history to reflect merge of #4966 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 99b5abe38fe..7a07fbe595e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -85,6 +85,7 @@
   * rubocop: jekyll/lib/frontmatter_defaults.rb (#4974)
   * rubocop: features/step_definitions.rb (#4956)
   * Rubocop theme and url jekyll libs (#4959)
+  * Rubocop jekyll.rb (#4966)
 
 ### Site Enhancements
 

From 59bd2587df2ccb01ed165123ae120d3737f4a40d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Guitton?= 
Date: Fri, 3 Jun 2016 10:48:32 +0200
Subject: [PATCH 0980/4996] Amend WEBrick default headers documentation

---
 site/_docs/configuration.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index 5fe13ddb1b8..f313656e27e 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -383,7 +383,7 @@ before your site is served.
   
    
 
 
-## Custom WEBRick Headers
+## Custom WEBrick Headers
 
 You can provide custom headers for your site by adding them to `_config.yml`
 
@@ -397,9 +397,10 @@ webrick:
 
 ### Defaults
 
-We only provide one default and that's a Cache-Control header that disables
-caching in development so that you don't have to fight with Chrome's aggressive
-caching when you are in development mode.
+We provide by default `Content-Type` and `Cache-Control` response headers: one
+dynamic in order to specify the nature of the data being served, the other
+static in order to disable caching so that you don't have to fight with Chrome's
+aggressive caching when you are in development mode.
 
 ## Specifying a Jekyll environment at build time
 

From b15423b6a99c1855a899453ceddbcdc138b72de9 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 3 Jun 2016 08:12:06 -0700
Subject: [PATCH 0981/4996] Update history to reflect merge of #4976 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7a07fbe595e..da34cf5162d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -132,6 +132,7 @@
   * Instructions on how to install github-gem on Windows (#4975)
   * Minor tweak to fix missing apostrophne (#4962)
   * Instructions on how to install github-gem on Windows (v2) (#4977)
+  * Fix inaccurate HTTP response header field name (#4976)
 
 ## 3.1.6 / 2016-05-19
 

From 912e6b469a619be6eba37061f651be62e730a080 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 3 Jun 2016 13:47:35 -0700
Subject: [PATCH 0982/4996] Add post about GSoC project.

---
 ...-s-google-summer-of-code-projects.markdown | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 site/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown

diff --git a/site/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown b/site/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown
new file mode 100644
index 00000000000..db19662c547
--- /dev/null
+++ b/site/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown
@@ -0,0 +1,19 @@
+---
+layout: news_item
+title: "Jekyll's Google Summer of Code Project: The CMS You Always Wanted"
+date: "2016-06-03 13:21:02 -0700"
+author: parkr
+categories: [community]
+---
+
+This year, Jekyll applied to be a part of [Google Summer of Code](https://summerofcode.withgoogle.com/how-it-works/). Students were able to propose any project related to Jekyll. With a gracious sponsorship from GitHub and the participation of myself, [@benbalter](https://github.com/benbalter) and [@jldec](https://github.com/jldec), Jekyll was able to accept two students for the 2016 season, [@mertkahyaoglu](https://github.com/mertkahyaoglu) and [@rush-skills](https://github.com/rush-skills).
+
+These students are working on a project that fills a huge need for the community: **a graphical solution for managing your site's content.** Current plans include a fully-integrated admin which spins up when you run `jekyll serve` and a web interface at an address like `http://localhost:4000/admin/`. The server implements a common interface which would make a hosted version to make updates to hosted content like a repository on GitHub very easy to write – simply implement the CRUD API and the web interface will happily use that instead.
+
+The strength of text files as the storage medium for content has been part of Jekyll's success. [Our homepage](/) lauds the absence of a traditional SQL database when using Jekyll – your content should be what demands your time, not pesky database downtime. Unfortunately, understanding of the structure of a Jekyll site takes some work, enough that for some users, it's prohibitive to using Jekyll to accomplish their publishing goals.
+
+Mert and Ankur both applied to take on this challenge and agreed to split the project, one taking on the web interface and the other taking on the backend. We're very excited to see a fully-functional CMS for Jekyll at the end of the summer produced by these excellent community members, and we hope you'll join us in cheering them on and sharing our gratitude for all their hard work.
+
+Thanks, as always, for being part of such a wonderful community that made this all possible. I'm honored to work with each of you to create something folks all around the globe find a joy to use. I look forward to our continued work to move Jekyll forward.
+
+As always, Happy Jekylling!

From 03c2811ae01d6e6b7fefc3c70b900b0ab82b4a69 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 3 Jun 2016 14:58:51 -0700
Subject: [PATCH 0983/4996] Use jekyll-mentions and restructure

---
 Gemfile                                                     | 1 +
 site/_config.yml                                            | 1 +
 ...date-on-jekyll-s-google-summer-of-code-projects.markdown | 6 ++++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 54983415f45..253826aa58f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -86,4 +86,5 @@ group :site do
   gem "jekyll-sitemap"
   gem "jekyll-seo-tag", "~> 1.1"
   gem "jekyll-avatar"
+  gem "jekyll-mentions"
 end
diff --git a/site/_config.yml b/site/_config.yml
index e284a81bedd..0b69dc98089 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -32,3 +32,4 @@ gems:
   - jekyll-sitemap
   - jekyll-seo-tag
   - jekyll-avatar
+  - jekyll-mentions
diff --git a/site/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown b/site/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown
index db19662c547..f2407cb68f9 100644
--- a/site/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown
+++ b/site/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown
@@ -6,9 +6,11 @@ author: parkr
 categories: [community]
 ---
 
-This year, Jekyll applied to be a part of [Google Summer of Code](https://summerofcode.withgoogle.com/how-it-works/). Students were able to propose any project related to Jekyll. With a gracious sponsorship from GitHub and the participation of myself, [@benbalter](https://github.com/benbalter) and [@jldec](https://github.com/jldec), Jekyll was able to accept two students for the 2016 season, [@mertkahyaoglu](https://github.com/mertkahyaoglu) and [@rush-skills](https://github.com/rush-skills).
+This year, Jekyll applied to be a part of [Google Summer of Code](https://summerofcode.withgoogle.com/how-it-works/). Students were able to propose any project related to Jekyll. With a gracious sponsorship from GitHub and the participation of myself, @benbalter and @jldec, Jekyll was able to accept two students for the 2016 season, @mertkahyaoglu and @rush-skills.
 
-These students are working on a project that fills a huge need for the community: **a graphical solution for managing your site's content.** Current plans include a fully-integrated admin which spins up when you run `jekyll serve` and a web interface at an address like `http://localhost:4000/admin/`. The server implements a common interface which would make a hosted version to make updates to hosted content like a repository on GitHub very easy to write – simply implement the CRUD API and the web interface will happily use that instead.
+These students are working on a project that fills a huge need for the community: **a graphical solution for managing your site's content.**
+
+Current plans include a fully-integrated admin which spins up when you run `jekyll serve` and a web interface at an address like `http://localhost:4000/admin/`. The server implements a common interface which would make a hosted version to make updates to hosted content like a repository on GitHub very easy to write – simply implement the CRUD API and the web interface will happily use that instead.
 
 The strength of text files as the storage medium for content has been part of Jekyll's success. [Our homepage](/) lauds the absence of a traditional SQL database when using Jekyll – your content should be what demands your time, not pesky database downtime. Unfortunately, understanding of the structure of a Jekyll site takes some work, enough that for some users, it's prohibitive to using Jekyll to accomplish their publishing goals.
 

From b3583a4236cae37f38f5d04ab8ff274335715cdf Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 3 Jun 2016 16:41:35 -0700
Subject: [PATCH 0984/4996] werdz

---
 ...update-on-jekyll-s-google-summer-of-code-projects.markdown | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/site/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown b/site/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown
index f2407cb68f9..0f4ce2de4d7 100644
--- a/site/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown
+++ b/site/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown
@@ -8,9 +8,7 @@ categories: [community]
 
 This year, Jekyll applied to be a part of [Google Summer of Code](https://summerofcode.withgoogle.com/how-it-works/). Students were able to propose any project related to Jekyll. With a gracious sponsorship from GitHub and the participation of myself, @benbalter and @jldec, Jekyll was able to accept two students for the 2016 season, @mertkahyaoglu and @rush-skills.
 
-These students are working on a project that fills a huge need for the community: **a graphical solution for managing your site's content.**
-
-Current plans include a fully-integrated admin which spins up when you run `jekyll serve` and a web interface at an address like `http://localhost:4000/admin/`. The server implements a common interface which would make a hosted version to make updates to hosted content like a repository on GitHub very easy to write – simply implement the CRUD API and the web interface will happily use that instead.
+These students are working on a project that fills a huge need for the community: _a graphical solution for managing your site's content._ Current plans include a fully-integrated admin which spins up when you run jekyll serve and provides a friendly web interface for creating and editing your content. The server and web interface will speak a common HTTP interface so either piece could be switched out for, e.g. a server which writes directly to a repository on GitHub.
 
 The strength of text files as the storage medium for content has been part of Jekyll's success. [Our homepage](/) lauds the absence of a traditional SQL database when using Jekyll – your content should be what demands your time, not pesky database downtime. Unfortunately, understanding of the structure of a Jekyll site takes some work, enough that for some users, it's prohibitive to using Jekyll to accomplish their publishing goals.
 

From ea0b43f56d29eeabb0c79327de2124ec3bdb6872 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 3 Jun 2016 16:42:37 -0700
Subject: [PATCH 0985/4996] Update history to reflect merge of #4980 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index da34cf5162d..36f579bc8b3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -133,6 +133,7 @@
   * Minor tweak to fix missing apostrophne (#4962)
   * Instructions on how to install github-gem on Windows (v2) (#4977)
   * Fix inaccurate HTTP response header field name (#4976)
+  * Add post about GSoC project (#4980)
 
 ## 3.1.6 / 2016-05-19
 

From f5a8000baae7eefd09919ee39b73fa0f2120fa73 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 3 Jun 2016 22:10:15 -0700
Subject: [PATCH 0986/4996] Fix regexp literal issues on master.

---
 lib/jekyll/url.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index ba1abbd40a0..440deb18f3b 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -72,13 +72,13 @@ def generate_url_from_hash(template)
           # Remove leading "/" to avoid generating urls with `//`
           result.gsub(%r!/:#{token.first}!, "")
         else
-          result.gsub(/:#{token.first}/, self.class.escape_path(token.last))
+          result.gsub(%r!:#{token.first}!, self.class.escape_path(token.last))
         end
       end
     end
 
     def generate_url_from_drop(template)
-      template.gsub(/:([a-z_]+)/) do |match|
+      template.gsub(%r!:([a-z_]+)!) do |match|
         replacement = @placeholders.public_send(match.sub(":".freeze, "".freeze))
         if replacement.nil?
           "".freeze

From 652f1bad0b88e6561d8e1db9298920dd5c78d3c3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 3 Jun 2016 22:18:39 -0700
Subject: [PATCH 0987/4996] Update history to reflect merge of #4979 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 36f579bc8b3..3afa797069c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -86,6 +86,7 @@
   * rubocop: features/step_definitions.rb (#4956)
   * Rubocop theme and url jekyll libs (#4959)
   * Rubocop jekyll.rb (#4966)
+  * Rubocop: use %r for all regular expressions. (#4979)
 
 ### Site Enhancements
 

From e0f2848da6656b5b17d72e40ed234b24b05638e0 Mon Sep 17 00:00:00 2001
From: chrisfinazzo 
Date: Sat, 4 Jun 2016 12:26:21 -0400
Subject: [PATCH 0988/4996] Link to the HTML page instead of Markdown

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

diff --git a/site/_docs/contributing.md b/site/_docs/contributing.md
index 4038df0d0d2..3c28953f733 100644
--- a/site/_docs/contributing.md
+++ b/site/_docs/contributing.md
@@ -73,7 +73,7 @@ One gotcha, all pull requests should be directed at the `master` branch (the def
 
 ### Adding plugins
 
-If you want to add your plugin to the [list of plugins](https://jekyllrb.com/docs/plugins/#available-plugins), please submit a pull request modifying the [plugins page source file](site/_docs/plugins.md) by adding a link to your plugin under the proper subheading depending upon its type.
+If you want to add your plugin to the [list of plugins](https://jekyllrb.com/docs/plugins/#available-plugins), please submit a pull request modifying the [plugins page source file](https://jekyllrb.com/docs/plugins/) by adding a link to your plugin under the proper subheading depending upon its type.
 
 ## Code Contributions
 

From 688c7b192560c9301500fd06e43767e111fcc3bd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 4 Jun 2016 09:30:26 -0700
Subject: [PATCH 0989/4996] Update history to reflect merge of #4985 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3afa797069c..cb5463a2c40 100644
--- a/History.markdown
+++ b/History.markdown
@@ -135,6 +135,7 @@
   * Instructions on how to install github-gem on Windows (v2) (#4977)
   * Fix inaccurate HTTP response header field name (#4976)
   * Add post about GSoC project (#4980)
+  * Link to the HTML page instead of Markdown (#4985)
 
 ## 3.1.6 / 2016-05-19
 

From 1f01c88fa05eb644a0546aff087f006429e9eb97 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sun, 5 Jun 2016 16:02:01 -0700
Subject: [PATCH 0990/4996] templates docs: .category, .categories, and .tags
 only apply to posts. [ci skip]

Fixes #4987.
---
 site/_docs/frontmatter.md | 64 +++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/site/_docs/frontmatter.md b/site/_docs/frontmatter.md
index 755f0bc6044..faf67b73f43 100644
--- a/site/_docs/frontmatter.md
+++ b/site/_docs/frontmatter.md
@@ -96,38 +96,6 @@ front matter of a page or post.
         
    
       
     
-    
-      
-        
    category
    
-        
    categories
    
-      
-      
-        
    
-
-          Instead of placing posts inside of folders, you can specify one or
-          more categories that the post belongs to. When the site is generated
-          the post will act as though it had been set with these categories
-          normally. Categories (plural key) can be specified as a YAML list or a
-          comma-separated string.
-
-        
    
-      
-    
-    
-      
-        
    tags
    
-      
-      
-        
    
-
-          Similar to categories, one or multiple tags can be added to a post.
-          Also like categories, tags can be specified as a YAML list or a
-          comma-separated string.
-
-        
    
-      
-    
   
 
 
@@ -176,6 +144,38 @@ These are available out-of-the-box to be used in the front matter for a post.
         
    
       
     
+    
+      
+        
    category
    
+        
    categories
    
+      
+      
+        
    
+
+          Instead of placing posts inside of folders, you can specify one or
+          more categories that the post belongs to. When the site is generated
+          the post will act as though it had been set with these categories
+          normally. Categories (plural key) can be specified as a YAML list or a
+          comma-separated string.
+
+        
    
+      
+    
+    
+      
+        
    tags
    
+      
+      
+        
    
+
+          Similar to categories, one or multiple tags can be added to a post.
+          Also like categories, tags can be specified as a YAML list or a
+          comma-separated string.
+
+        
    
+      
+    
   
 
 

From f41bd1bab7e9d237cd39bcc12280f260bd0a3a37 Mon Sep 17 00:00:00 2001
From: DirtyF 
Date: Tue, 24 May 2016 23:13:26 +0200
Subject: [PATCH 0991/4996] Rubocop cleanup

---
 .rubocop.yml                |   1 -
 lib/jekyll/collection.rb    |  21 +++--
 lib/jekyll/command.rb       |  30 ++++---
 lib/jekyll/configuration.rb | 161 +++++++++++++++++++-----------------
 lib/jekyll/deprecator.rb    |  17 ++--
 lib/jekyll/page.rb          |   2 +-
 6 files changed, 125 insertions(+), 107 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 8149e36a3f7..49170d63bf1 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -8,7 +8,6 @@ AllCops:
   - lib/jekyll/command.rb
   - lib/jekyll/configuration.rb
   - lib/jekyll/convertible.rb
-  - lib/jekyll/deprecator.rb
   - lib/jekyll/document.rb
   - lib/jekyll/filters.rb
   - lib/jekyll/regenerator.rb
diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index ff605b87063..6ec72703332 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -32,7 +32,8 @@ def respond_to?(method, include_private = false)
     # Override of method_missing to check in @data for the key.
     def method_missing(method, *args, &blck)
       if docs.respond_to?(method.to_sym)
-        Jekyll.logger.warn "Deprecation:", "#{label}.#{method} should be changed to #{label}.docs.#{method}."
+        Jekyll.logger.warn "Deprecation:", "#{label}.#{method} should be changed to" \
+          "#{label}.docs.#{method}."
         Jekyll.logger.warn "", "Called by #{caller.first}."
         docs.public_send(method.to_sym, *args, &blck)
       else
@@ -64,8 +65,10 @@ def read
             Jekyll.logger.debug "Skipped From Publishing:", doc.relative_path
           end
         else
-          relative_dir = Jekyll.sanitized_path(relative_directory, File.dirname(file_path)).chomp("/.")
-          files << StaticFile.new(site, site.source, relative_dir, File.basename(full_path), self)
+          relative_dir = Jekyll.sanitized_path(relative_directory,
+            File.dirname(file_path)).chomp("/.")
+          files << StaticFile.new(site, site.source, relative_dir,
+            File.basename(full_path), self)
         end
       end
       docs.sort!
@@ -79,7 +82,7 @@ def entries
       return [] unless exists?
       @entries ||=
         Utils.safe_glob(collection_dir, ["**", "*"]).map do |entry|
-          entry["#{collection_dir}/"] = ''
+          entry["#{collection_dir}/"] = ""
           entry
         end
     end
@@ -161,7 +164,7 @@ def inspect
     #
     # Returns a sanitized version of the label.
     def sanitize_label(label)
-      label.gsub(/[^a-z0-9_\-\.]/i, '')
+      label.gsub(/[^a-z0-9_\-\.]/i, "")
     end
 
     # Produce a representation of this Collection for use in Liquid.
@@ -179,14 +182,14 @@ def to_liquid
     #
     # Returns true if the 'write' metadata is true, false otherwise.
     def write?
-      !!metadata.fetch('output', false)
+      !!metadata.fetch("output", false)
     end
 
     # The URL template to render collection's documents at.
     #
     # Returns the URL template to render collection's documents at.
     def url_template
-      @url_template ||= metadata.fetch('permalink') do
+      @url_template ||= metadata.fetch("permalink") do
         Utils.add_permalink_suffix("/:collection/:path", site.permalink_style)
       end
     end
@@ -195,8 +198,8 @@ def url_template
     #
     # Returns the metadata for this collection
     def extract_metadata
-      if site.config['collections'].is_a?(Hash)
-        site.config['collections'][label] || {}
+      if site.config["collections"].is_a?(Hash)
+        site.config["collections"][label] || {}
       else
         {}
       end
diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index afe72a5b44f..eaf8ef44a81 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -46,19 +46,23 @@ def configuration_from_options(options)
       #
       # Returns nothing
       def add_build_options(c)
-        c.option 'config',  '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
-        c.option 'destination', '-d', '--destination DESTINATION', 'The current folder will be generated into DESTINATION'
-        c.option 'source', '-s', '--source SOURCE', 'Custom source directory'
-        c.option 'future',  '--future', 'Publishes posts with a future date'
-        c.option 'limit_posts', '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
-        c.option 'watch',   '-w', '--[no-]watch', 'Watch for changes and rebuild'
-        c.option 'force_polling', '--force_polling', 'Force watch to use polling'
-        c.option 'lsi',     '--lsi', 'Use LSI for improved related posts'
-        c.option 'show_drafts',  '-D', '--drafts', 'Render posts in the _drafts folder'
-        c.option 'unpublished', '--unpublished', 'Render posts that were marked as unpublished'
-        c.option 'quiet',   '-q', '--quiet', 'Silence output.'
-        c.option 'verbose', '-V', '--verbose', 'Print verbose output.'
-        c.option 'incremental', '-I', '--incremental', 'Enable incremental rebuild.'
+        c.option "config", "--config CONFIG_FILE[,CONFIG_FILE2,...]",
+          Array, "Custom configuration file"
+        c.option "destination", "-d", "--destination DESTINATION",
+          "The current folder will be generated into DESTINATION"
+        c.option "source", "-s", "--source SOURCE", "Custom source directory"
+        c.option "future", "--future", "Publishes posts with a future date"
+        c.option "limit_posts", "--limit_posts MAX_POSTS", Integer,
+          "Limits the number of posts to parse and publish"
+        c.option "watch", "-w", "--[no-]watch", "Watch for changes and rebuild"
+        c.option "force_polling", "--force_polling", "Force watch to use polling"
+        c.option "lsi", "--lsi", "Use LSI for improved related posts"
+        c.option "show_drafts", "-D", "--drafts", "Render posts in the _drafts folder"
+        c.option "unpublished", "--unpublished",
+          "Render posts that were marked as unpublished"
+        c.option "quiet", "-q", "--quiet", "Silence output."
+        c.option "verbose", "-V", "--verbose", "Print verbose output."
+        c.option "incremental", "-I", "--incremental", "Enable incremental rebuild."
       end
     end
   end
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index a88272cc393..80e36478811 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -6,71 +6,71 @@ class Configuration < Hash
     # Strings rather than symbols are used for compatibility with YAML.
     DEFAULTS = Configuration[{
       # Where things are
-      'source'        => Dir.pwd,
-      'destination'   => File.join(Dir.pwd, '_site'),
-      'plugins_dir'   => '_plugins',
-      'layouts_dir'   => '_layouts',
-      'data_dir'      => '_data',
-      'includes_dir'  => '_includes',
-      'collections'   => {},
+      "source"            => Dir.pwd,
+      "destination"       => File.join(Dir.pwd, "_site"),
+      "plugins_dir"       => "_plugins",
+      "layouts_dir"       => "_layouts",
+      "data_dir"          => "_data",
+      "includes_dir"      => "_includes",
+      "collections"       => {},
 
       # Handling Reading
-      'safe'          => false,
-      'include'       => ['.htaccess'],
-      'exclude'       => [],
-      'keep_files'    => ['.git', '.svn'],
-      'encoding'      => 'utf-8',
-      'markdown_ext'  => 'markdown,mkdown,mkdn,mkd,md',
+      "safe"              => false,
+      "include"           => [".htaccess"],
+      "exclude"           => [],
+      "keep_files"        => [".git", ".svn"],
+      "encoding"          => "utf-8",
+      "markdown_ext"      => "markdown,mkdown,mkdn,mkd,md",
 
       # Filtering Content
-      'show_drafts'   => nil,
-      'limit_posts'   => 0,
-      'future'        => false,
-      'unpublished'   => false,
+      "show_drafts"       => nil,
+      "limit_posts"       => 0,
+      "future"            => false,
+      "unpublished"       => false,
 
       # Plugins
-      'whitelist'     => [],
-      'gems'          => [],
+      "whitelist"         => [],
+      "gems"              => [],
 
       # Conversion
-      'markdown'      => 'kramdown',
-      'highlighter'   => 'rouge',
-      'lsi'           => false,
-      'excerpt_separator' => "\n\n",
-      'incremental'   => false,
+      "markdown"          => "kramdown",
+      "highlighter"       => "rouge",
+      "lsi"               => false,
+      "excerpt_separator" => "\n\n",
+      "incremental"       => false,
 
       # Serving
-      'detach'        => false,          # default to not detaching the server
-      'port'          => '4000',
-      'host'          => '127.0.0.1',
-      'baseurl'       => '',
-      'show_dir_listing' => false,
+      "detach"            => false, # default to not detaching the server
+      "port"              => "4000",
+      "host"              => "127.0.0.1",
+      "baseurl"           => "",
+      "show_dir_listing"  => false,
 
       # Output Configuration
-      'permalink'     => 'date',
-      'paginate_path' => '/page:num',
-      'timezone'      => nil,           # use the local timezone
+      "permalink"         => "date",
+      "paginate_path"     => "/page:num",
+      "timezone"          => nil, # use the local timezone
 
-      'quiet'         => false,
-      'verbose'       => false,
-      'defaults'      => [],
+      "quiet"             => false,
+      "verbose"           => false,
+      "defaults"          => [],
 
-      'rdiscount' => {
-        'extensions' => []
+      "rdiscount"         => {
+        "extensions" => []
       },
 
-      'redcarpet' => {
-        'extensions' => []
+      "redcarpet"         => {
+        "extensions" => []
       },
 
-      'kramdown' => {
-        'auto_ids'       => true,
-        'toc_levels'     => '1..6',
-        'entity_output'  => 'as_char',
-        'smart_quotes'   => 'lsquo,rsquo,ldquo,rdquo',
-        'input'          => "GFM",
-        'hard_wrap'      => false,
-        'footnote_nr'    => 1
+      "kramdown"          => {
+        "auto_ids"      => true,
+        "toc_levels"    => "1..6",
+        "entity_output" => "as_char",
+        "smart_quotes"  => "lsquo,rsquo,ldquo,rdquo",
+        "input"         => "GFM",
+        "hard_wrap"     => false,
+        "footnote_nr"   => 1
       }
     }.map { |k, v| [k, v.freeze] }].freeze
 
@@ -108,28 +108,29 @@ def get_config_value_with_override(config_key, override)
     #
     # Returns the path to the Jekyll source directory
     def source(override)
-      get_config_value_with_override('source', override)
+      get_config_value_with_override("source", override)
     end
 
     def quiet(override = {})
-      get_config_value_with_override('quiet', override)
+      get_config_value_with_override("quiet", override)
     end
     alias_method :quiet?, :quiet
 
     def verbose(override = {})
-      get_config_value_with_override('verbose', override)
+      get_config_value_with_override("verbose", override)
     end
     alias_method :verbose?, :verbose
 
     def safe_load_file(filename)
       case File.extname(filename)
       when /\.toml/i
-        Jekyll::External.require_with_graceful_fail('toml') unless defined?(TOML)
+        Jekyll::External.require_with_graceful_fail("toml") unless defined?(TOML)
         TOML.load_file(filename)
       when /\.ya?ml/i
         SafeYAML.load_file(filename) || {}
       else
-        raise ArgumentError, "No parser for '#{filename}' is available. Use a .toml or .y(a)ml file instead."
+        raise ArgumentError, "No parser for '#{filename}' is available.
+          Use a .toml or .y(a)ml file instead."
       end
     end
 
@@ -140,12 +141,15 @@ def safe_load_file(filename)
     # Returns an Array of config files
     def config_files(override)
       # Adjust verbosity quickly
-      Jekyll.logger.adjust_verbosity(:quiet => quiet?(override), :verbose => verbose?(override))
+      Jekyll.logger.adjust_verbosity(
+        :quiet   => quiet?(override),
+        :verbose => verbose?(override)
+      )
 
       # Get configuration from /_config.yml or /
-      config_files = override.delete('config')
+      config_files = override.delete("config")
       if config_files.to_s.empty?
-        default = %w(yml yaml).find(-> { 'yml' }) do |ext|
+        default = %w(yml yaml).find(-> { "yml" }) do |ext|
           File.exist?(Jekyll.sanitized_path(source(override), "_config.#{ext}"))
         end
         config_files = Jekyll.sanitized_path(source(override), "_config.#{default}")
@@ -170,7 +174,8 @@ def read_config_file(file)
         Jekyll.logger.warn "Configuration file:", "none"
         {}
       else
-        Jekyll.logger.error "Fatal:", "The configuration file '#{file}' could not be found."
+        Jekyll.logger.error "Fatal:", "The configuration file '#{file}'
+          could not be found."
         raise LoadError, "The Configuration file '#{file}' could not be found."
       end
     end
@@ -193,7 +198,7 @@ def read_config_files(files)
       rescue ArgumentError => err
         Jekyll.logger.warn "WARNING:", "Error reading configuration. " \
                      "Using defaults (and options)."
-        $stderr.puts "#{err}"
+        $stderr.puts err
       end
 
       configuration.fix_common_issues.backwards_compatibilize.add_default_collections
@@ -215,34 +220,34 @@ def csv_to_array(csv)
     def backwards_compatibilize
       config = clone
       # Provide backwards-compatibility
-      if config.key?('auto') || config.key?('watch')
+      if config.key?("auto") || config.key?("watch")
         Jekyll::Deprecator.deprecation_message "Auto-regeneration can no longer" \
-                            " be set from your configuration file(s). Use the"\
+                            " be set from your configuration file(s). Use the" \
                             " --[no-]watch/-w command-line option instead."
-        config.delete('auto')
-        config.delete('watch')
+        config.delete("auto")
+        config.delete("watch")
       end
 
-      if config.key? 'server'
+      if config.key?("server")
         Jekyll::Deprecator.deprecation_message "The 'server' configuration option" \
                             " is no longer accepted. Use the 'jekyll serve'" \
                             " subcommand to serve your site with WEBrick."
-        config.delete('server')
+        config.delete("server")
       end
 
-      renamed_key 'server_port', 'port', config
-      renamed_key 'plugins', 'plugins_dir', config
-      renamed_key 'layouts', 'layouts_dir', config
-      renamed_key 'data_source', 'data_dir', config
+      renamed_key "server_port", "port", config
+      renamed_key "plugins", "plugins_dir", config
+      renamed_key "layouts", "layouts_dir", config
+      renamed_key "data_source", "data_dir", config
 
-      if config.key? 'pygments'
+      if config.key?("pygments")
         Jekyll::Deprecator.deprecation_message "The 'pygments' configuration option" \
                             " has been renamed to 'highlighter'. Please update your" \
                             " config file accordingly. The allowed values are 'rouge', " \
                             "'pygments' or null."
 
-        config['highlighter'] = 'pygments' if config['pygments']
-        config.delete('pygments')
+        config["highlighter"] = "pygments" if config["pygments"]
+        config.delete("pygments")
       end
 
       %w(include exclude).each do |option|
@@ -256,13 +261,13 @@ def backwards_compatibilize
         config[option].map!(&:to_s) if config[option]
       end
 
-      if (config['kramdown'] || {}).key?('use_coderay')
+      if (config["kramdown"] || {}).key?("use_coderay")
         Jekyll::Deprecator.deprecation_message "Please change 'use_coderay'" \
           " to 'enable_coderay' in your configuration file."
-        config['kramdown']['use_coderay'] = config['kramdown'].delete('enable_coderay')
+        config["kramdown"]["use_coderay"] = config["kramdown"].delete("enable_coderay")
       end
 
-      if config.fetch('markdown', 'kramdown').to_s.downcase.eql?("maruku")
+      if config.fetch("markdown", "kramdown").to_s.casecmp("maruku") == 0
         Jekyll.logger.abort_with "Error:", "You're using the 'maruku' " \
           "Markdown processor, which has been removed as of 3.0.0. " \
           "We recommend you switch to Kramdown. To do this, replace " \
@@ -276,10 +281,12 @@ def backwards_compatibilize
     def fix_common_issues
       config = clone
 
-      if config.key?('paginate') && (!config['paginate'].is_a?(Integer) || config['paginate'] < 1)
-        Jekyll.logger.warn "Config Warning:", "The `paginate` key must be a" \
-          " positive integer or nil. It's currently set to '#{config['paginate'].inspect}'."
-        config['paginate'] = nil
+      if config.key?("paginate") && (!config["paginate"].is_a?(Integer) ||
+             config["paginate"] < 1)
+
+        Jekyll.logger.warn "Config Warning:", "The `paginate` key must be a positive" \
+          " integer or nil. It's currently set to '#{config["paginate"].inspect}'."
+        config["paginate"] = nil
       end
 
       config
diff --git a/lib/jekyll/deprecator.rb b/lib/jekyll/deprecator.rb
index 21449400b28..5fa0c0ac8ba 100644
--- a/lib/jekyll/deprecator.rb
+++ b/lib/jekyll/deprecator.rb
@@ -9,20 +9,24 @@ def process(args)
                           'serve' subcommand."
       arg_is_present? args, "--no-server", "To build Jekyll without launching a server, \
                           use the 'build' subcommand."
-      arg_is_present? args, "--auto", "The switch '--auto' has been replaced with '--watch'."
+      arg_is_present? args, "--auto", "The switch '--auto' has been replaced with \
+                          '--watch'."
       arg_is_present? args, "--no-auto", "To disable auto-replication, simply leave off \
                           the '--watch' switch."
       arg_is_present? args, "--pygments", "The 'pygments'settings has been removed in \
                           favour of 'highlighter'."
-      arg_is_present? args, "--paginate", "The 'paginate' setting can only be set in your \
+      arg_is_present? args, "--paginate", "The 'paginate' setting can only be set in \
+                          your config files."
+      arg_is_present? args, "--url", "The 'url' setting can only be set in your \
                           config files."
-      arg_is_present? args, "--url", "The 'url' setting can only be set in your config files."
       no_subcommand(args)
     end
 
     def no_subcommand(args)
-      if args.size > 0 && args.first =~ /^--/ && !%w(--help --version).include?(args.first)
-        deprecation_message "Jekyll now uses subcommands instead of just switches. Run `jekyll help` to find out more."
+      unless args.empty? ||
+          args.first !~ %r(!/^--/!) || %w(--help --version).include?(args.first)
+        deprecation_message "Jekyll now uses subcommands instead of just switches. \
+                          Run `jekyll help` to find out more."
         abort
       end
     end
@@ -39,7 +43,8 @@ def deprecation_message(message)
 
     def defaults_deprecate_type(old, current)
       Jekyll.logger.warn "Defaults:", "The '#{old}' type has become '#{current}'."
-      Jekyll.logger.warn "Defaults:", "Please update your front-matter defaults to use 'type: #{current}'."
+      Jekyll.logger.warn "Defaults:", "Please update your front-matter defaults to use \
+                        'type: #{current}'."
     end
 
   end
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index aa773ebfb7d..4e3efe3f719 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -23,7 +23,7 @@ class Page
     # A set of extensions that are considered HTML or HTML-like so we
     # should not alter them,  this includes .xhtml through XHTM5.
 
-    HTML_EXTENSIONS = %W(
+    HTML_EXTENSIONS = %w(
       .html
       .xhtml
       .htm

From 915b80b6b3a81ae66ac4d38c33a0a88c8d3d2a89 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 6 Jun 2016 07:53:34 -0700
Subject: [PATCH 0992/4996] Update history to reflect merge of #4940 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index cb5463a2c40..2cc166f5c1c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -87,6 +87,7 @@
   * Rubocop theme and url jekyll libs (#4959)
   * Rubocop jekyll.rb (#4966)
   * Rubocop: use %r for all regular expressions. (#4979)
+  * Cleanup and make misc files compliant with Rubocop. (#4940)
 
 ### Site Enhancements
 

From 43fe09a07bcb5a4cc0cd89dfc09d4ec3bef8770d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 6 Jun 2016 08:03:37 -0700
Subject: [PATCH 0993/4996] Update history to reflect merge of #4973 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2cc166f5c1c..9c17b2f4a2b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -88,6 +88,7 @@
   * Rubocop jekyll.rb (#4966)
   * Rubocop: use %r for all regular expressions. (#4979)
   * Cleanup and make misc files compliant with Rubocop. (#4940)
+  * Rubocop: jekyll/lib/site.rb (#4973)
 
 ### Site Enhancements
 

From 732ca468fa051eea57bf1bf6842ef9aa118f9fd5 Mon Sep 17 00:00:00 2001
From: chrisfinazzo 
Date: Mon, 6 Jun 2016 11:16:32 -0400
Subject: [PATCH 0994/4996] Update normalize.css to v4.0.0.

---
 site/_sass/_normalize.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/site/_sass/_normalize.scss b/site/_sass/_normalize.scss
index ba2f36c169f..995e0354e25 100644
--- a/site/_sass/_normalize.scss
+++ b/site/_sass/_normalize.scss
@@ -1 +1,2 @@
-/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}
\ No newline at end of file
+/*! normalize.css v4.0.0 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block}audio:not([controls]){display:none;height:0}progress{vertical-align:baseline}template,[hidden]{display:none}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit}b,strong{font-weight:bolder}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-0.25em}sup{top:-0.5em}img{border-style:none}svg:not(:root){overflow:hidden}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}button,input,select,textarea{font:inherit;margin:0}optgroup{font-weight:bold}button,input{overflow:visible}button,select{text-transform:none}button,html [type="button"],[type="reset"],[type="submit"]{-webkit-appearance:button}button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{border-style:none;padding:0}button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{outline:1px dotted ButtonText}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}textarea{overflow:auto}[type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto}[type="search"]{-webkit-appearance:textfield;outline-offset:-2px}[type="search"]::-webkit-search-cancel-button,[type="search"]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-input-placeholder{color:inherit;opacity:0.54}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}
+/*# sourceMappingURL=_normalize.scss.map */

From 2f95517bfd0bcf007676ec234f5d8c77038b9b28 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 6 Jun 2016 09:59:05 -0700
Subject: [PATCH 0995/4996] Update history to reflect merge of #4989 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9c17b2f4a2b..af4f78145bd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -138,6 +138,7 @@
   * Fix inaccurate HTTP response header field name (#4976)
   * Add post about GSoC project (#4980)
   * Link to the HTML page instead of Markdown (#4985)
+  * Update normalize.css to v4.0.0. (#4989)
 
 ## 3.1.6 / 2016-05-19
 

From 5f2bb5d0aaadb270de3b9edd600d9629ce8ef766 Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Tue, 7 Jun 2016 12:07:54 +0300
Subject: [PATCH 0996/4996] rubocop: fix code style

---
 .rubocop.yml          |  1 -
 lib/jekyll/filters.rb | 77 +++++++++++++++++++++++++------------------
 2 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 8fcb37d30c7..ac0ce379021 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -9,7 +9,6 @@ AllCops:
   - lib/jekyll/configuration.rb
   - lib/jekyll/convertible.rb
   - lib/jekyll/document.rb
-  - lib/jekyll/filters.rb
   - lib/jekyll/regenerator.rb
   - lib/jekyll/renderer.rb
   - lib/jekyll/static_file.rb
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 3c5d125d28b..a63cf35da38 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -1,7 +1,7 @@
-require 'uri'
-require 'json'
-require 'date'
-require 'liquid'
+require "uri"
+require "json"
+require "date"
+require "liquid"
 
 module Jekyll
   module Filters
@@ -56,7 +56,7 @@ def scssify(input)
     #
     # Returns the given filename or title as a lowercase URL String.
     # See Utils.slugify for more detail.
-    def slugify(input, mode=nil)
+    def slugify(input, mode = nil)
       Utils.slugify(input, :mode => mode)
     end
 
@@ -118,7 +118,7 @@ def date_to_rfc822(date)
     #
     # Returns the escaped String.
     def xml_escape(input)
-      input.to_s.encode(:xml => :attr).gsub(/\A"|"\Z/, "")
+      input.to_s.encode(:xml => :attr).gsub(%r!\A"|"\Z!, "")
     end
 
     # CGI escape a string for use in a URL. Replaces any special characters
@@ -133,7 +133,7 @@ def xml_escape(input)
     #
     # Returns the escaped String.
     def cgi_escape(input)
-      CGI::escape(input)
+      CGI.escape(input)
     end
 
     # URI escape a string.
@@ -180,7 +180,7 @@ def array_to_sentence_string(array)
       when 2
         "#{array[0]} #{connector} #{array[1]}"
       else
-        "#{array[0...-1].join(', ')}, #{connector} #{array[-1]}"
+        "#{array[0...-1].join(", ")}, #{connector} #{array[-1]}"
       end
     end
 
@@ -203,11 +203,14 @@ def jsonify(input)
     #   "items" => [...] } # all the items where `property` == "larry"
     def group_by(input, property)
       if groupable?(input)
-        input.group_by do |item|
-          item_property(item, property).to_s
-        end.inject([]) do |memo, i|
-          memo << { "name" => i.first, "items" => i.last, "size" => i.last.size }
-        end
+        input.group_by { |item| item_property(item, property).to_s }
+          .each_with_object([]) do |item, array|
+            array << {
+              "name"  => item.first,
+              "items" => item.last,
+              "size"  => item.last.size
+            }
+          end
       else
         input
       end
@@ -223,7 +226,9 @@ def group_by(input, property)
     def where(input, property, value)
       return input unless input.is_a?(Enumerable)
       input = input.values if input.is_a?(Hash)
-      input.select { |object| Array(item_property(object, property)).map(&:to_s).include?(value.to_s) }
+      input.select do |object|
+        Array(item_property(object, property)).map(&:to_s).include?(value.to_s)
+      end
     end
 
     # Filters an array of objects against an expression
@@ -255,33 +260,21 @@ def where_exp(input, variable, expression)
     # Returns the filtered array of objects
     def sort(input, property = nil, nils = "first")
       if input.nil?
-        raise ArgumentError.new("Cannot sort a null object.")
+        raise ArgumentError, "Cannot sort a null object."
       end
       if property.nil?
         input.sort
       else
-        case
-        when nils == "first"
+        if nils == "first"
           order = - 1
-        when nils == "last"
+        elsif nils == "last"
           order = + 1
         else
-          raise ArgumentError.new("Invalid nils order: " \
-            "'#{nils}' is not a valid nils order. It must be 'first' or 'last'.")
+          raise ArgumentError, "Invalid nils order: " \
+            "'#{nils}' is not a valid nils order. It must be 'first' or 'last'."
         end
 
-        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
-          end
-        end
+        sort_input(input, property, order)
       end
     end
 
@@ -332,6 +325,22 @@ def inspect(input)
       xml_escape(input.inspect)
     end
 
+    private
+    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
+        end
+      end
+    end
+
     private
     def time(input)
       case input
@@ -349,10 +358,12 @@ def time(input)
       end.localtime
     end
 
+    private
     def groupable?(element)
       element.respond_to?(:group_by)
     end
 
+    private
     def item_property(item, property)
       if item.respond_to?(:to_liquid)
         item.to_liquid[property.to_s]
@@ -363,6 +374,7 @@ def item_property(item, property)
       end
     end
 
+    private
     def as_liquid(item)
       case item
       when Hash
@@ -386,6 +398,7 @@ def as_liquid(item)
     end
 
     # Parse a string to a Liquid Condition
+    private
     def parse_condition(exp)
       parser = Liquid::Parser.new(exp)
       left_expr = parser.expression

From dfc7d617655cb8243a061eccc721d0c807615fea Mon Sep 17 00:00:00 2001
From: Jordon Bedwell 
Date: Wed, 8 Jun 2016 23:18:16 -0500
Subject: [PATCH 0997/4996] Mac OS -> MacOS

---
 .github/ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 5265bea4826..0f722c23468 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -20,7 +20,7 @@
 
 ---
 
-- [ ] I am on (or have tested on) ***Mac OS*** 10+
+- [ ] I am on (or have tested on) ***MacOS*** 10+
 - [ ] I am on (or have tested on) ***Debian/Ubuntu*** GNU/Linux
 - [ ] I am on (or have tested on) ***Fedora*** GNU/Linux
 - [ ] I am on (or have tested on) ***Arch*** GNU/Linux

From 6fd734f6ea900ea434b5e0bcb0bee4347d422982 Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Sun, 12 Jun 2016 15:14:37 +0800
Subject: [PATCH 0998/4996] Add jekyll-tags-list-plugin

---
 site/_docs/plugins.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 18efecf4b57..2dc2d2ba1d2 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -860,6 +860,7 @@ LESS.js files during generation.
 - [Jekyll Video Embed](https://github.com/eug/jekyll-video-embed): It provides several tags to easily embed videos (e.g. Youtube, Vimeo, UStream and Ted Talks)
 - [jekyll-i18n_tags](https://github.com/KrzysiekJ/jekyll-i18n_tags): Translate your templates.
 - [Jekyll Ideal Image Slider](https://github.com/xHN35RQ/jekyll-ideal-image-slider): Liquid tag plugin to create image sliders using [Ideal Image Slider](https://github.com/gilbitron/Ideal-Image-Slider).
+- [Jekyll Tags List Plugin](https://github.com/crispgm/jekyll-tags-list-plugin): A Liquid tag plugin that creates tags list in specific order.
 
 #### Collections
 

From e6dc78b22f710ef54b11d287fbb12b08c1bbf821 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 13 Jun 2016 13:08:48 -0700
Subject: [PATCH 0999/4996] Run Site#generate for 'jekyll doctor' to catch
 plugin issues.

---
 lib/jekyll/commands/doctor.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb
index 4c750b1c5c5..c7f387df7bb 100644
--- a/lib/jekyll/commands/doctor.rb
+++ b/lib/jekyll/commands/doctor.rb
@@ -19,7 +19,9 @@ def init_with_program(prog)
 
         def process(options)
           site = Jekyll::Site.new(configuration_from_options(options))
+          site.reset
           site.read
+          site.generate
 
           if healthy?(site)
             Jekyll.logger.info "Your test results", "are in. Everything looks fine."

From 8b1c3bbf33cd88b03d5fe06dfaf03076f1bed2ae Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 13 Jun 2016 13:17:54 -0700
Subject: [PATCH 1000/4996] Update history to reflect merge of #5005 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index af4f78145bd..1e9bab9fe9f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -27,6 +27,7 @@
   * Move EntryFilter to use Pathutil & fix `glob_include?` (#4859)
   * Add 'jekyll new-theme' command to help users get up and running creating a theme (#4848)
   * markdownify and smartify should convert input to string before conversion (#4958)
+  * Run Site#generate for 'jekyll doctor' to catch plugin issues (#5005)
 
 ### Bug Fixes
 

From 176b347737102cda8460f7c2f6942f60497a95fd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 13 Jun 2016 14:14:30 -0700
Subject: [PATCH 1001/4996] Update history to reflect merge of #5000 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1e9bab9fe9f..e815640d3cc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -140,6 +140,7 @@
   * Add post about GSoC project (#4980)
   * Link to the HTML page instead of Markdown (#4985)
   * Update normalize.css to v4.0.0. (#4989)
+  * Add jekyll-tags-list-plugin to list of third-party plugins (#5000)
 
 ## 3.1.6 / 2016-05-19
 

From c2441ffbb4b94148049baa0d35b495299d41b118 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 13 Jun 2016 14:23:41 -0700
Subject: [PATCH 1002/4996] Update history to reflect merge of #4908 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e815640d3cc..8f7465c663f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -90,6 +90,7 @@
   * Rubocop: use %r for all regular expressions. (#4979)
   * Cleanup and make misc files compliant with Rubocop. (#4940)
   * Rubocop: jekyll/lib/site.rb (#4973)
+  * Add timings for each scenario in cucumber & print worst offenders (#4908)
 
 ### Site Enhancements
 

From 959f19c086ac1ec8ee71d4aa0d4560e67f9dbd2e Mon Sep 17 00:00:00 2001
From: Jamie Bilinski 
Date: Mon, 13 Jun 2016 14:24:50 -0700
Subject: [PATCH 1003/4996] Command needs to be called from blog path

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

diff --git a/site/_docs/windows.md b/site/_docs/windows.md
index ea4c0359f58..6c668ba5884 100644
--- a/site/_docs/windows.md
+++ b/site/_docs/windows.md
@@ -104,7 +104,7 @@ gem 'github-pages'
 ```
 
  * **Note:** We use an unsecure connection because SSL throws exceptions in the version of Ruby
- * Open a command prompt and install github-pages: `bundle install`
+ * Open a command prompt, target your local blog repository root, and install github-pages: `bundle install`
 
  
 After this process you should have github-pages installed on your system and you can host your blog again with `jekyll s`. \\

From b5466196eaa37b6e76c3611c0cf3fc1b3a300f03 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 13 Jun 2016 14:38:45 -0700
Subject: [PATCH 1004/4996] Update history to reflect merge of #5006 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8f7465c663f..ff69985294c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -142,6 +142,7 @@
   * Link to the HTML page instead of Markdown (#4985)
   * Update normalize.css to v4.0.0. (#4989)
   * Add jekyll-tags-list-plugin to list of third-party plugins (#5000)
+  * Windows docs: Command needs to be called from blog path (#5006)
 
 ## 3.1.6 / 2016-05-19
 

From 3fe9e92c4f3e3bbf2a3dba437e98d08e360a7f50 Mon Sep 17 00:00:00 2001
From: Nathan Hazout 
Date: Tue, 14 Jun 2016 13:07:26 +0300
Subject: [PATCH 1005/4996] Prevent reset of page to fix #4414

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

diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index f9eb94beceb..87f327d6c67 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -141,7 +141,6 @@ def place_in_layouts(content, payload, info)
 
       while layout
         payload['content'] = output
-        payload['page']    = document.to_liquid
         payload['layout']  = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
 
         output = render_liquid(

From 6c279b173f9272e242014313d3915ab680fa3db1 Mon Sep 17 00:00:00 2001
From: Rares Vernica 
Date: Tue, 14 Jun 2016 09:45:51 -0700
Subject: [PATCH 1006/4996] Update text to be consitent with example

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

diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index 9e828d1d082..aaf829514f8 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -497,7 +497,7 @@ defaults:
       author: "Mr. Hyde"
 {% endhighlight %}
 
-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` as well as have the category for the page set to `project`.
+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`.
 
 {% highlight yaml %}
 collections:

From 15477d2417f334463c1646c216f4b14808caefba Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 14 Jun 2016 09:55:36 -0700
Subject: [PATCH 1007/4996] Update history to reflect merge of #5010 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ff69985294c..059a70623cd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -143,6 +143,7 @@
   * Update normalize.css to v4.0.0. (#4989)
   * Add jekyll-tags-list-plugin to list of third-party plugins (#5000)
   * Windows docs: Command needs to be called from blog path (#5006)
+  * Update text to be consitent with example (#5010)
 
 ## 3.1.6 / 2016-05-19
 

From c96fc1166c47991b5b297f0768aff3ba1917b7ed Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 14 Jun 2016 10:25:50 -0700
Subject: [PATCH 1008/4996] Spike out some internal documentation for Jekyll
 processes.

---
 docs/avoiding-burnout.md         |  3 ++
 docs/becoming-a-maintainer.md    |  3 ++
 docs/merging-a-pull-request.md   | 52 ++++++++++++++++++++++++++++++++
 docs/readme.md                   | 12 ++++++++
 docs/reviewing-a-pull-request.md |  4 +++
 docs/triaging-an-issue.md        |  9 ++++++
 6 files changed, 83 insertions(+)
 create mode 100644 docs/avoiding-burnout.md
 create mode 100644 docs/becoming-a-maintainer.md
 create mode 100644 docs/merging-a-pull-request.md
 create mode 100644 docs/readme.md
 create mode 100644 docs/reviewing-a-pull-request.md
 create mode 100644 docs/triaging-an-issue.md

diff --git a/docs/avoiding-burnout.md b/docs/avoiding-burnout.md
new file mode 100644
index 00000000000..488fbb013cc
--- /dev/null
+++ b/docs/avoiding-burnout.md
@@ -0,0 +1,3 @@
+# Maintainers: Avoiding Burnout
+
+**This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/becoming-a-maintainer.md b/docs/becoming-a-maintainer.md
new file mode 100644
index 00000000000..2926344c86c
--- /dev/null
+++ b/docs/becoming-a-maintainer.md
@@ -0,0 +1,3 @@
+# Contributors: Becoming a Maintainer
+
+**This guide is for contributors.** These special people have contributed to one or more of Jekyll's repositories, but do not yet have write access to any. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/merging-a-pull-request.md b/docs/merging-a-pull-request.md
new file mode 100644
index 00000000000..ff1f102ed98
--- /dev/null
+++ b/docs/merging-a-pull-request.md
@@ -0,0 +1,52 @@
+# Maintainers: Merging a Pull Request
+
+**This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
+
+## Code Review
+
+All pull requests should be subject to code review. Code review is a [foundational value](https://blog.fullstory.com/what-we-learned-from-google-code-reviews-arent-just-for-catching-bugs-b125a13aa292) of good engineering teams. Besides providing validation of correctness, it promotes a sense of community and gives other maintainers understanding of all parts of the code base. In short, code review is crucial to a healthy open source project.
+
+Before merging a pull request **that changes code**, ensure that code is thoroughly reviewed and has received a thorough review from at least two maintainers.
+
+Before merging a pull request **that changes the documentation**, ensure there aren't any errors and that at least one other maintainer has agreed on the changes.
+
+## Merging
+
+We have [a helpful little bot](https://github.com/jekyllbot) which we use to merge pull requests. We don't use the GitHub.com interface for two reasons:
+
+1. You can't modify anything on mobile (e.g. titles, labels)
+2. Provide a consistent paper trail in the `History.markdown` file for each release
+
+To merge a pull request, leave a comment thanking the contributor, then add the special merge request:
+
+```text
+Thank you very much for your contribution. Folks like you make this project and community strong. :heart:
+
+@jekyllbot: merge +dev
+```
+
+The merge request is made up of three things:
+
+1. `@jekyllbot:` – this is the prefix our bot looks for when processing commands
+2. `merge` – the command
+3. `+dev` – the category to which the changes belong
+
+The categories match the H3's in the history/changelog file, and they are:
+
+1. Major Enhancements (`+major`) – major updates or breaking changes to the code which necessitate a major version bump (v3 ~> v4)
+2. Minor Enhancements (`+minor`) – minor updates (feature, enhancement) which necessitate a minor version bump (v3.1 ~> v3.2)
+3. Bug Fixes (`+bug`) – corrections to code which do not change or add functionality, which necessitate a patch version bump (v3.1.0 ~> v3.1.1)
+4. Site Enhancements (`+site`) – changes to the source of https://jekyllrb.com, found in `site/`
+5. Development Fixes (`+dev`) – changes which do not affect user-facing functionality or documentation, such as test fixes or bumping internal dependencies
+
+Once @jekyllbot has merged the pull request, you should see three things:
+
+1. A successful merge
+2. Addition of labels for the necessary category if they aren't already applied
+3. A commit to the `History.markdown` file which adds a note about the change
+
+If you forget the category, that's just fine. You can always go back and move the line to the proper category header later. The category is always necessary for `jekyll/jekyll`, but many plugins have too few changes to necessitate changelog categories.
+
+## Rejoice
+
+You did it! Thanks for being a maintainer for one of our official Jekyll projects. Your work means the world to our thousands of users who rely on Jekyll daily. :heart:
diff --git a/docs/readme.md b/docs/readme.md
new file mode 100644
index 00000000000..abf4290113a
--- /dev/null
+++ b/docs/readme.md
@@ -0,0 +1,12 @@
+# Maintaining Jekyll
+
+Hello! This is where we document various processes for maintaining Jekyll. Being a maintainer for any Jekyll project is a big responsibility, so we put together some helpful documentation for various tasks you might do as a maintainer.
+
+1. [Triaging and issue](triaging-an-issue.md)
+2. [Reviewing a pull request](reviewing-a-pull-request.md)
+3. [Merging a pull request](merging-a-pull-request.md)
+4. [Avoiding burnout](avoiding-burnout.md)
+
+Interested in becoming a maintainer? Here is some documentation for **contributors**:
+
+1. [Becoming a maintainer](becoming-a-maintainer.md)
diff --git a/docs/reviewing-a-pull-request.md b/docs/reviewing-a-pull-request.md
new file mode 100644
index 00000000000..35ac769e5e4
--- /dev/null
+++ b/docs/reviewing-a-pull-request.md
@@ -0,0 +1,4 @@
+# Maintainers: Reviewing a Pull Request
+
+**This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
+
diff --git a/docs/triaging-an-issue.md b/docs/triaging-an-issue.md
new file mode 100644
index 00000000000..75dbe4d13af
--- /dev/null
+++ b/docs/triaging-an-issue.md
@@ -0,0 +1,9 @@
+# Maintainers: Triaging an Issue
+
+**This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
+
+Here are some key things to remember when evaluating an issue.
+
+## Reproducible?
+
+If the bug has clear reproduction steps, take a minute to try them.

From 902ff4c1320908a3a4d79458e2b81b2e69ab25bd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 14 Jun 2016 11:23:58 -0700
Subject: [PATCH 1009/4996] Update history to reflect merge of #4993 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 059a70623cd..4bc06fc67cd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -91,6 +91,7 @@
   * Cleanup and make misc files compliant with Rubocop. (#4940)
   * Rubocop: jekyll/lib/site.rb (#4973)
   * Add timings for each scenario in cucumber & print worst offenders (#4908)
+  * rubocop: jekyll/lib/filters.rb (#4993)
 
 ### Site Enhancements
 

From ad94182b4914c6ee887ff6049b54d8b24f2c0b7b Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 14 Jun 2016 11:43:12 -0700
Subject: [PATCH 1010/4996] Add .gitignore to theme template.

---
 lib/jekyll/theme_builder.rb      | 1 +
 lib/theme_template/gitignore.erb | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 lib/theme_template/gitignore.erb

diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb
index 649df0efeee..ca7dff69ba6 100644
--- a/lib/jekyll/theme_builder.rb
+++ b/lib/jekyll/theme_builder.rb
@@ -82,6 +82,7 @@ def create_example_site
   def initialize_git_repo
     Jekyll.logger.info "initialize", path.join(".git").to_s
     Dir.chdir(path.to_s) { `git init` }
+    write_file(".gitignore", template("gitignore"))
   end
 
   def user_name
diff --git a/lib/theme_template/gitignore.erb b/lib/theme_template/gitignore.erb
new file mode 100644
index 00000000000..3eab3fcb036
--- /dev/null
+++ b/lib/theme_template/gitignore.erb
@@ -0,0 +1,3 @@
+.sass-cache
+_site
+Gemfile.lock

From ce1c1488989be5101ca61ba44c3da4933ec82d17 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 14 Jun 2016 11:46:10 -0700
Subject: [PATCH 1011/4996] Rename the jekyll_pessimistic_version theme
 template method to be more descriptive

---
 lib/jekyll/theme_builder.rb          | 2 +-
 lib/theme_template/theme.gemspec.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb
index ca7dff69ba6..f5b60bdabb2 100644
--- a/lib/jekyll/theme_builder.rb
+++ b/lib/jekyll/theme_builder.rb
@@ -104,7 +104,7 @@ def initialize(theme_builder)
       @theme_builder = theme_builder
     end
 
-    def jekyll_pessimistic_version
+    def jekyll_version_with_minor
       Jekyll::VERSION.split(".").take(2).join(".")
     end
 
diff --git a/lib/theme_template/theme.gemspec.erb b/lib/theme_template/theme.gemspec.erb
index 0bd7c365732..1c3b7ee462f 100644
--- a/lib/theme_template/theme.gemspec.erb
+++ b/lib/theme_template/theme.gemspec.erb
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
-  spec.add_development_dependency "jekyll", "~> <%= jekyll_pessimistic_version %>"
+  spec.add_development_dependency "jekyll", "~> <%= jekyll_version_with_minor %>"
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
 end

From e72bfdab215e7587468f8595a2b3f46b765b7776 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 14 Jun 2016 11:51:01 -0700
Subject: [PATCH 1012/4996] theme template: link to the example post instead of
 just quoting it.

---
 lib/theme_template/example/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/theme_template/example/index.html b/lib/theme_template/example/index.html
index 858e5a11c23..d3187773878 100644
--- a/lib/theme_template/example/index.html
+++ b/lib/theme_template/example/index.html
@@ -5,7 +5,7 @@
 Lorem ipsum dolor sit amet, quo id prima corrumpit pertinacia, id ius dolor dolores, an veri pertinax explicari mea. Agam solum et qui, his id ludus graeco adipiscing. Duis theophrastus nam in, at his vidisse atomorum. Tantas gloriatur scripserit ne eos. Est wisi tempor habemus at, ei graeco dissentiet eos. Ne usu aliquip sanctus conceptam, te vis ignota animal, modus latine contentiones ius te.
 
 {% for post in site.posts %}
-
    {{ post.title }}
    
+
    {{ post.title }}
    
 
    {{ post.excerpt }}
    
 {% endfor %}
 

From 73f70e9071d63e789c5a33f338b72b51286db9d3 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 14 Jun 2016 11:51:26 -0700
Subject: [PATCH 1013/4996] Add .bundle to gitignore for the theme

---
 lib/theme_template/gitignore.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/theme_template/gitignore.erb b/lib/theme_template/gitignore.erb
index 3eab3fcb036..64eb653f051 100644
--- a/lib/theme_template/gitignore.erb
+++ b/lib/theme_template/gitignore.erb
@@ -1,3 +1,4 @@
+.bundle
 .sass-cache
 _site
 Gemfile.lock

From e85e89bbff55d0823e8fb9579a7ebc48c8360197 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 14 Jun 2016 11:54:01 -0700
Subject: [PATCH 1014/4996] Ensure the minima theme is shipped with a new site.

---
 lib/jekyll/commands/new.rb    | 3 +++
 lib/site_template/_config.yml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index 2658383c1c6..9c3d06eb8c1 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -72,6 +72,9 @@ def gemfile_contents
 # Happy Jekylling!
 gem "jekyll", "#{Jekyll::VERSION}"
 
+# This is the default theme for new Jekyll sites. You may change this to anything you like.
+gem "minima"
+
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
 # uncomment the line below. To upgrade, run `bundle update github-pages`.
 # gem "github-pages", group: :jekyll_plugins
diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
index adbffacd2d5..9bed54e4b23 100644
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -4,6 +4,7 @@
 # which you are expected to set up once and rarely edit after that. If you find
 # yourself editing these this file very often, consider using Jekyll's data files
 # feature for the data you need to update frequently.
+#
 # For technical reasons, this file is *NOT* reloaded automatically when you use
 # 'jekyll serve'. If you change this file, please restart the server process.
 

From 8d65ce675a79d982b03db4a8f91ea2cbe6db0dc0 Mon Sep 17 00:00:00 2001
From: Adam Hollett 
Date: Tue, 14 Jun 2016 15:21:24 -0400
Subject: [PATCH 1015/4996] Update links to point to core Liquid site

---
 site/_docs/templates.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/_docs/templates.md b/site/_docs/templates.md
index c81e9f6c92e..89bee3c11a4 100644
--- a/site/_docs/templates.md
+++ b/site/_docs/templates.md
@@ -4,9 +4,9 @@ title: Templates
 permalink: /docs/templates/
 ---
 
-Jekyll uses the [Liquid](https://github.com/Shopify/liquid/wiki) templating language to
-process templates. All of the standard Liquid [tags](https://github.com/Shopify/liquid/wiki/Liquid-for-Designers#tags) and
-[filters](https://github.com/Shopify/liquid/wiki/Liquid-for-Designers#standard-filters) are
+Jekyll uses the [Liquid](https://shopify.github.io/liquid/) templating language to
+process templates. All of the standard Liquid [tags](https://shopify.github.io/liquid/tags/) and
+[filters](https://shopify.github.io/liquid/filters/) are
 supported. Jekyll even adds a few handy filters and tags of its own to make
 common tasks easier.
 

From 492cfcd962834df6a4d5cd36d21a2f5ede1fb6a2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 14 Jun 2016 14:02:05 -0700
Subject: [PATCH 1016/4996] Update history to reflect merge of #5012 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4bc06fc67cd..ae90517d0ef 100644
--- a/History.markdown
+++ b/History.markdown
@@ -145,6 +145,7 @@
   * Add jekyll-tags-list-plugin to list of third-party plugins (#5000)
   * Windows docs: Command needs to be called from blog path (#5006)
   * Update text to be consitent with example (#5010)
+  * Update template links to point to core Liquid site (#5012)
 
 ## 3.1.6 / 2016-05-19
 

From 8d748ce45f11c9ed4d21868a2c33c7e42fb0e67b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 14 Jun 2016 14:03:06 -0700
Subject: [PATCH 1017/4996] Update history to reflect merge of #4917 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ae90517d0ef..37b96ac803e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * Add 'jekyll new-theme' command to help users get up and running creating a theme (#4848)
   * markdownify and smartify should convert input to string before conversion (#4958)
   * Run Site#generate for 'jekyll doctor' to catch plugin issues (#5005)
+  * Add normalize_whitepace filter (#4917)
 
 ### Bug Fixes
 

From d1f4d874be4d822ba9c68491bb26a8b7cc3df93d Mon Sep 17 00:00:00 2001
From: Nathan Hazout 
Date: Wed, 15 Jun 2016 11:21:02 +0300
Subject: [PATCH 1018/4996] Added a scenario for #4414

---
 features/hooks.feature | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/features/hooks.feature b/features/hooks.feature
index 48b2884e37a..075f632ae97 100644
--- a/features/hooks.feature
+++ b/features/hooks.feature
@@ -333,3 +333,28 @@ Feature: Hooks
     Then I should get a zero exit status
     And the _site directory should exist
     And I should see "Wrote document 0" in "_site/document-build.log"
+
+  Scenario: Set a custom payload['page'] property
+    Given I have a _plugins directory
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    Jekyll::Hooks.register :pages, :pre_render do |page, payload|
+        payload['page']['foo'] = "hello world"
+    end
+    """
+    And I have a _layouts directory
+    And I have a "_layouts/custom.html" file with content:
+      """
+      ---
+      ---
+      {{ content }} {% include foo.html %}
+      """
+    And I have a _includes directory
+    And I have a "_includes/foo.html" file with content:
+      """
+      {{page.foo}}
+      """
+    And I have an "index.html" page with layout "custom" that contains "page content"
+    When I run jekyll build
+    Then the "_site/index.html" file should exist
+    And I should see "page content\n hello world" in "_site/index.html"

From 4a2b96293b85898d7e6b6b8bbccfb4badd44c10c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 15 Jun 2016 10:04:37 -0700
Subject: [PATCH 1019/4996] Update history to reflect merge of #5009 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 37b96ac803e..dfd86789529 100644
--- a/History.markdown
+++ b/History.markdown
@@ -46,6 +46,7 @@
   * 3.2.x/master: Fix defaults for Documents (posts/collection docs) (#4808)
   * Don't rescue LoadError or bundler load errors for Bundler. (#4857)
   * `Serve.process` should receive same config as `Build.process` (#4953)
+  * Prevent reset of page in Liquid payload right before rendering layouts (#5009)
 
 ### Forward Ports
 

From ddf833505c539abcae56fb2fb0340d18cff346b2 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 15 Jun 2016 10:33:30 -0700
Subject: [PATCH 1020/4996] Fix offense.

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

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index fd9cc79fdc1..231eb7b6a87 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -156,7 +156,7 @@ def uri_escape(input)
     #
     # Returns the formatted String
     def normalize_whitespace(input)
-      input.to_s.gsub(/\s+/, " ").strip
+      input.to_s.gsub(%r!\s+!, " ").strip
     end
 
     # Count the number of words in the input string.

From 5e343f620a0dfbd7026570402a8529e0b206962d Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 15 Jun 2016 11:11:22 -0700
Subject: [PATCH 1021/4996] Move bin/jekyll to exe/jekyll to prevent collision
 with binstubs

---
 .gitignore          | 1 +
 {bin => exe}/jekyll | 0
 jekyll.gemspec      | 5 +++--
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename {bin => exe}/jekyll (100%)

diff --git a/.gitignore b/.gitignore
index 1d62ecc3876..c2960b077fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 /vendor
 Gemfile.lock
 _site/
+bin/
 bbin/
 coverage
 gh-pages/
diff --git a/bin/jekyll b/exe/jekyll
similarity index 100%
rename from bin/jekyll
rename to exe/jekyll
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 3f32f0a96d3..b506ffa30c3 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -21,8 +21,9 @@ Gem::Specification.new do |s|
   s.homepage      = 'https://github.com/jekyll/jekyll'
 
   all_files       = `git ls-files -z`.split("\x0")
-  s.files         = all_files.grep(%r{^(bin|lib)/|^.rubocop.yml$})
-  s.executables   = all_files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.files         = all_files.grep(%r{^(exe|lib)/|^.rubocop.yml$})
+  s.executables   = all_files.grep(%r{^exe/}) { |f| File.basename(f) }
+  s.bindir        = "exe"
   s.require_paths = ['lib']
 
   s.rdoc_options = ['--charset=UTF-8']

From 6cf6da04af6c561a3571726afa03b9aa081e70d0 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 15 Jun 2016 12:12:44 -0700
Subject: [PATCH 1022/4996] features: change jekyll bin path to use exe/jekyll

---
 features/support/helpers.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/support/helpers.rb b/features/support/helpers.rb
index e7381a36229..3a85a3b0115 100644
--- a/features/support/helpers.rb
+++ b/features/support/helpers.rb
@@ -12,7 +12,7 @@ def self.output_file; test_dir.join("jekyll_output.txt"); end
 
   def self.status_file; test_dir.join("jekyll_status.txt"); end
 
-  def self.jekyll_bin; source_dir.join("bin", "jekyll"); end
+  def self.jekyll_bin; source_dir.join("exe", "jekyll"); end
 
   def self.source_dir; SOURCE_DIR; end
 end

From 3a1ac37ed10df3f7f3763cb43bf3359eecb44490 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 15 Jun 2016 12:26:01 -0700
Subject: [PATCH 1023/4996] Exclude exe/jekyll from rubocop for now.

---
 .rubocop.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index ac0ce379021..431b08fffa7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,6 +4,7 @@ AllCops:
   Include:
   - lib/**/*.rb
   Exclude:
+  - exe/jekyll
   - lib/jekyll/collection.rb
   - lib/jekyll/command.rb
   - lib/jekyll/configuration.rb

From 499b83236c0289471118991bd5fe743effe9b348 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 15 Jun 2016 12:42:08 -0700
Subject: [PATCH 1024/4996] Update history to reflect merge of #5014 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index dfd86789529..acabb83dd26 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * markdownify and smartify should convert input to string before conversion (#4958)
   * Run Site#generate for 'jekyll doctor' to catch plugin issues (#5005)
   * Add normalize_whitepace filter (#4917)
+  * Move bin/jekyll to exe/jekyll to prevent collision with binstubs (#5014)
 
 ### Bug Fixes
 

From 2c3e044688f313c0f7cb266f039627cdf5680af4 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 15 Jun 2016 12:44:03 -0700
Subject: [PATCH 1025/4996] Demonstrate failures on Travis of JRuby and
 ruby-head.


From 52d32a643ee9505ab01176adb100b0836bf89653 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 15 Jun 2016 12:45:40 -0700
Subject: [PATCH 1026/4996] Now remove JRuby and ruby-head from matrix.

---
 .travis.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6b24b213938..13c17f90550 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,14 +9,8 @@ rvm:
   - &ruby1 2.3.0
   - &ruby2 2.2.4
   - &ruby3 2.1.8
-  - &jruby jruby-9.0.5.0
-  - &rhead ruby-head
 
 matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: *jruby
-    - rvm: *rhead
   include:
     - rvm: 2.3.0
       env: TEST_SUITE=fmt

From 1dbcf97bef44497986f7e81aaa3e437a5f21600e Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 15 Jun 2016 12:50:54 -0700
Subject: [PATCH 1027/4996] Fix rubocop offense.

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

diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb
index f5b60bdabb2..1ff22e6a2c5 100644
--- a/lib/jekyll/theme_builder.rb
+++ b/lib/jekyll/theme_builder.rb
@@ -55,7 +55,7 @@ def write_file(filename, contents)
 
   def create_directories
     mkdir_p(SCAFFOLD_DIRECTORIES)
-    mkdir_p(%w{example example/_posts})
+    mkdir_p(%w(example example/_posts))
   end
 
   def create_gemspec

From a9666bf1c777aad0eab89b0b039f3ea46a486942 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell 
Date: Wed, 15 Jun 2016 14:54:09 -0500
Subject: [PATCH 1028/4996] It's official.  It's macOS not "MacOS" or "Mac OS"
 anymore.

---
 .github/ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 0f722c23468..2e070d476d7 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -20,7 +20,7 @@
 
 ---
 
-- [ ] I am on (or have tested on) ***MacOS*** 10+
+- [ ] I am on (or have tested on) ***macOS*** 10+
 - [ ] I am on (or have tested on) ***Debian/Ubuntu*** GNU/Linux
 - [ ] I am on (or have tested on) ***Fedora*** GNU/Linux
 - [ ] I am on (or have tested on) ***Arch*** GNU/Linux

From 0c6162fc0a9badd4df8df9c743fca9050b124e30 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 15 Jun 2016 13:11:16 -0700
Subject: [PATCH 1029/4996] Borrow 97% of Homebrew's excellent 'Avoiding
 Burnout' document.

Many, many thanks to Mike McQuaid for writing it: https://github.com/Homebrew/brew/blob/master/share/doc/homebrew/Maintainers-Avoiding-Burnout.md#3-prioritise-maintainers-over-users
---
 docs/avoiding-burnout.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/avoiding-burnout.md b/docs/avoiding-burnout.md
index 488fbb013cc..4e8b2e0b116 100644
--- a/docs/avoiding-burnout.md
+++ b/docs/avoiding-burnout.md
@@ -1,3 +1,27 @@
 # Maintainers: Avoiding Burnout
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
+
+# 1. Use Homebrew
+
+Maintainers of Homebrew should be using it regularly. This is partly because you won't be a good maintainer unless you can put yourself in the shoes of our users but also because you may decide to stop using Jekyll and at that point you should also decide not to be a maintainer and find other things to work on.
+
+# 2. No Guilt About Leaving
+
+All maintainers can stop working on Jekyll at any time without any guilt or explanation (like a job). We may still ask for your help with questions after you leave but you are under no obligation to answer them. Like a job, if you create a big mess and then leave you still have no obligations but we may think less of you (or, realistically, probably just revert the problematic work). Like a job, you should probably take a break from Jekyll at least a few times a year.
+
+This also means contributors should be consumers. If a maintainer finds they are not using a project in the real-world, they should reconsider their involvement with the project.
+
+# 3. Prioritise Maintainers Over Users
+
+It's important to be user-focused but ultimately, as long as you follow #1 above, Jekyll's minimum number of users will be the number of maintainers. However, if Jekyll has no maintainers it will quickly become useless to all users and the project will die. As a result, no user complaint, behaviour or need takes priority over the burnout of maintainers. If users do not like the direction of the project, the easiest way to influence it is to make significant, high-quality code contributions and become a maintainer.
+
+# 4. Learn To Say No
+
+Jekyll gets a lot of feature requests, non-reproducible bug reports, usage questions and PRs we won't accept. These should be closed out as soon as we realise that they aren't going to be resolved or merged. This is kinder than deciding this after a long period of review. Our issue tracker should reflect work to be done.
+
+---
+
+Thanks to https://gist.github.com/ryanflorence/124070e7c4b3839d4573 which influenced this document.
+
+Thanks to [Homebrew's "Avoiding Burnout" document](https://github.com/Homebrew/brew/blob/master/share/doc/homebrew/Maintainers-Avoiding-Burnout.md) for providing a perfect base for this document.

From c3313d868e92f5906ec21e020c35f08c74dda090 Mon Sep 17 00:00:00 2001
From: DirtyF 
Date: Wed, 15 Jun 2016 22:22:57 +0200
Subject: [PATCH 1030/4996] fix rubocop offenses in exe/jekyll

---
 .rubocop.yml |  1 -
 exe/jekyll   | 30 +++++++++++++++++-------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 431b08fffa7..ac0ce379021 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,6 @@ AllCops:
   Include:
   - lib/**/*.rb
   Exclude:
-  - exe/jekyll
   - lib/jekyll/collection.rb
   - lib/jekyll/command.rb
   - lib/jekyll/configuration.rb
diff --git a/exe/jekyll b/exe/jekyll
index 43364b9960c..c5e03111fc7 100755
--- a/exe/jekyll
+++ b/exe/jekyll
@@ -3,8 +3,8 @@ STDOUT.sync = true
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w( .. lib ))
 
-require 'jekyll'
-require 'mercenary'
+require "jekyll"
+require "mercenary"
 
 Jekyll::PluginManager.require_from_bundler
 
@@ -12,22 +12,26 @@ Jekyll::Deprecator.process(ARGV)
 
 Mercenary.program(:jekyll) do |p|
   p.version Jekyll::VERSION
-  p.description 'Jekyll is a blog-aware, static site generator in Ruby'
-  p.syntax 'jekyll  [options]'
-
-  p.option 'source', '-s', '--source [DIR]', 'Source directory (defaults to ./)'
-  p.option 'destination', '-d', '--destination [DIR]', 'Destination directory (defaults to ./_site)'
-  p.option 'safe', '--safe', 'Safe mode (defaults to false)'
-  p.option 'plugins_dir', '-p', '--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]', Array, 'Plugins directory (defaults to ./_plugins)'
-  p.option 'layouts_dir', '--layouts DIR', String, 'Layouts directory (defaults to ./_layouts)'
-  p.option 'profile', '--profile', 'Generate a Liquid rendering profile'
+  p.description "Jekyll is a blog-aware, static site generator in Ruby"
+  p.syntax "jekyll  [options]"
+
+  p.option "source", "-s", "--source [DIR]", "Source directory (defaults to ./)"
+  p.option "destination", "-d", "--destination [DIR]", \
+    "Destination directory (defaults to ./_site)"
+  p.option "safe", "--safe", "Safe mode (defaults to false)"
+  p.option "plugins_dir", "-p", "--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]", Array, \
+    "Plugins directory (defaults to ./_plugins)"
+  p.option "layouts_dir", "--layouts DIR", String, \
+    "Layouts directory (defaults to ./_layouts)"
+  p.option "profile", "--profile", "Generate a Liquid rendering profile"
 
   Jekyll::External.require_if_present(Jekyll::External.blessed_gems) do |g|
-    cmd = g.split('-').last
+    cmd = g.split("-").last
     p.command(cmd.to_sym) do |c|
       c.syntax cmd
       c.action do
-        Jekyll.logger.abort_with "You must install the '#{g}' gem to use the 'jekyll #{cmd}' command."
+        Jekyll.logger.abort_with "You must install the '#{g}' gem" \
+          " to use the 'jekyll #{cmd}' command."
       end
     end
   end

From b972daa54db1f282e978919e0728999316fa549e Mon Sep 17 00:00:00 2001
From: DirtyF 
Date: Wed, 15 Jun 2016 22:31:08 +0200
Subject: [PATCH 1031/4996] apply @envygeeks recommandation

---
 exe/jekyll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exe/jekyll b/exe/jekyll
index c5e03111fc7..2244e27456f 100755
--- a/exe/jekyll
+++ b/exe/jekyll
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 STDOUT.sync = true
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w( .. lib ))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w( .. lib )))
 
 require "jekyll"
 require "mercenary"

From 20910976c4c6d04d88c33e2bda08d635cd602fc9 Mon Sep 17 00:00:00 2001
From: DirtyF 
Date: Wed, 15 Jun 2016 23:00:16 +0200
Subject: [PATCH 1032/4996] remove unecessary slashes

---
 exe/jekyll | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/exe/jekyll b/exe/jekyll
index 2244e27456f..997c64b0155 100755
--- a/exe/jekyll
+++ b/exe/jekyll
@@ -16,12 +16,12 @@ Mercenary.program(:jekyll) do |p|
   p.syntax "jekyll  [options]"
 
   p.option "source", "-s", "--source [DIR]", "Source directory (defaults to ./)"
-  p.option "destination", "-d", "--destination [DIR]", \
+  p.option "destination", "-d", "--destination [DIR]",
     "Destination directory (defaults to ./_site)"
   p.option "safe", "--safe", "Safe mode (defaults to false)"
-  p.option "plugins_dir", "-p", "--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]", Array, \
+  p.option "plugins_dir", "-p", "--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]", Array,
     "Plugins directory (defaults to ./_plugins)"
-  p.option "layouts_dir", "--layouts DIR", String, \
+  p.option "layouts_dir", "--layouts DIR", String,
     "Layouts directory (defaults to ./_layouts)"
   p.option "profile", "--profile", "Generate a Liquid rendering profile"
 

From 7c381c931b36fd34b77d8a13cd33bd1a5cdf1bf5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 15 Jun 2016 14:36:22 -0700
Subject: [PATCH 1033/4996] Update history to reflect merge of #5017 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index acabb83dd26..7016a7e4727 100644
--- a/History.markdown
+++ b/History.markdown
@@ -95,6 +95,7 @@
   * Rubocop: jekyll/lib/site.rb (#4973)
   * Add timings for each scenario in cucumber & print worst offenders (#4908)
   * rubocop: jekyll/lib/filters.rb (#4993)
+  * Fix rubocop offenses in exe/jekyll (#5017)
 
 ### Site Enhancements
 

From f27fa75935d3001c605e974d7690217dbd5a3004 Mon Sep 17 00:00:00 2001
From: DirtyF 
Date: Wed, 15 Jun 2016 23:54:05 +0200
Subject: [PATCH 1034/4996] remove lib/jekyll/command.rb from exclude

---
 .rubocop.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index ac0ce379021..adb0ca870e0 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -5,7 +5,6 @@ AllCops:
   - lib/**/*.rb
   Exclude:
   - lib/jekyll/collection.rb
-  - lib/jekyll/command.rb
   - lib/jekyll/configuration.rb
   - lib/jekyll/convertible.rb
   - lib/jekyll/document.rb

From e9fed13392b4c160daf52ad31a0e0a9d30bfbf4b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 15 Jun 2016 14:58:53 -0700
Subject: [PATCH 1035/4996] Update history to reflect merge of #5018 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7016a7e4727..67b486b900e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -96,6 +96,7 @@
   * Add timings for each scenario in cucumber & print worst offenders (#4908)
   * rubocop: jekyll/lib/filters.rb (#4993)
   * Fix rubocop offenses in exe/jekyll (#5017)
+  * Rubocop: lib/jekyll/command.rb  (#5018)
 
 ### Site Enhancements
 

From 765a23468e4f59df9a0c6afcd283cbfe4530ea43 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 15 Jun 2016 15:59:31 -0700
Subject: [PATCH 1036/4996] Give the user a layout scaffolding.

---
 lib/jekyll/theme_builder.rb           | 7 +++++++
 lib/theme_template/example/_post.md   | 3 +--
 lib/theme_template/example/index.html | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb
index 1ff22e6a2c5..71f92e1caba 100644
--- a/lib/jekyll/theme_builder.rb
+++ b/lib/jekyll/theme_builder.rb
@@ -12,6 +12,7 @@ def initialize(theme_name)
 
   def create!
     create_directories
+    create_starter_files
     create_gemspec
     create_accessories
     create_example_site
@@ -58,6 +59,12 @@ def create_directories
     mkdir_p(%w(example example/_posts))
   end
 
+  def create_starter_files
+    %w(page post default).each do |layout|
+      write_file("_layouts/#{layout}.html", template("_layouts/#{layout}.html"))
+    end
+  end
+
   def create_gemspec
     write_file("Gemfile", template("Gemfile"))
     write_file("#{name}.gemspec", template("theme.gemspec"))
diff --git a/lib/theme_template/example/_post.md b/lib/theme_template/example/_post.md
index cf40b7f0dea..145b21de42f 100644
--- a/lib/theme_template/example/_post.md
+++ b/lib/theme_template/example/_post.md
@@ -1,6 +1,5 @@
 ---
-# Specify a layout from your theme!
-# This will be the layout users specify for their posts.
+layout: post
 ---
 
 Eos eu docendi tractatos sapientem, brute option menandri in vix, quando vivendo accommodare te ius. Nec melius fastidii constituam id, viderer theophrastus ad sit, hinc semper periculis cum id. Noluisse postulant assentior est in, no choro sadipscing repudiandae vix. Vis in euismod delenit dignissim. Ex quod nostrum sit, suas decore animal id ius, nobis solet detracto quo te.
diff --git a/lib/theme_template/example/index.html b/lib/theme_template/example/index.html
index d3187773878..b688538cd69 100644
--- a/lib/theme_template/example/index.html
+++ b/lib/theme_template/example/index.html
@@ -1,5 +1,5 @@
 ---
-# Specify a layout from your theme!
+layout: page
 ---
 
 Lorem ipsum dolor sit amet, quo id prima corrumpit pertinacia, id ius dolor dolores, an veri pertinax explicari mea. Agam solum et qui, his id ludus graeco adipiscing. Duis theophrastus nam in, at his vidisse atomorum. Tantas gloriatur scripserit ne eos. Est wisi tempor habemus at, ei graeco dissentiet eos. Ne usu aliquip sanctus conceptam, te vis ignota animal, modus latine contentiones ius te.

From c70ca8ac9787f9402e1c7941b868f53153c06ece Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 15 Jun 2016 16:04:57 -0700
Subject: [PATCH 1037/4996] Whoops, forgot the _layouts templates.

---
 lib/theme_template/_layouts/default.html | 1 +
 lib/theme_template/_layouts/page.html    | 5 +++++
 lib/theme_template/_layouts/post.html    | 5 +++++
 3 files changed, 11 insertions(+)
 create mode 100644 lib/theme_template/_layouts/default.html
 create mode 100644 lib/theme_template/_layouts/page.html
 create mode 100644 lib/theme_template/_layouts/post.html

diff --git a/lib/theme_template/_layouts/default.html b/lib/theme_template/_layouts/default.html
new file mode 100644
index 00000000000..cddd07099f2
--- /dev/null
+++ b/lib/theme_template/_layouts/default.html
@@ -0,0 +1 @@
+{{ content }}
diff --git a/lib/theme_template/_layouts/page.html b/lib/theme_template/_layouts/page.html
new file mode 100644
index 00000000000..5e7112684af
--- /dev/null
+++ b/lib/theme_template/_layouts/page.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{{ content }}
diff --git a/lib/theme_template/_layouts/post.html b/lib/theme_template/_layouts/post.html
new file mode 100644
index 00000000000..5e7112684af
--- /dev/null
+++ b/lib/theme_template/_layouts/post.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{{ content }}

From a71e67720733d207b7ab6b389578a69d424d8594 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 15 Jun 2016 16:32:28 -0700
Subject: [PATCH 1038/4996] Add 'Reviewing a Pull Request' documentation

@mikemcquaid Would love your feedback on this one. Writing from scratch
here and I have the tendency to sound pretty formal. Thoughts?
---
 docs/reviewing-a-pull-request.md | 34 ++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/docs/reviewing-a-pull-request.md b/docs/reviewing-a-pull-request.md
index 35ac769e5e4..aeea06a5a1d 100644
--- a/docs/reviewing-a-pull-request.md
+++ b/docs/reviewing-a-pull-request.md
@@ -2,3 +2,37 @@
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
 
+## Respond Kindly
+
+Above all else, please review a pull request kindly. Our community can only be strong if we make it a welcoming and inclusive environment. To further promote this, the Jekyll community is governed by a [Code of Conduct](../CONDUCT.markdown) by which all community members must abide.
+
+Use emoji liberally :heart: :tada: :sparkles: :confetti_ball: and feel free to be emotive!! Contributions keep this project moving forward and we're always happy to receive them, even if the pull request isn't ultimately merged.
+
+Mike McQuaid's post on the GitHub blog entitled ["Kindly Closing Pull Requests"](https://github.com/blog/2124-kindly-closing-pull-requests) is a great place to start. It describes various scenarios in which it would be acceptable to close a pull request for reasons other than lack of technical integrity or accuracy. Part of being kind is responding to and resolving pull requests quickly.
+
+## Respond Quickly
+
+We should be able to review all pull requests within one week. The only time initial review should take longer is if all the maintainers mysteriously took vacation during the same week. Promptness encourages frequent, high-quality contributions from community members and other maintainers.
+
+If your response requires a response on the part of the author, please add the `pending-feedback` tag. @jekyllbot will automatically remove the tag once the author of the pull request responds.
+
+## Resolve Quickly
+
+Similarly, we should aim to resolve pull requests quickly. If a pull request introduces a feature which does not fit into the core purpose or goal of the project, close it prompty with a kind explanation of why it is not acceptable.
+
+Leave detailed comments wherever possible. Provide the contributor with context around why the change you are requesting is necessary, or why the question you are asking is important to resolve. The more context we can clearly communicate to the contributor, the better able
+
+You may close a pull request if more than 30 days pass without a response from the author.
+
+## CI Must Pass
+
+It is fine to ask a contributor to investigate failures on Travis and patch them up before you begin your review. It is helpful to leave a message for the contributor indicating that the tests have failed and that no review will occur before the tests pass. If they ask for help, take a look and assist if you can.
+
+## Rule of Two
+
+A pull request may be merged once two maintainers have reviewed the pull request and indicated that it is acceptable to them. There is no need to wait for a third unless one of the two reviewers wishes for another set of eyes.
+
+## Think Security
+
+We owe it to our users to ensure that using a theme from the community or building someone else's site doesn't come with built-in security vulnerabilities. Things like where files may be read from and written to are important to keep secure. Jekyll is also the basis for hosted services such as [GitHub Pages](https://pages.github.com), which cannot upgrade when security issues are introduced.
+

From fa6934300bf1680f5c505c48415d818ecdd818a7 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 15 Jun 2016 17:19:47 -0700
Subject: [PATCH 1039/4996] Add 'Becoming a Maintainer' docs.

---
 docs/becoming-a-maintainer.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/docs/becoming-a-maintainer.md b/docs/becoming-a-maintainer.md
index 2926344c86c..facc9965a59 100644
--- a/docs/becoming-a-maintainer.md
+++ b/docs/becoming-a-maintainer.md
@@ -1,3 +1,35 @@
 # Contributors: Becoming a Maintainer
 
 **This guide is for contributors.** These special people have contributed to one or more of Jekyll's repositories, but do not yet have write access to any. You may find what is written here interesting, but it’s definitely not for everyone.
+
+So you want to become a maintainer of a Jekyll project? We'd love to have you! Here are some things we like to see from community members before we promote them to maintainers.
+
+## 1. Use Jekyll
+
+You want to maintain Jekyll? Use it often. Do weird things with it. Do normal things with it. Does it work? Does it have any weaknesses? Is there a gap in the product that you think should be filled?
+
+## 1. Help Triage Issues
+
+Watch the repository you're interested in. Join [an Affinity Team](https://teams.jekyllrb.com) and receive mentions regarding a particular interest area of the project. When you receive a notification for an issue that has not been triaged by a maintainer, dive in. Can you reproduce the issue? Can you determine the fix? [More tips on Triaging an Issue in our maintainer guide](triaging-an-issue.md). Every maintainer loves an issue that is resolved before they get to it. :smiley:
+
+## 2. Write Documentation
+
+Good documentation means less confusion for our users and fewer issues to triage. Documentation is always in need of fixes and updates as we change the code. Read through the documentation during your normal usage of the product and submit changes as you feel they are necessary.
+
+## 3. Write Code
+
+As a maintainer, you will be reviewing pull requests which update code. You should feel comfortable with the Jekyll codebase enough to confidently review a put forward.
+
+## 4. Review Pull Requests
+
+Start by reviewing one pull request a week. Leave detailed comments and [follow our guide for reviewing pull requests](reviewing-a-pull-request.md).
+
+## 5. Ask!
+
+Open an issue describing your contributions to the project and why you wish to be a maintainer. Issues are nice because you can easily reference where you have demonstrated that you help triage issues, write code & documentation, and review pull requests. You may also email any maintainer privately if you do not feel comfortable asking in the open.
+
+We would love to expand the team and look forward to many more community members becoming maintainers!
+
+# Helping Out Elsewhere
+
+In addition to maintainers of our core and plugin code, the Jekyll team is comprised of moderators for our forums. These helpful community members take a look at the topics posted to https://help.jekyllrb.com and ensure they are properly categorized and are acceptable under our Code of Conduct. If you would like to be a moderator, email one of the maintainers with links to where you have answered questions and a request to be added as a moderator. More help is always welcome.

From 7a933893dbcaf1b57dbfafd6dc41edaadef43197 Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Thu, 16 Jun 2016 13:14:50 +0300
Subject: [PATCH 1040/4996] rubocop: fix code style

---
 .rubocop.yml              |  1 -
 lib/jekyll/static_file.rb | 50 +++++++++++++++++++--------------------
 test/test_site.rb         |  2 --
 3 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index adb0ca870e0..8c90c0494de 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -10,7 +10,6 @@ AllCops:
   - lib/jekyll/document.rb
   - lib/jekyll/regenerator.rb
   - lib/jekyll/renderer.rb
-  - lib/jekyll/static_file.rb
   - lib/jekyll/utils.rb
   - bin/**/*
   - benchmark/**/*
diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index 3e7d0d25d51..5471c2a9aff 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -1,8 +1,5 @@
 module Jekyll
   class StaticFile
-    # The cache of last modification times [path] -> mtime.
-    @@mtimes = {}
-
     attr_reader :relative_path, :extname
 
     # Initialize a new StaticFile.
@@ -11,6 +8,7 @@ class StaticFile
     # base - The String path to the .
     # dir  - The String path between  and the file.
     # name - The String filename of the file.
+    # rubocop: disable ParameterLists
     def initialize(site, base, dir, name, collection = nil)
       @site = site
       @base = base
@@ -19,7 +17,10 @@ def initialize(site, base, dir, name, collection = nil)
       @collection = collection
       @relative_path = File.join(*[@dir, @name].compact)
       @extname = File.extname(@name)
+      # The cache of last modification times [path] -> mtime.
+      @mtimes = {}
     end
+    # rubocop: enable ParameterLists
 
     # Returns source file path.
     def path
@@ -56,7 +57,7 @@ def mtime
     #
     # Returns true if modified since last write.
     def modified?
-      @@mtimes[path] != mtime
+      @mtimes[path] != mtime
     end
 
     # Whether to write the file to the filesystem
@@ -64,7 +65,7 @@ def modified?
     # Returns true unless the defaults for the destination path from
     # _config.yml contain `published: false`.
     def write?
-      defaults.fetch('published', true)
+      defaults.fetch("published", true)
     end
 
     # Write the static file to the destination directory (if modified).
@@ -76,28 +77,16 @@ def write(dest)
       dest_path = destination(dest)
 
       return false if File.exist?(dest_path) && !modified?
-      @@mtimes[path] = mtime
+      @mtimes[path] = mtime
 
       FileUtils.mkdir_p(File.dirname(dest_path))
       FileUtils.rm(dest_path) if File.exist?(dest_path)
-      if @site.safe || Jekyll.env == "production"
-        FileUtils.cp(path, dest_path)
-      else
-        FileUtils.copy_entry(path, dest_path)
-      end
-      File.utime(@@mtimes[path], @@mtimes[path], dest_path)
+      copy_file(dest_path)
+      File.utime(@mtimes[path], @mtimes[path], dest_path)
 
       true
     end
 
-    # Reset the mtimes cache (for testing purposes).
-    #
-    # Returns nothing.
-    def self.reset_cache
-      @@mtimes = {}
-      nil
-    end
-
     def to_liquid
       {
         "extname"       => extname,
@@ -109,11 +98,11 @@ def to_liquid
     def placeholders
       {
         :collection => @collection.label,
-        :path => relative_path[
+        :path       => relative_path[
           @collection.relative_directory.size..relative_path.size],
-        :output_ext => '',
-        :name => '',
-        :title => ''
+        :output_ext => "",
+        :name       => "",
+        :title      => ""
       }
     end
 
@@ -125,10 +114,10 @@ def url
                  relative_path
                else
                  ::Jekyll::URL.new({
-                   :template => @collection.url_template,
+                   :template     => @collection.url_template,
                    :placeholders => placeholders
                  })
-               end.to_s.gsub(/\/$/, '')
+               end.to_s.gsub(%r!/$!, "")
     end
 
     # Returns the type of the collection if present, nil otherwise.
@@ -141,5 +130,14 @@ def type
     def defaults
       @defaults ||= @site.frontmatter_defaults.all url, type
     end
+
+    private
+    def copy_file(dest_path)
+      if @site.safe || Jekyll.env == "production"
+        FileUtils.cp(path, dest_path)
+      else
+        FileUtils.copy_entry(path, dest_path)
+      end
+    end
   end
 end
diff --git a/test/test_site.rb b/test/test_site.rb
index 4e9e18a57ab..6ac27ccc730 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -100,7 +100,6 @@ def generate(site)
 
     should "write only modified static files" do
       clear_dest
-      StaticFile.reset_cache
       @site.regenerator.clear
 
       @site.process
@@ -130,7 +129,6 @@ def generate(site)
 
     should "write static files if not modified but missing in destination" do
       clear_dest
-      StaticFile.reset_cache
       @site.regenerator.clear
 
       @site.process

From 0f74db413110ae7cb435bbd2d7f21a2918dd9cfe Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Thu, 16 Jun 2016 23:12:01 +0300
Subject: [PATCH 1041/4996] rubocop: move mtimes cache hash to class variable

---
 lib/jekyll/static_file.rb | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index 5471c2a9aff..0f8544ee7da 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -2,6 +2,17 @@ module Jekyll
   class StaticFile
     attr_reader :relative_path, :extname
 
+    class << self
+      # The cache of last modification times [path] -> mtime.
+      def mtimes
+        @mtimes ||= {}
+      end
+
+      def reset_cache
+        @mtimes = nil
+      end
+    end
+
     # Initialize a new StaticFile.
     #
     # site - The Site.
@@ -17,8 +28,6 @@ def initialize(site, base, dir, name, collection = nil)
       @collection = collection
       @relative_path = File.join(*[@dir, @name].compact)
       @extname = File.extname(@name)
-      # The cache of last modification times [path] -> mtime.
-      @mtimes = {}
     end
     # rubocop: enable ParameterLists
 
@@ -57,7 +66,7 @@ def mtime
     #
     # Returns true if modified since last write.
     def modified?
-      @mtimes[path] != mtime
+      self.class.mtimes[path] != mtime
     end
 
     # Whether to write the file to the filesystem
@@ -77,12 +86,11 @@ def write(dest)
       dest_path = destination(dest)
 
       return false if File.exist?(dest_path) && !modified?
-      @mtimes[path] = mtime
+      self.class.mtimes[path] = mtime
 
       FileUtils.mkdir_p(File.dirname(dest_path))
       FileUtils.rm(dest_path) if File.exist?(dest_path)
       copy_file(dest_path)
-      File.utime(@mtimes[path], @mtimes[path], dest_path)
 
       true
     end
@@ -138,6 +146,7 @@ def copy_file(dest_path)
       else
         FileUtils.copy_entry(path, dest_path)
       end
+      File.utime(self.class.mtimes[path], self.class.mtimes[path], dest_path)
     end
   end
 end

From 4afb407304c1ab11da2e380543eada522f4b5503 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 16 Jun 2016 15:14:42 -0700
Subject: [PATCH 1042/4996] Address comments from PR review.

---
 docs/avoiding-burnout.md         |  2 +-
 docs/becoming-a-maintainer.md    | 12 ++++++------
 docs/merging-a-pull-request.md   |  4 +---
 docs/reviewing-a-pull-request.md |  4 ++++
 docs/triaging-an-issue.md        |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/docs/avoiding-burnout.md b/docs/avoiding-burnout.md
index 4e8b2e0b116..8ca27bfe31b 100644
--- a/docs/avoiding-burnout.md
+++ b/docs/avoiding-burnout.md
@@ -2,7 +2,7 @@
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
 
-# 1. Use Homebrew
+# 1. Use Jekyll
 
 Maintainers of Homebrew should be using it regularly. This is partly because you won't be a good maintainer unless you can put yourself in the shoes of our users but also because you may decide to stop using Jekyll and at that point you should also decide not to be a maintainer and find other things to work on.
 
diff --git a/docs/becoming-a-maintainer.md b/docs/becoming-a-maintainer.md
index facc9965a59..28f1f70b5f8 100644
--- a/docs/becoming-a-maintainer.md
+++ b/docs/becoming-a-maintainer.md
@@ -8,23 +8,23 @@ So you want to become a maintainer of a Jekyll project? We'd love to have you! H
 
 You want to maintain Jekyll? Use it often. Do weird things with it. Do normal things with it. Does it work? Does it have any weaknesses? Is there a gap in the product that you think should be filled?
 
-## 1. Help Triage Issues
+## 2. Help Triage Issues
 
 Watch the repository you're interested in. Join [an Affinity Team](https://teams.jekyllrb.com) and receive mentions regarding a particular interest area of the project. When you receive a notification for an issue that has not been triaged by a maintainer, dive in. Can you reproduce the issue? Can you determine the fix? [More tips on Triaging an Issue in our maintainer guide](triaging-an-issue.md). Every maintainer loves an issue that is resolved before they get to it. :smiley:
 
-## 2. Write Documentation
+## 3. Write Documentation
 
 Good documentation means less confusion for our users and fewer issues to triage. Documentation is always in need of fixes and updates as we change the code. Read through the documentation during your normal usage of the product and submit changes as you feel they are necessary.
 
-## 3. Write Code
+## 4. Write Code
 
-As a maintainer, you will be reviewing pull requests which update code. You should feel comfortable with the Jekyll codebase enough to confidently review a put forward.
+As a maintainer, you will be reviewing pull requests which update code. You should feel comfortable with the Jekyll codebase enough to confidently review any pull request put forward. In order to become more comfortable, write some code of your own and send a pull request. A great place to start is with any issue labeled "bug" in the issue tracker. Write a test which replicates the problem and fails, then work on fixing the code such that the test passes.
 
-## 4. Review Pull Requests
+## 5. Review Pull Requests
 
 Start by reviewing one pull request a week. Leave detailed comments and [follow our guide for reviewing pull requests](reviewing-a-pull-request.md).
 
-## 5. Ask!
+## 6. Ask!
 
 Open an issue describing your contributions to the project and why you wish to be a maintainer. Issues are nice because you can easily reference where you have demonstrated that you help triage issues, write code & documentation, and review pull requests. You may also email any maintainer privately if you do not feel comfortable asking in the open.
 
diff --git a/docs/merging-a-pull-request.md b/docs/merging-a-pull-request.md
index ff1f102ed98..3d56b09660d 100644
--- a/docs/merging-a-pull-request.md
+++ b/docs/merging-a-pull-request.md
@@ -6,9 +6,7 @@
 
 All pull requests should be subject to code review. Code review is a [foundational value](https://blog.fullstory.com/what-we-learned-from-google-code-reviews-arent-just-for-catching-bugs-b125a13aa292) of good engineering teams. Besides providing validation of correctness, it promotes a sense of community and gives other maintainers understanding of all parts of the code base. In short, code review is crucial to a healthy open source project.
 
-Before merging a pull request **that changes code**, ensure that code is thoroughly reviewed and has received a thorough review from at least two maintainers.
-
-Before merging a pull request **that changes the documentation**, ensure there aren't any errors and that at least one other maintainer has agreed on the changes.
+**Read our guide for [Reviewing a pull request](reviewing-a-pull-request.md) before merging.** Notably, the change must have tests if for code, and at least two maintainers must give it an OK.
 
 ## Merging
 
diff --git a/docs/reviewing-a-pull-request.md b/docs/reviewing-a-pull-request.md
index aeea06a5a1d..feea47ec522 100644
--- a/docs/reviewing-a-pull-request.md
+++ b/docs/reviewing-a-pull-request.md
@@ -24,6 +24,10 @@ Leave detailed comments wherever possible. Provide the contributor with context
 
 You may close a pull request if more than 30 days pass without a response from the author.
 
+## Look for Tests
+
+If this is a code change, are there tests for the updated or added behaviour? Shipping a version with bugs is inevitable, but ensuring changes are tested helps keep bugs and regressions to a minimum.
+
 ## CI Must Pass
 
 It is fine to ask a contributor to investigate failures on Travis and patch them up before you begin your review. It is helpful to leave a message for the contributor indicating that the tests have failed and that no review will occur before the tests pass. If they ask for help, take a look and assist if you can.
diff --git a/docs/triaging-an-issue.md b/docs/triaging-an-issue.md
index 75dbe4d13af..d69b64577f5 100644
--- a/docs/triaging-an-issue.md
+++ b/docs/triaging-an-issue.md
@@ -6,4 +6,4 @@ Here are some key things to remember when evaluating an issue.
 
 ## Reproducible?
 
-If the bug has clear reproduction steps, take a minute to try them.
+If the bug has clear reproduction steps, take a minute to try them. If it helps, write a test in our test suite for the scenario which replicates the problem.

From 0c7693f7b918c6d603119281fec9165d61177122 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 16 Jun 2016 17:07:16 -0700
Subject: [PATCH 1043/4996] Updates to Reviewing a Pull Request

---
 docs/reviewing-a-pull-request.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/reviewing-a-pull-request.md b/docs/reviewing-a-pull-request.md
index feea47ec522..b2c3e0def61 100644
--- a/docs/reviewing-a-pull-request.md
+++ b/docs/reviewing-a-pull-request.md
@@ -18,12 +18,14 @@ If your response requires a response on the part of the author, please add the `
 
 ## Resolve Quickly
 
-Similarly, we should aim to resolve pull requests quickly. If a pull request introduces a feature which does not fit into the core purpose or goal of the project, close it prompty with a kind explanation of why it is not acceptable.
+Similarly, we should aim to resolve pull requests quickly. If a pull request introduces a feature which does not fit into the core purpose or goal of the project, close it promptly with a kind explanation of why it is not acceptable.
 
-Leave detailed comments wherever possible. Provide the contributor with context around why the change you are requesting is necessary, or why the question you are asking is important to resolve. The more context we can clearly communicate to the contributor, the better able
+Leave detailed comments wherever possible. Provide the contributor with context around why the change you are requesting is necessary, or why the question you are asking is important to resolve. The more context we can clearly communicate to the contributor, the better able the contributor is to provide high-quality patches.
 
 You may close a pull request if more than 30 days pass without a response from the author.
 
+In some cases, review will involve many weeks of back-and-forth. As long as communication continues, this is fine. Ideally, any PR would be capable of resolution within 30 days of it being opened.
+
 ## Look for Tests
 
 If this is a code change, are there tests for the updated or added behaviour? Shipping a version with bugs is inevitable, but ensuring changes are tested helps keep bugs and regressions to a minimum.

From d220c7a9a922eb37f9e20098538bdceed7d8c751 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 16 Jun 2016 17:12:00 -0700
Subject: [PATCH 1044/4996] Try fleshing out Triaging an Issue more.

---
 docs/triaging-an-issue.md | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/docs/triaging-an-issue.md b/docs/triaging-an-issue.md
index d69b64577f5..436a89d0ec6 100644
--- a/docs/triaging-an-issue.md
+++ b/docs/triaging-an-issue.md
@@ -4,6 +4,35 @@
 
 Here are some key things to remember when evaluating an issue.
 
-## Reproducible?
+## Feature?
 
-If the bug has clear reproduction steps, take a minute to try them. If it helps, write a test in our test suite for the scenario which replicates the problem.
+If the issue describes a feature request, ask:
+
+1. Is this a setting? [Settings are a crutch](http://ben.balter.com/2016/03/08/optimizing-for-power-users-and-edge-cases/#settings-are-a-crutch) for doing "the right thing". Settings usually point to a bad default or an edge case that could be solved easily with a plugin. Keep the :christmas_tree: of settings as small as possible so as not to reduce the usability of the product. We like the philosophy "decisions not options."
+2. Would at least 80% of users find it useful? If even a quarter of our users won't use it, it's very likely that the request doesn't fit our product's core goal.
+3. Is there another way to accomplish the end goal of the request? Most feature requests are due to bad documentation for or understanding of a pre-existing feature. See if you can clarify the end goal of the request. What is the user trying to do? Could they accomplish that goal through another feature we already support?
+4. Even if 80% of our users will use it, does it fit the core goal of our project? We are writing a tool for making static websites, not a swiss army knife for publishing more generally.
+
+Feel free to get others' opinions and ask questions of the issue author, but depending upon the answers to the questions above, it may be out of scope for our project.
+
+If the request is within scope, prioritize it on the product roadmap with the other maintainers. Apply the appropriate tags and ensure the right people have weighed in to define the feature's scope and implementation. If you want to be the _best ever_, submit a PR yourself which adds the feature.
+
+## Bug?
+
+### Reproducibility
+
+If the bug has clear reproduction steps, take a minute to try them. If it helps, write a test in our test suite for the scenario which replicates the problem. Can you reliably replicate the issue?
+
+If you can't replicate the issue, post your replication steps which didn't work and ask for clarification from the issue author.
+
+### Supported Platform
+
+Is the author using a supported platform? We support the latest versions of macOS, most common distributions of Linux. If the author is using Windows, you can use the `@jekyll/windows` team to help you investigate, but ultimately it is not a supported platform.
+
+If the user is experiencing issues with GitHub Pages or another hosted platform that we cannot reproduce, please direct them to the platform's support channel and close the issue.
+
+### What they wanted vs. what they got
+
+An issue without a clear explanation of what the user got and what they were expecting to get is not an issue we can accurately respond to. If the user doesn't provide this information, please ask for clarification. This information helps us build test cases such that we do not break the behaviour again in the future.
+
+Is what they wanted to get something we want to happen? Sometimes a bug report is actually masquerading as a feature request. See the guidance above for handling feature requests.

From b06cfb9c500eccd3ae681130c9752ad8bd303ad1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 16 Jun 2016 17:31:54 -0700
Subject: [PATCH 1045/4996] Update history to reflect merge of #4922 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 67b486b900e..5966cd6d747 100644
--- a/History.markdown
+++ b/History.markdown
@@ -30,6 +30,7 @@
   * Run Site#generate for 'jekyll doctor' to catch plugin issues (#5005)
   * Add normalize_whitepace filter (#4917)
   * Move bin/jekyll to exe/jekyll to prevent collision with binstubs (#5014)
+  * Cleaning up site template & theme updates. (#4922)
 
 ### Bug Fixes
 

From 97fecafff51a046e1ee030d4a3c716e8c33826fb Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Fri, 17 Jun 2016 13:06:11 +0300
Subject: [PATCH 1046/4996] rubocop: revert changes in test

---
 test/test_site.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test_site.rb b/test/test_site.rb
index 6ac27ccc730..4e9e18a57ab 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -100,6 +100,7 @@ def generate(site)
 
     should "write only modified static files" do
       clear_dest
+      StaticFile.reset_cache
       @site.regenerator.clear
 
       @site.process
@@ -129,6 +130,7 @@ def generate(site)
 
     should "write static files if not modified but missing in destination" do
       clear_dest
+      StaticFile.reset_cache
       @site.regenerator.clear
 
       @site.process

From 902f344a50c19485c5b47b82791838bf731d215c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 17 Jun 2016 19:42:28 -0700
Subject: [PATCH 1047/4996] Update history to reflect merge of #5019 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5966cd6d747..75fcfacc525 100644
--- a/History.markdown
+++ b/History.markdown
@@ -98,6 +98,7 @@
   * rubocop: jekyll/lib/filters.rb (#4993)
   * Fix rubocop offenses in exe/jekyll (#5017)
   * Rubocop: lib/jekyll/command.rb  (#5018)
+  * rubocop: lib/jekyll/static_file.rb (#5019)
 
 ### Site Enhancements
 

From 14e857029ab1560c3aaad3bc67b3bf39120d0875 Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Sun, 19 Jun 2016 15:48:23 +0300
Subject: [PATCH 1048/4996] rubocop: fix code style

---
 .rubocop.yml                |   1 -
 lib/jekyll/configuration.rb | 152 +++++++++++++++++++++---------------
 2 files changed, 89 insertions(+), 64 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 8c90c0494de..3bea6a0253f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -5,7 +5,6 @@ AllCops:
   - lib/**/*.rb
   Exclude:
   - lib/jekyll/collection.rb
-  - lib/jekyll/configuration.rb
   - lib/jekyll/convertible.rb
   - lib/jekyll/document.rb
   - lib/jekyll/regenerator.rb
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 80e36478811..bcd13d0bf84 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -86,8 +86,8 @@ class << self
       # Returns a Configuration filled with defaults and fixed for common
       # problems and backwards-compatibility.
       def from(user_config)
-        Utils.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys).
-          fix_common_issues.add_default_collections
+        Utils.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys)
+          .fix_common_issues.add_default_collections
       end
     end
 
@@ -123,10 +123,10 @@ def verbose(override = {})
 
     def safe_load_file(filename)
       case File.extname(filename)
-      when /\.toml/i
+      when %r!\.toml!i
         Jekyll::External.require_with_graceful_fail("toml") unless defined?(TOML)
         TOML.load_file(filename)
-      when /\.ya?ml/i
+      when %r!\.ya?ml!i
         SafeYAML.load_file(filename) || {}
       else
         raise ArgumentError, "No parser for '#{filename}' is available.
@@ -191,7 +191,7 @@ def read_config_files(files)
 
       begin
         files.each do |config_file|
-          next if config_file.nil? or config_file.empty?
+          next if config_file.nil? || config_file.empty?
           new_config = read_config_file(config_file)
           configuration = Utils.deep_merge_hashes(configuration, new_config)
         end
@@ -220,60 +220,18 @@ def csv_to_array(csv)
     def backwards_compatibilize
       config = clone
       # Provide backwards-compatibility
-      if config.key?("auto") || config.key?("watch")
-        Jekyll::Deprecator.deprecation_message "Auto-regeneration can no longer" \
-                            " be set from your configuration file(s). Use the" \
-                            " --[no-]watch/-w command-line option instead."
-        config.delete("auto")
-        config.delete("watch")
-      end
-
-      if config.key?("server")
-        Jekyll::Deprecator.deprecation_message "The 'server' configuration option" \
-                            " is no longer accepted. Use the 'jekyll serve'" \
-                            " subcommand to serve your site with WEBrick."
-        config.delete("server")
-      end
+      check_auto(config)
+      check_server(config)
 
       renamed_key "server_port", "port", config
       renamed_key "plugins", "plugins_dir", config
       renamed_key "layouts", "layouts_dir", config
       renamed_key "data_source", "data_dir", config
 
-      if config.key?("pygments")
-        Jekyll::Deprecator.deprecation_message "The 'pygments' configuration option" \
-                            " has been renamed to 'highlighter'. Please update your" \
-                            " config file accordingly. The allowed values are 'rouge', " \
-                            "'pygments' or null."
-
-        config["highlighter"] = "pygments" if config["pygments"]
-        config.delete("pygments")
-      end
-
-      %w(include exclude).each do |option|
-        if config[option].is_a?(String)
-          Jekyll::Deprecator.deprecation_message "The '#{option}' configuration option" \
-            " must now be specified as an array, but you specified" \
-            " a string. For now, we've treated the string you provided" \
-            " as a list of comma-separated values."
-          config[option] = csv_to_array(config[option])
-        end
-        config[option].map!(&:to_s) if config[option]
-      end
-
-      if (config["kramdown"] || {}).key?("use_coderay")
-        Jekyll::Deprecator.deprecation_message "Please change 'use_coderay'" \
-          " to 'enable_coderay' in your configuration file."
-        config["kramdown"]["use_coderay"] = config["kramdown"].delete("enable_coderay")
-      end
-
-      if config.fetch("markdown", "kramdown").to_s.casecmp("maruku") == 0
-        Jekyll.logger.abort_with "Error:", "You're using the 'maruku' " \
-          "Markdown processor, which has been removed as of 3.0.0. " \
-          "We recommend you switch to Kramdown. To do this, replace " \
-          "`markdown: maruku` with `markdown: kramdown` in your " \
-          "`_config.yml` file."
-      end
+      check_pygments(config)
+      check_include_exclude(config)
+      check_coderay(config)
+      check_maruku(config)
 
       config
     end
@@ -296,19 +254,19 @@ def add_default_collections
       config = clone
 
       # It defaults to `{}`, so this is only if someone sets it to null manually.
-      return config if config['collections'].nil?
+      return config if config["collections"].nil?
 
       # Ensure we have a hash.
-      if config['collections'].is_a?(Array)
-        config['collections'] = Hash[config['collections'].map { |c| [c, {}] }]
+      if config["collections"].is_a?(Array)
+        config["collections"] = Hash[config["collections"].map { |c| [c, {}] }]
       end
 
-      config['collections'] = Utils.deep_merge_hashes(
-        { 'posts' => {} }, config['collections']
+      config["collections"] = Utils.deep_merge_hashes(
+        { "posts" => {} }, config["collections"]
       ).tap do |collections|
-        collections['posts']['output'] = true
-        if config['permalink']
-          collections['posts']['permalink'] ||= style_to_permalink(config['permalink'])
+        collections["posts"]["output"] = true
+        if config["permalink"]
+          collections["posts"]["permalink"] ||= style_to_permalink(config["permalink"])
         end
       end
 
@@ -325,7 +283,6 @@ def renamed_key(old, new, config, _ = nil)
     end
 
     private
-
     def style_to_permalink(permalink_style)
       case permalink_style.to_sym
       when :pretty
@@ -347,9 +304,78 @@ def style_to_permalink(permalink_style)
     # file - the file from which the config was extracted
     #
     # Raises an ArgumentError if given config is not a hash
+    private
     def check_config_is_hash!(extracted_config, file)
       unless extracted_config.is_a?(Hash)
-        raise ArgumentError.new("Configuration file: (INVALID) #{file}".yellow)
+        raise ArgumentError, "Configuration file: (INVALID) #{file}".yellow
+      end
+    end
+
+    private
+    def check_auto(config)
+      if config.key?("auto") || config.key?("watch")
+        Jekyll::Deprecator.deprecation_message "Auto-regeneration can no longer" \
+                            " be set from your configuration file(s). Use the" \
+                            " --[no-]watch/-w command-line option instead."
+        config.delete("auto")
+        config.delete("watch")
+      end
+    end
+
+    private
+    def check_server(config)
+      if config.key?("server")
+        Jekyll::Deprecator.deprecation_message "The 'server' configuration option" \
+                            " is no longer accepted. Use the 'jekyll serve'" \
+                            " subcommand to serve your site with WEBrick."
+        config.delete("server")
+      end
+    end
+
+    private
+    def check_pygments(config)
+      if config.key?("pygments")
+        Jekyll::Deprecator.deprecation_message "The 'pygments' configuration option" \
+                            " has been renamed to 'highlighter'. Please update your" \
+                            " config file accordingly. The allowed values are 'rouge', " \
+                            "'pygments' or null."
+
+        config["highlighter"] = "pygments" if config["pygments"]
+        config.delete("pygments")
+      end
+    end
+
+    private
+    def check_include_exclude(config)
+      %w(include exclude).each do |option|
+        if config[option].is_a?(String)
+          Jekyll::Deprecator.deprecation_message "The '#{option}' configuration option" \
+            " must now be specified as an array, but you specified" \
+            " a string. For now, we've treated the string you provided" \
+            " as a list of comma-separated values."
+          config[option] = csv_to_array(config[option])
+        end
+        config[option].map!(&:to_s) if config[option]
+      end
+    end
+
+    private
+    def check_coderay(config)
+      if (config["kramdown"] || {}).key?("use_coderay")
+        Jekyll::Deprecator.deprecation_message "Please change 'use_coderay'" \
+          " to 'enable_coderay' in your configuration file."
+        config["kramdown"]["use_coderay"] = config["kramdown"].delete("enable_coderay")
+      end
+    end
+
+    private
+    def check_maruku(config)
+      if config.fetch("markdown", "kramdown").to_s.casecmp("maruku") == 0
+        Jekyll.logger.abort_with "Error:", "You're using the 'maruku' " \
+          "Markdown processor, which has been removed as of 3.0.0. " \
+          "We recommend you switch to Kramdown. To do this, replace " \
+          "`markdown: maruku` with `markdown: kramdown` in your " \
+          "`_config.yml` file."
       end
     end
   end

From d13112dbdc3b54c6a79c612a0ea32fc08affd6ac Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Sun, 19 Jun 2016 18:22:59 +0300
Subject: [PATCH 1049/4996] rubocop: fix code style

---
 .rubocop.yml              |  1 -
 lib/jekyll/regenerator.rb | 75 ++++++++++++++++++++++++---------------
 2 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 8c90c0494de..dd0b6b012da 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -8,7 +8,6 @@ AllCops:
   - lib/jekyll/configuration.rb
   - lib/jekyll/convertible.rb
   - lib/jekyll/document.rb
-  - lib/jekyll/regenerator.rb
   - lib/jekyll/renderer.rb
   - lib/jekyll/utils.rb
   - bin/**/*
diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb
index 830ea914a12..b387732a1d1 100644
--- a/lib/jekyll/regenerator.rb
+++ b/lib/jekyll/regenerator.rb
@@ -20,18 +20,14 @@ def initialize(site)
     def regenerate?(document)
       case document
       when Page
-        document.asset_file? || document.data['regenerate'] ||
-          source_modified_or_dest_missing?(
-            site.in_source_dir(document.relative_path), document.destination(@site.dest)
-          )
+        regenerate_page?(document)
       when Document
-        !document.write? || document.data['regenerate'] ||
-          source_modified_or_dest_missing?(
-            document.path, document.destination(@site.dest)
-          )
+        regenerate_document?(document)
       else
-        source_path = document.respond_to?(:path)        ? document.path                    : nil
-        dest_path   = document.respond_to?(:destination) ? document.destination(@site.dest) : nil
+        source_path = document.respond_to?(:path) ? document.path : nil
+        dest_path = if document.respond_to?(:destination)
+                      document.destination(@site.dest)
+                    end
         source_modified_or_dest_missing?(source_path, dest_path)
       end
     end
@@ -44,7 +40,7 @@ def add(path)
 
       metadata[path] = {
         "mtime" => File.mtime(path),
-        "deps" => []
+        "deps"  => []
       }
       cache[path] = true
     end
@@ -94,23 +90,7 @@ def modified?(path)
         return cache[path]
       end
 
-      # Check path that exists in metadata
-      data = metadata[path]
-      if data
-        data["deps"].each do |dependency|
-          if modified?(dependency)
-            return cache[dependency] = cache[path] = true
-          end
-        end
-        if File.exist?(path) && data["mtime"].eql?(File.mtime(path))
-          return cache[path] = false
-        else
-          return add(path)
-        end
-      end
-
-      # Path does not exist in metadata, add it
-      return add(path)
+      check_path_exists(path)
     end
 
     # Add a dependency of a path
@@ -139,7 +119,7 @@ def write_metadata
     #
     # Returns the String path of the file.
     def metadata_file
-      site.in_source_dir('.jekyll-metadata')
+      site.in_source_dir(".jekyll-metadata")
     end
 
     # Check if metadata has been disabled
@@ -173,5 +153,42 @@ def read_metadata
           {}
         end
     end
+
+    private
+    def regenerate_page?(document)
+      document.asset_file? || document.data["regenerate"] ||
+        source_modified_or_dest_missing?(
+          site.in_source_dir(document.relative_path), document.destination(@site.dest)
+        )
+    end
+
+    private
+    def regenerate_document?(document)
+      !document.write? || document.data["regenerate"] ||
+        source_modified_or_dest_missing?(
+          document.path, document.destination(@site.dest)
+        )
+    end
+
+    # Private: Check path that exists in metadata
+    #
+    # Returns Boolean
+    private
+    def check_path_exists(path)
+      data = metadata[path]
+      if data
+        data["deps"].each do |dependency|
+          if modified?(dependency)
+            return cache[dependency] = cache[path] = true
+          end
+        end
+        if File.exist?(path) && data["mtime"].eql?(File.mtime(path))
+          return cache[path] = false
+        end
+      end
+
+      # Path does not exist in metadata, add it
+      add(path)
+    end
   end
 end

From 08b883b268c6dd143b0bf286bdee49224a339212 Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Mon, 20 Jun 2016 16:03:42 +0300
Subject: [PATCH 1050/4996] rubocop: fix code style

---
 .rubocop.yml        |  1 -
 lib/jekyll/utils.rb | 83 ++++++++++++++++++++++++++++-----------------
 2 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 8c90c0494de..4ad1c59f3db 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -10,7 +10,6 @@ AllCops:
   - lib/jekyll/document.rb
   - lib/jekyll/regenerator.rb
   - lib/jekyll/renderer.rb
-  - lib/jekyll/utils.rb
   - bin/**/*
   - benchmark/**/*
   - script/**/*
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index a70a7916739..ca9e6fbad70 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -2,27 +2,25 @@
 module Jekyll
   module Utils
     extend self
-    autoload :Platforms, 'jekyll/utils/platforms'
+    autoload :Platforms, "jekyll/utils/platforms"
     autoload :Ansi, "jekyll/utils/ansi"
 
     # Constants for use in #slugify
-    SLUGIFY_MODES = %w(raw default pretty)
+    SLUGIFY_MODES = %w(raw default pretty).freeze
     SLUGIFY_RAW_REGEXP = Regexp.new('\\s+').freeze
-    SLUGIFY_DEFAULT_REGEXP = Regexp.new('[^[:alnum:]]+').freeze
+    SLUGIFY_DEFAULT_REGEXP = Regexp.new("[^[:alnum:]]+").freeze
     SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze
 
     # Takes an indented string and removes the preceding spaces on each line
 
     def strip_heredoc(str)
-      str.gsub(/^[ \t]{#{(str.scan(/^[ \t]*(?=\S)/).min || "").size}}/, "")
+      str.gsub(%r!^[ \t]{#{(str.scan(%r!^[ \t]*(?=\S)!).min || "").size}}!, "")
     end
 
     # Takes a slug and turns it into a simple title.
 
     def titleize_slug(slug)
-      slug.split("-").map! do |val|
-        val.capitalize
-      end.join(" ")
+      slug.split("-").map!(&:capitalize).join(" ")
     end
 
     # Non-destructive version of deep_merge_hashes! See that method.
@@ -42,21 +40,9 @@ def deep_merge_hashes(master_hash, other_hash)
     #
     # Thanks to whoever made it.
     def deep_merge_hashes!(target, overwrite)
-      target.merge!(overwrite) do |key, old_val, new_val|
-        if new_val.nil?
-          old_val
-        else
-          mergable?(old_val) && mergable?(new_val) ? deep_merge_hashes(old_val, new_val) : new_val
-        end
-      end
-
-      if target.respond_to?(:default_proc) && overwrite.respond_to?(:default_proc) && target.default_proc.nil?
-        target.default_proc = overwrite.default_proc
-      end
-
-      target.each do |key, val|
-        target[key] = val.dup if val.frozen? && duplicable?(val)
-      end
+      merge_values(target, overwrite)
+      merge_default_proc(target, overwrite)
+      duplicate_frozen_values(target)
 
       target
     end
@@ -84,7 +70,9 @@ def duplicable?(obj)
     # Returns an array
     def pluralized_array_from_hash(hash, singular_key, plural_key)
       [].tap do |array|
-        array << (value_from_singular_key(hash, singular_key) || value_from_plural_key(hash, plural_key))
+        value = value_from_singular_key(hash, singular_key)
+        value ||= value_from_plural_key(hash, plural_key)
+        array << value
       end.flatten.compact
     end
 
@@ -146,11 +134,13 @@ def parse_date(input, msg = "Input could not be parsed.")
     # Determines whether a given file has
     #
     # Returns true if the YAML front matter is present.
+    # rubocop: disable PredicateName
     def has_yaml_header?(file)
-      !!(File.open(file, 'rb') { |f| f.readline } =~ /\A---\s*\r?\n/)
+      !!(File.open(file, "rb", &:readline) =~ %r!\A---\s*\r?\n!)
     rescue EOFError
       false
     end
+    # rubocop: enable PredicateName
 
     # Slugify a filename or title.
     #
@@ -185,7 +175,7 @@ def has_yaml_header?(file)
     #
     # Returns the slugified string.
     def slugify(string, mode: nil, cased: false)
-      mode ||= 'default'
+      mode ||= "default"
       return nil if string.nil?
 
       unless SLUGIFY_MODES.include?(mode)
@@ -195,21 +185,21 @@ def slugify(string, mode: nil, cased: false)
       # Replace each character sequence with a hyphen
       re =
         case mode
-        when 'raw'
+        when "raw"
           SLUGIFY_RAW_REGEXP
-        when 'default'
+        when "default"
           SLUGIFY_DEFAULT_REGEXP
-        when 'pretty'
+        when "pretty"
           # "._~!$&'()+,;=@" is human readable (not URI-escaped) in URL
           # and is allowed in both extN and NTFS.
           SLUGIFY_PRETTY_REGEXP
         end
 
       # Strip according to the mode
-      slug = string.gsub(re, '-')
+      slug = string.gsub(re, "-")
 
       # Remove leading/trailing hyphen
-      slug.gsub!(/^\-|\-$/i, '')
+      slug.gsub!(%r!^\-|\-$!i, "")
 
       slug.downcase! unless cased
       slug
@@ -280,7 +270,7 @@ def add_permalink_suffix(template, permalink_style)
     # Returns matched pathes
     def safe_glob(dir, patterns, flags = 0)
       return [] unless Dir.exist?(dir)
-      pattern = File.join(Array patterns)
+      pattern = File.join(Array(patterns))
       return [dir] if pattern.empty?
       Dir.chdir(dir) do
         Dir.glob(pattern, flags).map { |f| File.join(dir, f) }
@@ -297,5 +287,36 @@ def merged_file_read_opts(site, opts)
       merged
     end
 
+    private
+    def merge_values(target, overwrite)
+      target.merge!(overwrite) do |_key, old_val, new_val|
+        if new_val.nil?
+          old_val
+        elsif mergable?(old_val) && mergable?(new_val)
+          deep_merge_hashes(old_val, new_val)
+        else
+          new_val
+        end
+      end
+    end
+
+    private
+    def merge_default_proc(target, overwrite)
+      if default_proc?(target) && default_proc?(overwrite) && target.default_proc.nil?
+        target.default_proc = overwrite.default_proc
+      end
+    end
+
+    private
+    def default_proc?(object)
+      object.respond_to?(:default_proc)
+    end
+
+    private
+    def duplicate_frozen_values(target)
+      target.each do |key, val|
+        target[key] = val.dup if val.frozen? && duplicable?(val)
+      end
+    end
   end
 end

From f6f0f483bf31527884a8de7f7daf2075c13d986d Mon Sep 17 00:00:00 2001
From: Sondre Nilsen 
Date: Tue, 21 Jun 2016 19:40:22 +0200
Subject: [PATCH 1051/4996] Add generator-jekyllized to third party plugins

---
 site/_docs/plugins.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 2dc2d2ba1d2..3969406845a 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -904,6 +904,7 @@ LESS.js files during generation.
 - [Hawkins](https://github.com/awood/hawkins): Adds a `liveserve` sub-command to Jekyll that incorporates [LiveReload](http://livereload.com/) into your pages while you preview them.  No more hitting the refresh button in your browser!
 - [Jekyll Autoprefixer](https://github.com/vwochnik/jekyll-autoprefixer): Autoprefixer integration for Jekyll
 - [Jekyll-breadcrumbs](https://github.com/git-no/jekyll-breadcrumbs): Creates breadcrumbs for Jekyll 3.x, includes features like SEO optimization, optional breadcrumb item translation and more.
+- [generator-jekyllized](https://github.com/sondr3/generator-jekyllized): A Yeoman generator for rapidly developing sites with Gulp. Live reload your site, automatically minify and optimize your assets and much more.
 
 #### Editors
 

From 1779aa681acbd43d19237506bd391c4968968c66 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 21 Jun 2016 10:57:15 -0700
Subject: [PATCH 1052/4996] Update history to reflect merge of #5027 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 75fcfacc525..45df5c4bb92 100644
--- a/History.markdown
+++ b/History.markdown
@@ -153,6 +153,7 @@
   * Windows docs: Command needs to be called from blog path (#5006)
   * Update text to be consitent with example (#5010)
   * Update template links to point to core Liquid site (#5012)
+  * Add generator-jekyllized to third-party plugins (#5027)
 
 ## 3.1.6 / 2016-05-19
 

From b539c32364d941e1f0b23de41b7367419191eb18 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 21 Jun 2016 14:20:18 -0700
Subject: [PATCH 1053/4996] Add a benchmark for capture vs. assign in Liquid.
 [ci skip]

---
 benchmark/capture-assign.rb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 benchmark/capture-assign.rb

diff --git a/benchmark/capture-assign.rb b/benchmark/capture-assign.rb
new file mode 100644
index 00000000000..8d3ac8fa63e
--- /dev/null
+++ b/benchmark/capture-assign.rb
@@ -0,0 +1,20 @@
+require "liquid"
+require "benchmark/ips"
+
+puts "Ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
+puts "Liquid #{Liquid::VERSION}"
+
+template1 = '{% capture foobar %}foo{{ bar }}{% endcapture %}{{ foo }}{{ foobar }}'
+template2 = '{% assign foobar = "foo" | append: bar %}{{ foobar }}'
+
+def render(template)
+    Liquid::Template.parse(template).render("bar" => "42")
+end
+
+puts render(template1)
+puts render(template2)
+
+Benchmark.ips do |x|
+  x.report('capture') { render(template1) }
+  x.report('assign')  { render(template2) }
+end

From 8a71f0f48efb4e12de86e05a65e5b14707d841eb Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 21 Jun 2016 14:21:15 -0700
Subject: [PATCH 1054/4996] Not homebrew, jekyll.

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

diff --git a/docs/avoiding-burnout.md b/docs/avoiding-burnout.md
index 8ca27bfe31b..f5625e6891e 100644
--- a/docs/avoiding-burnout.md
+++ b/docs/avoiding-burnout.md
@@ -4,7 +4,7 @@
 
 # 1. Use Jekyll
 
-Maintainers of Homebrew should be using it regularly. This is partly because you won't be a good maintainer unless you can put yourself in the shoes of our users but also because you may decide to stop using Jekyll and at that point you should also decide not to be a maintainer and find other things to work on.
+Maintainers of Jekyll should be using it regularly. This is partly because you won't be a good maintainer unless you can put yourself in the shoes of our users but also because you may decide to stop using Jekyll and at that point you should also decide not to be a maintainer and find other things to work on.
 
 # 2. No Guilt About Leaving
 

From 13d60c21e16db57fe8de5a7f6581bf1f8123cf3e Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 21 Jun 2016 14:42:47 -0700
Subject: [PATCH 1055/4996] Specify how the pending-feedback label works and
 flesh out Windows & automatic closure handling.

---
 docs/triaging-an-issue.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/triaging-an-issue.md b/docs/triaging-an-issue.md
index 436a89d0ec6..e7c5aef6f81 100644
--- a/docs/triaging-an-issue.md
+++ b/docs/triaging-an-issue.md
@@ -27,12 +27,18 @@ If you can't replicate the issue, post your replication steps which didn't work
 
 ### Supported Platform
 
-Is the author using a supported platform? We support the latest versions of macOS, most common distributions of Linux. If the author is using Windows, you can use the `@jekyll/windows` team to help you investigate, but ultimately it is not a supported platform.
+Is the author using a supported platform? We support the latest versions of macOS, and most common distributions of Linux.
+
+You may close the issue immediately if the author cannot reproduce the issue on a supported platform. For Windows-related problems, leave a comment letting the user know that Windows is not officially supported, but that they may absolutely continue using the issue to communicate with folks from `@jekyll/windows` to further investigate. Additionally, you can point them to Jekyll Talk (https://talk.jekyllrb.com) as a means of getting support from the community.
 
 If the user is experiencing issues with GitHub Pages or another hosted platform that we cannot reproduce, please direct them to the platform's support channel and close the issue.
 
 ### What they wanted vs. what they got
 
-An issue without a clear explanation of what the user got and what they were expecting to get is not an issue we can accurately respond to. If the user doesn't provide this information, please ask for clarification. This information helps us build test cases such that we do not break the behaviour again in the future.
+An issue without a clear explanation of what the user got and what they were expecting to get is not an issue we can accurately respond to. If the user doesn't provide this information, please ask for clarification and apply the `pending-feedback` label. This information helps us build test cases such that we do not break the behaviour again in the future. The `pending-feedback` label will be removed automatically once the issue author posts a reply.
 
 Is what they wanted to get something we want to happen? Sometimes a bug report is actually masquerading as a feature request. See the guidance above for handling feature requests.
+
+### Staleness and automatic closure
+
+@jekyllbot will automatically mark issues as `stale` if no  activity occurs for at least one month. @jekyllbot leaves a comment asking for information about reproducibility in current versions. If no one responds after another month, the issue is automatically closed.

From 0b169f77393ef320f2025c72f34d4ce60e5d4d50 Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Wed, 22 Jun 2016 14:15:13 +0300
Subject: [PATCH 1056/4996] rubocop: refactor modified? method

---
 lib/jekyll/regenerator.rb | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb
index b387732a1d1..4d89da2e0e8 100644
--- a/lib/jekyll/regenerator.rb
+++ b/lib/jekyll/regenerator.rb
@@ -90,7 +90,14 @@ def modified?(path)
         return cache[path]
       end
 
-      check_path_exists(path)
+      if metadata[path]
+        # If we have seen this file before,
+        # check if it or one of its dependencies has been modified
+        existing_file_modified?(path)
+      else
+        # If we have not seen this file before, add it to the metadata and regenerate it
+        add(path)
+      end
     end
 
     # Add a dependency of a path
@@ -170,25 +177,23 @@ def regenerate_document?(document)
         )
     end
 
-    # Private: Check path that exists in metadata
-    #
-    # Returns Boolean
     private
-    def check_path_exists(path)
-      data = metadata[path]
-      if data
-        data["deps"].each do |dependency|
-          if modified?(dependency)
-            return cache[dependency] = cache[path] = true
-          end
-        end
-        if File.exist?(path) && data["mtime"].eql?(File.mtime(path))
-          return cache[path] = false
+    def existing_file_modified?(path)
+      # If one of this file dependencies have been modified,
+      # set the regeneration bit for both the dependency and the file to true
+      metadata[path]["deps"].each do |dependency|
+        if modified?(dependency)
+          return cache[dependency] = cache[path] = true
         end
       end
 
-      # Path does not exist in metadata, add it
-      add(path)
+      if File.exist?(path) && metadata[path]["mtime"].eql?(File.mtime(path))
+        # If this file has not been modified, set the regeneration bit to false
+        cache[path] = false
+      else
+        # If it has been modified, set it to true
+        add(path)
+      end
     end
   end
 end

From 357e3621e2f3aaa0d31c0407f6d4886983561754 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 22 Jun 2016 10:05:59 -0700
Subject: [PATCH 1057/4996] Update history to reflect merge of #5026 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 45df5c4bb92..f092085d630 100644
--- a/History.markdown
+++ b/History.markdown
@@ -99,6 +99,7 @@
   * Fix rubocop offenses in exe/jekyll (#5017)
   * Rubocop: lib/jekyll/command.rb  (#5018)
   * rubocop: lib/jekyll/static_file.rb (#5019)
+  * rubocop: lib/jekyll/utils.rb (#5026)
 
 ### Site Enhancements
 

From 77751cbf156487e303855f25d0cf04d307d4cfc4 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 22 Jun 2016 10:11:59 -0700
Subject: [PATCH 1058/4996] Add 'special labels' to internal docs.

---
 docs/readme.md         |  1 +
 docs/special-labels.md | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 docs/special-labels.md

diff --git a/docs/readme.md b/docs/readme.md
index abf4290113a..f2cb1fed2b5 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -6,6 +6,7 @@ Hello! This is where we document various processes for maintaining Jekyll. Being
 2. [Reviewing a pull request](reviewing-a-pull-request.md)
 3. [Merging a pull request](merging-a-pull-request.md)
 4. [Avoiding burnout](avoiding-burnout.md)
+5. [Special Labels](special-labels.md)
 
 Interested in becoming a maintainer? Here is some documentation for **contributors**:
 
diff --git a/docs/special-labels.md b/docs/special-labels.md
new file mode 100644
index 00000000000..8ce525977e6
--- /dev/null
+++ b/docs/special-labels.md
@@ -0,0 +1,17 @@
+# Maintainers: Special Labels
+
+**This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
+
+We use a series of "special labels" on GitHub.com to automate handling of some parts of the pull request and issue process. @jekyllbot may automatically apply or remove certain labels based on actions taken by users or maintainers. Below are the labels and how they work:
+
+## `pending-feedback`
+
+This label is used to indicate that we need more information from the issue/PR author in order to continue. It may be that you need more info before you can properly triage a bug report, or that you have some unanswered questions about a PR that need to be resolved before moving forward. You can safely ignore any issue with this label, as it is waiting for feedback.
+
+## `needs-work` & `pending-rebase`
+
+These labels are used to indicate that the Git state of a pull request must change. Both are removed once a push is registered (a "synchronize" event for the pull request) and the pull request becomes mergable. Add `needs-work` to a PR if, after your review, it requires code changes. Add `pending-rebase` to a PR if the code is fine but the branch is not automatically mergable with the target branch (e.g. `master`).
+
+## `stale`
+
+This label is automatically added and removed by @jekyllbot based on activity on an issue or pull request. The rules for this label are laid out in [Triaging an Issue: Staleness and automatic closure](triaging-an-issue.md#staleness-and-automatic-closure).

From 856dbcb2de317a0c463e6ea0381403e60befaae9 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 22 Jun 2016 10:18:51 -0700
Subject: [PATCH 1059/4996] Add list of supported platforms 4 real.

---
 docs/triaging-an-issue.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/triaging-an-issue.md b/docs/triaging-an-issue.md
index e7c5aef6f81..a6f24447e73 100644
--- a/docs/triaging-an-issue.md
+++ b/docs/triaging-an-issue.md
@@ -27,7 +27,7 @@ If you can't replicate the issue, post your replication steps which didn't work
 
 ### Supported Platform
 
-Is the author using a supported platform? We support the latest versions of macOS, and most common distributions of Linux.
+Is the author using a supported platform? We support the latest versions of macOS, Ubuntu, Debian, CentOS, Fedora, and Arch Linux.
 
 You may close the issue immediately if the author cannot reproduce the issue on a supported platform. For Windows-related problems, leave a comment letting the user know that Windows is not officially supported, but that they may absolutely continue using the issue to communicate with folks from `@jekyll/windows` to further investigate. Additionally, you can point them to Jekyll Talk (https://talk.jekyllrb.com) as a means of getting support from the community.
 

From 9278eb8fcec85b17573c6658d7d67ef6ea6ffb92 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 22 Jun 2016 12:15:07 -0700
Subject: [PATCH 1060/4996] utils: check that the object is a hash when merging
 default_proc

Follow-up to #5026.
---
 lib/jekyll/utils.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index ca9e6fbad70..1f0af762edc 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -302,16 +302,11 @@ def merge_values(target, overwrite)
 
     private
     def merge_default_proc(target, overwrite)
-      if default_proc?(target) && default_proc?(overwrite) && target.default_proc.nil?
+      if target.is_a?(Hash) && overwrite.is_a?(Hash) && target.default_proc.nil?
         target.default_proc = overwrite.default_proc
       end
     end
 
-    private
-    def default_proc?(object)
-      object.respond_to?(:default_proc)
-    end
-
     private
     def duplicate_frozen_values(target)
       target.each do |key, val|

From 5312e85478c1051eac5734b1136918171b5f7d78 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 23 Jun 2016 09:32:14 -0700
Subject: [PATCH 1061/4996] Update history to reflect merge of #5025 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f092085d630..8ca2caaeeab 100644
--- a/History.markdown
+++ b/History.markdown
@@ -100,6 +100,7 @@
   * Rubocop: lib/jekyll/command.rb  (#5018)
   * rubocop: lib/jekyll/static_file.rb (#5019)
   * rubocop: lib/jekyll/utils.rb (#5026)
+  * rubocop: lib/jekyll/regenerator.rb (#5025)
 
 ### Site Enhancements
 

From 6dd3cc21c40b98054851846425af06c64f9fb466 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 23 Jun 2016 18:48:25 -0700
Subject: [PATCH 1062/4996] Update history to reflect merge of #5024 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8ca2caaeeab..07344883d22 100644
--- a/History.markdown
+++ b/History.markdown
@@ -101,6 +101,7 @@
   * rubocop: lib/jekyll/static_file.rb (#5019)
   * rubocop: lib/jekyll/utils.rb (#5026)
   * rubocop: lib/jekyll/regenerator.rb (#5025)
+  * rubocop: lib/jekyll/configuration.rb (#5024)
 
 ### Site Enhancements
 

From aeca7a195e83b1fc3440435001d6e206bb41b639 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 23 Jun 2016 19:00:29 -0700
Subject: [PATCH 1063/4996] Run the unit tests in jruby.

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 13c17f90550..57140623a67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,8 @@ matrix:
   include:
     - rvm: 2.3.0
       env: TEST_SUITE=fmt
+    - rvm: jruby-9.0.5.0
+      env: TEST_SUITE=test
 env:
   matrix:
     - TEST_SUITE=test

From 6f5ad2530e3e1dd028335ca10429516d10c52c26 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 23 Jun 2016 19:08:53 -0700
Subject: [PATCH 1064/4996] Only run tests with --profile when using MRI.

---
 script/rubies | 14 ++++++++++++++
 script/test   | 22 +++++++++++-----------
 2 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100755 script/rubies

diff --git a/script/rubies b/script/rubies
new file mode 100755
index 00000000000..fb00ac61fd8
--- /dev/null
+++ b/script/rubies
@@ -0,0 +1,14 @@
+#!/bin/bash
+# -----------------------------------------------------------------------------
+# If you send us a ruby then we use that, if you do not then we test with
+# whatever we can detect, this way you can run both suites when you test out
+# your source, we expect full coverage now, not just MRI.
+# -----------------------------------------------------------------------------
+
+rubies=()
+for r in jruby ruby; do
+  if which "$r" > /dev/null 2>&1
+  then
+    echo $r
+  fi
+done
diff --git a/script/test b/script/test
index 5aab2f06cca..133b9807657 100755
--- a/script/test
+++ b/script/test
@@ -31,26 +31,26 @@ then
 
   shift
 else
-  rubies=()
-  for r in jruby ruby; do
-    if which "$r"
-    then
-      rubies+=(
-        $r
-      )
-    fi
-  done
+  rubies=($(script/rubies))
 fi
 
+
 for ruby in $rubies; do
+  if [[ "$ruby" == "jruby" ]]
+  then
+    testopts=""
+  else
+    testopts="--profile"
+  fi
+
   if [[ $# -lt 1 ]]
   then
     set -x
     time $ruby -S bundle exec \
-      rake TESTOPTS='--profile' test
+      rake TESTOPTS=$testopts test
    else
     set -x
     time $ruby -S bundle exec ruby -Itest \
-      "$@" --profile
+      "$@" $testops
   fi
 done

From b156aa912a0d36ea9d315ee02154511ccf6ed732 Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Sat, 25 Jun 2016 14:56:12 +0300
Subject: [PATCH 1065/4996] rubocop: fix code style

---
 lib/jekyll/document.rb | 101 +++++++++++++++++++++--------------------
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index cc0e91b24d3..6703a613cbe 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -7,9 +7,9 @@ class Document
     attr_reader :path, :site, :extname, :collection
     attr_accessor :content, :output
 
-    YAML_FRONT_MATTER_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
-    DATELESS_FILENAME_MATCHER = /^(.+\/)*(.*)(\.[^.]+)$/
-    DATE_FILENAME_MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$/
+    YAML_FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m
+    DATELESS_FILENAME_MATCHER = %r!^(?:.+/)*(.*)(\.[^.]+)$!
+    DATE_FILENAME_MATCHER = %r!^(?:.+/)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$!
 
     # Create a new Document.
     #
@@ -51,16 +51,16 @@ def data
     #
     # Returns the merged data.
     def merge_data!(other, source: "YAML front matter")
-      if other.key?('categories') && !other['categories'].nil?
-        if other['categories'].is_a?(String)
-          other['categories'] = other['categories'].split(" ").map(&:strip)
+      if other.key?("categories") && !other["categories"].nil?
+        if other["categories"].is_a?(String)
+          other["categories"] = other["categories"].split(" ").map(&:strip)
         end
-        other['categories'] = (data['categories'] || []) | other['categories']
+        other["categories"] = (data["categories"] || []) | other["categories"]
       end
       Utils.deep_merge_hashes!(data, other)
-      if data.key?('date') && !data['date'].is_a?(Time)
-        data['date'] = Utils.parse_date(
-          data['date'].to_s,
+      if data.key?("date") && !data["date"].is_a?(Time)
+        data["date"] = Utils.parse_date(
+          data["date"].to_s,
           "Document '#{relative_path}' does not have a valid date in the #{source}."
         )
       end
@@ -68,7 +68,7 @@ def merge_data!(other, source: "YAML front matter")
     end
 
     def date
-      data['date'] ||= (draft? ? source_file_mtime : site.time)
+      data["date"] ||= (draft? ? source_file_mtime : site.time)
     end
 
     def source_file_mtime
@@ -81,7 +81,8 @@ def source_file_mtime
     #
     # Returns whether the document is a draft.
     def draft?
-      data['draft'] ||= relative_path.index(collection.relative_directory).nil? && collection.label == "posts"
+      data["draft"] ||= relative_path.index(collection.relative_directory).nil? &&
+        collection.label == "posts"
     end
 
     # The path to the document, relative to the site source.
@@ -89,7 +90,8 @@ def draft?
     # Returns a String path which represents the relative path
     #   from the site source to this document
     def relative_path
-      @relative_path ||= Pathname.new(path).relative_path_from(Pathname.new(site.source)).to_s
+      @relative_path ||= Pathname.new(path)
+        .relative_path_from(Pathname.new(site.source)).to_s
     end
 
     # The output extension of the document.
@@ -103,7 +105,7 @@ def output_ext
     #
     # Returns the basename without the file extname.
     def basename_without_ext
-      @basename_without_ext ||= File.basename(path, '.*')
+      @basename_without_ext ||= File.basename(path, ".*")
     end
 
     # The base filename of the document.
@@ -156,7 +158,7 @@ def sass_file?
     #
     # Returns true if extname == .coffee, false otherwise.
     def coffeescript_file?
-      '.coffee'.eql?(extname)
+      ".coffee" == extname
     end
 
     # Determine whether the file should be rendered with Liquid.
@@ -195,7 +197,7 @@ def url_placeholders
     #
     # Returns the permalink or nil if no permalink was set in the data.
     def permalink
-      data && data.is_a?(Hash) && data['permalink']
+      data && data.is_a?(Hash) && data["permalink"]
     end
 
     # The computed URL for the document. See `Jekyll::URL#to_s` for more details.
@@ -203,9 +205,9 @@ def permalink
     # Returns the computed URL for the document.
     def url
       @url = URL.new({
-        :template => url_template,
+        :template     => url_template,
         :placeholders => url_placeholders,
-        :permalink => permalink
+        :permalink    => permalink
       }).to_s
     end
 
@@ -237,18 +239,17 @@ def destination(base_directory)
     def write(dest)
       path = destination(dest)
       FileUtils.mkdir_p(File.dirname(path))
-      File.open(path, 'wb') do |f|
-        f.write(output)
-      end
+      File.write(path, output, :mode => "wb")
 
       trigger_hooks(:post_write)
     end
 
     # Whether the file is published or not, as indicated in YAML front-matter
     #
-    # Returns true if the 'published' key is specified in the YAML front-matter and not `false`.
+    # Returns 'false' if the 'published' key is specified in the
+    # YAML front-matter and is 'false'. Otherwise returns 'true'.
     def published?
-      !(data.key?('published') && data['published'] == false)
+      !(data.key?("published") && data["published"] == false)
     end
 
     # Read in the file and assign the content and data based on the file contents.
@@ -263,23 +264,24 @@ def read(opts = {})
         @data = SafeYAML.load_file(path)
       else
         begin
-          defaults = @site.frontmatter_defaults.all(relative_path, collection.label.to_sym)
-          merge_data!(defaults, source: "front matter defaults") unless defaults.empty?
+          defaults = @site.frontmatter_defaults.all(
+            relative_path,
+            collection.label.to_sym
+          )
+          merge_data!(defaults, :source => "front matter defaults") unless defaults.empty?
 
           self.content = File.read(path, Utils.merged_file_read_opts(site, opts))
           if content =~ YAML_FRONT_MATTER_REGEXP
             self.content = $POSTMATCH
             data_file = SafeYAML.load(Regexp.last_match(1))
-            merge_data!(data_file, source: "YAML front matter") if data_file
+            merge_data!(data_file, :source => "YAML front matter") if data_file
           end
 
           post_read
         rescue SyntaxError => e
           Jekyll.logger.error "Error:", "YAML Exception reading #{path}: #{e.message}"
-        rescue Exception => e
-          if e.is_a? Jekyll::Errors::FatalException
-            raise e
-          end
+        rescue => e
+          raise e if e.is_a? Jekyll::Errors::FatalException
           Jekyll.logger.error "Error:", "could not read file #{path}: #{e.message}"
         end
       end
@@ -287,19 +289,19 @@ def read(opts = {})
 
     def post_read
       if relative_path =~ DATE_FILENAME_MATCHER
-        date, slug, ext = $2, $3, $4
-        if !data['date'] || data['date'].to_i == site.time.to_i
-          merge_data!({"date" => date}, source: "filename")
+        date, slug, ext = Regexp.last_match.captures
+        if !data["date"] || data["date"].to_i == site.time.to_i
+          merge_data!({ "date" => date }, :source => "filename")
         end
       elsif relative_path =~ DATELESS_FILENAME_MATCHER
-        slug, ext = $2, $3
+        slug, ext = Regexp.last_match.captures
       end
 
       # Try to ensure the user gets a title.
       data["title"] ||= Utils.titleize_slug(slug)
       # Only overwrite slug & ext if they aren't specified.
-      data['slug'] ||= slug
-      data['ext']  ||= ext
+      data["slug"] ||= slug
+      data["ext"]  ||= ext
 
       populate_categories
       populate_tags
@@ -312,16 +314,19 @@ def post_read
     #
     # Returns nothing.
     def categories_from_path(special_dir)
-      superdirs = relative_path.sub(/#{special_dir}(.*)/, '').split(File::SEPARATOR).reject do |c|
+      superdirs = relative_path.sub(%r!#{special_dir}(.*)!, "")
+        .split(File::SEPARATOR)
+        .reject do |c|
         c.empty? || c.eql?(special_dir) || c.eql?(basename)
       end
-      merge_data!({ 'categories' => superdirs }, source: "file path")
+      merge_data!({ "categories" => superdirs }, :source => "file path")
     end
 
     def populate_categories
       merge_data!({
-        'categories' => (
-          Array(data['categories']) + Utils.pluralized_array_from_hash(data, 'category', 'categories')
+        "categories" => (
+          Array(data["categories"]) +
+          Utils.pluralized_array_from_hash(data, "category", "categories")
         ).map(&:to_s).flatten.uniq
       })
     end
@@ -351,7 +356,7 @@ def inspect
     #
     # Returns the content of the document
     def to_s
-      output || content || 'NO CONTENT'
+      output || content || "NO CONTENT"
     end
 
     # Compare this document against another document.
@@ -361,7 +366,7 @@ def to_s
     #   equal or greater than the other doc's path. See String#<=> for more details.
     def <=>(other)
       return nil unless other.respond_to?(:data)
-      cmp = data['date'] <=> other.data['date']
+      cmp = data["date"] <=> other.data["date"]
       cmp = path <=> other.path if cmp.nil? || cmp == 0
       cmp
     end
@@ -380,7 +385,7 @@ def write?
     #
     # Returns the document excerpt_separator
     def excerpt_separator
-      (data['excerpt_separator'] || site.config['excerpt_separator']).to_s
+      (data["excerpt_separator"] || site.config["excerpt_separator"]).to_s
     end
 
     # Whether to generate an excerpt
@@ -394,8 +399,6 @@ def next_doc
       pos = collection.docs.index { |post| post.equal?(self) }
       if pos && pos < collection.docs.length - 1
         collection.docs[pos + 1]
-      else
-        nil
       end
     end
 
@@ -403,8 +406,6 @@ def previous_doc
       pos = collection.docs.index { |post| post.equal?(self) }
       if pos && pos > 0
         collection.docs[pos - 1]
-      else
-        nil
       end
     end
 
@@ -414,7 +415,7 @@ def trigger_hooks(hook_name, *args)
     end
 
     def id
-      @id ||= File.join(File.dirname(url), (data['slug'] || basename_without_ext).to_s)
+      @id ||= File.join(File.dirname(url), (data["slug"] || basename_without_ext).to_s)
     end
 
     # Calculate related posts.
@@ -433,8 +434,8 @@ def respond_to?(method, include_private = false)
     # Override of method_missing to check in @data for the key.
     def method_missing(method, *args, &blck)
       if data.key?(method.to_s)
-        Jekyll.logger.warn "Deprecation:", "Document##{method} is now a key in the #data hash."
-        Jekyll.logger.warn "", "Called by #{caller.first}."
+        Jekyll::Deprecator.deprecation_message "Document##{method} is now a key "\
+                           "in the #data hash. Called by #{caller.first}."
         data[method.to_s]
       else
         super

From 2bbad7cb43f9594a937b7b66b296cc1aba471bbc Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Sat, 25 Jun 2016 15:11:50 +0300
Subject: [PATCH 1066/4996] rubocop: fix code style

---
 lib/jekyll/convertible.rb | 50 +++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index a5d356071f1..bfb80c7a74b 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'set'
+require "set"
 
 # Convertible provides methods for converting a pagelike item
 # from a certain type of markup into actual content
@@ -20,12 +20,12 @@ module Jekyll
   module Convertible
     # Returns the contents as a String.
     def to_s
-      content || ''
+      content || ""
     end
 
     # Whether the file is published or not, as indicated in YAML front-matter
     def published?
-      !(data.key?('published') && data['published'] == false)
+      !(data.key?("published") && data["published"] == false)
     end
 
     # Read the YAML frontmatter.
@@ -47,7 +47,7 @@ def read_yaml(base, name, opts = {})
         end
       rescue SyntaxError => e
         Jekyll.logger.warn "YAML Exception reading #{filename}: #{e.message}"
-      rescue Exception => e
+      rescue => e
         Jekyll.logger.warn "Error reading file #{filename}: #{e.message}"
       end
 
@@ -61,12 +61,13 @@ def read_yaml(base, name, opts = {})
 
     def validate_data!(filename)
       unless self.data.is_a?(Hash)
-        raise Errors::InvalidYAMLFrontMatterError, "Invalid YAML front matter in #{filename}"
+        raise Errors::InvalidYAMLFrontMatterError,
+          "Invalid YAML front matter in #{filename}"
       end
     end
 
     def validate_permalink!(filename)
-      if self.data['permalink'] && self.data['permalink'].size == 0
+      if self.data["permalink"] && self.data["permalink"].empty?
         raise Errors::InvalidPermalinkError, "Invalid permalink in #{filename}"
       end
     end
@@ -79,7 +80,10 @@ def transform
         begin
           converter.convert output
         rescue => e
-          Jekyll.logger.error "Conversion error:", "#{converter.class} encountered an error while converting '#{path}':"
+          Jekyll.logger.error(
+            "Conversion error:",
+            "#{converter.class} encountered an error while converting '#{path}':"
+          )
           Jekyll.logger.error("", e.to_s)
           raise e
         end
@@ -112,12 +116,17 @@ def converters
     def render_liquid(content, payload, info, path)
       site.liquid_renderer.file(path).parse(content).render!(payload, info)
     rescue Tags::IncludeTagError => e
-      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{e.path}, included in #{path || self.path}"
+      Jekyll.logger.error(
+        "Liquid Exception:",
+        "#{e.message} in #{e.path}, included in #{path || self.path}"
+      )
       raise e
+    # rubocop: disable RescueException
     rescue Exception => e
       Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{path || self.path}"
       raise e
     end
+    # rubocop: enable RescueException
 
     # Convert this Convertible's data to a Hash suitable for use by Liquid.
     #
@@ -168,7 +177,7 @@ def sass_file?
     #
     # Returns true if extname == .coffee, false otherwise.
     def coffeescript_file?
-      '.coffee'.eql?(ext)
+      ".coffee" == ext
     end
 
     # Determine whether the file should be rendered with Liquid.
@@ -205,7 +214,10 @@ def render_all_layouts(layouts, payload, info)
       # recursively render layouts
       layout = layouts[data["layout"]]
 
-      Jekyll.logger.warn("Build Warning:", "Layout '#{data["layout"]}' requested in #{path} does not exist.") if invalid_layout? layout
+      Jekyll.logger.warn(
+        "Build Warning:",
+        "Layout '#{data["layout"]}' requested in #{path} does not exist."
+      ) if invalid_layout? layout
 
       used = Set.new([layout])
 
@@ -228,12 +240,9 @@ def render_all_layouts(layouts, payload, info)
           site.in_source_dir(layout.path)
         )
 
-        if layout = layouts[layout.data["layout"]]
-          if used.include?(layout)
-            layout = nil # avoid recursive chain
-          else
-            used << layout
-          end
+        if (layout = layouts[layout.data["layout"]])
+          break if used.include?(layout)
+          used << layout
         end
       end
     end
@@ -249,7 +258,10 @@ def do_layout(payload, layouts)
 
       Jekyll.logger.debug "Pre-Render Hooks:", self.relative_path
       Jekyll::Hooks.trigger hook_owner, :pre_render, self, payload
-      info = { :filters => [Jekyll::Filters], :registers => { :site => site, :page => payload["page"] } }
+      info = {
+        :filters   => [Jekyll::Filters],
+        :registers => { :site => site, :page => payload["page"] }
+      }
 
       # render and transform content (this becomes the final content of the object)
       payload["highlighter_prefix"] = converters.first.highlighter_prefix
@@ -278,9 +290,7 @@ def do_layout(payload, layouts)
     def write(dest)
       path = destination(dest)
       FileUtils.mkdir_p(File.dirname(path))
-      File.open(path, 'wb') do |f|
-        f.write(output)
-      end
+      File.write(path, output, :mode => "wb")
       Jekyll::Hooks.trigger hook_owner, :post_write, self
     end
 

From 3ccc91430f61374efa0045d6b187d27b9b263e7f Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Sat, 25 Jun 2016 15:22:36 +0300
Subject: [PATCH 1067/4996] rubocop: fix code style

---
 lib/jekyll/renderer.rb | 45 ++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index 87f327d6c67..143fe73eefb 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -38,21 +38,21 @@ def run
         payload["paginator"] = document.pager.to_liquid
       end
 
-      if document.is_a?(Document) && document.collection.label == 'posts'
-        payload['site']['related_posts'] = document.related_posts
+      if document.is_a?(Document) && document.collection.label == "posts"
+        payload["site"]["related_posts"] = document.related_posts
       else
-        payload['site']['related_posts'] = nil
+        payload["site"]["related_posts"] = nil
       end
 
       # render and transform content (this becomes the final content of the object)
-      payload['highlighter_prefix'] = converters.first.highlighter_prefix
-      payload['highlighter_suffix'] = converters.first.highlighter_suffix
+      payload["highlighter_prefix"] = converters.first.highlighter_prefix
+      payload["highlighter_suffix"] = converters.first.highlighter_suffix
 
       Jekyll.logger.debug "Pre-Render Hooks:", document.relative_path
       document.trigger_hooks(:pre_render, payload)
 
       info = {
-        :registers => { :site => site, :page => payload['page'] }
+        :registers => { :site => site, :page => payload["page"] }
       }
 
       output = document.content
@@ -88,7 +88,9 @@ def convert(content)
         begin
           converter.convert output
         rescue => e
-          Jekyll.logger.error "Conversion error:", "#{converter.class} encountered an error while converting '#{document.relative_path}':"
+          Jekyll.logger.error "Conversion error:",
+            "#{converter.class} encountered an error while "\
+            "converting '#{document.relative_path}':"
           Jekyll.logger.error("", e.to_s)
           raise e
         end
@@ -106,12 +108,16 @@ def convert(content)
     def render_liquid(content, payload, info, path = nil)
       site.liquid_renderer.file(path).parse(content).render!(payload, info)
     rescue Tags::IncludeTagError => e
-      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{e.path}, included in #{path || document.relative_path}"
+      Jekyll.logger.error "Liquid Exception:",
+        "#{e.message} in #{e.path}, included in #{path || document.relative_path}"
       raise e
+    # rubocop: disable RescueException
     rescue Exception => e
-      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{path || document.relative_path}"
+      Jekyll.logger.error "Liquid Exception:",
+        "#{e.message} in #{path || document.relative_path}"
       raise e
     end
+    # rubocop: enable RescueException
 
     # Checks if the layout specified in the document actually exists
     #
@@ -132,16 +138,20 @@ def place_in_layouts(content, payload, info)
       output = content.dup
       layout = site.layouts[document.data["layout"]]
 
-      Jekyll.logger.warn("Build Warning:", "Layout '#{document.data["layout"]}' requested in #{document.relative_path} does not exist.") if invalid_layout? layout
+      Jekyll.logger.warn(
+        "Build Warning:",
+        "Layout '#{document.data["layout"]}' requested in "\
+        "#{document.relative_path} does not exist."
+      ) if invalid_layout? layout
 
-      used   = Set.new([layout])
+      used = Set.new([layout])
 
       # Reset the payload layout data to ensure it starts fresh for each page.
       payload["layout"] = nil
 
       while layout
-        payload['content'] = output
-        payload['layout']  = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
+        payload["content"] = output
+        payload["layout"]  = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
 
         output = render_liquid(
           layout.content,
@@ -156,12 +166,9 @@ def place_in_layouts(content, payload, info)
           site.in_source_dir(layout.path)
         ) if document.write?
 
-        if layout = site.layouts[layout.data["layout"]]
-          if used.include?(layout)
-            layout = nil # avoid recursive chain
-          else
-            used << layout
-          end
+        if (layout = site.layouts[layout.data["layout"]])
+          break if used.include?(layout)
+          used << layout
         end
       end
 

From 6ddd64d4c4469ed6a056a13a5d5e7c41233dd59f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 25 Jun 2016 14:46:32 -0700
Subject: [PATCH 1068/4996] Update history to reflect merge of #5032 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 07344883d22..df8ffeb5a72 100644
--- a/History.markdown
+++ b/History.markdown
@@ -102,6 +102,7 @@
   * rubocop: lib/jekyll/utils.rb (#5026)
   * rubocop: lib/jekyll/regenerator.rb (#5025)
   * rubocop: lib/jekyll/configuration.rb (#5024)
+  * rubocop: lib/jekyll/renderer.rb style fixes (#5032)
 
 ### Site Enhancements
 

From 390c98045c1c93a21cd026173605bae5c00d7203 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 25 Jun 2016 14:47:30 -0700
Subject: [PATCH 1069/4996] Update history to reflect merge of #5031 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index df8ffeb5a72..26abe6e3eca 100644
--- a/History.markdown
+++ b/History.markdown
@@ -103,6 +103,7 @@
   * rubocop: lib/jekyll/regenerator.rb (#5025)
   * rubocop: lib/jekyll/configuration.rb (#5024)
   * rubocop: lib/jekyll/renderer.rb style fixes (#5032)
+  * rubocop: lib/jekyll/convertible.rb style fixes (#5031)
 
 ### Site Enhancements
 

From 8154eb40aa6c93c5a8c6c31446618f0655ec5ed7 Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Sun, 26 Jun 2016 16:43:56 +0200
Subject: [PATCH 1070/4996] rubocop: separate deprecator error messages

---
 lib/jekyll/document.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 6703a613cbe..e160e64009e 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -435,7 +435,8 @@ def respond_to?(method, include_private = false)
     def method_missing(method, *args, &blck)
       if data.key?(method.to_s)
         Jekyll::Deprecator.deprecation_message "Document##{method} is now a key "\
-                           "in the #data hash. Called by #{caller.first}."
+                           "in the #data hash."
+        Jekyll::Deprecator.deprecation_message "Called by #{caller.first}."
         data[method.to_s]
       else
         super

From 18a8b4dcc7925208135685b601d59b2b6128481a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 27 Jun 2016 09:48:48 -0700
Subject: [PATCH 1071/4996] Update history to reflect merge of #5030 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 26abe6e3eca..a6a8d81887b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -104,6 +104,7 @@
   * rubocop: lib/jekyll/configuration.rb (#5024)
   * rubocop: lib/jekyll/renderer.rb style fixes (#5032)
   * rubocop: lib/jekyll/convertible.rb style fixes (#5031)
+  * rubocop: lib/jekyll/document.rb style fixes (#5030)
 
 ### Site Enhancements
 

From 3a76ddf7a207a0d1048f8d363803c92e59d7a8a5 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 28 Jun 2016 12:38:46 -0700
Subject: [PATCH 1072/4996] script/fmt: print Rubocop version

---
 script/fmt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/fmt b/script/fmt
index 360b6e53419..e9f9d9fb0a5 100755
--- a/script/fmt
+++ b/script/fmt
@@ -1,3 +1,3 @@
 #!/bin/sh
-
+bundle exec rubocop --version
 bundle exec rubocop -D $@

From 12c1ada0e582a37427761fec0f9917ca975c317d Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 28 Jun 2016 12:43:15 -0700
Subject: [PATCH 1073/4996] test: skip openssl test for jruby

---
 test/test_commands_serve.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb
index 50fe9f8357e..244ca444f01 100644
--- a/test/test_commands_serve.rb
+++ b/test/test_commands_serve.rb
@@ -114,6 +114,8 @@ def custom_opts(what)
         end
 
         should "allow SSL with a key and cert" do
+          skip "JRuby does not have OpenSSL bindings." if jruby?
+
           expect(OpenSSL::PKey::RSA).to receive(:new).and_return("c2")
           expect(OpenSSL::X509::Certificate).to receive(:new).and_return("c1")
           allow(File).to receive(:read).and_return("foo")

From 89c6b0ec0de27e7b99c53fb6e2f27258cbea1d6a Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 28 Jun 2016 12:43:34 -0700
Subject: [PATCH 1074/4996] travis: do not run 'bundle update' any longer.

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 57140623a67..f33cba09c11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-before_script: bundle update
 bundler_args: --without benchmark:site:development
 script: script/cibuild
 cache: bundler

From 2ef70fd34860e0c067117c5fdd587d6eb9b06664 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 28 Jun 2016 14:39:06 -0700
Subject: [PATCH 1075/4996] Some weird stuff with Colorator on my machine &
 jruby.

---
 test/test_configuration.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index eddb2c96d0d..0e0a69c7052 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -1,4 +1,5 @@
 require "helper"
+require "colorator"
 
 class TestConfiguration < JekyllUnitTest
   test_config = {
@@ -260,7 +261,9 @@ class TestConfiguration < JekyllUnitTest
       allow(SafeYAML).to receive(:load_file).with(@path) do
         raise SystemCallError, "No such file or directory - #{@path}"
       end
-      allow($stderr).to receive(:puts).with("Configuration file: none".yellow)
+      allow($stderr).to receive(:puts).with(
+        Colorator.yellow("Configuration file: none")
+      )
       assert_equal site_configuration, Jekyll.configuration(test_config)
     end
 
@@ -275,13 +278,12 @@ class TestConfiguration < JekyllUnitTest
       allow($stderr)
         .to receive(:puts)
         .and_return(
-          ("WARNING: "
-             .rjust(20) + "Error reading configuration. Using defaults (and options).")
-              .yellow
+          "WARNING: ".rjust(20) +
+          Colorator.yellow("Error reading configuration. Using defaults (and options).")
         )
       allow($stderr)
         .to receive(:puts)
-        .and_return("Configuration file: (INVALID) #{@path}".yellow)
+        .and_return(Colorator.yellow("Configuration file: (INVALID) #{@path}"))
       assert_equal site_configuration, Jekyll.configuration(test_config)
     end
 
@@ -291,10 +293,10 @@ class TestConfiguration < JekyllUnitTest
       end
       allow($stderr)
         .to receive(:puts)
-        .with((
+        .with(Colorator.red(
           "Fatal: ".rjust(20) + \
           "The configuration file '#{@user_config}' could not be found."
-        ).red)
+        ))
       assert_raises LoadError do
         Jekyll.configuration({ "config" => [@user_config] })
       end

From 6f3c01ca8772434f8e205bd7c06c0750233cec92 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 28 Jun 2016 18:30:02 -0700
Subject: [PATCH 1076/4996] Fix for jruby

---
 Gemfile                     | 2 ++
 test/test_commands_serve.rb | 3 +--
 test/test_utils.rb          | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 253826aa58f..3dc758eff61 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,6 +23,8 @@ group :test do
   gem "nokogiri"
   gem "rspec"
   gem "test-theme", path: File.expand_path("./test/fixtures/test-theme", File.dirname(__FILE__))
+
+  gem "jruby-openssl" if RUBY_ENGINE == "jruby"
 end
 
 #
diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb
index 244ca444f01..f129a07ece2 100644
--- a/test/test_commands_serve.rb
+++ b/test/test_commands_serve.rb
@@ -1,6 +1,7 @@
 require "webrick"
 require "mercenary"
 require "helper"
+require "openssl"
 
 class TestCommandsServe < JekyllUnitTest
   def custom_opts(what)
@@ -114,8 +115,6 @@ def custom_opts(what)
         end
 
         should "allow SSL with a key and cert" do
-          skip "JRuby does not have OpenSSL bindings." if jruby?
-
           expect(OpenSSL::PKey::RSA).to receive(:new).and_return("c2")
           expect(OpenSSL::X509::Certificate).to receive(:new).and_return("c1")
           allow(File).to receive(:read).and_return("foo")
diff --git a/test/test_utils.rb b/test/test_utils.rb
index e2a50c58332..5fbb99fcada 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -320,7 +320,7 @@ class TestUtils < JekyllUnitTest
   context "The \`Utils.safe_glob\` method" do
     should "not apply pattern to the dir" do
       dir = "test/safe_glob_test["
-      assert_equal [], Dir.glob(dir + "/*")
+      assert_equal [], Dir.glob(dir + "/*") unless jruby?
       assert_equal ["test/safe_glob_test[/find_me.txt"], Utils.safe_glob(dir, "*")
     end
 

From a7d25ed9631f319fbbb27a3b6ec7a23e25e32046 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 28 Jun 2016 22:08:06 -0700
Subject: [PATCH 1077/4996] Fix rubocop offenses on master.

---
 exe/jekyll                 | 2 +-
 lib/jekyll/entry_filter.rb | 2 +-
 test/test_filters.rb       | 2 +-
 test/test_kramdown.rb      | 2 +-
 test/test_page.rb          | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/exe/jekyll b/exe/jekyll
index 997c64b0155..c233dd1ad47 100755
--- a/exe/jekyll
+++ b/exe/jekyll
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 STDOUT.sync = true
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w( .. lib )))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w(.. lib)))
 
 require "jekyll"
 require "mercenary"
diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb
index 9ec02dd4b09..6063607edfe 100644
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -2,7 +2,7 @@ module Jekyll
   class EntryFilter
     attr_reader :site
     SPECIAL_LEADING_CHARACTERS = [
-      ".", "_", '#', "~"
+      ".", "_", "#", "~"
     ].freeze
 
     def initialize(site, base_directory = nil)
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 1a9c7882a92..fa0f9e52180 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -22,7 +22,7 @@ def initialize(opts = {})
         "destination" => dest_dir,
         "timezone"    => "UTC"
       })
-      @sample_time = Time.utc(2013, 03, 27, 11, 22, 33)
+      @sample_time = Time.utc(2013, 3, 27, 11, 22, 33)
       @sample_date = Date.parse("2013-03-27")
       @time_as_string = "September 11, 2001 12:46:30 -0000"
       @time_as_numeric = 1_399_680_607
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index e8d494ae217..0a6332f8bdd 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -28,7 +28,7 @@ class TestKramdown < JekyllUnitTest
     end
 
     should "run Kramdown" do
-      assert_equal "
    Some Header
    ", @markdown.convert('# Some Header #').strip
+      assert_equal "
    Some Header
    ", @markdown.convert("# Some Header #").strip
     end
 
     context "when asked to convert smart quotes" do
diff --git a/test/test_page.rb b/test/test_page.rb
index 9b27af7f13a..ba79514e8f2 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -39,7 +39,7 @@ def do_render(page)
       end
 
       should "create url with non-alphabetic characters" do
-        @page = setup_page("+", '%# +.md')
+        @page = setup_page("+", "%# +.md")
         assert_equal "/+/%25%23%20+.html", @page.url
       end
 
@@ -268,12 +268,12 @@ def do_render(page)
       end
 
       should "write even when permalink has '%# +'" do
-        page = setup_page("+", '%# +.md')
+        page = setup_page("+", "%# +.md")
         do_render(page)
         page.write(dest_dir)
 
         assert File.directory?(dest_dir)
-        assert_exist dest_dir("+", '%# +.html')
+        assert_exist dest_dir("+", "%# +.html")
       end
 
       should "write properly without html extension" do

From a072e9d25f3fcb83382cf92d9c2498c6bf37962d Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 29 Jun 2016 00:55:11 -0700
Subject: [PATCH 1078/4996] Ping our Travis overlords.


From 70aa8a4e37cdbb935d8aacda3d6c6b598c2c91bb Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 29 Jun 2016 12:18:41 -0700
Subject: [PATCH 1079/4996] Update history to reflect merge of #5015 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a6a8d81887b..4be8a5559e2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -105,6 +105,7 @@
   * rubocop: lib/jekyll/renderer.rb style fixes (#5032)
   * rubocop: lib/jekyll/convertible.rb style fixes (#5031)
   * rubocop: lib/jekyll/document.rb style fixes (#5030)
+  * Remove ruby-head from Travis matrix & fix jruby failures (#5015)
 
 ### Site Enhancements
 

From 5a1a7e1056a3e9c19ad2f47614068d1034fae6dd Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 29 Jun 2016 14:13:09 -0700
Subject: [PATCH 1080/4996] Remove the plugin_theme metadata field. Not useful.

---
 lib/theme_template/theme.gemspec.erb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/theme_template/theme.gemspec.erb b/lib/theme_template/theme.gemspec.erb
index 1c3b7ee462f..13d795ce16e 100644
--- a/lib/theme_template/theme.gemspec.erb
+++ b/lib/theme_template/theme.gemspec.erb
@@ -10,8 +10,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = "TODO: Put your gem's website or public repo URL here."
   spec.license       = "MIT"
 
-  spec.metadata["plugin_type"] = "theme"
-
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(exe|<%= theme_directories.join("|") %>)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

From 4b7109d2735905491c3c31bf0a698cba0cafdf05 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 29 Jun 2016 14:15:02 -0700
Subject: [PATCH 1081/4996] Themes won't have executables.

---
 lib/theme_template/theme.gemspec.erb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/theme_template/theme.gemspec.erb b/lib/theme_template/theme.gemspec.erb
index 13d795ce16e..dac6ed39bfd 100644
--- a/lib/theme_template/theme.gemspec.erb
+++ b/lib/theme_template/theme.gemspec.erb
@@ -10,9 +10,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "TODO: Put your gem's website or public repo URL here."
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(exe|<%= theme_directories.join("|") %>)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(<%= theme_directories.join("|") %>)/}) }
 
   spec.add_development_dependency "jekyll", "~> <%= jekyll_version_with_minor %>"
   spec.add_development_dependency "bundler", "~> 1.12"

From 0599f114d6cf951888b5f68e27e8609a8a5a4edc Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 29 Jun 2016 15:11:52 -0700
Subject: [PATCH 1082/4996] Only add a CODE_OF_CONDUCT.md file if specified.

---
 lib/jekyll/commands/new_theme.rb | 11 +++++++----
 lib/jekyll/theme_builder.rb      |  9 ++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/jekyll/commands/new_theme.rb b/lib/jekyll/commands/new_theme.rb
index 08eb4291a44..a703ca852c1 100644
--- a/lib/jekyll/commands/new_theme.rb
+++ b/lib/jekyll/commands/new_theme.rb
@@ -6,20 +6,23 @@ def init_with_program(prog)
       prog.command(:"new-theme") do |c|
         c.syntax "new-theme NAME"
         c.description "Creates a new Jekyll theme scaffold"
+        c.option "code_of_conduct", \
+          "-c", "--code-of-conduct", \
+          "Include a Code of Conduct. (defaults to false)"
 
-        c.action do |args, _|
-          Jekyll::Commands::NewTheme.process(args)
+        c.action do |args, opts|
+          Jekyll::Commands::NewTheme.process(args, opts)
         end
       end
     end
 
-    def process(args)
+    def process(args, opts)
       if !args || args.empty?
         raise Jekyll::Errors::InvalidThemeName, "You must specify a theme name."
       end
 
       new_theme_name = args.join("_")
-      theme = Jekyll::ThemeBuilder.new(new_theme_name)
+      theme = Jekyll::ThemeBuilder.new(new_theme_name, opts)
       if theme.path.exist?
         Jekyll.logger.abort_with "Conflict:", "#{theme.path} already exists."
       end
diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb
index b0e82e3a83d..0145ff3cec2 100644
--- a/lib/jekyll/theme_builder.rb
+++ b/lib/jekyll/theme_builder.rb
@@ -3,11 +3,12 @@ class Jekyll::ThemeBuilder
     _layouts _includes _sass
   ).freeze
 
-  attr_reader :name, :path
+  attr_reader :name, :path, :code_of_conduct
 
-  def initialize(theme_name)
+  def initialize(theme_name, opts)
     @name = theme_name.to_s.tr(" ", "_").gsub(%r!_+!, "_")
     @path = Pathname.new(File.expand_path(name, Dir.pwd))
+    @code_of_conduct = !!opts["code_of_conduct"]
   end
 
   def create!
@@ -71,7 +72,9 @@ def create_gemspec
   end
 
   def create_accessories
-    %w(README.md Rakefile CODE_OF_CONDUCT.md LICENSE.txt).each do |filename|
+    accessories = %w(README.md Rakefile LICENSE.txt)
+    accessories << "CODE_OF_CONDUCT.md" if code_of_conduct
+    accessories.each do |filename|
       write_file(filename, template(filename))
     end
   end

From 897f0c52fa67da1c1fc9fe60d5ab8715c733241e Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 29 Jun 2016 15:17:04 -0700
Subject: [PATCH 1083/4996] Add test for CoC flag.

---
 features/theme.feature | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/features/theme.feature b/features/theme.feature
index ae18d3a6e60..0e05d693790 100644
--- a/features/theme.feature
+++ b/features/theme.feature
@@ -8,6 +8,12 @@ Feature: Writing themes
     Then I should get a zero exit status
     And the my-cool-theme directory should exist
 
+  Scenario: Generating a new theme scaffold with a code of conduct
+    When I run jekyll new-theme my-cool-theme --code-of-conduct
+    Then I should get a zero exit status
+    And the my-cool-theme directory should exist
+    And the "my-cool-theme/CODE_OF_CONDUCT.md" file should exist
+
   Scenario: A theme with SCSS
     Given I have a configuration file with "theme" set to "test-theme"
     And I have a css directory

From c26173079947e92fdf5acb991d63109c4b1168f2 Mon Sep 17 00:00:00 2001
From: Alex Ivkin 
Date: Wed, 29 Jun 2016 21:30:42 -0700
Subject: [PATCH 1084/4996] Art gallery generator plugin added

---
 site/_docs/plugins.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 3969406845a..ed2c239b898 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -751,6 +751,7 @@ LESS.js files during generation.
 - [Jekyll Flickr Plugin](https://github.com/lawmurray/indii-jekyll-flickr) by [Lawrence Murray](http://www.indii.org): Generates posts for photos uploaded to a Flickr photostream.
 - [Jekyll::Paginate::Category](https://github.com/midnightSuyama/jekyll-paginate-category): Pagination Generator for Jekyll Category.
 - [AMP-Jekyll by Juuso Mikkonen](https://github.com/juusaw/amp-jekyll): Generate [Accelerated Mobile Pages](https://www.ampproject.org) of Jekyll posts.
+- [Jekyll Art Gallery plugin](https://github.com/alexivkin/Jekyll-Art-Gallery-Plugin): An advanced art/photo gallery generation plugin for creating galleries from a set of image folders. Supports image tagging, thumbnails, sorting, image rotation, post-processing (remove EXIF, add watermark), multiple collections and much more.
 
 #### Converters
 

From 2f8c0ffc5d7cf3225d082f79bd735082d530ce8a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 30 Jun 2016 10:37:16 -0700
Subject: [PATCH 1085/4996] Update history to reflect merge of #5043 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4be8a5559e2..5bea9dc16d6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -161,6 +161,7 @@
   * Update text to be consitent with example (#5010)
   * Update template links to point to core Liquid site (#5012)
   * Add generator-jekyllized to third-party plugins (#5027)
+  * Add Jekyll Art Hallery generator plugin to list of third-party plugins (#5043)
 
 ## 3.1.6 / 2016-05-19
 

From dcc896080619e45f6299dffa02fba2f68da7c615 Mon Sep 17 00:00:00 2001
From: Stephen Checkoway 
Date: Sun, 3 Jul 2016 13:28:33 -0500
Subject: [PATCH 1086/4996] Enable strict (or lax) liquid parsing.

Insert

liquid:
  error_mode: strict # or lax or warn

in _config.yml to change the error mode.
---
 lib/jekyll/configuration.rb   | 4 ++++
 lib/jekyll/liquid_renderer.rb | 1 +
 2 files changed, 5 insertions(+)

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index bcd13d0bf84..8d57f666f94 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -55,6 +55,10 @@ class Configuration < Hash
       "verbose"           => false,
       "defaults"          => [],
 
+      "liquid"            => {
+        "error_mode" => "warn"
+      },
+
       "rdiscount"         => {
         "extensions" => []
       },
diff --git a/lib/jekyll/liquid_renderer.rb b/lib/jekyll/liquid_renderer.rb
index 30f798bc185..9110cb13d96 100644
--- a/lib/jekyll/liquid_renderer.rb
+++ b/lib/jekyll/liquid_renderer.rb
@@ -5,6 +5,7 @@ module Jekyll
   class LiquidRenderer
     def initialize(site)
       @site = site
+      Liquid::Template.error_mode = @site.config["liquid"]["error_mode"].to_sym
       reset
     end
 

From ac552cd4e4d57c23b05ca404469a8a855e17dff5 Mon Sep 17 00:00:00 2001
From: Andrew Munsell 
Date: Mon, 4 Jul 2016 16:15:48 -0700
Subject: [PATCH 1087/4996] Add Formingo to the list of Jekyll form SaaS

Formingo (https://www.formingo.co) is a new service I'm working on that handles form processing for static websites, such as those generated through Jekyll. Adding it to the list of form services because I believe it'd be a helpful resource and alternative to some of the other listed services.
---
 site/_docs/resources.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/_docs/resources.md b/site/_docs/resources.md
index 6d585a599dd..44db27dbfff 100644
--- a/site/_docs/resources.md
+++ b/site/_docs/resources.md
@@ -22,6 +22,7 @@ Jekyll’s growing use is producing a wide variety of tutorials, frameworks, ext
   - [Formspree (also open source)](http://formspree.io/)
   - [FormKeep](https://formkeep.com/guides/contact-form-jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=contact-form-jekyll)
   - [Simple Form](http://getsimpleform.com/)
+  - [Formingo](https://www.formingo.co/guides/jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=Jekyll%20Documentation)
 - [Jekyll Bootstrap](http://jekyllbootstrap.com), 0 to Blog in 3 minutes. Provides detailed explanations, examples, and helper-code to make getting started with Jekyll easier.
 - [Integrating Twitter with Jekyll](http://www.justkez.com/integrating-twitter-with-jekyll/)
   > “Having migrated Justkez.com to be based on Jekyll, I was pondering how I might include my recent twitterings on the front page of the site. In the WordPress world, this would have been done via a plugin which may or may not have hung the loading of the page, might have employed caching, but would certainly have had some overheads. … Not in Jekyll.”

From 51a80b8225df64c17be4e596571a69a6712b4f8f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 5 Jul 2016 10:19:29 -0700
Subject: [PATCH 1088/4996] Update history to reflect merge of #5054 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5bea9dc16d6..f3b54c3ae53 100644
--- a/History.markdown
+++ b/History.markdown
@@ -162,6 +162,7 @@
   * Update template links to point to core Liquid site (#5012)
   * Add generator-jekyllized to third-party plugins (#5027)
   * Add Jekyll Art Hallery generator plugin to list of third-party plugins (#5043)
+  * Add Formingo to the list of Jekyll form SaaS (#5054)
 
 ## 3.1.6 / 2016-05-19
 

From 72d49490d245444cebaf0503063110e43f06b70a Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Tue, 5 Jul 2016 21:22:24 +0300
Subject: [PATCH 1089/4996] Add fetch method to Drops

---
 lib/jekyll/drops/drop.rb |  4 ++++
 test/test_drop.rb        | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 test/test_drop.rb

diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index ebd3b4d2e37..b79544fe188 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -199,6 +199,10 @@ def merge!(other)
           end
         end
       end
+
+      def fetch(*args, &block)
+        to_h.fetch(*args, &block)
+      end
     end
   end
 end
diff --git a/test/test_drop.rb b/test/test_drop.rb
new file mode 100644
index 00000000000..e0f1884c807
--- /dev/null
+++ b/test/test_drop.rb
@@ -0,0 +1,34 @@
+require "helper"
+
+class TestDrop < JekyllUnitTest
+  context "a document drop" do
+    setup do
+      @site = fixture_site({
+        "collections" => ["methods"]
+      })
+      @site.process
+      @document = @site.collections["methods"].docs.detect do |d|
+        d.relative_path == "_methods/configuration.md"
+      end
+      @drop = @document.to_liquid
+    end
+
+    should "raise KeyError if key is not found and no default provided" do
+      assert_raises KeyError do
+        @drop.fetch("not_existing_key")
+      end
+    end
+
+    should "fetch value without default" do
+      assert_equal "Jekyll.configuration", @drop.fetch("title")
+    end
+
+    should "fetch default if key is not found" do
+      assert_equal "default", @drop.fetch("not_existing_key", "default")
+    end
+
+    should "fetch default value from block if key is not found" do
+      assert_equal "default bar", @drop.fetch("bar") { |el| "default #{el}" }
+    end
+  end
+end

From 3aead1d4a944b7895d9961e6eaff3bae9a9b6e73 Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Wed, 6 Jul 2016 11:20:37 +0300
Subject: [PATCH 1090/4996] Imitate fetch method instead of creating real Hash
 object

---
 lib/jekyll/drops/drop.rb | 11 +++++++++--
 test/test_drop.rb        |  8 ++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index b79544fe188..dfb35d20116 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -200,8 +200,15 @@ def merge!(other)
         end
       end
 
-      def fetch(*args, &block)
-        to_h.fetch(*args, &block)
+      # Imitate Hash.fetch method in Drop
+      #
+      # Returns value if key is present in Drop, otherwise returns default value
+      # KeyError is raised if key is not present and no default value given
+      def fetch(key, default = nil, &block)
+        return self[key] if key?(key)
+        raise KeyError, %(key not found: "#{key}") if default.nil? && block.nil?
+        return yield(key) unless block.nil?
+        return default unless default.nil?
       end
     end
   end
diff --git a/test/test_drop.rb b/test/test_drop.rb
index e0f1884c807..199e94ab075 100644
--- a/test/test_drop.rb
+++ b/test/test_drop.rb
@@ -27,8 +27,16 @@ class TestDrop < JekyllUnitTest
       assert_equal "default", @drop.fetch("not_existing_key", "default")
     end
 
+    should "fetch default boolean value correctly" do
+      assert_equal false, @drop.fetch("bar", false)
+    end
+
     should "fetch default value from block if key is not found" do
       assert_equal "default bar", @drop.fetch("bar") { |el| "default #{el}" }
     end
+
+    should "fetch default value from block first if both argument and block given" do
+      assert_equal "baz", @drop.fetch("bar", "default") { "baz" }
+    end
   end
 end

From c698e83eb1645b3cbcf5e6249acad3b368b3caeb Mon Sep 17 00:00:00 2001
From: Joshua Barnett 
Date: Wed, 6 Jul 2016 12:00:19 +0100
Subject: [PATCH 1091/4996] Highlight help nav item when navigated to.

---
 site/_includes/primary-nav-items.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_includes/primary-nav-items.html b/site/_includes/primary-nav-items.html
index df5b939f967..6c816b6e469 100644
--- a/site/_includes/primary-nav-items.html
+++ b/site/_includes/primary-nav-items.html
@@ -8,7 +8,7 @@
   
  • 
     News
   
    • 
-  
  • 
+  
  • 
     Help
   
    • 
   
  • 

From a25e97b5fb3efd0bab0c8c72caecdb0a09cf50b8 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 6 Jul 2016 17:46:35 -0700
Subject: [PATCH 1092/4996] Update history to reflect merge of #5058 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f3b54c3ae53..9ca726fbc08 100644
--- a/History.markdown
+++ b/History.markdown
@@ -163,6 +163,7 @@
   * Add generator-jekyllized to third-party plugins (#5027)
   * Add Jekyll Art Hallery generator plugin to list of third-party plugins (#5043)
   * Add Formingo to the list of Jekyll form SaaS (#5054)
+  * Highlight help nav item when navigated to. (#5058)
 
 ## 3.1.6 / 2016-05-19
 

From 25bff0075c858cfdda8dcf8db2ed119325cfd638 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 6 Jul 2016 19:34:58 -0700
Subject: [PATCH 1093/4996] Update history to reflect merge of #5056 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9ca726fbc08..d9e2e9b06c6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -31,6 +31,7 @@
   * Add normalize_whitepace filter (#4917)
   * Move bin/jekyll to exe/jekyll to prevent collision with binstubs (#5014)
   * Cleaning up site template & theme updates. (#4922)
+  * Add fetch method to Drops (#5056)
 
 ### Bug Fixes
 

From ba08e172043d63a2e35fd23d8aa9da7e7920c09d Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Thu, 7 Jul 2016 11:30:45 +0300
Subject: [PATCH 1094/4996] Extract tag name to class method

---
 lib/jekyll/tags/link.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/tags/link.rb b/lib/jekyll/tags/link.rb
index e6dcde610c0..6ffd4726c6a 100644
--- a/lib/jekyll/tags/link.rb
+++ b/lib/jekyll/tags/link.rb
@@ -1,7 +1,11 @@
 module Jekyll
   module Tags
     class Link < Liquid::Tag
-      TAG_NAME = "link".freeze
+      class << self
+        def tag_name
+          self.name.split("::").last.downcase
+        end
+      end
 
       def initialize(tag_name, relative_path, tokens)
         super
@@ -17,7 +21,7 @@ def render(context)
         end
 
         raise ArgumentError, <
Date: Thu, 7 Jul 2016 15:30:59 +0200
Subject: [PATCH 1095/4996] Remove useless statement from test

---
 test/test_configuration.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 0e0a69c7052..dd05a9e7a62 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -329,7 +329,6 @@ class TestConfiguration < JekyllUnitTest
         .with(@paths[:other])
         .and_return({ "baseurl" => "http://wahoo.dev" })
       allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}")
-      Jekyll.configuration({ "config" => @paths[:other] })
       assert_equal \
         site_configuration({ "baseurl" => "http://wahoo.dev" }),
         Jekyll.configuration(test_config.merge({ "config" => @paths[:other] }))

From 5a339cc735ea64ff3320e962aba278872671923e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 7 Jul 2016 08:12:05 -0700
Subject: [PATCH 1096/4996] Update history to reflect merge of #5065 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d9e2e9b06c6..cbafa3e90f8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -107,6 +107,7 @@
   * rubocop: lib/jekyll/convertible.rb style fixes (#5031)
   * rubocop: lib/jekyll/document.rb style fixes (#5030)
   * Remove ruby-head from Travis matrix & fix jruby failures (#5015)
+  * Remove useless statement from Configuration test (#5065)
 
 ### Site Enhancements
 

From c46f219d3cd53afe35ef1e406a1c0488fa2ae739 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 7 Jul 2016 13:34:10 -0700
Subject: [PATCH 1097/4996] Commit failing test for lack of certain excerpt
 drop properties.

---
 test/test_excerpt_drop.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/test_excerpt_drop.rb b/test/test_excerpt_drop.rb
index f8c75f9a47c..901b06a6f79 100644
--- a/test/test_excerpt_drop.rb
+++ b/test/test_excerpt_drop.rb
@@ -29,6 +29,10 @@ class TestExcerptDrop < JekyllUnitTest
       assert_equal @excerpt_drop["layout"], @doc_drop["layout"]
     end
 
+    should "be inspectable" do
+      refute_empty @excerpt_drop.inspect
+    end
+
     should "inherit values from the document" do
       assert_equal @excerpt_drop.keys.sort, @doc_drop.keys.sort
     end

From e3214c23a33464c318f175d0e9360b13da0b428d Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 7 Jul 2016 13:37:09 -0700
Subject: [PATCH 1098/4996] Add missing elements to Excerpt which delegate to
 its Document

---
 lib/jekyll/drops/drop.rb | 4 ++--
 lib/jekyll/excerpt.rb    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index dfb35d20116..6227213e4dd 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -102,8 +102,8 @@ def content_methods
       #
       # Returns true if the given key is present
       def key?(key)
-        if self.class.mutable && @mutations.key?(key)
-          true
+        if self.class.mutable
+          @mutations.key?(key)
         else
           respond_to?(key) || fallback_data.key?(key)
         end
diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb
index 2d53307e312..c181cb68ed7 100644
--- a/lib/jekyll/excerpt.rb
+++ b/lib/jekyll/excerpt.rb
@@ -7,7 +7,8 @@ class Excerpt
     attr_writer   :output
 
     def_delegators :@doc, :site, :name, :ext, :relative_path, :extname,
-                          :render_with_liquid?, :collection, :related_posts, :url
+                          :render_with_liquid?, :collection, :related_posts,
+                          :url, :next_doc, :previous_doc
 
     # Initialize this Excerpt instance.
     #

From 1a934125d99598e967cb3f7f2c05a9c59ba738be Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 7 Jul 2016 13:37:25 -0700
Subject: [PATCH 1099/4996] Check for Ruby first, then JRuby

---
 script/rubies | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/rubies b/script/rubies
index fb00ac61fd8..ae6d486856d 100755
--- a/script/rubies
+++ b/script/rubies
@@ -6,7 +6,7 @@
 # -----------------------------------------------------------------------------
 
 rubies=()
-for r in jruby ruby; do
+for r in ruby jruby; do
   if which "$r" > /dev/null 2>&1
   then
     echo $r

From f6dc74933253ae72c2f12389a60fe4e686418823 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 7 Jul 2016 15:42:31 -0700
Subject: [PATCH 1100/4996] Update history to reflect merge of #5063 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index cbafa3e90f8..d90dc3bb5c3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -32,6 +32,7 @@
   * Move bin/jekyll to exe/jekyll to prevent collision with binstubs (#5014)
   * Cleaning up site template & theme updates. (#4922)
   * Add fetch method to Drops (#5056)
+  * Extract tag name to class method (#5063)
 
 ### Bug Fixes
 

From 1c0f21230d6a605c0bef498c695e8a8b1316eaf2 Mon Sep 17 00:00:00 2001
From: Marcus Stollsteimer 
Date: Wed, 6 Jul 2016 14:30:30 +0200
Subject: [PATCH 1101/4996] Stringify configuration overrides before first use

This makes sure that overrides for Jekyll.configuration
all have string keys before their first use, particularly
also the "config" and "skip_config_files" options.
---
 lib/jekyll.rb              |  1 +
 test/test_configuration.rb | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index db1e40cd60b..a9fe696f0c5 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -101,6 +101,7 @@ def env
     # Returns the final configuration Hash.
     def configuration(override = {})
       config = Configuration.new
+      override = Configuration[override].stringify_keys
       unless override.delete("skip_config_files")
         config = config.read_config_files(config.config_files(override))
       end
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index dd05a9e7a62..90bcc822cdf 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -334,6 +334,18 @@ class TestConfiguration < JekyllUnitTest
         Jekyll.configuration(test_config.merge({ "config" => @paths[:other] }))
     end
 
+    should "load different config if specified with symbol key" do
+      allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return({})
+      allow(SafeYAML)
+        .to receive(:load_file)
+        .with(@paths[:other])
+        .and_return({ "baseurl" => "http://example.com" })
+      allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}")
+      assert_equal \
+        site_configuration({ "baseurl" => "http://example.com" }),
+        Jekyll.configuration(test_config.merge({ :config => @paths[:other] }))
+    end
+
     should "load default config if path passed is empty" do
       allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return({})
       allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}")

From ba8573c420c01a3c7e33ea2338d9158aa4f84b08 Mon Sep 17 00:00:00 2001
From: Marcus Stollsteimer 
Date: Fri, 8 Jul 2016 15:48:14 +0200
Subject: [PATCH 1102/4996] Change baseurl to example.com for some test cases

---
 test/test_configuration.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index dd05a9e7a62..dd4d4d40fdf 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -327,10 +327,10 @@ class TestConfiguration < JekyllUnitTest
       allow(SafeYAML)
         .to receive(:load_file)
         .with(@paths[:other])
-        .and_return({ "baseurl" => "http://wahoo.dev" })
+        .and_return({ "baseurl" => "http://example.com" })
       allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}")
       assert_equal \
-        site_configuration({ "baseurl" => "http://wahoo.dev" }),
+        site_configuration({ "baseurl" => "http://example.com" }),
         Jekyll.configuration(test_config.merge({ "config" => @paths[:other] }))
     end
 
@@ -378,7 +378,7 @@ class TestConfiguration < JekyllUnitTest
       allow(SafeYAML)
         .to receive(:load_file)
         .with(@paths[:other])
-        .and_return({ "baseurl" => "http://wahoo.dev" })
+        .and_return({ "baseurl" => "http://example.com" })
       allow($stdout)
         .to receive(:puts)
         .with("Configuration file: #{@paths[:default]}")
@@ -386,7 +386,7 @@ class TestConfiguration < JekyllUnitTest
         .to receive(:puts)
         .with("Configuration file: #{@paths[:other]}")
       assert_equal \
-        site_configuration({ "baseurl" => "http://wahoo.dev" }),
+        site_configuration({ "baseurl" => "http://example.com" }),
         Jekyll.configuration(
           test_config.merge({ "config" => [@paths[:default], @paths[:other]] })
         )

From cc82d442223bdaee36a2aceada64008a0106d82b Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Fri, 8 Jul 2016 20:33:47 +0200
Subject: [PATCH 1103/4996] check if relative URL contains a colon

fixes #2834
---
 lib/jekyll/errors.rb |  7 ++++---
 lib/jekyll/url.rb    |  9 ++++++++-
 test/test_url.rb     | 10 ++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/lib/jekyll/errors.rb b/lib/jekyll/errors.rb
index 01bc99b3d12..6ae24337ab5 100644
--- a/lib/jekyll/errors.rb
+++ b/lib/jekyll/errors.rb
@@ -9,8 +9,9 @@ module Errors
     InvalidYAMLFrontMatterError = Class.new(FatalException)
     MissingDependencyException  = Class.new(FatalException)
 
-    InvalidDateError = Class.new(FatalException)
-    InvalidPostNameError = Class.new(FatalException)
-    PostURLError = Class.new(FatalException)
+    InvalidDateError      = Class.new(FatalException)
+    InvalidPostNameError  = Class.new(FatalException)
+    PostURLError          = Class.new(FatalException)
+    InvalidURLError       = Class.new(FatalException)
   end
 end
diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 440deb18f3b..c74e11c8bd4 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -35,8 +35,15 @@ def initialize(options)
     # The generated relative URL of the resource
     #
     # Returns the String URL
+    # Raises a Jekyll::Errors::InvalidURLError if the relative URL contains a colon
     def to_s
-      sanitize_url(generated_permalink || generated_url)
+      sanitized_url = sanitize_url(generated_permalink || generated_url)
+      if sanitized_url.include?(":")
+        raise Jekyll::Errors::InvalidURLError,
+          "The URL #{sanitized_url} is invalid because it contains a colon."
+      else
+        sanitized_url
+      end
     end
 
     # Generates a URL from the permalink
diff --git a/test/test_url.rb b/test/test_url.rb
index fc9a46eb0a3..f5a77622fd1 100644
--- a/test/test_url.rb
+++ b/test/test_url.rb
@@ -70,5 +70,15 @@ class TestURL < JekyllUnitTest
         :placeholders => matching_doc.url_placeholders
       ).to_s
     end
+
+    should "throw an exception if the URL contains a colon" do
+      url = URL.new(
+        :template     => "/:x/:y/:z",
+        :placeholders => { :x => "foo", :z => "bar" }
+      )
+      assert_raises Jekyll::Errors::InvalidURLError do
+        url.to_s
+      end
+    end
   end
 end

From d4a7fbee28323576c88bbc4b4d689d267389dc47 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 8 Jul 2016 23:23:18 -0700
Subject: [PATCH 1104/4996] Update history to reflect merge of #5068 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d90dc3bb5c3..2784362eb96 100644
--- a/History.markdown
+++ b/History.markdown
@@ -109,6 +109,7 @@
   * rubocop: lib/jekyll/document.rb style fixes (#5030)
   * Remove ruby-head from Travis matrix & fix jruby failures (#5015)
   * Remove useless statement from Configuration test (#5065)
+  * Change baseurl to example.com for some test cases (#5068)
 
 ### Site Enhancements
 

From 232054a0596fe16df8472da3bafcfce32cb63733 Mon Sep 17 00:00:00 2001
From: chrisfinazzo 
Date: Mon, 11 Jul 2016 12:41:42 -0400
Subject: [PATCH 1105/4996] Update normalize.css to v4.2.0.

---
 site/_sass/_normalize.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/site/_sass/_normalize.scss b/site/_sass/_normalize.scss
index 995e0354e25..8d46a8ee270 100644
--- a/site/_sass/_normalize.scss
+++ b/site/_sass/_normalize.scss
@@ -1,2 +1 @@
-/*! normalize.css v4.0.0 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block}audio:not([controls]){display:none;height:0}progress{vertical-align:baseline}template,[hidden]{display:none}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit}b,strong{font-weight:bolder}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-0.25em}sup{top:-0.5em}img{border-style:none}svg:not(:root){overflow:hidden}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}button,input,select,textarea{font:inherit;margin:0}optgroup{font-weight:bold}button,input{overflow:visible}button,select{text-transform:none}button,html [type="button"],[type="reset"],[type="submit"]{-webkit-appearance:button}button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{border-style:none;padding:0}button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{outline:1px dotted ButtonText}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}textarea{overflow:auto}[type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto}[type="search"]{-webkit-appearance:textfield;outline-offset:-2px}[type="search"]::-webkit-search-cancel-button,[type="search"]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-input-placeholder{color:inherit;opacity:0.54}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}
-/*# sourceMappingURL=_normalize.scss.map */
+/*! normalize.css v4.2.0 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block}audio:not([controls]){display:none;height:0}progress{vertical-align:baseline}template,[hidden]{display:none}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit}b,strong{font-weight:bolder}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-0.25em}sup{top:-0.5em}img{border-style:none}svg:not(:root){overflow:hidden}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}button,input,optgroup,select,textarea{font:inherit;margin:0}optgroup{font-weight:bold}button,input{overflow:visible}button,select{text-transform:none}button,html [type="button"],[type="reset"],[type="submit"]{-webkit-appearance:button}button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{border-style:none;padding:0}button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{outline:1px dotted ButtonText}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}textarea{overflow:auto}[type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto}[type="search"]{-webkit-appearance:textfield;outline-offset:-2px}[type="search"]::-webkit-search-cancel-button,[type="search"]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-input-placeholder{color:inherit;opacity:0.54}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}

From 5b51b8bdf3385930b7eca85b9d421133c3a4e4ea Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 11 Jul 2016 11:19:31 -0700
Subject: [PATCH 1106/4996] Update history to reflect merge of #5096 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2784362eb96..5b7d23c70f9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -168,6 +168,7 @@
   * Add Jekyll Art Hallery generator plugin to list of third-party plugins (#5043)
   * Add Formingo to the list of Jekyll form SaaS (#5054)
   * Highlight help nav item when navigated to. (#5058)
+  * Update normalize.css to v4.2.0. (#5096)
 
 ## 3.1.6 / 2016-05-19
 

From 4b5126dda7f1e00d2701404b4f1ec2d155f40857 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 11 Jul 2016 11:20:23 -0700
Subject: [PATCH 1107/4996] Update history to reflect merge of #5067 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5b7d23c70f9..5d17e968830 100644
--- a/History.markdown
+++ b/History.markdown
@@ -51,6 +51,7 @@
   * Don't rescue LoadError or bundler load errors for Bundler. (#4857)
   * `Serve.process` should receive same config as `Build.process` (#4953)
   * Prevent reset of page in Liquid payload right before rendering layouts (#5009)
+  * Add missing fields to ExcerptDrop (#5067)
 
 ### Forward Ports
 

From 8d2227a03ab259443565cff92366c7e6f6fd19ef Mon Sep 17 00:00:00 2001
From: Mike Neumegen 
Date: Wed, 6 Jul 2016 15:16:01 +1200
Subject: [PATCH 1108/4996] added JekyllConf page

---
 site/_data/docs.yml             |   1 +
 site/_data/jekyllconf-talks.yml | 167 ++++++++++++++++++++++++++++++++
 site/_docs/jekyllconf.md        |  24 +++++
 site/_docs/resources.md         |   2 +-
 site/_sass/_style.scss          |  15 +++
 5 files changed, 208 insertions(+), 1 deletion(-)
 create mode 100644 site/_data/jekyllconf-talks.yml
 create mode 100644 site/_docs/jekyllconf.md

diff --git a/site/_data/docs.yml b/site/_data/docs.yml
index 071b5a14c72..5ce3ed8f3e8 100644
--- a/site/_data/docs.yml
+++ b/site/_data/docs.yml
@@ -40,6 +40,7 @@
   - troubleshooting
   - sites
   - resources
+  - jekyllconf
   - upgrading/0-to-2
   - upgrading/2-to-3
 
diff --git a/site/_data/jekyllconf-talks.yml b/site/_data/jekyllconf-talks.yml
new file mode 100644
index 00000000000..e5881682a68
--- /dev/null
+++ b/site/_data/jekyllconf-talks.yml
@@ -0,0 +1,167 @@
+- speaker: Ben Balter
+  twitter_handle: BenBalter
+  youtube_id: Z-37y1qaoxc
+  topic: GitHub Pages behind the scenes
+  year: 2015
+
+- speaker: Brandon Mathis
+  twitter_handle: imathis
+  youtube_id: KS6e4XxY2H4
+  topic: What the heck is Octopress and why should I care?
+  year: 2015
+
+- speaker: Brian Rinaldi
+  twitter_handle: remotesynth
+  youtube_id: vT7DhK5zbv0
+  topic: Comparing Jekyll with the Competition
+  year: 2015
+
+- speaker: Kyle Rush
+  twitter_handle: kylerush
+  youtube_id: ia8vsuiXiL0
+  topic: Meet the Obama Campaign's $250 Million Fundraising Platform
+  year: 2015
+
+- speaker: Michael Jovel
+  twitter_handle: mjovel
+  youtube_id: 8zSHG6XU_xY
+  topic: Building Living Style Guides with Jekyll
+  year: 2015
+
+- speaker: Mike Neumegen
+  twitter_handle: mikeneumegen
+  youtube_id: NuChR_YdjrI
+  topic: A CMS for Jekyll
+  year: 2015
+
+- speaker: Parker Moore
+  twitter_handle: parkr
+  youtube_id: y2SbOIQ5nSA
+  topic: Jekyll 3 and Beyond
+  year: 2015
+
+- speaker: Tom Preston-Werner
+  twitter_handle: mojombo
+  youtube_id: BMve1OCKj6M
+  topic: Some crazy ideas I have for the future of static sites
+  year: 2015
+
+- speaker: Allison Zadrozny
+  twitter_handle: allizad
+  youtube_id: Rsc0Mmp1qc8
+  topic: Elasticsearch for Jekyll
+  year: 2016
+
+- speaker: Amy Johnston
+  twitter_handle: amybeukenex
+  youtube_id: HR12JiUI2Zc
+  topic: Jekyll for Technical Documentation
+  year: 2016
+
+- speaker: Bud Parr
+  twitter_handle: budparr
+  youtube_id: A1nTuNjoNbg
+  topic: Real World Content Strategy with Jekyll
+  year: 2016
+
+- speaker: George Phillips
+  twitter_handle: gphillips_nz
+  youtube_id: skb_XWABEDc
+  topic: Building client-editable Jekyll sites
+  year: 2016
+
+- speaker: Ire Aderinokun
+  twitter_handle: ireaderinokun
+  youtube_id: PRKV5IGKF2c
+  topic: Using Jekyll for Rapid CSS Testing
+  year: 2016
+
+- speaker: Jon Chan
+  twitter_handle: JonHMChan
+  youtube_id: vDeKPs6xpOM
+  topic: Stack Overflow on Jekyll
+  year: 2016
+
+- speaker: Julio Faerman
+  twitter_handle: jmfaerman
+  youtube_id: SOMonG8Iqak
+  topic: Jekyll on AWS
+  year: 2016
+
+- speaker: Katy DeCorah
+  twitter_handle: katydecorah
+  youtube_id: s84wFRD8vfE
+  topic: Unconventional use cases for Jekyll
+  year: 2016
+
+- speaker: David Darnes
+  twitter_handle: DavidDarnes
+  youtube_id: Y4qwpN40Dvg
+  topic: Doing a lot with a little
+  year: 2016
+
+- speaker: Ronan Berder
+  twitter_handle: hunvreus
+  youtube_id: TteAQq25_Ns
+  topic: Designing fast websites with Jekyll
+  year: 2016
+
+- speaker: David Von Lehman
+  twitter_handle: davidvlsea
+  youtube_id: wMlPlKCZfEk
+  topic: Continuous deployment of Jekyll sites powered by Docker
+  year: 2016
+
+- speaker: David Jones
+  twitter_handle: d_jones
+  youtube_id: 4XxYQ7efk0E
+  topic: Building our agency site with Jekyll
+  year: 2016
+
+- speaker: Scott Hewitt
+  twitter_handle: scotthewitt
+  youtube_id: qSd3pXQaPsE
+  topic: Jekyll For Every Case
+  year: 2016
+
+- speaker: Tim Carry
+  twitter_handle: pixelastic
+  youtube_id: ivMML1J4ABY
+  topic: Algolia search on Jekyll sites
+  year: 2016
+
+- speaker: Nils Borchers
+  twitter_handle: nilsborchers
+  youtube_id: DtNMjuv6Rbo
+  topic: Building a living brand guide with Jekyll and Hologram
+  year: 2016
+
+- speaker: Mike Neumegen
+  twitter_handle: mikeneumegen
+  youtube_id: rJ5EhVmTR7I
+  topic: Learning resources for the Jekyll community
+  year: 2016
+
+- speaker: Oliver Pattison
+  twitter_handle: olivermakes
+  youtube_id: BIf6oNpGl74
+  topic: Responsive srcset images with imgix
+  year: 2016
+
+- speaker: Michael Lee
+  twitter_handle: michaelsoolee
+  youtube_id: F4bJRLEvXIc
+  topic: Jekyll, Your Website's Baseplate
+  year: 2016
+
+- speaker: Paul Webb
+  twitter_handle: NetOpWibby
+  youtube_id: BRB5DgAE5nM
+  topic: Deploy Jekyll Like A Boss
+  year: 2016
+  
+- speaker: Tom Johnson
+  twitter_handle: tomjohnson
+  youtube_id: nq1AUB72GCQ
+  topic: Overcoming challenges in using Jekyll for documentation projects
+  year: 2016
diff --git a/site/_docs/jekyllconf.md b/site/_docs/jekyllconf.md
new file mode 100644
index 00000000000..baf4d457a25
--- /dev/null
+++ b/site/_docs/jekyllconf.md
@@ -0,0 +1,24 @@
+---
+layout: docs
+title: JekyllConf
+permalink: /docs/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
+{% assign random = site.time | date: "%s%N" | modulo: site.data.jekyllconf-talks.size %}
+{% assign featured = site.data.jekyllconf-talks[random] %}
+
+{{ featured.topic }} - [{{ featured.speaker }}](https://twitter.com/{{ featured.twitter_handle }})
+
    
+	
+
    
+
+{% assign talks = site.data.jekyllconf-talks | group_by: 'year' %}
+{% for year in talks reversed %}
+## {{ year.name }}
+	{% for talk in year.items %}
+ * [{{ talk.topic }}](https://youtu.be/{{ talk.youtube_id }}) - [{{ talk.speaker }}](https://twitter.com/{{ talk.twitter_handle }})
+	{% endfor %}
+{% endfor %}
diff --git a/site/_docs/resources.md b/site/_docs/resources.md
index 44db27dbfff..b35ea9c18e3 100644
--- a/site/_docs/resources.md
+++ b/site/_docs/resources.md
@@ -8,7 +8,7 @@ Jekyll’s growing use is producing a wide variety of tutorials, frameworks, ext
 
 ### Useful Guides
 
-- [Jekyll Tips](http://jekyll.tips) is a set of resources created by [CloudCannon](https://cloudcannon.com) to help folks get up and running with Jekyll. The cover all skill levels, and even include some great video tutorials.
+- [Jekyll Tips](http://jekyll.tips) is a set of resources created by [CloudCannon](https://cloudcannon.com) to help folks get up and running with Jekyll. They cover all skill levels, and even include some great video tutorials.
 - [Jekyll Cheatsheet](http://cheat.jekyll.tips) is a single-page resource for Jekyll filters, variables, and the like.
 - [“Creating and Hosting a Personal Site on GitHub”](http://jmcglone.com/guides/github-pages/)
 - [‘Build A Blog With Jekyll And GitHub Pages’ on Smashing Magazine](http://www.smashingmagazine.com/2014/08/01/build-blog-jekyll-github-pages/)
diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss
index f06ea77f36d..540c4cc970d 100644
--- a/site/_sass/_style.scss
+++ b/site/_sass/_style.scss
@@ -986,6 +986,21 @@ code.output {
   }
 }
 
+.videoWrapper {
+  position: relative;
+  padding-bottom: 52.4%;
+  padding-top: 25px;
+  height: 0;
+}
+
+.videoWrapper iframe {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
 
 /* Helper class taken from Bootstrap.
    Hides an element to all devices except screen readers.

From 26b2a6251cefae098d69f9ac94615b6d03c0109d Mon Sep 17 00:00:00 2001
From: chrisfinazzo 
Date: Mon, 11 Jul 2016 17:47:41 -0400
Subject: [PATCH 1109/4996] Add a Community section and cleanup, closes #5057

---
 site/_includes/primary-nav-items.html            | 3 +++
 site/_sass/_style.scss                           | 1 +
 site/{_docs/jekyllconf.md => community/index.md} | 8 ++++----
 3 files changed, 8 insertions(+), 4 deletions(-)
 rename site/{_docs/jekyllconf.md => community/index.md} (88%)

diff --git a/site/_includes/primary-nav-items.html b/site/_includes/primary-nav-items.html
index 6c816b6e469..f67b1fadfef 100644
--- a/site/_includes/primary-nav-items.html
+++ b/site/_includes/primary-nav-items.html
@@ -8,6 +8,9 @@
   
  • 
     News
   
    • 
+  
  • 
+    Community
+  
    • 
   
  • 
     Help
   
    • 
diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss
index 540c4cc970d..10b1b0e292d 100644
--- a/site/_sass/_style.scss
+++ b/site/_sass/_style.scss
@@ -56,6 +56,7 @@ nav {
   ul {
     padding: 0;
     margin: 0;
+    white-space: nowrap;
   }
 
   li { display: inline-block; }
diff --git a/site/_docs/jekyllconf.md b/site/community/index.md
similarity index 88%
rename from site/_docs/jekyllconf.md
rename to site/community/index.md
index baf4d457a25..981a465ba66 100644
--- a/site/_docs/jekyllconf.md
+++ b/site/community/index.md
@@ -1,10 +1,10 @@
 ---
-layout: docs
-title: JekyllConf
-permalink: /docs/jekyllconf/
+layout: page
+title: Community
+permalink: /community/
 ---
 
-[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. 
+[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
 {% assign random = site.time | date: "%s%N" | modulo: site.data.jekyllconf-talks.size %}

From d683baa2576c57d75d945565467191d24aaa3eaa Mon Sep 17 00:00:00 2001
From: Erick Sasse 
Date: Mon, 11 Jul 2016 23:17:30 -0300
Subject: [PATCH 1110/4996] Updates html-proofer code

As in html-proofer docs: https://github.com/gjtorikian/html-proofer
---
 site/_docs/continuous-integration.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/_docs/continuous-integration.md b/site/_docs/continuous-integration.md
index 8a50afa768d..4bd01e2b343 100644
--- a/site/_docs/continuous-integration.md
+++ b/site/_docs/continuous-integration.md
@@ -63,8 +63,8 @@ You can also invoke `html-proofer` in Ruby scripts (e.g. in a Rakefile):
 {% highlight ruby %}
 #!/usr/bin/env ruby
 
-require 'html/proofer'
-HTML::Proofer.new("./_site").run
+require 'html-proofer'
+HTMLProofer.check_directory("./_site").run
 {% endhighlight %}
 
 Options are given as a second argument to `.new`, and are encoded in a

From 3674a7760fa3dc603938c3555b305069a9fcc126 Mon Sep 17 00:00:00 2001
From: chrisfinazzo 
Date: Mon, 11 Jul 2016 22:18:12 -0400
Subject: [PATCH 1111/4996] Remove JekyllConf from the sidebar

---
 site/_data/docs.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/site/_data/docs.yml b/site/_data/docs.yml
index 5ce3ed8f3e8..071b5a14c72 100644
--- a/site/_data/docs.yml
+++ b/site/_data/docs.yml
@@ -40,7 +40,6 @@
   - troubleshooting
   - sites
   - resources
-  - jekyllconf
   - upgrading/0-to-2
   - upgrading/2-to-3
 

From 0ebf7129cff85df518d9486454e357a06819baf6 Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Tue, 12 Jul 2016 21:26:52 +0200
Subject: [PATCH 1112/4996] use activesupport ~> 4.2 if we are on a Ruby <
 2.2.2

activesupport 5.0.x requires a ruby version >= 2.2.2
see https://github.com/rails/rails/blob/48512d790680a4fbfc20026f3c976f8fa759b2e5/activesupport/activesupport.gemspec#L10
---
 Gemfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Gemfile b/Gemfile
index 3dc758eff61..6b1db4c5f69 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,9 @@ source "https://rubygems.org"
 gemspec :name => "jekyll"
 
 gem "rake", "~> 11.0"
+
+gem "activesupport", "~> 4.2", :groups => [:test_legacy, :site] if RUBY_ENGINE == 'ruby' && RUBY_VERSION < '2.2.2'
+
 group :development do
   gem "launchy", "~> 2.3"
   gem "pry"

From 506ba8af1e95e9fa27633e99483fecdcd7407fc5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 12 Jul 2016 19:22:40 -0700
Subject: [PATCH 1113/4996] Update history to reflect merge of #5098 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5d17e968830..be1fc29933f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -170,6 +170,7 @@
   * Add Formingo to the list of Jekyll form SaaS (#5054)
   * Highlight help nav item when navigated to. (#5058)
   * Update normalize.css to v4.2.0. (#5096)
+  * Updates html-proofer code (#5098)
 
 ## 3.1.6 / 2016-05-19
 

From a29498eaaebbccd415cc3b811d050137f456cd9a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 12 Jul 2016 19:50:33 -0700
Subject: [PATCH 1114/4996] Update history to reflect merge of #5069 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index be1fc29933f..2882db66af8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -33,6 +33,7 @@
   * Cleaning up site template & theme updates. (#4922)
   * Add fetch method to Drops (#5056)
   * Extract tag name to class method (#5063)
+  * check if relative URL contains a colon (#5069)
 
 ### Bug Fixes
 

From 5194d1a42ccfceb2747a03c06e0b7ac7912f44b9 Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Wed, 13 Jul 2016 10:52:18 +0800
Subject: [PATCH 1115/4996] Add to_integer filter

---
 lib/jekyll/filters.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 231eb7b6a87..71e0dabdbfb 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -260,6 +260,15 @@ def where_exp(input, variable, expression)
       end
     end
 
+    # Convert the input into integer
+    #
+    # input - the object string
+    #
+    # Returns the integer value
+    def to_integer(input)
+      input.to_i
+    end
+
     # Sort an array of objects
     #
     # input - the object array

From f42fac60b01904b5b79fca82ec0b957c45d94644 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 12 Jul 2016 20:11:04 -0700
Subject: [PATCH 1116/4996] Update history to reflect merge of #5097 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2882db66af8..dc6f2e69151 100644
--- a/History.markdown
+++ b/History.markdown
@@ -172,6 +172,7 @@
   * Highlight help nav item when navigated to. (#5058)
   * Update normalize.css to v4.2.0. (#5096)
   * Updates html-proofer code (#5098)
+  * Jekyll Community (#5097)
 
 ## 3.1.6 / 2016-05-19
 

From cc994105ededbb91e185de3e855bbf518cb1046c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 12 Jul 2016 20:16:11 -0700
Subject: [PATCH 1117/4996] Update history to reflect merge of #5100 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index dc6f2e69151..e140d49f0a7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -112,6 +112,7 @@
   * Remove ruby-head from Travis matrix & fix jruby failures (#5015)
   * Remove useless statement from Configuration test (#5065)
   * Change baseurl to example.com for some test cases (#5068)
+  * use activesupport < 5 if we are on a Ruby < 2.2.2 (#5100)
 
 ### Site Enhancements
 

From a3cd58431100bbd2c12a3fe674e51b08dc9d9614 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 12 Jul 2016 20:17:44 -0700
Subject: [PATCH 1118/4996] Update activesupport handling and add comment to
 Gemfile.

/cc #5100
---
 Gemfile                    | 3 ++-
 site/_docs/contributing.md | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6b1db4c5f69..1f49e56a339 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,8 @@ gemspec :name => "jekyll"
 
 gem "rake", "~> 11.0"
 
-gem "activesupport", "~> 4.2", :groups => [:test_legacy, :site] if RUBY_ENGINE == 'ruby' && RUBY_VERSION < '2.2.2'
+# Dependency of jekyll-mentions. RubyGems in Ruby 2.1 doesn't shield us from this.
+gem "activesupport", "~> 4.2", :groups => [:test_legacy, :site] if RUBY_VERSION < '2.2.2'
 
 group :development do
   gem "launchy", "~> 2.3"
diff --git a/site/_docs/contributing.md b/site/_docs/contributing.md
index 3c28953f733..4038df0d0d2 100644
--- a/site/_docs/contributing.md
+++ b/site/_docs/contributing.md
@@ -73,7 +73,7 @@ One gotcha, all pull requests should be directed at the `master` branch (the def
 
 ### Adding plugins
 
-If you want to add your plugin to the [list of plugins](https://jekyllrb.com/docs/plugins/#available-plugins), please submit a pull request modifying the [plugins page source file](https://jekyllrb.com/docs/plugins/) by adding a link to your plugin under the proper subheading depending upon its type.
+If you want to add your plugin to the [list of plugins](https://jekyllrb.com/docs/plugins/#available-plugins), please submit a pull request modifying the [plugins page source file](site/_docs/plugins.md) by adding a link to your plugin under the proper subheading depending upon its type.
 
 ## Code Contributions
 

From 9336ad0fcf911e4fcde0d32abfeee464674f0f01 Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Wed, 13 Jul 2016 14:47:14 +0800
Subject: [PATCH 1119/4996] Add to_integer filter

---
 lib/jekyll/filters.rb |  9 ++++++++-
 test/test_filters.rb  | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 71e0dabdbfb..6e794bb02b2 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -266,7 +266,14 @@ def where_exp(input, variable, expression)
     #
     # Returns the integer value
     def to_integer(input)
-      input.to_i
+      return input if input.is_a?(Integer)
+      return 1 if input == true
+      return 0 if input == false
+      begin
+        input.to_i
+      rescue
+        raise ArgumentError, "Invalid input object type."
+      end
     end
 
     # Sort an array of objects
diff --git a/test/test_filters.rb b/test/test_filters.rb
index fa0f9e52180..c916bab926f 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -26,6 +26,7 @@ def initialize(opts = {})
       @sample_date = Date.parse("2013-03-27")
       @time_as_string = "September 11, 2001 12:46:30 -0000"
       @time_as_numeric = 1_399_680_607
+      @integer_as_string = "142857"
       @array_of_objects = [
         { "color" => "red",  "size" => "large"  },
         { "color" => "red",  "size" => "medium" },
@@ -235,6 +236,13 @@ def initialize(opts = {})
             @filter.date_to_rfc822(@time_as_string)
           )
         end
+
+        should "convert a String to Integer" do
+          assert_equal(
+            142857,
+            @filter.to_integer(@integer_as_string)
+          )
+        end
       end
 
       context "with a Numeric object" do
@@ -635,6 +643,30 @@ def to_liquid
       end
     end
 
+    context "to_integer filter" do
+      should "raise Exception when input is not integer or string" do
+        err_msg = "Invalid input object type."
+        err = assert_raises ArgumentError do
+          @filter.to_integer([1, 2])
+        end
+        assert_equal err_msg, err.message
+      end
+      should "return 0 when input is nil" do
+        assert_equal 0, @filter.to_integer(nil)
+      end
+      should "return integer when input is boolean" do
+        assert_equal 0, @filter.to_integer(false)
+        assert_equal 1, @filter.to_integer(true)
+      end
+      should "return integers" do
+        assert_equal 0, @filter.to_integer(0)
+        assert_equal 1, @filter.to_integer(1)
+        assert_equal 1, @filter.to_integer(1.42857)
+        assert_equal -1, @filter.to_integer(-1)
+        assert_equal -1, @filter.to_integer(-1.42857)
+      end
+    end
+
     context "inspect filter" do
       should "return a HTML-escaped string representation of an object" do
         assert_equal "{"<a>"=>1}", @filter.inspect({ "" => 1 })

From 218c7039a9b09504d81bdcf1617981eb9c788616 Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Wed, 13 Jul 2016 15:13:20 +0800
Subject: [PATCH 1120/4996] Fix test_filter: parenthesize the method

---
 test/test_filters.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index c916bab926f..55856044a66 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -662,8 +662,8 @@ def to_liquid
         assert_equal 0, @filter.to_integer(0)
         assert_equal 1, @filter.to_integer(1)
         assert_equal 1, @filter.to_integer(1.42857)
-        assert_equal -1, @filter.to_integer(-1)
-        assert_equal -1, @filter.to_integer(-1.42857)
+        assert_equal(-1, @filter.to_integer(-1))
+        assert_equal(-1, @filter.to_integer(-1.42857))
       end
     end
 

From 5c6c01793c940569f29880eff338da566f406a0b Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Wed, 13 Jul 2016 15:32:34 +0800
Subject: [PATCH 1121/4996] Fix offense: seperate every 3 digits with _

---
 test/test_filters.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index 55856044a66..06fa59ff697 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -239,7 +239,7 @@ def initialize(opts = {})
 
         should "convert a String to Integer" do
           assert_equal(
-            142857,
+            142_857,
             @filter.to_integer(@integer_as_string)
           )
         end

From 75989fdb3eb86d3dd03c3bccb4a2dbef3566e3b5 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 13 Jul 2016 14:51:12 -0700
Subject: [PATCH 1122/4996] Add definitions for feature & bug to maintainer
 docs.

---
 docs/triaging-an-issue.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/triaging-an-issue.md b/docs/triaging-an-issue.md
index a6f24447e73..10da324a3f4 100644
--- a/docs/triaging-an-issue.md
+++ b/docs/triaging-an-issue.md
@@ -2,7 +2,14 @@
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
 
-Here are some key things to remember when evaluating an issue.
+Before evaluating an issue, it is important to identify if it is a feature
+request or a bug. For the Jekyll project the following definitions are used
+to identify a feature or a bug:
+
+**Feature** - A feature is defined as a request that adds functionality to
+Jekyll outside of its current capabilities.
+**Bug** - A bug is defined as an issue that identifies an error that a user
+(or users) encounter when using current Jekyll functionalities.
 
 ## Feature?
 

From 8a3ea59141d721b09a762d7ae26e677b173bfcfa Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 13 Jul 2016 14:52:11 -0700
Subject: [PATCH 1123/4996] Update history to reflect merge of #5011 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e140d49f0a7..0806d6ffd81 100644
--- a/History.markdown
+++ b/History.markdown
@@ -113,6 +113,7 @@
   * Remove useless statement from Configuration test (#5065)
   * Change baseurl to example.com for some test cases (#5068)
   * use activesupport < 5 if we are on a Ruby < 2.2.2 (#5100)
+  * Internal documentation for working on Jekyll (#5011)
 
 ### Site Enhancements
 

From 5e760a206ace6095c6adb99ec85fb50812a44a61 Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Thu, 14 Jul 2016 11:05:30 +0800
Subject: [PATCH 1124/4996] rubocop:disable Metrics/ModuleLength

---
 lib/jekyll/filters.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 6e794bb02b2..73e662298ab 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -4,6 +4,7 @@
 require "liquid"
 
 module Jekyll
+  # rubocop:disable Metrics/ModuleLength
   module Filters
     # Convert a Markdown string into HTML output.
     #

From b1f9a0809c19929305470ed6e0437635cb121cc9 Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Thu, 14 Jul 2016 11:27:47 +0800
Subject: [PATCH 1125/4996] More descriptive exception

---
 lib/jekyll/filters.rb | 2 +-
 test/test_filters.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 73e662298ab..06a4147fbe1 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -273,7 +273,7 @@ def to_integer(input)
       begin
         input.to_i
       rescue
-        raise ArgumentError, "Invalid input object type."
+        raise ArgumentError, "Object '#{input.inspect}' could not be converted into an integer."
       end
     end
 
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 06fa59ff697..c8d4a68b805 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -645,7 +645,7 @@ def to_liquid
 
     context "to_integer filter" do
       should "raise Exception when input is not integer or string" do
-        err_msg = "Invalid input object type."
+        err_msg = "Object '[1, 2]' could not be converted into an integer."
         err = assert_raises ArgumentError do
           @filter.to_integer([1, 2])
         end

From e503c17dfa1de5e06a8f461201e74c43b1442ae3 Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Thu, 14 Jul 2016 12:00:19 +0800
Subject: [PATCH 1126/4996] Fix fmt error

---
 lib/jekyll/filters.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 06a4147fbe1..1d89b830ca6 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -273,7 +273,8 @@ def to_integer(input)
       begin
         input.to_i
       rescue
-        raise ArgumentError, "Object '#{input.inspect}' could not be converted into an integer."
+        raise ArgumentError,
+          "Object '#{input.inspect}' could not be converted into an integer."
       end
     end
 

From b44457a80ba72500675e06e4c84439b130ed9f3d Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Thu, 14 Jul 2016 13:38:14 +0800
Subject: [PATCH 1127/4996] Remove if stmt for integer input

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

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 1d89b830ca6..d688fca9f42 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -267,7 +267,6 @@ def where_exp(input, variable, expression)
     #
     # Returns the integer value
     def to_integer(input)
-      return input if input.is_a?(Integer)
       return 1 if input == true
       return 0 if input == false
       begin

From 3435b5ddac271b462602e688e6526760a87da86f Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Thu, 14 Jul 2016 14:06:25 +0800
Subject: [PATCH 1128/4996] Remove rescue for to_i

---
 lib/jekyll/filters.rb | 8 +-------
 test/test_filters.rb  | 9 +++++++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index d688fca9f42..0ab50d49f69 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -4,7 +4,6 @@
 require "liquid"
 
 module Jekyll
-  # rubocop:disable Metrics/ModuleLength
   module Filters
     # Convert a Markdown string into HTML output.
     #
@@ -269,12 +268,7 @@ def where_exp(input, variable, expression)
     def to_integer(input)
       return 1 if input == true
       return 0 if input == false
-      begin
-        input.to_i
-      rescue
-        raise ArgumentError,
-          "Object '#{input.inspect}' could not be converted into an integer."
-      end
+      input.to_i
     end
 
     # Sort an array of objects
diff --git a/test/test_filters.rb b/test/test_filters.rb
index c8d4a68b805..bb97952421d 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -645,8 +645,13 @@ def to_liquid
 
     context "to_integer filter" do
       should "raise Exception when input is not integer or string" do
-        err_msg = "Object '[1, 2]' could not be converted into an integer."
-        err = assert_raises ArgumentError do
+        err_msg = <<-EOS.strip!
+undefined method `to_i' for [1, 2]:Array
+Did you mean?  to_s
+               to_a
+               to_h
+EOS
+        err = assert_raises NoMethodError do
           @filter.to_integer([1, 2])
         end
         assert_equal err_msg, err.message

From 9ef9c2fb644e1ec3b2f91aa5a598ddfa0e6a4519 Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Thu, 14 Jul 2016 14:15:23 +0800
Subject: [PATCH 1129/4996] Remove error message assert

---
 test/test_filters.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index bb97952421d..399ade72c69 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -645,16 +645,9 @@ def to_liquid
 
     context "to_integer filter" do
       should "raise Exception when input is not integer or string" do
-        err_msg = <<-EOS.strip!
-undefined method `to_i' for [1, 2]:Array
-Did you mean?  to_s
-               to_a
-               to_h
-EOS
-        err = assert_raises NoMethodError do
+        assert_raises NoMethodError do
           @filter.to_integer([1, 2])
         end
-        assert_equal err_msg, err.message
       end
       should "return 0 when input is nil" do
         assert_equal 0, @filter.to_integer(nil)

From 695b5396fde83c84d38b134f0024b9b88bf9fb48 Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Fri, 17 Jun 2016 15:44:08 +0300
Subject: [PATCH 1130/4996] rubocop: fix code style

---
 .rubocop.yml             |  1 -
 lib/jekyll/collection.rb | 34 ++++++++++++++++++++++------------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index f255cb76f05..426c61a8a46 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,6 @@ AllCops:
   Include:
   - lib/**/*.rb
   Exclude:
-  - lib/jekyll/collection.rb
   - lib/jekyll/convertible.rb
   - lib/jekyll/document.rb
   - lib/jekyll/renderer.rb
diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index 6ec72703332..88120d1fc6f 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -57,18 +57,9 @@ def read
         full_path = collection_dir(file_path)
         next if File.directory?(full_path)
         if Utils.has_yaml_header? full_path
-          doc = Jekyll::Document.new(full_path, { :site => site, :collection => self })
-          doc.read
-          if site.publisher.publish?(doc) || !write?
-            docs << doc
-          else
-            Jekyll.logger.debug "Skipped From Publishing:", doc.relative_path
-          end
+          read_docs(full_path)
         else
-          relative_dir = Jekyll.sanitized_path(relative_directory,
-            File.dirname(file_path)).chomp("/.")
-          files << StaticFile.new(site, site.source, relative_dir,
-            File.basename(full_path), self)
+          read_files(file_path, full_path)
         end
       end
       docs.sort!
@@ -164,7 +155,7 @@ def inspect
     #
     # Returns a sanitized version of the label.
     def sanitize_label(label)
-      label.gsub(/[^a-z0-9_\-\.]/i, "")
+      label.gsub(%r![^a-z0-9_\-\.]!i, "")
     end
 
     # Produce a representation of this Collection for use in Liquid.
@@ -204,5 +195,24 @@ def extract_metadata
         {}
       end
     end
+
+    private
+    def read_docs(full_path)
+      doc = Jekyll::Document.new(full_path, { :site => site, :collection => self })
+      doc.read
+      if site.publisher.publish?(doc) || !write?
+        docs << doc
+      else
+        Jekyll.logger.debug "Skipped From Publishing:", doc.relative_path
+      end
+    end
+
+    private
+    def read_files(file_path, full_path)
+      relative_dir = Jekyll.sanitized_path(relative_directory,
+                                           File.dirname(file_path)).chomp("/.")
+      files << StaticFile.new(site, site.source, relative_dir,
+                              File.basename(full_path), self)
+    end
   end
 end

From 0e8f2040113fd4ca49ca138925f6c01f9e7197b0 Mon Sep 17 00:00:00 2001
From: Marko Locher 
Date: Sat, 7 May 2016 16:58:44 +0200
Subject: [PATCH 1131/4996] Fix #3926 post_url helper with sub-directories

Instead of matching the the value provided to `post_url` against
the basename, test against the relative path.

Updated the regexp to match both
  * _posts/category
  * category/_posts
---
 lib/jekyll/tags/post_url.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb
index 04c1ef2957b..c8b820b8b30 100644
--- a/lib/jekyll/tags/post_url.rb
+++ b/lib/jekyll/tags/post_url.rb
@@ -14,7 +14,7 @@ def initialize(name)
             "'#{name}' does not contain valid date and/or title."
         end
 
-        @name_regex = %r!^#{path}#{date}-#{slug}\.[^.]+!
+        @name_regex = %r!^_posts/#{path}#{date}-#{slug}\.[^.]+|^#{path}_posts/?#{date}-#{slug}\.[^.]+!
       end
 
       def post_date
@@ -23,7 +23,7 @@ def post_date
       end
 
       def ==(other)
-        other.basename.match(@name_regex)
+        other.relative_path.match(@name_regex)
       end
 
       def deprecated_equality(other)

From 49e97ef9b01831e747f1466452f527cc4bcb9aa6 Mon Sep 17 00:00:00 2001
From: Marko Locher 
Date: Wed, 18 May 2016 14:29:51 +0200
Subject: [PATCH 1132/4996] Add test case for deprecated post comparison

Checks that `post_url` works for nested posts even if the path isn't specified. Also checks that a deprecation message is shown in the build log.
---
 test/test_tags.rb | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/test/test_tags.rb b/test/test_tags.rb
index 6b8fe8db78d..5bfbd2f8d75 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -587,6 +587,32 @@ def highlight_block_with_opts(options_string)
     end
   end
 
+  context "simple page with nested post linking and path not used in `post_url`" do
+    setup do
+      content = < 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+    end
+
+    should "not cause an error" do
+      refute_match(/markdown\-html\-error/, @result)
+    end
+
+    should "have the url to the \"nested\" post from 2008-11-21" do
+      assert_match %r{1\s/2008/11/21/nested/}, @result
+    end
+
+    should "throw a deprecation warning" do
+      deprecation_warning = "       Deprecation: A call to '{{ post_url 2008-11-21-nested }}' did not match a post using the new matching method of checking name (path-date-slug) equality. Please make sure that you change this tag to match the post's name exactly."
+      assert_includes Jekyll.logger.messages, deprecation_warning
+    end
+  end
+
   context "simple page with invalid post name linking" do
     should "cause an error" do
       content = <
Date: Thu, 14 Jul 2016 12:15:00 +0200
Subject: [PATCH 1133/4996] Fix Rubocop warnings

---
 lib/jekyll/tags/post_url.rb |  3 ++-
 test/test_tags.rb           | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb
index c8b820b8b30..b865cd67fdf 100644
--- a/lib/jekyll/tags/post_url.rb
+++ b/lib/jekyll/tags/post_url.rb
@@ -14,7 +14,8 @@ def initialize(name)
             "'#{name}' does not contain valid date and/or title."
         end
 
-        @name_regex = %r!^_posts/#{path}#{date}-#{slug}\.[^.]+|^#{path}_posts/?#{date}-#{slug}\.[^.]+!
+        @name_regex = %r!^_posts/#{path}#{date}-#{slug}\.[^.]+|
+          ^#{path}_posts/?#{date}-#{slug}\.[^.]+!x
       end
 
       def post_date
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 5bfbd2f8d75..7a92928185a 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -596,19 +596,27 @@ def highlight_block_with_opts(options_string)
 
 - 1 {% post_url 2008-11-21-nested %}
 CONTENT
-      create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+      create_post(content, {
+        "permalink"   => "pretty",
+        "source"      => source_dir,
+        "destination" => dest_dir,
+        "read_posts"  => true
+      })
     end
 
     should "not cause an error" do
-      refute_match(/markdown\-html\-error/, @result)
+      refute_match(%r!markdown\-html\-error!, @result)
     end
 
     should "have the url to the \"nested\" post from 2008-11-21" do
-      assert_match %r{1\s/2008/11/21/nested/}, @result
+      assert_match %r!1\s/2008/11/21/nested/!, @result
     end
 
     should "throw a deprecation warning" do
-      deprecation_warning = "       Deprecation: A call to '{{ post_url 2008-11-21-nested }}' did not match a post using the new matching method of checking name (path-date-slug) equality. Please make sure that you change this tag to match the post's name exactly."
+      deprecation_warning = "       Deprecation: A call to "\
+        "'{{ post_url 2008-11-21-nested }}' did not match a post using the new matching "\
+        "method of checking name (path-date-slug) equality. Please make sure that you "\
+        "change this tag to match the post's name exactly."
       assert_includes Jekyll.logger.messages, deprecation_warning
     end
   end

From 2b57795c7f24fb8be7a5d165d08e0a29de64f938 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 14 Jul 2016 13:08:25 -0500
Subject: [PATCH 1134/4996] Failing test: where_exp filter should filter posts

---
 test/test_filters.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index fa0f9e52180..1c5b27c6f47 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -594,6 +594,14 @@ def to_liquid
         assert_equal "b", results[1]["id"]
         assert_equal "d", results[2]["id"]
       end
+
+      should "filter posts" do
+        site = fixture_site.tap(&:read)
+        posts = site.site_payload["site"]["posts"]
+        results = @filter.where_exp(posts, "obj", "obj.title == 'Foo Bar'")
+        assert_equal 1, results.length
+        assert_equal site.posts.find { |p| p.title == "Foo Bar" }, results.first
+      end
     end
 
     context "sort filter" do

From 99663a919966e9f2f204b048f180e441f7a4bd32 Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Sun, 10 Jul 2016 20:52:39 +0200
Subject: [PATCH 1135/4996] object needs to respond to select instead of being
 an enumerable

---
 lib/jekyll/filters.rb |  8 ++++----
 test/test_filters.rb  | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 231eb7b6a87..f98845d281e 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -233,11 +233,11 @@ def group_by(input, property)
     #
     # Returns the filtered array of objects
     def where(input, property, value)
-      return input unless input.is_a?(Enumerable)
+      return input unless input.respond_to?(:select)
       input = input.values if input.is_a?(Hash)
       input.select do |object|
         Array(item_property(object, property)).map(&:to_s).include?(value.to_s)
-      end
+      end || []
     end
 
     # Filters an array of objects against an expression
@@ -248,7 +248,7 @@ def where(input, property, value)
     #
     # Returns the filtered array of objects
     def where_exp(input, variable, expression)
-      return input unless input.is_a?(Enumerable)
+      return input unless input.respond_to?(:select)
       input = input.values if input.is_a?(Hash) # FIXME
 
       condition = parse_condition(expression)
@@ -257,7 +257,7 @@ def where_exp(input, variable, expression)
           @context[variable] = object
           condition.evaluate(@context)
         end
-      end
+      end || []
     end
 
     # Sort an array of objects
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 1c5b27c6f47..b6effecdbf6 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -15,6 +15,10 @@ def initialize(opts = {})
     end
   end
 
+  class SelectDummy
+    def select; end
+  end
+
   context "filters" do
     setup do
       @filter = JekyllFilter.new({
@@ -530,6 +534,11 @@ def to_liquid
         assert_equal 1, results.length
         assert_equal 4.7, results[0]["rating"]
       end
+
+      should "always return an array if the object responds to `select`" do
+        results = @filter.where(SelectDummy.new, "obj", "1 == 1")
+        assert_equal [], results
+      end
     end
 
     context "where_exp filter" do
@@ -602,6 +611,11 @@ def to_liquid
         assert_equal 1, results.length
         assert_equal site.posts.find { |p| p.title == "Foo Bar" }, results.first
       end
+
+      should "always return an array if the object responds to `select`" do
+        results = @filter.where_exp(SelectDummy.new, "obj", "1 == 1")
+        assert_equal [], results
+      end
     end
 
     context "sort filter" do

From 83a72606b3a0bb89696ce69bcf6f6de971137fb4 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 14 Jul 2016 16:23:02 -0700
Subject: [PATCH 1136/4996] Add a test to ensure the Apache bug doesn't come up
 again.

---
 features/highlighting.feature | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 features/highlighting.feature

diff --git a/features/highlighting.feature b/features/highlighting.feature
new file mode 100644
index 00000000000..c9f2b00acec
--- /dev/null
+++ b/features/highlighting.feature
@@ -0,0 +1,33 @@
+Feature: Syntax Highlighting
+  As a hacker who likes to blog
+  I want to share code snippets in my blog
+  And make them pretty for all the world to see
+
+  Scenario: highlighting an apache configuration
+    Given I have an "index.html" file with content:
+      """
+      ---
+      ---
+
+      {% highlight apache %}
+      RewriteEngine On
+      RewriteCond %{REQUEST_FILENAME} !-f
+      RewriteCond %{REQUEST_FILENAME} !-d
+      RewriteRule ^(.*)$ index.php [QSA,L]
+      {% endhighlight %}
+
+      ```apache
+      RewriteEngine On
+      RewriteCond %{REQUEST_FILENAME} !-f
+      RewriteCond %{REQUEST_FILENAME} !-d
+      RewriteRule ^(.*)$ index.php [QSA,L]
+      ```
+      """
+    And I have a "_config.yml" file with content:
+      """
+      kramdown:
+        input: GFM
+      """
+    When I run jekyll build
+    Then I should get a zero exit-status
+    And I should see "RewriteCond" in "_site/index.html"

From 20b3758edb05130135cfb620a8aa5ca0db059679 Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Wed, 13 Jul 2016 10:52:18 +0800
Subject: [PATCH 1137/4996] Add to_integer filter

Add to_integer filter

Fix test_filter: parenthesize the method

Fix offense: seperate every 3 digits with _

rubocop:disable Metrics/ModuleLength

More descriptive exception

Fix fmt error

Remove if stmt for integer input

Remove rescue for to_i

Remove error message assert
---
 lib/jekyll/filters.rb | 11 +++++++++++
 test/test_filters.rb  | 30 ++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 231eb7b6a87..0ab50d49f69 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -260,6 +260,17 @@ def where_exp(input, variable, expression)
       end
     end
 
+    # Convert the input into integer
+    #
+    # input - the object string
+    #
+    # Returns the integer value
+    def to_integer(input)
+      return 1 if input == true
+      return 0 if input == false
+      input.to_i
+    end
+
     # Sort an array of objects
     #
     # input - the object array
diff --git a/test/test_filters.rb b/test/test_filters.rb
index fa0f9e52180..399ade72c69 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -26,6 +26,7 @@ def initialize(opts = {})
       @sample_date = Date.parse("2013-03-27")
       @time_as_string = "September 11, 2001 12:46:30 -0000"
       @time_as_numeric = 1_399_680_607
+      @integer_as_string = "142857"
       @array_of_objects = [
         { "color" => "red",  "size" => "large"  },
         { "color" => "red",  "size" => "medium" },
@@ -235,6 +236,13 @@ def initialize(opts = {})
             @filter.date_to_rfc822(@time_as_string)
           )
         end
+
+        should "convert a String to Integer" do
+          assert_equal(
+            142_857,
+            @filter.to_integer(@integer_as_string)
+          )
+        end
       end
 
       context "with a Numeric object" do
@@ -635,6 +643,28 @@ def to_liquid
       end
     end
 
+    context "to_integer filter" do
+      should "raise Exception when input is not integer or string" do
+        assert_raises NoMethodError do
+          @filter.to_integer([1, 2])
+        end
+      end
+      should "return 0 when input is nil" do
+        assert_equal 0, @filter.to_integer(nil)
+      end
+      should "return integer when input is boolean" do
+        assert_equal 0, @filter.to_integer(false)
+        assert_equal 1, @filter.to_integer(true)
+      end
+      should "return integers" do
+        assert_equal 0, @filter.to_integer(0)
+        assert_equal 1, @filter.to_integer(1)
+        assert_equal 1, @filter.to_integer(1.42857)
+        assert_equal(-1, @filter.to_integer(-1))
+        assert_equal(-1, @filter.to_integer(-1.42857))
+      end
+    end
+
     context "inspect filter" do
       should "return a HTML-escaped string representation of an object" do
         assert_equal "{"<a>"=>1}", @filter.inspect({ "" => 1 })

From 3b6561a57c7b2fa35675d514ffd1523d6d6f85c4 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 14 Jul 2016 19:55:09 -0700
Subject: [PATCH 1138/4996] Update history to reflect merge of #5053 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0806d6ffd81..e1b6c8b040d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -34,6 +34,7 @@
   * Add fetch method to Drops (#5056)
   * Extract tag name to class method (#5063)
   * check if relative URL contains a colon (#5069)
+  * Enable strict (or lax) liquid parsing via a config variable. (#5053)
 
 ### Bug Fixes
 

From b88f0a21d653129328ef07e6b2916d4f7b1c4d70 Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Fri, 15 Jul 2016 10:31:02 +0300
Subject: [PATCH 1139/4996] hooks: move after_init hook call at the end of
 Site.initialize

---
 lib/jekyll/site.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 978f64a6afd..14f9369c657 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -29,10 +29,10 @@ def initialize(config)
 
       Jekyll.sites << self
 
-      Jekyll::Hooks.trigger :site, :after_init, self
-
       reset
       setup
+
+      Jekyll::Hooks.trigger :site, :after_init, self
     end
 
     # Public: Set the site's configuration. This handles side-effects caused by

From b9f232e5bfeb621f37e558ca0379d2f98344a95a Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Fri, 15 Jul 2016 10:56:29 +0300
Subject: [PATCH 1140/4996] rubocop: fix methods naming and indentation

---
 lib/jekyll/collection.rb | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index 88120d1fc6f..ebe6891c20a 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -57,9 +57,9 @@ def read
         full_path = collection_dir(file_path)
         next if File.directory?(full_path)
         if Utils.has_yaml_header? full_path
-          read_docs(full_path)
+          read_document(full_path)
         else
-          read_files(file_path, full_path)
+          read_static_file(file_path, full_path)
         end
       end
       docs.sort!
@@ -197,8 +197,8 @@ def extract_metadata
     end
 
     private
-    def read_docs(full_path)
-      doc = Jekyll::Document.new(full_path, { :site => site, :collection => self })
+    def read_document(full_path)
+      doc = Jekyll::Document.new(full_path, :site => site, :collection => self)
       doc.read
       if site.publisher.publish?(doc) || !write?
         docs << doc
@@ -208,11 +208,14 @@ def read_docs(full_path)
     end
 
     private
-    def read_files(file_path, full_path)
-      relative_dir = Jekyll.sanitized_path(relative_directory,
-                                           File.dirname(file_path)).chomp("/.")
+    def read_static_file(file_path, full_path)
+      relative_dir = Jekyll.sanitized_path(
+        relative_directory,
+        File.dirname(file_path)
+      ).chomp("/.")
+
       files << StaticFile.new(site, site.source, relative_dir,
-                              File.basename(full_path), self)
+        File.basename(full_path), self)
     end
   end
 end

From 0db1ec339d39cd06f2f91746fcd4b45c827bf655 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Jul 2016 09:58:09 -0700
Subject: [PATCH 1141/4996] Update history to reflect merge of #5101 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e1b6c8b040d..24dd8e541a0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -35,6 +35,7 @@
   * Extract tag name to class method (#5063)
   * check if relative URL contains a colon (#5069)
   * Enable strict (or lax) liquid parsing via a config variable. (#5053)
+  * Add filter: to_integer (#5101)
 
 ### Bug Fixes
 

From 196275f5b4e885a5489fcdda1898694af2e4ebc8 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Jul 2016 17:26:14 -0700
Subject: [PATCH 1142/4996] Update history to reflect merge of #5060 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 24dd8e541a0..312920eec33 100644
--- a/History.markdown
+++ b/History.markdown
@@ -55,6 +55,7 @@
   * `Serve.process` should receive same config as `Build.process` (#4953)
   * Prevent reset of page in Liquid payload right before rendering layouts (#5009)
   * Add missing fields to ExcerptDrop (#5067)
+  * Stringify configuration overrides before first use (#5060)
 
 ### Forward Ports
 

From 10cfaa2a75e6ee81335d598eb155754fdee89654 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Jul 2016 19:24:03 -0700
Subject: [PATCH 1143/4996] Update history to reflect merge of #5106 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 312920eec33..5fb67a20a79 100644
--- a/History.markdown
+++ b/History.markdown
@@ -56,6 +56,7 @@
   * Prevent reset of page in Liquid payload right before rendering layouts (#5009)
   * Add missing fields to ExcerptDrop (#5067)
   * Stringify configuration overrides before first use (#5060)
+  * hooks: move after_init hook call at the end of Site.initialize (#5106)
 
 ### Forward Ports
 

From 5e74610755e9faeacadf647b2373d7b68ab8b3fd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Jul 2016 19:39:42 -0700
Subject: [PATCH 1144/4996] Update history to reflect merge of #5022 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5fb67a20a79..3ac64babf2a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -118,6 +118,7 @@
   * Change baseurl to example.com for some test cases (#5068)
   * use activesupport < 5 if we are on a Ruby < 2.2.2 (#5100)
   * Internal documentation for working on Jekyll (#5011)
+  * rubocop: lib/jekyll/collection.rb (#5022)
 
 ### Site Enhancements
 

From 311e3d2fef137903bd97ba4f1d258ca50d148076 Mon Sep 17 00:00:00 2001
From: XhmikosR 
Date: Mon, 18 Jul 2016 18:27:38 +0300
Subject: [PATCH 1145/4996] Slightly, improve PNG compression.

Before: 101 KB (103.742 bytes)
After:  100 KB (102.817 bytes)
---
 site/img/article-footer.png | Bin 1863 -> 1581 bytes
 site/img/footer-logo.png    | Bin 3783 -> 3688 bytes
 site/img/logo-2x.png        | Bin 46514 -> 45966 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/site/img/article-footer.png b/site/img/article-footer.png
index d000cf08cd1be7d8ef746e3cc712c239fcc7c3d5..eeb74411cd0b8dcc59d3684192ea7dd45e345d20 100644
GIT binary patch
literal 1581
zcmb_cXE+-O0F4%Jpp3k5|UEVKp9y%c@S7ZQAv5<
z{-0EShNwc-{=X@6pfUgeDH%t58!wy~e=NIt%tY18`R;RkX=00TiQL
z1zU%Hn_eBl?=HI!ENGreqvi?+sAciJUyax5u&egVn)z;z23H%{U9LI-l$zyggP={~uE4teYn;!eK-^%vts;3HSeOK!D
zGde^^IDV}SN=WS-f2X@ceGyM3XeWE&IZbBq4Pgs%6%yp<}|9F{qRK`kf{3OvpZb
zupIeY^87J^eNr@y2W99RPui;A;Ya##K420`8jJ}F-NrNM2+eyuzf;%xzfux8Syd7W
zu%jd`gE$qPI`IgZzfB3SKuQ2jkT5EJ%3GP-g7AG40z0JdAeR?qBd!tRl8upNn#cSSxJf4xIykg
zr}geTT3L_G7wMWnm->b?KMFT-y3zb_gT;cplH0$S_6$V5Gq2~FS`P$EtP$kMrHa|K
z_UpspDHYph@&t4M4(~Dn#Oq^poKwXnkU>Ws+Y08VcZi)b!GSj=hsd4P=_`M4$LSA`
zh01KKbvffaEi4e2LxI~<3#|-xDV+n{|f+BIl=FR=r!aCbhc1O(4u{2XAocGs&gT=QAkV%JCi<
zfp`YhShM&H<I}U8=megSv|pY~o7iV2?q6z&_iQoHWuVGEB8~Q#3Ha&BX}4@d&%9
z$S&fEgt>tWezWM_0|kAboLL3RJ}(@JX}$H(8}UIDLPD6UEf(D_3?f7Q<^vg5Bl$f%
z#-D~yo(aB+U)1s-2HNzr6+&{T#p)Y~cRA%O)+|=O9-&mdy2+Pl(pogAIa~&FI2csX
zfHbQb%7Zb-csRkZ-A7r>rQGwV?vLTgk4EhTffP{=TSu$??8UZXuTd9}5Y7omAkq7-
zv92Mcfs;x?!DOIoB)2Jhta{1$eTM$~_4#rcl
ztg_#~b@G;QBu^JZ*^)iD41coTb8BIE4fCth0w){J5rQQl?!MMr)nKDFDW%hOR#z6)IwHiatva$Qp{Np@(v)l+>%Ln@
z%O*-SiMXP!ZKbN~P8=m_NurG|T77u-?aYpO^Jd=nkKgb6`~0rE?ylz{U~Mn}0DxR@
zcJKfIq&g0~yS(&49KPjMeUNJ0(U%?f|D%KIARms0`QNR>@P7{f4G)_G|9|z@<^Ov0
z7p%+PEj-vq#d)}10ssM0Kxru%kgT+vyo>@^38W|skyBPtRgnKmNl^`~3{h26fqtc~
zp$Ug+X~8wMHJ~tc?e>$IQUHLg{sjly%Lzcy^gI#j2z8RA$%M!#IN9C5dX!Ri;5R?~0(_HMOXih_6E^JmJZ`R4@G>)YH(F_XBh(k|V@qj5LE?-QQ?f?kUc
zXeBhPCu}P|tK+^$cw&gKLB035GBcHr8Oy#JpY$E)gE~Ar2eK$H47S}>S?RQn;q0Yf
z*!1syHXa%4f7Lm}&NOPtNed?!p1#Ydn4V>=FJ88+snl2lUD}IIG=7Odbzl&@OrOmY
zN$sWF($$pd&eByP)T~Ue6{b2ojKOk
z*{JVkHI$`u^@fG=6ABMvrVMav+-BoR`{6vQVmw*CK#O*SY1ILG_9GUD#m;bsNG2@T
zW4AK)^5?QalL8yOjn!aTu<8I<{RaT@x;mXs6Gv&${M)8{ak6ks5oqFK-EDJ7!{Bkn
z5PcZaD8c1EenSV4Y$T!ZLnqxpz01WttXgce7=O*EUroq!&ddKb0guUon1>f-^nEh&
zPosY#bO{I9zqc*4T7Rucym?~5ec|UG*7B5^7&_HmEIVXB2w%Jl8<4#>uQMI+fsA{X
zTq`Tt5#f}?8@{Q2)mUFX(9ir!O!dj&9daNVpY@)J6U8{hM4U_bxSk!?rym*LGS0x%
z-&ASUuhqX&K1-}f%uOswENDlc?G~R9p4t4T@Y38$(@)sl)>*l&l!yBRN$1|k-Ra)`
zp>YILxzQEsUr%ePm?st|796bQo^dOm-Le#3Tnn1GhNA|TDw^m$F~465=5)nbj7rD#
zGICDuSq|U^K46AQnSG_s{*d;q-|s#?+I;7+Gq^?<>X4TIIv0hA1~Qr!G$J^}8I%5Z
zff-)Fr^Myrhk{|rA1H88Wgq*PrHCOFs68O6qp-0h{G0Ap98~x8R$XKgD4K#t49)7=
z5k7A;X>j_}OGvxK)McL!;1=Y|+Rf55{BHOME}>n#lr7x+?AdkYQP0W|z&t9zRM1OH
zb}X;0**1%~O}M@k*3~(>Ilc=DIugD^carI$)$yVeR*ji+uf
z^M!FC`(e&G(Qx`03a7D%NCEoDq$5>ZQ@yHSj961c7NUx0gOdpB?c;8}^#JhGsMDTS-h7JqvPmZ2xg5cH(=-xw
ziy@-UIIhRv2Wa%Zm@;;G1q;uqDQ7bpo)bEhEnVT193*N)qKoJ_dfMd~o-JG?cBq=<
zK1jKUZnkzhRo(7$r7>dkU!7zOffplxTGt@BP}Hzw+n7Yg2(EsaTc4y$6MJb>dM?09
zDOC8xYz?eIOmZ~Wy(eI<7J06$h5DPW-N0gzkBy6{OT}(RI`Ql>%pecwZI2$HvMM49
z*L=&H#zwsWqGKYGo+NU>gWr%xXq(vKZ=LGZvKDARL?8)tV!Z{B%-IQvek}Yl@<{&*t#*
z|LWk-^laj9DNabHV%Pt{e$pco-DyGjz<*uNe@g&H*yXS`UTv
z3MP(uJjVD2Vd-o=Tx3HQppZ~rW6^h3Ay?#e1Ot!dqr?}osJ_Un3oe*f_=BTh}B}q)30AB6~?<-%^~7%4#$bRkYZJFdV>
z@cbZ*q}}37HkU65Jhft}T#=4Ztyy(}=hSFw(kT+Hw!qWrm|f{qvECDR)*pWiw-}8N
zw8?Z^n+1#Z?lC@&EsW#%bA7k}+PtjY+@{&EO18F}+D2-`tZm!2?Q7e%Z6(d_d1hyJ
zc94F~_iec6x8CQ>ILRo%B?AOPLdjTR;Sumjow{VEdJwBm${IkdAsHnSLQyUWS=n^_C%x4q3Mkbm>bTD)ocAG8JV=V?&1Z
zhdy_BK64rXPk9H*kVb|K3xQ69$Xy|b43;4c4CxvIorVr0H^YZQXoPd+K)0zbauW+q9C-+g
zZzE7VP=?f^HS|j$cXxu5NFI_Plq^GPP$LEUrINceaB7i<1PCR_km@-j;RosDE(4rM
z8PbT5o#6-Lijli%;PiiyAq@yQY&ulQJ!59vtl4wsR+&Bf&bZ{nfO)vtd@Way1u~=o
zAs51{a*Gx(2_tt)mvv5Ez5@ShO&+R(Q(T5LAY@*6v2yY%VmVi@88QJtJb79Rv7zhy
zA5w-~4`o9pk~d+YcRfr38z8ok{2x+=jDeCKo5**=?t#eAmi~VaDMR)y2L;PlksdWB
zD312Xkbblo3hH+weYU{UR+1qN2st0TZKT^8xZB=MhBP4LgW&aal75Bf;bs$RI>~^L
zGUOVt?x{rnaNE`i$P}}K7&4?jCBcbWO@7jQ=dQ*89BX&)A%+a8Q{BDb%qD-@7dVhO
zGNgX{!8uTg%p!k7>bDV`LX?9-%8>cM$h}X7G&^Lq9Sv{4{q}>0R*`1i4)dS)n@5Ip
zHEfW4HYC
zS`b-Vm)u34ISo~g#hVcF(Ahi!=Q5lma{hwoyVqV+6>@*w!h9)Uq~t$CDs2N}G5Nz{
zh+U$a?Yn*Vsl!mKtO+46L#!!@L_lbyijaY`OF>a`RZ?X+7?a2!T6>*OUV0_G*IsB5
zU_!_kO?SQ!i}4=v>QH#I;*zdA?@~@vLT*@D8jM>!qz1E8v?w}`|0hfcxvCr>Lwa?s
z8+mgbj2nNZgnSS(q#9d&AJ=&_Cx@KiP_{Rxg~Y?;#baPRn3F?lXZMifn)-MQsH099
z(oP}qcro7=dOFFF)`!$EbW;ancay-d;*(W)Vx0jYWyo?DNl7Bao+N>%pvp`GLduZ1
zOiG^CFbPigK$Uq$gp?smKS&CuL#!qV1V9ys5g~tNNZd~f4nXV~8PawkbGwM=;1^nk
zv{^_LCSDZ8&dZSY3wamu_=_Y%niuli<(ikyOxp2mn}YX1LG@wULl!qD@M>rexx}21^!y76nHk7l%x@qowEd3U2S{Us(*?uXNPQm
zNYj6$agz3sPsosFglt6u&az;FQg1feZe@W`3-@&7KW4|
zZ`Xcs)anqsYGFtja@f6^H#)uyu{aAu%8>L5#6}V)i2omQaL5BO%3ij6$Sn|iRqGBY
z^tV2wb-S^w4;c)xmBdMc*jOt=%8*MT_BelWUV~UlUGnt03~5qGDi5LRns-a#S@QHo
zTue6Qj0!1320$oE`+)Lf^3GvYNEz}4h!N*aFrKn9qzoCOHDo6+`dJxLhHRxZWVZ0;7ceLduY(iFE^v(-wx5AuI4p%XkZ%w=EATpS5ZTSrvbr
zcdQF3L+*l5DdLp@!?DzwkTN8{7Vi@8NpNaf7E*@n&wnVzX$DU2VpfHeA*VoS7xAj5
zfV04=kTRshhs~}b;FNn?hP2n`k?)X#8(_Ux*OHJjG2SF$xbUm%8(yG>;Y2p
zGtU3$@32#^&@;y6+EMZE>
zx=|3CO3LD(WJPSWr6D7tZ4|PCDIr6Zry*HIpsdVeblnl5b{Ham3NvEa;@_G
zKQ9Sh9J^~nRmv{+%yy*$u^oLvk#)QeHhnxe>
z*6bynZ@vI%4w)tIV@oN!J!QZ+>>_V!=dwY_XTVA*>@qjx2C(vdPXFuHF#K^qZAeB$
zorSe2(?cbqz!^o}b+tjrbSQr~y0%sK*|Rqmh=~k&-h_~6px|83X=@tIy;@+#F)-MW
zjPfrG4qr33X6ohlpkOC?*R8+xA>V*HM~fOC@=$w|sq>EIAuF2|vX%Fc8*CS{^hr|3^{Ri>Ay@6SPspWH
z?G|zXsZ}?`;*d1JJ|QW|ZXtt7wXhJ2LpHQg$S-Xc@^#W6tfaLesh@p9Qh!^8oUntm
zaE-J!WbioqgiN4V14sd*8Nb^>5klavLtq*Ou_vEvMHJMl<-VkZg6TXj3z&c4&D;C
zaxXZ!B7g4u5E-Fc(*-j;{_b}}W-nPsrmNk&!V1xa-}UfEoi&6^-3tH!002ovPDHLkV1fvgj4J>D

delta 3032
zcmZWrX*iS(8=a!EjxqM7%%e$0r7$XFo3T72B(hYtn3Off@}hXiEDh3QEENh-l8`+~
zy?T{rYIrpj$yOQ3p0!AP^Zx#Ro^##jzOU86plI+ANHSA?DüTQS&ua{g4C!y2
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
LJ6ctdd@uhG+$@f(

diff --git a/site/img/logo-2x.png b/site/img/logo-2x.png
index 28b9cd8d1c0741a956a7d22bdfda46a54a4213a0..57af994c61aed71f4c7ad11685d7baebd1fec373 100644
GIT binary patch
literal 45966
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̂l{EE@V
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
UV0TLl2>6keRQg=`$t39i0cd-D5dZ)H


From dbc034990935daf1148cafbadbad03d8445b174c Mon Sep 17 00:00:00 2001
From: XhmikosR 
Date: Mon, 18 Jul 2016 15:05:06 +0300
Subject: [PATCH 1146/4996] tests: Typo fixes.

---
 test/test_collections.rb    |  4 ++--
 test/test_commands_serve.rb |  2 +-
 test/test_convertible.rb    | 14 +++++++-------
 test/test_doctor_command.rb |  2 +-
 test/test_document.rb       | 14 +++++++-------
 test/test_excerpt.rb        |  2 +-
 test/test_filters.rb        |  2 +-
 test/test_page.rb           | 20 ++++++++++----------
 test/test_regenerator.rb    |  4 ++--
 test/test_related_posts.rb  |  4 ++--
 test/test_site.rb           | 10 +++++-----
 test/test_static_file.rb    |  4 ++--
 test/test_tags.rb           | 12 ++++++------
 test/test_utils.rb          |  4 ++--
 14 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/test/test_collections.rb b/test/test_collections.rb
index 795c0d8b0f3..3ae1ab12d4a 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -28,7 +28,7 @@ class TestCollections < JekyllUnitTest
       assert_equal @collection.label, "methods"
     end
 
-    should "have default url template" do
+    should "have default URL template" do
       assert_equal @collection.url_template, "/:collection/:path:output_ext"
     end
 
@@ -99,7 +99,7 @@ class TestCollections < JekyllUnitTest
       @collection = @site.collections["methods"]
     end
 
-    should "have custom url template" do
+    should "have custom URL template" do
       assert_equal @collection.url_template, "/awesome/:path/"
     end
   end
diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb
index f129a07ece2..7e8a7062bc4 100644
--- a/test/test_commands_serve.rb
+++ b/test/test_commands_serve.rb
@@ -99,7 +99,7 @@ def custom_opts(what)
         end
       end
 
-      context "enabling ssl" do
+      context "enabling SSL" do
         should "raise if enabling without key or cert" do
           assert_raises RuntimeError do
             custom_opts({
diff --git a/test/test_convertible.rb b/test/test_convertible.rb
index 0280946f085..82d643748a7 100644
--- a/test/test_convertible.rb
+++ b/test/test_convertible.rb
@@ -2,7 +2,7 @@
 require "ostruct"
 
 class TestConvertible < JekyllUnitTest
-  context "yaml front-matter" do
+  context "YAML front matter" do
     setup do
       @convertible = OpenStruct.new(
         "site" => Site.new(Jekyll.configuration(
@@ -13,17 +13,17 @@ class TestConvertible < JekyllUnitTest
       @base = File.expand_path("../fixtures", __FILE__)
     end
 
-    should "parse the front-matter correctly" do
+    should "parse the front matter correctly" do
       ret = @convertible.read_yaml(@base, "front_matter.erb")
       assert_equal({ "test" => "good" }, ret)
     end
 
-    should "not parse if the front-matter is not at the start of the file" do
+    should "not parse if the front matter is not at the start of the file" do
       ret = @convertible.read_yaml(@base, "broken_front_matter1.erb")
       assert_equal({}, ret)
     end
 
-    should "not parse if there is syntax error in front-matter" do
+    should "not parse if there is syntax error in front matter" do
       name = "broken_front_matter2.erb"
       out = capture_stderr do
         ret = @convertible.read_yaml(@base, name)
@@ -33,7 +33,7 @@ class TestConvertible < JekyllUnitTest
       assert_match(%r!#{File.join(@base, name)}!, out)
     end
 
-    should "not allow ruby objects in yaml" do
+    should "not allow ruby objects in YAML" do
       out = capture_stderr do
         @convertible.read_yaml(@base, "exploit_front_matter.erb")
       end
@@ -50,14 +50,14 @@ class TestConvertible < JekyllUnitTest
       assert_match(%r!#{File.join(@base, name)}!, out)
     end
 
-    should "parse the front-matter but show an error if permalink is empty" do
+    should "parse the front matter but show an error if permalink is empty" do
       name = "empty_permalink.erb"
       assert_raises(Errors::InvalidPermalinkError) do
         @convertible.read_yaml(@base, name)
       end
     end
 
-    should "parse the front-matter correctly whitout permalink" do
+    should "parse the front matter correctly without permalink" do
       out = capture_stderr do
         @convertible.read_yaml(@base, "front_matter.erb")
       end
diff --git a/test/test_doctor_command.rb b/test/test_doctor_command.rb
index 7280b2871ee..652175b9cf4 100644
--- a/test/test_doctor_command.rb
+++ b/test/test_doctor_command.rb
@@ -2,7 +2,7 @@
 require "jekyll/commands/doctor"
 
 class TestDoctorCommand < JekyllUnitTest
-  context "urls only differ by case" do
+  context "URLs only differ by case" do
     setup do
       clear_dest
     end
diff --git a/test/test_document.rb b/test/test_document.rb
index 808ef2e7d56..e4d7abbfdac 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -36,7 +36,7 @@ def assert_equal_value(key, one, other)
       assert_equal "configuration", @document.basename_without_ext
     end
 
-    should "know whether its a yaml file" do
+    should "know whether it's a YAML file" do
       assert_equal false, @document.yaml_file?
     end
 
@@ -110,7 +110,7 @@ def assert_equal_value(key, one, other)
     end
   end
 
-  context "a document as part of a collection with frontmatter defaults" do
+  context "a document as part of a collection with front matter defaults" do
     setup do
       @site = fixture_site({
         "collections" => ["slides"],
@@ -127,14 +127,14 @@ def assert_equal_value(key, one, other)
       @document = @site.collections["slides"].docs.select { |d| d.is_a?(Document) }.first
     end
 
-    should "know the frontmatter defaults" do
+    should "know the front matter defaults" do
       assert_equal "Example slide", @document.data["title"]
       assert_equal "slide", @document.data["layout"]
       assert_equal({ "key"=>"myval" }, @document.data["nested"])
     end
   end
 
-  context "a document as part of a collection with overriden default values" do
+  context "a document as part of a collection with overridden default values" do
     setup do
       @site = fixture_site({
         "collections" => ["slides"],
@@ -152,7 +152,7 @@ def assert_equal_value(key, one, other)
       @document = @site.collections["slides"].docs[1]
     end
 
-    should "override default values in the document frontmatter" do
+    should "override default values in the document front matter" do
       assert_equal "Override title", @document.data["title"]
       assert_equal "slide", @document.data["layout"]
       assert_equal(
@@ -179,7 +179,7 @@ def assert_equal_value(key, one, other)
       @document = @site.collections["slides"].docs.first
     end
 
-    should "know the frontmatter defaults" do
+    should "know the front matter defaults" do
       assert_equal "Example slide", @document.data["title"]
       assert_equal "slide", @document.data["layout"]
       assert_equal({ "key"=>"value123" }, @document.data["nested"])
@@ -203,7 +203,7 @@ def assert_equal_value(key, one, other)
       @document = @site.collections["slides"].docs.first
     end
 
-    should "not know the specified frontmatter defaults" do
+    should "not know the specified front matter defaults" do
       assert_equal "Example slide", @document.data["title"]
       assert_equal "slide", @document.data["layout"]
       assert_equal nil, @document.data["nested"]
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index 060323feb8b..b8169794c61 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -77,7 +77,7 @@ def do_render(document)
     end
 
     context "#to_liquid" do
-      should "contain the proper page data to mimick the post liquid" do
+      should "contain the proper page data to mimic the post liquid" do
         assert_equal "Post Excerpt with Layout", @excerpt.to_liquid["title"]
         url = "/bar/baz/z_category/mixedcase/2013/07/22/post-excerpt-with-layout.html"
         assert_equal url, @excerpt.to_liquid["url"]
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 399ade72c69..7e37f228236 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -151,7 +151,7 @@ def initialize(opts = {})
         assert_equal "a b", @filter.normalize_whitespace("a \t \n\nb")
       end
 
-      should "strip whitespace from begining and end of string" do
+      should "strip whitespace from beginning and end of string" do
         assert_equal "a", @filter.normalize_whitespace("a ")
         assert_equal "a", @filter.normalize_whitespace(" a")
         assert_equal "a", @filter.normalize_whitespace(" a ")
diff --git a/test/test_page.rb b/test/test_page.rb
index ba79514e8f2..3072aebb7f4 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -28,7 +28,7 @@ def do_render(page)
     end
 
     context "processing pages" do
-      should "create url based on filename" do
+      should "create URL based on filename" do
         @page = setup_page("contacts.html")
         assert_equal "/contacts.html", @page.url
       end
@@ -38,18 +38,18 @@ def do_render(page)
         assert_equal false, @page.published?
       end
 
-      should "create url with non-alphabetic characters" do
+      should "create URL with non-alphabetic characters" do
         @page = setup_page("+", "%# +.md")
         assert_equal "/+/%25%23%20+.html", @page.url
       end
 
       context "in a directory hierarchy" do
-        should "create url based on filename" do
+        should "create URL based on filename" do
           @page = setup_page("/contacts", "bar.html")
           assert_equal "/contacts/bar.html", @page.url
         end
 
-        should "create index url based on filename" do
+        should "create index URL based on filename" do
           @page = setup_page("/contacts", "index.html")
           assert_equal "/contacts/", @page.url
         end
@@ -105,7 +105,7 @@ def do_render(page)
           @site.permalink_style = :pretty
         end
 
-        should "return dir, url, and destination correctly" do
+        should "return dir, URL, and destination correctly" do
           @page = setup_page("contacts.html")
           @dest_file = dest_dir("contacts/index.html")
 
@@ -125,7 +125,7 @@ def do_render(page)
             assert_equal "/contacts/bar/", @page.url
           end
 
-          should "create index url based on filename" do
+          should "create index URL based on filename" do
             @page = setup_page("/contacts", "index.html")
             assert_equal "/contacts/", @page.url
           end
@@ -166,7 +166,7 @@ def do_render(page)
           @site.permalink_style = "/:title/"
         end
 
-        should "return url and destination correctly" do
+        should "return URL and destination correctly" do
           @page = setup_page("contacts.html")
           @dest_file = dest_dir("contacts/index.html")
           assert_equal "/contacts/", @page.url
@@ -179,7 +179,7 @@ def do_render(page)
           @site.permalink_style = "/:title:output_ext"
         end
 
-        should "return url and destination correctly" do
+        should "return URL and destination correctly" do
           @page = setup_page("contacts.html")
           @dest_file = dest_dir("contacts.html")
           assert_equal "/contacts.html", @page.url
@@ -192,7 +192,7 @@ def do_render(page)
           @site.permalink_style = "/:title"
         end
 
-        should "return url and destination correctly" do
+        should "return URL and destination correctly" do
           @page = setup_page("contacts.html")
           @dest_file = dest_dir("contacts.html")
           assert_equal "/contacts", @page.url
@@ -209,7 +209,7 @@ def do_render(page)
         end
       end
 
-      should "respect permalink in yaml front matter" do
+      should "respect permalink in YAML front matter" do
         file = "about.html"
         @page = setup_page(file)
 
diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb
index 36b15949591..03920c83022 100644
--- a/test/test_regenerator.rb
+++ b/test/test_regenerator.rb
@@ -166,7 +166,7 @@ class TestRegenerator < JekyllUnitTest
       assert_equal File.mtime(@path), @regenerator.metadata[@path]["mtime"]
     end
 
-    should "read legacy yaml metadata" do
+    should "read legacy YAML metadata" do
       metadata_file = source_dir(".jekyll-metadata")
       @regenerator = Regenerator.new(@site)
 
@@ -305,7 +305,7 @@ class TestRegenerator < JekyllUnitTest
     end
   end
 
-  context "when incremental regen is disabled" do
+  context "when incremental regeneration is disabled" do
     setup do
       FileUtils.rm_rf(source_dir(".jekyll-metadata"))
       @site = Site.new(Jekyll.configuration({
diff --git a/test/test_related_posts.rb b/test/test_related_posts.rb
index cda18dfcb3b..cea3ad0b539 100644
--- a/test/test_related_posts.rb
+++ b/test/test_related_posts.rb
@@ -18,7 +18,7 @@ class TestRelatedPosts < JekyllUnitTest
     end
   end
 
-  context "building related posts with lsi" do
+  context "building related posts with LSI" do
     setup do
       if jruby?
         skip(
@@ -53,7 +53,7 @@ class TestRelatedPosts < JekyllUnitTest
       Jekyll::RelatedPosts.new(post).build
     end
 
-    should "use lsi for the related posts" do
+    should "use LSI for the related posts" do
       allow_any_instance_of(::ClassifierReborn::LSI).to \
         receive(:find_related).and_return(@site.posts[-1..-9])
       allow_any_instance_of(::ClassifierReborn::LSI).to receive(:build_index)
diff --git a/test/test_site.rb b/test/test_site.rb
index 4e9e18a57ab..f09d94b9dac 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -210,12 +210,12 @@ def generate(site)
       assert_equal posts.size - @num_invalid_posts, @site.posts.size
     end
 
-    should "read pages with yaml front matter" do
+    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)
     end
 
-    should "enforce a strict 3-dash limit on the start of the YAML front-matter" do
+    should "enforce a strict 3-dash limit on the start of the YAML front matter" do
       abs_path = File.expand_path("pgp.key", @site.source)
       assert_equal false, Utils.has_yaml_header?(abs_path)
     end
@@ -330,7 +330,7 @@ def convert(*_args)
         s = Site.new(site_configuration("markdown" => custom_processor))
         s.process
 
-        # Do some cleanup, we don't like straggling stuff's.
+        # Do some cleanup, we don't like straggling stuff.
         Jekyll::Converters::Markdown.send(:remove_const, :CustomMarkdown)
       end
 
@@ -356,7 +356,7 @@ def convert(*_args)
           s.process
         end
 
-        # Do some cleanup, we don't like straggling stuff's.
+        # Do some cleanup, we don't like straggling stuff.
         Jekyll::Converters::Markdown.send(:remove_const, :Custom)
       end
     end
@@ -544,7 +544,7 @@ def convert(*_args)
         assert_equal mtime3, mtime4 # no modifications, so remain the same
       end
 
-      should "regnerate files that have had their destination deleted" do
+      should "regenerate files that have had their destination deleted" do
         contacts_html = @site.pages.find { |p| p.name == "contacts.html" }
         @site.process
 
diff --git a/test/test_static_file.rb b/test/test_static_file.rb
index 7019a1073b3..285ec879ffe 100644
--- a/test/test_static_file.rb
+++ b/test/test_static_file.rb
@@ -118,7 +118,7 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
       assert @static_file.modified?
     end
 
-    should "known if the source path is modified, when its not" do
+    should "known if the source path is modified, when it's not" do
       @static_file.write(dest_dir)
       sleep 1 # wait, else the times are still the same
       assert !@static_file.modified?
@@ -128,7 +128,7 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
       assert @static_file.write?, "always true, with current implementation"
     end
 
-    should "be able to write itself to the desitination directory" do
+    should "be able to write itself to the destination directory" do
       assert @static_file.write(dest_dir)
     end
 
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 6b8fe8db78d..239a75fa871 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -547,7 +547,7 @@ def highlight_block_with_opts(options_string)
       refute_match(%r!markdown\-html\-error!, @result)
     end
 
-    should "have the url to the \"complex\" post from 2008-11-21" do
+    should "have the URL to the \"complex\" post from 2008-11-21" do
       assert_match %r!/2008/11/21/complex/!, @result
     end
   end
@@ -576,12 +576,12 @@ def highlight_block_with_opts(options_string)
       refute_match(%r!markdown\-html\-error!, @result)
     end
 
-    should "have the url to the \"complex\" post from 2008-11-21" do
+    should "have the URL to the \"complex\" post from 2008-11-21" do
       assert_match %r!1\s/2008/11/21/complex/!, @result
       assert_match %r!2\s/2008/11/21/complex/!, @result
     end
 
-    should "have the url to the \"nested\" post from 2008-11-21" do
+    should "have the URL to the \"nested\" post from 2008-11-21" do
       assert_match %r!3\s/2008/11/21/nested/!, @result
       assert_match %r!4\s/2008/11/21/nested/!, @result
     end
@@ -648,7 +648,7 @@ def highlight_block_with_opts(options_string)
       refute_match(%r!markdown\-html\-error!, @result)
     end
 
-    should "have the url to the \"yaml_with_dots\" item" do
+    should "have the URL to the \"yaml_with_dots\" item" do
       assert_match(%r!/methods/yaml_with_dots\.html!, @result)
     end
   end
@@ -675,11 +675,11 @@ def highlight_block_with_opts(options_string)
       refute_match(%r!markdown\-html\-error!, @result)
     end
 
-    should "have the url to the \"sanitized_path\" item" do
+    should "have the URL to the \"sanitized_path\" item" do
       assert_match %r!1\s/methods/sanitized_path\.html!, @result
     end
 
-    should "have the url to the \"site/generate\" item" do
+    should "have the URL to the \"site/generate\" item" do
       assert_match %r!2\s/methods/site/generate\.html!, @result
     end
   end
diff --git a/test/test_utils.rb b/test/test_utils.rb
index 5fbb99fcada..7fab0d55a97 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -356,12 +356,12 @@ class TestUtils < JekyllUnitTest
   end
 
   context "The \`Utils.has_yaml_header?\` method" do
-    should "accept files with yaml front matter" do
+    should "accept files with YAML front matter" do
       file = source_dir("_posts", "2008-10-18-foo-bar.markdown")
       assert_equal "---\n", File.open(file, "rb") { |f| f.read(4) }
       assert Utils.has_yaml_header?(file)
     end
-    should "accept files with extraneous spaces after yaml front matter" do
+    should "accept files with extraneous spaces after YAML front matter" do
       file = source_dir("_posts", "2015-12-27-extra-spaces.markdown")
       assert_equal "---  \n", File.open(file, "rb") { |f| f.read(6) }
       assert Utils.has_yaml_header?(file)

From 5ca080ac6f526e0d70b5c27b24cb4a2fd7ab8b49 Mon Sep 17 00:00:00 2001
From: XhmikosR 
Date: Mon, 18 Jul 2016 15:23:26 +0300
Subject: [PATCH 1147/4996] Whitespace cleanup.

---
 .github/ISSUE_TEMPLATE.md            |  4 ++--
 History.markdown                     |  2 +-
 docs/triaging-an-issue.md            |  2 +-
 lib/jekyll/utils.rb                  |  2 +-
 script/cibuild                       |  2 +-
 script/proof                         |  2 +-
 site/_data/jekyllconf-talks.yml      |  2 +-
 site/_docs/assets.md                 |  6 +++---
 site/_docs/configuration.md          |  2 +-
 site/_docs/continuous-integration.md |  2 +-
 site/_docs/deployment-methods.md     |  6 +++---
 site/_docs/github-pages.md           |  6 +++---
 site/_docs/upgrading/2-to-3.md       |  2 +-
 site/_docs/windows.md                | 22 +++++++++++-----------
 site/community/index.md              |  8 ++++----
 15 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 2e070d476d7..bd7579c39d3 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,8 +1,8 @@
 
 
 - [ ] I believe this to be a bug, not a question about using Jekyll.
-- [ ] I Updated to the latest Jekyll (or) if on Github Pages to the latest `github-pages`
-- [ ] I Read the CONTRIBUTION file at https://jekyllrb.com/docs/contributing/
+- [ ] I updated to the latest Jekyll (or) if on GitHub Pages to the latest `github-pages`
+- [ ] I read the CONTRIBUTION file at https://jekyllrb.com/docs/contributing/
 - [ ] This is a feature request.
 
 ---
@@ -38,20 +38,20 @@
 
 - [ ] I was trying to install.
 - [ ] There is a broken Plugin API.
-- [ ] I had an error on Github Pages, and I have not tested locally.
-- [ ] I had an error on Github Pages, and Github Support said it was a Jekyll Bug.
-- [ ] I had an error on Github Pages and I did not test it locally.
+- [ ] I had an error on GitHub Pages, and I have not tested locally.
+- [ ] I had an error on GitHub Pages, and GitHub Support said it was a Jekyll Bug.
+- [ ] I had an error on GitHub Pages and I did not test it locally.
 - [ ] I was trying to build.
 - [ ] It was another bug.
 
 ## My Reproduction Steps
 
 
 
 ## The Output I Wanted
 
-
 
@@ -76,3 +79,4 @@
   anything like that so there should be no need to alter it.
 -->
 
+/cc include any Jekyll affinity teams here (see https://teams.jekyllrb.com/ for more info)
diff --git a/docs/affinity-team-captain.md b/docs/affinity-team-captain.md
new file mode 100644
index 00000000000..ccdcec7a689
--- /dev/null
+++ b/docs/affinity-team-captain.md
@@ -0,0 +1,25 @@
+# Affinity Team Captains
+
+**This guide is for affinity team captains.** These special people are **team maintainers** of one of our [affinity teams][] and help triage and evaluate the issues and contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
+
+## Affinity teams & their captains
+
+The Jekyll project uses [affinity teams][] to help break up the work of incoming issues and pull requests from community members. We receive a sizeable number of issues and pull requests each week; the use of affinity teams helps distribute this load across a number of specialized groups instead of pushing it all onto @jekyll/core.
+
+## Responsibilities of Team Captains
+
+Each affinity team has a few captains who manage the issues and pull requests for that team. When an issue or PR is opened with a `/cc` for a given affinity team, @jekyllbot automatically assigns a random affinity team captain to the issue to triage it. They have access to add labels, reassign the issue, give LGTM's, and so forth. While they do not merge PR's today, they are still asked to review PR's for parts of the codebase under their purview.
+
+## How do I become a team captain?
+
+Just ask! Feel free to open an issue on `jekyll/jekyll` and add `/cc @jekyll/core`. We can add you. :smile:
+
+Alternatively, you can email or otherwise reach out to [@parkr](https://github.com/parkr) directly if you prefer the more private route.
+
+## Ugh, I'm tired and don't have time to be a captain anymore. What now?
+
+No sweat at all! Email [@parkr](https://github.com/parkr) and ask to be removed. Alternatively, you should be able to go to your team's page on GitHub.com (go to https://github.com/jekyll, click "Teams", click the link to your team) and change your status to either "member" or leave the team.
+
+We realize that being a captain is no easy feat so we want to make it a great experience. As always, communicate as much as you can with us about what is working, and what isn't. Thanks for dedicating some time to Jekyll! :sparkles:
+
+[affinity teams]: https://teams.jekyllrb.com/

From 27139f40e22c35ea4227bdc750c50331653533ee Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 23 Aug 2016 02:24:30 +0200
Subject: [PATCH 1313/4996] Link to latent semantic indexing on Wikipedia

---
 site/_docs/variables.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/site/_docs/variables.md b/site/_docs/variables.md
index f3ead4c70c1..059e092b4ef 100644
--- a/site/_docs/variables.md
+++ b/site/_docs/variables.md
@@ -115,8 +115,7 @@ following is a reference of the available data.
         If the page being processed is a Post, this contains a list of up to ten
         related Posts. By default, these are the ten most recent posts.
         For high quality but slow to compute results, run the
-        jekyll command with the --lsi (latent semantic
-        indexing) option. Also note GitHub Pages does not support the lsi option when generating sites.
+        jekyll command with the --lsi (latent semantic indexing) option. Also note GitHub Pages does not support the lsi option when generating sites.
 
       
    
     

From b908c3de1d9b813c891c980e0c7aa7095b0dcdc2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 23 Aug 2016 07:40:10 -0700
Subject: [PATCH 1314/4996] Update history to reflect merge of #5274 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index cbc2b00b780..13eb14022ec 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Documentation: improve highlight in `Creating a theme` (#5249)
   * Bundler isn't installed by default (#5258)
   * Update troubleshooting documentation to include fix for issue with vendored gems (#5271)
+  * Link --lsi option's description to Wikipedia docs on LSI (#5274)
 
 ### Development Fixes
 

From 276404c3f8a8e01f59de6ccedc0715f424e72f19 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 23 Aug 2016 09:15:36 -0700
Subject: [PATCH 1315/4996] Update history to reflect merge of #5272 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 13eb14022ec..8b5db7da882 100644
--- a/History.markdown
+++ b/History.markdown
@@ -23,6 +23,7 @@
   * Update appveyor.yml and fix optional deps for Ruby x64 (#5180)
   * Improve tests for Jekyll::PluginManager (#5167)
   * Update Ruby versions in travis.yml (#5221)
+  * Avoid installing unecessary gems for site testing (#5272)
 
 ### Bug Fixes
 

From 13ce18d6a65d53bee6960d20d57190186e0dfb82 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 23 Aug 2016 21:36:06 +0200
Subject: [PATCH 1316/4996] document --profile option

---
 site/_docs/configuration.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index 1dc6f9ce52c..82f3436d292 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -284,6 +284,18 @@ class="flag">flags     (specified on the command-line) that control them.
         
    -I, --incremental
    
       
     
+    
+      
+        
    Liquid profiler
    
+        
    
+            Generate a Liquid rendering profile to help you identify performance bottlenecks.
+        
    
+      
+      
+        
    profile: BOOL
    
+        
    --profile
    
+      
+    
   
 
 

From 8aa54ad8014dafe64688cbe771eb4cfed88fa2f0 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 23 Aug 2016 13:01:31 -0700
Subject: [PATCH 1317/4996] Update history to reflect merge of #5279 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8b5db7da882..b3f830023c0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
   * Bundler isn't installed by default (#5258)
   * Update troubleshooting documentation to include fix for issue with vendored gems (#5271)
   * Link --lsi option's description to Wikipedia docs on LSI (#5274)
+  * Document --profile option on the configuration page (#5279)
 
 ### Development Fixes
 

From cf33a9c427ecd736feeec5f129d15a205e179b93 Mon Sep 17 00:00:00 2001
From: Anthony Gaudino 
Date: Tue, 23 Aug 2016 21:06:11 -0300
Subject: [PATCH 1318/4996] The hook ":site, :post_render" also provides a
 "payload", but the plugins documentation section of the official Jekyll site
 doesnt inform this.

---
 site/_docs/plugins.md | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index b6a12932256..36757520178 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -498,11 +498,13 @@ end
 {% endhighlight %}
 
 Jekyll provides hooks for :site, :pages,
-:posts, and :documents. In all cases, Jekyll calls your
-hooks with the container object as the first callback parameter. But in the
-case of :pre_render, your hook will also receive a payload hash as
-a second parameter which allows you full control over the variables that are
-available while rendering.
+:posts, and :documents. In all cases, Jekyll calls
+your hooks with the container object as the first callback parameter. But in the
+case of :pre_render and :site, :post_render, your hook
+will also receive a payload hash as a second parameter which allows you full
+control over the variables that are available while rendering in the former case
+and make final changes just before writing your website to disk on the latter
+case.
 
 The complete list of available hooks is below:
 

From 7c6fde1ac24f91d61b1a63bd41fc4f660f725514 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 23 Aug 2016 17:19:14 -0700
Subject: [PATCH 1319/4996] Update history to reflect merge of #5273 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b3f830023c0..60f2d0ebb10 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Improve tests for Jekyll::PluginManager (#5167)
   * Update Ruby versions in travis.yml (#5221)
   * Avoid installing unecessary gems for site testing (#5272)
+  * Proposal: Affinity teams and their captains (#5273)
 
 ### Bug Fixes
 

From df1cafd507c5040cd42b949842ff9857367d8309 Mon Sep 17 00:00:00 2001
From: Anthony Gaudino 
Date: Tue, 23 Aug 2016 21:48:35 -0300
Subject: [PATCH 1320/4996] On the site documentation section, links to
 documentation items point to the "jekyllrb.com" website, this means that
 users testing changes might get confused because they will see the official
 external website instead of their local website upon clicking those links.

---
 site/_includes/docs_option.html | 2 +-
 site/_includes/docs_ul.html     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/_includes/docs_option.html b/site/_includes/docs_option.html
index e7afcc88aa1..a2e156220a3 100644
--- a/site/_includes/docs_option.html
+++ b/site/_includes/docs_option.html
@@ -1,5 +1,5 @@
 {% for item in include.items %}
   {% assign item_url = item | prepend:"/docs/" | append:"/" %}
   {% assign doc = site.docs | where: "url", item_url | first %}
-  
+  
 {% endfor %}
diff --git a/site/_includes/docs_ul.html b/site/_includes/docs_ul.html
index 7688328fc20..adb6600e845 100644
--- a/site/_includes/docs_ul.html
+++ b/site/_includes/docs_ul.html
@@ -2,6 +2,6 @@
 {% for item in include.items %}
   {% assign item_url = item | prepend:"/docs/" | append:"/" %}
   {% assign p = site.docs | where:"url", item_url | first %}
-  
  • {{ p.title }}
    • 
+  
  • {{ p.title }}
    • 
 {% endfor %}
 

From a5470a32f1b12ac2fc5129746dd357edfb2ffbf1 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Wed, 24 Aug 2016 12:50:09 +0200
Subject: [PATCH 1321/4996] replace duplicate with local test [ci-skip]

---
 .github/ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 18d79319ca1..77602bc6ea2 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -41,7 +41,7 @@
 
 - [ ] I was trying to install.
 - [ ] There is a broken Plugin API.
-- [ ] I had an error on GitHub Pages, and I have not tested locally.
+- [ ] I had an error on GitHub Pages, and I have reproduced it locally.
 - [ ] I had an error on GitHub Pages, and GitHub Support said it was a Jekyll Bug.
 - [ ] I had an error on GitHub Pages and I did not test it locally.
 - [ ] I was trying to build.

From a74a6be4c43cf60a4e26de5cdd3f8052ce18e353 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 24 Aug 2016 19:37:10 +0530
Subject: [PATCH 1322/4996] update homepage to reflect merge of #5258

---
 site/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/index.html b/site/index.html
index 06c32d31509..74bace334ca 100644
--- a/site/index.html
+++ b/site/index.html
@@ -45,7 +45,7 @@ 
    Get up and running in seconds.
    
         
    
           ~
           $
-          gem install jekyll
+          gem install jekyll bundler
         
    
         
    
           ~

From 13330caa19fd3b89694ee20d4012cd3ed9ebf8ab Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 24 Aug 2016 13:15:39 -0700
Subject: [PATCH 1323/4996] Update history to reflect merge of #5287 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 60f2d0ebb10..748c24d88b8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -18,6 +18,7 @@
   * Update troubleshooting documentation to include fix for issue with vendored gems (#5271)
   * Link --lsi option's description to Wikipedia docs on LSI (#5274)
   * Document --profile option on the configuration page (#5279)
+  * Update homepage to sync with merge of #5258 (#5287)
 
 ### Development Fixes
 

From e0580c89091747fa6b587b8602caf2b66665cbfd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 24 Aug 2016 13:16:42 -0700
Subject: [PATCH 1324/4996] Update history to reflect merge of #5286 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 748c24d88b8..e577689425e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -27,6 +27,7 @@
   * Update Ruby versions in travis.yml (#5221)
   * Avoid installing unecessary gems for site testing (#5272)
   * Proposal: Affinity teams and their captains (#5273)
+  * Replace duplicate with postive local test in issue template (#5286)
 
 ### Bug Fixes
 

From 250ca228c98ebd008963224e51b4af62d915ac7a Mon Sep 17 00:00:00 2001
From: mertkahyaoglu 
Date: Thu, 25 Aug 2016 01:53:00 +0300
Subject: [PATCH 1325/4996] add post about jekyll admin initial release

---
 ...08-24-jekyll-admin-initial-release.markdown | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 site/_posts/2016-08-24-jekyll-admin-initial-release.markdown

diff --git a/site/_posts/2016-08-24-jekyll-admin-initial-release.markdown b/site/_posts/2016-08-24-jekyll-admin-initial-release.markdown
new file mode 100644
index 00000000000..316975d2a75
--- /dev/null
+++ b/site/_posts/2016-08-24-jekyll-admin-initial-release.markdown
@@ -0,0 +1,18 @@
+---
+layout: news_item
+title: "Jekyll Admin Initial Release"
+date: "2016-08-24 15:51:00 -0700"
+author: mertkahyaoglu
+categories: [community]
+---
+
+[Jekyll's Google Summer of Code Project](http://jekyllrb.com/news/2016/06/03/update-on-jekyll-s-google-summer-of-code-projects/) has concluded. After three months of hard (but fun) work with my mentors @benbalter, @jldec, and @parkr, I'm proud to announce [Jekyll Admin](https://github.com/jekyll/jekyll-admin)'s [initial release](https://github.com/jekyll/jekyll-admin/releases/tag/v0.1.0). Jekyll admin is a Jekyll plugin that provides users with a traditional CMS-style graphical interface to author content and administer Jekyll sites. You can start to use it right away by following [these instructions](https://github.com/jekyll/jekyll-admin#installation).
+
+As a Google Summer of Code student, I feel very lucky to be part of a project that the community has been wanting for such a long time. The three-month Google Summer of Code period was a great journey. It was a lot of fun developing the project and seeing how it could help the community, and going forward, we are really excited to see where the project goes with the help of the amazing Jekyll community.
+
+I would like to thank my mentors who embraced me as their teammate and guided me throughout the process. They have put a lot of work and time to mentor me and helped me with everything. It was a great pleasure to work with them. I also would like to thank the wonderful Jekyll community for making Jekyll what it is today. It was amazing to see the community contribute to the project and give their feedback
+prior to its release. I'm sure that they will support Jekyll Admin as much as they can and move Jekyll even further.
+
+Please let us know what you think about [Jekyll Admin](https://github.com/jekyll/jekyll-admin) and feel free to [contribute](https://github.com/jekyll/jekyll-admin/blob/master/.github/CONTRIBUTING.md). Your feedback and contributions are greatly appreciated.
+
+Happy (graphical) Jekylling!

From 89030385714da502debeb5ab268c8276e5f990fa Mon Sep 17 00:00:00 2001
From: mertkahyaoglu 
Date: Thu, 25 Aug 2016 02:57:24 +0300
Subject: [PATCH 1326/4996] up date

---
 site/_posts/2016-08-24-jekyll-admin-initial-release.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_posts/2016-08-24-jekyll-admin-initial-release.markdown b/site/_posts/2016-08-24-jekyll-admin-initial-release.markdown
index 316975d2a75..1f3eb24f495 100644
--- a/site/_posts/2016-08-24-jekyll-admin-initial-release.markdown
+++ b/site/_posts/2016-08-24-jekyll-admin-initial-release.markdown
@@ -1,7 +1,7 @@
 ---
 layout: news_item
 title: "Jekyll Admin Initial Release"
-date: "2016-08-24 15:51:00 -0700"
+date: "2016-08-25 15:51:00 -0700"
 author: mertkahyaoglu
 categories: [community]
 ---

From 299e89df01f7590ed2c9ec2b8711cb724bdabd30 Mon Sep 17 00:00:00 2001
From: mertkahyaoglu 
Date: Thu, 25 Aug 2016 09:50:03 +0300
Subject: [PATCH 1327/4996] up timezone

---
 site/_posts/2016-08-24-jekyll-admin-initial-release.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_posts/2016-08-24-jekyll-admin-initial-release.markdown b/site/_posts/2016-08-24-jekyll-admin-initial-release.markdown
index 1f3eb24f495..36532efdb47 100644
--- a/site/_posts/2016-08-24-jekyll-admin-initial-release.markdown
+++ b/site/_posts/2016-08-24-jekyll-admin-initial-release.markdown
@@ -1,7 +1,7 @@
 ---
 layout: news_item
 title: "Jekyll Admin Initial Release"
-date: "2016-08-25 15:51:00 -0700"
+date: "2016-08-25 09:50:00 +0300"
 author: mertkahyaoglu
 categories: [community]
 ---

From 9c33754f4f5c224350e55cfef93d21f9623a2e31 Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Thu, 25 Aug 2016 14:54:59 +0800
Subject: [PATCH 1328/4996] Exclude Gemfile in _config.yml template

---
 lib/site_template/_config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
index 9a17fc3d36e..7e5346b4478 100644
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -29,3 +29,6 @@ markdown: kramdown
 theme: minima
 gems:
   - jekyll-feed
+exclude:
+  - Gemfile
+  - Gemfile.lock

From 158e02623a4b0207878dfd01fda7a9bd666937fc Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Fri, 1 Jul 2016 17:24:14 +0300
Subject: [PATCH 1329/4996] rubocop: reduce code complexity

---
 .rubocop.yml           |   1 -
 lib/jekyll/document.rb | 191 ++++++++++++++++++++++++-----------------
 2 files changed, 112 insertions(+), 80 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 058b7502018..8ae01fb17d1 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -5,7 +5,6 @@ AllCops:
     - lib/**/*.rb
   Exclude:
     - lib/jekyll/convertible.rb
-    - lib/jekyll/document.rb
     - lib/jekyll/renderer.rb
     - bin/**/*
     - benchmark/**/*
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 9c67d84854e..e277886366e 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -51,19 +51,9 @@ def data
     #
     # Returns the merged data.
     def merge_data!(other, source: "YAML front matter")
-      if other.key?("categories") && !other["categories"].nil?
-        if other["categories"].is_a?(String)
-          other["categories"] = other["categories"].split(" ").map(&:strip)
-        end
-        other["categories"] = (data["categories"] || []) | other["categories"]
-      end
+      merge_categories!(other)
       Utils.deep_merge_hashes!(data, other)
-      if data.key?("date") && !data["date"].is_a?(Time)
-        data["date"] = Utils.parse_date(
-          data["date"].to_s,
-          "Document '#{relative_path}' does not have a valid date in the #{source}."
-        )
-      end
+      merge_date!(source)
       data
     end
 
@@ -90,8 +80,7 @@ def draft?
     # Returns a String path which represents the relative path
     #   from the site source to this document
     def relative_path
-      @relative_path ||= Pathname.new(path)
-        .relative_path_from(Pathname.new(site.source)).to_s
+      @relative_path ||= Pathutil.new(path).relative_path_from(site.source).to_s
     end
 
     # The output extension of the document.
@@ -264,20 +253,9 @@ def read(opts = {})
         @data = SafeYAML.load_file(path)
       else
         begin
-          defaults = @site.frontmatter_defaults.all(
-            relative_path,
-            collection.label.to_sym
-          )
-          merge_data!(defaults, :source => "front matter defaults") unless defaults.empty?
-
-          self.content = File.read(path, Utils.merged_file_read_opts(site, opts))
-          if content =~ YAML_FRONT_MATTER_REGEXP
-            self.content = $POSTMATCH
-            data_file = SafeYAML.load(Regexp.last_match(1))
-            merge_data!(data_file, :source => "YAML front matter") if data_file
-          end
-
-          post_read
+          merge_defaults
+          read_content(opts)
+          read_post_data
         rescue SyntaxError => e
           Jekyll.logger.error "Error:", "YAML Exception reading #{path}: #{e.message}"
         rescue => e
@@ -287,56 +265,6 @@ def read(opts = {})
       end
     end
 
-    def post_read
-      if relative_path =~ DATE_FILENAME_MATCHER
-        date, slug, ext = Regexp.last_match.captures
-        if !data["date"] || data["date"].to_i == site.time.to_i
-          merge_data!({ "date" => date }, :source => "filename")
-        end
-      elsif relative_path =~ DATELESS_FILENAME_MATCHER
-        slug, ext = Regexp.last_match.captures
-      end
-
-      # Try to ensure the user gets a title.
-      data["title"] ||= Utils.titleize_slug(slug)
-      # Only overwrite slug & ext if they aren't specified.
-      data["slug"] ||= slug
-      data["ext"]  ||= ext
-
-      populate_categories
-      populate_tags
-      generate_excerpt
-    end
-
-    # Add superdirectories of the special_dir to categories.
-    # In the case of es/_posts, 'es' is added as a category.
-    # In the case of _posts/es, 'es' is NOT added as a category.
-    #
-    # Returns nothing.
-    def categories_from_path(special_dir)
-      superdirs = relative_path.sub(%r!#{special_dir}(.*)!, "")
-        .split(File::SEPARATOR)
-        .reject do |c|
-        c.empty? || c.eql?(special_dir) || c.eql?(basename)
-      end
-      merge_data!({ "categories" => superdirs }, :source => "file path")
-    end
-
-    def populate_categories
-      merge_data!({
-        "categories" => (
-          Array(data["categories"]) +
-          Utils.pluralized_array_from_hash(data, "category", "categories")
-        ).map(&:to_s).flatten.uniq
-      })
-    end
-
-    def populate_tags
-      merge_data!({
-        "tags" => Utils.pluralized_array_from_hash(data, "tag", "tags").flatten
-      })
-    end
-
     # Create a Liquid-understandable version of this Document.
     #
     # Returns a Hash representing this Document's data.
@@ -443,7 +371,112 @@ def method_missing(method, *args, &blck)
       end
     end
 
-    private # :nodoc:
+    private
+    def merge_categories!(other)
+      if other.key?("categories") && !other["categories"].nil?
+        if other["categories"].is_a?(String)
+          other["categories"] = other["categories"].split(%r!\s+!).map(&:strip)
+        end
+        other["categories"] = (data["categories"] || []) | other["categories"]
+      end
+    end
+
+    private
+    def merge_date!(source)
+      if data.key?("date") && !data["date"].is_a?(Time)
+        data["date"] = Utils.parse_date(
+          data["date"].to_s,
+          "Document '#{relative_path}' does not have a valid date in the #{source}."
+        )
+      end
+    end
+
+    private
+    def merge_defaults
+      defaults = @site.frontmatter_defaults.all(
+        relative_path,
+        collection.label.to_sym
+      )
+      merge_data!(defaults, :source => "front matter defaults") unless defaults.empty?
+    end
+
+    private
+    def read_content(opts)
+      self.content = File.read(path, Utils.merged_file_read_opts(site, opts))
+      if content =~ YAML_FRONT_MATTER_REGEXP
+        self.content = $POSTMATCH
+        data_file = SafeYAML.load(Regexp.last_match(1))
+        merge_data!(data_file, :source => "YAML front matter") if data_file
+      end
+    end
+
+    private
+    def read_post_data
+      populate_title
+      populate_categories
+      populate_tags
+      generate_excerpt
+    end
+
+    private
+    def populate_title
+      if relative_path =~ DATE_FILENAME_MATCHER
+        date, slug, ext = Regexp.last_match.captures
+        modify_date(date)
+      elsif relative_path =~ DATELESS_FILENAME_MATCHER
+        slug, ext = Regexp.last_match.captures
+      end
+
+      # Try to ensure the user gets a title.
+      data["title"] ||= Utils.titleize_slug(slug)
+      # Only overwrite slug & ext if they aren't specified.
+      data["slug"]  ||= slug
+      data["ext"]   ||= ext
+    end
+
+    private
+    def modify_date(date)
+      if !data["date"] || data["date"].to_i == site.time.to_i
+        merge_data!({ "date" => date }, :source => "filename")
+      end
+    end
+
+    # Add superdirectories of the special_dir to categories.
+    # In the case of es/_posts, 'es' is added as a category.
+    # In the case of _posts/es, 'es' is NOT added as a category.
+    #
+    # Returns nothing.
+    private
+    def categories_from_path(special_dir)
+      superdirs = relative_path.sub(%r!#{special_dir}(.*)!, "")
+        .split(File::SEPARATOR)
+        .reject do |c|
+        c.empty? || c == special_dir || c == basename
+      end
+      merge_data!({ "categories" => superdirs }, :source => "file path")
+    end
+
+    private
+    def populate_categories
+      merge_data!({
+        "categories" => (
+        Array(data["categories"]) + Utils.pluralized_array_from_hash(
+          data,
+          "category",
+          "categories"
+        )
+        ).map(&:to_s).flatten.uniq
+      })
+    end
+
+    private
+    def populate_tags
+      merge_data!({
+        "tags" => Utils.pluralized_array_from_hash(data, "tag", "tags").flatten
+      })
+    end
+
+    private
     def generate_excerpt
       if generate_excerpt?
         data["excerpt"] ||= Jekyll::Excerpt.new(self)

From 2183d9d6b4658adf878fc4a2cf308d4131e4cffa Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Thu, 25 Aug 2016 12:13:34 +0200
Subject: [PATCH 1330/4996] Implement respond_to_missing? in Document

---
 lib/jekyll/document.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index e277886366e..f35cdb0e061 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -371,6 +371,10 @@ def method_missing(method, *args, &blck)
       end
     end
 
+    def respond_to_missing?(method, *)
+      data.key?(method.to_s) || super
+    end
+
     private
     def merge_categories!(other)
       if other.key?("categories") && !other["categories"].nil?

From 7892c5e1f392061c3d6862a83cefb6da8f134b6d Mon Sep 17 00:00:00 2001
From: "Heng, K. (Stephen)" 
Date: Thu, 25 Aug 2016 18:35:09 +0800
Subject: [PATCH 1331/4996] Fix issue #5276, where path strips root destination
 dir if filename matches

---
 lib/jekyll.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index ffe9e4acae2..f3c38f537f2 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -161,7 +161,9 @@ def sanitized_path(base_directory, questionable_path)
       questionable_path.insert(0, "/") if questionable_path.start_with?("~")
       clean_path = File.expand_path(questionable_path, "/")
 
-      if clean_path.start_with?(base_directory)
+      return clean_path if clean_path.eql?(base_directory)
+
+      if clean_path.start_with?(base_directory.sub(%r!\z!, "/"))
         clean_path
       else
         clean_path.sub!(%r!\A\w:/!, "/")

From f56f252b28162682d39c17ee47ccb4fdcba084fc Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 25 Aug 2016 11:13:55 -0700
Subject: [PATCH 1332/4996] Update history to reflect merge of #5291 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e577689425e..f6e3c07cf93 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
   * Link --lsi option's description to Wikipedia docs on LSI (#5274)
   * Document --profile option on the configuration page (#5279)
   * Update homepage to sync with merge of #5258 (#5287)
+  * Add post about Jekyll Admin initial release (#5291)
 
 ### Development Fixes
 

From 1cd880f9d09223a54a7d5eba0208652d3ab6a617 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sat, 20 Aug 2016 12:01:25 +0530
Subject: [PATCH 1333/4996] replace liquid highlight tag with backticks

---
 site/_docs/assets.md                 | 16 +++----
 site/_docs/collections.md            | 28 ++++++------
 site/_docs/configuration.md          | 48 ++++++++++----------
 site/_docs/continuous-integration.md | 56 +++++++++++------------
 site/_docs/datafiles.md              | 32 ++++++-------
 site/_docs/deployment-methods.md     | 41 +++++++++--------
 site/_docs/drafts.md                 |  4 +-
 site/_docs/extras.md                 |  4 +-
 site/_docs/frontmatter.md            |  8 ++--
 site/_docs/github-pages.md           | 12 ++---
 site/_docs/installation.md           | 16 +++----
 site/_docs/pages.md                  |  8 ++--
 site/_docs/pagination.md             | 16 +++----
 site/_docs/plugins.md                | 48 ++++++++++----------
 site/_docs/posts.md                  | 40 ++++++++--------
 site/_docs/quickstart.md             |  4 +-
 site/_docs/structure.md              |  4 +-
 site/_docs/templates.md              | 52 ++++++++++-----------
 site/_docs/themes.md                 |  4 +-
 site/_docs/troubleshooting.md        | 68 ++++++++++++++--------------
 site/_docs/upgrading/0-to-2.md       |  4 +-
 site/_docs/upgrading/2-to-3.md       | 24 +++++-----
 site/_docs/usage.md                  | 20 ++++----
 site/_docs/windows.md                | 16 +++----
 24 files changed, 287 insertions(+), 286 deletions(-)

diff --git a/site/_docs/assets.md b/site/_docs/assets.md
index fd163e061cc..4908a4008de 100644
--- a/site/_docs/assets.md
+++ b/site/_docs/assets.md
@@ -9,14 +9,14 @@ a Ruby gem. In order to use them, you must first create a file with the
 proper extension name (one of `.sass`, `.scss`, or `.coffee`) and ***start the
 file with two lines of triple dashes***, like this:
 
-{% highlight sass %}
+```sass
 ---
 ---
 
 // start content
 .my-definition
   font-size: 1.2em
-{% endhighlight %}
+```
 
 Jekyll treats these files the same as a regular page, in that the output file
 will be placed in the same directory that it came from. For instance, if you
@@ -46,10 +46,10 @@ If you are using Sass `@import` statements, you'll need to ensure that your
 `sass_dir` is set to the base directory that contains your Sass files. You
 can do that thusly:
 
-{% highlight yaml %}
+```yaml
 sass:
     sass_dir: _sass
-{% endhighlight %}
+```
 
 The Sass converter will default the `sass_dir` configuration option to
 `_sass`.
@@ -72,10 +72,10 @@ The Sass converter will default the `sass_dir` configuration option to
 You may also specify the output style with the `style` option in your
 `_config.yml` file:
 
-{% highlight yaml %}
+```yaml
 sass:
     style: compressed
-{% endhighlight %}
+```
 
 These are passed to Sass, so any output style options Sass supports are valid
 here, too.
@@ -88,7 +88,7 @@ To enable Coffeescript in Jekyll 3.0 and up you must
 * Install the `jekyll-coffeescript` gem
 * Ensure that your `_config.yml` is up-to-date and includes the following:
 
-{% highlight yaml %}
+```yaml
 gems:
  - jekyll-coffeescript
-{% endhighlight %}
+```
diff --git a/site/_docs/collections.md b/site/_docs/collections.md
index c1e1e7c27ff..22a86e60ff4 100644
--- a/site/_docs/collections.md
+++ b/site/_docs/collections.md
@@ -17,29 +17,29 @@ namespace.
 Add the following to your site's `_config.yml` file, replacing `my_collection`
 with the name of your collection:
 
-{% highlight yaml %}
+```yaml
 collections:
 - my_collection
-{% endhighlight %}
+```
 
 You can optionally specify metadata for your collection in the configuration:
 
-{% highlight yaml %}
+```yaml
 collections:
   my_collection:
     foo: bar
-{% endhighlight %}
+```
 
 Default attributes can also be set for a collection:
 
-{% highlight yaml %}
+```yaml
 defaults:
   - scope:
       path: ""
       type: my_collection
     values:
       layout: page
-{% endhighlight %}
+```
 
 ### Step 2: Add your content
 
@@ -62,11 +62,11 @@ If you'd like Jekyll to create a public-facing, rendered version of each
 document in your collection, set the `output` key to `true` in your collection
 metadata in your `_config.yml`:
 
-{% highlight yaml %}
+```yaml
 collections:
   my_collection:
     output: true
-{% endhighlight %}
+```
 
 This will produce a file for each document in the collection.
 For example, if you have `_my_collection/some_subdir/some_doc.md`,
@@ -76,12 +76,12 @@ choice and written out to `/my_collection/some_subdir/some_doc.html`.
 As for posts with [Permalinks](../permalinks/), the document
 URL can be customized by setting `permalink` metadata for the collection:
 
-{% highlight yaml %}
+```yaml
 collections:
   my_collection:
     output: true
     permalink: /awesome/:path/
-{% endhighlight %}
+```
 
 For example, if you have `_my_collection/some_subdir/some_doc.md`, it will be
 written out to `/awesome/some_subdir/some_doc/index.html`.
@@ -339,7 +339,7 @@ one might have front matter in an individual file structured as follows (which
 must use a supported markup format, and cannot be saved with a `.yaml`
 extension):
 
-{% highlight yaml %}
+```yaml
 title: "Josquin: Missa De beata virgine and Missa Ave maris stella"
 artist: "The Tallis Scholars"
 director: "Peter Phillips"
@@ -357,11 +357,11 @@ works:
         duration: "7:47"
       - title: "Agnus Dei I, II & III"
         duration: "6:49"
-{% endhighlight %}
+```
 
 Every album in the collection could be listed on a single page with a template:
 
-{% highlight html %}
+```html
 {% raw %}
 {% for album in site.albums %}
   
    {{ album.title }}
    
@@ -377,4 +377,4 @@ Every album in the collection could be listed on a single page with a template:
   {% endfor %}
 {% endfor %}
 {% endraw %}
-{% endhighlight %}
+```
diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index 82f3436d292..abb9e234eeb 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -399,13 +399,13 @@ before your site is served.
 
 You can provide custom headers for your site by adding them to `_config.yml`
 
-{% highlight yaml %}
+```yaml
 # File: _config.yml
 webrick:
   headers:
     My-Header: My-Value
     My-Other-Header: My-Other-Value
-{% endhighlight %}
+```
 
 ### Defaults
 
@@ -420,19 +420,19 @@ In the build (or serve) arguments, you can specify a Jekyll environment and valu
 
 For example, suppose you set this conditional statement in your code:
 
-{% highlight liquid %}
+```liquid
 {% raw %}
 {% if jekyll.environment == "production" %}
    {% include disqus.html %}
 {% endif %}
 {% endraw %}
-{% endhighlight %}
+```
 
 When you build your Jekyll site, the content inside the `if` statement won't be run unless you also specify a `production` environment in the build command, like this:
 
-{% highlight sh %}
+```sh
 JEKYLL_ENV=production jekyll build
-{% endhighlight %}
+```
 
 Specifying an environment value allows you to make certain content available only within specific environments.
 
@@ -454,14 +454,14 @@ The `defaults` key holds an array of scope/values pairs that define what default
 
 Let's say that you want to add a default layout to all pages and posts in your site. You would add this to your `_config.yml` file:
 
-{% highlight yaml %}
+```yaml
 defaults:
   -
     scope:
       path: "" # an empty string here means all files in the project
     values:
       layout: "default"
-{% endhighlight %}
+```
 
 
    
   
    Please stop and rerun `jekyll serve` command.
    
@@ -477,7 +477,7 @@ defaults:
 
 Here, we are scoping the `values` to any file that exists in the path `scope`. Since the path is set as an empty string, it will apply to **all files** in your project. You probably don't want to set a layout on every file in your project - like css files, for example - so you can also specify a `type` value under the `scope` key.
 
-{% highlight yaml %}
+```yaml
 defaults:
   -
     scope:
@@ -485,14 +485,14 @@ defaults:
       type: "posts" # previously `post` in Jekyll 2.2.
     values:
       layout: "default"
-{% endhighlight %}
+```
 
 Now, this will only set the layout for files where the type is `posts`.
 The different types that are available to you are `pages`, `posts`, `drafts` or any collection in your site. While `type` is optional, you must specify a value for `path` when creating a `scope/values` pair.
 
 As mentioned earlier, you can set multiple scope/values pairs for `defaults`.
 
-{% highlight yaml %}
+```yaml
 defaults:
   -
     scope:
@@ -507,11 +507,11 @@ defaults:
     values:
       layout: "project" # overrides previous default layout
       author: "Mr. Hyde"
-{% endhighlight %}
+```
 
 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`.
 
-{% highlight yaml %}
+```yaml
 collections:
   - my_collection:
       output: true
@@ -523,7 +523,7 @@ defaults:
       type: "my_collection" # a collection in your site, in plural form
     values:
       layout: "default"
-{% endhighlight %}
+```
 
 In this example, the `layout` is set to `default` inside the
 [collection](../collections/) with the name `my_collection`.
@@ -536,7 +536,7 @@ You can see that in the second to last example above. First, we set the default
 
 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:
 
-{% highlight yaml %}
+```yaml
 # In _config.yml
 ...
 defaults:
@@ -549,16 +549,16 @@ defaults:
       author: "Mr. Hyde"
       category: "project"
 ...
-{% endhighlight %}
+```
 
-{% highlight yaml %}
+```yaml
 # In projects/foo_project.md
 ---
 author: "John Smith"
 layout: "foobar"
 ---
 The post text goes here...
-{% endhighlight %}
+```
 
 The `projects/foo_project.md` would have the `layout` set to `foobar` instead
 of `project` and the `author` set to `John Smith` instead of `Mr. Hyde` when
@@ -579,7 +579,7 @@ file or on the command-line.
   
    
 
    
 
-{% highlight yaml %}
+```yaml
 # Where things are
 source:       .
 destination:  ./_site
@@ -651,7 +651,7 @@ kramdown:
   input:          GFM
   hard_wrap:      false
   footnote_nr:    1
-{% endhighlight %}
+```
 
 ## Liquid Options
 
@@ -715,7 +715,7 @@ extensions are:
 
 If you're interested in creating a custom markdown processor, you're in luck! Create a new class in the `Jekyll::Converters::Markdown` namespace:
 
-{% highlight ruby %}
+```ruby
 class Jekyll::Converters::Markdown::MyCustomProcessor
   def initialize(config)
     require 'funky_markdown'
@@ -730,14 +730,14 @@ class Jekyll::Converters::Markdown::MyCustomProcessor
     ::FunkyMarkdown.new(content).convert
   end
 end
-{% endhighlight %}
+```
 
 Once you've created your class and have it properly set up either as a plugin
 in the `_plugins` folder or as a gem, specify it in your `_config.yml`:
 
-{% highlight yaml %}
+```yaml
 markdown: MyCustomProcessor
-{% endhighlight %}
+```
 
 ## Incremental Regeneration
 
    
diff --git a/site/_docs/continuous-integration.md b/site/_docs/continuous-integration.md
index c01d1d1bc6d..4599115d5fe 100644
--- a/site/_docs/continuous-integration.md
+++ b/site/_docs/continuous-integration.md
@@ -38,13 +38,13 @@ Save the commands you want to run and succeed in a file: `./script/cibuild`
 
 ### The HTML Proofer Executable
 
-{% highlight shell %}
+```sh
 #!/usr/bin/env bash
 set -e # halt script on error
 
 bundle exec jekyll build
 bundle exec htmlproofer ./_site
-{% endhighlight %}
+```
 
 Some options can be specified via command-line switches. Check out the
 `html-proofer` README for more information about these switches, or run
@@ -52,20 +52,20 @@ Some options can be specified via command-line switches. Check out the
 
 For example to avoid testing external sites, use this command:
 
-{% highlight shell %}
+```sh
 $ bundle exec htmlproofer ./_site --disable-external
-{% endhighlight %}
+```
 
 ### The HTML Proofer Library
 
 You can also invoke `html-proofer` in Ruby scripts (e.g. in a Rakefile):
 
-{% highlight ruby %}
+```ruby
 #!/usr/bin/env ruby
 
 require 'html-proofer'
 HTMLProofer.check_directory("./_site").run
-{% endhighlight %}
+```
 
 Options are given as a second argument to `.new`, and are encoded in a
 symbol-keyed Ruby Hash. For more information about the configuration options,
@@ -82,16 +82,16 @@ an explanation of each line.
 
 **Note:** You will need a Gemfile as well, [Travis will automatically install](https://docs.travis-ci.com/user/languages/ruby/#Dependency-Management) the dependencies based on the referenced gems:
 
-{% highlight ruby %}
+```ruby
 source "https://rubygems.org"
 
 gem "jekyll"
 gem "html-proofer"
-{% endhighlight %}
+```
 
 Your `.travis.yml` file should look like this:
 
-{% highlight yaml %}
+```yaml
 language: ruby
 rvm:
 - 2.1
@@ -114,39 +114,39 @@ env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
 
 sudo: false # route your build to the container-based infrastructure for a faster build
-{% endhighlight %}
+```
 
 Ok, now for an explanation of each line:
 
-{% highlight yaml %}
+```yaml
 language: ruby
-{% endhighlight %}
+```
 
 This line tells Travis to use a Ruby build container. It gives your script
 access to Bundler, RubyGems, and a Ruby runtime.
 
-{% highlight yaml %}
+```yaml
 rvm:
 - 2.1
-{% endhighlight %}
+```
 
 RVM is a popular Ruby Version Manager (like rbenv, chruby, etc). This
 directive tells Travis the Ruby version to use when running your test
 script.
 
-{% highlight yaml %}
+```yaml
 before_script:
  - chmod +x ./script/cibuild
-{% endhighlight %}
+```
 
 The build script file needs to have the *executable* attribute set or
 Travis will fail with a permission denied error. You can also run this
 locally and commit the permissions directly, thus rendering this step
 irrelevant.
 
-{% highlight yaml %}
+```yaml
 script: ./script/cibuild
-{% endhighlight %}
+```
 
 Travis allows you to run any arbitrary shell script to test your site. One
 convention is to put all scripts for your project in the `script`
@@ -154,20 +154,20 @@ directory, and to call your test script `cibuild`. This line is completely
 customizable. If your script won't change much, you can write your test
 incantation here directly:
 
-{% highlight yaml %}
+```yaml
 install: gem install jekyll html-proofer
 script: jekyll build && htmlproofer ./_site
-{% endhighlight %}
+```
 
 The `script` directive can be absolutely any valid shell command.
 
-{% highlight yaml %}
+```yaml
 # branch whitelist, only for GitHub Pages
 branches:
   only:
   - gh-pages     # test the gh-pages branch
   - /pages-(.*)/ # test every branch which starts with "pages-"
-{% endhighlight %}
+```
 
 You want to ensure the Travis builds for your site are being run only on
 the branch or branches which contain your site. One means of ensuring this
@@ -181,11 +181,11 @@ prefixed, exemplified above with the `/pages-(.*)/` regular expression.
 The `branches` directive is completely optional. Travis will build from every
 push to any branch of your repo if leave it out.
 
-{% highlight yaml %}
+```yaml
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
-{% endhighlight %}
+```
 
 Using `html-proofer`? You'll want this environment variable. Nokogiri, used
 to parse HTML files in your compiled site, comes bundled with libraries
@@ -200,9 +200,9 @@ environment variable `NOKOGIRI_USE_SYSTEM_LIBRARIES` to `true`.
    servers, which Jekyll will mistakenly read and explode on.
    
 
    
 
-{% highlight yaml %}
+```yaml
 exclude: [vendor]
-{% endhighlight %}
+```
 
 By default you should supply the `sudo: false` command to Travis. This command
 explicitly tells Travis to run your build on Travis's [container-based
@@ -210,9 +210,9 @@ explicitly tells Travis to run your build on Travis's [container-based
 speed up your build. If you have any trouble with your build, or if your build
 does need `sudo` access, modify the line to `sudo: required`.
 
-{% highlight yaml %}
+```yaml
 sudo: false
-{% endhighlight %}
+```
 
 ### Troubleshooting
 
diff --git a/site/_docs/datafiles.md b/site/_docs/datafiles.md
index 474e8e8278c..d61c1bfaf48 100644
--- a/site/_docs/datafiles.md
+++ b/site/_docs/datafiles.md
@@ -32,7 +32,7 @@ of code in your Jekyll templates:
 
 In `_data/members.yml`:
 
-{% highlight yaml %}
+```yaml
 - name: Eric Mill
   github: konklone
 
@@ -41,23 +41,23 @@ In `_data/members.yml`:
 
 - name: Liu Fengyun
   github: liufengyun
-{% endhighlight %}
+```
 
 Or `_data/members.csv`:
 
-{% highlight text %}
+```text
 name,github
 Eric Mill,konklone
 Parker Moore,parkr
 Liu Fengyun,liufengyun
-{% endhighlight %}
+```
 
 This data can be accessed via `site.data.members` (notice that the filename
 determines the variable name).
 
 You can now render the list of members in a template:
 
-{% highlight html %}
+```html
 {% raw %}
 
      
 {% for member in site.data.members %}
@@ -69,7 +69,7 @@ You can now render the list of members in a template:
 {% endfor %}
 
    
 {% endraw %}
-{% endhighlight %}
+```
 
 ## Example: Organizations
 
@@ -80,7 +80,7 @@ folder:
 
 In `_data/orgs/jekyll.yml`:
 
-{% highlight yaml %}
+```yaml
 username: jekyll
 name: Jekyll
 members:
@@ -89,22 +89,22 @@ members:
 
   - name: Parker Moore
     github: parkr
-{% endhighlight %}
+```
 
 In `_data/orgs/doeorg.yml`:
 
-{% highlight yaml %}
+```yaml
 username: doeorg
 name: Doe Org
 members:
   - name: John Doe
     github: jdoe
-{% endhighlight %}
+```
 
 The organizations can then be accessed via `site.data.orgs`, followed by the
 file name:
 
-{% highlight html %}
+```html
 {% raw %}
 
      
 {% for org_hash in site.data.orgs %}
@@ -118,22 +118,22 @@ file name:
 {% endfor %}
 
    
 {% endraw %}
-{% endhighlight %}
+```
 
 ## Example: Accessing a specific author
 
 Pages and posts can also access a specific data item. The example below shows how to access a specific item:
 
 `_data/people.yml`:
-{% highlight yaml %}
+```yaml
 dave:
     name: David Smith
     twitter: DavidSilvaSmith
-{% endhighlight %}
+```
 
 The author can then be specified as a page variable in a post's frontmatter:
 
-{% highlight html %}
+```html
 {% raw %}
 ---
 title: sample post
@@ -148,4 +148,4 @@ author: dave
 
 
 {% endraw %}
-{% endhighlight %}
+```
diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md
index af6edf73b8f..7391fe0366a 100644
--- a/site/_docs/deployment-methods.md
+++ b/site/_docs/deployment-methods.md
@@ -35,19 +35,19 @@ this](http://web.archive.org/web/20091223025644/http://www.taknado.com/en/2009/0
 
 To have a remote server handle the deploy for you every time you push changes using Git, you can create a user account which has all the public keys that are authorized to deploy in its `authorized_keys` file. With that in place, setting up the post-receive hook is done as follows:
 
-{% highlight shell %}
+```sh
 laptop$ ssh deployer@example.com
 server$ mkdir myrepo.git
 server$ cd myrepo.git
 server$ git --bare init
 server$ cp hooks/post-receive.sample hooks/post-receive
 server$ mkdir /var/www/myrepo
-{% endhighlight %}
+```
 
 Next, add the following lines to hooks/post-receive and be sure Jekyll is
 installed on the server:
 
-{% highlight shell %}
+```sh
 GIT_REPO=$HOME/myrepo.git
 TMP_GIT_CLONE=$HOME/tmp/myrepo
 PUBLIC_WWW=/var/www/myrepo
@@ -56,21 +56,21 @@ git clone $GIT_REPO $TMP_GIT_CLONE
 jekyll build -s $TMP_GIT_CLONE -d $PUBLIC_WWW
 rm -Rf $TMP_GIT_CLONE
 exit
-{% endhighlight %}
+```
 
 Finally, run the following command on any users laptop that needs to be able to
 deploy using this hook:
 
-{% highlight shell %}
+```sh
 laptops$ git remote add deploy deployer@example.com:~/myrepo.git
-{% endhighlight %}
+```
 
 Deploying is now as easy as telling nginx or Apache to look at
 `/var/www/myrepo` and running the following:
 
-{% highlight shell %}
+```sh
 laptops$ git push deploy master
-{% endhighlight %}
+```
 
 ### Jekyll-hook
 
@@ -98,12 +98,13 @@ Another way to deploy your Jekyll site is to use [Rake](https://github.com/ruby/
 ### scp
 
 Once you’ve generated the `_site` directory, you can easily scp it using a
-`tasks/deploy` shell script similar to this:
+`tasks/deploy` shell script similar to [this deploy script][]. You’d obviously
+need to change the values to reflect your site’s details. There is even [a
+matching TextMate command][] that will help you run this script.
 
-    #!/bin/bash
-    
-    scp -r _site/* user@server:/home/user/public_html
+[this deploy script here]: https://github.com/henrik/henrik.nyh.se/blob/master/script/deploy
 
+[a matching TextMate command]: https://gist.github.com/henrik/214959
 
 ### rsync
 
@@ -128,9 +129,9 @@ is to put the restriction to certificate-based authorization in
 `~/.ssh/authorized_keys`. Then, launch `rrsync` and supply
 it with the folder it shall have read-write access to:
 
-{% highlight shell %}
+```sh
 command="$HOME/bin/rrsync ",no-agent-forwarding,no-port-forwarding,no-pty,no-user-rc,no-X11-forwarding ssh-rsa 
-{% endhighlight %}
+```
 
 `` is the path to your site. E.g., `~/public_html/you.org/blog-html/`.
 
@@ -138,11 +139,11 @@ command="$HOME/bin/rrsync ",no-agent-forwarding,no-port-forwarding,no-pt
 
 Add the `deploy` script to the site source folder:
 
-{% highlight shell %}
+```sh
 #!/bin/sh
 
 rsync -crvz --rsh='ssh -p2222' --delete-after --delete-excluded    @:
-{% endhighlight %}
+```
 
 Command line parameters are:
 
@@ -154,9 +155,9 @@ your host uses a different port than the default (e.g, HostGator)
 
 Using this setup, you might run the following command:
 
-{% highlight shell %}
+```sh
 rsync -crvz --rsh='ssh -p2222' --delete-after --delete-excluded _site/ hostuser@example.org:
-{% endhighlight %}
+```
 
 Don't forget the column `:` after server name!
 
@@ -168,10 +169,10 @@ copy it to the output folder. This behavior can be changed in `_config.yml`.
 
 Just add the following line:
 
-{% highlight yaml %}
+```yaml
 # Do not copy these files to the output directory
 exclude: ["deploy"]
-{% endhighlight %}
+```
 
 Alternatively, you can use an `rsync-exclude.txt` file to control which files will be transferred to your server.
 
diff --git a/site/_docs/drafts.md b/site/_docs/drafts.md
index e50af47435a..d5513f75fc1 100644
--- a/site/_docs/drafts.md
+++ b/site/_docs/drafts.md
@@ -9,10 +9,10 @@ don't want to publish yet. To get up and running with drafts, create a
 `_drafts` folder in your site's root (as described in the [site structure](/docs/structure/) section) and create your
 first draft:
 
-{% highlight text %}
+```text
 |-- _drafts/
 |   |-- a-draft-post.md
-{% endhighlight %}
+```
 
 To preview your site with drafts, simply run `jekyll serve` or `jekyll build`
 with the `--drafts` switch. Each will be assigned the value modification time
diff --git a/site/_docs/extras.md b/site/_docs/extras.md
index 5abd0d735be..83e79963213 100644
--- a/site/_docs/extras.md
+++ b/site/_docs/extras.md
@@ -11,9 +11,9 @@ may want to install, depending on how you plan to use Jekyll.
 
 Kramdown comes with optional support for LaTeX to PNG rendering via [MathJax](https://www.mathjax.org) within math blocks. See the Kramdown documentation on [math blocks](http://kramdown.gettalong.org/syntax.html#math-blocks) and [math support](http://kramdown.gettalong.org/converter/html.html#math-support) for more details. MathJax requires you to include JavaScript or CSS to render the LaTeX, e.g.
 
-{% highlight html %}
+```html
 
-{% endhighlight %}
+```
 
 For more information about getting started, check out [this excellent blog post](http://gastonsanchez.com/opinion/2014/02/16/Mathjax-with-jekyll/).
 
diff --git a/site/_docs/frontmatter.md b/site/_docs/frontmatter.md
index faf67b73f43..7e427552a2f 100644
--- a/site/_docs/frontmatter.md
+++ b/site/_docs/frontmatter.md
@@ -10,12 +10,12 @@ Jekyll as a special file. The front matter must be the first thing in the file
 and must take the form of valid YAML set between triple-dashed lines. Here is a
 basic example:
 
-{% highlight yaml %}
+```yaml
 ---
 layout: post
 title: Blogging Like a Hacker
 ---
-{% endhighlight %}
+```
 
 Between these triple-dashed lines, you can set predefined variables (see below
 for a reference) or even create custom ones of your own. These variables will
@@ -108,7 +108,7 @@ 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:
 
-{% highlight html %}
+```html
 
 
   
@@ -116,7 +116,7 @@ title:
   
   
     ...
-{% endhighlight %}
+```
 
 ## Predefined Variables for Posts
 
diff --git a/site/_docs/github-pages.md b/site/_docs/github-pages.md
index 4a4c3895a3b..6a449d682e2 100644
--- a/site/_docs/github-pages.md
+++ b/site/_docs/github-pages.md
@@ -22,14 +22,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 `site.github.url` in your URL's.
 
-{% highlight html %}
+```html
 {% raw %}
 
 
 
 {{ page.title }}
 {% endraw %}
-{% endhighlight %}
+```
 
 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
@@ -54,7 +54,7 @@ few minor details.
     currently-deployed version of the gem in your project, add the
     following to your Gemfile:
 
-{% highlight ruby %}
+```ruby
 source 'https://rubygems.org'
 
 require 'json'
@@ -62,18 +62,18 @@ require 'open-uri'
 versions = JSON.parse(open('https://pages.github.com/versions.json').read)
 
 gem 'github-pages', versions['github-pages']
-{% endhighlight %}
+```
 
     This will ensure that when you run bundle install, you
     have the correct version of the github-pages gem.
 
     If that fails, simplify it:
 
-{% highlight ruby %}
+```ruby
 source 'https://rubygems.org'
 
 gem 'github-pages'
-{% endhighlight %}
+```
 
     And be sure to run bundle update often.
 
diff --git a/site/_docs/installation.md b/site/_docs/installation.md
index f608a29908f..b86d179e562 100644
--- a/site/_docs/installation.md
+++ b/site/_docs/installation.md
@@ -37,9 +37,9 @@ The best way to install Jekyll is via
 [RubyGems](http://rubygems.org/pages/download). At the terminal prompt,
 simply run the following command to install Jekyll:
 
-{% highlight shell %}
+```sh
 $ gem install jekyll
-{% endhighlight %}
+```
 
 All of Jekyll’s gem dependencies are automatically installed by the above
 command, so you won’t have to worry about them at all. If you have problems
@@ -62,28 +62,28 @@ community can improve the experience for everyone.
 In order to install a pre-release, make sure you have all the requirements
 installed properly and run:
 
-{% highlight shell %}
+```sh
 gem install jekyll --pre
-{% endhighlight %}
+```
 
 This will install the latest pre-release. If you want a particular pre-release,
 use the `-v` switch to indicate the version you'd like to install:
 
-{% highlight shell %}
+```sh
 gem install jekyll -v '2.0.0.alpha.1'
-{% endhighlight %}
+```
 
 If you'd like to install a development version of Jekyll, the process is a bit
 more involved. This gives you the advantage of having the latest and greatest,
 but may be unstable.
 
-{% highlight shell %}
+```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
-{% endhighlight %}
+```
 
 ## Optional Extras
 
diff --git a/site/_docs/pages.md b/site/_docs/pages.md
index 48ba3de67bc..15e8f830e5f 100644
--- a/site/_docs/pages.md
+++ b/site/_docs/pages.md
@@ -46,7 +46,7 @@ directory with a suitable name for the page you want to create. For a site with
 a homepage, an about page, and a contact page, here’s what the root directory
 and associated URLs might look like:
 
-{% highlight shell %}
+```sh
 .
 |-- _config.yml
 |-- _includes/
@@ -57,7 +57,7 @@ and associated URLs might look like:
 |-- index.html    # => http://example.com/
 |-- other.md      # => http://example.com/other.html
 └── contact.html  # => http://example.com/contact.html
-{% endhighlight %}
+```
 
 ### Named folders containing index HTML files
 
@@ -69,7 +69,7 @@ the page URL ends up being the folder name, and the web server will serve up
 the respective `index.html` file. Here's an example of what this structure
 might look like:
 
-{% highlight shell %}
+```sh
 .
 ├── _config.yml
 ├── _includes/
@@ -83,7 +83,7 @@ might look like:
 |── other/
 |   └── index.md    # => http://example.com/other/
 └── index.html      # => http://example.com/
-{% endhighlight %}
+```
 
 This approach may not suit everyone, but for people who like clean URLs it’s
 simple and it works. In the end, the decision is yours!
diff --git a/site/_docs/pagination.md b/site/_docs/pagination.md
index 1ef2d496f15..b32b934ca91 100644
--- a/site/_docs/pagination.md
+++ b/site/_docs/pagination.md
@@ -28,18 +28,18 @@ your `_config.yml` under `gems`. For Jekyll 2, this is standard.
 To enable pagination for your blog, add a line to the `_config.yml` file that
 specifies how many items should be displayed per page:
 
-{% highlight yaml %}
+```yaml
 paginate: 5
-{% endhighlight %}
+```
 
 The number should be the maximum number of Posts you’d like to be displayed
 per-page in the generated site.
 
 You may also specify the destination of the pagination pages:
 
-{% highlight yaml %}
+```yaml
 paginate_path: "/blog/page:num/"
-{% endhighlight %}
+```
 
 This will read in `blog/index.html`, send it each pagination page in Liquid as
 `paginator` and write the output to `blog/page:num/`, where `:num` is the
@@ -146,7 +146,7 @@ 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:
 
-{% highlight html %}
+```html
 {% raw %}
 ---
 layout: default
@@ -179,7 +179,7 @@ title: My Blog
   {% endif %}
 
 {% endraw %}
-{% endhighlight %}
+```
 
 
    
   
    Beware the page one edge-case
    
@@ -193,7 +193,7 @@ 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.
 
-{% highlight html %}
+```html
 {% raw %}
 {% if paginator.total_pages > 1 %}
 
 {% endif %}
 {% endraw %}
-{% endhighlight %}
+```
diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index b6a12932256..218a94435c8 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -93,7 +93,7 @@ For instance, a generator can inject values computed at build time for template
 variables. In the following example the template `reading.html` has two
 variables `ongoing` and `done` that we fill in the generator:
 
-{% highlight ruby %}
+```ruby
 module Reading
   class Generator < Jekyll::Generator
     def generate(site)
@@ -105,11 +105,11 @@ module Reading
     end
   end
 end
-{% endhighlight %}
+```
 
 This is a more complex generator that generates new pages:
 
-{% highlight ruby %}
+```ruby
 module Jekyll
 
   class CategoryPage < Page
@@ -142,7 +142,7 @@ module Jekyll
   end
 
 end
-{% endhighlight %}
+```
 
 In this example, our generator will create a series of files under the
 `categories` directory for each category, listing the posts in each category
@@ -189,7 +189,7 @@ languages are implemented using this method.
 Below is a converter that will take all posts ending in `.upcase` and process
 them using the `UpcaseConverter`:
 
-{% highlight ruby %}
+```ruby
 module Jekyll
   class UpcaseConverter < Converter
     safe true
@@ -208,7 +208,7 @@ module Jekyll
     end
   end
 end
-{% endhighlight %}
+```
 
 Converters should implement at a minimum 3 methods:
 
@@ -266,16 +266,16 @@ As of version 2.5.0, Jekyll can be extended with plugins which provide
 subcommands for the `jekyll` executable. This is possible by including the
 relevant plugins in a `Gemfile` group called `:jekyll_plugins`:
 
-{% highlight ruby %}
+```ruby
 group :jekyll_plugins do
   gem "my_fancy_jekyll_plugin"
 end
-{% endhighlight %}
+```
 
 Each `Command` must be a subclass of the `Jekyll::Command` class and must
 contain one class method: `init_with_program`. An example:
 
-{% highlight ruby %}
+```ruby
 class MyNewCommand < Jekyll::Command
   class << self
     def init_with_program(prog)
@@ -292,7 +292,7 @@ class MyNewCommand < Jekyll::Command
     end
   end
 end
-{% endhighlight %}
+```
 
 Commands should implement this single class method:
 
@@ -328,7 +328,7 @@ hooking into the tagging system. Built-in examples added by Jekyll include the
 `highlight` and `include` tags. Below is an example of a custom liquid tag that
 will output the time the page was rendered:
 
-{% highlight ruby %}
+```ruby
 module Jekyll
   class RenderTimeTag < Liquid::Tag
 
@@ -344,7 +344,7 @@ module Jekyll
 end
 
 Liquid::Template.register_tag('render_time', Jekyll::RenderTimeTag)
-{% endhighlight %}
+```
 
 At a minimum, liquid tags must implement:
 
@@ -372,24 +372,24 @@ At a minimum, liquid tags must implement:
 You must also register the custom tag with the Liquid template engine as
 follows:
 
-{% highlight ruby %}
+```ruby
 Liquid::Template.register_tag('render_time', Jekyll::RenderTimeTag)
-{% endhighlight %}
+```
 
 In the example above, we can place the following tag anywhere in one of our
 pages:
 
-{% highlight ruby %}
+```ruby
 {% raw %}
 
    {% render_time page rendered at: %}
    
 {% endraw %}
-{% endhighlight %}
+```
 
 And we would get something like this on the page:
 
-{% highlight html %}
+```html
 
    page rendered at: Tue June 22 23:38:47 –0500 2010
    
-{% endhighlight %}
+```
 
 ### Liquid filters
 
@@ -398,7 +398,7 @@ add tags above. Filters are simply modules that export their methods to liquid.
 All methods will have to take at least one parameter which represents the input
 of the filter. The return value will be the output of the filter.
 
-{% highlight ruby %}
+```ruby
 module Jekyll
   module AssetFilter
     def asset_url(input)
@@ -408,7 +408,7 @@ module Jekyll
 end
 
 Liquid::Template.register_filter(Jekyll::AssetFilter)
-{% endhighlight %}
+```
 
 
    
   
    ProTip™: Access the site object using Liquid
    
@@ -469,7 +469,7 @@ There are two flags to be aware of when writing a plugin:
 To use one of the example plugins above as an illustration, here is how you’d
 specify these two flags:
 
-{% highlight ruby %}
+```ruby
 module Jekyll
   class UpcaseConverter < Converter
     safe true
@@ -477,7 +477,7 @@ module Jekyll
     ...
   end
 end
-{% endhighlight %}
+```
 
 ## Hooks
 
@@ -491,11 +491,11 @@ call whenever the hook is triggered. For example, if you want to execute some
 custom functionality every time Jekyll renders a post, you could register a
 hook like this:
 
-{% highlight ruby %}
+```ruby
 Jekyll::Hooks.register :posts, :post_render do |post|
   # code to call after Jekyll renders a post
 end
-{% endhighlight %}
+```
 
 Jekyll provides hooks for :site, :pages,
 :posts, and :documents. In all cases, Jekyll calls your
diff --git a/site/_docs/posts.md b/site/_docs/posts.md
index 2a9bf3faed8..0253dbac9e4 100644
--- a/site/_docs/posts.md
+++ b/site/_docs/posts.md
@@ -27,18 +27,18 @@ 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:
 
-{% highlight shell %}
+```sh
 YEAR-MONTH-DAY-title.MARKUP
-{% endhighlight %}
+```
 
 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:
 
-{% highlight shell %}
+```sh
 2011-12-31-new-years-eve-is-awesome.md
 2012-09-12-how-to-write-a-blog.textile
-{% endhighlight %}
+```
 
 
    
   
    ProTip™: Link to other posts
    
@@ -90,16 +90,16 @@ variable in a post.
 
 Including an image asset in a post:
 
-{% highlight text %}
+```text
 ... which is shown in the screenshot below:
 ![My helpful screenshot]({% raw %}{{ site.url }}{% endraw %}/assets/screenshot.jpg)
-{% endhighlight %}
+```
 
 Linking to a PDF for readers to download:
 
-{% highlight text %}
+```text
 ... you can [get the PDF]({% raw %}{{ site.url }}{% endraw %}/assets/mydoc.pdf) directly.
-{% endhighlight %}
+```
 
 
    
   
    ProTip™: Link using just the site root URL
    
@@ -119,7 +119,7 @@ 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:
 
-{% highlight html %}
+```html
 
      
   {% raw %}{% for post in site.posts %}{% endraw %}
     
    • 
@@ -127,7 +127,7 @@ basic example of how to create a list of links to your blog posts:
     
      • 
   {% raw %}{% endfor %}{% endraw %}
 
    
-{% endhighlight %}
+```
 
 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
@@ -146,7 +146,7 @@ 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:
 
-{% highlight html %}
+```html
 
      
   {% raw %}{% for post in site.posts %}{% endraw %}
     
    • 
@@ -155,22 +155,22 @@ your posts:
     
      • 
   {% raw %}{% endfor %}{% endraw %}
 
    
-{% endhighlight %}
+```
 
 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:
 
-{% highlight html %}
+```html
 {% raw %}{{ post.excerpt | remove: '
    ' | remove: '
    ' }}{% endraw %}
-{% endhighlight %}
+```
 
 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:
 
-{% highlight text %}
+```text
 ---
 excerpt_separator: 
 ---
@@ -178,7 +178,7 @@ excerpt_separator: 
 Excerpt
 
 Out-of-excerpt
-{% endhighlight %}
+```
 
 You can also set the `excerpt_separator` globally in your `_config.yml`
 configuration file.
@@ -197,7 +197,7 @@ 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:
 
-{% highlight text %}
+```text
 {% raw %}{% highlight ruby %}{% endraw %}
 def show
   @widget = Widget(params[:id])
@@ -207,11 +207,11 @@ def show
   end
 end
 {% raw %}{% endhighlight %}{% endraw %}
-{% endhighlight %}
+```
 
 And the output will look like this:
 
-{% highlight ruby %}
+```ruby
 def show
   @widget = Widget(params[:id])
   respond_to do |format|
@@ -219,7 +219,7 @@ def show
     format.json { render json: @widget }
   end
 end
-{% endhighlight %}
+```
 
 
    
   
    ProTip™: Show line numbers
    
diff --git a/site/_docs/quickstart.md b/site/_docs/quickstart.md
index 81bd74d20a4..b6cb5895599 100644
--- a/site/_docs/quickstart.md
+++ b/site/_docs/quickstart.md
@@ -6,14 +6,14 @@ permalink: /docs/quickstart/
 
 For the impatient, here's how to get a boilerplate Jekyll site up and running.
 
-{% highlight shell %}
+```sh
 ~ $ gem install jekyll bundler
 ~ $ jekyll new myblog
 ~ $ cd myblog
 ~/myblog $ bundle install
 ~/myblog $ bundle exec jekyll serve
 # => Now browse to http://localhost:4000
-{% endhighlight %}
+```
 
 If you wish to install jekyll into an existing directory, you can do so by running `jekyll new .` from within the directory instead of creating a new one. If the existing directory isn't empty, you'll also have to pass the `--force` option like so `jekyll new . --force`.
 
diff --git a/site/_docs/structure.md b/site/_docs/structure.md
index 227b8491ce9..de077c5ec40 100644
--- a/site/_docs/structure.md
+++ b/site/_docs/structure.md
@@ -14,7 +14,7 @@ product.
 
 A basic Jekyll site usually looks something like this:
 
-{% highlight shell %}
+```sh
 .
 ├── _config.yml
 ├── _drafts
@@ -34,7 +34,7 @@ A basic Jekyll site usually looks something like this:
 ├── _site
 ├── .jekyll-metadata
 └── index.html
-{% endhighlight %}
+```
 
 An overview of what each of these does:
 
diff --git a/site/_docs/templates.md b/site/_docs/templates.md
index 080ac5faf2f..55bd8b5b2f7 100644
--- a/site/_docs/templates.md
+++ b/site/_docs/templates.md
@@ -374,9 +374,9 @@ The default is `default`. They are as follows (with what they filter):
 If you have small page fragments that you wish to include in multiple places on
 your site, you can use the `include` tag.
 
-{% highlight liquid %}
+```liquid
 {% raw %}{% include footer.html %}{% endraw %}
-{% endhighlight %}
+```
 
 Jekyll expects all include files to be placed in an `_includes` directory at the
 root of your source directory. This will embed the contents of
@@ -395,23 +395,23 @@ root of your source directory. This will embed the contents of
 
 You can also pass parameters to an include. Omit the quotation marks to send a variable's value. Liquid curly brackets should not be used here:
 
-{% highlight liquid %}
+```liquid
 {% raw %}{% include footer.html param="value" variable-param=page.variable %}{% endraw %}
-{% endhighlight %}
+```
 
 These parameters are available via Liquid in the include:
 
-{% highlight liquid %}
+```liquid
 {% raw %}{{ include.param }}{% endraw %}
-{% endhighlight %}
+```
 
 #### Including files relative to another file
 
 You can also choose to include file fragments relative to the current file:
 
-{% highlight liquid %}
+```liquid
 {% raw %}{% include_relative somedir/footer.html %}{% endraw %}
-{% endhighlight %}
+```
 
 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,
@@ -437,7 +437,7 @@ languages](http://pygments.org/languages/)
 
 To render a code block with syntax highlighting, surround your code as follows:
 
-{% highlight liquid %}
+```liquid
 {% raw %}
 {% highlight ruby %}
 def foo
@@ -445,7 +445,7 @@ def foo
 end
 {% endhighlight %}
 {% endraw %}
-{% endhighlight %}
+```
 
 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
@@ -460,7 +460,7 @@ 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:
 
-{% highlight liquid %}
+```liquid
 {% raw %}
 {% highlight ruby linenos %}
 def foo
@@ -468,7 +468,7 @@ def foo
 end
 {% endhighlight %}
 {% endraw %}
-{% endhighlight %}
+```
 
 #### Stylesheets for syntax highlighting
 
@@ -488,21 +488,21 @@ specify.
 
 You must include the file extension when using the `link` tag.
 
-{% highlight liquid %}
+```liquid
 {% raw %}
 {% link _collection/name-of-document.md %}
 {% link _posts/2016-07-26-name-of-post.md %}
 {% endraw %}
-{% endhighlight %}
+```
 
 You can also use this tag to create a link in Markdown as follows:
 
-{% highlight liquid %}
+```liquid
 {% raw %}
 [Link to a document]({% link _collection/name-of-document.md %})
 [Link to a post]({% link _posts/2016-07-26-name-of-post.md %})
 {% endraw %}
-{% endhighlight %}
+```
 
 Support for static files and pages is coming in a later release but is
 **not** released as of v3.2.1.
@@ -512,49 +512,49 @@ Support for static files and pages is coming in a later release but is
 If you would like 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.
 
-{% highlight liquid %}
+```liquid
 {% raw %}
 {% post_url 2010-07-21-name-of-post %}
 {% endraw %}
-{% endhighlight %}
+```
 
 If you organize your posts in subdirectories, you need to include subdirectory
 path to the post:
 
-{% highlight liquid %}
+```liquid
 {% raw %}
 {% post_url /subdir/2010-07-21-name-of-post %}
 {% endraw %}
-{% endhighlight %}
+```
 
 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:
 
-{% highlight liquid %}
+```liquid
 {% raw %}
 [Name of Link]({% post_url 2010-07-21-name-of-post %})
 {% endraw %}
-{% endhighlight %}
+```
 
 ### Gist
 
 Use the `gist` tag to easily embed a GitHub Gist onto your site. This works
 with public or secret gists:
 
-{% highlight liquid %}
+```liquid
 {% raw %}
 {% gist parkr/931c1c8d465a04042403 %}
 {% endraw %}
-{% endhighlight %}
+```
 
 You may also optionally specify the filename in the gist to display:
 
-{% highlight liquid %}
+```liquid
 {% raw %}
 {% gist parkr/931c1c8d465a04042403 jekyll-private-gist.markdown %}
 {% endraw %}
-{% endhighlight %}
+```
 
 To use the `gist` tag, you'll need to add the
 [jekyll-gist](https://github.com/jekyll/jekyll-gist) gem to your project.
diff --git a/site/_docs/themes.md b/site/_docs/themes.md
index 41b3c4db187..55e14b4bb3e 100644
--- a/site/_docs/themes.md
+++ b/site/_docs/themes.md
@@ -38,7 +38,7 @@ Refer to your selected theme's documentation and source repository for more info
 
 Jekyll themes are distributed as Ruby gems. Don't worry, Jekyll will help you scaffold a new theme with the `new-theme` command. Just run `jekyll new-theme` with the theme name as an argument:
 
-{% highlight plaintext %}
+```sh
 jekyll new-theme my-awesome-theme
              create /path/to/my-awesome-theme/_layouts
              create /path/to/my-awesome-theme/_includes
@@ -54,7 +54,7 @@ jekyll new-theme my-awesome-theme
              create /path/to/my-awesome-theme/.gitignore
 Your new Jekyll theme, my-awesome-theme, is ready for you in /path/to/my-awesome-theme!
 For help getting started, read /path/to/my-awesome-theme/README.md.
-{% endhighlight %}
+```
 
 Add your template files in the corresponding folders, complete the `.gemspec` and the README files according to your needs.
 
diff --git a/site/_docs/troubleshooting.md b/site/_docs/troubleshooting.md
index a129961292d..c4580f69777 100644
--- a/site/_docs/troubleshooting.md
+++ b/site/_docs/troubleshooting.md
@@ -20,61 +20,61 @@ If you encounter errors during gem installation, you may need to install
 the header files for compiling extension modules for Ruby 2.0.0. This
 can be done on Ubuntu or Debian by running:
 
-{% highlight shell %}
+```sh
 sudo apt-get install ruby2.0.0-dev
-{% endhighlight %}
+```
 
 On Red Hat, CentOS, and Fedora systems you can do this by running:
 
-{% highlight shell %}
+```sh
 sudo yum install ruby-devel
-{% endhighlight %}
+```
 
 If you installed the above - specifically on Fedora 23 - but the extensions would still not compile, you are probably running a Fedora image that misses the `redhat-rpm-config` package. To solve this, simply run:
 
-{% highlight shell %}
+```sh
 sudo dnf install redhat-rpm-config
-{% endhighlight %}
+```
 
 
 On [NearlyFreeSpeech](https://www.nearlyfreespeech.net/) you need to run the
 following commands before installing Jekyll:
 
-{% highlight shell %}
+```sh
 export GEM_HOME=/home/private/gems
 export GEM_PATH=/home/private/gems:/usr/local/lib/ruby/gems/1.8/
 export PATH=$PATH:/home/private/gems/bin
 export RB_USER_INSTALL='true'
-{% endhighlight %}
+```
 
 To install RubyGems on Gentoo:
 
-{% highlight shell %}
+```sh
 sudo emerge -av dev-ruby/rubygems
-{% endhighlight %}
+```
 
 On Windows, you may need to install [RubyInstaller
 DevKit](https://wiki.github.com/oneclick/rubyinstaller/development-kit).
 
 On Mac OS X, you may need to update RubyGems (using `sudo` only if necessary):
 
-{% highlight shell %}
+```sh
 sudo gem update --system
-{% endhighlight %}
+```
 
 If you still have issues, you can download and install new Command Line
 Tools (such as `gcc`) using the command
 
-{% highlight shell %}
+```sh
 xcode-select --install
-{% endhighlight %}
+```
 
 which may allow you to install native gems using this command (again using
 `sudo` only if necessary):
 
-{% highlight shell %}
+```sh
 sudo gem install jekyll
-{% endhighlight %}
+```
 
 Note that upgrading Mac OS X does not automatically upgrade Xcode itself
 (that can be done separately via the App Store), and having an out-of-date
@@ -90,22 +90,22 @@ 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):
 
-{% highlight shell %}
+```sh
 sudo gem install -n /usr/local/bin jekyll
-{% endhighlight %}
+```
 
 Alternatively, Homebrew can be installed and used to set up Ruby. This can be
 done as follows:
 
-{% highlight shell %}
+```sh
 ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-{% endhighlight %}
+```
 
 Once Homebrew is installed, the second step is easy:
 
-{% highlight shell %}
+```sh
 brew install ruby
-{% endhighlight %}
+```
 
 Advanced users (with more complex needs) may find it helpful to choose one of a
 number of Ruby version managers ([RVM][], [rbenv][], [chruby][], [etc][].) in
@@ -119,15 +119,15 @@ which to install Jekyll.
 If you elect to use one of the above methods to install Ruby, it might be
 necessary to modify your `$PATH` variable using the following command:
 
-{% highlight shell %}
+```sh
 export PATH=/usr/local/bin:$PATH
-{% endhighlight %}
+```
 
 GUI apps can modify the `$PATH` as follows:
 
-{% highlight shell %}
+```sh
 launchctl setenv PATH "/usr/local/bin:$PATH"
-{% endhighlight %}
+```
 
 Either of these approaches are useful because `/usr/local` is considered a
 "safe" location on systems which have SIP enabled, they avoid potential
@@ -151,21 +151,21 @@ in order to have the `jekyll` executable be available in your Terminal.
 
 If you are using base-url option like:
 
-{% highlight shell %}
+```sh
 jekyll serve --baseurl '/blog'
-{% endhighlight %}
+```
 
 … then make sure that you access the site at:
 
-{% highlight shell %}
+```sh
 http://localhost:4000/blog/index.html
-{% endhighlight %}
+```
 
 It won’t work to just access:
 
-{% highlight shell %}
+```sh
 http://localhost:4000/blog
-{% endhighlight %}
+```
 
 ## Configuration problems
 
@@ -197,9 +197,9 @@ The latest version, version 2.0, seems to break the use of `{{ "{{" }}` in
 templates. Unlike previous versions, using `{{ "{{" }}` in 2.0 triggers the
 following error:
 
-{% highlight shell %}
+```sh
 '{{ "{{" }}' was not properly terminated with regexp: /\}\}/  (Liquid::SyntaxError)
-{% endhighlight %}
+```
 
 ### Excerpts
 
diff --git a/site/_docs/upgrading/0-to-2.md b/site/_docs/upgrading/0-to-2.md
index 9d91b01948a..9de634557c9 100644
--- a/site/_docs/upgrading/0-to-2.md
+++ b/site/_docs/upgrading/0-to-2.md
@@ -9,9 +9,9 @@ and 2.0 that you'll want to know about.
 
 Before we dive in, go ahead and fetch the latest version of Jekyll:
 
-{% highlight shell %}
+```sh
 $ gem update jekyll
-{% endhighlight %}
+```
 
 
    
   
    Diving in
    
diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md
index 3d15ec55e73..9e7b0a6ee71 100644
--- a/site/_docs/upgrading/2-to-3.md
+++ b/site/_docs/upgrading/2-to-3.md
@@ -9,9 +9,9 @@ that you'll want to know about.
 
 Before we dive in, go ahead and fetch the latest version of Jekyll:
 
-{% highlight shell %}
+```sh
 $ gem update jekyll
-{% endhighlight %}
+```
 
 Please note: Jekyll 3 requires Ruby version >= 2.0.0.
 
@@ -36,11 +36,11 @@ When iterating over `site.collections`, ensure the above conversions are made.
 
 For `site.collections.myCollection` in Jekyll 2, you now do:
 
-{% highlight liquid %}
+```liquid
 {% raw %}
 {% assign myCollection = site.collections | where: "label", "myCollection" | first %}
 {% endraw %}
-{% endhighlight %}
+```
 
 This is a bit cumbersome at first, but is easier than a big `for` loop.
 
@@ -97,17 +97,17 @@ In Jekyll 3 and above, relative permalinks have been deprecated. If you
 created your site using Jekyll 2 and below, you may receive the following
 error when trying to **serve** or **build**:
 
-{% highlight text %}
+```text
 Since v3.0, permalinks for pages in subfolders must be relative to the site
 source directory, not the parent directory. Check
 http://jekyllrb.com/docs/upgrading/ for more info.
-{% endhighlight %}
+```
 
 This can be fixed by removing the following line from your `_config.yml` file:
 
-{% highlight yaml %}
+```yaml
 relative_permalinks: true
-{% endhighlight %}
+```
 
 ### Permalinks no longer automatically add a trailing slash
 
@@ -117,19 +117,19 @@ In Jekyll 2, any URL constructed from the `permalink:` field had a trailing slas
 
 Try adding `future: true` to your `_config.yml` file. Are they showing up now? If they are, then you were ensnared by an issue with the way Ruby parses times. Each of your posts is being read in a different timezone than you might expect and, when compared to the computer's current time, is "in the future." The fix for this is to add [a timezone offset](https://en.wikipedia.org/wiki/List_of_UTC_time_offsets) to each post (and make sure you remove `future: true` from your `_config.yml` file). If you're writing from California, for example, you would change this:
 
-{% highlight yaml %}
+```yaml
 ---
 date: 2016-02-06 19:32:10
 ---
-{% endhighlight %}
+```
 
 to this (note the offset):
 
-{% highlight yaml %}
+```yaml
 ---
 date: 2016-02-06 19:32:10 -0800
 ---
-{% endhighlight %}
+```
 
 ### My categories have stopped working!
 
diff --git a/site/_docs/usage.md b/site/_docs/usage.md
index ee02b508e14..3d2413d444b 100644
--- a/site/_docs/usage.md
+++ b/site/_docs/usage.md
@@ -7,7 +7,7 @@ permalink: /docs/usage/
 The Jekyll gem makes a `jekyll` executable available to you in your Terminal
 window. You can use this command in a number of ways:
 
-{% highlight shell %}
+```sh
 $ jekyll build
 # => The current folder will be generated into ./_site
 
@@ -20,7 +20,7 @@ $ jekyll build --source  --destination 
 $ jekyll build --watch
 # => The current folder will be generated into ./_site,
 #    watched for changes, and regenerated automatically.
-{% endhighlight %}
+```
 
 
    
   
    Changes to _config.yml are not included during automatic regeneration.
    
@@ -52,7 +52,7 @@ $ jekyll build --watch
 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.
 
-{% highlight shell %}
+```sh
 $ jekyll serve
 # => A development server will run at http://localhost:4000/
 # Auto-regeneration: enabled. Use `--no-watch` to disable.
@@ -61,7 +61,7 @@ $ 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. [Read more](http://unixhelp.ed.ac.uk/shell/jobz5.html).
-{% endhighlight %}
+```
 
 
    
   
    Be aware of default behavior
    
@@ -70,10 +70,10 @@ $ jekyll serve --detach
   
    
 
    
 
-{% highlight shell %}
+```sh
 $ jekyll serve --no-watch
 # => Same as `jekyll serve` but will not watch for changes.
-{% endhighlight %}
+```
 
 These are just a few of the available [configuration options](../configuration/).
 Many configuration options can either be specified as flags on the command line,
@@ -82,17 +82,17 @@ file at the root of the source directory. Jekyll will automatically use the
 options from this file when run. For example, if you place the following lines
 in your `_config.yml` file:
 
-{% highlight yaml %}
+```yaml
 source:      _source
 destination: _deploy
-{% endhighlight %}
+```
 
 Then the following two commands will be equivalent:
 
-{% highlight shell %}
+```sh
 $ jekyll build
 $ jekyll build --source _source --destination _deploy
-{% endhighlight %}
+```
 
 For more about the possible configuration options, see the
 [configuration](../configuration/) page.
diff --git a/site/_docs/windows.md b/site/_docs/windows.md
index 3a8dddc6ac5..f64ac6d49d3 100644
--- a/site/_docs/windows.md
+++ b/site/_docs/windows.md
@@ -29,9 +29,9 @@ Additionally, you might need to change the code page of the console window to UT
 in case you get a "Liquid Exception: Incompatible character encoding" error during
 the site generation process. It can be done with the following command:
 
-{% highlight shell %}
+```sh
 $ chcp 65001
-{% endhighlight %}
+```
 
 [windows-installation]: http://jekyll-windows.juthilo.com/
 [hitimes-issue]: https://github.com/copiousfreetime/hitimes/issues/40
@@ -43,9 +43,9 @@ As of v1.3.0, Jekyll uses the `listen` gem to watch for changes when the
 built-in support for UNIX systems, it requires an extra gem for compatibility
 with Windows. Add the following to the Gemfile for your site:
 
-{% highlight ruby %}
+```ruby
 gem 'wdm', '~> 0.1.0' if Gem.win_platform?
-{% endhighlight %}
+```
 
 ### How to install github-pages
 
@@ -81,7 +81,7 @@ This gem is also needed in the github-pages and to get it running on Windows x64
 
 `choco install libiconv -Source "https://www.nuget.org/api/v2/"`{:.language-ruby}
 
-{% highlight ruby %}
+```ruby
  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^
@@ -89,7 +89,7 @@ This gem is also needed in the github-pages and to get it running on Windows x64
    --with-iconv-lib=C:\Chocolatey\lib\libiconv.redist.1.14.0.11\build\native\bin\v110\x64\Release\dynamic\cdecl^
    --with-xslt-include=C:\Chocolatey\lib\libxslt.1.1.28.0\build\native\include^
    --with-xslt-lib=C:\Chocolatey\lib\libxslt.redist.1.1.28.0\build\native\bin\v110\x64\Release\dynamic
-{% endhighlight %}
+```
 
 #### Install github-pages
 
@@ -98,10 +98,10 @@ This gem is also needed in the github-pages and to get it running on Windows x64
  * Copy & paste the two lines into the file:
 
 
-{% highlight ruby %}
+```ruby
 source 'http://rubygems.org'
 gem 'github-pages'
-{% endhighlight %}
+```
 
  * **Note:** We use an unsecure connection because SSL throws exceptions in the version of Ruby
  * Open a command prompt, target your local blog repository root, and install github-pages: `bundle install`

From 7f578b5dd88653583bdf3ad5ff703a6ee5d91b95 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 24 Aug 2016 19:31:32 +0530
Subject: [PATCH 1334/4996] sassy update to match

---
 site/_sass/_style.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss
index 10b1b0e292d..528de7cbaf0 100644
--- a/site/_sass/_style.scss
+++ b/site/_sass/_style.scss
@@ -673,6 +673,12 @@ h5 > code,
   overflow: auto;
 }
 
+.highlighter-rouge .highlight {
+  @extend .highlight;
+  margin: 0;
+  padding: 10px 0.5em;
+}
+
 /* HTML Elements */
 
 h1, h2, h3, h4, h5, h6 { margin: 0; }

From 0d8796fbe60dbca7e7af8d82bf94a822a8ffce90 Mon Sep 17 00:00:00 2001
From: "Heng, K. (Stephen)" 
Date: Fri, 26 Aug 2016 11:20:03 +0800
Subject: [PATCH 1335/4996] Test case for issue #5276, where
 Jekyll.sanitized_path strips base path incorrectly if file path has matching
 prefix

---
 test/test_path_sanitization.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/test/test_path_sanitization.rb b/test/test_path_sanitization.rb
index df7ef172d68..a0e2f8d6305 100644
--- a/test/test_path_sanitization.rb
+++ b/test/test_path_sanitization.rb
@@ -28,4 +28,22 @@ class TestPathSanitization < JekyllUnitTest
     assert_equal source_dir("files", "hi.txt"),
                  Jekyll.sanitized_path(source_dir, "f./../../../../../../files/hi.txt")
   end
+
+  context "on Windows with file path has matching prefix" do
+    setup do
+      @base_path = "D:/site"
+      @file_path = "D:/sitemap.xml"
+      allow(Dir).to receive(:pwd).and_return("D:/")
+    end
+
+    should "not strip base path" do
+      assert_equal "D:/site/sitemap.xml",
+                   Jekyll.sanitized_path(@base_path, @file_path)
+    end
+  end
+
+  should "not strip base path if file path has matching prefix" do
+    assert_equal "/site/sitemap.xml",
+                 Jekyll.sanitized_path("/site", "sitemap.xml")
+  end
 end

From 23d79299480fe8dd6c609aebcfd0e2ba8c193039 Mon Sep 17 00:00:00 2001
From: "Heng, K. (Stephen)" 
Date: Fri, 26 Aug 2016 11:43:32 +0800
Subject: [PATCH 1336/4996] Test case for issue #5192, where
 Jekyll.sanitized_path strips drive name on Windows incorrectly

---
 test/test_path_sanitization.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/test/test_path_sanitization.rb b/test/test_path_sanitization.rb
index a0e2f8d6305..a94fc0c52d1 100644
--- a/test/test_path_sanitization.rb
+++ b/test/test_path_sanitization.rb
@@ -29,6 +29,19 @@ class TestPathSanitization < JekyllUnitTest
                  Jekyll.sanitized_path(source_dir, "f./../../../../../../files/hi.txt")
   end
 
+  context "on Windows with absolute path" do
+    setup do
+      @base_path = "D:/demo"
+      @file_path = "D:/demo/_site"
+      allow(Dir).to receive(:pwd).and_return("D:/")
+    end
+
+    should "strip just the clean path drive name" do
+      assert_equal "D:/demo/_site",
+                   Jekyll.sanitized_path(@base_path, @file_path)
+    end
+  end
+
   context "on Windows with file path has matching prefix" do
     setup do
       @base_path = "D:/site"

From 891a66bddb2943bfbe8322d2ee8814368a48ea4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=A0v=C3=A1cha?= 
Date: Fri, 26 Aug 2016 13:56:41 +0200
Subject: [PATCH 1337/4996] Word update

Just a little update - I guess Travis has changed its icon a bit. It's not a wrench icon, but a gear one.
---
 site/_docs/continuous-integration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/continuous-integration.md b/site/_docs/continuous-integration.md
index c01d1d1bc6d..eb283d90e42 100644
--- a/site/_docs/continuous-integration.md
+++ b/site/_docs/continuous-integration.md
@@ -19,7 +19,7 @@ Enabling Travis builds for your GitHub repository is pretty simple:
 1. Go to your profile on travis-ci.org: https://travis-ci.org/profile/username
 2. Find the repository for which you're interested in enabling builds.
 3. Click the slider on the right so it says "ON" and is a dark grey.
-4. Optionally configure the build by clicking on the wrench icon. Further
+4. Optionally configure the build by clicking on the gear icon. Further
    configuration happens in your `.travis.yml` file. More details on that
    below.
 

From b0425d83088a6f2ca662e88566c1c3b5a7a34671 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 26 Aug 2016 16:11:38 -0700
Subject: [PATCH 1338/4996] Update history to reflect merge of #5262 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f6e3c07cf93..1f356831cc0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -20,6 +20,7 @@
   * Document --profile option on the configuration page (#5279)
   * Update homepage to sync with merge of #5258 (#5287)
   * Add post about Jekyll Admin initial release (#5291)
+  * Replace liquid highlight tag with backticks (#5262)
 
 ### Development Fixes
 

From 35846b8406e3687ebd8855b815f9a2a29f90fff3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 26 Aug 2016 16:54:10 -0700
Subject: [PATCH 1339/4996] Update history to reflect merge of #5294 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1f356831cc0..8c48a4e6763 100644
--- a/History.markdown
+++ b/History.markdown
@@ -21,6 +21,7 @@
   * Update homepage to sync with merge of #5258 (#5287)
   * Add post about Jekyll Admin initial release (#5291)
   * Replace liquid highlight tag with backticks (#5262)
+  * Word update (#5294)
 
 ### Development Fixes
 

From 488496a3a65965b53f4ee7bc67f9123c480e8429 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 26 Aug 2016 17:04:51 -0700
Subject: [PATCH 1340/4996] Update history to reflect merge of #5281 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8c48a4e6763..634114bf31d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -22,6 +22,7 @@
   * Add post about Jekyll Admin initial release (#5291)
   * Replace liquid highlight tag with backticks (#5262)
   * Word update (#5294)
+  * Site documentation section links always point to https://jekyllrb.com (#5281)
 
 ### Development Fixes
 

From 02602bebd7dcbbfdb7caadc7fd77409b8384b53f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 26 Aug 2016 18:56:42 -0700
Subject: [PATCH 1341/4996] Update history to reflect merge of #5293 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 634114bf31d..712f416cfe2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -40,6 +40,7 @@
 ### Minor Enhancements
 
   * Colorize interpolated output in logger.info (#5239)
+  * Site template: exclude Gemfile and Gemfile.lock in site config (#5293)
 
 ## 3.2.1 / 2016-08-02
 

From d49bf808b626aa71752d2cff5406e45d62c3688c Mon Sep 17 00:00:00 2001
From: XhmikosR 
Date: Sat, 13 Aug 2016 09:49:50 +0300
Subject: [PATCH 1342/4996] Update AppVeyor config.

Install gems in ./vendor/bundle and cache those only.
---
 appveyor.yml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 9e4ac855a6c..2fe407f4cd6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,3 @@
-# https://www.appveyor.com/docs/appveyor-yml
-
 version: "{build}"
 
 clone_depth: 10
@@ -13,31 +11,24 @@ build: off
 
 install:
   - SET PATH=C:\Ruby%RUBY_FOLDER_VER%\bin;%PATH%
-  - bundle install --retry 5
+  - bundle install --retry 5 --jobs=%NUMBER_OF_PROCESSORS% --clean --path vendor\bundle
 
 environment:
   BUNDLE_WITHOUT: "benchmark:site:development"
   matrix:
     - RUBY_FOLDER_VER: "23"
-      GEMS_FOLDER_VER: "2.3.0"
       TEST_SUITE: "test"
     - RUBY_FOLDER_VER: "23"
-      GEMS_FOLDER_VER: "2.3.0"
       TEST_SUITE: "cucumber"
     - RUBY_FOLDER_VER: "23"
-      GEMS_FOLDER_VER: "2.3.0"
       TEST_SUITE: "fmt"
     - RUBY_FOLDER_VER: "23"
-      GEMS_FOLDER_VER: "2.3.0"
       TEST_SUITE: "default-site"
     - RUBY_FOLDER_VER: "23-x64"
-      GEMS_FOLDER_VER: "2.3.0"
       TEST_SUITE: "test"
     - RUBY_FOLDER_VER: "22"
-      GEMS_FOLDER_VER: "2.2.0"
       TEST_SUITE: "test"
     - RUBY_FOLDER_VER: "21"
-      GEMS_FOLDER_VER: "2.1.0"
       TEST_SUITE: "test"
 
 test_script:
@@ -48,5 +39,4 @@ test_script:
 
 cache:
   # If one of the files after the right arrow changes, cache will be skipped
-  - C:\Ruby%RUBY_FOLDER_VER%\bin -> Gemfile,jekyll.gemspec,appveyor.yml
-  - C:\Ruby%RUBY_FOLDER_VER%\lib\ruby\gems\%GEMS_FOLDER_VER% -> Gemfile,jekyll.gemspec,appveyor.yml
+  - 'vendor\bundle -> appveyor.yml,Gemfile,jekyll.gemspec'

From d0d41792f9b4fb53960bc07d00b0e8a486c270be Mon Sep 17 00:00:00 2001
From: XhmikosR 
Date: Tue, 23 Aug 2016 02:01:47 +0300
Subject: [PATCH 1343/4996] script/default-site: add `ruby` in exec command.

Windows doesn't recognize `exe/jekyll` as Ruby executable so this should work everywhere.
---
 script/default-site | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/default-site b/script/default-site
index 006fd93b0b8..5e96a991049 100755
--- a/script/default-site
+++ b/script/default-site
@@ -10,7 +10,7 @@ rm -Rf ./tmp/default-site
 workdir=$(pwd)
 
 echo "$0: creating new default site"
-bundle exec exe/jekyll new tmp/default-site
+bundle exec ruby exe/jekyll new tmp/default-site
 pushd tmp/default-site
 
 echo "$0: respecifying the jekyll install location"

From 349569592eb1a1d6ee68f798b62de5d610e658b2 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 27 Aug 2016 10:06:29 +0200
Subject: [PATCH 1344/4996] [docs] add examples for static files liquid
 metadata

---
 site/_docs/static_files.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/site/_docs/static_files.md b/site/_docs/static_files.md
index 00afbaecbe0..df12acf1bf9 100644
--- a/site/_docs/static_files.md
+++ b/site/_docs/static_files.md
@@ -26,7 +26,7 @@ following metadata:
       
    file.path
    
       
    
 
-        The relative path to the file.
+        The relative path to the file, e.g /assets/img/image.jpg
 
       
    
     
@@ -34,7 +34,15 @@ following metadata:
       
    file.modified_time
    
       
    
 
-        The `Time` the file was last modified.
+        The `Time` the file was last modified, e.g 2016-04-01 16:35:26 +0200
+
+      
    
+    
+    
+      
    file.name
    
+      
    
+
+        The string name of the file without the extension, e.g. image for image.jpg
 
       
    
     

From a9da814f17a8df4c040ecfd13cc07b42a4ddd506 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 27 Aug 2016 11:22:24 +0200
Subject: [PATCH 1345/4996] add basename and name variables for static files

---
 lib/jekyll/static_file.rb  |  3 ++-
 site/_docs/static_files.md | 10 +++++++++-
 test/test_static_file.rb   |  3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index 1158c044908..f26263e3051 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -97,7 +97,8 @@ def write(dest)
 
     def to_liquid
       {
-        "name"          => File.basename(name, extname),
+        "basename"      => File.basename(name, extname),
+        "name"          => name,
         "extname"       => extname,
         "modified_time" => modified_time,
         "path"          => File.join("", relative_path)
diff --git a/site/_docs/static_files.md b/site/_docs/static_files.md
index df12acf1bf9..19d4508930c 100644
--- a/site/_docs/static_files.md
+++ b/site/_docs/static_files.md
@@ -42,7 +42,15 @@ following metadata:
       
    file.name
    
       
    
 
-        The string name of the file without the extension, e.g. image for image.jpg
+        The string name of the file e.g. image.jpg for image.jpg
+
+      
    
+    
+    
+      
    file.basename
    
+      
    
+
+        The string basename of the file e.g. image for image.jpg
 
       
    
     
diff --git a/test/test_static_file.rb b/test/test_static_file.rb
index a53dc952203..ebb51c23102 100644
--- a/test/test_static_file.rb
+++ b/test/test_static_file.rb
@@ -134,7 +134,8 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
 
     should "be able to convert to liquid" do
       expected = {
-        "name"          => "static_file",
+        "basename"      => "static_file",
+        "name"          => "static_file.txt",
         "extname"       => ".txt",
         "modified_time" => @static_file.modified_time,
         "path"          => "/static_file.txt"

From fd65e6ce32e7d376ca0dc9eb523740f377bbf733 Mon Sep 17 00:00:00 2001
From: Anthony Gaudino 
Date: Sun, 28 Aug 2016 12:48:25 -0300
Subject: [PATCH 1346/4996] Improve sentence to reduce confusion

---
 site/_docs/plugins.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 36757520178..91f95bc921c 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -499,12 +499,12 @@ end
 
 Jekyll provides hooks for :site, :pages,
 :posts, and :documents. In all cases, Jekyll calls
-your hooks with the container object as the first callback parameter. But in the
-case of :pre_render and :site, :post_render, your hook
-will also receive a payload hash as a second parameter which allows you full
-control over the variables that are available while rendering in the former case
-and make final changes just before writing your website to disk on the latter
-case.
+your hooks with the container object as the first callback parameter. However,
+all `:pre_render` hooks and the`:site, :post_render` hook will also provide a
+payload hash as a second parameter. In the case of `:pre_render`, the payload
+gives you full control over the variables that are available while rendering.
+In the case of `:site, :post_render`, the payload contains final values after
+rendering all the site (useful for sitemaps, feeds, etc).
 
 The complete list of available hooks is below:
 

From 809ceea1075c320ec3696ef3bd7ab758c80d912d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 29 Aug 2016 11:57:23 -0700
Subject: [PATCH 1347/4996] Update history to reflect merge of #5240 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 712f416cfe2..ce8e9a9344b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -32,6 +32,7 @@
   * Avoid installing unecessary gems for site testing (#5272)
   * Proposal: Affinity teams and their captains (#5273)
   * Replace duplicate with postive local test in issue template (#5286)
+  * Update AppVeyor config. (#5240)
 
 ### Bug Fixes
 

From 20f9c260881d45decbeb116f6254177c98b075b3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 29 Aug 2016 18:55:58 -0700
Subject: [PATCH 1348/4996] Update history to reflect merge of #5280 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ce8e9a9344b..2e0326d65e0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -23,6 +23,7 @@
   * Replace liquid highlight tag with backticks (#5262)
   * Word update (#5294)
   * Site documentation section links always point to https://jekyllrb.com (#5281)
+  * Missing ":site, :post_render" payload documentation on site (#5280)
 
 ### Development Fixes
 

From 34404af0319ae6350a4ad3c3da3b109eb8cb37c5 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Tue, 30 Aug 2016 09:22:44 +0530
Subject: [PATCH 1349/4996] execute jekyll from cloned source

---
 script/default-site | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/default-site b/script/default-site
index 5e96a991049..041c7e97160 100755
--- a/script/default-site
+++ b/script/default-site
@@ -10,7 +10,7 @@ rm -Rf ./tmp/default-site
 workdir=$(pwd)
 
 echo "$0: creating new default site"
-bundle exec ruby exe/jekyll new tmp/default-site
+bundle exec jekyll new tmp/default-site
 pushd tmp/default-site
 
 echo "$0: respecifying the jekyll install location"

From f3093e2f6f17c5490dc3e6c70dc11ebdcad05b0e Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Tue, 30 Aug 2016 09:35:07 +0530
Subject: [PATCH 1350/4996] change workdir assignment

---
 script/default-site | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/script/default-site b/script/default-site
index 041c7e97160..6530c320b7d 100755
--- a/script/default-site
+++ b/script/default-site
@@ -7,11 +7,10 @@ echo "$0: setting up tmp directory"
 mkdir -p ./tmp
 rm -Rf ./tmp/default-site
 
-workdir=$(pwd)
-
 echo "$0: creating new default site"
 bundle exec jekyll new tmp/default-site
 pushd tmp/default-site
+workdir="../../"
 
 echo "$0: respecifying the jekyll install location"
 ruby -e "contents = File.read('Gemfile'); File.write('Gemfile', contents.sub(/gem \"jekyll\".*\\n/, 'gem \"jekyll\", path: \"$workdir\"'))"

From 160782ec505c01a103556e86b2c2eec73cb9dcf9 Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Tue, 30 Aug 2016 19:54:33 +0800
Subject: [PATCH 1351/4996] Site: exclude README.md and .gitignore [ci skip]

---
 site/_config.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/site/_config.yml b/site/_config.yml
index 0c1e3245885..722f712cc4a 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -32,3 +32,7 @@ gems:
   - jekyll-seo-tag
   - jekyll-avatar
   - jekyll-mentions
+
+exclude:
+  - README.md
+  - .gitignore

From b2ece36d27166037e364a30597126b5babd59527 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Tue, 30 Aug 2016 22:15:00 +0530
Subject: [PATCH 1352/4996] remove variable workdir

---
 script/default-site | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/script/default-site b/script/default-site
index 6530c320b7d..899524a710d 100755
--- a/script/default-site
+++ b/script/default-site
@@ -10,10 +10,9 @@ rm -Rf ./tmp/default-site
 echo "$0: creating new default site"
 bundle exec jekyll new tmp/default-site
 pushd tmp/default-site
-workdir="../../"
 
 echo "$0: respecifying the jekyll install location"
-ruby -e "contents = File.read('Gemfile'); File.write('Gemfile', contents.sub(/gem \"jekyll\".*\\n/, 'gem \"jekyll\", path: \"$workdir\"'))"
+ruby -e "contents = File.read('Gemfile'); File.write('Gemfile', contents.sub(/gem \"jekyll\".*\\n/, 'gem \"jekyll\", path: \"../../\"'))"
 echo "$0: installing default site dependencies"
 BUNDLE_GEMFILE=Gemfile bundle install
 echo "$0: building the default site"

From f3d0a9760430b33ab11c5a18ff2fbed155831079 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 30 Aug 2016 11:02:59 -0700
Subject: [PATCH 1353/4996] Update history to reflect merge of #5304 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2e0326d65e0..b7567d60506 100644
--- a/History.markdown
+++ b/History.markdown
@@ -24,6 +24,7 @@
   * Word update (#5294)
   * Site documentation section links always point to https://jekyllrb.com (#5281)
   * Missing ":site, :post_render" payload documentation on site (#5280)
+  * Site: exclude README.md and .gitignore [ci skip] (#5304)
 
 ### Development Fixes
 

From b5ee87b4ca91fefe86c42526fee230a3c0294eca Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 30 Aug 2016 11:17:43 -0700
Subject: [PATCH 1354/4996] Update history to reflect merge of #5295 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b7567d60506..b2afa9d8769 100644
--- a/History.markdown
+++ b/History.markdown
@@ -35,6 +35,7 @@
   * Proposal: Affinity teams and their captains (#5273)
   * Replace duplicate with postive local test in issue template (#5286)
   * Update AppVeyor config. (#5240)
+  * Execute jekyll from clone instead of defined binary when running 'script/default-site' (#5295)
 
 ### Bug Fixes
 

From 40cc44c2ea265efd8f054d3189fd913726f4f094 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 30 Aug 2016 11:46:58 -0700
Subject: [PATCH 1355/4996] Reorganize history.markdown for HEAD.

---
 History.markdown | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/History.markdown b/History.markdown
index b2afa9d8769..7a4e8bf910d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,8 +1,17 @@
 ## HEAD
 
+### Minor Enhancements
+
+  * Colorize interpolated output in logger.info (#5239)
+  * Site template: exclude Gemfile and Gemfile.lock in site config (#5293)
+
+### Bug Fixes
+
+  * Use jekyll-feed to generate the default site's RSS feed (#5196)
+
 ### Site Enhancements
 
-  * Document for to_integer and inspect filters (#5185)
+  * Document `to_integer` and `inspect` filters (#5185)
   * Fix path in the prompt (#5194)
   * need subcommand build (#5190)
   * Add the Jekyll Cloudinary plugin (#5183)
@@ -11,20 +20,20 @@
   * Remove mention of page for link tag in release post (#5214)
   * fixed typo (#5226)
   * Add missing comma (#5222)
-  * Maintain aspect ratio with height: auto; (#5254)
+  * Maintain aspect ratio with `height: auto;` (#5254)
   * Fix a link in deployment-methods.md (#5244)
   * Documentation: improve highlight in `Creating a theme` (#5249)
   * Bundler isn't installed by default (#5258)
   * Update troubleshooting documentation to include fix for issue with vendored gems (#5271)
-  * Link --lsi option's description to Wikipedia docs on LSI (#5274)
-  * Document --profile option on the configuration page (#5279)
+  * Link `--lsi` option's description to Wikipedia docs on LSI (#5274)
+  * Document `--profile` option on the configuration page (#5279)
   * Update homepage to sync with merge of #5258 (#5287)
   * Add post about Jekyll Admin initial release (#5291)
   * Replace liquid highlight tag with backticks (#5262)
   * Word update (#5294)
   * Site documentation section links always point to https://jekyllrb.com (#5281)
-  * Missing ":site, :post_render" payload documentation on site (#5280)
-  * Site: exclude README.md and .gitignore [ci skip] (#5304)
+  * Missing `:site, :post_render` payload documentation on site (#5280)
+  * Site: exclude README.md and .gitignore (#5304)
 
 ### Development Fixes
 
@@ -37,15 +46,6 @@
   * Update AppVeyor config. (#5240)
   * Execute jekyll from clone instead of defined binary when running 'script/default-site' (#5295)
 
-### Bug Fixes
-
-  * Use jekyll-feed to generate the default site's RSS feed (#5196)
-
-### Minor Enhancements
-
-  * Colorize interpolated output in logger.info (#5239)
-  * Site template: exclude Gemfile and Gemfile.lock in site config (#5293)
-
 ## 3.2.1 / 2016-08-02
 
 ### Bug Fixes

From 4420c3b2af9c826fa3db3de4949e201e14988260 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 30 Aug 2016 11:58:21 -0700
Subject: [PATCH 1356/4996] Make Site#configure_theme more understandable

---
 lib/jekyll/site.rb | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 02110f9745d..91f58e3abc7 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -423,15 +423,14 @@ def configure_plugins
 
     private
     def configure_theme
-      self.theme = nil
-      return unless config["theme"]
-
-      if config["theme"].is_a?(String)
-        self.theme = Jekyll::Theme.new(config["theme"])
-      else
-        Jekyll.logger.warn "Theme:",
-          "value of 'theme' in config should be String, but got #{config["theme"].class}"
-      end
+      self.theme =
+        if config["theme"].is_a?(String)
+          Jekyll::Theme.new(config["theme"])
+        else
+          Jekyll.logger.warn "Theme:", "value of 'theme' in config should be "
+          "String to use gem-based themes, but got #{config["theme"].class}"
+          nil
+        end
     end
 
     private

From 2b15b0b3251d35c290dc96eb07e18fa31a58bcc6 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 30 Aug 2016 12:17:24 -0700
Subject: [PATCH 1357/4996] Site#configure_theme: don't do anything if theme
 config is unset; TEST

---
 lib/jekyll/site.rb |  5 ++++-
 test/test_site.rb  | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 91f58e3abc7..661365416d9 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -423,11 +423,14 @@ def configure_plugins
 
     private
     def configure_theme
+      self.theme = nil
+      return if config["theme"].nil?
+
       self.theme =
         if config["theme"].is_a?(String)
           Jekyll::Theme.new(config["theme"])
         else
-          Jekyll.logger.warn "Theme:", "value of 'theme' in config should be "
+          Jekyll.logger.warn "Theme:", "value of 'theme' in config should be " \
           "String to use gem-based themes, but got #{config["theme"].class}"
           nil
         end
diff --git a/test/test_site.rb b/test/test_site.rb
index f09d94b9dac..615f8a6977e 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -489,6 +489,32 @@ def convert(*_args)
       end
     end
 
+    context "when setting theme" do
+      should "set no theme if config is not set" do
+        expect($stderr).not_to receive(:puts)
+        expect($stdout).not_to receive(:puts)
+        site = fixture_site({ "theme" => nil })
+        assert_nil site.theme
+      end
+
+      should "set no theme if config is a hash" do
+        output = capture_output do
+          site = fixture_site({ "theme" => {} })
+          assert_nil site.theme
+        end
+        expected_msg = "Theme: value of 'theme' in config should be String to use gem-based themes, but got Hash\n"
+        assert output.end_with?(expected_msg), "Expected #{output.inspect} to end with #{expected_msg.inspect}"
+      end
+
+      should "set a theme if the config is a string" do
+        expect($stderr).not_to receive(:puts)
+        expect($stdout).not_to receive(:puts)
+        site = fixture_site({ "theme" => "test-theme" })
+        assert_instance_of Jekyll::Theme, site.theme
+        assert_equal "test-theme", site.theme.name
+      end
+    end
+
     context "with liquid profiling" do
       setup do
         @site = Site.new(site_configuration("profile" => true))

From 5b21f8fda9357ddf42b665dda5bf38e657b043b4 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 30 Aug 2016 13:28:46 -0700
Subject: [PATCH 1358/4996] Fix fmt errors.

---
 test/test_site.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/test_site.rb b/test/test_site.rb
index 615f8a6977e..57b06871377 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -502,8 +502,10 @@ def convert(*_args)
           site = fixture_site({ "theme" => {} })
           assert_nil site.theme
         end
-        expected_msg = "Theme: value of 'theme' in config should be String to use gem-based themes, but got Hash\n"
-        assert output.end_with?(expected_msg), "Expected #{output.inspect} to end with #{expected_msg.inspect}"
+        expected_msg = "Theme: value of 'theme' in config should be String " \
+          "to use gem-based themes, but got Hash\n"
+        assert output.end_with?(expected_msg),
+          "Expected #{output.inspect} to end with #{expected_msg.inspect}"
       end
 
       should "set a theme if the config is a string" do

From 17883b77c6c6dcbf8fce1a5141ecaeed526de736 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 30 Aug 2016 13:34:56 -0700
Subject: [PATCH 1359/4996] Update history to reflect merge of #5045 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7a4e8bf910d..d14bf9403af 100644
--- a/History.markdown
+++ b/History.markdown
@@ -45,6 +45,7 @@
   * Replace duplicate with postive local test in issue template (#5286)
   * Update AppVeyor config. (#5240)
   * Execute jekyll from clone instead of defined binary when running 'script/default-site' (#5295)
+  * rubocop: lib/jekyll/document.rb complexity fixes (#5045)
 
 ## 3.2.1 / 2016-08-02
 

From b781b9967de4386440c2f09f2e670ad34d329f4e Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 30 Aug 2016 14:04:57 -0700
Subject: [PATCH 1360/4996] Proxy Convertible#render_all_layouts to
 Renderer.place_in_layouts

---
 .rubocop.yml              |  1 -
 lib/jekyll/convertible.rb | 42 +++++++--------------------------------
 2 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 8ae01fb17d1..787fbdbe8f6 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,6 @@ AllCops:
   Include:
     - lib/**/*.rb
   Exclude:
-    - lib/jekyll/convertible.rb
     - lib/jekyll/renderer.rb
     - bin/**/*
     - benchmark/**/*
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index ca613f78b8d..954802a1eb1 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -95,7 +95,7 @@ def transform
     # Returns the String extension for the output file.
     #   e.g. ".html" for an HTML output file.
     def output_ext
-      Jekyll::Renderer.new(site, self).output_ext
+      _renderer.output_ext
     end
 
     # Determine which converter to use based on this convertible's
@@ -211,40 +211,7 @@ def invalid_layout?(layout)
     #
     # Returns nothing
     def render_all_layouts(layouts, payload, info)
-      # recursively render layouts
-      layout = layouts[data["layout"]]
-
-      Jekyll.logger.warn(
-        "Build Warning:",
-        "Layout '#{data["layout"]}' requested in #{path} does not exist."
-      ) if invalid_layout? layout
-
-      used = Set.new([layout])
-
-      # Reset the payload layout data to ensure it starts fresh for each page.
-      payload["layout"] = nil
-
-      while layout
-        Jekyll.logger.debug "Rendering Layout:", path
-        payload["content"] = output
-        payload["layout"]  = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
-
-        self.output = render_liquid(layout.content,
-                                    payload,
-                                    info,
-                                    layout.relative_path)
-
-        # Add layout to dependency tree
-        site.regenerator.add_dependency(
-          site.in_source_dir(path),
-          site.in_source_dir(layout.path)
-        )
-
-        if (layout = layouts[layout.data["layout"]])
-          break if used.include?(layout)
-          used << layout
-        end
-      end
+      _renderer.place_in_layouts(output, payload, info)
     end
 
     # Add any necessary layouts to this convertible document.
@@ -306,5 +273,10 @@ def [](property)
         data[property]
       end
     end
+
+    private
+    def _renderer
+      @_renderer ||= Jekyll::Renderer.new(site, self)
+    end
   end
 end

From 741102bd40db3d12b2bb9221a37aefd3d6beb744 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 30 Aug 2016 14:13:26 -0700
Subject: [PATCH 1361/4996] Proxy Convertible#converters to Renderer

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

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 954802a1eb1..db187dc96f7 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -103,7 +103,7 @@ def output_ext
     #
     # Returns the Converter instance.
     def converters
-      @converters ||= site.converters.select { |c| c.matches(ext) }.sort
+      _renderer.converters
     end
 
     # Render Liquid in the content

From d0f57b61d4e5e4ff1a6514578bf23f4ef0628296 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 30 Aug 2016 14:14:03 -0700
Subject: [PATCH 1362/4996] Proxy Convertible#transform to Renderer

---
 lib/jekyll/convertible.rb | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index db187dc96f7..8e87eec97e8 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -76,18 +76,7 @@ def validate_permalink!(filename)
     #
     # Returns the transformed contents.
     def transform
-      converters.reduce(content) do |output, converter|
-        begin
-          converter.convert output
-        rescue => e
-          Jekyll.logger.error(
-            "Conversion error:",
-            "#{converter.class} encountered an error while converting '#{path}':"
-          )
-          Jekyll.logger.error("", e.to_s)
-          raise e
-        end
-      end
+      _renderer.transform
     end
 
     # Determine the extension depending on content_type.

From 8496e2e8b6b79e6804f1c1daf90ea790bec81751 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 30 Aug 2016 14:14:12 -0700
Subject: [PATCH 1363/4996] Proxy Convertible#render_liquid to Renderer

---
 lib/jekyll/convertible.rb | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 8e87eec97e8..c0c97e337b5 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -103,17 +103,7 @@ def converters
     #
     # Returns the converted content
     def render_liquid(content, payload, info, path)
-      template = site.liquid_renderer.file(path).parse(content)
-      template.warnings.each do |e|
-        Jekyll.logger.warn "Liquid Warning:",
-          LiquidRenderer.format_error(e, path || self.path)
-      end
-      template.render!(payload, info)
-    # rubocop: disable RescueException
-    rescue Exception => e
-      Jekyll.logger.error "Liquid Exception:",
-        LiquidRenderer.format_error(e, path || self.path)
-      raise e
+      _renderer.render_liquid(content, payload, info, path)
     end
     # rubocop: enable RescueException
 

From 73e79f0049b642dd1246aebdf7e4696682ec56c2 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 30 Aug 2016 14:14:22 -0700
Subject: [PATCH 1364/4996] Proxy Convertible#converters to Renderer#run

---
 lib/jekyll/convertible.rb | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index c0c97e337b5..9922f7797ea 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -200,30 +200,9 @@ def render_all_layouts(layouts, payload, info)
     #
     # Returns nothing.
     def do_layout(payload, layouts)
-      Jekyll.logger.debug "Rendering:", self.relative_path
+      @_renderer = Jekyll::Renderer.new(site, self, payload)
+      _renderer.run
 
-      Jekyll.logger.debug "Pre-Render Hooks:", self.relative_path
-      Jekyll::Hooks.trigger hook_owner, :pre_render, self, payload
-      info = {
-        :filters   => [Jekyll::Filters],
-        :registers => { :site => site, :page => payload["page"] }
-      }
-
-      # render and transform content (this becomes the final content of the object)
-      payload["highlighter_prefix"] = converters.first.highlighter_prefix
-      payload["highlighter_suffix"] = converters.first.highlighter_suffix
-
-      if render_with_liquid?
-        Jekyll.logger.debug "Rendering Liquid:", self.relative_path
-        self.content = render_liquid(content, payload, info, path)
-      end
-      Jekyll.logger.debug "Rendering Markup:", self.relative_path
-      self.content = transform
-
-      # output keeps track of what will finally be written
-      self.output = content
-
-      render_all_layouts(layouts, payload, info) if place_in_layout?
       Jekyll.logger.debug "Post-Render Hooks:", self.relative_path
       Jekyll::Hooks.trigger hook_owner, :post_render, self
     end

From 8014c54ee0bafbaede8196c15741101f65197b52 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 30 Aug 2016 14:14:33 -0700
Subject: [PATCH 1365/4996] Convertible#converters: sort the converters

---
 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 083a2a6bafa..44f3fb5e2e4 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -15,7 +15,7 @@ def initialize(site, document, site_payload = nil)
     #
     # Returns an array of Converter instances.
     def converters
-      @converters ||= site.converters.select { |c| c.matches(document.extname) }
+      @converters ||= site.converters.select { |c| c.matches(document.extname) }.sort
     end
 
     # Determine the extname the outputted file should have

From ac6bbc190690fcb4c4ec4e9b821ac8fd922cbd88 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 30 Aug 2016 14:14:52 -0700
Subject: [PATCH 1366/4996] Renderer#invalid_layout? should check if document
 is an excerpt

---
 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 44f3fb5e2e4..b1177b602fc 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -126,7 +126,7 @@ def render_liquid(content, payload, info, path = nil)
     #
     # Returns true if the layout is invalid, false if otherwise
     def invalid_layout?(layout)
-      !document.data["layout"].nil? && layout.nil?
+      !document.data["layout"].nil? && layout.nil? && !(document.is_a? Jekyll::Excerpt)
     end
 
     # Render layouts and place given content inside.

From 9ddc12bad8773f022456be2bd72107ade97c06c2 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 30 Aug 2016 14:39:20 -0700
Subject: [PATCH 1367/4996] Convertible: ensure layouts the argument and
 payload the argument are set properly in the renderer

---
 lib/jekyll/convertible.rb | 12 ++++++++++--
 lib/jekyll/renderer.rb    | 31 ++++++++++++++++++++++++++-----
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 9922f7797ea..52fc49b4832 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -190,7 +190,10 @@ def invalid_layout?(layout)
     #
     # Returns nothing
     def render_all_layouts(layouts, payload, info)
+      _renderer.layouts = layouts
       _renderer.place_in_layouts(output, payload, info)
+    ensure
+      @_renderer = nil # this will allow the modifications above to disappear
     end
 
     # Add any necessary layouts to this convertible document.
@@ -200,11 +203,16 @@ def render_all_layouts(layouts, payload, info)
     #
     # Returns nothing.
     def do_layout(payload, layouts)
-      @_renderer = Jekyll::Renderer.new(site, self, payload)
-      _renderer.run
+      _renderer.tap do |renderer|
+        renderer.layouts = layouts
+        renderer.payload = payload
+        renderer.run
+      end
 
       Jekyll.logger.debug "Post-Render Hooks:", self.relative_path
       Jekyll::Hooks.trigger hook_owner, :post_render, self
+    ensure
+      @_renderer = nil # this will allow the modifications above to disappear
     end
 
     # Write the generated page file to the destination directory.
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index b1177b602fc..db01a167b91 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -2,12 +2,33 @@
 
 module Jekyll
   class Renderer
-    attr_reader :document, :site, :payload
+    attr_reader :document, :site
+    attr_writer :layouts, :payload
 
-    def initialize(site, document, site_payload = nil)
+    def initialize(site, document, site_payload = nil, layouts: nil)
       @site     = site
       @document = document
-      @payload  = site_payload || site.site_payload
+      @payload  = site_payload
+      @layouts  = layouts
+    end
+
+    # Fetches the payload used in Liquid rendering.
+    # It can be written with #payload=(new_payload)
+    # Falls back to site.site_payload if no payload is set.
+    #
+    # Returns a Jekyll::Drops::UnifiedPayloadDrop
+    def payload
+      @payload ||= site.site_payload
+    end
+
+    # The list of layouts registered for this Renderer.
+    # It can be written with #layouts=(new_layouts)
+    # Falls back to site.layouts if no layouts are registered.
+    #
+    # Returns a Hash of String => Jekyll::Layout identified
+    # as basename without the extension name.
+    def layouts
+      @layouts || site.layouts
     end
 
     # Determine which converters to use based on this document's
@@ -137,7 +158,7 @@ def invalid_layout?(layout)
     # Returns the content placed in the Liquid-rendered layouts
     def place_in_layouts(content, payload, info)
       output = content.dup
-      layout = site.layouts[document.data["layout"]]
+      layout = layouts[document.data["layout"]]
 
       Jekyll.logger.warn(
         "Build Warning:",
@@ -167,7 +188,7 @@ def place_in_layouts(content, payload, info)
           site.in_source_dir(layout.path)
         ) if document.write?
 
-        if (layout = site.layouts[layout.data["layout"]])
+        if (layout = layouts[layout.data["layout"]])
           break if used.include?(layout)
           used << layout
         end

From a78426f20db370bc0ee7f0bba681b3d91cd2ca2e Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 30 Aug 2016 14:39:49 -0700
Subject: [PATCH 1368/4996] Convertible#read_yaml: disable Metrics/AbcSize
 check

---
 lib/jekyll/convertible.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 52fc49b4832..65052b689c9 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -35,6 +35,7 @@ def published?
     # opts - optional parameter to File.read, default at site configs
     #
     # Returns nothing.
+    # rubocop:disable Metrics/AbcSize
     def read_yaml(base, name, opts = {})
       filename = File.join(base, name)
 
@@ -58,6 +59,7 @@ def read_yaml(base, name, opts = {})
 
       self.data
     end
+    # rubocop:enable Metrics/AbcSize
 
     def validate_data!(filename)
       unless self.data.is_a?(Hash)

From d905a0475a0bcbcbce856189a81ef02cc23e81dc Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 30 Aug 2016 14:54:48 -0700
Subject: [PATCH 1369/4996] Update history to reflect merge of #5189 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d14bf9403af..65ba60de61c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,7 @@
 ### Bug Fixes
 
   * Use jekyll-feed to generate the default site's RSS feed (#5196)
+  * Site#configure_theme: do not set theme unless it's a string (#5189)
 
 ### Site Enhancements
 

From 4f80dde8c42c3ac37559cd3433c8225d9fce7d76 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 31 Aug 2016 06:31:01 -0700
Subject: [PATCH 1370/4996] Update history to reflect merge of #5224 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 65ba60de61c..21f959f190d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -35,6 +35,7 @@
   * Site documentation section links always point to https://jekyllrb.com (#5281)
   * Missing `:site, :post_render` payload documentation on site (#5280)
   * Site: exclude README.md and .gitignore (#5304)
+  * Add link to Staticman (#5224)
 
 ### Development Fixes
 

From 4af0f0262ec119fd2a6049b236bba97314b2976e Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 1 Sep 2016 13:26:14 -0700
Subject: [PATCH 1371/4996] Remove layouts named param from Renderer#initialize

---
 lib/jekyll/renderer.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index db01a167b91..749882bf77d 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -5,11 +5,10 @@ class Renderer
     attr_reader :document, :site
     attr_writer :layouts, :payload
 
-    def initialize(site, document, site_payload = nil, layouts: nil)
+    def initialize(site, document, site_payload = nil)
       @site     = site
       @document = document
       @payload  = site_payload
-      @layouts  = layouts
     end
 
     # Fetches the payload used in Liquid rendering.

From 45aac995d81dc2ac9f2d301e7c0819b7b55a4e79 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 1 Sep 2016 17:18:51 -0700
Subject: [PATCH 1372/4996] Update history to reflect merge of #5308 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 21f959f190d..3ab9086e41b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -48,6 +48,7 @@
   * Update AppVeyor config. (#5240)
   * Execute jekyll from clone instead of defined binary when running 'script/default-site' (#5295)
   * rubocop: lib/jekyll/document.rb complexity fixes (#5045)
+  * Proxy a number of Convertible methods to Renderer (#5308)
 
 ## 3.2.1 / 2016-08-02
 

From 63595f388d2371d1ce07aaedf4be1fc100c9aaf1 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Fri, 2 Sep 2016 11:17:23 +0200
Subject: [PATCH 1373/4996] promote .md extensions

---
 site/_docs/posts.md     | 2 +-
 site/_docs/structure.md | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/site/_docs/posts.md b/site/_docs/posts.md
index 0253dbac9e4..40aa8365c58 100644
--- a/site/_docs/posts.md
+++ b/site/_docs/posts.md
@@ -37,7 +37,7 @@ 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.textile
+2012-09-12-how-to-write-a-blog.md
 ```
 
 
    
diff --git a/site/_docs/structure.md b/site/_docs/structure.md
index de077c5ec40..b21cb1b27be 100644
--- a/site/_docs/structure.md
+++ b/site/_docs/structure.md
@@ -18,8 +18,8 @@ A basic Jekyll site usually looks something like this:
 .
 ├── _config.yml
 ├── _drafts
-|   ├── begin-with-the-crazy-ideas.textile
-|   └── on-simplicity-in-technology.markdown
+|   ├── begin-with-the-crazy-ideas.md
+|   └── on-simplicity-in-technology.md
 ├── _includes
 |   ├── footer.html
 |   └── header.html
@@ -27,8 +27,8 @@ A basic Jekyll site usually looks something like this:
 |   ├── default.html
 |   └── post.html
 ├── _posts
-|   ├── 2007-10-29-why-every-programmer-should-play-nethack.textile
-|   └── 2009-04-26-barcamp-boston-4-roundup.textile
+|   ├── 2007-10-29-why-every-programmer-should-play-nethack.md
+|   └── 2009-04-26-barcamp-boston-4-roundup.md
 ├── _data
 |   └── members.yml
 ├── _site

From 9b09d8a8e810bca2c528cbe44beb6a333ea4797b Mon Sep 17 00:00:00 2001
From: Eloy Espinaco 
Date: Mon, 8 Aug 2016 11:28:53 -0300
Subject: [PATCH 1374/4996] Add support for indented link references on excerpt

Excerpt link reference extraction is missing all the indented references
at the bottom of the page. Markdown specify that those can be indented up
to three spaces.
---
 lib/jekyll/excerpt.rb                         |  2 +-
 ...16-08-16-indented-link-references.markdown | 16 ++++++++++++
 test/test_excerpt.rb                          | 26 +++++++++++++++++++
 test/test_generated_site.rb                   |  2 +-
 4 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 test/source/_posts/2016-08-16-indented-link-references.markdown

diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb
index c181cb68ed7..34a2e65c103 100644
--- a/lib/jekyll/excerpt.rb
+++ b/lib/jekyll/excerpt.rb
@@ -118,7 +118,7 @@ def extract_excerpt(doc_content)
       if tail.empty?
         head
       else
-        "" << head << "\n\n" << tail.scan(%r!^\[[^\]]+\]:.+$!).join("\n")
+        "" << head << "\n\n" << tail.scan(%r!^ {0,3}\[[^\]]+\]:.+$!).join("\n")
       end
     end
   end
diff --git a/test/source/_posts/2016-08-16-indented-link-references.markdown b/test/source/_posts/2016-08-16-indented-link-references.markdown
new file mode 100644
index 00000000000..f536616219f
--- /dev/null
+++ b/test/source/_posts/2016-08-16-indented-link-references.markdown
@@ -0,0 +1,16 @@
+---
+---
+
+This is the first paragraph. It [has][link_0] [lots][link_1] [of][link_2]
+[links][link_3].
+
+This is the second paragraph. It has sample code that should not be extracted:
+
+    [fakelink]: www.invalid.com
+
+And here are the real links:
+
+[link_0]: www.example.com/0
+ [link_1]: www.example.com/1
+  [link_2]: www.example.com/2
+   [link_3]: www.example.com/3
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index b8169794c61..671d55af4ae 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -119,6 +119,32 @@ def do_render(document)
           assert @extracted_excerpt.content.include?("http://www.jekyllrb.com/")
         end
       end
+
+      context "with indented link references" do
+        setup do
+          @post = setup_post("2016-08-16-indented-link-references.markdown")
+          @excerpt = @post.excerpt
+        end
+
+        should "contain all refs at the bottom of the page" do
+          (0..3).each do |i|
+            assert_match "[link_#{i}]: www.example.com/#{i}", @excerpt.content
+          end
+        end
+
+        should "ignore indented code" do
+          refute_match "[fakelink]:", @excerpt.content
+        end
+
+        should "render links properly" do
+          @rendered_post = @post.dup
+          do_render(@rendered_post)
+          output = @rendered_post.data["excerpt"].output
+          (0..3).each do |i|
+            assert_includes output, ""
+          end
+        end
+      end
     end
   end
 
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 8373f0fc848..31784054fd6 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -11,7 +11,7 @@ class TestGeneratedSite < JekyllUnitTest
     end
 
     should "ensure post count is as expected" do
-      assert_equal 49, @site.posts.size
+      assert_equal 50, @site.posts.size
     end
 
     should "insert site.posts into the index" do

From 57b86ee77eab0a9cddfd6b6bc7681051c1d16a78 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sat, 3 Sep 2016 18:09:06 +0530
Subject: [PATCH 1375/4996] add a line about updating theme-gems in the docs

---
 site/_docs/themes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/site/_docs/themes.md b/site/_docs/themes.md
index 55e14b4bb3e..a07e9cfb00e 100644
--- a/site/_docs/themes.md
+++ b/site/_docs/themes.md
@@ -94,3 +94,5 @@ Themes are published via [RubyGems.org](https://rubygems.org). You'll need a Rub
 2. Next, push your packaged theme up to the RubyGems service, by running the following command, again replacing `my-awesome-jekyll-theme` with the name of your theme:
 
         gem push my-awesome-jekyll-theme-*.gem
+
+3. To release a new version of your theme, simply update the version number in the gemspec file, ( `my-awesome-jekyll-theme.gemspec` in this example ), following the principles of [Semantic Versioning](http://semver.org/) and then repeat Steps 1 & 2 above.

From da0776d70e9de8b13578338a435fa5f57034daeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAnior=20Messias?= 
Date: Sat, 3 Sep 2016 11:28:18 -0300
Subject: [PATCH 1376/4996] Update url for OpenShift

Update url for Github repository with cartridge
---
 site/_docs/deployment-methods.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md
index 7391fe0366a..ad73c337295 100644
--- a/site/_docs/deployment-methods.md
+++ b/site/_docs/deployment-methods.md
@@ -205,7 +205,7 @@ low-volume blogs as you only pay for what you use.
 ## OpenShift
 
 If you'd like to deploy your site to an OpenShift gear, there's [a cartridge
-for that](https://github.com/openshift-cartridges/openshift-jekyll-cartridge).
+for that](https://github.com/openshift-quickstart/jekyll-openshift).
 
 
    
   
    ProTip™: Use GitHub Pages for zero-hassle Jekyll hosting
    

From f69671c46c76a97d7d664b3c780348b2b191ec61 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 3 Sep 2016 13:36:22 -0700
Subject: [PATCH 1377/4996] Update history to reflect merge of #5320 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3ab9086e41b..960ae5c0c14 100644
--- a/History.markdown
+++ b/History.markdown
@@ -36,6 +36,7 @@
   * Missing `:site, :post_render` payload documentation on site (#5280)
   * Site: exclude README.md and .gitignore (#5304)
   * Add link to Staticman (#5224)
+  * Update url for OpenShift (#5320)
 
 ### Development Fixes
 

From a666e6faee3c89e9bcc44b6fb1ce4a986df5d4c5 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 4 Sep 2016 13:04:24 +0530
Subject: [PATCH 1378/4996] update line about semver to be less authoritative

---
 site/_docs/themes.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/site/_docs/themes.md b/site/_docs/themes.md
index a07e9cfb00e..6fff61b283b 100644
--- a/site/_docs/themes.md
+++ b/site/_docs/themes.md
@@ -95,4 +95,5 @@ Themes are published via [RubyGems.org](https://rubygems.org). You'll need a Rub
 
         gem push my-awesome-jekyll-theme-*.gem
 
-3. To release a new version of your theme, simply update the version number in the gemspec file, ( `my-awesome-jekyll-theme.gemspec` in this example ), following the principles of [Semantic Versioning](http://semver.org/) and then repeat Steps 1 & 2 above.
+3. To release a new version of your theme, simply update the version number in the gemspec file, ( `my-awesome-jekyll-theme.gemspec` in this example ), and then repeat Steps 1 & 2 above.
+We recommend that you follow [Semantic Versioning](http://semver.org/) while bumping your theme-version.

From b47db14f8663ae7479ca60c8a0eed55ec0d0d14c Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 5 Sep 2016 15:14:59 +0530
Subject: [PATCH 1379/4996] add future gems to gitignore

---
 lib/theme_template/gitignore.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/theme_template/gitignore.erb b/lib/theme_template/gitignore.erb
index 64eb653f051..867d3792d5a 100644
--- a/lib/theme_template/gitignore.erb
+++ b/lib/theme_template/gitignore.erb
@@ -1,3 +1,4 @@
+*.gem
 .bundle
 .sass-cache
 _site

From 42b85bb82f65f3d74cc630f43e4b2c0b76022ffd Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Wed, 7 Sep 2016 02:00:51 +0200
Subject: [PATCH 1380/4996] explain how to copy theme's file

---
 site/_docs/themes.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/site/_docs/themes.md b/site/_docs/themes.md
index 55e14b4bb3e..cc96fefdc9d 100644
--- a/site/_docs/themes.md
+++ b/site/_docs/themes.md
@@ -34,6 +34,10 @@ Jekyll will look first to your site's content, before looking to the theme's def
 Refer to your selected theme's documentation and source repository for more information on what files you can override.
 {: .note .info}
 
+To locate theme's files on your computer, run `bundle show` followed by
+the name of the theme's gem, e.g. `bundle show minima` for default Jekyll's
+theme. Then copy the files you want to override, from the returned path to your root folder.
+
 ## Creating a theme
 
 Jekyll themes are distributed as Ruby gems. Don't worry, Jekyll will help you scaffold a new theme with the `new-theme` command. Just run `jekyll new-theme` with the theme name as an argument:

From f0293def80c222d43a50813f24897b8240c78eff Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Tue, 6 Sep 2016 22:48:32 +0200
Subject: [PATCH 1381/4996] [docs] add help for missing static_file e.g. on
 heroku

fixes #5144
---
 site/_docs/troubleshooting.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/site/_docs/troubleshooting.md b/site/_docs/troubleshooting.md
index c4580f69777..3a2c61700fd 100644
--- a/site/_docs/troubleshooting.md
+++ b/site/_docs/troubleshooting.md
@@ -13,6 +13,7 @@ that might be of help. If the problem you’re experiencing isn’t covered belo
 - [Base-URL Problems](#base-url-problems)
 - [Configuration problems](#configuration-problems)
 - [Markup Problems](#markup-problems)
+- [Production Problems](#production-problems)
 
 ## Installation Problems
 
@@ -209,6 +210,13 @@ strange errors where references don't exist or a tag hasn't been closed. If you
 run into these errors, try setting `excerpt_separator: ""` in your
 `_config.yml`, or set it to some nonsense string.
 
+## Production Problems
+
+If you run into an issue that a static file can't be found in your
+production environment during build since v3.2.0 you should set your
+[environment to `production`](../configuration/#specifying-a-jekyll-environment-at-build-time).
+The issue is caused by trying to copy a non-existing symlink.
+
 
    
   
    Please report issues you encounter!
    
   
    

From d632cdda6841a06c7f905bdb8cd6a36168b5a01b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 7 Sep 2016 15:04:17 -0700
Subject: [PATCH 1382/4996] Update history to reflect merge of #5334 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 960ae5c0c14..389f39be36b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -37,6 +37,7 @@
   * Site: exclude README.md and .gitignore (#5304)
   * Add link to Staticman (#5224)
   * Update url for OpenShift (#5320)
+  * [docs] add help for missing static_file e.g. on heroku (#5334)
 
 ### Development Fixes
 

From 3840a38081d93e0edb2f5267e0c5ce4b17059e6c Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 7 Sep 2016 15:59:43 -0700
Subject: [PATCH 1383/4996] Convertible: set self.output in #render_all_layouts
 and #do_layout

---
 lib/jekyll/convertible.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 65052b689c9..e710b6f03c4 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -193,7 +193,7 @@ def invalid_layout?(layout)
     # Returns nothing
     def render_all_layouts(layouts, payload, info)
       _renderer.layouts = layouts
-      _renderer.place_in_layouts(output, payload, info)
+      self.output = _renderer.place_in_layouts(output, payload, info)
     ensure
       @_renderer = nil # this will allow the modifications above to disappear
     end
@@ -205,11 +205,10 @@ def render_all_layouts(layouts, payload, info)
     #
     # Returns nothing.
     def do_layout(payload, layouts)
-      _renderer.tap do |renderer|
+      self.output = _renderer.tap do |renderer|
         renderer.layouts = layouts
         renderer.payload = payload
-        renderer.run
-      end
+      end.run
 
       Jekyll.logger.debug "Post-Render Hooks:", self.relative_path
       Jekyll::Hooks.trigger hook_owner, :post_render, self

From 8c979ec565c736af6275b3598120002462c53240 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 7 Sep 2016 16:28:01 -0700
Subject: [PATCH 1384/4996] Update history to reflect merge of #5318 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 389f39be36b..f7e85325c58 100644
--- a/History.markdown
+++ b/History.markdown
@@ -38,6 +38,7 @@
   * Add link to Staticman (#5224)
   * Update url for OpenShift (#5320)
   * [docs] add help for missing static_file e.g. on heroku (#5334)
+  * Add a line about updating theme-gems in the docs (#5318)
 
 ### Development Fixes
 

From f53a3b627239e87d7e85555982eeba1e038f8e68 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 7 Sep 2016 16:34:37 -0700
Subject: [PATCH 1385/4996] Update history to reflect merge of #5235 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f7e85325c58..f9c1ef668ab 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,7 @@
 
   * Colorize interpolated output in logger.info (#5239)
   * Site template: exclude Gemfile and Gemfile.lock in site config (#5293)
+  * Fix #5233: Increase our ability to detect Windows. (#5235)
 
 ### Bug Fixes
 

From c1e6f1fb94799157c924005a01e51f184842f4e0 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 7 Sep 2016 17:50:14 -0700
Subject: [PATCH 1386/4996] Fix rubocop errors & add one more test for slugify
 'ascii' mode (#4680)

---
 .rubocop.yml        | 2 +-
 lib/jekyll/utils.rb | 2 +-
 test/test_utils.rb  | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 787fbdbe8f6..15bcb5dfbfd 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -23,7 +23,7 @@ Metrics/ClassLength:
     - !ruby/regexp /test\/.*.rb$/
   Max: 300
 Metrics/CyclomaticComplexity:
-  Max: 8
+  Max: 9
 Metrics/LineLength:
   Exclude:
     - !ruby/regexp /features\/.*.rb/
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 24c5b832fac..f870ea85420 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -200,7 +200,7 @@ def slugify(string, mode: nil, cased: false)
           # "._~!$&'()+,;=@" is human readable (not URI-escaped) in URL
           # and is allowed in both extN and NTFS.
           SLUGIFY_PRETTY_REGEXP
-        when 'ascii'
+        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.
diff --git a/test/test_utils.rb b/test/test_utils.rb
index d2cc60ff237..5f5611ce55e 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -199,7 +199,10 @@ class TestUtils < JekyllUnitTest
     end
 
     should "replace everything else but ASCII characters" do
-      assert_equal "the-config-yml-file", Utils.slugify("The _config.yml file?", mode: "ascii")
+      assert_equal "the-config-yml-file",
+        Utils.slugify("The _config.yml file?", :mode => "ascii")
+      assert_equal "f-rtive-glance",
+        Utils.slugify("fürtive glance!!!!", :mode => "ascii")
     end
 
     should "only replace whitespace if mode is raw" do

From eefcbf5ddee6a09dfdf5aa1b0df75f7d0fc20668 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 8 Sep 2016 02:54:03 -0700
Subject: [PATCH 1387/4996] Update history to reflect merge of #5335 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f9c1ef668ab..04230f5e8a3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -40,6 +40,7 @@
   * Update url for OpenShift (#5320)
   * [docs] add help for missing static_file e.g. on heroku (#5334)
   * Add a line about updating theme-gems in the docs (#5318)
+  * Explain how to copy a theme's files (#5335)
 
 ### Development Fixes
 

From 6ebdcdb198356b4ef78c4d5bd08277826b787a30 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 8 Sep 2016 02:55:30 -0700
Subject: [PATCH 1388/4996] Update history to reflect merge of #5316 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 04230f5e8a3..9ae9d018203 100644
--- a/History.markdown
+++ b/History.markdown
@@ -41,6 +41,7 @@
   * [docs] add help for missing static_file e.g. on heroku (#5334)
   * Add a line about updating theme-gems in the docs (#5318)
   * Explain how to copy a theme's files (#5335)
+  * [docs] .md as default extension in examples (#5316)
 
 ### Development Fixes
 

From 8813173ba7cd960f08693608ecb5ae26dd9d38fe Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 8 Sep 2016 08:07:29 +0530
Subject: [PATCH 1389/4996] set empty url in config file by default

---
 lib/site_template/_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
index 7e5346b4478..24a465185ff 100644
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -20,7 +20,7 @@ description: > # this means to ignore newlines until "baseurl:"
   line in _config.yml. It will appear in your document head meta (for
   Google search results) and in your feed.xml site description.
 baseurl: "" # the subpath of your site, e.g. /blog
-url: "http://example.com" # the base hostname & protocol for your site
+url: "" # the base hostname & protocol for your site, e.g. http://example.com
 twitter_username: jekyllrb
 github_username:  jekyll
 

From aa2cfc81b7d13bc87b090da4c7fa7f28fe3cefeb Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 8 Sep 2016 11:27:36 -0700
Subject: [PATCH 1390/4996] Update history to reflect merge of #5337 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9ae9d018203..952957ff557 100644
--- a/History.markdown
+++ b/History.markdown
@@ -10,6 +10,7 @@
 
   * Use jekyll-feed to generate the default site's RSS feed (#5196)
   * Site#configure_theme: do not set theme unless it's a string (#5189)
+  * Convertible: set self.output in #render_all_layouts and #do_layout (#5337)
 
 ### Site Enhancements
 

From a2e911c1b53c2a977a6c9dfba8322a4d1f106ab1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 9 Sep 2016 13:53:28 -0700
Subject: [PATCH 1391/4996] Update history to reflect merge of #5326 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 952957ff557..887ffa397bf 100644
--- a/History.markdown
+++ b/History.markdown
@@ -5,6 +5,7 @@
   * Colorize interpolated output in logger.info (#5239)
   * Site template: exclude Gemfile and Gemfile.lock in site config (#5293)
   * Fix #5233: Increase our ability to detect Windows. (#5235)
+  * update gitignore template to ignore theme gems built by user (#5326)
 
 ### Bug Fixes
 

From d86a293d784d61a55aaf3d44c4b54acfc0bd9e9c Mon Sep 17 00:00:00 2001
From: vohedge 
Date: Sun, 11 Sep 2016 00:18:02 +0900
Subject: [PATCH 1392/4996] Fix typo

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

diff --git a/site/_docs/templates.md b/site/_docs/templates.md
index 55bd8b5b2f7..59bb4b1815a 100644
--- a/site/_docs/templates.md
+++ b/site/_docs/templates.md
@@ -263,7 +263,7 @@ common tasks easier.
       
       
         
    
-         {% raw %}{{ "a \n b" | normalize_whitepace }}{% endraw %}
+         {% raw %}{{ "a \n b" | normalize_whitespace }}{% endraw %}
         
    
       
     

From 55de780520d06eccc5ed2d629dba3dd11e5e9545 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 12 Sep 2016 00:26:00 -0700
Subject: [PATCH 1393/4996] Update history to reflect merge of #5347 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 887ffa397bf..bb4babf608f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -44,6 +44,7 @@
   * Add a line about updating theme-gems in the docs (#5318)
   * Explain how to copy a theme's files (#5335)
   * [docs] .md as default extension in examples (#5316)
+  * Fix small typo in docs (#5347)
 
 ### Development Fixes
 

From 566b42b8b34eeea233e9375c9f9688ebdf9dfc79 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 12 Aug 2016 07:40:05 +0530
Subject: [PATCH 1394/4996] add `bundle install` to `jekyll new`

 - automatically run `bundle install` from within the newly generated blog
   directory by default.
 - add a new switch to skip this default behaviour.
---
 lib/jekyll/commands/new.rb | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index 90e35feee2a..c85691642fc 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -11,6 +11,7 @@ def init_with_program(prog)
 
             c.option "force", "--force", "Force creation even if PATH already exists"
             c.option "blank", "--blank", "Creates scaffolding but with empty files"
+            c.option "skip-bundle", "--skip-bundle", "Skip 'bundle install'"
 
             c.action do |args, options|
               Jekyll::Commands::New.process(args, options)
@@ -34,7 +35,7 @@ def process(args, options = {})
             create_site new_blog_path
           end
 
-          Jekyll.logger.info "New jekyll site installed in #{new_blog_path.cyan}."
+          after_install(new_blog_path, options)
         end
 
         def create_blank_site(path)
@@ -114,6 +115,27 @@ def site_template
         def scaffold_path
           "_posts/0000-00-00-welcome-to-jekyll.markdown.erb"
         end
+
+        # After a new blog has been created, print a success notification and
+        # then automatically execute bundle install from within the new blog dir
+        # unless the user opts to generate a blank blog or skip 'bundle install'.
+
+        def after_install(path, options = {})
+          Jekyll.logger.info "New jekyll site installed in #{path.cyan}."
+          Jekyll.logger.info "Bundle install skipped." if options["skip-bundle"]
+
+          unless options["blank"] || options["skip-bundle"]
+            bundle_install path
+          end
+        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
+            system("bundle", "install")
+          end
+        end
       end
     end
   end

From 345f043cc44f21b153a97629e47f2319a5f8e8f5 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Tue, 13 Sep 2016 08:23:02 +0530
Subject: [PATCH 1395/4996] test bundle install and skipping it.

---
 test/test_new_command.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/test/test_new_command.rb b/test/test_new_command.rb
index aea7dd4c328..982de1da23d 100644
--- a/test/test_new_command.rb
+++ b/test/test_new_command.rb
@@ -40,9 +40,12 @@ def site_template
 
     should "display a success message" do
       Jekyll::Commands::New.process(@args)
-      output = Jekyll.logger.messages.last
+      output = Jekyll.logger.messages[-3]
+      output_last = Jekyll.logger.messages.last
       success_message = "New jekyll site installed in #{@full_path.cyan}."
+      bundle_message = "Running bundle install in #{@full_path.cyan}..."
       assert_includes output, success_message
+      assert_includes output_last, bundle_message
     end
 
     should "copy the static files in site template to the new directory" do
@@ -85,7 +88,10 @@ def site_template
     should "create blank project" do
       blank_contents = %w(/_drafts /_layouts /_posts /index.html)
       capture_stdout { Jekyll::Commands::New.process(@args, "--blank") }
+      output = Jekyll.logger.messages.last
+      bundle_message = "Running bundle install in #{@full_path.cyan}..."
       assert_same_elements blank_contents, dir_contents(@full_path)
+      refute_includes output, bundle_message
     end
 
     should "force created folder" do
@@ -93,6 +99,13 @@ def site_template
       output = capture_stdout { Jekyll::Commands::New.process(@args, "--force") }
       assert_match(%r!New jekyll site installed in!, output)
     end
+
+    should "skip bundle install when opted to" do
+      capture_stdout { Jekyll::Commands::New.process(@args, "--skip-bundle") }
+      output = Jekyll.logger.messages.last
+      bundle_message = "Bundle install skipped."
+      assert_includes output, bundle_message
+    end
   end
 
   context "when multiple args are given" do

From 57fd5f887da1189a16bdfbb982d75f725c38d725 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 13 Sep 2016 07:11:51 -0700
Subject: [PATCH 1396/4996] Update history to reflect merge of #5199 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index bb4babf608f..d9cccbc92a4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,7 @@
   * Site template: exclude Gemfile and Gemfile.lock in site config (#5293)
   * Fix #5233: Increase our ability to detect Windows. (#5235)
   * update gitignore template to ignore theme gems built by user (#5326)
+  * Adds ability to link to all files (#5199)
 
 ### Bug Fixes
 

From 59b61c3f9f64eaefae999019c565ab58153f47e6 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Fri, 16 Sep 2016 07:56:37 +0200
Subject: [PATCH 1397/4996] Exclude vendor by default

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

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index c70cdd2c92e..0f0fbd8d8f2 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -17,7 +17,7 @@ class Configuration < Hash
       # Handling Reading
       "safe"              => false,
       "include"           => [".htaccess"],
-      "exclude"           => [],
+      "exclude"           => ["vendor"],
       "keep_files"        => [".git", ".svn"],
       "encoding"          => "utf-8",
       "markdown_ext"      => "markdown,mkdown,mkdn,mkd,md",

From 0233d933522d3a17dee681e9a4afb979e7ead65f Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Fri, 16 Sep 2016 18:25:06 +0200
Subject: [PATCH 1398/4996] vendor is now excluded by default [ci-skip]

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

diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index abb9e234eeb..4771a438d00 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -594,7 +594,7 @@ collections:
 # Handling Reading
 safe:         false
 include:      [".htaccess"]
-exclude:      []
+exclude:      ["vendor"]
 keep_files:   [".git", ".svn"]
 encoding:     "utf-8"
 markdown_ext: "markdown,mkdown,mkdn,mkd,md"

From 562ffe7a3f4e691323a492c243dfaaf5677d2bcb Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 16 Sep 2016 12:58:42 -0700
Subject: [PATCH 1399/4996] Update history to reflect merge of #5361 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d9cccbc92a4..db214a70fd1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
   * Fix #5233: Increase our ability to detect Windows. (#5235)
   * update gitignore template to ignore theme gems built by user (#5326)
   * Adds ability to link to all files (#5199)
+  * Exclude vendor by default (#5361)
 
 ### Bug Fixes
 

From b8f17b9034200a76bdbeb60ee5f4091e0acc8130 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sun, 7 Aug 2016 12:15:58 -0700
Subject: [PATCH 1400/4996] Exclude node_modules by default

If no 'exclude' directive is specified, exclude node_modules by default.

https://twitter.com/mxstbr/status/761856359579185153
---
 lib/jekyll/configuration.rb | 2 +-
 site/_docs/configuration.md | 2 +-
 test/test_configuration.rb  | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 0f0fbd8d8f2..196cf5876e7 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -17,7 +17,7 @@ class Configuration < Hash
       # Handling Reading
       "safe"              => false,
       "include"           => [".htaccess"],
-      "exclude"           => ["vendor"],
+      "exclude"           => %w(node_modules vendor),
       "keep_files"        => [".git", ".svn"],
       "encoding"          => "utf-8",
       "markdown_ext"      => "markdown,mkdown,mkdn,mkd,md",
diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index 4771a438d00..a244e1ab1fd 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -594,7 +594,7 @@ collections:
 # Handling Reading
 safe:         false
 include:      [".htaccess"]
-exclude:      ["vendor"]
+exclude:      ["node_modules", "vendor"]
 keep_files:   [".git", ".svn"]
 encoding:     "utf-8"
 markdown_ext: "markdown,mkdown,mkdn,mkd,md"
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 75daffa5ff6..b0b34cce7c6 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -48,6 +48,12 @@ class TestConfiguration < JekyllUnitTest
     end
   end
 
+  context "the defaults" do
+    should "exclude node_modules" do
+      assert_includes Configuration.from({})["exclude"], "node_modules"
+    end
+  end
+
   context "#add_default_collections" do
     should "no-op if collections is nil" do
       result = Configuration[{ "collections" => nil }].add_default_collections

From 13aec48137b18e6007e43b5009c05e664c18aa83 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 16 Sep 2016 14:40:54 -0700
Subject: [PATCH 1401/4996] Add ThemeAssetsReader which reads assets from a
 theme

If the theme includes the 'assets' directory, it will be walked and items will be added to the site based
on the normal rules of Jekyll: if there is YAML front matter, it will be added as a (convertible) Page,
otherwise it will be added as a StaticFile.
---
 lib/jekyll.rb                             |  1 +
 lib/jekyll/page.rb                        |  6 ++++-
 lib/jekyll/reader.rb                      |  1 +
 lib/jekyll/readers/theme_assets_reader.rb | 31 +++++++++++++++++++++++
 lib/jekyll/theme.rb                       | 12 ++++++---
 5 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 lib/jekyll/readers/theme_assets_reader.rb

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index a9fe696f0c5..3c4def1a426 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -55,6 +55,7 @@ module Jekyll
   autoload :PostReader,          "jekyll/readers/post_reader"
   autoload :PageReader,          "jekyll/readers/page_reader"
   autoload :StaticFileReader,    "jekyll/readers/static_file_reader"
+  autoload :ThemeAssetsReader,   "jekyll/readers/theme_assets_reader"
   autoload :LogAdapter,          "jekyll/log_adapter"
   autoload :Page,                "jekyll/page"
   autoload :PluginManager,       "jekyll/plugin_manager"
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 4e3efe3f719..00fdec230d1 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -40,7 +40,11 @@ def initialize(site, base, dir, name)
       @base = base
       @dir  = dir
       @name = name
-      @path = site.in_source_dir(base, dir, name)
+      if site.in_theme_dir(base) == base # we're in a theme
+        @path = site.in_theme_dir(base, dir, name)
+      else
+        @path = site.in_source_dir(base, dir, name)
+      end
 
       process(name)
       read_yaml(File.join(base, dir), name)
diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index abbe923f6c4..7bde499d8e5 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -18,6 +18,7 @@ def read
       sort_files!
       @site.data = DataReader.new(site).read(site.config["data_dir"])
       CollectionReader.new(site).read
+      ThemeAssetsReader.new(site).read
     end
 
     # Sorts posts, pages, and static files.
diff --git a/lib/jekyll/readers/theme_assets_reader.rb b/lib/jekyll/readers/theme_assets_reader.rb
new file mode 100644
index 00000000000..85151d0f5a0
--- /dev/null
+++ b/lib/jekyll/readers/theme_assets_reader.rb
@@ -0,0 +1,31 @@
+module Jekyll
+  class ThemeAssetsReader
+    attr_reader :site
+    def initialize(site)
+      @site = site
+    end
+
+    def read
+      return unless site.theme && site.theme.assets_path
+
+      Find.find(site.theme.assets_path) do |path|
+        next if File.directory?(path)
+        if File.symlink?(path)
+          Jekyll.logger.warn "Theme reader:", "Ignored symlinked asset: #{path}"
+        else
+          base = site.theme.root
+          dir = File.dirname(path.sub("#{site.theme.root}/", ""))
+          name = File.basename(path)
+          relative_path = File.join(*[dir, name].compact)
+          if Utils.has_yaml_header?(path)
+            next if site.pages.any? { |file| file.relative_path == relative_path }
+            site.pages << Jekyll::Page.new(site, base, dir, name)
+          else
+            next if site.static_files.any? { |file| file.relative_path == relative_path }
+            site.static_files << Jekyll::StaticFile.new(site, base, dir, name)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb
index 0dd73f78486..4b0eb2db323 100644
--- a/lib/jekyll/theme.rb
+++ b/lib/jekyll/theme.rb
@@ -18,15 +18,19 @@ def root
     end
 
     def includes_path
-      path_for :includes
+      path_for :_includes
     end
 
     def layouts_path
-      path_for :layouts
+      path_for :_layouts
     end
 
     def sass_path
-      path_for :sass
+      path_for :_sass
+    end
+
+    def assets_path
+      path_for :assets
     end
 
     def configure_sass
@@ -43,7 +47,7 @@ def path_for(folder)
     end
 
     def realpath_for(folder)
-      File.realpath(Jekyll.sanitized_path(root, "_#{folder}"))
+      File.realpath(Jekyll.sanitized_path(root, folder.to_s))
     rescue Errno::ENOENT, Errno::EACCES, Errno::ELOOP
       nil
     end

From 87b9cfe2b5871807ee4269bdbf870028f244ff27 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 16 Sep 2016 14:57:58 -0700
Subject: [PATCH 1402/4996] ThemeBuilder: add 'assets' to list of scaffold
 directories

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

diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb
index 33477185baa..68a5eeabf3f 100644
--- a/lib/jekyll/theme_builder.rb
+++ b/lib/jekyll/theme_builder.rb
@@ -1,6 +1,6 @@
 class Jekyll::ThemeBuilder
   SCAFFOLD_DIRECTORIES = %w(
-    _layouts _includes _sass
+    assets _layouts _includes _sass
   ).freeze
 
   attr_reader :name, :path, :code_of_conduct

From cf26bf5db0fd2a50ae2bf5cc207bd3d6d633cc0c Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 16 Sep 2016 15:36:33 -0700
Subject: [PATCH 1403/4996] TestTheme: update tests for 'path_for' now that
 it's no longer prepending the underscore

---
 test/test_theme.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_theme.rb b/test/test_theme.rb
index a448ce30735..a24a4c8863b 100644
--- a/test/test_theme.rb
+++ b/test/test_theme.rb
@@ -43,7 +43,7 @@ def setup
 
     should "generate folder paths" do
       expected = File.expand_path("./_sass", @expected_root)
-      assert_equal expected, @theme.send(:path_for, :sass)
+      assert_equal expected, @theme.send(:path_for, :_sass)
     end
 
     should "not allow paths outside of the theme root" do
@@ -56,7 +56,7 @@ def setup
 
     should "return the resolved path when a symlink & resolved path exists" do
       expected = File.expand_path("./_layouts", @expected_root)
-      assert_equal expected, @theme.send(:path_for, :symlink)
+      assert_equal expected, @theme.send(:path_for, :_symlink)
     end
   end
 

From 6d7f305e7c40229149a01cc118b4ea569842e2c9 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 16 Sep 2016 16:04:35 -0700
Subject: [PATCH 1404/4996] Add tests for assets directory support.

---
 .../{style.scss => test-theme-black.scss}     |   0
 .../test-theme/assets/img/another-logo.png    |   1 +
 test/fixtures/test-theme/assets/img/logo.png  | Bin 0 -> 3514 bytes
 test/fixtures/test-theme/assets/style.scss    |   3 +
 test/test_theme.rb                            |   4 +-
 test/test_theme_assets_reader.rb              |  61 ++++++++++++++++++
 6 files changed, 67 insertions(+), 2 deletions(-)
 rename test/fixtures/test-theme/_sass/{style.scss => test-theme-black.scss} (100%)
 create mode 120000 test/fixtures/test-theme/assets/img/another-logo.png
 create mode 100644 test/fixtures/test-theme/assets/img/logo.png
 create mode 100644 test/fixtures/test-theme/assets/style.scss
 create mode 100644 test/test_theme_assets_reader.rb

diff --git a/test/fixtures/test-theme/_sass/style.scss b/test/fixtures/test-theme/_sass/test-theme-black.scss
similarity index 100%
rename from test/fixtures/test-theme/_sass/style.scss
rename to test/fixtures/test-theme/_sass/test-theme-black.scss
diff --git a/test/fixtures/test-theme/assets/img/another-logo.png b/test/fixtures/test-theme/assets/img/another-logo.png
new file mode 120000
index 00000000000..bd36e718eaa
--- /dev/null
+++ b/test/fixtures/test-theme/assets/img/another-logo.png
@@ -0,0 +1 @@
+logo.png
\ No newline at end of file
diff --git a/test/fixtures/test-theme/assets/img/logo.png b/test/fixtures/test-theme/assets/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d1cbe53d68031a7bb33ca2fd765d7cffb34f000
GIT binary patch
literal 3514
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 "test-theme",
+      "theme-color" => "black"
+    )
+    assert @site.theme
+  end
+
+  def assert_file_with_relative_path(haystack, relative_path)
+      assert haystack.any? { |f|
+        f.relative_path == relative_path
+      }, "Site should read in the #{relative_path} file, but it was not found in #{haystack.inspect}"
+  end
+
+  def refute_file_with_relative_path(haystack, relative_path)
+      refute haystack.any? { |f|
+        f.relative_path == relative_path
+      }, "Site should not have read in the #{relative_path} file, but it was found in #{haystack.inspect}"
+  end
+
+  context "with a valid theme" do
+    should "read all assets" do
+      ThemeAssetsReader.new(@site).read
+      assert_file_with_relative_path @site.static_files, "assets/img/logo.png"
+      assert_file_with_relative_path @site.pages, "assets/style.scss"
+    end
+
+    should "convert pages" do
+      @site.process
+
+      file = @site.pages.find { |f| f.relative_path == "assets/style.scss" }
+      refute_nil file
+      assert_equal @site.in_dest_dir("assets/style.css"), file.destination(@site.dest)
+      assert_includes file.output, ".sample {\n  color: black; }"
+    end
+  end
+
+  context "with a valid theme without an assets dir" do
+    should "not read any assets" do
+      allow(Theme).to receive(:realpath_for).with(:sass).and_return(nil)
+      site = fixture_site("theme" => "test-theme")
+      ThemeAssetsReader.new(site).read
+      refute_file_with_relative_path @site.static_files, "assets/img/logo.png"
+      refute_file_with_relative_path @site.pages, "assets/style.scss"
+    end
+  end
+
+  context "with no theme" do
+    should "not read any assets" do
+      site = fixture_site("theme" => nil)
+      ThemeAssetsReader.new(site).read
+      refute_file_with_relative_path @site.static_files, "assets/img/logo.png"
+      refute_file_with_relative_path @site.pages, "assets/style.scss"
+    end
+
+  end
+
+end

From 5a932c90b5aa69c340ab3b469cd8ea0ab8c1ce94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mertcan=20G=C3=96KG=C3=96Z?= 
Date: Sun, 18 Sep 2016 10:50:21 +0300
Subject: [PATCH 1405/4996] added jekyll-spotify plugin

---
 site/_docs/plugins.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 5ec55ca74f0..816e6de2e0a 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -910,6 +910,7 @@ LESS.js files during generation.
 - [Jekyll Autoprefixer](https://github.com/vwochnik/jekyll-autoprefixer): Autoprefixer integration for Jekyll
 - [Jekyll-breadcrumbs](https://github.com/git-no/jekyll-breadcrumbs): Creates breadcrumbs for Jekyll 3.x, includes features like SEO optimization, optional breadcrumb item translation and more.
 - [generator-jekyllized](https://github.com/sondr3/generator-jekyllized): A Yeoman generator for rapidly developing sites with Gulp. Live reload your site, automatically minify and optimize your assets and much more.
+- [Jekyll-Spotify](https://github.com/MertcanGokgoz/Jekyll-Spotify): Easily output Spotify Embed Player for jekyll
 
 #### Editors
 

From 9aea71137e1183ed768f156afebd0055f5620ad0 Mon Sep 17 00:00:00 2001
From: Kyle O'Brien 
Date: Sun, 18 Sep 2016 09:51:33 -0400
Subject: [PATCH 1406/4996] Add missing period to sentence in first paragraph.

Added a period to the end of the last sentence in the first paragraph, which was missing.
---
 site/_docs/installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/installation.md b/site/_docs/installation.md
index b86d179e562..712e3bae6fc 100644
--- a/site/_docs/installation.md
+++ b/site/_docs/installation.md
@@ -7,7 +7,7 @@ permalink: /docs/installation/
 Getting Jekyll installed and ready-to-go should only take a few minutes.
 If it ever becomes a pain, please [file an issue]({{ site.repository }}/issues/new)
 (or submit a pull request) describing the issue you
-encountered and how we might make the process easier
+encountered and how we might make the process easier.
 
 ### Requirements
 

From 7a9427ccec81eb210bb818fc66523c7d57ddb890 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 18 Sep 2016 10:54:26 -0700
Subject: [PATCH 1407/4996] Update history to reflect merge of #5372 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index db214a70fd1..b85989b1d1e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -47,6 +47,7 @@
   * Explain how to copy a theme's files (#5335)
   * [docs] .md as default extension in examples (#5316)
   * Fix small typo in docs (#5347)
+  * Add missing period to sentence in first paragraph. (#5372)
 
 ### Development Fixes
 

From 74baeb889a923ee46a29a3010caf605f2fbba453 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sun, 18 Sep 2016 15:04:15 -0400
Subject: [PATCH 1408/4996] ThemeAssetsReader: fix tests so everything passes.

---
 .rubocop.yml                                  |  2 +-
 features/theme.feature                        |  2 +-
 lib/jekyll/page.rb                            | 10 ++---
 lib/jekyll/readers/theme_assets_reader.rb     | 38 +++++++++++++------
 .../test-theme/_sass/test-theme-red.scss      |  3 ++
 test/fixtures/test-theme/assets/style.scss    |  2 +-
 test/test_theme.rb                            |  2 +-
 test/test_theme_assets_reader.rb              | 18 ++++-----
 8 files changed, 48 insertions(+), 29 deletions(-)
 create mode 100644 test/fixtures/test-theme/_sass/test-theme-red.scss

diff --git a/.rubocop.yml b/.rubocop.yml
index 15bcb5dfbfd..b0fef47a254 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -16,7 +16,7 @@ Lint/UnreachableCode:
 Lint/UselessAccessModifier:
   Enabled: false
 Metrics/AbcSize:
-  Max: 20
+  Max: 21
 Metrics/ClassLength:
   Exclude:
     - !ruby/regexp /features\/.*.rb$/
diff --git a/features/theme.feature b/features/theme.feature
index 0e05d693790..7729a0ebbb6 100644
--- a/features/theme.feature
+++ b/features/theme.feature
@@ -17,7 +17,7 @@ Feature: Writing themes
   Scenario: A theme with SCSS
     Given I have a configuration file with "theme" set to "test-theme"
     And I have a css directory
-    And I have a "css/main.scss" page that contains "@import 'style';"
+    And I have a "css/main.scss" page that contains "@import 'test-theme-black';"
     When I run jekyll build
     Then I should get a zero exit status
     And the _site directory should exist
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 00fdec230d1..3e3c7ec86ca 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -40,11 +40,11 @@ def initialize(site, base, dir, name)
       @base = base
       @dir  = dir
       @name = name
-      if site.in_theme_dir(base) == base # we're in a theme
-        @path = site.in_theme_dir(base, dir, name)
-      else
-        @path = site.in_source_dir(base, dir, name)
-      end
+      @path = if site.in_theme_dir(base) == base # we're in a theme
+                site.in_theme_dir(base, dir, name)
+              else
+                site.in_source_dir(base, dir, name)
+              end
 
       process(name)
       read_yaml(File.join(base, dir), name)
diff --git a/lib/jekyll/readers/theme_assets_reader.rb b/lib/jekyll/readers/theme_assets_reader.rb
index 85151d0f5a0..035c0607832 100644
--- a/lib/jekyll/readers/theme_assets_reader.rb
+++ b/lib/jekyll/readers/theme_assets_reader.rb
@@ -13,19 +13,35 @@ def read
         if File.symlink?(path)
           Jekyll.logger.warn "Theme reader:", "Ignored symlinked asset: #{path}"
         else
-          base = site.theme.root
-          dir = File.dirname(path.sub("#{site.theme.root}/", ""))
-          name = File.basename(path)
-          relative_path = File.join(*[dir, name].compact)
-          if Utils.has_yaml_header?(path)
-            next if site.pages.any? { |file| file.relative_path == relative_path }
-            site.pages << Jekyll::Page.new(site, base, dir, name)
-          else
-            next if site.static_files.any? { |file| file.relative_path == relative_path }
-            site.static_files << Jekyll::StaticFile.new(site, base, dir, name)
-          end
+          read_theme_asset(path)
         end
       end
     end
+
+    private
+    def read_theme_asset(path)
+      base = site.theme.root
+      dir = File.dirname(path.sub("#{site.theme.root}/", ""))
+      name = File.basename(path)
+
+      if Utils.has_yaml_header?(path)
+        append_unless_exists site.pages,
+          Jekyll::Page.new(site, base, dir, name)
+      else
+        append_unless_exists site.static_files,
+          Jekyll::StaticFile.new(site, base, dir, name)
+      end
+    end
+
+    def append_unless_exists(haystack, new_item)
+      if haystack.any? { |file| file.relative_path == new_item.relative_path }
+        Jekyll.logger.debug "Theme:",
+          "Ignoring #{new_item.relative_path} in theme due to existing file " \
+          "with that path in site."
+        return
+      end
+
+      haystack << new_item
+    end
   end
 end
diff --git a/test/fixtures/test-theme/_sass/test-theme-red.scss b/test/fixtures/test-theme/_sass/test-theme-red.scss
new file mode 100644
index 00000000000..0307e17abb3
--- /dev/null
+++ b/test/fixtures/test-theme/_sass/test-theme-red.scss
@@ -0,0 +1,3 @@
+.sample {
+  color: red;
+}
diff --git a/test/fixtures/test-theme/assets/style.scss b/test/fixtures/test-theme/assets/style.scss
index 408f04f769a..47c4a2f1375 100644
--- a/test/fixtures/test-theme/assets/style.scss
+++ b/test/fixtures/test-theme/assets/style.scss
@@ -1,3 +1,3 @@
 ---
 ---
-@import "test-theme-{{ site.theme-color }}";
+@import "test-theme-{{ site.theme-color | default: "red" }}";
diff --git a/test/test_theme.rb b/test/test_theme.rb
index 82b4224a62d..fd380d95090 100644
--- a/test/test_theme.rb
+++ b/test/test_theme.rb
@@ -37,7 +37,7 @@ def setup
     [:assets, :_layouts, :_includes, :_sass].each do |folder|
       should "know the #{folder} path" do
         expected = File.expand_path(folder.to_s, @expected_root)
-        assert_equal expected, @theme.public_send("#{folder}_path")
+        assert_equal expected, @theme.public_send("#{folder.to_s.tr("_", "")}_path")
       end
     end
 
diff --git a/test/test_theme_assets_reader.rb b/test/test_theme_assets_reader.rb
index d964acf3466..ecafa0f1103 100644
--- a/test/test_theme_assets_reader.rb
+++ b/test/test_theme_assets_reader.rb
@@ -3,22 +3,24 @@
 class TestThemeAssetsReader < JekyllUnitTest
   def setup
     @site = fixture_site(
-      "theme" => "test-theme",
+      "theme"       => "test-theme",
       "theme-color" => "black"
     )
     assert @site.theme
   end
 
   def assert_file_with_relative_path(haystack, relative_path)
-      assert haystack.any? { |f|
-        f.relative_path == relative_path
-      }, "Site should read in the #{relative_path} file, but it was not found in #{haystack.inspect}"
+    assert haystack.any? { |f|
+      f.relative_path == relative_path
+    }, "Site should read in the #{relative_path} file, " \
+      "but it was not found in #{haystack.inspect}"
   end
 
   def refute_file_with_relative_path(haystack, relative_path)
-      refute haystack.any? { |f|
-        f.relative_path == relative_path
-      }, "Site should not have read in the #{relative_path} file, but it was found in #{haystack.inspect}"
+    refute haystack.any? { |f|
+      f.relative_path == relative_path
+    }, "Site should not have read in the #{relative_path} file, " \
+      "but it was found in #{haystack.inspect}"
   end
 
   context "with a valid theme" do
@@ -55,7 +57,5 @@ def refute_file_with_relative_path(haystack, relative_path)
       refute_file_with_relative_path @site.static_files, "assets/img/logo.png"
       refute_file_with_relative_path @site.pages, "assets/style.scss"
     end
-
   end
-
 end

From 1a11536a2c5cdf2589c3773de58200c04796992f Mon Sep 17 00:00:00 2001
From: Jonathan Thornton 
Date: Sun, 18 Sep 2016 17:38:28 -0500
Subject: [PATCH 1409/4996] Clarify documentation in README

This change is subtle, but may prove greatly useful to Jekyll newbies
---
 lib/theme_template/README.md.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/theme_template/README.md.erb b/lib/theme_template/README.md.erb
index a4ec12f1ef4..1b2d04b2bad 100644
--- a/lib/theme_template/README.md.erb
+++ b/lib/theme_template/README.md.erb
@@ -12,7 +12,7 @@ Add this line to your Jekyll site's Gemfile:
 gem <%= theme_name.inspect %>
 ```
 
-And add this line to your Jekyll site:
+And add this line to your Jekyll site's _config.yml:
 
 ```yaml
 theme: <%= theme_name %>

From 0b94cf3fa1dbace4f6409b7b3204767c0c841aca Mon Sep 17 00:00:00 2001
From: Nicolas Porcel 
Date: Sun, 18 Sep 2016 23:17:15 +0200
Subject: [PATCH 1410/4996] Allow underscore in highlighter language

---
 lib/jekyll/tags/highlight.rb | 2 +-
 test/test_tags.rb            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index 952fc9b46fd..43b0c62f7ef 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -8,7 +8,7 @@ class HighlightBlock < Liquid::Block
       # forms: name, name=value, or name=""
       #
       #  is a space-separated list of numbers
-      SYNTAX = %r!^([a-zA-Z0-9.+#-]+)((\s+\w+(=(\w+|"([0-9]+\s)*[0-9]+"))?)*)$!
+      SYNTAX = %r!^([a-zA-Z0-9.+#_-]+)((\s+\w+(=(\w+|"([0-9]+\s)*[0-9]+"))?)*)$!
 
       def initialize(tag_name, markup, tokens)
         super
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 16e10a9b84a..8a0395f3c82 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -59,6 +59,7 @@ def highlight_block_with_opts(options_string)
       assert_match r, "xml+cheetah"
       assert_match r, "x.y"
       assert_match r, "coffee-script"
+      assert_match r, "shell_session"
 
       refute_match r, "blah^"
 

From 054b23f69a47c9f4d8f696aa0a3a90bfa551561e Mon Sep 17 00:00:00 2001
From: Edward Thomson 
Date: Mon, 19 Sep 2016 11:23:05 -0500
Subject: [PATCH 1411/4996] Only complain about `coderay` if it is actually in
 the config

Don't complain about the deprecated `kramdown.coderay` key when
`highlighter == "coderay"`, since that could have been set with the
legitimate `syntax_highlighter: coderay` setting.  Instead, complain
only if the `kramdown.coderay` configuration setting is actually
present.
---
 lib/jekyll/converters/markdown/kramdown_parser.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index 932cf24e490..dd71c6c1d5f 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -104,7 +104,7 @@ def strip_coderay_prefix(hash)
 
         private
         def modernize_coderay_config
-          if highlighter == "coderay"
+          unless @config["coderay"].empty?
             Jekyll::Deprecator.deprecation_message(
               "You are using 'kramdown.coderay' in your configuration, " \
               "please use 'syntax_highlighter_opts' instead."

From f2bfc832a02410582c9368ecb13be39fa89ddc7f Mon Sep 17 00:00:00 2001
From: Jonathan Thornton 
Date: Mon, 19 Sep 2016 12:08:20 -0500
Subject: [PATCH 1412/4996] Marking filename with backticks as suggested

---
 lib/theme_template/README.md.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/theme_template/README.md.erb b/lib/theme_template/README.md.erb
index 1b2d04b2bad..71cf29d393c 100644
--- a/lib/theme_template/README.md.erb
+++ b/lib/theme_template/README.md.erb
@@ -12,7 +12,7 @@ Add this line to your Jekyll site's Gemfile:
 gem <%= theme_name.inspect %>
 ```
 
-And add this line to your Jekyll site's _config.yml:
+And add this line to your Jekyll site's `_config.yml`:
 
 ```yaml
 theme: <%= theme_name %>

From 3bfdc00d14af0202295172169985f5de3ab71571 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Mon, 19 Sep 2016 13:15:02 -0500
Subject: [PATCH 1413/4996] Appease Rubocop

---
 exe/jekyll                 | 2 +-
 lib/jekyll/hooks.rb        | 2 +-
 test/test_related_posts.rb | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/exe/jekyll b/exe/jekyll
index c233dd1ad47..3bd37e544de 100755
--- a/exe/jekyll
+++ b/exe/jekyll
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 STDOUT.sync = true
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w(.. lib)))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
 require "jekyll"
 require "mercenary"
diff --git a/lib/jekyll/hooks.rb b/lib/jekyll/hooks.rb
index c9a4f79439a..44ce0c12495 100644
--- a/lib/jekyll/hooks.rb
+++ b/lib/jekyll/hooks.rb
@@ -54,7 +54,7 @@ def self.register(owners, event, priority: DEFAULT_PRIORITY, &block)
 
     # Ensure the priority is a Fixnum
     def self.priority_value(priority)
-      return priority if priority.is_a?(Fixnum)
+      return priority if priority.is_a?(Integer)
       PRIORITY_MAP[priority] || DEFAULT_PRIORITY
     end
 
diff --git a/test/test_related_posts.rb b/test/test_related_posts.rb
index cea3ad0b539..ef7265ef01d 100644
--- a/test/test_related_posts.rb
+++ b/test/test_related_posts.rb
@@ -13,8 +13,8 @@ class TestRelatedPosts < JekyllUnitTest
       last_post     = @site.posts.last
       related_posts = Jekyll::RelatedPosts.new(last_post).build
 
-      last_10_recent_posts = (@site.posts.docs.reverse - [last_post]).first(10)
-      assert_equal last_10_recent_posts, related_posts
+      last_ten_recent_posts = (@site.posts.docs.reverse - [last_post]).first(10)
+      assert_equal last_ten_recent_posts, related_posts
     end
   end
 

From 7309ecf8e188ee1a329a9b260b2a6678a54d8c38 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 19 Sep 2016 13:47:51 -0700
Subject: [PATCH 1414/4996] Theme: for various path helpers, use strings.
 Symbols confuse people.

---
 lib/jekyll/theme.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb
index 4b0eb2db323..803004f3ab8 100644
--- a/lib/jekyll/theme.rb
+++ b/lib/jekyll/theme.rb
@@ -18,19 +18,19 @@ def root
     end
 
     def includes_path
-      path_for :_includes
+      path_for "_includes".freeze
     end
 
     def layouts_path
-      path_for :_layouts
+      path_for "_layouts".freeze
     end
 
     def sass_path
-      path_for :_sass
+      path_for "_sass".freeze
     end
 
     def assets_path
-      path_for :assets
+      path_for "assets".freeze
     end
 
     def configure_sass

From b78827cecbc5c158a9e7d4242ecfe663af8c8c7d Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 19 Sep 2016 13:57:36 -0700
Subject: [PATCH 1415/4996] Add documentation for assets.

---
 site/_docs/themes.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/site/_docs/themes.md b/site/_docs/themes.md
index 988f6ebd093..c7d6d574474 100644
--- a/site/_docs/themes.md
+++ b/site/_docs/themes.md
@@ -27,6 +27,7 @@ Jekyll themes set default layouts, includes, and stylesheets, that can be overri
 
 Jekyll will look first to your site's content, before looking to the theme's defaults, for any requested file in the following folders:
 
+* `/assets`
 * `/_layouts`
 * `/_includes`
 * `/_sass`
@@ -68,6 +69,12 @@ Theme layouts and includes work just like they work in any Jekyll site. Place la
 
 For example, if your theme has a `/_layouts/page.html` file, and a page has `layout: page` in its YAML front matter, Jekyll will first look to the site's `_layouts` folder for a the `page` layout, and if none exists, will use your theme's `page` layout.
 
+### Assets
+
+Any file in `/assets` will be copied over to the user's site upon build unless they have a file with the same relative path. You may ship any kind of asset here: SCSS, an image, a webfont, etc. These files behave just like pages and static files in Jekyll: if the file has [YAML front matter]({{ site.baseurl }}/docs/frontmatter/) at the top, then it will be rendered. If it does not have YAML front matter, it will simply be copied over into the resulting site. This allows theme creators to ship a default `/assets/styles.scss` file which their layouts can depend on as `/assets/styles.css`.
+
+All files in `/assets` will be output into the compiled site in the `/assets` folder just as you'd expect from using Jekyll on your sites.
+
 ### Stylesheets
 
 Your theme's stylesheets should be placed in your theme's `/_sass` folder, again, just as you would when authoring a Jekyll site. Your theme's styles can be included in the user's stylesheet using the `@import` directive.

From 75d59911ae6d9dd559fa71b17a2539380406d795 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 19 Sep 2016 17:08:00 +0530
Subject: [PATCH 1416/4996] run features on windows

---
 features/support/helpers.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/support/helpers.rb b/features/support/helpers.rb
index 79210ad7d4b..0d809bca985 100644
--- a/features/support/helpers.rb
+++ b/features/support/helpers.rb
@@ -90,7 +90,7 @@ def run_bundle(args)
 
 def run_jekyll(args)
   args = args.strip.split(" ") # Shellwords?
-  process = run_in_shell(Paths.jekyll_bin.to_s, *args, "--trace")
+  process = run_in_shell("ruby", Paths.jekyll_bin.to_s, *args, "--trace")
   process.exitstatus.zero?
 end
 

From 92dbe313e997af6287c78433a8e6188dbee9dfda Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 20 Sep 2016 09:26:40 -0700
Subject: [PATCH 1417/4996] Update history to reflect merge of #5383 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b85989b1d1e..f340cd6923b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -61,6 +61,7 @@
   * Execute jekyll from clone instead of defined binary when running 'script/default-site' (#5295)
   * rubocop: lib/jekyll/document.rb complexity fixes (#5045)
   * Proxy a number of Convertible methods to Renderer (#5308)
+  * Run executable for Cucumber via Ruby instead of Shell (#5383)
 
 ## 3.2.1 / 2016-08-02
 

From 950a37395fad8ef7de830ca1260afc0d27141e23 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 20 Sep 2016 13:10:49 -0700
Subject: [PATCH 1418/4996] Update history to reflect merge of #5381 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f340cd6923b..b9309d54e89 100644
--- a/History.markdown
+++ b/History.markdown
@@ -62,6 +62,7 @@
   * rubocop: lib/jekyll/document.rb complexity fixes (#5045)
   * Proxy a number of Convertible methods to Renderer (#5308)
   * Run executable for Cucumber via Ruby instead of Shell (#5383)
+  * Appease Rubocop (#5381)
 
 ## 3.2.1 / 2016-08-02
 

From 29d8fee4ce9162019ef35facb4a5a44eb42c6920 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 20 Sep 2016 13:12:34 -0700
Subject: [PATCH 1419/4996] Add test to ensure that the /assets theme reader
 doesn't clobber preexisting site files.

---
 .../test-theme/assets/application.coffee      |  3 +++
 test/source/assets/application.coffee         |  3 +++
 test/test_filters.rb                          |  2 +-
 test/test_site.rb                             |  1 +
 test/test_theme_assets_reader.rb              | 20 ++++++++++++++-----
 5 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 test/fixtures/test-theme/assets/application.coffee
 create mode 100644 test/source/assets/application.coffee

diff --git a/test/fixtures/test-theme/assets/application.coffee b/test/fixtures/test-theme/assets/application.coffee
new file mode 100644
index 00000000000..02f335154b5
--- /dev/null
+++ b/test/fixtures/test-theme/assets/application.coffee
@@ -0,0 +1,3 @@
+---
+---
+alert "From your theme."
diff --git a/test/source/assets/application.coffee b/test/source/assets/application.coffee
new file mode 100644
index 00000000000..b9f5e1efa21
--- /dev/null
+++ b/test/source/assets/application.coffee
@@ -0,0 +1,3 @@
+---
+---
+alert "From your site."
diff --git a/test/test_filters.rb b/test/test_filters.rb
index b5f0a395ddf..d6ff9eac12b 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -475,7 +475,7 @@ def to_liquid
               g["items"].is_a?(Array),
               "The list of grouped items for '' is not an Array."
             )
-            assert_equal 14, g["items"].size
+            assert_equal 15, g["items"].size
           end
         end
       end
diff --git a/test/test_site.rb b/test/test_site.rb
index 83d6e45625b..1f0d30a1835 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -180,6 +180,7 @@ def generate(site)
         %#\ +.md
         .htaccess
         about.html
+        application.coffee
         bar.html
         coffeescript.coffee
         contacts.html
diff --git a/test/test_theme_assets_reader.rb b/test/test_theme_assets_reader.rb
index ecafa0f1103..fc335248084 100644
--- a/test/test_theme_assets_reader.rb
+++ b/test/test_theme_assets_reader.rb
@@ -25,6 +25,7 @@ def refute_file_with_relative_path(haystack, relative_path)
 
   context "with a valid theme" do
     should "read all assets" do
+      @site.reset
       ThemeAssetsReader.new(@site).read
       assert_file_with_relative_path @site.static_files, "assets/img/logo.png"
       assert_file_with_relative_path @site.pages, "assets/style.scss"
@@ -38,15 +39,24 @@ def refute_file_with_relative_path(haystack, relative_path)
       assert_equal @site.in_dest_dir("assets/style.css"), file.destination(@site.dest)
       assert_includes file.output, ".sample {\n  color: black; }"
     end
+
+    should "not overwrite site content with the same relative path" do
+      @site.reset
+      @site.read
+
+      file = @site.pages.find { |f| f.relative_path == "assets/application.coffee" }
+      refute_nil file
+      assert_includes file.content, "alert \"From your site.\""
+    end
   end
 
   context "with a valid theme without an assets dir" do
     should "not read any assets" do
-      allow(Theme).to receive(:realpath_for).with(:sass).and_return(nil)
       site = fixture_site("theme" => "test-theme")
+      allow(site.theme).to receive(:assets_path).and_return(nil)
       ThemeAssetsReader.new(site).read
-      refute_file_with_relative_path @site.static_files, "assets/img/logo.png"
-      refute_file_with_relative_path @site.pages, "assets/style.scss"
+      refute_file_with_relative_path site.static_files, "assets/img/logo.png"
+      refute_file_with_relative_path site.pages, "assets/style.scss"
     end
   end
 
@@ -54,8 +64,8 @@ def refute_file_with_relative_path(haystack, relative_path)
     should "not read any assets" do
       site = fixture_site("theme" => nil)
       ThemeAssetsReader.new(site).read
-      refute_file_with_relative_path @site.static_files, "assets/img/logo.png"
-      refute_file_with_relative_path @site.pages, "assets/style.scss"
+      refute_file_with_relative_path site.static_files, "assets/img/logo.png"
+      refute_file_with_relative_path site.pages, "assets/style.scss"
     end
   end
 end

From 152fa877f6775dc6502e8020e4384cd24f0a0c8c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 20 Sep 2016 13:40:11 -0700
Subject: [PATCH 1420/4996] Update history to reflect merge of #5364 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b9309d54e89..46838a87f19 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,7 @@
   * update gitignore template to ignore theme gems built by user (#5326)
   * Adds ability to link to all files (#5199)
   * Exclude vendor by default (#5361)
+  * Add ThemeAssetsReader which reads assets from a theme (#5364)
 
 ### Bug Fixes
 

From 650a3c7932d8ec23e073feef85ab68d67dd577a5 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 20 Sep 2016 13:48:40 -0700
Subject: [PATCH 1421/4996] Update history to reflect merge of #5369

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

diff --git a/History.markdown b/History.markdown
index 46838a87f19..71f2276df9c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -49,6 +49,7 @@
   * [docs] .md as default extension in examples (#5316)
   * Fix small typo in docs (#5347)
   * Add missing period to sentence in first paragraph. (#5372)
+  * added jekyll-spotify plugin (#5369)
 
 ### Development Fixes
 

From 262be85c49239fcfe0c9c71f0d876881791de1e9 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 20 Sep 2016 15:32:26 -0700
Subject: [PATCH 1422/4996] Update history to reflect merge of #5237 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 71f2276df9c..bec100fddac 100644
--- a/History.markdown
+++ b/History.markdown
@@ -9,6 +9,7 @@
   * Adds ability to link to all files (#5199)
   * Exclude vendor by default (#5361)
   * Add ThemeAssetsReader which reads assets from a theme (#5364)
+  * Add bundle install to jekyll new command (#5237)
 
 ### Bug Fixes
 

From 1ac87eaae2c794cdecbd602c815032868540c71f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 20 Sep 2016 16:39:33 -0700
Subject: [PATCH 1423/4996] Update history to reflect merge of #5380 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index bec100fddac..23a5d9088d8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -67,6 +67,10 @@
   * Run executable for Cucumber via Ruby instead of Shell (#5383)
   * Appease Rubocop (#5381)
 
+### buf
+
+  * Only complain about `kramdown.coderay` if it is actually in the config (#5380)
+
 ## 3.2.1 / 2016-08-02
 
 ### Bug Fixes

From 9ae0a7023bb79240b3a9620b9c3ec32314a85cc5 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 20 Sep 2016 17:04:26 -0700
Subject: [PATCH 1424/4996] Move reference to #5380.

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

diff --git a/History.markdown b/History.markdown
index 23a5d9088d8..ca5f7486771 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Use jekyll-feed to generate the default site's RSS feed (#5196)
   * Site#configure_theme: do not set theme unless it's a string (#5189)
   * Convertible: set self.output in #render_all_layouts and #do_layout (#5337)
+  * Only complain about `kramdown.coderay` if it is actually in the config (#5380)
 
 ### Site Enhancements
 
@@ -67,10 +68,6 @@
   * Run executable for Cucumber via Ruby instead of Shell (#5383)
   * Appease Rubocop (#5381)
 
-### buf
-
-  * Only complain about `kramdown.coderay` if it is actually in the config (#5380)
-
 ## 3.2.1 / 2016-08-02
 
 ### Bug Fixes

From f3859384c09dfd219eed3b3371ed2982a800e6d1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 20 Sep 2016 17:04:58 -0700
Subject: [PATCH 1425/4996] Update history to reflect merge of #5376 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ca5f7486771..3b4c08464e5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
   * Site#configure_theme: do not set theme unless it's a string (#5189)
   * Convertible: set self.output in #render_all_layouts and #do_layout (#5337)
   * Only complain about `kramdown.coderay` if it is actually in the config (#5380)
+  * Clarify documentation in theme gem's README template (#5376)
 
 ### Site Enhancements
 

From 846ab94f43be5d4e11883cb5f611d296d8e97754 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 20 Sep 2016 17:05:49 -0700
Subject: [PATCH 1426/4996] Update history to reflect merge of #5375 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3b4c08464e5..490688781aa 100644
--- a/History.markdown
+++ b/History.markdown
@@ -18,6 +18,7 @@
   * Convertible: set self.output in #render_all_layouts and #do_layout (#5337)
   * Only complain about `kramdown.coderay` if it is actually in the config (#5380)
   * Clarify documentation in theme gem's README template (#5376)
+  * Allow underscore in highlighter language (#5375)
 
 ### Site Enhancements
 

From 99fc60e28c192cb44fe372efbf5ffed8148ad8cb Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 5 Sep 2016 14:45:04 +0530
Subject: [PATCH 1427/4996] update template to include theme files

---
 lib/theme_template/theme.gemspec.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/theme_template/theme.gemspec.erb b/lib/theme_template/theme.gemspec.erb
index d403d6746d2..d0714ffce15 100644
--- a/lib/theme_template/theme.gemspec.erb
+++ b/lib/theme_template/theme.gemspec.erb
@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "TODO: Put your gem's website or public repo URL here."
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(<%= theme_directories.join("|") %>|LICENSE|README)/i}) }
+  spec.files         = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(<%= theme_directories.join("|") %>|LICENSE|README)}i) }
 
   spec.add_development_dependency "jekyll", "~> <%= jekyll_version_with_minor %>"
   spec.add_development_dependency "bundler", "~> 1.12"

From 588b3a6649eef68b172eac6fc8ab4f8e9720eeec Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 21 Sep 2016 22:42:01 +0530
Subject: [PATCH 1428/4996] remove features dirs on windows with proper access

---
 features/step_definitions.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index 731f8b7b942..ffe3fff53e3 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -1,4 +1,5 @@
 Before do
+  FileUtils.rm_rf(Paths.test_dir) if Paths.test_dir.exist?
   FileUtils.mkdir_p(Paths.test_dir) unless Paths.test_dir.directory?
   Dir.chdir(Paths.test_dir)
 end
@@ -6,7 +7,7 @@
 #
 
 After do
-  Paths.test_dir.rmtree if Paths.test_dir.exist?
+  FileUtils.rm_rf(Paths.test_dir) if Paths.test_dir.exist?
   Paths.output_file.delete if Paths.output_file.exist?
   Paths.status_file.delete if Paths.status_file.exist?
   Dir.chdir(Paths.test_dir.parent)

From 87c745573fde23d5b7416e57774f95484752e288 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 21 Sep 2016 13:29:38 -0700
Subject: [PATCH 1429/4996] Update history to reflect merge of #5389 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 490688781aa..de8c07feae2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -69,6 +69,7 @@
   * Proxy a number of Convertible methods to Renderer (#5308)
   * Run executable for Cucumber via Ruby instead of Shell (#5383)
   * Appease Rubocop (#5381)
+  * remove features' directories on windows with proper access (#5389)
 
 ## 3.2.1 / 2016-08-02
 

From ae27db62eb14a620e5b3645fadedcc70fda71379 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell 
Date: Thu, 22 Sep 2016 09:47:36 -0500
Subject: [PATCH 1430/4996] Add jekyll-menus to the list of plugins.

---
 site/_docs/plugins.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 816e6de2e0a..f8909ddbeb0 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -911,6 +911,7 @@ LESS.js files during generation.
 - [Jekyll-breadcrumbs](https://github.com/git-no/jekyll-breadcrumbs): Creates breadcrumbs for Jekyll 3.x, includes features like SEO optimization, optional breadcrumb item translation and more.
 - [generator-jekyllized](https://github.com/sondr3/generator-jekyllized): A Yeoman generator for rapidly developing sites with Gulp. Live reload your site, automatically minify and optimize your assets and much more.
 - [Jekyll-Spotify](https://github.com/MertcanGokgoz/Jekyll-Spotify): Easily output Spotify Embed Player for jekyll
+- [jekyll-menus](https://github.com/forestryio/jekyll-menus): Hugo style menus for your Jekyll site... recursive menus included.
 
 #### Editors
 

From aa866516504b97743b1b13d799313566303f01a3 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 22 Sep 2016 14:16:00 -0700
Subject: [PATCH 1431/4996] Add absolute_url and relative_url filters.

---
 lib/jekyll/filters.rb             |   3 +
 lib/jekyll/filters/url_filters.rb |  45 ++++++++++++
 test/helper.rb                    |   7 +-
 test/test_filters.rb              | 114 +++++++++++++++++++++++++++---
 4 files changed, 156 insertions(+), 13 deletions(-)
 create mode 100644 lib/jekyll/filters/url_filters.rb

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index d8915b3af4f..29f2a2b5e1a 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -3,8 +3,11 @@
 require "date"
 require "liquid"
 
+require_all "jekyll/filters"
+
 module Jekyll
   module Filters
+    include URLFilters
     # Convert a Markdown string into HTML output.
     #
     # input - The Markdown String to convert.
diff --git a/lib/jekyll/filters/url_filters.rb b/lib/jekyll/filters/url_filters.rb
new file mode 100644
index 00000000000..e907c91bf14
--- /dev/null
+++ b/lib/jekyll/filters/url_filters.rb
@@ -0,0 +1,45 @@
+module Jekyll
+  module Filters
+    module URLFilters
+      # Produces an absolute URL based on site.url and site.baseurl.
+      #
+      # input - the URL to make absolute.
+      #
+      # Returns the absolute URL as a String.
+      def absolute_url(input)
+        return if input.nil?
+        site = @context.registers[:site]
+        return relative_url(input).to_s if site.config["url"].nil?
+        URI(site.config["url"] + relative_url(input)).to_s
+      end
+
+      # Produces a URL relative to the domain root based on site.baseurl.
+      #
+      # 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?
+        site = @context.registers[:site]
+        return ensure_leading_slash(input.to_s) if site.config["baseurl"].nil?
+        ensure_leading_slash( # in case the baseurl doesn't have a leading slash
+          URI(
+            site.config["baseurl"] + ensure_leading_slash(input.to_s)
+            # in case the input doesn't have a leading slash
+          ).to_s
+        )
+      end
+
+      private
+      def ensure_leading_slash(input)
+        return input if input.nil? || input.empty?
+        if input.start_with?("/")
+          input
+        else
+          "/#{input}"
+        end
+      end
+
+    end
+  end
+end
diff --git a/test/helper.rb b/test/helper.rb
index 9505c76239e..8fc43d6733d 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -120,12 +120,9 @@ def site_configuration(overrides = {})
       "destination" => dest_dir,
       "incremental" => false
     }))
-    build_configs({
+    Configuration.from(full_overrides.merge({
       "source" => source_dir
-    }, full_overrides)
-      .fix_common_issues
-      .backwards_compatibilize
-      .add_default_collections
+    }))
   end
 
   def clear_dest
diff --git a/test/test_filters.rb b/test/test_filters.rb
index d6ff9eac12b..d027cbb4f27 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -8,23 +8,28 @@ class JekyllFilter
     attr_accessor :site, :context
 
     def initialize(opts = {})
-      @site = Jekyll::Site.new(
-        Jekyll.configuration(opts.merge("skip_config_files" => true))
-      )
+      @site = Jekyll::Site.new(opts.merge("skip_config_files" => true))
       @context = Liquid::Context.new({}, {}, { :site => @site })
     end
   end
 
+  def make_filter_mock(opts = {})
+    JekyllFilter.new(site_configuration(opts)).tap do |f|
+      tz = f.site.config["timezone"]
+      Jekyll.set_timezone(tz) if tz
+    end
+  end
+
   class SelectDummy
     def select; end
   end
 
   context "filters" do
     setup do
-      @filter = JekyllFilter.new({
-        "source"      => source_dir,
-        "destination" => dest_dir,
-        "timezone"    => "UTC"
+      @filter = make_filter_mock({
+        "timezone" => "UTC",
+        "url"      => "http://example.com",
+        "baseurl"  => "/base"
       })
       @sample_time = Time.utc(2013, 3, 27, 11, 22, 33)
       @sample_date = Date.parse("2013-03-27")
@@ -65,7 +70,7 @@ def select; end
       end
 
       should "escapes special characters when configured to do so" do
-        kramdown = JekyllFilter.new({ :kramdown => { :entity_output => :symbolic } })
+        kramdown = make_filter_mock({ :kramdown => { :entity_output => :symbolic } })
         assert_equal(
           "“This filter’s test…”",
           kramdown.smartify(%q{"This filter's test..."})
@@ -307,6 +312,99 @@ def select; end
       assert_equal "my%20things", @filter.uri_escape("my things")
     end
 
+    context "absolute_url filter" do
+      should "produce an absolute URL from a page URL" do
+        page_url = "/about/my_favorite_page/"
+        assert_equal "http://example.com/base#{page_url}", @filter.absolute_url(page_url)
+      end
+
+      should "ensure the leading slash" do
+        page_url = "about/my_favorite_page/"
+        assert_equal "http://example.com/base/#{page_url}", @filter.absolute_url(page_url)
+      end
+
+      should "ensure the leading slash for the baseurl" do
+        page_url = "about/my_favorite_page/"
+        filter = make_filter_mock({
+          "url"     => "http://example.com",
+          "baseurl" => "base"
+        })
+        assert_equal "http://example.com/base/#{page_url}", filter.absolute_url(page_url)
+      end
+
+      should "be ok with a blank but present 'url'" do
+        page_url = "about/my_favorite_page/"
+        filter = make_filter_mock({
+          "url"     => "",
+          "baseurl" => "base"
+        })
+        assert_equal "/base/#{page_url}", filter.absolute_url(page_url)
+      end
+
+      should "be ok with a nil 'url'" do
+        page_url = "about/my_favorite_page/"
+        filter = make_filter_mock({
+          "url"     => nil,
+          "baseurl" => "base"
+        })
+        assert_equal "/base/#{page_url}", filter.absolute_url(page_url)
+      end
+
+      should "be ok with a nil 'baseurl'" do
+        page_url = "about/my_favorite_page/"
+        filter = make_filter_mock({
+          "url"     => "http://example.com",
+          "baseurl" => nil
+        })
+        assert_equal "http://example.com/#{page_url}", filter.absolute_url(page_url)
+      end
+
+      should "not prepend a forward slash if input is empty" do
+        page_url = ""
+        filter = make_filter_mock({
+          "url"     => "http://example.com",
+          "baseurl" => "/base"
+        })
+        assert_equal "http://example.com/base", filter.absolute_url(page_url)
+      end
+    end
+
+    context "relative_url filter" do
+      should "produce a relative URL from a page URL" do
+        page_url = "/about/my_favorite_page/"
+        assert_equal "/base#{page_url}", @filter.relative_url(page_url)
+      end
+
+      should "ensure the leading slash between baseurl and input" do
+        page_url = "about/my_favorite_page/"
+        assert_equal "/base/#{page_url}", @filter.relative_url(page_url)
+      end
+
+      should "ensure the leading slash for the baseurl" do
+        page_url = "about/my_favorite_page/"
+        filter = make_filter_mock({ "baseurl" => "base" })
+        assert_equal "/base/#{page_url}", filter.relative_url(page_url)
+      end
+
+      should "be ok with a nil 'baseurl'" do
+        page_url = "about/my_favorite_page/"
+        filter = make_filter_mock({
+          "url"     => "http://example.com",
+          "baseurl" => nil
+        })
+        assert_equal "/#{page_url}", filter.relative_url(page_url)
+      end
+
+      should "not prepend a forward slash if input is empty" do
+        page_url = ""
+        filter = make_filter_mock({
+          "url"     => "http://example.com",
+          "baseurl" => "/base"
+        })
+        assert_equal "/base", filter.relative_url(page_url)
+      end
+    end
+
     context "jsonify filter" do
       should "convert hash to json" do
         assert_equal "{\"age\":18}", @filter.jsonify({ :age => 18 })

From eab6752f528c15752144d6dae369b52efbdfcc02 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 22 Sep 2016 14:40:20 -0700
Subject: [PATCH 1432/4996] Consolidate ensure_leading_slash to 2 lines.

---
 lib/jekyll/filters/url_filters.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/jekyll/filters/url_filters.rb b/lib/jekyll/filters/url_filters.rb
index e907c91bf14..de700aa7c74 100644
--- a/lib/jekyll/filters/url_filters.rb
+++ b/lib/jekyll/filters/url_filters.rb
@@ -32,12 +32,8 @@ def relative_url(input)
 
       private
       def ensure_leading_slash(input)
-        return input if input.nil? || input.empty?
-        if input.start_with?("/")
-          input
-        else
-          "/#{input}"
-        end
+        return input if input.nil? || input.empty? || input.start_with?("/")
+        "/#{input}"
       end
 
     end

From 081d7c016a647b17d39221a2027a621e2ec5be26 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 22 Sep 2016 16:56:05 -0700
Subject: [PATCH 1433/4996] Update history to reflect merge of #5397 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index de8c07feae2..e3788f5c37f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -54,6 +54,7 @@
   * Fix small typo in docs (#5347)
   * Add missing period to sentence in first paragraph. (#5372)
   * added jekyll-spotify plugin (#5369)
+  * Add jekyll-menus to the list of plugins. (#5397)
 
 ### Development Fixes
 

From 6571ea0c1a6c7fef40516ce6445b3d07060b636f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 22 Sep 2016 20:50:48 -0700
Subject: [PATCH 1434/4996] Update history to reflect merge of #5338 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e3788f5c37f..b64bede5c93 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
   * Only complain about `kramdown.coderay` if it is actually in the config (#5380)
   * Clarify documentation in theme gem's README template (#5376)
   * Allow underscore in highlighter language (#5375)
+  * Site template: set empty url in config file by default (#5338)
 
 ### Site Enhancements
 

From fa96843555091655fb028c9e9458735526e90449 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 22 Sep 2016 20:58:26 -0700
Subject: [PATCH 1435/4996] URLFilters: Simplify ensure_leading_slash calls.

---
 lib/jekyll/filters/url_filters.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/jekyll/filters/url_filters.rb b/lib/jekyll/filters/url_filters.rb
index de700aa7c74..39f60230f55 100644
--- a/lib/jekyll/filters/url_filters.rb
+++ b/lib/jekyll/filters/url_filters.rb
@@ -22,12 +22,9 @@ def relative_url(input)
         return if input.nil?
         site = @context.registers[:site]
         return ensure_leading_slash(input.to_s) if site.config["baseurl"].nil?
-        ensure_leading_slash( # in case the baseurl doesn't have a leading slash
-          URI(
-            site.config["baseurl"] + ensure_leading_slash(input.to_s)
-            # in case the input doesn't have a leading slash
-          ).to_s
-        )
+        URI(
+          ensure_leading_slash(site.config["baseurl"]) + ensure_leading_slash(input.to_s)
+        ).to_s
       end
 
       private

From 0dc15dba881ef2a0577c9c90416dd9ed48d5ff1d Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 23 Sep 2016 18:00:13 +0530
Subject: [PATCH 1436/4996] remove `css/` from new site scaffolding

css directory and its contents to be handled by theme's `assets/`
directory.
The directory removed here wil be added to minima gem.
---
 lib/site_template/css/main.scss | 39 ---------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 lib/site_template/css/main.scss

diff --git a/lib/site_template/css/main.scss b/lib/site_template/css/main.scss
deleted file mode 100644
index c91fac8d134..00000000000
--- a/lib/site_template/css/main.scss
+++ /dev/null
@@ -1,39 +0,0 @@
----
-# Only the main Sass file needs front matter (the dashes are enough)
----
-@charset "utf-8";
-
-// Our variables
-$base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-$base-font-size:   16px;
-$base-font-weight: 400;
-$small-font-size:  $base-font-size * 0.875;
-$base-line-height: 1.5;
-
-$spacing-unit:     30px;
-
-$text-color:       #111;
-$background-color: #fdfdfd;
-$brand-color:      #2a7ae2;
-
-$grey-color:       #828282;
-$grey-color-light: lighten($grey-color, 40%);
-$grey-color-dark:  darken($grey-color, 25%);
-
-// Width of the content area
-$content-width:    800px;
-
-$on-palm:          600px;
-$on-laptop:        800px;
-
-// Minima also includes a mixin for defining media queries.
-// Use media queries like this:
-// @include media-query($on-palm) {
-//     .wrapper {
-//         padding-right: $spacing-unit / 2;
-//         padding-left: $spacing-unit / 2;
-//     }
-// }
-
-// Import partials from the `minima` theme.
-@import "minima";

From 69937373bd88adbca2ed9190e41d5df513b68acb Mon Sep 17 00:00:00 2001
From: Chris Finazzo 
Date: Fri, 23 Sep 2016 14:47:23 -0400
Subject: [PATCH 1437/4996] macOS and one grammar fix

---
 site/_docs/installation.md    | 6 +++---
 site/_docs/troubleshooting.md | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/site/_docs/installation.md b/site/_docs/installation.md
index 712e3bae6fc..676bccb4814 100644
--- a/site/_docs/installation.md
+++ b/site/_docs/installation.md
@@ -17,7 +17,7 @@ requirements you’ll need to make sure your system has before you start.
 - [Ruby](https://www.ruby-lang.org/en/downloads/) (including development
   headers, v1.9.3 or above for Jekyll 2 and v2 or above for Jekyll 3)
 - [RubyGems](https://rubygems.org/pages/download)
-- Linux, Unix, or Mac OS X
+- Linux, Unix, or macOS
 - [NodeJS](https://nodejs.org/), or another JavaScript runtime (Jekyll 2 and
 earlier, for CoffeeScript support).
 - [Python 2.7](https://www.python.org/downloads/) (for Jekyll 2 and earlier)
@@ -51,8 +51,8 @@ community can improve the experience for everyone.
   
    Installing Xcode Command-Line Tools
    
   
    
     If you run into issues installing Jekyll's dependencies which make use of
-    native extensions and are using Mac OS X, you will need to install Xcode
-    and the Command-Line Tools it ships with. Download in
+    native extensions and are using macOS, you will need to install Xcode
+    and the Command-Line Tools it ships with. Download them in
     Preferences → Downloads → Components.
   
    
 
    
diff --git a/site/_docs/troubleshooting.md b/site/_docs/troubleshooting.md
index 3a2c61700fd..5a53a9ebab6 100644
--- a/site/_docs/troubleshooting.md
+++ b/site/_docs/troubleshooting.md
@@ -57,14 +57,14 @@ sudo emerge -av dev-ruby/rubygems
 On Windows, you may need to install [RubyInstaller
 DevKit](https://wiki.github.com/oneclick/rubyinstaller/development-kit).
 
-On Mac OS X, you may need to update RubyGems (using `sudo` only if necessary):
+On macOS, you may need to update RubyGems (using `sudo` only if necessary):
 
 ```sh
 sudo gem update --system
 ```
 
 If you still have issues, you can download and install new Command Line
-Tools (such as `gcc`) using the command
+Tools (such as `gcc`) using the following command:
 
 ```sh
 xcode-select --install
@@ -77,7 +77,7 @@ which may allow you to install native gems using this command (again using
 sudo gem install jekyll
 ```
 
-Note that upgrading Mac OS X does not automatically upgrade Xcode itself
+Note that upgrading macOS does not automatically upgrade Xcode itself
 (that can be done separately via the App Store), and having an out-of-date
 Xcode.app can interfere with the command line tools downloaded above. If
 you run into this issue, upgrade Xcode and install the upgraded Command

From f277baa9758217c55179a3ba125678343e398d8c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 23 Sep 2016 14:18:02 -0700
Subject: [PATCH 1438/4996] Update history to reflect merge of #5399 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b64bede5c93..9b308d35bfc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -10,6 +10,7 @@
   * Exclude vendor by default (#5361)
   * Add ThemeAssetsReader which reads assets from a theme (#5364)
   * Add bundle install to jekyll new command (#5237)
+  * Add absolute_url and relative_url filters. (#5399)
 
 ### Bug Fixes
 

From 8e027fced965bb4c0acde45b6cf9f8ecdcbbbba8 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 23 Sep 2016 14:22:57 -0700
Subject: [PATCH 1439/4996] Add documentation for relative_url and absolute_url

---
 site/_docs/templates.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/site/_docs/templates.md b/site/_docs/templates.md
index 59bb4b1815a..48d7cd7498c 100644
--- a/site/_docs/templates.md
+++ b/site/_docs/templates.md
@@ -21,6 +21,34 @@ common tasks easier.
     
   
   
+    
+      
+        
    Relative URL
    
+        
    Prepend the baseurl value to the input. Useful if your site is hosted at a subpath rather than the root of the domain.
    
+      
+      
+        
    
+         {% raw %}{{ "/assets/style.css" | relative_url }}{% endraw %}
+        
    
+        
    
+         /my-baseurl/assets/style.css
+        
    
+      
+    
+    
+      
+        
    Absolute URL
    
+        
    Prepend the url and baseurl value to the input.
    
+      
+      
+        
    
+         {% raw %}{{ "/assets/style.css" | absolute_url }}{% endraw %}
+        
    
+        
    
+          http://example.com/my-baseurl/assets/style.css
+        
    
+      
+    
     
       
         
    Date to XML Schema
    

From 956478205415b735a078370140bf263aaf66681e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 23 Sep 2016 14:30:39 -0700
Subject: [PATCH 1440/4996] Update history to reflect merge of #5402 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9b308d35bfc..b7068125fe6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
   * Add ThemeAssetsReader which reads assets from a theme (#5364)
   * Add bundle install to jekyll new command (#5237)
   * Add absolute_url and relative_url filters. (#5399)
+  * Site template: remove `css/` from new site scaffolding (#5402)
 
 ### Bug Fixes
 

From 93c5f71fafb7dd9cc20cadb4f5adce08e63a6d9d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 23 Sep 2016 17:46:41 -0700
Subject: [PATCH 1441/4996] Update history to reflect merge of #5403 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b7068125fe6..adf0f46df8d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -58,6 +58,7 @@
   * Add missing period to sentence in first paragraph. (#5372)
   * added jekyll-spotify plugin (#5369)
   * Add jekyll-menus to the list of plugins. (#5397)
+  * macOS and one grammar fix (#5403)
 
 ### Development Fixes
 

From 3966a37d71c506266822586be911b0828c5753b5 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sat, 24 Sep 2016 13:45:50 +0530
Subject: [PATCH 1442/4996] swallow bundle output in CI

---
 lib/jekyll/commands/new.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index c85691642fc..0a0c8b53c2e 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -133,7 +133,11 @@ def bundle_install(path)
           Jekyll::External.require_with_graceful_fail "bundler"
           Jekyll.logger.info "Running bundle install in #{path.cyan}..."
           Dir.chdir(path) do
-            system("bundle", "install")
+            if ENV["CI"]
+              system("bundle", "install", "--quiet")
+            else
+              system("bundle", "install")
+            end
           end
         end
       end

From bacb300876b758b0ff1a27ed62e456757eea372e Mon Sep 17 00:00:00 2001
From: Heng Kwokfu 
Date: Sat, 24 Sep 2016 21:55:02 +0800
Subject: [PATCH 1443/4996] Skip Windows tests in non-Windows environment.

---
 test/test_path_sanitization.rb | 40 ++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/test/test_path_sanitization.rb b/test/test_path_sanitization.rb
index a94fc0c52d1..31a4b92ebff 100644
--- a/test/test_path_sanitization.rb
+++ b/test/test_path_sanitization.rb
@@ -29,29 +29,31 @@ class TestPathSanitization < JekyllUnitTest
                  Jekyll.sanitized_path(source_dir, "f./../../../../../../files/hi.txt")
   end
 
-  context "on Windows with absolute path" do
-    setup do
-      @base_path = "D:/demo"
-      @file_path = "D:/demo/_site"
-      allow(Dir).to receive(:pwd).and_return("D:/")
-    end
+  if Jekyll::Utils::Platforms.really_windows?
+    context "on Windows with absolute path" do
+      setup do
+        @base_path = "D:/demo"
+        @file_path = "D:/demo/_site"
+        allow(Dir).to receive(:pwd).and_return("D:/")
+      end
 
-    should "strip just the clean path drive name" do
-      assert_equal "D:/demo/_site",
-                   Jekyll.sanitized_path(@base_path, @file_path)
+      should "strip just the clean path drive name" do
+        assert_equal "D:/demo/_site",
+                     Jekyll.sanitized_path(@base_path, @file_path)
+      end
     end
-  end
 
-  context "on Windows with file path has matching prefix" do
-    setup do
-      @base_path = "D:/site"
-      @file_path = "D:/sitemap.xml"
-      allow(Dir).to receive(:pwd).and_return("D:/")
-    end
+    context "on Windows with file path has matching prefix" do
+      setup do
+        @base_path = "D:/site"
+        @file_path = "D:/sitemap.xml"
+        allow(Dir).to receive(:pwd).and_return("D:/")
+      end
 
-    should "not strip base path" do
-      assert_equal "D:/site/sitemap.xml",
-                   Jekyll.sanitized_path(@base_path, @file_path)
+      should "not strip base path" do
+        assert_equal "D:/site/sitemap.xml",
+                     Jekyll.sanitized_path(@base_path, @file_path)
+      end
     end
   end
 

From aebf711c61c18fde414eb96916f5858fa92c63c1 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Sat, 24 Sep 2016 15:11:04 -0500
Subject: [PATCH 1444/4996] Failing tests: URL filters choke on i18n

---
 test/test_filters.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index d027cbb4f27..8ae69039f3d 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -367,6 +367,15 @@ def select; end
         })
         assert_equal "http://example.com/base", filter.absolute_url(page_url)
       end
+
+      should "normalize international URLs" do
+        page_url = ""
+        filter = make_filter_mock({
+          "url"     => "http://ümlaut.example.org/",
+          "baseurl" => nil
+        })
+        assert_equal "http://xn--mlaut-jva.example.org/", filter.absolute_url(page_url)
+      end
     end
 
     context "relative_url filter" do
@@ -386,6 +395,11 @@ def select; end
         assert_equal "/base/#{page_url}", filter.relative_url(page_url)
       end
 
+      should "normalize international URLs" do
+        page_url = "错误.html"
+        assert_equal "%E9%94%99%E8%AF%AF.html", @filter.relative_url(page_url)
+      end
+
       should "be ok with a nil 'baseurl'" do
         page_url = "about/my_favorite_page/"
         filter = make_filter_mock({

From fc6f7802a2030e19bf4c07c80ab280a4942febac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= 
Date: Sat, 24 Sep 2016 22:14:49 +0200
Subject: [PATCH 1445/4996] Replace classic box-sizing reset with inheritance
 reset

Reference: https://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/
---
 site/_sass/_style.scss | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss
index 528de7cbaf0..5e441924546 100644
--- a/site/_sass/_style.scss
+++ b/site/_sass/_style.scss
@@ -1,10 +1,14 @@
 /* Base */
 
-* {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
+ html {
+   box-sizing: border-box;
+ }
+
+ *,
+ *:before,
+ *:after {
+   box-sizing: inherit;
+ }
 
 body {
   font: 300 21px Lato, 'Helvetica Neue', Helvetica, Arial, sans-serif;

From 2b30c0614017d4805f368a279c88262f200a1f59 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Sat, 24 Sep 2016 15:34:00 -0500
Subject: [PATCH 1446/4996] Use Addressable to better deal with i18n URLs

---
 jekyll.gemspec                    | 1 +
 lib/jekyll/filters/url_filters.rb | 8 +++++---
 test/test_filters.rb              | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index b506ffa30c3..734df2e4934 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -38,4 +38,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0')
   s.add_runtime_dependency('jekyll-watch', '~> 1.1')
   s.add_runtime_dependency("pathutil", "~> 0.9")
+  s.add_runtime_dependency('addressable', '~> 2.4')
 end
diff --git a/lib/jekyll/filters/url_filters.rb b/lib/jekyll/filters/url_filters.rb
index 39f60230f55..ccc4dcb9829 100644
--- a/lib/jekyll/filters/url_filters.rb
+++ b/lib/jekyll/filters/url_filters.rb
@@ -1,3 +1,5 @@
+require "addressable/uri"
+
 module Jekyll
   module Filters
     module URLFilters
@@ -10,7 +12,7 @@ def absolute_url(input)
         return if input.nil?
         site = @context.registers[:site]
         return relative_url(input).to_s if site.config["url"].nil?
-        URI(site.config["url"] + relative_url(input)).to_s
+        Addressable::URI.parse(site.config["url"] + relative_url(input)).normalize.to_s
       end
 
       # Produces a URL relative to the domain root based on site.baseurl.
@@ -22,9 +24,9 @@ def relative_url(input)
         return if input.nil?
         site = @context.registers[:site]
         return ensure_leading_slash(input.to_s) if site.config["baseurl"].nil?
-        URI(
+        Addressable::URI.parse(
           ensure_leading_slash(site.config["baseurl"]) + ensure_leading_slash(input.to_s)
-        ).to_s
+        ).normalize.to_s
       end
 
       private
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 8ae69039f3d..9a0f87d46b7 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -397,7 +397,7 @@ def select; end
 
       should "normalize international URLs" do
         page_url = "错误.html"
-        assert_equal "%E9%94%99%E8%AF%AF.html", @filter.relative_url(page_url)
+        assert_equal "/base/%E9%94%99%E8%AF%AF.html", @filter.relative_url(page_url)
       end
 
       should "be ok with a nil 'baseurl'" do

From d79ca534e40d4d6ae4deb998b9f418f8ba5e3db4 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 24 Sep 2016 13:38:44 -0700
Subject: [PATCH 1447/4996] Update history to reflect merge of #5405 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index adf0f46df8d..ae2828e2264 100644
--- a/History.markdown
+++ b/History.markdown
@@ -59,6 +59,7 @@
   * added jekyll-spotify plugin (#5369)
   * Add jekyll-menus to the list of plugins. (#5397)
   * macOS and one grammar fix (#5403)
+  * Add documentation for relative_url and absolute_url (#5405)
 
 ### Development Fixes
 

From 5df8ef5717e0b1cde813ba597003fc3f9e754ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= 
Date: Sat, 24 Sep 2016 23:21:33 +0200
Subject: [PATCH 1448/4996] Add .editorconfig

---
 .editorconfig | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..9d5248e86f3
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+# editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false

From 6366f56c214011665ba64cb56faeaef9d94bb677 Mon Sep 17 00:00:00 2001
From: Manmeet Gill 
Date: Sun, 25 Sep 2016 16:26:43 +1000
Subject: [PATCH 1449/4996] Fix Travis.ci documentation

---
 site/_docs/continuous-integration.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/_docs/continuous-integration.md b/site/_docs/continuous-integration.md
index 0fc951afa5e..e6a78a41c5d 100644
--- a/site/_docs/continuous-integration.md
+++ b/site/_docs/continuous-integration.md
@@ -94,7 +94,7 @@ Your `.travis.yml` file should look like this:
 ```yaml
 language: ruby
 rvm:
-- 2.1
+- 2.2.2
 
 before_script:
  - chmod +x ./script/cibuild # or do this locally and commit
@@ -127,7 +127,7 @@ access to Bundler, RubyGems, and a Ruby runtime.
 
 ```yaml
 rvm:
-- 2.1
+- 2.2.2
 ```
 
 RVM is a popular Ruby Version Manager (like rbenv, chruby, etc). This

From 6b6ce3cf1857b5a64c022e0735530f1ff19b736c Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 25 Sep 2016 21:41:48 +0530
Subject: [PATCH 1450/4996] use UTC format in timezone

---
 features/site_configuration.feature | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/site_configuration.feature b/features/site_configuration.feature
index 5c495356a61..8bfe0fdae2e 100644
--- a/features/site_configuration.feature
+++ b/features/site_configuration.feature
@@ -161,8 +161,8 @@ Feature: Site configuration
       And I have a post layout that contains "Post Layout: {{ content }} built at {{ page.date | date_to_xmlschema }}"
       And I have an "index.html" page with layout "page" that contains "site index page"
       And I have a configuration file with:
-        | key         | value            |
-        | timezone    | America/New_York |
+        | key         | value        |
+        | timezone    | UTC+04:00    |
       And I have a _posts directory
       And I have the following posts:
         | title     | date                   | layout  | content             |
@@ -181,8 +181,8 @@ Feature: Site configuration
       And I have a post layout that contains "Post Layout: {{ content }} built at {{ page.date | date_to_xmlschema }}"
       And I have an "index.html" page with layout "page" that contains "site index page"
       And I have a configuration file with:
-        | key         | value               |
-        | timezone    | Pacific/Honolulu    |
+        | key         | value        |
+        | timezone    | UTC+10:00    |
       And I have a _posts directory
       And I have the following posts:
         | title     | date                   | layout  | content             |

From 81b16b24fc50ecc567e9e86a8cc2cd73f60fc397 Mon Sep 17 00:00:00 2001
From: Manmeet Gill 
Date: Mon, 26 Sep 2016 16:38:00 +1000
Subject: [PATCH 1451/4996] Change to 2.2.5 instead of 2.2.2

We don't need 2.2.2 exactly, switching to 2.2.5 shaves a solid 30 seconds off build time, as it is preinstalled on travis
---
 site/_docs/continuous-integration.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/_docs/continuous-integration.md b/site/_docs/continuous-integration.md
index e6a78a41c5d..4b5b2d4e334 100644
--- a/site/_docs/continuous-integration.md
+++ b/site/_docs/continuous-integration.md
@@ -94,7 +94,7 @@ Your `.travis.yml` file should look like this:
 ```yaml
 language: ruby
 rvm:
-- 2.2.2
+- 2.2.5
 
 before_script:
  - chmod +x ./script/cibuild # or do this locally and commit
@@ -127,7 +127,7 @@ access to Bundler, RubyGems, and a Ruby runtime.
 
 ```yaml
 rvm:
-- 2.2.2
+- 2.2.5
 ```
 
 RVM is a popular Ruby Version Manager (like rbenv, chruby, etc). This

From 8321b14b29946675adfad125642873c610c39495 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 27 Sep 2016 08:24:58 +0200
Subject: [PATCH 1452/4996] Move contents of the index.html page to the 'home'
 layout

---
 lib/site_template/index.html | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/lib/site_template/index.html b/lib/site_template/index.html
index 9fbc9b7011e..e4d427d215f 100644
--- a/lib/site_template/index.html
+++ b/lib/site_template/index.html
@@ -1,23 +1,3 @@
 ---
-layout: default
+layout: home
 ---
-
-
    
-
-  
    Posts
    
-
-      
-
-  
    subscribe via RSS
    
-
-
    

From 481901b413fffda8b1f2cdf0be50ac1baa0d4201 Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Tue, 27 Sep 2016 15:38:25 +0800
Subject: [PATCH 1453/4996] Bugfix on logo in JSON-LD

---
 site/_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_config.yml b/site/_config.yml
index 722f712cc4a..5333c52ecba 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -22,7 +22,7 @@ url: https://jekyllrb.com
 twitter:
   username: jekyllrb
 
-logo: img/logo-2x.png
+logo: /img/logo-2x.png
 
 gems:
   - jekyll-feed

From c4ccfae3af0994a7d69d573ed49e8fd2aef946b0 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 27 Sep 2016 11:12:29 +0200
Subject: [PATCH 1454/4996] rename index.html to index.md

fix https://github.com/jekyll/minima/issues/13
---
 lib/site_template/{index.html => index.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lib/site_template/{index.html => index.md} (100%)

diff --git a/lib/site_template/index.html b/lib/site_template/index.md
similarity index 100%
rename from lib/site_template/index.html
rename to lib/site_template/index.md

From 6dbb5e2df17b37e84f65eed1827bffd145a7592c Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 27 Sep 2016 11:27:29 +0200
Subject: [PATCH 1455/4996] add contextual help for overriding theme's default

---
 lib/site_template/index.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/site_template/index.md b/lib/site_template/index.md
index e4d427d215f..1eb5d6724d3 100644
--- a/lib/site_template/index.md
+++ b/lib/site_template/index.md
@@ -1,3 +1,6 @@
 ---
+# You don't need to edit this file, it's empty on purpose.
+# Edit theme's home layout instead if you wanna make some changes
+# See: https://jekyllrb.com/docs/themes/#overriding-theme-defaults
 layout: home
 ---

From 157c8e888e63b6f0564b9a2e226266de20a68d26 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 27 Sep 2016 11:06:17 -0700
Subject: [PATCH 1456/4996] Update history to reflect merge of #5420 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ae2828e2264..1fc7e626304 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,7 @@
   * Add bundle install to jekyll new command (#5237)
   * Add absolute_url and relative_url filters. (#5399)
   * Site template: remove `css/` from new site scaffolding (#5402)
+  * Site template: Move contents of the index.html page to the 'home' layout (#5420)
 
 ### Bug Fixes
 

From a920cf040b3ebbbca1b3ee4b6868dd6642b2ee85 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 27 Sep 2016 11:06:44 -0700
Subject: [PATCH 1457/4996] Update history to reflect merge of #5421 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1fc7e626304..0d8655e139c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -61,6 +61,7 @@
   * Add jekyll-menus to the list of plugins. (#5397)
   * macOS and one grammar fix (#5403)
   * Add documentation for relative_url and absolute_url (#5405)
+  * Bugfix on logo in JSON-LD (#5421)
 
 ### Development Fixes
 

From 719c0938a51bec8331c411b5fc96f5f749eb8fae Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 28 Sep 2016 16:09:07 -0700
Subject: [PATCH 1458/4996] Update history to reflect merge of #5416 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0d8655e139c..0e00f09e296 100644
--- a/History.markdown
+++ b/History.markdown
@@ -78,6 +78,7 @@
   * Run executable for Cucumber via Ruby instead of Shell (#5383)
   * Appease Rubocop (#5381)
   * remove features' directories on windows with proper access (#5389)
+  * site_configuration.feature: use UTC format in timezone (#5416)
 
 ## 3.2.1 / 2016-08-02
 

From 2f5b7dc1dc2a5250a351fc26d56ca61652384faa Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 28 Sep 2016 16:25:27 -0700
Subject: [PATCH 1459/4996] Update history to reflect merge of #5413 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0e00f09e296..123374f4179 100644
--- a/History.markdown
+++ b/History.markdown
@@ -79,6 +79,7 @@
   * Appease Rubocop (#5381)
   * remove features' directories on windows with proper access (#5389)
   * site_configuration.feature: use UTC format in timezone (#5416)
+  * Fix Travis.ci documentation (#5413)
 
 ## 3.2.1 / 2016-08-02
 

From d57b04782d055206db8069a7afca4af2a49efb66 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 28 Sep 2016 16:28:12 -0700
Subject: [PATCH 1460/4996] Fix reference to #5413

---
 History.markdown | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/History.markdown b/History.markdown
index 123374f4179..a3f695a540f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -60,8 +60,9 @@
   * added jekyll-spotify plugin (#5369)
   * Add jekyll-menus to the list of plugins. (#5397)
   * macOS and one grammar fix (#5403)
-  * Add documentation for relative_url and absolute_url (#5405)
+  * Add documentation for `relative_url` and `absolute_url` (#5405)
   * Bugfix on logo in JSON-LD (#5421)
+  * Fix Travis.ci documentation (#5413)
 
 ### Development Fixes
 
@@ -78,8 +79,7 @@
   * Run executable for Cucumber via Ruby instead of Shell (#5383)
   * Appease Rubocop (#5381)
   * remove features' directories on windows with proper access (#5389)
-  * site_configuration.feature: use UTC format in timezone (#5416)
-  * Fix Travis.ci documentation (#5413)
+  * `site_configuration.feature`: use UTC format in timezone (#5416)
 
 ## 3.2.1 / 2016-08-02
 

From 79b0f27bf6f23fe8e2d1ea51d9ec4a4bc4c2c165 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 28 Sep 2016 16:31:09 -0700
Subject: [PATCH 1461/4996] Update history to reflect merge of #5408 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a3f695a540f..e33181411bb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -80,6 +80,7 @@
   * Appease Rubocop (#5381)
   * remove features' directories on windows with proper access (#5389)
   * `site_configuration.feature`: use UTC format in timezone (#5416)
+  * swallow bundle output from `jekyll new` while in CI (#5408)
 
 ## 3.2.1 / 2016-08-02
 

From b6d4ba56b7bffcbd23c36a7f67bf314846e6d119 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 28 Sep 2016 16:38:00 -0700
Subject: [PATCH 1462/4996] Update history to reflect merge of #5210 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e33181411bb..ad40aa33674 100644
--- a/History.markdown
+++ b/History.markdown
@@ -13,6 +13,7 @@
   * Add absolute_url and relative_url filters. (#5399)
   * Site template: remove `css/` from new site scaffolding (#5402)
   * Site template: Move contents of the index.html page to the 'home' layout (#5420)
+  * Exclude node_modules by default (#5210)
 
 ### Bug Fixes
 

From 682c0fc98fc6dda8397d6f072accaa6af6568c70 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 28 Sep 2016 16:39:45 -0700
Subject: [PATCH 1463/4996] Update history to reflect merge of #5157 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ad40aa33674..979413252c9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -14,6 +14,7 @@
   * Site template: remove `css/` from new site scaffolding (#5402)
   * Site template: Move contents of the index.html page to the 'home' layout (#5420)
   * Exclude node_modules by default (#5210)
+  * Run hooks in priority order. (#5157)
 
 ### Bug Fixes
 

From fd5f2eb39932f313e5264f6c79b1c073aa7162d4 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 28 Sep 2016 16:54:58 -0700
Subject: [PATCH 1464/4996] Add failing test for File.utime of a symlink in
 staticfile.

---
 test/test_static_file.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/test_static_file.rb b/test/test_static_file.rb
index 285ec879ffe..71b3f31cd58 100644
--- a/test/test_static_file.rb
+++ b/test/test_static_file.rb
@@ -112,6 +112,14 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
       assert_equal Time.new.to_i, @static_file.mtime
     end
 
+    should "only set modified time if not a symlink" do
+      expect(File).to receive(:symlink?).and_return(true)
+      expect(File).not_to receive(:utime)
+      @static_file.write(dest_dir)
+
+      allow(File).to receive(:symlink?).and_call_original
+    end
+
     should "known if the source path is modified, when it is" do
       sleep 1
       modify_dummy_file(@filename)

From 8e912630310f913d7fd7397dbd640853f2ebc7bb Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 28 Sep 2016 16:55:57 -0700
Subject: [PATCH 1465/4996] StaticFile#copy_entry: don't mark modified time if
 path is a symlink

---
 lib/jekyll/static_file.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index 0f8544ee7da..e11d6689720 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -146,7 +146,10 @@ def copy_file(dest_path)
       else
         FileUtils.copy_entry(path, dest_path)
       end
-      File.utime(self.class.mtimes[path], self.class.mtimes[path], dest_path)
+
+      unless File.symlink?(dest_path)
+        File.utime(self.class.mtimes[path], self.class.mtimes[path], dest_path)
+      end
     end
   end
 end

From 1b4b51236a6b58e818fe0773c0b8d5933cb68c80 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 19 Sep 2016 16:59:14 +0530
Subject: [PATCH 1466/4996] add theme-gem feature for bonafide theme gems

this cucumber feature follows the likely steps a theme designer would take
to build a Rubygem of his theme starting from the scaffolding generated by
`jekyll new-theme` command and further checks if the gem built actually
has the files he planned to include.
---
 features/step_definitions.rb | 26 ++++++++++++++++++++++++++
 features/support/helpers.rb  |  8 ++++++++
 features/theme_gem.feature   | 31 +++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 features/theme_gem.feature

diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index ffe3fff53e3..e993b4f9839 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -156,6 +156,31 @@
 
 #
 
+When(%r!^I run gem(.*)$!) do |args|
+  run_rubygem(args)
+  if args.include?("--verbose") || ENV["DEBUG"]
+    $stderr.puts "\n#{jekyll_run_output}\n"
+  end
+end
+
+#
+
+When(%r!^I run git add .$!) do
+  run_in_shell("git", "add", ".")
+end
+
+#
+
+When(%r!^I decide to build the theme gem$!) do
+  Dir.chdir(Paths.theme_gem_dir)
+  gemspec = "my-cool-theme.gemspec"
+  File.write(gemspec, File.read(gemspec).sub("TODO: ", ""))
+  File.new("_includes/blank.html", "w")
+  File.new("_sass/blank.scss", "w")
+end
+
+#
+
 When(%r!^I change "(.*)" to contain "(.*)"$!) do |file, text|
   File.open(file, "a") do |f|
     f.write(text)
@@ -179,6 +204,7 @@
 end
 
 #
+
 Then(%r!^I should (not )?see "(.*)" in "(.*)"$!) do |negative, text, file|
   step %(the "#{file}" file should exist)
   regexp = Regexp.new(text, Regexp::MULTILINE)
diff --git a/features/support/helpers.rb b/features/support/helpers.rb
index 0d809bca985..e5d17bb2a1c 100644
--- a/features/support/helpers.rb
+++ b/features/support/helpers.rb
@@ -8,6 +8,8 @@ class Paths
   SOURCE_DIR = Pathname.new(File.expand_path("../..", __dir__))
   def self.test_dir; source_dir.join("tmp", "jekyll"); end
 
+  def self.theme_gem_dir; source_dir.join("tmp", "jekyll", "my-cool-theme"); end
+
   def self.output_file; test_dir.join("jekyll_output.txt"); end
 
   def self.status_file; test_dir.join("jekyll_status.txt"); end
@@ -88,6 +90,12 @@ def run_bundle(args)
 
 #
 
+def run_rubygem(args)
+  run_in_shell("gem", *args.strip.split(" "))
+end
+
+#
+
 def run_jekyll(args)
   args = args.strip.split(" ") # Shellwords?
   process = run_in_shell("ruby", Paths.jekyll_bin.to_s, *args, "--trace")
diff --git a/features/theme_gem.feature b/features/theme_gem.feature
new file mode 100644
index 00000000000..b79d9c0be25
--- /dev/null
+++ b/features/theme_gem.feature
@@ -0,0 +1,31 @@
+Feature: Building Theme Gems
+  As a hacker who likes to share my expertise
+  I want to be able to make a bonafide rubygem off my theme
+  In order to share my awesome style skillz with other Jekyllites
+
+  Scenario: Generating a new Jekyll Theme
+    When I run jekyll new-theme my-cool-theme
+    Then I should get a zero exit status
+    And the my-cool-theme directory should exist
+
+  Scenario: Checking if a bonafide Theme gem will be built from generated scaffolding
+    When I run jekyll new-theme my-cool-theme
+    Then I should get a zero exit status
+    And the my-cool-theme directory should exist
+    When I decide to build the theme gem
+    Then I should get a zero exit status
+    When I run git add .
+    Then I should get a zero exit status
+    When I run gem build my-cool-theme.gemspec
+    Then I should get a zero exit status
+    And the "./my-cool-theme-0.1.0.gem" file should exist
+    When I run gem unpack my-cool-theme-0.1.0.gem
+    Then I should get a zero exit status
+    And the my-cool-theme-0.1.0 directory should exist
+    And the "my-cool-theme-0.1.0/_layouts/default.html" file should exist
+    And the "my-cool-theme-0.1.0/_includes/blank.html" file should exist
+    And the "my-cool-theme-0.1.0/_sass/blank.scss" file should exist
+    And the my-cool-theme-0.1.0/.git directory should not exist
+    And the "my-cool-theme-0.1.0/.gitignore" file should not exist
+    And the "my-cool-theme-0.1.0/Gemfile" file should not exist
+    And the "my-cool-theme-0.1.0/my-cool-theme.gemspec" file should not exist

From 1fb4dce2f5b1d9618ef737469a3477eb1cbf93ef Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 23 Sep 2016 23:21:10 +0530
Subject: [PATCH 1467/4996] add a step to check contents in assets directory

---
 features/step_definitions.rb | 2 ++
 features/theme_gem.feature   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index e993b4f9839..7d490cdaa0a 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -177,6 +177,8 @@
   File.write(gemspec, File.read(gemspec).sub("TODO: ", ""))
   File.new("_includes/blank.html", "w")
   File.new("_sass/blank.scss", "w")
+  FileUtils.mkdir_p("assets/css")
+  File.new("assets/css/blank.scss", "w")
 end
 
 #
diff --git a/features/theme_gem.feature b/features/theme_gem.feature
index b79d9c0be25..d36c71ac549 100644
--- a/features/theme_gem.feature
+++ b/features/theme_gem.feature
@@ -25,6 +25,7 @@ Feature: Building Theme Gems
     And the "my-cool-theme-0.1.0/_layouts/default.html" file should exist
     And the "my-cool-theme-0.1.0/_includes/blank.html" file should exist
     And the "my-cool-theme-0.1.0/_sass/blank.scss" file should exist
+    And the "my-cool-theme-0.1.0/assets/css/blank.scss" file should exist
     And the my-cool-theme-0.1.0/.git directory should not exist
     And the "my-cool-theme-0.1.0/.gitignore" file should not exist
     And the "my-cool-theme-0.1.0/Gemfile" file should not exist

From 5b4269eca50b61603917e11c065be16383e94731 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 29 Sep 2016 08:47:26 +0530
Subject: [PATCH 1468/4996] document automatic bundle install

---
 site/_docs/quickstart.md | 3 ++-
 site/index.html          | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/site/_docs/quickstart.md b/site/_docs/quickstart.md
index b6cb5895599..969b5384ffd 100644
--- a/site/_docs/quickstart.md
+++ b/site/_docs/quickstart.md
@@ -10,11 +10,12 @@ For the impatient, here's how to get a boilerplate Jekyll site up and running.
 ~ $ gem install jekyll bundler
 ~ $ jekyll new myblog
 ~ $ cd myblog
-~/myblog $ bundle install
 ~/myblog $ bundle exec jekyll serve
 # => Now browse to http://localhost:4000
 ```
 
+The `jekyll new` command now automatically initiates `bundle install` and installs the dependencies required. To skip this, pass `--skip-bundle` option like so `jekyll new myblog --skip-bundle`.
+
 If you wish to install jekyll into an existing directory, you can do so by running `jekyll new .` from within the directory instead of creating a new one. If the existing directory isn't empty, you'll also have to pass the `--force` option like so `jekyll new . --force`.
 
 That's nothing, though. The real magic happens when you start creating blog
diff --git a/site/index.html b/site/index.html
index 74bace334ca..88b31c5b330 100644
--- a/site/index.html
+++ b/site/index.html
@@ -57,11 +57,6 @@ 
    Get up and running in seconds.
    
           $
           cd my-awesome-site
         
    
-        
    
-          ~/my-awesome-site
-          $
-          bundle install
-        
    
         
    
           ~/my-awesome-site
           $

From 51695b2165c12bfe8acf1fd1f0b22904a0980e88 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell 
Date: Thu, 29 Sep 2016 11:17:17 -0500
Subject: [PATCH 1469/4996] Travis is entirely broken.

I'm tired of getting emails from forks I don't even control or have commit to, it's not cool... at all.
---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1b779c0c09f..6ff7022c7b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,10 +30,6 @@ branches:
     - themes
 
 notifications:
-  email:
-    recipients:
-      - jordon@envygeeks.io
-
   slack:
     secure: "\
       dNdKk6nahNURIUbO3ULhA09/vTEQjK0fNbgjVjeYPEvROHgQBP1cIP3AJy8aWs8rl5Yyow4Y\

From 69172bcc4a5377365d05b4afa83fa4376ba9c6d3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 29 Sep 2016 10:04:47 -0700
Subject: [PATCH 1470/4996] Update history to reflect merge of #5428 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 979413252c9..d73c59b1a23 100644
--- a/History.markdown
+++ b/History.markdown
@@ -65,6 +65,7 @@
   * Add documentation for `relative_url` and `absolute_url` (#5405)
   * Bugfix on logo in JSON-LD (#5421)
   * Fix Travis.ci documentation (#5413)
+  * [docs] Update documentation regarding `bundle install` after `jekyll new` (#5428)
 
 ### Development Fixes
 

From 91ef3a7cc9222f513e47f64bab33b4543883dfc7 Mon Sep 17 00:00:00 2001
From: Antonio 
Date: Fri, 30 Sep 2016 02:17:08 +0800
Subject: [PATCH 1471/4996] prepend 'jekyll serve' with 'bundle exec'

Best not to send mixed messages and jekyllrb's quickstart message is "bundle exec jekyll serve"
---
 lib/site_template/_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
index 24a465185ff..9a2bee4530b 100644
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -6,7 +6,7 @@
 # feature for the data you need to update frequently.
 #
 # For technical reasons, this file is *NOT* reloaded automatically when you use
-# 'jekyll serve'. If you change this file, please restart the server process.
+# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
 
 # Site settings
 # These are used to personalize your new site. If you look in the HTML files,

From 1c7aa4729efce24dd0757c0ac4da800a530a0c3d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 29 Sep 2016 13:25:30 -0700
Subject: [PATCH 1472/4996] Update history to reflect merge of #5412 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d73c59b1a23..928ccab8fbf 100644
--- a/History.markdown
+++ b/History.markdown
@@ -84,6 +84,7 @@
   * remove features' directories on windows with proper access (#5389)
   * `site_configuration.feature`: use UTC format in timezone (#5416)
   * swallow bundle output from `jekyll new` while in CI (#5408)
+  * Add .editorconfig (#5412)
 
 ## 3.2.1 / 2016-08-02
 

From b38ac5d9381febebff77a171ffc9c7e989cf7a6f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 29 Sep 2016 13:26:03 -0700
Subject: [PATCH 1473/4996] Update history to reflect merge of #5430 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 928ccab8fbf..4aab87b0181 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Clarify documentation in theme gem's README template (#5376)
   * Allow underscore in highlighter language (#5375)
   * Site template: set empty url in config file by default (#5338)
+  * Site template config: prepend 'jekyll serve' with 'bundle exec' (#5430)
 
 ### Site Enhancements
 

From 459bc17019c7384a31470b23b4f310f2370c44b1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 29 Sep 2016 13:26:24 -0700
Subject: [PATCH 1474/4996] Update history to reflect merge of #5427 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4aab87b0181..38485e0b82a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -26,6 +26,7 @@
   * Allow underscore in highlighter language (#5375)
   * Site template: set empty url in config file by default (#5338)
   * Site template config: prepend 'jekyll serve' with 'bundle exec' (#5430)
+  * Don't call `File.utime` for StaticFiles if it's a symlink (#5427)
 
 ### Site Enhancements
 

From 7118999958dc5a334e523941cfb06762e7622e99 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 29 Sep 2016 13:27:12 -0700
Subject: [PATCH 1475/4996] Update history to reflect merge of #5410 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 38485e0b82a..54ba5992f23 100644
--- a/History.markdown
+++ b/History.markdown
@@ -27,6 +27,7 @@
   * Site template: set empty url in config file by default (#5338)
   * Site template config: prepend 'jekyll serve' with 'bundle exec' (#5430)
   * Don't call `File.utime` for StaticFiles if it's a symlink (#5427)
+  * Fix handling of non-ASCII characters in new `*_url` filters (#5410)
 
 ### Site Enhancements
 

From d716d9b7be8ab67014d8c8048718ef7324793a4a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 29 Sep 2016 14:02:09 -0700
Subject: [PATCH 1476/4996] Update history to reflect merge of #5411 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 54ba5992f23..3487f70cf22 100644
--- a/History.markdown
+++ b/History.markdown
@@ -69,6 +69,7 @@
   * Bugfix on logo in JSON-LD (#5421)
   * Fix Travis.ci documentation (#5413)
   * [docs] Update documentation regarding `bundle install` after `jekyll new` (#5428)
+  * Replace classic box-sizing reset with inheritance reset (#5411)
 
 ### Development Fixes
 

From aa901cdaba54efcd430cd09e1aec09a9bedb3b9d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 29 Sep 2016 14:13:32 -0700
Subject: [PATCH 1477/4996] Update history to reflect merge of #5264 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3487f70cf22..2a04338a3a5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -15,6 +15,7 @@
   * Site template: Move contents of the index.html page to the 'home' layout (#5420)
   * Exclude node_modules by default (#5210)
   * Run hooks in priority order. (#5157)
+  * Add `static_file.name` and `.basename` Liquid attributes (#5264)
 
 ### Bug Fixes
 

From 87a03f6c1a2c78628e1e9d39c1b04c5d7a95e5de Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 30 Sep 2016 15:23:08 +0530
Subject: [PATCH 1478/4996] replace zero exit status steps

---
 features/step_definitions.rb | 23 ++++++++++++++++++++++-
 features/theme_gem.feature   | 15 +++++++--------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index 7d490cdaa0a..bf6883af632 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -166,7 +166,7 @@
 #
 
 When(%r!^I run git add .$!) do
-  run_in_shell("git", "add", ".")
+  run_in_shell("git", "add", ".", "--verbose")
 end
 
 #
@@ -264,6 +264,27 @@
 
 #
 
+Then(%r!^I should get an updated git index$!) do
+  index = %w(
+    .gitignore
+    Gemfile
+    LICENSE.txt
+    README.md
+    _includes/blank.html
+    _layouts/default.html
+    _layouts/page.html
+    _layouts/post.html
+    _sass/blank.scss
+    assets/css/blank.scss
+    my-cool-theme.gemspec
+  )
+  index.each do |file|
+    expect(jekyll_run_output).to match file
+  end
+end
+
+#
+
 Then(%r!^I should get a zero exit(?:\-| )status$!) do
   step %(I should see "EXIT STATUS: 0" in the build output)
 end
diff --git a/features/theme_gem.feature b/features/theme_gem.feature
index d36c71ac549..875a8568ca2 100644
--- a/features/theme_gem.feature
+++ b/features/theme_gem.feature
@@ -10,18 +10,17 @@ Feature: Building Theme Gems
 
   Scenario: Checking if a bonafide Theme gem will be built from generated scaffolding
     When I run jekyll new-theme my-cool-theme
-    Then I should get a zero exit status
-    And the my-cool-theme directory should exist
+    Then the my-cool-theme directory should exist
     When I decide to build the theme gem
-    Then I should get a zero exit status
+    Then the "_includes/blank.html" file should exist
+    Then the "_sass/blank.scss" file should exist
+    Then the "assets/css/blank.scss" file should exist
     When I run git add .
-    Then I should get a zero exit status
+    Then I should get an updated git index
     When I run gem build my-cool-theme.gemspec
-    Then I should get a zero exit status
-    And the "./my-cool-theme-0.1.0.gem" file should exist
+    Then the "./my-cool-theme-0.1.0.gem" file should exist
     When I run gem unpack my-cool-theme-0.1.0.gem
-    Then I should get a zero exit status
-    And the my-cool-theme-0.1.0 directory should exist
+    Then the my-cool-theme-0.1.0 directory should exist
     And the "my-cool-theme-0.1.0/_layouts/default.html" file should exist
     And the "my-cool-theme-0.1.0/_includes/blank.html" file should exist
     And the "my-cool-theme-0.1.0/_sass/blank.scss" file should exist

From f636067661f2cad2c9c97e5526b3631c2e265dd2 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 30 Sep 2016 15:34:46 +0530
Subject: [PATCH 1479/4996] remove 'css' subdirectory from assets folder

---
 features/step_definitions.rb | 5 ++---
 features/theme_gem.feature   | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index bf6883af632..b57f5bb8d10 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -177,8 +177,7 @@
   File.write(gemspec, File.read(gemspec).sub("TODO: ", ""))
   File.new("_includes/blank.html", "w")
   File.new("_sass/blank.scss", "w")
-  FileUtils.mkdir_p("assets/css")
-  File.new("assets/css/blank.scss", "w")
+  File.new("assets/blank.scss", "w")
 end
 
 #
@@ -275,7 +274,7 @@
     _layouts/page.html
     _layouts/post.html
     _sass/blank.scss
-    assets/css/blank.scss
+    assets/blank.scss
     my-cool-theme.gemspec
   )
   index.each do |file|
diff --git a/features/theme_gem.feature b/features/theme_gem.feature
index 875a8568ca2..c46d37e040c 100644
--- a/features/theme_gem.feature
+++ b/features/theme_gem.feature
@@ -14,7 +14,7 @@ Feature: Building Theme Gems
     When I decide to build the theme gem
     Then the "_includes/blank.html" file should exist
     Then the "_sass/blank.scss" file should exist
-    Then the "assets/css/blank.scss" file should exist
+    Then the "assets/blank.scss" file should exist
     When I run git add .
     Then I should get an updated git index
     When I run gem build my-cool-theme.gemspec
@@ -24,7 +24,7 @@ Feature: Building Theme Gems
     And the "my-cool-theme-0.1.0/_layouts/default.html" file should exist
     And the "my-cool-theme-0.1.0/_includes/blank.html" file should exist
     And the "my-cool-theme-0.1.0/_sass/blank.scss" file should exist
-    And the "my-cool-theme-0.1.0/assets/css/blank.scss" file should exist
+    And the "my-cool-theme-0.1.0/assets/blank.scss" file should exist
     And the my-cool-theme-0.1.0/.git directory should not exist
     And the "my-cool-theme-0.1.0/.gitignore" file should not exist
     And the "my-cool-theme-0.1.0/Gemfile" file should not exist

From cff8f2994ceb727e465a6b2425625af89a63ef93 Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Sat, 1 Oct 2016 13:09:50 +0100
Subject: [PATCH 1480/4996] Fix loading data from subdir with a period in name
 #5429

---
 lib/jekyll/readers/data_reader.rb          |  4 ++--
 test/source/_data/categories.01/dairy.yaml |  6 ++++++
 test/test_site.rb                          | 15 +++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 test/source/_data/categories.01/dairy.yaml

diff --git a/lib/jekyll/readers/data_reader.rb b/lib/jekyll/readers/data_reader.rb
index 4c6495fd697..2047401121b 100644
--- a/lib/jekyll/readers/data_reader.rb
+++ b/lib/jekyll/readers/data_reader.rb
@@ -37,10 +37,10 @@ def read_data_to(dir, data)
         path = @site.in_source_dir(dir, entry)
         next if @entry_filter.symlink?(path)
 
-        key = sanitize_filename(File.basename(entry, ".*"))
         if File.directory?(path)
-          read_data_to(path, data[key] = {})
+          read_data_to(path, data[entry] = {})
         else
+          key = sanitize_filename(File.basename(entry, ".*"))
           data[key] = read_data_file(path)
         end
       end
diff --git a/test/source/_data/categories.01/dairy.yaml b/test/source/_data/categories.01/dairy.yaml
new file mode 100644
index 00000000000..30a09ba35af
--- /dev/null
+++ b/test/source/_data/categories.01/dairy.yaml
@@ -0,0 +1,6 @@
+name: Dairy
+products:
+- name: cheese
+  price: 5.5
+- name: milk
+  price: 2.75
diff --git a/test/test_site.rb b/test/test_site.rb
index 1f0d30a1835..5cd20b644ab 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -438,6 +438,21 @@ def convert(*_args)
         )
       end
 
+      should "auto load yaml files in subdirectory with a period in the name" do
+        site = Site.new(site_configuration)
+        site.process
+
+        file_content = SafeYAML.load_file(File.join(
+          source_dir, "_data", "categories.01", "dairy.yaml"
+        ))
+
+        assert_equal site.data["categories.01"]["dairy"], file_content
+        assert_equal(
+          site.site_payload["site"]["data"]["categories.01"]["dairy"],
+          file_content
+        )
+      end
+
       should "load symlink files in unsafe mode" do
         site = Site.new(site_configuration("safe" => false))
         site.process

From a0a351aa7a0529c36b095f1a0bd0e4cfce9c5918 Mon Sep 17 00:00:00 2001
From: "Mark H. Wilkinson" 
Date: Mon, 3 Oct 2016 22:21:35 +0100
Subject: [PATCH 1481/4996] Remove autoload of Draft which no longer exists.

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

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 3c4def1a426..aebf47094f7 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -41,7 +41,6 @@ module Jekyll
   autoload :Convertible,         "jekyll/convertible"
   autoload :Deprecator,          "jekyll/deprecator"
   autoload :Document,            "jekyll/document"
-  autoload :Draft,               "jekyll/draft"
   autoload :EntryFilter,         "jekyll/entry_filter"
   autoload :Errors,              "jekyll/errors"
   autoload :Excerpt,             "jekyll/excerpt"

From 274d350d614cba4a024c93f7bfcc37a37b462dc6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 3 Oct 2016 15:13:02 -0700
Subject: [PATCH 1482/4996] Update history to reflect merge of #5441 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2a04338a3a5..8d1acc73419 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * Site template config: prepend 'jekyll serve' with 'bundle exec' (#5430)
   * Don't call `File.utime` for StaticFiles if it's a symlink (#5427)
   * Fix handling of non-ASCII characters in new `*_url` filters (#5410)
+  * Remove autoload of Draft which no longer exists. (#5441)
 
 ### Site Enhancements
 

From 761ddcae24e11f11bdbe95b6516530c52876ba57 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 3 Oct 2016 17:44:47 -0700
Subject: [PATCH 1483/4996] Add Jekyll 3.3 release post

---
 .../2016-10-03-jekyll-3-3-0-released.markdown | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 site/_posts/2016-10-03-jekyll-3-3-0-released.markdown

diff --git a/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown b/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown
new file mode 100644
index 00000000000..d3e506b85ab
--- /dev/null
+++ b/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown
@@ -0,0 +1,90 @@
+---
+layout: news_item
+title: 'Jekyll 3.3 is here with better theme support, new URL filters, and tons more'
+date: 2016-10-03 17:08:38 -0700
+author: parkr
+version: 3.3.0
+categories: [release]
+---
+
+We have tons of new features for you in our latest release of Jekyll. Three
+key things you might want to give a whirl:
+
+### 1. Themes can now ship static & dynamic assets in an `/assets` directory
+
+We're really stoked about this one. In Jekyll 3.2, we shipped the ability
+to use a theme that was packaged as a gem. Due to security necessities and
+ease-of-use concerns, this initial ship only included support for includes,
+layouts, and sass partials. A theme couldn't write any CSS, JavaScript, or
+content to your site.
+
+In an effort to make theme management a bit easier, any files you put into
+`/assets` in your theme will be read in as though they were part of the
+user's site. This means you can ship SCSS and CoffeeScript, images and
+webfonts, JSON and other data. Same rules apply here as in a Jekyll site:
+if it has YAML front matter, it will be converted and renderd. No YAML
+front matter, and it will simply be copied over like a static asset. Neat,
+huh?
+
+See our [documentation on the subject](/docs/assets#assets-directory) for
+more info.
+
+### 2. `relative_url` and `absolute_url` filters
+
+Want a clean way to prepend the `baseurl` or `url` in your config? These
+new filters have you covered. When working locally, if you set your
+`baseurl` to match your deployment environment, say `baseurl: "/myproject"`,
+then `relative_url` will ensure that this baseurl is prepended to anything
+you pass it:
+
+{% highlight liquid %}
+{% raw %}
+{{ "/docs/assets/" | relative_url }} => /myproject/docs/assets
+{% endraw %}
+{% endhighlight %}
+
+A result of `relative_url` will safely always yield a link which is
+relative to the domain root. A similar principle applies to `absolute_url`.
+It prepends your `baseurl` and `url` values, making absolute URL's all the
+easier to make:
+
+{% highlight liquid %}
+{% raw %}
+{{ "/docs/assets/" | absolute_url }} => http://jekyllrb.com/myproject/docs/assets
+{% endraw %}
+{% endhighlight %}
+
+### 3. `site.url` is set by the development server
+
+When you run `jekyll serve` locally, it starts a web server, usually at
+`http://localhost:4000`, that you use to preview your site during
+development. If you are using the new `absolute_url` filter, or using
+`site.url` anywhere, you have probably had to create a development config
+which resets the `url` value to point to `http://localhost:4000`.
+
+No longer! When you run `jekyll serve`, Jekyll will build your site with
+the value of the `host`, `port`, and SSL-related options. This defaults to
+`url: http://localhost:4000`. When you are developing locally, `site.url`
+will yield `http://localhost:4000`.
+
+Note that this only applies when `JEKYLL_ENV` is equal to `development`. If
+you set `JEKYLL_ENV=production` and run `jekyll serve`, it will not
+overwrite the value of `url` in your config. And again, this only applies
+to serving, not to building.
+
+## A *lot* more!
+
+There are dozens of bug fixes and minor improvements to make your Jekyll
+experience better than ever. With every Jekyll release, we strive to bring
+greater stability and reliability to your everyday development workflow.
+
+As always, thanks to our many contributors who contributed countless hours
+of their free time to making this release happen:
+
+!! TODO: Add list of contributors for this release!
+
+[Full release notes]({{ "/docs/history/" | relative_url }}) are available
+for your perusal. If you notice any issues, please don't hesitate to file a
+bug report.
+
+Happy Jekylling!

From a138b02b106d3456d6d3ed44adaba668fa12ffb6 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 4 Oct 2016 11:35:42 -0700
Subject: [PATCH 1484/4996] Update links in 3.3 release post

---
 site/_posts/2016-10-03-jekyll-3-3-0-released.markdown | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown b/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown
index d3e506b85ab..932d0105204 100644
--- a/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown
+++ b/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown
@@ -26,8 +26,8 @@ if it has YAML front matter, it will be converted and renderd. No YAML
 front matter, and it will simply be copied over like a static asset. Neat,
 huh?
 
-See our [documentation on the subject](/docs/assets#assets-directory) for
-more info.
+See our [documentation on the subject]({{ "/docs/themes/#assets" | relative_url }})
+for more info.
 
 ### 2. `relative_url` and `absolute_url` filters
 
@@ -83,7 +83,7 @@ of their free time to making this release happen:
 
 !! TODO: Add list of contributors for this release!
 
-[Full release notes]({{ "/docs/history/" | relative_url }}) are available
+[Full release notes]({{ "/docs/history/#v3-3-0" | relative_url }}) are available
 for your perusal. If you notice any issues, please don't hesitate to file a
 bug report.
 

From 01c33907a38e3cd0fccfb1367c225c050dfd5bd4 Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Fri, 30 Sep 2016 23:11:00 +0200
Subject: [PATCH 1485/4996] default site.url in dev environment to
 `http://localhost:4000`

take `host`, `port` and `ssl` options into account
---
 lib/jekyll/commands/serve.rb | 28 +++++++++++++++++----
 test/test_commands_serve.rb  | 49 +++++++++++++++++++++++++++++++++---
 2 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 9042a4a0368..c3b99cba9e0 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -33,6 +33,7 @@ def init_with_program(prog)
               opts["serving"] = true
               opts["watch"  ] = true unless opts.key?("watch")
               config = opts["config"]
+              opts["url"] = default_url(opts) if Jekyll.env == "development"
               Build.process(opts)
               opts["config"] = config
               Serve.process(opts)
@@ -47,11 +48,7 @@ def process(opts)
           destination = opts["destination"]
           setup(destination)
 
-          server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
-          server.mount(opts["baseurl"], Servlet, destination, file_handler_opts)
-          Jekyll.logger.info "Server address:", server_address(server, opts)
-          launch_browser server, opts if opts["open_url"]
-          boot_or_detach server, opts
+          start_up_webrick(opts, destination)
         end
 
         # Do a base pre-setup of WEBRick so that everything is in place
@@ -101,6 +98,17 @@ def webrick_opts(opts)
           opts
         end
 
+        #
+
+        private
+        def start_up_webrick(opts, destination)
+          server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
+          server.mount(opts["baseurl"], Servlet, destination, file_handler_opts)
+          Jekyll.logger.info "Server address:", server_address(server, opts)
+          launch_browser server, opts if opts["open_url"]
+          boot_or_detach server, opts
+        end
+
         # Recreate NondisclosureName under utf-8 circumstance
 
         private
@@ -127,6 +135,16 @@ def server_address(server, opts)
 
         #
 
+        def default_url(opts)
+          config = configuration_from_options(opts)
+          host = config["host"] == "127.0.0.1" ? "localhost" : config["host"]
+          port = config["port"]
+          protocol = config["ssl_cert"] && config["ssl_key"] ? "https" : "http"
+          "#{protocol}://#{host}:#{port}"
+        end
+
+        #
+
         private
         def launch_browser(server, opts)
           address = server_address(server, opts)
diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb
index 7e8a7062bc4..143dc2a549f 100644
--- a/test/test_commands_serve.rb
+++ b/test/test_commands_serve.rb
@@ -19,6 +19,12 @@ def custom_opts(what)
           p
         )
       end
+      Jekyll.sites.clear
+      allow(SafeYAML).to receive(:load_file).and_return({})
+      allow(Jekyll::Commands::Build).to receive(:build).and_return("")
+    end
+    teardown do
+      Jekyll.sites.clear
     end
 
     should "label itself" do
@@ -79,16 +85,53 @@ def custom_opts(what)
         custom_options = {
           "config"  => %w(_config.yml _development.yml),
           "serving" => true,
-          "watch"   => false # for not having guard output when running the tests
+          "watch"   => false, # for not having guard output when running the tests
+          "url"     => "http://localhost:4000"
         }
-        allow(SafeYAML).to receive(:load_file).and_return({})
-        allow(Jekyll::Commands::Build).to receive(:build).and_return("")
 
         expect(Jekyll::Commands::Serve).to receive(:process).with(custom_options)
         @merc.execute(:serve, { "config" => %w(_config.yml _development.yml),
                                 "watch"  => false })
       end
 
+      context "in development environment" do
+        setup do
+          expect(Jekyll).to receive(:env).and_return("development")
+          expect(Jekyll::Commands::Serve).to receive(:start_up_webrick)
+        end
+        should "set the site url by default to `http://localhost:4000`" do
+          @merc.execute(:serve, { "watch" => false, "url" => "https://jekyllrb.com/" })
+
+          assert_equal 1, Jekyll.sites.count
+          assert_equal "http://localhost:4000", Jekyll.sites.first.config["url"]
+        end
+
+        should "take `host`, `port` and `ssl` into consideration if set" do
+          @merc.execute(:serve, {
+            "watch"    => false,
+            "host"     => "example.com",
+            "port"     => "9999",
+            "url"      => "https://jekyllrb.com/",
+            "ssl_cert" => "foo",
+            "ssl_key"  => "bar"
+          })
+
+          assert_equal 1, Jekyll.sites.count
+          assert_equal "https://example.com:9999", Jekyll.sites.first.config["url"]
+        end
+      end
+
+      context "not in development environment" do
+        should "not update the site url" do
+          expect(Jekyll).to receive(:env).and_return("production")
+          expect(Jekyll::Commands::Serve).to receive(:start_up_webrick)
+          @merc.execute(:serve, { "watch" => false, "url" => "https://jekyllrb.com/" })
+
+          assert_equal 1, Jekyll.sites.count
+          assert_equal "https://jekyllrb.com/", Jekyll.sites.first.config["url"]
+        end
+      end
+
       context "verbose" do
         should "debug when verbose" do
           assert_equal custom_opts({ "verbose" => true })[:Logger].level, 5

From e27a65d9e3ef674592e4584093f3445d2e0d8d37 Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Tue, 4 Oct 2016 19:39:41 +0100
Subject: [PATCH 1486/4996] Sanitize directory name as a key

---
 lib/jekyll/readers/data_reader.rb | 2 +-
 test/test_site.rb                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/readers/data_reader.rb b/lib/jekyll/readers/data_reader.rb
index 2047401121b..370a6893267 100644
--- a/lib/jekyll/readers/data_reader.rb
+++ b/lib/jekyll/readers/data_reader.rb
@@ -38,7 +38,7 @@ def read_data_to(dir, data)
         next if @entry_filter.symlink?(path)
 
         if File.directory?(path)
-          read_data_to(path, data[entry] = {})
+          read_data_to(path, data[sanitize_filename(entry)] = {})
         else
           key = sanitize_filename(File.basename(entry, ".*"))
           data[key] = read_data_file(path)
diff --git a/test/test_site.rb b/test/test_site.rb
index 5cd20b644ab..4f5272810df 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -446,9 +446,9 @@ def convert(*_args)
           source_dir, "_data", "categories.01", "dairy.yaml"
         ))
 
-        assert_equal site.data["categories.01"]["dairy"], file_content
+        assert_equal site.data["categories01"]["dairy"], file_content
         assert_equal(
-          site.site_payload["site"]["data"]["categories.01"]["dairy"],
+          site.site_payload["site"]["data"]["categories01"]["dairy"],
           file_content
         )
       end

From a945a658188d4cd8ac04f919ec2d0e0dc59e01e0 Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Tue, 4 Oct 2016 20:39:36 +0200
Subject: [PATCH 1487/4996] refactor to use `server_address`

---
 lib/jekyll/commands/serve.rb | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index c3b99cba9e0..d8f5890ca7e 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -104,7 +104,12 @@ def webrick_opts(opts)
         def start_up_webrick(opts, destination)
           server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
           server.mount(opts["baseurl"], Servlet, destination, file_handler_opts)
-          Jekyll.logger.info "Server address:", server_address(server, opts)
+          Jekyll.logger.info "Server address:", server_address(
+            server.config[:SSLEnable],
+            server.config[:BindAddress],
+            server.config[:Port],
+            opts["baseurl"]
+          )
           launch_browser server, opts if opts["open_url"]
           boot_or_detach server, opts
         end
@@ -124,23 +129,25 @@ def file_handler_opts
         #
 
         private
-        def server_address(server, opts)
+        def server_address(prefix, address, port, baseurl = nil)
           format("%{prefix}://%{address}:%{port}%{baseurl}", {
-            :prefix  => server.config[:SSLEnable] ? "https" : "http",
-            :baseurl => opts["baseurl"] ? "#{opts["baseurl"]}/" : "",
-            :address => server.config[:BindAddress],
-            :port    => server.config[:Port]
+            :prefix  => prefix ? "https" : "http",
+            :address => address,
+            :port    => port,
+            :baseurl => baseurl ? "#{baseurl}/" : ""
           })
         end
 
         #
 
+        private
         def default_url(opts)
           config = configuration_from_options(opts)
-          host = config["host"] == "127.0.0.1" ? "localhost" : config["host"]
-          port = config["port"]
-          protocol = config["ssl_cert"] && config["ssl_key"] ? "https" : "http"
-          "#{protocol}://#{host}:#{port}"
+          server_address(
+            config["ssl_cert"] && config["ssl_key"],
+            config["host"] == "127.0.0.1" ? "localhost" : config["host"],
+            config["port"]
+          )
         end
 
         #

From 7ea610f8c0ea1449a5071d524c12c53c46e11171 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 5 Oct 2016 09:59:02 -0700
Subject: [PATCH 1488/4996] Update history to reflect merge of #5431 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8d1acc73419..f6fbc47a1c2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Exclude node_modules by default (#5210)
   * Run hooks in priority order. (#5157)
   * Add `static_file.name` and `.basename` Liquid attributes (#5264)
+  * set site.url in dev environment to `http://localhost:4000` (#5431)
 
 ### Bug Fixes
 

From 55257d2a142b55d42ae3ebf24b05da1ab2e57af4 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 5 Oct 2016 11:34:07 -0700
Subject: [PATCH 1489/4996] Update history to reflect merge of #5256 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f6fbc47a1c2..8e9219ecae0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -31,6 +31,7 @@
   * Don't call `File.utime` for StaticFiles if it's a symlink (#5427)
   * Fix handling of non-ASCII characters in new `*_url` filters (#5410)
   * Remove autoload of Draft which no longer exists. (#5441)
+  * Fix issue where Windows drive name is stripped from Jekyll.sanitized_path incorrectly (#5256)
 
 ### Site Enhancements
 

From 38f9e93a10283b2ff4dab91d1eeab21c5d3efeb6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 5 Oct 2016 11:34:53 -0700
Subject: [PATCH 1490/4996] Update history to reflect merge of #5212 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8e9219ecae0..314b172df3d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
   * Run hooks in priority order. (#5157)
   * Add `static_file.name` and `.basename` Liquid attributes (#5264)
   * set site.url in dev environment to `http://localhost:4000` (#5431)
+  * Add support for indented link references on excerpt (#5212)
 
 ### Bug Fixes
 

From f67dfb71fe27d5f70726babaad795455cf0ade29 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 5 Oct 2016 11:40:06 -0700
Subject: [PATCH 1491/4996] Update history to reflect merge of #4873 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 314b172df3d..83bd53c9aa2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -33,6 +33,7 @@
   * Fix handling of non-ASCII characters in new `*_url` filters (#5410)
   * Remove autoload of Draft which no longer exists. (#5441)
   * Fix issue where Windows drive name is stripped from Jekyll.sanitized_path incorrectly (#5256)
+  * Fix bug where `post_url` tag matched incorrect post with subdirectory (#4873)
 
 ### Site Enhancements
 

From 6f2d1591fcfb61e27347defb7e5f3df846fe6e9c Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 5 Oct 2016 11:47:43 -0700
Subject: [PATCH 1492/4996] Release :gem: 3.3.0.pre.rc1

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

diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 7c342718e04..3e382c0160f 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.2.1".freeze
+  VERSION = "3.3.0.pre.rc1".freeze
 end

From fcef78c4b68a6b4609dabb00ef0ad2c4c1d5d2b3 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sun, 7 Aug 2016 11:54:32 -0700
Subject: [PATCH 1493/4996] Revert "templates.md: {% link %} tag only accepts
 collection documents"

This reverts commit ab4abb19332c71307a3e052746e65ff62d305b38.
---
 site/_docs/templates.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/site/_docs/templates.md b/site/_docs/templates.md
index 48d7cd7498c..f95f2ca5db1 100644
--- a/site/_docs/templates.md
+++ b/site/_docs/templates.md
@@ -510,9 +510,7 @@ numbers from the highlighted code.
 
 ### Link
 
-If you would like to include a link to a collection's document, or a post
-the `link` tag will generate the correct permalink URL for the path you
-specify.
+If you would like to include a link to a collection's document, a post, a page or a file the `link` tag will generate the correct permalink URL for the path you specify.
 
 You must include the file extension when using the `link` tag.
 
@@ -520,6 +518,8 @@ You must include the file extension when using the `link` tag.
 {% raw %}
 {% link _collection/name-of-document.md %}
 {% link _posts/2016-07-26-name-of-post.md %}
+{% link news/index.html %}
+{% link /assets/files/doc.pdf %}
 {% endraw %}
 ```
 
@@ -529,12 +529,11 @@ You can also use this tag to create a link in Markdown as follows:
 {% raw %}
 [Link to a document]({% link _collection/name-of-document.md %})
 [Link to a post]({% link _posts/2016-07-26-name-of-post.md %})
+[Link to a page]({% link news/index.html %})
+[Link to a file]({% link /assets/files/doc.pdf %})
 {% endraw %}
 ```
 
-Support for static files and pages is coming in a later release but is
-**not** released as of v3.2.1.
-
 ### Post URL
 
 If you would like to include a link to a post on your site, the `post_url` tag

From c61752a336d21de4ccae10266aae23306423d974 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Thu, 6 Oct 2016 01:17:26 +0200
Subject: [PATCH 1494/4996] Fix line length

---
 site/_docs/templates.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/site/_docs/templates.md b/site/_docs/templates.md
index f95f2ca5db1..54f914f7628 100644
--- a/site/_docs/templates.md
+++ b/site/_docs/templates.md
@@ -510,7 +510,9 @@ numbers from the highlighted code.
 
 ### Link
 
-If you would like to include a link to a collection's document, a post, a page or a file the `link` tag will generate the correct permalink URL for the path you specify.
+If you want to include a link to a collection's document, a post, a page
+or a file the `link` tag will generate the correct permalink URL for the path
+you specify.
 
 You must include the file extension when using the `link` tag.
 

From 8ec7421c0389f91219a238e4238318f58d67a941 Mon Sep 17 00:00:00 2001
From: Daniel Chapman 
Date: Thu, 6 Oct 2016 17:49:27 +0900
Subject: [PATCH 1495/4996] Update Wikipedia YAML list link

List no longer exists on that page as an id.  Basic_components holds the lists now, and at the top conveniently :v:

I also added a second link under the tags heading.
---
 site/_docs/frontmatter.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/site/_docs/frontmatter.md b/site/_docs/frontmatter.md
index 7e427552a2f..72281e265df 100644
--- a/site/_docs/frontmatter.md
+++ b/site/_docs/frontmatter.md
@@ -156,7 +156,7 @@ These are available out-of-the-box to be used in the front matter for a post.
           more categories that the post belongs to. When the site is generated
           the post will act as though it had been set with these categories
           normally. Categories (plural key) can be specified as a YAML list or a
+          href="https://en.wikipedia.org/wiki/YAML#Basic_components">YAML list or a
           comma-separated string.
 
         
    
@@ -170,7 +170,8 @@ These are available out-of-the-box to be used in the front matter for a post.
         
    
 
           Similar to categories, one or multiple tags can be added to a post.
-          Also like categories, tags can be specified as a YAML list or a
+          Also like categories, tags can be specified as a YAML list or a
           comma-separated string.
 
         
    

From 7133bddfb2d7de422f0c86c89ac293a6354b626a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 6 Oct 2016 09:11:32 -0700
Subject: [PATCH 1496/4996] Update history to reflect merge of #5452 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 83bd53c9aa2..34173a4b6ef 100644
--- a/History.markdown
+++ b/History.markdown
@@ -76,6 +76,7 @@
   * Fix Travis.ci documentation (#5413)
   * [docs] Update documentation regarding `bundle install` after `jekyll new` (#5428)
   * Replace classic box-sizing reset with inheritance reset (#5411)
+  * Update Wikipedia YAML list link (#5452)
 
 ### Development Fixes
 

From c90d44d2bea94f8f6757f3fd3263c49a1416c5a6 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 6 Oct 2016 09:36:56 -0700
Subject: [PATCH 1497/4996] Updates to 3.3.0 release post per comments.

---
 .../2016-10-03-jekyll-3-3-0-released.markdown | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown b/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown
index 932d0105204..e4afb49c59f 100644
--- a/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown
+++ b/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown
@@ -7,24 +7,26 @@ version: 3.3.0
 categories: [release]
 ---
 
-We have tons of new features for you in our latest release of Jekyll. Three
-key things you might want to give a whirl:
+There are tons of great new quality-of-life features you can use in 3.3.
+Three key things you might want to try:
 
 ### 1. Themes can now ship static & dynamic assets in an `/assets` directory
 
-We're really stoked about this one. In Jekyll 3.2, we shipped the ability
-to use a theme that was packaged as a gem. Due to security necessities and
-ease-of-use concerns, this initial ship only included support for includes,
-layouts, and sass partials. A theme couldn't write any CSS, JavaScript, or
-content to your site.
+In Jekyll 3.2, we shipped the ability to use a theme that was packaged as a
+[gem](http://guides.rubygems.org/). 3.2 included support for includes,
+layouts, and sass partials. In 3.3, we're adding assets to that list.
 
 In an effort to make theme management a bit easier, any files you put into
 `/assets` in your theme will be read in as though they were part of the
 user's site. This means you can ship SCSS and CoffeeScript, images and
-webfonts, JSON and other data. Same rules apply here as in a Jekyll site:
-if it has YAML front matter, it will be converted and renderd. No YAML
-front matter, and it will simply be copied over like a static asset. Neat,
-huh?
+webfonts, and so on -- anything you'd consider a part of the
+*presentation*. Same rules apply here as in a Jekyll site: if it has YAML
+front matter, it will be converted and rendered. No YAML front matter, and
+it will simply be copied over like a static asset.
+
+Note that if a user has a file of the same path, the theme content will not
+be included in the site, i.e. a user's `/assets/main.scss` will be written
+instead of a theme's `/assets/main.scss`. It's
 
 See our [documentation on the subject]({{ "/docs/themes/#assets" | relative_url }})
 for more info.
@@ -43,7 +45,16 @@ you pass it:
 {% endraw %}
 {% endhighlight %}
 
-A result of `relative_url` will safely always yield a link which is
+By default, `baseurl` is set to `""` and therefore yields (never set to
+`"/"`):
+
+{% highlight liquid %}
+{% raw %}
+{{ "/docs/assets/" | relative_url }} => /docs/assets
+{% endraw %}
+{% endhighlight %}
+
+A result of `relative_url` will safely always produce a URL which is
 relative to the domain root. A similar principle applies to `absolute_url`.
 It prepends your `baseurl` and `url` values, making absolute URL's all the
 easier to make:
@@ -67,8 +78,9 @@ the value of the `host`, `port`, and SSL-related options. This defaults to
 `url: http://localhost:4000`. When you are developing locally, `site.url`
 will yield `http://localhost:4000`.
 
-Note that this only applies when `JEKYLL_ENV` is equal to `development`. If
-you set `JEKYLL_ENV=production` and run `jekyll serve`, it will not
+This happens by default when running Jekyll locally. It will not be set if
+you set `JEKYLL_ENV=production` and run `jekyll serve`. If `JEKYLL_ENV` is
+any value except `development` (its default value), Jekyll will not
 overwrite the value of `url` in your config. And again, this only applies
 to serving, not to building.
 

From 6d1bc6c6ea79986a4d38ad588d632243d159ed79 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 6 Oct 2016 09:48:37 -0700
Subject: [PATCH 1498/4996] Revert Commands::Serve#server_address signature
 change.

---
 lib/jekyll/commands/serve.rb | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index d8f5890ca7e..d1b49f3df91 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -104,12 +104,7 @@ def webrick_opts(opts)
         def start_up_webrick(opts, destination)
           server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
           server.mount(opts["baseurl"], Servlet, destination, file_handler_opts)
-          Jekyll.logger.info "Server address:", server_address(
-            server.config[:SSLEnable],
-            server.config[:BindAddress],
-            server.config[:Port],
-            opts["baseurl"]
-          )
+          Jekyll.logger.info "Server address:", server_address(server, opts)
           launch_browser server, opts if opts["open_url"]
           boot_or_detach server, opts
         end
@@ -129,9 +124,19 @@ def file_handler_opts
         #
 
         private
-        def server_address(prefix, address, port, baseurl = nil)
+        def server_address(server, options = {})
+          format_url(
+            server.config[:SSLEnable],
+            server.config[:BindAddress],
+            server.config[:Port],
+            options["baseurl"],
+          )
+        end
+
+        private
+        def format_url(ssl_enabled, address, port, baseurl = nil)
           format("%{prefix}://%{address}:%{port}%{baseurl}", {
-            :prefix  => prefix ? "https" : "http",
+            :prefix  => ssl_enabled ? "https" : "http",
             :address => address,
             :port    => port,
             :baseurl => baseurl ? "#{baseurl}/" : ""
@@ -143,7 +148,7 @@ def server_address(prefix, address, port, baseurl = nil)
         private
         def default_url(opts)
           config = configuration_from_options(opts)
-          server_address(
+          format_url(
             config["ssl_cert"] && config["ssl_key"],
             config["host"] == "127.0.0.1" ? "localhost" : config["host"],
             config["port"]

From 63e4e750ec47b4dc1d6fbe717da47f354d9b56fc Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 6 Oct 2016 09:58:16 -0700
Subject: [PATCH 1499/4996] New site: lock minima to v2.x

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

diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index 0a0c8b53c2e..8319bd7efff 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -74,7 +74,7 @@ def gemfile_contents
 gem "jekyll", "#{Jekyll::VERSION}"
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
-gem "minima"
+gem "minima", "~> 2.0"
 
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
 # uncomment the line below. To upgrade, run `bundle update github-pages`.

From 7c8c825f27fd96b223e32855520ba4fa0c6d3588 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 6 Oct 2016 10:01:55 -0700
Subject: [PATCH 1500/4996] Fix.

---
 site/_posts/2016-10-03-jekyll-3-3-0-released.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown b/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown
index e4afb49c59f..af3948d349e 100644
--- a/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown
+++ b/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown
@@ -25,8 +25,8 @@ front matter, it will be converted and rendered. No YAML front matter, and
 it will simply be copied over like a static asset.
 
 Note that if a user has a file of the same path, the theme content will not
-be included in the site, i.e. a user's `/assets/main.scss` will be written
-instead of a theme's `/assets/main.scss`. It's
+be included in the site, i.e. a user's `/assets/main.scss` will be read and
+processed if present instead of a theme's `/assets/main.scss`.
 
 See our [documentation on the subject]({{ "/docs/themes/#assets" | relative_url }})
 for more info.

From ed042de6c4b989a72edc3216d46a975a372d6a17 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 6 Oct 2016 10:15:45 -0700
Subject: [PATCH 1501/4996] Oh fine, rubocop.

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

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index d1b49f3df91..e0da4807915 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -129,7 +129,7 @@ def server_address(server, options = {})
             server.config[:SSLEnable],
             server.config[:BindAddress],
             server.config[:Port],
-            options["baseurl"],
+            options["baseurl"]
           )
         end
 

From b37d18234a1d60af5ce76b4af2ca631dfc701ca0 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 6 Oct 2016 10:22:23 -0700
Subject: [PATCH 1502/4996] Update history to reflect merge of #5433 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 34173a4b6ef..6ccc6d57fdb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -34,6 +34,7 @@
   * Remove autoload of Draft which no longer exists. (#5441)
   * Fix issue where Windows drive name is stripped from Jekyll.sanitized_path incorrectly (#5256)
   * Fix bug where `post_url` tag matched incorrect post with subdirectory (#4873)
+  * Fix loading data from subdir with a period in name (#5433)
 
 ### Site Enhancements
 

From dc554c2cd58547fb6f5ed745fc7c6dcd5f78cfbb Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 6 Oct 2016 10:36:50 -0700
Subject: [PATCH 1503/4996] Update history to reflect merge of #5456 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6ccc6d57fdb..4fac6ddb705 100644
--- a/History.markdown
+++ b/History.markdown
@@ -35,6 +35,7 @@
   * Fix issue where Windows drive name is stripped from Jekyll.sanitized_path incorrectly (#5256)
   * Fix bug where `post_url` tag matched incorrect post with subdirectory (#4873)
   * Fix loading data from subdir with a period in name (#5433)
+  * Revert Commands::Serve#server_address signature change. (#5456)
 
 ### Site Enhancements
 

From 8bac0559d12796e1372c0414b17c03156d14512e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 6 Oct 2016 10:41:24 -0700
Subject: [PATCH 1504/4996] Update history to reflect merge of #5442 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4fac6ddb705..cf7e50a60a5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -79,6 +79,7 @@
   * [docs] Update documentation regarding `bundle install` after `jekyll new` (#5428)
   * Replace classic box-sizing reset with inheritance reset (#5411)
   * Update Wikipedia YAML list link (#5452)
+  * Add Jekyll 3.3 release post (#5442)
 
 ### Development Fixes
 

From 5e93ca63538c2bb98d35c9e3f3996b6e8fe079b7 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 6 Oct 2016 11:12:15 -0700
Subject: [PATCH 1505/4996] Release :gem: 3.3.0

---
 History.markdown                              |   2 +-
 lib/jekyll/version.rb                         |   2 +-
 site/_docs/history.md                         | 108 ++++++++++++++++++
 ...kdown => 2016-10-06-jekyll-3-3-is-here.md} |  12 +-
 site/latest_version.txt                       |   2 +-
 5 files changed, 121 insertions(+), 5 deletions(-)
 rename site/_posts/{2016-10-03-jekyll-3-3-0-released.markdown => 2016-10-06-jekyll-3-3-is-here.md} (85%)

diff --git a/History.markdown b/History.markdown
index cf7e50a60a5..7b30bd4d239 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,4 +1,4 @@
-## HEAD
+## 3.3.0 / 2016-10-06
 
 ### Minor Enhancements
 
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 3e382c0160f..848b513b738 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.3.0.pre.rc1".freeze
+  VERSION = "3.3.0".freeze
 end
diff --git a/site/_docs/history.md b/site/_docs/history.md
index f17b535e374..b272bd53de8 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -5,6 +5,114 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.3.0 / 2016-10-06
+{: #v3-3-0}
+
+### Minor Enhancements
+{: #minor-enhancements-v3-3-0}
+
+- Colorize interpolated output in logger.info ([#5239]({{ site.repository }}/issues/5239))
+- Site template: exclude Gemfile and Gemfile.lock in site config ([#5293]({{ site.repository }}/issues/5293))
+- Fix [#5233]({{ site.repository }}/issues/5233): Increase our ability to detect Windows. ([#5235]({{ site.repository }}/issues/5235))
+- update gitignore template to ignore theme gems built by user ([#5326]({{ site.repository }}/issues/5326))
+- Adds ability to link to all files ([#5199]({{ site.repository }}/issues/5199))
+- Exclude vendor by default ([#5361]({{ site.repository }}/issues/5361))
+- Add ThemeAssetsReader which reads assets from a theme ([#5364]({{ site.repository }}/issues/5364))
+- Add bundle install to jekyll new command ([#5237]({{ site.repository }}/issues/5237))
+- Add absolute_url and relative_url filters. ([#5399]({{ site.repository }}/issues/5399))
+- Site template: remove `css/` from new site scaffolding ([#5402]({{ site.repository }}/issues/5402))
+- Site template: Move contents of the index.html page to the 'home' layout ([#5420]({{ site.repository }}/issues/5420))
+- Exclude node_modules by default ([#5210]({{ site.repository }}/issues/5210))
+- Run hooks in priority order. ([#5157]({{ site.repository }}/issues/5157))
+- Add `static_file.name` and `.basename` Liquid attributes ([#5264]({{ site.repository }}/issues/5264))
+- set site.url in dev environment to `http://localhost:4000` ([#5431]({{ site.repository }}/issues/5431))
+- Add support for indented link references on excerpt ([#5212]({{ site.repository }}/issues/5212))
+
+### Bug Fixes
+{: #bug-fixes-v3-3-0}
+
+- Use jekyll-feed to generate the default site's RSS feed ([#5196]({{ site.repository }}/issues/5196))
+- Site#configure_theme: do not set theme unless it's a string ([#5189]({{ site.repository }}/issues/5189))
+- Convertible: set self.output in #render_all_layouts and #do_layout ([#5337]({{ site.repository }}/issues/5337))
+- Only complain about `kramdown.coderay` if it is actually in the config ([#5380]({{ site.repository }}/issues/5380))
+- Clarify documentation in theme gem's README template ([#5376]({{ site.repository }}/issues/5376))
+- Allow underscore in highlighter language ([#5375]({{ site.repository }}/issues/5375))
+- Site template: set empty url in config file by default ([#5338]({{ site.repository }}/issues/5338))
+- Site template config: prepend 'jekyll serve' with 'bundle exec' ([#5430]({{ site.repository }}/issues/5430))
+- Don't call `File.utime` for StaticFiles if it's a symlink ([#5427]({{ site.repository }}/issues/5427))
+- Fix handling of non-ASCII characters in new `*_url` filters ([#5410]({{ site.repository }}/issues/5410))
+- Remove autoload of Draft which no longer exists. ([#5441]({{ site.repository }}/issues/5441))
+- Fix issue where Windows drive name is stripped from Jekyll.sanitized_path incorrectly ([#5256]({{ site.repository }}/issues/5256))
+- Fix bug where `post_url` tag matched incorrect post with subdirectory ([#4873]({{ site.repository }}/issues/4873))
+- Fix loading data from subdir with a period in name ([#5433]({{ site.repository }}/issues/5433))
+- Revert Commands::Serve#server_address signature change. ([#5456]({{ site.repository }}/issues/5456))
+
+### Site Enhancements
+{: #site-enhancements-v3-3-0}
+
+- Document `to_integer` and `inspect` filters ([#5185]({{ site.repository }}/issues/5185))
+- Fix path in the prompt ([#5194]({{ site.repository }}/issues/5194))
+- need subcommand build ([#5190]({{ site.repository }}/issues/5190))
+- Add the Jekyll Cloudinary plugin ([#5183]({{ site.repository }}/issues/5183))
+- Documentation : `new-theme` command ([#5205]({{ site.repository }}/issues/5205))
+- Document `link` Liquid tag ([#5182]({{ site.repository }}/issues/5182))
+- Remove mention of page for link tag in release post ([#5214]({{ site.repository }}/issues/5214))
+- fixed typo ([#5226]({{ site.repository }}/issues/5226))
+- Add missing comma ([#5222]({{ site.repository }}/issues/5222))
+- Maintain aspect ratio with `height: auto;` ([#5254]({{ site.repository }}/issues/5254))
+- Fix a link in deployment-methods.md ([#5244]({{ site.repository }}/issues/5244))
+- Documentation: improve highlight in `Creating a theme` ([#5249]({{ site.repository }}/issues/5249))
+- Bundler isn't installed by default ([#5258]({{ site.repository }}/issues/5258))
+- Update troubleshooting documentation to include fix for issue with vendored gems ([#5271]({{ site.repository }}/issues/5271))
+- Link `--lsi` option's description to Wikipedia docs on LSI ([#5274]({{ site.repository }}/issues/5274))
+- Document `--profile` option on the configuration page ([#5279]({{ site.repository }}/issues/5279))
+- Update homepage to sync with merge of [#5258]({{ site.repository }}/issues/5258) ([#5287]({{ site.repository }}/issues/5287))
+- Add post about Jekyll Admin initial release ([#5291]({{ site.repository }}/issues/5291))
+- Replace liquid highlight tag with backticks ([#5262]({{ site.repository }}/issues/5262))
+- Word update ([#5294]({{ site.repository }}/issues/5294))
+- Site documentation section links always point to https://jekyllrb.com ([#5281]({{ site.repository }}/issues/5281))
+- Missing `:site, :post_render` payload documentation on site ([#5280]({{ site.repository }}/issues/5280))
+- Site: exclude README.md and .gitignore ([#5304]({{ site.repository }}/issues/5304))
+- Add link to Staticman ([#5224]({{ site.repository }}/issues/5224))
+- Update url for OpenShift ([#5320]({{ site.repository }}/issues/5320))
+- [docs] add help for missing static_file e.g. on heroku ([#5334]({{ site.repository }}/issues/5334))
+- Add a line about updating theme-gems in the docs ([#5318]({{ site.repository }}/issues/5318))
+- Explain how to copy a theme's files ([#5335]({{ site.repository }}/issues/5335))
+- [docs] .md as default extension in examples ([#5316]({{ site.repository }}/issues/5316))
+- Fix small typo in docs ([#5347]({{ site.repository }}/issues/5347))
+- Add missing period to sentence in first paragraph. ([#5372]({{ site.repository }}/issues/5372))
+- added jekyll-spotify plugin ([#5369]({{ site.repository }}/issues/5369))
+- Add jekyll-menus to the list of plugins. ([#5397]({{ site.repository }}/issues/5397))
+- macOS and one grammar fix ([#5403]({{ site.repository }}/issues/5403))
+- Add documentation for `relative_url` and `absolute_url` ([#5405]({{ site.repository }}/issues/5405))
+- Bugfix on logo in JSON-LD ([#5421]({{ site.repository }}/issues/5421))
+- Fix Travis.ci documentation ([#5413]({{ site.repository }}/issues/5413))
+- [docs] Update documentation regarding `bundle install` after `jekyll new` ([#5428]({{ site.repository }}/issues/5428))
+- Replace classic box-sizing reset with inheritance reset ([#5411]({{ site.repository }}/issues/5411))
+- Update Wikipedia YAML list link ([#5452]({{ site.repository }}/issues/5452))
+- Add Jekyll 3.3 release post ([#5442]({{ site.repository }}/issues/5442))
+
+### Development Fixes
+{: #development-fixes-v3-3-0}
+
+- Update appveyor.yml and fix optional deps for Ruby x64 ([#5180]({{ site.repository }}/issues/5180))
+- Improve tests for Jekyll::PluginManager ([#5167]({{ site.repository }}/issues/5167))
+- Update Ruby versions in travis.yml ([#5221]({{ site.repository }}/issues/5221))
+- Avoid installing unecessary gems for site testing ([#5272]({{ site.repository }}/issues/5272))
+- Proposal: Affinity teams and their captains ([#5273]({{ site.repository }}/issues/5273))
+- Replace duplicate with postive local test in issue template ([#5286]({{ site.repository }}/issues/5286))
+- Update AppVeyor config. ([#5240]({{ site.repository }}/issues/5240))
+- Execute jekyll from clone instead of defined binary when running 'script/default-site' ([#5295]({{ site.repository }}/issues/5295))
+- rubocop: lib/jekyll/document.rb complexity fixes ([#5045]({{ site.repository }}/issues/5045))
+- Proxy a number of Convertible methods to Renderer ([#5308]({{ site.repository }}/issues/5308))
+- Run executable for Cucumber via Ruby instead of Shell ([#5383]({{ site.repository }}/issues/5383))
+- Appease Rubocop ([#5381]({{ site.repository }}/issues/5381))
+- remove features' directories on windows with proper access ([#5389]({{ site.repository }}/issues/5389))
+- `site_configuration.feature`: use UTC format in timezone ([#5416]({{ site.repository }}/issues/5416))
+- swallow bundle output from `jekyll new` while in CI ([#5408]({{ site.repository }}/issues/5408))
+- Add .editorconfig ([#5412]({{ site.repository }}/issues/5412))
+
+
 ## 3.2.1 / 2016-08-02
 {: #v3-2-1}
 
diff --git a/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown b/site/_posts/2016-10-06-jekyll-3-3-is-here.md
similarity index 85%
rename from site/_posts/2016-10-03-jekyll-3-3-0-released.markdown
rename to site/_posts/2016-10-06-jekyll-3-3-is-here.md
index af3948d349e..93f366f1728 100644
--- a/site/_posts/2016-10-03-jekyll-3-3-0-released.markdown
+++ b/site/_posts/2016-10-06-jekyll-3-3-is-here.md
@@ -1,7 +1,7 @@
 ---
 layout: news_item
 title: 'Jekyll 3.3 is here with better theme support, new URL filters, and tons more'
-date: 2016-10-03 17:08:38 -0700
+date: 2016-10-06 11:10:38 -0700
 author: parkr
 version: 3.3.0
 categories: [release]
@@ -93,7 +93,15 @@ greater stability and reliability to your everyday development workflow.
 As always, thanks to our many contributors who contributed countless hours
 of their free time to making this release happen:
 
-!! TODO: Add list of contributors for this release!
+Anatoliy Yastreb, Anthony Gaudino, Antonio, Ashwin Maroli, Ben Balter,
+Charles Horn, Chris Finazzo, Daniel Chapman, David Zhang, Eduardo
+Bouças, Edward Thomson, Eloy Espinaco, Florian Thomas, Frank Taillandier,
+Gerardo, Heng Kwokfu, Heng, K. (Stephen), Jeff Kolesky, Jonathan Thornton,
+Jordon Bedwell, Jussi Kinnula, Júnior Messias, Kyle O'Brien, Manmeet Gill,
+Mark H. Wilkinson, Marko Locher, Mertcan GÖKGÖZ, Michal Švácha, Mike
+Kasberg, Nadjib Amar, Nicolas Hoizey, Nicolas Porcel, Parker Moore, Pat
+Hawks, Patrick Marsceill, Stephen Checkoway, Stuart Kent, XhmikosR, Zlatan
+Vasović, mertkahyaoglu, shingo-nakanishi, and vohedge.
 
 [Full release notes]({{ "/docs/history/#v3-3-0" | relative_url }}) are available
 for your perusal. If you notice any issues, please don't hesitate to file a
diff --git a/site/latest_version.txt b/site/latest_version.txt
index e4604e3afd0..15a27998172 100644
--- a/site/latest_version.txt
+++ b/site/latest_version.txt
@@ -1 +1 @@
-3.2.1
+3.3.0

From 08b30056b74c242e60ee52ffe5ed1e6c2139c827 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 6 Oct 2016 23:42:16 +0530
Subject: [PATCH 1506/4996] replace development_dependency with
 runtime_dependency

---
 lib/theme_template/theme.gemspec.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/theme_template/theme.gemspec.erb b/lib/theme_template/theme.gemspec.erb
index d0714ffce15..44c8feba61a 100644
--- a/lib/theme_template/theme.gemspec.erb
+++ b/lib/theme_template/theme.gemspec.erb
@@ -12,7 +12,8 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(<%= theme_directories.join("|") %>|LICENSE|README)}i) }
 
-  spec.add_development_dependency "jekyll", "~> <%= jekyll_version_with_minor %>"
+  spec.add_runtime_dependency "jekyll", "~> <%= jekyll_version_with_minor %>"
+
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
 end

From 53d472b7e297f2e5267aebbd3e160cd9e88c82bd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 6 Oct 2016 11:45:20 -0700
Subject: [PATCH 1507/4996] Update history to reflect merge of #5449 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7b30bd4d239..2cf97efdd7a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,3 +1,9 @@
+## HEAD
+
+### Site Enhancements
+
+  * Documentation: {% link %} tag  (#5449)
+
 ## 3.3.0 / 2016-10-06
 
 ### Minor Enhancements

From 884962c20eb3d3de6b239a3a67cd3cb2876da21e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= 
Date: Fri, 7 Oct 2016 19:54:40 +0200
Subject: [PATCH 1508/4996] Fix broken forum link

help.jekyllrb.com has been replaced with talk.jekyllrb.com :boom:
---
 docs/becoming-a-maintainer.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/becoming-a-maintainer.md b/docs/becoming-a-maintainer.md
index 28f1f70b5f8..f6473787294 100644
--- a/docs/becoming-a-maintainer.md
+++ b/docs/becoming-a-maintainer.md
@@ -32,4 +32,4 @@ We would love to expand the team and look forward to many more community members
 
 # Helping Out Elsewhere
 
-In addition to maintainers of our core and plugin code, the Jekyll team is comprised of moderators for our forums. These helpful community members take a look at the topics posted to https://help.jekyllrb.com and ensure they are properly categorized and are acceptable under our Code of Conduct. If you would like to be a moderator, email one of the maintainers with links to where you have answered questions and a request to be added as a moderator. More help is always welcome.
+In addition to maintainers of our core and plugin code, the Jekyll team is comprised of moderators for our forums. These helpful community members take a look at the topics posted to https://talk.jekyllrb.com and ensure they are properly categorized and are acceptable under our Code of Conduct. If you would like to be a moderator, email one of the maintainers with links to where you have answered questions and a request to be added as a moderator. More help is always welcome.

From c569edcf0a87626bb8815b0cc78bc713ad961d9b Mon Sep 17 00:00:00 2001
From: chrisfinazzo 
Date: Sun, 9 Oct 2016 11:36:04 -0400
Subject: [PATCH 1509/4996] Update normalize.css to v5.0.0

---
 site/_sass/_normalize.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_sass/_normalize.scss b/site/_sass/_normalize.scss
index 8d46a8ee270..b1f94f9db46 100644
--- a/site/_sass/_normalize.scss
+++ b/site/_sass/_normalize.scss
@@ -1 +1 @@
-/*! normalize.css v4.2.0 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block}audio:not([controls]){display:none;height:0}progress{vertical-align:baseline}template,[hidden]{display:none}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit}b,strong{font-weight:bolder}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-0.25em}sup{top:-0.5em}img{border-style:none}svg:not(:root){overflow:hidden}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}button,input,optgroup,select,textarea{font:inherit;margin:0}optgroup{font-weight:bold}button,input{overflow:visible}button,select{text-transform:none}button,html [type="button"],[type="reset"],[type="submit"]{-webkit-appearance:button}button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{border-style:none;padding:0}button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{outline:1px dotted ButtonText}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}textarea{overflow:auto}[type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto}[type="search"]{-webkit-appearance:textfield;outline-offset:-2px}[type="search"]::-webkit-search-cancel-button,[type="search"]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-input-placeholder{color:inherit;opacity:0.54}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}
+/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,footer,header,nav,section{display:block}h1{font-size:2em;margin:0.67em 0}figcaption,figure,main{display:block}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace, monospace;font-size:1em}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace, monospace;font-size:1em}dfn{font-style:italic}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-0.25em}sup{top:-0.5em}audio,video{display:inline-block}audio:not([controls]){display:none;height:0}img{border-style:none}svg:not(:root){overflow:hidden}button,input,optgroup,select,textarea{font-family:sans-serif;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}button,html [type="button"],[type="reset"],[type="submit"]{-webkit-appearance:button}button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{border-style:none;padding:0}button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{outline:1px dotted ButtonText}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{display:inline-block;vertical-align:baseline}textarea{overflow:auto}[type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto}[type="search"]{-webkit-appearance:textfield;outline-offset:-2px}[type="search"]::-webkit-search-cancel-button,[type="search"]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details,menu{display:block}summary{display:list-item}canvas{display:inline-block}template{display:none}[hidden]{display:none}

From f2fcd176270e35dbddbc92a0e05e5f5ba841bfcb Mon Sep 17 00:00:00 2001
From: Michael Large 
Date: Mon, 10 Oct 2016 11:10:41 -0400
Subject: [PATCH 1510/4996] Fix typo in theme_template README

---
 lib/theme_template/README.md.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/theme_template/README.md.erb b/lib/theme_template/README.md.erb
index 71cf29d393c..dbcb9cdaa43 100644
--- a/lib/theme_template/README.md.erb
+++ b/lib/theme_template/README.md.erb
@@ -38,7 +38,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 
 To set up your environment to develop this theme, run `bundle install`.
 
-You theme is setup just like a normal Jelyll site! To test your theme, run `bundle exec jekyll serve` and open your browser at `http://localhost:4000`. This starts a Jekyll server using your theme. Add pages, documents, data, etc. like normal to test your theme's contents. As you make modifications to your theme and to your content, your site will regenerate and you should see the changes in the browser after a refresh, just like normal.
+You theme is setup just like a normal Jekyll site! To test your theme, run `bundle exec jekyll serve` and open your browser at `http://localhost:4000`. This starts a Jekyll server using your theme. Add pages, documents, data, etc. like normal to test your theme's contents. As you make modifications to your theme and to your content, your site will regenerate and you should see the changes in the browser after a refresh, just like normal.
 
 When your theme is released, only the files in `_layouts`, `_includes`, and `_sass` tracked with Git will be released.
 

From 6cec4aebc6ad485040a4ec731733942781e1acdc Mon Sep 17 00:00:00 2001
From: Michael Large 
Date: Tue, 11 Oct 2016 09:05:39 -0400
Subject: [PATCH 1511/4996] Additional typo related to pull request #5472

---
 lib/theme_template/README.md.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/theme_template/README.md.erb b/lib/theme_template/README.md.erb
index dbcb9cdaa43..5c86314426e 100644
--- a/lib/theme_template/README.md.erb
+++ b/lib/theme_template/README.md.erb
@@ -38,7 +38,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 
 To set up your environment to develop this theme, run `bundle install`.
 
-You theme is setup just like a normal Jekyll site! To test your theme, run `bundle exec jekyll serve` and open your browser at `http://localhost:4000`. This starts a Jekyll server using your theme. Add pages, documents, data, etc. like normal to test your theme's contents. As you make modifications to your theme and to your content, your site will regenerate and you should see the changes in the browser after a refresh, just like normal.
+Your theme is setup just like a normal Jekyll site! To test your theme, run `bundle exec jekyll serve` and open your browser at `http://localhost:4000`. This starts a Jekyll server using your theme. Add pages, documents, data, etc. like normal to test your theme's contents. As you make modifications to your theme and to your content, your site will regenerate and you should see the changes in the browser after a refresh, just like normal.
 
 When your theme is released, only the files in `_layouts`, `_includes`, and `_sass` tracked with Git will be released.
 

From d4b7b4432874aedd15039d862258227a12654425 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 11 Oct 2016 08:46:53 -0700
Subject: [PATCH 1512/4996] Update history to reflect merge of #5475 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2cf97efdd7a..a0ccb2e0814 100644
--- a/History.markdown
+++ b/History.markdown
@@ -3,6 +3,7 @@
 ### Site Enhancements
 
   * Documentation: {% link %} tag  (#5449)
+  * Updating install instruction link for Jekyll 3 on Windows (#5475)
 
 ## 3.3.0 / 2016-10-06
 

From 0d12a02893baad606b89c426973db640de7ab83a Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 12 Oct 2016 14:35:39 +0530
Subject: [PATCH 1513/4996] script/test: add missing whitespace

---
 script/test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/test b/script/test
index 133b9807657..09f7eaa66c4 100755
--- a/script/test
+++ b/script/test
@@ -50,7 +50,7 @@ for ruby in $rubies; do
       rake TESTOPTS=$testopts test
    else
     set -x
-    time $ruby -S bundle exec ruby -Itest \
+    time $ruby -S bundle exec ruby -I test \
       "$@" $testops
   fi
 done

From aa97be3ab5f66fde36e2019f0167ef9d02e9e736 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 12 Oct 2016 15:34:51 -0700
Subject: [PATCH 1514/4996] Update history to reflect merge of #5471 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a0ccb2e0814..0f3d92f0638 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,7 @@
 
   * Documentation: {% link %} tag  (#5449)
   * Updating install instruction link for Jekyll 3 on Windows (#5475)
+  * Update normalize.css to v5.0.0 (#5471)
 
 ## 3.3.0 / 2016-10-06
 

From c9d24b7d188f4547d3ab386cbd483a4628998fd6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 12 Oct 2016 17:53:51 -0700
Subject: [PATCH 1515/4996] Update history to reflect merge of #5472 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0f3d92f0638..067f4c3d731 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,10 @@
   * Updating install instruction link for Jekyll 3 on Windows (#5475)
   * Update normalize.css to v5.0.0 (#5471)
 
+### Bug Fixes
+
+  * Fix typo in theme_template README (#5472)
+
 ## 3.3.0 / 2016-10-06
 
 ### Minor Enhancements

From d1f67bf85ad2302cc4f750f2ba260f0047eae462 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 17 Oct 2016 08:56:04 +0530
Subject: [PATCH 1516/4996] fix rubocop errors on testing with Rubocop 0.44

  - have the new `Metrics/BlockLength` cop ignore test files and
    `jekyll/configuration.rb`
  - have `AllCops` ignore Jekyll Executable which is not going to be
    altered in the near future.
---
 .rubocop.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index b0fef47a254..0324c4121b8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -6,6 +6,7 @@ AllCops:
   Exclude:
     - lib/jekyll/renderer.rb
     - bin/**/*
+    - exe/**/*
     - benchmark/**/*
     - script/**/*
     - vendor/**/*
@@ -17,6 +18,10 @@ Lint/UselessAccessModifier:
   Enabled: false
 Metrics/AbcSize:
   Max: 21
+Metrics/BlockLength:
+  Exclude:
+    - test/**/*.rb
+    - lib/jekyll/configuration.rb
 Metrics/ClassLength:
   Exclude:
     - !ruby/regexp /features\/.*.rb$/

From 6ec86f42078afd07b739670e8d773b61ff840476 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Tue, 18 Oct 2016 16:20:41 +0530
Subject: [PATCH 1517/4996] Add jekyll-data to the list of plugins

---
 site/_docs/plugins.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index f8909ddbeb0..58d61a49e43 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -912,6 +912,7 @@ LESS.js files during generation.
 - [generator-jekyllized](https://github.com/sondr3/generator-jekyllized): A Yeoman generator for rapidly developing sites with Gulp. Live reload your site, automatically minify and optimize your assets and much more.
 - [Jekyll-Spotify](https://github.com/MertcanGokgoz/Jekyll-Spotify): Easily output Spotify Embed Player for jekyll
 - [jekyll-menus](https://github.com/forestryio/jekyll-menus): Hugo style menus for your Jekyll site... recursive menus included.
+- [jekyll-data](https://github.com/ashmaroli/jekyll-data): Read data files within Jekyll Theme Gems.
 
 #### Editors
 

From 1f9c2b138040512d6385fc4f3252038dfde58e64 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 18 Oct 2016 09:49:12 -0700
Subject: [PATCH 1518/4996] Update history to reflect merge of #5491 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 067f4c3d731..885b2589b98 100644
--- a/History.markdown
+++ b/History.markdown
@@ -5,6 +5,7 @@
   * Documentation: {% link %} tag  (#5449)
   * Updating install instruction link for Jekyll 3 on Windows (#5475)
   * Update normalize.css to v5.0.0 (#5471)
+  * Add jekyll-data to the list of plugins (#5491)
 
 ### Bug Fixes
 

From 0a1c837755a437ce1683139bc784e90fc172af23 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 18 Oct 2016 09:50:50 -0700
Subject: [PATCH 1519/4996] Update history to reflect merge of #5489 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 885b2589b98..2ed9d98a75e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,10 @@
 
   * Fix typo in theme_template README (#5472)
 
+### Development Fixes
+
+  * fix rubocop errors on testing with Rubocop 0.44 (#5489)
+
 ## 3.3.0 / 2016-10-06
 
 ### Minor Enhancements

From 00e3c979c92a684b00bbd126dbf6141dd856e0b5 Mon Sep 17 00:00:00 2001
From: Tan Nhu 
Date: Tue, 18 Oct 2016 09:51:16 -0700
Subject: [PATCH 1520/4996] Add jekyll-include-absolute-plugin

---
 site/_docs/plugins.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 58d61a49e43..70d06f24d15 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -866,6 +866,7 @@ LESS.js files during generation.
 - [Jekyll Tags List Plugin](https://github.com/crispgm/jekyll-tags-list-plugin): A Liquid tag plugin that creates tags list in specific order.
 - [Jekyll Maps](https://github.com/ayastreb/jekyll-maps) by [Anatoliy Yastreb](https://github.com/ayastreb): A Jekyll plugin to easily embed maps with filterable locations.
 - [Jekyll Cloudinary](https://nhoizey.github.io/jekyll-cloudinary/) by [Nicolas Hoizey](https://nicolas-hoizey.com/): a Jekyll plugin adding a Liquid tag to ease the use of Cloudinary for responsive images in your Markdown/Kramdown posts.
+- [jekyll-include-absolute-plugin](https://github.com/tnhu/jekyll-include-absolute-plugin) by [Tan Nhu](https://github.com/tnhu): A Jekyll to include a file from its path relate to Jekyll's source folder.
 
 #### Collections
 

From 53d20bc77ef3a64bd6045268416c93e1e6e4df5d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 18 Oct 2016 09:51:45 -0700
Subject: [PATCH 1521/4996] Update history to reflect merge of #5479 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2ed9d98a75e..d096ad54455 100644
--- a/History.markdown
+++ b/History.markdown
@@ -14,6 +14,7 @@
 ### Development Fixes
 
   * fix rubocop errors on testing with Rubocop 0.44 (#5489)
+  * script/test: add missing whitespace (#5479)
 
 ## 3.3.0 / 2016-10-06
 

From b9275920ddef681c652c89c11c1aa6e09571f133 Mon Sep 17 00:00:00 2001
From: Tan Nhu 
Date: Tue, 18 Oct 2016 09:52:57 -0700
Subject: [PATCH 1522/4996] Update jekyll-include-absolute-plugin description

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

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 70d06f24d15..85d193ec4e1 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -866,7 +866,7 @@ LESS.js files during generation.
 - [Jekyll Tags List Plugin](https://github.com/crispgm/jekyll-tags-list-plugin): A Liquid tag plugin that creates tags list in specific order.
 - [Jekyll Maps](https://github.com/ayastreb/jekyll-maps) by [Anatoliy Yastreb](https://github.com/ayastreb): A Jekyll plugin to easily embed maps with filterable locations.
 - [Jekyll Cloudinary](https://nhoizey.github.io/jekyll-cloudinary/) by [Nicolas Hoizey](https://nicolas-hoizey.com/): a Jekyll plugin adding a Liquid tag to ease the use of Cloudinary for responsive images in your Markdown/Kramdown posts.
-- [jekyll-include-absolute-plugin](https://github.com/tnhu/jekyll-include-absolute-plugin) by [Tan Nhu](https://github.com/tnhu): A Jekyll to include a file from its path relate to Jekyll's source folder.
+- [jekyll-include-absolute-plugin](https://github.com/tnhu/jekyll-include-absolute-plugin) by [Tan Nhu](https://github.com/tnhu): A Jekyll plugin to include a file from its path relate to Jekyll's source folder.
 
 #### Collections
 

From c4a23b4ced7341f83b0bd9b4915d6f860d583cc5 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Tue, 18 Oct 2016 18:53:54 -0500
Subject: [PATCH 1523/4996] Collapse gsub

---
 lib/jekyll/frontmatter_defaults.rb | 2 +-
 lib/jekyll/readers/data_reader.rb  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb
index 0614975ab00..7cbfa358677 100644
--- a/lib/jekyll/frontmatter_defaults.rb
+++ b/lib/jekyll/frontmatter_defaults.rb
@@ -188,7 +188,7 @@ def sanitize_path(path)
       if path.nil? || path.empty?
         ""
       else
-        path.gsub(%r!\A/!, "").gsub(%r!([^/])\z!, '\1')
+        path.gsub(%r!\A/|(?<=[^/])\z!, "".freeze)
       end
     end
   end
diff --git a/lib/jekyll/readers/data_reader.rb b/lib/jekyll/readers/data_reader.rb
index 370a6893267..0afbad61274 100644
--- a/lib/jekyll/readers/data_reader.rb
+++ b/lib/jekyll/readers/data_reader.rb
@@ -62,8 +62,7 @@ def read_data_file(path)
     end
 
     def sanitize_filename(name)
-      name.gsub!(%r![^\w\s-]+!, "")
-      name.gsub!(%r!(^|\b\s)\s+($|\s?\b)!, '\\1\\2')
+      name.gsub!(%r![^\w\s-]+|(?<=^|\b\s)\s+(?=$|\s?\b)!, "".freeze)
       name.gsub(%r!\s+!, "_")
     end
   end

From 51d9be83a10a976499c42339310e519855f684e4 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Tue, 18 Oct 2016 19:45:03 -0500
Subject: [PATCH 1524/4996] Do not swallow all exceptions on render

---
 lib/jekyll/site.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 661365416d9..7f6531bca0f 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -191,11 +191,7 @@ def render
       render_pages(payload)
 
       Jekyll::Hooks.trigger :site, :post_render, self, payload
-    # rubocop: disable HandleExceptions
-    rescue Errno::ENOENT
-      # ignore missing layout dir
     end
-    # rubocop: enable HandleExceptions
 
     # Remove orphaned files and empty directories in destination.
     #

From cc1972848d97d5a409d48cc3606e8659f720cd8f Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Tue, 18 Oct 2016 19:51:54 -0500
Subject: [PATCH 1525/4996] Restrict Rubocop version

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index f1a4afb7682..464ab468f69 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ end
 #
 
 group :test do
-  gem "rubocop"
+  gem "rubocop", "~> 0.44.1"
   gem "cucumber", "~> 2.1"
   gem "jekyll_test_plugin"
   gem "jekyll_test_plugin_malicious"

From 8a4edc550bb02c973fc87b09f92ef80201295594 Mon Sep 17 00:00:00 2001
From: Scott King 
Date: Tue, 18 Oct 2016 21:07:58 -0400
Subject: [PATCH 1526/4996] Add info about checking version + updating

---
 site/_docs/installation.md | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/site/_docs/installation.md b/site/_docs/installation.md
index 676bccb4814..b8b8eeef393 100644
--- a/site/_docs/installation.md
+++ b/site/_docs/installation.md
@@ -103,4 +103,25 @@ Check out [the extras page](../extras/) for more information.
   
    
 
    
 
-Now that you’ve got everything installed, let’s get to work!
+## Already Have Jekyll?
+
+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
+```
+
+You can always use RubyGems to find the current stable version of the Jekyll gem. But you can also use the `gem` command line tool:
+
+```sh
+$ gem search jekyll --remote
+```
+
+and you'll search for just the name `Jekyll`, and in brackets will be latest version. If you aren't running the latest version, run the update command:
+
+```sh
+$ gem update jekyll
+```
+
+Now that you’ve got everything up-to-date and installed, let’s get to work!

From e6829b594984d4a2e744d6d09fbd8e63024f88dc Mon Sep 17 00:00:00 2001
From: Scott King 
Date: Tue, 18 Oct 2016 21:15:50 -0400
Subject: [PATCH 1527/4996] Fix some typos

---
 site/_docs/installation.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/_docs/installation.md b/site/_docs/installation.md
index b8b8eeef393..5c618a874b9 100644
--- a/site/_docs/installation.md
+++ b/site/_docs/installation.md
@@ -112,13 +112,13 @@ $ jekyll --version
 $ gem list jekyll
 ```
 
-You can always use RubyGems to find the current stable version of the Jekyll gem. But you can also use the `gem` command line tool:
+You can also use RubyGems to find the current versioning of any gem. But you can also use the `gem` command line tool:
 
 ```sh
 $ gem search jekyll --remote
 ```
 
-and you'll search for just the name `Jekyll`, and in brackets will be latest version. If you aren't running the latest version, run the update command:
+and you'll search for just the name `jekyll`, and in brackets will be latest version. If you aren't running the latest version, run the update command:
 
 ```sh
 $ gem update jekyll

From 2be5d560598002146c4f9e11568929eac02c5e44 Mon Sep 17 00:00:00 2001
From: Scott King 
Date: Tue, 18 Oct 2016 21:32:40 -0400
Subject: [PATCH 1528/4996] Fix some typos

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

diff --git a/site/_docs/installation.md b/site/_docs/installation.md
index 5c618a874b9..b61f439fe20 100644
--- a/site/_docs/installation.md
+++ b/site/_docs/installation.md
@@ -112,7 +112,7 @@ $ jekyll --version
 $ gem list jekyll
 ```
 
-You can also use RubyGems to find the current versioning of any gem. But you can also use the `gem` command line tool:
+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

From 0f5c34d16d957247bbb396b093320a9fc777f912 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 18 Oct 2016 18:38:14 -0700
Subject: [PATCH 1529/4996] Update history to reflect merge of #5494 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d096ad54455..06660408799 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,10 @@
   * fix rubocop errors on testing with Rubocop 0.44 (#5489)
   * script/test: add missing whitespace (#5479)
 
+### Minor Enhancements
+
+  * Collapse `gsub` (#5494)
+
 ## 3.3.0 / 2016-10-06
 
 ### Minor Enhancements

From ea72f98609b09fe25a89c1f20a4bfe079b5d029c Mon Sep 17 00:00:00 2001
From: Tan Nhu 
Date: Wed, 19 Oct 2016 00:53:44 -0700
Subject: [PATCH 1530/4996] Fix typo

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

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 85d193ec4e1..6e5bbf23847 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -866,7 +866,7 @@ LESS.js files during generation.
 - [Jekyll Tags List Plugin](https://github.com/crispgm/jekyll-tags-list-plugin): A Liquid tag plugin that creates tags list in specific order.
 - [Jekyll Maps](https://github.com/ayastreb/jekyll-maps) by [Anatoliy Yastreb](https://github.com/ayastreb): A Jekyll plugin to easily embed maps with filterable locations.
 - [Jekyll Cloudinary](https://nhoizey.github.io/jekyll-cloudinary/) by [Nicolas Hoizey](https://nicolas-hoizey.com/): a Jekyll plugin adding a Liquid tag to ease the use of Cloudinary for responsive images in your Markdown/Kramdown posts.
-- [jekyll-include-absolute-plugin](https://github.com/tnhu/jekyll-include-absolute-plugin) by [Tan Nhu](https://github.com/tnhu): A Jekyll plugin to include a file from its path relate to Jekyll's source folder.
+- [jekyll-include-absolute-plugin](https://github.com/tnhu/jekyll-include-absolute-plugin) by [Tan Nhu](https://github.com/tnhu): A Jekyll plugin to include a file from its path relative to Jekyll's source folder.
 
 #### Collections
 

From c7d0dda5a76db5360348bc9487d5171573b9ed9a Mon Sep 17 00:00:00 2001
From: Scott King 
Date: Wed, 19 Oct 2016 09:40:43 -0400
Subject: [PATCH 1531/4996] Add comment about gem outdated

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

diff --git a/site/_docs/installation.md b/site/_docs/installation.md
index b61f439fe20..ee27f15f6f0 100644
--- a/site/_docs/installation.md
+++ b/site/_docs/installation.md
@@ -118,7 +118,7 @@ You can also use [RubyGems](https://rubygems.org/gems/jekyll) to find the curren
 $ gem search jekyll --remote
 ```
 
-and you'll search for just the name `jekyll`, and in brackets will be latest version. If you aren't running the latest version, run the update command:
+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
 $ gem update jekyll

From 344d07cb559076069c0cb689a06156315ce6f8d5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 19 Oct 2016 10:40:43 -0700
Subject: [PATCH 1532/4996] Update history to reflect merge of #5497 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 06660408799..74512c74fcf 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,7 @@
   * Updating install instruction link for Jekyll 3 on Windows (#5475)
   * Update normalize.css to v5.0.0 (#5471)
   * Add jekyll-data to the list of plugins (#5491)
+  * Add info about checking version + updating (#5497)
 
 ### Bug Fixes
 

From 124c63fd59d9b16b741613787200421dca36ed7a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 19 Oct 2016 10:58:48 -0700
Subject: [PATCH 1533/4996] Update history to reflect merge of #5492 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 74512c74fcf..d30ca866f02 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
   * Update normalize.css to v5.0.0 (#5471)
   * Add jekyll-data to the list of plugins (#5491)
   * Add info about checking version + updating (#5497)
+  * Add jekyll-include-absolute-plugin to list of third-party plugins (#5492)
 
 ### Bug Fixes
 

From 821a84516677966a1f3b527d9d9daa5623a3452f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 19 Oct 2016 12:10:11 -0700
Subject: [PATCH 1534/4996] Update history to reflect merge of #5496 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d30ca866f02..89b25a3668f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
 
   * fix rubocop errors on testing with Rubocop 0.44 (#5489)
   * script/test: add missing whitespace (#5479)
+  * Restrict Rubocop version (#5496)
 
 ### Minor Enhancements
 

From 3431c9f7b8093c9f4fb90d87d909c982541a5a95 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 19 Oct 2016 21:24:11 -0700
Subject: [PATCH 1535/4996] Update history to reflect merge of #5495 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 89b25a3668f..d646d09d521 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,7 @@
 ### Bug Fixes
 
   * Fix typo in theme_template README (#5472)
+  * Do not swallow all exceptions on render (#5495)
 
 ### Development Fixes
 

From 11a0b6578ebb9fae24189e7a1b3ed50f4532408f Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Thu, 20 Oct 2016 21:12:16 +0200
Subject: [PATCH 1536/4996] Remove jekyll-hook from deployment methods

---
 site/_docs/deployment-methods.md | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md
index ad73c337295..937e418f10b 100644
--- a/site/_docs/deployment-methods.md
+++ b/site/_docs/deployment-methods.md
@@ -72,19 +72,6 @@ Deploying is now as easy as telling nginx or Apache to look at
 laptops$ git push deploy master
 ```
 
-### Jekyll-hook
-
-You can also use jekyll-hook, a server that listens for webhook posts from
-GitHub, generates a website with Jekyll, and moves it somewhere to be
-published. Use this to run your own GitHub Pages-style web server.
-
-This method is useful if you need to serve your websites behind a firewall,
-need extra server-level features like HTTP basic authentication or want to
-host your site directly on a CDN or file host like S3.
-
-Setup steps are fully documented
-[in the `jekyll-hook` repo](https://github.com/developmentseed/jekyll-hook).
-
 ### Static Publisher
 
 [Static Publisher](https://github.com/static-publisher/static-publisher) is another automated deployment option with a server listening for webhook posts, though it's not tied to GitHub specifically. It has a one-click deploy to Heroku, it can watch multiple projects from one server, it has an easy to user admin interface and can publish to either S3 or to a git repository (e.g. gh-pages).

From 4d597643ecb7f318b45048649b17cfaba9b9173e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 20 Oct 2016 13:12:08 -0700
Subject: [PATCH 1537/4996] Update history to reflect merge of #5502 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d646d09d521..8994d803680 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,7 @@
   * Add jekyll-data to the list of plugins (#5491)
   * Add info about checking version + updating (#5497)
   * Add jekyll-include-absolute-plugin to list of third-party plugins (#5492)
+  * Remove jekyll-hook from deployment methods (#5502)
 
 ### Bug Fixes
 

From d6844d284ce1572257ee06402b5def9996a26838 Mon Sep 17 00:00:00 2001
From: baiyangcao 
Date: Fri, 21 Oct 2016 13:30:26 +0800
Subject: [PATCH 1538/4996] Update deployment-methods.md

---
 site/_docs/deployment-methods.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md
index 937e418f10b..d3cf35a0c8d 100644
--- a/site/_docs/deployment-methods.md
+++ b/site/_docs/deployment-methods.md
@@ -89,7 +89,7 @@ Once you’ve generated the `_site` directory, you can easily scp it using a
 need to change the values to reflect your site’s details. There is even [a
 matching TextMate command][] that will help you run this script.
 
-[this deploy script here]: https://github.com/henrik/henrik.nyh.se/blob/master/script/deploy
+[this deploy script]: https://github.com/henrik/henrik.nyh.se/blob/master/script/deploy
 
 [a matching TextMate command]: https://gist.github.com/henrik/214959
 

From 8ed9863f078e9c3166fe16f20d9ac99e911d5ce1 Mon Sep 17 00:00:00 2001
From: Matthew Gifford 
Date: Tue, 18 Oct 2016 12:59:32 -0700
Subject: [PATCH 1539/4996] Add two plugins to the plugins page

---
 site/_docs/plugins.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 6e5bbf23847..9d76a6b322a 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -804,6 +804,7 @@ LESS.js files during generation.
 - [jekyll-roman](https://github.com/paulrobertlloyd/jekyll-roman): A liquid filter for Jekyll that converts numbers into Roman numerals.
 - [jekyll-typogrify](https://github.com/myles/jekyll-typogrify): A Jekyll plugin that brings the functions of [typogruby](http://avdgaag.github.io/typogruby/).
 - [Jekyll Email Protect](https://github.com/vwochnik/jekyll-email-protect): Email protection liquid filter for Jekyll
+- [Jekyll Uglify Filter](https://github.com/mattg/jekyll-uglify-filter): A Liquid filter that runs your JavaScript through UglifyJS.
 
 #### Tags
 
@@ -867,6 +868,7 @@ LESS.js files during generation.
 - [Jekyll Maps](https://github.com/ayastreb/jekyll-maps) by [Anatoliy Yastreb](https://github.com/ayastreb): A Jekyll plugin to easily embed maps with filterable locations.
 - [Jekyll Cloudinary](https://nhoizey.github.io/jekyll-cloudinary/) by [Nicolas Hoizey](https://nicolas-hoizey.com/): a Jekyll plugin adding a Liquid tag to ease the use of Cloudinary for responsive images in your Markdown/Kramdown posts.
 - [jekyll-include-absolute-plugin](https://github.com/tnhu/jekyll-include-absolute-plugin) by [Tan Nhu](https://github.com/tnhu): A Jekyll plugin to include a file from its path relative to Jekyll's source folder.
+- [Jekyll Download Tag](https://github.com/mattg/jekyll-download-tag): A Liquid tag that acts like `include`, but for external resources.
 
 #### Collections
 

From 12a86c1298f31f2e210c48c5fa433eae2e18a74a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 21 Oct 2016 13:58:47 -0700
Subject: [PATCH 1540/4996] Update history to reflect merge of #5504 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8994d803680..43014a64708 100644
--- a/History.markdown
+++ b/History.markdown
@@ -9,6 +9,7 @@
   * Add info about checking version + updating (#5497)
   * Add jekyll-include-absolute-plugin to list of third-party plugins (#5492)
   * Remove jekyll-hook from deployment methods (#5502)
+  * Update deployment-methods.md (#5504)
 
 ### Bug Fixes
 

From 7729d12cdcd55059c1628d088d68cedf51073d2d Mon Sep 17 00:00:00 2001
From: fen 
Date: Sat, 22 Oct 2016 03:13:30 +0200
Subject: [PATCH 1541/4996] include a hashbang for all benchmark scripts

this also makes every benchmark script executable
---
 benchmark/capture-assign.rb              | 1 +
 benchmark/end-with-vs-regexp             | 1 +
 benchmark/file-dir-ensure-trailing-slash | 0
 benchmark/flat-map                       | 1 +
 benchmark/hash-fetch                     | 1 +
 benchmark/jekyll-sanitize-path           | 0
 benchmark/proc-call-vs-yield             | 1 +
 benchmark/regexp-vs-include.rb           | 0
 benchmark/sequential-assignment          | 1 +
 benchmark/string-concat                  | 1 +
 benchmark/string-replacement             | 1 +
 benchmark/symbol-to-proc                 | 1 +
 12 files changed, 9 insertions(+)
 mode change 100644 => 100755 benchmark/capture-assign.rb
 mode change 100644 => 100755 benchmark/end-with-vs-regexp
 mode change 100644 => 100755 benchmark/file-dir-ensure-trailing-slash
 mode change 100644 => 100755 benchmark/flat-map
 mode change 100644 => 100755 benchmark/hash-fetch
 mode change 100644 => 100755 benchmark/jekyll-sanitize-path
 mode change 100644 => 100755 benchmark/proc-call-vs-yield
 mode change 100644 => 100755 benchmark/regexp-vs-include.rb
 mode change 100644 => 100755 benchmark/sequential-assignment
 mode change 100644 => 100755 benchmark/string-concat
 mode change 100644 => 100755 benchmark/string-replacement
 mode change 100644 => 100755 benchmark/symbol-to-proc

diff --git a/benchmark/capture-assign.rb b/benchmark/capture-assign.rb
old mode 100644
new mode 100755
index e7ad49ba116..7a127ad218a
--- a/benchmark/capture-assign.rb
+++ b/benchmark/capture-assign.rb
@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require "liquid"
 require "benchmark/ips"
 
diff --git a/benchmark/end-with-vs-regexp b/benchmark/end-with-vs-regexp
old mode 100644
new mode 100755
index 76f0312b93b..2ba5a3078c1
--- a/benchmark/end-with-vs-regexp
+++ b/benchmark/end-with-vs-regexp
@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'benchmark/ips'
 
 Benchmark.ips do |x|
diff --git a/benchmark/file-dir-ensure-trailing-slash b/benchmark/file-dir-ensure-trailing-slash
old mode 100644
new mode 100755
diff --git a/benchmark/flat-map b/benchmark/flat-map
old mode 100644
new mode 100755
index 547bcee12de..18f0cfdbe03
--- a/benchmark/flat-map
+++ b/benchmark/flat-map
@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'benchmark/ips'
 
 enum = (0..50).to_a
diff --git a/benchmark/hash-fetch b/benchmark/hash-fetch
old mode 100644
new mode 100755
index 357083576ca..d7427d5364a
--- a/benchmark/hash-fetch
+++ b/benchmark/hash-fetch
@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'benchmark/ips'
 
 h = {:bar => 'uco'}
diff --git a/benchmark/jekyll-sanitize-path b/benchmark/jekyll-sanitize-path
old mode 100644
new mode 100755
diff --git a/benchmark/proc-call-vs-yield b/benchmark/proc-call-vs-yield
old mode 100644
new mode 100755
index 3d55979bab1..9b4ad3755ae
--- a/benchmark/proc-call-vs-yield
+++ b/benchmark/proc-call-vs-yield
@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'benchmark/ips'
 
 def fast
diff --git a/benchmark/regexp-vs-include.rb b/benchmark/regexp-vs-include.rb
old mode 100644
new mode 100755
diff --git a/benchmark/sequential-assignment b/benchmark/sequential-assignment
old mode 100644
new mode 100755
index 945e982b25f..790e995c367
--- a/benchmark/sequential-assignment
+++ b/benchmark/sequential-assignment
@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'benchmark/ips'
 
 Benchmark.ips do |x|
diff --git a/benchmark/string-concat b/benchmark/string-concat
old mode 100644
new mode 100755
index c4a9174836d..c5397088764
--- a/benchmark/string-concat
+++ b/benchmark/string-concat
@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'benchmark/ips'
 
 url = "http://jekyllrb.com"
diff --git a/benchmark/string-replacement b/benchmark/string-replacement
old mode 100644
new mode 100755
index 36de613c31e..f522cfef517
--- a/benchmark/string-replacement
+++ b/benchmark/string-replacement
@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'benchmark/ips'
 
 def str
diff --git a/benchmark/symbol-to-proc b/benchmark/symbol-to-proc
old mode 100644
new mode 100755
index bc08b2f29a2..7b568c474f1
--- a/benchmark/symbol-to-proc
+++ b/benchmark/symbol-to-proc
@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'benchmark/ips'
 
 Benchmark.ips do |x|

From 3689844597d88d74d34d02124a9bcbe7359040b0 Mon Sep 17 00:00:00 2001
From: "Spencer A. Bywater" 
Date: Sat, 22 Oct 2016 09:54:35 -0700
Subject: [PATCH 1542/4996] Update 2-to-3.md

I was reading through the "Upgrading from 2.x to 3.x" page in the docs and noticed some of the markdown was janky. I made these small edits to fix the formatting and conform with how it's done elsewhere.
---
 site/_docs/upgrading/2-to-3.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md
index 9e7b0a6ee71..dfc93dff6bc 100644
--- a/site/_docs/upgrading/2-to-3.md
+++ b/site/_docs/upgrading/2-to-3.md
@@ -68,7 +68,7 @@ generate when running `jekyll build` or `jekyll serve`.
 
    
   
    Future Posts on GitHub Pages
    
   
    
-    An exception to the above rule are GitHub Pages sites, where the `--future` flag remains _enabled_
+    An exception to the above rule are GitHub Pages sites, where the --future flag remains enabled
     by default to maintain historical consistency for those sites. 
   
    
 
    

From 9bb242b44ab3bf3c247f72b97a9b34a33cf530c8 Mon Sep 17 00:00:00 2001
From: Chris Stein 
Date: Sun, 23 Oct 2016 15:26:50 -0500
Subject: [PATCH 1543/4996] fix _config.yml typo in site_template

Found a typo when going through a tutorial. Replacing `these this` with `this`
---
 lib/site_template/_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
index 9a2bee4530b..f5df9830896 100644
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -2,7 +2,7 @@
 #
 # This config file is meant for settings that affect your whole blog, values
 # which you are expected to set up once and rarely edit after that. If you find
-# yourself editing these this file very often, consider using Jekyll's data files
+# yourself editing this file very often, consider using Jekyll's data files
 # feature for the data you need to update frequently.
 #
 # For technical reasons, this file is *NOT* reloaded automatically when you use

From a87cfec587a6e6b6988d680d7e35ecd1b7913e11 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 23 Oct 2016 18:52:47 -0700
Subject: [PATCH 1544/4996] Update history to reflect merge of #5511 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 43014a64708..7716265e0da 100644
--- a/History.markdown
+++ b/History.markdown
@@ -15,6 +15,7 @@
 
   * Fix typo in theme_template README (#5472)
   * Do not swallow all exceptions on render (#5495)
+  * Site template: fixed `_config.yml` comment typo (#5511)
 
 ### Development Fixes
 

From ce6f20f187af0facb4ccf420f6d0694fb15e034d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 24 Oct 2016 14:48:05 -0700
Subject: [PATCH 1545/4996] Update history to reflect merge of #5505 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7716265e0da..db05d3e04a0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -22,6 +22,7 @@
   * fix rubocop errors on testing with Rubocop 0.44 (#5489)
   * script/test: add missing whitespace (#5479)
   * Restrict Rubocop version (#5496)
+  * include a hashbang for all benchmark scripts & make them executable (#5505)
 
 ### Minor Enhancements
 

From 81535dc18830877b0ffd8580120b80da27a74f49 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 24 Oct 2016 14:49:19 -0700
Subject: [PATCH 1546/4996] Update history to reflect merge of #5457 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index db05d3e04a0..06722ca2c4e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Fix typo in theme_template README (#5472)
   * Do not swallow all exceptions on render (#5495)
   * Site template: fixed `_config.yml` comment typo (#5511)
+  * `jekyll new-theme` should specify Jekyll as a runtime dependency for the theme (#5457)
 
 ### Development Fixes
 

From fcec2a6af93d28a3545f9bceb14823d7ee024154 Mon Sep 17 00:00:00 2001
From: 5jt 
Date: Tue, 25 Oct 2016 09:40:56 +0200
Subject: [PATCH 1547/4996] Update troubleshooting.md

`sudo apt-get install ruby2.0.0-dev` reports _Unable to locate package ruby2.0.0-dev_
---
 site/_docs/troubleshooting.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/troubleshooting.md b/site/_docs/troubleshooting.md
index 5a53a9ebab6..191953ec668 100644
--- a/site/_docs/troubleshooting.md
+++ b/site/_docs/troubleshooting.md
@@ -22,7 +22,7 @@ the header files for compiling extension modules for Ruby 2.0.0. This
 can be done on Ubuntu or Debian by running:
 
 ```sh
-sudo apt-get install ruby2.0.0-dev
+sudo apt-get install ruby2.3-dev
 ```
 
 On Red Hat, CentOS, and Fedora systems you can do this by running:

From 803c8827e35ca9b9973427c4d7bf05f96ddf4348 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 25 Oct 2016 12:06:24 -0700
Subject: [PATCH 1548/4996] Update history to reflect merge of #5512 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 06722ca2c4e..123f38945c2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -10,6 +10,7 @@
   * Add jekyll-include-absolute-plugin to list of third-party plugins (#5492)
   * Remove jekyll-hook from deployment methods (#5502)
   * Update deployment-methods.md (#5504)
+  * Ubuntu users should install ruby2.3-dev (#5512)
 
 ### Bug Fixes
 

From 762bf18d25e47c986c494a67ad346d77374397e7 Mon Sep 17 00:00:00 2001
From: George Mandis 
Date: Tue, 25 Oct 2016 13:54:43 -0700
Subject: [PATCH 1549/4996] Added jekyll-pinboard.

Added link to my Jekyll plugin: https://github.com/snaptortoise/jekyll-pinboard-plugin. Interfaces with the Pinboard API to make data for specified tags available to the template, sort of similar to the built-in Data Files support.
---
 site/_docs/plugins.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 6e5bbf23847..9b7de42859d 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -914,6 +914,7 @@ LESS.js files during generation.
 - [Jekyll-Spotify](https://github.com/MertcanGokgoz/Jekyll-Spotify): Easily output Spotify Embed Player for jekyll
 - [jekyll-menus](https://github.com/forestryio/jekyll-menus): Hugo style menus for your Jekyll site... recursive menus included.
 - [jekyll-data](https://github.com/ashmaroli/jekyll-data): Read data files within Jekyll Theme Gems.
+- [jekyll-pinboard(https://github.com/snaptortoise/jekyll-pinboard-plugin): Access your Pinboard bookmarks within your Jekyll theme.
 
 #### Editors
 

From 26144645d83bae6499f644f9ff5bebc036886f48 Mon Sep 17 00:00:00 2001
From: Robert 
Date: Sat, 29 Oct 2016 14:45:18 +0100
Subject: [PATCH 1550/4996] Remove Glynn as deployment option

Remove Glynn as deployment option since that gem is no longer actively maintained. See notes on readme in repository: https://github.com/dmathieu/glynn and https://github.com/dmathieu/glynn/issues/67
---
 site/_docs/deployment-methods.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md
index d3cf35a0c8d..09116824843 100644
--- a/site/_docs/deployment-methods.md
+++ b/site/_docs/deployment-methods.md
@@ -10,11 +10,6 @@ Sites built using Jekyll can be deployed in a large number of ways due to the st
 
 Just about any traditional web hosting provider will let you upload files to their servers over FTP. To upload a Jekyll site to a web host using FTP, simply run the `jekyll build` command and copy the generated `_site` folder to the root folder of your hosting account. This is most likely to be the `httpdocs` or `public_html` folder on most hosting providers.
 
-### FTP using Glynn
-
-There is a project called [Glynn](https://github.com/dmathieu/glynn), which lets you easily generate your Jekyll powered website’s static files and
-send them to your host through FTP.
-
 ## Self-managed web server
 
 If you have direct access to the deployment web server, the process is essentially the same, except you might have other methods available to you (such as `scp`, or even direct filesystem access) for transferring the files. Just remember to make sure the contents of the generated `_site` folder get placed in the appropriate web root directory for your web server.

From a1bdd312496d6822a2155050025b24a8f7524ab2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 30 Oct 2016 02:49:26 -0700
Subject: [PATCH 1551/4996] Update history to reflect merge of #5519 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 123f38945c2..f02fc174eb8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
   * Remove jekyll-hook from deployment methods (#5502)
   * Update deployment-methods.md (#5504)
   * Ubuntu users should install ruby2.3-dev (#5512)
+  * Remove Glynn as deployment option (#5519)
 
 ### Bug Fixes
 

From a856a948c9674713f48e69684c89ab7c7fd3b0be Mon Sep 17 00:00:00 2001
From: Pierre-Alexandre 
Date: Sun, 30 Oct 2016 11:41:15 +0000
Subject: [PATCH 1552/4996] no more invalid US-ASCII on lines 30 and 97

Avoiding errors on `jekyll serve`

```
# jekyll serve -H 0.0.0.0
Configuration file: /jekyll-offline-docs/site/_config.yml
Configuration file: /jekyll-offline-docs/site/_config.yml
            Source: /jekyll-offline-docs/site
       Destination: /jekyll-offline-docs/site/_site
 Incremental build: disabled. Enable with --incremental
      Generating...
  Conversion error: Jekyll::Converters::Scss encountered an error while converting 'css/screen.scss':
                    Invalid US-ASCII character "\xE2" on line 30
jekyll 3.3.0 | Error:  Invalid US-ASCII character "\xE2" on line 30
```

And line 97 when 30 is adjusted...
---
 site/_sass/_gridism.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/_sass/_gridism.scss b/site/_sass/_gridism.scss
index fa47dd2f533..4c4ce3219f0 100644
--- a/site/_sass/_gridism.scss
+++ b/site/_sass/_gridism.scss
@@ -27,7 +27,7 @@
 .grid .unit:first-child { padding-left: 20px; }
 .grid .unit:last-child { padding-right: 20px; }
 
-/* Nested grids already have padding though, so let’s nuke it */
+/* Nested grids already have padding though, so let's nuke it */
 .unit .unit:first-child { padding-left: 0; }
 .unit .unit:last-child { padding-right: 0; }
 .unit .grid:first-child > .unit { padding-top: 0; }
@@ -94,7 +94,7 @@
 
 /* Responsive Stuff */
 @media screen and (max-width: 568px) {
-  /* Stack anything that isn’t full-width on smaller screens
+  /* Stack anything that isn't full-width on smaller screens
      and doesn't provide the no-stacking-on-mobiles class */
   .grid:not(.no-stacking-on-mobiles) > .unit {
     width: 100% !important;

From 1bb2259a103edcfb16a0886afb26f2ee99a9fb62 Mon Sep 17 00:00:00 2001
From: fen 
Date: Wed, 2 Nov 2016 00:00:38 +0100
Subject: [PATCH 1553/4996] add failing test

---
 test/test_url.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/test/test_url.rb b/test/test_url.rb
index f5a77622fd1..5f983909447 100644
--- a/test/test_url.rb
+++ b/test/test_url.rb
@@ -80,5 +80,26 @@ class TestURL < JekyllUnitTest
         url.to_s
       end
     end
+
+    should "ignore NoMethodErrors when a placeholder is not found" do
+      site = fixture_site({
+        "collections" => {
+          "methods" => {
+            "output" => true
+          }
+        }
+      })
+      site.read
+      matching_doc = site.collections["methods"].docs.find do |doc|
+        doc.relative_path == "_methods/escape-+ #%20[].md"
+      end
+      out, err = capture_io do
+        URL.new(
+          :template     => "/methods/:title/:headline",
+          :placeholders => matching_doc.url_placeholders
+        ).to_s
+      end
+      assert out.include? ":headline is not defined!"
+    end
   end
 end

From a2ffde8f1423a250c921b6e23693a38b33235eaf Mon Sep 17 00:00:00 2001
From: fen 
Date: Wed, 2 Nov 2016 00:22:20 +0100
Subject: [PATCH 1554/4996] rewrite test to only not throw error

---
 test/test_url.rb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/test/test_url.rb b/test/test_url.rb
index 5f983909447..28fab43d557 100644
--- a/test/test_url.rb
+++ b/test/test_url.rb
@@ -93,13 +93,11 @@ class TestURL < JekyllUnitTest
       matching_doc = site.collections["methods"].docs.find do |doc|
         doc.relative_path == "_methods/escape-+ #%20[].md"
       end
-      out, err = capture_io do
-        URL.new(
-          :template     => "/methods/:title/:headline",
-          :placeholders => matching_doc.url_placeholders
-        ).to_s
-      end
-      assert out.include? ":headline is not defined!"
+      URL.new(
+        :template     => "/methods/:title/:headline",
+        :placeholders => matching_doc.url_placeholders
+      ).to_s
+      pass
     end
   end
 end

From 2d35364c02003ccbb9c5b06c291b65c2f6c3b278 Mon Sep 17 00:00:00 2001
From: fen 
Date: Wed, 2 Nov 2016 00:22:41 +0100
Subject: [PATCH 1555/4996] implement warning about missing keys in url drops

---
 lib/jekyll/url.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index c74e11c8bd4..32bcfb8f66e 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -86,7 +86,11 @@ def generate_url_from_hash(template)
 
     def generate_url_from_drop(template)
       template.gsub(%r!:([a-z_]+)!) do |match|
-        replacement = @placeholders.public_send(match.sub(":".freeze, "".freeze))
+        begin
+          replacement = @placeholders.public_send(match.sub(":".freeze, "".freeze))
+        rescue NoMethodError
+          Jekyll.logger.warn "", "#{match} is not defined!"
+        end
         if replacement.nil?
           "".freeze
         else

From 0c234c90a90e3799bd237c3391d1c58c6ad8cdb4 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 2 Nov 2016 12:18:05 +0530
Subject: [PATCH 1556/4996] TestGeneratedSite: add "|" to preserve newline

adding a pipe character ('|') preserves the formatting of
'expected_output' with a trailing newline bit, in windows.
---
 test/test_generated_site.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 31784054fd6..112cf9d3c09 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -50,11 +50,13 @@ class TestGeneratedSite < JekyllUnitTest
 
     should "print a nice list of static files" do
       time_regexp = "\\d+:\\d+"
+      #
+      # adding a pipe character at the beginning preserves formatting with newlines
       expected_output = Regexp.new <<-OUTPUT
-- /css/screen.css last edited at #{time_regexp} with extname .css
-- /pgp.key last edited at #{time_regexp} with extname .key
-- /products.yml last edited at #{time_regexp} with extname .yml
-- /symlink-test/symlinked-dir/screen.css last edited at #{time_regexp} with extname .css
+| - /css/screen.css last edited at #{time_regexp} with extname .css
+  - /pgp.key last edited at #{time_regexp} with extname .key
+  - /products.yml last edited at #{time_regexp} with extname .yml
+  - /symlink-test/symlinked-dir/screen.css last edited at #{time_regexp} with extname .css
 OUTPUT
       assert_match expected_output, File.read(dest_dir("static_files.html"))
     end

From 257e60b9a7629d04c244c22673fe4f4ffc1c3970 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 2 Nov 2016 12:25:50 +0530
Subject: [PATCH 1557/4996] TestSite: add symlinked files only if not Windows

add symlinked files to "sorted_pages" array only when testing on
non-windows platforms.
---
 test/test_site.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/test_site.rb b/test/test_site.rb
index 4f5272810df..efe7076ac95 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -175,7 +175,8 @@ def generate(site)
         method.call(*args, &block).reverse
       end
       @site.process
-      # files in symlinked directories may appear twice
+      # exclude files in symlinked directories here and insert them in the
+      # following step when not on Windows.
       sorted_pages = %w(
         %#\ +.md
         .htaccess
@@ -194,12 +195,14 @@ def generate(site)
         index.html
         info.md
         main.scss
-        main.scss
         properties.html
         sitemap.xml
         static_files.html
-        symlinked-file
       )
+      unless Utils::Platforms.really_windows?
+        # files in symlinked directories may appear twice
+        sorted_pages.push("main.scss", "symlinked-file").sort!
+      end
       assert_equal sorted_pages, @site.pages.map(&:name)
     end
 

From e6b9dd1cc147a881ef39b36977c705ef2b76c63c Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 2 Nov 2016 12:54:47 +0530
Subject: [PATCH 1558/4996] TestFilters: adjust array size to ignore symlinks

Adjust the size of grouped-items array as it won't include symlinked
pages in Windows.
---
 test/test_filters.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index 9a0f87d46b7..20587610beb 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -575,7 +575,9 @@ def to_liquid
               g["items"].is_a?(Array),
               "The list of grouped items for 'default' is not an Array."
             )
-            assert_equal 5, g["items"].size
+            # adjust array.size to ignore symlinked page in Windows
+            qty = Utils::Platforms.really_windows? ? 4 : 5
+            assert_equal qty, g["items"].size
           when "nil"
             assert(
               g["items"].is_a?(Array),
@@ -587,7 +589,9 @@ def to_liquid
               g["items"].is_a?(Array),
               "The list of grouped items for '' is not an Array."
             )
-            assert_equal 15, g["items"].size
+            # adjust array.size to ignore symlinked page in Windows
+            qty = Utils::Platforms.really_windows? ? 14 : 15
+            assert_equal qty, g["items"].size
           end
         end
       end

From e92dd2055dd0e64dff66a6ec58ed3dce5b7af5bb Mon Sep 17 00:00:00 2001
From: fen 
Date: Wed, 2 Nov 2016 21:30:23 +0100
Subject: [PATCH 1559/4996] check for the urldrop key first

---
 lib/jekyll/drops/url_drop.rb |  5 +++++
 lib/jekyll/url.rb            | 11 +++++------
 test/test_url.rb             | 11 ++++++-----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/lib/jekyll/drops/url_drop.rb b/lib/jekyll/drops/url_drop.rb
index 04e48a206d8..5c97190da59 100644
--- a/lib/jekyll/drops/url_drop.rb
+++ b/lib/jekyll/drops/url_drop.rb
@@ -78,6 +78,11 @@ def short_year
       def y_day
         @obj.date.strftime("%j")
       end
+
+      private
+      def fallback_data
+        {}
+      end
     end
   end
 end
diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 32bcfb8f66e..291f6e5865d 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -86,15 +86,14 @@ def generate_url_from_hash(template)
 
     def generate_url_from_drop(template)
       template.gsub(%r!:([a-z_]+)!) do |match|
-        begin
-          replacement = @placeholders.public_send(match.sub(":".freeze, "".freeze))
-        rescue NoMethodError
-          Jekyll.logger.warn "", "#{match} is not defined!"
+        key = match.sub(":".freeze, "".freeze)
+        unless @placeholders.key?(key)
+          raise NoMethodError, "The URL template key #{key} doesn't exist!"
         end
-        if replacement.nil?
+        if @placeholders[key].nil?
           "".freeze
         else
-          self.class.escape_path(replacement)
+          self.class.escape_path(@placeholders[key])
         end
       end.gsub(%r!//!, "/".freeze)
     end
diff --git a/test/test_url.rb b/test/test_url.rb
index 28fab43d557..1a4471162f3 100644
--- a/test/test_url.rb
+++ b/test/test_url.rb
@@ -93,11 +93,12 @@ class TestURL < JekyllUnitTest
       matching_doc = site.collections["methods"].docs.find do |doc|
         doc.relative_path == "_methods/escape-+ #%20[].md"
       end
-      URL.new(
-        :template     => "/methods/:title/:headline",
-        :placeholders => matching_doc.url_placeholders
-      ).to_s
-      pass
+      assert_raises NoMethodError do
+        URL.new(
+          :template     => "/methods/:headline",
+          :placeholders => matching_doc.url_placeholders
+        ).to_s
+      end
     end
   end
 end

From 16217b2ed76dc76af1f54e3a6e28bb592b988363 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 2 Nov 2016 13:40:22 -0700
Subject: [PATCH 1560/4996] Update history to reflect merge of #5466 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f02fc174eb8..711367a82a5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,7 @@
   * Update deployment-methods.md (#5504)
   * Ubuntu users should install ruby2.3-dev (#5512)
   * Remove Glynn as deployment option (#5519)
+  * Fix broken forum link (#5466)
 
 ### Bug Fixes
 

From 3eedfd8fe08a2e7a9cc44c89acb60de0f2c7d2f7 Mon Sep 17 00:00:00 2001
From: Ben Balter 
Date: Thu, 6 Oct 2016 14:41:23 -0400
Subject: [PATCH 1561/4996] abstract site directory to variable

---
 Rakefile       |  6 +++++-
 rake/site.rake | 14 +++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Rakefile b/Rakefile
index 4e9a1057771..de2aa441ec7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -27,6 +27,10 @@ def docs_name
   "#{name}-docs"
 end
 
+def docs_folder
+  "site"
+end
+
 def gemspec_file
   "#{name}.gemspec"
 end
@@ -102,7 +106,7 @@ def siteify_file(file, overrides_front_matter = {})
     "note"      => "This file is autogenerated. Edit /#{file} instead."
   }.merge(overrides_front_matter)
   contents = "#{front_matter.to_yaml}---\n\n#{content_for(file)}"
-  File.write("site/_docs/#{slug}.md", contents)
+  File.write("#{docs_folder}/_docs/#{slug}.md", contents)
 end
 
 def content_for(file)
diff --git a/rake/site.rake b/rake/site.rake
index 8dd283fb566..283b4a9c30a 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -23,8 +23,8 @@ namespace :site do
     # Generate the site in server mode.
     puts "Running Jekyll..."
     options = {
-      "source"      => File.expand_path("site"),
-      "destination" => File.expand_path("site/_site"),
+      "source"      => File.expand_path(docs_folder),
+      "destination" => File.expand_path("#{docs_folder}/_site"),
       "watch"       => true,
       "serving"     => true
     }
@@ -37,15 +37,15 @@ namespace :site do
     require "jekyll"
     Jekyll::Commands::Build.process({
       "profile" => true,
-      "source"      => File.expand_path("site"),
-      "destination" => File.expand_path("site/_site")
+      "source"      => File.expand_path(docs_folder),
+      "destination" => File.expand_path("#{docs_folder}/_site")
     })
   end
   task :build => :generate
 
   desc "Update normalize.css library to the latest version and minify"
   task :update_normalize_css do
-    Dir.chdir("site/_sass") do
+    Dir.chdir("#{docs_folder}/_sass") do
       sh 'curl "http://necolas.github.io/normalize.css/latest/normalize.css" -o "normalize.scss"'
       sh 'sass "normalize.scss":"_normalize.scss" --style compressed'
       rm ['normalize.scss', Dir.glob('*.map')].flatten
@@ -84,7 +84,7 @@ namespace :site do
     ENV['JEKYLL_ENV'] = 'production'
     require "jekyll"
     Jekyll::Commands::Build.process({
-      "source"       => File.expand_path("site"),
+      "source"       => File.expand_path(docs_folder),
       "destination"  => File.expand_path("gh-pages"),
       "sass"         => { "style" => "compressed" }
     })
@@ -132,7 +132,7 @@ namespace :site do
       raise "Specify a version: rake site:releases:new['1.2.3']" unless args.version
       today = Time.new.strftime('%Y-%m-%d')
       release = args.version.to_s
-      filename = "site/_posts/#{today}-jekyll-#{release.split('.').join('-')}-released.markdown"
+      filename = "#{docs_folder}/_posts/#{today}-jekyll-#{release.split('.').join('-')}-released.markdown"
 
       File.open(filename, "wb") do |post|
         post.puts("---")

From 8b9391da9899711620543235eb34c6d97da5a05a Mon Sep 17 00:00:00 2001
From: Ben Balter 
Date: Thu, 6 Oct 2016 14:42:57 -0400
Subject: [PATCH 1562/4996] abstract one last site reference

---
 rake/site.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rake/site.rake b/rake/site.rake
index 283b4a9c30a..eb08cc7f9b2 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -123,7 +123,7 @@ namespace :site do
 
   desc "Write the site latest_version.txt file"
   task :version_file do
-    File.open('site/latest_version.txt', 'wb') { |f| f.puts(version) } unless version =~ /(beta|rc|alpha)/i
+    File.open("#{docs_folder}/latest_version.txt", 'wb') { |f| f.puts(version) } unless version =~ /(beta|rc|alpha)/i
   end
 
   namespace :releases do

From a087d34ece2662a31ecf15a5464f806e5bd1aaf5 Mon Sep 17 00:00:00 2001
From: Ben Balter 
Date: Thu, 6 Oct 2016 15:26:26 -0400
Subject: [PATCH 1563/4996] update rake task to use docs folder

---
 rake/site.rake | 46 ++++------------------------------------------
 1 file changed, 4 insertions(+), 42 deletions(-)

diff --git a/rake/site.rake b/rake/site.rake
index eb08cc7f9b2..679e4bf0768 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -52,52 +52,14 @@ namespace :site do
     end
   end
 
-  desc "Commit the local site to the gh-pages branch and publish to GitHub Pages"
+  desc "Generate generated pages and publish to GitHub Pages"
   task :publish => :generated_pages do
-    # Ensure the gh-pages dir exists so we can generate into it.
-    puts "Checking for gh-pages dir..."
-    unless File.exist?("./gh-pages")
-      puts "Creating gh-pages dir..."
-      sh "git clone git@github.com:jekyll/jekyll gh-pages"
-    end
-
-    # Ensure latest gh-pages branch history.
-    Dir.chdir('gh-pages') do
-      sh "git checkout gh-pages"
-      sh "git pull origin gh-pages"
-    end
-
-    # Proceed to purge all files in case we removed a file in this release.
-    puts "Cleaning gh-pages directory..."
-    purge_exclude = %w[
-      gh-pages/.
-      gh-pages/..
-      gh-pages/.git
-      gh-pages/.gitignore
-    ]
-    FileList["gh-pages/{*,.*}"].exclude(*purge_exclude).each do |path|
-      sh "rm -rf #{path}"
-    end
-
-    # Copy site to gh-pages dir.
-    puts "Building site into gh-pages branch..."
-    ENV['JEKYLL_ENV'] = 'production'
-    require "jekyll"
-    Jekyll::Commands::Build.process({
-      "source"       => File.expand_path(docs_folder),
-      "destination"  => File.expand_path("gh-pages"),
-      "sass"         => { "style" => "compressed" }
-    })
-
-    File.open('gh-pages/.nojekyll', 'wb') { |f| f.puts(":dog: food.") }
-
-    # Commit and push.
     puts "Committing and pushing to GitHub Pages..."
     sha = `git rev-parse HEAD`.strip
     Dir.chdir('gh-pages') do
-      sh "git add ."
-      sh "git commit --allow-empty -m 'Updating to #{sha}.'"
-      sh "git push origin gh-pages"
+      sh "git add docs/"
+      sh "git commit --allow-empty -m 'Generating pages for #{sha}.'"
+      sh "git push origin master"
     end
     puts 'Done.'
   end

From 6be62def90e1b379b72f9b656094117d0dad4a74 Mon Sep 17 00:00:00 2001
From: Ben Balter 
Date: Thu, 6 Oct 2016 15:26:35 -0400
Subject: [PATCH 1564/4996] move site to docs folder

---
 Rakefile                                      |   2 +-
 {site => docs}/.gitignore                     |   0
 {site => docs}/404.html                       |   0
 {site => docs}/CNAME                          |   0
 {site => docs}/_config.yml                    |   0
 {site => docs}/_data/docs.yml                 |   1 +
 {site => docs}/_data/jekyllconf-talks.yml     |   0
 {site => docs}/_docs/assets.md                |   0
 {site => docs}/_docs/collections.md           |   0
 {site => docs}/_docs/conduct.md               |   0
 {site => docs}/_docs/configuration.md         |   0
 .../_docs/continuous-integration.md           |   0
 {site => docs}/_docs/contributing.md          |   0
 {site => docs}/_docs/datafiles.md             |   0
 {site => docs}/_docs/deployment-methods.md    |   0
 .../development}/affinity-team-captain.md     |   7 +++++-
 .../development}/avoiding-burnout.md          |   7 +++++-
 .../development}/becoming-a-maintainer.md     |   7 +++++-
 docs/_docs/development/index.md               |  20 +++++++++++++++++
 .../development}/merging-a-pull-request.md    |   7 +++++-
 .../development}/reviewing-a-pull-request.md  |   8 +++++--
 .../{ => _docs/development}/special-labels.md |   7 +++++-
 .../development}/triaging-an-issue.md         |   7 +++++-
 {site => docs}/_docs/drafts.md                |   0
 {site => docs}/_docs/extras.md                |   0
 {site => docs}/_docs/frontmatter.md           |   0
 {site => docs}/_docs/github-pages.md          |   0
 {site => docs}/_docs/history.md               |   0
 {site => docs}/_docs/index.md                 |   0
 {site => docs}/_docs/installation.md          |   0
 {site => docs}/_docs/migrations.md            |   0
 {site => docs}/_docs/pages.md                 |   0
 {site => docs}/_docs/pagination.md            |   0
 {site => docs}/_docs/permalinks.md            |   0
 {site => docs}/_docs/plugins.md               |   0
 {site => docs}/_docs/posts.md                 |   0
 {site => docs}/_docs/quickstart.md            |   0
 {site => docs}/_docs/resources.md             |   0
 {site => docs}/_docs/sites.md                 |   0
 {site => docs}/_docs/static_files.md          |   0
 {site => docs}/_docs/structure.md             |   0
 {site => docs}/_docs/templates.md             |   0
 {site => docs}/_docs/themes.md                |   0
 {site => docs}/_docs/troubleshooting.md       |   0
 {site => docs}/_docs/upgrading.md             |   0
 {site => docs}/_docs/upgrading/0-to-2.md      |   0
 {site => docs}/_docs/upgrading/2-to-3.md      |   0
 {site => docs}/_docs/usage.md                 |   0
 {site => docs}/_docs/variables.md             |   0
 {site => docs}/_docs/windows.md               |   0
 {site => docs}/_includes/analytics.html       |   0
 {site => docs}/_includes/anchor_links.html    |   0
 {site => docs}/_includes/docs_contents.html   |   0
 .../_includes/docs_contents_mobile.html       |   0
 {site => docs}/_includes/docs_option.html     |   0
 {site => docs}/_includes/docs_ul.html         |   0
 {site => docs}/_includes/footer.html          |   0
 {site => docs}/_includes/header.html          |   0
 {site => docs}/_includes/news_contents.html   |   0
 .../_includes/news_contents_mobile.html       |   0
 {site => docs}/_includes/news_item.html       |   0
 .../_includes/primary-nav-items.html          |   0
 {site => docs}/_includes/section_nav.html     |   0
 {site => docs}/_includes/top.html             |   0
 {site => docs}/_layouts/default.html          |   0
 {site => docs}/_layouts/docs.html             |   0
 {site => docs}/_layouts/error.html            |   0
 {site => docs}/_layouts/news.html             |   0
 {site => docs}/_layouts/news_item.html        |   0
 {site => docs}/_layouts/page.html             |   0
 .../2013-05-06-jekyll-1-0-0-released.markdown |   0
 .../2013-05-08-jekyll-1-0-1-released.markdown |   0
 .../2013-05-12-jekyll-1-0-2-released.markdown |   0
 .../2013-06-07-jekyll-1-0-3-released.markdown |   0
 .../2013-07-14-jekyll-1-1-0-released.markdown |   0
 .../2013-07-24-jekyll-1-1-1-released.markdown |   0
 .../2013-07-25-jekyll-1-0-4-released.markdown |   0
 .../2013-07-25-jekyll-1-1-2-released.markdown |   0
 .../2013-09-06-jekyll-1-2-0-released.markdown |   0
 .../2013-09-14-jekyll-1-2-1-released.markdown |   0
 ...3-10-28-jekyll-1-3-0-rc1-released.markdown |   0
 .../2013-11-04-jekyll-1-3-0-released.markdown |   0
 .../2013-11-26-jekyll-1-3-1-released.markdown |   0
 .../2013-12-07-jekyll-1-4-0-released.markdown |   0
 .../2013-12-09-jekyll-1-4-1-released.markdown |   0
 .../2013-12-16-jekyll-1-4-2-released.markdown |   0
 .../2014-01-13-jekyll-1-4-3-released.markdown |   0
 .../2014-03-24-jekyll-1-5-0-released.markdown |   0
 .../2014-03-27-jekyll-1-5-1-released.markdown |   0
 .../2014-05-06-jekyll-turns-2-0-0.markdown    |   0
 .../2014-05-08-jekyll-2-0-3-released.markdown |   0
 ...yll-stickers-1-dollar-stickermule.markdown |   0
 ...6-28-jekyll-turns-21-i-mean-2-1-0.markdown |   0
 .../2014-07-01-jekyll-2-1-1-released.markdown |   0
 .../2014-07-29-jekyll-2-2-0-released.markdown |   0
 .../2014-08-10-jekyll-2-3-0-released.markdown |   0
 .../2014-09-09-jekyll-2-4-0-released.markdown |   0
 ...midlife-crisis-jekyll-turns-2-5-0.markdown |   0
 .../2014-11-08-jekyll-2-5-1-released.markdown |   0
 .../2014-11-12-jekyll-2-5-2-released.markdown |   0
 ...12-17-alfredxing-welcome-to-jekyll-core.md |   0
 .../2014-12-22-jekyll-2-5-3-released.markdown |   0
 .../2015-01-20-jekyll-meet-and-greet.markdown |   0
 ...01-24-jekyll-3-0-0-beta1-released.markdown |   0
 ...015-02-26-introducing-jekyll-talk.markdown |   0
 .../2015-10-26-jekyll-3-0-released.markdown   |   0
 .../2015-11-17-jekyll-3-0-1-released.markdown |   0
 .../2016-01-20-jekyll-3-0-2-released.markdown |   0
 .../2016-01-24-jekyll-3-1-0-released.markdown |   0
 .../2016-01-28-jekyll-3-1-1-released.markdown |   0
 .../2016-02-08-jekyll-3-0-3-released.markdown |   0
 .../2016-02-19-jekyll-3-1-2-released.markdown |   0
 ...aking-it-easier-to-contribute-to-jekyll.md |   0
 .../2016-04-19-jekyll-3-0-4-released.markdown |   0
 .../2016-04-19-jekyll-3-1-3-released.markdown |   0
 .../2016-04-26-jekyll-3-0-5-released.markdown |   0
 .../2016-05-18-jekyll-3-1-4-released.markdown |   0
 .../2016-05-18-jekyll-3-1-5-released.markdown |   0
 .../2016-05-19-jekyll-3-1-6-released.markdown |   0
 ...-s-google-summer-of-code-projects.markdown |   0
 .../2016-07-26-jekyll-3-2-0-released.markdown |   0
 .../2016-08-02-jekyll-3-2-1-released.markdown |   0
 ...8-24-jekyll-admin-initial-release.markdown |   0
 .../_posts/2016-10-06-jekyll-3-3-is-here.md   |   0
 {site => docs}/_sass/_font-awesome.scss       |   0
 {site => docs}/_sass/_gridism.scss            |   0
 {site => docs}/_sass/_mixins.scss             |   0
 {site => docs}/_sass/_normalize.scss          |   0
 {site => docs}/_sass/_pygments.scss           |   0
 {site => docs}/_sass/_style.scss              |   0
 {site => docs}/community/index.md             |   0
 {site => docs}/css/screen.scss                |   0
 {site => docs}/favicon.ico                    | Bin
 {site => docs}/fonts/fontawesome-webfont.eot  | Bin
 {site => docs}/fonts/fontawesome-webfont.svg  |   0
 {site => docs}/fonts/fontawesome-webfont.ttf  | Bin
 {site => docs}/fonts/fontawesome-webfont.woff | Bin
 .../fonts/fontawesome-webfont.woff2           | Bin
 {site => docs}/freenode.txt                   |   0
 {site => docs}/help/index.md                  |   0
 {site => docs}/img/article-footer.png         | Bin
 {site => docs}/img/footer-arrow.png           | Bin
 {site => docs}/img/footer-logo.png            | Bin
 {site => docs}/img/jekyll-sticker.jpg         | Bin
 {site => docs}/img/logo-2x.png                | Bin
 {site => docs}/img/logo-rss.png               | Bin
 {site => docs}/img/octojekyll.png             | Bin
 {site => docs}/index.html                     |   0
 {site => docs}/js/html5shiv.min.js            |   0
 {site => docs}/js/respond.min.js              |   0
 {site => docs}/latest_version.txt             |   0
 {site => docs}/news/index.html                |   0
 {site => docs}/news/releases/index.html       |   0
 docs/readme.md                                |  21 ++++++++++--------
 {site => docs}/redirects/github.html          |   0
 {site => docs}/redirects/issues.html          |   0
 site/README.md                                |  16 -------------
 157 files changed, 76 insertions(+), 34 deletions(-)
 rename {site => docs}/.gitignore (100%)
 rename {site => docs}/404.html (100%)
 rename {site => docs}/CNAME (100%)
 rename {site => docs}/_config.yml (100%)
 rename {site => docs}/_data/docs.yml (97%)
 rename {site => docs}/_data/jekyllconf-talks.yml (100%)
 rename {site => docs}/_docs/assets.md (100%)
 rename {site => docs}/_docs/collections.md (100%)
 rename {site => docs}/_docs/conduct.md (100%)
 rename {site => docs}/_docs/configuration.md (100%)
 rename {site => docs}/_docs/continuous-integration.md (100%)
 rename {site => docs}/_docs/contributing.md (100%)
 rename {site => docs}/_docs/datafiles.md (100%)
 rename {site => docs}/_docs/deployment-methods.md (100%)
 rename docs/{ => _docs/development}/affinity-team-captain.md (94%)
 rename docs/{ => _docs/development}/avoiding-burnout.md (95%)
 rename docs/{ => _docs/development}/becoming-a-maintainer.md (96%)
 create mode 100644 docs/_docs/development/index.md
 rename docs/{ => _docs/development}/merging-a-pull-request.md (96%)
 rename docs/{ => _docs/development}/reviewing-a-pull-request.md (96%)
 rename docs/{ => _docs/development}/special-labels.md (93%)
 rename docs/{ => _docs/development}/triaging-an-issue.md (97%)
 rename {site => docs}/_docs/drafts.md (100%)
 rename {site => docs}/_docs/extras.md (100%)
 rename {site => docs}/_docs/frontmatter.md (100%)
 rename {site => docs}/_docs/github-pages.md (100%)
 rename {site => docs}/_docs/history.md (100%)
 rename {site => docs}/_docs/index.md (100%)
 rename {site => docs}/_docs/installation.md (100%)
 rename {site => docs}/_docs/migrations.md (100%)
 rename {site => docs}/_docs/pages.md (100%)
 rename {site => docs}/_docs/pagination.md (100%)
 rename {site => docs}/_docs/permalinks.md (100%)
 rename {site => docs}/_docs/plugins.md (100%)
 rename {site => docs}/_docs/posts.md (100%)
 rename {site => docs}/_docs/quickstart.md (100%)
 rename {site => docs}/_docs/resources.md (100%)
 rename {site => docs}/_docs/sites.md (100%)
 rename {site => docs}/_docs/static_files.md (100%)
 rename {site => docs}/_docs/structure.md (100%)
 rename {site => docs}/_docs/templates.md (100%)
 rename {site => docs}/_docs/themes.md (100%)
 rename {site => docs}/_docs/troubleshooting.md (100%)
 rename {site => docs}/_docs/upgrading.md (100%)
 rename {site => docs}/_docs/upgrading/0-to-2.md (100%)
 rename {site => docs}/_docs/upgrading/2-to-3.md (100%)
 rename {site => docs}/_docs/usage.md (100%)
 rename {site => docs}/_docs/variables.md (100%)
 rename {site => docs}/_docs/windows.md (100%)
 rename {site => docs}/_includes/analytics.html (100%)
 rename {site => docs}/_includes/anchor_links.html (100%)
 rename {site => docs}/_includes/docs_contents.html (100%)
 rename {site => docs}/_includes/docs_contents_mobile.html (100%)
 rename {site => docs}/_includes/docs_option.html (100%)
 rename {site => docs}/_includes/docs_ul.html (100%)
 rename {site => docs}/_includes/footer.html (100%)
 rename {site => docs}/_includes/header.html (100%)
 rename {site => docs}/_includes/news_contents.html (100%)
 rename {site => docs}/_includes/news_contents_mobile.html (100%)
 rename {site => docs}/_includes/news_item.html (100%)
 rename {site => docs}/_includes/primary-nav-items.html (100%)
 rename {site => docs}/_includes/section_nav.html (100%)
 rename {site => docs}/_includes/top.html (100%)
 rename {site => docs}/_layouts/default.html (100%)
 rename {site => docs}/_layouts/docs.html (100%)
 rename {site => docs}/_layouts/error.html (100%)
 rename {site => docs}/_layouts/news.html (100%)
 rename {site => docs}/_layouts/news_item.html (100%)
 rename {site => docs}/_layouts/page.html (100%)
 rename {site => docs}/_posts/2013-05-06-jekyll-1-0-0-released.markdown (100%)
 rename {site => docs}/_posts/2013-05-08-jekyll-1-0-1-released.markdown (100%)
 rename {site => docs}/_posts/2013-05-12-jekyll-1-0-2-released.markdown (100%)
 rename {site => docs}/_posts/2013-06-07-jekyll-1-0-3-released.markdown (100%)
 rename {site => docs}/_posts/2013-07-14-jekyll-1-1-0-released.markdown (100%)
 rename {site => docs}/_posts/2013-07-24-jekyll-1-1-1-released.markdown (100%)
 rename {site => docs}/_posts/2013-07-25-jekyll-1-0-4-released.markdown (100%)
 rename {site => docs}/_posts/2013-07-25-jekyll-1-1-2-released.markdown (100%)
 rename {site => docs}/_posts/2013-09-06-jekyll-1-2-0-released.markdown (100%)
 rename {site => docs}/_posts/2013-09-14-jekyll-1-2-1-released.markdown (100%)
 rename {site => docs}/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown (100%)
 rename {site => docs}/_posts/2013-11-04-jekyll-1-3-0-released.markdown (100%)
 rename {site => docs}/_posts/2013-11-26-jekyll-1-3-1-released.markdown (100%)
 rename {site => docs}/_posts/2013-12-07-jekyll-1-4-0-released.markdown (100%)
 rename {site => docs}/_posts/2013-12-09-jekyll-1-4-1-released.markdown (100%)
 rename {site => docs}/_posts/2013-12-16-jekyll-1-4-2-released.markdown (100%)
 rename {site => docs}/_posts/2014-01-13-jekyll-1-4-3-released.markdown (100%)
 rename {site => docs}/_posts/2014-03-24-jekyll-1-5-0-released.markdown (100%)
 rename {site => docs}/_posts/2014-03-27-jekyll-1-5-1-released.markdown (100%)
 rename {site => docs}/_posts/2014-05-06-jekyll-turns-2-0-0.markdown (100%)
 rename {site => docs}/_posts/2014-05-08-jekyll-2-0-3-released.markdown (100%)
 rename {site => docs}/_posts/2014-06-04-jekyll-stickers-1-dollar-stickermule.markdown (100%)
 rename {site => docs}/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown (100%)
 rename {site => docs}/_posts/2014-07-01-jekyll-2-1-1-released.markdown (100%)
 rename {site => docs}/_posts/2014-07-29-jekyll-2-2-0-released.markdown (100%)
 rename {site => docs}/_posts/2014-08-10-jekyll-2-3-0-released.markdown (100%)
 rename {site => docs}/_posts/2014-09-09-jekyll-2-4-0-released.markdown (100%)
 rename {site => docs}/_posts/2014-11-06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown (100%)
 rename {site => docs}/_posts/2014-11-08-jekyll-2-5-1-released.markdown (100%)
 rename {site => docs}/_posts/2014-11-12-jekyll-2-5-2-released.markdown (100%)
 rename {site => docs}/_posts/2014-12-17-alfredxing-welcome-to-jekyll-core.md (100%)
 rename {site => docs}/_posts/2014-12-22-jekyll-2-5-3-released.markdown (100%)
 rename {site => docs}/_posts/2015-01-20-jekyll-meet-and-greet.markdown (100%)
 rename {site => docs}/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown (100%)
 rename {site => docs}/_posts/2015-02-26-introducing-jekyll-talk.markdown (100%)
 rename {site => docs}/_posts/2015-10-26-jekyll-3-0-released.markdown (100%)
 rename {site => docs}/_posts/2015-11-17-jekyll-3-0-1-released.markdown (100%)
 rename {site => docs}/_posts/2016-01-20-jekyll-3-0-2-released.markdown (100%)
 rename {site => docs}/_posts/2016-01-24-jekyll-3-1-0-released.markdown (100%)
 rename {site => docs}/_posts/2016-01-28-jekyll-3-1-1-released.markdown (100%)
 rename {site => docs}/_posts/2016-02-08-jekyll-3-0-3-released.markdown (100%)
 rename {site => docs}/_posts/2016-02-19-jekyll-3-1-2-released.markdown (100%)
 rename {site => docs}/_posts/2016-03-10-making-it-easier-to-contribute-to-jekyll.md (100%)
 rename {site => docs}/_posts/2016-04-19-jekyll-3-0-4-released.markdown (100%)
 rename {site => docs}/_posts/2016-04-19-jekyll-3-1-3-released.markdown (100%)
 rename {site => docs}/_posts/2016-04-26-jekyll-3-0-5-released.markdown (100%)
 rename {site => docs}/_posts/2016-05-18-jekyll-3-1-4-released.markdown (100%)
 rename {site => docs}/_posts/2016-05-18-jekyll-3-1-5-released.markdown (100%)
 rename {site => docs}/_posts/2016-05-19-jekyll-3-1-6-released.markdown (100%)
 rename {site => docs}/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown (100%)
 rename {site => docs}/_posts/2016-07-26-jekyll-3-2-0-released.markdown (100%)
 rename {site => docs}/_posts/2016-08-02-jekyll-3-2-1-released.markdown (100%)
 rename {site => docs}/_posts/2016-08-24-jekyll-admin-initial-release.markdown (100%)
 rename {site => docs}/_posts/2016-10-06-jekyll-3-3-is-here.md (100%)
 rename {site => docs}/_sass/_font-awesome.scss (100%)
 rename {site => docs}/_sass/_gridism.scss (100%)
 rename {site => docs}/_sass/_mixins.scss (100%)
 rename {site => docs}/_sass/_normalize.scss (100%)
 rename {site => docs}/_sass/_pygments.scss (100%)
 rename {site => docs}/_sass/_style.scss (100%)
 rename {site => docs}/community/index.md (100%)
 rename {site => docs}/css/screen.scss (100%)
 rename {site => docs}/favicon.ico (100%)
 rename {site => docs}/fonts/fontawesome-webfont.eot (100%)
 rename {site => docs}/fonts/fontawesome-webfont.svg (100%)
 rename {site => docs}/fonts/fontawesome-webfont.ttf (100%)
 rename {site => docs}/fonts/fontawesome-webfont.woff (100%)
 rename {site => docs}/fonts/fontawesome-webfont.woff2 (100%)
 rename {site => docs}/freenode.txt (100%)
 rename {site => docs}/help/index.md (100%)
 rename {site => docs}/img/article-footer.png (100%)
 rename {site => docs}/img/footer-arrow.png (100%)
 rename {site => docs}/img/footer-logo.png (100%)
 rename {site => docs}/img/jekyll-sticker.jpg (100%)
 rename {site => docs}/img/logo-2x.png (100%)
 rename {site => docs}/img/logo-rss.png (100%)
 rename {site => docs}/img/octojekyll.png (100%)
 rename {site => docs}/index.html (100%)
 rename {site => docs}/js/html5shiv.min.js (100%)
 rename {site => docs}/js/respond.min.js (100%)
 rename {site => docs}/latest_version.txt (100%)
 rename {site => docs}/news/index.html (100%)
 rename {site => docs}/news/releases/index.html (100%)
 rename {site => docs}/redirects/github.html (100%)
 rename {site => docs}/redirects/issues.html (100%)
 delete mode 100644 site/README.md

diff --git a/Rakefile b/Rakefile
index de2aa441ec7..58aecfaf767 100644
--- a/Rakefile
+++ b/Rakefile
@@ -28,7 +28,7 @@ def docs_name
 end
 
 def docs_folder
-  "site"
+  "docs"
 end
 
 def gemspec_file
diff --git a/site/.gitignore b/docs/.gitignore
similarity index 100%
rename from site/.gitignore
rename to docs/.gitignore
diff --git a/site/404.html b/docs/404.html
similarity index 100%
rename from site/404.html
rename to docs/404.html
diff --git a/site/CNAME b/docs/CNAME
similarity index 100%
rename from site/CNAME
rename to docs/CNAME
diff --git a/site/_config.yml b/docs/_config.yml
similarity index 100%
rename from site/_config.yml
rename to docs/_config.yml
diff --git a/site/_data/docs.yml b/docs/_data/docs.yml
similarity index 97%
rename from site/_data/docs.yml
rename to docs/_data/docs.yml
index 071b5a14c72..950d2a6c7c0 100644
--- a/site/_data/docs.yml
+++ b/docs/_data/docs.yml
@@ -46,5 +46,6 @@
 - title: Meta
   docs:
   - contributing
+  - development
   - conduct
   - history
diff --git a/site/_data/jekyllconf-talks.yml b/docs/_data/jekyllconf-talks.yml
similarity index 100%
rename from site/_data/jekyllconf-talks.yml
rename to docs/_data/jekyllconf-talks.yml
diff --git a/site/_docs/assets.md b/docs/_docs/assets.md
similarity index 100%
rename from site/_docs/assets.md
rename to docs/_docs/assets.md
diff --git a/site/_docs/collections.md b/docs/_docs/collections.md
similarity index 100%
rename from site/_docs/collections.md
rename to docs/_docs/collections.md
diff --git a/site/_docs/conduct.md b/docs/_docs/conduct.md
similarity index 100%
rename from site/_docs/conduct.md
rename to docs/_docs/conduct.md
diff --git a/site/_docs/configuration.md b/docs/_docs/configuration.md
similarity index 100%
rename from site/_docs/configuration.md
rename to docs/_docs/configuration.md
diff --git a/site/_docs/continuous-integration.md b/docs/_docs/continuous-integration.md
similarity index 100%
rename from site/_docs/continuous-integration.md
rename to docs/_docs/continuous-integration.md
diff --git a/site/_docs/contributing.md b/docs/_docs/contributing.md
similarity index 100%
rename from site/_docs/contributing.md
rename to docs/_docs/contributing.md
diff --git a/site/_docs/datafiles.md b/docs/_docs/datafiles.md
similarity index 100%
rename from site/_docs/datafiles.md
rename to docs/_docs/datafiles.md
diff --git a/site/_docs/deployment-methods.md b/docs/_docs/deployment-methods.md
similarity index 100%
rename from site/_docs/deployment-methods.md
rename to docs/_docs/deployment-methods.md
diff --git a/docs/affinity-team-captain.md b/docs/_docs/development/affinity-team-captain.md
similarity index 94%
rename from docs/affinity-team-captain.md
rename to docs/_docs/development/affinity-team-captain.md
index ccdcec7a689..addfececc58 100644
--- a/docs/affinity-team-captain.md
+++ b/docs/_docs/development/affinity-team-captain.md
@@ -1,6 +1,11 @@
-# Affinity Team Captains
+---
+title: Affinity Team Captains
+layout: docs
+permalink: /docs/development/affinity-team-captain/
+---
 
 **This guide is for affinity team captains.** These special people are **team maintainers** of one of our [affinity teams][] and help triage and evaluate the issues and contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
+{: .note .info }
 
 ## Affinity teams & their captains
 
diff --git a/docs/avoiding-burnout.md b/docs/_docs/development/avoiding-burnout.md
similarity index 95%
rename from docs/avoiding-burnout.md
rename to docs/_docs/development/avoiding-burnout.md
index f5625e6891e..34d878f706b 100644
--- a/docs/avoiding-burnout.md
+++ b/docs/_docs/development/avoiding-burnout.md
@@ -1,6 +1,11 @@
-# Maintainers: Avoiding Burnout
+---
+title: "Avoiding Burnout"
+layout: docs
+permalink: /docs/development/avoiding-burnout/
+---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
+{: .note .info }
 
 # 1. Use Jekyll
 
diff --git a/docs/becoming-a-maintainer.md b/docs/_docs/development/becoming-a-maintainer.md
similarity index 96%
rename from docs/becoming-a-maintainer.md
rename to docs/_docs/development/becoming-a-maintainer.md
index f6473787294..e15ac3e41b6 100644
--- a/docs/becoming-a-maintainer.md
+++ b/docs/_docs/development/becoming-a-maintainer.md
@@ -1,6 +1,11 @@
-# Contributors: Becoming a Maintainer
+---
+title: "Becoming a Maintainer"
+layout: docs
+permalink: /docs/development/becoming-a-maintainer/
+---
 
 **This guide is for contributors.** These special people have contributed to one or more of Jekyll's repositories, but do not yet have write access to any. You may find what is written here interesting, but it’s definitely not for everyone.
+{: .note .info }
 
 So you want to become a maintainer of a Jekyll project? We'd love to have you! Here are some things we like to see from community members before we promote them to maintainers.
 
diff --git a/docs/_docs/development/index.md b/docs/_docs/development/index.md
new file mode 100644
index 00000000000..4b585c832f2
--- /dev/null
+++ b/docs/_docs/development/index.md
@@ -0,0 +1,20 @@
+---
+layout: docs
+title: Maintaining Jekyll
+permalink: /docs/development/
+---
+
+**This guide is for Jekyll contributors and maintainers.** These special people contribute to one or more of Jekyll's repositories or help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
+{: .note .info }
+
+Hello! This is where we document various processes for maintaining Jekyll. Being a maintainer for any Jekyll project is a big responsibility, so we put together some helpful documentation for various tasks you might do as a maintainer.
+
+1. [Triaging and issue](triaging-an-issue/)
+2. [Reviewing a pull request](reviewing-a-pull-request/)
+3. [Merging a pull request](merging-a-pull-request/)
+4. [Avoiding burnout](avoiding-burnout/)
+5. [Special Labels](special-labels/)
+
+Interested in becoming a maintainer? Here is some documentation for **contributors**:
+
+1. [Becoming a maintainer](becoming-a-maintainer/)
diff --git a/docs/merging-a-pull-request.md b/docs/_docs/development/merging-a-pull-request.md
similarity index 96%
rename from docs/merging-a-pull-request.md
rename to docs/_docs/development/merging-a-pull-request.md
index 3d56b09660d..37970c4de92 100644
--- a/docs/merging-a-pull-request.md
+++ b/docs/_docs/development/merging-a-pull-request.md
@@ -1,6 +1,11 @@
-# Maintainers: Merging a Pull Request
+---
+title: "Merging a Pull Request"
+layout: docs
+permalink: /docs/development/merging-a-pull-request/
+---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
+{: .note .info }
 
 ## Code Review
 
diff --git a/docs/reviewing-a-pull-request.md b/docs/_docs/development/reviewing-a-pull-request.md
similarity index 96%
rename from docs/reviewing-a-pull-request.md
rename to docs/_docs/development/reviewing-a-pull-request.md
index b2c3e0def61..a6a26f423a9 100644
--- a/docs/reviewing-a-pull-request.md
+++ b/docs/_docs/development/reviewing-a-pull-request.md
@@ -1,6 +1,11 @@
-# Maintainers: Reviewing a Pull Request
+---
+title: "Reviewing a Pull Request"
+layout: docs
+permalink: /docs/development/reviewing-a-pull-request/
+---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
+{: .note .info }
 
 ## Respond Kindly
 
@@ -41,4 +46,3 @@ A pull request may be merged once two maintainers have reviewed the pull request
 ## Think Security
 
 We owe it to our users to ensure that using a theme from the community or building someone else's site doesn't come with built-in security vulnerabilities. Things like where files may be read from and written to are important to keep secure. Jekyll is also the basis for hosted services such as [GitHub Pages](https://pages.github.com), which cannot upgrade when security issues are introduced.
-
diff --git a/docs/special-labels.md b/docs/_docs/development/special-labels.md
similarity index 93%
rename from docs/special-labels.md
rename to docs/_docs/development/special-labels.md
index 8ce525977e6..ba39cdc30d6 100644
--- a/docs/special-labels.md
+++ b/docs/_docs/development/special-labels.md
@@ -1,6 +1,11 @@
-# Maintainers: Special Labels
+---
+title: "Special Labels"
+layout: docs
+permalink: /docs/development/special-labels/
+---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
+{: .note .info }
 
 We use a series of "special labels" on GitHub.com to automate handling of some parts of the pull request and issue process. @jekyllbot may automatically apply or remove certain labels based on actions taken by users or maintainers. Below are the labels and how they work:
 
diff --git a/docs/triaging-an-issue.md b/docs/_docs/development/triaging-an-issue.md
similarity index 97%
rename from docs/triaging-an-issue.md
rename to docs/_docs/development/triaging-an-issue.md
index 405dffaf45f..a919d4bbe5f 100644
--- a/docs/triaging-an-issue.md
+++ b/docs/_docs/development/triaging-an-issue.md
@@ -1,6 +1,11 @@
-# Maintainers: Triaging an Issue
+---
+title: "Triaging an Issue"
+layout: docs
+permalink: /docs/development/triaging-an-issue/
+---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
+{: .note .info }
 
 Before evaluating an issue, it is important to identify if it is a feature
 request or a bug. For the Jekyll project the following definitions are used
diff --git a/site/_docs/drafts.md b/docs/_docs/drafts.md
similarity index 100%
rename from site/_docs/drafts.md
rename to docs/_docs/drafts.md
diff --git a/site/_docs/extras.md b/docs/_docs/extras.md
similarity index 100%
rename from site/_docs/extras.md
rename to docs/_docs/extras.md
diff --git a/site/_docs/frontmatter.md b/docs/_docs/frontmatter.md
similarity index 100%
rename from site/_docs/frontmatter.md
rename to docs/_docs/frontmatter.md
diff --git a/site/_docs/github-pages.md b/docs/_docs/github-pages.md
similarity index 100%
rename from site/_docs/github-pages.md
rename to docs/_docs/github-pages.md
diff --git a/site/_docs/history.md b/docs/_docs/history.md
similarity index 100%
rename from site/_docs/history.md
rename to docs/_docs/history.md
diff --git a/site/_docs/index.md b/docs/_docs/index.md
similarity index 100%
rename from site/_docs/index.md
rename to docs/_docs/index.md
diff --git a/site/_docs/installation.md b/docs/_docs/installation.md
similarity index 100%
rename from site/_docs/installation.md
rename to docs/_docs/installation.md
diff --git a/site/_docs/migrations.md b/docs/_docs/migrations.md
similarity index 100%
rename from site/_docs/migrations.md
rename to docs/_docs/migrations.md
diff --git a/site/_docs/pages.md b/docs/_docs/pages.md
similarity index 100%
rename from site/_docs/pages.md
rename to docs/_docs/pages.md
diff --git a/site/_docs/pagination.md b/docs/_docs/pagination.md
similarity index 100%
rename from site/_docs/pagination.md
rename to docs/_docs/pagination.md
diff --git a/site/_docs/permalinks.md b/docs/_docs/permalinks.md
similarity index 100%
rename from site/_docs/permalinks.md
rename to docs/_docs/permalinks.md
diff --git a/site/_docs/plugins.md b/docs/_docs/plugins.md
similarity index 100%
rename from site/_docs/plugins.md
rename to docs/_docs/plugins.md
diff --git a/site/_docs/posts.md b/docs/_docs/posts.md
similarity index 100%
rename from site/_docs/posts.md
rename to docs/_docs/posts.md
diff --git a/site/_docs/quickstart.md b/docs/_docs/quickstart.md
similarity index 100%
rename from site/_docs/quickstart.md
rename to docs/_docs/quickstart.md
diff --git a/site/_docs/resources.md b/docs/_docs/resources.md
similarity index 100%
rename from site/_docs/resources.md
rename to docs/_docs/resources.md
diff --git a/site/_docs/sites.md b/docs/_docs/sites.md
similarity index 100%
rename from site/_docs/sites.md
rename to docs/_docs/sites.md
diff --git a/site/_docs/static_files.md b/docs/_docs/static_files.md
similarity index 100%
rename from site/_docs/static_files.md
rename to docs/_docs/static_files.md
diff --git a/site/_docs/structure.md b/docs/_docs/structure.md
similarity index 100%
rename from site/_docs/structure.md
rename to docs/_docs/structure.md
diff --git a/site/_docs/templates.md b/docs/_docs/templates.md
similarity index 100%
rename from site/_docs/templates.md
rename to docs/_docs/templates.md
diff --git a/site/_docs/themes.md b/docs/_docs/themes.md
similarity index 100%
rename from site/_docs/themes.md
rename to docs/_docs/themes.md
diff --git a/site/_docs/troubleshooting.md b/docs/_docs/troubleshooting.md
similarity index 100%
rename from site/_docs/troubleshooting.md
rename to docs/_docs/troubleshooting.md
diff --git a/site/_docs/upgrading.md b/docs/_docs/upgrading.md
similarity index 100%
rename from site/_docs/upgrading.md
rename to docs/_docs/upgrading.md
diff --git a/site/_docs/upgrading/0-to-2.md b/docs/_docs/upgrading/0-to-2.md
similarity index 100%
rename from site/_docs/upgrading/0-to-2.md
rename to docs/_docs/upgrading/0-to-2.md
diff --git a/site/_docs/upgrading/2-to-3.md b/docs/_docs/upgrading/2-to-3.md
similarity index 100%
rename from site/_docs/upgrading/2-to-3.md
rename to docs/_docs/upgrading/2-to-3.md
diff --git a/site/_docs/usage.md b/docs/_docs/usage.md
similarity index 100%
rename from site/_docs/usage.md
rename to docs/_docs/usage.md
diff --git a/site/_docs/variables.md b/docs/_docs/variables.md
similarity index 100%
rename from site/_docs/variables.md
rename to docs/_docs/variables.md
diff --git a/site/_docs/windows.md b/docs/_docs/windows.md
similarity index 100%
rename from site/_docs/windows.md
rename to docs/_docs/windows.md
diff --git a/site/_includes/analytics.html b/docs/_includes/analytics.html
similarity index 100%
rename from site/_includes/analytics.html
rename to docs/_includes/analytics.html
diff --git a/site/_includes/anchor_links.html b/docs/_includes/anchor_links.html
similarity index 100%
rename from site/_includes/anchor_links.html
rename to docs/_includes/anchor_links.html
diff --git a/site/_includes/docs_contents.html b/docs/_includes/docs_contents.html
similarity index 100%
rename from site/_includes/docs_contents.html
rename to docs/_includes/docs_contents.html
diff --git a/site/_includes/docs_contents_mobile.html b/docs/_includes/docs_contents_mobile.html
similarity index 100%
rename from site/_includes/docs_contents_mobile.html
rename to docs/_includes/docs_contents_mobile.html
diff --git a/site/_includes/docs_option.html b/docs/_includes/docs_option.html
similarity index 100%
rename from site/_includes/docs_option.html
rename to docs/_includes/docs_option.html
diff --git a/site/_includes/docs_ul.html b/docs/_includes/docs_ul.html
similarity index 100%
rename from site/_includes/docs_ul.html
rename to docs/_includes/docs_ul.html
diff --git a/site/_includes/footer.html b/docs/_includes/footer.html
similarity index 100%
rename from site/_includes/footer.html
rename to docs/_includes/footer.html
diff --git a/site/_includes/header.html b/docs/_includes/header.html
similarity index 100%
rename from site/_includes/header.html
rename to docs/_includes/header.html
diff --git a/site/_includes/news_contents.html b/docs/_includes/news_contents.html
similarity index 100%
rename from site/_includes/news_contents.html
rename to docs/_includes/news_contents.html
diff --git a/site/_includes/news_contents_mobile.html b/docs/_includes/news_contents_mobile.html
similarity index 100%
rename from site/_includes/news_contents_mobile.html
rename to docs/_includes/news_contents_mobile.html
diff --git a/site/_includes/news_item.html b/docs/_includes/news_item.html
similarity index 100%
rename from site/_includes/news_item.html
rename to docs/_includes/news_item.html
diff --git a/site/_includes/primary-nav-items.html b/docs/_includes/primary-nav-items.html
similarity index 100%
rename from site/_includes/primary-nav-items.html
rename to docs/_includes/primary-nav-items.html
diff --git a/site/_includes/section_nav.html b/docs/_includes/section_nav.html
similarity index 100%
rename from site/_includes/section_nav.html
rename to docs/_includes/section_nav.html
diff --git a/site/_includes/top.html b/docs/_includes/top.html
similarity index 100%
rename from site/_includes/top.html
rename to docs/_includes/top.html
diff --git a/site/_layouts/default.html b/docs/_layouts/default.html
similarity index 100%
rename from site/_layouts/default.html
rename to docs/_layouts/default.html
diff --git a/site/_layouts/docs.html b/docs/_layouts/docs.html
similarity index 100%
rename from site/_layouts/docs.html
rename to docs/_layouts/docs.html
diff --git a/site/_layouts/error.html b/docs/_layouts/error.html
similarity index 100%
rename from site/_layouts/error.html
rename to docs/_layouts/error.html
diff --git a/site/_layouts/news.html b/docs/_layouts/news.html
similarity index 100%
rename from site/_layouts/news.html
rename to docs/_layouts/news.html
diff --git a/site/_layouts/news_item.html b/docs/_layouts/news_item.html
similarity index 100%
rename from site/_layouts/news_item.html
rename to docs/_layouts/news_item.html
diff --git a/site/_layouts/page.html b/docs/_layouts/page.html
similarity index 100%
rename from site/_layouts/page.html
rename to docs/_layouts/page.html
diff --git a/site/_posts/2013-05-06-jekyll-1-0-0-released.markdown b/docs/_posts/2013-05-06-jekyll-1-0-0-released.markdown
similarity index 100%
rename from site/_posts/2013-05-06-jekyll-1-0-0-released.markdown
rename to docs/_posts/2013-05-06-jekyll-1-0-0-released.markdown
diff --git a/site/_posts/2013-05-08-jekyll-1-0-1-released.markdown b/docs/_posts/2013-05-08-jekyll-1-0-1-released.markdown
similarity index 100%
rename from site/_posts/2013-05-08-jekyll-1-0-1-released.markdown
rename to docs/_posts/2013-05-08-jekyll-1-0-1-released.markdown
diff --git a/site/_posts/2013-05-12-jekyll-1-0-2-released.markdown b/docs/_posts/2013-05-12-jekyll-1-0-2-released.markdown
similarity index 100%
rename from site/_posts/2013-05-12-jekyll-1-0-2-released.markdown
rename to docs/_posts/2013-05-12-jekyll-1-0-2-released.markdown
diff --git a/site/_posts/2013-06-07-jekyll-1-0-3-released.markdown b/docs/_posts/2013-06-07-jekyll-1-0-3-released.markdown
similarity index 100%
rename from site/_posts/2013-06-07-jekyll-1-0-3-released.markdown
rename to docs/_posts/2013-06-07-jekyll-1-0-3-released.markdown
diff --git a/site/_posts/2013-07-14-jekyll-1-1-0-released.markdown b/docs/_posts/2013-07-14-jekyll-1-1-0-released.markdown
similarity index 100%
rename from site/_posts/2013-07-14-jekyll-1-1-0-released.markdown
rename to docs/_posts/2013-07-14-jekyll-1-1-0-released.markdown
diff --git a/site/_posts/2013-07-24-jekyll-1-1-1-released.markdown b/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown
similarity index 100%
rename from site/_posts/2013-07-24-jekyll-1-1-1-released.markdown
rename to docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown
diff --git a/site/_posts/2013-07-25-jekyll-1-0-4-released.markdown b/docs/_posts/2013-07-25-jekyll-1-0-4-released.markdown
similarity index 100%
rename from site/_posts/2013-07-25-jekyll-1-0-4-released.markdown
rename to docs/_posts/2013-07-25-jekyll-1-0-4-released.markdown
diff --git a/site/_posts/2013-07-25-jekyll-1-1-2-released.markdown b/docs/_posts/2013-07-25-jekyll-1-1-2-released.markdown
similarity index 100%
rename from site/_posts/2013-07-25-jekyll-1-1-2-released.markdown
rename to docs/_posts/2013-07-25-jekyll-1-1-2-released.markdown
diff --git a/site/_posts/2013-09-06-jekyll-1-2-0-released.markdown b/docs/_posts/2013-09-06-jekyll-1-2-0-released.markdown
similarity index 100%
rename from site/_posts/2013-09-06-jekyll-1-2-0-released.markdown
rename to docs/_posts/2013-09-06-jekyll-1-2-0-released.markdown
diff --git a/site/_posts/2013-09-14-jekyll-1-2-1-released.markdown b/docs/_posts/2013-09-14-jekyll-1-2-1-released.markdown
similarity index 100%
rename from site/_posts/2013-09-14-jekyll-1-2-1-released.markdown
rename to docs/_posts/2013-09-14-jekyll-1-2-1-released.markdown
diff --git a/site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown b/docs/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
similarity index 100%
rename from site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
rename to docs/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
diff --git a/site/_posts/2013-11-04-jekyll-1-3-0-released.markdown b/docs/_posts/2013-11-04-jekyll-1-3-0-released.markdown
similarity index 100%
rename from site/_posts/2013-11-04-jekyll-1-3-0-released.markdown
rename to docs/_posts/2013-11-04-jekyll-1-3-0-released.markdown
diff --git a/site/_posts/2013-11-26-jekyll-1-3-1-released.markdown b/docs/_posts/2013-11-26-jekyll-1-3-1-released.markdown
similarity index 100%
rename from site/_posts/2013-11-26-jekyll-1-3-1-released.markdown
rename to docs/_posts/2013-11-26-jekyll-1-3-1-released.markdown
diff --git a/site/_posts/2013-12-07-jekyll-1-4-0-released.markdown b/docs/_posts/2013-12-07-jekyll-1-4-0-released.markdown
similarity index 100%
rename from site/_posts/2013-12-07-jekyll-1-4-0-released.markdown
rename to docs/_posts/2013-12-07-jekyll-1-4-0-released.markdown
diff --git a/site/_posts/2013-12-09-jekyll-1-4-1-released.markdown b/docs/_posts/2013-12-09-jekyll-1-4-1-released.markdown
similarity index 100%
rename from site/_posts/2013-12-09-jekyll-1-4-1-released.markdown
rename to docs/_posts/2013-12-09-jekyll-1-4-1-released.markdown
diff --git a/site/_posts/2013-12-16-jekyll-1-4-2-released.markdown b/docs/_posts/2013-12-16-jekyll-1-4-2-released.markdown
similarity index 100%
rename from site/_posts/2013-12-16-jekyll-1-4-2-released.markdown
rename to docs/_posts/2013-12-16-jekyll-1-4-2-released.markdown
diff --git a/site/_posts/2014-01-13-jekyll-1-4-3-released.markdown b/docs/_posts/2014-01-13-jekyll-1-4-3-released.markdown
similarity index 100%
rename from site/_posts/2014-01-13-jekyll-1-4-3-released.markdown
rename to docs/_posts/2014-01-13-jekyll-1-4-3-released.markdown
diff --git a/site/_posts/2014-03-24-jekyll-1-5-0-released.markdown b/docs/_posts/2014-03-24-jekyll-1-5-0-released.markdown
similarity index 100%
rename from site/_posts/2014-03-24-jekyll-1-5-0-released.markdown
rename to docs/_posts/2014-03-24-jekyll-1-5-0-released.markdown
diff --git a/site/_posts/2014-03-27-jekyll-1-5-1-released.markdown b/docs/_posts/2014-03-27-jekyll-1-5-1-released.markdown
similarity index 100%
rename from site/_posts/2014-03-27-jekyll-1-5-1-released.markdown
rename to docs/_posts/2014-03-27-jekyll-1-5-1-released.markdown
diff --git a/site/_posts/2014-05-06-jekyll-turns-2-0-0.markdown b/docs/_posts/2014-05-06-jekyll-turns-2-0-0.markdown
similarity index 100%
rename from site/_posts/2014-05-06-jekyll-turns-2-0-0.markdown
rename to docs/_posts/2014-05-06-jekyll-turns-2-0-0.markdown
diff --git a/site/_posts/2014-05-08-jekyll-2-0-3-released.markdown b/docs/_posts/2014-05-08-jekyll-2-0-3-released.markdown
similarity index 100%
rename from site/_posts/2014-05-08-jekyll-2-0-3-released.markdown
rename to docs/_posts/2014-05-08-jekyll-2-0-3-released.markdown
diff --git a/site/_posts/2014-06-04-jekyll-stickers-1-dollar-stickermule.markdown b/docs/_posts/2014-06-04-jekyll-stickers-1-dollar-stickermule.markdown
similarity index 100%
rename from site/_posts/2014-06-04-jekyll-stickers-1-dollar-stickermule.markdown
rename to docs/_posts/2014-06-04-jekyll-stickers-1-dollar-stickermule.markdown
diff --git a/site/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown b/docs/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown
similarity index 100%
rename from site/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown
rename to docs/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown
diff --git a/site/_posts/2014-07-01-jekyll-2-1-1-released.markdown b/docs/_posts/2014-07-01-jekyll-2-1-1-released.markdown
similarity index 100%
rename from site/_posts/2014-07-01-jekyll-2-1-1-released.markdown
rename to docs/_posts/2014-07-01-jekyll-2-1-1-released.markdown
diff --git a/site/_posts/2014-07-29-jekyll-2-2-0-released.markdown b/docs/_posts/2014-07-29-jekyll-2-2-0-released.markdown
similarity index 100%
rename from site/_posts/2014-07-29-jekyll-2-2-0-released.markdown
rename to docs/_posts/2014-07-29-jekyll-2-2-0-released.markdown
diff --git a/site/_posts/2014-08-10-jekyll-2-3-0-released.markdown b/docs/_posts/2014-08-10-jekyll-2-3-0-released.markdown
similarity index 100%
rename from site/_posts/2014-08-10-jekyll-2-3-0-released.markdown
rename to docs/_posts/2014-08-10-jekyll-2-3-0-released.markdown
diff --git a/site/_posts/2014-09-09-jekyll-2-4-0-released.markdown b/docs/_posts/2014-09-09-jekyll-2-4-0-released.markdown
similarity index 100%
rename from site/_posts/2014-09-09-jekyll-2-4-0-released.markdown
rename to docs/_posts/2014-09-09-jekyll-2-4-0-released.markdown
diff --git a/site/_posts/2014-11-06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown b/docs/_posts/2014-11-06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown
similarity index 100%
rename from site/_posts/2014-11-06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown
rename to docs/_posts/2014-11-06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown
diff --git a/site/_posts/2014-11-08-jekyll-2-5-1-released.markdown b/docs/_posts/2014-11-08-jekyll-2-5-1-released.markdown
similarity index 100%
rename from site/_posts/2014-11-08-jekyll-2-5-1-released.markdown
rename to docs/_posts/2014-11-08-jekyll-2-5-1-released.markdown
diff --git a/site/_posts/2014-11-12-jekyll-2-5-2-released.markdown b/docs/_posts/2014-11-12-jekyll-2-5-2-released.markdown
similarity index 100%
rename from site/_posts/2014-11-12-jekyll-2-5-2-released.markdown
rename to docs/_posts/2014-11-12-jekyll-2-5-2-released.markdown
diff --git a/site/_posts/2014-12-17-alfredxing-welcome-to-jekyll-core.md b/docs/_posts/2014-12-17-alfredxing-welcome-to-jekyll-core.md
similarity index 100%
rename from site/_posts/2014-12-17-alfredxing-welcome-to-jekyll-core.md
rename to docs/_posts/2014-12-17-alfredxing-welcome-to-jekyll-core.md
diff --git a/site/_posts/2014-12-22-jekyll-2-5-3-released.markdown b/docs/_posts/2014-12-22-jekyll-2-5-3-released.markdown
similarity index 100%
rename from site/_posts/2014-12-22-jekyll-2-5-3-released.markdown
rename to docs/_posts/2014-12-22-jekyll-2-5-3-released.markdown
diff --git a/site/_posts/2015-01-20-jekyll-meet-and-greet.markdown b/docs/_posts/2015-01-20-jekyll-meet-and-greet.markdown
similarity index 100%
rename from site/_posts/2015-01-20-jekyll-meet-and-greet.markdown
rename to docs/_posts/2015-01-20-jekyll-meet-and-greet.markdown
diff --git a/site/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown b/docs/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown
similarity index 100%
rename from site/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown
rename to docs/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown
diff --git a/site/_posts/2015-02-26-introducing-jekyll-talk.markdown b/docs/_posts/2015-02-26-introducing-jekyll-talk.markdown
similarity index 100%
rename from site/_posts/2015-02-26-introducing-jekyll-talk.markdown
rename to docs/_posts/2015-02-26-introducing-jekyll-talk.markdown
diff --git a/site/_posts/2015-10-26-jekyll-3-0-released.markdown b/docs/_posts/2015-10-26-jekyll-3-0-released.markdown
similarity index 100%
rename from site/_posts/2015-10-26-jekyll-3-0-released.markdown
rename to docs/_posts/2015-10-26-jekyll-3-0-released.markdown
diff --git a/site/_posts/2015-11-17-jekyll-3-0-1-released.markdown b/docs/_posts/2015-11-17-jekyll-3-0-1-released.markdown
similarity index 100%
rename from site/_posts/2015-11-17-jekyll-3-0-1-released.markdown
rename to docs/_posts/2015-11-17-jekyll-3-0-1-released.markdown
diff --git a/site/_posts/2016-01-20-jekyll-3-0-2-released.markdown b/docs/_posts/2016-01-20-jekyll-3-0-2-released.markdown
similarity index 100%
rename from site/_posts/2016-01-20-jekyll-3-0-2-released.markdown
rename to docs/_posts/2016-01-20-jekyll-3-0-2-released.markdown
diff --git a/site/_posts/2016-01-24-jekyll-3-1-0-released.markdown b/docs/_posts/2016-01-24-jekyll-3-1-0-released.markdown
similarity index 100%
rename from site/_posts/2016-01-24-jekyll-3-1-0-released.markdown
rename to docs/_posts/2016-01-24-jekyll-3-1-0-released.markdown
diff --git a/site/_posts/2016-01-28-jekyll-3-1-1-released.markdown b/docs/_posts/2016-01-28-jekyll-3-1-1-released.markdown
similarity index 100%
rename from site/_posts/2016-01-28-jekyll-3-1-1-released.markdown
rename to docs/_posts/2016-01-28-jekyll-3-1-1-released.markdown
diff --git a/site/_posts/2016-02-08-jekyll-3-0-3-released.markdown b/docs/_posts/2016-02-08-jekyll-3-0-3-released.markdown
similarity index 100%
rename from site/_posts/2016-02-08-jekyll-3-0-3-released.markdown
rename to docs/_posts/2016-02-08-jekyll-3-0-3-released.markdown
diff --git a/site/_posts/2016-02-19-jekyll-3-1-2-released.markdown b/docs/_posts/2016-02-19-jekyll-3-1-2-released.markdown
similarity index 100%
rename from site/_posts/2016-02-19-jekyll-3-1-2-released.markdown
rename to docs/_posts/2016-02-19-jekyll-3-1-2-released.markdown
diff --git a/site/_posts/2016-03-10-making-it-easier-to-contribute-to-jekyll.md b/docs/_posts/2016-03-10-making-it-easier-to-contribute-to-jekyll.md
similarity index 100%
rename from site/_posts/2016-03-10-making-it-easier-to-contribute-to-jekyll.md
rename to docs/_posts/2016-03-10-making-it-easier-to-contribute-to-jekyll.md
diff --git a/site/_posts/2016-04-19-jekyll-3-0-4-released.markdown b/docs/_posts/2016-04-19-jekyll-3-0-4-released.markdown
similarity index 100%
rename from site/_posts/2016-04-19-jekyll-3-0-4-released.markdown
rename to docs/_posts/2016-04-19-jekyll-3-0-4-released.markdown
diff --git a/site/_posts/2016-04-19-jekyll-3-1-3-released.markdown b/docs/_posts/2016-04-19-jekyll-3-1-3-released.markdown
similarity index 100%
rename from site/_posts/2016-04-19-jekyll-3-1-3-released.markdown
rename to docs/_posts/2016-04-19-jekyll-3-1-3-released.markdown
diff --git a/site/_posts/2016-04-26-jekyll-3-0-5-released.markdown b/docs/_posts/2016-04-26-jekyll-3-0-5-released.markdown
similarity index 100%
rename from site/_posts/2016-04-26-jekyll-3-0-5-released.markdown
rename to docs/_posts/2016-04-26-jekyll-3-0-5-released.markdown
diff --git a/site/_posts/2016-05-18-jekyll-3-1-4-released.markdown b/docs/_posts/2016-05-18-jekyll-3-1-4-released.markdown
similarity index 100%
rename from site/_posts/2016-05-18-jekyll-3-1-4-released.markdown
rename to docs/_posts/2016-05-18-jekyll-3-1-4-released.markdown
diff --git a/site/_posts/2016-05-18-jekyll-3-1-5-released.markdown b/docs/_posts/2016-05-18-jekyll-3-1-5-released.markdown
similarity index 100%
rename from site/_posts/2016-05-18-jekyll-3-1-5-released.markdown
rename to docs/_posts/2016-05-18-jekyll-3-1-5-released.markdown
diff --git a/site/_posts/2016-05-19-jekyll-3-1-6-released.markdown b/docs/_posts/2016-05-19-jekyll-3-1-6-released.markdown
similarity index 100%
rename from site/_posts/2016-05-19-jekyll-3-1-6-released.markdown
rename to docs/_posts/2016-05-19-jekyll-3-1-6-released.markdown
diff --git a/site/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown b/docs/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown
similarity index 100%
rename from site/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown
rename to docs/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown
diff --git a/site/_posts/2016-07-26-jekyll-3-2-0-released.markdown b/docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown
similarity index 100%
rename from site/_posts/2016-07-26-jekyll-3-2-0-released.markdown
rename to docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown
diff --git a/site/_posts/2016-08-02-jekyll-3-2-1-released.markdown b/docs/_posts/2016-08-02-jekyll-3-2-1-released.markdown
similarity index 100%
rename from site/_posts/2016-08-02-jekyll-3-2-1-released.markdown
rename to docs/_posts/2016-08-02-jekyll-3-2-1-released.markdown
diff --git a/site/_posts/2016-08-24-jekyll-admin-initial-release.markdown b/docs/_posts/2016-08-24-jekyll-admin-initial-release.markdown
similarity index 100%
rename from site/_posts/2016-08-24-jekyll-admin-initial-release.markdown
rename to docs/_posts/2016-08-24-jekyll-admin-initial-release.markdown
diff --git a/site/_posts/2016-10-06-jekyll-3-3-is-here.md b/docs/_posts/2016-10-06-jekyll-3-3-is-here.md
similarity index 100%
rename from site/_posts/2016-10-06-jekyll-3-3-is-here.md
rename to docs/_posts/2016-10-06-jekyll-3-3-is-here.md
diff --git a/site/_sass/_font-awesome.scss b/docs/_sass/_font-awesome.scss
similarity index 100%
rename from site/_sass/_font-awesome.scss
rename to docs/_sass/_font-awesome.scss
diff --git a/site/_sass/_gridism.scss b/docs/_sass/_gridism.scss
similarity index 100%
rename from site/_sass/_gridism.scss
rename to docs/_sass/_gridism.scss
diff --git a/site/_sass/_mixins.scss b/docs/_sass/_mixins.scss
similarity index 100%
rename from site/_sass/_mixins.scss
rename to docs/_sass/_mixins.scss
diff --git a/site/_sass/_normalize.scss b/docs/_sass/_normalize.scss
similarity index 100%
rename from site/_sass/_normalize.scss
rename to docs/_sass/_normalize.scss
diff --git a/site/_sass/_pygments.scss b/docs/_sass/_pygments.scss
similarity index 100%
rename from site/_sass/_pygments.scss
rename to docs/_sass/_pygments.scss
diff --git a/site/_sass/_style.scss b/docs/_sass/_style.scss
similarity index 100%
rename from site/_sass/_style.scss
rename to docs/_sass/_style.scss
diff --git a/site/community/index.md b/docs/community/index.md
similarity index 100%
rename from site/community/index.md
rename to docs/community/index.md
diff --git a/site/css/screen.scss b/docs/css/screen.scss
similarity index 100%
rename from site/css/screen.scss
rename to docs/css/screen.scss
diff --git a/site/favicon.ico b/docs/favicon.ico
similarity index 100%
rename from site/favicon.ico
rename to docs/favicon.ico
diff --git a/site/fonts/fontawesome-webfont.eot b/docs/fonts/fontawesome-webfont.eot
similarity index 100%
rename from site/fonts/fontawesome-webfont.eot
rename to docs/fonts/fontawesome-webfont.eot
diff --git a/site/fonts/fontawesome-webfont.svg b/docs/fonts/fontawesome-webfont.svg
similarity index 100%
rename from site/fonts/fontawesome-webfont.svg
rename to docs/fonts/fontawesome-webfont.svg
diff --git a/site/fonts/fontawesome-webfont.ttf b/docs/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from site/fonts/fontawesome-webfont.ttf
rename to docs/fonts/fontawesome-webfont.ttf
diff --git a/site/fonts/fontawesome-webfont.woff b/docs/fonts/fontawesome-webfont.woff
similarity index 100%
rename from site/fonts/fontawesome-webfont.woff
rename to docs/fonts/fontawesome-webfont.woff
diff --git a/site/fonts/fontawesome-webfont.woff2 b/docs/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from site/fonts/fontawesome-webfont.woff2
rename to docs/fonts/fontawesome-webfont.woff2
diff --git a/site/freenode.txt b/docs/freenode.txt
similarity index 100%
rename from site/freenode.txt
rename to docs/freenode.txt
diff --git a/site/help/index.md b/docs/help/index.md
similarity index 100%
rename from site/help/index.md
rename to docs/help/index.md
diff --git a/site/img/article-footer.png b/docs/img/article-footer.png
similarity index 100%
rename from site/img/article-footer.png
rename to docs/img/article-footer.png
diff --git a/site/img/footer-arrow.png b/docs/img/footer-arrow.png
similarity index 100%
rename from site/img/footer-arrow.png
rename to docs/img/footer-arrow.png
diff --git a/site/img/footer-logo.png b/docs/img/footer-logo.png
similarity index 100%
rename from site/img/footer-logo.png
rename to docs/img/footer-logo.png
diff --git a/site/img/jekyll-sticker.jpg b/docs/img/jekyll-sticker.jpg
similarity index 100%
rename from site/img/jekyll-sticker.jpg
rename to docs/img/jekyll-sticker.jpg
diff --git a/site/img/logo-2x.png b/docs/img/logo-2x.png
similarity index 100%
rename from site/img/logo-2x.png
rename to docs/img/logo-2x.png
diff --git a/site/img/logo-rss.png b/docs/img/logo-rss.png
similarity index 100%
rename from site/img/logo-rss.png
rename to docs/img/logo-rss.png
diff --git a/site/img/octojekyll.png b/docs/img/octojekyll.png
similarity index 100%
rename from site/img/octojekyll.png
rename to docs/img/octojekyll.png
diff --git a/site/index.html b/docs/index.html
similarity index 100%
rename from site/index.html
rename to docs/index.html
diff --git a/site/js/html5shiv.min.js b/docs/js/html5shiv.min.js
similarity index 100%
rename from site/js/html5shiv.min.js
rename to docs/js/html5shiv.min.js
diff --git a/site/js/respond.min.js b/docs/js/respond.min.js
similarity index 100%
rename from site/js/respond.min.js
rename to docs/js/respond.min.js
diff --git a/site/latest_version.txt b/docs/latest_version.txt
similarity index 100%
rename from site/latest_version.txt
rename to docs/latest_version.txt
diff --git a/site/news/index.html b/docs/news/index.html
similarity index 100%
rename from site/news/index.html
rename to docs/news/index.html
diff --git a/site/news/releases/index.html b/docs/news/releases/index.html
similarity index 100%
rename from site/news/releases/index.html
rename to docs/news/releases/index.html
diff --git a/docs/readme.md b/docs/readme.md
index f2cb1fed2b5..674d8b36dcf 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -1,13 +1,16 @@
-# Maintaining Jekyll
+# Jekyll docs site
 
-Hello! This is where we document various processes for maintaining Jekyll. Being a maintainer for any Jekyll project is a big responsibility, so we put together some helpful documentation for various tasks you might do as a maintainer.
+This directory contains the code for the Jekyll docs site, [jekyllrb.com](http://jekyllrb.com/).
 
-1. [Triaging and issue](triaging-an-issue.md)
-2. [Reviewing a pull request](reviewing-a-pull-request.md)
-3. [Merging a pull request](merging-a-pull-request.md)
-4. [Avoiding burnout](avoiding-burnout.md)
-5. [Special Labels](special-labels.md)
+## Contributing
 
-Interested in becoming a maintainer? Here is some documentation for **contributors**:
+For information about contributing, see the [Contributing page](http://jekyllrb.com/docs/contributing/).
 
-1. [Becoming a maintainer](becoming-a-maintainer.md)
+## Running locally
+
+You can preview your contributions before opening a pull request by running from within the directory:
+
+1. `bundle install --without test test_legacy benchmark`
+2. `bundle exec rake site:preview`
+
+It's just a jekyll site, afterall! :wink:
diff --git a/site/redirects/github.html b/docs/redirects/github.html
similarity index 100%
rename from site/redirects/github.html
rename to docs/redirects/github.html
diff --git a/site/redirects/issues.html b/docs/redirects/issues.html
similarity index 100%
rename from site/redirects/issues.html
rename to docs/redirects/issues.html
diff --git a/site/README.md b/site/README.md
deleted file mode 100644
index 674d8b36dcf..00000000000
--- a/site/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Jekyll docs site
-
-This directory contains the code for the Jekyll docs site, [jekyllrb.com](http://jekyllrb.com/).
-
-## Contributing
-
-For information about contributing, see the [Contributing page](http://jekyllrb.com/docs/contributing/).
-
-## Running locally
-
-You can preview your contributions before opening a pull request by running from within the directory:
-
-1. `bundle install --without test test_legacy benchmark`
-2. `bundle exec rake site:preview`
-
-It's just a jekyll site, afterall! :wink:

From db4c5710208fb95cfe8c2ba4bfd74a1eb827be9c Mon Sep 17 00:00:00 2001
From: Sverrir Sigmundarson 
Date: Mon, 10 Oct 2016 23:10:49 +0200
Subject: [PATCH 1565/4996] Updating install instruction link

Adding a link to updated installation instructions for Jekyll 3 and Ruby 2.2.5. These instructions were adapted and significantly updated from the earlier work of Julian Thilo which is now outdated.
---
 docs/_docs/windows.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index f64ac6d49d3..68edd8ef69d 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -16,8 +16,10 @@ A quick way to install Jekyll is to follow the [installation instructions by Dav
  2. Install Ruby via Chocolatey: `choco install ruby -y`
  3. Reopen a command prompt and install Jekyll: `gem install jekyll`
 
-For a more conventional way of installing Jekyll you can follow the [installation instruction by Julian Thilo][windows-installation]. The instructions were written for Ruby 2.0.0, but should work for later
-versions [prior to 2.2][hitimes-issue].
+For a more conventional way of installing Jekyll you can follow the [installation instructions by Sverrir Sigmundarson][windows-installjekyll3]. These instructions are for newer versions of Ruby 2.2.5 and Jekyll 3.
+
+For instructions for older versions of Ruby 2.0.0 ([prior to 2.2][hitimes-issue]) and Jekyll 2 and older you should follow the [installation instruction by Julian Thilo][windows-installation].
+
 
 ## Encoding
 
@@ -34,6 +36,7 @@ $ chcp 65001
 ```
 
 [windows-installation]: http://jekyll-windows.juthilo.com/
+[windows-installjekyll3]: https://labs.sverrirs.com/jekyll/
 [hitimes-issue]: https://github.com/copiousfreetime/hitimes/issues/40
 
 ## Auto-regeneration

From b108f4c87e6806c2b7f11e74ad6f426c9cc3b495 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 2 Nov 2016 14:03:08 -0700
Subject: [PATCH 1566/4996] Move docs/development to docs/maintaining

---
 docs/_data/docs.yml                                 |  2 +-
 .../affinity-team-captain.md                        |  1 -
 .../avoiding-burnout.md                             |  1 -
 .../becoming-a-maintainer.md                        |  1 -
 docs/_docs/{development => maintaining}/index.md    | 13 +++++++------
 .../merging-a-pull-request.md                       |  1 -
 .../reviewing-a-pull-request.md                     |  1 -
 .../{development => maintaining}/special-labels.md  |  1 -
 .../triaging-an-issue.md                            |  1 -
 9 files changed, 8 insertions(+), 14 deletions(-)
 rename docs/_docs/{development => maintaining}/affinity-team-captain.md (97%)
 rename docs/_docs/{development => maintaining}/avoiding-burnout.md (98%)
 rename docs/_docs/{development => maintaining}/becoming-a-maintainer.md (98%)
 rename docs/_docs/{development => maintaining}/index.md (68%)
 rename docs/_docs/{development => maintaining}/merging-a-pull-request.md (98%)
 rename docs/_docs/{development => maintaining}/reviewing-a-pull-request.md (98%)
 rename docs/_docs/{development => maintaining}/special-labels.md (97%)
 rename docs/_docs/{development => maintaining}/triaging-an-issue.md (98%)

diff --git a/docs/_data/docs.yml b/docs/_data/docs.yml
index 950d2a6c7c0..4ff28ba2a68 100644
--- a/docs/_data/docs.yml
+++ b/docs/_data/docs.yml
@@ -46,6 +46,6 @@
 - title: Meta
   docs:
   - contributing
-  - development
+  - maintaining
   - conduct
   - history
diff --git a/docs/_docs/development/affinity-team-captain.md b/docs/_docs/maintaining/affinity-team-captain.md
similarity index 97%
rename from docs/_docs/development/affinity-team-captain.md
rename to docs/_docs/maintaining/affinity-team-captain.md
index addfececc58..02247d2d17c 100644
--- a/docs/_docs/development/affinity-team-captain.md
+++ b/docs/_docs/maintaining/affinity-team-captain.md
@@ -1,7 +1,6 @@
 ---
 title: Affinity Team Captains
 layout: docs
-permalink: /docs/development/affinity-team-captain/
 ---
 
 **This guide is for affinity team captains.** These special people are **team maintainers** of one of our [affinity teams][] and help triage and evaluate the issues and contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/development/avoiding-burnout.md b/docs/_docs/maintaining/avoiding-burnout.md
similarity index 98%
rename from docs/_docs/development/avoiding-burnout.md
rename to docs/_docs/maintaining/avoiding-burnout.md
index 34d878f706b..a418cefdb5e 100644
--- a/docs/_docs/development/avoiding-burnout.md
+++ b/docs/_docs/maintaining/avoiding-burnout.md
@@ -1,7 +1,6 @@
 ---
 title: "Avoiding Burnout"
 layout: docs
-permalink: /docs/development/avoiding-burnout/
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/development/becoming-a-maintainer.md b/docs/_docs/maintaining/becoming-a-maintainer.md
similarity index 98%
rename from docs/_docs/development/becoming-a-maintainer.md
rename to docs/_docs/maintaining/becoming-a-maintainer.md
index e15ac3e41b6..c4a262b930c 100644
--- a/docs/_docs/development/becoming-a-maintainer.md
+++ b/docs/_docs/maintaining/becoming-a-maintainer.md
@@ -1,7 +1,6 @@
 ---
 title: "Becoming a Maintainer"
 layout: docs
-permalink: /docs/development/becoming-a-maintainer/
 ---
 
 **This guide is for contributors.** These special people have contributed to one or more of Jekyll's repositories, but do not yet have write access to any. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/development/index.md b/docs/_docs/maintaining/index.md
similarity index 68%
rename from docs/_docs/development/index.md
rename to docs/_docs/maintaining/index.md
index 4b585c832f2..5c4da4db308 100644
--- a/docs/_docs/development/index.md
+++ b/docs/_docs/maintaining/index.md
@@ -1,7 +1,7 @@
 ---
 layout: docs
 title: Maintaining Jekyll
-permalink: /docs/development/
+permalink: /docs/maintaining/
 ---
 
 **This guide is for Jekyll contributors and maintainers.** These special people contribute to one or more of Jekyll's repositories or help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
@@ -9,11 +9,12 @@ permalink: /docs/development/
 
 Hello! This is where we document various processes for maintaining Jekyll. Being a maintainer for any Jekyll project is a big responsibility, so we put together some helpful documentation for various tasks you might do as a maintainer.
 
-1. [Triaging and issue](triaging-an-issue/)
-2. [Reviewing a pull request](reviewing-a-pull-request/)
-3. [Merging a pull request](merging-a-pull-request/)
-4. [Avoiding burnout](avoiding-burnout/)
-5. [Special Labels](special-labels/)
+1. [Affinity teams & their captains](affinity-team-captain/)
+2. [Triaging and issue](triaging-an-issue/)
+3. [Reviewing a pull request](reviewing-a-pull-request/)
+4. [Merging a pull request](merging-a-pull-request/)
+5. [Avoiding burnout](avoiding-burnout/)
+6. [Special Labels](special-labels/)
 
 Interested in becoming a maintainer? Here is some documentation for **contributors**:
 
diff --git a/docs/_docs/development/merging-a-pull-request.md b/docs/_docs/maintaining/merging-a-pull-request.md
similarity index 98%
rename from docs/_docs/development/merging-a-pull-request.md
rename to docs/_docs/maintaining/merging-a-pull-request.md
index 37970c4de92..7265c6f857c 100644
--- a/docs/_docs/development/merging-a-pull-request.md
+++ b/docs/_docs/maintaining/merging-a-pull-request.md
@@ -1,7 +1,6 @@
 ---
 title: "Merging a Pull Request"
 layout: docs
-permalink: /docs/development/merging-a-pull-request/
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/development/reviewing-a-pull-request.md b/docs/_docs/maintaining/reviewing-a-pull-request.md
similarity index 98%
rename from docs/_docs/development/reviewing-a-pull-request.md
rename to docs/_docs/maintaining/reviewing-a-pull-request.md
index a6a26f423a9..1ecaeea9899 100644
--- a/docs/_docs/development/reviewing-a-pull-request.md
+++ b/docs/_docs/maintaining/reviewing-a-pull-request.md
@@ -1,7 +1,6 @@
 ---
 title: "Reviewing a Pull Request"
 layout: docs
-permalink: /docs/development/reviewing-a-pull-request/
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/development/special-labels.md b/docs/_docs/maintaining/special-labels.md
similarity index 97%
rename from docs/_docs/development/special-labels.md
rename to docs/_docs/maintaining/special-labels.md
index ba39cdc30d6..ff8a623f858 100644
--- a/docs/_docs/development/special-labels.md
+++ b/docs/_docs/maintaining/special-labels.md
@@ -1,7 +1,6 @@
 ---
 title: "Special Labels"
 layout: docs
-permalink: /docs/development/special-labels/
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/development/triaging-an-issue.md b/docs/_docs/maintaining/triaging-an-issue.md
similarity index 98%
rename from docs/_docs/development/triaging-an-issue.md
rename to docs/_docs/maintaining/triaging-an-issue.md
index a919d4bbe5f..4802b61b486 100644
--- a/docs/_docs/development/triaging-an-issue.md
+++ b/docs/_docs/maintaining/triaging-an-issue.md
@@ -1,7 +1,6 @@
 ---
 title: "Triaging an Issue"
 layout: docs
-permalink: /docs/development/triaging-an-issue/
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.

From 8b2a35dc509d0ec826a22c63193576df5f723917 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 2 Nov 2016 14:11:40 -0700
Subject: [PATCH 1567/4996] Instead of a sleep hack, just use a Jekyll hook!
 :smile:

---
 rake/site.rake | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/rake/site.rake b/rake/site.rake
index 679e4bf0768..45b0cac2f41 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -12,11 +12,11 @@ namespace :site do
     require "launchy"
     require "jekyll"
 
-    # Yep, it's a hack! Wait a few seconds for the Jekyll site to generate and
-    # then open it in a browser. Someday we can do better than this, I hope.
-    Thread.new do
-      sleep 4
-      puts "Opening in browser..."
+    browser_launched = false
+    Jekyll::Hooks.register :site, :post_write do |site|
+      next if browser_launched
+      browser_launched = true
+      Jekyll.logger.info "Opening in browser..."
       Launchy.open("http://localhost:4000")
     end
 
@@ -36,7 +36,7 @@ namespace :site do
   task :generate => :generated_pages do
     require "jekyll"
     Jekyll::Commands::Build.process({
-      "profile" => true,
+      "profile"     => true,
       "source"      => File.expand_path(docs_folder),
       "destination" => File.expand_path("#{docs_folder}/_site")
     })
@@ -54,14 +54,8 @@ namespace :site do
 
   desc "Generate generated pages and publish to GitHub Pages"
   task :publish => :generated_pages do
-    puts "Committing and pushing to GitHub Pages..."
-    sha = `git rev-parse HEAD`.strip
-    Dir.chdir('gh-pages') do
-      sh "git add docs/"
-      sh "git commit --allow-empty -m 'Generating pages for #{sha}.'"
-      sh "git push origin master"
-    end
-    puts 'Done.'
+    puts "GitHub Pages now compiles our docs site on every push to the `master` branch. Cool, huh?"
+    exit 1
   end
 
   desc "Create a nicely formatted history page for the jekyll site based on the repo history."

From 1669f944d16e71350a1c162f725689849cf7e399 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 2 Nov 2016 14:12:03 -0700
Subject: [PATCH 1568/4996] Move posts-specific permalink into collections
 metadata. Way better. :dizzy:

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

diff --git a/docs/_config.yml b/docs/_config.yml
index 5333c52ecba..6f57710aa2e 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,6 +1,5 @@
 markdown: kramdown
 highlighter: rouge
-permalink: /news/:year/:month/:day/:title/
 
 gauges_id: 503c5af6613f5d0f19000027
 google_analytics_id: UA-50755011-1
@@ -14,6 +13,9 @@ timezone: America/Los_Angeles
 collections:
   docs:
     output: true
+  posts:
+    permalink: /news/:year/:month/:day/:title/
+    output: true
 
 name: Jekyll • Simple, blog-aware, static sites
 description: Transform your plain text into static websites and blogs

From 2adac58b41a788eef41a6db1d4588a667de611da Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 2 Nov 2016 14:48:06 -0700
Subject: [PATCH 1569/4996] Update history to reflect merge of #5459 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 711367a82a5..8c51f23a3ef 100644
--- a/History.markdown
+++ b/History.markdown
@@ -13,6 +13,7 @@
   * Ubuntu users should install ruby2.3-dev (#5512)
   * Remove Glynn as deployment option (#5519)
   * Fix broken forum link (#5466)
+  * Move documentation to docs folder (#5459)
 
 ### Bug Fixes
 

From 3e2139e8940a38d2cd513dd38fc4517ad7a8af63 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 2 Nov 2016 15:09:46 -0700
Subject: [PATCH 1570/4996] Fix 'Improve this page' link.

Fixes #5529
---
 docs/_layouts/docs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_layouts/docs.html b/docs/_layouts/docs.html
index 0456c4cc9ae..7a6b052061d 100644
--- a/docs/_layouts/docs.html
+++ b/docs/_layouts/docs.html
@@ -10,7 +10,7 @@
       
    
         
    
           
    
-              Improve this page
+              Improve this page
           
    
           
    {{ page.title }}
    
           {{ content }}

From acc00e41fb841a626a50ba37992363235966f98e Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 3 Nov 2016 07:00:55 +0530
Subject: [PATCH 1571/4996] add permalinks to docs in '/maintaining/'

---
 docs/_docs/maintaining/affinity-team-captain.md    | 1 +
 docs/_docs/maintaining/avoiding-burnout.md         | 1 +
 docs/_docs/maintaining/becoming-a-maintainer.md    | 1 +
 docs/_docs/maintaining/merging-a-pull-request.md   | 1 +
 docs/_docs/maintaining/reviewing-a-pull-request.md | 1 +
 docs/_docs/maintaining/special-labels.md           | 1 +
 docs/_docs/maintaining/triaging-an-issue.md        | 1 +
 7 files changed, 7 insertions(+)

diff --git a/docs/_docs/maintaining/affinity-team-captain.md b/docs/_docs/maintaining/affinity-team-captain.md
index 02247d2d17c..0554fdc63e1 100644
--- a/docs/_docs/maintaining/affinity-team-captain.md
+++ b/docs/_docs/maintaining/affinity-team-captain.md
@@ -1,6 +1,7 @@
 ---
 title: Affinity Team Captains
 layout: docs
+permalink: /docs/maintaining/affinity-team-captain/
 ---
 
 **This guide is for affinity team captains.** These special people are **team maintainers** of one of our [affinity teams][] and help triage and evaluate the issues and contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/avoiding-burnout.md b/docs/_docs/maintaining/avoiding-burnout.md
index a418cefdb5e..72e46e1ac41 100644
--- a/docs/_docs/maintaining/avoiding-burnout.md
+++ b/docs/_docs/maintaining/avoiding-burnout.md
@@ -1,6 +1,7 @@
 ---
 title: "Avoiding Burnout"
 layout: docs
+permalink: /docs/maintaining/avoiding-burnout/
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/becoming-a-maintainer.md b/docs/_docs/maintaining/becoming-a-maintainer.md
index c4a262b930c..61b19e2cd20 100644
--- a/docs/_docs/maintaining/becoming-a-maintainer.md
+++ b/docs/_docs/maintaining/becoming-a-maintainer.md
@@ -1,6 +1,7 @@
 ---
 title: "Becoming a Maintainer"
 layout: docs
+permalink: /docs/maintaining/becoming-a-maintainer/
 ---
 
 **This guide is for contributors.** These special people have contributed to one or more of Jekyll's repositories, but do not yet have write access to any. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/merging-a-pull-request.md b/docs/_docs/maintaining/merging-a-pull-request.md
index 7265c6f857c..e5c5eacfef8 100644
--- a/docs/_docs/maintaining/merging-a-pull-request.md
+++ b/docs/_docs/maintaining/merging-a-pull-request.md
@@ -1,6 +1,7 @@
 ---
 title: "Merging a Pull Request"
 layout: docs
+permalink: /docs/maintaining/merging-a-pull-request/
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/reviewing-a-pull-request.md b/docs/_docs/maintaining/reviewing-a-pull-request.md
index 1ecaeea9899..3185a19ef43 100644
--- a/docs/_docs/maintaining/reviewing-a-pull-request.md
+++ b/docs/_docs/maintaining/reviewing-a-pull-request.md
@@ -1,6 +1,7 @@
 ---
 title: "Reviewing a Pull Request"
 layout: docs
+permalink: /docs/maintaining/reviewing-a-pull-request/
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/special-labels.md b/docs/_docs/maintaining/special-labels.md
index ff8a623f858..7a32a1fa4c7 100644
--- a/docs/_docs/maintaining/special-labels.md
+++ b/docs/_docs/maintaining/special-labels.md
@@ -1,6 +1,7 @@
 ---
 title: "Special Labels"
 layout: docs
+permalink: /docs/maintaining/special-labels/
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/triaging-an-issue.md b/docs/_docs/maintaining/triaging-an-issue.md
index 4802b61b486..6c97f967cba 100644
--- a/docs/_docs/maintaining/triaging-an-issue.md
+++ b/docs/_docs/maintaining/triaging-an-issue.md
@@ -1,6 +1,7 @@
 ---
 title: "Triaging an Issue"
 layout: docs
+permalink: /docs/maintaining/triaging-an-issue/
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.

From e523b2251073cf0a85e546c60bab655f47d588c9 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 2 Nov 2016 18:55:48 -0700
Subject: [PATCH 1572/4996] Update history to reflect merge of #5532 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8c51f23a3ef..f6832ba6764 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,5 +1,7 @@
 ## HEAD
 
+  * Add permalinks to docs in '/maintaining/' (#5532)
+
 ### Site Enhancements
 
   * Documentation: {% link %} tag  (#5449)

From 0a17b0ab0ad0f47e759d814e5a7ef8746a83eed3 Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Thu, 3 Nov 2016 10:49:40 +0800
Subject: [PATCH 1573/4996] Fix broken links

---
 .github/CONTRIBUTING.markdown | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/CONTRIBUTING.markdown b/.github/CONTRIBUTING.markdown
index 15f2fcce5ea..9e9e479cf77 100644
--- a/.github/CONTRIBUTING.markdown
+++ b/.github/CONTRIBUTING.markdown
@@ -62,13 +62,13 @@ We want the Jekyll documentation to be the best it can be. We've open-sourced ou
 
 ### How to submit changes
 
-You can find the documentation for jekyllrb.com in the [site](https://github.com/jekyll/jekyll/tree/master/site) directory. See the section above, [submitting a pull request](#submitting-a-pull-request) for information on how to propose a change.
+You can find the documentation for jekyllrb.com in the [docs](https://github.com/jekyll/jekyll/tree/master/docs) directory. See the section above, [submitting a pull request](#submitting-a-pull-request) for information on how to propose a change.
 
 One gotcha, all pull requests should be directed at the `master` branch (the default branch).
 
 ### Adding plugins
 
-If you want to add your plugin to the [list of plugins](https://jekyllrb.com/docs/plugins/#available-plugins), please submit a pull request modifying the [plugins page source file](https://github.com/jekyll/jekyll/blob/master/site/_docs/plugins.md) by adding a link to your plugin under the proper subheading depending upon its type.
+If you want to add your plugin to the [list of plugins](https://jekyllrb.com/docs/plugins/#available-plugins), please submit a pull request modifying the [plugins page source file](https://github.com/jekyll/jekyll/blob/master/docs/_docs/plugins.md) by adding a link to your plugin under the proper subheading depending upon its type.
 
 ## Code Contributions
 
@@ -80,7 +80,7 @@ Any time you propose a code change, you should also include updates to the docum
 
 #### Documentation
 
-If your contribution changes any Jekyll behavior, make sure to update the documentation. Documentation lives in the `site/_docs` folder (spoiler alert: it's a Jekyll site!). If the docs are missing information, please feel free to add it in. Great docs make a great project. Include changes to the documentation within your pull request, and once merged, `jekyllrb.com` will be updated.
+If your contribution changes any Jekyll behavior, make sure to update the documentation. Documentation lives in the `docs/_docs` folder (spoiler alert: it's a Jekyll site!). If the docs are missing information, please feel free to add it in. Great docs make a great project. Include changes to the documentation within your pull request, and once merged, `jekyllrb.com` will be updated.
 
 #### Tests
 

From 55887194cdd25ffa83e02912560e021949911a66 Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre 
Date: Thu, 3 Nov 2016 10:00:35 +0100
Subject: [PATCH 1574/4996] Fix HTML rendering

Previously the YAML example would contains the string 'yaml' at the top of the file. Very confusing for newcomers.
---
 docs/_docs/datafiles.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_docs/datafiles.md b/docs/_docs/datafiles.md
index d61c1bfaf48..daf5e4b1776 100644
--- a/docs/_docs/datafiles.md
+++ b/docs/_docs/datafiles.md
@@ -125,6 +125,7 @@ file name:
 Pages and posts can also access a specific data item. The example below shows how to access a specific item:
 
 `_data/people.yml`:
+
 ```yaml
 dave:
     name: David Smith

From 52e189c46adb621e7cac565373dc7405c8f0c28c Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Thu, 3 Nov 2016 14:54:11 +0100
Subject: [PATCH 1575/4996] update source in script/proof

---
 script/proof | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/proof b/script/proof
index 95cffc0bf62..8e7e899da19 100755
--- a/script/proof
+++ b/script/proof
@@ -16,7 +16,7 @@ INGORE_HREFS=$(ruby -e 'puts %w{
   eduardoboucas.com
   github.com\/matrix9180
 }.map{|h| "/#{h}/"}.join(",")')
-SOURCE="site"
+SOURCE="docs"
 DESTINATION="_site"
 
 export PROOF=true

From d55cfe51544f90ded9c29721b735ddc615a80215 Mon Sep 17 00:00:00 2001
From: Matthew Du 
Date: Thu, 3 Nov 2016 22:02:46 +0800
Subject: [PATCH 1576/4996] Update doc about categories and tags

---
 docs/_docs/frontmatter.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/frontmatter.md b/docs/_docs/frontmatter.md
index 72281e265df..6dd8e5fe2ba 100644
--- a/docs/_docs/frontmatter.md
+++ b/docs/_docs/frontmatter.md
@@ -157,7 +157,7 @@ These are available out-of-the-box to be used in the front matter for a post.
           the post will act as though it had been set with these categories
           normally. Categories (plural key) can be specified as a YAML list or a
-          comma-separated string.
+          space-separated string.
 
         
    
       
@@ -172,7 +172,7 @@ These are available out-of-the-box to be used in the front matter for a post.
           Similar to categories, one or multiple tags can be added to a post.
           Also like categories, tags can be specified as a YAML list or a
-          comma-separated string.
+          space-separated string.
 
         
    
       

From 5237040b44fbd02745c8b7876634fa6b6e9a205f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 3 Nov 2016 08:37:46 -0700
Subject: [PATCH 1577/4996] Update history to reflect merge of #5538 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f6832ba6764..c43b91e6bf5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -30,6 +30,7 @@
   * script/test: add missing whitespace (#5479)
   * Restrict Rubocop version (#5496)
   * include a hashbang for all benchmark scripts & make them executable (#5505)
+  * Update source in script/proof (#5538)
 
 ### Minor Enhancements
 

From 7298da6de44df2ce8c65da40bcd19ab3fa8dde55 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 3 Nov 2016 08:38:28 -0700
Subject: [PATCH 1578/4996] Update history to reflect merge of #5533 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c43b91e6bf5..14c2cbb0a7b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Remove Glynn as deployment option (#5519)
   * Fix broken forum link (#5466)
   * Move documentation to docs folder (#5459)
+  * Fix broken links in CONTRIBUTING (#5533)
 
 ### Bug Fixes
 

From b30c499196571db81c02e031d9b664084f59ef90 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 3 Nov 2016 09:53:43 -0700
Subject: [PATCH 1579/4996] Update history to reflect merge of #5540 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 14c2cbb0a7b..89e33d9eb8a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
   * Fix broken forum link (#5466)
   * Move documentation to docs folder (#5459)
   * Fix broken links in CONTRIBUTING (#5533)
+  * Update documentation on jekyllrb.com (#5540)
 
 ### Bug Fixes
 

From 894d2a0415a64b3a40840b5adbe11523b5eff097 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 4 Nov 2016 00:50:54 +0530
Subject: [PATCH 1580/4996] test double slash when input = '/'

---
 test/test_filters.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index 9a0f87d46b7..380f1d23f9f 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -368,6 +368,24 @@ def select; end
         assert_equal "http://example.com/base", filter.absolute_url(page_url)
       end
 
+      should "not append a forward slash if input is '/'" do
+        page_url = "/"
+        filter = make_filter_mock({
+          "url"     => "http://example.com",
+          "baseurl" => "/base"
+        })
+        refute_equal "http://example.com/base//", filter.absolute_url(page_url)
+      end
+
+      should "not append a forward slash if input is '/' and nil 'baseurl'" do
+        page_url = "/"
+        filter = make_filter_mock({
+          "url"     => "http://example.com",
+          "baseurl" => nil
+        })
+        refute_equal "http://example.com//", filter.absolute_url(page_url)
+      end
+
       should "normalize international URLs" do
         page_url = ""
         filter = make_filter_mock({

From 9192e66b7b9cdbeff43598c55d4a34f67a83f888 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 4 Nov 2016 01:17:54 +0530
Subject: [PATCH 1581/4996] assert instead of refuting

---
 test/test_filters.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index 380f1d23f9f..66091c28c15 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -374,7 +374,7 @@ def select; end
           "url"     => "http://example.com",
           "baseurl" => "/base"
         })
-        refute_equal "http://example.com/base//", filter.absolute_url(page_url)
+        assert_equal "http://example.com/base/", filter.absolute_url(page_url)
       end
 
       should "not append a forward slash if input is '/' and nil 'baseurl'" do
@@ -383,7 +383,7 @@ def select; end
           "url"     => "http://example.com",
           "baseurl" => nil
         })
-        refute_equal "http://example.com//", filter.absolute_url(page_url)
+        assert_equal "http://example.com/", filter.absolute_url(page_url)
       end
 
       should "normalize international URLs" do

From 2dafd50664c687531c6bb4b787b206e49b6248e3 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 3 Nov 2016 13:32:20 -0700
Subject: [PATCH 1582/4996] Remove freenode.txt from jekyllrb.com.

Fixes #5539.
---
 docs/freenode.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 docs/freenode.txt

diff --git a/docs/freenode.txt b/docs/freenode.txt
deleted file mode 100644
index 898ed7291d6..00000000000
--- a/docs/freenode.txt
+++ /dev/null
@@ -1 +0,0 @@
-aS3gAc4g

From e1eff52cd2eb9e7508269a2f25d9761653a0360e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 3 Nov 2016 15:22:56 -0700
Subject: [PATCH 1583/4996] Update history to reflect merge of #5536 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 89e33d9eb8a..d81fdbd320c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -18,6 +18,7 @@
   * Move documentation to docs folder (#5459)
   * Fix broken links in CONTRIBUTING (#5533)
   * Update documentation on jekyllrb.com (#5540)
+  * Fix HTML rendering (#5536)
 
 ### Bug Fixes
 

From da762eaa42f0410dcd6c254c4f020d0f63532330 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 3 Nov 2016 15:48:37 -0700
Subject: [PATCH 1584/4996] Revert "Add permalinks to docs in '/maintaining/'"

---
 docs/_docs/maintaining/affinity-team-captain.md    | 1 -
 docs/_docs/maintaining/avoiding-burnout.md         | 1 -
 docs/_docs/maintaining/becoming-a-maintainer.md    | 1 -
 docs/_docs/maintaining/merging-a-pull-request.md   | 1 -
 docs/_docs/maintaining/reviewing-a-pull-request.md | 1 -
 docs/_docs/maintaining/special-labels.md           | 1 -
 docs/_docs/maintaining/triaging-an-issue.md        | 1 -
 7 files changed, 7 deletions(-)

diff --git a/docs/_docs/maintaining/affinity-team-captain.md b/docs/_docs/maintaining/affinity-team-captain.md
index 0554fdc63e1..02247d2d17c 100644
--- a/docs/_docs/maintaining/affinity-team-captain.md
+++ b/docs/_docs/maintaining/affinity-team-captain.md
@@ -1,7 +1,6 @@
 ---
 title: Affinity Team Captains
 layout: docs
-permalink: /docs/maintaining/affinity-team-captain/
 ---
 
 **This guide is for affinity team captains.** These special people are **team maintainers** of one of our [affinity teams][] and help triage and evaluate the issues and contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/avoiding-burnout.md b/docs/_docs/maintaining/avoiding-burnout.md
index 72e46e1ac41..a418cefdb5e 100644
--- a/docs/_docs/maintaining/avoiding-burnout.md
+++ b/docs/_docs/maintaining/avoiding-burnout.md
@@ -1,7 +1,6 @@
 ---
 title: "Avoiding Burnout"
 layout: docs
-permalink: /docs/maintaining/avoiding-burnout/
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/becoming-a-maintainer.md b/docs/_docs/maintaining/becoming-a-maintainer.md
index 61b19e2cd20..c4a262b930c 100644
--- a/docs/_docs/maintaining/becoming-a-maintainer.md
+++ b/docs/_docs/maintaining/becoming-a-maintainer.md
@@ -1,7 +1,6 @@
 ---
 title: "Becoming a Maintainer"
 layout: docs
-permalink: /docs/maintaining/becoming-a-maintainer/
 ---
 
 **This guide is for contributors.** These special people have contributed to one or more of Jekyll's repositories, but do not yet have write access to any. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/merging-a-pull-request.md b/docs/_docs/maintaining/merging-a-pull-request.md
index e5c5eacfef8..7265c6f857c 100644
--- a/docs/_docs/maintaining/merging-a-pull-request.md
+++ b/docs/_docs/maintaining/merging-a-pull-request.md
@@ -1,7 +1,6 @@
 ---
 title: "Merging a Pull Request"
 layout: docs
-permalink: /docs/maintaining/merging-a-pull-request/
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/reviewing-a-pull-request.md b/docs/_docs/maintaining/reviewing-a-pull-request.md
index 3185a19ef43..1ecaeea9899 100644
--- a/docs/_docs/maintaining/reviewing-a-pull-request.md
+++ b/docs/_docs/maintaining/reviewing-a-pull-request.md
@@ -1,7 +1,6 @@
 ---
 title: "Reviewing a Pull Request"
 layout: docs
-permalink: /docs/maintaining/reviewing-a-pull-request/
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/special-labels.md b/docs/_docs/maintaining/special-labels.md
index 7a32a1fa4c7..ff8a623f858 100644
--- a/docs/_docs/maintaining/special-labels.md
+++ b/docs/_docs/maintaining/special-labels.md
@@ -1,7 +1,6 @@
 ---
 title: "Special Labels"
 layout: docs
-permalink: /docs/maintaining/special-labels/
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/triaging-an-issue.md b/docs/_docs/maintaining/triaging-an-issue.md
index 6c97f967cba..4802b61b486 100644
--- a/docs/_docs/maintaining/triaging-an-issue.md
+++ b/docs/_docs/maintaining/triaging-an-issue.md
@@ -1,7 +1,6 @@
 ---
 title: "Triaging an Issue"
 layout: docs
-permalink: /docs/maintaining/triaging-an-issue/
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.

From 8d1e0433061b1ebae06d5755dc05edf7ecdbe3da Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 3 Nov 2016 15:49:21 -0700
Subject: [PATCH 1585/4996] Set docs permalink in config

---
 docs/_config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_config.yml b/docs/_config.yml
index 6f57710aa2e..32ae74bb0d4 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -12,6 +12,7 @@ timezone: America/Los_Angeles
 
 collections:
   docs:
+    permalink: /:collection/:path/
     output: true
   posts:
     permalink: /news/:year/:month/:day/:title/

From 8157d53af0e9d2a5493b44245fa5303421b365ed Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 3 Nov 2016 15:53:00 -0700
Subject: [PATCH 1586/4996] Update contributing documentation based on
 .github/CONTRIBUTING.md

---
 docs/_docs/contributing.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index a317631c89a..c5a377226d8 100644
--- a/docs/_docs/contributing.md
+++ b/docs/_docs/contributing.md
@@ -67,13 +67,13 @@ We want the Jekyll documentation to be the best it can be. We've open-sourced ou
 
 ### How to submit changes
 
-You can find the documentation for jekyllrb.com in the [site](https://github.com/jekyll/jekyll/tree/master/site) directory. See the section above, [submitting a pull request](#submitting-a-pull-request) for information on how to propose a change.
+You can find the documentation for jekyllrb.com in the [docs](https://github.com/jekyll/jekyll/tree/master/docs) directory. See the section above, [submitting a pull request](#submitting-a-pull-request) for information on how to propose a change.
 
 One gotcha, all pull requests should be directed at the `master` branch (the default branch).
 
 ### Adding plugins
 
-If you want to add your plugin to the [list of plugins](https://jekyllrb.com/docs/plugins/#available-plugins), please submit a pull request modifying the [plugins page source file](https://github.com/jekyll/jekyll/blob/master/site/_docs/plugins.md) by adding a link to your plugin under the proper subheading depending upon its type.
+If you want to add your plugin to the [list of plugins](https://jekyllrb.com/docs/plugins/#available-plugins), please submit a pull request modifying the [plugins page source file](https://github.com/jekyll/jekyll/blob/master/docs/_docs/plugins.md) by adding a link to your plugin under the proper subheading depending upon its type.
 
 ## Code Contributions
 
@@ -85,7 +85,7 @@ Any time you propose a code change, you should also include updates to the docum
 
 #### Documentation
 
-If your contribution changes any Jekyll behavior, make sure to update the documentation. Documentation lives in the `site/_docs` folder (spoiler alert: it's a Jekyll site!). If the docs are missing information, please feel free to add it in. Great docs make a great project. Include changes to the documentation within your pull request, and once merged, `jekyllrb.com` will be updated.
+If your contribution changes any Jekyll behavior, make sure to update the documentation. Documentation lives in the `docs/_docs` folder (spoiler alert: it's a Jekyll site!). If the docs are missing information, please feel free to add it in. Great docs make a great project. Include changes to the documentation within your pull request, and once merged, `jekyllrb.com` will be updated.
 
 #### Tests
 

From 9824c3103bd7ffcc78c4a6c671a27efea5ce21e1 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 3 Nov 2016 16:26:16 -0700
Subject: [PATCH 1587/4996] Allow us to specify other options to pass to
 htmlproofer.

---
 script/proof | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/proof b/script/proof
index 8e7e899da19..1dd63a28925 100755
--- a/script/proof
+++ b/script/proof
@@ -32,4 +32,4 @@ bundle exec jekyll build -s $SOURCE -d $DESTINATION --trace
 
 # 3.
 msg "Proofing..."
-time bundle exec htmlproof ./$DESTINATION --url-ignore $INGORE_HREFS
+time bundle exec htmlproof ./$DESTINATION --url-ignore $INGORE_HREFS $@

From 7af41649e953bb2da4743db6f5b8a7fc477fca86 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 3 Nov 2016 16:26:21 -0700
Subject: [PATCH 1588/4996] Fix internal links.

---
 docs/_docs/maintaining/becoming-a-maintainer.md    | 4 ++--
 docs/_docs/maintaining/merging-a-pull-request.md   | 2 +-
 docs/_docs/maintaining/reviewing-a-pull-request.md | 2 +-
 docs/_docs/maintaining/special-labels.md           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/_docs/maintaining/becoming-a-maintainer.md b/docs/_docs/maintaining/becoming-a-maintainer.md
index 61b19e2cd20..a303d940267 100644
--- a/docs/_docs/maintaining/becoming-a-maintainer.md
+++ b/docs/_docs/maintaining/becoming-a-maintainer.md
@@ -15,7 +15,7 @@ You want to maintain Jekyll? Use it often. Do weird things with it. Do normal th
 
 ## 2. Help Triage Issues
 
-Watch the repository you're interested in. Join [an Affinity Team](https://teams.jekyllrb.com) and receive mentions regarding a particular interest area of the project. When you receive a notification for an issue that has not been triaged by a maintainer, dive in. Can you reproduce the issue? Can you determine the fix? [More tips on Triaging an Issue in our maintainer guide](triaging-an-issue.md). Every maintainer loves an issue that is resolved before they get to it. :smiley:
+Watch the repository you're interested in. Join [an Affinity Team](https://teams.jekyllrb.com) and receive mentions regarding a particular interest area of the project. When you receive a notification for an issue that has not been triaged by a maintainer, dive in. Can you reproduce the issue? Can you determine the fix? [More tips on Triaging an Issue in our maintainer guide](../triaging-an-issue). Every maintainer loves an issue that is resolved before they get to it. :smiley:
 
 ## 3. Write Documentation
 
@@ -27,7 +27,7 @@ As a maintainer, you will be reviewing pull requests which update code. You shou
 
 ## 5. Review Pull Requests
 
-Start by reviewing one pull request a week. Leave detailed comments and [follow our guide for reviewing pull requests](reviewing-a-pull-request.md).
+Start by reviewing one pull request a week. Leave detailed comments and [follow our guide for reviewing pull requests](../reviewing-a-pull-request).
 
 ## 6. Ask!
 
diff --git a/docs/_docs/maintaining/merging-a-pull-request.md b/docs/_docs/maintaining/merging-a-pull-request.md
index e5c5eacfef8..9d6c82c45d4 100644
--- a/docs/_docs/maintaining/merging-a-pull-request.md
+++ b/docs/_docs/maintaining/merging-a-pull-request.md
@@ -11,7 +11,7 @@ permalink: /docs/maintaining/merging-a-pull-request/
 
 All pull requests should be subject to code review. Code review is a [foundational value](https://blog.fullstory.com/what-we-learned-from-google-code-reviews-arent-just-for-catching-bugs-b125a13aa292) of good engineering teams. Besides providing validation of correctness, it promotes a sense of community and gives other maintainers understanding of all parts of the code base. In short, code review is crucial to a healthy open source project.
 
-**Read our guide for [Reviewing a pull request](reviewing-a-pull-request.md) before merging.** Notably, the change must have tests if for code, and at least two maintainers must give it an OK.
+**Read our guide for [Reviewing a pull request](../reviewing-a-pull-request) before merging.** Notably, the change must have tests if for code, and at least two maintainers must give it an OK.
 
 ## Merging
 
diff --git a/docs/_docs/maintaining/reviewing-a-pull-request.md b/docs/_docs/maintaining/reviewing-a-pull-request.md
index 3185a19ef43..fef21d7a33f 100644
--- a/docs/_docs/maintaining/reviewing-a-pull-request.md
+++ b/docs/_docs/maintaining/reviewing-a-pull-request.md
@@ -9,7 +9,7 @@ permalink: /docs/maintaining/reviewing-a-pull-request/
 
 ## Respond Kindly
 
-Above all else, please review a pull request kindly. Our community can only be strong if we make it a welcoming and inclusive environment. To further promote this, the Jekyll community is governed by a [Code of Conduct](../CONDUCT.markdown) by which all community members must abide.
+Above all else, please review a pull request kindly. Our community can only be strong if we make it a welcoming and inclusive environment. To further promote this, the Jekyll community is governed by a [Code of Conduct](/docs/conduct/) by which all community members must abide.
 
 Use emoji liberally :heart: :tada: :sparkles: :confetti_ball: and feel free to be emotive!! Contributions keep this project moving forward and we're always happy to receive them, even if the pull request isn't ultimately merged.
 
diff --git a/docs/_docs/maintaining/special-labels.md b/docs/_docs/maintaining/special-labels.md
index 7a32a1fa4c7..7f0ff12ea6c 100644
--- a/docs/_docs/maintaining/special-labels.md
+++ b/docs/_docs/maintaining/special-labels.md
@@ -19,4 +19,4 @@ These labels are used to indicate that the Git state of a pull request must chan
 
 ## `stale`
 
-This label is automatically added and removed by @jekyllbot based on activity on an issue or pull request. The rules for this label are laid out in [Triaging an Issue: Staleness and automatic closure](triaging-an-issue.md#staleness-and-automatic-closure).
+This label is automatically added and removed by @jekyllbot based on activity on an issue or pull request. The rules for this label are laid out in [Triaging an Issue: Staleness and automatic closure](../triaging-an-issue/#staleness-and-automatic-closure).

From 57a6847165b75fb6c8c37c0ec32326ca0920432d Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 3 Nov 2016 16:29:50 -0700
Subject: [PATCH 1589/4996] Fix some external links.

---
 docs/_docs/continuous-integration.md       | 2 +-
 docs/_docs/maintaining/avoiding-burnout.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/continuous-integration.md b/docs/_docs/continuous-integration.md
index 4b5b2d4e334..54b3466cb7c 100644
--- a/docs/_docs/continuous-integration.md
+++ b/docs/_docs/continuous-integration.md
@@ -229,5 +229,5 @@ an entry in the `.gitignore` file to avoid it from being checked in again.
 This entire guide is open-source. Go ahead and [edit it][3] if you have a
 fix or [ask for help][4] if you run into trouble and need some help.
 
-[3]: https://github.com/jekyll/jekyll/edit/master/site/_docs/continuous-integration.md
+[3]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration.md
 [4]: https://jekyllrb.com/help/
diff --git a/docs/_docs/maintaining/avoiding-burnout.md b/docs/_docs/maintaining/avoiding-burnout.md
index 72e46e1ac41..86c5530b56a 100644
--- a/docs/_docs/maintaining/avoiding-burnout.md
+++ b/docs/_docs/maintaining/avoiding-burnout.md
@@ -29,4 +29,4 @@ Jekyll gets a lot of feature requests, non-reproducible bug reports, usage quest
 
 Thanks to https://gist.github.com/ryanflorence/124070e7c4b3839d4573 which influenced this document.
 
-Thanks to [Homebrew's "Avoiding Burnout" document](https://github.com/Homebrew/brew/blob/master/share/doc/homebrew/Maintainers-Avoiding-Burnout.md) for providing a perfect base for this document.
+Thanks to [Homebrew's "Avoiding Burnout" document](https://github.com/Homebrew/brew/blob/master/docs/Maintainers-Avoiding-Burnout.md) for providing a perfect base for this document.

From 1852e54d102f3877ebad04134db3296178458a74 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 2 Nov 2016 14:18:07 +0530
Subject: [PATCH 1590/4996] add and use 'skip_if_windows' helper method

  - add a new helper method to skip tests if on Windows platform
  - skip those tests that fail due to lack of support for symlinked files
    on Windows.
---
 test/helper.rb            | 7 +++++++
 test/test_collections.rb  | 3 +++
 test/test_entry_filter.rb | 6 ++++++
 test/test_theme.rb        | 3 +++
 4 files changed, 19 insertions(+)

diff --git a/test/helper.rb b/test/helper.rb
index 8fc43d6733d..ad88b5d04a7 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -158,4 +158,11 @@ def nokogiri_fragment(str)
       str
     )
   end
+
+  def skip_if_windows(msg = nil)
+    if Utils::Platforms.really_windows?
+      msg ||= "Jekyll does not currently support this feature on Windows."
+      skip msg.to_s.magenta
+    end
+  end
 end
diff --git a/test/test_collections.rb b/test/test_collections.rb
index 3ae1ab12d4a..45e2a51192b 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -186,6 +186,9 @@ class TestCollections < JekyllUnitTest
     end
 
     should "include the symlinked file from site.source in the list of docs" do
+      # no support for including symlinked file on Windows
+      skip_if_windows "Jekyll does not currently support symlinks on Windows."
+
       assert_includes @collection.docs.map(&:relative_path), "_methods/um_hi.md"
     end
   end
diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb
index eed245674a8..f65badc67ea 100644
--- a/test/test_entry_filter.rb
+++ b/test/test_entry_filter.rb
@@ -82,6 +82,9 @@ class TestEntryFilter < JekyllUnitTest
 
     # rubocop:disable Performance/FixedSize
     should "include only safe symlinks in safe mode" do
+      # no support for symlinks on Windows
+      skip_if_windows "Jekyll does not currently support symlinks on Windows."
+
       site = Site.new(site_configuration("safe" => true))
       site.reader.read_directories("symlink-test")
 
@@ -91,6 +94,9 @@ class TestEntryFilter < JekyllUnitTest
     # rubocop:enable Performance/FixedSize
 
     should "include symlinks in unsafe mode" do
+      # no support for symlinks on Windows
+      skip_if_windows "Jekyll does not currently support symlinks on Windows."
+
       site = Site.new(site_configuration)
 
       site.reader.read_directories("symlink-test")
diff --git a/test/test_theme.rb b/test/test_theme.rb
index fd380d95090..918d01f69c0 100644
--- a/test/test_theme.rb
+++ b/test/test_theme.rb
@@ -55,6 +55,9 @@ def setup
     end
 
     should "return the resolved path when a symlink & resolved path exists" do
+      # no support for symlinks on Windows
+      skip_if_windows "Jekyll does not currently support symlinks on Windows."
+
       expected = File.expand_path("./_layouts", @expected_root)
       assert_equal expected, @theme.send(:path_for, :_symlink)
     end

From 2c68069a4151d4dc08e0b46e0f24a5e4c49c80b6 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 3 Nov 2016 23:10:22 +0530
Subject: [PATCH 1591/4996] TestSite: consider dive-letter in Windows

The array of plugins will contain current drive-letter in Windows
---
 test/test_site.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/test/test_site.rb b/test/test_site.rb
index efe7076ac95..105e086a62b 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -14,14 +14,20 @@ class TestSite < JekyllUnitTest
 
     should "have an array for plugins if passed as a string" do
       site = Site.new(site_configuration({ "plugins_dir" => "/tmp/plugins" }))
-      assert_equal ["/tmp/plugins"], site.plugins
+      array = Utils::Platforms.windows? ? ["C:/tmp/plugins"] : ["/tmp/plugins"]
+      assert_equal array, site.plugins
     end
 
     should "have an array for plugins if passed as an array" do
       site = Site.new(site_configuration({
         "plugins_dir" => ["/tmp/plugins", "/tmp/otherplugins"]
       }))
-      assert_equal ["/tmp/plugins", "/tmp/otherplugins"], site.plugins
+      array = if Utils::Platforms.windows?
+                ["C:/tmp/plugins", "C:/tmp/otherplugins"]
+              else
+                ["/tmp/plugins", "/tmp/otherplugins"]
+              end
+      assert_equal array, site.plugins
     end
 
     should "have an empty array for plugins if nothing is passed" do

From 7314e4a5dbcdbb2984bafb743a8a5da540aef9d8 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 4 Nov 2016 12:29:48 +0530
Subject: [PATCH 1592/4996] collections.feature: conditional steps

---
 features/collections.feature | 15 ++++++++++-----
 features/step_definitions.rb | 29 +++++++++++++++++++++++++++++
 features/support/helpers.rb  |  2 +-
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/features/collections.feature b/features/collections.feature
index ac67611edd6..60bba8a17fa 100644
--- a/features/collections.feature
+++ b/features/collections.feature
@@ -77,7 +77,8 @@ Feature: Collections
     When I run jekyll build
     Then I should get a zero exit status
     Then the _site directory should exist
-    And I should see "Collections: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
+    And I should see "Collections: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" unless Windows
+    And I should see "Collections: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/yaml_with_dots.md" in "_site/index.html" if on Windows
 
   Scenario: Collections specified as an hash
     Given I have an "index.html" page that contains "Collections: {% for method in site.methods %}{{ method.relative_path }} {% endfor %}"
@@ -90,7 +91,8 @@ Feature: Collections
     When I run jekyll build
     Then I should get a zero exit status
     Then the _site directory should exist
-    And I should see "Collections: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
+    And I should see "Collections: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" unless Windows
+    And I should see "Collections: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/yaml_with_dots.md" in "_site/index.html" if on Windows
 
   Scenario: All the documents
     Given I have an "index.html" page that contains "All documents: {% for doc in site.documents %}{{ doc.relative_path }} {% endfor %}"
@@ -103,7 +105,8 @@ Feature: Collections
     When I run jekyll build
     Then I should get a zero exit status
     Then the _site directory should exist
-    And I should see "All documents: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
+    And I should see "All documents: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" unless Windows
+    And I should see "All documents: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/yaml_with_dots.md" in "_site/index.html" if on Windows
 
   Scenario: Documents have an output attribute, which is the converted HTML
     Given I have an "index.html" page that contains "Second document's output: {{ site.documents[1].output }}"
@@ -142,7 +145,8 @@ Feature: Collections
     When I run jekyll build
     Then I should get a zero exit status
     And the _site directory should exist
-    And I should see "2. of 8: 
    Page without title.
    " in "_site/index.html"
+    And I should see "2. of 8: 
    Page without title.
    " in "_site/index.html" unless Windows
+    And I should see "2. of 7: 
    Page without title.
    " in "_site/index.html" if on Windows
 
   Scenario: Sort by relative_path
     Given I have an "index.html" page that contains "Collections: {% assign methods = site.methods | sort: 'relative_path' %}{{ methods | map:"title" | join: ", " }}"
@@ -155,7 +159,8 @@ Feature: Collections
     When I run jekyll build
     Then I should get a zero exit status
     Then the _site directory should exist
-    And I should see "Collections: Collection#entries, Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, Site#generate," in "_site/index.html"
+    And I should see "Collections: Collection#entries, Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, Site#generate," in "_site/index.html" unless Windows
+    And I should see "Collections: Collection#entries, Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, YAML with Dots" in "_site/index.html" if on Windows
 
   Scenario: Rendered collection with date/dateless filename
     Given I have an "index.html" page that contains "Collections: {% for method in site.thanksgiving %}{{ method.title }} {% endfor %}"
diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index ffe3fff53e3..c685008948d 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -179,6 +179,7 @@
 end
 
 #
+
 Then(%r!^I should (not )?see "(.*)" in "(.*)"$!) do |negative, text, file|
   step %(the "#{file}" file should exist)
   regexp = Regexp.new(text, Regexp::MULTILINE)
@@ -191,6 +192,34 @@
 
 #
 
+Then(%r!^I should (not )?see "(.*)" in "(.*)" if on Windows$!) do |negative, text, file|
+  step %(the "#{file}" file should exist)
+  regexp = Regexp.new(text, Regexp::MULTILINE)
+  if negative.nil? || negative.empty?
+    if Jekyll::Utils::Platforms.really_windows?
+      expect(file_contents(file)).to match regexp
+    else
+      expect(file_contents(file)).not_to match regexp
+    end
+  end
+end
+
+#
+
+Then(%r!^I should (not )?see "(.*)" in "(.*)" unless Windows$!) do |negative, text, file|
+  step %(the "#{file}" file should exist)
+  regexp = Regexp.new(text, Regexp::MULTILINE)
+  if negative.nil? || negative.empty?
+    if Jekyll::Utils::Platforms.really_windows?
+      expect(file_contents(file)).not_to match regexp
+    else
+      expect(file_contents(file)).to match regexp
+    end
+  end
+end
+
+#
+
 Then(%r!^I should see exactly "(.*)" in "(.*)"$!) do |text, file|
   step %(the "#{file}" file should exist)
   expect(file_contents(file).strip).to eq text
diff --git a/features/support/helpers.rb b/features/support/helpers.rb
index 0d809bca985..11ae777b98e 100644
--- a/features/support/helpers.rb
+++ b/features/support/helpers.rb
@@ -1,5 +1,5 @@
 require "fileutils"
-require "jekyll/utils"
+require "jekyll"
 require "open3"
 require "time"
 require "safe_yaml/load"

From 7f18ac8f9943a88f29a9f8e61bc6dc7cd3fa2e20 Mon Sep 17 00:00:00 2001
From: Thiago Arrais 
Date: Tue, 25 Oct 2016 17:38:22 -0300
Subject: [PATCH 1593/4996] Group using arbitraty Liquid expressions

---
 docs/_docs/templates.md                | 16 +++++
 lib/jekyll/filters.rb                  | 31 +---------
 lib/jekyll/filters/grouping_filters.rb | 56 ++++++++++++++++++
 test/test_filters.rb                   | 82 ++++++++++++++++++++++++++
 4 files changed, 157 insertions(+), 28 deletions(-)
 create mode 100644 lib/jekyll/filters/grouping_filters.rb

diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md
index 54f914f7628..0d37f8e1274 100644
--- a/docs/_docs/templates.md
+++ b/docs/_docs/templates.md
@@ -147,6 +147,22 @@ common tasks easier.
         
    
       
     
+    
+      
+        
    Group By Expression
    
+        
    Group an array's items using a Liquid expression.
    
+      
+      
+        
    
+         {% raw %}{{ site.members | group_by_exp:"item",
+"item.graduation_year | truncate: 3, \"\"" }}{% endraw %}
+        
    
+        
    
+          [{"name"=>"201...", "items"=>[...]},
+{"name"=>"200...", "items"=>[...]}]
+        
    
+      
+    
     
       
         
    XML Escape
    
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 29f2a2b5e1a..f1467fa5e23 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -8,6 +8,8 @@
 module Jekyll
   module Filters
     include URLFilters
+    include GroupingFilters
+
     # Convert a Markdown string into HTML output.
     #
     # input - The Markdown String to convert.
@@ -205,29 +207,6 @@ def jsonify(input)
       as_liquid(input).to_json
     end
 
-    # Group an array of items by a property
-    #
-    # input - the inputted Enumerable
-    # property - the property
-    #
-    # Returns an array of Hashes, each looking something like this:
-    #  {"name"  => "larry"
-    #   "items" => [...] } # all the items where `property` == "larry"
-    def group_by(input, property)
-      if groupable?(input)
-        input.group_by { |item| item_property(item, property).to_s }
-          .each_with_object([]) do |item, array|
-            array << {
-              "name"  => item.first,
-              "items" => item.last,
-              "size"  => item.last.size
-            }
-          end
-      else
-        input
-      end
-    end
-
     # Filter an array of objects
     #
     # input - the object array
@@ -381,11 +360,6 @@ def time(input)
       end.localtime
     end
 
-    private
-    def groupable?(element)
-      element.respond_to?(:group_by)
-    end
-
     private
     def item_property(item, property)
       if item.respond_to?(:to_liquid)
@@ -436,6 +410,7 @@ def parse_condition(exp)
 
       condition
     end
+
   end
 end
 
diff --git a/lib/jekyll/filters/grouping_filters.rb b/lib/jekyll/filters/grouping_filters.rb
new file mode 100644
index 00000000000..372b1e7bc39
--- /dev/null
+++ b/lib/jekyll/filters/grouping_filters.rb
@@ -0,0 +1,56 @@
+module Jekyll
+  module Filters
+    module GroupingFilters
+      # Group an array of items by a property
+      #
+      # input - the inputted Enumerable
+      # property - the property
+      #
+      # Returns an array of Hashes, each looking something like this:
+      #  {"name"  => "larry"
+      #   "items" => [...] } # all the items where `property` == "larry"
+      def group_by(input, property)
+        if groupable?(input)
+          groups = input.group_by { |item| item_property(item, property).to_s }
+          make_grouped_array(groups)
+        else
+          input
+        end
+      end
+
+      def group_by_exp(input, variable, expression)
+        return input unless groupable?(input)
+
+        parsed_expr = parse_expression(expression)
+        @context.stack do
+          groups = input.group_by do |item|
+            @context[variable] = item
+            parsed_expr.render(@context)
+          end
+          make_grouped_array(groups)
+        end
+      end
+
+      private
+      def parse_expression(str)
+        Liquid::Variable.new(str, {})
+      end
+
+      private
+      def groupable?(element)
+        element.respond_to?(:group_by)
+      end
+
+      private
+      def make_grouped_array(groups)
+        groups.each_with_object([]) do |item, array|
+          array << {
+            "name"  => item.first,
+            "items" => item.last,
+            "size"  => item.last.size
+          }
+        end
+      end
+    end
+  end
+end
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 9a0f87d46b7..9a2909ef44a 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -747,6 +747,88 @@ def to_liquid
       end
     end
 
+    context "group_by_exp filter" do
+      should "successfully group array of Jekyll::Page's" do
+        @filter.site.process
+        groups = @filter.group_by_exp(@filter.site.pages, "page", "page.layout | upcase")
+        groups.each do |g|
+          assert(
+            ["DEFAULT", "NIL", ""].include?(g["name"]),
+            "#{g["name"]} isn't a valid grouping."
+          )
+          case g["name"]
+          when "DEFAULT"
+            assert(
+              g["items"].is_a?(Array),
+              "The list of grouped items for 'default' is not an Array."
+            )
+            assert_equal 5, g["items"].size
+          when "nil"
+            assert(
+              g["items"].is_a?(Array),
+              "The list of grouped items for 'nil' is not an Array."
+            )
+            assert_equal 2, g["items"].size
+          when ""
+            assert(
+              g["items"].is_a?(Array),
+              "The list of grouped items for '' is not an Array."
+            )
+            assert_equal 15, g["items"].size
+          end
+        end
+      end
+
+      should "include the size of each grouping" do
+        groups = @filter.group_by_exp(@filter.site.pages, "page", "page.layout")
+        groups.each do |g|
+          p g
+          assert_equal(
+            g["items"].size,
+            g["size"],
+            "The size property for '#{g["name"]}' doesn't match the size of the Array."
+          )
+        end
+      end
+
+      should "allow more complex filters" do
+        items = [
+          { "version"=>"1.0", "result"=>"slow" },
+          { "version"=>"1.1.5", "result"=>"medium" },
+          { "version"=>"2.7.3", "result"=>"fast" }
+        ]
+
+        result = @filter.group_by_exp(items, "item", "item.version | split: '.' | first")
+        assert_equal 2, result.size
+      end
+
+      should "be equivalent of group_by" do
+        actual = @filter.group_by_exp(@filter.site.pages, "page", "page.layout")
+        expected = @filter.group_by(@filter.site.pages, "layout")
+
+        assert_equal expected, actual
+      end
+
+      should "return any input that is not an array" do
+        assert_equal "some string", @filter.group_by_exp("some string", "la", "le")
+      end
+
+      should "group by full element (as opposed to a field of the element)" do
+        items = %w(a b c d)
+
+        result = @filter.group_by_exp(items, "item", "item")
+        assert_equal 4, result.length
+        assert_equal ["a"], result.first["items"]
+      end
+
+      should "accept hashes" do
+        hash = { 1 => "a", 2 => "b", 3 => "c", 4 => "d" }
+
+        result = @filter.group_by_exp(hash, "item", "item")
+        assert_equal 4, result.length
+      end
+    end
+
     context "sort filter" do
       should "raise Exception when input is nil" do
         err = assert_raises ArgumentError do

From 7ac9653f4efe61f12b27adb0a7261547c17e266c Mon Sep 17 00:00:00 2001
From: Thiago Arrais 
Date: Fri, 4 Nov 2016 18:32:52 -0300
Subject: [PATCH 1594/4996] RDoc for group_by_exp

---
 lib/jekyll/filters/grouping_filters.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/jekyll/filters/grouping_filters.rb b/lib/jekyll/filters/grouping_filters.rb
index 372b1e7bc39..804c65593f7 100644
--- a/lib/jekyll/filters/grouping_filters.rb
+++ b/lib/jekyll/filters/grouping_filters.rb
@@ -18,6 +18,13 @@ def group_by(input, property)
         end
       end
 
+      # Group an array of items by an expression
+      #
+      # input - the object array
+      # variable - the variable to assign each item to in the expression
+      # expression -a Liquid comparison expression passed in as a string
+      #
+      # Returns the filtered array of objects
       def group_by_exp(input, variable, expression)
         return input unless groupable?(input)
 

From 1bafbd91fadad9ddcebea43fc5cb352ffb9f1111 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sat, 5 Nov 2016 15:00:40 +0530
Subject: [PATCH 1595/4996] create orphan files with touch method

---
 test/test_site.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/test_site.rb b/test/test_site.rb
index 105e086a62b..81da363d2d6 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -277,19 +277,19 @@ def generate(site)
         @site.process
         # generate some orphaned files:
         # single file
-        File.open(dest_dir("obsolete.html"), "w")
+        FileUtils.touch(dest_dir("obsolete.html"))
         # single file in sub directory
         FileUtils.mkdir(dest_dir("qux"))
-        File.open(dest_dir("qux/obsolete.html"), "w")
+        FileUtils.touch(dest_dir("qux/obsolete.html"))
         # empty directory
         FileUtils.mkdir(dest_dir("quux"))
         FileUtils.mkdir(dest_dir(".git"))
         FileUtils.mkdir(dest_dir(".svn"))
         FileUtils.mkdir(dest_dir(".hg"))
         # single file in repository
-        File.open(dest_dir(".git/HEAD"), "w")
-        File.open(dest_dir(".svn/HEAD"), "w")
-        File.open(dest_dir(".hg/HEAD"), "w")
+        FileUtils.touch(dest_dir(".git/HEAD"))
+        FileUtils.touch(dest_dir(".svn/HEAD"))
+        FileUtils.touch(dest_dir(".hg/HEAD"))
       end
 
       teardown do

From 303580682684cdca11f3bb7222bca56faa43be51 Mon Sep 17 00:00:00 2001
From: Owen Walters 
Date: Mon, 7 Nov 2016 11:29:03 -0500
Subject: [PATCH 1596/4996] R.I.P. Startups

---
 docs/_docs/deployment-methods.md | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/docs/_docs/deployment-methods.md b/docs/_docs/deployment-methods.md
index 09116824843..cefb4d32d79 100644
--- a/docs/_docs/deployment-methods.md
+++ b/docs/_docs/deployment-methods.md
@@ -208,12 +208,3 @@ Setting up Kickster is very easy, just install the gem and you are good to go. M
 
 Automating the build and deployment of a Jekyll site is just as simple as GitHub Pages - push your changes to your repo (excluding the `_site` directory) and within seconds a build will be triggered and your built site deployed to our highly- available, globally distributed hosting service. The build process will even install and execute custom Ruby plugins. See our [Jekyll docs](https://www.aerobatic.com/docs/static-generators#jekyll) for more details.
 
-## PubStorm
-
-[PubStorm](https://www.pubstorm.com) is a free front-end and static-site publishing platform built by [Nitrous](https://www.nitrous.io). PubStorm is distributed as a node package and can be installed by running `npm install -g pubstorm`. You can create a free account by running `storm signup`.
-
-To publish your site, run `storm init` from the root of your project and enter `_site` as the project path when prompted. You can the run `jekyll build` to build your site and then run `storm deploy` to publish your site in seconds.
-
-PubStorm offers a pre-configured CDN, free custom domains, SSL certs, rollbacks, collaboration and more. To configure additional features, [follow the instructions on the PubStorm help site](http://help.pubstorm.com).
-
-You can also use the [Nitrous Jekyll Template](https://www.nitrous.io/quickstarts) to develop your Jekyll project and deploy to PubStorm directly from Nitrous. This is a great option for developing Jekyll projects on Windows.

From 70fae19b88152f578be2869d042d87abdf2e3127 Mon Sep 17 00:00:00 2001
From: Ryan Schmidt 
Date: Mon, 7 Nov 2016 23:27:33 -0600
Subject: [PATCH 1597/4996] Use site.baseurl before link tag

---
 docs/_docs/templates.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md
index 54f914f7628..4ae26d2a2ae 100644
--- a/docs/_docs/templates.md
+++ b/docs/_docs/templates.md
@@ -518,10 +518,10 @@ You must include the file extension when using the `link` tag.
 
 ```liquid
 {% raw %}
-{% link _collection/name-of-document.md %}
-{% link _posts/2016-07-26-name-of-post.md %}
-{% link news/index.html %}
-{% link /assets/files/doc.pdf %}
+{{ 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 %}
 ```
 
@@ -529,10 +529,10 @@ You can also use this tag to create a link in Markdown as follows:
 
 ```liquid
 {% raw %}
-[Link to a document]({% link _collection/name-of-document.md %})
-[Link to a post]({% link _posts/2016-07-26-name-of-post.md %})
-[Link to a page]({% link news/index.html %})
-[Link to a file]({% link /assets/files/doc.pdf %})
+[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 %}
 ```
 

From 92354fa7fc9f87d86ddddb6edd0519600c749974 Mon Sep 17 00:00:00 2001
From: Ryan Schmidt 
Date: Mon, 7 Nov 2016 23:29:49 -0600
Subject: [PATCH 1598/4996] Use site.baseurl before post_url tag

---
 docs/_docs/templates.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md
index 4ae26d2a2ae..daae34c2771 100644
--- a/docs/_docs/templates.md
+++ b/docs/_docs/templates.md
@@ -543,7 +543,7 @@ will generate the correct permalink URL for the post you specify.
 
 ```liquid
 {% raw %}
-{% post_url 2010-07-21-name-of-post %}
+{{ site.baseurl }}{% post_url 2010-07-21-name-of-post %}
 {% endraw %}
 ```
 
@@ -552,7 +552,7 @@ path to the post:
 
 ```liquid
 {% raw %}
-{% post_url /subdir/2010-07-21-name-of-post %}
+{{ site.baseurl }}{% post_url /subdir/2010-07-21-name-of-post %}
 {% endraw %}
 ```
 
@@ -562,7 +562,7 @@ You can also use this tag to create a link to a post in Markdown as follows:
 
 ```liquid
 {% raw %}
-[Name of Link]({% post_url 2010-07-21-name-of-post %})
+[Name of Link]({{ site.baseurl }}{% post_url 2010-07-21-name-of-post %})
 {% endraw %}
 ```
 

From ca3aaec7b5a47af7b6b7bce1d1ce4f1801d4b9f5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 8 Nov 2016 12:35:43 -0800
Subject: [PATCH 1599/4996] Update history to reflect merge of #5557 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d81fdbd320c..4185302a75f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
   * Fix broken links in CONTRIBUTING (#5533)
   * Update documentation on jekyllrb.com (#5540)
   * Fix HTML rendering (#5536)
+  * Remove outdated deployment information (#5557)
 
 ### Bug Fixes
 

From 0de653d18647e4d15b5dd5d66674daf3a3b84809 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 8 Nov 2016 17:05:19 -0800
Subject: [PATCH 1600/4996] Update history to reflect merge of #5524 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4185302a75f..f603840ef6f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -39,6 +39,7 @@
 ### Minor Enhancements
 
   * Collapse `gsub` (#5494)
+  * URL: warn if key doesn't exist in url drop (#5524)
 
 ## 3.3.0 / 2016-10-06
 

From 74a5297c192044c82c47cb30955f59d2a4247be0 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 9 Nov 2016 09:41:55 -0800
Subject: [PATCH 1601/4996] Lock to codeclimate-test-reporter ~> 0.6.0. /cc
 #5565

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 464ab468f69..92797b42676 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ group :test do
   gem "cucumber", "~> 2.1"
   gem "jekyll_test_plugin"
   gem "jekyll_test_plugin_malicious"
-  gem "codeclimate-test-reporter"
+  gem "codeclimate-test-reporter", "~> 0.6.0"
   gem "rspec-mocks"
   gem "nokogiri"
   gem "rspec"

From b194211a32f3da646bf96ef58d4081ea3a2da130 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 9 Nov 2016 08:15:55 -0800
Subject: [PATCH 1602/4996] Be much more specific about ignoring vendored
 directories.

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

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 196cf5876e7..e66d504c747 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -17,7 +17,7 @@ class Configuration < Hash
       # Handling Reading
       "safe"              => false,
       "include"           => [".htaccess"],
-      "exclude"           => %w(node_modules vendor),
+      "exclude"           => %w(node_modules vendor/bundle vendor/ruby vendor/cache),
       "keep_files"        => [".git", ".svn"],
       "encoding"          => "utf-8",
       "markdown_ext"      => "markdown,mkdown,mkdn,mkd,md",

From 7bf46270468b837cdf97a0a870e9e4fc5a3a16d9 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 9 Nov 2016 09:22:00 -0800
Subject: [PATCH 1603/4996] Add vendor/gems to the list of excluded & do some
 refactoring.

---
 lib/jekyll/configuration.rb |  4 +++-
 lib/jekyll/entry_filter.rb  | 17 ++++++++---------
 test/test_configuration.rb  |  8 ++++++++
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index e66d504c747..8dc1807d14a 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -17,7 +17,9 @@ class Configuration < Hash
       # Handling Reading
       "safe"              => false,
       "include"           => [".htaccess"],
-      "exclude"           => %w(node_modules vendor/bundle vendor/ruby vendor/cache),
+      "exclude"           => %w(
+        node_modules vendor/bundle/ vendor/cache/ vendor/gems/ vendor/ruby/
+      ),
       "keep_files"        => [".git", ".svn"],
       "encoding"          => "utf-8",
       "markdown_ext"      => "markdown,mkdown,mkdn,mkd,md",
diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb
index 6063607edfe..5f3431d8ed3 100644
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -36,8 +36,7 @@ def filter(entries)
     end
 
     def included?(entry)
-      glob_include?(site.include,
-        entry)
+      glob_include?(site.include, entry)
     end
 
     def special?(entry)
@@ -50,14 +49,14 @@ def backup?(entry)
     end
 
     def excluded?(entry)
-      excluded = glob_include?(site.exclude, relative_to_source(entry))
-      if excluded
-        Jekyll.logger.debug(
-          "EntryFilter:",
-          "excluded #{relative_to_source(entry)}"
-        )
+      glob_include?(site.exclude, relative_to_source(entry)).tap do |excluded|
+        if excluded
+          Jekyll.logger.debug(
+            "EntryFilter:",
+            "excluded #{relative_to_source(entry)}"
+          )
+        end
       end
-      excluded
     end
 
     # --
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index b0b34cce7c6..696fc3e9f63 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -52,6 +52,14 @@ class TestConfiguration < JekyllUnitTest
     should "exclude node_modules" do
       assert_includes Configuration.from({})["exclude"], "node_modules"
     end
+
+    should "exclude ruby vendor directories" do
+      exclude = Configuration.from({})["exclude"]
+      assert_includes exclude, "vendor/bundle/"
+      assert_includes exclude, "vendor/cache/"
+      assert_includes exclude, "vendor/gems/"
+      assert_includes exclude, "vendor/ruby/"
+    end
   end
 
   context "#add_default_collections" do

From 47e400549a7af16c953f2f158c68ec5b1f012d3a Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Wed, 9 Nov 2016 22:42:14 +0100
Subject: [PATCH 1604/4996] [docs] info about the help command usage

---
 docs/_docs/quickstart.md | 2 ++
 docs/_docs/usage.md      | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/docs/_docs/quickstart.md b/docs/_docs/quickstart.md
index 969b5384ffd..2d341cc0d79 100644
--- a/docs/_docs/quickstart.md
+++ b/docs/_docs/quickstart.md
@@ -25,4 +25,6 @@ advantage of all the awesome configuration options Jekyll makes available.
 If you're running into problems, ensure you have all the [requirements
 installed][Installation].
 
+When in doubt, use the help command to remind you of all available options and usage, it also works with the new, build and serve subcommands, e.g. jekyll help new or jekyll help build.
+
 [Installation]: /docs/installation/
diff --git a/docs/_docs/usage.md b/docs/_docs/usage.md
index 3d2413d444b..9f91d437c35 100644
--- a/docs/_docs/usage.md
+++ b/docs/_docs/usage.md
@@ -97,5 +97,12 @@ $ jekyll build --source _source --destination _deploy
 For more about the possible configuration options, see the
 [configuration](../configuration/) page.
 
+
    
+  
    Call for help
    
+  
    
+    The help command is always here to remind you of all available options and usage, and also works with the build, serve and new subcommands, e.g jekyll help new or jekyll help build.
+  
    
+
    
+
 If you're interested in browsing these docs on-the-go, install the
 `jekyll-docs` gem and run `jekyll docs` in your terminal.

From 820b704e3f9f2a05541d90988ef36bf2ecd29466 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Thu, 10 Nov 2016 00:00:26 +0100
Subject: [PATCH 1605/4996] appease script/proof --disable-external

---
 docs/_docs/continuous-integration.md               | 2 +-
 docs/_docs/contributing.md                         | 6 +++---
 docs/_docs/github-pages.md                         | 6 +++---
 docs/_docs/maintaining/avoiding-burnout.md         | 2 +-
 docs/_docs/maintaining/becoming-a-maintainer.md    | 6 +++---
 docs/_docs/maintaining/merging-a-pull-request.md   | 2 +-
 docs/_docs/maintaining/reviewing-a-pull-request.md | 2 +-
 docs/_docs/maintaining/special-labels.md           | 2 +-
 docs/_docs/plugins.md                              | 1 -
 9 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/docs/_docs/continuous-integration.md b/docs/_docs/continuous-integration.md
index 4b5b2d4e334..54b3466cb7c 100644
--- a/docs/_docs/continuous-integration.md
+++ b/docs/_docs/continuous-integration.md
@@ -229,5 +229,5 @@ an entry in the `.gitignore` file to avoid it from being checked in again.
 This entire guide is open-source. Go ahead and [edit it][3] if you have a
 fix or [ask for help][4] if you run into trouble and need some help.
 
-[3]: https://github.com/jekyll/jekyll/edit/master/site/_docs/continuous-integration.md
+[3]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration.md
 [4]: https://jekyllrb.com/help/
diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index a317631c89a..c5a377226d8 100644
--- a/docs/_docs/contributing.md
+++ b/docs/_docs/contributing.md
@@ -67,13 +67,13 @@ We want the Jekyll documentation to be the best it can be. We've open-sourced ou
 
 ### How to submit changes
 
-You can find the documentation for jekyllrb.com in the [site](https://github.com/jekyll/jekyll/tree/master/site) directory. See the section above, [submitting a pull request](#submitting-a-pull-request) for information on how to propose a change.
+You can find the documentation for jekyllrb.com in the [docs](https://github.com/jekyll/jekyll/tree/master/docs) directory. See the section above, [submitting a pull request](#submitting-a-pull-request) for information on how to propose a change.
 
 One gotcha, all pull requests should be directed at the `master` branch (the default branch).
 
 ### Adding plugins
 
-If you want to add your plugin to the [list of plugins](https://jekyllrb.com/docs/plugins/#available-plugins), please submit a pull request modifying the [plugins page source file](https://github.com/jekyll/jekyll/blob/master/site/_docs/plugins.md) by adding a link to your plugin under the proper subheading depending upon its type.
+If you want to add your plugin to the [list of plugins](https://jekyllrb.com/docs/plugins/#available-plugins), please submit a pull request modifying the [plugins page source file](https://github.com/jekyll/jekyll/blob/master/docs/_docs/plugins.md) by adding a link to your plugin under the proper subheading depending upon its type.
 
 ## Code Contributions
 
@@ -85,7 +85,7 @@ Any time you propose a code change, you should also include updates to the docum
 
 #### Documentation
 
-If your contribution changes any Jekyll behavior, make sure to update the documentation. Documentation lives in the `site/_docs` folder (spoiler alert: it's a Jekyll site!). If the docs are missing information, please feel free to add it in. Great docs make a great project. Include changes to the documentation within your pull request, and once merged, `jekyllrb.com` will be updated.
+If your contribution changes any Jekyll behavior, make sure to update the documentation. Documentation lives in the `docs/_docs` folder (spoiler alert: it's a Jekyll site!). If the docs are missing information, please feel free to add it in. Great docs make a great project. Include changes to the documentation within your pull request, and once merged, `jekyllrb.com` will be updated.
 
 #### Tests
 
diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index 6a449d682e2..7a90b8bb2d2 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -122,9 +122,9 @@ custom domain is specified—see below).
 
 The Jekyll project repository itself is a perfect example of this branch
 structure—the [master branch]({{ site.repository }}) contains the
-actual software project for Jekyll, however the Jekyll website (that you’re
-looking at right now) is contained in the [gh-pages
-branch]({{ site.repository }}/tree/gh-pages) of the same repository.
+actual software project for Jekyll, and the Jekyll website that you’re
+looking at right now is contained in the [docs
+folder]({{ site.repository }}/tree/master/docs) of the same repository.
 
 
    
   
    Source Files Must be in the Root Directory
    
diff --git a/docs/_docs/maintaining/avoiding-burnout.md b/docs/_docs/maintaining/avoiding-burnout.md
index a418cefdb5e..1d1d93b17e5 100644
--- a/docs/_docs/maintaining/avoiding-burnout.md
+++ b/docs/_docs/maintaining/avoiding-burnout.md
@@ -28,4 +28,4 @@ Jekyll gets a lot of feature requests, non-reproducible bug reports, usage quest
 
 Thanks to https://gist.github.com/ryanflorence/124070e7c4b3839d4573 which influenced this document.
 
-Thanks to [Homebrew's "Avoiding Burnout" document](https://github.com/Homebrew/brew/blob/master/share/doc/homebrew/Maintainers-Avoiding-Burnout.md) for providing a perfect base for this document.
+Thanks to [Homebrew's "Avoiding Burnout" document](https://github.com/Homebrew/brew/blob/master/docs/Maintainers-Avoiding-Burnout.md) for providing a perfect base for this document.
diff --git a/docs/_docs/maintaining/becoming-a-maintainer.md b/docs/_docs/maintaining/becoming-a-maintainer.md
index c4a262b930c..e4a1840ca7a 100644
--- a/docs/_docs/maintaining/becoming-a-maintainer.md
+++ b/docs/_docs/maintaining/becoming-a-maintainer.md
@@ -14,7 +14,7 @@ You want to maintain Jekyll? Use it often. Do weird things with it. Do normal th
 
 ## 2. Help Triage Issues
 
-Watch the repository you're interested in. Join [an Affinity Team](https://teams.jekyllrb.com) and receive mentions regarding a particular interest area of the project. When you receive a notification for an issue that has not been triaged by a maintainer, dive in. Can you reproduce the issue? Can you determine the fix? [More tips on Triaging an Issue in our maintainer guide](triaging-an-issue.md). Every maintainer loves an issue that is resolved before they get to it. :smiley:
+Watch the repository you're interested in. Join [an Affinity Team](https://teams.jekyllrb.com) and receive mentions regarding a particular interest area of the project. When you receive a notification for an issue that has not been triaged by a maintainer, dive in. Can you reproduce the issue? Can you determine the fix? [More tips on Triaging an Issue in our maintainer guide](../triaging-an-issue). Every maintainer loves an issue that is resolved before they get to it. :smiley:
 
 ## 3. Write Documentation
 
@@ -26,7 +26,7 @@ As a maintainer, you will be reviewing pull requests which update code. You shou
 
 ## 5. Review Pull Requests
 
-Start by reviewing one pull request a week. Leave detailed comments and [follow our guide for reviewing pull requests](reviewing-a-pull-request.md).
+Start by reviewing one pull request a week. Leave detailed comments and [follow our guide for reviewing pull requests](../reviewing-a-pull-request).
 
 ## 6. Ask!
 
@@ -36,4 +36,4 @@ We would love to expand the team and look forward to many more community members
 
 # Helping Out Elsewhere
 
-In addition to maintainers of our core and plugin code, the Jekyll team is comprised of moderators for our forums. These helpful community members take a look at the topics posted to https://talk.jekyllrb.com and ensure they are properly categorized and are acceptable under our Code of Conduct. If you would like to be a moderator, email one of the maintainers with links to where you have answered questions and a request to be added as a moderator. More help is always welcome.
+In addition to maintainers of our core and plugin code, the Jekyll team is comprised of moderators for our forums. These helpful community members take a look at the topics posted to [https://talk.jekyllrb.com](https://talk.jekyllrb.com) and ensure they are properly categorized and are acceptable under our Code of Conduct. If you would like to be a moderator, email one of the maintainers with links to where you have answered questions and a request to be added as a moderator. More help is always welcome.
diff --git a/docs/_docs/maintaining/merging-a-pull-request.md b/docs/_docs/maintaining/merging-a-pull-request.md
index 7265c6f857c..80ad6f7c5e3 100644
--- a/docs/_docs/maintaining/merging-a-pull-request.md
+++ b/docs/_docs/maintaining/merging-a-pull-request.md
@@ -10,7 +10,7 @@ layout: docs
 
 All pull requests should be subject to code review. Code review is a [foundational value](https://blog.fullstory.com/what-we-learned-from-google-code-reviews-arent-just-for-catching-bugs-b125a13aa292) of good engineering teams. Besides providing validation of correctness, it promotes a sense of community and gives other maintainers understanding of all parts of the code base. In short, code review is crucial to a healthy open source project.
 
-**Read our guide for [Reviewing a pull request](reviewing-a-pull-request.md) before merging.** Notably, the change must have tests if for code, and at least two maintainers must give it an OK.
+**Read our guide for [Reviewing a pull request](../reviewing-a-pull-request) before merging.** Notably, the change must have tests if for code, and at least two maintainers must give it an OK.
 
 ## Merging
 
diff --git a/docs/_docs/maintaining/reviewing-a-pull-request.md b/docs/_docs/maintaining/reviewing-a-pull-request.md
index 1ecaeea9899..ebdd7a3c41b 100644
--- a/docs/_docs/maintaining/reviewing-a-pull-request.md
+++ b/docs/_docs/maintaining/reviewing-a-pull-request.md
@@ -8,7 +8,7 @@ layout: docs
 
 ## Respond Kindly
 
-Above all else, please review a pull request kindly. Our community can only be strong if we make it a welcoming and inclusive environment. To further promote this, the Jekyll community is governed by a [Code of Conduct](../CONDUCT.markdown) by which all community members must abide.
+Above all else, please review a pull request kindly. Our community can only be strong if we make it a welcoming and inclusive environment. To further promote this, the Jekyll community is governed by a [Code of Conduct](/docs/conduct) by which all community members must abide.
 
 Use emoji liberally :heart: :tada: :sparkles: :confetti_ball: and feel free to be emotive!! Contributions keep this project moving forward and we're always happy to receive them, even if the pull request isn't ultimately merged.
 
diff --git a/docs/_docs/maintaining/special-labels.md b/docs/_docs/maintaining/special-labels.md
index ff8a623f858..eea366e96be 100644
--- a/docs/_docs/maintaining/special-labels.md
+++ b/docs/_docs/maintaining/special-labels.md
@@ -18,4 +18,4 @@ These labels are used to indicate that the Git state of a pull request must chan
 
 ## `stale`
 
-This label is automatically added and removed by @jekyllbot based on activity on an issue or pull request. The rules for this label are laid out in [Triaging an Issue: Staleness and automatic closure](triaging-an-issue.md#staleness-and-automatic-closure).
+This label is automatically added and removed by @jekyllbot based on activity on an issue or pull request. The rules for this label are laid out in [Triaging an Issue: Staleness and automatic closure](../triaging-an-issue/#staleness-and-automatic-closure).
diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 6e5bbf23847..e546396f210 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -771,7 +771,6 @@ LESS.js files during generation.
 - [Markdown References by Olov Lassus](https://github.com/olov/jekyll-references): Keep all your markdown reference-style link definitions in one \_references.md file.
 - [Stylus Converter](https://gist.github.com/988201): Convert .styl to .css.
 - [ReStructuredText Converter](https://github.com/xdissent/jekyll-rst): Converts ReST documents to HTML with Pygments syntax highlighting.
-- [Jekyll-pandoc-plugin](https://github.com/dsanson/jekyll-pandoc-plugin): Use pandoc for rendering markdown.
 - [Jekyll-pandoc-multiple-formats](https://github.com/fauno/jekyll-pandoc-multiple-formats) by [edsl](https://github.com/edsl): Use pandoc to generate your site in multiple formats. Supports pandoc’s markdown extensions.
 - [Transform Layouts](https://gist.github.com/1472645): Allows HAML layouts (you need a HAML Converter plugin for this to work).
 - [Org-mode Converter](https://gist.github.com/abhiyerra/7377603): Org-mode converter for Jekyll.

From d71dff74ae89498c6df4755029b6965229f482a2 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell 
Date: Fri, 7 Oct 2016 07:53:07 -0500
Subject: [PATCH 1606/4996] Fix #5462: Only shutdown watch in Bash On Windows.

---
 lib/jekyll/commands/build.rb  |  8 ++++----
 lib/jekyll/utils/platforms.rb | 19 ++++++++++++++++---
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb
index 3e43f955b7e..d291663239a 100644
--- a/lib/jekyll/commands/build.rb
+++ b/lib/jekyll/commands/build.rb
@@ -71,10 +71,10 @@ def build(site, options)
         #
         # Returns nothing.
         def watch(site, options)
-          if Utils::Platforms.windows?
-            Jekyll.logger.warn "", "--watch arg is unsupported on Windows. "
-            Jekyll.logger.warn "", "If you are on Windows Bash, please see: " \
-              "https://github.com/Microsoft/BashOnWindows/issues/216"
+          if Utils::Platforms.bash_on_windows?
+            Jekyll.logger.warn "", "--watch arg is unsupported in Bash on Windows. "
+            Jekyll.logger.warn "", "Please see: https://github.com/Microsoft/BashOnWindows/issues/216"
+            Jekyll.logger.warn "", "If iNotify is fixed, please file a ticket."
 
           else
             External.require_with_graceful_fail "jekyll-watch"
diff --git a/lib/jekyll/utils/platforms.rb b/lib/jekyll/utils/platforms.rb
index a16c239bcf0..f66ef795bbd 100644
--- a/lib/jekyll/utils/platforms.rb
+++ b/lib/jekyll/utils/platforms.rb
@@ -19,20 +19,33 @@ module Platforms
       # /proc/version returns nothing to us.
       # --
 
-      def really_windows?
+      def vanilla_windows?
         RbConfig::CONFIG["host_os"] =~ %r!mswin|mingw|cygwin!i && \
           !proc_version
       end
 
+      # --
+      # XXX: Remove in 4.0
+      # --
+
+      alias_method :really_windows?, \
+        :vanilla_windows?
+
       #
 
-      def windows?
-        RbConfig::CONFIG["host_os"] =~ %r!mswin|mingw|cygwin!i || \
+      def bash_on_windows?
+        RbConfig::CONFIG["host_os"] =~ %r!linux! && \
           proc_version =~ %r!microsoft!i
       end
 
       #
 
+      def windows?
+        vanilla_windows? || bash_on_windows?
+      end
+
+      #
+
       def linux?
         RbConfig::CONFIG["host_os"] =~ %r!linux! && \
           proc_version !~ %r!microsoft!i

From df45f2618790922e6f704d301628d0169346a1a3 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 10 Nov 2016 12:54:30 -0800
Subject: [PATCH 1607/4996] Builder.watch: only warn for Bash on Windows, still
 try watching.

---
 lib/jekyll/commands/build.rb | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb
index d291663239a..3cea607cbd0 100644
--- a/lib/jekyll/commands/build.rb
+++ b/lib/jekyll/commands/build.rb
@@ -71,23 +71,27 @@ def build(site, options)
         #
         # Returns nothing.
         def watch(site, options)
+          # Warn Windows users that they might need to upgrade.
           if Utils::Platforms.bash_on_windows?
-            Jekyll.logger.warn "", "--watch arg is unsupported in Bash on Windows. "
-            Jekyll.logger.warn "", "Please see: https://github.com/Microsoft/BashOnWindows/issues/216"
-            Jekyll.logger.warn "", "If iNotify is fixed, please file a ticket."
+            Jekyll.logger.warn "",
+              "Auto-regeneration may not work on some Windows versions."
+            Jekyll.logger.warn "",
+              "Please see: https://github.com/Microsoft/BashOnWindows/issues/216"
+            Jekyll.logger.warn "",
+              "If it does not work, please upgrade Bash on Windows or "\
+                "run Jekyll with --no-watch."
+          end
 
+          External.require_with_graceful_fail "jekyll-watch"
+          watch_method = Jekyll::Watcher.method(:watch)
+          if watch_method.parameters.size == 1
+            watch_method.call(
+              options
+            )
           else
-            External.require_with_graceful_fail "jekyll-watch"
-            watch_method = Jekyll::Watcher.method(:watch)
-            if watch_method.parameters.size == 1
-              watch_method.call(
-                options
-              )
-            else
-              watch_method.call(
-                options, site
-              )
-            end
+            watch_method.call(
+              options, site
+            )
           end
         end
       end # end of class << self

From 2d1a50c21214659a89c2e6f36e68cd7c257dd23a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 10 Nov 2016 13:00:40 -0800
Subject: [PATCH 1608/4996] Update history to reflect merge of #5564 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f603840ef6f..b2ae50f0877 100644
--- a/History.markdown
+++ b/History.markdown
@@ -27,6 +27,7 @@
   * Do not swallow all exceptions on render (#5495)
   * Site template: fixed `_config.yml` comment typo (#5511)
   * `jekyll new-theme` should specify Jekyll as a runtime dependency for the theme (#5457)
+  * Be much more specific about ignoring specific vendored directories. (#5564)
 
 ### Development Fixes
 

From 426830107116edb91a8c14e56ae390ba9ae7e3a2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 10 Nov 2016 13:02:10 -0800
Subject: [PATCH 1609/4996] Update history to reflect merge of #5546 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b2ae50f0877..16af17c8dcd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -36,6 +36,7 @@
   * Restrict Rubocop version (#5496)
   * include a hashbang for all benchmark scripts & make them executable (#5505)
   * Update source in script/proof (#5538)
+  * Collections.feature: conditional steps to have it pass on Windows (#5546)
 
 ### Minor Enhancements
 

From fc66991243ec66ed7a7de53d37bff2080bb6859d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 10 Nov 2016 13:02:49 -0800
Subject: [PATCH 1610/4996] Update history to reflect merge of #5526 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 16af17c8dcd..f1962af2d28 100644
--- a/History.markdown
+++ b/History.markdown
@@ -37,6 +37,7 @@
   * include a hashbang for all benchmark scripts & make them executable (#5505)
   * Update source in script/proof (#5538)
   * Collections.feature: conditional steps to have it pass on Windows (#5546)
+  * Fix tests to get script/test to pass on Windows (#5526)
 
 ### Minor Enhancements
 

From bafe37cc9d70fa7a2d6708510e0c1c7860e8d07e Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 10 Nov 2016 13:12:29 -0800
Subject: [PATCH 1611/4996] Update history to reflect merge of #5520

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

diff --git a/History.markdown b/History.markdown
index f1962af2d28..e31d2b0e510 100644
--- a/History.markdown
+++ b/History.markdown
@@ -20,6 +20,7 @@
   * Update documentation on jekyllrb.com (#5540)
   * Fix HTML rendering (#5536)
   * Remove outdated deployment information (#5557)
+  * no more invalid US-ASCII on lines 30 and 97 (#5520)
 
 ### Bug Fixes
 

From 6110002d1e3cfb44a8ee3178300d360cc7be2531 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 10 Nov 2016 13:13:11 -0800
Subject: [PATCH 1612/4996] Fix history reference to #5532.

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

diff --git a/History.markdown b/History.markdown
index e31d2b0e510..6239f78877e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,7 +1,5 @@
 ## HEAD
 
-  * Add permalinks to docs in '/maintaining/' (#5532)
-
 ### Site Enhancements
 
   * Documentation: {% link %} tag  (#5449)
@@ -21,6 +19,7 @@
   * Fix HTML rendering (#5536)
   * Remove outdated deployment information (#5557)
   * no more invalid US-ASCII on lines 30 and 97 (#5520)
+  * Add permalinks to docs in '/maintaining/' (#5532)
 
 ### Bug Fixes
 

From fcbbc4d0bc37a5b89c154c2c2436a71cca8298a8 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 10 Nov 2016 13:15:20 -0800
Subject: [PATCH 1613/4996] Update history to reflect merge of #5514

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

diff --git a/History.markdown b/History.markdown
index 6239f78877e..353ba7a3d25 100644
--- a/History.markdown
+++ b/History.markdown
@@ -20,6 +20,7 @@
   * Remove outdated deployment information (#5557)
   * no more invalid US-ASCII on lines 30 and 97 (#5520)
   * Add permalinks to docs in '/maintaining/' (#5532)
+  * Add jekyll-pinboard to list of third-party plugins (#5514)
 
 ### Bug Fixes
 

From 09ec7c81f2b6e085425a962c5f791de5f078e10b Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 10 Nov 2016 13:15:54 -0800
Subject: [PATCH 1614/4996] Update history to reflect merge of #5507

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

diff --git a/History.markdown b/History.markdown
index 353ba7a3d25..d2ba094c0f0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -21,6 +21,7 @@
   * no more invalid US-ASCII on lines 30 and 97 (#5520)
   * Add permalinks to docs in '/maintaining/' (#5532)
   * Add jekyll-pinboard to list of third-party plugins (#5514)
+  * Fix formatting in 2-to-3.md (#5507)
 
 ### Bug Fixes
 

From d050f6de10c7dcbe4b38c1bc1c1a39b0b19420cb Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 10 Nov 2016 13:18:17 -0800
Subject: [PATCH 1615/4996] Update history to reflect merge of #5493 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d2ba094c0f0..5a68072c06a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -22,6 +22,7 @@
   * Add permalinks to docs in '/maintaining/' (#5532)
   * Add jekyll-pinboard to list of third-party plugins (#5514)
   * Fix formatting in 2-to-3.md (#5507)
+  * Add two plugins to the plugins page (#5493)
 
 ### Bug Fixes
 

From e515ddeb293cfdf9840f1d748f21b1f97d57f988 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Thu, 10 Nov 2016 23:13:34 +0100
Subject: [PATCH 1616/4996] fix link to jekyll-pinboard plugin

---
 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 a28b90cadd6..6c5a9f9f13a 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -916,7 +916,7 @@ LESS.js files during generation.
 - [Jekyll-Spotify](https://github.com/MertcanGokgoz/Jekyll-Spotify): Easily output Spotify Embed Player for jekyll
 - [jekyll-menus](https://github.com/forestryio/jekyll-menus): Hugo style menus for your Jekyll site... recursive menus included.
 - [jekyll-data](https://github.com/ashmaroli/jekyll-data): Read data files within Jekyll Theme Gems.
-- [jekyll-pinboard(https://github.com/snaptortoise/jekyll-pinboard-plugin): Access your Pinboard bookmarks within your Jekyll theme.
+- [jekyll-pinboard](https://github.com/snaptortoise/jekyll-pinboard-plugin): Access your Pinboard bookmarks within your Jekyll theme.
 
 #### Editors
 

From 262ebbb9f0fb782a970c9d8dab9a355ca996b9c1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 10 Nov 2016 14:32:55 -0800
Subject: [PATCH 1617/4996] Update history to reflect merge of #5559 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5a68072c06a..8fefb05710d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -23,6 +23,7 @@
   * Add jekyll-pinboard to list of third-party plugins (#5514)
   * Fix formatting in 2-to-3.md (#5507)
   * Add two plugins to the plugins page (#5493)
+  * Use site.baseurl before link and post_url tags (#5559)
 
 ### Bug Fixes
 

From 3e504f083717f6295cfee8a9903348b9d6e3bffc Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Thu, 10 Nov 2016 23:42:01 +0100
Subject: [PATCH 1618/4996] mention `docs` folder to deploy on GitHub Pages

fix #5543
---
 docs/_docs/github-pages.md | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index 6a449d682e2..b65bad904b8 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -115,21 +115,28 @@ publish the GitHub Pages site, so make sure your Jekyll site is stored there.
 
 Unlike user and organization Pages, Project Pages are kept in the same
 repository as the project they are for, except that the website content is
-stored in a specially named `gh-pages` branch. The content of this branch will
-be rendered using Jekyll, and the output will become available under a subpath
-of your user pages subdomain, such as `username.github.io/project` (unless a
-custom domain is specified—see below).
+stored in a specially named `gh-pages` branch or in a `docs` folder on the
+`master` branch. The content will be rendered using Jekyll, and the output
+will become available under a subpath of your user pages subdomain, such as
+`username.github.io/project` (unless a custom domain is specified).
 
-The Jekyll project repository itself is a perfect example of this branch
-structure—the [master branch]({{ site.repository }}) contains the
-actual software project for Jekyll, however the Jekyll website (that you’re
-looking at right now) is contained in the [gh-pages
-branch]({{ site.repository }}/tree/gh-pages) of the same repository.
+The Jekyll project repository itself is a perfect example: the
+[master branch]({{ site.repository }}) contains the actual software project
+for Jekyll, however the Jekyll website (that you’re looking at right now) is
+contained in the [docs folder]({{ site.repository }}/tree/master/docs) of the
+same repository.
+
+Please refer to GitHub official documentation on
+[user, organization and projets pages](https://help.github.com/articles/user-organization-and-project-pages/)
+to see more detailed examples.
 
 
    
   
    Source Files Must be in the Root Directory
    
   
    
-GitHub Pages overrides the “Site Source” configuration value, so if you locate your files anywhere other than the root directory, your site may not build correctly.
+    GitHub Pages overrides
+    the “Site Source”
+    configuration value, so if you locate your files anywhere other than the
+    root directory, your site may not build correctly.
   
    
 
    
 

From dbfe0cdf56eb933b973cd626f8e01dd69301a9cc Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 10 Nov 2016 14:50:39 -0800
Subject: [PATCH 1619/4996] Update history to reflect merge of #5570 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8fefb05710d..aaac384b477 100644
--- a/History.markdown
+++ b/History.markdown
@@ -24,6 +24,7 @@
   * Fix formatting in 2-to-3.md (#5507)
   * Add two plugins to the plugins page (#5493)
   * Use site.baseurl before link and post_url tags (#5559)
+  * Fix link to jekyll-pinboard plugin (#5570)
 
 ### Bug Fixes
 

From 07d4333579f0024f913c2dbb22c40145163d0a83 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 10 Nov 2016 15:05:42 -0800
Subject: [PATCH 1620/4996] Update history to reflect merge of #5464 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index aaac384b477..138d4cf7dc4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -33,6 +33,7 @@
   * Site template: fixed `_config.yml` comment typo (#5511)
   * `jekyll new-theme` should specify Jekyll as a runtime dependency for the theme (#5457)
   * Be much more specific about ignoring specific vendored directories. (#5564)
+  * Only warn about auto-regeneration bug on Bash On Windows. (#5464)
 
 ### Development Fixes
 

From 51d04cbd00deab11918cee382c393d56159736f2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 10 Nov 2016 15:22:13 -0800
Subject: [PATCH 1621/4996] Update history to reflect merge of #5571 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 138d4cf7dc4..a408b0f29c5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Add two plugins to the plugins page (#5493)
   * Use site.baseurl before link and post_url tags (#5559)
   * Fix link to jekyll-pinboard plugin (#5570)
+  * mention `docs` folder as a way to deploy on GitHub Pages (#5571)
 
 ### Bug Fixes
 

From f27eb77d0bbbffaa2317f90b790be3b0491aa464 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 10 Nov 2016 15:20:11 -0800
Subject: [PATCH 1622/4996] Add failing test for permalink templates with
 trailing underscores

---
 test/helper.rb   | 15 +++++++++++++++
 test/test_url.rb | 34 +++++++++++-----------------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/test/helper.rb b/test/helper.rb
index ad88b5d04a7..0c6935a03fb 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -103,6 +103,21 @@ def after_teardown
     RSpec::Mocks.teardown
   end
 
+  def fixture_document(relative_path)
+    site = fixture_site({
+      "collections" => {
+        "methods" => {
+          "output" => true
+        }
+      }
+    })
+    site.read
+    matching_doc = site.collections["methods"].docs.find do |doc|
+      doc.relative_path == relative_path
+    end
+    [site, matching_doc]
+  end
+
   def fixture_site(overrides = {})
     Jekyll::Site.new(site_configuration(overrides))
   end
diff --git a/test/test_url.rb b/test/test_url.rb
index 1a4471162f3..c39e51f2f96 100644
--- a/test/test_url.rb
+++ b/test/test_url.rb
@@ -54,17 +54,7 @@ class TestURL < JekyllUnitTest
     end
 
     should "handle UrlDrop as a placeholder in addition to a hash" do
-      site = fixture_site({
-        "collections" => {
-          "methods" => {
-            "output" => true
-          }
-        }
-      })
-      site.read
-      matching_doc = site.collections["methods"].docs.find do |doc|
-        doc.relative_path == "_methods/escape-+ #%20[].md"
-      end
+      _, matching_doc = fixture_document("_methods/escape-+ #%20[].md")
       assert_equal "/methods/escape-+-20/escape-20.html", URL.new(
         :template     => "/methods/:title/:name:output_ext",
         :placeholders => matching_doc.url_placeholders
@@ -81,18 +71,16 @@ class TestURL < JekyllUnitTest
       end
     end
 
-    should "ignore NoMethodErrors when a placeholder is not found" do
-      site = fixture_site({
-        "collections" => {
-          "methods" => {
-            "output" => true
-          }
-        }
-      })
-      site.read
-      matching_doc = site.collections["methods"].docs.find do |doc|
-        doc.relative_path == "_methods/escape-+ #%20[].md"
-      end
+    should "check for key without trailing underscore" do
+      _, matching_doc = fixture_document("_methods/configuration.md")
+      assert_equal "/lol", URL.new(
+        :template => "/:year-:month-:day_:title",
+        :placeholders => matching_doc.url_placeholders
+      ).to_s
+    end
+
+    should "raise custom error when URL placeholder doesn't have key" do
+      _, matching_doc = fixture_document("_methods/escape-+ #%20[].md")
       assert_raises NoMethodError do
         URL.new(
           :template     => "/methods/:headline",

From 9f8f0314693c61f516af7fe68e1022acb508b2d0 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 10 Nov 2016 15:30:51 -0800
Subject: [PATCH 1623/4996] Whoops, an *actually useful* failing test.

---
 test/test_url.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_url.rb b/test/test_url.rb
index c39e51f2f96..4c0320a76f7 100644
--- a/test/test_url.rb
+++ b/test/test_url.rb
@@ -73,8 +73,8 @@ class TestURL < JekyllUnitTest
 
     should "check for key without trailing underscore" do
       _, matching_doc = fixture_document("_methods/configuration.md")
-      assert_equal "/lol", URL.new(
-        :template => "/:year-:month-:day_:title",
+      assert_equal "/methods/2016-11-10_configuration", URL.new(
+        :template => "/methods/:year-:month-:day_:title",
         :placeholders => matching_doc.url_placeholders
       ).to_s
     end

From 347651e5716c768efbc4f613b242bd55ed55bfea Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 10 Nov 2016 15:34:03 -0800
Subject: [PATCH 1624/4996] URL#generate_url_from_drop: be smarter about
 replacing *just* the keys

---
 lib/jekyll/url.rb | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 291f6e5865d..e4a93fba5a3 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -84,17 +84,29 @@ def generate_url_from_hash(template)
       end
     end
 
+    def possible_keys(key)
+      if key.end_with?("_")
+        [key, key.chomp("_")]
+      else
+        [key]
+      end
+    end
+
     def generate_url_from_drop(template)
       template.gsub(%r!:([a-z_]+)!) do |match|
-        key = match.sub(":".freeze, "".freeze)
-        unless @placeholders.key?(key)
-          raise NoMethodError, "The URL template key #{key} doesn't exist!"
-        end
-        if @placeholders[key].nil?
-          "".freeze
-        else
-          self.class.escape_path(@placeholders[key])
+        pool = possible_keys(match.sub(":".freeze, "".freeze))
+
+        winner = pool.find { |key| @placeholders.key?(key) }
+        if winner.nil?
+          raise NoMethodError,
+            "The URL template doesn't have #{pool.join(" or ")} keys. Check your permalink template!"
         end
+
+        value = @placeholders[winner]
+        value = "" if value.nil?
+        replacement = self.class.escape_path(value)
+
+        match.sub(":#{winner}", replacement)
       end.gsub(%r!//!, "/".freeze)
     end
 

From d50ef0e3dd00a39fd9b3e19049ca2f52d06ac43a Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 10 Nov 2016 15:36:05 -0800
Subject: [PATCH 1625/4996] Add useful comment.

---
 lib/jekyll/url.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index e4a93fba5a3..9e49cc408d0 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -84,6 +84,12 @@ def generate_url_from_hash(template)
       end
     end
 
+    # We include underscores in keys to allow for 'i_month' and so forth.
+    # This poses a problem for keys which are followed by and underscore
+    # but the underscore is not part of the key, e.g. '/:month_:day'.
+    # That should be :month and :day, but our key extraction regexp isn't
+    # smart enough to know that so we have to make it an explicit
+    # possibility.
     def possible_keys(key)
       if key.end_with?("_")
         [key, key.chomp("_")]

From ff012e795aabad96cb7d124061acc278d5888f8a Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 10 Nov 2016 15:57:45 -0800
Subject: [PATCH 1626/4996] Fix fmt error.

---
 lib/jekyll/url.rb | 3 ++-
 test/test_url.rb  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 9e49cc408d0..404b27283ca 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -105,7 +105,8 @@ def generate_url_from_drop(template)
         winner = pool.find { |key| @placeholders.key?(key) }
         if winner.nil?
           raise NoMethodError,
-            "The URL template doesn't have #{pool.join(" or ")} keys. Check your permalink template!"
+            "The URL template doesn't have #{pool.join(" or ")} keys. "\
+              "Check your permalink template!"
         end
 
         value = @placeholders[winner]
diff --git a/test/test_url.rb b/test/test_url.rb
index 4c0320a76f7..e9987b15a1b 100644
--- a/test/test_url.rb
+++ b/test/test_url.rb
@@ -74,7 +74,7 @@ class TestURL < JekyllUnitTest
     should "check for key without trailing underscore" do
       _, matching_doc = fixture_document("_methods/configuration.md")
       assert_equal "/methods/2016-11-10_configuration", URL.new(
-        :template => "/methods/:year-:month-:day_:title",
+        :template     => "/methods/:year-:month-:day_:title",
         :placeholders => matching_doc.url_placeholders
       ).to_s
     end

From cb6724046de0dbae828d609edea11e796979cb37 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 11 Nov 2016 16:30:44 -0800
Subject: [PATCH 1627/4996] Dates are _the worst_

---
 test/test_url.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_url.rb b/test/test_url.rb
index e9987b15a1b..fc3678d70d0 100644
--- a/test/test_url.rb
+++ b/test/test_url.rb
@@ -73,8 +73,8 @@ class TestURL < JekyllUnitTest
 
     should "check for key without trailing underscore" do
       _, matching_doc = fixture_document("_methods/configuration.md")
-      assert_equal "/methods/2016-11-10_configuration", URL.new(
-        :template     => "/methods/:year-:month-:day_:title",
+      assert_equal "/methods/configuration-configuration_methods_configuration", URL.new(
+        :template     => "/methods/:name-:slug_:collection_:title",
         :placeholders => matching_doc.url_placeholders
       ).to_s
     end

From 15bdd8149913bbf33411711365b385a21e262625 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sat, 12 Nov 2016 23:28:57 +0530
Subject: [PATCH 1628/4996] bring docs on 'structure' up-to-date

---
 docs/_docs/structure.md | 45 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/docs/_docs/structure.md b/docs/_docs/structure.md
index b21cb1b27be..0d205361be0 100644
--- a/docs/_docs/structure.md
+++ b/docs/_docs/structure.md
@@ -17,6 +17,8 @@ A basic Jekyll site usually looks something like this:
 ```sh
 .
 ├── _config.yml
+├── _data
+|   └── members.yml
 ├── _drafts
 |   ├── begin-with-the-crazy-ideas.md
 |   └── on-simplicity-in-technology.md
@@ -29,13 +31,28 @@ A basic Jekyll site usually looks something like this:
 ├── _posts
 |   ├── 2007-10-29-why-every-programmer-should-play-nethack.md
 |   └── 2009-04-26-barcamp-boston-4-roundup.md
-├── _data
-|   └── members.yml
+├── _sass
+|   ├── _base.scss
+|   └── _layout.scss
 ├── _site
 ├── .jekyll-metadata
-└── index.html
+└── index.html # can also be an 'index.md' with valid YAML Frontmatter
 ```
 
+
    
+  
    Directory Structure of Jekyll Sites using Theme Gems
    
+  
    
+    Starting v3.2, a new Jekyll Project installed by jekyll new uses gem-based themes to define the look of the site, and would have a slightly changed directory structure. 
    _layouts, _includes and _sass are now part of the gem-based theme, which by default, is minima.
+  
    
+  
    
+    With v3.3, the css directory has been renamed to assets, and moved to minima as well. Moreover, index.html is now an index.md.
+  

    
+  
    
+    You can easily find the path to your local installation of minima gem by executing bundle show minima.
+    For further information, refer our documentation on theme-gems.
+  
    
+
    
+
 An overview of what each of these does:
 
 
    
@@ -133,9 +150,9 @@ An overview of what each of these does:
         
    
 
           Well-formatted site data should be placed here. The Jekyll engine
-          will autoload all YAML files in this directory (using either the
-          .yml, .yaml, .json or
-          .csv formats and extensions) and they will be
+          will autoload all data files (using either the .yml,
+          .yaml, .json or .csv
+          formats and extensions) in this directory, and they will be
           accessible via `site.data`. If there's a file
           members.yml under the directory, then you can access
           contents of the file through site.data.members.
@@ -143,6 +160,20 @@ An overview of what each of these does:
         
    
       
     
+    
+      
+        
    _sass
    
+      
+      
+        
    
+
+          These are sass partials that can be imported into your main.scss
+          which will then be processed into a single stylesheet main.css
+          that defines the styles to be used by your site.
+
+        
    
+      
+    
     
       
         
    _site
    
@@ -175,7 +206,7 @@ An overview of what each of these does:
     
     
       
-        
    index.html and other HTML, Markdown, Textile files
    
+        
    index.html or index.md and other HTML, Markdown, Textile files
    
       
       
         
    

From 5d1f2bceeac33f5f48be5eebf805cf18ccc9a929 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 12 Nov 2016 20:51:55 +0100
Subject: [PATCH 1629/4996] update directory structure documentation

---
 docs/_docs/structure.md | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/docs/_docs/structure.md b/docs/_docs/structure.md
index 0d205361be0..cbc8b6eeb8a 100644
--- a/docs/_docs/structure.md
+++ b/docs/_docs/structure.md
@@ -40,16 +40,13 @@ A basic Jekyll site usually looks something like this:
 ```
 
 
    
-  
    Directory Structure of Jekyll Sites using Theme Gems
    
+  
    Directory structure of Jekyll sites using gem themes
    
   
    
-    Starting v3.2, a new Jekyll Project installed by jekyll new uses gem-based themes to define the look of the site, and would have a slightly changed directory structure. 
    _layouts, _includes and _sass are now part of the gem-based theme, which by default, is minima.
+    Starting Jekyll 3.2, a new Jekyll project boostraped with jekyll new uses gem-based themes to define the look of the site. This results in a lighter default directory structure : _layouts, _includes and _sass are stored by default in the gem theme path.
   
    
+  
    
   
    
-    With v3.3, the css directory has been renamed to assets, and moved to minima as well. Moreover, index.html is now an index.md.
-  

    
-  
    
-    You can easily find the path to your local installation of minima gem by executing bundle show minima.
-    For further information, refer our documentation on theme-gems.
+     minima is the current default theme, bundle show minima will show you where minima theme's files are stored on your computer.
   
    
 
    
 
@@ -70,11 +67,9 @@ An overview of what each of these does:
       
       
         
    
-
           Stores configuration data. Many of
           these options can be specified from the command line executable but
           it’s easier to specify them here so you don’t have to remember them.
-
         
    
       
     
@@ -84,11 +79,9 @@ An overview of what each of these does:
       
       
         
    
-
           Drafts are unpublished posts. The format of these files is without a
           date: title.MARKUP. Learn how to 
           work with drafts.
-
         
    
       
     
@@ -98,13 +91,11 @@ An overview of what each of these does:
       
       
         
    
-
           These are the partials that can be mixed and matched by your layouts
           and posts to facilitate reuse. The liquid tag
           {% raw %}{% include file.ext %}{% endraw %}
           can be used to include the partial in
           _includes/file.ext.
-
         
    
       
     
@@ -114,14 +105,12 @@ An overview of what each of these does:
       
       
         
    
-
           These are the templates that wrap posts. Layouts are chosen on a
           post-by-post basis in the
           YAML Front Matter,
           which is described in the next section. The liquid tag
           {% raw %}{{ content }}{% endraw %}
           is used to inject content into the web page.
-
         
    
       
     
@@ -131,14 +120,12 @@ An overview of what each of these does:
       
       
         
    
-
           Your dynamic content, so to speak. The naming convention of these
           files is important, and must follow the format:
           YEAR-MONTH-DAY-title.MARKUP.
           The permalinks can be customized for
           each post, but the date and markup language are determined solely by
           the file name.
-
         
    
       
     
@@ -148,7 +135,6 @@ An overview of what each of these does:
       
       
         
    
-
           Well-formatted site data should be placed here. The Jekyll engine
           will autoload all data files (using either the .yml,
           .yaml, .json or .csv
@@ -156,7 +142,6 @@ An overview of what each of these does:
           accessible via `site.data`. If there's a file
           members.yml under the directory, then you can access
           contents of the file through site.data.members.
-
         
    
       
     
@@ -166,11 +151,10 @@ An overview of what each of these does:
       
       
         
    
-
           These are sass partials that can be imported into your main.scss
-          which will then be processed into a single stylesheet main.css
+          which will then be processed into a single stylesheet
+          main.css
           that defines the styles to be used by your site.
-
         
    
       
     
@@ -180,11 +164,9 @@ An overview of what each of these does:
       
       
         
    
-
           This is where the generated site will be placed (by default) once
           Jekyll is done transforming it. It’s probably a good idea to add this
           to your .gitignore file.
-
         
    
       
     
@@ -194,13 +176,11 @@ An overview of what each of these does:
       
       
         
    
-
           This helps Jekyll keep track of which files have not been modified
           since the site was last built, and which files will need to be
           regenerated on the next build. This file will not be included in the
           generated site. It’s probably a good idea to add this to your
           .gitignore file.
-
         
    
       
     
@@ -210,13 +190,11 @@ An overview of what each of these does:
       
       
         
    
-
           Provided that the file has a YAML Front
           Matter section, it will be transformed by Jekyll. The same will
           happen for any .html, .markdown,
           .md, or .textile file in your site’s root
           directory or directories not listed above.
-
         
    
       
     
@@ -226,14 +204,12 @@ An overview of what each of these does:
       
       
         
    
-
           Every other directory and file except for those listed above—such as
           css and images folders,
           favicon.ico files, and so forth—will be copied verbatim
           to the generated site. There are plenty of sites
           already using Jekyll if you’re curious to see how they’re laid
           out.
-
         
    
       
     

From 365ecb7c37417a983886a25d9523f201dbf9a708 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 13 Nov 2016 07:41:50 +0530
Subject: [PATCH 1630/4996] a few more edits

---
 docs/_docs/structure.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/_docs/structure.md b/docs/_docs/structure.md
index cbc8b6eeb8a..bdfaab59a7a 100644
--- a/docs/_docs/structure.md
+++ b/docs/_docs/structure.md
@@ -40,13 +40,13 @@ A basic Jekyll site usually looks something like this:
 ```
 
 
    
-  
    Directory structure of Jekyll sites using gem themes
    
+  
    Directory structure of Jekyll sites using gem-based themes
    
   
    
-    Starting Jekyll 3.2, a new Jekyll project boostraped with jekyll new uses gem-based themes to define the look of the site. This results in a lighter default directory structure : _layouts, _includes and _sass are stored by default in the gem theme path.
+    Starting Jekyll 3.2, a new Jekyll project bootstrapped with jekyll new uses gem-based themes to define the look of the site. This results in a lighter default directory structure : _layouts, _includes and _sass are stored in the theme-gem, by default.
   
    
   
    
   
    
-     minima is the current default theme, bundle show minima will show you where minima theme's files are stored on your computer.
+     minima is the current default theme, and bundle show minima will show you where minima theme's files are stored on your computer.
   
    
 
    
 
@@ -153,8 +153,7 @@ An overview of what each of these does:
         
    
           These are sass partials that can be imported into your main.scss
           which will then be processed into a single stylesheet
-          main.css
-          that defines the styles to be used by your site.
+          main.css that defines the styles to be used by your site.
         
    
       
     
@@ -186,7 +185,8 @@ An overview of what each of these does:
     
     
       
-        
    index.html or index.md and other HTML, Markdown, Textile files
    
+        
    index.html or index.md and other HTML,
+        Markdown, Textile files
    
       
       
         
    

From d3e387d14628cdec6863c2ee4ce55852eb7e4bc5 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 14 Nov 2016 13:30:14 -0800
Subject: [PATCH 1631/4996] Fix typo.

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

diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 404b27283ca..4504574f451 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -85,7 +85,7 @@ def generate_url_from_hash(template)
     end
 
     # We include underscores in keys to allow for 'i_month' and so forth.
-    # This poses a problem for keys which are followed by and underscore
+    # This poses a problem for keys which are followed by an underscore
     # but the underscore is not part of the key, e.g. '/:month_:day'.
     # That should be :month and :day, but our key extraction regexp isn't
     # smart enough to know that so we have to make it an explicit

From cd3831296a5cb1be176db4d97daf69d9ebd238d5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 14 Nov 2016 14:28:37 -0800
Subject: [PATCH 1632/4996] Update history to reflect merge of #5572 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a408b0f29c5..b5714d0bc2b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -35,6 +35,7 @@
   * `jekyll new-theme` should specify Jekyll as a runtime dependency for the theme (#5457)
   * Be much more specific about ignoring specific vendored directories. (#5564)
   * Only warn about auto-regeneration bug on Bash On Windows. (#5464)
+  * Allow permalink template to have underscores (#5572)
 
 ### Development Fixes
 

From 7c44c5a56d104181216a053355357dac4b1b093d Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 14 Nov 2016 14:36:05 -0800
Subject: [PATCH 1633/4996] Release :gem: 3.3.1

---
 History.markdown                              | 34 +++++------
 docs/_docs/configuration.md                   |  2 +-
 docs/_docs/history.md                         | 60 +++++++++++++++++++
 .../2016-11-14-jekyll-3-3-1-released.markdown | 19 ++++++
 docs/latest_version.txt                       |  2 +-
 lib/jekyll/version.rb                         |  2 +-
 6 files changed, 99 insertions(+), 20 deletions(-)
 create mode 100644 docs/_posts/2016-11-14-jekyll-3-3-1-released.markdown

diff --git a/History.markdown b/History.markdown
index b5714d0bc2b..caa4911133f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,8 +1,23 @@
-## HEAD
+## 3.3.1 / 2016-11-14
+
+### Minor Enhancements
+
+  * Collapse `gsub` for performance (#5494)
+  * URL: warn if key doesn't exist in url drop (#5524)
+
+### Bug Fixes
+
+  * Fix typo in `theme_template` README (#5472)
+  * Do not swallow all exceptions on render (#5495)
+  * Site template: fixed `_config.yml` comment typo (#5511)
+  * `jekyll new-theme` should specify Jekyll as a runtime dependency for the theme (#5457)
+  * Be much more specific about ignoring specific vendored directories. (#5564)
+  * Only warn about auto-regeneration bug on Bash On Windows. (#5464)
+  * Allow permalink template to have underscores (#5572)
 
 ### Site Enhancements
 
-  * Documentation: {% link %} tag  (#5449)
+  * Documentation: `link` Liquid tag  (#5449)
   * Updating install instruction link for Jekyll 3 on Windows (#5475)
   * Update normalize.css to v5.0.0 (#5471)
   * Add jekyll-data to the list of plugins (#5491)
@@ -27,16 +42,6 @@
   * Fix link to jekyll-pinboard plugin (#5570)
   * mention `docs` folder as a way to deploy on GitHub Pages (#5571)
 
-### Bug Fixes
-
-  * Fix typo in theme_template README (#5472)
-  * Do not swallow all exceptions on render (#5495)
-  * Site template: fixed `_config.yml` comment typo (#5511)
-  * `jekyll new-theme` should specify Jekyll as a runtime dependency for the theme (#5457)
-  * Be much more specific about ignoring specific vendored directories. (#5564)
-  * Only warn about auto-regeneration bug on Bash On Windows. (#5464)
-  * Allow permalink template to have underscores (#5572)
-
 ### Development Fixes
 
   * fix rubocop errors on testing with Rubocop 0.44 (#5489)
@@ -47,11 +52,6 @@
   * Collections.feature: conditional steps to have it pass on Windows (#5546)
   * Fix tests to get script/test to pass on Windows (#5526)
 
-### Minor Enhancements
-
-  * Collapse `gsub` (#5494)
-  * URL: warn if key doesn't exist in url drop (#5524)
-
 ## 3.3.0 / 2016-10-06
 
 ### Minor Enhancements
diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index a244e1ab1fd..41fed98037e 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -594,7 +594,7 @@ collections:
 # Handling Reading
 safe:         false
 include:      [".htaccess"]
-exclude:      ["node_modules", "vendor"]
+exclude:      ["node_modules", "vendor/bundle/", "vendor/cache/", "vendor/gems/", "vendor/ruby/"]
 keep_files:   [".git", ".svn"]
 encoding:     "utf-8"
 markdown_ext: "markdown,mkdown,mkdn,mkd,md"
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index b272bd53de8..5d07eb4009b 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -5,6 +5,66 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.3.1 / 2016-11-14
+{: #v3-3-1}
+
+### Minor Enhancements
+{: #minor-enhancements-v3-3-1}
+
+- Collapse `gsub` for performance ([#5494]({{ site.repository }}/issues/5494))
+- URL: warn if key doesn't exist in url drop ([#5524]({{ site.repository }}/issues/5524))
+
+### Bug Fixes
+{: #bug-fixes-v3-3-1}
+
+- Fix typo in `theme_template` README ([#5472]({{ site.repository }}/issues/5472))
+- Do not swallow all exceptions on render ([#5495]({{ site.repository }}/issues/5495))
+- Site template: fixed `_config.yml` comment typo ([#5511]({{ site.repository }}/issues/5511))
+- `jekyll new-theme` should specify Jekyll as a runtime dependency for the theme ([#5457]({{ site.repository }}/issues/5457))
+- Be much more specific about ignoring specific vendored directories. ([#5564]({{ site.repository }}/issues/5564))
+- Only warn about auto-regeneration bug on Bash On Windows. ([#5464]({{ site.repository }}/issues/5464))
+- Allow permalink template to have underscores ([#5572]({{ site.repository }}/issues/5572))
+
+### Site Enhancements
+{: #site-enhancements-v3-3-1}
+
+- Documentation: `link` Liquid tag  ([#5449]({{ site.repository }}/issues/5449))
+- Updating install instruction link for Jekyll 3 on Windows ([#5475]({{ site.repository }}/issues/5475))
+- Update normalize.css to v5.0.0 ([#5471]({{ site.repository }}/issues/5471))
+- Add jekyll-data to the list of plugins ([#5491]({{ site.repository }}/issues/5491))
+- Add info about checking version + updating ([#5497]({{ site.repository }}/issues/5497))
+- Add jekyll-include-absolute-plugin to list of third-party plugins ([#5492]({{ site.repository }}/issues/5492))
+- Remove jekyll-hook from deployment methods ([#5502]({{ site.repository }}/issues/5502))
+- Update deployment-methods.md ([#5504]({{ site.repository }}/issues/5504))
+- Ubuntu users should install ruby2.3-dev ([#5512]({{ site.repository }}/issues/5512))
+- Remove Glynn as deployment option ([#5519]({{ site.repository }}/issues/5519))
+- Fix broken forum link ([#5466]({{ site.repository }}/issues/5466))
+- Move documentation to docs folder ([#5459]({{ site.repository }}/issues/5459))
+- Fix broken links in CONTRIBUTING ([#5533]({{ site.repository }}/issues/5533))
+- Update documentation on jekyllrb.com ([#5540]({{ site.repository }}/issues/5540))
+- Fix HTML rendering ([#5536]({{ site.repository }}/issues/5536))
+- Remove outdated deployment information ([#5557]({{ site.repository }}/issues/5557))
+- no more invalid US-ASCII on lines 30 and 97 ([#5520]({{ site.repository }}/issues/5520))
+- Add permalinks to docs in '/maintaining/' ([#5532]({{ site.repository }}/issues/5532))
+- Add jekyll-pinboard to list of third-party plugins ([#5514]({{ site.repository }}/issues/5514))
+- Fix formatting in 2-to-3.md ([#5507]({{ site.repository }}/issues/5507))
+- Add two plugins to the plugins page ([#5493]({{ site.repository }}/issues/5493))
+- Use site.baseurl before link and post_url tags ([#5559]({{ site.repository }}/issues/5559))
+- Fix link to jekyll-pinboard plugin ([#5570]({{ site.repository }}/issues/5570))
+- mention `docs` folder as a way to deploy on GitHub Pages ([#5571]({{ site.repository }}/issues/5571))
+
+### Development Fixes
+{: #development-fixes-v3-3-1}
+
+- fix rubocop errors on testing with Rubocop 0.44 ([#5489]({{ site.repository }}/issues/5489))
+- script/test: add missing whitespace ([#5479]({{ site.repository }}/issues/5479))
+- Restrict Rubocop version ([#5496]({{ site.repository }}/issues/5496))
+- include a hashbang for all benchmark scripts & make them executable ([#5505]({{ site.repository }}/issues/5505))
+- Update source in script/proof ([#5538]({{ site.repository }}/issues/5538))
+- Collections.feature: conditional steps to have it pass on Windows ([#5546]({{ site.repository }}/issues/5546))
+- Fix tests to get script/test to pass on Windows ([#5526]({{ site.repository }}/issues/5526))
+
+
 ## 3.3.0 / 2016-10-06
 {: #v3-3-0}
 
diff --git a/docs/_posts/2016-11-14-jekyll-3-3-1-released.markdown b/docs/_posts/2016-11-14-jekyll-3-3-1-released.markdown
new file mode 100644
index 00000000000..a5a88376c94
--- /dev/null
+++ b/docs/_posts/2016-11-14-jekyll-3-3-1-released.markdown
@@ -0,0 +1,19 @@
+---
+layout: news_item
+title: 'Jekyll 3.3.1 Released'
+date: 2016-11-14 14:29:59 -0800
+author: parkr
+version: 3.3.1
+categories: [release]
+---
+
+Hello! We have a bugfix release of Jekyll hot off the presses for you. Key
+fixes to call out:
+
+1. Only warn about auto-regeneration issues on Windows instead of disabling
+2. Exclude very specific `vendor/` subdirectories instead of all of `vendor/`
+3. Allow permalink templates to have plaintext underscores
+
+..and lots more! Check out the [full history for more](/docs/history/#v3-3-1).
+
+Happy Jekylling!
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index 15a27998172..bea438e9ade 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.3.0
+3.3.1
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 848b513b738..a01e787a21d 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.3.0".freeze
+  VERSION = "3.3.1".freeze
 end

From 5defc4782afdd03c4f38b704862092f01c56d70f Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 15 Nov 2016 20:35:48 +0100
Subject: [PATCH 1634/4996] remove instructions for Jekyll 2

---
 docs/_docs/windows.md | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index 68edd8ef69d..4ae1fd5e055 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -16,10 +16,9 @@ A quick way to install Jekyll is to follow the [installation instructions by Dav
  2. Install Ruby via Chocolatey: `choco install ruby -y`
  3. Reopen a command prompt and install Jekyll: `gem install jekyll`
 
-For a more conventional way of installing Jekyll you can follow the [installation instructions by Sverrir Sigmundarson][windows-installjekyll3]. These instructions are for newer versions of Ruby 2.2.5 and Jekyll 3.
-
-For instructions for older versions of Ruby 2.0.0 ([prior to 2.2][hitimes-issue]) and Jekyll 2 and older you should follow the [installation instruction by Julian Thilo][windows-installation].
+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].
 
+[windows-installjekyll3]: https://labs.sverrirs.com/jekyll/
 
 ## Encoding
 
@@ -35,10 +34,6 @@ the site generation process. It can be done with the following command:
 $ chcp 65001
 ```
 
-[windows-installation]: http://jekyll-windows.juthilo.com/
-[windows-installjekyll3]: https://labs.sverrirs.com/jekyll/
-[hitimes-issue]: https://github.com/copiousfreetime/hitimes/issues/40
-
 ## Auto-regeneration
 
 As of v1.3.0, Jekyll uses the `listen` gem to watch for changes when the
@@ -103,7 +98,7 @@ This gem is also needed in the github-pages and to get it running on Windows x64
 
 ```ruby
 source 'http://rubygems.org'
-gem 'github-pages'
+gem 'github-pages', group: :jekyll_plugins
 ```
 
  * **Note:** We use an unsecure connection because SSL throws exceptions in the version of Ruby

From 575c23e547991116e7059d4582fa7fd8071d7dd3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 15 Nov 2016 13:55:41 -0800
Subject: [PATCH 1635/4996] Update history to reflect merge of #5582 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index caa4911133f..29302ef7109 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,3 +1,9 @@
+## HEAD
+
+### Site Enhancements
+
+  * Remove instructions to install Jekyll 2 on Windows (#5582)
+
 ## 3.3.1 / 2016-11-14
 
 ### Minor Enhancements

From 52742e049668b8c92d7bb439f7d7d17179c999c9 Mon Sep 17 00:00:00 2001
From: Don Denton 
Date: Thu, 17 Nov 2016 01:12:41 -0600
Subject: [PATCH 1636/4996] Fix bad config YAML in collections example

If you add the previous version to your config file, you'd get an error on build/serve.
---
 docs/_docs/configuration.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index 41fed98037e..9dca5cea6dc 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -513,8 +513,8 @@ With these defaults, all posts would use the `my-site` layout. Any html files th
 
 ```yaml
 collections:
-  - my_collection:
-      output: true
+  my_collection:
+    output: true
 
 defaults:
   -

From 195770f7f619dddaae4630b9b734a7c6b90484e2 Mon Sep 17 00:00:00 2001
From: brainscript 
Date: Sun, 20 Nov 2016 13:43:36 +0100
Subject: [PATCH 1637/4996] Fix example URL inconsistency

In case of the GitHub example links like `` with the full URL plus the variable were used, but for the Twitter example link only the `{{  author.name }}` was set as `href`.
---
 docs/_docs/datafiles.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/datafiles.md b/docs/_docs/datafiles.md
index daf5e4b1776..21799169e92 100644
--- a/docs/_docs/datafiles.md
+++ b/docs/_docs/datafiles.md
@@ -143,7 +143,7 @@ author: dave
 
 {% assign author = site.data.people[page.author] %}
 

From 8d4803eb6dea2f7c54ca5bad00f9b47e6cdf71e1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 20 Nov 2016 11:21:53 -0800
Subject: [PATCH 1638/4996] Update history to reflect merge of #5592 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 29302ef7109..ecda830ceae 100644
--- a/History.markdown
+++ b/History.markdown
@@ -3,6 +3,7 @@
 ### Site Enhancements
 
   * Remove instructions to install Jekyll 2 on Windows (#5582)
+  * Fix example URL inconsistency (#5592)
 
 ## 3.3.1 / 2016-11-14
 

From 127704ad1775eade80bc4a920de73ed0e0970e13 Mon Sep 17 00:00:00 2001
From: alexmalik 
Date: Sat, 1 Oct 2016 23:14:12 +0100
Subject: [PATCH 1639/4996] Replace backticks with HTML tags

Prior to the change backticks were used in an attempt to create a
code block. The problem is that inside block level HTML tags Markdown
is not supported. I have replaced the backticks with a combination of
HTML tags in order to approximately simulate the appearance of a code
block. The docs suggest possible use of span tags in place of the
surrounding div tags as a solution to getting the Markdown to render.
I tried this but no success.

This change improves the readers understanding of the information,
because the reader doesn't have to make sense of raw markdown.
---
 docs/_docs/github-pages.md | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index b65bad904b8..f07af766be1 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -54,26 +54,22 @@ few minor details.
     currently-deployed version of the gem in your project, add the
     following to your Gemfile:
 
-```ruby
-source 'https://rubygems.org'
+    
    source 'https://rubygems.org'
    
 
-require 'json'
-require 'open-uri'
-versions = JSON.parse(open('https://pages.github.com/versions.json').read)
+    
    require 'json'
    
+    
    require 'open-uri'
    
+    
    versions = JSON.parse(open('https://pages.github.com/versions.json').read)
    
 
-gem 'github-pages', versions['github-pages']
-```
+    
    gem 'github-pages', versions['github-pages']
    
 
     This will ensure that when you run bundle install, you
     have the correct version of the github-pages gem.
 
     If that fails, simplify it:
 
-```ruby
-source 'https://rubygems.org'
+    
    source 'https://rubygems.org'
    
 
-gem 'github-pages'
-```
+    
    gem 'github-pages'
    
 
     And be sure to run bundle update often.
 

From c47ae465ad6e27f5f335f96f5834da8c2959cfc9 Mon Sep 17 00:00:00 2001
From: alexmalik 
Date: Sun, 2 Oct 2016 13:31:15 +0100
Subject: [PATCH 1640/4996] Replace p and code tags with {% highlight %}

---
 docs/_docs/github-pages.md | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index f07af766be1..449e45152b2 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -53,24 +53,33 @@ few minor details.
     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:
+  
    
 
-    
    source 'https://rubygems.org'
    
+  {% highlight ruby %}
+    source 'https://rubygems.org'
 
-    
    require 'json'
    
-    
    require 'open-uri'
    
-    
    versions = JSON.parse(open('https://pages.github.com/versions.json').read)
    
+    require 'json'
+    require 'open-uri'
+    versions = JSON.parse(open('https://pages.github.com/versions.json').read)
 
-    
    gem 'github-pages', versions['github-pages']
    
+    gem 'github-pages', versions['github-pages']
+  {% endhighlight %}
 
+  
    
     This will ensure that when you run bundle install, you
     have the correct version of the github-pages gem.
 
     If that fails, simplify it:
+  
    
 
-    
    source 'https://rubygems.org'
    
 
-    
    gem 'github-pages'
    
+  {% highlight ruby %}
+    source 'https://rubygems.org'
 
+    gem 'github-pages'
+  {% endhighlight %}
+
+  
    
     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).

From a41b46ff35e375ba5847abe5af1671c35aa21fa8 Mon Sep 17 00:00:00 2001
From: alexmalik 
Date: Tue, 4 Oct 2016 12:11:52 +0100
Subject: [PATCH 1641/4996] replace {% %} with bacticks for nested code-block

uses Kramdown with the markdown="1" attribute, as suggested by
@mmistakes. This allows rendering of code blocks which are nested
inside HTML tags.
---
 docs/_docs/github-pages.md | 70 ++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index 449e45152b2..b82baa186fb 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -42,48 +42,46 @@ There are two basic types available: user/organization pages and project pages.
 The way to deploy these two types of sites are nearly identical, except for a
 few minor details.
 
-
    
-  
    Use the github-pages gem
    
-  
    
-    Our friends at GitHub have provided the
-    github-pages
-    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:
-  
    
-
-  {% highlight 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']
-  {% endhighlight %}
-
-  
    
-    This will ensure that when you run bundle install, you
-    have the correct version of the github-pages gem.
+
    
+##### Use the `github-pages` gem
+
+Our friends at GitHub have provided the
+github-pages
+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`:
+
+
    
+```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']
+```
+
    
 
-    If that fails, simplify it:
-  
    
+This will ensure that when you run `bundle install`, you
+have the correct version of the `github-pages` gem.
 
+If that fails, simplify it:
 
-  {% highlight ruby %}
-    source 'https://rubygems.org'
+
    
+```ruby
+source 'https://rubygems.org'
 
-    gem 'github-pages'
-  {% endhighlight %}
+gem 'github-pages'
+```
+
    
 
-  
    
-    And be sure to run bundle update often.
+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).
-  
    
+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).
 
    
 
 
    

From 2009749e58bad922e697eb0f5d4206f0b84c2bf7 Mon Sep 17 00:00:00 2001
From: alexmalik 
Date: Tue, 4 Oct 2016 12:19:30 +0100
Subject: [PATCH 1642/4996] add new style rule for .code-block class

as suggested by @ashmaroli
---
 docs/_sass/_style.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss
index 5e441924546..f1e3de5f327 100644
--- a/docs/_sass/_style.scss
+++ b/docs/_sass/_style.scss
@@ -670,6 +670,11 @@ h5 > code,
   font-size: 0.8em;
 }
 
+.code-block {
+  margin: 10px 0;
+  code { background: none; }
+}
+
 .highlight {
   margin: 1em 0;
   padding: 10px 0;

From 9cd71aaea9e8f780e2789cbc3a5d02ad92927e27 Mon Sep 17 00:00:00 2001
From: alexmalik 
Date: Tue, 4 Oct 2016 14:34:24 +0100
Subject: [PATCH 1643/4996] add empty div with markdown="1" attribute

an empty div is necessary in order for the code blocks to render
correctly when not displayed on the jekyllrb site.
---
 docs/_docs/github-pages.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index b82baa186fb..a93b65b5b35 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -43,6 +43,9 @@ The way to deploy these two types of sites are nearly identical, except for a
 few minor details.
 
 
    
+
    
+
    
+
 ##### Use the `github-pages` gem
 
 Our friends at GitHub have provided the
@@ -55,6 +58,9 @@ currently-deployed version of the gem in your project, add the
 following to your `Gemfile`:
 
 
    
+
    
+
    
+
 ```ruby
 source 'https://rubygems.org'
 
@@ -72,6 +78,9 @@ have the correct version of the `github-pages` gem.
 If that fails, simplify it:
 
 
    
+
    
+
    
+
 ```ruby
 source 'https://rubygems.org'
 

From df80f6fd2a70cde7eaa305dda4d157dcfab1c251 Mon Sep 17 00:00:00 2001
From: alexmalik 
Date: Tue, 25 Oct 2016 12:10:31 +0100
Subject: [PATCH 1644/4996] Replace html links with markdown links

---
 docs/_docs/github-pages.md | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index a93b65b5b35..b046f0f9173 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -27,7 +27,7 @@ site builds properly, use `site.github.url` in your URL's.
 
 
 
-{{ page.title }}
+[{{ page.title }}]("{{ page.url | prepend: site.github.url }}")
 {% endraw %}
 ```
 
@@ -49,7 +49,7 @@ few minor details.
 ##### Use the `github-pages` gem
 
 Our friends at GitHub have provided the
-github-pages
+[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
@@ -90,7 +90,8 @@ gem 'github-pages'
 
 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).
+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)]("http://jwillmer.de/blog/tutorial/how-to-install-jekyll-and-pages-gem-on-windows-10-x46#github-pages-and-plugins").
 
    
 
 
    
@@ -107,8 +108,7 @@ If you like to install `pages-gem` on Windows you can find instructions by Jens
 
 User and organization pages live in a special GitHub repository dedicated to
 only the GitHub Pages files. This repository must be named after the account
-name. For example, [@mojombo’s user page
-repository](https://github.com/mojombo/mojombo.github.io) has the name
+name. For example, [@mojombo’s user page repository](https://github.com/mojombo/mojombo.github.io) has the name
 `mojombo.github.io`.
 
 Content from the `master` branch of your repository will be used to build and
@@ -156,9 +156,8 @@ to see more detailed examples.
   
    GitHub Pages Documentation, Help, and Support
    
   
    
     For more information about what you can do with GitHub Pages, as well as for
-    troubleshooting guides, you should check out GitHub’s Pages Help
-    section. If all else fails, you should contact GitHub Support.
+    troubleshooting guides, you should check out
+    GitHub’s Pages Help section.
+    If all else fails, you should contact GitHub Support.
   
    
 
    

From 8a08bb417e4cb70a3cf77c958b55183c5706aaa3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 20 Nov 2016 15:06:46 -0800
Subject: [PATCH 1645/4996] Update history to reflect merge of #5435 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ecda830ceae..cde0bd3180b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,7 @@
 
   * Remove instructions to install Jekyll 2 on Windows (#5582)
   * Fix example URL inconsistency (#5592)
+  * Replace backticks within HTML blocks with HTML tags (#5435)
 
 ## 3.3.1 / 2016-11-14
 

From 5c965d6a203d66a4543c11032f3912209782a748 Mon Sep 17 00:00:00 2001
From: Tim Banks 
Date: Tue, 22 Nov 2016 17:38:33 -0600
Subject: [PATCH 1646/4996] Add connector param to array_to_sentence_string
 filter

---
 docs/_docs/templates.md | 8 +++++++-
 lib/jekyll/filters.rb   | 4 ++--
 test/test_filters.rb    | 5 +++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md
index daae34c2771..a203172eb64 100644
--- a/docs/_docs/templates.md
+++ b/docs/_docs/templates.md
@@ -208,7 +208,7 @@ common tasks easier.
     
       
         
    Array to Sentence
    
-        
    Convert an array into a sentence. Useful for listing tags.
    
+        
    Convert an array into a sentence. Useful for listing tags. Optional argument for connector.
    
       
       
         
    
@@ -217,6 +217,12 @@ common tasks easier.
         
    
           foo, bar, and baz
         
    
+        
    
+         {% raw %}{{ page.tags | array_to_sentence_string: 'or' }}{% endraw %}
+        
    
+        
    
+          foo, bar, or baz
+        
    
       
     
     
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 29f2a2b5e1a..ddd4fea981e 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -175,6 +175,7 @@ def number_of_words(input)
     # word "and" for the last one.
     #
     # array - The Array of Strings to join.
+    # connector - Word used to connect the last 2 items in the array
     #
     # Examples
     #
@@ -182,8 +183,7 @@ def number_of_words(input)
     #   # => "apples, oranges, and grapes"
     #
     # Returns the formatted String.
-    def array_to_sentence_string(array)
-      connector = "and"
+    def array_to_sentence_string(array, connector = "and")
       case array.length
       when 0
         ""
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 20587610beb..48f90bbb741 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -143,6 +143,11 @@ def select; end
       )
     end
 
+    should "convert array to sentence string with different connector" do
+      assert_equal "1 or 2", @filter.array_to_sentence_string([1, 2], "or")
+      assert_equal "1, 2, 3, or 4", @filter.array_to_sentence_string([1, 2, 3, 4], "or")
+    end
+
     context "normalize_whitespace filter" do
       should "replace newlines with a space" do
         assert_equal "a b", @filter.normalize_whitespace("a\nb")

From fabce98c54ed09b14052f11a9c9dff9d1e304253 Mon Sep 17 00:00:00 2001
From: Max Chadwick 
Date: Wed, 23 Nov 2016 05:52:51 -0500
Subject: [PATCH 1647/4996] Add jekyll-migrate-permalink

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 6c5a9f9f13a..b68d7bba780 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -917,6 +917,7 @@ LESS.js files during generation.
 - [jekyll-menus](https://github.com/forestryio/jekyll-menus): Hugo style menus for your Jekyll site... recursive menus included.
 - [jekyll-data](https://github.com/ashmaroli/jekyll-data): Read data files within Jekyll Theme Gems.
 - [jekyll-pinboard](https://github.com/snaptortoise/jekyll-pinboard-plugin): Access your Pinboard bookmarks within your Jekyll theme.
+- [jekyll-migrate-permalink](https://github.com/mpchadwick/jekyll-migrate-permalink): Adds a `migrate-permalink` sub-command to help deal with side effects of changing your permalink.
 
 #### Editors
 

From ce67da0f80058f579630e0adcec538facd8418a8 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 23 Nov 2016 08:23:02 -0800
Subject: [PATCH 1648/4996] Update history to reflect merge of #5597 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index cde0bd3180b..afc76af4998 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,10 @@
   * Fix example URL inconsistency (#5592)
   * Replace backticks within HTML blocks with HTML tags (#5435)
 
+### Minor Enhancements
+
+  * Add connector param to array_to_sentence_string filter (#5597)
+
 ## 3.3.1 / 2016-11-14
 
 ### Minor Enhancements

From bbdeb32f38727113b274367c340599bcb9c54014 Mon Sep 17 00:00:00 2001
From: Eldritch Cheese 
Date: Sat, 26 Nov 2016 16:51:01 -0500
Subject: [PATCH 1649/4996] Escaped regular expressions when using post_url.

Previously, the post_url function would give error messages when the
post being listed contained special characters for use in regular
expressions.  These special characters are now escaped using
Regexp.escape.
---
 lib/jekyll/tags/post_url.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb
index b865cd67fdf..9b4203d6bf4 100644
--- a/lib/jekyll/tags/post_url.rb
+++ b/lib/jekyll/tags/post_url.rb
@@ -14,7 +14,8 @@ def initialize(name)
             "'#{name}' does not contain valid date and/or title."
         end
 
-        @name_regex = %r!^_posts/#{path}#{date}-#{slug}\.[^.]+|
+        escaped_slug = Regexp.escape(slug)
+        @name_regex = %r!^_posts/#{path}#{date}-#{escaped_slug}\.[^.]+|
           ^#{path}_posts/?#{date}-#{slug}\.[^.]+!x
       end
 

From a55760d4ad9fe3a00d4bfcd6e74512f4132d8cfe Mon Sep 17 00:00:00 2001
From: Eldritch Cheese 
Date: Sat, 26 Nov 2016 22:31:03 -0500
Subject: [PATCH 1650/4996] Added unit test for special character, fixed error
 that it exposed.

---
 lib/jekyll/tags/post_url.rb                   |  2 +-
 .../2016-11-26-special-chars-(+).markdown     |  8 ++++++
 test/test_tags.rb                             | 26 +++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 test/source/_posts/2016-11-26-special-chars-(+).markdown

diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb
index 9b4203d6bf4..37c7e56546b 100644
--- a/lib/jekyll/tags/post_url.rb
+++ b/lib/jekyll/tags/post_url.rb
@@ -16,7 +16,7 @@ def initialize(name)
 
         escaped_slug = Regexp.escape(slug)
         @name_regex = %r!^_posts/#{path}#{date}-#{escaped_slug}\.[^.]+|
-          ^#{path}_posts/?#{date}-#{slug}\.[^.]+!x
+          ^#{path}_posts/?#{date}-#{escaped_slug}\.[^.]+!x
       end
 
       def post_date
diff --git a/test/source/_posts/2016-11-26-special-chars-(+).markdown b/test/source/_posts/2016-11-26-special-chars-(+).markdown
new file mode 100644
index 00000000000..21cc7714620
--- /dev/null
+++ b/test/source/_posts/2016-11-26-special-chars-(+).markdown
@@ -0,0 +1,8 @@
+---
+layout: default
+title: Special Characters
+---
+
+url: {{ page.url }}
+date: {{ page.date }}
+id: {{ page.id }}
\ No newline at end of file
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 6bf4b84b1e9..0a277173e49 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -554,6 +554,32 @@ def highlight_block_with_opts(options_string)
     end
   end
 
+  context "simple page with post linking containing special characters" do
+    setup do
+      content = < "pretty",
+        "source"      => source_dir,
+        "destination" => dest_dir,
+        "read_posts"  => true
+      })
+    end
+
+    should "not cause an error" do
+      refute_match(%r!markdown\-html\-error!, @result)
+    end
+
+    should "have the URL to the \"complex\" post from 2008-11-21" do
+      assert_match %r!/2016/11/26/special-chars-\(\+\)/!, @result
+    end
+  end
+
   context "simple page with nested post linking" do
     setup do
       content = <
Date: Sun, 27 Nov 2016 07:59:56 -0500
Subject: [PATCH 1651/4996] Increased number of posts in test_generated_site to
 account for special chars test

---
 test/test_generated_site.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 112cf9d3c09..3a520b24cc3 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -11,7 +11,7 @@ class TestGeneratedSite < JekyllUnitTest
     end
 
     should "ensure post count is as expected" do
-      assert_equal 50, @site.posts.size
+      assert_equal 51, @site.posts.size
     end
 
     should "insert site.posts into the index" do

From 467bd5bb321a94a5aae0812f55f45b6ca3c273bc Mon Sep 17 00:00:00 2001
From: Eldritch Cheese 
Date: Mon, 28 Nov 2016 07:35:48 -0500
Subject: [PATCH 1652/4996] Updated test name, using single quotes for
 cleanliness.

---
 test/test_tags.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_tags.rb b/test/test_tags.rb
index 0a277173e49..bd75cb53030 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -575,7 +575,7 @@ def highlight_block_with_opts(options_string)
       refute_match(%r!markdown\-html\-error!, @result)
     end
 
-    should "have the URL to the \"complex\" post from 2008-11-21" do
+    should 'have the URL to the "special-chars" post from 2016-11-26' do
       assert_match %r!/2016/11/26/special-chars-\(\+\)/!, @result
     end
   end

From 4c634d1d6654dc625c2403c6ccfa4a9863c7a579 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 28 Nov 2016 09:25:12 -0800
Subject: [PATCH 1653/4996] Update history to reflect merge of #5605 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index afc76af4998..a20e68b4afb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -10,6 +10,10 @@
 
   * Add connector param to array_to_sentence_string filter (#5597)
 
+### Bug Fixes
+
+  * Escaped regular expressions when using post_url. (#5605)
+
 ## 3.3.1 / 2016-11-14
 
 ### Minor Enhancements

From d175ba2cb8c50ca74fc0badf916ecdb8aede5447 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 28 Nov 2016 23:05:47 +0530
Subject: [PATCH 1654/4996] clean unit-test-names

---
 test/test_tags.rb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/test_tags.rb b/test/test_tags.rb
index bd75cb53030..fd6dcb9783e 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -549,7 +549,7 @@ def highlight_block_with_opts(options_string)
       refute_match(%r!markdown\-html\-error!, @result)
     end
 
-    should "have the URL to the \"complex\" post from 2008-11-21" do
+    should "have the URL to the 'complex' post from 2008-11-21" do
       assert_match %r!/2008/11/21/complex/!, @result
     end
   end
@@ -575,7 +575,7 @@ def highlight_block_with_opts(options_string)
       refute_match(%r!markdown\-html\-error!, @result)
     end
 
-    should 'have the URL to the "special-chars" post from 2016-11-26' do
+    should "have the URL to the 'special-chars' post from 2016-11-26" do
       assert_match %r!/2016/11/26/special-chars-\(\+\)/!, @result
     end
   end
@@ -604,12 +604,12 @@ def highlight_block_with_opts(options_string)
       refute_match(%r!markdown\-html\-error!, @result)
     end
 
-    should "have the URL to the \"complex\" post from 2008-11-21" do
+    should "have the URL to the 'complex' post from 2008-11-21" do
       assert_match %r!1\s/2008/11/21/complex/!, @result
       assert_match %r!2\s/2008/11/21/complex/!, @result
     end
 
-    should "have the URL to the \"nested\" post from 2008-11-21" do
+    should "have the URL to the 'nested' post from 2008-11-21" do
       assert_match %r!3\s/2008/11/21/nested/!, @result
       assert_match %r!4\s/2008/11/21/nested/!, @result
     end
@@ -636,7 +636,7 @@ def highlight_block_with_opts(options_string)
       refute_match(%r!markdown\-html\-error!, @result)
     end
 
-    should "have the url to the \"nested\" post from 2008-11-21" do
+    should "have the url to the 'nested' post from 2008-11-21" do
       assert_match %r!1\s/2008/11/21/nested/!, @result
     end
 
@@ -711,15 +711,15 @@ def highlight_block_with_opts(options_string)
       refute_match(%r!markdown\-html\-error!, @result)
     end
 
-    should "have the URL to the \"contacts\" item" do
+    should "have the URL to the 'contacts' item" do
       assert_match(%r!/contacts\.html!, @result)
     end
 
-    should "have the URL to the \"info\" item" do
+    should "have the URL to the 'info' item" do
       assert_match(%r!/info\.html!, @result)
     end
 
-    should "have the URL to the \"screen.css\" item" do
+    should "have the URL to the 'screen.css' item" do
       assert_match(%r!/css/screen\.css!, @result)
     end
   end
@@ -745,7 +745,7 @@ def highlight_block_with_opts(options_string)
       refute_match(%r!markdown\-html\-error!, @result)
     end
 
-    should "have the URL to the \"yaml_with_dots\" item" do
+    should "have the URL to the 'yaml_with_dots' item" do
       assert_match(%r!/methods/yaml_with_dots\.html!, @result)
     end
   end
@@ -772,11 +772,11 @@ def highlight_block_with_opts(options_string)
       refute_match(%r!markdown\-html\-error!, @result)
     end
 
-    should "have the URL to the \"sanitized_path\" item" do
+    should "have the URL to the 'sanitized_path' item" do
       assert_match %r!1\s/methods/sanitized_path\.html!, @result
     end
 
-    should "have the URL to the \"site/generate\" item" do
+    should "have the URL to the 'site/generate' item" do
       assert_match %r!2\s/methods/site/generate\.html!, @result
     end
   end

From 6bf1522de94cd7de6b43d268536d1636c5fd1d8c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 28 Nov 2016 21:16:24 -0800
Subject: [PATCH 1655/4996] Update history to reflect merge of #5608 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a20e68b4afb..2b1ebabe805 100644
--- a/History.markdown
+++ b/History.markdown
@@ -14,6 +14,10 @@
 
   * Escaped regular expressions when using post_url. (#5605)
 
+### Development Fixes
+
+  * clean unit-test names in `test/test_tags.rb` (#5608)
+
 ## 3.3.1 / 2016-11-14
 
 ### Minor Enhancements

From bf3134f5cff219e2f820011c0585751c35ec3789 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 28 Nov 2016 21:24:29 -0800
Subject: [PATCH 1656/4996] Update history to reflect merge of #5600 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2b1ebabe805..751ad640047 100644
--- a/History.markdown
+++ b/History.markdown
@@ -5,6 +5,7 @@
   * Remove instructions to install Jekyll 2 on Windows (#5582)
   * Fix example URL inconsistency (#5592)
   * Replace backticks within HTML blocks with HTML tags (#5435)
+  * Add jekyll-migrate-permalink (#5600)
 
 ### Minor Enhancements
 

From 5c69924484d6e0e6c976a256fc2f65bfc6470d0c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 28 Nov 2016 21:25:11 -0800
Subject: [PATCH 1657/4996] Update history to reflect merge of #5587 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 751ad640047..d68e15b1b0c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,7 @@
   * Fix example URL inconsistency (#5592)
   * Replace backticks within HTML blocks with HTML tags (#5435)
   * Add jekyll-migrate-permalink (#5600)
+  * Fix bad config YAML in collections example (#5587)
 
 ### Minor Enhancements
 

From 65b845470e6d0251bac050befc2db996cf3f4ca1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 28 Nov 2016 21:26:47 -0800
Subject: [PATCH 1658/4996] Update history to reflect merge of #5573 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d68e15b1b0c..bf59c3119da 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
   * Replace backticks within HTML blocks with HTML tags (#5435)
   * Add jekyll-migrate-permalink (#5600)
   * Fix bad config YAML in collections example (#5587)
+  * Bring documentation on 'Directory Structure' up-to-date (#5573)
 
 ### Minor Enhancements
 

From 4bd6240a1d3680a2aeb7ccf1249f450d8ca85edc Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 28 Nov 2016 21:38:17 -0800
Subject: [PATCH 1659/4996] Update history to reflect merge of #5384 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index bf59c3119da..3d87b54b020 100644
--- a/History.markdown
+++ b/History.markdown
@@ -20,6 +20,7 @@
 ### Development Fixes
 
   * clean unit-test names in `test/test_tags.rb` (#5608)
+  * Add cucumber feature to test for bonafide theme gems (#5384)
 
 ## 3.3.1 / 2016-11-14
 

From fac041933c3e328ff73dc91faeaeb08182ae3c74 Mon Sep 17 00:00:00 2001
From: jona 
Date: Tue, 29 Nov 2016 09:14:03 +0100
Subject: [PATCH 1660/4996] fix date parsing in file names

---
 lib/jekyll/document.rb                        |  2 +-
 .../3940394-21-9393050-fifif1323-test.md      |  5 ++++
 test/test_document.rb                         | 29 +++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 test/source/_methods/3940394-21-9393050-fifif1323-test.md

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index f35cdb0e061..ad5884efb68 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -9,7 +9,7 @@ class Document
 
     YAML_FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m
     DATELESS_FILENAME_MATCHER = %r!^(?:.+/)*(.*)(\.[^.]+)$!
-    DATE_FILENAME_MATCHER = %r!^(?:.+/)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$!
+    DATE_FILENAME_MATCHER = %r!^(?:.+/)*(\d{4}-\d{2}-\d{2})-(.*)(\.[^.]+)$!
 
     # Create a new Document.
     #
diff --git a/test/source/_methods/3940394-21-9393050-fifif1323-test.md b/test/source/_methods/3940394-21-9393050-fifif1323-test.md
new file mode 100644
index 00000000000..848d0204cc4
--- /dev/null
+++ b/test/source/_methods/3940394-21-9393050-fifif1323-test.md
@@ -0,0 +1,5 @@
+---
+title: "this is a test!"
+---
+
+wheee
diff --git a/test/test_document.rb b/test/test_document.rb
index e4d7abbfdac..5b9156f3e39 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -492,4 +492,33 @@ def assert_equal_value(key, one, other)
       assert_equal true, File.file?(@dest_file)
     end
   end
+
+  context "a document in a collection with dash-separated numeric file name" do
+    setup do
+      @site = fixture_site({
+        "collections" => {
+          "methods" => {
+            "output" => true
+          }
+        }
+      })
+      @site.process
+      @document = @site.collections["methods"].docs.find do |doc|
+        doc.relative_path == "_methods/3940394-21-9393050-fifif1323-test.md"
+      end
+      @dest_file = dest_dir("methods/3940394-21-9393050-fifif1323-test.html")
+    end
+
+    should "produce the right URL" do
+      assert_equal "/methods/3940394-21-9393050-fifif1323-test.html", @document.url
+    end
+
+    should "produce the right destination" do
+      assert_equal @dest_file, @document.destination(dest_dir)
+    end
+
+    should "be output in the correct place" do
+      assert_equal true, File.file?(@dest_file)
+    end
+  end
 end

From dc4e77c1e226c0acc28123c7700c3bc409e7c376 Mon Sep 17 00:00:00 2001
From: XhmikosR 
Date: Thu, 3 Nov 2016 00:08:26 +0200
Subject: [PATCH 1661/4996] Use only the used Font Awesome icons.

The font is generated with https://icomoon.io/app/.

This saves ~50KB.
---
 docs/_sass/_font-awesome.scss        |  11 +-
 docs/fonts/FontAwesome.eot           | Bin 0 -> 1804 bytes
 docs/fonts/FontAwesome.svg           |  12 +
 docs/fonts/FontAwesome.ttf           | Bin 0 -> 1624 bytes
 docs/fonts/FontAwesome.woff          | Bin 0 -> 1700 bytes
 docs/fonts/fontawesome-webfont.eot   | Bin 68875 -> 0 bytes
 docs/fonts/fontawesome-webfont.svg   | 640 ---------------------------
 docs/fonts/fontawesome-webfont.ttf   | Bin 138204 -> 0 bytes
 docs/fonts/fontawesome-webfont.woff  | Bin 81284 -> 0 bytes
 docs/fonts/fontawesome-webfont.woff2 | Bin 64464 -> 0 bytes
 docs/icomoon-selection.json          |  96 ++++
 docs/readme.md                       |   7 +
 12 files changed, 120 insertions(+), 646 deletions(-)
 create mode 100644 docs/fonts/FontAwesome.eot
 create mode 100644 docs/fonts/FontAwesome.svg
 create mode 100644 docs/fonts/FontAwesome.ttf
 create mode 100644 docs/fonts/FontAwesome.woff
 delete mode 100755 docs/fonts/fontawesome-webfont.eot
 delete mode 100755 docs/fonts/fontawesome-webfont.svg
 delete mode 100755 docs/fonts/fontawesome-webfont.ttf
 delete mode 100755 docs/fonts/fontawesome-webfont.woff
 delete mode 100644 docs/fonts/fontawesome-webfont.woff2
 create mode 100644 docs/icomoon-selection.json

diff --git a/docs/_sass/_font-awesome.scss b/docs/_sass/_font-awesome.scss
index 681011e131d..9e6b285bbd3 100644
--- a/docs/_sass/_font-awesome.scss
+++ b/docs/_sass/_font-awesome.scss
@@ -1,11 +1,10 @@
-/*!
- *  Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../fonts/fontawesome-webfont.eot?v=4.4.0');
-  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.4.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.4.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.4.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg');
+  src: url('../fonts/FontAwesome.eot?9h6hxj');
+  src: url('../fonts/FontAwesome.eot?9h6hxj#iefix') format('embedded-opentype'),
+    url('../fonts/FontAwesome.ttf?9h6hxj') format('truetype'),
+    url('../fonts/FontAwesome.woff?9h6hxj') format('woff'),
+    url('../fonts/FontAwesome.svg?9h6hxj#FontAwesome') format('svg');
   font-weight: normal;
   font-style: normal;
 }
diff --git a/docs/fonts/FontAwesome.eot b/docs/fonts/FontAwesome.eot
new file mode 100644
index 0000000000000000000000000000000000000000..4f0b1de2bd3b048212f62503d9463d277b987758
GIT binary patch
literal 1804
zcmah~Pi)&%82_G~_+K&`Rws6vXmeUv51_1T(iWyB%MhA~v4dwLL4?R2?-%_*%9rsBT^NCc3i{n+0N3ypii>j@B4j!-+P~*
z<1*3v5)mVTMhBx?j5C+t8|AreFs$2G&;L_Ll%z}KQIk4!k-Fqk8&U%^kxthz*J+D3
zs7fs`Nm>Teg3V3e$DwnSqiJ9BUs0gs1;l8NM4Eng@$8IoGX58sAMxB+ZB#dV&w78t
zCDhHc`tbkZ(YCn$?E;+1F3UAnzf^cbi_jgE}!J
z?(dK&D(n_Tk^7GDE10i>nf*a|hAbn4q3qF7Ch9#9@AvOhS;Pb7;4rwI!(V{(1f0_=_a5}0_4~fxP-6Wj#zW(6cpr_ZXC@~kndvNHCi63M^Q^>Xrz|!(%S_2&Q}ZR3pGlr(
zr&!{*!hWGrWUt9lF)AGXA_%f1L`60$2&WGYUp)|OadqWjMN8{OTKim$S72VO2qz_3
z;MP%r12zZHl2}%hu42aG
zrmCkME0Hl&RZ+IU#7t#LQ4X72N@#%uTR9QhCX*Rm)dU*1maK(rcEQ@VQfWJHm9p8Q
z)wNPbczfKQv5OM{&j_))vZ|?iCYf~7x@w*Pv#ltKyd<0Ko9BWu#*64GvZ5N9gcX<`
zHjrx3wo~>t(oU4Dyq!*2U3($x6s<)o#rdK$Q9{OX+upVp_`dT#!gK!WZEM9?cuFz9
zVdzo$XLQQ&NdCE(Q%Ycx(j@GmZ+f=NOX
zU;)?W7a
+
+
+Generated by IcoMoon
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/docs/fonts/FontAwesome.ttf b/docs/fonts/FontAwesome.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..47e2443e99084e51e746397225bb4d6dabc43b16
GIT binary patch
literal 1624
zcmah}Ply{;82{c(GXIj!Xm^sCY(hKP)$Tz_w@G%RlBB6fFRjPK?~yU`sz9sNzjGT=8_jeZyV3*dX$mDcwDM<2{Q`X2m%
zNVu`(Ha27Lw0g<9k#S@j=PYVzL|`@NE3cKo{(yZBxWkBigMiHETIJqwsIo0
zO(rwCstGh}ty<-5wruTMskB|Ns@ZJC8d|9na(mX!+m*RM&IqxFvZ|?iCYf~7x@w+*
zWLHrXc~v&qch872!;2UyvZ5N9gcX<`w~=bawo~>l(#}<_f}KuTL%W=HD%OgX;_`|!
zS4GBI+upUy{M`8*;d|r#Z>)8r{Dfluz|h0mi(hi}WcP0d?-`REEcp2E0)x#L?rl1e
zfrS)k0>a%egCzdQ-!_&;CY_@m%K>vwi9QZPO)_w+$OA7=z%kW0W!e;Q&D@;5^q
z0lppLC~!8!67WWdHJYWL_=}6EkR+iAus}L}5n>VYYaxyR-wAOP_|*_gz?~3lRHTPj
zz0Tmu(CvF|m#&fr<$$ixkX-76waHy`d;MEp$GMbSq&0|pP~7qj9lAt0T0AwvsRq~G
z*3NdLN7oU)MLV=j4eFih#SNU6+i`o1fxGE6_nrENcg^!Uxo3?y2rg@BS}moa+w&

literal 0
HcmV?d00001

diff --git a/docs/fonts/FontAwesome.woff b/docs/fonts/FontAwesome.woff
new file mode 100644
index 0000000000000000000000000000000000000000..bec5c4fe77ce01bf6d1dfe7240cc78b10c9eb535
GIT binary patch
literal 1700
zcmah}O=ufO6n?WS?Vl8F8n3h~OC&3~wF@muV#yXQlA@GiDrg9ejVUzLk?gG;u(U>!
zt@zf`)IGG&LVF36o_uS`v4x%z8VHm^FFE(pW5I})9AovH*;VXb;s>n2EWw_v}_Ro#{!Z*~TEz};82(S#PzdppH6N2{Q>6X`GPnZ
zNR~DBHAT_eJqgkDRq$qiQ<3SgPYOGG(&D&IGZMW5-=loR3AMYKO2w5x?_ut|1uw$Z-?uIQ#=?k#F{5+N<`&1L<`4#yqJsd
zOma(Zk&2FTgp84Tw}%g)CG2)
zCI2Yxml{>}ni`d(($Q~{q$*NWW($&Z;qd5{L%9{#*ACZ=Ov201k!mADGoT5rR
zIx2C%76H0EoE;=G#@gYBMm%op8yQoyNIL2Aefd7k&^z=oHo7!>krf#45Di$$On!Dw
zbjlk-w^z{Zaf}&E5&FsnwoqC`^EM_D!z7SMaH}pg{m2xu)-8utiSJO0gMYY)X&kb#gH!;*yO*gYiI|x1M
zpwzPCq@7)q&DZRrlS$h{r;>B4_OhMkeAUg@P;uIEcAW~}cYcqcZ@%}9y=GRPQcPSJ
zdQyMsOYWY$#mVq*9=A;h)`;%{7n=*t?f6CthLpe)7yCIgrzZK#L@VyX6fpZ~NfY(E8&@}zRzqp7FCIwG`
zCH!~32(b+QT8JaS2O*9EzaC-*xEo@FO7vvO?+&gGy}pkh)Drn{4(KWk$)i534tc9y
zuYcR`x|a)=Xccr1j@u&8rOQ;HOQ&WyHQw(ciqHb9&M0IE!xAgfxY#yU%r@ypDX_xzCiv1z)bL#

literal 0
HcmV?d00001

diff --git a/docs/fonts/fontawesome-webfont.eot b/docs/fonts/fontawesome-webfont.eot
deleted file mode 100755
index a30335d748c65c0bab5880b4e6dba53f5c79206c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 68875
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
    7r8$?kb-D3z%-c}
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
F002TuuHFCu

diff --git a/docs/fonts/fontawesome-webfont.svg b/docs/fonts/fontawesome-webfont.svg
deleted file mode 100755
index 6fd19abcb9e..00000000000
--- a/docs/fonts/fontawesome-webfont.svg
+++ /dev/null
@@ -1,640 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
\ No newline at end of file
diff --git a/docs/fonts/fontawesome-webfont.ttf b/docs/fonts/fontawesome-webfont.ttf
deleted file mode 100755
index d7994e13086b1ac1a216bd754c93e1bccd65f237..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138204
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

diff --git a/docs/fonts/fontawesome-webfont.woff b/docs/fonts/fontawesome-webfont.woff
deleted file mode 100755
index 6fd4ede0f30f170eecb4156beb7235bf01fff00b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 81284
zcmZ5nW0dAhw{6=tra5ifoc6SB+fUn^wr$(CZQHhu+wb@DX02T(d*__0q*hjvI;nDz
z6B7dh1_A;C<_!cw_^}|k8~@`!yZ?U^6H}7;aTNK{@&1ENMg)_%h^W|)ruV}M{s#&W
zZ#hMJrXS7shx7hGFO$}3^;lfddE#vpEoI3*cgGVDi&foU;C{|wOVrtHrDj==p8j30pfFkldupAzhU?5A*DGt@J2G|A}c8SCkr
z>o=I_>6wAZO%21w!fMC5@%113m4gEjR1IeZ_w5JA1|b&1KoW-n4j~5AferOvwXSQE
zah+1@_DDn5n5dd0liHfPDAc#fzU7kNzDRb6*liqG%p4(BHpD)HH}o+P&d>^62?%?n
zvT^cYhB@H6YiGR6$gT}{I=1;PF2U6KvnG>fX|Sjq<;6yR`Oi
zzfj`_B+|da`W(r5PMLbX8ClyMhtSxjT;=Fc#>{N{^}>E2KALfSaWJu>$b2v(cP(#e
zQh?N#{q#Bz@Xx&p;=0!11?{P{xcJik+-3Zf%5K{vO&*^*kp>pWUBalJ(+NlJQayb9~mb9}|No-GXO8xq>8P94Ck^I$vs&07w4u$Fr{06>`ii
zU;f%Ii%-7FRos!|3ghm|RV@YA|Kt~@jOcE(ovW$ih<5q>VjWj50>YUYMD#_?PB2Es
z+0ba9CdQDvVk*rTDJorTdgtjJYqCume06DZB~{d;*e9uJ-Qapq&uQ<#o=I`N+wI^@
z*lwCj7;_ou$oQiK=-vwep`Ps^7aj#Ouxh;p=#%)wLKv=>1aFYdgB)*18$baU5I$W_
zSmIJnNCd4dT=1ntUP16acK%#a9IflTXirMSj}oQpOrn9_8v`VvVZfSw7M+*K9#zzG
z*5dw_wcMRY5I(cID|UxMVV9A7zK3D2C4xbwQ@3M+1&kIhmdCid>t8!HlGzf}gBL0r
zvVQn<&uo{MZp6H5laSarDlzWlu9tJ?7y7o9Ke~Z#4b`X}E5%pVg$Ye*lB=f@LzL!J
z>|k;@!>)_YjZ;U95Qs;+8jNteXlpVxU46})c&^>urAqlwg@{CV!Czb4YQ5Ibbi_;X
zvHQzZ1&uH2(p}vY3GIG|H!B7t9zSP+2B!Ro&G6-C8kIu_5PqCRoE%
zq#LMnW2Hn^H>X$%O!aI@@nkVS6uBr#B+!AI+!n%zRkFk~icobqX8@!DRy$h9`rgq*J+u^|#@mEq}83ofS&jJVXsFUrTiil)0~bwFSt
z2^#7(U>T9H>nrB~&gjVIV(yvldtghB=6cb^IwKvLgRJo;_^pzCOJKA4vg3X#^E7gu
zzDrM~gL4zk=T;q4tHX=rH6P;}Vi@~0EzYb{rKC0Se0OS>Zl`Jw;P`A8ZT~%FFT{mz
zEe3CZ@6cjG1aw~i5}OgmR6b`Yazsf;T1^2V@CpbC5Y^u#eXdt8EhT<$gaabQo#Yutzno)XVD
zLr*oeR}wFc<-P=_90Uv{!-4rdZMvHuT?WM1PZJ@qVs3NSV)5L~p<);eGF5fX8Scvc
zZ9E0e$H7cmn~R=nRtDMoJ2ym}7sd7&y?A3+bFW>P_u^h2GHlPIH2cFEI{a?ak4>?A
zy7&ua8&Zezc`UXY3h+gQxz|$DA2tx2LNHsGUs~a9^-32~Anu=;Sn(zKnW%yi=3lOa
z8*Yd>KcN~
z?S(eQ!gl$0?$_5q)i5HPt_oodoApYa)Ay}v^tEoAv2Z-=-|p7ao&7=2?;`J){#Uu#
zgmzh??c%Or_i8A$v~)UH8qdo&nHW3=>$b1PAiwdnG+ICE1p8pGe|wR|
zpTX%AfHC3!{Hi-DzDys9o;o_dNb(SZ@KT3@
z7xLjAS;Uh~yhMf2VwNygc>$7H|R>k-aM1e(2UcBd;
zxCDH**B3m4HiTRs-4y8Cls6Fkatg!(J^@&?oc51D5r5C-ZhQ!0_CSbrku7D^jAuaC
zlTPwzosVSsB+cUI(4I(_d87+=1;+j)ql9UuZFS=Zef^|~=ad3!w(*R|wPWg}A?kKz
zbDB(Zpt?adI*K7?Yalku;Ai{#bB4$WT<&5u!ma%?`EM;m$UI`NDtGGfPT
zX#))!7cBJ+w6ycdY0?mmF9iKbX9L0b5}Be>8%O=J06>DBI=q;PU44rbD^G!YQc(R1
zdX5jiw`4Pb1TAnDJ}j<>sM5bCaLkfx{6rH=7!bTdYbCquM{a){a*shx%xTbw2KhHv
zhN)zm?au*KyRn|vHN%b~D4f%rV`ca$bo~k!W+5#Ar38dzob)O$+tay)P){f72DbT}
zafu(OxBqjzdb=ybGjs7P^$!*LYlODuH!Fi)GEAW2%A2WnKveQgbpt_b9grC@fN6lT
zLjDX#ptOOI+nC*o$~U|06}hJsNOh361@bf7CNnj~dGO1id(>#j`Md`Bo3e)MhCmai
zn@tbzFDP1VVJIDr5RXu|LcZ&f5O31W#9sF~(h@z(!r2W~^>fH}k(VO7SL7XVLuaCF
zEeIMzh9*$sls!~|W?aB5RtBdAy?@<}Km8T~|KOBTTr}d#Q%)vC{97Hgb^!v=UjMC!
zC+O|G8xDQnD*p4N%5@2I?rD)CfM5#1GJ-`|P{)Q}<06MWXw~Rd491pG2@Xy(awP5t
zXWCzr-nWFn&Fv>6w2mCiVu!`!D)~8B8UQJm`|{gq68e$Rx$|x1AL@zF16W%OTq$}>
zZp~jM;>BJC1W!TdIaG=j9äY>7uxS6S37IVP_>DW-kg%dn+sFHLnFhvXTU%&ox
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
ZUtABnb?tu62nVk>KX+wfW(Hek
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
o-IM%8o*ehr=#Iq=Q0BvwUBdJ3D
+2. Choose Import Icons and load `icomoon-selection.json`
+3. Choose Generate Font → Download
+4. Copy the font files and adapt the CSS to the paths we use in Jekyll

From 4f4a628df81fc3490c4f4134c689eeed983d7c2c Mon Sep 17 00:00:00 2001
From: jona 
Date: Tue, 29 Nov 2016 13:37:10 +0100
Subject: [PATCH 1662/4996] fix tests

---
 ...8-9-23-categories.markdown => 2008-09-23-categories.markdown} | 0
 ...8-9-23-categories.markdown => 2008-09-23-categories.markdown} | 0
 test/test_collections.rb                                         | 1 +
 3 files changed, 1 insertion(+)
 rename test/source/category/_posts/{2008-9-23-categories.markdown => 2008-09-23-categories.markdown} (100%)
 rename test/source/z_category/_posts/{2008-9-23-categories.markdown => 2008-09-23-categories.markdown} (100%)

diff --git a/test/source/category/_posts/2008-9-23-categories.markdown b/test/source/category/_posts/2008-09-23-categories.markdown
similarity index 100%
rename from test/source/category/_posts/2008-9-23-categories.markdown
rename to test/source/category/_posts/2008-09-23-categories.markdown
diff --git a/test/source/z_category/_posts/2008-9-23-categories.markdown b/test/source/z_category/_posts/2008-09-23-categories.markdown
similarity index 100%
rename from test/source/z_category/_posts/2008-9-23-categories.markdown
rename to test/source/z_category/_posts/2008-09-23-categories.markdown
diff --git a/test/test_collections.rb b/test/test_collections.rb
index 45e2a51192b..0dca8443994 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -132,6 +132,7 @@ class TestCollections < JekyllUnitTest
           _methods/um_hi.md
           _methods/escape-+\ #%20[].md
           _methods/yaml_with_dots.md
+          _methods/3940394-21-9393050-fifif1323-test.md
         ), doc.relative_path
       end
     end

From d7cdab16e2f67fe50515a3bb2021fa840444fa79 Mon Sep 17 00:00:00 2001
From: --global 
Date: Tue, 29 Nov 2016 14:07:07 +0100
Subject: [PATCH 1663/4996] fix cucumber tests

---
 features/collections.feature | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/features/collections.feature b/features/collections.feature
index 60bba8a17fa..1310bdb1b65 100644
--- a/features/collections.feature
+++ b/features/collections.feature
@@ -77,8 +77,8 @@ Feature: Collections
     When I run jekyll build
     Then I should get a zero exit status
     Then the _site directory should exist
-    And I should see "Collections: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" unless Windows
-    And I should see "Collections: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/yaml_with_dots.md" in "_site/index.html" if on Windows
+    And I should see "Collections: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" unless Windows
+    And I should see "Collections: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/yaml_with_dots.md" in "_site/index.html" if on Windows
 
   Scenario: Collections specified as an hash
     Given I have an "index.html" page that contains "Collections: {% for method in site.methods %}{{ method.relative_path }} {% endfor %}"
@@ -91,8 +91,8 @@ Feature: Collections
     When I run jekyll build
     Then I should get a zero exit status
     Then the _site directory should exist
-    And I should see "Collections: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" unless Windows
-    And I should see "Collections: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/yaml_with_dots.md" in "_site/index.html" if on Windows
+    And I should see "Collections: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" unless Windows
+    And I should see "Collections: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/yaml_with_dots.md" in "_site/index.html" if on Windows
 
   Scenario: All the documents
     Given I have an "index.html" page that contains "All documents: {% for doc in site.documents %}{{ doc.relative_path }} {% endfor %}"
@@ -105,11 +105,11 @@ Feature: Collections
     When I run jekyll build
     Then I should get a zero exit status
     Then the _site directory should exist
-    And I should see "All documents: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" unless Windows
-    And I should see "All documents: _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/yaml_with_dots.md" in "_site/index.html" if on Windows
+    And I should see "All documents: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" unless Windows
+    And I should see "All documents: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/yaml_with_dots.md" in "_site/index.html" if on Windows
 
   Scenario: Documents have an output attribute, which is the converted HTML
-    Given I have an "index.html" page that contains "Second document's output: {{ site.documents[1].output }}"
+    Given I have an "index.html" page that contains "Second document's output: {{ site.documents[2].output }}"
     And I have fixture collections
     And I have a "_config.yml" file with content:
     """
@@ -145,7 +145,7 @@ Feature: Collections
     When I run jekyll build
     Then I should get a zero exit status
     And the _site directory should exist
-    And I should see "2. of 8: 
    Page without title.
    " in "_site/index.html" unless Windows
+    And I should see "2. of 9: 
    Page without title.
    " in "_site/index.html" unless Windows
     And I should see "2. of 7: 
    Page without title.
    " in "_site/index.html" if on Windows
 
   Scenario: Sort by relative_path
@@ -159,8 +159,8 @@ Feature: Collections
     When I run jekyll build
     Then I should get a zero exit status
     Then the _site directory should exist
-    And I should see "Collections: Collection#entries, Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, Site#generate," in "_site/index.html" unless Windows
-    And I should see "Collections: Collection#entries, Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, YAML with Dots" in "_site/index.html" if on Windows
+    And I should see "Collections: this is a test!, Collection#entries, Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, Site#generate, YAML with Dots" in "_site/index.html" unless Windows
+    And I should see "Collections: this is a test!, Collection#entries, Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, YAML with Dots" in "_site/index.html" if on Windows
 
   Scenario: Rendered collection with date/dateless filename
     Given I have an "index.html" page that contains "Collections: {% for method in site.thanksgiving %}{{ method.title }} {% endfor %}"

From 6cbcaa99ad56c85633626500e69f7fadc6b2cba4 Mon Sep 17 00:00:00 2001
From: --global 
Date: Tue, 29 Nov 2016 14:17:56 +0100
Subject: [PATCH 1664/4996] fix collection cucumber for windows

---
 features/collections.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/collections.feature b/features/collections.feature
index 1310bdb1b65..de5e2a22ed7 100644
--- a/features/collections.feature
+++ b/features/collections.feature
@@ -146,7 +146,7 @@ Feature: Collections
     Then I should get a zero exit status
     And the _site directory should exist
     And I should see "2. of 9: 
    Page without title.
    " in "_site/index.html" unless Windows
-    And I should see "2. of 7: 
    Page without title.
    " in "_site/index.html" if on Windows
+    And I should see "2. of 8: 
    Page without title.
    " in "_site/index.html" if on Windows
 
   Scenario: Sort by relative_path
     Given I have an "index.html" page that contains "Collections: {% assign methods = site.methods | sort: 'relative_path' %}{{ methods | map:"title" | join: ", " }}"

From d9cf97e9c6f443765954b48d4a863038cedd4b91 Mon Sep 17 00:00:00 2001
From: XhmikosR 
Date: Tue, 29 Nov 2016 10:10:37 +0200
Subject: [PATCH 1665/4996] Switch to `https` when possible.

Also, remove two 404 links.
---
 benchmark/string-concat                            |  2 +-
 docs/_docs/github-pages.md                         |  2 +-
 docs/_docs/installation.md                         |  2 +-
 docs/_docs/plugins.md                              | 14 +++++++-------
 docs/_docs/resources.md                            | 10 +++++-----
 docs/_docs/sites.md                                |  4 ++--
 docs/_docs/upgrading/2-to-3.md                     |  2 +-
 docs/_docs/usage.md                                |  2 +-
 docs/_docs/windows.md                              |  4 ++--
 docs/_includes/analytics.html                      |  4 ++--
 .../2013-05-06-jekyll-1-0-0-released.markdown      |  2 +-
 .../2013-07-24-jekyll-1-1-1-released.markdown      |  2 +-
 ...4-jekyll-stickers-1-dollar-stickermule.markdown |  2 +-
 ...014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown |  2 +-
 ...2014-12-17-alfredxing-welcome-to-jekyll-core.md |  2 +-
 ...016-08-24-jekyll-admin-initial-release.markdown |  2 +-
 docs/_posts/2016-10-06-jekyll-3-3-is-here.md       |  2 +-
 docs/readme.md                                     |  4 ++--
 features/site_configuration.feature                | 12 ++++++------
 lib/jekyll/external.rb                             |  2 +-
 lib/jekyll/site.rb                                 |  2 +-
 .../0000-00-00-welcome-to-jekyll.markdown.erb      |  2 +-
 lib/site_template/about.md                         |  2 +-
 lib/theme_template/README.md.erb                   |  2 +-
 rake/site.rake                                     |  4 ++--
 .../source/_posts/2013-01-02-post-excerpt.markdown |  2 +-
 .../2013-07-22-post-excerpt-with-layout.markdown   |  2 +-
 .../2015-01-08-post-excerpt-separator.markdown     |  2 +-
 test/source/_slides/example-slide-4.html           |  4 ++--
 test/source/_slides/example-slide-6.html           |  4 ++--
 test/test_excerpt.rb                               |  8 ++++----
 31 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/benchmark/string-concat b/benchmark/string-concat
index c5397088764..2020bb51567 100755
--- a/benchmark/string-concat
+++ b/benchmark/string-concat
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'benchmark/ips'
 
-url = "http://jekyllrb.com"
+url = "https://jekyllrb.com"
 
 Benchmark.ips do |x|
   x.report('+=') { url += '/' }
diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index b046f0f9173..233d72e3ec7 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -91,7 +91,7 @@ gem 'github-pages'
 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)]("http://jwillmer.de/blog/tutorial/how-to-install-jekyll-and-pages-gem-on-windows-10-x46#github-pages-and-plugins").
+[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").
 
    
 
 
    
diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index ee27f15f6f0..54dfd9fc2b8 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -34,7 +34,7 @@ earlier, for CoffeeScript support).
 ## Install with RubyGems
 
 The best way to install Jekyll is via
-[RubyGems](http://rubygems.org/pages/download). At the terminal prompt,
+[RubyGems](https://rubygems.org/pages/download). At the terminal prompt,
 simply run the following command to install Jekyll:
 
 ```sh
diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index b68d7bba780..cc1995ad48a 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -783,7 +783,7 @@ LESS.js files during generation.
 
 #### Filters
 
-- [Truncate HTML](https://github.com/MattHall/truncatehtml) by [Matt Hall](http://codebeef.com): A Jekyll filter that truncates HTML while preserving markup structure.
+- [Truncate HTML](https://github.com/MattHall/truncatehtml) by [Matt Hall](https://codebeef.com/): A Jekyll filter that truncates HTML while preserving markup structure.
 - [Domain Name Filter by Lawrence Woodman](https://github.com/LawrenceWoodman/domain_name-liquid_filter): Filters the input text so that just the domain name is left.
 - [Summarize Filter by Mathieu Arnold](https://gist.github.com/731597): Remove markup after a `
    ` tag.
 - [i18n_filter](https://github.com/gacha/gacha.id.lv/blob/master/_plugins/i18n_filter.rb): Liquid filter to use I18n localization.
@@ -834,7 +834,7 @@ LESS.js files during generation.
 - [Jekyll-devonly_tag](https://gist.github.com/2403522): A block tag for including markup only during development.
 - [JekyllGalleryTag](https://github.com/redwallhp/JekyllGalleryTag) by [redwallhp](https://github.com/redwallhp): Generates thumbnails from a directory of images and displays them in a grid.
 - [Youku and Tudou Embed](https://gist.github.com/Yexiaoxing/5891929): Liquid plugin for embedding Youku and Tudou videos.
-- [Jekyll-swfobject](https://github.com/sectore/jekyll-swfobject): Liquid plugin for embedding Adobe Flash files (.swf) using [SWFObject](http://code.google.com/p/swfobject/).
+- [Jekyll-swfobject](https://github.com/sectore/jekyll-swfobject): Liquid plugin for embedding Adobe Flash files (.swf) using [SWFObject](https://github.com/swfobject/swfobject).
 - [Jekyll Picture Tag](https://github.com/robwierzbowski/jekyll-picture-tag): Easy responsive images for Jekyll. Based on the proposed [``](https://html.spec.whatwg.org/multipage/embedded-content.html#the-picture-element) element, polyfilled with Scott Jehl’s [Picturefill](https://github.com/scottjehl/picturefill).
 - [Jekyll Image Tag](https://github.com/robwierzbowski/jekyll-image-tag): Better images for Jekyll. Save image presets, generate resized images, and add classes, alt text, and other attributes.
 - [Jekyll Responsive Image](https://github.com/wildlyinaccurate/jekyll-responsive-image): Responsive images for Jekyll. Automatically resizes images, supports all responsive methods (``, `srcset`, Imager.js, etc), super-flexible configuration.
@@ -844,14 +844,14 @@ LESS.js files during generation.
 - [Jekyll Image Encode](https://github.com/GSI/jekyll_image_encode) by [GSI](https://github.com/GSI): Tag that renders base64 codes of images fetched from the web.
 - [Jekyll Quick Man](https://github.com/GSI/jekyll_quick_man) by [GSI](https://github.com/GSI): Tag that renders pretty links to man page sources on the internet.
 - [jekyll-font-awesome](https://gist.github.com/23maverick23/8532525): Quickly and easily add Font Awesome icons to your posts.
-- [Lychee Gallery Tag](https://gist.github.com/tobru/9171700) by [tobru](https://github.com/tobru): Include [Lychee](http://lychee.electerious.com/) albums into a post. For an introduction, see [Jekyll meets Lychee - A Liquid Tag plugin](https://tobrunet.ch/articles/jekyll-meets-lychee-a-liquid-tag-plugin/)
+- [Lychee Gallery Tag](https://gist.github.com/tobru/9171700) by [tobru](https://github.com/tobru): Include [Lychee](https://lychee.electerious.com/) albums into a post. For an introduction, see [Jekyll meets Lychee - A Liquid Tag plugin](https://tobrunet.ch/articles/jekyll-meets-lychee-a-liquid-tag-plugin/)
 - [Image Set/Gallery Tag](https://github.com/callmeed/jekyll-image-set) by [callmeed](https://github.com/callmeed): Renders HTML for an image gallery from a folder in your Jekyll site. Just pass it a folder name and class/tag options.
 - [jekyll_figure](https://github.com/lmullen/jekyll_figure): Generate figures and captions with links to the figure in a variety of formats
 - [Jekyll GitHub Sample Tag](https://github.com/bwillis/jekyll-github-sample): A liquid tag to include a sample of a github repo file in your Jekyll site.
 - [Jekyll Project Version Tag](https://github.com/rob-murray/jekyll-version-plugin): A Liquid tag plugin that renders a version identifier for your Jekyll site sourced from the git repository containing your code.
-- [Piwigo Gallery](https://github.com/AlessandroLorenzi/piwigo_gallery) by [Alessandro Lorenzi](http://www.alorenzi.eu/): Jekyll plugin to generate thumbnails from a Piwigo gallery and display them with a Liquid tag
+- [Piwigo Gallery](https://github.com/AlessandroLorenzi/piwigo_gallery) by [Alessandro Lorenzi](http://blog.alorenzi.eu/): Jekyll plugin to generate thumbnails from a Piwigo gallery and display them with a Liquid tag
 - [mathml.rb](https://github.com/tmthrgd/jekyll-plugins) by Tom Thorogood: A plugin to convert TeX mathematics into MathML for display.
-- [webmention_io.rb](https://github.com/aarongustafson/jekyll-webmention_io) by [Aaron Gustafson](http://aaron-gustafson.com/): A plugin to enable [webmention](http://indiewebcamp.com/webmention) integration using [Webmention.io](http://webmention.io). Includes an optional JavaScript for updating webmentions automatically between publishes and, if available, in realtime using WebSockets.
+- [webmention_io.rb](https://github.com/aarongustafson/jekyll-webmention_io) by [Aaron Gustafson](http://aaron-gustafson.com/): A plugin to enable [webmention](https://indieweb.org/webmention) integration using [Webmention.io](https://webmention.io/). Includes an optional JavaScript for updating webmentions automatically between publishes and, if available, in realtime using WebSockets.
 - [Jekyll 500px Embed](https://github.com/lkorth/jekyll-500px-embed) by Luke Korth. A Liquid tag plugin that embeds [500px](https://500px.com/) photos.
 - [inline\_highlight](https://github.com/bdesham/inline_highlight): A tag for inline syntax highlighting.
 - [jekyll-mermaid](https://github.com/jasonbellamy/jekyll-mermaid): Simplify the creation of mermaid diagrams and flowcharts in your posts and pages.
@@ -873,7 +873,7 @@ LESS.js files during generation.
 #### Collections
 
 - [Jekyll Plugins by Recursive Design](https://github.com/recurser/jekyll-plugins): Plugins to generate Project pages from GitHub readmes, a Category page, and a Sitemap generator.
-- [Company website and blog plugins](https://github.com/flatterline/jekyll-plugins) by Flatterline, a [Ruby on Rails development company](http://flatterline.com/): Portfolio/project page generator, team/individual page generator, an author bio liquid tag for use on posts, and a few other smaller plugins.
+- [Company website and blog plugins](https://github.com/flatterline/jekyll-plugins) by Flatterline, a Ruby on Rails development company: Portfolio/project page generator, team/individual page generator, an author bio liquid tag for use on posts, and a few other smaller plugins.
 - [Jekyll plugins by Aucor](https://github.com/aucor/jekyll-plugins): Plugins for trimming unwanted newlines/whitespace and sorting pages by weight attribute.
 
 #### Other
@@ -892,7 +892,7 @@ LESS.js files during generation.
 - [Jekyll-tagging](https://github.com/pattex/jekyll-tagging): Jekyll plugin to automatically generate a tag cloud and tag pages.
 - [Jekyll-scholar](https://github.com/inukshuk/jekyll-scholar): Jekyll extensions for the blogging scholar.
 - [Jekyll-asset_bundler](https://github.com/moshen/jekyll-asset_bundler): Bundles and minifies JavaScript and CSS.
-- [Jekyll-assets](http://ixti.net/jekyll-assets/) by [ixti](https://github.com/ixti): Rails-alike assets pipeline (write assets in CoffeeScript, Sass, LESS etc; specify dependencies for automatic bundling using simple declarative comments in assets; minify and compress; use JST templates; cache bust; and many-many more).
+- [Jekyll-assets](http://jekyll.github.io/jekyll-assets/) by [ixti](https://github.com/ixti): Rails-alike assets pipeline (write assets in CoffeeScript, Sass, LESS etc; specify dependencies for automatic bundling using simple declarative comments in assets; minify and compress; use JST templates; cache bust; and many-many more).
 - [JAPR](https://github.com/kitsched/japr): Jekyll Asset Pipeline Reborn - Powerful asset pipeline for Jekyll that collects, converts and compresses JavaScript and CSS assets.
 - [File compressor](https://gist.github.com/2758691) by [mytharcher](https://github.com/mytharcher): Compress HTML and JavaScript files on site build.
 - [Jekyll-minibundle](https://github.com/tkareine/jekyll-minibundle): Asset bundling and cache busting using external minification tool of your choice. No gem dependencies.
diff --git a/docs/_docs/resources.md b/docs/_docs/resources.md
index e17035ad782..2042b1a67b4 100644
--- a/docs/_docs/resources.md
+++ b/docs/_docs/resources.md
@@ -9,19 +9,19 @@ Jekyll’s growing use is producing a wide variety of tutorials, frameworks, ext
 ### Useful Guides
 
 - [Jekyll Tips](http://jekyll.tips) is a set of resources created by [CloudCannon](https://cloudcannon.com) to help folks get up and running with Jekyll. They cover all skill levels, and even include some great video tutorials.
-- [Jekyll Cheatsheet](http://cheat.jekyll.tips) is a single-page resource for Jekyll filters, variables, and the like.
+- [Jekyll Cheatsheet](http://jekyll.tips/jekyll-cheat-sheet/) is a single-page resource for Jekyll filters, variables, and the like.
 - [“Creating and Hosting a Personal Site on GitHub”](http://jmcglone.com/guides/github-pages/)
-- [‘Build A Blog With Jekyll And GitHub Pages’ on Smashing Magazine](http://www.smashingmagazine.com/2014/08/01/build-blog-jekyll-github-pages/)
+- [‘Build A Blog With Jekyll And GitHub Pages’ on Smashing Magazine](https://www.smashingmagazine.com/2014/08/01/build-blog-jekyll-github-pages/)
 - Publishing to GitHub Pages? [Check out our documentation page for just that purpose](/docs/github-pages/).
-- [Blogging with Git, Emacs and Jekyll](http://metajack.im/2009/01/23/blogging-with-git-emacs-and-jekyll/)
+- [Blogging with Git, Emacs and Jekyll](https://metajack.im/2009/01/23/blogging-with-git-emacs-and-jekyll/)
 - [Tips for working with GitHub Pages Integration](https://gist.github.com/jedschneider/2890453)
 
 ### Integrations
 
 - Use a saas service as a backend for forms (contact forms, hiring forms, etc.)
-  - [Formspree (also open source)](http://formspree.io/)
+  - [Formspree (also open source)](https://formspree.io/)
   - [FormKeep](https://formkeep.com/guides/contact-form-jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=contact-form-jekyll)
-  - [Simple Form](http://getsimpleform.com/)
+  - [Simple Form](https://getsimpleform.com/)
   - [Formingo](https://www.formingo.co/guides/jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=Jekyll%20Documentation)
 - [Jekyll Bootstrap](http://jekyllbootstrap.com), 0 to Blog in 3 minutes. Provides detailed explanations, examples, and helper-code to make getting started with Jekyll easier.
 - [Integrating Twitter with Jekyll](http://www.justkez.com/integrating-twitter-with-jekyll/)
diff --git a/docs/_docs/sites.md b/docs/_docs/sites.md
index 61fbba139db..28e464bad7d 100644
--- a/docs/_docs/sites.md
+++ b/docs/_docs/sites.md
@@ -10,9 +10,9 @@ learning purposes.
 
 - [Tom Preston-Werner](http://tom.preston-werner.com/)
     ([source](https://github.com/mojombo/mojombo.github.io))
-- [GitHub Official Teaching Materials](http://training.github.com)
+- [GitHub Official Teaching Materials](https://services.github.com/training/)
     ([source](https://github.com/github/training-kit))
-- [Rasmus Andersson](http://rsms.me/)
+- [Rasmus Andersson](https://rsms.me/)
     ([source](https://github.com/rsms/rsms.github.com))
 
 If you would like to explore more examples, you can find a list of sites
diff --git a/docs/_docs/upgrading/2-to-3.md b/docs/_docs/upgrading/2-to-3.md
index dfc93dff6bc..0d145b9c262 100644
--- a/docs/_docs/upgrading/2-to-3.md
+++ b/docs/_docs/upgrading/2-to-3.md
@@ -100,7 +100,7 @@ error when trying to **serve** or **build**:
 ```text
 Since v3.0, permalinks for pages in subfolders must be relative to the site
 source directory, not the parent directory. Check
-http://jekyllrb.com/docs/upgrading/ for more info.
+https://jekyllrb.com/docs/upgrading/ for more info.
 ```
 
 This can be fixed by removing the following line from your `_config.yml` file:
diff --git a/docs/_docs/usage.md b/docs/_docs/usage.md
index 3d2413d444b..e6f1a0dba46 100644
--- a/docs/_docs/usage.md
+++ b/docs/_docs/usage.md
@@ -60,7 +60,7 @@ $ jekyll serve
 $ 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. [Read more](http://unixhelp.ed.ac.uk/shell/jobz5.html).
+#    If you cannot find the PID, then do, `ps aux | grep jekyll` and kill the instance.
 ```
 
 
    
diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index 4ae1fd5e055..05f3bbff14e 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -97,7 +97,7 @@ This gem is also needed in the github-pages and to get it running on Windows x64
 
 
 ```ruby
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 gem 'github-pages', group: :jekyll_plugins
 ```
 
@@ -110,7 +110,7 @@ There will be a warning on startup that you should include `gem 'wdm', '>= 0.1.0
 
 In the future the installation process of the github-pages should be as simple as the setup of the blog. But as long as the new version of the Nokogiri ([v1.6.8][nokogiriReleases]) is not stable and referenced, it is work to get it up and running on Windows.
 
-[jwillmerPost]: http://jwillmer.de/blog/tutorial/how-to-install-jekyll-and-pages-gem-on-windows-10-x46 "Installation instructions by Jens Willmer"
+[jwillmerPost]: https://jwillmer.de/blog/tutorial/how-to-install-jekyll-and-pages-gem-on-windows-10-x46 "Installation instructions by Jens Willmer"
 [Chocolatey]: https://chocolatey.org/install "Package manager for Windows"
 [Bundler]: http://bundler.io/ "Ruby Dependencie Manager"
 [nokogiriReleases]: https://github.com/sparklemotion/nokogiri/releases "Nokogiri Releases"
diff --git a/docs/_includes/analytics.html b/docs/_includes/analytics.html
index 5bbfc88858e..05761c29b1f 100644
--- a/docs/_includes/analytics.html
+++ b/docs/_includes/analytics.html
@@ -1,5 +1,5 @@
 {% if site.gauges_id %}
-  
+  
   
 ```
 
-For more information about getting started, check out [this excellent blog post](http://gastonsanchez.com/opinion/2014/02/16/Mathjax-with-jekyll/).
+For more information about getting started, check out [this excellent blog post](http://gastonsanchez.com/visually-enforced/opinion/2014/02/16/Mathjax-with-jekyll/).
 
 ## Alternative Markdown Processors
 
diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index 710f702e6e4..b9b0cce6bc4 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -12,15 +12,13 @@ content, they’re also a great way to host your Jekyll-powered website for free
 
 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.
+This guide will teach you what you need to know about Git, GitHub, and Jekyll to create your very own website on GitHub Pages.
 
 ### 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 URL's.
+Project Pages complicates the proper resolution of URLs. In order to assure your site builds properly, use `site.github.url` in your URL's.
 
 ```html
 {% raw %}
@@ -91,7 +89,7 @@ gem 'github-pages'
 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").
+[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).
 
    
 
 
    
diff --git a/docs/_docs/permalinks.md b/docs/_docs/permalinks.md
index b8fd5ec643a..dc6ae44ff7a 100644
--- a/docs/_docs/permalinks.md
+++ b/docs/_docs/permalinks.md
@@ -328,7 +328,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 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
 
diff --git a/docs/_docs/quickstart.md b/docs/_docs/quickstart.md
index d15a9eb1730..7a81e70e316 100644
--- a/docs/_docs/quickstart.md
+++ b/docs/_docs/quickstart.md
@@ -4,7 +4,7 @@ title: Quick-start guide
 permalink: /docs/quickstart/
 ---
 
-If you already have [Ruby](https://www.ruby-lang.org/en/downloads/) and [RubyGems](https://rubygems.org/pages/download) installed (see Jekyll's [requirements](/docs/installation/#requirements/)), you can create a new Jekyll site by doing the following:
+If you already have [Ruby](https://www.ruby-lang.org/en/downloads/) and [RubyGems](https://rubygems.org/pages/download) installed (see Jekyll's [requirements](../installation/#requirements)), you can create a new Jekyll site by doing the following:
 
 ```sh
 # Install Jekyll and Bundler gems through RubyGems
@@ -35,7 +35,7 @@ If you already have [Ruby](https://www.ruby-lang.org/en/downloads/) and [RubyGem
 
 `jekyll new ` installs a new Jekyll site at the path specified (relative to current directory). In this case, Jekyll will be installed in a directory called `myblog`. Here are some additional details:
 
-* To install the Jekyll site into the directory you're currently in, run `jekyll new .` If the existing directory isn't empty, you can pass the `--force` option with `jekyll new . --force`.  
+* To install the Jekyll site into the directory you're currently in, run `jekyll new .` If the existing directory isn't empty, you can pass the `--force` option with `jekyll new . --force`.
 * `jekyll new` automatically initiates `bundle install` to install the dependencies required. (If you don't want Bundler to install the gems, use `jekyll new myblog --skip-bundle`.)
 * By default, the Jekyll site installed by `jekyll new` uses a gem-based theme called [Minima](https://github.com/jekyll/minima). With [gem-based themes](../themes), some of the directories and files are stored in the theme-gem, hidden from your immediate view.
 * To learn about other parameters you can include with `jekyll new`, type `jekyll new --help`.
diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index 8d7bb8bc865..7dedde22f1a 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -17,6 +17,7 @@ A quick way to install Jekyll is to follow the [installation instructions by Dav
  3. Reopen a command prompt and install Jekyll: `gem install jekyll`
 
 Updates in the infrastructure of Ruby may cause SSL errors when attempting to use `gem install` with versions of the RubyGems package older than 2.6. (The RubyGems package installed via the Chocolatey tool is version 2.3) If you have installed an older version, you can update the RubyGems package using the directions [here.][ssl-certificate-update]
+
 [ssl-certificate-update]: http://guides.rubygems.org/ssl-certificate-update/#installing-using-update-packages
 
 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].
@@ -39,10 +40,10 @@ $ chcp 65001
 
 ## Timezone 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.  
+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.
 
-Jekyll now uses a rubygem to internally configure Timezone based on established [IANA Timezone Database](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).  
+Jekyll now uses a rubygem to internally configure Timezone based on established [IANA Timezone Database](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
 While 'new' blogs created with Jekyll v3.4 and greater, will have the following added to their 'Gemfile' by default, existing sites *will* have to update their 'Gemfile' (and installed) to enable development on Windows:
 
 ```ruby

From 6cd388b2ab03658789bb093ef84ebdf67dfadfd8 Mon Sep 17 00:00:00 2001
From: Longwelwind 
Date: Sun, 8 Jan 2017 23:12:45 +0100
Subject: [PATCH 1801/4996] Replace a dead link with a web-archived one

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

diff --git a/docs/_docs/extras.md b/docs/_docs/extras.md
index 83e79963213..9064d967d3d 100644
--- a/docs/_docs/extras.md
+++ b/docs/_docs/extras.md
@@ -15,7 +15,7 @@ Kramdown comes with optional support for LaTeX to PNG rendering via [MathJax](ht
 
 ```
 
-For more information about getting started, check out [this excellent blog post](http://gastonsanchez.com/opinion/2014/02/16/Mathjax-with-jekyll/).
+For more information about getting started, check out [this excellent blog post](https://web.archive.org/web/20160522225559/http://gastonsanchez.com/opinion/2014/02/16/Mathjax-with-jekyll).
 
 ## Alternative Markdown Processors
 

From 5ef6edb97770f9fc73c1a161d129a37daca499f1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 8 Jan 2017 14:51:30 -0800
Subject: [PATCH 1802/4996] Update history to reflect merge of #5738 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b75a9f15d0b..baf346a1c6f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -55,6 +55,7 @@
   * Document --unpublished build option (#5720)
   * Improve pages docs (#5692)
   * Added new includes.md topic to docs (#5696)
+  * Replace a dead link with a web-archived one (#5738)
 
 ## 3.3.1 / 2016-11-14
 

From 0ebc832e1b21b712f108ad0892c869be2893ef85 Mon Sep 17 00:00:00 2001
From: Kurt Anderson 
Date: Mon, 9 Jan 2017 08:01:58 -0500
Subject: [PATCH 1803/4996] Remove duplicate paragraph.

---
 docs/_docs/github-pages.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index 710f702e6e4..0a00f2fa6d1 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -132,12 +132,6 @@ stored in a specially named `gh-pages` branch or in a `docs` folder on the
 will become available under a subpath of your user pages subdomain, such as
 `username.github.io/project` (unless a custom domain is specified).
 
-The Jekyll project repository itself is a perfect example: the
-[master branch]({{ site.repository }}) contains the actual software project
-for Jekyll, however the Jekyll website (that you’re looking at right now) is
-contained in the [docs folder]({{ site.repository }}/tree/master/docs) of the
-same repository.
-
 The Jekyll project repository itself is a perfect example of this branch
 structure—the [master branch]({{ site.repository }}) contains the
 actual software project for Jekyll, and the Jekyll website that you’re

From 74fe613072d377c747ab37a4cc47f08f91a922b3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 9 Jan 2017 05:16:12 -0800
Subject: [PATCH 1804/4996] Update history to reflect merge of #5740 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index baf346a1c6f..c0764538714 100644
--- a/History.markdown
+++ b/History.markdown
@@ -56,6 +56,7 @@
   * Improve pages docs (#5692)
   * Added new includes.md topic to docs (#5696)
   * Replace a dead link with a web-archived one (#5738)
+  * Remove duplicate paragraph. (#5740)
 
 ## 3.3.1 / 2016-11-14
 

From 8a5672fdffd87e586c2f97b5f77b7ca7aa7c53c2 Mon Sep 17 00:00:00 2001
From: Kenton Hansen 
Date: Mon, 10 Oct 2016 15:55:40 -0500
Subject: [PATCH 1805/4996] Addition of a sample "typical post"

So, I thought this section in the docs would be a good place to put the anatomy of a post .md file.
---
 site/_docs/posts.md | 255 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 255 insertions(+)
 create mode 100644 site/_docs/posts.md

diff --git a/site/_docs/posts.md b/site/_docs/posts.md
new file mode 100644
index 00000000000..bc8628c9414
--- /dev/null
+++ b/site/_docs/posts.md
@@ -0,0 +1,255 @@
+---
+layout: docs
+title: Writing posts
+permalink: /docs/posts/
+---
+
+One of Jekyll’s best aspects is that it is “blog aware”. What does this mean,
+exactly? Well, simply put, it means that blogging is baked into Jekyll’s
+functionality. If you write articles and publish them online, you can publish
+and maintain a blog simply by managing a folder of text-files on your computer.
+Compared to the hassle of configuring and maintaining databases and web-based
+CMS systems, this will be a welcome change!
+
+## The Posts Folder
+
+As explained on the [directory structure](../structure/) page, the `_posts`
+folder is where your blog posts will live. These files are generally
+[Markdown](https://daringfireball.net/projects/markdown/) or HTML, but can
+be other formats with the proper converter installed.
+All posts must have [YAML Front Matter](../frontmatter/), and they will be
+converted from their source format into an HTML page that is part of your
+static site.
+
+### Creating Post Files
+
+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
+```
+
+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
+```
+
+
    
+  
    ProTip™: Link to other posts
    
+  
    
+    Use the post_url
+    tag to link to other posts without having to worry about the URL's
+    breaking when the site permalink style changes.
+  
    
+
    
+
+### Content Formats
+
+All blog post files must begin with [YAML Front Matter](../frontmatter/). After
+that, it's simply a matter of deciding which format you prefer. Jekyll supports
+[Markdown](https://daringfireball.net/projects/markdown/) out of the box,
+and has [myriad extensions for other formats as well](/docs/plugins/#converters-1),
+including the popular [Textile](http://redcloth.org/textile) format. These
+formats each have their own way of marking up different types of content
+within a post, so you should familiarize yourself with these formats and
+decide which one best suits your needs.
+
+
    
+  
    Be aware of character sets
    
+  
    
+    Content processors can modify certain characters to make them look nicer.
+    For example, the smart extension in Redcarpet converts standard,
+    ASCII quotation characters to curly, Unicode ones. In order for the browser
+    to display those characters properly, define the charset meta value by
+    including <meta charset="utf-8"> in the
+    <head> of your layout.
+  
    
+
    
+
+## Including images and resources
+
+Chances are, at some point, you'll want to include images, downloads, or other
+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.
+
+Because of Jekyll’s flexibility, there are many solutions to how to do this.
+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
+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.
+
+Including an image asset in a post:
+
+```text
+... which is shown in the screenshot below:
+![My helpful screenshot]({% raw %}{{ site.url }}{% endraw %}/assets/screenshot.jpg)
+```
+
+Linking to a PDF for readers to download:
+
+```text
+... you can [get the PDF]({% raw %}{{ site.url }}{% endraw %}/assets/mydoc.pdf) directly.
+```
+
+
    
+  
    ProTip™: Link using just the site root URL
    
+  
    
+    You can skip the {% raw %}{{ site.url }}{% endraw %} variable
+    if you know your site will only ever be displayed at the
+    root URL of your domain. In this case you can reference assets directly with
+    just /path/file.jpg.
+  
    
+
    
+
+## 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 an Title, Layout, Publishing Date, and Categories might look like this:
+
+```
+---
+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 `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."
+
+## Displaying an index of posts
+
+It’s all well and good to have posts in a folder, but a blog is no use unless
+you have a list of posts somewhere. Creating an index of posts on another page
+(or in a [template](../templates/)) is easy, thanks to the [Liquid template
+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:
+
+```html
+
+```
+
+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
+work](../templates/) with Jekyll if you want to know more.
+
+Note that the `post` variable only exists inside the `for` loop above. If
+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.
+
+## Post excerpts
+
+Each post automatically takes the first block of text, from the beginning of
+the content to the first occurrence of `excerpt_separator`, and sets it as the `post.excerpt`.
+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
+
+```
+
+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: '
    ' | remove: '
    ' }}{% 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
+---
+excerpt_separator: 
+---
+
+Excerpt
+
+Out-of-excerpt
+```
+
+You can also set the `excerpt_separator` globally in your `_config.yml`
+configuration file.
+
+Completely disable excerpts by setting your `excerpt_separator` to `""`.
+
+Also, as with any output generated by Liquid tags, you can pass the
+`| strip_html` filter to remove any html tags in the output. This is
+particularly helpful if you wish to output a post excerpt as a
+`meta="description"` tag within the post `head`, or anywhere else having
+html tags along with the content is not desirable.
+
+## Highlighting code snippets
+
+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 %}
+def show
+  @widget = Widget(params[:id])
+  respond_to do |format|
+    format.html # show.html.erb
+    format.json { render json: @widget }
+  end
+end
+{% raw %}{% endhighlight %}{% endraw %}
+```
+
+And the output will look like this:
+
+```ruby
+def show
+  @widget = Widget(params[:id])
+  respond_to do |format|
+    format.html # show.html.erb
+    format.json { render json: @widget }
+  end
+end
+```
+
+
    
+  
    ProTip™: Show line numbers
    
+  
    
+    You can make code snippets include line-numbers by adding the word
+    linenos to the end of the opening highlight tag like this:
+    {% raw %}{% highlight ruby linenos %}{% endraw %}.
+  
    
+
    
+
+These basics should be enough to get you started writing your first posts. When
+you’re ready to dig into what else is possible, you might be interested in
+doing things like [customizing post permalinks](../permalinks/) or
+using [custom variables](../variables/) in your posts and elsewhere on your
+site.

From b1291605b36d978f0fab9fcc7de48879a67ace86 Mon Sep 17 00:00:00 2001
From: Kenton Hansen 
Date: Mon, 10 Oct 2016 16:46:42 -0500
Subject: [PATCH 1806/4996] Changes to 'bundle exec jekyll serve'

Updated to be consistent with the rest of documentation.
---
 site/_docs/posts.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/posts.md b/site/_docs/posts.md
index bc8628c9414..d4d8f15d1b5 100644
--- a/site/_docs/posts.md
+++ b/site/_docs/posts.md
@@ -122,7 +122,7 @@ 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 `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
+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.
 

From e60769731afc143ca3e2b7fc082be5ec17e16ad9 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 9 Jan 2017 15:25:59 +0100
Subject: [PATCH 1807/4996] Report modifications to docs

---
 docs/_docs/posts.md |  18 ++++
 site/_docs/posts.md | 255 --------------------------------------------
 2 files changed, 18 insertions(+), 255 deletions(-)
 delete mode 100644 site/_docs/posts.md

diff --git a/docs/_docs/posts.md b/docs/_docs/posts.md
index 40aa8365c58..d4d8f15d1b5 100644
--- a/docs/_docs/posts.md
+++ b/docs/_docs/posts.md
@@ -111,6 +111,24 @@ Linking to a PDF for readers to download:
   
    
 
    
 
+## 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 an Title, Layout, Publishing Date, and Categories might look like this:
+
+```
+---
+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."
+
 ## Displaying an index of posts
 
 It’s all well and good to have posts in a folder, but a blog is no use unless
diff --git a/site/_docs/posts.md b/site/_docs/posts.md
deleted file mode 100644
index d4d8f15d1b5..00000000000
--- a/site/_docs/posts.md
+++ /dev/null
@@ -1,255 +0,0 @@
----
-layout: docs
-title: Writing posts
-permalink: /docs/posts/
----
-
-One of Jekyll’s best aspects is that it is “blog aware”. What does this mean,
-exactly? Well, simply put, it means that blogging is baked into Jekyll’s
-functionality. If you write articles and publish them online, you can publish
-and maintain a blog simply by managing a folder of text-files on your computer.
-Compared to the hassle of configuring and maintaining databases and web-based
-CMS systems, this will be a welcome change!
-
-## The Posts Folder
-
-As explained on the [directory structure](../structure/) page, the `_posts`
-folder is where your blog posts will live. These files are generally
-[Markdown](https://daringfireball.net/projects/markdown/) or HTML, but can
-be other formats with the proper converter installed.
-All posts must have [YAML Front Matter](../frontmatter/), and they will be
-converted from their source format into an HTML page that is part of your
-static site.
-
-### Creating Post Files
-
-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
-```
-
-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
-```
-
-
    
-  
    ProTip™: Link to other posts
    
-  
    
-    Use the post_url
-    tag to link to other posts without having to worry about the URL's
-    breaking when the site permalink style changes.
-  
    
-
    
-
-### Content Formats
-
-All blog post files must begin with [YAML Front Matter](../frontmatter/). After
-that, it's simply a matter of deciding which format you prefer. Jekyll supports
-[Markdown](https://daringfireball.net/projects/markdown/) out of the box,
-and has [myriad extensions for other formats as well](/docs/plugins/#converters-1),
-including the popular [Textile](http://redcloth.org/textile) format. These
-formats each have their own way of marking up different types of content
-within a post, so you should familiarize yourself with these formats and
-decide which one best suits your needs.
-
-
    
-  
    Be aware of character sets
    
-  
    
-    Content processors can modify certain characters to make them look nicer.
-    For example, the smart extension in Redcarpet converts standard,
-    ASCII quotation characters to curly, Unicode ones. In order for the browser
-    to display those characters properly, define the charset meta value by
-    including <meta charset="utf-8"> in the
-    <head> of your layout.
-  
    
-
    
-
-## Including images and resources
-
-Chances are, at some point, you'll want to include images, downloads, or other
-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.
-
-Because of Jekyll’s flexibility, there are many solutions to how to do this.
-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
-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.
-
-Including an image asset in a post:
-
-```text
-... which is shown in the screenshot below:
-![My helpful screenshot]({% raw %}{{ site.url }}{% endraw %}/assets/screenshot.jpg)
-```
-
-Linking to a PDF for readers to download:
-
-```text
-... you can [get the PDF]({% raw %}{{ site.url }}{% endraw %}/assets/mydoc.pdf) directly.
-```
-
-
    
-  
    ProTip™: Link using just the site root URL
    
-  
    
-    You can skip the {% raw %}{{ site.url }}{% endraw %} variable
-    if you know your site will only ever be displayed at the
-    root URL of your domain. In this case you can reference assets directly with
-    just /path/file.jpg.
-  
    
-
    
-
-## 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 an Title, Layout, Publishing Date, and Categories might look like this:
-
-```
----
-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."
-
-## Displaying an index of posts
-
-It’s all well and good to have posts in a folder, but a blog is no use unless
-you have a list of posts somewhere. Creating an index of posts on another page
-(or in a [template](../templates/)) is easy, thanks to the [Liquid template
-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:
-
-```html
-
-```
-
-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
-work](../templates/) with Jekyll if you want to know more.
-
-Note that the `post` variable only exists inside the `for` loop above. If
-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.
-
-## Post excerpts
-
-Each post automatically takes the first block of text, from the beginning of
-the content to the first occurrence of `excerpt_separator`, and sets it as the `post.excerpt`.
-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
-
-```
-
-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: '
    ' | remove: '
    ' }}{% 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
----
-excerpt_separator: 
----
-
-Excerpt
-
-Out-of-excerpt
-```
-
-You can also set the `excerpt_separator` globally in your `_config.yml`
-configuration file.
-
-Completely disable excerpts by setting your `excerpt_separator` to `""`.
-
-Also, as with any output generated by Liquid tags, you can pass the
-`| strip_html` filter to remove any html tags in the output. This is
-particularly helpful if you wish to output a post excerpt as a
-`meta="description"` tag within the post `head`, or anywhere else having
-html tags along with the content is not desirable.
-
-## Highlighting code snippets
-
-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 %}
-def show
-  @widget = Widget(params[:id])
-  respond_to do |format|
-    format.html # show.html.erb
-    format.json { render json: @widget }
-  end
-end
-{% raw %}{% endhighlight %}{% endraw %}
-```
-
-And the output will look like this:
-
-```ruby
-def show
-  @widget = Widget(params[:id])
-  respond_to do |format|
-    format.html # show.html.erb
-    format.json { render json: @widget }
-  end
-end
-```
-
-
    
-  
    ProTip™: Show line numbers
    
-  
    
-    You can make code snippets include line-numbers by adding the word
-    linenos to the end of the opening highlight tag like this:
-    {% raw %}{% highlight ruby linenos %}{% endraw %}.
-  
    
-
    
-
-These basics should be enough to get you started writing your first posts. When
-you’re ready to dig into what else is possible, you might be interested in
-doing things like [customizing post permalinks](../permalinks/) or
-using [custom variables](../variables/) in your posts and elsewhere on your
-site.

From 86fc58491c494c6acfb25d5e6a8d9f4a4c6c754f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 9 Jan 2017 06:36:52 -0800
Subject: [PATCH 1808/4996] Update history to reflect merge of #5473 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c0764538714..b578b9bfb51 100644
--- a/History.markdown
+++ b/History.markdown
@@ -57,6 +57,7 @@
   * Added new includes.md topic to docs (#5696)
   * Replace a dead link with a web-archived one (#5738)
   * Remove duplicate paragraph. (#5740)
+  * Addition of a sample "typical post" (#5473)
 
 ## 3.3.1 / 2016-11-14
 

From 5ac3e0a866d7a2abfa4a081183160874bc082f7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= 
Date: Sat, 7 Jan 2017 11:12:50 +0100
Subject: [PATCH 1809/4996] Fix #5730: add gcc and make to the list of
 requirements

---
 docs/_docs/installation.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index 54dfd9fc2b8..1fb1ca36f55 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -21,6 +21,7 @@ requirements you’ll need to make sure your system has before you start.
 - [NodeJS](https://nodejs.org/), or another JavaScript runtime (Jekyll 2 and
 earlier, for CoffeeScript support).
 - [Python 2.7](https://www.python.org/downloads/) (for Jekyll 2 and earlier)
+- [GCC](https://gcc.gnu.org/install/) and [Make](https://www.gnu.org/software/make/) (in case your system doesn't have them installed, which you can check by running `gcc -v` and `make -v` in your system's command line interface)
 
 
    
   
    Running Jekyll on Windows
    

From 74e6ef83c9aa274a4ebf2efea372c7479feae68c Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 9 Jan 2017 21:10:24 +0100
Subject: [PATCH 1810/4996] Use defaults in config

All docs stored in _docs inherit from docs layout
All news items stored in _posts inherit from news-item layout
---
 Rakefile                                          |  1 -
 docs/_config.yml                                  | 15 +++++++++++++++
 docs/_docs/assets.md                              |  1 -
 docs/_docs/collections.md                         |  1 -
 docs/_docs/conduct.md                             |  1 -
 docs/_docs/configuration.md                       |  1 -
 docs/_docs/continuous-integration.md              |  1 -
 docs/_docs/contributing.md                        |  1 -
 docs/_docs/datafiles.md                           |  1 -
 docs/_docs/deployment-methods.md                  |  1 -
 docs/_docs/drafts.md                              |  1 -
 docs/_docs/extras.md                              |  1 -
 docs/_docs/frontmatter.md                         |  1 -
 docs/_docs/github-pages.md                        |  1 -
 docs/_docs/history.md                             |  1 -
 docs/_docs/includes.md                            |  1 -
 docs/_docs/index.md                               |  1 -
 docs/_docs/installation.md                        |  1 -
 docs/_docs/maintaining/affinity-team-captain.md   |  1 -
 docs/_docs/maintaining/avoiding-burnout.md        |  1 -
 docs/_docs/maintaining/becoming-a-maintainer.md   |  1 -
 docs/_docs/maintaining/index.md                   |  1 -
 docs/_docs/maintaining/merging-a-pull-request.md  |  1 -
 .../_docs/maintaining/reviewing-a-pull-request.md |  1 -
 docs/_docs/maintaining/special-labels.md          |  1 -
 docs/_docs/maintaining/triaging-an-issue.md       |  1 -
 docs/_docs/migrations.md                          |  1 -
 docs/_docs/pages.md                               |  1 -
 docs/_docs/pagination.md                          |  1 -
 docs/_docs/permalinks.md                          |  1 -
 docs/_docs/plugins.md                             |  1 -
 docs/_docs/posts.md                               |  1 -
 docs/_docs/quickstart.md                          |  1 -
 docs/_docs/resources.md                           |  1 -
 docs/_docs/sites.md                               |  1 -
 docs/_docs/static_files.md                        |  1 -
 docs/_docs/structure.md                           |  1 -
 docs/_docs/templates.md                           |  1 -
 docs/_docs/themes.md                              |  1 -
 docs/_docs/troubleshooting.md                     |  1 -
 docs/_docs/upgrading/0-to-2.md                    |  1 -
 docs/_docs/upgrading/2-to-3.md                    |  1 -
 docs/_docs/usage.md                               |  1 -
 docs/_docs/variables.md                           |  1 -
 docs/_docs/windows.md                             |  1 -
 .../2013-05-06-jekyll-1-0-0-released.markdown     |  1 -
 .../2013-05-08-jekyll-1-0-1-released.markdown     |  1 -
 .../2013-05-12-jekyll-1-0-2-released.markdown     |  1 -
 .../2013-06-07-jekyll-1-0-3-released.markdown     |  1 -
 .../2013-07-14-jekyll-1-1-0-released.markdown     |  1 -
 .../2013-07-24-jekyll-1-1-1-released.markdown     |  1 -
 .../2013-07-25-jekyll-1-0-4-released.markdown     |  1 -
 .../2013-07-25-jekyll-1-1-2-released.markdown     |  1 -
 .../2013-09-06-jekyll-1-2-0-released.markdown     |  1 -
 .../2013-09-14-jekyll-1-2-1-released.markdown     |  1 -
 .../2013-10-28-jekyll-1-3-0-rc1-released.markdown |  1 -
 .../2013-11-04-jekyll-1-3-0-released.markdown     |  1 -
 .../2013-11-26-jekyll-1-3-1-released.markdown     |  1 -
 .../2013-12-07-jekyll-1-4-0-released.markdown     |  1 -
 .../2013-12-09-jekyll-1-4-1-released.markdown     |  1 -
 .../2013-12-16-jekyll-1-4-2-released.markdown     |  1 -
 .../2014-01-13-jekyll-1-4-3-released.markdown     |  1 -
 .../2014-03-24-jekyll-1-5-0-released.markdown     |  1 -
 .../2014-03-27-jekyll-1-5-1-released.markdown     |  1 -
 .../_posts/2014-05-06-jekyll-turns-2-0-0.markdown |  1 -
 .../2014-05-08-jekyll-2-0-3-released.markdown     |  1 -
 ...-jekyll-stickers-1-dollar-stickermule.markdown |  1 -
 ...14-06-28-jekyll-turns-21-i-mean-2-1-0.markdown |  1 -
 .../2014-07-01-jekyll-2-1-1-released.markdown     |  1 -
 .../2014-07-29-jekyll-2-2-0-released.markdown     |  1 -
 .../2014-08-10-jekyll-2-3-0-released.markdown     |  1 -
 .../2014-09-09-jekyll-2-4-0-released.markdown     |  1 -
 ...lls-midlife-crisis-jekyll-turns-2-5-0.markdown |  1 -
 .../2014-11-08-jekyll-2-5-1-released.markdown     |  1 -
 .../2014-11-12-jekyll-2-5-2-released.markdown     |  1 -
 ...014-12-17-alfredxing-welcome-to-jekyll-core.md |  1 -
 .../2014-12-22-jekyll-2-5-3-released.markdown     |  1 -
 .../2015-01-20-jekyll-meet-and-greet.markdown     |  1 -
 ...015-01-24-jekyll-3-0-0-beta1-released.markdown |  1 -
 .../2015-02-26-introducing-jekyll-talk.markdown   |  3 +--
 .../2015-10-26-jekyll-3-0-released.markdown       |  1 -
 .../2015-11-17-jekyll-3-0-1-released.markdown     |  1 -
 .../2016-01-20-jekyll-3-0-2-released.markdown     |  1 -
 .../2016-01-24-jekyll-3-1-0-released.markdown     |  1 -
 .../2016-01-28-jekyll-3-1-1-released.markdown     |  1 -
 .../2016-02-08-jekyll-3-0-3-released.markdown     |  1 -
 .../2016-02-19-jekyll-3-1-2-released.markdown     |  1 -
 ...10-making-it-easier-to-contribute-to-jekyll.md |  1 -
 .../2016-04-19-jekyll-3-0-4-released.markdown     |  1 -
 .../2016-04-19-jekyll-3-1-3-released.markdown     |  2 --
 .../2016-04-26-jekyll-3-0-5-released.markdown     |  1 -
 .../2016-05-18-jekyll-3-1-4-released.markdown     |  1 -
 .../2016-05-18-jekyll-3-1-5-released.markdown     |  1 -
 .../2016-05-19-jekyll-3-1-6-released.markdown     |  1 -
 ...kyll-s-google-summer-of-code-projects.markdown |  1 -
 .../2016-07-26-jekyll-3-2-0-released.markdown     |  1 -
 .../2016-08-02-jekyll-3-2-1-released.markdown     |  1 -
 ...16-08-24-jekyll-admin-initial-release.markdown |  1 -
 docs/_posts/2016-10-06-jekyll-3-3-is-here.md      |  1 -
 .../2016-11-14-jekyll-3-3-1-released.markdown     |  1 -
 rake/site.rake                                    |  1 -
 101 files changed, 16 insertions(+), 102 deletions(-)

diff --git a/Rakefile b/Rakefile
index 58aecfaf767..4f11a64e667 100644
--- a/Rakefile
+++ b/Rakefile
@@ -101,7 +101,6 @@ def siteify_file(file, overrides_front_matter = {})
   slug  = File.basename(file, ".markdown").downcase
   front_matter = {
     "title"     => title,
-    "layout"    => "docs",
     "permalink" => "/docs/#{slug}/",
     "note"      => "This file is autogenerated. Edit /#{file} instead."
   }.merge(overrides_front_matter)
diff --git a/docs/_config.yml b/docs/_config.yml
index 32ae74bb0d4..f3dcb08d04a 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -10,6 +10,21 @@ help_url: https://github.com/jekyll/jekyll-help
 
 timezone: America/Los_Angeles
 
+defaults:
+  -
+    scope:
+      path: "_docs"
+      type: "docs"
+    values:
+      layout: "docs"
+  -
+    scope:
+      path: "_posts"
+      type: "posts"
+    values:
+      layout: "news_item"
+
+
 collections:
   docs:
     permalink: /:collection/:path/
diff --git a/docs/_docs/assets.md b/docs/_docs/assets.md
index 4908a4008de..7418f984f34 100644
--- a/docs/_docs/assets.md
+++ b/docs/_docs/assets.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Assets
 permalink: /docs/assets/
 ---
diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index 22a86e60ff4..8a1c3a1ad52 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Collections
 permalink: /docs/collections/
 ---
diff --git a/docs/_docs/conduct.md b/docs/_docs/conduct.md
index d68c5ec58ac..7ba30a5acaf 100644
--- a/docs/_docs/conduct.md
+++ b/docs/_docs/conduct.md
@@ -1,6 +1,5 @@
 ---
 title: Code of Conduct
-layout: docs
 permalink: "/docs/conduct/"
 note: This file is autogenerated. Edit /CONDUCT.markdown instead.
 redirect_from: "/conduct/index.html"
diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index 9df1c85f181..e4c35b8ad0a 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Configuration
 permalink: /docs/configuration/
 ---
diff --git a/docs/_docs/continuous-integration.md b/docs/_docs/continuous-integration.md
index 54b3466cb7c..c2e8a31fab1 100644
--- a/docs/_docs/continuous-integration.md
+++ b/docs/_docs/continuous-integration.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Continuous Integration
 permalink: /docs/continuous-integration/
 ---
diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index 9ccac2935d9..724c6641801 100644
--- a/docs/_docs/contributing.md
+++ b/docs/_docs/contributing.md
@@ -1,6 +1,5 @@
 ---
 title: Contributing
-layout: docs
 permalink: "/docs/contributing/"
 note: This file is autogenerated. Edit /.github/CONTRIBUTING.markdown instead.
 ---
diff --git a/docs/_docs/datafiles.md b/docs/_docs/datafiles.md
index 21799169e92..221ee4d31a2 100644
--- a/docs/_docs/datafiles.md
+++ b/docs/_docs/datafiles.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Data Files
 permalink: /docs/datafiles/
 ---
diff --git a/docs/_docs/deployment-methods.md b/docs/_docs/deployment-methods.md
index cefb4d32d79..33edec592fd 100644
--- a/docs/_docs/deployment-methods.md
+++ b/docs/_docs/deployment-methods.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Deployment methods
 permalink: /docs/deployment-methods/
 ---
diff --git a/docs/_docs/drafts.md b/docs/_docs/drafts.md
index d5513f75fc1..c4b4f9f0514 100644
--- a/docs/_docs/drafts.md
+++ b/docs/_docs/drafts.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Working with drafts
 permalink: /docs/drafts/
 ---
diff --git a/docs/_docs/extras.md b/docs/_docs/extras.md
index 9064d967d3d..67236e715e2 100644
--- a/docs/_docs/extras.md
+++ b/docs/_docs/extras.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Extras
 permalink: /docs/extras/
 ---
diff --git a/docs/_docs/frontmatter.md b/docs/_docs/frontmatter.md
index 6dd8e5fe2ba..cb55c444e53 100644
--- a/docs/_docs/frontmatter.md
+++ b/docs/_docs/frontmatter.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Front Matter
 permalink: /docs/frontmatter/
 ---
diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index 0a00f2fa6d1..cc7387045dd 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: GitHub Pages
 permalink: /docs/github-pages/
 ---
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 5d07eb4009b..03767126d9b 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -1,6 +1,5 @@
 ---
 title: History
-layout: docs
 permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
diff --git a/docs/_docs/includes.md b/docs/_docs/includes.md
index 94c568946ed..ae6409cd5ee 100644
--- a/docs/_docs/includes.md
+++ b/docs/_docs/includes.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Includes
 permalink: /docs/includes/
 ---
diff --git a/docs/_docs/index.md b/docs/_docs/index.md
index 5e08d7605b9..ff5e8ccedcf 100644
--- a/docs/_docs/index.md
+++ b/docs/_docs/index.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Welcome
 permalink: /docs/home/
 redirect_from: /docs/index.html
diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index 54dfd9fc2b8..d264997d436 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Installation
 permalink: /docs/installation/
 ---
diff --git a/docs/_docs/maintaining/affinity-team-captain.md b/docs/_docs/maintaining/affinity-team-captain.md
index 02247d2d17c..bafa4e9db4d 100644
--- a/docs/_docs/maintaining/affinity-team-captain.md
+++ b/docs/_docs/maintaining/affinity-team-captain.md
@@ -1,6 +1,5 @@
 ---
 title: Affinity Team Captains
-layout: docs
 ---
 
 **This guide is for affinity team captains.** These special people are **team maintainers** of one of our [affinity teams][] and help triage and evaluate the issues and contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/avoiding-burnout.md b/docs/_docs/maintaining/avoiding-burnout.md
index 1d1d93b17e5..e6acf4028e6 100644
--- a/docs/_docs/maintaining/avoiding-burnout.md
+++ b/docs/_docs/maintaining/avoiding-burnout.md
@@ -1,6 +1,5 @@
 ---
 title: "Avoiding Burnout"
-layout: docs
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/becoming-a-maintainer.md b/docs/_docs/maintaining/becoming-a-maintainer.md
index e4a1840ca7a..00abef54bd8 100644
--- a/docs/_docs/maintaining/becoming-a-maintainer.md
+++ b/docs/_docs/maintaining/becoming-a-maintainer.md
@@ -1,6 +1,5 @@
 ---
 title: "Becoming a Maintainer"
-layout: docs
 ---
 
 **This guide is for contributors.** These special people have contributed to one or more of Jekyll's repositories, but do not yet have write access to any. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/index.md b/docs/_docs/maintaining/index.md
index 5c4da4db308..383bc6eeb64 100644
--- a/docs/_docs/maintaining/index.md
+++ b/docs/_docs/maintaining/index.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Maintaining Jekyll
 permalink: /docs/maintaining/
 ---
diff --git a/docs/_docs/maintaining/merging-a-pull-request.md b/docs/_docs/maintaining/merging-a-pull-request.md
index 80ad6f7c5e3..9aee4153c78 100644
--- a/docs/_docs/maintaining/merging-a-pull-request.md
+++ b/docs/_docs/maintaining/merging-a-pull-request.md
@@ -1,6 +1,5 @@
 ---
 title: "Merging a Pull Request"
-layout: docs
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/reviewing-a-pull-request.md b/docs/_docs/maintaining/reviewing-a-pull-request.md
index 12f7a35f38d..a0a6e353de5 100644
--- a/docs/_docs/maintaining/reviewing-a-pull-request.md
+++ b/docs/_docs/maintaining/reviewing-a-pull-request.md
@@ -1,6 +1,5 @@
 ---
 title: "Reviewing a Pull Request"
-layout: docs
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/special-labels.md b/docs/_docs/maintaining/special-labels.md
index eea366e96be..a8696174191 100644
--- a/docs/_docs/maintaining/special-labels.md
+++ b/docs/_docs/maintaining/special-labels.md
@@ -1,6 +1,5 @@
 ---
 title: "Special Labels"
-layout: docs
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/maintaining/triaging-an-issue.md b/docs/_docs/maintaining/triaging-an-issue.md
index 4802b61b486..bc87d96e19f 100644
--- a/docs/_docs/maintaining/triaging-an-issue.md
+++ b/docs/_docs/maintaining/triaging-an-issue.md
@@ -1,6 +1,5 @@
 ---
 title: "Triaging an Issue"
-layout: docs
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
diff --git a/docs/_docs/migrations.md b/docs/_docs/migrations.md
index 961762f72eb..fd8676a40ea 100644
--- a/docs/_docs/migrations.md
+++ b/docs/_docs/migrations.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Blog migrations
 permalink: /docs/migrations/
 ---
diff --git a/docs/_docs/pages.md b/docs/_docs/pages.md
index 258fd6a269e..398d1987d1b 100644
--- a/docs/_docs/pages.md
+++ b/docs/_docs/pages.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Creating pages
 permalink: /docs/pages/
 ---
diff --git a/docs/_docs/pagination.md b/docs/_docs/pagination.md
index b32b934ca91..b05b6bb21b9 100644
--- a/docs/_docs/pagination.md
+++ b/docs/_docs/pagination.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Pagination
 permalink: /docs/pagination/
 ---
diff --git a/docs/_docs/permalinks.md b/docs/_docs/permalinks.md
index b8fd5ec643a..bcb39e54c16 100644
--- a/docs/_docs/permalinks.md
+++ b/docs/_docs/permalinks.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Permalinks
 permalink: /docs/permalinks/
 ---
diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 4a5e61cfd78..ce174f128be 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Plugins
 permalink: /docs/plugins/
 ---
diff --git a/docs/_docs/posts.md b/docs/_docs/posts.md
index d4d8f15d1b5..f43b72e8af3 100644
--- a/docs/_docs/posts.md
+++ b/docs/_docs/posts.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Writing posts
 permalink: /docs/posts/
 ---
diff --git a/docs/_docs/quickstart.md b/docs/_docs/quickstart.md
index d15a9eb1730..984275f7a37 100644
--- a/docs/_docs/quickstart.md
+++ b/docs/_docs/quickstart.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Quick-start guide
 permalink: /docs/quickstart/
 ---
diff --git a/docs/_docs/resources.md b/docs/_docs/resources.md
index 2042b1a67b4..0f90fae8f25 100644
--- a/docs/_docs/resources.md
+++ b/docs/_docs/resources.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Resources
 permalink: /docs/resources/
 ---
diff --git a/docs/_docs/sites.md b/docs/_docs/sites.md
index 28e464bad7d..65401551cdc 100644
--- a/docs/_docs/sites.md
+++ b/docs/_docs/sites.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Sites using Jekyll
 permalink: /docs/sites/
 ---
diff --git a/docs/_docs/static_files.md b/docs/_docs/static_files.md
index 55a72747d4e..523c29dfc41 100644
--- a/docs/_docs/static_files.md
+++ b/docs/_docs/static_files.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Static Files
 permalink: /docs/static-files/
 ---
diff --git a/docs/_docs/structure.md b/docs/_docs/structure.md
index bdfaab59a7a..6735d6e02ac 100644
--- a/docs/_docs/structure.md
+++ b/docs/_docs/structure.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Directory structure
 permalink: /docs/structure/
 ---
diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md
index 79b5fdae770..26bd804a6d5 100644
--- a/docs/_docs/templates.md
+++ b/docs/_docs/templates.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Templates
 permalink: /docs/templates/
 ---
diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index c7d6d574474..e01a4d1535c 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Themes
 permalink: /docs/themes/
 ---
diff --git a/docs/_docs/troubleshooting.md b/docs/_docs/troubleshooting.md
index 191953ec668..aae024bd285 100644
--- a/docs/_docs/troubleshooting.md
+++ b/docs/_docs/troubleshooting.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Troubleshooting
 permalink: /docs/troubleshooting/
 ---
diff --git a/docs/_docs/upgrading/0-to-2.md b/docs/_docs/upgrading/0-to-2.md
index 9de634557c9..5f9d2320b80 100644
--- a/docs/_docs/upgrading/0-to-2.md
+++ b/docs/_docs/upgrading/0-to-2.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Upgrading from 0.x to 2.x
 permalink: /docs/upgrading/0-to-2/
 ---
diff --git a/docs/_docs/upgrading/2-to-3.md b/docs/_docs/upgrading/2-to-3.md
index 0d145b9c262..a378d2f7e78 100644
--- a/docs/_docs/upgrading/2-to-3.md
+++ b/docs/_docs/upgrading/2-to-3.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Upgrading from 2.x to 3.x
 permalink: /docs/upgrading/2-to-3/
 ---
diff --git a/docs/_docs/usage.md b/docs/_docs/usage.md
index e6f1a0dba46..c88603734de 100644
--- a/docs/_docs/usage.md
+++ b/docs/_docs/usage.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Basic Usage
 permalink: /docs/usage/
 ---
diff --git a/docs/_docs/variables.md b/docs/_docs/variables.md
index 1d4e2091add..f32bddd6d9d 100644
--- a/docs/_docs/variables.md
+++ b/docs/_docs/variables.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Variables
 permalink: /docs/variables/
 ---
diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index 8d7bb8bc865..62fb69b4425 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Jekyll on Windows
 permalink: /docs/windows/
 ---
diff --git a/docs/_posts/2013-05-06-jekyll-1-0-0-released.markdown b/docs/_posts/2013-05-06-jekyll-1-0-0-released.markdown
index 538cb56528a..ae5d3f9cf32 100644
--- a/docs/_posts/2013-05-06-jekyll-1-0-0-released.markdown
+++ b/docs/_posts/2013-05-06-jekyll-1-0-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.0.0 Released"
 date: "2013-05-06 02:12:52 +0200"
 author: parkr
diff --git a/docs/_posts/2013-05-08-jekyll-1-0-1-released.markdown b/docs/_posts/2013-05-08-jekyll-1-0-1-released.markdown
index 90edcc26a43..5b7a2c353cc 100644
--- a/docs/_posts/2013-05-08-jekyll-1-0-1-released.markdown
+++ b/docs/_posts/2013-05-08-jekyll-1-0-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.0.1 Released"
 date: "2013-05-08 23:46:11 +0200"
 author: parkr
diff --git a/docs/_posts/2013-05-12-jekyll-1-0-2-released.markdown b/docs/_posts/2013-05-12-jekyll-1-0-2-released.markdown
index 2a2b97e6afc..e54663622a5 100644
--- a/docs/_posts/2013-05-12-jekyll-1-0-2-released.markdown
+++ b/docs/_posts/2013-05-12-jekyll-1-0-2-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.0.2 Released"
 date: "2013-05-12 14:45:00 +0200"
 author: parkr
diff --git a/docs/_posts/2013-06-07-jekyll-1-0-3-released.markdown b/docs/_posts/2013-06-07-jekyll-1-0-3-released.markdown
index 566ae6688cf..88f8ad41283 100644
--- a/docs/_posts/2013-06-07-jekyll-1-0-3-released.markdown
+++ b/docs/_posts/2013-06-07-jekyll-1-0-3-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.0.3 Released"
 date: "2013-06-07 21:02:13 +0200"
 author: parkr
diff --git a/docs/_posts/2013-07-14-jekyll-1-1-0-released.markdown b/docs/_posts/2013-07-14-jekyll-1-1-0-released.markdown
index 12b3d92130a..8d00b98bc8a 100644
--- a/docs/_posts/2013-07-14-jekyll-1-1-0-released.markdown
+++ b/docs/_posts/2013-07-14-jekyll-1-1-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.1.0 Released"
 date: "2013-07-14 19:38:02 +0200"
 author: parkr
diff --git a/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown b/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown
index 6741a89eb25..90b81847682 100644
--- a/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown
+++ b/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.1.1 Released"
 date: "2013-07-24 22:24:14 +0200"
 author: parkr
diff --git a/docs/_posts/2013-07-25-jekyll-1-0-4-released.markdown b/docs/_posts/2013-07-25-jekyll-1-0-4-released.markdown
index 635d0e6cd09..2e234c0ed5f 100644
--- a/docs/_posts/2013-07-25-jekyll-1-0-4-released.markdown
+++ b/docs/_posts/2013-07-25-jekyll-1-0-4-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.0.4 Released"
 date: "2013-07-25 09:08:38 +0200"
 author: mattr-
diff --git a/docs/_posts/2013-07-25-jekyll-1-1-2-released.markdown b/docs/_posts/2013-07-25-jekyll-1-1-2-released.markdown
index ed16ca717c4..f308ca12544 100644
--- a/docs/_posts/2013-07-25-jekyll-1-1-2-released.markdown
+++ b/docs/_posts/2013-07-25-jekyll-1-1-2-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.1.2 Released"
 date: "2013-07-25 09:08:38 +0200"
 author: parkr
diff --git a/docs/_posts/2013-09-06-jekyll-1-2-0-released.markdown b/docs/_posts/2013-09-06-jekyll-1-2-0-released.markdown
index ae5448c21a3..76090527c93 100644
--- a/docs/_posts/2013-09-06-jekyll-1-2-0-released.markdown
+++ b/docs/_posts/2013-09-06-jekyll-1-2-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.2.0 Released"
 date: "2013-09-06 22:02:41 -0400"
 author: parkr
diff --git a/docs/_posts/2013-09-14-jekyll-1-2-1-released.markdown b/docs/_posts/2013-09-14-jekyll-1-2-1-released.markdown
index 832dbd06a54..5f759e20525 100644
--- a/docs/_posts/2013-09-14-jekyll-1-2-1-released.markdown
+++ b/docs/_posts/2013-09-14-jekyll-1-2-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.2.1 Released'
 date: 2013-09-14 20:46:50 -0400
 author: parkr
diff --git a/docs/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown b/docs/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
index 1e3e44cee55..65e98700bd6 100644
--- a/docs/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
+++ b/docs/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.3.0.rc1 Released'
 date: 2013-10-28 20:14:39 -0500
 author: mattr-
diff --git a/docs/_posts/2013-11-04-jekyll-1-3-0-released.markdown b/docs/_posts/2013-11-04-jekyll-1-3-0-released.markdown
index 1e325117c28..f70408cd88a 100644
--- a/docs/_posts/2013-11-04-jekyll-1-3-0-released.markdown
+++ b/docs/_posts/2013-11-04-jekyll-1-3-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.3.0 Released'
 date: 2013-11-04 21:46:02 -0600
 author: mattr-
diff --git a/docs/_posts/2013-11-26-jekyll-1-3-1-released.markdown b/docs/_posts/2013-11-26-jekyll-1-3-1-released.markdown
index 4b4c37d5fda..baf8dea098f 100644
--- a/docs/_posts/2013-11-26-jekyll-1-3-1-released.markdown
+++ b/docs/_posts/2013-11-26-jekyll-1-3-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.3.1 Released'
 date: 2013-11-26 19:52:20 -0600
 author: mattr-
diff --git a/docs/_posts/2013-12-07-jekyll-1-4-0-released.markdown b/docs/_posts/2013-12-07-jekyll-1-4-0-released.markdown
index d7a0c14f914..1b9d4b7a0e9 100644
--- a/docs/_posts/2013-12-07-jekyll-1-4-0-released.markdown
+++ b/docs/_posts/2013-12-07-jekyll-1-4-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.4.0 Released'
 date: 2013-12-07 13:55:28 -0600
 author: mattr-
diff --git a/docs/_posts/2013-12-09-jekyll-1-4-1-released.markdown b/docs/_posts/2013-12-09-jekyll-1-4-1-released.markdown
index 63407158207..9d754857d98 100644
--- a/docs/_posts/2013-12-09-jekyll-1-4-1-released.markdown
+++ b/docs/_posts/2013-12-09-jekyll-1-4-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.4.1 Released'
 date: 2013-12-09 20:44:13 -0600
 author: mattr-
diff --git a/docs/_posts/2013-12-16-jekyll-1-4-2-released.markdown b/docs/_posts/2013-12-16-jekyll-1-4-2-released.markdown
index afc92147d11..e4329adc3f2 100644
--- a/docs/_posts/2013-12-16-jekyll-1-4-2-released.markdown
+++ b/docs/_posts/2013-12-16-jekyll-1-4-2-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.4.2 Released'
 date: 2013-12-16 19:48:13 -0500
 author: parkr
diff --git a/docs/_posts/2014-01-13-jekyll-1-4-3-released.markdown b/docs/_posts/2014-01-13-jekyll-1-4-3-released.markdown
index a97bcec496b..8338ffb6c13 100644
--- a/docs/_posts/2014-01-13-jekyll-1-4-3-released.markdown
+++ b/docs/_posts/2014-01-13-jekyll-1-4-3-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.4.3 Released'
 date: 2014-01-13 17:43:32 -0800
 author: benbalter
diff --git a/docs/_posts/2014-03-24-jekyll-1-5-0-released.markdown b/docs/_posts/2014-03-24-jekyll-1-5-0-released.markdown
index 5b103dc219c..717424ab7f3 100644
--- a/docs/_posts/2014-03-24-jekyll-1-5-0-released.markdown
+++ b/docs/_posts/2014-03-24-jekyll-1-5-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.5.0 Released'
 date: 2014-03-24 20:37:59 -0400
 author: parkr
diff --git a/docs/_posts/2014-03-27-jekyll-1-5-1-released.markdown b/docs/_posts/2014-03-27-jekyll-1-5-1-released.markdown
index e8a4096a45a..2105ad4dfe2 100644
--- a/docs/_posts/2014-03-27-jekyll-1-5-1-released.markdown
+++ b/docs/_posts/2014-03-27-jekyll-1-5-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.5.1 Released'
 date: 2014-03-27 22:43:48 -0400
 author: parkr
diff --git a/docs/_posts/2014-05-06-jekyll-turns-2-0-0.markdown b/docs/_posts/2014-05-06-jekyll-turns-2-0-0.markdown
index 82555514bf7..af2a6774d7a 100644
--- a/docs/_posts/2014-05-06-jekyll-turns-2-0-0.markdown
+++ b/docs/_posts/2014-05-06-jekyll-turns-2-0-0.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll turns 2.0.0'
 author: parkr
 version: 2.0.0
diff --git a/docs/_posts/2014-05-08-jekyll-2-0-3-released.markdown b/docs/_posts/2014-05-08-jekyll-2-0-3-released.markdown
index ac5e9d7538a..e98e32c8f36 100644
--- a/docs/_posts/2014-05-08-jekyll-2-0-3-released.markdown
+++ b/docs/_posts/2014-05-08-jekyll-2-0-3-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 2.0.3 Released'
 date: 2014-05-08 22:43:17 -0400
 author: parkr
diff --git a/docs/_posts/2014-06-04-jekyll-stickers-1-dollar-stickermule.markdown b/docs/_posts/2014-06-04-jekyll-stickers-1-dollar-stickermule.markdown
index 5ba126d2fe3..8ef37c54542 100644
--- a/docs/_posts/2014-06-04-jekyll-stickers-1-dollar-stickermule.markdown
+++ b/docs/_posts/2014-06-04-jekyll-stickers-1-dollar-stickermule.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Pick Up your $1 Jekyll Sticker'
 date: 2014-06-04 15:46:53 -0400
 author: parkr
diff --git a/docs/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown b/docs/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown
index 82d01a181d0..c3fd4bb6a28 100644
--- a/docs/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown
+++ b/docs/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll Turns 21! Err... I mean 2.1.0.'
 date: 2014-06-28 17:26:59 -0400
 author: parkr
diff --git a/docs/_posts/2014-07-01-jekyll-2-1-1-released.markdown b/docs/_posts/2014-07-01-jekyll-2-1-1-released.markdown
index 81423539690..c73a055dfce 100644
--- a/docs/_posts/2014-07-01-jekyll-2-1-1-released.markdown
+++ b/docs/_posts/2014-07-01-jekyll-2-1-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 2.1.1 Released'
 date: 2014-07-01 20:16:43 -0400
 author: parkr
diff --git a/docs/_posts/2014-07-29-jekyll-2-2-0-released.markdown b/docs/_posts/2014-07-29-jekyll-2-2-0-released.markdown
index ca7aee48870..6b726f17f15 100644
--- a/docs/_posts/2014-07-29-jekyll-2-2-0-released.markdown
+++ b/docs/_posts/2014-07-29-jekyll-2-2-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 2.2.0 Released'
 date: 2014-07-29 18:59:13 -0400
 author: parkr
diff --git a/docs/_posts/2014-08-10-jekyll-2-3-0-released.markdown b/docs/_posts/2014-08-10-jekyll-2-3-0-released.markdown
index 63fe2b45012..07afc3c06e6 100644
--- a/docs/_posts/2014-08-10-jekyll-2-3-0-released.markdown
+++ b/docs/_posts/2014-08-10-jekyll-2-3-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 2.3.0 Released'
 date: 2014-08-10 20:38:34 -0400
 author: parkr
diff --git a/docs/_posts/2014-09-09-jekyll-2-4-0-released.markdown b/docs/_posts/2014-09-09-jekyll-2-4-0-released.markdown
index e8dda676295..11cb738ec74 100644
--- a/docs/_posts/2014-09-09-jekyll-2-4-0-released.markdown
+++ b/docs/_posts/2014-09-09-jekyll-2-4-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'A Wild Jekyll 2.4.0 Appeared!'
 date: 2014-09-09 21:10:33 -0700
 author: parkr
diff --git a/docs/_posts/2014-11-06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown b/docs/_posts/2014-11-06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown
index cc5de7c012b..012b6155bd4 100644
--- a/docs/_posts/2014-11-06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown
+++ b/docs/_posts/2014-11-06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll's Mid-Life Crisis (Or, Jekyll turns 2.5.0)"
 date: 2014-11-05 10:48:22 -0800
 author: parkr
diff --git a/docs/_posts/2014-11-08-jekyll-2-5-1-released.markdown b/docs/_posts/2014-11-08-jekyll-2-5-1-released.markdown
index 3237e48d4d2..2f6e3b51467 100644
--- a/docs/_posts/2014-11-08-jekyll-2-5-1-released.markdown
+++ b/docs/_posts/2014-11-08-jekyll-2-5-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 2.5.1 Released'
 date: 2014-11-09 09:47:52 -0800
 author: parkr
diff --git a/docs/_posts/2014-11-12-jekyll-2-5-2-released.markdown b/docs/_posts/2014-11-12-jekyll-2-5-2-released.markdown
index 3eab8998aa2..cff18248e62 100644
--- a/docs/_posts/2014-11-12-jekyll-2-5-2-released.markdown
+++ b/docs/_posts/2014-11-12-jekyll-2-5-2-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 2.5.2 Released'
 date: 2014-11-12 18:49:08 -0800
 author: parkr
diff --git a/docs/_posts/2014-12-17-alfredxing-welcome-to-jekyll-core.md b/docs/_posts/2014-12-17-alfredxing-welcome-to-jekyll-core.md
index 1951f0a48e7..51f55028b94 100644
--- a/docs/_posts/2014-12-17-alfredxing-welcome-to-jekyll-core.md
+++ b/docs/_posts/2014-12-17-alfredxing-welcome-to-jekyll-core.md
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Alfred Xing has joined the Jekyll core team'
 date: 2014-12-17 11:16:21 -0800
 author: parkr
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 7743fd8ed59..491007cdd1d 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
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll Release for the Holidays! v2.5.3 Out'
 date: 2014-12-22 09:03:30 -0500
 author: parkr
diff --git a/docs/_posts/2015-01-20-jekyll-meet-and-greet.markdown b/docs/_posts/2015-01-20-jekyll-meet-and-greet.markdown
index ed273f9d337..eee8d5e7931 100644
--- a/docs/_posts/2015-01-20-jekyll-meet-and-greet.markdown
+++ b/docs/_posts/2015-01-20-jekyll-meet-and-greet.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll Meet & Greet at GitHub HQ"
 date: "2015-01-20 19:23:12 -0800"
 author: parkr
diff --git a/docs/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown b/docs/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown
index 9ba83b045a0..c63f184b3e3 100644
--- a/docs/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown
+++ b/docs/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.0.0.beta1 Released'
 date: 2015-01-24 00:42:31 -0800
 author: parkr
diff --git a/docs/_posts/2015-02-26-introducing-jekyll-talk.markdown b/docs/_posts/2015-02-26-introducing-jekyll-talk.markdown
index 90863c12eca..468ae4c81d7 100644
--- a/docs/_posts/2015-02-26-introducing-jekyll-talk.markdown
+++ b/docs/_posts/2015-02-26-introducing-jekyll-talk.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Join the Discussion at Jekyll Talk'
 date: 2015-02-26 21:06:51 -0800
 author: alfredxing
@@ -12,4 +11,4 @@ The forum was set up by [@envygeeks](https://github.com/envygeeks) to build a co
 
 There's already been a lot of interesting topics, including a [site showcase](https://talk.jekyllrb.com/t/showcase-sites-made-using-jekyll/18) and [a poll for Jekyll 3.0 priorities](https://talk.jekyllrb.com/t/poll-installation-priorities-for-3-0/106/9).
 
-Come join the fun!
\ No newline at end of file
+Come join the fun!
diff --git a/docs/_posts/2015-10-26-jekyll-3-0-released.markdown b/docs/_posts/2015-10-26-jekyll-3-0-released.markdown
index e7cf9db4e8f..37d075c4d56 100644
--- a/docs/_posts/2015-10-26-jekyll-3-0-released.markdown
+++ b/docs/_posts/2015-10-26-jekyll-3-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.0 Released'
 date: 2015-10-26 15:37:30 -0700
 author: parkr
diff --git a/docs/_posts/2015-11-17-jekyll-3-0-1-released.markdown b/docs/_posts/2015-11-17-jekyll-3-0-1-released.markdown
index 71412c6ba54..3eb3cb718ce 100644
--- a/docs/_posts/2015-11-17-jekyll-3-0-1-released.markdown
+++ b/docs/_posts/2015-11-17-jekyll-3-0-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.0.1 Released'
 date: 2015-11-17 22:04:39 -0800
 author: parkr
diff --git a/docs/_posts/2016-01-20-jekyll-3-0-2-released.markdown b/docs/_posts/2016-01-20-jekyll-3-0-2-released.markdown
index 88f8888f757..c12cde34a11 100644
--- a/docs/_posts/2016-01-20-jekyll-3-0-2-released.markdown
+++ b/docs/_posts/2016-01-20-jekyll-3-0-2-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.0.2 Released'
 date: 2016-01-20 14:08:18 -0800
 author: parkr
diff --git a/docs/_posts/2016-01-24-jekyll-3-1-0-released.markdown b/docs/_posts/2016-01-24-jekyll-3-1-0-released.markdown
index 42768b9fe3e..7e91aa1d6af 100644
--- a/docs/_posts/2016-01-24-jekyll-3-1-0-released.markdown
+++ b/docs/_posts/2016-01-24-jekyll-3-1-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.1.0 Released'
 date: 2016-01-24 13:16:12 -0800
 author: parkr
diff --git a/docs/_posts/2016-01-28-jekyll-3-1-1-released.markdown b/docs/_posts/2016-01-28-jekyll-3-1-1-released.markdown
index b5932b0aefe..cddfbf2602d 100644
--- a/docs/_posts/2016-01-28-jekyll-3-1-1-released.markdown
+++ b/docs/_posts/2016-01-28-jekyll-3-1-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.1.1 Released'
 date: 2016-01-28 17:21:50 -0800
 author: parkr
diff --git a/docs/_posts/2016-02-08-jekyll-3-0-3-released.markdown b/docs/_posts/2016-02-08-jekyll-3-0-3-released.markdown
index 0c260cc696b..442dfeb9c5c 100644
--- a/docs/_posts/2016-02-08-jekyll-3-0-3-released.markdown
+++ b/docs/_posts/2016-02-08-jekyll-3-0-3-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.0.3 Released'
 date: 2016-02-08 10:39:08 -0800
 author: parkr
diff --git a/docs/_posts/2016-02-19-jekyll-3-1-2-released.markdown b/docs/_posts/2016-02-19-jekyll-3-1-2-released.markdown
index 775445107d0..807621f6a9c 100644
--- a/docs/_posts/2016-02-19-jekyll-3-1-2-released.markdown
+++ b/docs/_posts/2016-02-19-jekyll-3-1-2-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.1.2 Released!'
 date: 2016-02-19 15:24:00 -0800
 author: parkr
diff --git a/docs/_posts/2016-03-10-making-it-easier-to-contribute-to-jekyll.md b/docs/_posts/2016-03-10-making-it-easier-to-contribute-to-jekyll.md
index d735b6829b7..9d80604997e 100644
--- a/docs/_posts/2016-03-10-making-it-easier-to-contribute-to-jekyll.md
+++ b/docs/_posts/2016-03-10-making-it-easier-to-contribute-to-jekyll.md
@@ -1,7 +1,6 @@
 ---
 title: Making it easier to contribute to Jekyll
 description: We've made it easier to contribute to Jekyll by updating our contributing documentation and introducing Jekyll Affinity Teams, teams dedicated to specific aspects of the project.
-layout: news_item
 author: benbalter
 categories: [community]
 ---
diff --git a/docs/_posts/2016-04-19-jekyll-3-0-4-released.markdown b/docs/_posts/2016-04-19-jekyll-3-0-4-released.markdown
index d2cc4ec611a..9aa9b822f82 100644
--- a/docs/_posts/2016-04-19-jekyll-3-0-4-released.markdown
+++ b/docs/_posts/2016-04-19-jekyll-3-0-4-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.0.4 Released'
 date: 2016-04-19 10:26:12 -0700
 author: parkr
diff --git a/docs/_posts/2016-04-19-jekyll-3-1-3-released.markdown b/docs/_posts/2016-04-19-jekyll-3-1-3-released.markdown
index cd478e22da8..6b0892aca49 100644
--- a/docs/_posts/2016-04-19-jekyll-3-1-3-released.markdown
+++ b/docs/_posts/2016-04-19-jekyll-3-1-3-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.1.3 Released'
 date: 2016-04-19 10:26:16 -0700
 author: parkr
@@ -15,4 +14,3 @@ v3.1.3 is a patch release which fixes the follow two issues:
 Both of these issues have been resolved. For more information, check out [the full history](/docs/history/#v3-1-3).
 
 Happy Jekylling!
-
diff --git a/docs/_posts/2016-04-26-jekyll-3-0-5-released.markdown b/docs/_posts/2016-04-26-jekyll-3-0-5-released.markdown
index 9696713aa4b..5ac2154598d 100644
--- a/docs/_posts/2016-04-26-jekyll-3-0-5-released.markdown
+++ b/docs/_posts/2016-04-26-jekyll-3-0-5-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.0.5 Released'
 date: 2016-04-26 17:40:44 -0700
 author: parkr
diff --git a/docs/_posts/2016-05-18-jekyll-3-1-4-released.markdown b/docs/_posts/2016-05-18-jekyll-3-1-4-released.markdown
index 161d4746346..738fc12e514 100644
--- a/docs/_posts/2016-05-18-jekyll-3-1-4-released.markdown
+++ b/docs/_posts/2016-05-18-jekyll-3-1-4-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.1.4 "Stability Sam" Released'
 date: 2016-05-18 16:50:37 -0700
 author: parkr
diff --git a/docs/_posts/2016-05-18-jekyll-3-1-5-released.markdown b/docs/_posts/2016-05-18-jekyll-3-1-5-released.markdown
index c341b37b1a6..0ca981a623d 100644
--- a/docs/_posts/2016-05-18-jekyll-3-1-5-released.markdown
+++ b/docs/_posts/2016-05-18-jekyll-3-1-5-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.1.5 Released'
 date: 2016-05-18 21:35:27 -0700
 author: parkr
diff --git a/docs/_posts/2016-05-19-jekyll-3-1-6-released.markdown b/docs/_posts/2016-05-19-jekyll-3-1-6-released.markdown
index 45e7312f1fe..e31951ebd41 100644
--- a/docs/_posts/2016-05-19-jekyll-3-1-6-released.markdown
+++ b/docs/_posts/2016-05-19-jekyll-3-1-6-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.1.6 Released'
 date: 2016-05-19 12:48:14 -0700
 author: parkr
diff --git a/docs/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown b/docs/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown
index 0f4ce2de4d7..c3d01cddcbe 100644
--- a/docs/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown
+++ b/docs/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll's Google Summer of Code Project: The CMS You Always Wanted"
 date: "2016-06-03 13:21:02 -0700"
 author: parkr
diff --git a/docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown b/docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown
index 2e62cc329e6..4cf4b6f754a 100644
--- a/docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown
+++ b/docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll turns 3.2'
 date: 2016-07-26 15:06:49 -0700
 author: parkr
diff --git a/docs/_posts/2016-08-02-jekyll-3-2-1-released.markdown b/docs/_posts/2016-08-02-jekyll-3-2-1-released.markdown
index f4d17e04ca5..f2bdaec87b9 100644
--- a/docs/_posts/2016-08-02-jekyll-3-2-1-released.markdown
+++ b/docs/_posts/2016-08-02-jekyll-3-2-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.2.1 Released with Fix for Windows'
 date: 2016-08-02 13:20:11 -0700
 author: parkr
diff --git a/docs/_posts/2016-08-24-jekyll-admin-initial-release.markdown b/docs/_posts/2016-08-24-jekyll-admin-initial-release.markdown
index 1f6fa154211..e256a5c72c7 100644
--- a/docs/_posts/2016-08-24-jekyll-admin-initial-release.markdown
+++ b/docs/_posts/2016-08-24-jekyll-admin-initial-release.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll Admin Initial Release"
 date: "2016-08-25 09:50:00 +0300"
 author: mertkahyaoglu
diff --git a/docs/_posts/2016-10-06-jekyll-3-3-is-here.md b/docs/_posts/2016-10-06-jekyll-3-3-is-here.md
index 0b51e31eb44..8c756ef7291 100644
--- a/docs/_posts/2016-10-06-jekyll-3-3-is-here.md
+++ b/docs/_posts/2016-10-06-jekyll-3-3-is-here.md
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.3 is here with better theme support, new URL filters, and tons more'
 date: 2016-10-06 11:10:38 -0700
 author: parkr
diff --git a/docs/_posts/2016-11-14-jekyll-3-3-1-released.markdown b/docs/_posts/2016-11-14-jekyll-3-3-1-released.markdown
index a5a88376c94..0a357ea23da 100644
--- a/docs/_posts/2016-11-14-jekyll-3-3-1-released.markdown
+++ b/docs/_posts/2016-11-14-jekyll-3-3-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.3.1 Released'
 date: 2016-11-14 14:29:59 -0800
 author: parkr
diff --git a/rake/site.rake b/rake/site.rake
index 51978aed2e3..2fb4172a351 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -92,7 +92,6 @@ namespace :site do
 
       File.open(filename, "wb") do |post|
         post.puts("---")
-        post.puts("layout: news_item")
         post.puts("title: 'Jekyll #{release} Released'")
         post.puts("date: #{Time.new.strftime('%Y-%m-%d %H:%M:%S %z')}")
         post.puts("author: ")

From 0c9c236c4863c996043d7eed068a324d4e421bf9 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 9 Jan 2017 21:31:57 +0100
Subject: [PATCH 1811/4996] rubocup -a

---
 Rakefile | 68 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/Rakefile b/Rakefile
index 58aecfaf767..5353717e035 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,13 +1,13 @@
-require 'rubygems'
-require 'rake'
-require 'rdoc'
-require 'date'
-require 'yaml'
+require "rubygems"
+require "rake"
+require "rdoc"
+require "date"
+require "yaml"
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[lib]))
-require 'jekyll/version'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
+require "jekyll/version"
 
-Dir.glob('rake/**.rake').each { |f| import f }
+Dir.glob("rake/**.rake").each { |f| import f }
 
 #############################################################################
 #
@@ -36,21 +36,21 @@ def gemspec_file
 end
 
 def gem_file
-  "#{name}-#{Gem::Version.new(version).to_s}.gem"
+  "#{name}-#{Gem::Version.new(version)}.gem"
 end
 
 def normalize_bullets(markdown)
-  markdown.gsub(/\n\s{2}\*{1}/, "\n-")
+  markdown.gsub(%r!\n\s{2}\*{1}!, "\n-")
 end
 
 def linkify_prs(markdown)
-  markdown.gsub(/#(\d+)/) do |word|
+  markdown.gsub(%r!#(\d+)!) do |word|
     "[#{word}]({{ site.repository }}/issues/#{word.delete("#")})"
   end
 end
 
 def linkify_users(markdown)
-  markdown.gsub(/(@\w+)/) do |username|
+  markdown.gsub(%r!(@\w+)!) do |username|
     "[#{username}](https://github.com/#{username.delete("@")})"
   end
 end
@@ -60,13 +60,13 @@ def linkify(markdown)
 end
 
 def liquid_escape(markdown)
-  markdown.gsub(/(`{[{%].+[}%]}`)/, "{% raw %}\\1{% endraw %}")
+  markdown.gsub(%r!(`{[{%].+[}%]}`)!, "{% raw %}\\1{% endraw %}")
 end
 
 def custom_release_header_anchors(markdown)
-  header_regexp = /^(\d{1,2})\.(\d{1,2})\.(\d{1,2}) \/ \d{4}-\d{2}-\d{2}/
-  section_regexp = /^### \w+ \w+$/
-  markdown.split(/^##\s/).map do |release_notes|
+  header_regexp = %r!^(\d{1,2})\.(\d{1,2})\.(\d{1,2}) \/ \d{4}-\d{2}-\d{2}!
+  section_regexp = %r!^### \w+ \w+$!
+  markdown.split(%r!^##\s!).map do |release_notes|
     _, major, minor, patch = *release_notes.match(header_regexp)
     release_notes
       .gsub(header_regexp, "\\0\n{: #v\\1-\\2-\\3}")
@@ -75,11 +75,11 @@ def custom_release_header_anchors(markdown)
 end
 
 def sluffigy(header)
-  header.gsub(/#/, '').strip.downcase.gsub(/\s+/, '-')
+  header.delete("#").strip.downcase.gsub(%r!\s+!, "-")
 end
 
 def remove_head_from_history(markdown)
-  index = markdown =~ /^##\s+\d+\.\d+\.\d+/
+  index = markdown =~ %r!^##\s+\d+\.\d+\.\d+!
   markdown[index..-1]
 end
 
@@ -88,13 +88,17 @@ def converted_history(markdown)
     custom_release_header_anchors(
       liquid_escape(
         linkify(
-          normalize_bullets(markdown)))))
+          normalize_bullets(markdown)
+        )
+      )
+    )
+  )
 end
 
 def siteify_file(file, overrides_front_matter = {})
-  abort "You seem to have misplaced your #{file} file. I can haz?" unless File.exists?(file)
+  abort "You seem to have misplaced your #{file} file. I can haz?" unless File.exist?(file)
   title = begin
-            File.read(file).match(/\A# (.*)$/)[1]
+            File.read(file).match(%r!\A# (.*)$!)[1]
           rescue
             File.basename(file, ".*").downcase.capitalize
           end
@@ -115,7 +119,7 @@ def content_for(file)
   when "History.markdown"
     converted_history(contents)
   else
-    contents.gsub(/\A# .*\n\n?/, "")
+    contents.gsub(%r!\A# .*\n\n?!, "")
   end
 end
 
@@ -128,23 +132,23 @@ end
 multitask :default => [:test, :features]
 
 task :spec => :test
-require 'rake/testtask'
+require "rake/testtask"
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.libs << "lib" << "test"
+  test.pattern = "test/**/test_*.rb"
   test.verbose = true
 end
 
-require 'rdoc/task'
+require "rdoc/task"
 Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
+  rdoc.rdoc_dir = "rdoc"
   rdoc.title = "#{name} #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.include("README*")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
 begin
-  require 'cucumber/rake/task'
+  require "cucumber/rake/task"
   Cucumber::Rake::Task.new(:features) do |t|
     t.profile = "travis"
   end
@@ -152,9 +156,9 @@ begin
     t.profile = "html_report"
   end
 rescue LoadError
-  desc 'Cucumber rake task not available'
+  desc "Cucumber rake task not available"
   task :features do
-    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+    abort "Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin"
   end
 end
 

From 8bf9c37cf5f03fe6975f462531959d4bc5978a5b Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 9 Jan 2017 21:32:11 +0100
Subject: [PATCH 1812/4996] rubocop -a

---
 jekyll.gemspec | 52 +++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 734df2e4934..ca12fa0dbd0 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -1,42 +1,42 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'jekyll/version'
+require "jekyll/version"
 
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = '2.2.2'
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.rubygems_version = "2.2.2"
+  s.required_ruby_version = ">= 2.0.0"
 
-  s.name          = 'jekyll'
+  s.name          = "jekyll"
   s.version       = Jekyll::VERSION
-  s.license       = 'MIT'
+  s.license       = "MIT"
 
-  s.summary       = 'A simple, blog aware, static site generator.'
-  s.description   = 'Jekyll is a simple, blog aware, static site generator.'
+  s.summary       = "A simple, blog aware, static site generator."
+  s.description   = "Jekyll is a simple, blog aware, static site generator."
 
-  s.authors       = ['Tom Preston-Werner']
-  s.email         = 'tom@mojombo.com'
-  s.homepage      = 'https://github.com/jekyll/jekyll'
+  s.authors       = ["Tom Preston-Werner"]
+  s.email         = "tom@mojombo.com"
+  s.homepage      = "https://github.com/jekyll/jekyll"
 
   all_files       = `git ls-files -z`.split("\x0")
-  s.files         = all_files.grep(%r{^(exe|lib)/|^.rubocop.yml$})
-  s.executables   = all_files.grep(%r{^exe/}) { |f| File.basename(f) }
+  s.files         = all_files.grep(%r!^(exe|lib)/|^.rubocop.yml$!)
+  s.executables   = all_files.grep(%r!^exe/!) { |f| File.basename(f) }
   s.bindir        = "exe"
-  s.require_paths = ['lib']
+  s.require_paths = ["lib"]
 
-  s.rdoc_options = ['--charset=UTF-8']
-  s.extra_rdoc_files = %w[README.markdown LICENSE]
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.extra_rdoc_files = %w(README.markdown LICENSE)
 
-  s.add_runtime_dependency('liquid',    '~> 3.0')
-  s.add_runtime_dependency('kramdown',  '~> 1.3')
-  s.add_runtime_dependency('mercenary', '~> 0.3.3')
-  s.add_runtime_dependency('safe_yaml', '~> 1.0')
-  s.add_runtime_dependency('colorator', '~> 1.0')
-  s.add_runtime_dependency('rouge', '~> 1.7')
-  s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0')
-  s.add_runtime_dependency('jekyll-watch', '~> 1.1')
+  s.add_runtime_dependency("liquid",    "~> 3.0")
+  s.add_runtime_dependency("kramdown",  "~> 1.3")
+  s.add_runtime_dependency("mercenary", "~> 0.3.3")
+  s.add_runtime_dependency("safe_yaml", "~> 1.0")
+  s.add_runtime_dependency("colorator", "~> 1.0")
+  s.add_runtime_dependency("rouge", "~> 1.7")
+  s.add_runtime_dependency("jekyll-sass-converter", "~> 1.0")
+  s.add_runtime_dependency("jekyll-watch", "~> 1.1")
   s.add_runtime_dependency("pathutil", "~> 0.9")
-  s.add_runtime_dependency('addressable', '~> 2.4')
+  s.add_runtime_dependency("addressable", "~> 2.4")
 end

From 10b96b26bc82bfbedfe4be4a3914b50b4532fb6e Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 9 Jan 2017 21:39:19 +0100
Subject: [PATCH 1813/4996] Sort dependencies

---
 jekyll.gemspec | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 734df2e4934..b36bed9f1bf 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -29,14 +29,14 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = %w[README.markdown LICENSE]
 
-  s.add_runtime_dependency('liquid',    '~> 3.0')
-  s.add_runtime_dependency('kramdown',  '~> 1.3')
-  s.add_runtime_dependency('mercenary', '~> 0.3.3')
-  s.add_runtime_dependency('safe_yaml', '~> 1.0')
-  s.add_runtime_dependency('colorator', '~> 1.0')
-  s.add_runtime_dependency('rouge', '~> 1.7')
-  s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0')
-  s.add_runtime_dependency('jekyll-watch', '~> 1.1')
+  s.add_runtime_dependency("addressable", "~> 2.4")
+  s.add_runtime_dependency("colorator", "~> 1.0")
+  s.add_runtime_dependency("jekyll-sass-converter", "~> 1.0")
+  s.add_runtime_dependency("jekyll-watch", "~> 1.1")
+  s.add_runtime_dependency("kramdown",  "~> 1.3")
+  s.add_runtime_dependency("liquid",    "~> 3.0")
+  s.add_runtime_dependency("mercenary", "~> 0.3.3")
   s.add_runtime_dependency("pathutil", "~> 0.9")
-  s.add_runtime_dependency('addressable', '~> 2.4')
+  s.add_runtime_dependency("rouge", "~> 1.7")
+  s.add_runtime_dependency("safe_yaml", "~> 1.0")
 end

From 335d9b3881fc5f8ef6ebf5ce3a392d9c80420e4b Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 9 Jan 2017 21:39:42 +0100
Subject: [PATCH 1814/4996] sort gems

---
 docs/_config.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index 32ae74bb0d4..cc7476e252b 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -28,14 +28,14 @@ twitter:
 logo: /img/logo-2x.png
 
 gems:
+  - jekyll-avatar
   - jekyll-feed
+  - jekyll-mentions
   - jekyll-redirect-from
-  - jemoji
-  - jekyll-sitemap
   - jekyll-seo-tag
-  - jekyll-avatar
-  - jekyll-mentions
+  - jekyll-sitemap
+  - jemoji
 
 exclude:
-  - README.md
   - .gitignore
+  - README.md

From fb83ebadf61326bb628d6baa72b8db7711db6e6d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 9 Jan 2017 14:10:03 -0800
Subject: [PATCH 1815/4996] Update history to reflect merge of #5745 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b578b9bfb51..d58914065bf 100644
--- a/History.markdown
+++ b/History.markdown
@@ -41,6 +41,7 @@
   * Bump to rake 12.0 (#5670)
   * Rubocop Gemfile (#5671)
   * update Classifier-Reborn to 2.1.0 (#5711)
+  * Rubocop: fix Rakefile and gemspec (#5745)
 
 ### Documentation
 

From 47550935cb63d9432bb773fdd9e96ed926058e8d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 9 Jan 2017 14:14:03 -0800
Subject: [PATCH 1816/4996] Update history to reflect merge of #5725 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d58914065bf..8ff70c6bc06 100644
--- a/History.markdown
+++ b/History.markdown
@@ -42,6 +42,7 @@
   * Rubocop Gemfile (#5671)
   * update Classifier-Reborn to 2.1.0 (#5711)
   * Rubocop: fix Rakefile and gemspec (#5745)
+  * Use `assert_nil` (#5725)
 
 ### Documentation
 

From 4ef69b948c4d903047e4992cc68e5dfbc15b5717 Mon Sep 17 00:00:00 2001
From: yoostk 
Date: Tue, 10 Jan 2017 15:03:46 +0900
Subject: [PATCH 1817/4996] Fix a minor grammatical mistake on themes' document

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

diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index c7d6d574474..81a77d20835 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -67,7 +67,7 @@ Add your template files in the corresponding folders, complete the `.gemspec` an
 
 Theme layouts and includes work just like they work in any Jekyll site. Place layouts in your theme's `/_layouts` folder, and place includes in your themes `/_includes` folder.
 
-For example, if your theme has a `/_layouts/page.html` file, and a page has `layout: page` in its YAML front matter, Jekyll will first look to the site's `_layouts` folder for a the `page` layout, and if none exists, will use your theme's `page` layout.
+For example, if your theme has a `/_layouts/page.html` file, and a page has `layout: page` in its YAML front matter, Jekyll will first look to the site's `_layouts` folder for the `page` layout, and if none exists, will use your theme's `page` layout.
 
 ### Assets
 

From c48daa9d5b5768acdc0e30908844fc7ae604e1ef Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 10 Jan 2017 10:34:16 +0100
Subject: [PATCH 1818/4996] normalize whitespace

---
 jekyll.gemspec | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 4ddac2faf3d..71b5f31eb59 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -29,15 +29,14 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w(README.markdown LICENSE)
 
-  s.add_runtime_dependency("addressable", "~> 2.4")
-  s.add_runtime_dependency("colorator", "~> 1.0")
+  s.add_runtime_dependency("addressable",           "~> 2.4")
+  s.add_runtime_dependency("colorator",             "~> 1.0")
   s.add_runtime_dependency("jekyll-sass-converter", "~> 1.0")
-  s.add_runtime_dependency("jekyll-watch", "~> 1.1")
-  s.add_runtime_dependency("kramdown",  "~> 1.3")
-  s.add_runtime_dependency("liquid",    "~> 3.0")
-  s.add_runtime_dependency("mercenary", "~> 0.3.3")
-  s.add_runtime_dependency("pathutil", "~> 0.9")
-  s.add_runtime_dependency("rouge", "~> 1.7")
-  s.add_runtime_dependency("safe_yaml", "~> 1.0")
-
+  s.add_runtime_dependency("jekyll-watch",          "~> 1.1")
+  s.add_runtime_dependency("kramdown",              "~> 1.3")
+  s.add_runtime_dependency("liquid",                "~> 3.0")
+  s.add_runtime_dependency("mercenary",             "~> 0.3.3")
+  s.add_runtime_dependency("pathutil",              "~> 0.9")
+  s.add_runtime_dependency("rouge",                 "~> 1.7")
+  s.add_runtime_dependency("safe_yaml",             "~> 1.0")
 end

From f785d6f8d14ffb65588f4536a2ddc86bf8b3b6dc Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 10 Jan 2017 01:45:46 -0800
Subject: [PATCH 1819/4996] Update history to reflect merge of #5748 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8ff70c6bc06..de38e96d74e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -60,6 +60,7 @@
   * Replace a dead link with a web-archived one (#5738)
   * Remove duplicate paragraph. (#5740)
   * Addition of a sample "typical post" (#5473)
+  * Fix a minor grammatical mistake on themes' document (#5748)
 
 ## 3.3.1 / 2016-11-14
 

From 0210022c757e6d931db508e160217c2088a39e64 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 10 Jan 2017 01:46:18 -0800
Subject: [PATCH 1820/4996] Update history to reflect merge of #5746 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index de38e96d74e..61315abecc8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -24,6 +24,7 @@
   * Use the current year for the LICENSE of theme (#5712)
   * Update License (#5713)
   * Use Addressable instead of URI to decode (#5726)
+  * Sort gems (#5746)
 
 ### Bug Fixes
 

From faa67bcd62e3d55e07301c86f95d77267fe2082a Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 10 Jan 2017 12:12:55 -0500
Subject: [PATCH 1821/4996] include: fix 'no implicit conversion of nil to
 String'

This is when either 'dir' or 'file' is nil.
---
 lib/jekyll/tags/include.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index 674617507f2..cf05219718d 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -112,8 +112,8 @@ def tag_includes_dirs(context)
       def locate_include_file(context, file, safe)
         includes_dirs = tag_includes_dirs(context)
         includes_dirs.each do |dir|
-          path = File.join(dir, file)
-          return path if valid_include_file?(path, dir, safe)
+          path = File.join(dir.to_s, file.to_s)
+          return path if valid_include_file?(path, dir.to_s, safe)
         end
         raise IOError, "Could not locate the included file '#{file}' in any of "\
           "#{includes_dirs}. Ensure it exists in one of those directories and, "\
@@ -163,7 +163,7 @@ def load_cached_partial(path, context)
       end
 
       def valid_include_file?(path, dir, safe)
-        !(outside_site_source?(path, dir, safe) || !File.exist?(path))
+        !(outside_site_source?(path, dir, safe) || !File.file?(path))
       end
 
       def outside_site_source?(path, dir, safe)

From 22368896fb6776766e82b746fb96bb55fcbbdd0d Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 10 Jan 2017 12:17:42 -0500
Subject: [PATCH 1822/4996] Rearrange some pieces of History.markdown.

---
 History.markdown | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/History.markdown b/History.markdown
index 61315abecc8..887a21653b4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,5 +1,20 @@
 ## HEAD
 
+### Minor Enhancements
+
+  * Add connector param to `array_to_sentence_string` filter (#5597)
+  * Adds `group_by_exp` filter (#5513)
+  * Use the current year for the LICENSE of theme (#5712)
+  * Update License (#5713)
+  * Use Addressable instead of URI to decode (#5726)
+
+### Bug Fixes
+
+  * Escaped regular expressions when using `post_url`. (#5605)
+  * fix date parsing in file names to be stricter (#5609)
+  * Add a module to re-define `ENV["TZ"]` in Windows (#5612)
+  * Use each instead of map to actually return nothing (#5668)
+
 ### Site Enhancements
 
   * Remove instructions to install Jekyll 2 on Windows (#5582)
@@ -16,22 +31,7 @@
   * Add Jekyll-Post to list of plugins (#5705)
   * Add jekyll-numbered-headings (#5688)
   * Docs: move permalinks from documents into config (#5544)
-
-### Minor Enhancements
-
-  * Add connector param to array_to_sentence_string filter (#5597)
-  * Adds group_by_exp filter (#5513)
-  * Use the current year for the LICENSE of theme (#5712)
-  * Update License (#5713)
-  * Use Addressable instead of URI to decode (#5726)
-  * Sort gems (#5746)
-
-### Bug Fixes
-
-  * Escaped regular expressions when using post_url. (#5605)
-  * fix date parsing in file names to be stricter (#5609)
-  * Add a module to re-define `ENV["TZ"]` in Windows (#5612)
-  * Use each instead of map to actually return nothing (#5668)
+  * Sort gems in `docs/_config.yml` (#5746)
 
 ### Development Fixes
 
@@ -44,6 +44,7 @@
   * update Classifier-Reborn to 2.1.0 (#5711)
   * Rubocop: fix Rakefile and gemspec (#5745)
   * Use `assert_nil` (#5725)
+  * Sort gems in `jekyll.gemspec` (#5746)
 
 ### Documentation
 

From 4f84b522b518d51864917fd1a70bbbc455039ac0 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 10 Jan 2017 12:05:59 -0800
Subject: [PATCH 1823/4996] Update history to reflect merge of #5621 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 887a21653b4..d7950127478 100644
--- a/History.markdown
+++ b/History.markdown
@@ -64,6 +64,10 @@
   * Addition of a sample "typical post" (#5473)
   * Fix a minor grammatical mistake on themes' document (#5748)
 
+### -dev
+
+  * Correct comments in data_reader.rb (#5621)
+
 ## 3.3.1 / 2016-11-14
 
 ### Minor Enhancements

From c198b08ee87f7441eaf0ddc8a23014553860e3c8 Mon Sep 17 00:00:00 2001
From: Max Chadwick 
Date: Tue, 10 Jan 2017 22:50:30 -0500
Subject: [PATCH 1824/4996] Add jekyll-pre-commit to plugins list

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 4a5e61cfd78..05fe14343e5 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -919,6 +919,7 @@ LESS.js files during generation.
 - [jekyll-migrate-permalink](https://github.com/mpchadwick/jekyll-migrate-permalink): Adds a `migrate-permalink` sub-command to help deal with side effects of changing your permalink.
 - [Jekyll-Post](https://github.com/robcrocombe/jekyll-post): A CLI tool to easily draft, edit, and publish Jekyll posts.
 - [jekyll-numbered-headings](https://github.com/muratayusuke/jekyll-numbered-headings): Adds ordered number to headings.
+- [jekyll-pre-commit](https://github.com/mpchadwick/jekyll-pre-commit): A framework for running checks against your posts using a git pre-commit hook before you publish them.
 
 #### Editors
 

From 07d161c2ce8707d7320fbaf09af898e075f4a240 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 11 Jan 2017 01:42:10 -0800
Subject: [PATCH 1825/4996] Update history to reflect merge of #5752 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d7950127478..2d769ba8efb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -62,11 +62,9 @@
   * Replace a dead link with a web-archived one (#5738)
   * Remove duplicate paragraph. (#5740)
   * Addition of a sample "typical post" (#5473)
-  * Fix a minor grammatical mistake on themes' document (#5748)
-
-### -dev
-
+  * Fix a minor grammatical mistake on themes' document ### -dev (#5748)
   * Correct comments in data_reader.rb (#5621)
+  * Add jekyll-pre-commit to plugins list (#5752)
 
 ## 3.3.1 / 2016-11-14
 

From d77ed5e608254123c6d0d0850338e6193ef38d84 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Wed, 11 Jan 2017 10:49:21 +0100
Subject: [PATCH 1826/4996] Add missing merge labels for jekyllbot

---
 docs/_docs/maintaining/merging-a-pull-request.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/maintaining/merging-a-pull-request.md b/docs/_docs/maintaining/merging-a-pull-request.md
index 80ad6f7c5e3..c7efe0b5e20 100644
--- a/docs/_docs/maintaining/merging-a-pull-request.md
+++ b/docs/_docs/maintaining/merging-a-pull-request.md
@@ -38,8 +38,9 @@ The categories match the H3's in the history/changelog file, and they are:
 1. Major Enhancements (`+major`) – major updates or breaking changes to the code which necessitate a major version bump (v3 ~> v4)
 2. Minor Enhancements (`+minor`) – minor updates (feature, enhancement) which necessitate a minor version bump (v3.1 ~> v3.2)
 3. Bug Fixes (`+bug`) – corrections to code which do not change or add functionality, which necessitate a patch version bump (v3.1.0 ~> v3.1.1)
-4. Site Enhancements (`+site`) – changes to the source of https://jekyllrb.com, found in `site/`
+4. Site Enhancements (`+site` or `+doc`) – changes to the source or the documentation found in `docs/` and published on https://jekyllrb.com, 
 5. Development Fixes (`+dev`) – changes which do not affect user-facing functionality or documentation, such as test fixes or bumping internal dependencies
+6. Forward Ports (`+port`) — forward-port changes, e.g. from v3.1.4.
 
 Once @jekyllbot has merged the pull request, you should see three things:
 

From 02858fdf089bce0e4bb7901ef8e5b13d61e91c01 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 11 Jan 2017 12:05:56 -0500
Subject: [PATCH 1827/4996] include: improve boolean logic in
 #valid_include_file?

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

diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index cf05219718d..ca74087da28 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -163,7 +163,7 @@ def load_cached_partial(path, context)
       end
 
       def valid_include_file?(path, dir, safe)
-        !(outside_site_source?(path, dir, safe) || !File.file?(path))
+        !outside_site_source?(path, dir, safe) && File.file?(path)
       end
 
       def outside_site_source?(path, dir, safe)

From 8ae2673ebae7c9d2a7c75e3e3e95729cde04cdfc Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 11 Jan 2017 09:13:39 -0800
Subject: [PATCH 1828/4996] Update history to reflect merge of #5744 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2d769ba8efb..bb10365f06a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -32,6 +32,7 @@
   * Add jekyll-numbered-headings (#5688)
   * Docs: move permalinks from documents into config (#5544)
   * Sort gems in `docs/_config.yml` (#5746)
+  * [site] Use defaults for docs and news-items (#5744)
 
 ### Development Fixes
 

From 538cff15e9a9d68d7bf6c5727b8592d3cccaf332 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Wed, 11 Jan 2017 20:57:34 +0100
Subject: [PATCH 1829/4996] report @parkr feedback

---
 docs/_docs/maintaining/merging-a-pull-request.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/maintaining/merging-a-pull-request.md b/docs/_docs/maintaining/merging-a-pull-request.md
index c7efe0b5e20..ed34adf1863 100644
--- a/docs/_docs/maintaining/merging-a-pull-request.md
+++ b/docs/_docs/maintaining/merging-a-pull-request.md
@@ -38,9 +38,10 @@ The categories match the H3's in the history/changelog file, and they are:
 1. Major Enhancements (`+major`) – major updates or breaking changes to the code which necessitate a major version bump (v3 ~> v4)
 2. Minor Enhancements (`+minor`) – minor updates (feature, enhancement) which necessitate a minor version bump (v3.1 ~> v3.2)
 3. Bug Fixes (`+bug`) – corrections to code which do not change or add functionality, which necessitate a patch version bump (v3.1.0 ~> v3.1.1)
-4. Site Enhancements (`+site` or `+doc`) – changes to the source or the documentation found in `docs/` and published on https://jekyllrb.com, 
-5. Development Fixes (`+dev`) – changes which do not affect user-facing functionality or documentation, such as test fixes or bumping internal dependencies
-6. Forward Ports (`+port`) — forward-port changes, e.g. from v3.1.4.
+4. Documentation (`+doc`) - changes to the documentation found in `docs/_docs/`
+5. Site Enhancements (`+site`) – changes to the source of [https://jekyllrb.com](https://jekyllrb.com) found in `docs/`
+6. Development Fixes (`+dev`) – changes which do not affect user-facing functionality or documentation, such as test fixes or bumping internal dependencies
+7. Forward Ports (`+port`) — bug fixes applied to a previous version of Jekyll pulled onto `master`, e.g. cherry-picked commits from `3-1-stable` to `master`
 
 Once @jekyllbot has merged the pull request, you should see three things:
 

From 335c8fcf62bfb48c3555e0cd2a8a6d89fdfd1d7e Mon Sep 17 00:00:00 2001
From: BlueberryFoxtrot 
Date: Thu, 12 Jan 2017 17:28:32 +0100
Subject: [PATCH 1830/4996] Update installation.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. Addition of *Running Jekyll on Ubuntu* section, to address Ubuntu stumbling block as per https://github.com/jekyll/jekyll/issues/5719.
2. Restructuring, and I hope I understood correctly when NodeJS/Python are/aren't required.
3. Gentler wording – it's probably not a good idea to tell punters who hit this page because they ran into trouble that installing Jekyll *is* easy and straight-forward; it *ought to be* straight-forward. (There's always the potential for pain and confusion if not all dependencies are in place.)
---
 docs/_docs/installation.md | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index d264997d436..bbc35fabd92 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -10,16 +10,31 @@ encountered and how we might make the process easier.
 
 ### Requirements
 
-Installing Jekyll is easy and straight-forward, but there are a few
-requirements you’ll need to make sure your system has before you start.
+Installing Jekyll ought to be straight-forward if all requirements are met.
+Before you start, make sure your system has the following:
 
-- [Ruby](https://www.ruby-lang.org/en/downloads/) (including development
+- Linux, Unix, or macOS
+- [Ruby](https://www.ruby-lang.org/en/downloads/) (including all development
   headers, v1.9.3 or above for Jekyll 2 and v2 or above for Jekyll 3)
 - [RubyGems](https://rubygems.org/pages/download)
-- Linux, Unix, or macOS
-- [NodeJS](https://nodejs.org/), or another JavaScript runtime (Jekyll 2 and
-earlier, for CoffeeScript support).
-- [Python 2.7](https://www.python.org/downloads/) (for Jekyll 2 and earlier)
+
+#### Only required for Jekyll 2 and earlier
+- [NodeJS](https://nodejs.org/), or another JavaScript runtime (for CoffeeScript support).
+- [Python 2.7](https://www.python.org/downloads/)
+
+
    
+  
    Running Jekyll on Ubuntu
    
+  
    
+    Users of Jekyll on Ubuntu have reported encountering 
+    Could not locate Gemfile or .bundle/ directory error messages at the 
+    bundle exec jekyll serve step in the Quick-start guide.
+    The likely cause is that all installation requirements have not been fully met.
+    Recent stock Ubuntu distributions require the installation of both the ruby and ruby-all-dev
+    packages, e.g. via sudo apt-get install ruby ruby-all-dev (RubyGems should be included in ruby).
+    The ruby-all-dev .deb package in particular contains development header files whose absence causes 
+    the above error message.
+  
    
+
    
 
 
    
   
    Running Jekyll on Windows
    

From 2fc4fdfe79223d7869417efb8c26ededaedda06c Mon Sep 17 00:00:00 2001
From: BlueberryFoxtrot 
Date: Thu, 12 Jan 2017 17:39:21 +0100
Subject: [PATCH 1831/4996] Update quickstart.md

---
 docs/_docs/quickstart.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/quickstart.md b/docs/_docs/quickstart.md
index 984275f7a37..e84f87beb5e 100644
--- a/docs/_docs/quickstart.md
+++ b/docs/_docs/quickstart.md
@@ -3,7 +3,7 @@ title: Quick-start guide
 permalink: /docs/quickstart/
 ---
 
-If you already have [Ruby](https://www.ruby-lang.org/en/downloads/) and [RubyGems](https://rubygems.org/pages/download) installed (see Jekyll's [requirements](/docs/installation/#requirements/)), you can create a new Jekyll site by doing the following:
+If you already have a full [Ruby](https://www.ruby-lang.org/en/downloads/) development environment with all headers and [RubyGems](https://rubygems.org/pages/download) installed (see Jekyll's [requirements](/docs/installation/#requirements/)), you can create a new Jekyll site by doing the following:
 
 ```sh
 # Install Jekyll and Bundler gems through RubyGems
@@ -21,6 +21,8 @@ If you already have [Ruby](https://www.ruby-lang.org/en/downloads/) and [RubyGem
 # Now browse to http://localhost:4000
 ```
 
+If you encounter any unexpected errors during the above, please refer to the already-mentioned [requirements](/docs/installation/#requirements/) page, as you might be missing development headers or other prerequisites.
+
 ## About Bundler
 
 `gem install jekyll bundler` installs the [jekyll](https://rubygems.org/gems/jekyll/) and [bundler](https://rubygems.org/gems/bundler) gems through [RubyGems](https://rubygems.org/). You need only to install the gems one time — not every time you create a new Jekyll project. Here are some additional details:

From 1d885911bce091a8d8f89df410896809ec6e8bd4 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 12 Jan 2017 17:52:29 -0600
Subject: [PATCH 1832/4996] Rubocop: Require consistent comma in multiline
 literals

---
 .rubocop.yml                                  |  2 +
 features/support/formatter.rb                 |  2 +-
 features/support/helpers.rb                   |  4 +-
 lib/jekyll/commands/doctor.rb                 |  2 +-
 lib/jekyll/commands/serve.rb                  | 12 +--
 lib/jekyll/commands/serve/servlet.rb          |  2 +-
 lib/jekyll/configuration.rb                   | 10 +-
 .../converters/markdown/kramdown_parser.rb    |  2 +-
 .../converters/markdown/redcarpet_parser.rb   |  2 +-
 lib/jekyll/document.rb                        |  6 +-
 lib/jekyll/drops/jekyll_drop.rb               |  2 +-
 lib/jekyll/entry_filter.rb                    |  2 +-
 lib/jekyll/filters/grouping_filters.rb        |  2 +-
 lib/jekyll/hooks.rb                           | 14 +--
 lib/jekyll/log_adapter.rb                     |  2 +-
 lib/jekyll/page.rb                            |  4 +-
 lib/jekyll/plugin.rb                          |  2 +-
 lib/jekyll/readers/data_reader.rb             |  2 +-
 lib/jekyll/readers/post_reader.rb             |  2 +-
 lib/jekyll/regenerator.rb                     |  2 +-
 lib/jekyll/static_file.rb                     |  6 +-
 lib/jekyll/tags/highlight.rb                  |  4 +-
 lib/jekyll/theme_builder.rb                   |  2 +-
 lib/jekyll/utils/ansi.rb                      |  2 +-
 test/helper.rb                                | 12 +--
 test/test_collections.rb                      | 18 ++--
 test/test_commands_serve.rb                   | 12 +--
 test/test_configuration.rb                    | 50 +++++-----
 test/test_doctor_command.rb                   |  4 +-
 test/test_document.rb                         | 94 +++++++++----------
 test/test_drop.rb                             |  2 +-
 test/test_entry_filter.rb                     |  2 +-
 test/test_excerpt.rb                          |  4 +-
 test/test_filters.rb                          | 78 +++++++--------
 test/test_front_matter_defaults.rb            | 58 ++++++------
 test/test_kramdown.rb                         | 24 ++---
 test/test_layout_reader.rb                    |  2 +-
 test/test_liquid_renderer.rb                  |  2 +-
 test/test_page.rb                             |  6 +-
 test/test_plugin_manager.rb                   |  8 +-
 test/test_rdiscount.rb                        |  4 +-
 test/test_redcarpet.rb                        |  4 +-
 test/test_regenerator.rb                      | 12 +--
 test/test_related_posts.rb                    |  2 +-
 test/test_sass.rb                             |  2 +-
 test/test_site.rb                             |  8 +-
 test/test_static_file.rb                      |  6 +-
 test/test_tags.rb                             | 54 +++++------
 48 files changed, 281 insertions(+), 279 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 0324c4121b8..67f212aea57 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -127,5 +127,7 @@ Style/StringLiterals:
   EnforcedStyle: double_quotes
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: consistent_comma
 Style/UnneededCapitalW:
   Enabled: false
diff --git a/features/support/formatter.rb b/features/support/formatter.rb
index 2223701012c..79d1466480f 100644
--- a/features/support/formatter.rb
+++ b/features/support/formatter.rb
@@ -16,7 +16,7 @@ class Formatter
         :pending   => "\u203D".yellow,
         :undefined => "\u2718".red,
         :passed    => "\u2714".green,
-        :skipped   => "\u203D".blue
+        :skipped   => "\u203D".blue,
       }.freeze
 
       #
diff --git a/features/support/helpers.rb b/features/support/helpers.rb
index 1340808a313..b8044a7c53e 100644
--- a/features/support/helpers.rb
+++ b/features/support/helpers.rb
@@ -142,7 +142,7 @@ def location(folder, direction)
   end
 
   [before || ".",
-    after || "."]
+    after || ".",]
 end
 
 #
@@ -160,7 +160,7 @@ def seconds_agnostic_datetime(datetime = Time.now)
   [
     Regexp.escape(date),
     "#{time}:\\d{2}",
-    Regexp.escape(zone)
+    Regexp.escape(zone),
   ] \
     .join("\\ ")
 end
diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb
index c7f387df7bb..59004c96049 100644
--- a/lib/jekyll/commands/doctor.rb
+++ b/lib/jekyll/commands/doctor.rb
@@ -35,7 +35,7 @@ def healthy?(site)
             fsnotify_buggy?(site),
             !deprecated_relative_permalinks(site),
             !conflicting_urls(site),
-            !urls_only_differ_by_case(site)
+            !urls_only_differ_by_case(site),
           ].all?
         end
 
diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index e0da4807915..1691359569d 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -10,9 +10,9 @@ class << self
           "ssl_key"            => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."],
           "port"               => ["-P", "--port [PORT]", "Port to listen on"],
           "show_dir_listing"   => ["--show-dir-listing",
-            "Show a directory listing instead of loading your index file."],
+            "Show a directory listing instead of loading your index file.",],
           "skip_initial_build" => ["skip_initial_build", "--skip-initial-build",
-            "Skips the initial site build which occurs before the server is started."]
+            "Skips the initial site build which occurs before the server is started.",],
         }.freeze
 
         #
@@ -88,7 +88,7 @@ def webrick_opts(opts)
               index.rhtml
               index.cgi
               index.xml
-            )
+            ),
           }
 
           opts[:DirectoryIndex] = [] if opts[:JekyllOptions]["show_dir_listing"]
@@ -116,8 +116,8 @@ def file_handler_opts
           WEBrick::Config::FileHandler.merge({
             :FancyIndexing     => true,
             :NondisclosureName => [
-              ".ht*", "~*"
-            ]
+              ".ht*", "~*",
+            ],
           })
         end
 
@@ -139,7 +139,7 @@ def format_url(ssl_enabled, address, port, baseurl = nil)
             :prefix  => ssl_enabled ? "https" : "http",
             :address => address,
             :port    => port,
-            :baseurl => baseurl ? "#{baseurl}/" : ""
+            :baseurl => baseurl ? "#{baseurl}/" : "",
           })
         end
 
diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb
index d0dd22af8d7..3ae5cf32367 100644
--- a/lib/jekyll/commands/serve/servlet.rb
+++ b/lib/jekyll/commands/serve/servlet.rb
@@ -6,7 +6,7 @@ class Serve
       class Servlet < WEBrick::HTTPServlet::FileHandler
         DEFAULTS = {
           "Cache-Control" => "private, max-age=0, proxy-revalidate, " \
-            "no-store, no-cache, must-revalidate"
+            "no-store, no-cache, must-revalidate",
         }.freeze
 
         def initialize(server, root, callbacks)
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 8dc1807d14a..27e245e4bcb 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -58,15 +58,15 @@ class Configuration < Hash
       "defaults"          => [],
 
       "liquid"            => {
-        "error_mode" => "warn"
+        "error_mode" => "warn",
       },
 
       "rdiscount"         => {
-        "extensions" => []
+        "extensions" => [],
       },
 
       "redcarpet"         => {
-        "extensions" => []
+        "extensions" => [],
       },
 
       "kramdown"          => {
@@ -76,8 +76,8 @@ class Configuration < Hash
         "smart_quotes"  => "lsquo,rsquo,ldquo,rdquo",
         "input"         => "GFM",
         "hard_wrap"     => false,
-        "footnote_nr"   => 1
-      }
+        "footnote_nr"   => 1,
+      },
     }.map { |k, v| [k, v.freeze] }].freeze
 
     class << self
diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index dd71c6c1d5f..a7252f1a689 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -11,7 +11,7 @@ class KramdownParser
           "line_numbers"      => "inline",
           "line_number_start" => 1,
           "tab_width"         => 4,
-          "wrap"              => "div"
+          "wrap"              => "div",
         }.freeze
 
         def initialize(config)
diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb
index b5ec99f55ce..aa170feb3b7 100644
--- a/lib/jekyll/converters/markdown/redcarpet_parser.rb
+++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb
@@ -21,7 +21,7 @@ def block_code(code, lang)
           code,
           {
             :lexer   => lang,
-            :options => { :encoding => "utf-8" }
+            :options => { :encoding => "utf-8" },
           }
         ),
         lang
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index ad5884efb68..fecd58285c3 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -196,7 +196,7 @@ def url
       @url = URL.new({
         :template     => url_template,
         :placeholders => url_placeholders,
-        :permalink    => permalink
+        :permalink    => permalink,
       }).to_s
     end
 
@@ -469,14 +469,14 @@ def populate_categories
           "category",
           "categories"
         )
-        ).map(&:to_s).flatten.uniq
+        ).map(&:to_s).flatten.uniq,
       })
     end
 
     private
     def populate_tags
       merge_data!({
-        "tags" => Utils.pluralized_array_from_hash(data, "tag", "tags").flatten
+        "tags" => Utils.pluralized_array_from_hash(data, "tag", "tags").flatten,
       })
     end
 
diff --git a/lib/jekyll/drops/jekyll_drop.rb b/lib/jekyll/drops/jekyll_drop.rb
index 50163d7461b..e3d2eb38d52 100644
--- a/lib/jekyll/drops/jekyll_drop.rb
+++ b/lib/jekyll/drops/jekyll_drop.rb
@@ -20,7 +20,7 @@ def environment
       def to_h
         @to_h ||= {
           "version"     => version,
-          "environment" => environment
+          "environment" => environment,
         }
       end
 
diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb
index 5f3431d8ed3..e4187d42d8e 100644
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -2,7 +2,7 @@ module Jekyll
   class EntryFilter
     attr_reader :site
     SPECIAL_LEADING_CHARACTERS = [
-      ".", "_", "#", "~"
+      ".", "_", "#", "~",
     ].freeze
 
     def initialize(site, base_directory = nil)
diff --git a/lib/jekyll/filters/grouping_filters.rb b/lib/jekyll/filters/grouping_filters.rb
index a16901d92b1..e7a904a4746 100644
--- a/lib/jekyll/filters/grouping_filters.rb
+++ b/lib/jekyll/filters/grouping_filters.rb
@@ -54,7 +54,7 @@ def grouped_array(groups)
           array << {
             "name"  => item.first,
             "items" => item.last,
-            "size"  => item.last.size
+            "size"  => item.last.size,
           }
         end
       end
diff --git a/lib/jekyll/hooks.rb b/lib/jekyll/hooks.rb
index 9083b27a605..5f21b5f6fea 100644
--- a/lib/jekyll/hooks.rb
+++ b/lib/jekyll/hooks.rb
@@ -6,7 +6,7 @@ module Hooks
     PRIORITY_MAP = {
       :low    => 10,
       :normal => 20,
-      :high   => 30
+      :high   => 30,
     }.freeze
 
     # initial empty hooks
@@ -17,26 +17,26 @@ module Hooks
         :post_read   => [],
         :pre_render  => [],
         :post_render => [],
-        :post_write  => []
+        :post_write  => [],
       },
       :pages     => {
         :post_init   => [],
         :pre_render  => [],
         :post_render => [],
-        :post_write  => []
+        :post_write  => [],
       },
       :posts     => {
         :post_init   => [],
         :pre_render  => [],
         :post_render => [],
-        :post_write  => []
+        :post_write  => [],
       },
       :documents => {
         :post_init   => [],
         :pre_render  => [],
         :post_render => [],
-        :post_write  => []
-      }
+        :post_write  => [],
+      },
     }
 
     # map of all hooks and their priorities
@@ -64,7 +64,7 @@ def self.register_one(owner, event, priority, &block)
         :post_init   => [],
         :pre_render  => [],
         :post_render => [],
-        :post_write  => []
+        :post_write  => [],
       }
 
       unless @registry[owner][event]
diff --git a/lib/jekyll/log_adapter.rb b/lib/jekyll/log_adapter.rb
index 70173b91b9a..965f3295702 100644
--- a/lib/jekyll/log_adapter.rb
+++ b/lib/jekyll/log_adapter.rb
@@ -6,7 +6,7 @@ class LogAdapter
       :debug => ::Logger::DEBUG,
       :info  => ::Logger::INFO,
       :warn  => ::Logger::WARN,
-      :error => ::Logger::ERROR
+      :error => ::Logger::ERROR,
     }.freeze
 
     # Public: Create a new instance of a log writer
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 7619966de76..324a867d475 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -98,7 +98,7 @@ def url
       @url ||= URL.new({
         :template     => template,
         :placeholders => url_placeholders,
-        :permalink    => permalink
+        :permalink    => permalink,
       }).to_s
     end
 
@@ -108,7 +108,7 @@ def url_placeholders
       {
         :path       => @dir,
         :basename   => basename,
-        :output_ext => output_ext
+        :output_ext => output_ext,
       }
     end
 
diff --git a/lib/jekyll/plugin.rb b/lib/jekyll/plugin.rb
index bcc1bf7e990..4680be32434 100644
--- a/lib/jekyll/plugin.rb
+++ b/lib/jekyll/plugin.rb
@@ -5,7 +5,7 @@ class Plugin
       :highest => 100,
       :lowest  => -100,
       :normal  => 0,
-      :high    => 10
+      :high    => 10,
     }.freeze
 
     #
diff --git a/lib/jekyll/readers/data_reader.rb b/lib/jekyll/readers/data_reader.rb
index 6744ae05ce1..1083d62b26b 100644
--- a/lib/jekyll/readers/data_reader.rb
+++ b/lib/jekyll/readers/data_reader.rb
@@ -54,7 +54,7 @@ def read_data_file(path)
       when ".csv"
         CSV.read(path, {
           :headers  => true,
-          :encoding => site.config["encoding"]
+          :encoding => site.config["encoding"],
         }).map(&:to_hash)
       else
         SafeYAML.load_file(path)
diff --git a/lib/jekyll/readers/post_reader.rb b/lib/jekyll/readers/post_reader.rb
index 123709e7374..70688875da5 100644
--- a/lib/jekyll/readers/post_reader.rb
+++ b/lib/jekyll/readers/post_reader.rb
@@ -57,7 +57,7 @@ def read_content(dir, magic_dir, matcher)
         path = @site.in_source_dir(File.join(dir, magic_dir, entry))
         Document.new(path, {
           :site       => @site,
-          :collection => @site.posts
+          :collection => @site.posts,
         })
       end.reject(&:nil?)
     end
diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb
index 4d89da2e0e8..09ff309a28d 100644
--- a/lib/jekyll/regenerator.rb
+++ b/lib/jekyll/regenerator.rb
@@ -40,7 +40,7 @@ def add(path)
 
       metadata[path] = {
         "mtime" => File.mtime(path),
-        "deps"  => []
+        "deps"  => [],
       }
       cache[path] = true
     end
diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index 927a9b47105..53b945d4168 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -101,7 +101,7 @@ def to_liquid
         "name"          => name,
         "extname"       => extname,
         "modified_time" => modified_time,
-        "path"          => File.join("", relative_path)
+        "path"          => File.join("", relative_path),
       }
     end
 
@@ -112,7 +112,7 @@ def placeholders
           @collection.relative_directory.size..relative_path.size],
         :output_ext => "",
         :name       => "",
-        :title      => ""
+        :title      => "",
       }
     end
 
@@ -125,7 +125,7 @@ def url
                else
                  ::Jekyll::URL.new({
                    :template     => @collection.url_template,
-                   :placeholders => placeholders
+                   :placeholders => placeholders,
                  })
                end.to_s.gsub(%r!/$!, "")
     end
diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index 43b0c62f7ef..86b9171b1fb 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -54,7 +54,7 @@ def sanitized_opts(opts, is_safe)
             [:hl_lines,    opts.fetch(:hl_lines, nil)],
             [:linenos,     opts.fetch(:linenos, nil)],
             [:encoding,    opts.fetch(:encoding, "utf-8")],
-            [:cssclass,    opts.fetch(:cssclass, nil)]
+            [:cssclass,    opts.fetch(:cssclass, nil)],
           ].reject { |f| f.last.nil? }]
         else
           opts
@@ -125,7 +125,7 @@ def render_codehighlighter(code)
       def add_code_tag(code)
         code_attributes = [
           "class=\"language-#{@lang.to_s.tr("+", "-")}\"",
-          "data-lang=\"#{@lang}\""
+          "data-lang=\"#{@lang}\"",
         ].join(" ")
         "
    "\
         "#{code.chomp}
    "
diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb
index 68a5eeabf3f..f1c97e37974 100644
--- a/lib/jekyll/theme_builder.rb
+++ b/lib/jekyll/theme_builder.rb
@@ -28,7 +28,7 @@ def root
   def template_file(filename)
     [
       root.join("theme_template", "#{filename}.erb"),
-      root.join("theme_template", filename.to_s)
+      root.join("theme_template", filename.to_s),
     ].find(&:exist?)
   end
 
diff --git a/lib/jekyll/utils/ansi.rb b/lib/jekyll/utils/ansi.rb
index 4be163c54ad..8bdd2322168 100644
--- a/lib/jekyll/utils/ansi.rb
+++ b/lib/jekyll/utils/ansi.rb
@@ -17,7 +17,7 @@ module Ansi
         :yellow  => 33,
         :white   => 37,
         :blue    => 34,
-        :cyan    => 36
+        :cyan    => 36,
       }.freeze
 
       # Strip ANSI from the current string.  It also strips cursor stuff,
diff --git a/test/helper.rb b/test/helper.rb
index 0c6935a03fb..e33ddae7a49 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -46,7 +46,7 @@ def jruby?
 Minitest::Reporters.use! [
   Minitest::Reporters::DefaultReporter.new(
     :color => true
-  )
+  ),
 ]
 
 module Minitest::Assertions
@@ -107,9 +107,9 @@ def fixture_document(relative_path)
     site = fixture_site({
       "collections" => {
         "methods" => {
-          "output" => true
-        }
-      }
+          "output" => true,
+        },
+      },
     })
     site.read
     matching_doc = site.collections["methods"].docs.find do |doc|
@@ -133,10 +133,10 @@ def build_configs(overrides, base_hash = default_configuration)
   def site_configuration(overrides = {})
     full_overrides = build_configs(overrides, build_configs({
       "destination" => dest_dir,
-      "incremental" => false
+      "incremental" => false,
     }))
     Configuration.from(full_overrides.merge({
-      "source" => source_dir
+      "source" => source_dir,
     }))
   end
 
diff --git a/test/test_collections.rb b/test/test_collections.rb
index 0dca8443994..0607208b8f3 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -91,9 +91,9 @@ class TestCollections < JekyllUnitTest
       @site = fixture_site({
         "collections" => {
           "methods" => {
-            "permalink" => "/awesome/:path/"
-          }
-        }
+            "permalink" => "/awesome/:path/",
+          },
+        },
       })
       @site.process
       @collection = @site.collections["methods"]
@@ -107,7 +107,7 @@ class TestCollections < JekyllUnitTest
   context "with a collection" do
     setup do
       @site = fixture_site({
-        "collections" => ["methods"]
+        "collections" => ["methods"],
       })
       @site.process
       @collection = @site.collections["methods"]
@@ -158,9 +158,9 @@ class TestCollections < JekyllUnitTest
         "collections" => {
           "methods" => {
             "foo" => "bar",
-            "baz" => "whoo"
-          }
-        }
+            "baz" => "whoo",
+          },
+        },
       })
       @site.process
       @collection = @site.collections["methods"]
@@ -175,7 +175,7 @@ class TestCollections < JekyllUnitTest
     setup do
       @site = fixture_site({
         "collections" => ["methods"],
-        "safe"        => true
+        "safe"        => true,
       })
       @site.process
       @collection = @site.collections["methods"]
@@ -198,7 +198,7 @@ class TestCollections < JekyllUnitTest
     setup do
       @site = fixture_site({
         "collections" => ["with.dots"],
-        "safe"        => true
+        "safe"        => true,
       })
       @site.process
       @collection = @site.collections["with.dots"]
diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb
index 143dc2a549f..fa0f7f67bf3 100644
--- a/test/test_commands_serve.rb
+++ b/test/test_commands_serve.rb
@@ -86,12 +86,12 @@ def custom_opts(what)
           "config"  => %w(_config.yml _development.yml),
           "serving" => true,
           "watch"   => false, # for not having guard output when running the tests
-          "url"     => "http://localhost:4000"
+          "url"     => "http://localhost:4000",
         }
 
         expect(Jekyll::Commands::Serve).to receive(:process).with(custom_options)
         @merc.execute(:serve, { "config" => %w(_config.yml _development.yml),
-                                "watch"  => false })
+                                "watch"  => false, })
       end
 
       context "in development environment" do
@@ -113,7 +113,7 @@ def custom_opts(what)
             "port"     => "9999",
             "url"      => "https://jekyllrb.com/",
             "ssl_cert" => "foo",
-            "ssl_key"  => "bar"
+            "ssl_key"  => "bar",
           })
 
           assert_equal 1, Jekyll.sites.count
@@ -146,13 +146,13 @@ def custom_opts(what)
         should "raise if enabling without key or cert" do
           assert_raises RuntimeError do
             custom_opts({
-              "ssl_key" => "foo"
+              "ssl_key" => "foo",
             })
           end
 
           assert_raises RuntimeError do
             custom_opts({
-              "ssl_key" => "foo"
+              "ssl_key" => "foo",
             })
           end
         end
@@ -166,7 +166,7 @@ def custom_opts(what)
             "ssl_cert"   => "foo",
             "source"     => "bar",
             "enable_ssl" => true,
-            "ssl_key"    => "bar"
+            "ssl_key"    => "bar",
           })
 
           assert result[:SSLEnable]
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 696fc3e9f63..febc0cbee1b 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -4,7 +4,7 @@
 class TestConfiguration < JekyllUnitTest
   test_config = {
     "source"      => new(nil).source_dir,
-    "destination" => dest_dir
+    "destination" => dest_dir,
   }
 
   context ".from" do
@@ -34,8 +34,8 @@ class TestConfiguration < JekyllUnitTest
         {
           "posts" => {
             "output"    => true,
-            "permalink" => "/:categories/:year/:month/:day/:title:output_ext"
-          }
+            "permalink" => "/:categories/:year/:month/:day/:title:output_ext",
+          },
         }
       )
     end
@@ -85,8 +85,8 @@ class TestConfiguration < JekyllUnitTest
         {
           "posts" => {
             "output"    => true,
-            "permalink" => "/:categories/:year/:month/:day/:title/"
-          }
+            "permalink" => "/:categories/:year/:month/:day/:title/",
+          },
         }
       )
 
@@ -109,14 +109,14 @@ class TestConfiguration < JekyllUnitTest
         :permalink => "date",
         "baseurl"  => "/",
         :include   => [".htaccess"],
-        :source    => "./"
+        :source    => "./",
       }]
       @string_keys = Configuration[{
         "markdown"  => "kramdown",
         "permalink" => "date",
         "baseurl"   => "/",
         "include"   => [".htaccess"],
-        "source"    => "./"
+        "source"    => "./",
       }]
     end
     should "stringify symbol keys" do
@@ -132,7 +132,7 @@ class TestConfiguration < JekyllUnitTest
       @no_override     = {}
       @one_config_file = { "config" => "config.yml" }
       @multiple_files  = {
-        "config" => %w(config/site.yml config/deploy.toml configuration.yml)
+        "config" => %w(config/site.yml config/deploy.toml configuration.yml),
       }
     end
 
@@ -205,7 +205,7 @@ class TestConfiguration < JekyllUnitTest
         "pygments"    => true,
         "plugins"     => true,
         "layouts"     => true,
-        "data_source" => true
+        "data_source" => true,
       }]
     end
     should "unset 'auto' and 'watch'" do
@@ -255,7 +255,7 @@ class TestConfiguration < JekyllUnitTest
     setup do
       @config = proc do |val|
         Configuration[{
-          "paginate" => val
+          "paginate" => val,
         }]
       end
     end
@@ -327,7 +327,7 @@ class TestConfiguration < JekyllUnitTest
         :default => source_dir("_config.yml"),
         :other   => source_dir("_config.live.yml"),
         :toml    => source_dir("_config.dev.toml"),
-        :empty   => ""
+        :empty   => "",
       }
     end
 
@@ -372,7 +372,7 @@ class TestConfiguration < JekyllUnitTest
       Jekyll.logger.log_level = :warn
       assert_equal \
         site_configuration({ "baseurl" => "/you-beautiful-blog-you",
-                             "title"   => "My magnificent site, wut" }),
+                             "title"   => "My magnificent site, wut", }),
         Jekyll.configuration(test_config.merge({ "config" => [@paths[:toml]] }))
       Jekyll.logger.log_level = :info
     end
@@ -435,9 +435,9 @@ class TestConfiguration < JekyllUnitTest
           "docs"  => {},
           "posts" => {
             "output"    => true,
-            "permalink" => "/:categories/:year/:month/:day/:title:output_ext"
-          }
-        }
+            "permalink" => "/:categories/:year/:month/:day/:title:output_ext",
+          },
+        },
       })
     end
 
@@ -449,9 +449,9 @@ class TestConfiguration < JekyllUnitTest
         "collections" => {
           "posts" => {
             "output"    => true,
-            "permalink" => "/:categories/:year/:month/:day/:title:output_ext"
-          }
-        }
+            "permalink" => "/:categories/:year/:month/:day/:title:output_ext",
+          },
+        },
       })
     end
 
@@ -461,9 +461,9 @@ class TestConfiguration < JekyllUnitTest
         "collections" => {
           "posts" => {
             "output"    => true,
-            "permalink" => "/:categories/:year/:month/:day/:title:output_ext"
-          }
-        }
+            "permalink" => "/:categories/:year/:month/:day/:title:output_ext",
+          },
+        },
       })
     end
 
@@ -471,16 +471,16 @@ class TestConfiguration < JekyllUnitTest
       posts_permalink = "/:year/:title/"
       conf = Configuration[default_configuration].tap do |c|
         c["collections"] = {
-          "posts" => { "permalink" => posts_permalink }
+          "posts" => { "permalink" => posts_permalink },
         }
       end
       assert_equal conf.add_default_collections, conf.merge({
         "collections" => {
           "posts" => {
             "output"    => true,
-            "permalink" => posts_permalink
-          }
-        }
+            "permalink" => posts_permalink,
+          },
+        },
       })
     end
   end
diff --git a/test/test_doctor_command.rb b/test/test_doctor_command.rb
index 652175b9cf4..8861440255c 100644
--- a/test/test_doctor_command.rb
+++ b/test/test_doctor_command.rb
@@ -10,7 +10,7 @@ class TestDoctorCommand < JekyllUnitTest
     should "return success on a valid site/page" do
       @site = Site.new(Jekyll.configuration({
         "source"      => File.join(source_dir, "/_urls_differ_by_case_valid"),
-        "destination" => dest_dir
+        "destination" => dest_dir,
       }))
       @site.process
       output = capture_stderr do
@@ -23,7 +23,7 @@ class TestDoctorCommand < JekyllUnitTest
     should "return warning for pages only differing by case" do
       @site = Site.new(Jekyll.configuration({
         "source"      => File.join(source_dir, "/_urls_differ_by_case_invalid"),
-        "destination" => dest_dir
+        "destination" => dest_dir,
       }))
       @site.process
       output = capture_stderr do
diff --git a/test/test_document.rb b/test/test_document.rb
index 7c9df18c7dd..f274dd5327c 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -8,7 +8,7 @@ def assert_equal_value(key, one, other)
   context "a document in a collection" do
     setup do
       @site = fixture_site({
-        "collections" => ["methods"]
+        "collections" => ["methods"],
       })
       @site.process
       @document = @site.collections["methods"].docs.detect do |d|
@@ -118,10 +118,10 @@ def assert_equal_value(key, one, other)
           "scope"  => { "path"=>"", "type"=>"slides" },
           "values" => {
             "nested" => {
-              "key" => "myval"
-            }
-          }
-        }]
+              "key" => "myval",
+            },
+          },
+        },],
       })
       @site.process
       @document = @site.collections["slides"].docs.select { |d| d.is_a?(Document) }.first
@@ -143,10 +143,10 @@ def assert_equal_value(key, one, other)
           "values" => {
             "nested" => {
               "test1" => "default1",
-              "test2" => "default1"
-            }
-          }
-        }]
+              "test2" => "default1",
+            },
+          },
+        },],
       })
       @site.process
       @document = @site.collections["slides"].docs[1]
@@ -170,10 +170,10 @@ def assert_equal_value(key, one, other)
           "scope"  => { "path"=>"_slides", "type"=>"slides" },
           "values" => {
             "nested" => {
-              "key" => "value123"
-            }
-          }
-        }]
+              "key" => "value123",
+            },
+          },
+        },],
       })
       @site.process
       @document = @site.collections["slides"].docs.first
@@ -194,10 +194,10 @@ def assert_equal_value(key, one, other)
           "scope"  => { "path"=>"somepath", "type"=>"slides" },
           "values" => {
             "nested" => {
-              "key" => "myval"
-            }
-          }
-        }]
+              "key" => "myval",
+            },
+          },
+        },],
       })
       @site.process
       @document = @site.collections["slides"].docs.first
@@ -213,7 +213,7 @@ def assert_equal_value(key, one, other)
   context "a document in a collection with a custom permalink" do
     setup do
       @site = fixture_site({
-        "collections" => ["slides"]
+        "collections" => ["slides"],
       })
       @site.process
       @document = @site.collections["slides"].docs[2]
@@ -235,10 +235,10 @@ def assert_equal_value(key, one, other)
         "collections" => {
           "slides" => {
             "output"    => true,
-            "permalink" => "/slides/test/:name"
-          }
+            "permalink" => "/slides/test/:name",
+          },
         },
-        "permalink"   => "pretty"
+        "permalink"   => "pretty",
       })
       @site.process
       @document = @site.collections["slides"].docs[0]
@@ -263,9 +263,9 @@ def assert_equal_value(key, one, other)
       @site = fixture_site({
         "collections" => {
           "slides" => {
-            "output" => true
-          }
-        }
+            "output" => true,
+          },
+        },
       })
       @site.permalink_style = :pretty
       @site.process
@@ -287,9 +287,9 @@ def assert_equal_value(key, one, other)
       @site = fixture_site({
         "collections" => {
           "slides" => {
-            "output" => true
-          }
-        }
+            "output" => true,
+          },
+        },
       })
       @site.permalink_style = :pretty
       @site.process
@@ -307,9 +307,9 @@ def assert_equal_value(key, one, other)
       @site = fixture_site({
         "collections" => {
           "slides" => {
-            "output" => true
-          }
-        }
+            "output" => true,
+          },
+        },
       })
       @site.process
       @document = @site.collections["slides"].docs[6]
@@ -339,9 +339,9 @@ def assert_equal_value(key, one, other)
         "collections" => {
           "slides" => {
             "output"    => true,
-            "permalink" => "/slides/:title"
-          }
-        }
+            "permalink" => "/slides/:title",
+          },
+        },
       })
       @site.process
       @document = @site.collections["slides"].docs[3]
@@ -381,8 +381,8 @@ def assert_equal_value(key, one, other)
   context "document with a permalink with dots & a trailing slash" do
     setup do
       @site = fixture_site({ "collections" => {
-        "with.dots" => { "output" => true }
-      } })
+        "with.dots" => { "output" => true },
+      }, })
       @site.process
       @document = @site.collections["with.dots"].docs.last
       @dest_file = dest_dir("with.dots", "permalink.with.slash.tho", "index.html")
@@ -406,9 +406,9 @@ def assert_equal_value(key, one, other)
       @site = fixture_site({
         "collections" => {
           "slides" => {
-            "output" => true
-          }
-        }
+            "output" => true,
+          },
+        },
       })
       @site.process
       @files = @site.collections["slides"].docs
@@ -436,9 +436,9 @@ def assert_equal_value(key, one, other)
       @site = fixture_site({
         "collections" => {
           "slides" => {
-            "output" => true
-          }
-        }
+            "output" => true,
+          },
+        },
       })
       @site.process
       @document = @site.collections["slides"].files.find do |doc|
@@ -469,9 +469,9 @@ def assert_equal_value(key, one, other)
       @site = fixture_site({
         "collections" => {
           "methods" => {
-            "output" => true
-          }
-        }
+            "output" => true,
+          },
+        },
       })
       @site.process
       @document = @site.collections["methods"].docs.find do |doc|
@@ -498,9 +498,9 @@ def assert_equal_value(key, one, other)
       @site = fixture_site({
         "collections" => {
           "methods" => {
-            "output" => true
-          }
-        }
+            "output" => true,
+          },
+        },
       })
       @site.process
       @document = @site.collections["methods"].docs.find do |doc|
diff --git a/test/test_drop.rb b/test/test_drop.rb
index 199e94ab075..80b0d0ff693 100644
--- a/test/test_drop.rb
+++ b/test/test_drop.rb
@@ -4,7 +4,7 @@ class TestDrop < JekyllUnitTest
   context "a document drop" do
     setup do
       @site = fixture_site({
-        "collections" => ["methods"]
+        "collections" => ["methods"],
       })
       @site.process
       @document = @site.collections["methods"].docs.detect do |d|
diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb
index f65badc67ea..7f32653c957 100644
--- a/test/test_entry_filter.rb
+++ b/test/test_entry_filter.rb
@@ -17,7 +17,7 @@ class TestEntryFilter < JekyllUnitTest
     should "allow regexp filtering" do
       files = %w(README.md)
       @site.exclude = [
-        %r!README!
+        %r!README!,
       ]
 
       assert_empty @site.reader.filter_entries(
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index 0b7e540fc6f..e0960f69663 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -4,13 +4,13 @@ class TestExcerpt < JekyllUnitTest
   def setup_post(file)
     Document.new(@site.in_source_dir(File.join("_posts", file)), {
       :site       => @site,
-      :collection => @site.posts
+      :collection => @site.posts,
     }).tap(&:read)
   end
 
   def do_render(document)
     @site.layouts = {
-      "default" => Layout.new(@site, source_dir("_layouts"), "simple.html")
+      "default" => Layout.new(@site, source_dir("_layouts"), "simple.html"),
     }
     document.output = Jekyll::Renderer.new(@site, document, @site.site_payload).run
   end
diff --git a/test/test_filters.rb b/test/test_filters.rb
index e5dedfae9ad..71639ad7824 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -29,7 +29,7 @@ def select; end
       @filter = make_filter_mock({
         "timezone" => "UTC",
         "url"      => "http://example.com",
-        "baseurl"  => "/base"
+        "baseurl"  => "/base",
       })
       @sample_time = Time.utc(2013, 3, 27, 11, 22, 33)
       @sample_date = Date.parse("2013-03-27")
@@ -39,7 +39,7 @@ def select; end
       @array_of_objects = [
         { "color" => "red",  "size" => "large"  },
         { "color" => "red",  "size" => "medium" },
-        { "color" => "blue", "size" => "medium" }
+        { "color" => "blue", "size" => "medium" },
       ]
     end
 
@@ -332,7 +332,7 @@ def select; end
         page_url = "about/my_favorite_page/"
         filter = make_filter_mock({
           "url"     => "http://example.com",
-          "baseurl" => "base"
+          "baseurl" => "base",
         })
         assert_equal "http://example.com/base/#{page_url}", filter.absolute_url(page_url)
       end
@@ -341,7 +341,7 @@ def select; end
         page_url = "about/my_favorite_page/"
         filter = make_filter_mock({
           "url"     => "",
-          "baseurl" => "base"
+          "baseurl" => "base",
         })
         assert_equal "/base/#{page_url}", filter.absolute_url(page_url)
       end
@@ -350,7 +350,7 @@ def select; end
         page_url = "about/my_favorite_page/"
         filter = make_filter_mock({
           "url"     => nil,
-          "baseurl" => "base"
+          "baseurl" => "base",
         })
         assert_equal "/base/#{page_url}", filter.absolute_url(page_url)
       end
@@ -359,7 +359,7 @@ def select; end
         page_url = "about/my_favorite_page/"
         filter = make_filter_mock({
           "url"     => "http://example.com",
-          "baseurl" => nil
+          "baseurl" => nil,
         })
         assert_equal "http://example.com/#{page_url}", filter.absolute_url(page_url)
       end
@@ -368,7 +368,7 @@ def select; end
         page_url = ""
         filter = make_filter_mock({
           "url"     => "http://example.com",
-          "baseurl" => "/base"
+          "baseurl" => "/base",
         })
         assert_equal "http://example.com/base", filter.absolute_url(page_url)
       end
@@ -377,7 +377,7 @@ def select; end
         page_url = ""
         filter = make_filter_mock({
           "url"     => "http://ümlaut.example.org/",
-          "baseurl" => nil
+          "baseurl" => nil,
         })
         assert_equal "http://xn--mlaut-jva.example.org/", filter.absolute_url(page_url)
       end
@@ -409,7 +409,7 @@ def select; end
         page_url = "about/my_favorite_page/"
         filter = make_filter_mock({
           "url"     => "http://example.com",
-          "baseurl" => nil
+          "baseurl" => nil,
         })
         assert_equal "/#{page_url}", filter.relative_url(page_url)
       end
@@ -418,7 +418,7 @@ def select; end
         page_url = ""
         filter = make_filter_mock({
           "url"     => "http://example.com",
-          "baseurl" => "/base"
+          "baseurl" => "/base",
         })
         assert_equal "/base", filter.relative_url(page_url)
       end
@@ -451,7 +451,7 @@ def select; end
           "excerpt"       => "
    This should be published.
    \n",
           "draft"         => false,
           "categories"    => [
-            "publish_test"
+            "publish_test",
           ],
           "layout"        => "default",
           "title"         => "Publish",
@@ -459,7 +459,7 @@ def select; end
           "date"          => "2008-02-02 00:00:00 +0000",
           "slug"          => "published",
           "ext"           => ".markdown",
-          "tags"          => []
+          "tags"          => [],
         }
         actual = JSON.parse(@filter.jsonify(@filter.site.docs_to_write.first.to_liquid))
 
@@ -475,7 +475,7 @@ def select; end
         actual = @filter.jsonify(@filter.site.to_liquid)
         assert_equal JSON.parse(actual)["jekyll"], {
           "environment" => "development",
-          "version"     => Jekyll::VERSION
+          "version"     => Jekyll::VERSION,
         }
       end
 
@@ -491,7 +491,7 @@ def to_liquid
             "name" => name,
             :v     => 1,
             :thing => M.new({ :kay => "jewelers" }),
-            :stuff => true
+            :stuff => true,
           }
         end
       end
@@ -503,21 +503,21 @@ def to_liquid
             "v"     => 1,
             "thing" => [
               {
-                "kay" => "jewelers"
-              }
+                "kay" => "jewelers",
+              },
             ],
-            "stuff" => true
+            "stuff" => true,
           },
           {
             "name"  => "Smathers",
             "v"     => 1,
             "thing" => [
               {
-                "kay" => "jewelers"
-              }
+                "kay" => "jewelers",
+              },
             ],
-            "stuff" => true
-          }
+            "stuff" => true,
+          },
         ]
         result = @filter.jsonify([T.new("Jeremiah"), T.new("Smathers")])
         assert_equal expected, JSON.parse(result)
@@ -533,32 +533,32 @@ def to_liquid
               "v"     => 1,
               "thing" => [
                 {
-                  "kay" => "jewelers"
-                }
+                  "kay" => "jewelers",
+                },
               ],
-              "stuff" => true
+              "stuff" => true,
             },
             {
               "name"  => 1,
               "v"     => 1,
               "thing" => [
                 {
-                  "kay" => "jewelers"
-                }
+                  "kay" => "jewelers",
+                },
               ],
-              "stuff" => true
+              "stuff" => true,
             },
             {
               "name"  => 2,
               "v"     => 1,
               "thing" => [
                 {
-                  "kay" => "jewelers"
-                }
+                  "kay" => "jewelers",
+                },
               ],
-              "stuff" => true
-            }
-          ]
+              "stuff" => true,
+            },
+          ],
         }
         result = @filter.jsonify(my_hash)
         assert_equal expected, JSON.parse(result)
@@ -633,7 +633,7 @@ def to_liquid
         hash = {
           "a" => { "tags"=>%w(x y) },
           "b" => { "tags"=>["x"] },
-          "c" => { "tags"=>%w(y z) }
+          "c" => { "tags"=>%w(y z) },
         }
         assert_equal 2, @filter.where(hash, "tags", "x").length
       end
@@ -642,7 +642,7 @@ def to_liquid
         hash = {
           "a" => { "tags"=>%w(x y) },
           "b" => { "tags"=>"x" },
-          "c" => { "tags"=>%w(y z) }
+          "c" => { "tags"=>%w(y z) },
         }
         assert_equal 2, @filter.where(hash, "tags", "x").length
       end
@@ -651,7 +651,7 @@ def to_liquid
         hash = {
           "a" => { "category"=>"bear" },
           "b" => { "category"=>"wolf" },
-          "c" => { "category"=>%w(bear lion) }
+          "c" => { "category"=>%w(bear lion) },
         }
         assert_equal 0, @filter.where(hash, "category", "ear").length
       end
@@ -660,7 +660,7 @@ def to_liquid
         hash = {
           "The Words" => { "rating" => 1.2, "featured" => false },
           "Limitless" => { "rating" => 9.2, "featured" => true },
-          "Hustle"    => { "rating" => 4.7, "featured" => true }
+          "Hustle"    => { "rating" => 4.7, "featured" => true },
         }
 
         results = @filter.where(hash, "featured", "true")
@@ -704,7 +704,7 @@ def to_liquid
         hash = {
           "The Words" => { "rating" => 1.2, "featured" => false },
           "Limitless" => { "rating" => 9.2, "featured" => true },
-          "Hustle"    => { "rating" => 4.7, "featured" => true }
+          "Hustle"    => { "rating" => 4.7, "featured" => true },
         }
 
         results = @filter.where_exp(hash, "item", "item.featured == true")
@@ -725,7 +725,7 @@ def to_liquid
         { "id" => "a", "groups" => [1, 2] },
         { "id" => "b", "groups" => [2, 3] },
         { "id" => "c" },
-        { "id" => "d", "groups" => [1, 3] }
+        { "id" => "d", "groups" => [1, 3] },
       ]
       should "filter with the contains operator over arrays" do
         results = @filter.where_exp(objects, "obj", "obj.groups contains 1")
@@ -807,7 +807,7 @@ def to_liquid
         items = [
           { "version"=>"1.0", "result"=>"slow" },
           { "version"=>"1.1.5", "result"=>"medium" },
-          { "version"=>"2.7.3", "result"=>"fast" }
+          { "version"=>"2.7.3", "result"=>"fast" },
         ]
 
         result = @filter.group_by_exp(items, "item", "item.version | split: '.' | first")
diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb
index 30c713aca60..0d066c11f15 100644
--- a/test/test_front_matter_defaults.rb
+++ b/test/test_front_matter_defaults.rb
@@ -7,12 +7,12 @@ class TestFrontMatterDefaults < JekyllUnitTest
         "defaults" => [{
           "scope"  => {
             "path" => "contacts",
-            "type" => "page"
+            "type" => "page",
           },
           "values" => {
-            "key" => "val"
-          }
-        }]
+            "key" => "val",
+          },
+        },],
       })
       @site.process
       @affected = @site.pages.find { |page| page.relative_path == "contacts/bar.html" }
@@ -30,12 +30,12 @@ class TestFrontMatterDefaults < JekyllUnitTest
       @site = fixture_site({
         "defaults" => [{
           "scope"  => {
-            "path" => "index.html"
+            "path" => "index.html",
           },
           "values" => {
-            "key" => "val"
-          }
-        }]
+            "key" => "val",
+          },
+        },],
       })
 
       @site.process
@@ -54,12 +54,12 @@ class TestFrontMatterDefaults < JekyllUnitTest
       @site = fixture_site({
         "defaults" => [{
           "scope"  => {
-            "path" => "win"
+            "path" => "win",
           },
           "values" => {
-            "key" => "val"
-          }
-        }]
+            "key" => "val",
+          },
+        },],
       })
 
       @site.process
@@ -78,12 +78,12 @@ class TestFrontMatterDefaults < JekyllUnitTest
       @site = fixture_site({
         "defaults" => [{
           "scope"  => {
-            "type" => "page"
+            "type" => "page",
           },
           "values" => {
-            "key" => "val"
-          }
-        }]
+            "key" => "val",
+          },
+        },],
       })
 
       @site.process
@@ -103,12 +103,12 @@ class TestFrontMatterDefaults < JekyllUnitTest
       @site = fixture_site({
         "defaults" => [{
           "scope"  => {
-            "type" => "pages"
+            "type" => "pages",
           },
           "values" => {
-            "key" => "val"
-          }
-        }]
+            "key" => "val",
+          },
+        },],
       })
       @site.process
       @affected = @site.pages
@@ -129,9 +129,9 @@ class TestFrontMatterDefaults < JekyllUnitTest
           "scope"  => {
           },
           "values" => {
-            "key" => "val"
-          }
-        }]
+            "key" => "val",
+          },
+        },],
       })
       @site.process
       @affected = @site.pages
@@ -149,9 +149,9 @@ class TestFrontMatterDefaults < JekyllUnitTest
       @site = fixture_site({
         "defaults" => [{
           "values" => {
-            "key" => "val"
-          }
-        }]
+            "key" => "val",
+          },
+        },],
       })
       @site.process
       @affected = @site.pages
@@ -171,9 +171,9 @@ class TestFrontMatterDefaults < JekyllUnitTest
         "destination" => dest_dir,
         "defaults"    => [{
           "values" => {
-            "date" => "2015-01-01 00:00:01"
-          }
-        }]
+            "date" => "2015-01-01 00:00:01",
+          },
+        },],
       }))
     end
 
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index 0a6332f8bdd..d8f886a4c1a 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -16,9 +16,9 @@ class TestKramdown < JekyllUnitTest
 
           "syntax_highlighter"      => "rouge",
           "syntax_highlighter_opts" => {
-            "bold_every" => 8, "css" => :class
-          }
-        }
+            "bold_every" => 8, "css" => :class,
+          },
+        },
       }
 
       @config = Jekyll.configuration(@config)
@@ -43,8 +43,8 @@ class TestKramdown < JekyllUnitTest
         override = {
           "highlighter" => nil,
           "kramdown"    => {
-            "smart_quotes" => "lsaquo,rsaquo,laquo,raquo"
-          }
+            "smart_quotes" => "lsaquo,rsaquo,laquo,raquo",
+          },
         }
 
         markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, override))
@@ -70,8 +70,8 @@ class TestKramdown < JekyllUnitTest
           "highlighter" => nil,
           "markdown"    => "kramdown",
           "kramdown"    => {
-            "syntax_highlighter" => :coderay
-          }
+            "syntax_highlighter" => :coderay,
+          },
         }
 
         markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, override))
@@ -89,8 +89,8 @@ class TestKramdown < JekyllUnitTest
         override = {
           "markdown" => "kramdown",
           "kramdown" => {
-            "enable_coderay" => true
-          }
+            "enable_coderay" => true,
+          },
         }
 
         @config.delete("highlighter")
@@ -115,9 +115,9 @@ class TestKramdown < JekyllUnitTest
         "kramdown"   => {
           "syntax_highlighter" => "coderay",
           "coderay"            => {
-            "hello" => "world"
-          }
-        }
+            "hello" => "world",
+          },
+        },
       }))
 
       expect(Kramdown::Document).to receive(:new) do |arg1, hash|
diff --git a/test/test_layout_reader.rb b/test/test_layout_reader.rb
index 133cd6f219c..1d32fa57892 100644
--- a/test/test_layout_reader.rb
+++ b/test/test_layout_reader.rb
@@ -4,7 +4,7 @@ class TestLayoutReader < JekyllUnitTest
   context "reading layouts" do
     setup do
       config = Jekyll::Configuration::DEFAULTS.merge({ "source"      => source_dir,
-                                                       "destination" => dest_dir })
+                                                       "destination" => dest_dir, })
       @site = fixture_site(config)
     end
 
diff --git a/test/test_liquid_renderer.rb b/test/test_liquid_renderer.rb
index 7d429c52a24..6ba29299d67 100644
--- a/test/test_liquid_renderer.rb
+++ b/test/test_liquid_renderer.rb
@@ -16,7 +16,7 @@ class TestLiquidRenderer < JekyllUnitTest
       expected = [
         %r!^Filename\s+|\s+Count\s+|\s+Bytes\s+|\s+Time$!,
         %r!^-+\++-+\++-+\++-+$!,
-        %r!^_posts/2010-01-09-date-override\.markdown\s+|\s+\d+\s+|\s+\d+\.\d{2}K\s+|\s+\d+\.\d{3}$!
+        %r!^_posts/2010-01-09-date-override\.markdown\s+|\s+\d+\s+|\s+\d+\.\d{2}K\s+|\s+\d+\.\d{3}$!,
       ]
       # rubocop:enable Metrics/LineLength
 
diff --git a/test/test_page.rb b/test/test_page.rb
index 259de1858b4..431c57a63ca 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -12,7 +12,7 @@ def setup_page(*args)
 
   def do_render(page)
     layouts = {
-      "default" => Layout.new(@site, source_dir("_layouts"), "simple.html")
+      "default" => Layout.new(@site, source_dir("_layouts"), "simple.html"),
     }
     page.render(layouts, @site.site_payload)
   end
@@ -23,7 +23,7 @@ def do_render(page)
       @site = Site.new(Jekyll.configuration({
         "source"            => source_dir,
         "destination"       => dest_dir,
-        "skip_config_files" => true
+        "skip_config_files" => true,
       }))
     end
 
@@ -90,7 +90,7 @@ def do_render(page)
           :permalink => "/properties/",
           :published => nil,
           :title     => "Properties Page",
-          :url       => "/properties/"
+          :url       => "/properties/",
         }
 
         attrs.each do |attr, val|
diff --git a/test/test_plugin_manager.rb b/test/test_plugin_manager.rb
index c625c3a84a2..702df593bb8 100644
--- a/test/test_plugin_manager.rb
+++ b/test/test_plugin_manager.rb
@@ -68,7 +68,7 @@ def with_no_gemfile
     should "require plugin files" do
       site = double({ :safe          => false,
                       :config        => { "plugins_dir" => "_plugins" },
-                      :in_source_dir => "/tmp/" })
+                      :in_source_dir => "/tmp/", })
       plugin_manager = PluginManager.new(site)
 
       expect(Jekyll::External).to receive(:require_with_graceful_fail)
@@ -98,9 +98,9 @@ def with_no_gemfile
     should "call site's in_source_dir" do
       site = double({
         :config        => {
-          "plugins_dir" => Jekyll::Configuration::DEFAULTS["plugins_dir"]
+          "plugins_dir" => Jekyll::Configuration::DEFAULTS["plugins_dir"],
         },
-        :in_source_dir => "/tmp/"
+        :in_source_dir => "/tmp/",
       })
       plugin_manager = PluginManager.new(site)
 
@@ -132,7 +132,7 @@ def with_no_gemfile
 
     should "print no deprecation warning if jekyll-paginate is present" do
       site = double({
-        :config => { "paginate" => true, "gems" => ["jekyll-paginate"] }
+        :config => { "paginate" => true, "gems" => ["jekyll-paginate"] },
       })
       plugin_manager = PluginManager.new(site)
 
diff --git a/test/test_rdiscount.rb b/test/test_rdiscount.rb
index 9390aaed080..32289a64368 100644
--- a/test/test_rdiscount.rb
+++ b/test/test_rdiscount.rb
@@ -13,8 +13,8 @@ class TestRdiscount < JekyllUnitTest
         "markdown"  => "rdiscount",
         "rdiscount" => {
           "toc_token"  => "{:toc}",
-          "extensions" => %w(smart generate_toc)
-        }
+          "extensions" => %w(smart generate_toc),
+        },
       }
 
       @markdown = Converters::Markdown.new config
diff --git a/test/test_redcarpet.rb b/test/test_redcarpet.rb
index 140fabbea9b..4e979f4d2ee 100644
--- a/test/test_redcarpet.rb
+++ b/test/test_redcarpet.rb
@@ -12,8 +12,8 @@ class TestRedcarpet < JekyllUnitTest
       @config = {
         "markdown"  => "redcarpet",
         "redcarpet" => {
-          "extensions" => %w(smart strikethrough filter_html)
-        }
+          "extensions" => %w(smart strikethrough filter_html),
+        },
       }
 
       @markdown = Converters::Markdown.new @config
diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb
index 03920c83022..9e1559d4bec 100644
--- a/test/test_regenerator.rb
+++ b/test/test_regenerator.rb
@@ -8,10 +8,10 @@ class TestRegenerator < JekyllUnitTest
       @site = fixture_site({
         "collections" => {
           "methods" => {
-            "output" => true
-          }
+            "output" => true,
+          },
         },
-        "incremental" => true
+        "incremental" => true,
       })
 
       @site.read
@@ -92,7 +92,7 @@ class TestRegenerator < JekyllUnitTest
     setup do
       FileUtils.rm_rf(source_dir(".jekyll-metadata"))
       @site = fixture_site({
-        "incremental" => true
+        "incremental" => true,
       })
 
       @site.read
@@ -129,7 +129,7 @@ class TestRegenerator < JekyllUnitTest
       @site = Site.new(Jekyll.configuration({
         "source"      => source_dir,
         "destination" => dest_dir,
-        "incremental" => true
+        "incremental" => true,
       }))
 
       @site.process
@@ -311,7 +311,7 @@ class TestRegenerator < JekyllUnitTest
       @site = Site.new(Jekyll.configuration({
         "source"      => source_dir,
         "destination" => dest_dir,
-        "incremental" => false
+        "incremental" => false,
       }))
 
       @site.process
diff --git a/test/test_related_posts.rb b/test/test_related_posts.rb
index ef7265ef01d..2d6165505e3 100644
--- a/test/test_related_posts.rb
+++ b/test/test_related_posts.rb
@@ -28,7 +28,7 @@ class TestRelatedPosts < JekyllUnitTest
 
       allow_any_instance_of(Jekyll::RelatedPosts).to receive(:display)
       @site = fixture_site({
-        "lsi" => true
+        "lsi" => true,
       })
 
       @site.reset
diff --git a/test/test_sass.rb b/test/test_sass.rb
index f5241790497..3a9df0aeae3 100644
--- a/test/test_sass.rb
+++ b/test/test_sass.rb
@@ -5,7 +5,7 @@ class TestSass < JekyllUnitTest
     setup do
       @site = Jekyll::Site.new(Jekyll.configuration({
         "source"      => source_dir,
-        "destination" => dest_dir
+        "destination" => dest_dir,
       }))
       @site.process
       @test_css_file = dest_dir("css/main.css")
diff --git a/test/test_site.rb b/test/test_site.rb
index 81da363d2d6..bbf42d25656 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -20,7 +20,7 @@ class TestSite < JekyllUnitTest
 
     should "have an array for plugins if passed as an array" do
       site = Site.new(site_configuration({
-        "plugins_dir" => ["/tmp/plugins", "/tmp/otherplugins"]
+        "plugins_dir" => ["/tmp/plugins", "/tmp/otherplugins"],
       }))
       array = if Utils::Platforms.windows?
                 ["C:/tmp/plugins", "C:/tmp/otherplugins"]
@@ -485,7 +485,7 @@ def convert(*_args)
     context "manipulating the Jekyll environment" do
       setup do
         @site = Site.new(site_configuration({
-          "incremental" => false
+          "incremental" => false,
         }))
         @site.process
         @page = @site.pages.find { |p| p.name == "environment.html" }
@@ -499,7 +499,7 @@ def convert(*_args)
         setup do
           ENV["JEKYLL_ENV"] = "production"
           @site = Site.new(site_configuration({
-            "incremental" => false
+            "incremental" => false,
           }))
           @site.process
           @page = @site.pages.find { |p| p.name == "environment.html" }
@@ -565,7 +565,7 @@ def convert(*_args)
     context "incremental build" do
       setup do
         @site = Site.new(site_configuration({
-          "incremental" => true
+          "incremental" => true,
         }))
         @site.read
       end
diff --git a/test/test_static_file.rb b/test/test_static_file.rb
index 2be800a662c..dd3515f6c0e 100644
--- a/test/test_static_file.rb
+++ b/test/test_static_file.rb
@@ -95,8 +95,8 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
     should "use the _config.yml defaults to determine writability" do
       defaults = [{
         "scope"  => { "path" => "private" },
-        "values" => { "published" => false }
-      }]
+        "values" => { "published" => false },
+      },]
       static_file = setup_static_file_with_defaults(
         "root",
         "private/dir/subdir",
@@ -146,7 +146,7 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
         "name"          => "static_file.txt",
         "extname"       => ".txt",
         "modified_time" => @static_file.modified_time,
-        "path"          => "/static_file.txt"
+        "path"          => "/static_file.txt",
       }
       assert_equal expected, @static_file.to_liquid
     end
diff --git a/test/test_tags.rb b/test/test_tags.rb
index fd6dcb9783e..a636abf6131 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -17,7 +17,7 @@ def create_post(content, override = {}, converter_class = Jekyll::Converters::Ma
     info = { :filters => [Jekyll::Filters], :registers => { :site => site } }
     @converter = site.converters.find { |c| c.class == converter_class }
     payload = { "highlighter_prefix" => @converter.highlighter_prefix,
-                "highlighter_suffix" => @converter.highlighter_suffix }
+                "highlighter_suffix" => @converter.highlighter_suffix, }
 
     @result = Liquid::Template.parse(content).render!(payload, info)
     @result = @converter.convert(@result)
@@ -487,7 +487,7 @@ def highlight_block_with_opts(options_string)
         end
 
         create_post(@content, {
-          "markdown" => "rdiscount"
+          "markdown" => "rdiscount",
         })
       end
 
@@ -517,7 +517,7 @@ def highlight_block_with_opts(options_string)
         end
 
         create_post(@content, {
-          "markdown" => "redcarpet"
+          "markdown" => "redcarpet",
         })
       end
 
@@ -541,7 +541,7 @@ def highlight_block_with_opts(options_string)
         "permalink"   => "pretty",
         "source"      => source_dir,
         "destination" => dest_dir,
-        "read_posts"  => true
+        "read_posts"  => true,
       })
     end
 
@@ -567,7 +567,7 @@ def highlight_block_with_opts(options_string)
         "permalink"   => "pretty",
         "source"      => source_dir,
         "destination" => dest_dir,
-        "read_posts"  => true
+        "read_posts"  => true,
       })
     end
 
@@ -596,7 +596,7 @@ def highlight_block_with_opts(options_string)
         "permalink"   => "pretty",
         "source"      => source_dir,
         "destination" => dest_dir,
-        "read_posts"  => true
+        "read_posts"  => true,
       })
     end
 
@@ -628,7 +628,7 @@ def highlight_block_with_opts(options_string)
         "permalink"   => "pretty",
         "source"      => source_dir,
         "destination" => dest_dir,
-        "read_posts"  => true
+        "read_posts"  => true,
       })
     end
 
@@ -664,7 +664,7 @@ def highlight_block_with_opts(options_string)
           "permalink"   => "pretty",
           "source"      => source_dir,
           "destination" => dest_dir,
-          "read_posts"  => true
+          "read_posts"  => true,
         })
       end
     end
@@ -683,7 +683,7 @@ def highlight_block_with_opts(options_string)
           "permalink"   => "pretty",
           "source"      => source_dir,
           "destination" => dest_dir,
-          "read_posts"  => true
+          "read_posts"  => true,
         })
       end
     end
@@ -703,7 +703,7 @@ def highlight_block_with_opts(options_string)
       create_post(content, {
         "source"      => source_dir,
         "destination" => dest_dir,
-        "read_all"    => true
+        "read_all"    => true,
       })
     end
 
@@ -737,7 +737,7 @@ def highlight_block_with_opts(options_string)
         "source"           => source_dir,
         "destination"      => dest_dir,
         "collections"      => { "methods" => { "output" => true } },
-        "read_collections" => true
+        "read_collections" => true,
       })
     end
 
@@ -764,7 +764,7 @@ def highlight_block_with_opts(options_string)
         "source"           => source_dir,
         "destination"      => dest_dir,
         "collections"      => { "methods" => { "output" => true } },
-        "read_collections" => true
+        "read_collections" => true,
       })
     end
 
@@ -796,7 +796,7 @@ def highlight_block_with_opts(options_string)
           "source"           => source_dir,
           "destination"      => dest_dir,
           "collections"      => { "methods" => { "output" => true } },
-          "read_collections" => true
+          "read_collections" => true,
         })
       end
     end
@@ -820,7 +820,7 @@ def highlight_block_with_opts(options_string)
             "source"      => source_dir,
             "destination" => dest_dir,
             "read_posts"  => true,
-            "safe"        => true
+            "safe"        => true,
           })
         end
         @result ||= ""
@@ -842,7 +842,7 @@ def highlight_block_with_opts(options_string)
             "source"      => source_dir,
             "destination" => dest_dir,
             "read_posts"  => true,
-            "safe"        => true
+            "safe"        => true,
           })
         end
         assert_match(
@@ -868,7 +868,7 @@ def highlight_block_with_opts(options_string)
           "permalink"   => "pretty",
           "source"      => source_dir,
           "destination" => dest_dir,
-          "read_posts"  => true
+          "read_posts"  => true,
         })
       end
 
@@ -896,7 +896,7 @@ def highlight_block_with_opts(options_string)
             "permalink"   => "pretty",
             "source"      => source_dir,
             "destination" => dest_dir,
-            "read_posts"  => true
+            "read_posts"  => true,
           })
         end
 
@@ -913,7 +913,7 @@ def highlight_block_with_opts(options_string)
             "permalink"   => "pretty",
             "source"      => source_dir,
             "destination" => dest_dir,
-            "read_posts"  => true
+            "read_posts"  => true,
           })
         end
       end
@@ -932,7 +932,7 @@ def highlight_block_with_opts(options_string)
           "permalink"   => "pretty",
           "source"      => source_dir,
           "destination" => dest_dir,
-          "read_posts"  => true
+          "read_posts"  => true,
         })
       end
 
@@ -959,7 +959,7 @@ def highlight_block_with_opts(options_string)
           "permalink"   => "pretty",
           "source"      => source_dir,
           "destination" => dest_dir,
-          "read_posts"  => true
+          "read_posts"  => true,
         })
       end
 
@@ -982,7 +982,7 @@ def highlight_block_with_opts(options_string)
           "permalink"    => "pretty",
           "source"       => source_dir,
           "destination"  => dest_dir,
-          "read_posts"   => true
+          "read_posts"   => true,
         })
       end
 
@@ -1004,7 +1004,7 @@ def highlight_block_with_opts(options_string)
           "permalink"   => "pretty",
           "source"      => source_dir,
           "destination" => dest_dir,
-          "read_posts"  => true
+          "read_posts"  => true,
         })
       end
 
@@ -1030,7 +1030,7 @@ def highlight_block_with_opts(options_string)
             "permalink"   => "pretty",
             "source"      => source_dir,
             "destination" => dest_dir,
-            "read_posts"  => true
+            "read_posts"  => true,
           })
         end
         assert_match(
@@ -1125,7 +1125,7 @@ def highlight_block_with_opts(options_string)
               "permalink"   => "pretty",
               "source"      => source_dir,
               "destination" => dest_dir,
-              "read_posts"  => true
+              "read_posts"  => true,
             })
           end
           assert_match "Could not locate the included file 'missing.html' in any of " \
@@ -1150,7 +1150,7 @@ def highlight_block_with_opts(options_string)
               "permalink"   => "pretty",
               "source"      => source_dir,
               "destination" => dest_dir,
-              "read_posts"  => true
+              "read_posts"  => true,
             })
           end
           assert_equal(
@@ -1180,7 +1180,7 @@ def highlight_block_with_opts(options_string)
             "source"      => source_dir,
             "destination" => dest_dir,
             "read_posts"  => true,
-            "safe"        => true
+            "safe"        => true,
           })
         end
         @result ||= ""
@@ -1202,7 +1202,7 @@ def highlight_block_with_opts(options_string)
             "source"      => source_dir,
             "destination" => dest_dir,
             "read_posts"  => true,
-            "safe"        => true
+            "safe"        => true,
           })
         end
         assert_match(

From 27ed81547b12d28a60c51961b82a5723981feb7d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 12 Jan 2017 16:41:16 -0800
Subject: [PATCH 1833/4996] Update history to reflect merge of #5761 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index bb10365f06a..60c9cf21f99 100644
--- a/History.markdown
+++ b/History.markdown
@@ -46,6 +46,7 @@
   * Rubocop: fix Rakefile and gemspec (#5745)
   * Use `assert_nil` (#5725)
   * Sort gems in `jekyll.gemspec` (#5746)
+  * Rubocop: Require consistent comma in multiline literals (#5761)
 
 ### Documentation
 

From 7efeb3d4af68543a9fc88fbdadfff2354c173419 Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Thu, 12 Jan 2017 23:03:56 -0800
Subject: [PATCH 1834/4996] made updates as requested from latest review

---
 docs/_docs/datafiles.md  |   2 +
 docs/_docs/navigation.md | 174 ++++++++++++++++++++-------------------
 docs/_sass/_style.scss   |   3 -
 3 files changed, 91 insertions(+), 88 deletions(-)

diff --git a/docs/_docs/datafiles.md b/docs/_docs/datafiles.md
index 40723d2fab7..59a3ef3ed59 100644
--- a/docs/_docs/datafiles.md
+++ b/docs/_docs/datafiles.md
@@ -70,6 +70,8 @@ You can now render the list of members in a template:
 
 {% endraw %}
 ```
+{: .note .info }
+If your Jekyll site has a lot of pages, such as with documentation websites, we've got you covered with some detailed examples on [how to build robust navigation for your site](..navigation). 
 
 ## Example: Organizations
 
diff --git a/docs/_docs/navigation.md b/docs/_docs/navigation.md
index bbb009c74e6..548013a2d15 100644
--- a/docs/_docs/navigation.md
+++ b/docs/_docs/navigation.md
@@ -49,21 +49,24 @@ docs:
 {% raw %}
    {{ site.data.samplelist.docs_list_title }}
    
 {% endraw %}
 ```
 
 **Result**
-
    
+
    
    
    ACME Documentation
    
    
 
    
 
+{: .note .info }
+For the results in these samples with fictitious page references, `#` is manually substituted for the actual link value to avoid 404 errors.) 
+
 When you use a `for` loop, you choose how you want to refer to the items you're looping through. The variable you choose (in this case, `item`) becomes how you access the properties of each item in the list. Dot notation is used to get a property of the item (for example, `item.url`).
 
 The YAML content has two main types of formats that are relevant here:
@@ -94,10 +97,10 @@ Suppose you wanted to sort the list by the `title`. To do this, convert the refe
 
 **Result**
 
-
    
-   
  • Configuration
    • 
-   
  • Deployment
    • 
-   
  • Introduction
    • 
+
    
+   
  • Configuration
    • 
+   
  • Deployment
    • 
+   
  • Introduction
    • 
 
    
 
 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.
@@ -158,26 +161,26 @@ toc:
 ```
 
 **Result**
-
    
+
    
     
    Group 1
    
       
 
     
    Group 2
    
       
 
     
    Group 3
    
       
 
    
 
@@ -240,64 +243,64 @@ toc2:
 {% raw %}
    
 {% if site.data.samplelist.toc2[0] %}
   {% for item in site.data.samplelist.toc2 %}
-  
    {{ item.title }}
    
-    {% if item.subfolderitems[0] %}
-      
      
-        {% for entry in item.subfolderitems %}
-            
    • {{ entry.page }}
      • 
-              {% if entry.subsubfolderitems[0] %}
-                
-              {% endif %}
-        {% endfor %}
-      
    
-    {% endif %}
-  {% endfor %}
+    
    {{ item.title }}
    
+      {% if item.subfolderitems[0] %}
+        
      
+          {% for entry in item.subfolderitems %}
+              
    • {{ entry.page }}
      • 
+                {% if entry.subsubfolderitems[0] %}
+                  
+                {% endif %}
+          {% endfor %}
+        
    
+      {% endif %}
+    {% endfor %}
 {% endif %}
 
    {% endraw %}
 ```
 
 **Result**
 
-
    
+
    
    
 
    
 
- In this example, `if site.data.samplelist.toc2[0]` is used to ensure that the YAML level actually contains items. If there isn't anything at the `[0]` position, we can skip looking in this level.
+In this example, `if site.data.samplelist.toc2[0]` is used to ensure that the YAML level actually contains items. If there isn't anything at the `[0]` position, we can skip looking in this level.
 
 
    
   
    ProTip: Line up for loops and if statements
    
@@ -324,17 +327,17 @@ sidebar: toc
 ```liquid
 {% raw %}{% endraw %}
 ```
 **Result**
 
-
    
+
    
    
 
    
 
@@ -358,7 +361,8 @@ In addition to inserting items from the YAML data file into your list, you also
 ```liquid
 {% raw %}{% for item in site.data.samplelist.docs %}
     
  • 
-    {{ item.title }}
    • 
+      {{ item.title }}
+    
 {% endfor %}{% endraw %}
 ```
 
@@ -371,10 +375,10 @@ In addition to inserting items from the YAML data file into your list, you also
   }
 
 
-
    
-   
  • Introduction
    • 
-   
  • Configuration
    • 
-   
  • Deployment
    • 
+
    
+   
  • Introduction
    • 
+   
  • Configuration
    • 
+   
  • Deployment
    • 
 
    
 
 In this case, assume `Deployment` is the current page.
@@ -408,19 +412,19 @@ docs2:
 ```liquid
 {% raw %}
      
     {% for item in site.data.samplelist.docs2 %}
-        {% if item.version == 1 %}
-          
    • {{ item.title }}
      • 
-        {% endif %}
+      {% if item.version == 1 %}
+        
    • {{ item.title }}
      • 
+      {% endif %}
     {% endfor %}
 
    {% endraw %}
 ```
 
 **Result**
 
-
    
+
    
    
 
    
 
@@ -488,20 +492,20 @@ If you wanted to simply get all docs in the collection for a specific category,
 {% raw %}
    Getting Started
    
 
      
     {% for doc in site.docs %}
-        {% if doc.category == "getting-started" %}
-          
    • {{ doc.title }}
      • 
-        {% endif %}
+      {% if doc.category == "getting-started" %}
+        
    • {{ doc.title }}
      • 
+      {% endif %}
     {% endfor %}
 
    {% endraw %}
 ```
 
 The result would be as follows:
 
-
    
+
    
    
    Getting Started
    
    
 
    
 
@@ -521,31 +525,31 @@ Here's the code for getting lists of pages grouped under their corresponding cat
 {% for cat in mydocs %}
 
    {{ cat.name | capitalize }}
    
     
      
-        {% assign items = cat.items | sort: 'weight' %}
-        {% for item in items %}
-          
    • {{ item.title }}
      • 
-        {% endfor %}
+      {% assign items = cat.items | sort: 'order' %}
+      {% for item in items %}
+        
    • {{ item.title }}
      • 
+      {% endfor %}
     
    
 {% endfor %}{% endraw %}
 ```
 
 **Result**
 
-
    
+
    
    
    Getting-started
    
    
    
    Configuration
    
    
    
    Deployment
    
    
 
    
 
diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss
index 202644087dd..3a038966558 100644
--- a/docs/_sass/_style.scss
+++ b/docs/_sass/_style.scss
@@ -1035,7 +1035,4 @@ code.output {
 .result {
   border: 1px solid yellow;
   padding: 10px;
-  margin-top: 10px;
-  margin-bottom: 10px;
-  font-size:14px;
 }

From 6d9633e36460d6292414eb8f8173b570ac711f38 Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Thu, 12 Jan 2017 23:28:56 -0800
Subject: [PATCH 1835/4996] making edits from reviews

---
 docs/_docs/datafiles.md  |  3 ++-
 docs/_docs/navigation.md | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/_docs/datafiles.md b/docs/_docs/datafiles.md
index 59a3ef3ed59..3f4644763cd 100644
--- a/docs/_docs/datafiles.md
+++ b/docs/_docs/datafiles.md
@@ -70,8 +70,9 @@ You can now render the list of members in a template:
 
 {% endraw %}
 ```
+
 {: .note .info }
-If your Jekyll site has a lot of pages, such as with documentation websites, we've got you covered with some detailed examples on [how to build robust navigation for your site](..navigation). 
+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](../navigation). 
 
 ## Example: Organizations
 
diff --git a/docs/_docs/navigation.md b/docs/_docs/navigation.md
index 548013a2d15..bd4228e379a 100644
--- a/docs/_docs/navigation.md
+++ b/docs/_docs/navigation.md
@@ -10,7 +10,7 @@ There are two primary ways of retrieving pages on a Jekyll site:
 * **Retrieve pages listed in a YAML data source**. Store the page data in a YAML (or JSON or CSV) file in the `_data` folder, loop through the YAML properties, and insert the values into your theme.
 * **Retrieve pages by looping through the page front matter**. Look through the front matter of your pages to identify certain properties, return those pages, and insert the pages' front matter values into your theme.
 
-The examples that follow start with a basic navigation scenario and add more sophisticated elements to demonstrate different ways of returning the pages. In almost every scenario, you'll see 3 elements:
+The examples that follow start with a basic navigation scenario and add more sophisticated elements to demonstrate different ways of returning the pages. In every scenario, you'll see 3 elements:
 
 * YAML
 * Liquid
@@ -65,7 +65,7 @@ docs:
 
    
 
 {: .note .info }
-For the results in these samples with fictitious page references, `#` is manually substituted for the actual link value to avoid 404 errors.) 
+For the results in these fictitious samples, `#` is manually substituted for the actual link value to avoid 404 errors.) 
 
 When you use a `for` loop, you choose how you want to refer to the items you're looping through. The variable you choose (in this case, `item`) becomes how you access the properties of each item in the list. Dot notation is used to get a property of the item (for example, `item.url`).
 
@@ -434,7 +434,7 @@ The `Deployment` page is excluded because its `version` is `2`.
 
 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.
 
-In this scenario, suppose we have a collection called `_docs`. Collections are often better than pages because they allow you to be more specific in what you're looping through. (Try to avoid scenarios where you loop through large numbers of items, since it will increase your build time. Collections help you narrow the scope. For more information about collections, see [Collections]({% link _docs/collections.md %}).)
+In this scenario, suppose we have a collection called `_docs`. Collections are often better than pages because they allow you to narrow the list of what you're looping through. (Try to avoid scenarios where you loop through large numbers of items, since it will increase your build time. [Collections]({% link _docs/collections.md %}) help you narrow the scope.)
 
 In our scenario, there are 6 docs in the `docs` collection: Sample 1, Sample 2, Topic 1, Topic 2, Widget 1, and Widget 2.
 
@@ -513,7 +513,7 @@ This might be useful if you're setting up a knowledge base and have dozens of to
 
 But let's say you want to sort the items by category and group them under the category name, without hard-coding the category names. To achieve this, you could use two filters:
 
-* `group by`
+* `group_by`
 * `sort`
 
 Here's the code for getting lists of pages grouped under their corresponding category headers:
@@ -571,6 +571,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 [group by in 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 in Liquid's documentation](https://help.shopify.com/themes/liquid/filters/array-filters#sort).
+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.
 
 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.

From a66fd1fa042752d421e248244ebeed27f7ea0459 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 13 Jan 2017 04:59:14 -0500
Subject: [PATCH 1836/4996] Update history to reflect merge of #5758 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 60c9cf21f99..5980801bb88 100644
--- a/History.markdown
+++ b/History.markdown
@@ -67,6 +67,7 @@
   * Fix a minor grammatical mistake on themes' document ### -dev (#5748)
   * Correct comments in data_reader.rb (#5621)
   * Add jekyll-pre-commit to plugins list (#5752)
+  * Update quickstart.md (#5758)
 
 ## 3.3.1 / 2016-11-14
 

From b9ae94387f4b51ddb41dd543515fbfebef59f71f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 14 Jan 2017 00:01:33 -0500
Subject: [PATCH 1837/4996] Update history to reflect merge of #5750 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5980801bb88..2c6b5c7ad33 100644
--- a/History.markdown
+++ b/History.markdown
@@ -14,6 +14,7 @@
   * fix date parsing in file names to be stricter (#5609)
   * Add a module to re-define `ENV["TZ"]` in Windows (#5612)
   * Use each instead of map to actually return nothing (#5668)
+  * include: fix 'no implicit conversion of nil to String' (#5750)
 
 ### Site Enhancements
 

From 59cbdf5935541e0088f086ef07770f2d3f595d3c Mon Sep 17 00:00:00 2001
From: Purplecarrot 
Date: Sat, 14 Jan 2017 10:36:55 +0000
Subject: [PATCH 1838/4996] Correct minor typo

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

diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index cc7387045dd..886dea88640 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -138,7 +138,7 @@ looking at right now is contained in the [docs
 folder]({{ site.repository }}/tree/master/docs) of the same repository.
 
 Please refer to GitHub official documentation on
-[user, organization and projets pages](https://help.github.com/articles/user-organization-and-project-pages/)
+[user, organization and project pages](https://help.github.com/articles/user-organization-and-project-pages/)
 to see more detailed examples.
 
 
    

From 7d5f961dbacac7af9d58cb4d900eadb84d26494d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 14 Jan 2017 07:41:25 -0500
Subject: [PATCH 1839/4996] Update history to reflect merge of #5764 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2c6b5c7ad33..216c887b0f5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -69,6 +69,7 @@
   * Correct comments in data_reader.rb (#5621)
   * Add jekyll-pre-commit to plugins list (#5752)
   * Update quickstart.md (#5758)
+  * Correct minor typo (#5764)
 
 ## 3.3.1 / 2016-11-14
 

From 44324828b4b4b807f8a99fab365d6b29234f045f Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 14 Jan 2017 20:00:36 +0100
Subject: [PATCH 1840/4996] bump Rubocop to latest version

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index eda95e5eb53..ea65fdcc3f0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ group :test do
   gem "nokogiri"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.44.1"
+  gem "rubocop", "~> 0.46"
   gem "test-theme", :path => File.expand_path("./test/fixtures/test-theme", File.dirname(__FILE__))
 
   gem "jruby-openssl" if RUBY_ENGINE == "jruby"

From 5d52074d2d05c2178bb6791b60c5eafb6a7ea320 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 14 Jan 2017 20:01:41 +0100
Subject: [PATCH 1841/4996] appease Rubocop

---
 test/source/_plugins/dummy.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/source/_plugins/dummy.rb b/test/source/_plugins/dummy.rb
index bfd46e1ce03..fd11d0e1044 100644
--- a/test/source/_plugins/dummy.rb
+++ b/test/source/_plugins/dummy.rb
@@ -2,7 +2,6 @@ module Jekyll
   class Dummy < Generator
     priority :high
 
-    def generate(site)
-    end
+    def generate(site) end
   end
 end

From 39b7af373264efeff89af59c23708366bce1b672 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 14 Jan 2017 20:05:11 +0100
Subject: [PATCH 1842/4996] exclude rake tasks and gemspec from metrics

exclude from BlockLength and LineLength metrics
---
 .rubocop.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index 67f212aea57..87d24743abb 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -22,6 +22,8 @@ Metrics/BlockLength:
   Exclude:
     - test/**/*.rb
     - lib/jekyll/configuration.rb
+    - rake/*.rake
+    - jekyll.gemspec
 Metrics/ClassLength:
   Exclude:
     - !ruby/regexp /features\/.*.rb$/
@@ -32,6 +34,8 @@ Metrics/CyclomaticComplexity:
 Metrics/LineLength:
   Exclude:
     - !ruby/regexp /features\/.*.rb/
+    - Rakefile
+    - rake/*.rake
   Max: 90
   Severity: warning
 Metrics/MethodLength:

From 6f8bf2e9501b2e2752effd07bd9cd781194a38a8 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 14 Jan 2017 20:11:30 +0100
Subject: [PATCH 1843/4996] appease rubocop

---
 rake/docs.rake    |  2 +-
 rake/release.rake |  2 +-
 rake/site.rake    | 26 +++++++++++++-------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/rake/docs.rake b/rake/docs.rake
index aec162b59e9..fcae4f20162 100644
--- a/rake/docs.rake
+++ b/rake/docs.rake
@@ -7,7 +7,7 @@
 namespace :docs do
   desc "Release #{docs_name} v#{version}"
   task :release => :build do
-    unless `git branch` =~ /^\* master$/
+    unless `git branch` =~ %r!^\* master$!
       puts "You must be on the master branch to release!"
       exit!
     end
diff --git a/rake/release.rake b/rake/release.rake
index a78690d8726..832b5bb33de 100644
--- a/rake/release.rake
+++ b/rake/release.rake
@@ -6,7 +6,7 @@
 
 desc "Release #{name} v#{version}"
 task :release => :build do
-  unless `git branch` =~ /^\* master$/
+  unless `git branch` =~ %r!^\* master$!
     puts "You must be on the master branch to release!"
     exit!
   end
diff --git a/rake/site.rake b/rake/site.rake
index 2fb4172a351..63b04fc8243 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -13,7 +13,7 @@ namespace :site do
     require "jekyll"
 
     browser_launched = false
-    Jekyll::Hooks.register :site, :post_write do |site|
+    Jekyll::Hooks.register :site, :post_write do |_site|
       next if browser_launched
       browser_launched = true
       Jekyll.logger.info "Opening in browser..."
@@ -26,7 +26,7 @@ namespace :site do
       "source"      => File.expand_path(docs_folder),
       "destination" => File.expand_path("#{docs_folder}/_site"),
       "watch"       => true,
-      "serving"     => true
+      "serving"     => true,
     }
     Jekyll::Commands::Build.process(options)
     Jekyll::Commands::Serve.process(options)
@@ -38,7 +38,7 @@ namespace :site do
     Jekyll::Commands::Build.process({
       "profile"     => true,
       "source"      => File.expand_path(docs_folder),
-      "destination" => File.expand_path("#{docs_folder}/_site")
+      "destination" => File.expand_path("#{docs_folder}/_site"),
     })
   end
   task :build => :generate
@@ -48,7 +48,7 @@ namespace :site do
     Dir.chdir("#{docs_folder}/_sass") do
       sh 'curl "https://necolas.github.io/normalize.css/latest/normalize.css" -o "normalize.scss"'
       sh 'sass "normalize.scss":"_normalize.scss" --style compressed'
-      rm ['normalize.scss', Dir.glob('*.map')].flatten
+      rm ["normalize.scss", Dir.glob("*.map")].flatten
     end
   end
 
@@ -60,40 +60,40 @@ namespace :site do
 
   desc "Create a nicely formatted history page for the jekyll site based on the repo history."
   task :history do
-    siteify_file('History.markdown', { "title" => "History" })
+    siteify_file("History.markdown", { "title" => "History" })
   end
 
   desc "Copy the Code of Conduct"
   task :conduct do
     front_matter = {
       "redirect_from" => "/conduct/index.html",
-      "editable"      => false
+      "editable"      => false,
     }
-    siteify_file('CONDUCT.markdown', front_matter)
+    siteify_file("CONDUCT.markdown", front_matter)
   end
 
   desc "Copy the contributing file"
   task :contributing do
-    siteify_file('.github/CONTRIBUTING.markdown', "title" => "Contributing")
+    siteify_file(".github/CONTRIBUTING.markdown", "title" => "Contributing")
   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 =~ /(beta|rc|alpha)/i
+    File.open("#{docs_folder}/latest_version.txt", "wb") { |f| f.puts(version) } unless version =~ %r!(beta|rc|alpha)!i
   end
 
   namespace :releases do
     desc "Create new release post"
-    task :new, :version do |t, args|
+    task :new, :version do |_t, args|
       raise "Specify a version: rake site:releases:new['1.2.3']" unless args.version
-      today = Time.new.strftime('%Y-%m-%d')
+      today = Time.new.strftime("%Y-%m-%d")
       release = args.version.to_s
-      filename = "#{docs_folder}/_posts/#{today}-jekyll-#{release.split('.').join('-')}-released.markdown"
+      filename = "#{docs_folder}/_posts/#{today}-jekyll-#{release.split(".").join("-")}-released.markdown"
 
       File.open(filename, "wb") do |post|
         post.puts("---")
         post.puts("title: 'Jekyll #{release} Released'")
-        post.puts("date: #{Time.new.strftime('%Y-%m-%d %H:%M:%S %z')}")
+        post.puts("date: #{Time.new.strftime("%Y-%m-%d %H:%M:%S %z")}")
         post.puts("author: ")
         post.puts("version: #{release}")
         post.puts("categories: [release]")

From becdcb5164cbba419abbd0d2f3650ef798d2c393 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 15 Jan 2017 03:47:06 -0500
Subject: [PATCH 1844/4996] Update history to reflect merge of #5765 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 216c887b0f5..eafd41c4516 100644
--- a/History.markdown
+++ b/History.markdown
@@ -48,6 +48,7 @@
   * Use `assert_nil` (#5725)
   * Sort gems in `jekyll.gemspec` (#5746)
   * Rubocop: Require consistent comma in multiline literals (#5761)
+  * Bump rubocop (#5765)
 
 ### Documentation
 

From ecd04badf05094cf65062635248cacebce139a38 Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Sun, 15 Jan 2017 20:35:10 +0100
Subject: [PATCH 1845/4996] throw IncludeTagError if error occurs in included
 file

fixes #5756
---
 features/rendering.feature | 9 +++++++++
 lib/jekyll/tags/include.rb | 8 ++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/features/rendering.feature b/features/rendering.feature
index 5031ef06d8d..fbe9ce57415 100644
--- a/features/rendering.feature
+++ b/features/rendering.feature
@@ -12,6 +12,15 @@ Feature: Rendering
     Then  I should get a non-zero exit-status
     And   I should see "Liquid Exception" in the build output
 
+  Scenario: When receiving bad Liquid in included file
+    Given I have a _includes directory
+    And   I have a "_includes/invalid.html" file that contains "{% INVALID %}"
+    And   I have a "index.html" page with layout "simple" that contains "{% include invalid.html %}"
+    And   I have a simple layout that contains "{{ content }}"
+    When  I run jekyll build
+    Then  I should get a non-zero exit-status
+    And   I should see "Liquid Exception.*Unknown tag 'INVALID' in.*_includes/invalid\.html" in the build output
+
   Scenario: Render Liquid and place in layout
     Given I have a "index.html" page with layout "simple" that contains "Hi there, Jekyll {{ jekyll.environment }}!"
     And I have a simple layout that contains "{{ content }}Ahoy, indeed!"
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index ca74087da28..08843047a2e 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -155,10 +155,14 @@ def load_cached_partial(path, context)
         if cached_partial.key?(path)
           cached_partial[path]
         else
-          cached_partial[path] = context.registers[:site]
+          unparsed_file = context.registers[:site]
             .liquid_renderer
             .file(path)
-            .parse(read_file(path, context))
+          begin
+            cached_partial[path] = unparsed_file.parse(read_file(path, context))
+          rescue Liquid::SyntaxError => ex
+            raise IncludeTagError.new(ex.message, path)
+          end
         end
       end
 

From a30d81ceb899ea33308503743603dace74d2ac98 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 16 Jan 2017 10:26:08 +0100
Subject: [PATCH 1846/4996] bump Rubocop to v47

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index ea65fdcc3f0..f04f7969d34 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ group :test do
   gem "nokogiri"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.46"
+  gem "rubocop", "~> 0.47"
   gem "test-theme", :path => File.expand_path("./test/fixtures/test-theme", File.dirname(__FILE__))
 
   gem "jruby-openssl" if RUBY_ENGINE == "jruby"

From d790477d6dda77c0bea900f2739a076a2b894912 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 16 Jan 2017 10:43:07 +0100
Subject: [PATCH 1847/4996] Add security rules

---
 .rubocop.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index 87d24743abb..4193f4b4afd 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -48,6 +48,14 @@ Metrics/ParameterLists:
   Max: 4
 Metrics/PerceivedComplexity:
   Max: 8
+Security/MarshalLoad:
+  Exclude:
+    - !ruby/regexp /test\/.*.rb$/
+    - lib/jekyll/regenerator.rb
+Security/YAMLLoad:
+  Exclude:
+    - !ruby/regexp /features\/.*.rb/
+    - !ruby/regexp /test\/.*.rb$/
 Style/Alias:
   Enabled: false
 Style/AlignArray:

From 55993c6c5d5cf2b2ad3d5e5b12b365d4ca9d715c Mon Sep 17 00:00:00 2001
From: Dmitrii Evdokimov 
Date: Mon, 16 Jan 2017 17:53:04 +0300
Subject: [PATCH 1848/4996] Fix a markdown link to look properly on the web

---
 docs/_docs/windows.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index 62fb69b4425..ce7e78c142a 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -15,7 +15,8 @@ A quick way to install Jekyll is to follow the [installation instructions by Dav
  2. Install Ruby via Chocolatey: `choco install ruby -y`
  3. Reopen a command prompt and install Jekyll: `gem install jekyll`
 
-Updates in the infrastructure of Ruby may cause SSL errors when attempting to use `gem install` with versions of the RubyGems package older than 2.6. (The RubyGems package installed via the Chocolatey tool is version 2.3) If you have installed an older version, you can update the RubyGems package using the directions [here.][ssl-certificate-update]
+Updates in the infrastructure of Ruby may cause SSL errors when attempting to use `gem install` with versions of the RubyGems package older than 2.6. (The RubyGems package installed via the Chocolatey tool is version 2.3) If you have installed an older version, you can update the RubyGems package using the directions [here][ssl-certificate-update].
+
 [ssl-certificate-update]: http://guides.rubygems.org/ssl-certificate-update/#installing-using-update-packages
 
 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].

From 036dd3ccc96365ea97797dc61387aac167c54742 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 16 Jan 2017 11:05:25 -0500
Subject: [PATCH 1849/4996] Update history to reflect merge of #5769 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index eafd41c4516..0d537420664 100644
--- a/History.markdown
+++ b/History.markdown
@@ -71,6 +71,7 @@
   * Add jekyll-pre-commit to plugins list (#5752)
   * Update quickstart.md (#5758)
   * Correct minor typo (#5764)
+  * Fix a markdown link to look properly on the web (#5769)
 
 ## 3.3.1 / 2016-11-14
 

From 9d70bbba44cc2c62ac96a579050f163b52dc1672 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 16 Jan 2017 16:00:07 -0500
Subject: [PATCH 1850/4996] Update history to reflect merge of #5768 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0d537420664..c6694c36ea4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -49,6 +49,7 @@
   * Sort gems in `jekyll.gemspec` (#5746)
   * Rubocop: Require consistent comma in multiline literals (#5761)
   * Bump rubocop (#5765)
+  * New rubocop security checks (#5768)
 
 ### Documentation
 

From 567a7952dd0a506b04e2e50a1ac29715bc48aa6d Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 16 Jan 2017 16:25:09 -0500
Subject: [PATCH 1851/4996] test/helper: fix flaky plugin path test by
 initializing Configuration::DEFAULTS at start of tests

If we do a Dir.chdir before Configuration::DEFAULTS is initialized, then its source and destination values will not be what we expect.
We expect that Dir.pwd should stay as the root of the repo but there are some errant calls to Dir.chdir without a block that are still
not yet cleaned up.
---
 test/helper.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/helper.rb b/test/helper.rb
index 0c6935a03fb..fcbb71668b2 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -30,6 +30,11 @@ def jruby?
 require "rspec/mocks"
 require_relative "../lib/jekyll.rb"
 
+# The default "source" and "destination" values depend on Dir.pwd,
+# which changes when we use Dir.chdir without a block. Initialize
+# it here so it has Dir.pwd = root of this repo.
+Jekyll::Configuration::DEFAULTS
+
 Jekyll.logger = Logger.new(StringIO.new)
 
 unless jruby?

From aa7e47a30d4db30e644c54fc939ecd526db3c161 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 16 Jan 2017 16:43:25 -0500
Subject: [PATCH 1852/4996] Remove calls to Dir.chdir without a block.

This removes the necessity to initialize Jekyll::Configuration::DEFAULTS manually.
---
 test/helper.rb           | 11 +++++------
 test/test_static_file.rb | 15 ++++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/helper.rb b/test/helper.rb
index fcbb71668b2..28c37ecff92 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -30,11 +30,6 @@ def jruby?
 require "rspec/mocks"
 require_relative "../lib/jekyll.rb"
 
-# The default "source" and "destination" values depend on Dir.pwd,
-# which changes when we use Dir.chdir without a block. Initialize
-# it here so it has Dir.pwd = root of this repo.
-Jekyll::Configuration::DEFAULTS
-
 Jekyll.logger = Logger.new(StringIO.new)
 
 unless jruby?
@@ -67,6 +62,10 @@ def refute_exist(filename, msg = nil)
 end
 
 module DirectoryHelpers
+  def root_dir(*subdirs)
+    File.join(File.dirname(File.dirname(__FILE__)), *subdirs)
+  end
+
   def dest_dir(*subdirs)
     test_dir("dest", *subdirs)
   end
@@ -76,7 +75,7 @@ def source_dir(*subdirs)
   end
 
   def test_dir(*subdirs)
-    File.join(File.dirname(__FILE__), *subdirs)
+    root_dir("test", *subdirs)
   end
 end
 
diff --git a/test/test_static_file.rb b/test/test_static_file.rb
index 2be800a662c..c45dcd78063 100644
--- a/test/test_static_file.rb
+++ b/test/test_static_file.rb
@@ -16,33 +16,34 @@ def remove_dummy_file(filename)
   end
 
   def setup_static_file(base, dir, name)
-    StaticFile.new(@site, base, dir, name)
+    Dir.chdir(@site.source) { StaticFile.new(@site, base, dir, name) }
   end
 
   def setup_static_file_with_collection(base, dir, name, metadata)
     site = fixture_site("collections" => { "foo" => metadata })
-    StaticFile.new(site, base, dir, name, site.collections["foo"])
+    Dir.chdir(site.source) do
+      StaticFile.new(site, base, dir, name, site.collections["foo"])
+    end
   end
 
   def setup_static_file_with_defaults(base, dir, name, defaults)
     site = fixture_site("defaults" => defaults)
-    StaticFile.new(site, base, dir, name)
+    Dir.chdir(site.source) do
+      StaticFile.new(site, base, dir, name)
+    end
   end
 
   context "A StaticFile" do
     setup do
       clear_dest
-      @old_pwd = Dir.pwd
-      Dir.chdir source_dir
       @site = fixture_site
       @filename = "static_file.txt"
       make_dummy_file(@filename)
-      @static_file = setup_static_file(nil, nil, @filename)
+      @static_file = setup_static_file(@site.source, "", @filename)
     end
 
     teardown do
       remove_dummy_file(@filename) if File.exist?(source_dir(@filename))
-      Dir.chdir @old_pwd
     end
 
     should "have a source file path" do

From 448b6ba08ee419f4dd55b9a0ee0d036089077b48 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 16 Jan 2017 17:03:42 -0500
Subject: [PATCH 1853/4996] Update history to reflect merge of #5779 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c6694c36ea4..dfea615e224 100644
--- a/History.markdown
+++ b/History.markdown
@@ -50,6 +50,7 @@
   * Rubocop: Require consistent comma in multiline literals (#5761)
   * Bump rubocop (#5765)
   * New rubocop security checks (#5768)
+  * test/helper: fix flaky plugin path test by removing calls to Dir.chdir without a block (#5779)
 
 ### Documentation
 

From e509cf2139d1a7ee11090b09721344608ecf48f6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 16 Jan 2017 18:38:35 -0500
Subject: [PATCH 1854/4996] Update history to reflect merge of #5767 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index dfea615e224..49783093da8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
   * Use the current year for the LICENSE of theme (#5712)
   * Update License (#5713)
   * Use Addressable instead of URI to decode (#5726)
+  * throw IncludeTagError if error occurs in included file (#5767)
 
 ### Bug Fixes
 

From 9a5307c3f9c568dec3703a3f30e6c68f0a751597 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 16 Jan 2017 19:17:45 -0500
Subject: [PATCH 1855/4996] Don't include the theme's includes_path if it is
 nil.

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

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 5797df77e74..3bbeaef34b7 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -435,7 +435,7 @@ def configure_theme
     private
     def configure_include_paths
       @includes_load_paths = Array(in_source_dir(config["includes_dir"].to_s))
-      @includes_load_paths << theme.includes_path if self.theme
+      @includes_load_paths << theme.includes_path if self.theme && theme.includes_path
     end
 
     private

From cd8836cf6efe15d4da4c668e8df1a9bfdac71861 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 17 Jan 2017 02:34:15 +0100
Subject: [PATCH 1856/4996] bump htmlproofer

---
 Gemfile      | 2 +-
 script/proof | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index f04f7969d34..4ead30a9a5b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,7 +88,7 @@ end
 
 group :site do
   if ENV["PROOF"]
-    gem "html-proofer", "~> 2.0"
+    gem "html-proofer", "~> 3.4"
   end
 
   gem "jekyll-avatar"
diff --git a/script/proof b/script/proof
index 1dd63a28925..664e778d22a 100755
--- a/script/proof
+++ b/script/proof
@@ -32,4 +32,4 @@ bundle exec jekyll build -s $SOURCE -d $DESTINATION --trace
 
 # 3.
 msg "Proofing..."
-time bundle exec htmlproof ./$DESTINATION --url-ignore $INGORE_HREFS $@
+time bundle exec htmlproofer ./$DESTINATION --url-ignore $INGORE_HREFS $@

From c39414a17b43399243190a31df7dfe24eeb3d945 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 17 Jan 2017 02:59:57 +0100
Subject: [PATCH 1857/4996] use latest jemoji gem

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index f04f7969d34..97364a112e2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -95,5 +95,5 @@ group :site do
   gem "jekyll-mentions"
   gem "jekyll-seo-tag"
   gem "jekyll-sitemap"
-  gem "jemoji", "0.5.1"
+  gem "jemoji"
 end

From 67ab1596064eef6a2eb9c1dcc4367915c3efe1b7 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 16 Jan 2017 21:38:56 -0500
Subject: [PATCH 1858/4996] Update history to reflect merge of #5691 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 49783093da8..f8433c8389e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -35,6 +35,7 @@
   * Docs: move permalinks from documents into config (#5544)
   * Sort gems in `docs/_config.yml` (#5746)
   * [site] Use defaults for docs and news-items (#5744)
+  * Improve collections docs (#5691)
 
 ### Development Fixes
 

From 5460e711765c99a638a125b1cbaca698ea813297 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 16 Jan 2017 21:48:20 -0500
Subject: [PATCH 1859/4996] Update history to reflect merge of #5731 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f8433c8389e..d03a2f6e7d3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -36,6 +36,7 @@
   * Sort gems in `docs/_config.yml` (#5746)
   * [site] Use defaults for docs and news-items (#5744)
   * Improve collections docs (#5691)
+  * Fix #5730: add gcc and make to the list of requirements (#5731)
 
 ### Development Fixes
 

From 4ea770e99565f611359f4699e50fd7b9dcb2face Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 17 Jan 2017 03:22:44 -0500
Subject: [PATCH 1860/4996] Update history to reflect merge of #5782 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d03a2f6e7d3..f6f737875d2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -54,6 +54,7 @@
   * Bump rubocop (#5765)
   * New rubocop security checks (#5768)
   * test/helper: fix flaky plugin path test by removing calls to Dir.chdir without a block (#5779)
+  * Use latest jemoji gem (#5782)
 
 ### Documentation
 

From 9c729033959bf7ef74372a22eb19e67900881aa9 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 17 Jan 2017 03:24:08 -0500
Subject: [PATCH 1861/4996] Update history to reflect merge of #5781 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f6f737875d2..25aa3c5a4a1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -55,6 +55,7 @@
   * New rubocop security checks (#5768)
   * test/helper: fix flaky plugin path test by removing calls to Dir.chdir without a block (#5779)
   * Use latest jemoji gem (#5782)
+  * Bump htmlproofer (#5781)
 
 ### Documentation
 

From b9dedb34774382099b89eff7aa8bb85ed5e39ed5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 17 Jan 2017 03:34:05 -0500
Subject: [PATCH 1862/4996] Update history to reflect merge of #5312 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 25aa3c5a4a1..faee4627e40 100644
--- a/History.markdown
+++ b/History.markdown
@@ -79,6 +79,7 @@
   * Update quickstart.md (#5758)
   * Correct minor typo (#5764)
   * Fix a markdown link to look properly on the web (#5769)
+  * [docs] Info about the help command usage (#5312)
 
 ## 3.3.1 / 2016-11-14
 

From bfb6cf1ca95b57afcacc2e77126774179b14ba92 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Tue, 17 Jan 2017 14:35:33 +0530
Subject: [PATCH 1863/4996] bump rubies

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6ff7022c7b5..30eb1fc5d47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,10 @@ language: ruby
 sudo: false
 
 rvm:
-  - &ruby1 2.3.1
-  - &ruby2 2.2.5
+  - &ruby1 2.3.3
+  - &ruby2 2.2.6
   - &ruby3 2.1.9
-  - &jruby jruby-9.1.2.0
+  - &jruby jruby-9.1.7.0
 
 matrix:
   include:

From 39c4054cd1aa5346ff0e6f547bcdb15485998e3a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 17 Jan 2017 04:34:19 -0500
Subject: [PATCH 1864/4996] Update history to reflect merge of #5784 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index faee4627e40..f2c2abda883 100644
--- a/History.markdown
+++ b/History.markdown
@@ -56,6 +56,7 @@
   * test/helper: fix flaky plugin path test by removing calls to Dir.chdir without a block (#5779)
   * Use latest jemoji gem (#5782)
   * Bump htmlproofer (#5781)
+  * Bump rubies we test against (#5784)
 
 ### Documentation
 

From e1f4d92d023cdbb960eff4a9943bd7930ee50690 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 17 Jan 2017 18:22:28 +0100
Subject: [PATCH 1865/4996] add missing class

---
 docs/_docs/quickstart.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/quickstart.md b/docs/_docs/quickstart.md
index b21d084d31d..3d126787b73 100644
--- a/docs/_docs/quickstart.md
+++ b/docs/_docs/quickstart.md
@@ -37,15 +37,14 @@ If you encounter any unexpected errors during the above, please refer to the alr
 
 `jekyll new ` installs a new Jekyll site at the path specified (relative to current directory). In this case, Jekyll will be installed in a directory called `myblog`. Here are some additional details:
 
-* To install the Jekyll site into the directory you're currently in, run `jekyll new .` If the existing directory isn't empty, you can pass the `--force` option with `jekyll new . --force`.  
+* To install the Jekyll site into the directory you're currently in, run `jekyll new .` If the existing directory isn't empty, you can pass the `--force` option with `jekyll new . --force`.
 * `jekyll new` automatically initiates `bundle install` to install the dependencies required. (If you don't want Bundler to install the gems, use `jekyll new myblog --skip-bundle`.)
 * By default, the Jekyll site installed by `jekyll new` uses a gem-based theme called [Minima](https://github.com/jekyll/minima). With [gem-based themes](../themes), some of the directories and files are stored in the theme-gem, hidden from your immediate view.
 * To learn about other parameters you can include with `jekyll new`, type `jekyll new --help`.
 
 When in doubt, use the help command to remind you of all available options and usage, it also works with the new, build and serve subcommands, e.g. jekyll help new or jekyll help build.
-{: .info }
+{: .note .info }
 
 ## Next steps
 
 Building a Jekyll site with the default theme is just the first step. The real magic happens when you start creating blog posts, using the front matter to control templates and layouts, and taking advantage of all the awesome configuration options Jekyll makes available.
-

From 2052280ccd026b0c8711e026ed513a4783566308 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 17 Jan 2017 14:56:00 -0500
Subject: [PATCH 1866/4996] Update history to reflect merge of #5791 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f2c2abda883..5971b779bc0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -37,6 +37,7 @@
   * [site] Use defaults for docs and news-items (#5744)
   * Improve collections docs (#5691)
   * Fix #5730: add gcc and make to the list of requirements (#5731)
+  * Add missing class (#5791)
 
 ### Development Fixes
 

From ad8fb9b927908f52565efbf59e3a4198bfd8c82c Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 17 Jan 2017 16:19:26 -0500
Subject: [PATCH 1867/4996] Add theme_dir() helper func

---
 test/helper.rb     | 4 ++++
 test/test_theme.rb | 9 ++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/helper.rb b/test/helper.rb
index bb9e5a29f8d..ca60f79ff19 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -74,6 +74,10 @@ def source_dir(*subdirs)
     test_dir("source", *subdirs)
   end
 
+  def theme_dir(*subdirs)
+    test_dir("fixtures", "test-theme", *subdirs)
+  end
+
   def test_dir(*subdirs)
     root_dir("test", *subdirs)
   end
diff --git a/test/test_theme.rb b/test/test_theme.rb
index ab1eff4395f..3d557dc8ca0 100644
--- a/test/test_theme.rb
+++ b/test/test_theme.rb
@@ -3,7 +3,6 @@
 class TestTheme < JekyllUnitTest
   def setup
     @theme = Theme.new("test-theme")
-    @expected_root = File.expand_path "./fixtures/test-theme", File.dirname(__FILE__)
   end
 
   context "initializing" do
@@ -13,7 +12,7 @@ def setup
     end
 
     should "know the theme root" do
-      assert_equal @expected_root, @theme.root
+      assert_equal theme_dir, @theme.root
     end
 
     should "know the theme version" do
@@ -36,13 +35,13 @@ def setup
   context "path generation" do
     [:assets, :_layouts, :_includes, :_sass].each do |folder|
       should "know the #{folder} path" do
-        expected = File.expand_path(folder.to_s, @expected_root)
+        expected = theme_dir(folder.to_s)
         assert_equal expected, @theme.public_send("#{folder.to_s.tr("_", "")}_path")
       end
     end
 
     should "generate folder paths" do
-      expected = File.expand_path("./_sass", @expected_root)
+      expected = theme_dir("_sass")
       assert_equal expected, @theme.send(:path_for, :_sass)
     end
 
@@ -58,7 +57,7 @@ def setup
       # no support for symlinks on Windows
       skip_if_windows "Jekyll does not currently support symlinks on Windows."
 
-      expected = File.expand_path("./_layouts", @expected_root)
+      expected = theme_dir("_layouts")
       assert_equal expected, @theme.send(:path_for, :_symlink)
     end
   end

From e0d63c8aa90acd4608cfc34b2dbf2e34c6c7483f Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 17 Jan 2017 16:19:47 -0500
Subject: [PATCH 1868/4996] Add test to ensure that if the includes dir isn't
 in the theme that it won't break the site

---
 test/test_site.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/test/test_site.rb b/test/test_site.rb
index bbf42d25656..cee08dfd342 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -49,6 +49,17 @@ class TestSite < JekyllUnitTest
       site = Site.new(site_configuration({ "baseurl" => "/blog" }))
       assert_equal "/blog", site.baseurl
     end
+
+    should "only include theme includes_path if the path exists" do
+      site = fixture_site({ "theme" => "test-theme" })
+      assert_equal [source_dir("_includes"), theme_dir("_includes")], site.includes_load_paths
+
+      allow(File).to receive(:directory?).with(theme_dir("_sass")).and_return(true)
+      allow(File).to receive(:directory?).with(theme_dir("_layouts")).and_return(true)
+      allow(File).to receive(:directory?).with(theme_dir("_includes")).and_return(false)
+      site = fixture_site({ "theme" => "test-theme" })
+      assert_equal [source_dir("_includes")], site.includes_load_paths
+    end
   end
   context "creating sites" do
     setup do

From 023476049befdd61dd9ffabbc3e871034bc3cd9c Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 17 Jan 2017 16:21:28 -0500
Subject: [PATCH 1869/4996] Remove superfluous self.

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

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 3bbeaef34b7..87ea719b6a8 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -435,7 +435,7 @@ def configure_theme
     private
     def configure_include_paths
       @includes_load_paths = Array(in_source_dir(config["includes_dir"].to_s))
-      @includes_load_paths << theme.includes_path if self.theme && theme.includes_path
+      @includes_load_paths << theme.includes_path if theme && theme.includes_path
     end
 
     private

From 130159dda4c1c567edc7ce2104a82f0e090b7048 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 17 Jan 2017 17:05:14 -0500
Subject: [PATCH 1870/4996] Fix rubocop error.

---
 test/test_site.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/test_site.rb b/test/test_site.rb
index cee08dfd342..65032ebdfd3 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -52,7 +52,8 @@ class TestSite < JekyllUnitTest
 
     should "only include theme includes_path if the path exists" do
       site = fixture_site({ "theme" => "test-theme" })
-      assert_equal [source_dir("_includes"), theme_dir("_includes")], site.includes_load_paths
+      assert_equal [source_dir("_includes"), theme_dir("_includes")],
+        site.includes_load_paths
 
       allow(File).to receive(:directory?).with(theme_dir("_sass")).and_return(true)
       allow(File).to receive(:directory?).with(theme_dir("_layouts")).and_return(true)

From 2c19264d08786028a94355e0c57d09e19a6324ad Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 17 Jan 2017 18:51:49 -0500
Subject: [PATCH 1871/4996] Add a philosophy doc.

---
 docs/philosophy.md | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 docs/philosophy.md

diff --git a/docs/philosophy.md b/docs/philosophy.md
new file mode 100644
index 00000000000..ad9cbb4f170
--- /dev/null
+++ b/docs/philosophy.md
@@ -0,0 +1,41 @@
+---
+title: Philosophy
+---
+
+Jekyll offers a unique philosophy when approaching the problem of static
+site generation. This core philosophy drives development and product
+decisions. When a contributor, maintainer, or user asks herself what Jekyll
+is about, the following principles should come to mind:
+
+### 1. No Magic
+
+Jekyll is not magic. A user should be able to understand the underlying
+processes that make up the Jekyll build without much reading. It should
+behave "as you'd expect."
+
+### 2. It "Just Works"
+
+The out-of-the-box experience should be that it "just works." Run `gem
+install jekyll` and it should build any Jekyll site that it's given.
+Features like auto-regeneration and settings like the markdown renderer
+should represent sane defaults that work perfectly for the vast majority of
+cases. The burden of configuration should not be placed on the user.
+
+### 3. Content is King
+
+Why is Jekyll so loved by content creators? It focuses on content first and
+foremost, making the process of publishing content on the Web easy. Users
+should find the management of their content enjoyable and simple.
+
+### 4. Stability
+
+If a user's site builds today, it should build tomorrow.
+Backwards-compatibility should be strongly preferred over breaking changes.
+Upon breaking changes, provide a clear path for users to upgrade.
+
+### 5. Small & Extensible
+
+The core of Jekyll should be simple and small, and extensibility should be
+a first-class feature to provide added functionality from community
+contributors. The core should be kept to features used by at least 90% of
+users–everything else should be provided as a plugin.

From a9c7e14d6079e8cfee9adfd7e54e11954e9c0ba1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 17 Jan 2017 18:59:39 -0500
Subject: [PATCH 1872/4996] Update history to reflect merge of #5780 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5971b779bc0..dcf5a6195ab 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Add a module to re-define `ENV["TZ"]` in Windows (#5612)
   * Use each instead of map to actually return nothing (#5668)
   * include: fix 'no implicit conversion of nil to String' (#5750)
+  * Don't include the theme's includes_path if it is nil. (#5780)
 
 ### Site Enhancements
 

From 0b4a097a40bafd278116a7833f87ae1b6cbdc81a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 17 Jan 2017 20:20:36 -0500
Subject: [PATCH 1873/4996] Update history to reflect merge of #5753 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index dcf5a6195ab..55a65c5ee2e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -83,6 +83,7 @@
   * Correct minor typo (#5764)
   * Fix a markdown link to look properly on the web (#5769)
   * [docs] Info about the help command usage (#5312)
+  * Add missing merge labels for jekyllbot (#5753)
 
 ## 3.3.1 / 2016-11-14
 

From 402eb0dfa548ffbbd11a9b9a1fffa90a0ee40b04 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 17 Jan 2017 20:21:49 -0500
Subject: [PATCH 1874/4996] Update history to reflect merge of #5542 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 55a65c5ee2e..26abb8799af 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
   * Use each instead of map to actually return nothing (#5668)
   * include: fix 'no implicit conversion of nil to String' (#5750)
   * Don't include the theme's includes_path if it is nil. (#5780)
+  * test double slash when input = '/' (#5542)
 
 ### Site Enhancements
 

From 0599c2242570d82230f60b70ffa49d8f363f0e1c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 18 Jan 2017 14:15:13 -0500
Subject: [PATCH 1875/4996] Update history to reflect merge of #5640 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 26abb8799af..36e70cb6d85 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,7 @@
   * Update License (#5713)
   * Use Addressable instead of URI to decode (#5726)
   * throw IncludeTagError if error occurs in included file (#5767)
+  * Write Jekyll::Utils::Exec.run for running shell commands. (#5640)
 
 ### Bug Fixes
 

From b6bc85ec7cf70dfdde262eb15b0723b191ad21d0 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 18 Jan 2017 14:16:08 -0500
Subject: [PATCH 1876/4996] Correct 2 Style/TrailingCommaInLiteral rubocop
 offenses in test_filters.rb

---
 test/test_filters.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index 8b31a171368..d18b57e3ef3 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -377,7 +377,7 @@ def select; end
         page_url = "/"
         filter = make_filter_mock({
           "url"     => "http://example.com",
-          "baseurl" => "/base"
+          "baseurl" => "/base",
         })
         assert_equal "http://example.com/base/", filter.absolute_url(page_url)
       end
@@ -386,7 +386,7 @@ def select; end
         page_url = "/"
         filter = make_filter_mock({
           "url"     => "http://example.com",
-          "baseurl" => nil
+          "baseurl" => nil,
         })
         assert_equal "http://example.com/", filter.absolute_url(page_url)
       end

From b2d93913d09740494d5bfedea9a9f459acdf9353 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 18 Jan 2017 15:36:13 -0500
Subject: [PATCH 1877/4996] Update history to reflect merge of #5694 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 36e70cb6d85..e9df1fb4ed4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -41,6 +41,7 @@
   * Improve collections docs (#5691)
   * Fix #5730: add gcc and make to the list of requirements (#5731)
   * Add missing class (#5791)
+  * Improve template docs (#5694)
 
 ### Development Fixes
 

From b7f44e6ecace7521614942d631345b504ad146bf Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 18 Jan 2017 16:54:21 -0500
Subject: [PATCH 1878/4996] Queue up a 3.4 deploy with unfinished release post.

---
 History.markdown                              |  2 +-
 docs/_docs/history.md                         | 95 +++++++++++++++++++
 .../2017-01-18-jekyll-3-4-0-released.markdown | 16 ++++
 docs/latest_version.txt                       |  2 +-
 lib/jekyll/version.rb                         |  2 +-
 5 files changed, 114 insertions(+), 3 deletions(-)
 create mode 100644 docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown

diff --git a/History.markdown b/History.markdown
index 36e70cb6d85..8ad3e2ae814 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,4 +1,4 @@
-## HEAD
+## 3.4.0 / 2016-01-20
 
 ### Minor Enhancements
 
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 03767126d9b..a31266bcdec 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,101 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.4.0 / 2016-01-20
+{: #v3-4-0}
+
+### Minor Enhancements
+{: #minor-enhancements-v3-4-0}
+
+- Add connector param to `array_to_sentence_string` filter ([#5597]({{ site.repository }}/issues/5597))
+- Adds `group_by_exp` filter ([#5513]({{ site.repository }}/issues/5513))
+- Use the current year for the LICENSE of theme ([#5712]({{ site.repository }}/issues/5712))
+- Update License ([#5713]({{ site.repository }}/issues/5713))
+- Use Addressable instead of URI to decode ([#5726]({{ site.repository }}/issues/5726))
+- throw IncludeTagError if error occurs in included file ([#5767]({{ site.repository }}/issues/5767))
+- Write Jekyll::Utils::Exec.run for running shell commands. ([#5640]({{ site.repository }}/issues/5640))
+
+### Bug Fixes
+{: #bug-fixes-v3-4-0}
+
+- Escaped regular expressions when using `post_url`. ([#5605]({{ site.repository }}/issues/5605))
+- fix date parsing in file names to be stricter ([#5609]({{ site.repository }}/issues/5609))
+- Add a module to re-define `ENV["TZ"]` in Windows ([#5612]({{ site.repository }}/issues/5612))
+- Use each instead of map to actually return nothing ([#5668]({{ site.repository }}/issues/5668))
+- include: fix 'no implicit conversion of nil to String' ([#5750]({{ site.repository }}/issues/5750))
+- Don't include the theme's includes_path if it is nil. ([#5780]({{ site.repository }}/issues/5780))
+- test double slash when input = '/' ([#5542]({{ site.repository }}/issues/5542))
+
+### Site Enhancements
+{: #site-enhancements-v3-4-0}
+
+- Remove instructions to install Jekyll 2 on Windows ([#5582]({{ site.repository }}/issues/5582))
+- Fix example URL inconsistency ([#5592]({{ site.repository }}/issues/5592))
+- Replace backticks within HTML blocks with HTML tags ([#5435]({{ site.repository }}/issues/5435))
+- Add jekyll-migrate-permalink ([#5600]({{ site.repository }}/issues/5600))
+- Fix bad config YAML in collections example ([#5587]({{ site.repository }}/issues/5587))
+- Bring documentation on 'Directory Structure' up-to-date ([#5573]({{ site.repository }}/issues/5573))
+- Use only the used Font Awesome icons. ([#5530]({{ site.repository }}/issues/5530))
+- Switch to `https` when possible. ([#5611]({{ site.repository }}/issues/5611))
+- Update `_font-awesome.scss` to move .woff file before .ttf ([#5614]({{ site.repository }}/issues/5614))
+- Update documentation on updating FontAwesome Iconset ([#5655]({{ site.repository }}/issues/5655))
+- Improve quickstart docs ([#5689]({{ site.repository }}/issues/5689))
+- Add Jekyll-Post to list of plugins ([#5705]({{ site.repository }}/issues/5705))
+- Add jekyll-numbered-headings ([#5688]({{ site.repository }}/issues/5688))
+- Docs: move permalinks from documents into config ([#5544]({{ site.repository }}/issues/5544))
+- Sort gems in `docs/_config.yml` ([#5746]({{ site.repository }}/issues/5746))
+- [site] Use defaults for docs and news-items ([#5744]({{ site.repository }}/issues/5744))
+- Improve collections docs ([#5691]({{ site.repository }}/issues/5691))
+- Fix [#5730]({{ site.repository }}/issues/5730): add gcc and make to the list of requirements ([#5731]({{ site.repository }}/issues/5731))
+- Add missing class ([#5791]({{ site.repository }}/issues/5791))
+
+### Development Fixes
+{: #development-fixes-v3-4-0}
+
+- clean unit-test names in `test/test_tags.rb` ([#5608]({{ site.repository }}/issues/5608))
+- Add cucumber feature to test for bonafide theme gems ([#5384]({{ site.repository }}/issues/5384))
+- Use `assert_nil` instead of `assert_equal nil` ([#5652]({{ site.repository }}/issues/5652))
+- Rubocop -a on lib/jekyll ([#5666]({{ site.repository }}/issues/5666))
+- Bump to rake 12.0 ([#5670]({{ site.repository }}/issues/5670))
+- Rubocop Gemfile ([#5671]({{ site.repository }}/issues/5671))
+- update Classifier-Reborn to 2.1.0 ([#5711]({{ site.repository }}/issues/5711))
+- Rubocop: fix Rakefile and gemspec ([#5745]({{ site.repository }}/issues/5745))
+- Use `assert_nil` ([#5725]({{ site.repository }}/issues/5725))
+- Sort gems in `jekyll.gemspec` ([#5746]({{ site.repository }}/issues/5746))
+- Rubocop: Require consistent comma in multiline literals ([#5761]({{ site.repository }}/issues/5761))
+- Bump rubocop ([#5765]({{ site.repository }}/issues/5765))
+- New rubocop security checks ([#5768]({{ site.repository }}/issues/5768))
+- test/helper: fix flaky plugin path test by removing calls to Dir.chdir without a block ([#5779]({{ site.repository }}/issues/5779))
+- Use latest jemoji gem ([#5782]({{ site.repository }}/issues/5782))
+- Bump htmlproofer ([#5781]({{ site.repository }}/issues/5781))
+- Bump rubies we test against ([#5784]({{ site.repository }}/issues/5784))
+
+### Documentation
+
+- Fixed typo ([#5632]({{ site.repository }}/issues/5632))
+- use backticks for Gemfile for consistency since in the next sentence … ([#5641]({{ site.repository }}/issues/5641))
+- Update Core team list in the README file ([#5643]({{ site.repository }}/issues/5643))
+- Improve Permalinks documentation. ([#5653]({{ site.repository }}/issues/5653))
+- Fix typo in Variables doc page ([#5657]({{ site.repository }}/issues/5657))
+- Fix a couple of typos in the docs ([#5658]({{ site.repository }}/issues/5658))
+- Update windows.md ([#5683]({{ site.repository }}/issues/5683))
+- Improve permalinks docs ([#5693]({{ site.repository }}/issues/5693))
+- Document --unpublished build option ([#5720]({{ site.repository }}/issues/5720))
+- Improve pages docs ([#5692]({{ site.repository }}/issues/5692))
+- Added new includes.md topic to docs ([#5696]({{ site.repository }}/issues/5696))
+- Replace a dead link with a web-archived one ([#5738]({{ site.repository }}/issues/5738))
+- Remove duplicate paragraph. ([#5740]({{ site.repository }}/issues/5740))
+- Addition of a sample "typical post" ([#5473]({{ site.repository }}/issues/5473))
+- Fix a minor grammatical mistake on themes' document ### -dev ([#5748]({{ site.repository }}/issues/5748))
+- Correct comments in data_reader.rb ([#5621]({{ site.repository }}/issues/5621))
+- Add jekyll-pre-commit to plugins list ([#5752]({{ site.repository }}/issues/5752))
+- Update quickstart.md ([#5758]({{ site.repository }}/issues/5758))
+- Correct minor typo ([#5764]({{ site.repository }}/issues/5764))
+- Fix a markdown link to look properly on the web ([#5769]({{ site.repository }}/issues/5769))
+- [docs] Info about the help command usage ([#5312]({{ site.repository }}/issues/5312))
+- Add missing merge labels for jekyllbot ([#5753]({{ site.repository }}/issues/5753))
+
+
 ## 3.3.1 / 2016-11-14
 {: #v3-3-1}
 
diff --git a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
new file mode 100644
index 00000000000..ca9745d7f58
--- /dev/null
+++ b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
@@ -0,0 +1,16 @@
+---
+title: 'Jekyll turns 3.4.0'
+date: 2017-01-18 14:19:13 -0500
+author: parkr
+version: 3.4.0
+categories: [release]
+---
+
+Hey there! We have a quick updated of Jekyll for you to enjoy this January.
+Packed full of bug fixes as usual, thanks to the tireless efforts of our
+exceptional Jekyll community. Three changes to call out:
+
+1. If you're a big fan of [`where_by_exp`](/docs/filters/), you'll be an
+even bigger fan of [`group_by_exp`](/docs/filters/).
+2. Using a custom timezone in Jekyll on Windows? Yeah, sorry that hasn't ever worked
+   properly. We made the internals possible
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index bea438e9ade..18091983f59 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.3.1
+3.4.0
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index a01e787a21d..4babc2082bc 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.3.1".freeze
+  VERSION = "3.4.0".freeze
 end

From 60ba3fc0c982f771c75f59d2f4d2061d0bc1ef8f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 19 Jan 2017 08:55:04 -0500
Subject: [PATCH 1879/4996] Update history to reflect merge of #5736 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e9df1fb4ed4..b813f405c55 100644
--- a/History.markdown
+++ b/History.markdown
@@ -87,6 +87,7 @@
   * Fix a markdown link to look properly on the web (#5769)
   * [docs] Info about the help command usage (#5312)
   * Add missing merge labels for jekyllbot (#5753)
+  * Fix broken links in documentation (#5736)
 
 ## 3.3.1 / 2016-11-14
 

From 63dfe080db91334dab01276e70b33e77430a2e41 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Thu, 19 Jan 2017 22:06:37 +0100
Subject: [PATCH 1880/4996] bump rdoc to v5.0

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 7a786c9b15f..0abcbe4a426 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,7 +69,7 @@ group :jekyll_optional_dependencies do
   gem "jekyll-redirect-from"
   gem "kramdown", "~> 1.9"
   gem "mime-types", "~> 3.0"
-  gem "rdoc", "~> 4.2"
+  gem "rdoc", "~> 5.0"
   gem "toml", "~> 0.1.0"
 
   platform :ruby, :mswin, :mingw, :x64_mingw do

From 6ec2145c0ccf949e0d1ef0ca7d0aa4acbdb05c4c Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Thu, 19 Jan 2017 22:15:07 +0100
Subject: [PATCH 1881/4996] bump codeclimate-test-reporter to v1.0.5

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 7a786c9b15f..9b0a2c182a5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ end
 #
 
 group :test do
-  gem "codeclimate-test-reporter", "~> 0.6.0"
+  gem "codeclimate-test-reporter", "~> 1.0.5"
   gem "cucumber", "~> 2.1"
   gem "jekyll_test_plugin"
   gem "jekyll_test_plugin_malicious"

From 5ed22d0b3eb4dbabfdf458fa5ad288983f29e8d7 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Thu, 19 Jan 2017 22:39:39 +0100
Subject: [PATCH 1882/4996] Now we must execute SimpleCov

---
 test/helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/helper.rb b/test/helper.rb
index 94bad2ccacf..74f2682e36b 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -10,8 +10,8 @@ def jruby?
 end
 
 if ENV["CI"]
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
+  require "simplecov"
+  SimpleCov.start
 else
   require File.expand_path("../simplecov_custom_profile", __FILE__)
   SimpleCov.start "gem" do

From 4ed4c430445dd58f0991f322cded2e38feecf1b6 Mon Sep 17 00:00:00 2001
From: Tunghsiao Liu 
Date: Fri, 20 Jan 2017 15:14:23 +0800
Subject: [PATCH 1883/4996] Add `match_regex` and `replace_regex` filters

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 9034cb207a2..09bb2feb5a5 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -803,6 +803,8 @@ LESS.js files during generation.
 - [jekyll-typogrify](https://github.com/myles/jekyll-typogrify): A Jekyll plugin that brings the functions of [typogruby](http://avdgaag.github.io/typogruby/).
 - [Jekyll Email Protect](https://github.com/vwochnik/jekyll-email-protect): Email protection liquid filter for Jekyll
 - [Jekyll Uglify Filter](https://github.com/mattg/jekyll-uglify-filter): A Liquid filter that runs your JavaScript through UglifyJS.
+- [match_regex](https://github.com/sparanoid/match_regex): A Liquid filter to perform regex match.
+- [replace_regex](https://github.com/sparanoid/replace_regex): A Liquid filter to perform regex replace.
 
 #### Tags
 

From 4804806266e9fade7c3de6bf0d3064bc013e29fd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 20 Jan 2017 03:42:02 -0500
Subject: [PATCH 1884/4996] Update history to reflect merge of #5799 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b813f405c55..883cb845f1a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -88,6 +88,7 @@
   * [docs] Info about the help command usage (#5312)
   * Add missing merge labels for jekyllbot (#5753)
   * Fix broken links in documentation (#5736)
+  * Docs: add `match_regex` and `replace_regex` filters (#5799)
 
 ## 3.3.1 / 2016-11-14
 

From 12201d4f1bf057abdbad544a7a49c64b539691f0 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Fri, 20 Jan 2017 09:49:34 +0100
Subject: [PATCH 1885/4996] update excluded paths

---
 .codeclimate.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index cd70c7de6af..b3d26d655a1 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -23,7 +23,7 @@ exclude_paths:
 
   - features/**/*
   - script/**/*
-  - site/**/*
+  - docs/**/*
   - spec/**/*
   - test/**/*
   - vendor/**/*

From 9fe73be1013639b6721b4bffb787d8e62cbf12bd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 20 Jan 2017 13:59:19 -0500
Subject: [PATCH 1886/4996] Update history to reflect merge of #5797 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 883cb845f1a..8b63ad60bc1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -62,6 +62,7 @@
   * Use latest jemoji gem (#5782)
   * Bump htmlproofer (#5781)
   * Bump rubies we test against (#5784)
+  * Bump rdoc to v5.0 (#5797)
 
 ### Documentation
 

From eb54e270f91892e4df6d3252cfa896b5ff9afdf5 Mon Sep 17 00:00:00 2001
From: Ajay Karwal 
Date: Sat, 21 Jan 2017 00:17:14 +0000
Subject: [PATCH 1887/4996] Added note about --blank flag

Added instructions about installing Jekyll with a blank slate using the --blank flag.
---
 docs/_docs/quickstart.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_docs/quickstart.md b/docs/_docs/quickstart.md
index 50df76cf080..a8a2ae98cb5 100644
--- a/docs/_docs/quickstart.md
+++ b/docs/_docs/quickstart.md
@@ -40,6 +40,7 @@ If you encounter any unexpected errors during the above, please refer to the alr
 * To install the Jekyll site into the directory you're currently in, run `jekyll new .` If the existing directory isn't empty, you can pass the `--force` option with `jekyll new . --force`.
 * `jekyll new` automatically initiates `bundle install` to install the dependencies required. (If you don't want Bundler to install the gems, use `jekyll new myblog --skip-bundle`.)
 * By default, the Jekyll site installed by `jekyll new` uses a gem-based theme called [Minima](https://github.com/jekyll/minima). With [gem-based themes](../themes), some of the directories and files are stored in the theme-gem, hidden from your immediate view.
+* We recommend setting up Jekyll with a gem-based theme but if you want to start with a blank slate, use `jekyll new myblog --blank`
 * To learn about other parameters you can include with `jekyll new`, type `jekyll new --help`.
 
 When in doubt, use the help command to remind you of all available options and usage, it also works with the new, build and serve subcommands, e.g. jekyll help new or jekyll help build.

From f7186c86c4b365fbd13a5b9602033eb34bf83f08 Mon Sep 17 00:00:00 2001
From: Josh Habdas 
Date: Sun, 22 Jan 2017 22:33:21 +0800
Subject: [PATCH 1888/4996] Got that diaper money?

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 09bb2feb5a5..d9e5fe33ad2 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -805,6 +805,7 @@ LESS.js files during generation.
 - [Jekyll Uglify Filter](https://github.com/mattg/jekyll-uglify-filter): A Liquid filter that runs your JavaScript through UglifyJS.
 - [match_regex](https://github.com/sparanoid/match_regex): A Liquid filter to perform regex match.
 - [replace_regex](https://github.com/sparanoid/replace_regex): A Liquid filter to perform regex replace.
+- [Jekyll Money](https://rubygems.org/gems/jekyll-money): A Jekyll plugin for dealing with money. Because we all have to at some point.
 
 #### Tags
 

From c1b542e066f656f81a3fc138b0b73871c4852d9b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 22 Jan 2017 12:00:29 -0500
Subject: [PATCH 1889/4996] Update history to reflect merge of #5810 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8b63ad60bc1..64cc144c21a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -90,6 +90,7 @@
   * Add missing merge labels for jekyllbot (#5753)
   * Fix broken links in documentation (#5736)
   * Docs: add `match_regex` and `replace_regex` filters (#5799)
+  * Got that diaper money? (#5810)
 
 ## 3.3.1 / 2016-11-14
 

From 03722f022e4a0858aabfe85d7b06b369c942786d Mon Sep 17 00:00:00 2001
From: Nicolas Hoizey 
Date: Sun, 22 Jan 2017 22:12:58 +0100
Subject: [PATCH 1890/4996] Add mention of classifier-reborn for LSI

classifier-reborn is mandatory for LSI since Jekyll 3.0
---
 docs/_docs/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index e4c35b8ad0a..2542b85f5bb 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -233,7 +233,7 @@ class="flag">flags (specified on the command-line) that control them.
     
       
         
    LSI
    
-        
    Produce an index for related posts.
    
+        
    Produce an index for related posts. The classifier-reborn plugin must be used.
    
       
       
         
    lsi: BOOL
    

From e6392ea6dd56af288de3b6602868455414eba92a Mon Sep 17 00:00:00 2001
From: Nicolas Hoizey 
Date: Mon, 23 Jan 2017 10:06:24 +0100
Subject: [PATCH 1891/4996] Update configuration.md

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

diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index 2542b85f5bb..3f3bfd25c9f 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -233,7 +233,7 @@ class="flag">flags (specified on the command-line) that control them.
     
       
         
    LSI
    
-        
    Produce an index for related posts. The classifier-reborn plugin must be used.
    
+        
    Produce an index for related posts. Requires the classifier-reborn plugin.
    
       
       
         
    lsi: BOOL
    

From 2a2602cf61af9b83c43b60470dc89d1817557a64 Mon Sep 17 00:00:00 2001
From: Josh Habdas 
Date: Mon, 23 Jan 2017 17:59:25 +0800
Subject: [PATCH 1892/4996] Add jekyll-ga plug-in

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 09bb2feb5a5..f0cdb3454f2 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -753,6 +753,7 @@ LESS.js files during generation.
 - [Jekyll::Paginate::Category](https://github.com/midnightSuyama/jekyll-paginate-category): Pagination Generator for Jekyll Category.
 - [AMP-Jekyll by Juuso Mikkonen](https://github.com/juusaw/amp-jekyll): Generate [Accelerated Mobile Pages](https://www.ampproject.org) of Jekyll posts.
 - [Jekyll Art Gallery plugin](https://github.com/alexivkin/Jekyll-Art-Gallery-Plugin): An advanced art/photo gallery generation plugin for creating galleries from a set of image folders. Supports image tagging, thumbnails, sorting, image rotation, post-processing (remove EXIF, add watermark), multiple collections and much more.
+- [jekyll-ga](https://github.com/developmentseed/jekyll-ga): A Jekyll plugin that downloads Google Analytics data and adds it to posts. Useful for making a site that lists "most popular" content. [Read the introduction](https://developmentseed.org/blog/google-analytics-jekyll-plugin/) post on the developmentSEED blog.
 
 #### Converters
 

From 2a56e9ce0d5eaf3581bf0bf4e134241731785974 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 23 Jan 2017 11:53:13 -0500
Subject: [PATCH 1893/4996] Update history to reflect merge of #5812 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 64cc144c21a..776fd40b225 100644
--- a/History.markdown
+++ b/History.markdown
@@ -91,6 +91,7 @@
   * Fix broken links in documentation (#5736)
   * Docs: add `match_regex` and `replace_regex` filters (#5799)
   * Got that diaper money? (#5810)
+  * Sort content by popularity using Google Analytics (#5812)
 
 ## 3.3.1 / 2016-11-14
 

From 2662319641fe0b4a902d448407ef8bb860d4d53b Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 23 Jan 2017 19:58:20 +0100
Subject: [PATCH 1894/4996] typo

---
 docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
index ca9745d7f58..6950277eb80 100644
--- a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
+++ b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
@@ -6,7 +6,7 @@ version: 3.4.0
 categories: [release]
 ---
 
-Hey there! We have a quick updated of Jekyll for you to enjoy this January.
+Hey there! We have a quick update of Jekyll for you to enjoy this January.
 Packed full of bug fixes as usual, thanks to the tireless efforts of our
 exceptional Jekyll community. Three changes to call out:
 

From 3a3ceff1509b0391952252c6121db614387dd88e Mon Sep 17 00:00:00 2001
From: Ricardo N Feliciano 
Date: Thu, 19 Jan 2017 19:29:09 -0500
Subject: [PATCH 1895/4996] Rework CI doc to include multiple providers.

---
 docs/_docs/continuous-integration.md          | 242 ++----------------
 docs/_docs/continuous-integration/circleci.md |  92 +++++++
 .../_docs/continuous-integration/travis-ci.md | 230 +++++++++++++++++
 docs/img/circleci-badge.svg                   |  14 +
 docs/img/travis-ci-badge.png                  | Bin 0 -> 26749 bytes
 5 files changed, 351 insertions(+), 227 deletions(-)
 create mode 100644 docs/_docs/continuous-integration/circleci.md
 create mode 100644 docs/_docs/continuous-integration/travis-ci.md
 create mode 100644 docs/img/circleci-badge.svg
 create mode 100644 docs/img/travis-ci-badge.png

diff --git a/docs/_docs/continuous-integration.md b/docs/_docs/continuous-integration.md
index c2e8a31fab1..7947764554d 100644
--- a/docs/_docs/continuous-integration.md
+++ b/docs/_docs/continuous-integration.md
@@ -1,232 +1,20 @@
 ---
 title: Continuous Integration
-permalink: /docs/continuous-integration/
 ---
 
-You can easily test your website build against one or more versions of Ruby.
-The following guide will show you how to set up a free build environment on
-[Travis][0], with [GitHub][1] integration for pull requests. Paid
-alternatives exist for private repositories.
-
-[0]: https://travis-ci.org/
-[1]: https://github.com/
-
-## 1. Enabling Travis and GitHub
-
-Enabling Travis builds for your GitHub repository is pretty simple:
-
-1. Go to your profile on travis-ci.org: https://travis-ci.org/profile/username
-2. Find the repository for which you're interested in enabling builds.
-3. Click the slider on the right so it says "ON" and is a dark grey.
-4. Optionally configure the build by clicking on the gear icon. Further
-   configuration happens in your `.travis.yml` file. More details on that
-   below.
-
-## 2. The Test Script
-
-The simplest test script simply runs `jekyll build` and ensures that Jekyll
-doesn't fail to build the site. It doesn't check the resulting site, but it
-does ensure things are built properly.
-
-When testing Jekyll output, there is no better tool than [html-proofer][2].
-This tool checks your resulting site to ensure all links and images exist.
-Utilize it either with the convenient `htmlproofer` command-line executable,
-or write a Ruby script which utilizes the gem.
-
-Save the commands you want to run and succeed in a file: `./script/cibuild`
-
-### The HTML Proofer Executable
-
-```sh
-#!/usr/bin/env bash
-set -e # halt script on error
-
-bundle exec jekyll build
-bundle exec htmlproofer ./_site
-```
-
-Some options can be specified via command-line switches. Check out the
-`html-proofer` README for more information about these switches, or run
-`htmlproofer --help` locally.
-
-For example to avoid testing external sites, use this command:
-
-```sh
-$ bundle exec htmlproofer ./_site --disable-external
-```
-
-### The HTML Proofer Library
-
-You can also invoke `html-proofer` in Ruby scripts (e.g. in a Rakefile):
-
-```ruby
-#!/usr/bin/env ruby
-
-require 'html-proofer'
-HTMLProofer.check_directory("./_site").run
-```
-
-Options are given as a second argument to `.new`, and are encoded in a
-symbol-keyed Ruby Hash. For more information about the configuration options,
-check out `html-proofer`'s README file.
-
-[2]: https://github.com/gjtorikian/html-proofer
-
-## 3. Configuring Your Travis Builds
-
-This file is used to configure your Travis builds. Because Jekyll is built
-with Ruby and requires RubyGems to install, we use the Ruby language build
-environment. Below is a sample `.travis.yml` file, followed by
-an explanation of each line.
-
-**Note:** You will need a Gemfile as well, [Travis will automatically install](https://docs.travis-ci.com/user/languages/ruby/#Dependency-Management) the dependencies based on the referenced gems:
-
-```ruby
-source "https://rubygems.org"
-
-gem "jekyll"
-gem "html-proofer"
-```
-
-Your `.travis.yml` file should look like this:
-
-```yaml
-language: ruby
-rvm:
-- 2.2.5
-
-before_script:
- - chmod +x ./script/cibuild # or do this locally and commit
-
-# Assume bundler is being used, therefore
-# the `install` step will run `bundle install` by default.
-script: ./script/cibuild
-
-# branch whitelist, only for GitHub Pages
-branches:
-  only:
-  - gh-pages     # test the gh-pages branch
-  - /pages-(.*)/ # test every branch which starts with "pages-"
-
-env:
-  global:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
-
-sudo: false # route your build to the container-based infrastructure for a faster build
-```
-
-Ok, now for an explanation of each line:
-
-```yaml
-language: ruby
-```
-
-This line tells Travis to use a Ruby build container. It gives your script
-access to Bundler, RubyGems, and a Ruby runtime.
-
-```yaml
-rvm:
-- 2.2.5
-```
-
-RVM is a popular Ruby Version Manager (like rbenv, chruby, etc). This
-directive tells Travis the Ruby version to use when running your test
-script.
-
-```yaml
-before_script:
- - chmod +x ./script/cibuild
-```
-
-The build script file needs to have the *executable* attribute set or
-Travis will fail with a permission denied error. You can also run this
-locally and commit the permissions directly, thus rendering this step
-irrelevant.
-
-```yaml
-script: ./script/cibuild
-```
-
-Travis allows you to run any arbitrary shell script to test your site. One
-convention is to put all scripts for your project in the `script`
-directory, and to call your test script `cibuild`. This line is completely
-customizable. If your script won't change much, you can write your test
-incantation here directly:
-
-```yaml
-install: gem install jekyll html-proofer
-script: jekyll build && htmlproofer ./_site
-```
-
-The `script` directive can be absolutely any valid shell command.
-
-```yaml
-# branch whitelist, only for GitHub Pages
-branches:
-  only:
-  - gh-pages     # test the gh-pages branch
-  - /pages-(.*)/ # test every branch which starts with "pages-"
-```
-
-You want to ensure the Travis builds for your site are being run only on
-the branch or branches which contain your site. One means of ensuring this
-isolation is including a branch whitelist in your Travis configuration
-file. By specifying the `gh-pages` branch, you will ensure the associated
-test script (discussed above) is only executed on site branches. If you use
-a pull request flow for proposing changes, you may wish to enforce a
-convention for your builds such that all branches containing edits are
-prefixed, exemplified above with the `/pages-(.*)/` regular expression.
-
-The `branches` directive is completely optional. Travis will build from every
-push to any branch of your repo if leave it out.
-
-```yaml
-env:
-  global:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
-```
-
-Using `html-proofer`? You'll want this environment variable. Nokogiri, used
-to parse HTML files in your compiled site, comes bundled with libraries
-which it must compile each time it is installed. Luckily, you can
-dramatically decrease the install time of Nokogiri by setting the
-environment variable `NOKOGIRI_USE_SYSTEM_LIBRARIES` to `true`.
-
-
    
-  
    Be sure to exclude vendor from your
-   _config.yml
    
-  
    Travis bundles all gems in the vendor directory on its build
-   servers, which Jekyll will mistakenly read and explode on.
    
+Continuous Integration (CI) enables you to publish your Jekyll generated website with confidence by automating the quality assurance and deployment processes. You can quickly get started using CI with one of the providers below:
+
+
-
-```yaml
-exclude: [vendor]
-```
-
-By default you should supply the `sudo: false` command to Travis. This command
-explicitly tells Travis to run your build on Travis's [container-based
- infrastructure](https://docs.travis-ci.com/user/workers/container-based-infrastructure/#Routing-your-build-to-container-based-infrastructure). Running on the container-based infrastructure can often times
-speed up your build. If you have any trouble with your build, or if your build
-does need `sudo` access, modify the line to `sudo: required`.
-
-```yaml
-sudo: false
-```
-
-### Troubleshooting
-
-**Travis error:** *"You are trying to install in deployment mode after changing
-your Gemfile. Run bundle install elsewhere and add the updated Gemfile.lock
-to version control."*
-
-**Workaround:** Either run `bundle install` locally and commit your changes to
-`Gemfile.lock`, or remove the `Gemfile.lock` file from your repository and add
-an entry in the `.gitignore` file to avoid it from being checked in again.
-
-### Questions?
-
-This entire guide is open-source. Go ahead and [edit it][3] if you have a
-fix or [ask for help][4] if you run into trouble and need some help.
-
-[3]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration.md
-[4]: https://jekyllrb.com/help/
diff --git a/docs/_docs/continuous-integration/circleci.md b/docs/_docs/continuous-integration/circleci.md
new file mode 100644
index 00000000000..ccd2d933a9c
--- /dev/null
+++ b/docs/_docs/continuous-integration/circleci.md
@@ -0,0 +1,92 @@
+---
+title: "CircleCI"
+---
+
+Building, testing, and deploying your Jekyll-generated website can quickly be done with [CircleCI][0], a continuous integration & delivery tool. CircleCI supports [GitHub][1] and [Bitbucket][2], and you can get started for free using an open-source or private repository.
+
+[0]: https://circleci.com/
+[1]: https://github.com/
+[2]: https://bitbucket.org/
+
+## Follow Your Project on CircleCI
+
+To start building your project on CircleCI, all you need to do is 'follow' your project from CircleCI's website:
+
+1. Visit the 'Add Projects' page: 
+1. From the GitHub or Bitbucket tab on the left, choose a user or organization.
+1. Find your project in the list and click 'Build project' on the right.
+1. The first build will start on its own. You can start telling CircleCI how to build your project by creating a [circle.yml][3] file in the root of your repository.
+
+[3]: https://circleci.com/docs/configuration/
+
+## Dependencies
+
+The easiest way to manage dependencies for a Jekyll project (with or without CircleCI) is via a [Gemfile][4]. You'd want to have Jekyll, any Jekyll plugins, [HTML Proofer](#html-proofer), and any other gems that you are using in the `Gemfile`. Don't forget to version `Gemfile.lock` as well. Here's an example `Gemfile`:
+
+[4]: http://bundler.io/gemfile.html
+
+```yaml
+source 'https://rubygems.org'
+
+ruby '2.4.0'
+
+gem 'jekyll'
+gem 'html-proofer'
+```
+
+CircleCI detects when `Gemfile` is present is will automatically run `bundle install` for you in the `dependencies` phase.
+
+## Testing
+
+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.
+
+```
+dependencies:
+  post:
+    - bundle exec jekyll build
+```
+
+### HTML Proofer
+
+With your site built, it's useful to run tests to check for valid HTML, broken links, etc. There's a few tools out there but [HTML Proofer][5] is popular amongst Jekyll users. We'll run it in the `test` phase with a few preferred flags. Check out the `html-proofer` [README][6] for all available flags, or run `htmlproofer --help` locally.
+
+[5]: https://github.com/gjtorikian/html-proofer
+[6]: https://github.com/gjtorikian/html-proofer/blob/master/README.md#configuration
+
+```yaml
+test:
+  post:
+    - bundle exec htmlproofer ./_site --check-html --disable-external
+```
+
+## Complete Example circle.yml File
+
+When you put it all together, here's an example of what that `circle.yml` file could look like:
+
+```
+machine:
+  environment:
+    NOKOGIRI_USE_SYSTEM_LIBRARIES: true # speeds up installation of html-proofer
+
+dependencies:
+  post:
+    - bundle exec jekyll build
+
+test:
+  post:
+    - bundle exec htmlproofer ./_site --allow-hash-href --check-favicon --check-html --disable-external
+
+deployment:
+  prod:
+    branch: master
+    commands:
+      - rsync -va --delete ./_site username@my-website:/var/html
+```
+
+## Questions?
+
+This entire guide is open-source. Go ahead and [edit it][7] if you have a fix or [ask for help][8] if you run into trouble and need some help. CircleCI also has an [online community][9] for help.
+
+[7]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration/circleci.md
+[8]: https://jekyllrb.com/help/
+[9]: https://discuss.circleci.com
diff --git a/docs/_docs/continuous-integration/travis-ci.md b/docs/_docs/continuous-integration/travis-ci.md
new file mode 100644
index 00000000000..caff2f64238
--- /dev/null
+++ b/docs/_docs/continuous-integration/travis-ci.md
@@ -0,0 +1,230 @@
+---
+title: "Travis CI"
+---
+
+You can easily test your website build against one or more versions of Ruby.
+The following guide will show you how to set up a free build environment on
+[Travis][0], with [GitHub][1] integration for pull requests.
+
+[0]: https://travis-ci.org/
+[1]: https://github.com/
+
+## 1. Enabling Travis and GitHub
+
+Enabling Travis builds for your GitHub repository is pretty simple:
+
+1. Go to your profile on travis-ci.org: https://travis-ci.org/profile/username
+2. Find the repository for which you're interested in enabling builds.
+3. Click the slider on the right so it says "ON" and is a dark grey.
+4. Optionally configure the build by clicking on the gear icon. Further
+   configuration happens in your `.travis.yml` file. More details on that
+   below.
+
+## 2. The Test Script
+
+The simplest test script simply runs `jekyll build` and ensures that Jekyll
+doesn't fail to build the site. It doesn't check the resulting site, but it
+does ensure things are built properly.
+
+When testing Jekyll output, there is no better tool than [html-proofer][2].
+This tool checks your resulting site to ensure all links and images exist.
+Utilize it either with the convenient `htmlproofer` command-line executable,
+or write a Ruby script which utilizes the gem.
+
+Save the commands you want to run and succeed in a file: `./script/cibuild`
+
+### The HTML Proofer Executable
+
+```sh
+#!/usr/bin/env bash
+set -e # halt script on error
+
+bundle exec jekyll build
+bundle exec htmlproofer ./_site
+```
+
+Some options can be specified via command-line switches. Check out the
+`html-proofer` README for more information about these switches, or run
+`htmlproofer --help` locally.
+
+For example to avoid testing external sites, use this command:
+
+```sh
+$ bundle exec htmlproofer ./_site --disable-external
+```
+
+### The HTML Proofer Library
+
+You can also invoke `html-proofer` in Ruby scripts (e.g. in a Rakefile):
+
+```ruby
+#!/usr/bin/env ruby
+
+require 'html-proofer'
+HTMLProofer.check_directory("./_site").run
+```
+
+Options are given as a second argument to `.new`, and are encoded in a
+symbol-keyed Ruby Hash. For more information about the configuration options,
+check out `html-proofer`'s README file.
+
+[2]: https://github.com/gjtorikian/html-proofer
+
+## 3. Configuring Your Travis Builds
+
+This file is used to configure your Travis builds. Because Jekyll is built
+with Ruby and requires RubyGems to install, we use the Ruby language build
+environment. Below is a sample `.travis.yml` file, followed by
+an explanation of each line.
+
+**Note:** You will need a Gemfile as well, [Travis will automatically install](https://docs.travis-ci.com/user/languages/ruby/#Dependency-Management) the dependencies based on the referenced gems:
+
+```ruby
+source "https://rubygems.org"
+
+gem "jekyll"
+gem "html-proofer"
+```
+
+Your `.travis.yml` file should look like this:
+
+```yaml
+language: ruby
+rvm:
+- 2.2.5
+
+before_script:
+ - chmod +x ./script/cibuild # or do this locally and commit
+
+# Assume bundler is being used, therefore
+# the `install` step will run `bundle install` by default.
+script: ./script/cibuild
+
+# branch whitelist, only for GitHub Pages
+branches:
+  only:
+  - gh-pages     # test the gh-pages branch
+  - /pages-(.*)/ # test every branch which starts with "pages-"
+
+env:
+  global:
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
+
+sudo: false # route your build to the container-based infrastructure for a faster build
+```
+
+Ok, now for an explanation of each line:
+
+```yaml
+language: ruby
+```
+
+This line tells Travis to use a Ruby build container. It gives your script
+access to Bundler, RubyGems, and a Ruby runtime.
+
+```yaml
+rvm:
+- 2.2.5
+```
+
+RVM is a popular Ruby Version Manager (like rbenv, chruby, etc). This
+directive tells Travis the Ruby version to use when running your test
+script.
+
+```yaml
+before_script:
+ - chmod +x ./script/cibuild
+```
+
+The build script file needs to have the *executable* attribute set or
+Travis will fail with a permission denied error. You can also run this
+locally and commit the permissions directly, thus rendering this step
+irrelevant.
+
+```yaml
+script: ./script/cibuild
+```
+
+Travis allows you to run any arbitrary shell script to test your site. One
+convention is to put all scripts for your project in the `script`
+directory, and to call your test script `cibuild`. This line is completely
+customizable. If your script won't change much, you can write your test
+incantation here directly:
+
+```yaml
+install: gem install jekyll html-proofer
+script: jekyll build && htmlproofer ./_site
+```
+
+The `script` directive can be absolutely any valid shell command.
+
+```yaml
+# branch whitelist, only for GitHub Pages
+branches:
+  only:
+  - gh-pages     # test the gh-pages branch
+  - /pages-(.*)/ # test every branch which starts with "pages-"
+```
+
+You want to ensure the Travis builds for your site are being run only on
+the branch or branches which contain your site. One means of ensuring this
+isolation is including a branch whitelist in your Travis configuration
+file. By specifying the `gh-pages` branch, you will ensure the associated
+test script (discussed above) is only executed on site branches. If you use
+a pull request flow for proposing changes, you may wish to enforce a
+convention for your builds such that all branches containing edits are
+prefixed, exemplified above with the `/pages-(.*)/` regular expression.
+
+The `branches` directive is completely optional. Travis will build from every
+push to any branch of your repo if leave it out.
+
+```yaml
+env:
+  global:
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
+```
+
+Using `html-proofer`? You'll want this environment variable. Nokogiri, used
+to parse HTML files in your compiled site, comes bundled with libraries
+which it must compile each time it is installed. Luckily, you can
+dramatically decrease the install time of Nokogiri by setting the
+environment variable `NOKOGIRI_USE_SYSTEM_LIBRARIES` to `true`.
+
+
    
+  
    Be sure to exclude vendor from your
+   _config.yml
    
+  
    Travis bundles all gems in the vendor directory on its build
+   servers, which Jekyll will mistakenly read and explode on.
    
+
    
+
+```yaml
+exclude: [vendor]
+```
+
+By default you should supply the `sudo: false` command to Travis. This command
+explicitly tells Travis to run your build on Travis's [container-based
+ infrastructure](https://docs.travis-ci.com/user/workers/container-based-infrastructure/#Routing-your-build-to-container-based-infrastructure). Running on the container-based infrastructure can often times
+speed up your build. If you have any trouble with your build, or if your build
+does need `sudo` access, modify the line to `sudo: required`.
+
+```yaml
+sudo: false
+```
+
+### Troubleshooting
+
+**Travis error:** *"You are trying to install in deployment mode after changing
+your Gemfile. Run bundle install elsewhere and add the updated Gemfile.lock
+to version control."*
+
+**Workaround:** Either run `bundle install` locally and commit your changes to
+`Gemfile.lock`, or remove the `Gemfile.lock` file from your repository and add
+an entry in the `.gitignore` file to avoid it from being checked in again.
+
+### Questions?
+
+This entire guide is open-source. Go ahead and [edit it][3] if you have a
+fix or [ask for help][4] if you run into trouble and need some help.
+
+[3]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration/travis-ci.md
+[4]: https://jekyllrb.com/help/
diff --git a/docs/img/circleci-badge.svg b/docs/img/circleci-badge.svg
new file mode 100644
index 00000000000..38658380a67
--- /dev/null
+++ b/docs/img/circleci-badge.svg
@@ -0,0 +1,14 @@
+
+
+
+
+
+	
+
+
diff --git a/docs/img/travis-ci-badge.png b/docs/img/travis-ci-badge.png
new file mode 100644
index 0000000000000000000000000000000000000000..94f255ec9ef016e18e94f7fedb6bb04105ae4aa7
GIT binary patch
literal 26749
zcmX6^cOcvE^N(E=EmgIvHQL(L7W-30ky3k8dym+Ak1C~T&8Q+aReRO0y&`5rZ81WL
zAjU8K{{F~6Pu|ZxclX?LchBqYNdRf7Qc*Bb0000gwbv>-00037|2w`ziXZV=;35M6
z98}a)6yNz19CVOnnHhxKj%iG4d|@~ee9@@KpVDeO0{{JRpy&06ponM6^=$9o3^Xge
zIqtiNvQ83NHGGL10!=S{7gT5Cj`2xXyblQ*NF$5l%<*Lpf&U$6`sj_`_YSj1A{TI>
zMteEo-&?#Vq;UHaH<-D*6Je+9*Q&P{1r-7&o^Ok49QMC)XE|Jcvuks>`6g}lbAEl>
z?nRf4^$^-3;BCz(&N3-_AK^4kJxgE%adlp%^I-;B>U!9ZJ#5qXm3pXo8YfgEjd*u4a5e;SZSnW|{l0{>N6%=YK?BPRqqp{x#03OCtuWr478cqvW#E;cYk{
zR&+L9ID7qXR{21`J@H6oI=Upb`J?&25jV_q+LE}-N_%tAMD<1M3!z=D@GSg%+TTk>
zfMpr9w8vi{%`))zcdxtLwTVTr#kTgX0|od7lT)yBbu@aLqf*)xvep$!bNM?C4IJ@P
z2&zVeB%&KGr!m_k=Zfn8)_CF^*q)48+mkR0eJHsSgyt^=_yV4R#?)8@&R4WqWV{G=
z*!{2PhxnJ8^4)}2>7(!rJXbCw81-ScjQlSNOnIawi_zF-{dGVQ+)l}2Y)l%|F1G$6
z!@237pg|$DNu$iG3YBe1rW67pN|YM}lJ-;D6>qA6{}yM$44V%AC4OVLO4!UFoAMvK
z_1VY603&o7L_kWd?r(yk$!1?S^0Xx9wIPuTp_jEYTMAh!wswU+i2VbnqFGu}NMf=d
z=+MWy`$ylB)lmAo-`!5BX8Rl2|FkqLc}(TN0u00{1<@^XQXBSd)UA>2W;fN?{M)2%
z*#N1e
z-#se}Vb$P>V1GcDA9A*ojK=RDwU&i#9j>;wzT(TmUj3`=*PFdbus+H|yc}wb1EYSX
zE$eqPv(+ccb;?-c+M_)RCWH8?m|Q_;YEd+P*yC<
zq3DlA60n-r&+!Dx7dd8W`I5dHgyto&w7UadOEmv92-eCA@I)XvGkS)cvSKMvX_el~
z8C(*{pJ07k$?G_V_YE46t*|q0kt8^$
zagkGJ-MWVyhY)IaU(Tna`S@4l+^d}bvBT5=&$B7}IXXK|puEa!s`_y`k-1&(*q6GI
zYPO;4f9JHCn?GlwTw^ZpsUtL5;H`LYM2*9r1jkKpyK6BJp#-mAJAR+)jIA_d+uUyR
zV;VD|2hCn_rfB7FNkm4{{AO{Q?}r4-t;W3YJM9QdyW4d61H%x{-q_O5gVd#Ri&c&`
zqVDhvbM9hqVT~@`_~@R8=j+f{-QSp6qtd5;reo71UUb7p((u4*P(~e;^%dyZS5l9#~Dn~0`9unA!g?v=A}M&uvGHSK;tEkxnx
z7%#ZD8HlHwrjOjAi{6{}L(Jwe++6E|E8FgJ_H+IMUR1bK-sVRsG_u7Nsk&Q$2=nkl
z0Yavbh{Ks%8PgFWbZ5xxLIG$PCPnVS4bW`s2Q}B~$5N7drrA5Fw1HxHTF2S4{FK8k
zCiqX^wK4@*F>kxmZN213^qum1sx#1xT=3Upyvv68p%QhN#FJ@XxeIhuyHBw0A
zpfHyuy*wIpr}(Gu{1tF93XGE}uqgEC59`aHS@iRGxd4zQy0za=2D2wzUl>fva8uvN
z!V1C~g`r`tV~5dc=52vCMIfHLbfE(E)ZV{Z$L}my5#TM2eCLBkGKqAiEVG*1NqrV7
zp)8>w>N2TRULqIIA$jk+P`R3mOaH>!`901_^8LuxcZ8D%jE5X@WY4^-G*#aNX@v12
z=VPb0wIxfuevi3jDmL3i;14zNsj)Zo{w>g8PR6*kkP;Ost?A$e?tWUG)hix%C@rt7
zQ~6JKF@Wm?8&v@qLh{*#)%x!Rj84#~FfWJzl1%gPT@aNV4)ZE%Z3T#Fs
zAU2mDHZJ;b@8FQvqxY1}Ks1^TS7t|NM0|5{fZB-)#bk)UCb@j*_YyOo=lNl&8r5cHXWlm6gJu6D0m
znCY>RKoCRwrrDrvEJW^3#UWA}0G?0B@!1uNZWO0>J8pncXLd;0u&g7;;RotJKzO|*fg97BJ
z>0tr_)?+Vwn_^W!^P-wS{KBF#HCVADn~$NdTU^;0h?2X5SN;agX}=-?D;8X>A9y76
zE?NvO4V`d9&Rs-RRBM-?qt}lRERatBzjGE1q@5R8T{_n+>HT{yRm?qP+_fo#2e$Z7
z_349%{4>ajl1-t#Q?YK1NeBBK=TQQb?`uZehQ#z?BD~-zCWSq5xAIW^-`o?zR}VY|
z?{2zr*W#UcxLg*?P6lnGY1QX@;;T46)+Xbrh3yg&up;n-RTV|EEtcAYW^M0az1z)Q
z>nUEWQ$Pe;<*9m}+gY)Tp_R)rf)lUVm)vXH^@6SyXO5OTNksFiKm90C(-mU2JDYAl
zrp<-}Xh*eb8sq5kb|ot+ds6;o#o(InmT|Adult^oP?VY2KP#MSCfKp#MdV}laxRvt
zfRzvdXq-LUSAq$d?g`s6ZsfM$SUc8qY+Ht|ehwcXMG$lV;QRI^?X#QX)ALd6d7(gL
z;01_=@u;|OR(TqVII&||k}keB1sPbIQbBZmBV!Pp_pV3g_m5AZqkf8Jpqlss!ROWE
zGH*Ks^@abuWjsE{hw7a-*aMj+LBMIO%@l`X^_NSZXnJnEgtJxxb&N+hp5UM!)AYG;
zKM><_WMGtzHH#W=GjUGn@tB)*n1PMy1U9krHcuOWI0APF3KTn9ZzHb%1K}-9H0OTC{>>WYPus~yi^aA6q}I7=k$?roIEjP@zM(na2O9dH^oV&Ji3Mji?B&vK
z6N9-1`scnai4N57KV~5K1RDRx4)XTUKCqf->)?bj;4}goHh58)T|dv$fTTpB9yO_8
zkzs>LWm?A<;M635smhj2;GZRJa@3|W@UC~68QiYP3vr^E7O;NARNd-hmgm(pl{CE~
z2(7ST5w3jTJxE!r(oD?^+r4#*lb$RqZm57~Qh?)dwsF!`(Y@Q}69(G4_2#audmvOJ
z^gOT(lr?Zr?0hEDILhoojI~yg%3(xNzW|`9vAlswCc#F`FSc0K-ui`|?i_$=x9u8k
zvnas*QwLuUNt=vjG3Lf;ESJM*`PThccrWp{knOS)doLlQSgep-;C!Pn`dY#i7rC|<
z*}Aqf5`Xp~LF=%kd4>O1GN2W2A=pYi!A)TI(=3>1oP=lZ*4UI4ddfns
z{mVItYWoKg&LPIao2&ZBz&{{)oO^+xFRKvGxd6-tPLPlh!##3b4WnsU`1iR0w4z2vpfVaR`dF~=&s{=3
zJN%|Z1{UjgK*zl@XyL?c(%!ra!p9t{Pz}-8kDkxXU4lya!mNOvtoNT9xK>${U@9SO
zNKJuGeb!?m63&bg`N{eTp@MI(zAnW-ddmsZ>l}FS{Zyd&2_H?LSRV|U(>6?wU*P;o
zN!BEGGKZtHTBL~(BH&4A_VVQywXHy!V*X;gPI+Om`&5|zTmQh8XjvMoQ`(^ybFYAj0LMAuSP7a(m!TE%mFZ}WcwHRNgOCop|WRT8i{w#$-s&AU&g?+v9
zHQDV&fFjTxn$tQ&(qXe^i80ooFyUz0j=%p@BDn6~=UUZl0!_8T8J~}I?|V)yf=c(*
zK!UU=Fr1(`l`E?uhNw>C8TGo7rlVI>>&pX_Z_4YBtFfvh=i<{K|ltmMv=K2_6{IZ#EE{2yv7rn&cP35AOp(^kwO`a-~-)#
z7>L)Vo{Y`GuHlrXXT~NB_xo%q(=N@TRA!fEGp>-dcS8X6J>0G)%c|2ij*8
zCUFIY9CA2LBM;cNorvzl7&5^-(bNs7$X4a#Rsxi5WhO<5E~n?(#o>utIK|`Rf=!?Ug6p;=cE61ue|G`Yi)YibaO!FX<NxP(Yxw;MEaecKEY4|eN$*p8^l`W*0CdN%yEi&yULfCY~oH#Gen
z7c`3q-1Gc7B=qVj`k4sPN>JcadZj9UPdeBvGEef;38l&VEg1nN8QAp*o^XwqxC~7G
zv{QoND*-y>Xt1sM-<5*YXbqoN^4f^cbl|Gx5QKBtGu-<$KLOy0yZ(v@3;Qn2&`Z$m
zro}Uinb)lrPyS``$tU>bcZh&kq0#NQ=TrhuNZ$xC1|5bKjSS=fZ3mQuU)r#r_v-`FO)B*WGvAcWB
znv^IV9o`U3@!mvw|H44CD6*nf62gk2W;}{)?e)P+kfbTSX?#^sQP$_G0z#`!L(8Ja
z*n_VEJ~6iWLUH!LC{Z_G(UE~|?e`vW9K!LAmN##I>|rDgLk@&ZP_Y956=k;orGynM
z`nyJpAS&^$K>w0%@S~}Nqb|AmJ4ImqKe;(h@QIvx$G0l{-`N<~mo|Q7%*)@oP^d@SkZ1xP}ZxfDj(hC
z%Sq+ysFY=!mH9I7hp>|tx{q?U#Nb;J4co?VVKfD4N)PF74PzP=I|1ep<0b%p!xuG(BGuMS~
zwQD3`m73JfoT)pg7dA_s-nbr!_mp7ahWw;((dN0bk;!)lZ=>dZQ
z-c79SQiBA06Sq$)tE?9oBv*AA`z~2j9z}%wK>rn2G_!SinWIMHv3zOL=nlMAryXa!
zxf?FNnda2PL}ON}(>b29cC#R0z62ST-8l>*w!E_-Wc>)
zUltd`iaOJ;3(g{{VV7Zi5##2MXqW*0J<8E0o0Mtz$jSh-;L4~Is{;^hbYNG!oUr+3
zC$keg75OuMk#5fXKLDQ59yy;PFeD`KUSZAv
z+|qCfd6iT)KBK*|)UtQREcvVC=bBV_y__k;9Dx?nI`Yt`eqt|douA!#8*nC*(L|1V
z{<7fP2P#QxM18o??_e#xTnB=XwTIQRX+e9^
zF)nM`LEDVhk5Ly3l*r)7iH|n|EZpnMEqBivm?eNIh0)!xv3qOiOZ6{wu#CqHrl?#_
z0`O=Av}KD@{EW-x>Gj+dqeAn8TY{
zQ9E;C2M1F~hNSJBunXQB0e?kc!fWfFawgPab#uLoGzv}1h^54)I96aKwwykNK}5vL
zO$)@{NbN;RaIH9Dxcy7fB{z9yh{-QP`tsVIyGUlvYSS`7s%@17Lu@R2v3D(}O&!z#
zxcD_?(tGJ0(TYfH8eF@s@~eMEj1g&=ZWP+D^HMfqc^H72mxOCXiye}IRo>7UIJ9Sg
zQv(*L|1tCy9)zsMmZq>L#B#)`wkuakg+XzHYr>qhYrrbMs1iIOF&#Eh#{Yb3*aBdDO^ywZO6(ne
z=StwCx1e^j#icZ+4#INT7?EH?RDm^@)RmV<&i+jDz?WFdPoD#
zp`TDJ8IrrF7!J4j?A>tKQNoSqLioXIt5WDDIX5KqAqD3=GV=A8yuXdj}4qn+5~uk%Grbi2pbTikk+m
zXM6c6Di>6Wz*yFrq_|e?o?OUb>SNW?ZZ{-&u-dg7aR|T!SDlL=WNfg-{B4x0!a7#^
zDRuxE4`!|hMx-_ye9WbpZT2cX(*`{LBa$32?>rBaM}j%G*2=U`&=m!5OR+N57~>rN
zufGx?)F40-4gS(@w|v5q9V;DfcX0OsYJ;Tx9HD)Z?-LSs56yUcb~la@e>MyA5lntf
zzgWktJ19}1*Gu-e5Pz7`t6$4{!s(DS@#q
zz29NkrotS_VHgKE3RaCoZUfjaa#hg5S8WSh*Xc*kMOUcQ!2ZEJWb4@sut6NSuIPM2
z;`YCVJ!#sGK0^|MHOD|OP8l&}jQ8r5KG9hv1}1-6L4&r)gOk>nUum2sfAdSCgKJtS
zVO86;DTIDr#UH9K?kjd&_+M~JGy}fmNCYxzzI04j=caKxg{@(^qNN-9fij~3r%`x{
z*1N}`ZM2gzaP5~XS*!d8xjomHD)dw3fnZQL9&P&~VKPoij0;gq7^~}E9q?`zFim*~
zU6L@}-gS*^wsH=tu^IpHTJJR0bSJXY-!z~azQ%{LC`v*6Seo1IRL@{~#B`!RJZ+PLEjS2PE
z{RFp8b#jbf`=({EQI2LE)(F(3Z7r&4TQ4D*s5!7~62h=_#WwH@L4XSNkOjcgf&BqxQ-^}SkrS0$}%nH?=nZn|~e3SrAQ
zI0TK`#YvN;v#hB8eb~DH9LPL9PgS;tTHY20#WAAjt_Q|Evm|}Oy`gVY1iz9CpWN;H
zQ$*Xu{JTWMB_nx-4v!>-P~>o&AVM92QS(bhg@@^>PPL0kWqM6P6L$~n@5iDNts*bg
zlPdDmfQ1r4W#vX9HoinMeX~>`i2>P#eY)@t=^;&!pI3`Pv|q`P${T9(x(k6b|JEfd
znfQk=vl=Y^GVu(L0D72)EL>8OW?h{NDTF9_p4gfx;4_^9>;bdE;E82Qz<~X)xc4o@
zgzBFU#HcZNh?ihSe`hjwYM_vJu)_RZJFBut@oc{L*o8}1
z^%>7c))vq&!aBFV%{^&@Q><$!O=VU}dDkDNeNg?io?lK<*F$KM2_-3MpPkFiYUT;j
zI#bb6DmAaWUXDJlZ|4r!wIz6-QJ~CX2ZYW?EE`fXi7`{5HrwtjNaWJ20MvlLm&L}v
zqw;xcpA_c^<9ilyop2=$b3b6n)$5vFm&y#{5abDEf?fwV{w93Zg4(=8?cFs0|P-{0VpnO
z^h>>K`b&r+?#yg9Bu`WG4k|`D&p$AjN2-l1o=C-Cker|X$oxq=jaf|q5^SIvY<^L9
zCbu{?ZbyMRFA-V(oVp;lAGl9M*U2S{4{U3`nwbrSWFJ>hl&p#fT^4+PTY5WC`tj9f
z+xr`HT7!wUid^N`EB>Yx5W_yNSM=q#v_Gi5{5I;o_jA)Lb@6-sBuGSmoR|kavr~~i
z{pH!RuwsWPH2vO!k8DUw%RX20N)$0hE`7(ToyVp{F~oK>1`&44D(ED9)&8X3nK!-X
zuP;Vevd0{*FIbi^>Y&*12I_6OcYIyjj5F5uLteCQwmU@ksY|&GDqdf#W~3@%bT-1j
z3@tY=Z*l4&{nTj>--7`Cu1K|G7TyQRdd_WBJtun^c6q7#LZ0^;&VXcCO66vU4*I05zbwL&
za8#=U@eEZ$d+!PlnIEf*>jgRHct334NX59xKYn#8_v|?D1M2CqsztEmjrXiVW%;LE
z$cm9xitN?aj4>cX65b@oNQIfMzTQn?bCe}wLxc?O?dvXmcZtTyN9^T=l6Qz8d8GvY
zi|)6EXlebfpb^!ndf%dyJ^pU+OpP;_Pa-@rTEzTE{q4=rTJ>$s?bY#vA+N%_Lsq|%
zHs(FJ<@ONy1&V2=YJX}W4p7l;NDYz$s=Y;sd8^ogmYNo3t*E7lJ^T+s7M#fEZ=668
zYa378^1uk~pqkR#!ytE}!PS}ah~_OQ49r;Y(-sGx`9!yDuKT9TZ?>fCg%KYUisPi?
zC9AYgUWb`W$E%m|l9dp{@H=L+?vgeWW9QplQs$`q2Snh*4)vuMiyig`KBU3=U(v^!
zl;7)b&k`JB20dBq%)k$$zYLWZkEfcaE6Mh+I{o$*Jt{j2|iO>rs<1-SzZyHx*qWFkCdD%s?Eq1;oez{aj@AD%%u;9+P}NeAMcK*3yXVrfDjM9&geu*A(;WpBVzVw3Up%du^wob4NQsrh579<;^=v)Nmxaf?(|Z{Y@9n`+O|~_&HI5o?<9NDZWtCFQcEr
zW^&vpGFv~#;JY492d*p4`ix(3>77}ss3@Bm9g!%T@msHNCm7I$#xtMoJj>Ek8tw``
zp<{iB#TVf3LB_Zrp$53h-q*n^CMU+sQtrPcLt%Kmi7~s4${}w+DG&3$pxz%7V&Jn-
zn+(2&#)ZE3t{OVpe_FTAIF|d`dS&`JB%7=>^q?~+V^9qlW}%&V;too0PTv(O3LIiy
z!B@(MV?R6ergIvdx7)C!ryS98lP1*4%ZFoK7PnW1P`phP&tMs2x39K{pdev?Y8;ZwQg_7Z+e(*@zYonpAL6yXGpts!l2SJQkr_9
zefAYAG*v$*O(Z``$vqar((@p=$#RGpQa#@ass4c7xu2#WqR_6HYDbh_%%|2ErLcML
zo-AQ?rYt%jh2!(W
zeVcNVZAQFylUydhFsxGY9BPvuSeg;Jv~(0(7qdj9GAIbBizF2gXdv@t8kh59g+*o6
zy#Jx#?GLos@^jlG_o#F?XKEScdj51MgPr!Qm3z;s&vG;v
zUqL-sZMfUXpS#I=@#G#`Rl2t
zdFU(Wg{Q_t%*-#K?hBn5pE8;g(SktigwZCh8W}}Du9QV-mKLkyg)rbq!Q2$8h821T
zb{+(MgUGQ4arAdzmHGMk?k{Rp?tbG6rOa%8{E<_w{B`Q!WcMn0p2#gG2M=#~vvnk@
zM_zO*&w<&3ClFqx8fl!fE>LBWqr#-19UJs*zcnBBU-S}l0c~5^Sp?l|+OwmshS-Cl
z5fka0YP72<>}^da+DLy9oSoQ4@_#=(>K@@isL;>-uR3hg{^LKeh*mfgM;+kLzd3HbGL$atwRSE8s8jQr=u`to)W%o@c+S2%aqAO87~X@
z<)JA9=A%z(x>~@DM`@OK!!rqY$J?lLEAjOfd`?vyQQD_i64+G{7yZ8yr@wi1@>fnZ
zkT&wxj5c@SG)oDkDb8$)*=(islRFI>=~kFCSt^dBY_5WD7-${kZKcR<`I
zia_B)sh3|?Nen*iFAP#O25fd`lb9v{M@cwc>+}yqj>Co%@u3HFXRz{u=UKe@-pOJj
z*+ejVGNX!dd()7EjO~_BPW>+oHCi+dZ!Ir~!dh--_MQFpsM%U?g6@9vtbD7=n-nRX
z)KGT57dw{2kd=u91h6evw6#B9(IpY1U{((fDdtpTE9WNArv}j5s1eyI>5aHHbsZuz
zW6!DC<@~w((S0(y>j9ml4i9I-W0?^fy+P~eH!0d@Y8R^y7zXll}bH9w$8GlfDCT-m2Idd}GkL-wu
zHM1i4RxTM)A#R-Zy%BTwm!)M&IYm)VE&D4mw@8LpHZfCkl#f*Shk^^nNKi#9j7Pc4
zZ2$Vj{(R@g8wpj7(5cXOogk_^QLuCKnHGhR?;o9?^(WKgyU)_TYZ{myKe39{0JXnx+X}evN^79^wpm5ZPI;-myWb35MHBcu6ldT%dbpxa%Q1SM
z`@CrsTbB!wV+gWpRw2#1)-=kj#Qyb}EvHg|mIEgA6`Xu#TgRVPH2K`TAIr$AsailV
zU7ux}<(18vw5To*KA9uK%2krz1O?1NSpc&2`3tvVT_?kMiU&v{x$(el6^V0_XL{X9
zPpb3)4@h3z@B@H91L<;_WkBI}OOHe6P$O}K9{#VasdXl*7mksE{N;NhEcdd0?+S6I
zvj6MVqg2m2mY%!5sTm?irAuML$&UQ*)~?Q$|I8ON1#=Kh4VOsXt9bCb?xJyQdZX
    ak<2AIA!{{F87&q>sx_$WcF+D1SEnsUiAvXH$1
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
    #3$RpaHpFsInJ
z%)l~`DYR|$8JI+u!{ddZPw(u~i%N!YIQ!smB~;rol(_-BM{+vIww93
zE^uUK?a$>G1guNls@n-sLXe~+9Irn$!QL6T-K#bL{$0EF1Hoh=awm+d@`X8ow*NM;
zEL)X1WMhHjBY95gQr42wSNqJ9!7knq
zOXgSKee>c2NX6Dnafr#M*o{@Y^tiH5;<;#KBt<{2}x@VsTCLaAyp@yxcB?QGO%`EJNVy$O7Z30jFz*J
z_zVI0!yf}7YUBu?o#sluV_(mqJrBT|a)x6RCce9~*(N3t`YvFt-PPQa9mm8HCei5Z
z$dDI-hhGL-E>H8NZ!YyW1GehqNO~~qI?ZTX6T9^P~)Q0MZ_D
z;nJoB*#-aLUB?xdD&bXMmbyy+@-SE-+-tf1rVYP3L&!l&w9c@5$3A(?!4Gpq^k|Ee;WDK)1adYf}x#Y)RZ=b4ZZ~5_n1pBn(gFFZT30
zI;1U6|Lt|LFkyF@0|uw{OqL_w-OOJ3CtlsOZvJ1D$m`ddx3InC0nPiREf;royKa%I
zyDF+H2JN;w>)}>ZIDPwVL5dFG>8YVrdxvs~+;pLVb}V1`%Vooqti-0^@RGW$G()SF21
zyVbD>ruM)mA16hSu5CXbF;K`wv_CyzoJUyH2I-mQ=W6Xmrb1_L
z8rHnKkjTPMeE~}MUqWa%{gdqi*9Nv96E%*llULp{eR$K#L>JAF>Pt|qhpa1t!FE68
zoko&;kFBe-;g{^mK`Xv9j{_W1H@VpZ!c;`}idSE#UDhB{M*ha;xKe1&#-~+^Tzp&n_iulDmUNtT)3$_tje
Date: Tue, 24 Jan 2017 01:42:53 +0100
Subject: [PATCH 1896/4996] Review CI pages

---
 docs/_docs/continuous-integration.md          |  20 ------------------
 docs/_docs/continuous-integration/circleci.md |   6 +++---
 docs/_docs/continuous-integration/index.md    |   9 ++++++++
 .../_docs/continuous-integration/travis-ci.md |  14 ++++++------
 docs/img/circleci-badge.svg                   |  14 ------------
 docs/img/travis-ci-badge.png                  | Bin 26749 -> 0 bytes
 6 files changed, 19 insertions(+), 44 deletions(-)
 delete mode 100644 docs/_docs/continuous-integration.md
 create mode 100644 docs/_docs/continuous-integration/index.md
 delete mode 100644 docs/img/circleci-badge.svg
 delete mode 100644 docs/img/travis-ci-badge.png

diff --git a/docs/_docs/continuous-integration.md b/docs/_docs/continuous-integration.md
deleted file mode 100644
index 7947764554d..00000000000
--- a/docs/_docs/continuous-integration.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-title: Continuous Integration
----
-
-Continuous Integration (CI) enables you to publish your Jekyll generated website with confidence by automating the quality assurance and deployment processes. You can quickly get started using CI with one of the providers below:
-
-
diff --git a/docs/_docs/continuous-integration/circleci.md b/docs/_docs/continuous-integration/circleci.md
index ccd2d933a9c..fede484a2d1 100644
--- a/docs/_docs/continuous-integration/circleci.md
+++ b/docs/_docs/continuous-integration/circleci.md
@@ -8,7 +8,7 @@ Building, testing, and deploying your Jekyll-generated website can quickly be do
 [1]: https://github.com/
 [2]: https://bitbucket.org/
 
-## Follow Your Project on CircleCI
+## 1. Follow Your Project on CircleCI
 
 To start building your project on CircleCI, all you need to do is 'follow' your project from CircleCI's website:
 
@@ -19,7 +19,7 @@ To start building your project on CircleCI, all you need to do is 'follow' your
 
 [3]: https://circleci.com/docs/configuration/
 
-## Dependencies
+## 2. Dependencies
 
 The easiest way to manage dependencies for a Jekyll project (with or without CircleCI) is via a [Gemfile][4]. You'd want to have Jekyll, any Jekyll plugins, [HTML Proofer](#html-proofer), and any other gems that you are using in the `Gemfile`. Don't forget to version `Gemfile.lock` as well. Here's an example `Gemfile`:
 
@@ -36,7 +36,7 @@ gem 'html-proofer'
 
 CircleCI detects when `Gemfile` is present is will automatically run `bundle install` for you in the `dependencies` phase.
 
-## Testing
+## 3. Testing
 
 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.
 
diff --git a/docs/_docs/continuous-integration/index.md b/docs/_docs/continuous-integration/index.md
new file mode 100644
index 00000000000..14c5c7490a4
--- /dev/null
+++ b/docs/_docs/continuous-integration/index.md
@@ -0,0 +1,9 @@
+---
+title: Continuous Integration
+permalink: /docs/continuous-integration/
+---
+
+Continuous Integration (CI) enables you to publish your Jekyll generated website with confidence by automating the quality assurance and deployment processes. You can quickly get started using CI with one of the providers below:
+
+* [Travis CI](travis-ci)
+* [CircleCI](circleci)
diff --git a/docs/_docs/continuous-integration/travis-ci.md b/docs/_docs/continuous-integration/travis-ci.md
index caff2f64238..e76e1a60c32 100644
--- a/docs/_docs/continuous-integration/travis-ci.md
+++ b/docs/_docs/continuous-integration/travis-ci.md
@@ -4,10 +4,10 @@ title: "Travis CI"
 
 You can easily test your website build against one or more versions of Ruby.
 The following guide will show you how to set up a free build environment on
-[Travis][0], with [GitHub][1] integration for pull requests.
+[Travis][travis], with [GitHub][github] integration for pull requests.
 
-[0]: https://travis-ci.org/
-[1]: https://github.com/
+[travis]: https://travis-ci.org/
+[github]: https://github.com/
 
 ## 1. Enabling Travis and GitHub
 
@@ -26,7 +26,7 @@ The simplest test script simply runs `jekyll build` and ensures that Jekyll
 doesn't fail to build the site. It doesn't check the resulting site, but it
 does ensure things are built properly.
 
-When testing Jekyll output, there is no better tool than [html-proofer][2].
+When testing Jekyll output, there is no better tool than [html-proofer][html-proofer].
 This tool checks your resulting site to ensure all links and images exist.
 Utilize it either with the convenient `htmlproofer` command-line executable,
 or write a Ruby script which utilizes the gem.
@@ -68,7 +68,7 @@ Options are given as a second argument to `.new`, and are encoded in a
 symbol-keyed Ruby Hash. For more information about the configuration options,
 check out `html-proofer`'s README file.
 
-[2]: https://github.com/gjtorikian/html-proofer
+[html-proofer]: https://github.com/gjtorikian/html-proofer
 
 ## 3. Configuring Your Travis Builds
 
@@ -91,7 +91,7 @@ Your `.travis.yml` file should look like this:
 ```yaml
 language: ruby
 rvm:
-- 2.2.5
+- 2.3.3
 
 before_script:
  - chmod +x ./script/cibuild # or do this locally and commit
@@ -124,7 +124,7 @@ access to Bundler, RubyGems, and a Ruby runtime.
 
 ```yaml
 rvm:
-- 2.2.5
+- 2.3.3
 ```
 
 RVM is a popular Ruby Version Manager (like rbenv, chruby, etc). This
diff --git a/docs/img/circleci-badge.svg b/docs/img/circleci-badge.svg
deleted file mode 100644
index 38658380a67..00000000000
--- a/docs/img/circleci-badge.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-	
-
-
diff --git a/docs/img/travis-ci-badge.png b/docs/img/travis-ci-badge.png
deleted file mode 100644
index 94f255ec9ef016e18e94f7fedb6bb04105ae4aa7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26749
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
    ak<2AIA!{{F87&q>sx_$WcF+D1SEnsUiAvXH$1
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
    #3$RpaHpFsInJ
z%)l~`DYR|$8JI+u!{ddZPw(u~i%N!YIQ!smB~;rol(_-BM{+vIww93
zE^uUK?a$>G1guNls@n-sLXe~+9Irn$!QL6T-K#bL{$0EF1Hoh=awm+d@`X8ow*NM;
zEL)X1WMhHjBY95gQr42wSNqJ9!7knq
zOXgSKee>c2NX6Dnafr#M*o{@Y^tiH5;<;#KBt<{2}x@VsTCLaAyp@yxcB?QGO%`EJNVy$O7Z30jFz*J
z_zVI0!yf}7YUBu?o#sluV_(mqJrBT|a)x6RCce9~*(N3t`YvFt-PPQa9mm8HCei5Z
z$dDI-hhGL-E>H8NZ!YyW1GehqNO~~qI?ZTX6T9^P~)Q0MZ_D
z;nJoB*#-aLUB?xdD&bXMmbyy+@-SE-+-tf1rVYP3L&!l&w9c@5$3A(?!4Gpq^k|Ee;WDK)1adYf}x#Y)RZ=b4ZZ~5_n1pBn(gFFZT30
zI;1U6|Lt|LFkyF@0|uw{OqL_w-OOJ3CtlsOZvJ1D$m`ddx3InC0nPiREf;royKa%I
zyDF+H2JN;w>)}>ZIDPwVL5dFG>8YVrdxvs~+;pLVb}V1`%Vooqti-0^@RGW$G()SF21
zyVbD>ruM)mA16hSu5CXbF;K`wv_CyzoJUyH2I-mQ=W6Xmrb1_L
z8rHnKkjTPMeE~}MUqWa%{gdqi*9Nv96E%*llULp{eR$K#L>JAF>Pt|qhpa1t!FE68
zoko&;kFBe-;g{^mK`Xv9j{_W1H@VpZ!c;`}idSE#UDhB{M*ha;xKe1&#-~+^Tzp&n_iulDmUNtT)3$_tje
Date: Mon, 23 Jan 2017 20:08:44 -0500
Subject: [PATCH 1897/4996] Include more verbiage to the 3.4.0 release post.

---
 .../2017-01-18-jekyll-3-4-0-released.markdown | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
index 6950277eb80..f6a880fc428 100644
--- a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
+++ b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
@@ -13,4 +13,22 @@ exceptional Jekyll community. Three changes to call out:
 1. If you're a big fan of [`where_by_exp`](/docs/filters/), you'll be an
 even bigger fan of [`group_by_exp`](/docs/filters/).
 2. Using a custom timezone in Jekyll on Windows? Yeah, sorry that hasn't ever worked
-   properly. We made the internals possible
+   properly. We made it possible to accurately [set the timezone using IANA
+   timezone codes](https://jekyllrb.com/docs/windows/#timezone-management).
+3.
+
+And [lots and lots more!](/docs/history/#v3-4-0)
+
+This update was made possible by the dedicated efforts of our excellent
+contributors: CONTRIB LIST HERE.
+
+As always, if you encounter bugs, please do [search the issues]({{ site.repository }}/issues)
+and [file an issue]({{ site.repository }}/issues/new) if you aren't able to
+find a resolution. We also have [our Jekyll Talk
+forum](https://talk.jekyllrb.com) for those of you with general questions
+about how to accomplish certain tasks with Jekyll.
+
+We have some exciting updates in store for v3.5, and we're hard at work on
+those already.
+
+Happy Jekylling!

From 451fd8e15f84f813ab406ac06a505047c5a3232a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 24 Jan 2017 10:39:54 -0500
Subject: [PATCH 1898/4996] Update history to reflect merge of #5815 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 776fd40b225..c0d869ebcc4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -92,6 +92,7 @@
   * Docs: add `match_regex` and `replace_regex` filters (#5799)
   * Got that diaper money? (#5810)
   * Sort content by popularity using Google Analytics (#5812)
+  * Rework CI doc to include multiple providers. (#5815)
 
 ## 3.3.1 / 2016-11-14
 

From b0a7c4df0abdb85bb01d03febfc81e6457105724 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 24 Jan 2017 10:41:13 -0500
Subject: [PATCH 1899/4996] Update history to reflect merge of #5690 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c0d869ebcc4..fed14a91842 100644
--- a/History.markdown
+++ b/History.markdown
@@ -93,6 +93,7 @@
   * Got that diaper money? (#5810)
   * Sort content by popularity using Google Analytics (#5812)
   * Rework CI doc to include multiple providers. (#5815)
+  * Improve theme docs (#5690)
 
 ## 3.3.1 / 2016-11-14
 

From 770ef586f53b5efa9b3594586c2ce04ec365301b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 24 Jan 2017 10:45:27 -0500
Subject: [PATCH 1900/4996] Update history to reflect merge of #5811 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fed14a91842..60156e55a30 100644
--- a/History.markdown
+++ b/History.markdown
@@ -94,6 +94,7 @@
   * Sort content by popularity using Google Analytics (#5812)
   * Rework CI doc to include multiple providers. (#5815)
   * Improve theme docs (#5690)
+  * Add mention of classifier-reborn for LSI (#5811)
 
 ## 3.3.1 / 2016-11-14
 

From 6b08c14ccccc2cf292bd141661bcd3294af056e2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 24 Jan 2017 12:51:25 -0500
Subject: [PATCH 1901/4996] Update history to reflect merge of #5802 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 60156e55a30..3595e48c06a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -95,6 +95,7 @@
   * Rework CI doc to include multiple providers. (#5815)
   * Improve theme docs (#5690)
   * Add mention of classifier-reborn for LSI (#5811)
+  * Added note about --blank flag (#5802)
 
 ## 3.3.1 / 2016-11-14
 

From b1edaea7e8d38b9a8cd4d327ac5fab794a4898a0 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 24 Jan 2017 20:21:34 +0100
Subject: [PATCH 1902/4996] Add a note about troubleshooting on installation
 page

---
 docs/_docs/installation.md | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index 0228a0f88c8..979279b80ee 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -25,16 +25,11 @@ Before you start, make sure your system has the following:
 - [Python 2.7](https://www.python.org/downloads/)
 
 
    
-  
    Running Jekyll on Ubuntu
    
+  
    Problems installing Jekyll?
    
   
    
-    Users of Jekyll on Ubuntu have reported encountering 
-    Could not locate Gemfile or .bundle/ directory error messages at the 
-    bundle exec jekyll serve step in the Quick-start guide.
-    The likely cause is that all installation requirements have not been fully met.
-    Recent stock Ubuntu distributions require the installation of both the ruby and ruby-all-dev
-    packages, e.g. via sudo apt-get install ruby ruby-all-dev (RubyGems should be included in ruby).
-    The ruby-all-dev .deb package in particular contains development header files whose absence causes 
-    the above error message.
+    Check out the troubleshooting page or
+    report an issue so the
+    Jekyll community can improve the experience for everyone.
   
    
 
    
 
@@ -58,10 +53,7 @@ $ gem install jekyll
 ```
 
 All of Jekyll’s gem dependencies are automatically installed by the above
-command, so you won’t have to worry about them at all. If you have problems
-installing Jekyll, check out the [troubleshooting](../troubleshooting/) page or
-[report an issue]({{ site.repository }}/issues/new) so the Jekyll
-community can improve the experience for everyone.
+command, so you won’t have to worry about them at all.
 
 
    
   
    Installing Xcode Command-Line Tools
    

From 7397f305c238da1593732c0e38f1b3ef184f0f84 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 24 Jan 2017 20:23:01 +0100
Subject: [PATCH 1903/4996] Add Ubuntu section on troubleshooting

---
 docs/_docs/troubleshooting.md | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/docs/_docs/troubleshooting.md b/docs/_docs/troubleshooting.md
index aae024bd285..d5f29671fa2 100644
--- a/docs/_docs/troubleshooting.md
+++ b/docs/_docs/troubleshooting.md
@@ -36,6 +36,15 @@ If you installed the above - specifically on Fedora 23 - but the extensions woul
 sudo dnf install redhat-rpm-config
 ```
 
+On Ubuntu if you get stuck after `bundle exec jekyll serve` and see error
+messages like `Could not locate Gemfile` or `.bundle/ directory`, it's likely
+because all requirements have not been fully met. Recent stock Ubuntu
+distributions require the installation of both the `ruby` and `ruby-all-dev`
+packages:
+
+```sh
+sudo apt-get install ruby ruby-all-dev
+```
 
 On [NearlyFreeSpeech](https://www.nearlyfreespeech.net/) you need to run the
 following commands before installing Jekyll:
@@ -180,10 +189,10 @@ 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`. 
+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`.
 
 ## Markup Problems
 

From 9eef1d9f5ac6cad1e39aaded9b5cc6abb6b1307c Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 24 Jan 2017 20:52:34 +0100
Subject: [PATCH 1904/4996] add contributors

---
 docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
index f6a880fc428..cfb1c4fd1d2 100644
--- a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
+++ b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
@@ -15,12 +15,12 @@ even bigger fan of [`group_by_exp`](/docs/filters/).
 2. Using a custom timezone in Jekyll on Windows? Yeah, sorry that hasn't ever worked
    properly. We made it possible to accurately [set the timezone using IANA
    timezone codes](https://jekyllrb.com/docs/windows/#timezone-management).
-3.
+3. New users should
 
 And [lots and lots more!](/docs/history/#v3-4-0)
 
 This update was made possible by the dedicated efforts of our excellent
-contributors: CONTRIB LIST HERE.
+contributors: Frank Taillandier, Tom Johnson, Ashwin Maroli, Parker Moore, Pat Hawks, alexmalik, Thiago Arrais, Nursen, Eldritch Cheese, XhmikosR, Roger Ogden, Ricardo N Feliciano, Nicolas Hoizey, Max Chadwick, Kenton Hansen, Josh Habdas, jona, Zlatan Vasović, yoostk, Tunghsiao Liu, Tim Banks, Skylar Challand, Rob Crocombe, Purplecarrot, muratayusuke, Longwelwind, Kurt Anderson, kimbaudi, Kevin Wojniak, Ivan Dmitrievsky, Hugo, Florian Thomas, Fabrice Laporte, Don Denton, Dmitrii Evdokimov, Dean Attali, Chayoung You, Chase, brainscript, BlueberryFoxtrot, Alexey Rogachev, Ajay Karwal.
 
 As always, if you encounter bugs, please do [search the issues]({{ site.repository }}/issues)
 and [file an issue]({{ site.repository }}/issues/new) if you aren't able to

From 886de9f37d0e859a04ac9e9cc92e75ac255d3466 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 24 Jan 2017 20:53:27 +0100
Subject: [PATCH 1905/4996] Group all documentation related changes

---
 History.markdown | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/History.markdown b/History.markdown
index 8ad3e2ae814..d364e673ecb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,11 +4,11 @@
 
   * Add connector param to `array_to_sentence_string` filter (#5597)
   * Adds `group_by_exp` filter (#5513)
-  * Use the current year for the LICENSE of theme (#5712)
-  * Update License (#5713)
   * Use Addressable instead of URI to decode (#5726)
   * throw IncludeTagError if error occurs in included file (#5767)
   * Write Jekyll::Utils::Exec.run for running shell commands. (#5640)
+  * Use the current year for the LICENSE of theme (#5712)
+  * Update License (#5713)
 
 ### Bug Fixes
 
@@ -22,24 +22,12 @@
 
 ### Site Enhancements
 
-  * Remove instructions to install Jekyll 2 on Windows (#5582)
-  * Fix example URL inconsistency (#5592)
-  * Replace backticks within HTML blocks with HTML tags (#5435)
-  * Add jekyll-migrate-permalink (#5600)
-  * Fix bad config YAML in collections example (#5587)
-  * Bring documentation on 'Directory Structure' up-to-date (#5573)
   * Use only the used Font Awesome icons. (#5530)
   * Switch to `https` when possible. (#5611)
   * Update `_font-awesome.scss` to move .woff file before .ttf (#5614)
   * Update documentation on updating FontAwesome Iconset (#5655)
-  * Improve quickstart docs (#5689)
-  * Add Jekyll-Post to list of plugins (#5705)
-  * Add jekyll-numbered-headings (#5688)
-  * Docs: move permalinks from documents into config (#5544)
-  * Sort gems in `docs/_config.yml` (#5746)
   * [site] Use defaults for docs and news-items (#5744)
-  * Improve collections docs (#5691)
-  * Fix #5730: add gcc and make to the list of requirements (#5731)
+  * Sort gems in `docs/_config.yml` (#5746)
   * Add missing class (#5791)
 
 ### Development Fixes
@@ -64,6 +52,18 @@
 
 ### Documentation
 
+  * Improve quickstart docs (#5689)
+  * Add Jekyll-Post to list of plugins (#5705)
+  * Add jekyll-numbered-headings (#5688)
+  * Docs: move permalinks from documents into config (#5544)
+  * Improve collections docs (#5691)
+  * Fix #5730: add gcc and make to the list of requirements (#5731)
+  * Remove instructions to install Jekyll 2 on Windows (#5582)
+  * Fix example URL inconsistency (#5592)
+  * Replace backticks within HTML blocks with HTML tags (#5435)
+  * Add jekyll-migrate-permalink (#5600)
+  * Fix bad config YAML in collections example (#5587)
+  * Bring documentation on 'Directory Structure' up-to-date (#5573)
   * Fixed typo (#5632)
   * use backticks for Gemfile for consistency since in the next sentence … (#5641)
   * Update Core team list in the README file (#5643)

From 452b0cf29d5c1499f4db37c3a71ed9ff36cdffde Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 24 Jan 2017 20:59:07 +0100
Subject: [PATCH 1906/4996] mention documentation improvements

---
 docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
index cfb1c4fd1d2..db0796dffcd 100644
--- a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
+++ b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
@@ -15,7 +15,7 @@ even bigger fan of [`group_by_exp`](/docs/filters/).
 2. Using a custom timezone in Jekyll on Windows? Yeah, sorry that hasn't ever worked
    properly. We made it possible to accurately [set the timezone using IANA
    timezone codes](https://jekyllrb.com/docs/windows/#timezone-management).
-3. New users should
+3. Documentation has been improved, notably on themes, includes and permalinks.
 
 And [lots and lots more!](/docs/history/#v3-4-0)
 

From 92c0890fbd0b7261fe2b6a20e3b066871ed41bea Mon Sep 17 00:00:00 2001
From: penny 
Date: Tue, 24 Jan 2017 21:09:08 +0100
Subject: [PATCH 1907/4996] let's not use my deadname

---
 docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
index db0796dffcd..39835d5bd30 100644
--- a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
+++ b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
@@ -20,7 +20,7 @@ even bigger fan of [`group_by_exp`](/docs/filters/).
 And [lots and lots more!](/docs/history/#v3-4-0)
 
 This update was made possible by the dedicated efforts of our excellent
-contributors: Frank Taillandier, Tom Johnson, Ashwin Maroli, Parker Moore, Pat Hawks, alexmalik, Thiago Arrais, Nursen, Eldritch Cheese, XhmikosR, Roger Ogden, Ricardo N Feliciano, Nicolas Hoizey, Max Chadwick, Kenton Hansen, Josh Habdas, jona, Zlatan Vasović, yoostk, Tunghsiao Liu, Tim Banks, Skylar Challand, Rob Crocombe, Purplecarrot, muratayusuke, Longwelwind, Kurt Anderson, kimbaudi, Kevin Wojniak, Ivan Dmitrievsky, Hugo, Florian Thomas, Fabrice Laporte, Don Denton, Dmitrii Evdokimov, Dean Attali, Chayoung You, Chase, brainscript, BlueberryFoxtrot, Alexey Rogachev, Ajay Karwal.
+contributors: Frank Taillandier, Tom Johnson, Ashwin Maroli, Parker Moore, Pat Hawks, alexmalik, Thiago Arrais, Nursen, Eldritch Cheese, XhmikosR, Roger Ogden, Ricardo N Feliciano, Nicolas Hoizey, Max Chadwick, Kenton Hansen, Josh Habdas, penny, Zlatan Vasović, yoostk, Tunghsiao Liu, Tim Banks, Skylar Challand, Rob Crocombe, Purplecarrot, muratayusuke, Longwelwind, Kurt Anderson, kimbaudi, Kevin Wojniak, Ivan Dmitrievsky, Hugo, Florian Thomas, Fabrice Laporte, Don Denton, Dmitrii Evdokimov, Dean Attali, Chayoung You, Chase, brainscript, BlueberryFoxtrot, Alexey Rogachev, Ajay Karwal.
 
 As always, if you encounter bugs, please do [search the issues]({{ site.repository }}/issues)
 and [file an issue]({{ site.repository }}/issues/new) if you aren't able to

From a05e64c9d360e8357dc9c23a76656d231f0665dd Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Tue, 24 Jan 2017 15:38:17 -0800
Subject: [PATCH 1908/4996] moved navigation under new collection called
 tutorial

---
 docs/{_docs => _tutorials}/navigation.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/{_docs => _tutorials}/navigation.md (100%)

diff --git a/docs/_docs/navigation.md b/docs/_tutorials/navigation.md
similarity index 100%
rename from docs/_docs/navigation.md
rename to docs/_tutorials/navigation.md

From 2e9a32edd2ced3626cb38fcf0ec998549e56b411 Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Tue, 24 Jan 2017 22:58:04 -0800
Subject: [PATCH 1909/4996] Added tutorials as a new collection, similar to
 Docs. Also added tutorial sidebar, tutorial link in primary nav, and tutorial
 overview page.

---
 docs/.gitignore                               |  1 +
 docs/_config.yml                              |  2 +
 docs/_data/tutorials.yml                      |  8 ++++
 docs/_includes/primary-nav-items.html         |  5 ++-
 docs/_includes/section_nav_tutorials.html     | 39 +++++++++++++++++++
 docs/_includes/tutorials_contents.html        | 10 +++++
 docs/_includes/tutorials_contents_mobile.html | 10 +++++
 docs/_includes/tutorials_option.html          |  5 +++
 docs/_includes/tutorials_ul.html              |  7 ++++
 docs/_layouts/tutorials.html                  | 27 +++++++++++++
 docs/_tutorials/index.md                      | 35 +++++++++++++++++
 docs/_tutorials/navigation.md                 |  5 ++-
 12 files changed, 151 insertions(+), 3 deletions(-)
 create mode 100644 docs/_data/tutorials.yml
 create mode 100644 docs/_includes/section_nav_tutorials.html
 create mode 100644 docs/_includes/tutorials_contents.html
 create mode 100644 docs/_includes/tutorials_contents_mobile.html
 create mode 100644 docs/_includes/tutorials_option.html
 create mode 100644 docs/_includes/tutorials_ul.html
 create mode 100644 docs/_layouts/tutorials.html
 create mode 100644 docs/_tutorials/index.md

diff --git a/docs/.gitignore b/docs/.gitignore
index 79bd74f7496..527980f3c80 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -2,3 +2,4 @@ _site/
 *.swp
 pkg/
 test/
+.idea/
\ No newline at end of file
diff --git a/docs/_config.yml b/docs/_config.yml
index 6f57710aa2e..589b042e27f 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -16,6 +16,8 @@ collections:
   posts:
     permalink: /news/:year/:month/:day/:title/
     output: true
+  tutorials:
+    output: true
 
 name: Jekyll • Simple, blog-aware, static sites
 description: Transform your plain text into static websites and blogs
diff --git a/docs/_data/tutorials.yml b/docs/_data/tutorials.yml
new file mode 100644
index 00000000000..73a0184a195
--- /dev/null
+++ b/docs/_data/tutorials.yml
@@ -0,0 +1,8 @@
+- title: Tutorials
+  tutorials:
+  - home
+  - navigation
+
+#- title: Another section
+#  tutorials:
+#  - sample
\ No newline at end of file
diff --git a/docs/_includes/primary-nav-items.html b/docs/_includes/primary-nav-items.html
index f3778a8439c..a431d846d50 100644
--- a/docs/_includes/primary-nav-items.html
+++ b/docs/_includes/primary-nav-items.html
@@ -5,6 +5,9 @@
   
  • 
     Docs
   
    • 
+  
  • 
+    Tutorials
+  
    • 
   
  • 
     News
   
    • 
@@ -15,6 +18,6 @@
     Help
   
   
  • 
-    View on GitHub
+    GitHub
   
    • 
 
diff --git a/docs/_includes/section_nav_tutorials.html b/docs/_includes/section_nav_tutorials.html
new file mode 100644
index 00000000000..30812bbafe4
--- /dev/null
+++ b/docs/_includes/section_nav_tutorials.html
@@ -0,0 +1,39 @@
+{% comment %}
+Map grabs the tutorials sections, giving us an array of arrays. Join, flattens all
+the items to a comma delimited string. Split turns it into an array again.
+{% endcomment %}
+{% assign tutorials = site.data.tutorials | map: 'tutorials' | join: ',' | split: ',' %}
+
+{% comment %}
+Because this is built for every page, lets find where we are in the ordered
+document list by comparing url strings. Then if there's something previous or
+next, lets build a link to it.
+{% endcomment %}
+
+{% for tutorial in tutorials %}
+  {% assign tutorial_url = tutorial | prepend:"/tutorials/" | append:"/" %}
+  {% if tutorial_url == page.url %}
+    
    
+      
    
+          {% if forloop.first %}
+            Back
+          {% else %}
+            {% assign previous = forloop.index0 | minus: 1 %}
+            {% assign previous_page = tutorials[previous] | prepend:"/tutorials/" | append:"/" %}
+            
+          {% endif %}
+      
    
+      
    
+          {% if forloop.last %}
+            Next
+          {% else %}
+            {% assign next = forloop.index0 | plus: 1 %}
+            {% assign next_page = tutorials[next] | prepend:"/tutorials/" | append:"/" %}
+            
+          {% endif %}
+      
    
+    
    
+    
    
+    {% break %}
+  {% endif %}
+{% endfor %}
\ No newline at end of file
diff --git a/docs/_includes/tutorials_contents.html b/docs/_includes/tutorials_contents.html
new file mode 100644
index 00000000000..5c9cdc8ee7f
--- /dev/null
+++ b/docs/_includes/tutorials_contents.html
@@ -0,0 +1,10 @@
+
    
+  
+
    
diff --git a/docs/_includes/tutorials_contents_mobile.html b/docs/_includes/tutorials_contents_mobile.html
new file mode 100644
index 00000000000..901fdf5c435
--- /dev/null
+++ b/docs/_includes/tutorials_contents_mobile.html
@@ -0,0 +1,10 @@
+
    
+  
+
    
diff --git a/docs/_includes/tutorials_option.html b/docs/_includes/tutorials_option.html
new file mode 100644
index 00000000000..482c2143337
--- /dev/null
+++ b/docs/_includes/tutorials_option.html
@@ -0,0 +1,5 @@
+{% for item in include.items %}
+  {% assign item_url = item | prepend:"/tutorials/" | append:"/" %}
+  {% assign tutorial = site.tutorials | where: "url", item_url | first %}
+  
+{% endfor %}
diff --git a/docs/_includes/tutorials_ul.html b/docs/_includes/tutorials_ul.html
new file mode 100644
index 00000000000..6604915c716
--- /dev/null
+++ b/docs/_includes/tutorials_ul.html
@@ -0,0 +1,7 @@
+
      
+{% for item in include.items %}
+  {% assign item_url = item | prepend:"/tutorials/" | append:"/" %}
+  {% assign p = site.tutorials | where:"url", item_url | first %}
+  
    • {{ p.title }}
      • 
+{% endfor %}
+
    
diff --git a/docs/_layouts/tutorials.html b/docs/_layouts/tutorials.html
new file mode 100644
index 00000000000..e3f7794bdd5
--- /dev/null
+++ b/docs/_layouts/tutorials.html
@@ -0,0 +1,27 @@
+---
+layout: default
+---
+
+  
    
+    
    
+
+      {% include tutorials_contents_mobile.html %}
+
+      
    
+        
    
+          
    
+              Improve this page
+          
    
+          
    {{ page.title }}
    
+          {{ content }}
+          {% include section_nav_tutorials.html %}
+        
    
+      
    
+
+      {% include tutorials_contents.html %}
+
+      
    
+
+    
    
+  
    
diff --git a/docs/_tutorials/index.md b/docs/_tutorials/index.md
new file mode 100644
index 00000000000..b0988b09f62
--- /dev/null
+++ b/docs/_tutorials/index.md
@@ -0,0 +1,35 @@
+---
+layout: tutorials
+title: Tutorials
+permalink: /tutorials/home/
+redirect_from: /tutorials/index.html
+---
+
+In contrast to [Docs](../docs), Tutorials provide more detailed, narrative instruction that cover a variety of Jekyll topics and scenarios. Tutorials might contain the following:
+
+* Step-by-step processes through particular scenarios or challenges
+* Full walk-throughs using sample data, showing inputs and results from the sample data
+* Detailed explanation about the pros and cons for different Jekyll strategies
+* End-to-end instruction in developing a complete feature on a Jekyll site
+* Instruction that combines various techniques from across the docs
+
+In short, tutorials aren't the core reference information in docs. They walk users through processes from beginning to end.
+
+{: .info .note}
+**Note:** The Tutorials section is new, so there aren't many tutorials yet. You can add a tutorial here to help popular this section.
+
+Some of these techniques might even guide you through a supporting tool, script, service, or other hack used with your Jekyll site. Feel free to include tutorials involving external services with Jekyll as well. However, note that Jekyll in no way endorses any third-party tools mentioned in tutorials.
+
+## How to contribute a tutorial
+
+We welcome your tutorial contributions. To add your tutorial:
+
+1. Fork the Jekyll project by clicking the **Fork** button in the upper-right corner of the [jekyll/jekyll project Github repo](https://github.com/jekyll/jekyll/).
+2. Add your tutorial in the `_tutorials` collection.
+3. Make sure your tutorial has the same front matter items as other tutorial items.
+5. Add a reference to your tutorial filename in `_data/tutorials.yml`. This allows your tutorial to appear in the Tutorials sidebar.
+6. Follow the regular git workflow to submit the pull request.
+
+When you submit your pull request, the Jekyll documentation team will review your contribution and either merge it or suggest edits.
+
+
diff --git a/docs/_tutorials/navigation.md b/docs/_tutorials/navigation.md
index bd4228e379a..60e86369af8 100644
--- a/docs/_tutorials/navigation.md
+++ b/docs/_tutorials/navigation.md
@@ -1,6 +1,7 @@
 ---
-layout: docs
-permalink: /docs/navigation
+layout: tutorials
+permalink: /tutorials/navigation/
+title: Navigation
 ---
 
 If your Jekyll site has a lot of pages, you might want to create navigation for the pages. Instead of hard-coding navigation links, you can programmatically retrieve a list of pages to build the navigation for your site.

From ecdc8a5bf2436b78eb0f753b38ad2d8aad1348b7 Mon Sep 17 00:00:00 2001
From: Alexey Rogachev 
Date: Wed, 25 Jan 2017 15:22:26 +0600
Subject: [PATCH 1910/4996] Fixed inaccuracy in "Built-in permalink styles"
 docs [skip ci]

Must be either:

> Rather than typing `permalink: /:categories/:year/:month/:day/:title/`, you can just type `permalink: pretty`.

or:

> Rather than typing `permalink: /:categories/:year/:month/:day/:title.html`, you can just type `permalink: date`.

I guess the former was meant to write because the latter was already mentioned in "Where to configure permalinks" section.
---
 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 1bd880215b7..f0e16770b36 100644
--- a/docs/_docs/permalinks.md
+++ b/docs/_docs/permalinks.md
@@ -230,7 +230,7 @@ Although you can specify a custom permalink pattern using [template variables](#
 
 
    
 
-Rather than typing `permalink: /:categories/:year/:month/:day/:title/`, you can just type `permalink: date`.
+Rather than typing `permalink: /:categories/:year/:month/:day/:title/`, you can just type `permalink: pretty`.
 
 
    
 
    Specifying permalinks through the YAML Front Matter
    

From e56d8092982982622653007d31a742542b32c85a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 25 Jan 2017 07:29:43 -0500
Subject: [PATCH 1911/4996] Update history to reflect merge of #5819 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3595e48c06a..6d840343665 100644
--- a/History.markdown
+++ b/History.markdown
@@ -96,6 +96,7 @@
   * Improve theme docs (#5690)
   * Add mention of classifier-reborn for LSI (#5811)
   * Added note about --blank flag (#5802)
+  * Fixed inaccuracy in "Built-in permalink styles" docs (#5819)
 
 ## 3.3.1 / 2016-11-14
 

From ef8779dbfd3c45d88dcd0e683f5b89ee36da62b7 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Wed, 25 Jan 2017 14:06:27 +0100
Subject: [PATCH 1912/4996] run codeclimate after success

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 30eb1fc5d47..66c85eaabab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,3 +45,6 @@ addons:
         DA4vsRURfABU0fIhwYkQuZqEcA3d8TL36BZcGEshG6MQ2AmnYsmFiTcxqV5bmlElHEqQuT\
         5SUFXLafgZPBnL0qDwujQcHukID41sE=\
       "
+# regular test configuration
+after_success:
+  - bundle exec codeclimate-test-reporter

From 65a3891ca293818d68b4d3a2c0ea2abf9b71e19f Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Wed, 25 Jan 2017 14:10:19 +0100
Subject: [PATCH 1913/4996] ought to -> should

props @pnn
---
 docs/_docs/installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index 979279b80ee..bc5c251568c 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -10,7 +10,7 @@ encountered and how we might make the process easier.
 
 ### Requirements
 
-Installing Jekyll ought to be straight-forward if all requirements are met.
+Installing Jekyll should be straight-forward if all requirements are met.
 Before you start, make sure your system has the following:
 
 - GNU/Linux, Unix, or macOS

From c7db12bad8a8a02f206df908a9a72ce296b0bf2c Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Wed, 25 Jan 2017 06:50:23 -0800
Subject: [PATCH 1914/4996] fixed link in datafiles.md to point to
 navigation.md location in new tutorials collection

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

diff --git a/docs/_docs/datafiles.md b/docs/_docs/datafiles.md
index 3f4644763cd..fde34aa0ff9 100644
--- a/docs/_docs/datafiles.md
+++ b/docs/_docs/datafiles.md
@@ -72,7 +72,7 @@ You can now render the list of members in a template:
 ```
 
 {: .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](../navigation). 
+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 %}).
 
 ## Example: Organizations
 

From a6adfa835832dec060cc068740e36612e01d39d6 Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Wed, 25 Jan 2017 09:49:36 -0800
Subject: [PATCH 1915/4996] added cross-reference to the data files topic
 within the navigation topic

---
 docs/_tutorials/navigation.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/_tutorials/navigation.md b/docs/_tutorials/navigation.md
index 60e86369af8..7d4bafa372f 100644
--- a/docs/_tutorials/navigation.md
+++ b/docs/_tutorials/navigation.md
@@ -6,6 +6,8 @@ title: Navigation
 
 If your Jekyll site has a lot of pages, you might want to create navigation for the pages. Instead of hard-coding navigation links, you can programmatically retrieve a list of pages to build the navigation for your site.
 
+Although there's already information about [interacting with data files]({% link _docs/datafiles.md %}) in other Jekyll docs, this tutorial dives into building more robust navigation for your site.
+
 There are two primary ways of retrieving pages on a Jekyll site:
 
 * **Retrieve pages listed in a YAML data source**. Store the page data in a YAML (or JSON or CSV) file in the `_data` folder, loop through the YAML properties, and insert the values into your theme.

From 0a3916c07e2444eaab01540161bba1f67df66c3b Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Wed, 25 Jan 2017 10:06:57 -0800
Subject: [PATCH 1916/4996] Make links in sidebar for current page more
 prominent

When viewing a page, it's kind of hard to see what page you're viewing. The little triangle graphic pointing to the page is too subtle. Making the link to the current page orange (the same as the hover color) would make it visually more apparent where you are in the navigation. Here's a screenshot showing the change: [https://www.screencast.com/t/e6NKerSAUL](https://www.screencast.com/t/e6NKerSAUL). The link to the current page is orange even when I'm not hovering over the link with my mouse.
---
 docs/_sass/_style.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss
index f1e3de5f327..e39e8f01cf4 100644
--- a/docs/_sass/_style.scss
+++ b/docs/_sass/_style.scss
@@ -459,6 +459,9 @@ aside {
       top: 0;
       left: -30px;
     }
+    &.current a {
+        color: #f90;
+    }
   }
 }
 

From 4b19e93f0905e45876d0add85ec65e42d354c1ac Mon Sep 17 00:00:00 2001
From: Joel Meyer-Hamme 
Date: Thu, 26 Jan 2017 16:02:08 +0000
Subject: [PATCH 1917/4996] use logger.info

Imo running `--lsi` should use `Jekyll.logger.info`, so it can be made `--quiet`.
---
 lib/jekyll/related_posts.rb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/jekyll/related_posts.rb b/lib/jekyll/related_posts.rb
index cde1742c081..3526a73b76f 100644
--- a/lib/jekyll/related_posts.rb
+++ b/lib/jekyll/related_posts.rb
@@ -26,15 +26,15 @@ def build
     def build_index
       self.class.lsi ||= begin
         lsi = ClassifierReborn::LSI.new(:auto_rebuild => false)
-        display("Populating LSI...")
+        Jekyll.logger.info("Populating LSI...")
 
         site.posts.docs.each do |x|
           lsi.add_item(x)
         end
 
-        display("Rebuilding index...")
+        Jekyll.logger.info("Rebuilding index...")
         lsi.build_index
-        display("")
+        Jekyll.logger.info("")
         lsi
       end
     end
@@ -46,11 +46,5 @@ def lsi_related_posts
     def most_recent_posts
       @most_recent_posts ||= (site.posts.docs.reverse - [post]).first(10)
     end
-
-    def display(output)
-      $stdout.print("\n")
-      $stdout.print(Jekyll.logger.formatted_topic(output))
-      $stdout.flush
-    end
   end
 end

From 4a781f23f3c0e3c02bbf6bdfffd726f6d01da453 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 26 Jan 2017 15:52:26 -0500
Subject: [PATCH 1918/4996] Update history to reflect merge of #5822 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6d840343665..30372e1c9bd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
   * include: fix 'no implicit conversion of nil to String' (#5750)
   * Don't include the theme's includes_path if it is nil. (#5780)
   * test double slash when input = '/' (#5542)
+  * use logger.info for related posts (#5822)
 
 ### Site Enhancements
 

From f0dcc9415b2a1a1a61143a6935ba616968e39475 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 26 Jan 2017 15:53:46 -0500
Subject: [PATCH 1919/4996] Update history to reflect merge of #5798 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 30372e1c9bd..1348af78977 100644
--- a/History.markdown
+++ b/History.markdown
@@ -64,6 +64,7 @@
   * Bump htmlproofer (#5781)
   * Bump rubies we test against (#5784)
   * Bump rdoc to v5.0 (#5797)
+  * Bump codeclimate-test-reporter to v1.0.5 (#5798)
 
 ### Documentation
 

From 7c1aae3e303be7bc25aa2ac08961bdc282d3a719 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 26 Jan 2017 16:24:45 -0500
Subject: [PATCH 1920/4996] Update history on website to reflect new things
 merged

---
 docs/_docs/history.md | 43 ++++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index a31266bcdec..e400efd5610 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -12,11 +12,11 @@ note: This file is autogenerated. Edit /History.markdown instead.
 
 - Add connector param to `array_to_sentence_string` filter ([#5597]({{ site.repository }}/issues/5597))
 - Adds `group_by_exp` filter ([#5513]({{ site.repository }}/issues/5513))
-- Use the current year for the LICENSE of theme ([#5712]({{ site.repository }}/issues/5712))
-- Update License ([#5713]({{ site.repository }}/issues/5713))
 - Use Addressable instead of URI to decode ([#5726]({{ site.repository }}/issues/5726))
 - throw IncludeTagError if error occurs in included file ([#5767]({{ site.repository }}/issues/5767))
 - Write Jekyll::Utils::Exec.run for running shell commands. ([#5640]({{ site.repository }}/issues/5640))
+- Use the current year for the LICENSE of theme ([#5712]({{ site.repository }}/issues/5712))
+- Update License ([#5713]({{ site.repository }}/issues/5713))
 
 ### Bug Fixes
 {: #bug-fixes-v3-4-0}
@@ -28,29 +28,19 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - include: fix 'no implicit conversion of nil to String' ([#5750]({{ site.repository }}/issues/5750))
 - Don't include the theme's includes_path if it is nil. ([#5780]({{ site.repository }}/issues/5780))
 - test double slash when input = '/' ([#5542]({{ site.repository }}/issues/5542))
+- use logger.info for related posts ([#5822]({{ site.repository }}/issues/5822))
 
 ### Site Enhancements
 {: #site-enhancements-v3-4-0}
 
-- Remove instructions to install Jekyll 2 on Windows ([#5582]({{ site.repository }}/issues/5582))
-- Fix example URL inconsistency ([#5592]({{ site.repository }}/issues/5592))
-- Replace backticks within HTML blocks with HTML tags ([#5435]({{ site.repository }}/issues/5435))
-- Add jekyll-migrate-permalink ([#5600]({{ site.repository }}/issues/5600))
-- Fix bad config YAML in collections example ([#5587]({{ site.repository }}/issues/5587))
-- Bring documentation on 'Directory Structure' up-to-date ([#5573]({{ site.repository }}/issues/5573))
 - Use only the used Font Awesome icons. ([#5530]({{ site.repository }}/issues/5530))
 - Switch to `https` when possible. ([#5611]({{ site.repository }}/issues/5611))
 - Update `_font-awesome.scss` to move .woff file before .ttf ([#5614]({{ site.repository }}/issues/5614))
 - Update documentation on updating FontAwesome Iconset ([#5655]({{ site.repository }}/issues/5655))
-- Improve quickstart docs ([#5689]({{ site.repository }}/issues/5689))
-- Add Jekyll-Post to list of plugins ([#5705]({{ site.repository }}/issues/5705))
-- Add jekyll-numbered-headings ([#5688]({{ site.repository }}/issues/5688))
-- Docs: move permalinks from documents into config ([#5544]({{ site.repository }}/issues/5544))
-- Sort gems in `docs/_config.yml` ([#5746]({{ site.repository }}/issues/5746))
 - [site] Use defaults for docs and news-items ([#5744]({{ site.repository }}/issues/5744))
-- Improve collections docs ([#5691]({{ site.repository }}/issues/5691))
-- Fix [#5730]({{ site.repository }}/issues/5730): add gcc and make to the list of requirements ([#5731]({{ site.repository }}/issues/5731))
+- Sort gems in `docs/_config.yml` ([#5746]({{ site.repository }}/issues/5746))
 - Add missing class ([#5791]({{ site.repository }}/issues/5791))
+- Improve template docs ([#5694]({{ site.repository }}/issues/5694))
 
 ### Development Fixes
 {: #development-fixes-v3-4-0}
@@ -72,9 +62,23 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Use latest jemoji gem ([#5782]({{ site.repository }}/issues/5782))
 - Bump htmlproofer ([#5781]({{ site.repository }}/issues/5781))
 - Bump rubies we test against ([#5784]({{ site.repository }}/issues/5784))
+- Bump rdoc to v5.0 ([#5797]({{ site.repository }}/issues/5797))
+- Bump codeclimate-test-reporter to v1.0.5 ([#5798]({{ site.repository }}/issues/5798))
 
 ### Documentation
 
+- Improve quickstart docs ([#5689]({{ site.repository }}/issues/5689))
+- Add Jekyll-Post to list of plugins ([#5705]({{ site.repository }}/issues/5705))
+- Add jekyll-numbered-headings ([#5688]({{ site.repository }}/issues/5688))
+- Docs: move permalinks from documents into config ([#5544]({{ site.repository }}/issues/5544))
+- Improve collections docs ([#5691]({{ site.repository }}/issues/5691))
+- Fix [#5730]({{ site.repository }}/issues/5730): add gcc and make to the list of requirements ([#5731]({{ site.repository }}/issues/5731))
+- Remove instructions to install Jekyll 2 on Windows ([#5582]({{ site.repository }}/issues/5582))
+- Fix example URL inconsistency ([#5592]({{ site.repository }}/issues/5592))
+- Replace backticks within HTML blocks with HTML tags ([#5435]({{ site.repository }}/issues/5435))
+- Add jekyll-migrate-permalink ([#5600]({{ site.repository }}/issues/5600))
+- Fix bad config YAML in collections example ([#5587]({{ site.repository }}/issues/5587))
+- Bring documentation on 'Directory Structure' up-to-date ([#5573]({{ site.repository }}/issues/5573))
 - Fixed typo ([#5632]({{ site.repository }}/issues/5632))
 - use backticks for Gemfile for consistency since in the next sentence … ([#5641]({{ site.repository }}/issues/5641))
 - Update Core team list in the README file ([#5643]({{ site.repository }}/issues/5643))
@@ -97,6 +101,15 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Fix a markdown link to look properly on the web ([#5769]({{ site.repository }}/issues/5769))
 - [docs] Info about the help command usage ([#5312]({{ site.repository }}/issues/5312))
 - Add missing merge labels for jekyllbot ([#5753]({{ site.repository }}/issues/5753))
+- Fix broken links in documentation ([#5736]({{ site.repository }}/issues/5736))
+- Docs: add `match_regex` and `replace_regex` filters ([#5799]({{ site.repository }}/issues/5799))
+- Got that diaper money? ([#5810]({{ site.repository }}/issues/5810))
+- Sort content by popularity using Google Analytics ([#5812]({{ site.repository }}/issues/5812))
+- Rework CI doc to include multiple providers. ([#5815]({{ site.repository }}/issues/5815))
+- Improve theme docs ([#5690]({{ site.repository }}/issues/5690))
+- Add mention of classifier-reborn for LSI ([#5811]({{ site.repository }}/issues/5811))
+- Added note about --blank flag ([#5802]({{ site.repository }}/issues/5802))
+- Fixed inaccuracy in "Built-in permalink styles" docs ([#5819]({{ site.repository }}/issues/5819))
 
 
 ## 3.3.1 / 2016-11-14

From 6d34cf18fbf1e66013577d33136a72cafaa68fe4 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 26 Jan 2017 16:24:53 -0500
Subject: [PATCH 1921/4996] New list of contributors

---
 docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
index 39835d5bd30..58275063779 100644
--- a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
+++ b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
@@ -20,7 +20,15 @@ even bigger fan of [`group_by_exp`](/docs/filters/).
 And [lots and lots more!](/docs/history/#v3-4-0)
 
 This update was made possible by the dedicated efforts of our excellent
-contributors: Frank Taillandier, Tom Johnson, Ashwin Maroli, Parker Moore, Pat Hawks, alexmalik, Thiago Arrais, Nursen, Eldritch Cheese, XhmikosR, Roger Ogden, Ricardo N Feliciano, Nicolas Hoizey, Max Chadwick, Kenton Hansen, Josh Habdas, penny, Zlatan Vasović, yoostk, Tunghsiao Liu, Tim Banks, Skylar Challand, Rob Crocombe, Purplecarrot, muratayusuke, Longwelwind, Kurt Anderson, kimbaudi, Kevin Wojniak, Ivan Dmitrievsky, Hugo, Florian Thomas, Fabrice Laporte, Don Denton, Dmitrii Evdokimov, Dean Attali, Chayoung You, Chase, brainscript, BlueberryFoxtrot, Alexey Rogachev, Ajay Karwal.
+contributors: Ajay Karwal, Alexey Rogachev, Ashwin Maroli,
+BlueberryFoxtrot, Chase, Chayoung You, Dean Attali, Dmitrii Evdokimov, Don
+Denton, Eldritch Cheese, Fabrice Laporte, Florian Thomas, Frank
+Taillandier, Hugo, Ivan Dmitrievsky, Joel Meyer-Hamme, Josh Habdas, Kenton
+Hansen, Kevin Wojniak, Kurt Anderson, Longwelwind, Max Chadwick, Nicolas
+Hoizey, Nursen, Parker Moore, Pat Hawks, Purplecarrot, Ricardo N Feliciano,
+Rob Crocombe, Roger Ogden, Skylar Challand, Thiago Arrais, Tim Banks, Tom
+Johnson, Tunghsiao Liu, XhmikosR, Zlatan Vasović, alexmalik, brainscript,
+jona, kimbaudi, muratayusuke, penny, and yoostk.
 
 As always, if you encounter bugs, please do [search the issues]({{ site.repository }}/issues)
 and [file an issue]({{ site.repository }}/issues/new) if you aren't able to

From eca4b94c3a387e3b2232030164701f31be5c4752 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 26 Jan 2017 16:26:39 -0500
Subject: [PATCH 1922/4996] Remove jona as contributor.

---
 docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
index 58275063779..cb2c6f872ca 100644
--- a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
+++ b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
@@ -28,7 +28,7 @@ Hansen, Kevin Wojniak, Kurt Anderson, Longwelwind, Max Chadwick, Nicolas
 Hoizey, Nursen, Parker Moore, Pat Hawks, Purplecarrot, Ricardo N Feliciano,
 Rob Crocombe, Roger Ogden, Skylar Challand, Thiago Arrais, Tim Banks, Tom
 Johnson, Tunghsiao Liu, XhmikosR, Zlatan Vasović, alexmalik, brainscript,
-jona, kimbaudi, muratayusuke, penny, and yoostk.
+kimbaudi, muratayusuke, penny, and yoostk.
 
 As always, if you encounter bugs, please do [search the issues]({{ site.repository }}/issues)
 and [file an issue]({{ site.repository }}/issues/new) if you aren't able to

From 5183bde7b88fa95b6816a9ca87a75b6d27ac6176 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 27 Jan 2017 11:05:55 -0500
Subject: [PATCH 1923/4996] Update release date of 3.4.0

---
 History.markdown      | 2 +-
 docs/_docs/history.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/History.markdown b/History.markdown
index 2470b67b7c2..ab9cd2e631a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,4 +1,4 @@
-## 3.4.0 / 2016-01-20
+## 3.4.0 / 2016-01-27
 
 ### Minor Enhancements
 
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index e400efd5610..2ddaf67a6f2 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,7 +4,7 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
-## 3.4.0 / 2016-01-20
+## 3.4.0 / 2016-01-27
 {: #v3-4-0}
 
 ### Minor Enhancements

From 76feebd2d26cb4166d42ecffaab19ff38ad36494 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 27 Jan 2017 11:06:00 -0500
Subject: [PATCH 1924/4996] Release :gem: 3.4.0


From c01b7e4a4a70ee4df498398585bce4e6f59fb04a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 27 Jan 2017 11:10:55 -0500
Subject: [PATCH 1925/4996] Update history to reflect merge of #4362 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ab9cd2e631a..d286be245b6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,3 +1,9 @@
+## HEAD
+
+### Minor Enhancements
+
+  * Upgrade to Liquid v4 (#4362)
+
 ## 3.4.0 / 2016-01-27
 
 ### Minor Enhancements

From 966800fb1f4371729eb0ed8b016efa0a084e7318 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 27 Jan 2017 11:37:05 -0500
Subject: [PATCH 1926/4996] Update history to reflect merge of #5817 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d286be245b6..2958d74e224 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,10 @@
 
   * Upgrade to Liquid v4 (#4362)
 
+### Documentation
+
+  * Install troubleshooting on Ubuntu (#5817)
+
 ## 3.4.0 / 2016-01-27
 
 ### Minor Enhancements

From f6dffecab7aad6497b33fb4a954f83a90d234ea9 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Fri, 27 Jan 2017 20:51:56 +0100
Subject: [PATCH 1927/4996] fix broken links in release post

---
 docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
index cb2c6f872ca..37edb7bc379 100644
--- a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
+++ b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
@@ -10,8 +10,8 @@ Hey there! We have a quick update of Jekyll for you to enjoy this January.
 Packed full of bug fixes as usual, thanks to the tireless efforts of our
 exceptional Jekyll community. Three changes to call out:
 
-1. If you're a big fan of [`where_by_exp`](/docs/filters/), you'll be an
-even bigger fan of [`group_by_exp`](/docs/filters/).
+1. If you're a big fan of [`where_by_exp`](/docs/templates/#filters), you'll be an
+even bigger fan of [`group_by_exp`](/docs/templates/#filters).
 2. Using a custom timezone in Jekyll on Windows? Yeah, sorry that hasn't ever worked
    properly. We made it possible to accurately [set the timezone using IANA
    timezone codes](https://jekyllrb.com/docs/windows/#timezone-management).

From 3da459ef33055802074000dd95a94dac8b262574 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sat, 28 Jan 2017 22:15:34 +0530
Subject: [PATCH 1928/4996] update rubygems version on travis

---
 .travis.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3543e9aae57..f48eb77a0d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,9 @@ sudo: false
 
 rvm:
   - &ruby1 2.4.0
-  - &ruby1 2.3.3
-  - &ruby2 2.2.6
-  - &ruby3 2.1.9
+  - &ruby2 2.3.3
+  - &ruby3 2.2.6
+  - &ruby4 2.1.9
   - &jruby jruby-9.1.7.0
 
 matrix:
@@ -17,6 +17,10 @@ matrix:
       env: TEST_SUITE=fmt
     - rvm: *ruby1
       env: TEST_SUITE=default-site
+    - rvm: *ruby2
+      env: TEST_SUITE=fmt
+    - rvm: *ruby2
+      env: TEST_SUITE=default-site
   exclude:
     - rvm: *jruby
       env: TEST_SUITE=cucumber
@@ -49,3 +53,6 @@ addons:
 # regular test configuration
 after_success:
   - bundle exec codeclimate-test-reporter
+
+before_install:
+  - gem update --system

From 8bacf01c1b49042d9aeb1a9b82824f46292545e5 Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Sun, 29 Jan 2017 21:45:03 -0800
Subject: [PATCH 1929/4996] Add documentation about order of interpretation

This tutorial defines Jekyll's "order of interpretation," as @swizca called it in [#5808](https://github.com/jekyll/jekyll/pull/5698). This tutorial makes it clear how Jekyll processes files as it renders the static HTML output.

This order-of-interpretation info is important for troubleshooting and generally understanding Jekyll. It's important to know how Jekyll generates out the files, what rules it uses, what order it processes things, and so forth.

(Note: Please process 5698 before this request, because 5698 includes the tutorial collection/navigation that this tutorial fits into. I also need to update this commit to add a link in the Tutorials nav to this topic, but I'm waiting for 5698 to be merged so that menu becomes available.)

@jekyll/documentation
@dirtyf
---
 docs/_tutorials/orderofinterpretation.md | 133 +++++++++++++++++++++++
 1 file changed, 133 insertions(+)
 create mode 100644 docs/_tutorials/orderofinterpretation.md

diff --git a/docs/_tutorials/orderofinterpretation.md b/docs/_tutorials/orderofinterpretation.md
new file mode 100644
index 00000000000..e4e003be8a5
--- /dev/null
+++ b/docs/_tutorials/orderofinterpretation.md
@@ -0,0 +1,133 @@
+---
+layout: tutorials
+permalink: /tutorials/orderofinterpretation/
+title: Order of interpretation
+---
+
+Jekyll's main job is to convert your raw text files into a static website. It does this by rendering Liquid, Markdown, and other transforms as it generates the static HTML output.
+
+In this conversion process, it's important to understand Jekyll's order of interpretation. By "order of interpretation," we mean what gets rendered, in what order, and what rules get applied in converting content.
+
+If an element isn't converting, you can troubleshoot the problem by analyzing the order of interpretation.
+
+## Order of interpretations
+
+Jekyll converts your site in the following order:
+
+1. **Site variables**. Jekyll looks across your files and populates [site variables]({% link _docs/variables.md %}), such as `site`, `page`, `post`, and collection objects. (From these objects, Jekyll determines the values for permalinks, tags, categories, and other details.)
+
+2. **Liquid**. Jekyll processes any Liquid formatting in pages that contain [front matter]({% link _docs/frontmatter.md %}). All Liquid tags, such as `include`, `highlight`, or `assign` tags, are rendered. (Anything in Jekyll with `{% raw %}{{ }}{% endraw %}` curly braces or `{% raw %}{% %}{% endraw %}` is usually a Liquid filter or tag.)
+
+3. **Markdown**. Jekyll converts Markdown to HTML using the Markdown filter specified in your config file. Files must have a Markdown file extension and front matter in order for Jekyll to convert them.
+
+4. **Layout**. Jekyll pushes content into the layouts specified by the page's front matter (or as specified in the config file). The content from each page gets pushed into the `{% raw %}{{content}}{% endraw %}` tags within the layouts.
+
+5. **Files**. Jekyll writes the generated content into files in the [directory structure]({% link _docs/structure.md %}) in `_site`. Pages, posts, and collections get structured based on their [permalink]({% link _docs/permalinks.md %}) setting. Directories that begin with `_` (such as `_includes` and `_data`) are usually hidden in the output.
+
+## Scenarios where incorrect configurations yield problems
+
+For the most part, you don't have to think about the order of interpretation when building your Jekyll site. These details only become important to know when something isn't rendering.
+
+The following scenarios highlight potential problems you might encounter. These problems stem from misunderstanding the order of interpretation and can be easily fixed.
+
+### Variable on page not rendered because variable is assigned in layout
+
+In your layout file (`_layouts/default.html`), suppose you have a variable assigned:
+
+```
+{% raw %}{% assign myvar = "joe" %}{% endraw %}
+```
+
+On a page that uses the layout, you reference that variable:
+
+```
+{% raw %}{{myvar}}{% 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.
+
+To make the code work, you could put the variable assignment into the page's front matter.
+
+### Liquid tag in data reference not rendered
+
+In `_data/mydata.yml`, suppose you have this mapping:
+
+```
+{% raw %}somevalue: {{myvar}}{% endraw %}
+```
+
+On a page, you try to insert this value:
+
+```
+{% raw %}{{site.data.mydata.somevalue}}{% endraw %}
+```
+Nothing renders because first the site variables populate, and then Liquid renders. When the site variables populate, the value for `{% raw %}{{site.data.mydata.somevalue}}{% endraw %}` is simply `{% raw %}{{myvar}}{% endraw %}`, which registers as a string and gets printed as a string. You can't use Liquid in data files.
+
+Similarly, suppose you have a `highlight` tag in your `_data/mydata.yml` file:
+
+```
+{% raw %}myvalue: >
+  {% highlight javascript %}
+  console.log('alert');
+  {% endhighlight %}{% endraw %}
+```
+
+On a page, you try to insert the value:
+
+```
+{% raw %}{{site.data.mydata.myvalue}}{% endraw %}
+```
+
+This renders as a string for the same reasons described above. When the `site.data.mydata.myvalue` tag populates, the value gets stored as a string and printed to the page as a string.
+
+To make the code work, consider populating content from includes.
+
+### Markdown in include file not processed
+
+Suppose you have a Markdown file at `_includes/mycontent.md`. In the Markdown file, you have some Markdown formatting:
+
+```markdown
+This is a list:
+* first item
+* second item
+```
+
+You include the file into an HTML file as follows:
+
+```liquid
+{% raw %}{% 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.
+
+But because the content is included into an *HTML* page, the Markdown isn't rendered. The Markdown filter processes content only in Markdown files.
+
+To make the code work, use HMTL formatting in includes inserted into HTML files.
+
+However, note that `highlight` tags don't require Markdown to process. Suppose your include contains the following:
+
+```liquid
+{% raw %}{% highlight javascript %}
+console.log('alert');
+{% 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.
+
+### Liquid mixed with JavaScript isn't rendered
+
+Suppose you try to mix Liquid with JavaScript, like this:
+
+```liquid
+{% raw %}if page.type == "home" { 
+    $("intro").addClass("bright");
+elsif page.type == "normal" {
+    $("intro").addClass("muted");
+ }{% endraw %}
+```
+
+The Liquid renders long before the page gets converted to HTML. So when JavaScript executes in the browser, the Liquid is no longer present.
+
+You can never mix Liquid with JavaScript because Liquid processes when the site builds. In contrast, JavaScript processes in the browser when a user interacts with your site.
+
+To make the code work, don't mix Liquid with JavaScript. If you need the code to execute in real-time in the browser, use JavaScript.

From a7cba8a8a6686af2c8395bd627e2e8a2a2819a5e Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Mon, 30 Jan 2017 11:45:24 -0800
Subject: [PATCH 1930/4996] Made updates as suggested by reviewers

---
 docs/_tutorials/orderofinterpretation.md | 59 ++++++++++++++++--------
 1 file changed, 40 insertions(+), 19 deletions(-)

diff --git a/docs/_tutorials/orderofinterpretation.md b/docs/_tutorials/orderofinterpretation.md
index e4e003be8a5..bf3614a1870 100644
--- a/docs/_tutorials/orderofinterpretation.md
+++ b/docs/_tutorials/orderofinterpretation.md
@@ -20,11 +20,11 @@ Jekyll converts your site in the following order:
 
 3. **Markdown**. Jekyll converts Markdown to HTML using the Markdown filter specified in your config file. Files must have a Markdown file extension and front matter in order for Jekyll to convert them.
 
-4. **Layout**. Jekyll pushes content into the layouts specified by the page's front matter (or as specified in the config file). The content from each page gets pushed into the `{% raw %}{{content}}{% endraw %}` tags within the layouts.
+4. **Layout**. Jekyll pushes content into the layouts specified by the page's front matter (or as specified in the config file). The content from each page gets pushed into the `{% raw %}{{ content }}{% endraw %}` tags within the layouts.
 
 5. **Files**. Jekyll writes the generated content into files in the [directory structure]({% link _docs/structure.md %}) in `_site`. Pages, posts, and collections get structured based on their [permalink]({% link _docs/permalinks.md %}) setting. Directories that begin with `_` (such as `_includes` and `_data`) are usually hidden in the output.
 
-## Scenarios where incorrect configurations yield problems
+## Scenarios where incorrect configurations create problems
 
 For the most part, you don't have to think about the order of interpretation when building your Jekyll site. These details only become important to know when something isn't rendering.
 
@@ -41,7 +41,7 @@ In your layout file (`_layouts/default.html`), suppose you have a variable assig
 On a page that uses the layout, you reference that variable:
 
 ```
-{% raw %}{{myvar}}{% endraw %}
+{% raw %}{{ myvar }}{% 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.
@@ -53,15 +53,16 @@ To make the code work, you could put the variable assignment into the page's fro
 In `_data/mydata.yml`, suppose you have this mapping:
 
 ```
-{% raw %}somevalue: {{myvar}}{% endraw %}
+{% raw %}somevalue: {{ myvar }}{% endraw %}
 ```
 
 On a page, you try to insert this value:
 
 ```
-{% raw %}{{site.data.mydata.somevalue}}{% endraw %}
+{% raw %}{{ site.data.mydata.somevalue }}{% endraw %}
 ```
-Nothing renders because first the site variables populate, and then Liquid renders. When the site variables populate, the value for `{% raw %}{{site.data.mydata.somevalue}}{% endraw %}` is simply `{% raw %}{{myvar}}{% endraw %}`, which registers as a string and gets printed as a string. You can't use Liquid in data files.
+
+This renders as a string (`{% raw %}"{{ site.data.mydata.somevalue }}{% endraw %}"` rather than the variable's value. This is because first the site variables populate, and then Liquid renders. When the site variables populate, the value for `{% raw %}{{ site.data.mydata.somevalue }}{% endraw %}` is simply `{% raw %}{{ myvar }}{% endraw %}`, which registers as a string. You can't use Liquid in data files.
 
 Similarly, suppose you have a `highlight` tag in your `_data/mydata.yml` file:
 
@@ -75,7 +76,7 @@ Similarly, suppose you have a `highlight` tag in your `_data/mydata.yml` file:
 On a page, you try to insert the value:
 
 ```
-{% raw %}{{site.data.mydata.myvalue}}{% endraw %}
+{% raw %}{{ site.data.mydata.myvalue }}{% endraw %}
 ```
 
 This renders as a string for the same reasons described above. When the `site.data.mydata.myvalue` tag populates, the value gets stored as a string and printed to the page as a string.
@@ -102,9 +103,9 @@ The Markdown is not processed because first the Liquid (`include` tag) gets proc
 
 But because the content is included into an *HTML* page, the Markdown isn't rendered. The Markdown filter processes content only in Markdown files.
 
-To make the code work, use HMTL formatting in includes inserted into HTML files.
+To make the code work, use HMTL formatting in includes that are inserted into HTML files.
 
-However, note that `highlight` tags don't require Markdown to process. Suppose your include contains the following:
+Note that `highlight` tags don't require Markdown to process. Suppose your include contains the following:
 
 ```liquid
 {% raw %}{% highlight javascript %}
@@ -116,18 +117,38 @@ The `highlight` tag *is* Liquid. (Liquid passes the content to Rouge or Pygments
 
 ### Liquid mixed with JavaScript isn't rendered
 
-Suppose you try to mix Liquid with JavaScript, like this:
+Suppose you try to mix Liquid's `assign` tag with JavaScript, like this:
 
-```liquid
-{% raw %}if page.type == "home" { 
-    $("intro").addClass("bright");
-elsif page.type == "normal" {
-    $("intro").addClass("muted");
- }{% endraw %}
+```javascript
+{% raw %}
+
+
    
+
+{% endraw %}
 ```
 
-The Liquid renders long before the page gets converted to HTML. So when JavaScript executes in the browser, the Liquid is no longer present.
+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 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:
+
+```js
+{% raw %}
+
+
    
+
+{% endraw %}
+```
 
-You can never mix Liquid with JavaScript because Liquid processes when the site builds. In contrast, JavaScript processes in the browser when a user interacts with your site.
+When Jekyll builds the site, this `someContent` property populates the script's values, converting `{% raw %}{{ page.someContent }}{% endraw %}` to `"This is some content"`.
 
-To make the code work, don't mix Liquid with JavaScript. If you need the code to execute in real-time in the browser, use JavaScript.
+The key to remember is that Liquid renders when Jekyll builds your site. Liquid is not available at run-time in the browser when a user executes an event.

From 384be58b5e7e0b57433c47f6cd3de15eaf6ce612 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Tue, 31 Jan 2017 08:40:06 +0530
Subject: [PATCH 1931/4996] add missing comma

---
 test/test_site_drop.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_site_drop.rb b/test/test_site_drop.rb
index 6175bbb8cc9..b836c70d3eb 100644
--- a/test/test_site_drop.rb
+++ b/test/test_site_drop.rb
@@ -4,7 +4,7 @@ class TestSiteDrop < JekyllUnitTest
   context "a site drop" do
     setup do
       @site = fixture_site({
-        "collections" => ["thanksgiving"]
+        "collections" => ["thanksgiving"],
       })
       @site.process
       @drop = @site.to_liquid.site

From 875486e8ae8ab5d18ca1c744eb3c8b7618065460 Mon Sep 17 00:00:00 2001
From: Nate 
Date: Mon, 30 Jan 2017 22:13:05 -0800
Subject: [PATCH 1932/4996] Add Termux section on troubleshooting

---
 docs/_docs/troubleshooting.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/_docs/troubleshooting.md b/docs/_docs/troubleshooting.md
index d5f29671fa2..8fb669425c1 100644
--- a/docs/_docs/troubleshooting.md
+++ b/docs/_docs/troubleshooting.md
@@ -65,6 +65,12 @@ 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: 
+
+```sh
+apt update && apt install libffi-dev clang ruby-dev make
+```
+
 On macOS, you may need to update RubyGems (using `sudo` only if necessary):
 
 ```sh

From 78a4f207449e323e77f67036eab504bea7b9d9cb Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 31 Jan 2017 03:50:10 -0500
Subject: [PATCH 1933/4996] Update history to reflect merge of #5835 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2958d74e224..252b41b41b6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,10 @@
 
   * Install troubleshooting on Ubuntu (#5817)
 
+### Development Fixes
+
+  * [Rubocop] add missing comma (#5835)
+
 ## 3.4.0 / 2016-01-27
 
 ### Minor Enhancements

From e0109633ded51bc5cbd31c114e751418f33855d8 Mon Sep 17 00:00:00 2001
From: Alfred Myers 
Date: Tue, 31 Jan 2017 13:05:26 -0200
Subject: [PATCH 1934/4996] Corrected date for version 3.4.0

Year should probably be 2017 instead of 2016
---
 History.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/History.markdown b/History.markdown
index 252b41b41b6..194b4a70451 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,7 +12,7 @@
 
   * [Rubocop] add missing comma (#5835)
 
-## 3.4.0 / 2016-01-27
+## 3.4.0 / 2017-01-27
 
 ### Minor Enhancements
 

From 1457359ce500d734cd22349bc603077f9a76acff Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 31 Jan 2017 10:10:36 -0500
Subject: [PATCH 1935/4996] Update history to reflect merge of #5842 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 194b4a70451..71e56083a09 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,10 @@
 
   * [Rubocop] add missing comma (#5835)
 
+### Site Enhancements
+
+  * Corrected date for version 3.4.0 (#5842)
+
 ## 3.4.0 / 2017-01-27
 
 ### Minor Enhancements

From 0c59ac3d299ab498ff535c4de83253d9034c0ffa Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 31 Jan 2017 10:12:47 -0500
Subject: [PATCH 1936/4996] Update history to reflect merge of #5837 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 71e56083a09..3d0d01d6812 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
 ### Documentation
 
   * Install troubleshooting on Ubuntu (#5817)
+  * Add Termux section on troubleshooting (#5837)
 
 ### Development Fixes
 

From 4b325a65afde21830b026ee978c847ac4c2c3b5b Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Fri, 3 Feb 2017 20:46:05 -0800
Subject: [PATCH 1937/4996] updated based on review

I moved the section about liquid and yaml to the end and shortened it. i also clarified that isn't an order-of-interpretation issue why liquid doesn't render in yaml. I also fixed the type with HMTL.
---
 docs/_tutorials/orderofinterpretation.md | 60 +++++++++---------------
 1 file changed, 23 insertions(+), 37 deletions(-)

diff --git a/docs/_tutorials/orderofinterpretation.md b/docs/_tutorials/orderofinterpretation.md
index bf3614a1870..8ffb9d7ea3d 100644
--- a/docs/_tutorials/orderofinterpretation.md
+++ b/docs/_tutorials/orderofinterpretation.md
@@ -48,41 +48,6 @@ The variable won't render because the page's order of interpretation is to rende
 
 To make the code work, you could put the variable assignment into the page's front matter.
 
-### Liquid tag in data reference not rendered
-
-In `_data/mydata.yml`, suppose you have this mapping:
-
-```
-{% raw %}somevalue: {{ myvar }}{% endraw %}
-```
-
-On a page, you try to insert this value:
-
-```
-{% raw %}{{ site.data.mydata.somevalue }}{% endraw %}
-```
-
-This renders as a string (`{% raw %}"{{ site.data.mydata.somevalue }}{% endraw %}"` rather than the variable's value. This is because first the site variables populate, and then Liquid renders. When the site variables populate, the value for `{% raw %}{{ site.data.mydata.somevalue }}{% endraw %}` is simply `{% raw %}{{ myvar }}{% endraw %}`, which registers as a string. You can't use Liquid in data files.
-
-Similarly, suppose you have a `highlight` tag in your `_data/mydata.yml` file:
-
-```
-{% raw %}myvalue: >
-  {% highlight javascript %}
-  console.log('alert');
-  {% endhighlight %}{% endraw %}
-```
-
-On a page, you try to insert the value:
-
-```
-{% raw %}{{ site.data.mydata.myvalue }}{% endraw %}
-```
-
-This renders as a string for the same reasons described above. When the `site.data.mydata.myvalue` tag populates, the value gets stored as a string and printed to the page as a string.
-
-To make the code work, consider populating content from includes.
-
 ### Markdown in include file not processed
 
 Suppose you have a Markdown file at `_includes/mycontent.md`. In the Markdown file, you have some Markdown formatting:
@@ -103,7 +68,7 @@ The Markdown is not processed because first the Liquid (`include` tag) gets proc
 
 But because the content is included into an *HTML* page, the Markdown isn't rendered. The Markdown filter processes content only in Markdown files.
 
-To make the code work, use HMTL formatting in includes that are inserted into HTML files.
+To make the code work, use HTML formatting in includes that are inserted into HTML files.
 
 Note that `highlight` tags don't require Markdown to process. Suppose your include contains the following:
 
@@ -132,7 +97,7 @@ function someFunction() {
 {% 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 page. At that time, the Liquid logic is no longer available, so the `assign` tag wouldn't return anything.
+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:
 
@@ -152,3 +117,24 @@ function someFunction() {
 When Jekyll builds the site, this `someContent` property populates the script's values, converting `{% raw %}{{ page.someContent }}{% endraw %}` to `"This is some content"`.
 
 The key to remember is that Liquid renders when Jekyll builds your site. Liquid is not available at run-time in the browser when a user executes an event.
+
+## Note about using Liquid in YAML
+
+There's one more detail to remember: Liquid does not render when embedded in YAML files or front matter. (This isn't related to order of interpretation, but it's worth mentioning because it's a common question about element rendering.)
+
+For example, suppose you have a `highlight` tag in your `_data/mydata.yml` file:
+
+```
+{% raw %}myvalue: >
+  {% highlight javascript %}
+  console.log('alert');
+  {% endhighlight %}{% endraw %}
+```
+
+On a page, you try to insert the value:
+
+```
+{% raw %}{{ site.data.mydata.myvalue }}{% endraw %}
+```
+
+This would render as a string rather than a code sample with syntax highlighting. To make the code render, you might use an include instead.

From 7e45610379cf5419ceba3c8f9532eca25ee405bd Mon Sep 17 00:00:00 2001
From: Colin 
Date: Sat, 4 Feb 2017 15:52:42 +0000
Subject: [PATCH 1938/4996] Add the correct year to the 3.4.0 release date

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

diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 2ddaf67a6f2..7d96660a389 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,7 +4,7 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
-## 3.4.0 / 2016-01-27
+## 3.4.0 / 2017-01-27
 {: #v3-4-0}
 
 ### Minor Enhancements

From 20d2eb2709b9fda243a955d365fbb911cd0b51f6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 4 Feb 2017 12:30:28 -0500
Subject: [PATCH 1939/4996] Update history to reflect merge of #5858 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3d0d01d6812..abf9b5f2031 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
 ### Site Enhancements
 
   * Corrected date for version 3.4.0 (#5842)
+  * Add the correct year to the 3.4.0 release date (#5858)
 
 ## 3.4.0 / 2017-01-27
 

From 4e40593a53e51c9f1e2ce567677bc1803bbd4829 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 5 Feb 2017 01:26:41 +0530
Subject: [PATCH 1940/4996] exclude Gemfile and its lockfile by default

---
 lib/jekyll/configuration.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 27e245e4bcb..b4bf7c5aba3 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -18,7 +18,8 @@ class Configuration < Hash
       "safe"              => false,
       "include"           => [".htaccess"],
       "exclude"           => %w(
-        node_modules vendor/bundle/ vendor/cache/ vendor/gems/ vendor/ruby/
+        Gemfile Gemfile.lock node_modules vendor/bundle/ vendor/cache/ vendor/gems/
+        vendor/ruby/
       ),
       "keep_files"        => [".git", ".svn"],
       "encoding"          => "utf-8",

From 6316856773a8c41d16c887e2df82ec8735f3890b Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 5 Feb 2017 01:28:43 +0530
Subject: [PATCH 1941/4996] comment out 'exclude:' in config file

---
 lib/site_template/_config.yml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
index f5df9830896..aa255a64979 100644
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -29,6 +29,17 @@ markdown: kramdown
 theme: minima
 gems:
   - jekyll-feed
-exclude:
-  - Gemfile
-  - Gemfile.lock
+
+# Exclude from processing.
+#   The items below are excluded by default, to customize the list, uncomment the
+#   lines below and simply add to the list. Items removed will **not** be excluded
+#   from processing.
+#
+# exclude:
+#   - Gemfile
+#   - Gemfile.lock
+#   - node_modules
+#   - vendor/bundle/
+#   - vendor/cache/
+#   - vendor/gems/
+#   - vendor/ruby/

From 2813b9c03985e2c4bd7c1f74b246d5432cb41bf0 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 5 Feb 2017 01:49:38 +0530
Subject: [PATCH 1942/4996] test exclusion of Gemfile

---
 test/test_configuration.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index febc0cbee1b..9602c5c309f 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -55,6 +55,8 @@ class TestConfiguration < JekyllUnitTest
 
     should "exclude ruby vendor directories" do
       exclude = Configuration.from({})["exclude"]
+      assert_includes exclude, "Gemfile"
+      assert_includes exclude, "Gemfile.lock"
       assert_includes exclude, "vendor/bundle/"
       assert_includes exclude, "vendor/cache/"
       assert_includes exclude, "vendor/gems/"

From eb36ea095fb948ad21a820ba35fe145a43cbf352 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 5 Feb 2017 01:56:49 +0530
Subject: [PATCH 1943/4996] test overriding default excludes

---
 features/site_configuration.feature | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/features/site_configuration.feature b/features/site_configuration.feature
index 2d00f9b77cf..3aace7946ef 100644
--- a/features/site_configuration.feature
+++ b/features/site_configuration.feature
@@ -44,9 +44,11 @@ Feature: Site configuration
     Given I have an "Rakefile" file that contains "I want to be excluded"
     And I have an "README" file that contains "I want to be excluded"
     And I have an "index.html" file that contains "I want to be included"
+    And I have a "Gemfile" file that contains "gem 'include-me'"
     And I have a configuration file with "exclude" set to "['Rakefile', 'README']"
     When I run jekyll build
     Then I should see "I want to be included" in "_site/index.html"
+    And the "_site/Gemfile" file should exist
     And the "_site/Rakefile" file should not exist
     And the "_site/README" file should not exist
 

From 3745b2456409882ba81f1c2e7cd6c4f868175f3b Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 5 Feb 2017 07:55:26 +0530
Subject: [PATCH 1944/4996] update comment for `exclude` array

---
 lib/site_template/_config.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
index aa255a64979..436d5999500 100644
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -31,10 +31,8 @@ gems:
   - jekyll-feed
 
 # Exclude from processing.
-#   The items below are excluded by default, to customize the list, uncomment the
-#   lines below and simply add to the list. Items removed will **not** be excluded
-#   from processing.
-#
+# The following items will not be processed, by default. Create a custom list
+# to override the default setting.
 # exclude:
 #   - Gemfile
 #   - Gemfile.lock

From 755cc6c137dedefe7a070fdf03f427e102b5e866 Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Sun, 5 Feb 2017 20:55:16 -0800
Subject: [PATCH 1945/4996] Fixes based on latest review

Mostly I added more detail in the Liquid section.
---
 docs/_tutorials/orderofinterpretation.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/_tutorials/orderofinterpretation.md b/docs/_tutorials/orderofinterpretation.md
index 8ffb9d7ea3d..1146c636200 100644
--- a/docs/_tutorials/orderofinterpretation.md
+++ b/docs/_tutorials/orderofinterpretation.md
@@ -16,7 +16,10 @@ Jekyll converts your site in the following order:
 
 1. **Site variables**. Jekyll looks across your files and populates [site variables]({% link _docs/variables.md %}), such as `site`, `page`, `post`, and collection objects. (From these objects, Jekyll determines the values for permalinks, tags, categories, and other details.)
 
-2. **Liquid**. Jekyll processes any Liquid formatting in pages that contain [front matter]({% link _docs/frontmatter.md %}). All Liquid tags, such as `include`, `highlight`, or `assign` tags, are rendered. (Anything in Jekyll with `{% raw %}{{ }}{% endraw %}` curly braces or `{% raw %}{% %}{% endraw %}` is usually a Liquid filter or tag.)
+2. **Liquid**. Jekyll processes any [Liquid](https://github.com/Shopify/liquid) formatting in pages that contain [front matter]({% link _docs/frontmatter.md %}). You can identify Liquid as follows:
+   * **Liguid tags** start with `{% raw %}{%{% endraw %}` and end with a `{% raw %}%}{% endraw %}`. For example: `{% raw %}{% highlight %}{% endraw %}` or `{% raw %}{% seo %}{% endraw %}`. Tags can define blocks or be inline. Block-defining tags will also come with a corresponding end tag — for example, `{% raw %}{% endhighlight %}{% endraw %}`.
+   * **Liquid variables** start and end with double curly braces. For example: `{% raw %}{{ site.myvariable }}{% endraw %}` or `{% raw %}{{ content }}{% endraw %}`.
+   * **Liquid filters** start with a pipe character (`|`) and can only be used within **Liquid variables** after the variable string. For example: the `relative_url` filter in `{% raw %}{{ "css/main.css" | relative_url }}{% endraw %}`.
 
 3. **Markdown**. Jekyll converts Markdown to HTML using the Markdown filter specified in your config file. Files must have a Markdown file extension and front matter in order for Jekyll to convert them.
 
@@ -28,7 +31,7 @@ Jekyll converts your site in the following order:
 
 For the most part, you don't have to think about the order of interpretation when building your Jekyll site. These details only become important to know when something isn't rendering.
 
-The following scenarios highlight potential problems you might encounter. These problems stem from misunderstanding the order of interpretation and can be easily fixed.
+The following scenarios highlight potential problems you might encounter. These problems come from misunderstanding the order of interpretation and can be easily fixed.
 
 ### Variable on page not rendered because variable is assigned in layout
 
@@ -137,4 +140,4 @@ On a page, you try to insert the value:
 {% raw %}{{ site.data.mydata.myvalue }}{% endraw %}
 ```
 
-This would render as a string rather than a code sample with syntax highlighting. To make the code render, you might use an include instead.
+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.

From 229769e249bc9a6703fda4a9af061cd639d1ca75 Mon Sep 17 00:00:00 2001
From: Ben Balter 
Date: Wed, 8 Feb 2017 17:44:47 -0500
Subject: [PATCH 1946/4996] add StaticFileDrop

---
 lib/jekyll/drops/static_file_drop.rb | 11 +++++++++++
 lib/jekyll/static_file.rb            | 20 +++++++++++++-------
 test/test_static_file.rb             |  3 ++-
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 lib/jekyll/drops/static_file_drop.rb

diff --git a/lib/jekyll/drops/static_file_drop.rb b/lib/jekyll/drops/static_file_drop.rb
new file mode 100644
index 00000000000..e0af2f09ed1
--- /dev/null
+++ b/lib/jekyll/drops/static_file_drop.rb
@@ -0,0 +1,11 @@
+module Jekyll
+  module Drops
+    class StaticFileDrop < Drop
+      extend Forwardable
+      def_delegators :@obj, :name, :extname, :modified_time, :basename
+      def_delegator :@obj, :relative_path, :path
+      def_delegator :@obj, :data, :fallback_data
+      def_delegator :@obj, :type, :collection
+    end
+  end
+end
diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index 53b945d4168..beea9ddf99c 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -28,6 +28,10 @@ def initialize(site, base, dir, name, collection = nil)
       @collection = collection
       @relative_path = File.join(*[@dir, @name].compact)
       @extname = File.extname(@name)
+
+      data.default_proc = proc do |_, key|
+        site.frontmatter_defaults.find(relative_path, type, key)
+      end
     end
     # rubocop: enable ParameterLists
 
@@ -96,13 +100,15 @@ def write(dest)
     end
 
     def to_liquid
-      {
-        "basename"      => File.basename(name, extname),
-        "name"          => name,
-        "extname"       => extname,
-        "modified_time" => modified_time,
-        "path"          => File.join("", relative_path),
-      }
+      @to_liquid ||= Drops::StaticFileDrop.new(self)
+    end
+
+    def data
+      @data ||= {}
+    end
+
+    def basename
+      File.basename(name, extname)
     end
 
     def placeholders
diff --git a/test/test_static_file.rb b/test/test_static_file.rb
index 114885db752..b2299ae273f 100644
--- a/test/test_static_file.rb
+++ b/test/test_static_file.rb
@@ -148,8 +148,9 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
         "extname"       => ".txt",
         "modified_time" => @static_file.modified_time,
         "path"          => "/static_file.txt",
+        "collection"    => nil
       }
-      assert_equal expected, @static_file.to_liquid
+      assert_equal expected, @static_file.to_liquid.to_h
     end
   end
 end

From 1d44be54216fc1dddf698a630ea4e5f7c0577bca Mon Sep 17 00:00:00 2001
From: Marcelo Canina 
Date: Fri, 10 Feb 2017 12:34:16 -0300
Subject: [PATCH 1947/4996] fix ial css classes in theme doc

---
 docs/_docs/themes.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index 551d93400c9..4db8d404143 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -141,7 +141,8 @@ To install a gem-based theme:
    bundle exec jekyll serve
    ```
 
-You can have multiple themes listed in your site's `Gemfile`, but only one theme can be selected in your site's `_config.yml`. {: .note .info }
+You can have multiple themes listed in your site's `Gemfile`, but only one theme can be selected in your site's `_config.yml`. 
+{: .note .info }
 
 If you're publishing your Jekyll site on [GitHub Pages](https://pages.github.com/), note that GitHub Pages supports only some gem-based themes. See [Supported Themes](https://pages.github.com/themes/) in GitHub's documentation to see which themes are supported.
 
@@ -217,7 +218,8 @@ Themes are visual. Show users what your theme looks like by including a screensh
 
 To preview your theme as you're authoring it, it may be helpful to add dummy content in, for example, `/index.html` and `/page.html` files. This will allow you to use the `jekyll build` and `jekyll serve` commands to preview your theme, just as you'd preview a Jekyll site.
 
-If you do preview your theme locally, be sure to add `/_site` to your theme's `.gitignore` file to prevent the compiled site from also being included when you distribute your theme. {: .info .note}
+If you do preview your theme locally, be sure to add `/_site` to your theme's `.gitignore` file to prevent the compiled site from also being included when you distribute your theme. 
+{: .info .note}
 
 ### Publishing your theme
 

From bdf594317b25899c4d9856e5d40e0c944363f48b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 10 Feb 2017 14:26:16 -0500
Subject: [PATCH 1948/4996] Update history to reflect merge of #5876 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index abf9b5f2031..33b3a5f8158 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,7 @@
 
   * Install troubleshooting on Ubuntu (#5817)
   * Add Termux section on troubleshooting (#5837)
+  * fix ial css classes in theme doc (#5876)
 
 ### Development Fixes
 

From 7b58bcfc9e0822649f4ea26843856ef46e801dad Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 10 Feb 2017 21:08:50 -0500
Subject: [PATCH 1949/4996] Update history to reflect merge of #5871 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 33b3a5f8158..7d2c32b3a72 100644
--- a/History.markdown
+++ b/History.markdown
@@ -3,6 +3,7 @@
 ### Minor Enhancements
 
   * Upgrade to Liquid v4 (#4362)
+  * Convert StaticFile liquid representation to a Drop & add front matter defaults support to StaticFiles (#5871)
 
 ### Documentation
 

From bcebf58cbd1181ca73b05dac797c59a5d80d6e40 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 10 Feb 2017 21:10:11 -0500
Subject: [PATCH 1950/4996] Update history to reflect merge of #5860 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7d2c32b3a72..8ef746b934d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -20,6 +20,10 @@
   * Corrected date for version 3.4.0 (#5842)
   * Add the correct year to the 3.4.0 release date (#5858)
 
+### Bug Fixes
+
+  * Exclude Gemfile by default (#5860)
+
 ## 3.4.0 / 2017-01-27
 
 ### Minor Enhancements

From ec234a4ef89629f40b3bb826f41948303a70a400 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 10 Feb 2017 21:05:32 -0500
Subject: [PATCH 1951/4996] Bump Ruby 2.1 testing up to Ruby 2.1.10

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 66c85eaabab..3a6ef68bb67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ sudo: false
 rvm:
   - &ruby1 2.3.3
   - &ruby2 2.2.6
-  - &ruby3 2.1.9
+  - &ruby3 2.1.10
   - &jruby jruby-9.1.7.0
 
 matrix:

From 23808c2ae64638f79e1cb2b51936827e98f70880 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 10 Feb 2017 21:16:25 -0500
Subject: [PATCH 1952/4996] Fix missing trailing comma to alleviate fmt errors

Offenses:

test/test_static_file.rb:151:9: C: [Corrected] Style/TrailingCommaInLiteral: Put a comma after the last item of a multiline hash.
        "collection"    => nil
        ^^^^^^^^^^^^^^^^^^^^^^
---
 test/test_static_file.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_static_file.rb b/test/test_static_file.rb
index b2299ae273f..1603420a8dd 100644
--- a/test/test_static_file.rb
+++ b/test/test_static_file.rb
@@ -148,7 +148,7 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
         "extname"       => ".txt",
         "modified_time" => @static_file.modified_time,
         "path"          => "/static_file.txt",
-        "collection"    => nil
+        "collection"    => nil,
       }
       assert_equal expected, @static_file.to_liquid.to_h
     end

From 98e19c3cf5122582a8d2b5ecaad805a7902f2e53 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 10 Feb 2017 21:16:58 -0500
Subject: [PATCH 1953/4996] Update history to reflect merge of #5834 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8ef746b934d..f6fb2e3a5d4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
 
   * Corrected date for version 3.4.0 (#5842)
   * Add the correct year to the 3.4.0 release date (#5858)
+  * Add documentation about order of interpretation (#5834)
 
 ### Bug Fixes
 

From 5bc67c1fb7964d9180777d84f9996027eec4001c Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 10 Feb 2017 21:56:43 -0500
Subject: [PATCH 1954/4996] Convertible#validate_permalink!: ensure the return
 value of data["permalink"] is a string before asking if it is empty

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

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index e710b6f03c4..11d5fa865cf 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -69,7 +69,7 @@ def validate_data!(filename)
     end
 
     def validate_permalink!(filename)
-      if self.data["permalink"] && self.data["permalink"].empty?
+      if self.data["permalink"] && self.data["permalink"].to_s.empty?
         raise Errors::InvalidPermalinkError, "Invalid permalink in #{filename}"
       end
     end

From 7414ab068a91c795c3a2cae9cff8a2c642c45faf Mon Sep 17 00:00:00 2001
From: BlueberryFoxtrot 
Date: Sat, 11 Feb 2017 05:35:50 +0100
Subject: [PATCH 1955/4996] Update installation.md

It --> Jekyll.
Avoids misreading that "it is possible to get [Windows] running on Windows."
---
 docs/_docs/installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index bc5c251568c..5a8fc7a1286 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -36,7 +36,7 @@ Before you start, make sure your system has the following:
 
    
   
    Running Jekyll on Windows
    
   
    
-    While Windows is not officially supported, it is possible to get it running
+    While Windows is not officially supported, it is possible to get Jekyll running
     on Windows. Special instructions can be found on our
     Windows-specific docs page.
   
    

From 9ec7969c09c4de2f40bff94bd84ab76b9c33f870 Mon Sep 17 00:00:00 2001
From: Ricardo N Feliciano 
Date: Sat, 11 Feb 2017 00:06:48 -0500
Subject: [PATCH 1956/4996] Add note to collections doc on hard-coded
 collections.

---
 docs/_docs/collections.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index c64abd23aa7..97ca6ecb9ab 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -321,6 +321,15 @@ you specified in your `_config.yml` (if present) and the following information:
 
 
    
 
+
    
+  
    A Hard-Coded Collection
    
+  
    In addition to any collections you create yourself, the 
+  posts collection is hard-coded into Jekyll. It exists whether 
+  you have a _posts directory or not. This is something to note 
+  when iterating through site.collections as you may need to 
+  filter it out.
    
+
    
+
 
 ### Documents
 

From 7484c23ba42068bcaf36b3a2a5f4d6a031368287 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 11 Feb 2017 00:21:20 -0500
Subject: [PATCH 1957/4996] Update history to reflect merge of #5880 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f6fb2e3a5d4..83a744304f7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -10,6 +10,7 @@
   * Install troubleshooting on Ubuntu (#5817)
   * Add Termux section on troubleshooting (#5837)
   * fix ial css classes in theme doc (#5876)
+  * Update installation.md (#5880)
 
 ### Development Fixes
 

From 6123175a7138d1ed6912054abcd4d7fd0c28bbb5 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sat, 11 Feb 2017 13:58:23 +0530
Subject: [PATCH 1958/4996] test with pygments 1.1 on all ruby versions

---
 Gemfile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index b13bb9084ed..616abfb8d09 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,12 +3,7 @@ gemspec :name => "jekyll"
 
 gem "rake", "~> 12.0"
 
-if RUBY_VERSION >= '2.4'
-  gem "json", "~> 2.0"
-  gem "pygments.rb", "~> 1.1"
-else
-  gem "pygments.rb", "~> 0.6.0" unless RUBY_ENGINE == "jruby"
-end
+gem "pygments.rb", "~> 1.1"
 
 # Dependency of jekyll-mentions. RubyGems in Ruby 2.1 doesn't shield us from this.
 gem "activesupport", "~> 4.2", :groups => [:test_legacy, :site] if RUBY_VERSION < "2.2.2"

From 04ae82b84913b11408b326d4c815200039e72bf3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 12 Feb 2017 09:21:32 -0500
Subject: [PATCH 1959/4996] Update history to reflect merge of #5878 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 83a744304f7..e79677bcb3c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
 ### Bug Fixes
 
   * Exclude Gemfile by default (#5860)
+  * Convertible#validate_permalink!: ensure the return value of data["permalink"] is a string before asking if it is empty (#5878)
 
 ## 3.4.0 / 2017-01-27
 

From b17c6c29144504aae7607a3163659e06f8e11d92 Mon Sep 17 00:00:00 2001
From: Ivan Storck 
Date: Sun, 12 Feb 2017 13:54:46 -0500
Subject: [PATCH 1960/4996] update Aerobatic docs

---
 docs/_docs/deployment-methods.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/deployment-methods.md b/docs/_docs/deployment-methods.md
index 79138caafd2..f2533cfd363 100644
--- a/docs/_docs/deployment-methods.md
+++ b/docs/_docs/deployment-methods.md
@@ -203,6 +203,6 @@ Setting up Kickster is very easy, just install the gem and you are good to go. M
 
 ## Aerobatic
 
-[Aerobatic](https://www.aerobatic.com) is an add-on for Bitbucket that brings GitHub Pages style functionality to Bitbucket users. It includes continuous deployment, custom domains with a wildcard SSL cert, CDN, basic auth, and staging branches all in the box.
+[Aerobatic](https://www.aerobatic.com) has custom domains, global CDN distribution, basic auth, CORS proxying, and a growling list of plugins all included.
 
-Automating the build and deployment of a Jekyll site is just as simple as GitHub Pages - push your changes to your repo (excluding the `_site` directory) and within seconds a build will be triggered and your built site deployed to our highly- available, globally distributed hosting service. The build process will even install and execute custom Ruby plugins. See our [Jekyll docs](https://www.aerobatic.com/docs/static-generators#jekyll) for more details.
+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 deployed to our highly-available, globally distributed hosting service.

From b181eb2515b3e82e301eea343be4dccc800ba9ee Mon Sep 17 00:00:00 2001
From: Ivan Storck 
Date: Sun, 12 Feb 2017 17:56:08 -0500
Subject: [PATCH 1961/4996] fix typo

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

diff --git a/docs/_docs/deployment-methods.md b/docs/_docs/deployment-methods.md
index f2533cfd363..ef8d16b1726 100644
--- a/docs/_docs/deployment-methods.md
+++ b/docs/_docs/deployment-methods.md
@@ -205,4 +205,4 @@ Setting up Kickster is very easy, just install the gem and you are good to go. M
 
 [Aerobatic](https://www.aerobatic.com) has custom domains, global CDN distribution, basic auth, CORS proxying, and a growling 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 deployed to our highly-available, globally distributed hosting service.
+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.

From 50292be8951f62750ae4bd68ce4e0658a898d172 Mon Sep 17 00:00:00 2001
From: Ivan Storck 
Date: Mon, 13 Feb 2017 11:40:30 -0500
Subject: [PATCH 1962/4996] fix typo

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

diff --git a/docs/_docs/deployment-methods.md b/docs/_docs/deployment-methods.md
index ef8d16b1726..3e5fcfdcc90 100644
--- a/docs/_docs/deployment-methods.md
+++ b/docs/_docs/deployment-methods.md
@@ -203,6 +203,6 @@ Setting up Kickster is very easy, just install the gem and you are good to go. M
 
 ## Aerobatic
 
-[Aerobatic](https://www.aerobatic.com) has custom domains, global CDN distribution, basic auth, CORS proxying, and a growling list of plugins all included.
+[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.

From 2dde1800a285d6199eee38fd24bc0106b857bde8 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 13 Feb 2017 14:23:50 -0500
Subject: [PATCH 1963/4996] Update history to reflect merge of #5883 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e79677bcb3c..83151769713 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
   * Add Termux section on troubleshooting (#5837)
   * fix ial css classes in theme doc (#5876)
   * Update installation.md (#5880)
+  * Update Aerobatic docs (#5883)
 
 ### Development Fixes
 

From c48b12ba9f293c6137a7b60bc3ab7bf240482989 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 14 Feb 2017 02:34:16 -0500
Subject: [PATCH 1964/4996] Update history to reflect merge of #5882 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 83151769713..f50b1c5007a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,7 @@
   * fix ial css classes in theme doc (#5876)
   * Update installation.md (#5880)
   * Update Aerobatic docs (#5883)
+  * Add note to collections doc on hard-coded collections. (#5882)
 
 ### Development Fixes
 

From 42a65a57e61cabacfb2505c22735527f2124a41e Mon Sep 17 00:00:00 2001
From: Phil Nash 
Date: Fri, 17 Feb 2017 02:16:37 +0000
Subject: [PATCH 1965/4996] Makes uri_escape template docs more specific.

I didn't know the difference between cgi_escape and uri_escape until it bit me when I had a colon in a title I used uri_escape on. Addressable::URI.encode (from addressable 2.4.0 and later) thought it was a URI and raised an error. I should have been using cgi_escape, which is for strings that will be added to URIs and not uri_escape, which is for encoding strings that are already in a URI.

This commit borrows from the addressable docs to make it more specific so that readers choose uri_escape when they already have a URI and cgi_escape when they are just escaping a plain string.
---
 docs/_docs/templates.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md
index 0d4975d6dc3..19ad65193e6 100644
--- a/docs/_docs/templates.md
+++ b/docs/_docs/templates.md
@@ -194,15 +194,15 @@ common tasks easier.
       
         
    URI Escape
    
         
    
-          URI escape a string.
+          Percent encodes any special characters in a URI.
         
    
       
       
         
    
-         {% raw %}{{ "foo, bar \baz?" | uri_escape }}{% endraw %}
+         {% raw %}{{ "http://foo.com/?query=foo, bar \baz?" | uri_escape }}{% endraw %}
         
    
         
    
-          foo,%20bar%20%5Cbaz?
+          http://foo.com/?query=foo,%20bar%20%5Cbaz?
         
    
       
     

From 6137dccfc02998ea2936e67e9524bfbdecb948fe Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 17 Feb 2017 04:19:18 -0500
Subject: [PATCH 1966/4996] Update history to reflect merge of #5887 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f50b1c5007a..722b5fd71b1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -13,6 +13,7 @@
   * Update installation.md (#5880)
   * Update Aerobatic docs (#5883)
   * Add note to collections doc on hard-coded collections. (#5882)
+  * Makes uri_escape template docs more specific. (#5887)
 
 ### Development Fixes
 

From db229a85d79a5351e23b1f3639125b5f2edb1b2d Mon Sep 17 00:00:00 2001
From: Chun Fei Lung 
Date: Sat, 18 Feb 2017 17:14:15 +0100
Subject: [PATCH 1967/4996] Remove duplicate footnote_nr from default config

The configuration page lists the footnote_nr kramdown configuration option twice. That seemed a bit much, so I removed one of the two lines.
---
 docs/_docs/configuration.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index 3f3bfd25c9f..79de5a98ffc 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -653,7 +653,6 @@ redcarpet:
 
 kramdown:
   auto_ids:       true
-  footnote_nr:    1
   entity_output:  as_char
   toc_levels:     1..6
   smart_quotes:   lsquo,rsquo,ldquo,rdquo

From 2c75cb1ca7e540673ce21de30793f75eafc62b94 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 19 Feb 2017 11:29:53 -0500
Subject: [PATCH 1968/4996] Update history to reflect merge of #5891 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 722b5fd71b1..d876c6714f6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -14,6 +14,7 @@
   * Update Aerobatic docs (#5883)
   * Add note to collections doc on hard-coded collections. (#5882)
   * Makes uri_escape template docs more specific. (#5887)
+  * Remove duplicate footnote_nr from default config (#5891)
 
 ### Development Fixes
 

From 4e913add3ecece41885c4c314d56a103934040ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pobo=C5=99il?= 
Date: Wed, 22 Feb 2017 22:58:48 +0100
Subject: [PATCH 1969/4996] Fixed tutorial for publishing gem to include repo.

gem build lists files by git, so it is needed to have them commited.
---
 docs/_docs/themes.md | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index 4db8d404143..2e6052a4002 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -225,16 +225,24 @@ If you do preview your theme locally, be sure to add `/_site` to your theme's `.
 
 Themes are published via [RubyGems.org](https://rubygems.org). You will need a RubyGems account, which you can [create for free](https://rubygems.org/sign_up).
 
-1. First, package your theme, by running the following command, replacing `jekyll-theme-awesome` with the name of your theme:
+1. First, you need to have it in a git repository:
+
+   ```sh
+   git init # Only the first time
+   git add -A
+   git commit -m "Init commit"
+   ```
+
+2. Next, package your theme, by running the following command, replacing `jekyll-theme-awesome` with the name of your theme:
 
    ```sh
    gem build jekyll-theme-awesome.gemspec
    ```
 
-2. Next, push your packaged theme up to the RubyGems service, by running the following command, again replacing `jekyll-theme-awesome` with the name of your theme:
+3. Finally, push your packaged theme up to the RubyGems service, by running the following command, again replacing `jekyll-theme-awesome` with the name of your theme:
 
    ```sh
    gem push jekyll-theme-awesome-*.gem
    ```
 
-3. To release a new version of your theme, update the version number in the gemspec file, ( `jekyll-theme-awesome.gemspec` in this example ), and then repeat Steps 1 & 2 above. We recommend that you follow [Semantic Versioning](http://semver.org/) while bumping your theme-version.
+4. To release a new version of your theme, update the version number in the gemspec file, ( `jekyll-theme-awesome.gemspec` in this example ), and then repeat Steps 1 - 3 above. We recommend that you follow [Semantic Versioning](http://semver.org/) while bumping your theme-version.

From e52fa8766548ace67a031f431e0db54459e3268b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 23 Feb 2017 03:36:34 -0500
Subject: [PATCH 1970/4996] Update history to reflect merge of #5900 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d876c6714f6..e447b7028cd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -15,6 +15,7 @@
   * Add note to collections doc on hard-coded collections. (#5882)
   * Makes uri_escape template docs more specific. (#5887)
   * Remove duplicate footnote_nr from default config (#5891)
+  * Fixed tutorial for publishing gem to include repo. (#5900)
 
 ### Development Fixes
 

From 90d747238870bc178b533428559d1673dc56563e Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sat, 25 Feb 2017 08:15:56 +0530
Subject: [PATCH 1971/4996] Remove dependency on include from default about.md

This ensures better portability, allowing to switch and preview
themes without having to delete the code block.
---
 lib/site_template/about.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/site_template/about.md b/lib/site_template/about.md
index d441cde3009..8b4e0b28c83 100644
--- a/lib/site_template/about.md
+++ b/lib/site_template/about.md
@@ -6,10 +6,13 @@ permalink: /about/
 
 This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](https://jekyllrb.com/)
 
-You can find the source code for the Jekyll new theme at:
-{% include icon-github.html username="jekyll" %} /
+You can find the source code for Minima at GitHub:
+[jekyll][jekyll-organization] /
 [minima](https://github.com/jekyll/minima)
 
-You can find the source code for Jekyll at
-{% include icon-github.html username="jekyll" %} /
+You can find the source code for Jekyll at GitHub:
+[jekyll][jekyll-organization] /
 [jekyll](https://github.com/jekyll/jekyll)
+
+
+[jekyll-organization]: https://github.com/jekyll

From 1f5612dd1be62c05edf74425090b48a6d755c357 Mon Sep 17 00:00:00 2001
From: Antonio Argote 
Date: Sun, 26 Feb 2017 16:02:17 +0800
Subject: [PATCH 1972/4996] update broken links

where once there was a working url, there's now a broken redirect
---
 docs/_docs/templates.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md
index 19ad65193e6..c612df497d8 100644
--- a/docs/_docs/templates.md
+++ b/docs/_docs/templates.md
@@ -4,8 +4,8 @@ permalink: /docs/templates/
 ---
 
 Jekyll uses the [Liquid](https://shopify.github.io/liquid/) templating language to
-process templates. All of the standard Liquid [tags](https://shopify.github.io/liquid/tags/) and
-[filters](https://shopify.github.io/liquid/filters/) are
+process templates. All of the standard Liquid [tags](https://shopify.github.io/liquid/tags/control-flow/) and
+[filters](https://shopify.github.io/liquid/filters/abs/) are
 supported. Jekyll even adds a few handy filters and tags of its own to make
 common tasks easier.
 

From 21106b5431148a1fe536fd57315b2c541b4d5d86 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 26 Feb 2017 04:47:13 -0500
Subject: [PATCH 1973/4996] Update history to reflect merge of #5905 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e447b7028cd..ee1098f92bc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Makes uri_escape template docs more specific. (#5887)
   * Remove duplicate footnote_nr from default config (#5891)
   * Fixed tutorial for publishing gem to include repo. (#5900)
+  * update broken links (#5905)
 
 ### Development Fixes
 

From b9c645d4c3ac9aacdbef46d09283a853779f85ec Mon Sep 17 00:00:00 2001
From: Roger Sheen 
Date: Mon, 27 Feb 2017 23:27:30 +0100
Subject: [PATCH 1974/4996] Fix typo in contribution information
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Minor subject/verb agreement (use plural “pull request**s**” to agree with verb form)
---
 docs/_docs/contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index 724c6641801..b0b85e0f31c 100644
--- a/docs/_docs/contributing.md
+++ b/docs/_docs/contributing.md
@@ -32,7 +32,7 @@ Whether you're a developer, a designer, or just a Jekyll devotee, there are lots
 
 * The more information, the better. Make judicious use of the pull request body. Describe what changes were made, why you made them, and what impact they will have for users.
 
-* Pull request are easy and fun. If this is your first pull request, it may help to [understand GitHub Flow](https://guides.github.com/introduction/flow/).
+* Pull requests are easy and fun. If this is your first pull request, it may help to [understand GitHub Flow](https://guides.github.com/introduction/flow/).
 
 * If you're submitting a code contribution, be sure to read the [code contributions](#code-contributions) section below.
 

From 31b8a2ba5c437f7ddb29e9c74ddbf789c4e9673e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 27 Feb 2017 17:41:57 -0500
Subject: [PATCH 1975/4996] Update history to reflect merge of #5910 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ee1098f92bc..2f74dfd652f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
   * Remove duplicate footnote_nr from default config (#5891)
   * Fixed tutorial for publishing gem to include repo. (#5900)
   * update broken links (#5905)
+  * Fix typo in contribution information (#5910)
 
 ### Development Fixes
 

From 0ecbf40d0e28a44c80db8ba2a5eaa0d8b5d0edd7 Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Tue, 28 Feb 2017 10:15:20 -0800
Subject: [PATCH 1976/4996] fixes from parkr's review. removed yellow style
 line. moved tutorials link from primary nav to Help page. removed .giignore
 change.

---
 docs/_includes/primary-nav-items.html | 3 ---
 docs/_sass/_style.scss                | 3 +--
 docs/help/index.md                    | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/_includes/primary-nav-items.html b/docs/_includes/primary-nav-items.html
index a431d846d50..21200b3e97c 100644
--- a/docs/_includes/primary-nav-items.html
+++ b/docs/_includes/primary-nav-items.html
@@ -5,9 +5,6 @@
   
  • 
     Docs
   
    • 
-  
  • 
-    Tutorials
-  
    • 
   
  • 
     News
   
    • 
diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss
index 3a038966558..d8b0bf38297 100644
--- a/docs/_sass/_style.scss
+++ b/docs/_sass/_style.scss
@@ -1033,6 +1033,5 @@ code.output {
 }
 
 .result {
-  border: 1px solid yellow;
-  padding: 10px;
+  padding: 12px;
 }
diff --git a/docs/help/index.md b/docs/help/index.md
index 46ddcd4d3f1..c4674a21e2f 100644
--- a/docs/help/index.md
+++ b/docs/help/index.md
@@ -14,6 +14,10 @@ Known breaking changes are listed in the upgrading docs.
 
 Our guide to Jekyll covering installation, writing, customization, deployment, and more.
 
+### [Tutorials](/tutorials/home)
+
+Similar to documentation, but more detailed scenario-based walk-throughs covering a variety of topics.
+
 ### [View source](https://github.com/jekyll/jekyll/wiki/sites)
 
 Learn from the source of others' Jekyll-powered sites.

From 05790460c1d2479334428e1eb42891232aba008f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 28 Feb 2017 14:04:53 -0500
Subject: [PATCH 1977/4996] Update history to reflect merge of #5698 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2f74dfd652f..c923f1bf981 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * Corrected date for version 3.4.0 (#5842)
   * Add the correct year to the 3.4.0 release date (#5858)
   * Add documentation about order of interpretation (#5834)
+  * Documentation on how to build navigation (#5698)
 
 ### Bug Fixes
 

From f7d1a9c9996ba9b3a124ba38637cdc04fe39c3f9 Mon Sep 17 00:00:00 2001
From: jekylltools 
Date: Tue, 28 Feb 2017 17:32:40 -0800
Subject: [PATCH 1978/4996] update plugin URL to reflect repo move

---
 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 a0c61cd3f58..4c09d2275f3 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -865,7 +865,7 @@ LESS.js files during generation.
 - [jekyll-figure](https://github.com/paulrobertlloyd/jekyll-figure): A liquid tag for Jekyll that generates `
    ` elements.
 - [Jekyll Video Embed](https://github.com/eug/jekyll-video-embed): It provides several tags to easily embed videos (e.g. Youtube, Vimeo, UStream and Ted Talks)
 - [jekyll-i18n_tags](https://github.com/KrzysiekJ/jekyll-i18n_tags): Translate your templates.
-- [Jekyll Ideal Image Slider](https://github.com/xHN35RQ/jekyll-ideal-image-slider): Liquid tag plugin to create image sliders using [Ideal Image Slider](https://github.com/gilbitron/Ideal-Image-Slider).
+- [Jekyll Ideal Image Slider](https://github.com/jekylltools/jekyll-ideal-image-slider): Liquid tag plugin to create image sliders using [Ideal Image Slider](https://github.com/gilbitron/Ideal-Image-Slider).
 - [Jekyll Tags List Plugin](https://github.com/crispgm/jekyll-tags-list-plugin): A Liquid tag plugin that creates tags list in specific order.
 - [Jekyll Maps](https://github.com/ayastreb/jekyll-maps) by [Anatoliy Yastreb](https://github.com/ayastreb): A Jekyll plugin to easily embed maps with filterable locations.
 - [Jekyll Cloudinary](https://nhoizey.github.io/jekyll-cloudinary/) by [Nicolas Hoizey](https://nicolas-hoizey.com/): a Jekyll plugin adding a Liquid tag to ease the use of Cloudinary for responsive images in your Markdown/Kramdown posts.

From 0300a7017b8e69d86d267d1e252d561b34906e77 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 28 Feb 2017 21:21:27 -0500
Subject: [PATCH 1979/4996] Update history to reflect merge of #5916 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c923f1bf981..6b2b3561e4c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -18,6 +18,7 @@
   * Fixed tutorial for publishing gem to include repo. (#5900)
   * update broken links (#5905)
   * Fix typo in contribution information (#5910)
+  * update plugin repo URL to reflect repo move (#5916)
 
 ### Development Fixes
 

From 8a0c0727eab4c39ad7ee160100ac939adb152649 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 1 Mar 2017 21:38:55 -0500
Subject: [PATCH 1980/4996] Failing test: abbreviated post dates are no longer
 read.

This is a regression introduced by https://github.com/jekyll/jekyll/pull/5609.
---
 test/source/_posts/2017-2-5-i-dont-like-zeroes.md | 5 +++++
 test/test_generated_site.rb                       | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 test/source/_posts/2017-2-5-i-dont-like-zeroes.md

diff --git a/test/source/_posts/2017-2-5-i-dont-like-zeroes.md b/test/source/_posts/2017-2-5-i-dont-like-zeroes.md
new file mode 100644
index 00000000000..201b96dc745
--- /dev/null
+++ b/test/source/_posts/2017-2-5-i-dont-like-zeroes.md
@@ -0,0 +1,5 @@
+---
+foo: barj
+---
+I have an abbreviated date. Instead of "2017-02-05", I am instead "2017-2-5".
+Zeros have always seemed superfluous.
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 3a520b24cc3..debb4ceb8c0 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -11,7 +11,7 @@ class TestGeneratedSite < JekyllUnitTest
     end
 
     should "ensure post count is as expected" do
-      assert_equal 51, @site.posts.size
+      assert_equal 52, @site.posts.size
     end
 
     should "insert site.posts into the index" do
@@ -48,6 +48,11 @@ class TestGeneratedSite < JekyllUnitTest
       assert_exist dest_dir("dynamic_file.php")
     end
 
+    should "include a post with a abbreviated dates" do
+      refute_nil -1, @site.posts.index { |post| post.relative_path == "_posts/2017-2-5-i-dont-like-zeroes.md" }
+      assert_exist dest_dir("2017", "02", "05", "i-dont-like-zeroes.html")
+    end
+
     should "print a nice list of static files" do
       time_regexp = "\\d+:\\d+"
       #

From 4085e29f80fbb760cd2050a9a8cc93bc18dbb6ee Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 1 Mar 2017 21:39:23 -0500
Subject: [PATCH 1981/4996] Document::DATE_FILENAME_MATCHER: allow abbreviated
 dates in post filenames

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

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index fecd58285c3..386683d6d5a 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -9,7 +9,7 @@ class Document
 
     YAML_FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m
     DATELESS_FILENAME_MATCHER = %r!^(?:.+/)*(.*)(\.[^.]+)$!
-    DATE_FILENAME_MATCHER = %r!^(?:.+/)*(\d{4}-\d{2}-\d{2})-(.*)(\.[^.]+)$!
+    DATE_FILENAME_MATCHER = %r!^(?:.+/)*(\d{2,4}-\d{1,2}-\d{1,2})-(.*)(\.[^.]+)$!
 
     # Create a new Document.
     #

From ca87c99a3c6bc4324741c8cba31dfe2981881281 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 1 Mar 2017 22:08:21 -0500
Subject: [PATCH 1982/4996] Fix fmt issues in test for 'include a post with a
 abbreviated dates'

---
 test/test_generated_site.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index debb4ceb8c0..e7cc52cb5f0 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -49,7 +49,9 @@ class TestGeneratedSite < JekyllUnitTest
     end
 
     should "include a post with a abbreviated dates" do
-      refute_nil -1, @site.posts.index { |post| post.relative_path == "_posts/2017-2-5-i-dont-like-zeroes.md" }
+      refute_nil @site.posts.index { |post|
+        post.relative_path == "_posts/2017-2-5-i-dont-like-zeroes.md"
+      }
       assert_exist dest_dir("2017", "02", "05", "i-dont-like-zeroes.html")
     end
 

From 3e4dbc83e3efb25edf47ffcfe798611c34a7a267 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 1 Mar 2017 22:36:25 -0500
Subject: [PATCH 1983/4996] Attempt to alleviate strange Windows encoding
 error.

Error:
TestGeneratedSite#test_: generated sites should render latest post's content. :
Encoding::CompatibilityError: incompatible character encodings: IBM437 and UTF-8
    C:/projects/jekyll/test/test_generated_site.rb:22:in `include?'
    C:/projects/jekyll/test/test_generated_site.rb:22:in `block (2 levels) in '
    C:/projects/jekyll/test/test_generated_site.rb:34:in `instance_exec'
    C:/projects/jekyll/test/test_generated_site.rb:34:in `block in create_test_from_should_hash'
---
 test/source/_posts/2017-2-5-i-dont-like-zeroes.md | 2 +-
 test/test_generated_site.rb                       | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/source/_posts/2017-2-5-i-dont-like-zeroes.md b/test/source/_posts/2017-2-5-i-dont-like-zeroes.md
index 201b96dc745..95e11f12c00 100644
--- a/test/source/_posts/2017-2-5-i-dont-like-zeroes.md
+++ b/test/source/_posts/2017-2-5-i-dont-like-zeroes.md
@@ -1,5 +1,5 @@
 ---
-foo: barj
+foo: bar
 ---
 I have an abbreviated date. Instead of "2017-02-05", I am instead "2017-2-5".
 Zeros have always seemed superfluous.
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index e7cc52cb5f0..41e7c3a1f5d 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -7,7 +7,10 @@ class TestGeneratedSite < JekyllUnitTest
 
       @site = fixture_site
       @site.process
-      @index = File.read(dest_dir("index.html"))
+      @index = File.read(
+        dest_dir("index.html"),
+        Utils.merged_file_read_opts(@site, {})
+      )
     end
 
     should "ensure post count is as expected" do

From 56dfe18c5dd2ac769670480600e5e1c63ecdac8d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 2 Mar 2017 12:32:15 -0500
Subject: [PATCH 1984/4996] Update history to reflect merge of #5920 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6b2b3561e4c..f3a55f689ef 100644
--- a/History.markdown
+++ b/History.markdown
@@ -35,6 +35,7 @@
 
   * Exclude Gemfile by default (#5860)
   * Convertible#validate_permalink!: ensure the return value of data["permalink"] is a string before asking if it is empty (#5878)
+  * Allow abbreviated post dates (#5920)
 
 ## 3.4.0 / 2017-01-27
 

From 47f54dbecaf15fe485c9dc345505f3f3cb1348ea Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 2 Mar 2017 12:39:02 -0500
Subject: [PATCH 1985/4996] Add script/backport-pr

---
 script/backport-pr | 81 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100755 script/backport-pr

diff --git a/script/backport-pr b/script/backport-pr
new file mode 100755
index 00000000000..fa0df835ea1
--- /dev/null
+++ b/script/backport-pr
@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+# This script is pulled from https://github.com/git-lfs/git-lfs/blob/master/script/backport-pr
+# Many thanks, git-lfs team!
+#
+# Backports a PR into a release branch:
+#
+#   # backport PR #123 into 1.1-stable-backport-1023
+#   $ git checkout master
+#   $ git pull
+#   $ script/backport-pr 1.1 1023
+
+usage() {
+  echo "usage: $0  "
+  echo "example: $0 3.4 5623"
+}
+
+if test -z "$1"; then
+  echo "fatal: no minor release version, e.g. '3.4'" > /dev/stderr
+  usage
+  exit 1
+fi
+
+if test -z "$2"; then
+  echo "fatal: no pull request number, e.g. '5623'" > /dev/stderr
+  usage
+  exit 1
+fi
+
+relversion="v$1.x"
+relbranch="$1-stable"
+pr="$2"
+prbranch="$relbranch-backport-$pr"
+pullsurl="https://api.github.com/repos/jekyll/jekyll/pulls"
+prurl="https://api.github.com/repos/jekyll/jekyll/pulls/$pr"
+prjson="$(curl -n $pullsurl/$pr 2>/dev/null)"
+headref="$(echo $prjson | jq -r -e ".head.ref")"
+[ "$?" -ne 0 ] && {
+  echo "PR #$pr is invalid."
+  exit 1
+}
+prtitle="$(echo $prjson | jq -r ".title" | sed "s/\"/'/g")"
+
+git checkout -q -f $relbranch
+git clean -q -fdx
+git pull -q
+git checkout -q -f -B $prbranch
+
+commit=`git log -1 --pretty=%H "--grep=Merge pull request #$pr" "--grep=Merge branch '.*$headref'" master`
+
+echo "Backporting:\n"
+
+git log -1 $commit
+
+conflicts=""
+
+git cherry-pick -x --allow-empty -m1 $commit &> /dev/null || {
+  unmerged=$(git ls-files --unmerged --stage | cut -f 2 -d$'\t' | uniq)
+  conflicts="\n\nConflicting files:"
+  for file in $unmerged; do
+    git add "$file"
+    conflicts="$conflicts\n- $file"
+  done
+  git commit -q --no-edit
+}
+
+commitmsg="Backport $headref from #$pr to $relbranch"
+if [ "$conflicts" ]; then
+  commitmsg="$commitmsg [merge conflicts]"
+fi
+
+git commit -q --allow-empty --amend -m "$commitmsg"
+git push -q -f origin $prbranch
+git checkout -q -f $relbranch
+git branch -q -D $prbranch
+
+curl -in $pullsurl -d "{
+  \"title\": \"Backport #$pr for $relversion: $prtitle\",
+  \"head\": \"$prbranch\",
+  \"base\": \"$relbranch\",
+  \"body\": \"This backports #$pr.$conflicts\"
+}" 2>/dev/null

From e2cfd7cb4c25b9f6e5f815a41d962c11d8919c98 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 2 Mar 2017 12:47:43 -0500
Subject: [PATCH 1986/4996] rake/release: allow releases from *-stable
 branches.

---
 rake/release.rake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rake/release.rake b/rake/release.rake
index 832b5bb33de..e9b638457ab 100644
--- a/rake/release.rake
+++ b/rake/release.rake
@@ -6,7 +6,8 @@
 
 desc "Release #{name} v#{version}"
 task :release => :build do
-  unless `git branch` =~ %r!^\* master$!
+  current_branch = `git branch`.to_s.strip.match(%r!^\* (.+)$!)[1]
+  unless current_branch == "master" || current_branch.end_with?("-stable")
     puts "You must be on the master branch to release!"
     exit!
   end

From ac727f22a35af4665bf6ee1d0e413c22471c458b Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 2 Mar 2017 12:49:54 -0500
Subject: [PATCH 1987/4996] travis: build *-stable branches.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 3a6ef68bb67..e88878de0e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ branches:
   only:
     - master
     - themes
+    - /*-stable$/
 
 notifications:
   slack:

From 1fbca40f0b4c1dc94a9deeeb57cff6505dd243da Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 2 Mar 2017 12:50:36 -0500
Subject: [PATCH 1988/4996] appveyor: build *-stable branches.

---
 appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yml b/appveyor.yml
index 2fe407f4cd6..224770f8373 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,6 +6,7 @@ branches:
   only:
     - master
     - themes
+    - /*-stable$/
 
 build: off
 

From fa9a80b15f9e206c19b1626ea52c8ee6ccc9b760 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 2 Mar 2017 12:56:20 -0500
Subject: [PATCH 1989/4996] You never really know what 'regexp support' means
 until you break it.

---
 .travis.yml  | 2 +-
 appveyor.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e88878de0e5..36f2d6ff160 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ branches:
   only:
     - master
     - themes
-    - /*-stable$/
+    - /*-stable/
 
 notifications:
   slack:
diff --git a/appveyor.yml b/appveyor.yml
index 224770f8373..d03507d166f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,7 +6,7 @@ branches:
   only:
     - master
     - themes
-    - /*-stable$/
+    - /*-stable/
 
 build: off
 

From 97375b38c7a08eaf9c0469ae3a07dc0d78c5f66c Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 2 Mar 2017 12:59:34 -0500
Subject: [PATCH 1990/4996] Appveyor couldn't possibly support what it says it
 does in the docs.

https://ci.appveyor.com/project/jekyll/jekyll/build/1.0.1402
---
 appveyor.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index d03507d166f..2fe407f4cd6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,7 +6,6 @@ branches:
   only:
     - master
     - themes
-    - /*-stable/
 
 build: off
 

From 29ced3764152767fe259b7dc2ae0dfbcb534ee2a Mon Sep 17 00:00:00 2001
From: Pedro Lamas 
Date: Thu, 2 Mar 2017 21:54:51 +0000
Subject: [PATCH 1991/4996] Navigation has been moved out from docs

Change introduced in a05e64c9d360e8357dc9c23a76656d231f0665dd has broken the bottom navigation as the page no longer exists, so I removed it from docs.yml
---
 docs/_data/docs.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/_data/docs.yml b/docs/_data/docs.yml
index 8b1d9c4813c..bb9d3b14c74 100644
--- a/docs/_data/docs.yml
+++ b/docs/_data/docs.yml
@@ -26,7 +26,6 @@
   - includes
   - permalinks
   - pagination
-  - navigation
   - plugins
   - themes
   - extras

From 9b91b248ab9ec1efac57c64db48cb357293ec344 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 2 Mar 2017 12:48:31 -0500
Subject: [PATCH 1992/4996] Release :gem: 3.4.1

---
 History.markdown        | 4 ++++
 docs/_docs/history.md   | 6 ++++++
 docs/latest_version.txt | 2 +-
 lib/jekyll/version.rb   | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/History.markdown b/History.markdown
index f3a55f689ef..66a2236d2fb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -37,6 +37,10 @@
   * Convertible#validate_permalink!: ensure the return value of data["permalink"] is a string before asking if it is empty (#5878)
   * Allow abbreviated post dates (#5920)
 
+## 3.4.1 / 2017-03-02
+
+  * Backport #5920 for v3.4.x: Allow abbreviated post dates (#5924)
+
 ## 3.4.0 / 2017-01-27
 
 ### Minor Enhancements
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 7d96660a389..acc7e1cfeda 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,12 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.4.1 / 2017-03-02
+{: #v3-4-1}
+
+- Backport [#5920]({{ site.repository }}/issues/5920) for v3.4.x: Allow abbreviated post dates ([#5924]({{ site.repository }}/issues/5924))
+
+
 ## 3.4.0 / 2017-01-27
 {: #v3-4-0}
 
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index 18091983f59..47b322c971c 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.4.0
+3.4.1
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 4babc2082bc..20060c51c7c 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.4.0".freeze
+  VERSION = "3.4.1".freeze
 end

From 7b9e64af854e4e891a07979f8e613e8c604ebef0 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 3 Mar 2017 12:09:15 -0500
Subject: [PATCH 1993/4996] Release post for v3.4.1

---
 .../2017-03-02-jekyll-3-4-1-released.markdown | 106 ++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 docs/_posts/2017-03-02-jekyll-3-4-1-released.markdown

diff --git a/docs/_posts/2017-03-02-jekyll-3-4-1-released.markdown b/docs/_posts/2017-03-02-jekyll-3-4-1-released.markdown
new file mode 100644
index 00000000000..c90e7cfb1b9
--- /dev/null
+++ b/docs/_posts/2017-03-02-jekyll-3-4-1-released.markdown
@@ -0,0 +1,106 @@
+---
+title: 'Jekyll 3.4.1, or "Unintended Consequences"'
+date: 2017-03-02 14:20:26 -0500
+author: parkr
+version: 3.4.1
+categories: [release]
+---
+
+Conformity is a confounding thing.
+
+We write tests to ensure that a piece of functionality that works today
+will work tomorrow, as further modifications are made to the codebase. This
+is a principle of modern software development: every change must have a
+test to guard against regressions to the functionality implemented by that
+change.
+
+And yet, occasionally, our very best efforts to test functionality will be
+thwarted. This is because of how our code produces unintended
+functionality, which naturally goes untested.
+
+In our documentation, we tell users to name their posts with the following
+format:
+
+```text
+YYYY-MM-DD-title.extension
+```
+
+That format specifies exactly four numbers for the year, e.g. 2017, two
+letters for the month, e.g. 03, and two letters for the day, e.g. 02. To
+match this, we had the following regular expression:
+
+```ruby
+%r!^(?:.+/)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$!
+```
+
+You might already see the punchline. While our documentation specifies the
+exact number of numbers that is required for each section of the date, our
+regular expression does not enforce this precision. What happens if a user
+doesn't conform to our documentation?
+
+We recently [received a bug report](https://github.com/jekyll/jekyll/issues/5603)
+that detailed how the following file was considered a post:
+
+```text
+84093135-42842323-42000001-b890-136270f7e5f1.md
+```
+
+Of course! It matches the above regular expression, but doesn't satisfy
+other requirements about those numbers being a valid date (unless you're
+living in a world that has 43 million months, and 42 million (and one)
+days). So, we [modified the regular expression to match our
+documentation](https://github.com/jekyll/jekyll/pull/5609):
+
+```ruby
+%r!^(?:.+/)*(\d{4}-\d{2}-\d{2})-(.*)(\.[^.]+)$!
+```
+
+Our tests all passed and we were properly excluding this crazy date with 43
+million months and days. This change shipped in Jekyll v3.4.0 and all was
+well.
+
+Well, not so much.
+
+A very common way to specify the month of February is `2`. This is true for
+all single-digit months and days of the month. Notice anything about our
+first regular expression versus our second? The second regular expression
+imposes a **minimum**, as well as maximum, number of digits. This change
+made Jekyll ignore dates with single-digit days and months.
+
+The first eight years of Jekyll's existence had allowed single-digit days
+and months due to an imprecise regular expression. For some people, their
+entire blog was missing, and there were no errors that told them why.
+
+After receiving a few bug reports, it became clear what had happened.
+Unintended functionality of the last eight years had been broken. Thus,
+v3.4.0 was broken for a non-negligible number of sites. With a test site
+in-hand from @andrewbanchich, I tracked it down to this regular expression
+and [reintroduced](https://github.com/jekyll/jekyll/pull/5920) a proper
+minimum number of digits for each segment:
+
+```ruby
+%r!^(?:.+/)*(\d{2,4}-\d{1,2}-\d{1,2})-(.*)(\.[^.]+)$!
+```
+
+And, I wrote a test.
+
+This change was quickly backported to v3.4.0 and here we are: releasing
+v3.4.1. It will fix the problem for all users who were using single-digit
+months and days.
+
+With this, I encourage all of you to look at your code for *unintended*
+functionality and make a judgement call: if it's allowed, *should it be*?
+If it should be allowed, make it *intended* functionality and test it! I
+know I'll be looking at my code with much greater scrutiny going forward,
+looking for unintended consequences.
+
+Many thanks to our Jekyll affinity team captains who helped out, including
+@pathawks, @pnn, and @DirtyF. Thanks, too, to @ashmaroli for reviewing my
+change with an eye for consistency and precision. This was certainly a team
+effort.
+
+We hope Jekyll v3.4.1 brings your variable-digit dates back to their
+previous glory. We certainly won't let that unintended functionality be
+unintended any longer.
+
+As always, Happy Jekylling!

From ea91864af89662d33e14040c9f8cdd573481977d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 3 Mar 2017 15:38:25 -0500
Subject: [PATCH 1994/4996] Update history to reflect merge of #5927 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 66a2236d2fb..15636bb04db 100644
--- a/History.markdown
+++ b/History.markdown
@@ -30,6 +30,7 @@
   * Add the correct year to the 3.4.0 release date (#5858)
   * Add documentation about order of interpretation (#5834)
   * Documentation on how to build navigation (#5698)
+  * Navigation has been moved out from docs (#5927)
 
 ### Bug Fixes
 

From 635e3365cc56421e7a9cfcb3369094ec7e7c8c58 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sat, 4 Mar 2017 23:29:04 +0530
Subject: [PATCH 1995/4996] appease classifier-reborn

---
 test/source/_posts/2010-01-16-override-data.markdown | 2 ++
 test/source/_posts/2011-04-12-text-extension.text    | 1 +
 test/source/_posts/2013-08-01-mkdn-extension.mkdn    | 1 +
 test/source/_posts/2014-11-24-Rmd-extension.Rmd      | 1 +
 test/source/_posts/2015-12-27-extra-spaces.markdown  | 2 ++
 5 files changed, 7 insertions(+)

diff --git a/test/source/_posts/2010-01-16-override-data.markdown b/test/source/_posts/2010-01-16-override-data.markdown
index 5b1a95c4bda..e5106488d32 100644
--- a/test/source/_posts/2010-01-16-override-data.markdown
+++ b/test/source/_posts/2010-01-16-override-data.markdown
@@ -2,3 +2,5 @@
 date: 2010-01-10 13:07:09
 tags: A string
 ---
+
+Best **post** ever
diff --git a/test/source/_posts/2011-04-12-text-extension.text b/test/source/_posts/2011-04-12-text-extension.text
index e69de29bb2d..6b4ef010ad1 100644
--- a/test/source/_posts/2011-04-12-text-extension.text
+++ b/test/source/_posts/2011-04-12-text-extension.text
@@ -0,0 +1 @@
+Best **post** ever
diff --git a/test/source/_posts/2013-08-01-mkdn-extension.mkdn b/test/source/_posts/2013-08-01-mkdn-extension.mkdn
index e69de29bb2d..6b4ef010ad1 100644
--- a/test/source/_posts/2013-08-01-mkdn-extension.mkdn
+++ b/test/source/_posts/2013-08-01-mkdn-extension.mkdn
@@ -0,0 +1 @@
+Best **post** ever
diff --git a/test/source/_posts/2014-11-24-Rmd-extension.Rmd b/test/source/_posts/2014-11-24-Rmd-extension.Rmd
index e69de29bb2d..6b4ef010ad1 100644
--- a/test/source/_posts/2014-11-24-Rmd-extension.Rmd
+++ b/test/source/_posts/2014-11-24-Rmd-extension.Rmd
@@ -0,0 +1 @@
+Best **post** ever
diff --git a/test/source/_posts/2015-12-27-extra-spaces.markdown b/test/source/_posts/2015-12-27-extra-spaces.markdown
index 595a9cd9afe..d8f785b06f5 100644
--- a/test/source/_posts/2015-12-27-extra-spaces.markdown
+++ b/test/source/_posts/2015-12-27-extra-spaces.markdown
@@ -1,3 +1,5 @@
 ---  
 extra: spaces
 ---
+
+Best **post** ever

From 3e2875f39c1cfb9162a01f4883739d8a95423451 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 6 Mar 2017 20:58:05 -0500
Subject: [PATCH 1996/4996] Update history to reflect merge of #5820 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 15636bb04db..03c163d5fbc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -31,6 +31,7 @@
   * Add documentation about order of interpretation (#5834)
   * Documentation on how to build navigation (#5698)
   * Navigation has been moved out from docs (#5927)
+  * Make links in sidebar for current page more prominent (#5820)
 
 ### Bug Fixes
 

From 085b5f56f302a22a90426b9f7ab69a07b69b62d0 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 6 Mar 2017 20:58:53 -0500
Subject: [PATCH 1997/4996] Update history to reflect merge of #5934 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 03c163d5fbc..42ad3bc4f80 100644
--- a/History.markdown
+++ b/History.markdown
@@ -23,6 +23,7 @@
 ### Development Fixes
 
   * [Rubocop] add missing comma (#5835)
+  * Appease classifier-reborn (#5934)
 
 ### Site Enhancements
 

From bfb6341339dc62c228a1cccf6d080766c24f7624 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 6 Mar 2017 20:59:58 -0500
Subject: [PATCH 1998/4996] Update history to reflect merge of #5926 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 42ad3bc4f80..1c12057d461 100644
--- a/History.markdown
+++ b/History.markdown
@@ -24,6 +24,7 @@
 
   * [Rubocop] add missing comma (#5835)
   * Appease classifier-reborn (#5934)
+  * Allow releases & development on *-stable branches (#5926)
 
 ### Site Enhancements
 

From 67a7c22defd8e342a8c900dd858335e259a35970 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 6 Mar 2017 21:00:25 -0500
Subject: [PATCH 1999/4996] Fix typo in backport-pr

---
 script/backport-pr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/backport-pr b/script/backport-pr
index fa0df835ea1..5ef6c4dec7a 100755
--- a/script/backport-pr
+++ b/script/backport-pr
@@ -4,7 +4,7 @@
 #
 # Backports a PR into a release branch:
 #
-#   # backport PR #123 into 1.1-stable-backport-1023
+#   # backport PR #1023 into 1.1-stable-backport-1023
 #   $ git checkout master
 #   $ git pull
 #   $ script/backport-pr 1.1 1023

From 31a0aef59487893ad78bf50b203545682fec331a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 6 Mar 2017 21:00:53 -0500
Subject: [PATCH 2000/4996] Update history to reflect merge of #5925 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1c12057d461..37da6256627 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * [Rubocop] add missing comma (#5835)
   * Appease classifier-reborn (#5934)
   * Allow releases & development on *-stable branches (#5926)
+  * Add script/backport-pr (#5925)
 
 ### Site Enhancements
 

From ea4a2fd57b3f0cc48823710b47cacef269b5104c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 6 Mar 2017 21:05:06 -0500
Subject: [PATCH 2001/4996] Update history to reflect merge of #5903 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 37da6256627..c7ef4aa88ee 100644
--- a/History.markdown
+++ b/History.markdown
@@ -41,6 +41,7 @@
   * Exclude Gemfile by default (#5860)
   * Convertible#validate_permalink!: ensure the return value of data["permalink"] is a string before asking if it is empty (#5878)
   * Allow abbreviated post dates (#5920)
+  * Remove dependency on include from default about.md (#5903)
 
 ## 3.4.1 / 2017-03-02
 

From d7822aba33457b538a7d80a06303c15bd1d99ebf Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 9 Mar 2017 15:36:56 -0500
Subject: [PATCH 2002/4996] Release :gem: 3.4.2

---
 rake/release.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rake/release.rake b/rake/release.rake
index e9b638457ab..9d9220a49a7 100644
--- a/rake/release.rake
+++ b/rake/release.rake
@@ -13,7 +13,7 @@ task :release => :build do
   end
   sh "git commit --allow-empty -m 'Release :gem: #{version}'"
   sh "git tag v#{version}"
-  sh "git push origin master"
+  sh "git push origin #{current_branch}"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
 end

From 511481e626db0beba1b0b847d2ab109f8e5edbf8 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 9 Mar 2017 15:36:10 -0500
Subject: [PATCH 2003/4996] Release :gem: 3.4.2

---
 History.markdown        | 5 +++++
 docs/_docs/history.md   | 7 +++++++
 docs/latest_version.txt | 2 +-
 lib/jekyll/version.rb   | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/History.markdown b/History.markdown
index c7ef4aa88ee..a4c99c20258 100644
--- a/History.markdown
+++ b/History.markdown
@@ -43,6 +43,11 @@
   * Allow abbreviated post dates (#5920)
   * Remove dependency on include from default about.md (#5903)
 
+## 3.4.2 / 2017-03-09
+
+  * Backport #5871 for v3.4.x: Convert StaticFile liquid representation to
+    a Drop & add front matter defaults support to StaticFiles (#5940)
+
 ## 3.4.1 / 2017-03-02
 
   * Backport #5920 for v3.4.x: Allow abbreviated post dates (#5924)
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index acc7e1cfeda..3c821edad51 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,13 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.4.2 / 2017-03-09
+{: #v3-4-2}
+
+- Backport [#5871]({{ site.repository }}/issues/5871) for v3.4.x: Convert StaticFile liquid representation to
+    a Drop & add front matter defaults support to StaticFiles ([#5940]({{ site.repository }}/issues/5940))
+
+
 ## 3.4.1 / 2017-03-02
 {: #v3-4-1}
 
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index 47b322c971c..4d9d11cf505 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.4.1
+3.4.2
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 20060c51c7c..fc43a4c354a 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.4.1".freeze
+  VERSION = "3.4.2".freeze
 end

From b3725e202eb7c5ff838da434384f166f34c62338 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 9 Mar 2017 15:41:33 -0500
Subject: [PATCH 2004/4996] Fix typo in CONTRIBUTING doc.

---
 .github/CONTRIBUTING.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CONTRIBUTING.markdown b/.github/CONTRIBUTING.markdown
index 6a239fc7452..14442f6dc55 100644
--- a/.github/CONTRIBUTING.markdown
+++ b/.github/CONTRIBUTING.markdown
@@ -28,7 +28,7 @@ Whether you're a developer, a designer, or just a Jekyll devotee, there are lots
 
 * The more information, the better. Make judicious use of the pull request body. Describe what changes were made, why you made them, and what impact they will have for users.
 
-* Pull request are easy and fun. If this is your first pull request, it may help to [understand GitHub Flow](https://guides.github.com/introduction/flow/).
+* Pull requests are easy and fun. If this is your first pull request, it may help to [understand GitHub Flow](https://guides.github.com/introduction/flow/).
 
 * If you're submitting a code contribution, be sure to read the [code contributions](#code-contributions) section below.
 

From 266d1255505d15c28f78eeccabe1a990ef915c74 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 9 Mar 2017 16:06:16 -0500
Subject: [PATCH 2005/4996] Add v3.4.2 release post

---
 .../2017-03-09-jekyll-3-4-2-released.markdown | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 docs/_posts/2017-03-09-jekyll-3-4-2-released.markdown

diff --git a/docs/_posts/2017-03-09-jekyll-3-4-2-released.markdown b/docs/_posts/2017-03-09-jekyll-3-4-2-released.markdown
new file mode 100644
index 00000000000..6493d933bf5
--- /dev/null
+++ b/docs/_posts/2017-03-09-jekyll-3-4-2-released.markdown
@@ -0,0 +1,51 @@
+---
+title: 'Jekyll 3.4.2 Released'
+date: 2017-03-09 15:41:57 -0500
+author: parkr
+version: 3.4.2
+categories: [release]
+---
+
+Another one-PR patch update, though without the same [lessons as for the
+previous release]({% link _posts/2017-03-02-jekyll-3-4-1-released.markdown %}).
+
+This release includes a fairly critical change for a number of plugins:
+**static files now respect front matter defaults**.
+
+You might be asking yourself: "why would static files, files that are
+static files explicitly because they *don't* have YAML front matter, want
+to respect YAML front matter?" That's a great question. Let me illustrate
+with an example.
+
+Let's look at `jekyll-sitemap`. This plugin generates a list of documents,
+pages, and static files, and some metadata for them in an XML file for a
+Google/Yahoo/Bing/DuckDuckGo crawler to consume. If you don't want a given
+file in this list, you set `sitemap: false` in the YAML front matter. But
+what about static files, which don't have YAML front matter? Before this
+release, they could not be excluded because they had no properties in YAML
+other than [the ones we explicitly assigned](https://github.com/jekyll/jekyll/blob/v3.4.1/lib/jekyll/static_file.rb#L98-L106).
+So if you had a PDF you didn't want to be in your sitemap, you couldn't use
+`jekyll-sitemap`.
+
+With this release, you can now set [front matter
+defaults](/docs/configuration/#front-matter-defaults) for static files:
+
+```yaml
+defaults:
+  -
+    scope:
+      path: "pdfs/"
+    values:
+      sitemap: false
+```
+
+Now, for every file in the Liquid `site.static_files` loop which is in the
+folder `pdfs/`, you'll see `sitemap` equal to `false`.
+
+Many thanks to @benbalter for coming up with the solution and ensuring
+sitemaps everywhere are filled with just the right content.
+
+As always, if you notice any bugs, please search the issues and file one if
+you can't find another related to your issue.
+
+Happy Jekylling!

From 754cd2f1b24372acbcfc0c32355dd90ba43b27a7 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 9 Mar 2017 16:12:32 -0500
Subject: [PATCH 2006/4996] Don't be so "doomsdayesque"

---
 docs/_posts/2017-03-09-jekyll-3-4-2-released.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_posts/2017-03-09-jekyll-3-4-2-released.markdown b/docs/_posts/2017-03-09-jekyll-3-4-2-released.markdown
index 6493d933bf5..40d591e5e7e 100644
--- a/docs/_posts/2017-03-09-jekyll-3-4-2-released.markdown
+++ b/docs/_posts/2017-03-09-jekyll-3-4-2-released.markdown
@@ -9,7 +9,7 @@ categories: [release]
 Another one-PR patch update, though without the same [lessons as for the
 previous release]({% link _posts/2017-03-02-jekyll-3-4-1-released.markdown %}).
 
-This release includes a fairly critical change for a number of plugins:
+This release includes a beneficial change for a number of plugins:
 **static files now respect front matter defaults**.
 
 You might be asking yourself: "why would static files, files that are

From 06223e510e270365cba2d015d75dd9541f10f58f Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sat, 11 Mar 2017 17:23:18 +0530
Subject: [PATCH 2007/4996] add a tutorial on serving custom Error 404 page

---
 docs/_tutorials/custom-404-page.md | 66 ++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 docs/_tutorials/custom-404-page.md

diff --git a/docs/_tutorials/custom-404-page.md b/docs/_tutorials/custom-404-page.md
new file mode 100644
index 00000000000..40bb3262752
--- /dev/null
+++ b/docs/_tutorials/custom-404-page.md
@@ -0,0 +1,66 @@
+---
+layout: tutorials
+permalink: /tutorials/custom-404-page/
+title: Custom 404 Page
+---
+
+You can easily serve custom 404 error pages with Jekyll to replace the default **Error 404 -- File Not Found** page displayed when one tries to access a broken link on your site.
+
+
+## On GitHub Pages
+
+Any `404.html` at the **root of your `_site` directory** will be served automatically by GitHub Pages and the local WEBrick development server.
+
+Simply add a `404.md` or `404.html` at the root of your site's source directory and include the YAML Front Matter data to use the theme's base layout.
+
+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.
+
+```
+---
+# example 404.md
+
+layout: default
+permalink: /404.html
+---
+
+# 404
+
+Page not found! :(
+```
+
+## Hosting on Apache Web Servers
+
+Apache Web Servers load a configuration file named [`.htaccess`](http://www.htaccess-guide.com/) that modifies the functionality of these servers.
+
+Simply add the following to your `.htaccess` file.
+
+```
+ErrorDocument 404 /404.html
+```
+
+With an `.htaccess` file, you have the freedom to place your error page within a subdirectory.
+
+```
+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). 
+
+
+## Hosting on Nginx server
+
+The procedure is just as simple as configuring Apache servers, but slightly different.
+
+Add the following to the ngnix configuration file, `nginx.conf`, which is usually located inside `/etc/nginx/` or `/etc/nginx/conf/`:
+
+```
+server {
+  error_page 404 /404.html;
+  location  /404.html {
+    internal;
+  }
+}
+```
+The `location` directive prevents users from directly browsing the 404.html page.

From 6a7c49c5b89b5ecab63e77e930f305b7d41e7aee Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sat, 11 Mar 2017 17:42:03 +0530
Subject: [PATCH 2008/4996] update exclude array in configuration.md

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

diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index 79de5a98ffc..50750869674 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -603,7 +603,7 @@ collections:
 # Handling Reading
 safe:         false
 include:      [".htaccess"]
-exclude:      ["node_modules", "vendor/bundle/", "vendor/cache/", "vendor/gems/", "vendor/ruby/"]
+exclude:      ["Gemfile", "Gemfile.lock", node_modules", "vendor/bundle/", "vendor/cache/", "vendor/gems/", "vendor/ruby/"]
 keep_files:   [".git", ".svn"]
 encoding:     "utf-8"
 markdown_ext: "markdown,mkdown,mkdn,mkd,md"

From b87a4358ee97b94f45bb51298d6016035f68839a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 12 Mar 2017 06:02:06 -0400
Subject: [PATCH 2009/4996] Update history to reflect merge of #5947 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a4c99c20258..cb6f447dc9b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
   * update broken links (#5905)
   * Fix typo in contribution information (#5910)
   * update plugin repo URL to reflect repo move (#5916)
+  * Update exclude array in configuration.md (#5947)
 
 ### Development Fixes
 
@@ -45,8 +46,7 @@
 
 ## 3.4.2 / 2017-03-09
 
-  * Backport #5871 for v3.4.x: Convert StaticFile liquid representation to
-    a Drop & add front matter defaults support to StaticFiles (#5940)
+  * Backport #5871 for v3.4.x: Convert StaticFile liquid representation to a Drop & add front matter defaults support to StaticFiles (#5940)
 
 ## 3.4.1 / 2017-03-02
 

From 4df6753109ed255895ffe3ca0e46f797f6ae6fb3 Mon Sep 17 00:00:00 2001
From: Lukasz Brodowski 
Date: Sun, 12 Mar 2017 14:22:16 -0700
Subject: [PATCH 2010/4996] Removed navigation paragraph

Removed the paragraph telling a user to visit the navigations page to learn how to build more robust navigation.

The permalink was broken since Navigation no longer exists and no other suitable substitute (closest being ./permalinks) fits the description.
---
 docs/_docs/datafiles.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/_docs/datafiles.md b/docs/_docs/datafiles.md
index a389a65887d..c0e109976c0 100644
--- a/docs/_docs/datafiles.md
+++ b/docs/_docs/datafiles.md
@@ -152,5 +152,3 @@ author: dave
 
 {% 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](../navigation).

From cf65d2cd8ed256d962f9c145ca53416c58d916b7 Mon Sep 17 00:00:00 2001
From: Lukasz Brodowski 
Date: Sun, 12 Mar 2017 14:55:47 -0700
Subject: [PATCH 2011/4996] Corrected permalink

Fixed the permalink to navigation page since it was moved to under tutorials.
---
 docs/_docs/datafiles.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/_docs/datafiles.md b/docs/_docs/datafiles.md
index c0e109976c0..671a32060b9 100644
--- a/docs/_docs/datafiles.md
+++ b/docs/_docs/datafiles.md
@@ -152,3 +152,5 @@ author: dave
 
 {% 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).

From 99775e4b5168d63dbac4b7f677a1fe07fac08f0b Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Mon, 13 Mar 2017 09:55:27 -0700
Subject: [PATCH 2012/4996] Fixed path in "Improve this page" link in Tutorials
 section

The path in the "Improve this page" link that is auto-generated in the Tutorials section had an incorrect parameter. This PR fixes it.
---
 docs/_layouts/tutorials.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_layouts/tutorials.html b/docs/_layouts/tutorials.html
index e3f7794bdd5..3850971c336 100644
--- a/docs/_layouts/tutorials.html
+++ b/docs/_layouts/tutorials.html
@@ -10,7 +10,7 @@
       
    
         
    
           
    
-              Improve this page
           
    
           
    {{ page.title }}
    

From 88ad56c9e0be3cd2332d30efd6a0f55477752285 Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Mon, 13 Mar 2017 09:58:02 -0700
Subject: [PATCH 2013/4996] Add link to order of interpretation tutorial in
 Tutorials nav

Added a link to the Order of interpretation tutorial into the Tutorials nav. This tutorial is published, just not linked.
---
 docs/_data/tutorials.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/_data/tutorials.yml b/docs/_data/tutorials.yml
index 73a0184a195..ad4f4e5c96b 100644
--- a/docs/_data/tutorials.yml
+++ b/docs/_data/tutorials.yml
@@ -2,7 +2,8 @@
   tutorials:
   - home
   - navigation
+  - orderofinterpretation
 
 #- title: Another section
 #  tutorials:
-#  - sample
\ No newline at end of file
+#  - sample

From 0f0ac6f586d26be761f1147c345442be8556111f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 14 Mar 2017 01:13:38 -0400
Subject: [PATCH 2014/4996] Update history to reflect merge of #5951 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index cb6f447dc9b..053e1ee52d2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -20,6 +20,7 @@
   * Fix typo in contribution information (#5910)
   * update plugin repo URL to reflect repo move (#5916)
   * Update exclude array in configuration.md (#5947)
+  * Fixed path in "Improve this page" link in Tutorials section (#5951)
 
 ### Development Fixes
 

From ec5b45cd7c1a2df1520ada1df9b235101ea11ba2 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 16 Mar 2017 07:54:13 -0500
Subject: [PATCH 2015/4996] Allow colons in `uri_escape` filter

Fixes #5954
---
 lib/jekyll/filters.rb | 2 +-
 test/test_filters.rb  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 0393ea241d6..3020bfbcb6b 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -152,7 +152,7 @@ def cgi_escape(input)
     #
     # Returns the escaped String.
     def uri_escape(input)
-      Addressable::URI.encode(input)
+      Addressable::URI.normalize_component(input)
     end
 
     # Replace any whitespace in the input string with a single space
diff --git a/test/test_filters.rb b/test/test_filters.rb
index d18b57e3ef3..898f7e3ed90 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -317,6 +317,11 @@ def select; end
       assert_equal "my%20things", @filter.uri_escape("my things")
     end
 
+    should "escape colon" do
+      assert_equal "foo:bar", @filter.uri_escape("foo:bar")
+      assert_equal "foo%20bar:baz", @filter.uri_escape("foo bar:baz")
+    end
+
     context "absolute_url filter" do
       should "produce an absolute URL from a page URL" do
         page_url = "/about/my_favorite_page/"

From 6bc9f71050be590478d1d47b1050f4dddb5471f7 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Thu, 16 Mar 2017 07:59:13 -0500
Subject: [PATCH 2016/4996] Rename test for clarity

---
 test/test_filters.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index 898f7e3ed90..782b5be984f 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -317,7 +317,7 @@ def select; end
       assert_equal "my%20things", @filter.uri_escape("my things")
     end
 
-    should "escape colon" do
+    should "allow colons in URI" do
       assert_equal "foo:bar", @filter.uri_escape("foo:bar")
       assert_equal "foo%20bar:baz", @filter.uri_escape("foo bar:baz")
     end

From 7b1841a78e8b88fdbec34e9732e24c8c81dfe25a Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 17 Mar 2017 16:19:19 +0530
Subject: [PATCH 2017/4996] Fix Appveyor with dst-aware cucumber steps

---
 features/site_configuration.feature | 10 +++++-----
 features/step_definitions.rb        | 24 ++++++++++++++++++++++++
 features/support/helpers.rb         | 11 +++++++++++
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/features/site_configuration.feature b/features/site_configuration.feature
index 3aace7946ef..cc6f01fbadd 100644
--- a/features/site_configuration.feature
+++ b/features/site_configuration.feature
@@ -172,12 +172,12 @@ Feature: Site configuration
         | entry2    | 2013-04-10 03:14 -0400 | post    | content for entry2. |
       When I run jekyll build
       Then I should get a zero exit status
-    And the _site directory should exist
+      And the _site directory should exist
       And I should see "Page Layout: 2" in "_site/index.html"
-      And I should see "Post Layout: 
    content for entry1.
    \n built at 2013-04-09T23:22:00-04:00" in "_site/2013/04/09/entry1.html" unless Windows
-      And I should see "Post Layout: 
    content for entry1.
    \n built at 2013-04-09T22:22:00-05:00" in "_site/2013/04/09/entry1.html" if on Windows
-      And I should see "Post Layout: 
    content for entry2.
    \n built at 2013-04-10T03:14:00-04:00" in "_site/2013/04/10/entry2.html" unless Windows
-      And I should see "Post Layout: 
    content for entry2.
    \n built at 2013-04-10T02:14:00-05:00" in "_site/2013/04/10/entry2.html" if on Windows
+      And I should see date "2013-04-09T23:22:00-04:00" in "_site/2013/04/09/entry1.html" unless Windows
+      And I should see date "2013-04-09T22:22:00-05:00" in "_site/2013/04/09/entry1.html" if on Windows
+      And I should see date "2013-04-10T03:14:00-04:00" in "_site/2013/04/10/entry2.html" unless Windows
+      And I should see date "2013-04-10T02:14:00-05:00" in "_site/2013/04/10/entry2.html" if on Windows
 
     Scenario: Generate proper dates with explicitly set timezone (different than posts' time)
       Given I have a _layouts directory
diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index 5d318a02f1e..bcbfcb9a362 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -246,6 +246,30 @@
 
 #
 
+Then(%r!^I should see date "(.*)" in "(.*)" unless Windows$!) do |text, file|
+  step %(the "#{file}" file should exist)
+  regexp = Regexp.new(text)
+  if Jekyll::Utils::Platforms.really_windows? && !dst_active?
+    expect(file_contents(file)).not_to match regexp
+  else
+    expect(file_contents(file)).to match regexp
+  end
+end
+
+#
+
+Then(%r!^I should see date "(.*)" in "(.*)" if on Windows$!) do |text, file|
+  step %(the "#{file}" file should exist)
+  regexp = Regexp.new(text)
+  if Jekyll::Utils::Platforms.really_windows? && !dst_active?
+    expect(file_contents(file)).to match regexp
+  else
+    expect(file_contents(file)).not_to match regexp
+  end
+end
+
+#
+
 Then(%r!^I should see exactly "(.*)" in "(.*)"$!) do |text, file|
   step %(the "#{file}" file should exist)
   expect(file_contents(file).strip).to eq text
diff --git a/features/support/helpers.rb b/features/support/helpers.rb
index 06d768fe547..5081d3f1aae 100644
--- a/features/support/helpers.rb
+++ b/features/support/helpers.rb
@@ -163,3 +163,14 @@ def seconds_agnostic_time(time)
   hour, minutes, = time.split(":")
   "#{hour}:#{minutes}"
 end
+
+# Helper method for Windows
+def dst_active?
+  config = Jekyll.configuration("quiet" => true)
+  ENV["TZ"] = config["timezone"]
+  dst = Time.now.isdst
+
+  # reset variable to default state on Windows
+  ENV["TZ"] = nil
+  dst
+end

From 336b488d70038a9b54ec9cd5e57c7edc0549bf62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Ku=C5=9B?= 
Date: Fri, 17 Mar 2017 16:18:52 +0100
Subject: [PATCH 2018/4996] Create buddyworks

Added description for configuring a Jekyll build using a free https://buddy.works project.
---
 docs/_docs/continuous-integration/buddyworks | 63 ++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 docs/_docs/continuous-integration/buddyworks

diff --git a/docs/_docs/continuous-integration/buddyworks b/docs/_docs/continuous-integration/buddyworks
new file mode 100644
index 00000000000..45daa1f2a50
--- /dev/null
+++ b/docs/_docs/continuous-integration/buddyworks
@@ -0,0 +1,63 @@
+---
+title: "BuddyWorks"
+---
+
+[BuddyWorks][0] is a [Docker][1]-based CI server that you can set up in 15-20 minutes to build, test, and deploy your Jekyll websites. It supports [GitHub][2], [Bitbucket][3], and [GitLab][4] repositories, can be installed on-premises or in cloud. The following guide will show you how to set up a free environment to build and test your Jekyll project.
+
+[0]: https://buddy.works
+[1]: https://www.docker.com/
+[2]: https://github.com
+[3]: https://https://bitbucket.org/
+[4]: https://gitlab.com
+
+## 1. Getting started
+
+1. Log in at  with your GitHub/Bitbucket account or email
+2. Choose your Git provider and select or push your Jekyll Project
+3. Create a new pipeline and set the trigger mode to 'On every push'
+4. Add the Jekyll action and save the pipeline
+
+## 2. How it works
+
+Whenever you make a push to the selected branch, the Jekyll action runs `jekyll build` in an isolated [Jekyll Docker image][0]. The output is generated to the `/filesystem` directory, and can be further deployed to FTP/SFTP and Cloud services. You can add your own commands, install additional packages, attach services, and run Selenium tests, as well as add other actions down the pipeline, eg. a Slack notification or an SSH script that will restart your server.
+
+![Jekyll Build](https://buddy.works/data/blog/_images/buddyworks-jekyll-small.png)
+
+[0]: https://hub.docker.com/r/jekyll/jekyll/
+
+## 3. Using YAML for configuration
+
+If you prefer configuration as code over GUI, you can generate `buddy.yml` that will create a pipeline with the Jekyll action once pushed to the repository:
+
+```ruby
+- pipeline: "Build and Deploy Jekyll site"
+  trigger_mode: "ON_EVERY_PUSH"
+  ref_name: "master"
+  actions:
+  - action: "Execute: jekyll build"
+    type: "BUILD"
+    docker_image_name: "jekyll/jekyll"
+    docker_image_tag: "latest"
+    execute_commands:
+    - "# Working directory with cloned repository: /srv/jekyll"
+    - "jekyll build"
+```
+
+## 4. Setting up on-premises server
+
+The self-hosted version of BuddyWorks can be installed on any type of server supporting Docker, including [Linux][1], [Mac][2], [AWS EC2][3], [DigitalOcean][4], and [Microsoft Azure][5].
+
+[0]: https://buddy.works/buddy-go
+[1]: https://buddy.works/knowledge/standalone/installation-linux
+[2]: https://buddy.works/knowledge/standalone/installation-mac-osx
+[3]: https://buddy.works/knowledge/standalone/installation-amazon-ec2
+[4]: https://buddy.works/knowledge/standalone/installation-digitalocean
+[5]: https://buddy.works/knowledge/standalone/installation-azure
+
+## 5. Questions?
+
+This entire guide is open-source. Go ahead and [edit it][0] if you want to expand it or have a fix or [ask for help][1] if you run into trouble and need assistance. BuddyWorks also has an [online community][2] for help.
+
+[0]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration/buddyworks.md
+[1]: https://jekyllrb.com/help/
+[2]: http://forum.buddy.works/

From be7fc8a2c4e9fa77ab6e367d55060cf07b353ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Ku=C5=9B?= 
Date: Fri, 17 Mar 2017 16:46:31 +0100
Subject: [PATCH 2019/4996] added extension + fixed line 15

---
 docs/_docs/continuous-integration/{buddyworks => buddyworks.md} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename docs/_docs/continuous-integration/{buddyworks => buddyworks.md} (97%)

diff --git a/docs/_docs/continuous-integration/buddyworks b/docs/_docs/continuous-integration/buddyworks.md
similarity index 97%
rename from docs/_docs/continuous-integration/buddyworks
rename to docs/_docs/continuous-integration/buddyworks.md
index 45daa1f2a50..5c845270f5a 100644
--- a/docs/_docs/continuous-integration/buddyworks
+++ b/docs/_docs/continuous-integration/buddyworks.md
@@ -12,7 +12,7 @@ title: "BuddyWorks"
 
 ## 1. Getting started
 
-1. Log in at  with your GitHub/Bitbucket account or email
+1. Log in at https://buddy.works with your GitHub/Bitbucket account or email
 2. Choose your Git provider and select or push your Jekyll Project
 3. Create a new pipeline and set the trigger mode to 'On every push'
 4. Add the Jekyll action and save the pipeline

From 9e55247dac8f463d60b53885572405857ae2e97f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Ku=C5=9B?= 
Date: Mon, 20 Mar 2017 11:59:25 +0100
Subject: [PATCH 2020/4996] fix in line 42

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

diff --git a/docs/_docs/continuous-integration/buddyworks.md b/docs/_docs/continuous-integration/buddyworks.md
index 5c845270f5a..7a3a7eee652 100644
--- a/docs/_docs/continuous-integration/buddyworks.md
+++ b/docs/_docs/continuous-integration/buddyworks.md
@@ -39,7 +39,7 @@ If you prefer configuration as code over GUI, you can generate `buddy.yml` that
     docker_image_name: "jekyll/jekyll"
     docker_image_tag: "latest"
     execute_commands:
-    - "# Working directory with cloned repository: /srv/jekyll"
+    - "chown jekyll:jekyll $WORKING_DIR"
     - "jekyll build"
 ```
 

From ddc9931c203f5cc84a8451ac684992bf3b82ce25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Ku=C5=9B?= 
Date: Mon, 20 Mar 2017 12:04:46 +0100
Subject: [PATCH 2021/4996] added (buddyworks) to ci list

This can only be approved once https://github.com/jekyll/jekyll/pull/5962 has been merged.
---
 docs/_docs/continuous-integration/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_docs/continuous-integration/index.md b/docs/_docs/continuous-integration/index.md
index 14c5c7490a4..a9a12267502 100644
--- a/docs/_docs/continuous-integration/index.md
+++ b/docs/_docs/continuous-integration/index.md
@@ -7,3 +7,4 @@ Continuous Integration (CI) enables you to publish your Jekyll generated website
 
 * [Travis CI](travis-ci)
 * [CircleCI](circleci)
+* [BuddyWorks](buddyworks)

From f93453368a91ab0df79c5389b30ebfb2d5cbf2f2 Mon Sep 17 00:00:00 2001
From: William Entriken 
Date: Mon, 20 Mar 2017 10:56:34 -0400
Subject: [PATCH 2022/4996] Prefer .yaml over .toml

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

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index b4bf7c5aba3..1e2ca01c7b1 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -137,7 +137,7 @@ def safe_load_file(filename)
         SafeYAML.load_file(filename) || {}
       else
         raise ArgumentError, "No parser for '#{filename}' is available.
-          Use a .toml or .y(a)ml file instead."
+          Use a .y(a)ml or .toml file instead."
       end
     end
 

From 428ff04b7f8009dcf594d102a1c6d919bf8dc17c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 20 Mar 2017 15:21:27 -0400
Subject: [PATCH 2023/4996] Update history to reflect merge of #5966 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 053e1ee52d2..f28c18e2332 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * Appease classifier-reborn (#5934)
   * Allow releases & development on *-stable branches (#5926)
   * Add script/backport-pr (#5925)
+  * Prefer .yaml over .toml (#5966)
 
 ### Site Enhancements
 

From 93f472d1eb8251762321cfcc3af5957fc61c7fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Ku=C5=9B?= 
Date: Tue, 21 Mar 2017 09:34:43 +0100
Subject: [PATCH 2024/4996] Update buddyworks.md

added unique links + minor text changes
---
 .../continuous-integration/buddyworks.md      | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/docs/_docs/continuous-integration/buddyworks.md b/docs/_docs/continuous-integration/buddyworks.md
index 7a3a7eee652..d33259dfe3b 100644
--- a/docs/_docs/continuous-integration/buddyworks.md
+++ b/docs/_docs/continuous-integration/buddyworks.md
@@ -2,12 +2,12 @@
 title: "BuddyWorks"
 ---
 
-[BuddyWorks][0] is a [Docker][1]-based CI server that you can set up in 15-20 minutes to build, test, and deploy your Jekyll websites. It supports [GitHub][2], [Bitbucket][3], and [GitLab][4] repositories, can be installed on-premises or in cloud. The following guide will show you how to set up a free environment to build and test your Jekyll project.
+[BuddyWorks][0] is a [Docker][1]-based CI server that you can set up in 15-20 minutes to build, test, and deploy your Jekyll websites. It supports [GitHub][2], [Bitbucket][3], and [GitLab][4] repositories, and can be installed on-premises or used in cloud. The following guide will show you how to set up a free environment to build and test your Jekyll project.
 
 [0]: https://buddy.works
 [1]: https://www.docker.com/
 [2]: https://github.com
-[3]: https://https://bitbucket.org/
+[3]: https://bitbucket.org/
 [4]: https://gitlab.com
 
 ## 1. Getting started
@@ -15,19 +15,19 @@ title: "BuddyWorks"
 1. Log in at https://buddy.works with your GitHub/Bitbucket account or email
 2. Choose your Git provider and select or push your Jekyll Project
 3. Create a new pipeline and set the trigger mode to 'On every push'
-4. Add the Jekyll action and save the pipeline
+4. Add and configure the Jekyll action and save the pipeline
 
 ## 2. How it works
 
-Whenever you make a push to the selected branch, the Jekyll action runs `jekyll build` in an isolated [Jekyll Docker image][0]. The output is generated to the `/filesystem` directory, and can be further deployed to FTP/SFTP and Cloud services. You can add your own commands, install additional packages, attach services, and run Selenium tests, as well as add other actions down the pipeline, eg. a Slack notification or an SSH script that will restart your server.
+Whenever you make a push to the selected branch, the Jekyll action runs `jekyll build` in an isolated [Jekyll Docker image][5]. The output is generated to the `/filesystem` directory, and can be further deployed to FTP/SFTP and IaaS services. You can add your own commands, install additional packages, attach services, and run Selenium tests, as well as add other actions down the pipeline, eg. a Slack notification or an SSH script that will restart your server.
 
 ![Jekyll Build](https://buddy.works/data/blog/_images/buddyworks-jekyll-small.png)
 
-[0]: https://hub.docker.com/r/jekyll/jekyll/
+[5]: https://hub.docker.com/r/jekyll/jekyll/
 
 ## 3. Using YAML for configuration
 
-If you prefer configuration as code over GUI, you can generate `buddy.yml` that will create a pipeline with the Jekyll action once pushed to the repository:
+If you prefer configuration as code over GUI, you can generate `buddy.yml` that will create a pipeline with the Jekyll action once you push it to the target branch:
 
 ```ruby
 - pipeline: "Build and Deploy Jekyll site"
@@ -45,19 +45,18 @@ If you prefer configuration as code over GUI, you can generate `buddy.yml` that
 
 ## 4. Setting up on-premises server
 
-The self-hosted version of BuddyWorks can be installed on any type of server supporting Docker, including [Linux][1], [Mac][2], [AWS EC2][3], [DigitalOcean][4], and [Microsoft Azure][5].
+The self-hosted version of BuddyWorks can be installed on any type of server supporting Docker, including [Linux][6], [Mac][7], [AWS EC2][8], [DigitalOcean][9], and [Microsoft Azure][10].
 
-[0]: https://buddy.works/buddy-go
-[1]: https://buddy.works/knowledge/standalone/installation-linux
-[2]: https://buddy.works/knowledge/standalone/installation-mac-osx
-[3]: https://buddy.works/knowledge/standalone/installation-amazon-ec2
-[4]: https://buddy.works/knowledge/standalone/installation-digitalocean
-[5]: https://buddy.works/knowledge/standalone/installation-azure
+[6]: https://buddy.works/knowledge/standalone/installation-linux
+[7]: https://buddy.works/knowledge/standalone/installation-mac-osx
+[8]: https://buddy.works/knowledge/standalone/installation-amazon-ec2
+[9]: https://buddy.works/knowledge/standalone/installation-digitalocean
+[10]: https://buddy.works/knowledge/standalone/installation-azure
 
 ## 5. Questions?
 
-This entire guide is open-source. Go ahead and [edit it][0] if you want to expand it or have a fix or [ask for help][1] if you run into trouble and need assistance. BuddyWorks also has an [online community][2] for help.
+This entire guide is open-source. Go ahead and [edit it][11] if you want to expand it or have a fix or [ask for help][12] if you run into trouble and need assistance. BuddyWorks also has an [online community][13] for help.
 
-[0]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration/buddyworks.md
-[1]: https://jekyllrb.com/help/
-[2]: http://forum.buddy.works/
+[11]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration/buddyworks.md
+[12]: https://jekyllrb.com/help/
+[13]: http://forum.buddy.works/

From 086bf13a33ae132af7009acf456dea8158212f5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Ku=C5=9B?= 
Date: Tue, 21 Mar 2017 10:49:48 +0100
Subject: [PATCH 2025/4996] Update buddyworks.md

added article to `buddy.yml`
---
 docs/_docs/continuous-integration/buddyworks.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/continuous-integration/buddyworks.md b/docs/_docs/continuous-integration/buddyworks.md
index d33259dfe3b..c60b5b3657a 100644
--- a/docs/_docs/continuous-integration/buddyworks.md
+++ b/docs/_docs/continuous-integration/buddyworks.md
@@ -27,7 +27,7 @@ Whenever you make a push to the selected branch, the Jekyll action runs `jekyll
 
 ## 3. Using YAML for configuration
 
-If you prefer configuration as code over GUI, you can generate `buddy.yml` that will create a pipeline with the Jekyll action once you push it to the target branch:
+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
 - pipeline: "Build and Deploy Jekyll site"

From d592f5781ab7ccba005a20e0d18286cd7410bf40 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 21 Mar 2017 09:12:18 -0400
Subject: [PATCH 2026/4996] Update history to reflect merge of #5957 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f28c18e2332..3f995c3a3cf 100644
--- a/History.markdown
+++ b/History.markdown
@@ -45,6 +45,9 @@
   * Convertible#validate_permalink!: ensure the return value of data["permalink"] is a string before asking if it is empty (#5878)
   * Allow abbreviated post dates (#5920)
   * Remove dependency on include from default about.md (#5903)
+  * Allow colons in `uri_escape` filter
+
+Fixes #5954 (#5957)
 
 ## 3.4.2 / 2017-03-09
 

From df0d3f20c4075c3853b59be40c057a5b5145ba8e Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 21 Mar 2017 09:58:26 -0400
Subject: [PATCH 2027/4996] Fix some errant entries in History.markdown.

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

diff --git a/History.markdown b/History.markdown
index 3f995c3a3cf..128772266f3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -26,7 +26,7 @@
 
   * [Rubocop] add missing comma (#5835)
   * Appease classifier-reborn (#5934)
-  * Allow releases & development on *-stable branches (#5926)
+  * Allow releases & development on `*-stable` branches (#5926)
   * Add script/backport-pr (#5925)
   * Prefer .yaml over .toml (#5966)
 
@@ -45,9 +45,7 @@
   * Convertible#validate_permalink!: ensure the return value of data["permalink"] is a string before asking if it is empty (#5878)
   * Allow abbreviated post dates (#5920)
   * Remove dependency on include from default about.md (#5903)
-  * Allow colons in `uri_escape` filter
-
-Fixes #5954 (#5957)
+  * Allow colons in `uri_escape` filter (#5957)
 
 ## 3.4.2 / 2017-03-09
 

From 9d66fc2292080335db5adabbf507693d6c02cedb Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Tue, 21 Mar 2017 08:38:37 -0500
Subject: [PATCH 2028/4996] Release :gem: 3.4.3

---
 History.markdown        | 4 ++++
 docs/_docs/history.md   | 6 ++++++
 docs/latest_version.txt | 2 +-
 lib/jekyll/version.rb   | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/History.markdown b/History.markdown
index 128772266f3..c9aae111206 100644
--- a/History.markdown
+++ b/History.markdown
@@ -47,6 +47,10 @@
   * Remove dependency on include from default about.md (#5903)
   * Allow colons in `uri_escape` filter (#5957)
 
+## 3.4.3 / 2017-03-21
+
+  * Backport #5957 for v3.4.x: Allow colons in `uri_escape` filter (#5968)
+
 ## 3.4.2 / 2017-03-09
 
   * Backport #5871 for v3.4.x: Convert StaticFile liquid representation to a Drop & add front matter defaults support to StaticFiles (#5940)
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 3c821edad51..9a504af606d 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,12 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.4.3 / 2017-03-21
+{: #v3-4-3}
+
+- Backport [#5957]({{ site.repository }}/issues/5957) for v3.4.x: Allow colons in `uri_escape` filter ([#5968]({{ site.repository }}/issues/5968))
+
+
 ## 3.4.2 / 2017-03-09
 {: #v3-4-2}
 
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index 4d9d11cf505..6cb9d3dd0d6 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.4.2
+3.4.3
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index fc43a4c354a..1c4a0b96025 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.4.2".freeze
+  VERSION = "3.4.3".freeze
 end

From eab83c3653685ccb51af01be489fa5b6412c8045 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 21 Mar 2017 10:00:47 -0400
Subject: [PATCH 2029/4996] Update generated history for jekyllrb.com

---
 docs/_docs/history.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 9a504af606d..d0938169520 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -13,8 +13,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ## 3.4.2 / 2017-03-09
 {: #v3-4-2}
 
-- Backport [#5871]({{ site.repository }}/issues/5871) for v3.4.x: Convert StaticFile liquid representation to
-    a Drop & add front matter defaults support to StaticFiles ([#5940]({{ site.repository }}/issues/5940))
+- Backport [#5871]({{ site.repository }}/issues/5871) for v3.4.x: Convert StaticFile liquid representation to a Drop & add front matter defaults support to StaticFiles ([#5940]({{ site.repository }}/issues/5940))
 
 
 ## 3.4.1 / 2017-03-02

From ca9d6be061aaa1b5c28d2c75ee942c21d647b9fe Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Tue, 21 Mar 2017 09:58:02 -0500
Subject: [PATCH 2030/4996] Release post for v3.4.3

---
 .../2017-03-21-jekyll-3-4-3-released.markdown | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 docs/_posts/2017-03-21-jekyll-3-4-3-released.markdown

diff --git a/docs/_posts/2017-03-21-jekyll-3-4-3-released.markdown b/docs/_posts/2017-03-21-jekyll-3-4-3-released.markdown
new file mode 100644
index 00000000000..a51fdf498c0
--- /dev/null
+++ b/docs/_posts/2017-03-21-jekyll-3-4-3-released.markdown
@@ -0,0 +1,49 @@
+---
+title: 'Jekyll 3.4.3 Released'
+date: 2017-03-21 08:52:53 -0500
+author: pathawks
+version: 3.4.3
+categories: [release]
+---
+
+Another one-PR patch update as we continue our quest to destroy all bugs. A
+fairly technical debriefing follows, but the TLDR is that we have updated the
+`uri_escape` filter to more closely follow the pre-v3.4.0 behavior.
+
+In [v3.4.0]({% link _posts/2017-01-18-jekyll-3-4-0-released.markdown %}), we
+moved away from using the deprecated
+[`URI.escape`](https://ruby-doc.org/stdlib-2.3.0/libdoc/uri/rdoc/URI/Escape.html#method-i-encode)
+in favor of
+[`Addressable::URI.encode`](http://www.rubydoc.info/gems/addressable/Addressable/URI#encode-class_method).
+This is what powers our [`uri_escape`
+filter](https://jekyllrb.com/docs/templates/).
+
+While this transition was mostly a smooth one, the two methods are not
+identical. While `URI.escape` was happy to escape any string,
+`Addressable::URI.encode` first turns the string into an `Addressable::URI`
+object, and will then escape each component of that object. In most cases, this
+difference was insignificant, but there were a few cases where this caused some
+unintended regressions when encoding colons.
+
+While **Addressable** can understand that something like `"/example :page"` is a
+relative URI, without the slash it cannot figure out how to turn
+`"example :page"` into an `Addressable::URI` object. `URI.escape` had no such
+objection. This lead to the following Liquid code working fine in Jekyll 3.3.x
+but breaking in 3.4.0:
+
+{% raw %}
+```liquid
+{{ "example :page" | uri_escape }}
+```
+{% endraw %}
+
+This was not an intended consequence of switching to **Addressable**.
+
+Fortunately, the solution was not complicated. **Addressable** has a method
+[`Addressable::URI.normalize_component`](http://www.rubydoc.info/gems/addressable/Addressable/URI#normalize_component-class_method)
+which will simply escape the characters in a string, much like `URI.escape`.
+
+Thanks to @cameronmcefee and @FriesFlorian for reporting
+[this issue](https://github.com/jekyll/jekyll/issues/5954).
+
+Happy Jekylling!

From f9243c5ab1c0ae6113180e8c650094e71bd08262 Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Tue, 21 Mar 2017 08:52:33 -0700
Subject: [PATCH 2031/4996] Included more details about adding defaults to
 static files

Based on the functionality released in [3.4.2](http://jekyllrb.com/news/2017/03/09/jekyll-3-4-2-released/) re adding defaults to static files, I thought this page needed some more detail.
---
 docs/_docs/static_files.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/docs/_docs/static_files.md b/docs/_docs/static_files.md
index 523c29dfc41..fbb03e792de 100644
--- a/docs/_docs/static_files.md
+++ b/docs/_docs/static_files.md
@@ -65,3 +65,35 @@ following metadata:
   
 
 
    
+
+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 actually 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: 
+
+In your `_config.yml` file, add the following values to the `defaults` property:
+
+```yaml
+defaults:
+  - scope:
+      path: "assets/img"
+    values:
+      image: true
+```
+
+This assumes that your Jekyll site has a folder path of `assets/img` where  you have images (static files) stored. When Jekyll builds the site, it will treat each image as if it had the front matter value of `image: true`.
+
+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:
+
+```liquid
+{% raw %}{% for myfile in site.static_files %}
+   {% if myfile.image == true %}
+     {{ myfile.path }}
+   {% endif %}
+{% endfor %}{% endraw %}
+```
+
+When you build your site, the output will list the path to each file that meets this front matter condition.

From 161902eda266167e0fc239e96e38190b6462b9aa Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 21 Mar 2017 12:26:06 -0400
Subject: [PATCH 2032/4996] Update history to reflect merge of #5949 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c9aae111206..8c262f24621 100644
--- a/History.markdown
+++ b/History.markdown
@@ -21,6 +21,7 @@
   * update plugin repo URL to reflect repo move (#5916)
   * Update exclude array in configuration.md (#5947)
   * Fixed path in "Improve this page" link in Tutorials section (#5951)
+  * Corrected permalink (#5949)
 
 ### Development Fixes
 

From fe6d4c7beaf315b55623b2c686116f055cd62f2a Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Tue, 21 Mar 2017 10:27:05 -0700
Subject: [PATCH 2033/4996] updates from parkr's review

- removed "actually"
- switched code example to use `where`
---
 docs/_docs/static_files.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/_docs/static_files.md b/docs/_docs/static_files.md
index fbb03e792de..a4dda58892d 100644
--- a/docs/_docs/static_files.md
+++ b/docs/_docs/static_files.md
@@ -70,7 +70,7 @@ Note that in the above table, `file` can be anything. It's simply an arbitrarily
 
 ## Add front matter to static files
 
-Although you can't directly add front matter values to static files, you can actually 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: 
 
@@ -89,10 +89,9 @@ 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:
 
 ```liquid
-{% raw %}{% for myfile in site.static_files %}
-   {% if myfile.image == true %}
-     {{ myfile.path }}
-   {% endif %}
+{% raw %}{% assign image_files = site.static_files | where: "image", true %}
+{% for myimage in image_files %}
+  {{ myimage.path }}
 {% endfor %}{% endraw %}
 ```
 

From c55cc1d9ef72ecd4083b1911b8f70a821808203c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 21 Mar 2017 15:34:57 -0400
Subject: [PATCH 2034/4996] Update history to reflect merge of #5971 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8c262f24621..f46b46dcbe1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -22,6 +22,7 @@
   * Update exclude array in configuration.md (#5947)
   * Fixed path in "Improve this page" link in Tutorials section (#5951)
   * Corrected permalink (#5949)
+  * Included more details about adding defaults to static files (#5971)
 
 ### Development Fixes
 

From b60b78cfc4c8743446284a88d85c251634eff624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Ku=C5=9B?= 
Date: Wed, 22 Mar 2017 13:55:56 +0100
Subject: [PATCH 2035/4996] changed link references to names

---
 .../continuous-integration/buddyworks.md      | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/_docs/continuous-integration/buddyworks.md b/docs/_docs/continuous-integration/buddyworks.md
index c60b5b3657a..1dea8be53db 100644
--- a/docs/_docs/continuous-integration/buddyworks.md
+++ b/docs/_docs/continuous-integration/buddyworks.md
@@ -2,13 +2,13 @@
 title: "BuddyWorks"
 ---
 
-[BuddyWorks][0] is a [Docker][1]-based CI server that you can set up in 15-20 minutes to build, test, and deploy your Jekyll websites. It supports [GitHub][2], [Bitbucket][3], and [GitLab][4] repositories, and can be installed on-premises or used in cloud. The following guide will show you how to set up a free environment to build and test your Jekyll project.
+[BuddyWorks][buddyworks-homepage] is a [Docker][docker-homepage]-based CI server that you can set up in 15-20 minutes to build, test, and deploy your Jekyll websites. It supports [GitHub][github-homepage], [Bitbucket][bitbucket-homepage], and [GitLab][gitlab-homepage] repositories, and can be installed on-premises or used in cloud. The following guide will show you how to set up a free environment to build and test your Jekyll project.
 
-[0]: https://buddy.works
-[1]: https://www.docker.com/
-[2]: https://github.com
-[3]: https://bitbucket.org/
-[4]: https://gitlab.com
+[buddyworks-homepage]: https://buddy.works
+[docker-homepage]: https://www.docker.com/
+[github-homepage]: https://github.com
+[bitbucket-homepage]: https://bitbucket.org/
+[gitlab-homepage]: https://gitlab.com
 
 ## 1. Getting started
 
@@ -19,11 +19,11 @@ title: "BuddyWorks"
 
 ## 2. How it works
 
-Whenever you make a push to the selected branch, the Jekyll action runs `jekyll build` in an isolated [Jekyll Docker image][5]. The output is generated to the `/filesystem` directory, and can be further deployed to FTP/SFTP and IaaS services. You can add your own commands, install additional packages, attach services, and run Selenium tests, as well as add other actions down the pipeline, eg. a Slack notification or an SSH script that will restart your server.
+Whenever you make a push to the selected branch, the Jekyll action runs `jekyll build` in an isolated [Jekyll Docker image][jekyll-docker-image]. The output is generated to the `/filesystem` directory, and can be further deployed to FTP/SFTP and IaaS services. You can add your own commands, install additional packages, attach services, and run Selenium tests, as well as add other actions down the pipeline, eg. a Slack notification or an SSH script that will restart your server.
 
 ![Jekyll Build](https://buddy.works/data/blog/_images/buddyworks-jekyll-small.png)
 
-[5]: https://hub.docker.com/r/jekyll/jekyll/
+[jekyll-docker-image]: https://hub.docker.com/r/jekyll/jekyll/
 
 ## 3. Using YAML for configuration
 
@@ -45,18 +45,18 @@ If you prefer configuration as code over GUI, you can generate a `buddy.yml` tha
 
 ## 4. Setting up on-premises server
 
-The self-hosted version of BuddyWorks can be installed on any type of server supporting Docker, including [Linux][6], [Mac][7], [AWS EC2][8], [DigitalOcean][9], and [Microsoft Azure][10].
+The self-hosted version of BuddyWorks can be installed on any type of server supporting Docker, including [Linux][bw-linux], [Mac][bw-mac], [AWS EC2][bw-aws-ec2], [DigitalOcean][bw-digitalocean], and [Microsoft Azure][bw-azure].
 
-[6]: https://buddy.works/knowledge/standalone/installation-linux
-[7]: https://buddy.works/knowledge/standalone/installation-mac-osx
-[8]: https://buddy.works/knowledge/standalone/installation-amazon-ec2
-[9]: https://buddy.works/knowledge/standalone/installation-digitalocean
-[10]: https://buddy.works/knowledge/standalone/installation-azure
+[bw-linux]: https://buddy.works/knowledge/standalone/installation-linux
+[bw-mac]: https://buddy.works/knowledge/standalone/installation-mac-osx
+[bw-aws-ec2]: https://buddy.works/knowledge/standalone/installation-amazon-ec2
+[bw-digitalocean]: https://buddy.works/knowledge/standalone/installation-digitalocean
+[bw-azure]: https://buddy.works/knowledge/standalone/installation-azure
 
 ## 5. Questions?
 
-This entire guide is open-source. Go ahead and [edit it][11] if you want to expand it or have a fix or [ask for help][12] if you run into trouble and need assistance. BuddyWorks also has an [online community][13] for help.
+This entire guide is open-source. Go ahead and [edit it][jekyll-docs-ci-buddyworks] if you want to expand it or have a fix or [ask for help][jekyll-help] if you run into trouble and need assistance. BuddyWorks also has an [online community][buddyworks-forum] for help.
 
-[11]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration/buddyworks.md
-[12]: https://jekyllrb.com/help/
-[13]: http://forum.buddy.works/
+[jekyll-docs-ci-buddyworks]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration/buddyworks.md
+[jekyll-help]: https://jekyllrb.com/help/
+[buddyworks-forum]: http://forum.buddy.works/

From c48f147192d417294aac72c559599a46ef0e3410 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 22 Mar 2017 10:02:05 -0400
Subject: [PATCH 2036/4996] Update history to reflect merge of #5962 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f46b46dcbe1..86b2fe79c7b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -23,6 +23,7 @@
   * Fixed path in "Improve this page" link in Tutorials section (#5951)
   * Corrected permalink (#5949)
   * Included more details about adding defaults to static files (#5971)
+  * Create buddyworks (#5962)
 
 ### Development Fixes
 

From 16e807a41dd9170b0c7b2b683372ebf463f284fe Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 22 Mar 2017 11:28:40 -0400
Subject: [PATCH 2037/4996] Update history to reflect merge of #5965 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 86b2fe79c7b..6140fb92e4b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -24,6 +24,7 @@
   * Corrected permalink (#5949)
   * Included more details about adding defaults to static files (#5971)
   * Create buddyworks (#5962)
+  * added (buddyworks) to ci list (#5965)
 
 ### Development Fixes
 

From 58dce4f0995b7085618e36fd869c35a2d12b1410 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 23 Mar 2017 10:10:38 +0530
Subject: [PATCH 2038/4996] Check for given content in posts

---
 features/site_configuration.feature | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/features/site_configuration.feature b/features/site_configuration.feature
index cc6f01fbadd..6dc6f5b09fa 100644
--- a/features/site_configuration.feature
+++ b/features/site_configuration.feature
@@ -174,6 +174,8 @@ Feature: Site configuration
       Then I should get a zero exit status
       And the _site directory should exist
       And I should see "Page Layout: 2" in "_site/index.html"
+      And I should see "Post Layout: 
    content for entry1.
    \n built at" in "_site/2013/04/09/entry1.html"
+      And I should see "Post Layout: 
    content for entry2.
    \n built at" in "_site/2013/04/10/entry2.html"
       And I should see date "2013-04-09T23:22:00-04:00" in "_site/2013/04/09/entry1.html" unless Windows
       And I should see date "2013-04-09T22:22:00-05:00" in "_site/2013/04/09/entry1.html" if on Windows
       And I should see date "2013-04-10T03:14:00-04:00" in "_site/2013/04/10/entry2.html" unless Windows

From 3142f31a7aa3554f5dbeae716b8fe2e691fdd85f Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Fri, 24 Mar 2017 21:19:54 +0100
Subject: [PATCH 2039/4996] add custom 404 to tutorial navigation

---
 docs/_data/tutorials.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_data/tutorials.yml b/docs/_data/tutorials.yml
index 73a0184a195..df6b4c207ca 100644
--- a/docs/_data/tutorials.yml
+++ b/docs/_data/tutorials.yml
@@ -2,6 +2,7 @@
   tutorials:
   - home
   - navigation
+  - custom-404-page
 
 #- title: Another section
 #  tutorials:

From 990809ba0793c09e0801ed87933c6de686025765 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 24 Mar 2017 16:21:38 -0400
Subject: [PATCH 2040/4996] Update history to reflect merge of #5946 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6140fb92e4b..72a24fa3772 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Included more details about adding defaults to static files (#5971)
   * Create buddyworks (#5962)
   * added (buddyworks) to ci list (#5965)
+  * Add a tutorial on serving custom Error 404 page (#5946)
 
 ### Development Fixes
 

From a3aed14d4107f85628ce03aeff6d80d5ce64c149 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 24 Mar 2017 17:14:20 -0400
Subject: [PATCH 2041/4996] Update history to reflect merge of #5978 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 72a24fa3772..fdb618fa456 100644
--- a/History.markdown
+++ b/History.markdown
@@ -26,6 +26,7 @@
   * Create buddyworks (#5962)
   * added (buddyworks) to ci list (#5965)
   * Add a tutorial on serving custom Error 404 page (#5946)
+  * add custom 404 to tutorial navigation (#5978)
 
 ### Development Fixes
 

From a9830fadac277b709bb9212ad8b266d9faa50128 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 25 Mar 2017 06:16:03 -0400
Subject: [PATCH 2042/4996] Update history to reflect merge of #5952 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fdb618fa456..fcf59e3042b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -27,6 +27,7 @@
   * added (buddyworks) to ci list (#5965)
   * Add a tutorial on serving custom Error 404 page (#5946)
   * add custom 404 to tutorial navigation (#5978)
+  * Add link to order of interpretation tutorial in Tutorials nav (#5952)
 
 ### Development Fixes
 

From f2bf9841608b631376b7cc699198589eb743a5ce Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 27 Mar 2017 13:03:42 -0400
Subject: [PATCH 2043/4996] Update philosophy document based on benbalter's
 feedback.

---
 docs/philosophy.md | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/docs/philosophy.md b/docs/philosophy.md
index ad9cbb4f170..b058183eaa0 100644
--- a/docs/philosophy.md
+++ b/docs/philosophy.md
@@ -11,7 +11,8 @@ is about, the following principles should come to mind:
 
 Jekyll is not magic. A user should be able to understand the underlying
 processes that make up the Jekyll build without much reading. It should
-behave "as you'd expect."
+do only what you ask it to and nothing more. When a user takes a certain
+action, the outcome should be easily understandable and focused.
 
 ### 2. It "Just Works"
 
@@ -19,7 +20,7 @@ The out-of-the-box experience should be that it "just works." Run `gem
 install jekyll` and it should build any Jekyll site that it's given.
 Features like auto-regeneration and settings like the markdown renderer
 should represent sane defaults that work perfectly for the vast majority of
-cases. The burden of configuration should not be placed on the user.
+cases. The burden of initial configuration should not be placed on the user.
 
 ### 3. Content is King
 
@@ -31,6 +32,12 @@ should find the management of their content enjoyable and simple.
 
 If a user's site builds today, it should build tomorrow.
 Backwards-compatibility should be strongly preferred over breaking changes.
+Breaking changes should be made to support a strong practical goal, and
+breaking changes should never be made to drive forward "purity" of the
+codebase, or other changes purely to make the maintainers' lives easier.
+Breaking changes provide a significant amount of friction between upgrades
+and reduce the confidence of users in this software, and should thus be
+avoided unless absolutely necessary.
 Upon breaking changes, provide a clear path for users to upgrade.
 
 ### 5. Small & Extensible
@@ -38,4 +45,6 @@ Upon breaking changes, provide a clear path for users to upgrade.
 The core of Jekyll should be simple and small, and extensibility should be
 a first-class feature to provide added functionality from community
 contributors. The core should be kept to features used by at least 90% of
-users–everything else should be provided as a plugin.
+users–everything else should be provided as a plugin. New features should
+be shipped as plugins and focus should be put on creating extensible core
+API's to support rich plugins.

From a6518c1de3ac54df01dc06b45d687100124c20e3 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 27 Mar 2017 13:08:00 -0400
Subject: [PATCH 2044/4996] Update history to reflect merge of #5792 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fcf59e3042b..56084528056 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * Add a tutorial on serving custom Error 404 page (#5946)
   * add custom 404 to tutorial navigation (#5978)
   * Add link to order of interpretation tutorial in Tutorials nav (#5952)
+  * Document Jekyll's Philosophy (#5792)
 
 ### Development Fixes
 

From b36731442401a03c3fd5d40c6497821b0b7b7c52 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 27 Mar 2017 13:38:09 -0400
Subject: [PATCH 2045/4996] Fix whitespace issue in philosophy document.

/cc https://github.com/jekyll/jekyll/issues/5342#issuecomment-247358296
---
 docs/philosophy.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/philosophy.md b/docs/philosophy.md
index b058183eaa0..7d9c414fb28 100644
--- a/docs/philosophy.md
+++ b/docs/philosophy.md
@@ -16,8 +16,8 @@ action, the outcome should be easily understandable and focused.
 
 ### 2. It "Just Works"
 
-The out-of-the-box experience should be that it "just works." Run `gem
-install jekyll` and it should build any Jekyll site that it's given.
+The out-of-the-box experience should be that it "just works." Run
+`gem install jekyll` and it should build any Jekyll site that it's given.
 Features like auto-regeneration and settings like the markdown renderer
 should represent sane defaults that work perfectly for the vast majority of
 cases. The burden of initial configuration should not be placed on the user.

From a2e82b72649d8fad1f6cd4101b2c987049310ed2 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 26 Mar 2017 13:23:17 +0200
Subject: [PATCH 2046/4996] mention Ruby > 2.1.0 in docs

---
 docs/_docs/troubleshooting.md  | 2 +-
 docs/_docs/upgrading/2-to-3.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/troubleshooting.md b/docs/_docs/troubleshooting.md
index 8fb669425c1..48163fdc5bb 100644
--- a/docs/_docs/troubleshooting.md
+++ b/docs/_docs/troubleshooting.md
@@ -17,7 +17,7 @@ that might be of help. If the problem you’re experiencing isn’t covered belo
 ## Installation Problems
 
 If you encounter errors during gem installation, you may need to install
-the header files for compiling extension modules for Ruby 2.0.0. This
+the header files for compiling extension modules for Ruby 2.x This
 can be done on Ubuntu or Debian by running:
 
 ```sh
diff --git a/docs/_docs/upgrading/2-to-3.md b/docs/_docs/upgrading/2-to-3.md
index a378d2f7e78..2b1b13573c6 100644
--- a/docs/_docs/upgrading/2-to-3.md
+++ b/docs/_docs/upgrading/2-to-3.md
@@ -12,7 +12,7 @@ Before we dive in, go ahead and fetch the latest version of Jekyll:
 $ gem update jekyll
 ```
 
-Please note: Jekyll 3 requires Ruby version >= 2.0.0.
+Please note: Jekyll 3.2 requires Ruby version >= 2.1
 
 
    
   
    Diving in
    

From 7affec23478a25228929996f825f4f475151f7b5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 27 Mar 2017 15:38:37 -0400
Subject: [PATCH 2047/4996] Update history to reflect merge of #5983 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 56084528056..dd8c57607c2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * add custom 404 to tutorial navigation (#5978)
   * Add link to order of interpretation tutorial in Tutorials nav (#5952)
   * Document Jekyll's Philosophy (#5792)
+  * Require Ruby > 2.1.0 (#5983)
 
 ### Development Fixes
 

From f598b7e6804548c61e8a5bc0a4fd72075faf8aa4 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 27 Mar 2017 15:39:20 -0400
Subject: [PATCH 2048/4996] Update history to reflect merge of #5961 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index dd8c57607c2..5411ac240b1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -38,6 +38,7 @@
   * Allow releases & development on `*-stable` branches (#5926)
   * Add script/backport-pr (#5925)
   * Prefer .yaml over .toml (#5966)
+  * Fix Appveyor with DST-aware cucumber steps (#5961)
 
 ### Site Enhancements
 

From 86703f100908dd6aadb29a68904ed7ab81cb8fdd Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Tue, 28 Mar 2017 09:05:54 +0530
Subject: [PATCH 2049/4996] Use Rubocop v0.47.1 till we're ready for v0.48

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 3a65e9ba2f6..a310188ffa8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ group :test do
   gem "nokogiri"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.47"
+  gem "rubocop", "~> 0.47.1"
   gem "test-theme", :path => File.expand_path("./test/fixtures/test-theme", File.dirname(__FILE__))
 
   gem "jruby-openssl" if RUBY_ENGINE == "jruby"

From 73e70da9e5d97c1b7e1bd85f93a2bda89811207d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 28 Mar 2017 11:35:45 -0400
Subject: [PATCH 2050/4996] Update history to reflect merge of #5989 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5411ac240b1..d1fef356ec6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -39,6 +39,7 @@
   * Add script/backport-pr (#5925)
   * Prefer .yaml over .toml (#5966)
   * Fix Appveyor with DST-aware cucumber steps (#5961)
+  * Use Rubocop v0.47.1 till we're ready for v0.48 (#5989)
 
 ### Site Enhancements
 

From 3688640d59a5b53a85cb6f31d336b474165ef4d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20P=C3=A4per?= 
Date: Wed, 29 Mar 2017 00:36:29 +0200
Subject: [PATCH 2051/4996] add /_data/*.tsv support (#5985)

* Update data.feature

- add .tsv
- add .csv with `\t`
- add .csv with `;`

* Fix Appveyor with dst-aware cucumber steps

* Check for given content in posts

* mention Ruby > 2.1.0 in docs

* Update history to reflect merge of #5983 [ci skip]

* Update history to reflect merge of #5961 [ci skip]

* Update data_reader.rb

- add .tsv support with tab separated columns
- not adding support for auto-detecting `:col_sep`

ftp://ftp.iana.org/assignments/media-types/text/tab-separated-values
https://www.ietf.org/rfc/rfc4180.txt (CSV)
https://ruby-doc.org/stdlib-2.4.1/libdoc/csv/rdoc/CSV.html

* Update data.feature

don't do semicolons and tabs in .csv within this patch

* Update data.feature

I don't know which component replaced my tab characters by space before.

* Update data.feature

t

* Update data_reader.rb

add a single space to satisfy format checker
---
 features/data.feature             | 14 ++++++++++++++
 lib/jekyll/readers/data_reader.rb | 10 ++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/features/data.feature b/features/data.feature
index e44be8a5cf6..41f476a4996 100644
--- a/features/data.feature
+++ b/features/data.feature
@@ -59,6 +59,20 @@ Feature: Data
     And I should see "Jack" in "_site/index.html"
     And I should see "Leon" in "_site/index.html"
 
+  Scenario: autoload *.tsv files in _data directory
+    Given I have a _data directory
+    And I have a "_data/members.tsv" file with content:
+      """
+      name	age
+      Jack	28
+      Leon	34
+      """
+    And I have an "index.html" page that contains "{% for member in site.data.members %}{{member.name}}{% endfor %}"
+    When I run jekyll build
+    Then the "_site/index.html" file should exist
+    And I should see "Jack" in "_site/index.html"
+    And I should see "Leon" in "_site/index.html"
+
   Scenario: autoload *.yml files in _data directory with space in file name
     Given I have a _data directory
     And I have a "_data/team members.yml" file with content:
diff --git a/lib/jekyll/readers/data_reader.rb b/lib/jekyll/readers/data_reader.rb
index 1083d62b26b..63db7c6d920 100644
--- a/lib/jekyll/readers/data_reader.rb
+++ b/lib/jekyll/readers/data_reader.rb
@@ -19,7 +19,7 @@ def read(dir)
       @content
     end
 
-    # Read and parse all .yaml, .yml, .json, and .csv
+    # Read and parse all .yaml, .yml, .json, .csv and .tsv
     # files under  and add them to the  variable.
     #
     # dir - The string absolute path of the directory to read.
@@ -30,7 +30,7 @@ def read_data_to(dir, data)
       return unless File.directory?(dir) && !@entry_filter.symlink?(dir)
 
       entries = Dir.chdir(dir) do
-        Dir["*.{yaml,yml,json,csv}"] + Dir["*"].select { |fn| File.directory?(fn) }
+        Dir["*.{yaml,yml,json,csv,tsv}"] + Dir["*"].select { |fn| File.directory?(fn) }
       end
 
       entries.each do |entry|
@@ -56,6 +56,12 @@ def read_data_file(path)
           :headers  => true,
           :encoding => site.config["encoding"],
         }).map(&:to_hash)
+      when ".tsv"
+        CSV.read(path, {
+          :col_sep  => "\t",
+          :headers  => true,
+          :encoding => site.config["encoding"],
+        }).map(&:to_hash)
       else
         SafeYAML.load_file(path)
       end

From 6edc546d36916c9cc521fd6e341ada1bb95c5fce Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 28 Mar 2017 18:39:30 -0400
Subject: [PATCH 2052/4996] Update history to reflect merge of #5985

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index d1fef356ec6..ff4e81e23c7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,7 @@
 
   * Upgrade to Liquid v4 (#4362)
   * Convert StaticFile liquid representation to a Drop & add front matter defaults support to StaticFiles (#5871)
+  * Add support for Tab-Separated Values data files (`*.tsv`) (#5985)
 
 ### Documentation
 

From 8325d56a1acf39689bf0b679eb2bbb2cd568237c Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Thu, 30 Mar 2017 14:00:31 -0700
Subject: [PATCH 2053/4996] Fix broken link (#5994)

Merge pull request 5994
---
 docs/_tutorials/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_tutorials/index.md b/docs/_tutorials/index.md
index b0988b09f62..f023dc11e5c 100644
--- a/docs/_tutorials/index.md
+++ b/docs/_tutorials/index.md
@@ -5,7 +5,7 @@ permalink: /tutorials/home/
 redirect_from: /tutorials/index.html
 ---
 
-In contrast to [Docs](../docs), Tutorials provide more detailed, narrative instruction that cover a variety of Jekyll topics and scenarios. Tutorials might contain the following:
+In contrast to [Docs](/docs/home/), Tutorials provide more detailed, narrative instruction that cover a variety of Jekyll topics and scenarios. Tutorials might contain the following:
 
 * Step-by-step processes through particular scenarios or challenges
 * Full walk-throughs using sample data, showing inputs and results from the sample data

From fe388a885e3883f16ff55bf64de5b5890aaab0a3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 30 Mar 2017 17:00:33 -0400
Subject: [PATCH 2054/4996] Update history to reflect merge of #5994 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ff4e81e23c7..f35894107d1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -31,6 +31,7 @@
   * Add link to order of interpretation tutorial in Tutorials nav (#5952)
   * Document Jekyll's Philosophy (#5792)
   * Require Ruby > 2.1.0 (#5983)
+  * Fix broken link (#5994)
 
 ### Development Fixes
 

From 711a8483c680e70906b23f081070f62f4e10b52f Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 30 Mar 2017 20:14:04 -0400
Subject: [PATCH 2055/4996] travis: upgrade Ruby 2.2 and 2.1 to latest PATCH
 release

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 36f2d6ff160..088fadaebdd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,8 @@ language: ruby
 sudo: false
 
 rvm:
-  - &ruby1 2.3.3
-  - &ruby2 2.2.6
+  - &ruby1 2.3.4
+  - &ruby2 2.2.7
   - &ruby3 2.1.10
   - &jruby jruby-9.1.7.0
 

From 0d02a25b04ae0da5e63d349f8fd022e3b7b8a6ec Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Fri, 31 Mar 2017 04:02:04 +0200
Subject: [PATCH 2056/4996] Default options for script/proof (#5995)

Merge pull request 5995
---
 docs/_docs/posts.md           | 2 +-
 docs/_docs/quickstart.md      | 4 ++--
 docs/_docs/themes.md          | 6 +++---
 docs/_tutorials/navigation.md | 2 +-
 script/proof                  | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/_docs/posts.md b/docs/_docs/posts.md
index f43b72e8af3..ce00e2dde74 100644
--- a/docs/_docs/posts.md
+++ b/docs/_docs/posts.md
@@ -42,7 +42,7 @@ file. For example, the following are examples of valid post filenames:
 
    
   
    ProTip™: Link to other posts
    
   
    
-    Use the post_url
+    Use the post_url
     tag to link to other posts without having to worry about the URL's
     breaking when the site permalink style changes.
   
    
diff --git a/docs/_docs/quickstart.md b/docs/_docs/quickstart.md
index a8a2ae98cb5..9bd164b3b5e 100644
--- a/docs/_docs/quickstart.md
+++ b/docs/_docs/quickstart.md
@@ -4,7 +4,7 @@ permalink: /docs/quickstart/
 ---
 
 
-If you already have a full [Ruby](https://www.ruby-lang.org/en/downloads/) development environment with all headers and [RubyGems](https://rubygems.org/pages/download) installed (see Jekyll's [requirements](/docs/installation/#requirements/)), you can create a new Jekyll site by doing the following:
+If you already have a full [Ruby](https://www.ruby-lang.org/en/downloads/) development environment with all headers and [RubyGems](https://rubygems.org/pages/download) installed (see Jekyll's [requirements](/docs/installation/#requirements)), you can create a new Jekyll site by doing the following:
 
 ```sh
 # Install Jekyll and Bundler gems through RubyGems
@@ -22,7 +22,7 @@ If you already have a full [Ruby](https://www.ruby-lang.org/en/downloads/) devel
 # Now browse to http://localhost:4000
 ```
 
-If you encounter any unexpected errors during the above, please refer to the already-mentioned [requirements](/docs/installation/#requirements/) page, as you might be missing development headers or other prerequisites.
+If you encounter any unexpected errors during the above, please refer to the already-mentioned [requirements](/docs/installation/#requirements) page, as you might be missing development headers or other prerequisites.
 
 ## About Bundler
 
diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index 2e6052a4002..5ad3b2da8b2 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -141,7 +141,7 @@ To install a gem-based theme:
    bundle exec jekyll serve
    ```
 
-You can have multiple themes listed in your site's `Gemfile`, but only one theme can be selected in your site's `_config.yml`. 
+You can have multiple themes listed in your site's `Gemfile`, but only one theme can be selected in your site's `_config.yml`.
 {: .note .info }
 
 If you're publishing your Jekyll site on [GitHub Pages](https://pages.github.com/), note that GitHub Pages supports only some gem-based themes. See [Supported Themes](https://pages.github.com/themes/) in GitHub's documentation to see which themes are supported.
@@ -184,7 +184,7 @@ For example, if your theme has a `/_layouts/page.html` file, and a page has `lay
 
 Any file in `/assets` will be copied over to the user's site upon build unless they have a file with the same relative path. You can ship any kind of asset here: SCSS, an image, a webfont, etc. These files behave like pages and static files in Jekyll:
 
-- If the file has [YAML front matter](../docs/frontmatter/) at the top, it will be rendered.
+- If the file has [YAML front matter](/docs/frontmatter/) at the top, it will be rendered.
 - If the file does not have YAML front matter, it will simply be copied over into the resulting site.
 
 This allows theme creators to ship a default `/assets/styles.scss` file which their layouts can depend on as `/assets/styles.css`.
@@ -218,7 +218,7 @@ Themes are visual. Show users what your theme looks like by including a screensh
 
 To preview your theme as you're authoring it, it may be helpful to add dummy content in, for example, `/index.html` and `/page.html` files. This will allow you to use the `jekyll build` and `jekyll serve` commands to preview your theme, just as you'd preview a Jekyll site.
 
-If you do preview your theme locally, be sure to add `/_site` to your theme's `.gitignore` file to prevent the compiled site from also being included when you distribute your theme. 
+If you do preview your theme locally, be sure to add `/_site` to your theme's `.gitignore` file to prevent the compiled site from also being included when you distribute your theme.
 {: .info .note}
 
 ### Publishing your theme
diff --git a/docs/_tutorials/navigation.md b/docs/_tutorials/navigation.md
index 7d4bafa372f..324fe8ad3a2 100644
--- a/docs/_tutorials/navigation.md
+++ b/docs/_tutorials/navigation.md
@@ -68,7 +68,7 @@ docs:
 
    
 
 {: .note .info }
-For the results in these fictitious samples, `#` is manually substituted for the actual link value to avoid 404 errors.) 
+For the results in these fictitious samples, `#` is manually substituted for the actual link value to avoid 404 errors.)
 
 When you use a `for` loop, you choose how you want to refer to the items you're looping through. The variable you choose (in this case, `item`) becomes how you access the properties of each item in the list. Dot notation is used to get a property of the item (for example, `item.url`).
 
diff --git a/script/proof b/script/proof
index 664e778d22a..e8b796b2299 100755
--- a/script/proof
+++ b/script/proof
@@ -9,7 +9,7 @@ function msg {
   printf "\e[0;37m==> $1\e[0m\n"
 }
 
-INGORE_HREFS=$(ruby -e 'puts %w{
+IGNORE_HREFS=$(ruby -e 'puts %w{
   Chrononaut
   twitter.com
   nearlyfreespeech.net
@@ -32,4 +32,4 @@ bundle exec jekyll build -s $SOURCE -d $DESTINATION --trace
 
 # 3.
 msg "Proofing..."
-time bundle exec htmlproofer ./$DESTINATION --url-ignore $INGORE_HREFS $@
+time bundle exec htmlproofer ./$DESTINATION --allow-hash-href --url-ignore $IGNORE_HREFS $@

From 3921e523c5303583959fb9c04dcc62ca98e559a0 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 30 Mar 2017 22:02:05 -0400
Subject: [PATCH 2057/4996] Update history to reflect merge of #5995 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f35894107d1..d1c79e0c367 100644
--- a/History.markdown
+++ b/History.markdown
@@ -32,6 +32,7 @@
   * Document Jekyll's Philosophy (#5792)
   * Require Ruby > 2.1.0 (#5983)
   * Fix broken link (#5994)
+  * Default options for script/proof (#5995)
 
 ### Development Fixes
 

From 409c8f9f3146e9af142f891172c6a31e7226460f Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 31 Mar 2017 00:49:42 -0400
Subject: [PATCH 2058/4996] Make stackprof a ruby script [ci skip]

---
 script/stackprof | 59 +++++++++++++++++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/script/stackprof b/script/stackprof
index f78f11aa042..e6e77f8d85f 100755
--- a/script/stackprof
+++ b/script/stackprof
@@ -1,26 +1,49 @@
-#!/usr/bin/env bash
+#!/usr/bin/env ruby
 
-set -e
+require "bundler/setup"
+require "json"
+require "stackprof"
+require File.expand_path("../../lib/jekyll", __FILE__)
 
-case "$1" in
-  cpu|object) STACKPROF_MODE="$1"; shift ;;
-  *) STACKPROF_MODE="cpu" ;;
-esac
+MODE = ARGV.first || "cpu"
+PROF_OUTPUT_FILE = File.expand_path("../../tmp/stackprof-#{MODE}-#{Time.now.strftime("%Y%m%d%H%M")}.dump", __FILE__)
 
-export BENCHMARK=true
-command -v stackprof > /dev/null || script/bootstrap
+puts "Stackprof Mode: #{MODE}"
 
-TEST_SCRIPT="Jekyll::Commands::Build.process({'source' => 'docs'})"
-PROF_OUTPUT_FILE=tmp/stackprof-${STACKPROF_MODE}-$(date +%Y%m%d%H%M).dump
+unless File.exist?(PROF_OUTPUT_FILE)
+  StackProf.run(
+    mode: MODE.to_sym,
+    interval: 100,
+    raw: true,
+    out: PROF_OUTPUT_FILE
+  ) do
+    puts "GC Stats:", JSON.pretty_generate(GC.stat)
+    GC.disable
 
-GC_BEFORE="puts 'GC Stats:'; puts JSON.pretty_generate(GC.stat); GC.disable"
-GC_AFTER="puts 'GC Stats:'; GC.start(full_mark: true, immediate_sweep: false); puts JSON.pretty_generate(GC.stat);"
+    Jekyll::Commands::Build.process({'source' => 'docs'})
 
-echo Stackprof Mode: $STACKPROF_MODE
-test -f "$PROF_OUTPUT_FILE" || {
-  bundle exec ruby -r./lib/jekyll -rstackprof -rjson \
-    -e "StackProf.run(mode: :${STACKPROF_MODE}, interval: 100, out: '${PROF_OUTPUT_FILE}') { ${GC_BEFORE}; ${TEST_SCRIPT}; ${GC_AFTER}; }"
+    puts 'GC Stats:'
+    GC.start(full_mark: true, immediate_sweep: false)
+    puts JSON.pretty_generate(GC.stat)
+  end
+end
+
+options = {
+  sort: true,
+  limit: 30,
+  format: :text,
 }
 
-set -x
-bundle exec stackprof $PROF_OUTPUT_FILE $@ --sort-total
+# You can also do other things. Examples:
+# https://github.com/tmm1/stackprof/blob/master/bin/stackprof
+report = StackProf::Report.new(Marshal.load(IO.binread(PROF_OUTPUT_FILE)))
+report.print_text(
+  options[:sort],
+  options[:limit],
+  options[:select_files],
+  options[:reject_files],
+  options[:select_names],
+  options[:reject_names]
+)
+
+puts "Results stored in #{PROF_OUTPUT_FILE}"

From 15e133f6274b577519b1695a962aa1fb78f7bddf Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 31 Mar 2017 00:56:15 -0400
Subject: [PATCH 2059/4996] Depend on my branch of yajl-ruby with Ruby 2.4
 Integer fix

/cc https://github.com/brianmario/yajl-ruby/pull/173
---
 Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gemfile b/Gemfile
index a310188ffa8..8355c1b9570 100644
--- a/Gemfile
+++ b/Gemfile
@@ -76,6 +76,7 @@ group :jekyll_optional_dependencies do
     gem "classifier-reborn", "~> 2.1.0"
     gem "liquid-c", "~> 3.0"
     gem "pygments.rb", "~> 0.6.0"
+    gem "yajl-ruby", git: "https://github.com/parkr/yajl-ruby", branch: "1.2.x-unify-fixnum-to-integer"
     gem "rdiscount", "~> 2.0"
     gem "redcarpet", "~> 3.2", ">= 3.2.3"
   end

From db06288448b65f7e4206fc05810f2603c0576e26 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 31 Mar 2017 01:03:56 -0400
Subject: [PATCH 2060/4996] Update history to reflect merge of #5687

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index d1c79e0c367..ec0b2ca85b0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -43,6 +43,7 @@
   * Prefer .yaml over .toml (#5966)
   * Fix Appveyor with DST-aware cucumber steps (#5961)
   * Use Rubocop v0.47.1 till we're ready for v0.48 (#5989)
+  * Test against Ruby 2.4.0 (#5687)
 
 ### Site Enhancements
 

From 1c33bd579796d6f77abafc1af78e496298b4d74d Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Sun, 3 Jul 2016 16:43:37 +0300
Subject: [PATCH 2061/4996] rubocop: reduce code complexity and remove
 duplicated code

---
 .rubocop.yml              |   1 -
 lib/jekyll/convertible.rb |   2 +-
 lib/jekyll/page.rb        |  10 +--
 lib/jekyll/renderer.rb    | 167 +++++++++++++++++++++++---------------
 4 files changed, 108 insertions(+), 72 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 4193f4b4afd..168e779ae67 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,6 @@ AllCops:
   Include:
     - lib/**/*.rb
   Exclude:
-    - lib/jekyll/renderer.rb
     - bin/**/*
     - exe/**/*
     - benchmark/**/*
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 11d5fa865cf..34741c8ff1d 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -78,7 +78,7 @@ def validate_permalink!(filename)
     #
     # Returns the transformed contents.
     def transform
-      _renderer.transform
+      _renderer.convert(content)
     end
 
     # Determine the extension depending on content_type.
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 324a867d475..2fb899cc5e3 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -127,12 +127,12 @@ def process(name)
     # layouts      - The Hash of {"name" => "layout"}.
     # site_payload - The site payload Hash.
     #
-    # Returns nothing.
+    # Returns String rendered page.
     def render(layouts, site_payload)
-      site_payload["page"] = to_liquid
-      site_payload["paginator"] = pager.to_liquid
-
-      do_layout(site_payload, layouts)
+      self.output = _renderer.tap do |renderer|
+        renderer.layouts = layouts
+        renderer.payload = site_payload
+      end.run
     end
 
     # The path to the source file
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index 749882bf77d..3a4aedc9d0f 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -33,50 +33,44 @@ def layouts
     # Determine which converters to use based on this document's
     # extension.
     #
-    # Returns an array of Converter instances.
+    # Returns Array of Converter instances.
     def converters
       @converters ||= site.converters.select { |c| c.matches(document.extname) }.sort
     end
 
     # Determine the extname the outputted file should have
     #
-    # Returns the output extname including the leading period.
+    # Returns String the output extname including the leading period.
     def output_ext
       @output_ext ||= (permalink_ext || converter_output_ext)
     end
 
-    ######################
-    ## DAT RENDER THO
-    ######################
-
+    # Prepare payload and render the document
+    #
+    # Returns String rendered document output
     def run
       Jekyll.logger.debug "Rendering:", document.relative_path
 
-      payload["page"] = document.to_liquid
-
-      if document.respond_to? :pager
-        payload["paginator"] = document.pager.to_liquid
-      end
-
-      if document.is_a?(Document) && document.collection.label == "posts"
-        payload["site"]["related_posts"] = document.related_posts
-      else
-        payload["site"]["related_posts"] = nil
-      end
-
-      # render and transform content (this becomes the final content of the object)
-      payload["highlighter_prefix"] = converters.first.highlighter_prefix
-      payload["highlighter_suffix"] = converters.first.highlighter_suffix
+      assign_pages!
+      assign_related_posts!
+      assign_highlighter_options!
 
       Jekyll.logger.debug "Pre-Render Hooks:", document.relative_path
       document.trigger_hooks(:pre_render, payload)
 
+      render_document
+    end
+
+    # Render the document.
+    #
+    # Returns String rendered document output
+    # rubocop: disable AbcSize
+    def render_document
       info = {
+        :filters   => [Jekyll::Filters],
         :registers => { :site => site, :page => payload["page"] }
       }
-
       output = document.content
-
       if document.render_with_liquid?
         Jekyll.logger.debug "Rendering Liquid:", document.relative_path
         output = render_liquid(output, payload, info, document.path)
@@ -88,21 +82,16 @@ def run
 
       if document.place_in_layout?
         Jekyll.logger.debug "Rendering Layout:", document.relative_path
-        place_in_layouts(
-          output,
-          payload,
-          info
-        )
-      else
-        output
+        output = place_in_layouts(output, payload, info)
       end
+
+      output
     end
+    # rubocop: enable AbcSize
 
-    # Convert the given content using the converters which match this renderer's document.
-    #
-    # content - the raw, unconverted content
+    # Convert the document using the converters which match this renderer's document.
     #
-    # Returns the converted content.
+    # Returns String the converted content.
     def convert(content)
       converters.reduce(content) do |output, converter|
         begin
@@ -124,7 +113,7 @@ def convert(content)
     # info    -
     # path    - (optional) the path to the file, for use in ex
     #
-    # Returns the content, rendered by Liquid.
+    # Returns String the content, rendered by Liquid.
     def render_liquid(content, payload, info, path = nil)
       template = site.liquid_renderer.file(path).parse(content)
       template.warnings.each do |e|
@@ -144,26 +133,18 @@ def render_liquid(content, payload, info, path = nil)
     #
     # layout - the layout to check
     #
-    # Returns true if the layout is invalid, false if otherwise
+    # Returns Boolean true if the layout is invalid, false if otherwise
     def invalid_layout?(layout)
       !document.data["layout"].nil? && layout.nil? && !(document.is_a? Jekyll::Excerpt)
     end
 
-    # Render layouts and place given content inside.
-    #
-    # content - the content to be placed in the layout
-    #
+    # Render layouts and place document content inside.
     #
-    # Returns the content placed in the Liquid-rendered layouts
+    # Returns String rendered content
     def place_in_layouts(content, payload, info)
       output = content.dup
       layout = layouts[document.data["layout"]]
-
-      Jekyll.logger.warn(
-        "Build Warning:",
-        "Layout '#{document.data["layout"]}' requested in "\
-        "#{document.relative_path} does not exist."
-      ) if invalid_layout? layout
+      validate_layout(layout)
 
       used = Set.new([layout])
 
@@ -171,33 +152,87 @@ def place_in_layouts(content, payload, info)
       payload["layout"] = nil
 
       while layout
-        payload["content"] = output
-        payload["layout"]  = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
-
-        output = render_liquid(
-          layout.content,
-          payload,
-          info,
-          layout.relative_path
-        )
-
-        # Add layout to dependency tree
-        site.regenerator.add_dependency(
-          site.in_source_dir(document.path),
-          site.in_source_dir(layout.path)
-        ) if document.write?
-
-        if (layout = layouts[layout.data["layout"]])
+        output = render_layout(output, layout, info)
+        add_regenerator_dependencies(layout)
+
+        if (layout = site.layouts[layout.data["layout"]])
           break if used.include?(layout)
           used << layout
         end
       end
-
       output
     end
 
+    # Checks if the layout specified in the document actually exists
+    #
+    # layout - the layout to check
+    # Returns nothing
+    private
+    def validate_layout(layout)
+      Jekyll.logger.warn(
+        "Build Warning:",
+        "Layout '#{document.data["layout"]}' requested "\
+        "in #{document.relative_path} does not exist."
+      ) if invalid_layout?(layout)
+    end
+
+    # Render layout content into document.output
+    #
+    # Returns String rendered content
     private
+    def render_layout(output, layout, info)
+      payload["content"] = output
+      payload["layout"]  = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
+
+      render_liquid(
+        layout.content,
+        payload,
+        info,
+        layout.relative_path
+      )
+    end
 
+    private
+    def add_regenerator_dependencies(layout)
+      site.regenerator.add_dependency(
+        site.in_source_dir(document.path),
+        site.in_source_dir(layout.path)
+      ) if document.write?
+    end
+
+    # Set page content to payload and assign pager if document has one.
+    #
+    # Returns nothing
+    private
+    def assign_pages!
+      payload["page"] = document.to_liquid
+      payload["paginator"] = if document.respond_to?(:pager)
+                               document.pager.to_liquid
+                             end
+    end
+
+    # Set related posts to payload if document is a post.
+    #
+    # Returns nothing
+    private
+    def assign_related_posts!
+      if document.is_a?(Document) && document.collection.label == "posts"
+        payload["site"]["related_posts"] = document.related_posts
+      else
+        payload["site"]["related_posts"] = nil
+      end
+    end
+
+    # Set highlighter prefix and suffix
+    #
+    # Returns nothing
+    private
+    def assign_highlighter_options!
+      payload["highlighter_prefix"] = converters.first.highlighter_prefix
+      payload["highlighter_suffix"] = converters.first.highlighter_suffix
+    end
+
+    private
     def permalink_ext
       if document.permalink && !document.permalink.end_with?("/")
         permalink_ext = File.extname(document.permalink)
@@ -205,6 +240,7 @@ def permalink_ext
       end
     end
 
+    private
     def converter_output_ext
       if output_exts.size == 1
         output_exts.last
@@ -213,6 +249,7 @@ def converter_output_ext
       end
     end
 
+    private
     def output_exts
       @output_exts ||= converters.map do |c|
         c.output_ext(document.extname)

From d49c78177986365dd204442e09b35c9086647a5f Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 31 Mar 2017 01:20:50 -0400
Subject: [PATCH 2062/4996] Address my comments in #5052.

---
 lib/jekyll/page.rb     | 8 ++++----
 lib/jekyll/renderer.rb | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 2fb899cc5e3..02c6cfae9f1 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -129,10 +129,10 @@ def process(name)
     #
     # Returns String rendered page.
     def render(layouts, site_payload)
-      self.output = _renderer.tap do |renderer|
-        renderer.layouts = layouts
-        renderer.payload = site_payload
-      end.run
+      site_payload["page"] = to_liquid
+      site_payload["paginator"] = pager.to_liquid
+
+      do_layout(site_payload, layouts)
     end
 
     # The path to the source file
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index 3a4aedc9d0f..eb1f54ab509 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -67,8 +67,7 @@ def run
     # rubocop: disable AbcSize
     def render_document
       info = {
-        :filters   => [Jekyll::Filters],
-        :registers => { :site => site, :page => payload["page"] }
+        :registers => { :site => site, :page => payload["page"] },
       }
       output = document.content
       if document.render_with_liquid?
@@ -169,11 +168,12 @@ def place_in_layouts(content, payload, info)
     # Returns nothing
     private
     def validate_layout(layout)
+      return unless invalid_layout?(layout)
       Jekyll.logger.warn(
         "Build Warning:",
         "Layout '#{document.data["layout"]}' requested "\
         "in #{document.relative_path} does not exist."
-      ) if invalid_layout?(layout)
+      )
     end
 
     # Render layout content into document.output
@@ -194,10 +194,11 @@ def render_layout(output, layout, info)
 
     private
     def add_regenerator_dependencies(layout)
+      return unless document.write?
       site.regenerator.add_dependency(
         site.in_source_dir(document.path),
         site.in_source_dir(layout.path)
-      ) if document.write?
+      )
     end
 
     # Set page content to payload and assign pager if document has one.

From 20ed6d0a3ccdd760bbaab15a30f1e335bb079673 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 31 Mar 2017 01:23:54 -0400
Subject: [PATCH 2063/4996] Update history to reflect merge of #5052

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index ec0b2ca85b0..fd2ba1a8079 100644
--- a/History.markdown
+++ b/History.markdown
@@ -44,6 +44,7 @@
   * Fix Appveyor with DST-aware cucumber steps (#5961)
   * Use Rubocop v0.47.1 till we're ready for v0.48 (#5989)
   * Test against Ruby 2.4.0 (#5687)
+  * rubocop: lib/jekyll/renderer.rb complexity fixes (#5052)
 
 ### Site Enhancements
 

From 1b1fe27d75c1f4933138b7738a006749d7bba65c Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Fri, 31 Mar 2017 11:00:08 +0530
Subject: [PATCH 2064/4996] Re-surface missing public methods in
 `Jekyll::Document` (#5975)

Merge pull request 5975
---
 lib/jekyll/document.rb | 70 +++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 386683d6d5a..a37ca1e41f5 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -3,10 +3,13 @@
 module Jekyll
   class Document
     include Comparable
+    extend Forwardable
 
     attr_reader :path, :site, :extname, :collection
     attr_accessor :content, :output
 
+    def_delegator :self, :read_post_data, :post_read
+
     YAML_FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m
     DATELESS_FILENAME_MATCHER = %r!^(?:.+/)*(.*)(\.[^.]+)$!
     DATE_FILENAME_MATCHER = %r!^(?:.+/)*(\d{2,4}-\d{1,2}-\d{1,2})-(.*)(\.[^.]+)$!
@@ -375,6 +378,38 @@ def respond_to_missing?(method, *)
       data.key?(method.to_s) || super
     end
 
+    # Add superdirectories of the special_dir to categories.
+    # In the case of es/_posts, 'es' is added as a category.
+    # In the case of _posts/es, 'es' is NOT added as a category.
+    #
+    # Returns nothing.
+    def categories_from_path(special_dir)
+      superdirs = relative_path.sub(%r!#{special_dir}(.*)!, "")
+        .split(File::SEPARATOR)
+        .reject do |c|
+        c.empty? || c == special_dir || c == basename
+      end
+      merge_data!({ "categories" => superdirs }, :source => "file path")
+    end
+
+    def populate_categories
+      merge_data!({
+        "categories" => (
+        Array(data["categories"]) + Utils.pluralized_array_from_hash(
+          data,
+          "category",
+          "categories"
+        )
+        ).map(&:to_s).flatten.uniq,
+      })
+    end
+
+    def populate_tags
+      merge_data!({
+        "tags" => Utils.pluralized_array_from_hash(data, "tag", "tags").flatten,
+      })
+    end
+
     private
     def merge_categories!(other)
       if other.key?("categories") && !other["categories"].nil?
@@ -445,41 +480,6 @@ def modify_date(date)
       end
     end
 
-    # Add superdirectories of the special_dir to categories.
-    # In the case of es/_posts, 'es' is added as a category.
-    # In the case of _posts/es, 'es' is NOT added as a category.
-    #
-    # Returns nothing.
-    private
-    def categories_from_path(special_dir)
-      superdirs = relative_path.sub(%r!#{special_dir}(.*)!, "")
-        .split(File::SEPARATOR)
-        .reject do |c|
-        c.empty? || c == special_dir || c == basename
-      end
-      merge_data!({ "categories" => superdirs }, :source => "file path")
-    end
-
-    private
-    def populate_categories
-      merge_data!({
-        "categories" => (
-        Array(data["categories"]) + Utils.pluralized_array_from_hash(
-          data,
-          "category",
-          "categories"
-        )
-        ).map(&:to_s).flatten.uniq,
-      })
-    end
-
-    private
-    def populate_tags
-      merge_data!({
-        "tags" => Utils.pluralized_array_from_hash(data, "tag", "tags").flatten,
-      })
-    end
-
     private
     def generate_excerpt
       if generate_excerpt?

From bdcdfa694f16154346d9d998b5befdeb319cb275 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 31 Mar 2017 01:30:09 -0400
Subject: [PATCH 2065/4996] Update history to reflect merge of #5975 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fd2ba1a8079..a25bb4158db 100644
--- a/History.markdown
+++ b/History.markdown
@@ -62,6 +62,7 @@
   * Allow abbreviated post dates (#5920)
   * Remove dependency on include from default about.md (#5903)
   * Allow colons in `uri_escape` filter (#5957)
+  * Re-surface missing public methods in `Jekyll::Document` (#5975)
 
 ## 3.4.3 / 2017-03-21
 

From b807799f24685f5ca6d13a355840928a4a1b479d Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 31 Mar 2017 01:30:59 -0400
Subject: [PATCH 2066/4996] Specify version constraint in subcommand error
 message. (#5974)

Merge pull request 5974
---
 exe/jekyll             |  4 ++--
 lib/jekyll/external.rb | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/exe/jekyll b/exe/jekyll
index 3bd37e544de..f0f41c93e6f 100755
--- a/exe/jekyll
+++ b/exe/jekyll
@@ -25,13 +25,13 @@ Mercenary.program(:jekyll) do |p|
     "Layouts directory (defaults to ./_layouts)"
   p.option "profile", "--profile", "Generate a Liquid rendering profile"
 
-  Jekyll::External.require_if_present(Jekyll::External.blessed_gems) do |g|
+  Jekyll::External.require_if_present(Jekyll::External.blessed_gems) do |g, ver_constraint|
     cmd = g.split("-").last
     p.command(cmd.to_sym) do |c|
       c.syntax cmd
       c.action do
         Jekyll.logger.abort_with "You must install the '#{g}' gem" \
-          " to use the 'jekyll #{cmd}' command."
+          " version #{ver_constraint} to use the 'jekyll #{cmd}' command."
       end
     end
   end
diff --git a/lib/jekyll/external.rb b/lib/jekyll/external.rb
index 503569dba7a..bdefc798ae8 100644
--- a/lib/jekyll/external.rb
+++ b/lib/jekyll/external.rb
@@ -23,12 +23,25 @@ def require_if_present(names)
             require name
           rescue LoadError
             Jekyll.logger.debug "Couldn't load #{name}. Skipping."
-            yield(name) if block_given?
+            yield(name, version_constraint(name)) if block_given?
             false
           end
         end
       end
 
+      #
+      # The version constraint required to activate a given gem.
+      # Usually the gem version requirement is "> 0," because any version
+      # will do. In the case of jekyll-docs, however, we require the exact
+      # same version as Jekyll.
+      #
+      # Returns a String version constraint in a parseable form for
+      # RubyGems.
+      def version_constraint(gem_name)
+        return "= #{Jekyll::VERSION}" if gem_name.to_s.eql?("jekyll-docs")
+        "> 0"
+      end
+
       #
       # Require a gem or gems. If it's not present, show a very nice error
       # message that explains everything and is much more helpful than the

From a4d2ceb320628e9a35b6ca4dc25be25ed11836c3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 31 Mar 2017 01:31:00 -0400
Subject: [PATCH 2067/4996] Update history to reflect merge of #5974 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a25bb4158db..9822c68348c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -5,6 +5,7 @@
   * Upgrade to Liquid v4 (#4362)
   * Convert StaticFile liquid representation to a Drop & add front matter defaults support to StaticFiles (#5871)
   * Add support for Tab-Separated Values data files (`*.tsv`) (#5985)
+  * Specify version constraint in subcommand error message. (#5974)
 
 ### Documentation
 

From 4eb82706d8d508afd8c36bb65f0267d1021345df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kl=C3=ADmek?= 
Date: Fri, 31 Mar 2017 07:31:32 +0200
Subject: [PATCH 2068/4996] Mention Bash on Ubuntu on Windows (#5960)

Merge pull request 5960
---
 docs/_docs/windows.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index d3a0fa641d3..cc284567b6a 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -4,8 +4,9 @@ permalink: /docs/windows/
 ---
 
 While Windows is not an officially-supported platform, it can be used to run
-Jekyll with the proper tweaks. This page aims to collect some of the general
-knowledge and lessons that have been unearthed by Windows users.
+Jekyll with the proper tweaks. If you are using Windows 10 Anniversary Update, 
+the easiest way to run Jekyll is to use the new [Bash on Ubuntu on Windows](https://msdn.microsoft.com/en-us/commandline/wsl/about?f=255&MSPPError=-2147217396).
+For older installations, this page aims to collect some of the general knowledge and lessons that have been unearthed by Windows users.
 
 ## Installation
 

From 367c4521053fc4838615b6bddc4a82c065447b68 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 31 Mar 2017 01:31:33 -0400
Subject: [PATCH 2069/4996] Update history to reflect merge of #5960 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9822c68348c..0cfc736c6f7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -34,6 +34,7 @@
   * Require Ruby > 2.1.0 (#5983)
   * Fix broken link (#5994)
   * Default options for script/proof (#5995)
+  * Mention Bash on Ubuntu on Windows (#5960)
 
 ### Development Fixes
 

From 201470902a7ccd7589e5c3276cf293f5d2001c96 Mon Sep 17 00:00:00 2001
From: "Yury V. Zaytsev" 
Date: Fri, 31 Mar 2017 07:32:14 +0200
Subject: [PATCH 2070/4996] Document `--unpublished` flag introduced in 91e9ecf
 (#5959)

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

diff --git a/docs/_docs/frontmatter.md b/docs/_docs/frontmatter.md
index cb55c444e53..cf5aad13f14 100644
--- a/docs/_docs/frontmatter.md
+++ b/docs/_docs/frontmatter.md
@@ -99,6 +99,14 @@ front matter of a page or post.
 
 
    
 
+
    
+  
    ProTip™: Render Posts Marked As Unpublished
    
+  
    
+    To preview unpublished pages, simply run `jekyll serve` or `jekyll build`
+    with the `--unpublished` switch. Jekyll also has a handy drafts
+    feature tailored specifically for blog posts.
+  
    
+
    
 
 ## Custom Variables
 

From b7916f8a838e60658572d804e456e960633be225 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 31 Mar 2017 01:32:15 -0400
Subject: [PATCH 2071/4996] Update history to reflect merge of #5959 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0cfc736c6f7..a5c3cb5c666 100644
--- a/History.markdown
+++ b/History.markdown
@@ -35,6 +35,7 @@
   * Fix broken link (#5994)
   * Default options for script/proof (#5995)
   * Mention Bash on Ubuntu on Windows (#5960)
+  * Document `--unpublished` flag introduced in 91e9ecf (#5959)
 
 ### Development Fixes
 

From e4a09706f5b386a368ad4f3aa7a4b7e6630bfe21 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Fri, 31 Mar 2017 11:06:14 +0530
Subject: [PATCH 2072/4996] Add a template for custom 404 page (#5945)

Merge pull request 5945
---
 lib/site_template/404.html | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 lib/site_template/404.html

diff --git a/lib/site_template/404.html b/lib/site_template/404.html
new file mode 100644
index 00000000000..c472b4ea0a7
--- /dev/null
+++ b/lib/site_template/404.html
@@ -0,0 +1,24 @@
+---
+layout: default
+---
+
+
+
+
    
+  
    404
    
+
+  
    Page not found :(
    
+  
    The requested page could not be found.
    
+
    

From 7c49070a0ecb2753b98d34b226a922a37a9f5079 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 31 Mar 2017 01:36:15 -0400
Subject: [PATCH 2073/4996] Update history to reflect merge of #5945 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a5c3cb5c666..e374b229883 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,7 @@
   * Convert StaticFile liquid representation to a Drop & add front matter defaults support to StaticFiles (#5871)
   * Add support for Tab-Separated Values data files (`*.tsv`) (#5985)
   * Specify version constraint in subcommand error message. (#5974)
+  * Add a template for custom 404 page (#5945)
 
 ### Documentation
 

From 0eb937935451377232724370b6228bb08f9a8cec Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Fri, 31 Mar 2017 11:16:15 +0530
Subject: [PATCH 2074/4996] Require `runtime_dependencies` of a Gem-based theme
 from its `.gemspec` file (#5914)

Merge pull request 5914
---
 Gemfile                                          |  1 +
 docs/_docs/themes.md                             |  6 ++++++
 features/theme.feature                           |  7 +++++++
 lib/jekyll/plugin_manager.rb                     | 12 ++++++++++++
 lib/jekyll/theme.rb                              |  4 ++++
 .../test-dependency-theme.gemspec                | 11 +++++++++++
 test/test_plugin_manager.rb                      | 16 ++++++++++++++--
 7 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/test-dependency-theme/test-dependency-theme.gemspec

diff --git a/Gemfile b/Gemfile
index 8355c1b9570..7e509366d6d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,6 +27,7 @@ group :test do
   gem "rspec-mocks"
   gem "rubocop", "~> 0.47.1"
   gem "test-theme", :path => File.expand_path("./test/fixtures/test-theme", File.dirname(__FILE__))
+  gem "test-dependency-theme", :path => File.expand_path("./test/fixtures/test-dependency-theme", File.dirname(__FILE__))
 
   gem "jruby-openssl" if RUBY_ENGINE == "jruby"
 end
diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index 5ad3b2da8b2..6770a9ca998 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -206,6 +206,12 @@ Your theme's styles can be included in the user's stylesheet using the `@import`
 {% raw %}@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.)
+
+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.
+
 ### Documenting your theme
 
 Your theme should include a `/README.md` file, which explains how site authors can install and use your theme. What layouts are included? What includes? Do they need to add anything special to their site's configuration file?
diff --git a/features/theme.feature b/features/theme.feature
index 7729a0ebbb6..820283e889d 100644
--- a/features/theme.feature
+++ b/features/theme.feature
@@ -46,6 +46,13 @@ Feature: Writing themes
     And I should see "default.html from test-theme: I'm content." in "_site/index.html"
     And I should see "post.html from the project: I'm more content." in "_site/post.html"
 
+  Scenario: Requiring dependencies of a theme
+    Given I have a configuration file with "theme" set to "test-dependency-theme"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And the "_site/test.txt" file should exist
+
   Scenario: Complicated site that puts it all together
     Given I have a configuration file with "theme" set to "test-theme"
     And I have a _posts directory
diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb
index 53c081130e6..fa183c628dd 100644
--- a/lib/jekyll/plugin_manager.rb
+++ b/lib/jekyll/plugin_manager.rb
@@ -15,6 +15,7 @@ def initialize(site)
     #
     # Returns nothing
     def conscientious_require
+      require_theme_deps if site.theme
       require_plugin_files
       require_gems
       deprecation_checks
@@ -29,6 +30,17 @@ def require_gems
       )
     end
 
+    # Require each of the runtime_dependencies specified by the theme's gemspec.
+    #
+    # Returns false only if no dependencies have been specified, otherwise nothing.
+    def require_theme_deps
+      return false unless site.theme.runtime_dependencies
+      site.theme.runtime_dependencies.each do |dep|
+        next if dep.name == "jekyll"
+        External.require_with_graceful_fail(dep.name) if plugin_allowed?(dep.name)
+      end
+    end
+
     def self.require_from_bundler
       if !ENV["JEKYLL_NO_BUNDLER_REQUIRE"] && File.file?("Gemfile")
         require "bundler"
diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb
index 803004f3ab8..045c91aa0c8 100644
--- a/lib/jekyll/theme.rb
+++ b/lib/jekyll/theme.rb
@@ -39,6 +39,10 @@ def configure_sass
       Sass.load_paths << sass_path
     end
 
+    def runtime_dependencies
+      gemspec.runtime_dependencies
+    end
+
     private
 
     def path_for(folder)
diff --git a/test/fixtures/test-dependency-theme/test-dependency-theme.gemspec b/test/fixtures/test-dependency-theme/test-dependency-theme.gemspec
new file mode 100644
index 00000000000..f372354e275
--- /dev/null
+++ b/test/fixtures/test-dependency-theme/test-dependency-theme.gemspec
@@ -0,0 +1,11 @@
+Gem::Specification.new do |s|
+  s.name          = 'test-dependency-theme'
+  s.version       = '0.1.0'
+  s.licenses      = ['MIT']
+  s.summary       = "This is another theme used to test Jekyll"
+  s.authors       = ["Jekyll"]
+  s.files         = ["lib/example.rb"]
+  s.homepage      = 'https://github.com/jekyll/jekyll'
+
+  s.add_runtime_dependency "jekyll_test_plugin"
+end
diff --git a/test/test_plugin_manager.rb b/test/test_plugin_manager.rb
index 702df593bb8..9217965b211 100644
--- a/test/test_plugin_manager.rb
+++ b/test/test_plugin_manager.rb
@@ -142,12 +142,24 @@ def with_no_gemfile
   end
 
   should "conscientious require" do
-    site = double
+    site = double({
+      :config      => { "theme" => "test-dependency-theme" },
+      :in_dest_dir => "/tmp/_site/",
+    })
     plugin_manager = PluginManager.new(site)
 
+    expect(site).to receive(:theme).and_return(true)
+    expect(site).to receive(:process).and_return(true)
     expect(plugin_manager).to(
-      receive_messages([:require_plugin_files, :require_gems, :deprecation_checks])
+      receive_messages([
+        :require_theme_deps,
+        :require_plugin_files,
+        :require_gems,
+        :deprecation_checks,
+      ])
     )
     plugin_manager.conscientious_require
+    site.process
+    assert site.in_dest_dir("test.txt")
   end
 end

From e7a7215095b8abd8325b6e9646fe545c1bbaa974 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 31 Mar 2017 01:46:16 -0400
Subject: [PATCH 2075/4996] Update history to reflect merge of #5914 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e374b229883..1e1f1b18e42 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
   * Add support for Tab-Separated Values data files (`*.tsv`) (#5985)
   * Specify version constraint in subcommand error message. (#5974)
   * Add a template for custom 404 page (#5945)
+  * Require `runtime_dependencies` of a Gem-based theme from its `.gemspec` file (#5914)
 
 ### Documentation
 

From a4c4388b8dc6b37878db2b94b3c4c60d8cd535f5 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Fri, 31 Mar 2017 07:48:54 +0200
Subject: [PATCH 2076/4996] Don't raise an error if URL contains a colon
 (#5889)

Merge pull request 5889
---
 lib/jekyll/url.rb |  9 +--------
 test/test_url.rb  | 10 ----------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index aefbebc9e26..8f3047d30cf 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -35,15 +35,8 @@ def initialize(options)
     # The generated relative URL of the resource
     #
     # Returns the String URL
-    # Raises a Jekyll::Errors::InvalidURLError if the relative URL contains a colon
     def to_s
-      sanitized_url = sanitize_url(generated_permalink || generated_url)
-      if sanitized_url.include?(":")
-        raise Jekyll::Errors::InvalidURLError,
-          "The URL #{sanitized_url} is invalid because it contains a colon."
-      else
-        sanitized_url
-      end
+      sanitize_url(generated_permalink || generated_url)
     end
 
     # Generates a URL from the permalink
diff --git a/test/test_url.rb b/test/test_url.rb
index fc3678d70d0..23ab9735861 100644
--- a/test/test_url.rb
+++ b/test/test_url.rb
@@ -61,16 +61,6 @@ class TestURL < JekyllUnitTest
       ).to_s
     end
 
-    should "throw an exception if the URL contains a colon" do
-      url = URL.new(
-        :template     => "/:x/:y/:z",
-        :placeholders => { :x => "foo", :z => "bar" }
-      )
-      assert_raises Jekyll::Errors::InvalidURLError do
-        url.to_s
-      end
-    end
-
     should "check for key without trailing underscore" do
       _, matching_doc = fixture_document("_methods/configuration.md")
       assert_equal "/methods/configuration-configuration_methods_configuration", URL.new(

From 57e93c463abb4ad73d2e879b65ede0b3dcabbfa8 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 31 Mar 2017 01:48:55 -0400
Subject: [PATCH 2077/4996] Update history to reflect merge of #5889 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1e1f1b18e42..e203d2c2e60 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,7 @@
   * Specify version constraint in subcommand error message. (#5974)
   * Add a template for custom 404 page (#5945)
   * Require `runtime_dependencies` of a Gem-based theme from its `.gemspec` file (#5914)
+  * Don't raise an error if URL contains a colon (#5889)
 
 ### Documentation
 

From da5ee4685e9c9f9c4ba3b8bdd890507626ef842b Mon Sep 17 00:00:00 2001
From: Mer 
Date: Fri, 31 Mar 2017 07:00:51 +0100
Subject: [PATCH 2078/4996] Update upgrading.md to mention usage of `bundle
 update` (#5604)

Merge pull request 5604
---
 docs/_docs/upgrading.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/_docs/upgrading.md b/docs/_docs/upgrading.md
index a1280672d96..e59187a496d 100644
--- a/docs/_docs/upgrading.md
+++ b/docs/_docs/upgrading.md
@@ -8,3 +8,6 @@ Upgrading from an older version of Jekyll? Upgrading to a new major version of J
 
 - [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.

From 5dee5a000ad9acb4ff3551a87328380c5b957dfd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 31 Mar 2017 02:00:52 -0400
Subject: [PATCH 2079/4996] Update history to reflect merge of #5604 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e203d2c2e60..2e7cf750bbd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -39,6 +39,7 @@
   * Default options for script/proof (#5995)
   * Mention Bash on Ubuntu on Windows (#5960)
   * Document `--unpublished` flag introduced in 91e9ecf (#5959)
+  * Update upgrading.md to mention usage of `bundle update` (#5604)
 
 ### Development Fixes
 

From f3bfe2febde9d7289b4d027c4cb57ab49a497bd1 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 31 Mar 2017 12:02:16 -0400
Subject: [PATCH 2080/4996] travis: upgrade to 2.4.1

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c582e11324f..a2bf5192376 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ language: ruby
 sudo: false
 
 rvm:
-  - &ruby1 2.4.0
+  - &ruby1 2.4.1
   - &ruby2 2.3.4
   - &ruby3 2.2.7
   - &ruby4 2.1.10

From 725c756ae14df9e20ce7d7046f2951467f1ebd87 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 31 Mar 2017 12:04:36 -0400
Subject: [PATCH 2081/4996] travis: don't duplicate fmt & default-site tests

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a2bf5192376..c8b8671bd42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,6 @@ matrix:
       env: TEST_SUITE=fmt
     - rvm: *ruby1
       env: TEST_SUITE=default-site
-    - rvm: *ruby2
-      env: TEST_SUITE=fmt
-    - rvm: *ruby2
-      env: TEST_SUITE=default-site
   exclude:
     - rvm: *jruby
       env: TEST_SUITE=cucumber

From faf5be46a588e782488cc163fdd29fc04ee73446 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 31 Mar 2017 14:44:46 -0400
Subject: [PATCH 2082/4996] Filters#time helper: Duplicate time before calling
 #localtime. (#5996)

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

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 3020bfbcb6b..ea0fc9054d5 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -352,7 +352,7 @@ def time(input)
         raise Errors::InvalidDateError,
           "Invalid Date: '#{input.inspect}' is not a valid datetime."
       end
-      date.to_time.localtime
+      date.to_time.dup.localtime
     end
 
     private

From 55103132f953beed9a43434443994d65b568c392 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 31 Mar 2017 14:44:47 -0400
Subject: [PATCH 2083/4996] Update history to reflect merge of #5996 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2e7cf750bbd..f96994ba2e9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -71,6 +71,10 @@
   * Allow colons in `uri_escape` filter (#5957)
   * Re-surface missing public methods in `Jekyll::Document` (#5975)
 
+### fix
+
+  * Filters#time helper: Duplicate time before calling #localtime. (#5996)
+
 ## 3.4.3 / 2017-03-21
 
   * Backport #5957 for v3.4.x: Allow colons in `uri_escape` filter (#5968)

From 45b1f9e5ec4288f999f34d3c821bce74ca3f52a3 Mon Sep 17 00:00:00 2001
From: Adam Hollett 
Date: Mon, 3 Apr 2017 01:28:29 -0400
Subject: [PATCH 2084/4996] Fix missing quotation mark (#6002)

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

diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index 50750869674..989aa907eeb 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -603,7 +603,7 @@ collections:
 # Handling Reading
 safe:         false
 include:      [".htaccess"]
-exclude:      ["Gemfile", "Gemfile.lock", node_modules", "vendor/bundle/", "vendor/cache/", "vendor/gems/", "vendor/ruby/"]
+exclude:      ["Gemfile", "Gemfile.lock", "node_modules", "vendor/bundle/", "vendor/cache/", "vendor/gems/", "vendor/ruby/"]
 keep_files:   [".git", ".svn"]
 encoding:     "utf-8"
 markdown_ext: "markdown,mkdown,mkdn,mkd,md"

From 370d28e290f9a7c01e00d81f9056734ab83d1289 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 3 Apr 2017 01:28:30 -0400
Subject: [PATCH 2085/4996] Update history to reflect merge of #6002 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f96994ba2e9..99b0c1851cf 100644
--- a/History.markdown
+++ b/History.markdown
@@ -40,6 +40,7 @@
   * Mention Bash on Ubuntu on Windows (#5960)
   * Document `--unpublished` flag introduced in 91e9ecf (#5959)
   * Update upgrading.md to mention usage of `bundle update` (#5604)
+  * Fix missing quotation mark (#6002)
 
 ### Development Fixes
 

From dede66936e814b7c0ef133b38ea1389211ff6b89 Mon Sep 17 00:00:00 2001
From: Tom Johnson 
Date: Tue, 4 Apr 2017 15:37:33 -0700
Subject: [PATCH 2086/4996] New tutorial: Convert an HTML site to Jekyll
 (#5881)

Merge pull request 5881
---
 docs/_data/tutorials.yml               |   1 +
 docs/_tutorials/create-jekyll-theme.md | 490 +++++++++++++++++++++++++
 docs/img/jekylllayoutconcept.png       | Bin 0 -> 34133 bytes
 3 files changed, 491 insertions(+)
 create mode 100644 docs/_tutorials/create-jekyll-theme.md
 create mode 100644 docs/img/jekylllayoutconcept.png

diff --git a/docs/_data/tutorials.yml b/docs/_data/tutorials.yml
index 809c7e55427..baf778963f9 100644
--- a/docs/_data/tutorials.yml
+++ b/docs/_data/tutorials.yml
@@ -4,6 +4,7 @@
   - navigation
   - orderofinterpretation
   - custom-404-page
+  - create-jekyll-theme
 
 #- title: Another section
 #  tutorials:
diff --git a/docs/_tutorials/create-jekyll-theme.md b/docs/_tutorials/create-jekyll-theme.md
new file mode 100644
index 00000000000..348ff31ad90
--- /dev/null
+++ b/docs/_tutorials/create-jekyll-theme.md
@@ -0,0 +1,490 @@
+---
+layout: tutorials
+permalink: /tutorials/create-jekyll-theme/
+title: Create your first Jekyll theme
+---
+
+If you're looking for themes for your Jekyll site, you don't have to restrict yourself to existing Jekyll themes. It's pretty easy to convert almost any static HTML site into a Jekyll theme.
+
+In many ways, any site that is currently a static site *already* is a Jekyll site. Jekyll just allows you to automate parts of the site (like inserting pages into templates, rendering lists for navigation, generating feeds and sitemaps, and more) as it processes the files.
+
+Understanding how to convert any HTML site into a Jekyll website will open your world to many more options for Jekyll themes. Instead of searching online for "Jekyll themes," you can choose from the large variety of HTML templates for your site, quickly Jekyll-ize the HTML template as you need to, and build the output with Jekyll.
+
+Although websites can have sophisticated features and controls, we'll keep things simple in this tutorial. This tutorial contains the following sections:
+
+* TOC
+{:toc}
+
+## Understand a basic Jekyll site
+
+First, let's start with a grounding in the basics. Stripping a Jekyll site down to an extremely basic level will help clarify what happens in a Jekyll site. If you haven't already installed the jekyll gem, [install it]({% link _docs/installation.md %}).
+
+A simple Jekyll site might consist of just 3 files:
+
+```
+├── _config.yaml
+├── _layouts
+│   └── default.html
+└── index.md
+```
+
+Manually create these 3 files in a folder called `myjekyllsite`. (Put `default.html` inside a folder called `_layouts`.) Then populate the content of the `default.html` and `index.md` files as follows:
+
+**_layouts/default.html**
+
+```html
+
+  
+     {% raw %}{{ content }}{% endraw %}
+  
+
+```
+
+**index.md**
+
+```yaml
+---
+title: My page
+layout: default.html
+---
+
+Some **bold** content.
+```
+
+Now `cd` to `myjekyllsite` and build the site:
+
+```
+jekyll serve
+```
+
+When you build the site, you get a preview URL such as `http://127.0.0.1:4001/`. The site's files are built in the `_site` folder.
+
+This is a Jekyll site at the most basic level. Here's what is happening:
+
+* The `_config.yml` file contains settings that Jekyll uses as it processes your site. An empty config file will use default values for building a Jekyll site. For example, to convert Markdown to HTML, Jekyll will automatically use the [kramdown Markdown filter](https://rubygems.org/gems/kramdown/), without any need to specify it.
+* Jekyll looks for files with [front matter tags]({% link _docs/frontmatter.md %}) (the two sets of dashed lines `---` like those in `index.md`) and processes the files (populating site variables, rendering any [Liquid](https://shopify.github.io/liquid/), and converting Markdown to HTML).
+* Jekyll pushes the content from all pages and posts into the `{% raw %}{{ content }}{% endraw %}` tags in the layout specified (`default`) in the front matter tags.
+* The processed files get written as `.html` files in the `_site` directory.
+
+You can read more about how Jekyll processes the files in [Order of Interpretation](/tutorials/orderofinterpretation/).
+
+With this basic foundation of how a Jekyll site works, you can convert almost any HTML theme into a Jekyll site. The following sections will take you through a step-by-step tutorial on converting an HTML template into a Jekyll site.
+
+## 1. Create a template for your default layout
+
+Find your HTML theme and save it as a default layout. If you're converting or cloning an existing site, you can right-click the page and view the source code.
+
+For example, suppose you're cloning your company site to create a documentation site with the same branding. Or suppose you have a personal site that you built with HTML and now want to make it a Jekyll theme. Get the HTML source code for your site.
+
+{: .note .info}
+**Note:** Regardless of the site, check the license and make sure you have permission to copy the code.
+
+Copy and paste the source code into a file called `default.html`. Put the `default.html` file inside a folder called `_layouts`. This will be the default layout template for your pages and posts — that is, each page or post will use this layout when Jekyll builds the site.
+
+Note that in looking for templates, you want the HTML output of the template. If the template has PHP tags or other dynamic scripts, these dynamic elements will need to be converted to HTML or to [Liquid](https://shopify.github.io/liquid/) scripting where possible. Jekyll uses Liquid in its templating system to retrieve dynamic content.
+
+Open `default.html` into your browser locally to ensure the site looks and functions like it does online. You will likely need to adjust CSS, JS, and image paths so they work.
+
+For example, if the paths were relative on the site you copied, you'll need to either download the same assets into your Jekyll site or use absolute paths to the same assets in the cloud. (Syntax such as `src="//` requires a prefix such as `src="http://` to work in your local browser.)
+
+Jekyll provides some [filters](/docs/templates/#filters) to prepend a site URL before path. For example, you could preface your stylesheet like this:
+
+```liquid
+{% raw %}{{ "/assets/style.css" | relative_url }}{% endraw %}
+```
+
+The `relative_url` filter will prepend the `baseurl` value from your config file to the input. This is useful if your site is hosted at a subpath rather than the root of the domain (for example, `http://mysite.com/blog/`).
+
+You can also use an `absolute_url` filter. This filter will prepend the `url` *and* `baseurl` value to the input:
+
+```liquid
+{% raw %}{{ "/assets/style.css" | absolute_url }}{% endraw %}
+```
+
+Again, both `url` and `baseurl` must be defined in your site's config file, like this:
+
+```
+url: http://mysite.com
+baseurl: /blog
+```
+
+The result in the output will be `http://mysite.com/blog/assets/style.css`.
+
+Note that the `url` property of any page begins with a forward slash (`/`), so omit this at the end of your `url` or `baseurl` property.
+
+You don't have to prepend filters to link paths like this. You could also use relative links across your entire site. However you decide to code the paths to your assets, make sure they render correctly.
+
+Does your local `default.html` page look good in your browser? Are all images, styles, and other elements showing up correctly? If so, great. Keep going. You'll use this template as the layout for all your pages and posts.
+
+In the next section, you'll blank out the content of the layout and replace it with placeholder tags that get populated dynamically with your Jekyll pages.
+
+## 2. Identify the content part of the layout
+
+In `default.html`, find where the page content begins (usually at `h1` or `h2` tags). Replace the title that appears inside these tags with `{% raw %}{{ page.title }}{% endraw %}`.
+
+Remove the page content (but not code from the top nav, sidebar, or footer) and replace the page content with `{% raw %}{{ content }}{% endraw %}`.
+
+Check the layout again in your browser and make sure you didn't corrupt or alter it up by inadvertently removing a crucial `div` tag or other element. The only change should be to the title and page content, which are now blanked out or showing the placeholder tag.
+
+## 3. Create a couple of files with front matter tags
+
+Create a couple of files (`index.md` and `about.md`) in your root directory.
+
+In your `index.md` file, add some front matter tags containing a `title` and `layout` property, like this:
+
+```yaml
+---
+title: Home
+layout: default
+---
+
+Some page content here...
+```
+
+Create another page for testing called `about.md` with similar front matter tags.
+
+{: .note .info}
+**Note:** If you don't specify a layout in your pages, Jekyll will automatically use the template labeled `default`. We specify it here only to make it explicit what's happening.
+
+## 4. Add a configuration file
+
+Add a `_config.yml` file in your root directory. In `_config.yml`, you can optionally specify the markdown filter you want. By default, [kramdown](https://kramdown.gettalong.org/)) is used (without the need to specify it). If no other filter is specified, your config file will automatically apply the following as a default setting:
+
+```
+markdown: kramdown
+```
+
+You can also specify [some options](https://kramdown.gettalong.org/converter/html.html) for kramdown to make it behave more like Github-flavored Markdown:
+
+```
+kramdown:
+ input: GFM
+ auto_ids: true
+ hard_wrap: false
+ syntax_highlighter: rouge
+```
+
+## 5. Test your pages
+
+Now run `jekyll serve` and toggle between your `index.html` and `about.html` pages. The default layout should load for both pages.
+
+You've now extracted your content out into separate files and defined a common layout for pages.
+
+You could define any number of layouts you want for pages. Then just identify the layout you want that particular page to use. For example:
+
+```
+---
+title: Sample page
+layout: homepage
+---
+```
+
+This page would then use the `homepage.html` template in the `_layouts` folder.
+
+You can even set [default front matter tags](/docs/configuration/#front-matter-defaults) for pages, posts, or [collections]({% link _docs/collections.md %}) in your `_config.yml` file so that you don't have to specify the layout in your front matter tags. However, setting defaults is more advanced than this basic tutorial will cover.
+
+## 6. Configure site variables
+
+You already configured the page title using `{% raw %}{{ page.title }}{% endraw %}` tags. But there are more `title` tags to populate. Pages also have a [`title`](https://moz.com/learn/seo/title-tag) tag that appears in the browser tab or window. Typically you put the page title followed by the site title here.
+
+In your `default.html` layout, look for the `title` tags below your `head` tags:
+
+```
+ACME Website
+```
+
+Insert the following site variables:
+
+```
+{% raw %}{{ page.title }} | {{ site.title }}{% endraw %}
+```
+
+Open `_config.yml` and add a `title` property for your site's name.
+
+```
+title: ACME Website
+```
+
+Any properties you add in your `_config.yml` file are accessible through the `site` namespace. Similarly, any properties in your page's front matter are accessible through the `page` namespace. Use dot notation after `site` or `page` to access the value.
+
+Stop your Jekyll server (**Ctrl + C**) and restart it. Verify that the `title` tags are populating correctly.
+
+{: .note .info}
+**Note:** Every time you modify your config file, you have to restart Jekyll for the changes to take effect. When you modify other files, Jekyll automatically picks up the changes when it rebuilds.
+
+If you have other variables to populate in your site, do so following this same pattern.
+
+## 7. Show posts on a page
+
+It's common to show a list of posts on the homepage. First, let's create some posts so that our loop will have something to display.
+
+Add some posts in a `_posts` folder following the standard `YYYY-MM-DD-title.md` post format:
+
+* `2017-01-02-my-first-post.md`
+* `2017-01-15-my-second-post.md`
+* `2017-02-08-my-third-post.md`
+
+In each post, add some basic content:
+
+```
+---
+title: My First Post
+layout: default
+---
+
+Some sample content...
+```
+
+Now let's create a layout that will display the posts. Create a new file in `_layouts` called `home.html`. In your `home.html` layout, add the following logic:
+
+```
+---
+layout: default
+---
+
+{% raw %}
      
+{% for post in site.posts %}
+    
    • {{ post.title}}
+    {{ post.date | date: "%b %-d, %Y" }}
+    
      • 
+{% endfor %}
+
    {% endraw %}
+```
+
+Create a file called `blog.md` in your root directory and specify the `home` layout:
+
+```
+---
+title: Blog
+layout: home
+---
+```
+
+In this case, `home.md` will be pushed into the `{% raw %}{{ content }}{% endraw %}` tags in the `home` layout. Then the `home` layout will be pushed into the `{% raw %}{{ content }}{% endraw %}` tags of the `default` layout.
+
+### How layouts work
+
+When a layout specifies another layout, it means the content of the first layout will be stuffed into the `{% raw %}{{ content }}{% endraw %}` tag of the second layout. As an analogy, think of Russian dolls that fit into each other. Each layout fits into another layout that it specifies.
+
+The following diagram shows how layouts work in Jekyll:
+
+Concept of Jekyll layouts
+
+In this case, the content from a page that specifies the layout `page` gets pushed into the `{% raw %}{{ content }}{% endraw %}` tag of the layout file named `page`. Because the `page` layout itself specifies another layout (`docs`), the content from `page` gets pushed into the `{% raw %}{{ content }}{% endraw %}` tag in the `docs` layout. Because the `docs` layout specifies another layout (`default`), the content from docs gets pushed into the `{% raw %}{{ content }}{% endraw %}` tag of the `default` layout.
+
+You don't need multiple layouts. You could just use one: `default`. You have options for how you design your site. In general, it's common to define one layout for pages and another layout for posts, but for both of these layouts to inherit the `default` template (which usually defines the top and bottom parts of the site).
+
+In your browser, go to `home.html` and see the list of posts. (Note that you didn't have to use the method described here. You could have simply added the `for` loop to any page, such as `index.md`, to display these posts. But given that you may have more complex logic for other features, it can be helpful to store your logic in templates separate from the page area where you frequently type your content.)
+
+### 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.
+
+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:
+
+```liquid
+{% raw %}
      
+{% for post in site.categories.podcasts limit:3 %}
+    
    • {{ post.title}}
+    {{ post.date | date: "%b %-d, %Y" }}
+    
      • 
+{% endfor %}{% endraw %}
+```
+
+This loop would get the latest 3 posts that have a category called `podcasts` in the front matter.
+
+## 8. Configure navigation
+
+Now that you've configured posts, let's configure page navigation. Most websites have some navigation either in the sidebar or header area.  
+
+In this tutorial, we'll assume you've got a simple list of pages you want to generate. If you only have a handful of pages, you could list them by using a `for` loop to iterate through the `site.pages` object and then order them by a front matter property.
+
+Identify the part of your code where the list of pages appears. Usually this is a `
        ` element with various child `
      • ` elements. Replace the code with the following:
+
+```html
+{% raw %}
          
+  {% assign mypages = site.pages | sort: "order" %}
+    {% for page in mypages %}
+    
        • {{ page.title }}
          • 
+    {% endfor %}
+  
        {% endraw %}
+```
+
+This example assumes each page would have front matter containing both a `title` and `order` property like this:
+
+```
+---
+title: My page
+order: 2
+---
+```
+
+Here the `order` property will define how the pages get sorted, with `1` appearing first in the list.
+
+You could also iterate through a list of pages that you maintain in a separate data file. This might be more appropriate if you have a lot of pages, or you have other properties about the pages you want to store.
+
+To manage page links this way, create a folder in your Jekyll project called `_data`. In this folder, create a file called `sidebar_links.yml` with this content:
+
+```
+- title: Sample page 1
+  url: /sample1/
+
+- title: Sample page 2
+  url: /sample2/
+
+- title: Sample page 3
+  url: /sample3/
+```
+
+(You can store additional properties for each item in this data file as desired. Arrange the list items in the order you want them to appear.
+
+To print the list of pages from the data file, use code like this:
+
+```html
+{% raw %}
          
+    {% for p in site.data.sidebar_links %}
+    
        • {{ p.title }}
          • 
+    {% endfor %}
+
        {% endraw %}
+```
+
+If you have more sophisticated requirements around navigation, such as when building a documentation site, see the [detailed tutorial on navigation](/tutorials/navigation/).
+
+## 9. Simplify your site with includes
+
+Let's suppose your `default.html` file is massive and hard to work with. You can break up your layout by putting some of the content in include files.
+
+Add a folder called `_includes` in your root directory. In that folder, add a file there called `sidebar.html`.
+
+Remove your sidebar code from your `default.html` layout and insert it into the `sidebar.html` file.
+
+In place of sidebar code in `default.html`, pull in your include like this:
+
+```liquid
+{% raw %}{% include sidebar.html %}{% endraw %}
+```
+
+You can break up other elements of your theme like this, such as your header or footer. Then you can apply these common elements to other layout files. This way you won't have duplicate code.
+
+## 10. RSS feed
+
+Your Jekyll site needs an RSS feed. Here's the [basic RSS feed syntax](http://www.w3schools.com/xml/xml_rss.asp). To create an RSS file in Jekyll, create a file called `feed.xml` in your root directory and add the following:
+
+```xml
+---
+layout: null
+---
+
+{% raw %}
+
+
+    
+        {{ site.title }}
+        {{ site.url }}
+        {{ site.description }}
+        {{ site.time | date_to_rfc822 }}
+        {% for post in site.posts %}
+        
+            
+                {{ post.content | escape | truncate: '400' }}
+            
+            {{ post.date | date_to_rfc822 }}
+            
+                {{ post.url | prepend: site.url }}
+            
+        
+        {% endfor %}
+    
+{% endraw %}
+```
+
+Make sure your `_config.yml` file has properties for `title`, `url`, and `description`.
+
+This code uses a `for` loop to look through your last 20 posts. The content from the posts gets escaped and truncated to the last 400 characters using [Liquid filters](https://help.shopify.com/themes/liquid/filters).
+
+In your `default.html` layout, look for a reference to the RSS or Atom feed in your header, and replace it with a reference to the file you just created. For example:
+
+```html
+
+```
+
+You can also auto-generate your feed by adding a gem called [`jekyll-feed`][jekyll-feed]. This gem will also work on GitHub Pages.
+
+## 11. Add a sitemap
+
+Finally, add a [site map](https://www.sitemaps.org/protocol.html). Create a `sitemap.xml` file in your root directory and add this code:
+
+```xml
+---
+layout: null
+search: exclude
+---
+
+{% raw %}
+
+
+    {% for page in site.pages %}
+    
+        {{page.url}}
+        {{site.time | date: '%Y-%B-%d' }}
+        daily
+        0.5
+    
+    {% endfor %}
+
+    {% for post in site.posts %}
+    
+        {{post.url}}
+        {{site.time | date: '%Y-%B-%d' }}
+        daily
+        0.5
+    
+    {% endfor %}
+
+{% endraw %}
+```
+
+Again, we're using a for loop here to iterate through all posts and pages to add them to the sitemap.
+
+You can also auto-generate your sitemap by adding a gem called [`jekyll-sitemap`][jekyll-sitemap]. This gem will also work on GitHub Pages.
+
+## 12. Add external services
+
+For other services you might need (such as contact forms, search, comments, and more), look for third-party services. For example, you might use the following:
+
+* For comments: [Disqus](https://disqus.com/)
+* For a newsletter: [Tinyletter](https://tinyletter.com/)
+* For contact forms: [Wufoo](https://www.wufoo.com/)
+* For search: [Algolia Docsearch](https://community.algolia.com/docsearch/)
+
+For more details on services for static sites, see the [Third Parties](https://learn.cloudcannon.com/jekyll-third-parties/) list and tutorials from CloudCannon.
+
+Your Jekyll pages consist of HTML, CSS, and JavaScript, so pretty much any code you need to embed will work without a problem.
+
+As you integrate code for these services, not that if a page in your Jekyll site doesn't have front matter tags, Jekyll won't process any of the content. The page will just be passed to the `_site` folder when you build your site.
+
+If you do want Jekyll to process some page content (for example, to populate a variable that you define in your site's config file), just add front matter tags to the page. If you don't want any layout applied to the page, specify `layout: null` like this:
+
+```
+---
+layout: null
+---
+```
+
+## 13. Conclusion
+
+Although websites can implement more sophisticated features and functionality, we've covered the basics in this tutorial. You now have a fully functional Jekyll site.
+
+To deploy your site, consider using [Github Pages](https://pages.github.com/), [Amazon AWS S3](https://aws.amazon.com/s3/) using the [s3_website plugin](https://github.com/laurilehmijoki/s3_website), or just FTP your files to your web server.
+
+You can also take your Jekyll theme to the next level by [packaging it as a Ruby gem](docs/themes/#creating-a-theme).
+
+## Additional resources
+
+Here are some additional tutorials on creating Jekyll sites:
+
+* [Convert a static site to Jekyll](http://jekyll.tips/jekyll-casts/converting-a-static-site-to-jekyll/)
+* [Building a Jekyll Site – Part 1 of 3: Converting a Static Website To Jekyll](https://css-tricks.com/building-a-jekyll-site-part-1-of-3/)
+
+[jekyll-sitemap]: https://help.github.com/articles/sitemaps-for-github-pages/
+[jekyll-feed]: https://help.github.com/articles/atom-rss-feeds-for-github-pages/
diff --git a/docs/img/jekylllayoutconcept.png b/docs/img/jekylllayoutconcept.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe302c0a9d1f5f3430eb5771443fd41023130c23
GIT binary patch
literal 34133
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
Date: Tue, 4 Apr 2017 18:37:34 -0400
Subject: [PATCH 2087/4996] Update history to reflect merge of #5881 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 99b0c1851cf..564c44f7acb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -41,6 +41,7 @@
   * Document `--unpublished` flag introduced in 91e9ecf (#5959)
   * Update upgrading.md to mention usage of `bundle update` (#5604)
   * Fix missing quotation mark (#6002)
+  * New tutorial: Convert an HTML site to Jekyll (#5881)
 
 ### Development Fixes
 

From 94e6b65ad4a25094846e810a1f91dc388a69e171 Mon Sep 17 00:00:00 2001
From: Ryan Lue 
Date: Wed, 5 Apr 2017 06:40:29 +0800
Subject: [PATCH 2088/4996] Revamp Permalink section (#5912)

Merge pull request 5912
---
 docs/_docs/collections.md | 153 +++++++++++++++++---------------------
 1 file changed, 67 insertions(+), 86 deletions(-)

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index 97ca6ecb9ab..fa82e096324 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -89,18 +89,75 @@ choice and written out to `/my_collection/some_subdir/some_doc.html`.
 
 ## Configuring permalinks for collections {#permalinks}
 
-You can customize the [Permalinks](../permalinks/) for your collection's documents by setting `permalink` property in the collection's configuration as follows:
+If you wish to specify a custom pattern for the URLs where your Collection pages
+will reside, you may do so with the [`permalink` property](../permalinks/):
 
 ```yaml
 collections:
   my_collection:
     output: true
-    permalink: /awesome/:path/:title.:output_ext
+    permalink: /:collection/:name
 ```
 
-In this example, the collection documents will the have the URL of `awesome` followed by the path to the document and its file extension.
+### Examples
 
-Collections have the following template variables available for permalinks:
+For a collection with the following source file structure,
+
+```
+_my_collection/
+└── some_subdir
+    └── some_doc.md
+```
+
+each of the following `permalink` configurations will produce the document structure shown below it.
+
+* **Default**  
+  Same as `permalink: /:collection/:path`.
+
+  ```
+  _site/
+  ├── my_collection
+  │   └── some_subdir
+  │       └── some_doc.html
+  ...
+  ```
+* `permalink: pretty`  
+  Same as `permalink: /:collection/:path/`.
+
+  ```
+  _site/
+  ├── my_collection
+  │   └── some_subdir
+  │       └── some_doc
+  │           └── index.html
+  ...
+  ```
+* `permalink: /doc/:path`
+
+  ```
+  _site/
+  ├── doc
+  │   └── some_subdir
+  │       └── some_doc.html
+  ...
+  ```
+* `permalink: /doc/:name`
+
+  ```
+  _site/
+  ├── doc
+  │   └── some_doc.html
+  ...
+  ```
+* `permalink: /:name`
+
+  ```
+  _site/
+  ├── some_doc.html
+  ...
+  ```
+
+### Template Variables
 
 
        
 
@@ -113,7 +170,7 @@ Collections have the following template variables available for permalinks:
   
        
     
        
       
-        
        collection
        
+        
        :collection
        
               		
       
         
        Label of the containing collection.
        
@@ -121,7 +178,7 @@ Collections have the following template variables available for permalinks:
     
        
     
        
       
-        
        path
        
+        
        :path
        
               		
       
         
        Path to the document relative to the collection's directory.
        
@@ -129,7 +186,7 @@ Collections have the following template variables available for permalinks:
     
        
     
        
       
-        
        name
        
+        
        :name
        
               		
       
         
        The document's base filename, with every sequence of spaces
@@ -138,7 +195,7 @@ Collections have the following template variables available for permalinks:
     
        
     
        
       
-        
        title
        
+        
        :title
        
               		
       
         
        The document's lowercase title (as defined in its front matter), with every sequence of spaces and non-alphanumeric characters replaced by a hyphen. If the document does not define a title in its front matter, this is equivalent to name.
        
@@ -146,92 +203,16 @@ Collections have the following template variables available for permalinks:
     
        
     
        
       
-        
        output_ext
        
+        
        :output_ext
        
               		
       
-        
        Extension of the output file.
        
+        
        Extension of the output file. (Included by default and usually unnecessary.)
        
               		
     
        
           
 
        
 
        
 
-## Permalink examples for collections
-
-Depending on how you declare the permalinks in your configuration file, the permalinks and paths get written differently in the `_site` folder. A few examples will help clarify the options.
-
-Let's say your collection is called `apidocs` with `doc1.md` in your collection. `doc1.md` is grouped inside a folder called `mydocs`. Your project's source directory for the collection looks this:
-
-```
-├── \_apidocs
-│   └── mydocs
-│       └── doc1.md
-```
-
-Based on this scenario, here are a few permalink options.
-
-**Permalink configuration 1**: [Nothing configured] 
        
-**Output**:
-
-```
-├── apidocs
-│   └── mydocs
-│       └── doc1.html
-```
-
-**Permalink configuration 2**: `/:collection/:path/:title:output_ext`  
        
-**Output**:
-
-```
-├── apidocs
-│   └── mydocs
-│       └── doc1.html
-```
-
-**Permalink configuration 3**: No collection permalinks configured, but `pretty` configured for pages/posts. 
        
-**Output**:
-
-```
-├── apidocs
-│   └── mydocs
-│       └── doc1
-│           └── index.html
-```
-
-**Permalink configuration 4**: `/awesome/:path/:title.html`   
        
-**Output**:
-
-```
-├── awesome
-│   └── mydocs
-│       └── doc1.html
-```
-
-**Permalink configuration 5**: `/awesome/:path/:title/`  
        
-**Output**:
-
-```
-├── awesome
-│   └── mydocs
-│       └── doc1
-│           └── index.html
-```
-
-**Permalink configuration 6**: `/awesome/:title.html` 
        
-**Output**:  
-
-```
-├── awesome
-│   └── doc1.html
-```
-
-**Permalink configuration 7**: `:title.html`
-**Output**:
-
-```
-├── doc1.html
-```
-
 ## Liquid Attributes
 
 ### Collections

From 4d689ec0518bd69e6d7682bf75f9e8e871a1fcee Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 4 Apr 2017 18:40:30 -0400
Subject: [PATCH 2089/4996] Update history to reflect merge of #5912 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 564c44f7acb..0ee4e11a104 100644
--- a/History.markdown
+++ b/History.markdown
@@ -42,6 +42,7 @@
   * Update upgrading.md to mention usage of `bundle update` (#5604)
   * Fix missing quotation mark (#6002)
   * New tutorial: Convert an HTML site to Jekyll (#5881)
+  * Revamp Permalink section (#5912)
 
 ### Development Fixes
 

From 52ac75b484408bc47bf31d7c10dbcb8c3a9024e8 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 4 Apr 2017 19:47:11 -0400
Subject: [PATCH 2090/4996] Date filters should never raise an exception
 (#5722)

Merge pull request 5722
---
 lib/jekyll/filters.rb | 3 +++
 test/test_filters.rb  | 8 +++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index ea0fc9054d5..c8da0e526ce 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -80,6 +80,7 @@ def date_to_string(date)
     #
     # Returns the formatted String.
     def date_to_long_string(date)
+      return date if date.to_s.empty?
       time(date).strftime("%d %B %Y")
     end
 
@@ -94,6 +95,7 @@ def date_to_long_string(date)
     #
     # Returns the formatted String.
     def date_to_xmlschema(date)
+      return date if date.to_s.empty?
       time(date).xmlschema
     end
 
@@ -108,6 +110,7 @@ def date_to_xmlschema(date)
     #
     # Returns the formatted String.
     def date_to_rfc822(date)
+      return date if date.to_s.empty?
       time(date).rfc822
     end
 
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 782b5be984f..9e35df92c5a 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -284,11 +284,9 @@ def select; end
       end
 
       context "without input" do
-        should "raise an error if input is nil" do
-          err = assert_raises Jekyll::Errors::InvalidDateError do
-            @filter.date_to_xmlschema(nil)
-          end
-          assert_equal "Invalid Date: 'nil' is not a valid datetime.", err.message
+        should "return input" do
+          assert_nil(@filter.date_to_xmlschema(nil))
+          assert_equal("", @filter.date_to_xmlschema(""))
         end
       end
     end

From b4926daf3a3419773c247bc33d471712f674f42f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 4 Apr 2017 19:47:12 -0400
Subject: [PATCH 2091/4996] Update history to reflect merge of #5722 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0ee4e11a104..339911e1557 100644
--- a/History.markdown
+++ b/History.markdown
@@ -9,6 +9,7 @@
   * Add a template for custom 404 page (#5945)
   * Require `runtime_dependencies` of a Gem-based theme from its `.gemspec` file (#5914)
   * Don't raise an error if URL contains a colon (#5889)
+  * Date filters should never raise an exception (#5722)
 
 ### Documentation
 

From 5f19b1a7e0a2ca3d3cd8424c51a07396d0ccf29d Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 5 Apr 2017 15:36:29 -0400
Subject: [PATCH 2092/4996] Use yajl-ruby 1.2.2 (now with 2.4 support) (#6007)

Merge pull request 6007
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 7e509366d6d..f4e60e12b3e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -77,7 +77,7 @@ group :jekyll_optional_dependencies do
     gem "classifier-reborn", "~> 2.1.0"
     gem "liquid-c", "~> 3.0"
     gem "pygments.rb", "~> 0.6.0"
-    gem "yajl-ruby", git: "https://github.com/parkr/yajl-ruby", branch: "1.2.x-unify-fixnum-to-integer"
+    gem "yajl-ruby", "~> 1.2"
     gem "rdiscount", "~> 2.0"
     gem "redcarpet", "~> 3.2", ">= 3.2.3"
   end

From f46dffcc8e9285c4a7a76d84042e406079bb2bf2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 5 Apr 2017 15:36:31 -0400
Subject: [PATCH 2093/4996] Update history to reflect merge of #6007 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 339911e1557..90d1c4b2204 100644
--- a/History.markdown
+++ b/History.markdown
@@ -56,6 +56,7 @@
   * Use Rubocop v0.47.1 till we're ready for v0.48 (#5989)
   * Test against Ruby 2.4.0 (#5687)
   * rubocop: lib/jekyll/renderer.rb complexity fixes (#5052)
+  * Use yajl-ruby 1.2.2 (now with 2.4 support) (#6007)
 
 ### Site Enhancements
 

From 768d2bb5a304d25a3114a3cfb1eeced91ab00598 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 5 Apr 2017 16:16:55 -0400
Subject: [PATCH 2094/4996] absolute_url should not mangle URL if called more
 than once (#5789)

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

diff --git a/lib/jekyll/filters/url_filters.rb b/lib/jekyll/filters/url_filters.rb
index ccc4dcb9829..7db83c800c9 100644
--- a/lib/jekyll/filters/url_filters.rb
+++ b/lib/jekyll/filters/url_filters.rb
@@ -10,6 +10,7 @@ module URLFilters
       # Returns the absolute URL as a String.
       def absolute_url(input)
         return if input.nil?
+        return input if Addressable::URI.parse(input).absolute?
         site = @context.registers[:site]
         return relative_url(input).to_s if site.config["url"].nil?
         Addressable::URI.parse(site.config["url"] + relative_url(input)).normalize.to_s
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 9e35df92c5a..03d2732abd5 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -402,6 +402,11 @@ def select; end
         })
         assert_equal "http://xn--mlaut-jva.example.org/", filter.absolute_url(page_url)
       end
+
+      should "not modify an absolute URL" do
+        page_url = "http://example.com/"
+        assert_equal "http://example.com/", @filter.absolute_url(page_url)
+      end
     end
 
     context "relative_url filter" do

From 84d1f2d408cf73988d2b2067ceb9fc6fc5dc945c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 5 Apr 2017 16:16:56 -0400
Subject: [PATCH 2095/4996] Update history to reflect merge of #5789 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 90d1c4b2204..d38d1af6e22 100644
--- a/History.markdown
+++ b/History.markdown
@@ -75,6 +75,7 @@
   * Remove dependency on include from default about.md (#5903)
   * Allow colons in `uri_escape` filter (#5957)
   * Re-surface missing public methods in `Jekyll::Document` (#5975)
+  * absolute_url should not mangle URL if called more than once (#5789)
 
 ### fix
 

From d1c7bdb985b82eaa233f9f1b2ca983415005491e Mon Sep 17 00:00:00 2001
From: Chris Finazzo 
Date: Wed, 5 Apr 2017 17:18:23 -0400
Subject: [PATCH 2096/4996] Update normalize.css to v6.0.0 (#6008)

Merge pull request 6008
---
 docs/_sass/_normalize.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_sass/_normalize.scss b/docs/_sass/_normalize.scss
index b1f94f9db46..36186c9931a 100644
--- a/docs/_sass/_normalize.scss
+++ b/docs/_sass/_normalize.scss
@@ -1 +1 @@
-/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,footer,header,nav,section{display:block}h1{font-size:2em;margin:0.67em 0}figcaption,figure,main{display:block}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace, monospace;font-size:1em}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace, monospace;font-size:1em}dfn{font-style:italic}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-0.25em}sup{top:-0.5em}audio,video{display:inline-block}audio:not([controls]){display:none;height:0}img{border-style:none}svg:not(:root){overflow:hidden}button,input,optgroup,select,textarea{font-family:sans-serif;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}button,html [type="button"],[type="reset"],[type="submit"]{-webkit-appearance:button}button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{border-style:none;padding:0}button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{outline:1px dotted ButtonText}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{display:inline-block;vertical-align:baseline}textarea{overflow:auto}[type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto}[type="search"]{-webkit-appearance:textfield;outline-offset:-2px}[type="search"]::-webkit-search-cancel-button,[type="search"]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details,menu{display:block}summary{display:list-item}canvas{display:inline-block}template{display:none}[hidden]{display:none}
+/*! normalize.css v6.0.0 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}article,aside,footer,header,nav,section{display:block}h1{font-size:2em;margin:0.67em 0}figcaption,figure,main{display:block}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace, monospace;font-size:1em}a{background-color:transparent;-webkit-text-decoration-skip:objects}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace, monospace;font-size:1em}dfn{font-style:italic}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-0.25em}sup{top:-0.5em}audio,video{display:inline-block}audio:not([controls]){display:none;height:0}img{border-style:none}svg:not(:root){overflow:hidden}button,input,optgroup,select,textarea{margin:0}button,input{overflow:visible}button,select{text-transform:none}button,html [type="button"],[type="reset"],[type="submit"]{-webkit-appearance:button}button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{border-style:none;padding:0}button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{outline:1px dotted ButtonText}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{display:inline-block;vertical-align:baseline}textarea{overflow:auto}[type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto}[type="search"]{-webkit-appearance:textfield;outline-offset:-2px}[type="search"]::-webkit-search-cancel-button,[type="search"]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details,menu{display:block}summary{display:list-item}canvas{display:inline-block}template{display:none}[hidden]{display:none}

From a83b6684092ef3efebc7b7ac5d653b950f87ca04 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 5 Apr 2017 17:18:24 -0400
Subject: [PATCH 2097/4996] Update history to reflect merge of #6008 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d38d1af6e22..8842ffc7a95 100644
--- a/History.markdown
+++ b/History.markdown
@@ -66,6 +66,7 @@
   * Documentation on how to build navigation (#5698)
   * Navigation has been moved out from docs (#5927)
   * Make links in sidebar for current page more prominent (#5820)
+  * Update normalize.css to v6.0.0 (#6008)
 
 ### Bug Fixes
 

From 7d7a312b33cf1cbf92d73435146d37a568885994 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Sun, 9 Apr 2017 16:54:45 +0530
Subject: [PATCH 2098/4996] Bump Rubocop to v0.48 (#5997)

Merge pull request 5997
---
 .rubocop.yml                                           | 10 ++++++++++
 Gemfile                                                |  6 +++---
 Rakefile                                               |  2 +-
 jekyll.gemspec                                         |  1 +
 lib/jekyll/reader.rb                                   |  1 +
 lib/jekyll/site.rb                                     |  1 +
 .../test-dependency-theme.gemspec                      |  8 ++++----
 test/fixtures/test-theme/test-theme.gemspec            |  8 ++++----
 test/test_collections.rb                               |  4 +++-
 test/test_document.rb                                  |  6 +++---
 test/test_front_matter_defaults.rb                     |  4 ++--
 test/test_generated_site.rb                            |  8 +++++---
 test/test_tags.rb                                      |  1 +
 13 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 168e779ae67..5ab7a7e84ed 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -35,6 +35,8 @@ Metrics/LineLength:
     - !ruby/regexp /features\/.*.rb/
     - Rakefile
     - rake/*.rake
+    - Gemfile
+    - jekyll.gemspec
   Max: 90
   Severity: warning
 Metrics/MethodLength:
@@ -82,6 +84,8 @@ Style/EmptyLinesAroundAccessModifier:
   Enabled: false
 Style/EmptyLinesAroundModuleBody:
   Enabled: false
+Style/EndOfLine:
+  EnforcedStyle: lf
 Style/ExtraSpacing:
   AllowForAlignment: true
 Style/FileName:
@@ -99,8 +103,12 @@ Style/IndentArray:
   EnforcedStyle: consistent
 Style/IndentHash:
   EnforcedStyle: consistent
+Style/IndentHeredoc:
+  Enabled: false
 Style/IndentationWidth:
   Severity: error
+Style/InverseMethods:
+  Enabled: false
 Style/ModuleFunction:
   Enabled: false
 Style/MultilineMethodCallIndentation:
@@ -138,6 +146,8 @@ Style/StringLiterals:
   EnforcedStyle: double_quotes
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
+Style/SymbolArray:
+  Enabled: false
 Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: consistent_comma
 Style/UnneededCapitalW:
diff --git a/Gemfile b/Gemfile
index f4e60e12b3e..5da04ca66c7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,9 +25,9 @@ group :test do
   gem "nokogiri"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.47.1"
-  gem "test-theme", :path => File.expand_path("./test/fixtures/test-theme", File.dirname(__FILE__))
+  gem "rubocop", "~> 0.48.1"
   gem "test-dependency-theme", :path => File.expand_path("./test/fixtures/test-dependency-theme", File.dirname(__FILE__))
+  gem "test-theme", :path => File.expand_path("./test/fixtures/test-theme", File.dirname(__FILE__))
 
   gem "jruby-openssl" if RUBY_ENGINE == "jruby"
 end
@@ -77,9 +77,9 @@ group :jekyll_optional_dependencies do
     gem "classifier-reborn", "~> 2.1.0"
     gem "liquid-c", "~> 3.0"
     gem "pygments.rb", "~> 0.6.0"
-    gem "yajl-ruby", "~> 1.2"
     gem "rdiscount", "~> 2.0"
     gem "redcarpet", "~> 3.2", ">= 3.2.3"
+    gem "yajl-ruby", "~> 1.2"
   end
 
   # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
diff --git a/Rakefile b/Rakefile
index ab934e27416..949e0fd8e76 100644
--- a/Rakefile
+++ b/Rakefile
@@ -106,7 +106,7 @@ def siteify_file(file, overrides_front_matter = {})
   front_matter = {
     "title"     => title,
     "permalink" => "/docs/#{slug}/",
-    "note"      => "This file is autogenerated. Edit /#{file} instead."
+    "note"      => "This file is autogenerated. Edit /#{file} instead.",
   }.merge(overrides_front_matter)
   contents = "#{front_matter.to_yaml}---\n\n#{content_for(file)}"
   File.write("#{docs_folder}/_docs/#{slug}.md", contents)
diff --git a/jekyll.gemspec b/jekyll.gemspec
index a55392090f3..f95862594e2 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "jekyll/version"
diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index e1d3b8f5663..cdd45ab0f74 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 require "csv"
 
 module Jekyll
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 87ea719b6a8..347cea97641 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 require "csv"
 
 module Jekyll
diff --git a/test/fixtures/test-dependency-theme/test-dependency-theme.gemspec b/test/fixtures/test-dependency-theme/test-dependency-theme.gemspec
index f372354e275..5c260329d3b 100644
--- a/test/fixtures/test-dependency-theme/test-dependency-theme.gemspec
+++ b/test/fixtures/test-dependency-theme/test-dependency-theme.gemspec
@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
-  s.name          = 'test-dependency-theme'
-  s.version       = '0.1.0'
-  s.licenses      = ['MIT']
+  s.name          = "test-dependency-theme"
+  s.version       = "0.1.0"
+  s.licenses      = ["MIT"]
   s.summary       = "This is another theme used to test Jekyll"
   s.authors       = ["Jekyll"]
   s.files         = ["lib/example.rb"]
-  s.homepage      = 'https://github.com/jekyll/jekyll'
+  s.homepage      = "https://github.com/jekyll/jekyll"
 
   s.add_runtime_dependency "jekyll_test_plugin"
 end
diff --git a/test/fixtures/test-theme/test-theme.gemspec b/test/fixtures/test-theme/test-theme.gemspec
index 5f950ae18b9..73e5deb2e94 100644
--- a/test/fixtures/test-theme/test-theme.gemspec
+++ b/test/fixtures/test-theme/test-theme.gemspec
@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
-  s.name        = 'test-theme'
-  s.version     = '0.1.0'
-  s.licenses    = ['MIT']
+  s.name        = "test-theme"
+  s.version     = "0.1.0"
+  s.licenses    = ["MIT"]
   s.summary     = "This is a theme used to test Jekyll"
   s.authors     = ["Jekyll"]
   s.files       = ["lib/example.rb"]
-  s.homepage    = 'https://github.com/jekyll/jekyll'
+  s.homepage    = "https://github.com/jekyll/jekyll"
 end
diff --git a/test/test_collections.rb b/test/test_collections.rb
index 0607208b8f3..5b80a6c7e03 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -217,7 +217,9 @@ class TestCollections < JekyllUnitTest
     end
 
     should "read document in subfolders with dots" do
-      assert @collection.docs.any? { |d| d.path.include?("all.dots") }
+      assert(
+        @collection.docs.any? { |d| d.path.include?("all.dots") }
+      )
     end
   end
 end
diff --git a/test/test_document.rb b/test/test_document.rb
index f274dd5327c..37e709ac6dc 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -424,9 +424,9 @@ def assert_equal_value(key, one, other)
 
     context "with output overrides" do
       should "be output according its front matter" do
-        assert_nil @files.find { |doc|
-          doc.relative_path == "_slides/non-outputted-slide.html"
-        }
+        assert_nil(
+          @files.find { |doc| doc.relative_path == "_slides/non-outputted-slide.html" }
+        )
       end
     end
   end
diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb
index 0d066c11f15..d45ab6de9a5 100644
--- a/test/test_front_matter_defaults.rb
+++ b/test/test_front_matter_defaults.rb
@@ -184,8 +184,8 @@ class TestFrontMatterDefaults < JekyllUnitTest
     should "parse date" do
       @site.process
       date = Time.parse("2015-01-01 00:00:01")
-      assert @site.pages.find { |page| page.data["date"] == date }
-      assert @site.posts.find { |page| page.data["date"] == date }
+      assert(@site.pages.find { |page| page.data["date"] == date })
+      assert(@site.posts.find { |page| page.data["date"] == date })
     end
   end
 end
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 41e7c3a1f5d..46f55484fba 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -52,9 +52,11 @@ class TestGeneratedSite < JekyllUnitTest
     end
 
     should "include a post with a abbreviated dates" do
-      refute_nil @site.posts.index { |post|
-        post.relative_path == "_posts/2017-2-5-i-dont-like-zeroes.md"
-      }
+      refute_nil(
+        @site.posts.index do |post|
+          post.relative_path == "_posts/2017-2-5-i-dont-like-zeroes.md"
+        end
+      )
       assert_exist dest_dir("2017", "02", "05", "i-dont-like-zeroes.html")
     end
 
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 0fe07aa6991..f077615defb 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -1,4 +1,5 @@
 # coding: utf-8
+
 require "helper"
 
 class TestTags < JekyllUnitTest

From cce53abe3d64cfc4057fcfd75f3f16a3e829d886 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 9 Apr 2017 07:24:46 -0400
Subject: [PATCH 2099/4996] Update history to reflect merge of #5997 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8842ffc7a95..ef2ef088b02 100644
--- a/History.markdown
+++ b/History.markdown
@@ -57,6 +57,7 @@
   * Test against Ruby 2.4.0 (#5687)
   * rubocop: lib/jekyll/renderer.rb complexity fixes (#5052)
   * Use yajl-ruby 1.2.2 (now with 2.4 support) (#6007)
+  * Bump Rubocop to v0.48 (#5997)
 
 ### Site Enhancements
 

From 029b993225ed63c6e03bf1c965035b9d6a50d741 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Mon, 10 Apr 2017 02:15:44 +0530
Subject: [PATCH 2100/4996] Fixup tutorial on creating theme from existing HTML
 templates (#6006)

Merge pull request 6006
---
 docs/_data/tutorials.yml                      |   2 +-
 docs/_sass/_style.scss                        |  13 ++
 ....md => convert-existing-site-to-jekyll.md} | 179 ++++++++++--------
 docs/img/jekylllayoutconcept.png              | Bin 34133 -> 40209 bytes
 4 files changed, 119 insertions(+), 75 deletions(-)
 rename docs/_tutorials/{create-jekyll-theme.md => convert-existing-site-to-jekyll.md} (57%)

diff --git a/docs/_data/tutorials.yml b/docs/_data/tutorials.yml
index baf778963f9..a394345bbd4 100644
--- a/docs/_data/tutorials.yml
+++ b/docs/_data/tutorials.yml
@@ -4,7 +4,7 @@
   - navigation
   - orderofinterpretation
   - custom-404-page
-  - create-jekyll-theme
+  - convert-site-to-jekyll
 
 #- title: Another section
 #  tutorials:
diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss
index c56d6a94741..005781b6e12 100644
--- a/docs/_sass/_style.scss
+++ b/docs/_sass/_style.scss
@@ -1038,3 +1038,16 @@ code.output {
 .result {
   padding: 12px;
 }
+
+.image-description {
+  margin: -20px 0 20px;
+  padding: 10px 15px;
+  font-size: 0.81em;
+  text-align: justify;
+  background: #5c5c5c;
+
+  pre, code {
+    font-size: 0.75em;
+    background: #454545;
+  }
+}
diff --git a/docs/_tutorials/create-jekyll-theme.md b/docs/_tutorials/convert-existing-site-to-jekyll.md
similarity index 57%
rename from docs/_tutorials/create-jekyll-theme.md
rename to docs/_tutorials/convert-existing-site-to-jekyll.md
index 348ff31ad90..6a041e8ba64 100644
--- a/docs/_tutorials/create-jekyll-theme.md
+++ b/docs/_tutorials/convert-existing-site-to-jekyll.md
@@ -1,38 +1,49 @@
 ---
 layout: tutorials
-permalink: /tutorials/create-jekyll-theme/
-title: Create your first Jekyll theme
+permalink: /tutorials/convert-site-to-jekyll/
+title: Convert an HTML site to Jekyll
 ---
 
-If you're looking for themes for your Jekyll site, you don't have to restrict yourself to existing Jekyll themes. It's pretty easy to convert almost any static HTML site into a Jekyll theme.
+If you're looking for themes for your Jekyll site, you don't have to restrict yourself to existing Jekyll themes. It's pretty easy to convert almost any static HTML files into a Jekyll website.
 
-In many ways, any site that is currently a static site *already* is a Jekyll site. Jekyll just allows you to automate parts of the site (like inserting pages into templates, rendering lists for navigation, generating feeds and sitemaps, and more) as it processes the files.
+In many ways, any site that is currently a static site is *already* a Jekyll website. Jekyll just allows you to automate parts of the site (like inserting pages into templates, rendering lists for navigation, generating feeds and sitemaps, and more) as it processes the files.
 
-Understanding how to convert any HTML site into a Jekyll website will open your world to many more options for Jekyll themes. Instead of searching online for "Jekyll themes," you can choose from the large variety of HTML templates for your site, quickly Jekyll-ize the HTML template as you need to, and build the output with Jekyll.
+Understanding how to convert any HTML site into Jekyll templates will open your world to many more options for Jekyll themes. Instead of [searching online for  *Jekyll themes*](https://duckduckgo.com/?q=Jekyll+themes), you can choose from the large variety of HTML templates for your site, quickly Jekyll-ize the HTML templates as you need to, and build the output with Jekyll.
 
-Although websites can have sophisticated features and controls, we'll keep things simple in this tutorial. This tutorial contains the following sections:
+Although websites can have sophisticated features and controls, we'll keep things simple in this tutorial.
 
-* TOC
-{:toc}
-
-## Understand a basic Jekyll site
+## What is a Jekyll Website?
 
 First, let's start with a grounding in the basics. Stripping a Jekyll site down to an extremely basic level will help clarify what happens in a Jekyll site. If you haven't already installed the jekyll gem, [install it]({% link _docs/installation.md %}).
 
-A simple Jekyll site might consist of just 3 files:
+We'll start with a *basic Jekyll site* consisting of three files:
 
 ```
-├── _config.yaml
+├── _config.yml
 ├── _layouts
 │   └── default.html
 └── index.md
 ```
 
-Manually create these 3 files in a folder called `myjekyllsite`. (Put `default.html` inside a folder called `_layouts`.) Then populate the content of the `default.html` and `index.md` files as follows:
+Manually create these three files in a folder called `my_jekyll_site` or whatever suits you the most, and place `default.html` inside a folder named `_layouts`.
+
+```sh
+$ touch _config.yml index.md default.html
+$ mkdir _layouts && mv default.html _layouts
+```
+
+Fire up your favorite editor, and populate the contents of the `default.html` and `index.md` files as follows:
+
+**_config.yml**
+
+```yaml
+name: My Jekyll Website
+```
 
 **_layouts/default.html**
 
 ```html
+
 
   
      {% raw %}{{ content }}{% endraw %}
@@ -48,52 +59,62 @@ title: My page
 layout: default.html
 ---
 
-Some **bold** content.
+# {% raw %}{{ page.title }}{% endraw %}
+
+Content is written in [Markdown](https://learnxinyminutes.com/docs/markdown/). Plain text format allows you to focus on your **content**.
+
+
 ```
 
-Now `cd` to `myjekyllsite` and build the site:
+Now `cd` to `my_jekyll_site` and serve the site with the built-in server:
 
 ```
+cd my_jekyll_site
 jekyll serve
 ```
 
-When you build the site, you get a preview URL such as `http://127.0.0.1:4001/`. The site's files are built in the `_site` folder.
+If you have a Gemfile, [use Bundler]({% link _docs/quickstart.md %}#about-bundler) by typing `bundle exec jekyll serve` instead.
+{: .note .info}
+
+When you serve the site, you get a preview URL such as `http://127.0.0.1:4000/` (which is the same as `http://localhost:4000/`). The site's files are built into the `_site` folder by default.
 
-This is a Jekyll site at the most basic level. Here's what is happening:
+This is a Jekyll site at the most basic functional level. Here's what is happening:
 
-* The `_config.yml` file contains settings that Jekyll uses as it processes your site. An empty config file will use default values for building a Jekyll site. For example, to convert Markdown to HTML, Jekyll will automatically use the [kramdown Markdown filter](https://rubygems.org/gems/kramdown/), without any need to specify it.
-* Jekyll looks for files with [front matter tags]({% link _docs/frontmatter.md %}) (the two sets of dashed lines `---` like those in `index.md`) and processes the files (populating site variables, rendering any [Liquid](https://shopify.github.io/liquid/), and converting Markdown to HTML).
-* Jekyll pushes the content from all pages and posts into the `{% raw %}{{ content }}{% endraw %}` tags in the layout specified (`default`) in the front matter tags.
-* The processed files get written as `.html` files in the `_site` directory.
+  * The `_config.yml` file contains settings that Jekyll uses as it processes your site. An empty config file will use default values for building a Jekyll site. For example, to convert [Markdown](https://learnxinyminutes.com/docs/markdown/) to HTML, Jekyll will automatically use the [kramdown Markdown filter](https://rubygems.org/gems/kramdown/), without any need to specify it.
+  * Jekyll looks for files with [front matter tags]({% link _docs/frontmatter.md %}) (the two sets of dashed lines `---` like those in `index.md`) and processes the files (populating site variables, rendering any [Liquid](https://shopify.github.io/liquid/), and converting Markdown to HTML).
+  * Jekyll pushes the content from all pages and posts into the `{% raw %}{{ content }}{% endraw %}` variable in the layout specified (`default`) in the front matter tags.
+  * The processed files get written as `.html` files in the `_site` directory.
 
-You can read more about how Jekyll processes the files in [Order of Interpretation](/tutorials/orderofinterpretation/).
+You can read more about how Jekyll processes the files in [order of Interpretation]({% link _tutorials/orderofinterpretation.md %}).
 
-With this basic foundation of how a Jekyll site works, you can convert almost any HTML theme into a Jekyll site. The following sections will take you through a step-by-step tutorial on converting an HTML template into a Jekyll site.
+With this basic understanding of how a Jekyll site works, you can convert almost any HTML theme for Jekyll. The following sections will take you through a step-by-step tutorial to do so.
 
 ## 1. Create a template for your default layout
 
-Find your HTML theme and save it as a default layout. If you're converting or cloning an existing site, you can right-click the page and view the source code.
+Find your HTML theme and save it as a `default` layout. If you're converting or cloning an existing site, you can right-click the page and view the source code.
 
-For example, suppose you're cloning your company site to create a documentation site with the same branding. Or suppose you have a personal site that you built with HTML and now want to make it a Jekyll theme. Get the HTML source code for your site.
+For example, suppose you're cloning your company site to create a documentation site with the same branding. Or suppose you have a personal site that you built with HTML and now want to make it a Jekyll site. Get the HTML source code for your site.
 
 {: .note .info}
-**Note:** Regardless of the site, check the license and make sure you have permission to copy the code.
+Regardless of the site, do check the license and make sure you have permission to copy and use the code.
 
-Copy and paste the source code into a file called `default.html`. Put the `default.html` file inside a folder called `_layouts`. This will be the default layout template for your pages and posts — that is, each page or post will use this layout when Jekyll builds the site.
+Copy and paste the source code into a file called `default.html`. Put the `default.html` file inside the `_layouts` folder. This will be the default layout template for your pages and posts — that is, each page or post will use this layout when Jekyll builds the site.
 
-Note that in looking for templates, you want the HTML output of the template. If the template has PHP tags or other dynamic scripts, these dynamic elements will need to be converted to HTML or to [Liquid](https://shopify.github.io/liquid/) scripting where possible. Jekyll uses Liquid in its templating system to retrieve dynamic content.
+Note that in looking for templates, you want the HTML output of the template. If the template has PHP tags or other dynamic scripts, these dynamic elements will need to be converted to HTML or to [Liquid](https://shopify.github.io/liquid/). Liquid is [Jekyll templating system]({% link _docs/templates.md %}) to retrieve dynamic content.
 
-Open `default.html` into your browser locally to ensure the site looks and functions like it does online. You will likely need to adjust CSS, JS, and image paths so they work.
+Open `default.html` into your browser locally to ensure the site looks and behaves like it does online. You will likely need to adjust CSS, JS, and image paths so they work.
 
 For example, if the paths were relative on the site you copied, you'll need to either download the same assets into your Jekyll site or use absolute paths to the same assets in the cloud. (Syntax such as `src="//` requires a prefix such as `src="http://` to work in your local browser.)
 
-Jekyll provides some [filters](/docs/templates/#filters) to prepend a site URL before path. For example, you could preface your stylesheet like this:
+Jekyll provides some [filters]({% link _docs/templates.md %}#filters) to prepend a site URL before path. For example, you could preface your stylesheet like this:
 
 ```liquid
 {% raw %}{{ "/assets/style.css" | relative_url }}{% endraw %}
 ```
 
-The `relative_url` filter will prepend the `baseurl` value from your config file to the input. This is useful if your site is hosted at a subpath rather than the root of the domain (for example, `http://mysite.com/blog/`).
+The `relative_url` filter will prepend the [`baseurl`](https://byparker.com/blog/2014/clearing-up-confusion-around-baseurl/) value from your config file (as`blog` for instance) to the input. This is useful if your site is hosted at a subpath rather than at the root of the domain (for example, `http://mysite.com/blog/`).
 
 You can also use an `absolute_url` filter. This filter will prepend the `url` *and* `baseurl` value to the input:
 
@@ -101,7 +122,7 @@ You can also use an `absolute_url` filter. This filter will prepend the `url` *a
 {% raw %}{{ "/assets/style.css" | absolute_url }}{% endraw %}
 ```
 
-Again, both `url` and `baseurl` must be defined in your site's config file, like this:
+Again, both `url` and `baseurl` can be defined in your site's config file, like this:
 
 ```
 url: http://mysite.com
@@ -114,7 +135,7 @@ Note that the `url` property of any page begins with a forward slash (`/`), so o
 
 You don't have to prepend filters to link paths like this. You could also use relative links across your entire site. However you decide to code the paths to your assets, make sure they render correctly.
 
-Does your local `default.html` page look good in your browser? Are all images, styles, and other elements showing up correctly? If so, great. Keep going. You'll use this template as the layout for all your pages and posts.
+Does your local `default.html` page look good in your browser? Are all images, styles, and other elements showing up correctly? If so, great. Keep going. You can use this template as the layout for all your pages and posts or create as many templates as you need.
 
 In the next section, you'll blank out the content of the layout and replace it with placeholder tags that get populated dynamically with your Jekyll pages.
 
@@ -122,7 +143,7 @@ In the next section, you'll blank out the content of the layout and replace it w
 
 In `default.html`, find where the page content begins (usually at `h1` or `h2` tags). Replace the title that appears inside these tags with `{% raw %}{{ page.title }}{% endraw %}`.
 
-Remove the page content (but not code from the top nav, sidebar, or footer) and replace the page content with `{% raw %}{{ content }}{% endraw %}`.
+Remove the content part (keep everything else: navigation menu, sidebar, footer, etc.) and replace it with `{% raw %}{{ content }}{% endraw %}`.
 
 Check the layout again in your browser and make sure you didn't corrupt or alter it up by inadvertently removing a crucial `div` tag or other element. The only change should be to the title and page content, which are now blanked out or showing the placeholder tag.
 
@@ -144,17 +165,17 @@ Some page content here...
 Create another page for testing called `about.md` with similar front matter tags.
 
 {: .note .info}
-**Note:** If you don't specify a layout in your pages, Jekyll will automatically use the template labeled `default`. We specify it here only to make it explicit what's happening.
+If you don't specify a layout in your pages, Jekyll will simply render that page as an unstyled basic HTML page.
 
 ## 4. Add a configuration file
 
-Add a `_config.yml` file in your root directory. In `_config.yml`, you can optionally specify the markdown filter you want. By default, [kramdown](https://kramdown.gettalong.org/)) is used (without the need to specify it). If no other filter is specified, your config file will automatically apply the following as a default setting:
+Add a `_config.yml` file in your root directory. In `_config.yml`, you can optionally specify the markdown filter you want. By default, [kramdown](https://kramdown.gettalong.org/) is used (without the need to specify it). If no other filter is specified, your config file will automatically apply the following as a default setting:
 
 ```
 markdown: kramdown
 ```
 
-You can also specify [some options](https://kramdown.gettalong.org/converter/html.html) for kramdown to make it behave more like Github-flavored Markdown:
+You can also specify [some options](https://kramdown.gettalong.org/converter/html.html) for kramdown to make it behave more like [GitHub Flavored Markdown (GFM)](https://github.github.com/gfm/):
 
 ```
 kramdown:
@@ -181,7 +202,7 @@ layout: homepage
 
 This page would then use the `homepage.html` template in the `_layouts` folder.
 
-You can even set [default front matter tags](/docs/configuration/#front-matter-defaults) for pages, posts, or [collections]({% link _docs/collections.md %}) in your `_config.yml` file so that you don't have to specify the layout in your front matter tags. However, setting defaults is more advanced than this basic tutorial will cover.
+You can even set [default front matter tags]({% link _docs/configuration.md %}#front-matter-defaults) for pages, posts, or [collections]({% link _docs/collections.md %}) in your `_config.yml` file so that you don't have to specify the layout in the front matter variables. Anywayd, setting defaults is beyond the scope of this tutorial, let's get back to work.
 
 ## 6. Configure site variables
 
@@ -207,22 +228,22 @@ title: ACME Website
 
 Any properties you add in your `_config.yml` file are accessible through the `site` namespace. Similarly, any properties in your page's front matter are accessible through the `page` namespace. Use dot notation after `site` or `page` to access the value.
 
-Stop your Jekyll server (**Ctrl + C**) and restart it. Verify that the `title` tags are populating correctly.
+Stop your Jekyll server with Ctrl + C and restart it. Verify that the `title` tags are populating correctly.
 
 {: .note .info}
-**Note:** Every time you modify your config file, you have to restart Jekyll for the changes to take effect. When you modify other files, Jekyll automatically picks up the changes when it rebuilds.
+Every time you modify your config file, you have to restart Jekyll for the changes to take effect. When you modify other files, Jekyll automatically picks up the changes when it rebuilds.
 
-If you have other variables to populate in your site, do so following this same pattern.
+If you have other variables to populate in your site, rinse and repeat.
 
 ## 7. Show posts on a page
 
-It's common to show a list of posts on the homepage. First, let's create some posts so that our loop will have something to display.
+It's common to show a list of posts on the homepage. First, let's create some posts so that we have something to showcase.
 
 Add some posts in a `_posts` folder following the standard `YYYY-MM-DD-title.md` post format:
 
-* `2017-01-02-my-first-post.md`
-* `2017-01-15-my-second-post.md`
-* `2017-02-08-my-third-post.md`
+  * `2017-01-02-my-first-post.md`
+  * `2017-01-15-my-second-post.md`
+  * `2017-02-08-my-third-post.md`
 
 In each post, add some basic content:
 
@@ -235,14 +256,15 @@ layout: default
 Some sample content...
 ```
 
-Now let's create a layout that will display the posts. Create a new file in `_layouts` called `home.html`. In your `home.html` layout, add the following logic:
+Now let's create a layout that will display the posts. Create a new file in `_layouts` called `home.html` and add the following logic:
 
 ```
 ---
 layout: default
 ---
 
-{% raw %}
          
+{% raw %}{{ content }}
+
            
 {% for post in site.posts %}
     
          • {{ post.title}}
     {{ post.date | date: "%b %-d, %Y" }}
@@ -260,7 +282,8 @@ layout: home
 ---
 ```
 
-In this case, `home.md` will be pushed into the `{% raw %}{{ content }}{% endraw %}` tags in the `home` layout. Then the `home` layout will be pushed into the `{% raw %}{{ content }}{% endraw %}` tags of the `default` layout.
+In this case, contents of `blog.md` will be pushed into the `{% raw %}{{ content }}{% endraw %}` tag in the `home` layout. Then the `home` layout will be pushed into the `{% raw %}{{ content }}{% endraw %}` tag of the `default` layout.
+
 
 ### How layouts work
 
@@ -270,15 +293,20 @@ The following diagram shows how layouts work in Jekyll:
 
 Concept of Jekyll layouts
 
-In this case, the content from a page that specifies the layout `page` gets pushed into the `{% raw %}{{ content }}{% endraw %}` tag of the layout file named `page`. Because the `page` layout itself specifies another layout (`docs`), the content from `page` gets pushed into the `{% raw %}{{ content }}{% endraw %}` tag in the `docs` layout. Because the `docs` layout specifies another layout (`default`), the content from docs gets pushed into the `{% raw %}{{ content }}{% endraw %}` tag of the `default` layout.
+{: .image-description}
+In this example, the content from a Markdown document `document.md` that specifies `layout: docs` gets pushed into the `{% raw %}{{ content }}{% endraw %}` tag of the layout file `docs.html`. Because the `docs` layout itself specifies `layout: page`, the content from `docs.html` gets pushed into the `{% raw %}{{ content }}{% endraw %}` tag in the layout file `page.html`. Finally because the `page` layout specifies `layout: default`, the content from `page.html` gets pushed into the `{% raw %}{{ content }}{% endraw %}` tag of the layout file `default.html`.
 
 You don't need multiple layouts. You could just use one: `default`. You have options for how you design your site. In general, it's common to define one layout for pages and another layout for posts, but for both of these layouts to inherit the `default` template (which usually defines the top and bottom parts of the site).
 
-In your browser, go to `home.html` and see the list of posts. (Note that you didn't have to use the method described here. You could have simply added the `for` loop to any page, such as `index.md`, to display these posts. But given that you may have more complex logic for other features, it can be helpful to store your logic in templates separate from the page area where you frequently type your content.)
+In your browser, go to `blog.html` and see the list of posts.
+Note that you don't have to use the method described here. You could have simply added the `for` loop to any page, such as `index.md`, to display these posts. But given that you may have more complex logic for other features, it can be helpful to store your logic in templates separate from the page area where you frequently type your content.
+
+{: .note .info}
+At minimum, a layout should contain `{% raw %}{{ content }}{% endraw %}`, which acts as a receiver for the *content* to be rendered.
 
 ### 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://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.
 
 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:
 
@@ -291,11 +319,11 @@ We've only scratched the surface of what you can do with `for` loops in retrievi
 {% endfor %}{% endraw %}
 ```
 
-This loop would get the latest 3 posts that have a category called `podcasts` in the front matter.
+This loop would get the latest three posts that have a category called `podcasts` in the front matter.
 
 ## 8. Configure navigation
 
-Now that you've configured posts, let's configure page navigation. Most websites have some navigation either in the sidebar or header area.  
+Now that you've configured posts, let's configure page navigation. Most websites have some navigation either in the sidebar or header area.
 
 In this tutorial, we'll assume you've got a simple list of pages you want to generate. If you only have a handful of pages, you could list them by using a `for` loop to iterate through the `site.pages` object and then order them by a front matter property.
 
@@ -323,27 +351,30 @@ Here the `order` property will define how the pages get sorted, with `1` appeari
 
 You could also iterate through a list of pages that you maintain in a separate data file. This might be more appropriate if you have a lot of pages, or you have other properties about the pages you want to store.
 
-To manage page links this way, create a folder in your Jekyll project called `_data`. In this folder, create a file called `sidebar_links.yml` with this content:
+To manage page links this way, create a folder in your Jekyll project called `_data`. In this folder, create a file called e.g. `navigation.yml` with this content:
 
-```
+```yaml
 - title: Sample page 1
-  url: /sample1/
+  url: /page-1-permalink/
 
 - title: Sample page 2
-  url: /sample2/
+  url: /page-2-permalink/
 
 - title: Sample page 3
-  url: /sample3/
+  url: /page-3-permalink/
 ```
 
-(You can store additional properties for each item in this data file as desired. Arrange the list items in the order you want them to appear.
+{: .note .info}
+If you never wrote any YAML before, you'll get quickly familiar with it. Take a look at [what you can do with YAML](https://learnxinyminutes.com/docs/yaml/).
+
+You can store additional properties for each item in this data file as desired. Arrange the list items in the order you want them to appear.
 
 To print the list of pages from the data file, use code like this:
 
 ```html
 {% raw %}{% endraw %}
 ```
@@ -352,13 +383,13 @@ If you have more sophisticated requirements around navigation, such as when buil
 
 ## 9. Simplify your site with includes
 
-Let's suppose your `default.html` file is massive and hard to work with. You can break up your layout by putting some of the content in include files.
+Let's suppose your `default.html` file is massive and hard to work with. You can break up your layout by putting some of the HTML code in *include* files.
 
 Add a folder called `_includes` in your root directory. In that folder, add a file there called `sidebar.html`.
 
 Remove your sidebar code from your `default.html` layout and insert it into the `sidebar.html` file.
 
-In place of sidebar code in `default.html`, pull in your include like this:
+Where the sidebar code previously existed in `default.html`, pull in your "include" like this:
 
 ```liquid
 {% raw %}{% include sidebar.html %}{% endraw %}
@@ -408,7 +439,7 @@ In your `default.html` layout, look for a reference to the RSS or Atom feed in y
 
 ```
 
-You can also auto-generate your feed by adding a gem called [`jekyll-feed`][jekyll-feed]. This gem will also work on GitHub Pages.
+You can also auto-generate your posts feed by adding a gem called [`jekyll-feed`][jekyll-feed]. This gem will also work on GitHub Pages.
 
 ## 11. Add a sitemap
 
@@ -444,7 +475,7 @@ search: exclude
 {% endraw %}
 ```
 
-Again, we're using a for loop here to iterate through all posts and pages to add them to the sitemap.
+Again, we're using a `for` loop here to iterate through all posts and pages to add them to the sitemap.
 
 You can also auto-generate your sitemap by adding a gem called [`jekyll-sitemap`][jekyll-sitemap]. This gem will also work on GitHub Pages.
 
@@ -452,16 +483,16 @@ You can also auto-generate your sitemap by adding a gem called [`jekyll-sitemap`
 
 For other services you might need (such as contact forms, search, comments, and more), look for third-party services. For example, you might use the following:
 
-* For comments: [Disqus](https://disqus.com/)
-* For a newsletter: [Tinyletter](https://tinyletter.com/)
-* For contact forms: [Wufoo](https://www.wufoo.com/)
-* For search: [Algolia Docsearch](https://community.algolia.com/docsearch/)
+  * For comments: [Disqus](https://disqus.com/)
+  * For a newsletter: [Tinyletter](https://tinyletter.com/)
+  * For contact forms: [Wufoo](https://www.wufoo.com/)
+  * For search: [Algolia Docsearch](https://community.algolia.com/docsearch/)
 
 For more details on services for static sites, see the [Third Parties](https://learn.cloudcannon.com/jekyll-third-parties/) list and tutorials from CloudCannon.
 
 Your Jekyll pages consist of HTML, CSS, and JavaScript, so pretty much any code you need to embed will work without a problem.
 
-As you integrate code for these services, not that if a page in your Jekyll site doesn't have front matter tags, Jekyll won't process any of the content. The page will just be passed to the `_site` folder when you build your site.
+As you integrate code for these services, note that **if a page in your Jekyll site doesn't have front matter tags, Jekyll won't process any of the content in that page.** The page will just be passed to the `_site` folder when you build your site.
 
 If you do want Jekyll to process some page content (for example, to populate a variable that you define in your site's config file), just add front matter tags to the page. If you don't want any layout applied to the page, specify `layout: null` like this:
 
@@ -475,16 +506,16 @@ layout: null
 
 Although websites can implement more sophisticated features and functionality, we've covered the basics in this tutorial. You now have a fully functional Jekyll site.
 
-To deploy your site, consider using [Github Pages](https://pages.github.com/), [Amazon AWS S3](https://aws.amazon.com/s3/) using the [s3_website plugin](https://github.com/laurilehmijoki/s3_website), or just FTP your files to your web server.
+To deploy your site, consider using [GitHub Pages](https://pages.github.com/), [Netlify](https://www.netlify.com/), [Amazon AWS S3](https://aws.amazon.com/s3/) using the [s3_website plugin](https://github.com/laurilehmijoki/s3_website), or just FTP your files to your web server.
 
-You can also take your Jekyll theme to the next level by [packaging it as a Ruby gem](docs/themes/#creating-a-theme).
+You can also package your layouts, includes and assets into a Ruby `gem` and [make it a Jekyll theme]({% link _docs/themes.md %}#creating-a-theme).
 
 ## Additional resources
 
 Here are some additional tutorials on creating Jekyll sites:
 
-* [Convert a static site to Jekyll](http://jekyll.tips/jekyll-casts/converting-a-static-site-to-jekyll/)
-* [Building a Jekyll Site – Part 1 of 3: Converting a Static Website To Jekyll](https://css-tricks.com/building-a-jekyll-site-part-1-of-3/)
+  * [Convert a static site to Jekyll](http://jekyll.tips/jekyll-casts/converting-a-static-site-to-jekyll/)
+  * [Building a Jekyll Site – Part 1 of 3: Converting a Static Website To Jekyll](https://css-tricks.com/building-a-jekyll-site-part-1-of-3/)
 
 [jekyll-sitemap]: https://help.github.com/articles/sitemaps-for-github-pages/
 [jekyll-feed]: https://help.github.com/articles/atom-rss-feeds-for-github-pages/
diff --git a/docs/img/jekylllayoutconcept.png b/docs/img/jekylllayoutconcept.png
index fe302c0a9d1f5f3430eb5771443fd41023130c23..bf0a3c34d56b144db38162256f758149d8e53d77 100644
GIT binary patch
literal 40209
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
Date: Sun, 9 Apr 2017 16:45:45 -0400
Subject: [PATCH 2101/4996] Update history to reflect merge of #6006 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ef2ef088b02..e98b6c3336e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -44,6 +44,7 @@
   * Fix missing quotation mark (#6002)
   * New tutorial: Convert an HTML site to Jekyll (#5881)
   * Revamp Permalink section (#5912)
+  * Fixup tutorial on creating theme from existing HTML templates (#6006)
 
 ### Development Fixes
 

From 034f03ed50f83183593095d4178063d8f18564a3 Mon Sep 17 00:00:00 2001
From: Zarino Zappia 
Date: Tue, 11 Apr 2017 16:19:49 +0100
Subject: [PATCH 2102/4996] Standardise on "URLs" without apostrophe in docs
 (#6018)

Merge pull request 6018
---
 History.markdown                                      | 4 ++--
 docs/_docs/github-pages.md                            | 4 ++--
 docs/_docs/history.md                                 | 4 ++--
 docs/_docs/posts.md                                   | 2 +-
 docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown | 2 +-
 docs/_posts/2016-10-06-jekyll-3-3-is-here.md          | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/History.markdown b/History.markdown
index e98b6c3336e..b51aae1358c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -395,7 +395,7 @@
   * Add `show_dir_listing` option for serve command and fix index file names (#4533)
   * Site Template: write a Gemfile which is educational to the new site (#4542)
   * Site template: add explanation of site variables in the example `_config.yml` (#4704)
-  * Adds `link` Liquid tag to make generation of URL's easier (#4624)
+  * Adds `link` Liquid tag to make generation of URLs easier (#4624)
   * Allow static files to be symlinked in unsafe mode or non-prod environments (#4640)
   * Add `:after_init` hook & add `Site#config=` to make resetting config easy (#4703)
   * DocumentDrop: add `#<=>` which sorts by date (falling back to path) (#4741)
@@ -1178,7 +1178,7 @@
   * Fix Rouge's RedCarpet plugin interface integration (#2951)
   * Remove `--watch` from the site template blog post since it defaults to watching in in 2.4.0 (#2922)
   * Fix code for media query mixin in site template (#2946)
-  * Allow post URL's to have `.htm` extensions (#2925)
+  * Allow post URLs to have `.htm` extensions (#2925)
   * `Utils.slugify`: Don't create new objects when gsubbing (#2997)
   * The jsonify filter should deep-convert to Liquid when given an Array. (#3032)
   * Apply `jsonify` filter to Hashes deeply and effectively (#3063)
diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index 875bb0ece71..2d519f68e00 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -17,13 +17,13 @@ This guide will teach you what you need to know about Git, GitHub, and Jekyll to
 
 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 URL's.
+Project Pages complicates the proper resolution of URLs. In order to assure your site builds properly, use `site.github.url` in your URLs.
 
 ```html
 {% raw %}
 
 
-
+
 [{{ page.title }}]("{{ page.url | prepend: site.github.url }}")
 {% endraw %}
 ```
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index d0938169520..c67f978ab08 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -346,7 +346,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Add `show_dir_listing` option for serve command and fix index file names ([#4533]({{ site.repository }}/issues/4533))
 - Site Template: write a Gemfile which is educational to the new site ([#4542]({{ site.repository }}/issues/4542))
 - Site template: add explanation of site variables in the example `_config.yml` ([#4704]({{ site.repository }}/issues/4704))
-- Adds `link` Liquid tag to make generation of URL's easier ([#4624]({{ site.repository }}/issues/4624))
+- Adds `link` Liquid tag to make generation of URLs easier ([#4624]({{ site.repository }}/issues/4624))
 - Allow static files to be symlinked in unsafe mode or non-prod environments ([#4640]({{ site.repository }}/issues/4640))
 - Add `:after_init` hook & add `Site#config=` to make resetting config easy ([#4703]({{ site.repository }}/issues/4703))
 - DocumentDrop: add `#<=>` which sorts by date (falling back to path) ([#4741]({{ site.repository }}/issues/4741))
@@ -1200,7 +1200,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Fix Rouge's RedCarpet plugin interface integration ([#2951]({{ site.repository }}/issues/2951))
 - Remove `--watch` from the site template blog post since it defaults to watching in in 2.4.0 ([#2922]({{ site.repository }}/issues/2922))
 - Fix code for media query mixin in site template ([#2946]({{ site.repository }}/issues/2946))
-- Allow post URL's to have `.htm` extensions ([#2925]({{ site.repository }}/issues/2925))
+- Allow post URLs to have `.htm` extensions ([#2925]({{ site.repository }}/issues/2925))
 - `Utils.slugify`: Don't create new objects when gsubbing ([#2997]({{ site.repository }}/issues/2997))
 - The jsonify filter should deep-convert to Liquid when given an Array. ([#3032]({{ site.repository }}/issues/3032))
 - Apply `jsonify` filter to Hashes deeply and effectively ([#3063]({{ site.repository }}/issues/3063))
diff --git a/docs/_docs/posts.md b/docs/_docs/posts.md
index ce00e2dde74..79b918153c1 100644
--- a/docs/_docs/posts.md
+++ b/docs/_docs/posts.md
@@ -43,7 +43,7 @@ file. For example, the following are examples of valid post filenames:
   
            ProTip™: Link to other posts
            
   
            
     Use the post_url
-    tag to link to other posts without having to worry about the URL's
+    tag to link to other posts without having to worry about the URLs
     breaking when the site permalink style changes.
   
            
 
    
diff --git a/docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown b/docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown
index 4cf4b6f754a..c17b8ce5648 100644
--- a/docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown
+++ b/docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown
@@ -22,7 +22,7 @@ Some other notable changes:
 - Explicit support for Ruby 2.0.x was dropped
 - Added an `:after_init` Hook
 - Added a `where_exp` filter to provide more powerful filtering
-- Added a `link` liquid tag which can be used to generate URL's for any
+- Added a `link` liquid tag which can be used to generate URLs for any
 post or document based on its path relative to the site source
 - ... and lots more!
 
diff --git a/docs/_posts/2016-10-06-jekyll-3-3-is-here.md b/docs/_posts/2016-10-06-jekyll-3-3-is-here.md
index 8c756ef7291..1ddddac12b7 100644
--- a/docs/_posts/2016-10-06-jekyll-3-3-is-here.md
+++ b/docs/_posts/2016-10-06-jekyll-3-3-is-here.md
@@ -55,7 +55,7 @@ By default, `baseurl` is set to `""` and therefore yields (never set to
 
 A result of `relative_url` will safely always produce a URL which is
 relative to the domain root. A similar principle applies to `absolute_url`.
-It prepends your `baseurl` and `url` values, making absolute URL's all the
+It prepends your `baseurl` and `url` values, making absolute URLs all the
 easier to make:
 
 {% highlight liquid %}

From 4e82518a019a931d5148f2cd9b5ff28bea145785 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 11 Apr 2017 11:19:51 -0400
Subject: [PATCH 2103/4996] Update history to reflect merge of #6018 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b51aae1358c..4797308c0fc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -45,6 +45,7 @@
   * New tutorial: Convert an HTML site to Jekyll (#5881)
   * Revamp Permalink section (#5912)
   * Fixup tutorial on creating theme from existing HTML templates (#6006)
+  * Standardise on "URLs" without apostrophe in docs (#6018)
 
 ### Development Fixes
 

From 87dd49693b6549bfad5c7c4e735bf4bb71ee49a0 Mon Sep 17 00:00:00 2001
From: Ricky Han 
Date: Thu, 13 Apr 2017 08:13:18 -0400
Subject: [PATCH 2104/4996] Added txtpen in tutorial (#6021)

Merge pull request 6021
---
 docs/_docs/extras.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/_docs/extras.md b/docs/_docs/extras.md
index 87971f74a33..e79b9e90d74 100644
--- a/docs/_docs/extras.md
+++ b/docs/_docs/extras.md
@@ -6,6 +6,16 @@ permalink: /docs/extras/
 There are a number of (optional) extra features that Jekyll supports that you
 may want to install, depending on how you plan to use Jekyll.
 
+## Web Highlights and Commenting 
+
+Register your site with [txtpen](https://txtpen.com). Then append 
+
+```html
+    
 ```
 
 to your template files in `/_layout` folder.

From be9b83dff6b3479a05ae787614c853cfbe0c5ba3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 14 Apr 2017 07:33:36 -0400
Subject: [PATCH 2109/4996] Update history to reflect merge of #6027 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 39a0bf414d2..d37a675ac8d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -48,6 +48,7 @@
   * Standardise on "URLs" without apostrophe in docs (#6018)
   * Added txtpen in tutorial (#6021)
   * fix typo using past participle (#6026)
+  * changed formatting to fit the style of the documentation (#6027)
 
 ### Development Fixes
 

From edc7a7ae54f1b183faace8be70db5c113d4ada91 Mon Sep 17 00:00:00 2001
From: Jeff Puckett 
Date: Fri, 14 Apr 2017 15:28:32 -0500
Subject: [PATCH 2110/4996] doc fix typo word usage (#6028)

Merge pull request 6028
---
 docs/_tutorials/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_tutorials/index.md b/docs/_tutorials/index.md
index f023dc11e5c..e0eacfa6297 100644
--- a/docs/_tutorials/index.md
+++ b/docs/_tutorials/index.md
@@ -16,7 +16,7 @@ In contrast to [Docs](/docs/home/), Tutorials provide more detailed, narrative i
 In short, tutorials aren't the core reference information in docs. They walk users through processes from beginning to end.
 
 {: .info .note}
-**Note:** The Tutorials section is new, so there aren't many tutorials yet. You can add a tutorial here to help popular this section.
+**Note:** The Tutorials section is new, so there aren't many tutorials yet. You can add a tutorial here to help populate this section.
 
 Some of these techniques might even guide you through a supporting tool, script, service, or other hack used with your Jekyll site. Feel free to include tutorials involving external services with Jekyll as well. However, note that Jekyll in no way endorses any third-party tools mentioned in tutorials.
 

From 3df88b2e31d49a6eb8a782bb39f13d40a471c55a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 14 Apr 2017 16:28:33 -0400
Subject: [PATCH 2111/4996] Update history to reflect merge of #6028 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d37a675ac8d..e458583e714 100644
--- a/History.markdown
+++ b/History.markdown
@@ -49,6 +49,7 @@
   * Added txtpen in tutorial (#6021)
   * fix typo using past participle (#6026)
   * changed formatting to fit the style of the documentation (#6027)
+  * doc fix typo word usage (#6028)
 
 ### Development Fixes
 

From ccb133fd333e75ddbf51bf26efc5b95085c6e449 Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Mon, 17 Apr 2017 12:46:33 +0100
Subject: [PATCH 2112/4996] add `plugins` config key as replacement for `gems`
 (#5130)

Merge pull request 5130
---
 docs/_docs/assets.md         |  2 +-
 docs/_docs/configuration.md  |  2 +-
 docs/_docs/plugins.md        |  6 +++---
 lib/jekyll/configuration.rb  | 24 ++++++++++++++++++++++--
 lib/jekyll/errors.rb         |  9 +++++----
 lib/jekyll/plugin_manager.rb | 14 +++++++-------
 lib/jekyll/site.rb           |  5 ++++-
 test/test_configuration.rb   | 16 ++++++++++++----
 test/test_plugin_manager.rb  |  2 +-
 9 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/docs/_docs/assets.md b/docs/_docs/assets.md
index 7418f984f34..b31cf16cfe3 100644
--- a/docs/_docs/assets.md
+++ b/docs/_docs/assets.md
@@ -88,6 +88,6 @@ To enable Coffeescript in Jekyll 3.0 and up you must
 * Ensure that your `_config.yml` is up-to-date and includes the following:
 
 ```yaml
-gems:
+plugins:
  - jekyll-coffeescript
 ```
diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index 989aa907eeb..7789d52f6e7 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -616,7 +616,7 @@ unpublished: false
 
 # Plugins
 whitelist: []
-gems:      []
+plugins:   []
 
 # Conversion
 markdown:    kramdown
diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 4c09d2275f3..bc6386e2c7c 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -27,12 +27,12 @@ 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 `gems` and the
+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:
 
 
-        gems: [jekyll-coffeescript, jekyll-watch, jekyll-assets]
-        # This will require each of these gems automatically.
+        plugins: [jekyll-coffeescript, jekyll-watch, jekyll-assets]
+        # This will require each of these plugins automatically.
 
     Then install your plugins using `gem install jekyll-coffeescript jekyll-watch jekyll-assets`
 
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 1e2ca01c7b1..86bee3c10a9 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -33,7 +33,7 @@ class Configuration < Hash
 
       # Plugins
       "whitelist"         => [],
-      "gems"              => [],
+      "plugins"           => [],
 
       # Conversion
       "markdown"          => "kramdown",
@@ -229,9 +229,10 @@ def backwards_compatibilize
       # Provide backwards-compatibility
       check_auto(config)
       check_server(config)
+      check_plugins(config)
 
       renamed_key "server_port", "port", config
-      renamed_key "plugins", "plugins_dir", config
+      renamed_key "gems", "plugins", config
       renamed_key "layouts", "layouts_dir", config
       renamed_key "data_source", "data_dir", config
 
@@ -385,5 +386,24 @@ def check_maruku(config)
           "`_config.yml` file."
       end
     end
+
+    # Private: Checks if the `plugins` config is a String
+    #
+    # config - the config hash
+    #
+    # Raises a Jekyll::Errors::InvalidConfigurationError if the config `plugins`
+    # is a string
+    private
+    def check_plugins(config)
+      if config.key?("plugins") && config["plugins"].is_a?(String)
+        Jekyll.logger.error "Configuration Error:", "You specified the" \
+          " `plugins` config in your configuration file as a string, please" \
+          " use an array instead. If you wanted to set the directory of your" \
+          " plugins, use the config key `plugins_dir` instead."
+        raise Jekyll::Errors::InvalidConfigurationError,
+          "'plugins' should not be a string, but was: " \
+          "#{config["plugins"].inspect}. Use 'plugins_dir' instead."
+      end
+    end
   end
 end
diff --git a/lib/jekyll/errors.rb b/lib/jekyll/errors.rb
index 6ae24337ab5..95aa04b4ccd 100644
--- a/lib/jekyll/errors.rb
+++ b/lib/jekyll/errors.rb
@@ -9,9 +9,10 @@ module Errors
     InvalidYAMLFrontMatterError = Class.new(FatalException)
     MissingDependencyException  = Class.new(FatalException)
 
-    InvalidDateError      = Class.new(FatalException)
-    InvalidPostNameError  = Class.new(FatalException)
-    PostURLError          = Class.new(FatalException)
-    InvalidURLError       = Class.new(FatalException)
+    InvalidDateError            = Class.new(FatalException)
+    InvalidPostNameError        = Class.new(FatalException)
+    PostURLError                = Class.new(FatalException)
+    InvalidURLError             = Class.new(FatalException)
+    InvalidConfigurationError   = Class.new(FatalException)
   end
 end
diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb
index fa183c628dd..979004d63b6 100644
--- a/lib/jekyll/plugin_manager.rb
+++ b/lib/jekyll/plugin_manager.rb
@@ -26,7 +26,7 @@ def conscientious_require
     # Returns nothing.
     def require_gems
       Jekyll::External.require_with_graceful_fail(
-        site.gems.select { |gem| plugin_allowed?(gem) }
+        site.gems.select { |plugin| plugin_allowed?(plugin) }
       )
     end
 
@@ -59,12 +59,12 @@ def self.require_from_bundler
 
     # Check whether a gem plugin is allowed to be used during this build.
     #
-    # gem_name - the name of the gem
+    # plugin_name - the name of the plugin
     #
-    # Returns true if the gem name is in the whitelist or if the site is not
+    # Returns true if the plugin name is in the whitelist or if the site is not
     #   in safe mode.
-    def plugin_allowed?(gem_name)
-      !site.safe || whitelist.include?(gem_name)
+    def plugin_allowed?(plugin_name)
+      !site.safe || whitelist.include?(plugin_name)
     end
 
     # Build an array of allowed plugin gem names.
@@ -99,12 +99,12 @@ def plugins_path
     end
 
     def deprecation_checks
-      pagination_included = (site.config["gems"] || []).include?("jekyll-paginate") ||
+      pagination_included = (site.config["plugins"] || []).include?("jekyll-paginate") ||
         defined?(Jekyll::Paginate)
       if site.config["paginate"] && !pagination_included
         Jekyll::Deprecator.deprecation_message "You appear to have pagination " \
           "turned on, but you haven't included the `jekyll-paginate` gem. " \
-          "Ensure you have `gems: [jekyll-paginate]` in your configuration file."
+          "Ensure you have `plugins: [jekyll-paginate]` in your configuration file."
       end
     end
   end
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 347cea97641..6476027577b 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -46,10 +46,13 @@ def config=(config)
       @config = config.clone
 
       %w(safe lsi highlighter baseurl exclude include future unpublished
-        show_drafts limit_posts keep_files gems).each do |opt|
+        show_drafts limit_posts keep_files).each do |opt|
         self.send("#{opt}=", config[opt])
       end
 
+      # keep using `gems` to avoid breaking change
+      self.gems = config["plugins"]
+
       configure_plugins
       configure_theme
       configure_include_paths
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 9602c5c309f..c9988d163bc 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -205,9 +205,9 @@ class TestConfiguration < JekyllUnitTest
         "exclude"     => "READ-ME.md, Gemfile,CONTRIBUTING.hello.markdown",
         "include"     => "STOP_THE_PRESSES.txt,.heloses, .git",
         "pygments"    => true,
-        "plugins"     => true,
         "layouts"     => true,
         "data_source" => true,
+        "gems"        => [],
       }]
     end
     should "unset 'auto' and 'watch'" do
@@ -242,9 +242,6 @@ class TestConfiguration < JekyllUnitTest
       assert_equal @config.backwards_compatibilize["highlighter"], "pygments"
     end
     should "adjust directory names" do
-      assert @config.key?("plugins")
-      assert !@config.backwards_compatibilize.key?("plugins")
-      assert @config.backwards_compatibilize["plugins_dir"]
       assert @config.key?("layouts")
       assert !@config.backwards_compatibilize.key?("layouts")
       assert @config.backwards_compatibilize["layouts_dir"]
@@ -252,6 +249,17 @@ class TestConfiguration < JekyllUnitTest
       assert !@config.backwards_compatibilize.key?("data_source")
       assert @config.backwards_compatibilize["data_dir"]
     end
+    should "raise an error if `plugins` key is a string" do
+      config = Configuration[{ "plugins" => "_plugin" }]
+      assert_raises Jekyll::Errors::InvalidConfigurationError do
+        config.backwards_compatibilize
+      end
+    end
+    should "set the `gems` config to `plugins`" do
+      assert @config.key?("gems")
+      assert !@config.backwards_compatibilize["gems"]
+      assert @config.backwards_compatibilize["plugins"]
+    end
   end
   context "#fix_common_issues" do
     setup do
diff --git a/test/test_plugin_manager.rb b/test/test_plugin_manager.rb
index 9217965b211..90f057641e7 100644
--- a/test/test_plugin_manager.rb
+++ b/test/test_plugin_manager.rb
@@ -132,7 +132,7 @@ def with_no_gemfile
 
     should "print no deprecation warning if jekyll-paginate is present" do
       site = double({
-        :config => { "paginate" => true, "gems" => ["jekyll-paginate"] },
+        :config => { "paginate" => true, "plugins" => ["jekyll-paginate"] },
       })
       plugin_manager = PluginManager.new(site)
 

From 14f0db9dcc10bd3c80c4f1f9a69ef220a2bd9102 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 17 Apr 2017 07:46:34 -0400
Subject: [PATCH 2113/4996] Update history to reflect merge of #5130 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e458583e714..da5850561b9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -10,6 +10,7 @@
   * Require `runtime_dependencies` of a Gem-based theme from its `.gemspec` file (#5914)
   * Don't raise an error if URL contains a colon (#5889)
   * Date filters should never raise an exception (#5722)
+  * add `plugins` config key as replacement for `gems` (#5130)
 
 ### Documentation
 

From a2e5899450b740ac94b30c8766b5cdf51cc29a22 Mon Sep 17 00:00:00 2001
From: Sven Meyer 
Date: Mon, 17 Apr 2017 23:03:59 +0200
Subject: [PATCH 2114/4996] corrected reference to layout in index.md (#6032)

Merge pull request 6032
---
 docs/_tutorials/convert-existing-site-to-jekyll.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_tutorials/convert-existing-site-to-jekyll.md b/docs/_tutorials/convert-existing-site-to-jekyll.md
index 6a041e8ba64..a1058d75d97 100644
--- a/docs/_tutorials/convert-existing-site-to-jekyll.md
+++ b/docs/_tutorials/convert-existing-site-to-jekyll.md
@@ -56,7 +56,7 @@ name: My Jekyll Website
 ```yaml
 ---
 title: My page
-layout: default.html
+layout: default
 ---
 
 # {% raw %}{{ page.title }}{% endraw %}

From b37d8b13dc212daab4ee52aed71993d11a5e9893 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 17 Apr 2017 17:04:00 -0400
Subject: [PATCH 2115/4996] Update history to reflect merge of #6032 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index da5850561b9..6783db30f56 100644
--- a/History.markdown
+++ b/History.markdown
@@ -51,6 +51,7 @@
   * fix typo using past participle (#6026)
   * changed formatting to fit the style of the documentation (#6027)
   * doc fix typo word usage (#6028)
+  * corrected reference to layout in index.md (#6032)
 
 ### Development Fixes
 

From af5d0965c03b97130435a9e0cca1299cc5dc72c0 Mon Sep 17 00:00:00 2001
From: Jeff Puckett 
Date: Mon, 17 Apr 2017 16:06:59 -0500
Subject: [PATCH 2116/4996] doc use example.com (#6031)

Merge pull request 6031
---
 lib/site_template/_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
index 436d5999500..8cb35c70e85 100644
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -14,7 +14,7 @@
 # You can create any custom variable you would like, and they will be accessible
 # in the templates via {{ site.myvariable }}.
 title: Your awesome title
-email: your-email@domain.com
+email: your-email@example.com
 description: > # this means to ignore newlines until "baseurl:"
   Write an awesome description for your new site here. You can edit this
   line in _config.yml. It will appear in your document head meta (for

From 144d053226fbb69145501a946aaea160f96cbffd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 17 Apr 2017 17:07:00 -0400
Subject: [PATCH 2117/4996] Update history to reflect merge of #6031 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6783db30f56..b54331c396b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -66,6 +66,7 @@
   * rubocop: lib/jekyll/renderer.rb complexity fixes (#5052)
   * Use yajl-ruby 1.2.2 (now with 2.4 support) (#6007)
   * Bump Rubocop to v0.48 (#5997)
+  * doc use example.com (#6031)
 
 ### Site Enhancements
 

From b728473a63433ab3187a481d815b0131d8d49740 Mon Sep 17 00:00:00 2001
From: Brent Yi 
Date: Mon, 17 Apr 2017 14:32:04 -0700
Subject: [PATCH 2118/4996] Update CDN for MathJax (#6013)

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

diff --git a/docs/_docs/extras.md b/docs/_docs/extras.md
index 7a826802c80..05d4682e874 100644
--- a/docs/_docs/extras.md
+++ b/docs/_docs/extras.md
@@ -21,7 +21,7 @@ to your template files in `/_layout` folder.
 Kramdown comes with optional support for LaTeX to PNG rendering via [MathJax](https://www.mathjax.org) within math blocks. See the Kramdown documentation on [math blocks](http://kramdown.gettalong.org/syntax.html#math-blocks) and [math support](http://kramdown.gettalong.org/converter/html.html#math-support) for more details. MathJax requires you to include JavaScript or CSS to render the LaTeX, e.g.
 
 ```html
-
+
 ```
 
 For more information about getting started, check out [this excellent blog post](http://gastonsanchez.com/visually-enforced/opinion/2014/02/16/Mathjax-with-jekyll/).

From 4b8b3084cdd5a6c1a6d30002a725a6e8bac0ed8a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 17 Apr 2017 17:32:06 -0400
Subject: [PATCH 2119/4996] Update history to reflect merge of #6013 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b54331c396b..7486379fe62 100644
--- a/History.markdown
+++ b/History.markdown
@@ -52,6 +52,7 @@
   * changed formatting to fit the style of the documentation (#6027)
   * doc fix typo word usage (#6028)
   * corrected reference to layout in index.md (#6032)
+  * (Minor) Update MathJax CDN (#6013)
 
 ### Development Fixes
 

From c35f0ed71cce00c05735e22c293150ba1e9e9a99 Mon Sep 17 00:00:00 2001
From: Marc Bruins 
Date: Wed, 19 Apr 2017 00:43:36 +0200
Subject: [PATCH 2120/4996] Add MvvmCross to samples (#6035)

Merge pull request 6035
---
 docs/_docs/sites.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/_docs/sites.md b/docs/_docs/sites.md
index 65401551cdc..f01a7a77f15 100644
--- a/docs/_docs/sites.md
+++ b/docs/_docs/sites.md
@@ -13,6 +13,8 @@ learning purposes.
     ([source](https://github.com/github/training-kit))
 - [Rasmus Andersson](https://rsms.me/)
     ([source](https://github.com/rsms/rsms.github.com))
+- [MvvmCross](https://mvvmcross.github.io/MvvmCross/)
+    ([source](https://github.com/MvvmCross/MvvmCross/tree/master/docs))
 
 If you would like to explore more examples, you can find a list of sites
 and their sources on the ["Sites" page in the Jekyll wiki][jekyll-sites].

From 76fb728f7207ca9cf3457660f593a2794abec6d8 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 18 Apr 2017 18:43:38 -0400
Subject: [PATCH 2121/4996] Update history to reflect merge of #6035 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7486379fe62..280fc471c7e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -53,6 +53,7 @@
   * doc fix typo word usage (#6028)
   * corrected reference to layout in index.md (#6032)
   * (Minor) Update MathJax CDN (#6013)
+  * Add MvvmCross to samples (#6035)
 
 ### Development Fixes
 

From 0108b22f3c99fa1d9bfb0ba4e72e2ded3fe4e281 Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Wed, 19 Apr 2017 19:50:25 +0100
Subject: [PATCH 2122/4996] create configuration from options only once in the
 boot process (#5487)

Merge pull request 5487
---
 lib/jekyll/command.rb        |  1 +
 lib/jekyll/commands/serve.rb | 11 ++++++-----
 test/test_commands_serve.rb  | 25 +++++++++++++++++++++----
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index 2a4fc77f450..9150d24d806 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -37,6 +37,7 @@ def process_site(site)
       #
       # Returns a full Jekyll configuration
       def configuration_from_options(options)
+        return options if options.is_a?(Jekyll::Configuration)
         Jekyll.configuration(options)
       end
 
diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 1691359569d..622eda49b49 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -32,11 +32,12 @@ def init_with_program(prog)
             cmd.action do |_, opts|
               opts["serving"] = true
               opts["watch"  ] = true unless opts.key?("watch")
-              config = opts["config"]
-              opts["url"] = default_url(opts) if Jekyll.env == "development"
-              Build.process(opts)
-              opts["config"] = config
-              Serve.process(opts)
+
+              config = configuration_from_options(opts)
+              if Jekyll.env == "development"
+                config["url"] = default_url(config)
+              end
+              [Build, Serve].each { |klass| klass.process(config) }
             end
           end
         end
diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb
index fa0f7f67bf3..ef98bab4e2b 100644
--- a/test/test_commands_serve.rb
+++ b/test/test_commands_serve.rb
@@ -82,16 +82,26 @@ def custom_opts(what)
       end
 
       should "keep config between build and serve" do
-        custom_options = {
+        options = {
           "config"  => %w(_config.yml _development.yml),
           "serving" => true,
           "watch"   => false, # for not having guard output when running the tests
           "url"     => "http://localhost:4000",
         }
+        config = Jekyll::Configuration.from(options)
 
-        expect(Jekyll::Commands::Serve).to receive(:process).with(custom_options)
-        @merc.execute(:serve, { "config" => %w(_config.yml _development.yml),
-                                "watch"  => false, })
+        allow(Jekyll::Command).to(
+          receive(:configuration_from_options).with(options).and_return(config)
+        )
+        allow(Jekyll::Command).to(
+          receive(:configuration_from_options).with(config).and_return(config)
+        )
+
+        expect(Jekyll::Commands::Build).to(
+          receive(:process).with(config).and_call_original
+        )
+        expect(Jekyll::Commands::Serve).to receive(:process).with(config)
+        @merc.execute(:serve, options)
       end
 
       context "in development environment" do
@@ -175,5 +185,12 @@ def custom_opts(what)
         end
       end
     end
+
+    should "read `configuration` only once" do
+      allow(Jekyll::Commands::Serve).to receive(:start_up_webrick)
+
+      expect(Jekyll).to receive(:configuration).once.and_call_original
+      @merc.execute(:serve, { "watch" => false })
+    end
   end
 end

From 4c61e1809a26ad9d0c419bb98c0dec97ee3ce41d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 19 Apr 2017 14:50:27 -0400
Subject: [PATCH 2123/4996] Update history to reflect merge of #5487 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 280fc471c7e..a41751b3d5b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
   * Don't raise an error if URL contains a colon (#5889)
   * Date filters should never raise an exception (#5722)
   * add `plugins` config key as replacement for `gems` (#5130)
+  * create configuration from options only once in the boot process (#5487)
 
 ### Documentation
 

From 694dcbd9e0af70db0db9e7c562ce1d7e8f7ae9a0 Mon Sep 17 00:00:00 2001
From: dyang 
Date: Wed, 19 Apr 2017 18:42:22 -0400
Subject: [PATCH 2124/4996] fix typo (#6040)

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

diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb
index 37c7e56546b..f7e52f42b57 100644
--- a/lib/jekyll/tags/post_url.rb
+++ b/lib/jekyll/tags/post_url.rb
@@ -81,7 +81,7 @@ def render(context)
         site.posts.docs.each do |p|
           next unless @post.deprecated_equality p
           Jekyll::Deprecator.deprecation_message "A call to "\
-            "'{{ post_url #{@post.name} }}' did not match " \
+            "'{% post_url #{@post.name} %}' did not match " \
             "a post using the new matching method of checking name " \
             "(path-date-slug) equality. Please make sure that you " \
             "change this tag to match the post's name exactly."

From 13976cfb33f19b9c8fb7c9e9b306f354c6ca500c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 19 Apr 2017 18:42:23 -0400
Subject: [PATCH 2125/4996] Update history to reflect merge of #6040 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a41751b3d5b..2633828363e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -70,6 +70,7 @@
   * Use yajl-ruby 1.2.2 (now with 2.4 support) (#6007)
   * Bump Rubocop to v0.48 (#5997)
   * doc use example.com (#6031)
+  * fix typo (#6040)
 
 ### Site Enhancements
 

From 3a36fde2402f6341caf4494e423774d1b44bac82 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 22 Apr 2017 22:22:26 +0200
Subject: [PATCH 2126/4996] Fix CI after #6040 (#6044)

Merge pull request 6044
---
 test/test_tags.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_tags.rb b/test/test_tags.rb
index f077615defb..68fd40398a8 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -643,7 +643,7 @@ def highlight_block_with_opts(options_string)
 
     should "throw a deprecation warning" do
       deprecation_warning = "       Deprecation: A call to "\
-        "'{{ post_url 2008-11-21-nested }}' did not match a post using the new matching "\
+        "'{% post_url 2008-11-21-nested %}' did not match a post using the new matching "\
         "method of checking name (path-date-slug) equality. Please make sure that you "\
         "change this tag to match the post's name exactly."
       assert_includes Jekyll.logger.messages, deprecation_warning

From 4aa073279fd34d95d4fb2852aba80406cfb0a208 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 22 Apr 2017 16:22:27 -0400
Subject: [PATCH 2127/4996] Update history to reflect merge of #6044 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2633828363e..8f1a3379cb0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -71,6 +71,7 @@
   * Bump Rubocop to v0.48 (#5997)
   * doc use example.com (#6031)
   * fix typo (#6040)
+  * Fix CI  (#6044)
 
 ### Site Enhancements
 

From 457e4515e80e16f2d59b35a97ddd641002460e58 Mon Sep 17 00:00:00 2001
From: Liu Cheng 
Date: Mon, 24 Apr 2017 03:44:57 -0400
Subject: [PATCH 2128/4996] Update travis-ci.md to correct procedure (#6043)

Merge pull request 6043
---
 docs/_docs/continuous-integration/travis-ci.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/continuous-integration/travis-ci.md b/docs/_docs/continuous-integration/travis-ci.md
index e76e1a60c32..cf7d74997eb 100644
--- a/docs/_docs/continuous-integration/travis-ci.md
+++ b/docs/_docs/continuous-integration/travis-ci.md
@@ -15,7 +15,7 @@ Enabling Travis builds for your GitHub repository is pretty simple:
 
 1. Go to your profile on travis-ci.org: https://travis-ci.org/profile/username
 2. Find the repository for which you're interested in enabling builds.
-3. Click the slider on the right so it says "ON" and is a dark grey.
+3. Flick the repository switch on so that it turns blue.
 4. Optionally configure the build by clicking on the gear icon. Further
    configuration happens in your `.travis.yml` file. More details on that
    below.

From 2e34bb816a4e257c7db7dc05d6089fdbd67b4cb2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 24 Apr 2017 03:44:58 -0400
Subject: [PATCH 2129/4996] Update history to reflect merge of #6043 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8f1a3379cb0..c10fab27d8c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -55,6 +55,7 @@
   * corrected reference to layout in index.md (#6032)
   * (Minor) Update MathJax CDN (#6013)
   * Add MvvmCross to samples (#6035)
+  * Update travis-ci.md to correct procedure (#6043)
 
 ### Development Fixes
 

From 5f7f9ff1967a29a6fde6422ff1b6cf637af3e794 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Mon, 24 Apr 2017 21:26:04 +0530
Subject: [PATCH 2130/4996] fix sentence in documentation (#6048)

Merge pull request 6048
---
 docs/_docs/continuous-integration/travis-ci.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/_docs/continuous-integration/travis-ci.md b/docs/_docs/continuous-integration/travis-ci.md
index cf7d74997eb..91323958024 100644
--- a/docs/_docs/continuous-integration/travis-ci.md
+++ b/docs/_docs/continuous-integration/travis-ci.md
@@ -17,8 +17,7 @@ Enabling Travis builds for your GitHub repository is pretty simple:
 2. Find the repository for which you're interested in enabling builds.
 3. Flick the repository switch on so that it turns blue.
 4. Optionally configure the build by clicking on the gear icon. Further
-   configuration happens in your `.travis.yml` file. More details on that
-   below.
+   configuration happens via your `.travis.yml` file. More details below.
 
 ## 2. The Test Script
 

From fbd535278ecdc4ee0341b7fb3bebd0bad4a757ca Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 24 Apr 2017 11:56:05 -0400
Subject: [PATCH 2131/4996] Update history to reflect merge of #6048 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c10fab27d8c..28b4b100598 100644
--- a/History.markdown
+++ b/History.markdown
@@ -56,6 +56,7 @@
   * (Minor) Update MathJax CDN (#6013)
   * Add MvvmCross to samples (#6035)
   * Update travis-ci.md to correct procedure (#6043)
+  * fix sentence in documentation (#6048)
 
 ### Development Fixes
 

From 0aea7c526294a2d68acf9e378c09d5b2d5fd5d49 Mon Sep 17 00:00:00 2001
From: Ryan Streur 
Date: Tue, 25 Apr 2017 08:37:35 -0700
Subject: [PATCH 2132/4996] rephrase a sentence in posts.md to be more direct
 (#6049)

Merge pull request 6049
---
 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 f26c1c92be2..7265a564919 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.
 
-Because of Jekyll’s flexibility, there are many solutions to how to do this.
+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

From 46668744e4d14e17cbe05e0ce7d2904d29657551 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 25 Apr 2017 11:37:37 -0400
Subject: [PATCH 2133/4996] Update history to reflect merge of #6049 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 28b4b100598..9e42055cd1b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -57,6 +57,7 @@
   * Add MvvmCross to samples (#6035)
   * Update travis-ci.md to correct procedure (#6043)
   * fix sentence in documentation (#6048)
+  * rephrase a sentence in posts.md to be more direct (#6049)
 
 ### Development Fixes
 

From d37f604fe2af472643ced91559e9b6208fd50330 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 25 Apr 2017 17:40:13 +0200
Subject: [PATCH 2134/4996] Compress Website Sass output (#6009)

Merge pull request 6009
---
 docs/_config.yml           |   2 +
 docs/_sass/_normalize.scss | 428 ++++++++++++++++++++++++++++++++++++-
 rake/site.rake             |   6 +-
 3 files changed, 431 insertions(+), 5 deletions(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index 3661906ae06..ab3d4bf3aa1 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,5 +1,7 @@
 markdown: kramdown
 highlighter: rouge
+sass:
+  style: compressed
 
 gauges_id: 503c5af6613f5d0f19000027
 google_analytics_id: UA-50755011-1
diff --git a/docs/_sass/_normalize.scss b/docs/_sass/_normalize.scss
index 36186c9931a..b26c1009564 100644
--- a/docs/_sass/_normalize.scss
+++ b/docs/_sass/_normalize.scss
@@ -1 +1,427 @@
-/*! normalize.css v6.0.0 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}article,aside,footer,header,nav,section{display:block}h1{font-size:2em;margin:0.67em 0}figcaption,figure,main{display:block}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace, monospace;font-size:1em}a{background-color:transparent;-webkit-text-decoration-skip:objects}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace, monospace;font-size:1em}dfn{font-style:italic}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-0.25em}sup{top:-0.5em}audio,video{display:inline-block}audio:not([controls]){display:none;height:0}img{border-style:none}svg:not(:root){overflow:hidden}button,input,optgroup,select,textarea{margin:0}button,input{overflow:visible}button,select{text-transform:none}button,html [type="button"],[type="reset"],[type="submit"]{-webkit-appearance:button}button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{border-style:none;padding:0}button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{outline:1px dotted ButtonText}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{display:inline-block;vertical-align:baseline}textarea{overflow:auto}[type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto}[type="search"]{-webkit-appearance:textfield;outline-offset:-2px}[type="search"]::-webkit-search-cancel-button,[type="search"]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details,menu{display:block}summary{display:list-item}canvas{display:inline-block}template{display:none}[hidden]{display:none}
+/*! normalize.css v6.0.0 | MIT License | github.com/necolas/normalize.css */
+
+/* Document
+   ========================================================================== */
+
+/**
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in
+ *    IE on Windows Phone and in iOS.
+ */
+
+html {
+  line-height: 1.15; /* 1 */
+  -ms-text-size-adjust: 100%; /* 2 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/* Sections
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ */
+
+article,
+aside,
+footer,
+header,
+nav,
+section {
+  display: block;
+}
+
+/**
+ * Correct the font size and margin on `h1` elements within `section` and
+ * `article` contexts in Chrome, Firefox, and Safari.
+ */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ * 1. Add the correct display in IE.
+ */
+
+figcaption,
+figure,
+main { /* 1 */
+  display: block;
+}
+
+/**
+ * Add the correct margin in IE 8.
+ */
+
+figure {
+  margin: 1em 40px;
+}
+
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
+ */
+
+hr {
+  box-sizing: content-box; /* 1 */
+  height: 0; /* 1 */
+  overflow: visible; /* 2 */
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+pre {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * 1. Remove the gray background on active links in IE 10.
+ * 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
+ */
+
+a {
+  background-color: transparent; /* 1 */
+  -webkit-text-decoration-skip: objects; /* 2 */
+}
+
+/**
+ * 1. Remove the bottom border in Chrome 57- and Firefox 39-.
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+ */
+
+abbr[title] {
+  border-bottom: none; /* 1 */
+  text-decoration: underline; /* 2 */
+  text-decoration: underline dotted; /* 2 */
+}
+
+/**
+ * Prevent the duplicate application of `bolder` by the next rule in Safari 6.
+ */
+
+b,
+strong {
+  font-weight: inherit;
+}
+
+/**
+ * Add the correct font weight in Chrome, Edge, and Safari.
+ */
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+code,
+kbd,
+samp {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/**
+ * Add the correct font style in Android 4.3-.
+ */
+
+dfn {
+  font-style: italic;
+}
+
+/**
+ * Add the correct background and color in IE 9-.
+ */
+
+mark {
+  background-color: #ff0;
+  color: #000;
+}
+
+/**
+ * Add the correct font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` elements from affecting the line height in
+ * all browsers.
+ */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ */
+
+audio,
+video {
+  display: inline-block;
+}
+
+/**
+ * Add the correct display in iOS 4-7.
+ */
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+/**
+ * Remove the border on images inside links in IE 10-.
+ */
+
+img {
+  border-style: none;
+}
+
+/**
+ * Hide the overflow in IE.
+ */
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * Remove the margin in Firefox and Safari.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  margin: 0;
+}
+
+/**
+ * Show the overflow in IE.
+ * 1. Show the overflow in Edge.
+ */
+
+button,
+input { /* 1 */
+  overflow: visible;
+}
+
+/**
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Remove the inheritance of text transform in Firefox.
+ */
+
+button,
+select { /* 1 */
+  text-transform: none;
+}
+
+/**
+ * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
+ *    controls in Android 4.
+ * 2. Correct the inability to style clickable types in iOS and Safari.
+ */
+
+button,
+html [type="button"], /* 1 */
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button; /* 2 */
+}
+
+/**
+ * Remove the inner border and padding in Firefox.
+ */
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+/**
+ * Restore the focus styles unset by the previous rule.
+ */
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+/**
+ * 1. Correct the text wrapping in Edge and IE.
+ * 2. Correct the color inheritance from `fieldset` elements in IE.
+ * 3. Remove the padding so developers are not caught out when they zero out
+ *    `fieldset` elements in all browsers.
+ */
+
+legend {
+  box-sizing: border-box; /* 1 */
+  color: inherit; /* 2 */
+  display: table; /* 1 */
+  max-width: 100%; /* 1 */
+  padding: 0; /* 3 */
+  white-space: normal; /* 1 */
+}
+
+/**
+ * 1. Add the correct display in IE 9-.
+ * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ */
+
+progress {
+  display: inline-block; /* 1 */
+  vertical-align: baseline; /* 2 */
+}
+
+/**
+ * Remove the default vertical scrollbar in IE.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * 1. Add the correct box sizing in IE 10-.
+ * 2. Remove the padding in IE 10-.
+ */
+
+[type="checkbox"],
+[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Correct the cursor style of increment and decrement buttons in Chrome.
+ */
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
+ */
+
+[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
+}
+
+/**
+ * Remove the inner padding and cancel buttons in Chrome and Safari on macOS.
+ */
+
+[type="search"]::-webkit-search-cancel-button,
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to `inherit` in Safari.
+ */
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
+}
+
+/* Interactive
+   ========================================================================== */
+
+/*
+ * Add the correct display in IE 9-.
+ * 1. Add the correct display in Edge, IE, and Firefox.
+ */
+
+details, /* 1 */
+menu {
+  display: block;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+summary {
+  display: list-item;
+}
+
+/* Scripting
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ */
+
+canvas {
+  display: inline-block;
+}
+
+/**
+ * Add the correct display in IE.
+ */
+
+template {
+  display: none;
+}
+
+/* Hidden
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 10-.
+ */
+
+[hidden] {
+  display: none;
+}
diff --git a/rake/site.rake b/rake/site.rake
index 63b04fc8243..00ffd228b44 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -43,12 +43,10 @@ namespace :site do
   end
   task :build => :generate
 
-  desc "Update normalize.css library to the latest version and minify"
+  desc "Update normalize.css library to the latest version"
   task :update_normalize_css do
     Dir.chdir("#{docs_folder}/_sass") do
-      sh 'curl "https://necolas.github.io/normalize.css/latest/normalize.css" -o "normalize.scss"'
-      sh 'sass "normalize.scss":"_normalize.scss" --style compressed'
-      rm ["normalize.scss", Dir.glob("*.map")].flatten
+      sh 'curl "https://necolas.github.io/normalize.css/latest/normalize.css" -o "_normalize.scss"'
     end
   end
 

From e3dae0065f3696ad29bf8e80c95bac3a20649cb2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 25 Apr 2017 11:40:15 -0400
Subject: [PATCH 2135/4996] Update history to reflect merge of #6009 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9e42055cd1b..b719187be1e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -58,6 +58,7 @@
   * Update travis-ci.md to correct procedure (#6043)
   * fix sentence in documentation (#6048)
   * rephrase a sentence in posts.md to be more direct (#6049)
+  * Compress Website Sass output (#6009)
 
 ### Development Fixes
 

From 501ef914d7db377ad6ca7103366fb9ae0ca941f2 Mon Sep 17 00:00:00 2001
From: zenHeart 
Date: Wed, 26 Apr 2017 00:09:19 +0800
Subject: [PATCH 2136/4996] doc correct  spelling error (#6050)

Merge pull request 6050
---
 docs/_tutorials/orderofinterpretation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_tutorials/orderofinterpretation.md b/docs/_tutorials/orderofinterpretation.md
index 1146c636200..8cf9da557b0 100644
--- a/docs/_tutorials/orderofinterpretation.md
+++ b/docs/_tutorials/orderofinterpretation.md
@@ -17,7 +17,7 @@ Jekyll converts your site in the following order:
 1. **Site variables**. Jekyll looks across your files and populates [site variables]({% link _docs/variables.md %}), such as `site`, `page`, `post`, and collection objects. (From these objects, Jekyll determines the values for permalinks, tags, categories, and other details.)
 
 2. **Liquid**. Jekyll processes any [Liquid](https://github.com/Shopify/liquid) formatting in pages that contain [front matter]({% link _docs/frontmatter.md %}). You can identify Liquid as follows:
-   * **Liguid tags** start with `{% raw %}{%{% endraw %}` and end with a `{% raw %}%}{% endraw %}`. For example: `{% raw %}{% highlight %}{% endraw %}` or `{% raw %}{% seo %}{% endraw %}`. Tags can define blocks or be inline. Block-defining tags will also come with a corresponding end tag — for example, `{% raw %}{% endhighlight %}{% endraw %}`.
+   * **Liquid tags** start with `{% raw %}{%{% endraw %}` and end with a `{% raw %}%}{% endraw %}`. For example: `{% raw %}{% highlight %}{% endraw %}` or `{% raw %}{% seo %}{% endraw %}`. Tags can define blocks or be inline. Block-defining tags will also come with a corresponding end tag — for example, `{% raw %}{% endhighlight %}{% endraw %}`.
    * **Liquid variables** start and end with double curly braces. For example: `{% raw %}{{ site.myvariable }}{% endraw %}` or `{% raw %}{{ content }}{% endraw %}`.
    * **Liquid filters** start with a pipe character (`|`) and can only be used within **Liquid variables** after the variable string. For example: the `relative_url` filter in `{% raw %}{{ "css/main.css" | relative_url }}{% endraw %}`.
 

From 0126f4ab5ed9d66f56332d0083984c8fa12c3985 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 25 Apr 2017 12:09:20 -0400
Subject: [PATCH 2137/4996] Update history to reflect merge of #6050 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b719187be1e..00497364be8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -59,6 +59,7 @@
   * fix sentence in documentation (#6048)
   * rephrase a sentence in posts.md to be more direct (#6049)
   * Compress Website Sass output (#6009)
+  * doc correct spelling error (#6050)
 
 ### Development Fixes
 

From e5c0e91bc5bed7e8707bb9d44a9405c96de7e7e0 Mon Sep 17 00:00:00 2001
From: Sven Meyer 
Date: Thu, 27 Apr 2017 17:28:35 +0200
Subject: [PATCH 2138/4996] adjusted date-format in sitemap (#6053)

Merge pull request 6053
---
 docs/_tutorials/convert-existing-site-to-jekyll.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_tutorials/convert-existing-site-to-jekyll.md b/docs/_tutorials/convert-existing-site-to-jekyll.md
index a1058d75d97..2a6db34d323 100644
--- a/docs/_tutorials/convert-existing-site-to-jekyll.md
+++ b/docs/_tutorials/convert-existing-site-to-jekyll.md
@@ -457,7 +457,7 @@ search: exclude
     {% for page in site.pages %}
     
         {{page.url}}
-        {{site.time | date: '%Y-%B-%d' }}
+        {{site.time | date: '%Y-%m-%d' }}
         daily
         0.5
     
@@ -466,7 +466,7 @@ search: exclude
     {% for post in site.posts %}
     
         {{post.url}}
-        {{site.time | date: '%Y-%B-%d' }}
+        {{site.time | date: '%Y-%m-%d' }}
         daily
         0.5
     

From be70e8edd736b2bd091bb2f11e843ab1ba0a0659 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 27 Apr 2017 11:28:36 -0400
Subject: [PATCH 2139/4996] Update history to reflect merge of #6053 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 00497364be8..bc07ae351fd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -60,6 +60,7 @@
   * rephrase a sentence in posts.md to be more direct (#6049)
   * Compress Website Sass output (#6009)
   * doc correct spelling error (#6050)
+  * adjusted date-format in sitemap (#6053)
 
 ### Development Fixes
 

From d3a15fad8d01746fa74a23c04899d4a20302ecf3 Mon Sep 17 00:00:00 2001
From: Finn Ellis 
Date: Tue, 9 May 2017 00:45:03 -0700
Subject: [PATCH 2140/4996] Typo fix (welcomed change -> welcome change).
 (#6070)

Merge pull request 6070
---
 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 7265a564919..e3a749d5a5e 100644
--- a/docs/_docs/posts.md
+++ b/docs/_docs/posts.md
@@ -8,7 +8,7 @@ exactly? Well, simply put, it means that blogging is baked into Jekyll’s
 functionality. If you write articles and publish them online, you can publish
 and maintain a blog simply by managing a folder of text-files on your computer.
 Compared to the hassle of configuring and maintaining databases and web-based
-CMS systems, this will be a welcomed change!
+CMS systems, this will be a welcome change!
 
 ## The Posts Folder
 

From c3c5745e4a4a632cdc00dd4790fead665d86f96a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 9 May 2017 03:45:04 -0400
Subject: [PATCH 2141/4996] Update history to reflect merge of #6070 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index bc07ae351fd..c64994c071f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -61,6 +61,7 @@
   * Compress Website Sass output (#6009)
   * doc correct spelling error (#6050)
   * adjusted date-format in sitemap (#6053)
+  * Typo fix (welcomed change -> welcome change). (#6070)
 
 ### Development Fixes
 

From 2b535792c7f9a227f1393047c3b6e52eb741e0b9 Mon Sep 17 00:00:00 2001
From: Shane Neuville 
Date: Tue, 9 May 2017 01:46:24 -0600
Subject: [PATCH 2142/4996] Fixed documentation inconsistency (#6068)

Merge pull request 6068
---
 docs/_tutorials/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_tutorials/navigation.md b/docs/_tutorials/navigation.md
index 324fe8ad3a2..94d79d0e8ed 100644
--- a/docs/_tutorials/navigation.md
+++ b/docs/_tutorials/navigation.md
@@ -33,7 +33,7 @@ You want to return a basic list of pages.
 **YAML**
 
 ```yaml
-docs_list_title: Docs
+docs_list_title: ACME Documentation
 docs:
 
 - title: Introduction

From 86d2b77f3bded0832dbcb5a78578c89b206d47b4 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 9 May 2017 03:46:26 -0400
Subject: [PATCH 2143/4996] Update history to reflect merge of #6068 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c64994c071f..5b0cac48e84 100644
--- a/History.markdown
+++ b/History.markdown
@@ -62,6 +62,7 @@
   * doc correct spelling error (#6050)
   * adjusted date-format in sitemap (#6053)
   * Typo fix (welcomed change -> welcome change). (#6070)
+  * Fixed documentation inconsistency (#6068)
 
 ### Development Fixes
 

From 308ba550efeab34d786c43594d6cfb59744df184 Mon Sep 17 00:00:00 2001
From: Jonathan Hooper 
Date: Tue, 9 May 2017 19:17:36 -0500
Subject: [PATCH 2144/4996] Add option to fail a build with front matter syntax
 errors (#5832)

Merge pull request 5832
---
 docs/_docs/configuration.md     | 25 ++++++++---
 lib/jekyll/command.rb           |  4 ++
 lib/jekyll/configuration.rb     | 79 +++++++++++++++++----------------
 lib/jekyll/convertible.rb       |  2 +
 lib/jekyll/document.rb          | 18 ++++++--
 test/source/_broken/bad_post.md |  4 ++
 test/test_convertible.rb        |  8 ++++
 test/test_site.rb               | 18 ++++++++
 8 files changed, 109 insertions(+), 49 deletions(-)
 create mode 100644 test/source/_broken/bad_post.md

diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index 7789d52f6e7..057e4ee29f8 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -305,6 +305,18 @@ class="flag">flags (specified on the command-line) that control them.
         
    --profile
    
       
     
+    
+      
+        
    Strict Front Matter
    
+        
    
+            Cause a build to fail if there is a YAML syntax error in a page's front matter.
+        
    
+      
+      
+        
    strict_front_matter: BOOL
    
+        
    --strict_front_matter
    
+      
+    
   
 
 
    
@@ -601,12 +613,13 @@ collections:
     output:   true
 
 # Handling Reading
-safe:         false
-include:      [".htaccess"]
-exclude:      ["Gemfile", "Gemfile.lock", "node_modules", "vendor/bundle/", "vendor/cache/", "vendor/gems/", "vendor/ruby/"]
-keep_files:   [".git", ".svn"]
-encoding:     "utf-8"
-markdown_ext: "markdown,mkdown,mkdn,mkd,md"
+safe:                 false
+include:              [".htaccess"]
+exclude:              ["Gemfile", "Gemfile.lock", "node_modules", "vendor/bundle/", "vendor/cache/", "vendor/gems/", "vendor/ruby/"]
+keep_files:           [".git", ".svn"]
+encoding:             "utf-8"
+markdown_ext:         "markdown,mkdown,mkdn,mkd,md"
+strict_front_matter: false
 
 # Filtering Content
 show_drafts: null
diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index 9150d24d806..f9f243dd9e6 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -46,6 +46,7 @@ def configuration_from_options(options)
       # c - the Jekyll::Command to add these options to
       #
       # Returns nothing
+      # rubocop:disable Metrics/MethodLength
       def add_build_options(c)
         c.option "config", "--config CONFIG_FILE[,CONFIG_FILE2,...]",
           Array, "Custom configuration file"
@@ -66,7 +67,10 @@ def add_build_options(c)
         c.option "quiet", "-q", "--quiet", "Silence output."
         c.option "verbose", "-V", "--verbose", "Print verbose output."
         c.option "incremental", "-I", "--incremental", "Enable incremental rebuild."
+        c.option "strict_front_matter", "--strict_front_matter",
+          "Fail if errors are present in front matter"
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 86bee3c10a9..153d98fe009 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -6,71 +6,72 @@ class Configuration < Hash
     # Strings rather than symbols are used for compatibility with YAML.
     DEFAULTS = Configuration[{
       # Where things are
-      "source"            => Dir.pwd,
-      "destination"       => File.join(Dir.pwd, "_site"),
-      "plugins_dir"       => "_plugins",
-      "layouts_dir"       => "_layouts",
-      "data_dir"          => "_data",
-      "includes_dir"      => "_includes",
-      "collections"       => {},
+      "source"              => Dir.pwd,
+      "destination"         => File.join(Dir.pwd, "_site"),
+      "plugins_dir"         => "_plugins",
+      "layouts_dir"         => "_layouts",
+      "data_dir"            => "_data",
+      "includes_dir"        => "_includes",
+      "collections"         => {},
 
       # Handling Reading
-      "safe"              => false,
-      "include"           => [".htaccess"],
-      "exclude"           => %w(
+      "safe"                => false,
+      "include"             => [".htaccess"],
+      "exclude"             => %w(
         Gemfile Gemfile.lock node_modules vendor/bundle/ vendor/cache/ vendor/gems/
         vendor/ruby/
       ),
-      "keep_files"        => [".git", ".svn"],
-      "encoding"          => "utf-8",
-      "markdown_ext"      => "markdown,mkdown,mkdn,mkd,md",
+      "keep_files"          => [".git", ".svn"],
+      "encoding"            => "utf-8",
+      "markdown_ext"        => "markdown,mkdown,mkdn,mkd,md",
+      "strict_front_matter" => false,
 
       # Filtering Content
-      "show_drafts"       => nil,
-      "limit_posts"       => 0,
-      "future"            => false,
-      "unpublished"       => false,
+      "show_drafts"         => nil,
+      "limit_posts"         => 0,
+      "future"              => false,
+      "unpublished"         => false,
 
       # Plugins
-      "whitelist"         => [],
-      "plugins"           => [],
+      "whitelist"           => [],
+      "plugins"             => [],
 
       # Conversion
-      "markdown"          => "kramdown",
-      "highlighter"       => "rouge",
-      "lsi"               => false,
-      "excerpt_separator" => "\n\n",
-      "incremental"       => false,
+      "markdown"            => "kramdown",
+      "highlighter"         => "rouge",
+      "lsi"                 => false,
+      "excerpt_separator"   => "\n\n",
+      "incremental"         => false,
 
       # Serving
-      "detach"            => false, # default to not detaching the server
-      "port"              => "4000",
-      "host"              => "127.0.0.1",
-      "baseurl"           => "",
-      "show_dir_listing"  => false,
+      "detach"              => false, # default to not detaching the server
+      "port"                => "4000",
+      "host"                => "127.0.0.1",
+      "baseurl"             => "",
+      "show_dir_listing"    => false,
 
       # Output Configuration
-      "permalink"         => "date",
-      "paginate_path"     => "/page:num",
-      "timezone"          => nil, # use the local timezone
+      "permalink"           => "date",
+      "paginate_path"       => "/page:num",
+      "timezone"            => nil, # use the local timezone
 
-      "quiet"             => false,
-      "verbose"           => false,
-      "defaults"          => [],
+      "quiet"               => false,
+      "verbose"             => false,
+      "defaults"            => [],
 
-      "liquid"            => {
+      "liquid"              => {
         "error_mode" => "warn",
       },
 
-      "rdiscount"         => {
+      "rdiscount"           => {
         "extensions" => [],
       },
 
-      "redcarpet"         => {
+      "redcarpet"           => {
         "extensions" => [],
       },
 
-      "kramdown"          => {
+      "kramdown"            => {
         "auto_ids"      => true,
         "toc_levels"    => "1..6",
         "entity_output" => "as_char",
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 34741c8ff1d..16745dd5b6a 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -48,8 +48,10 @@ def read_yaml(base, name, opts = {})
         end
       rescue SyntaxError => e
         Jekyll.logger.warn "YAML Exception reading #{filename}: #{e.message}"
+        raise e if self.site.config["strict_front_matter"]
       rescue => e
         Jekyll.logger.warn "Error reading file #{filename}: #{e.message}"
+        raise e if self.site.config["strict_front_matter"]
       end
 
       self.data ||= {}
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index a37ca1e41f5..90cfd1be97a 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -259,11 +259,8 @@ def read(opts = {})
           merge_defaults
           read_content(opts)
           read_post_data
-        rescue SyntaxError => e
-          Jekyll.logger.error "Error:", "YAML Exception reading #{path}: #{e.message}"
         rescue => e
-          raise e if e.is_a? Jekyll::Errors::FatalException
-          Jekyll.logger.error "Error:", "could not read file #{path}: #{e.message}"
+          handle_read_error(e)
         end
       end
     end
@@ -457,6 +454,19 @@ def read_post_data
       generate_excerpt
     end
 
+    private
+    def handle_read_error(error)
+      if error.is_a? SyntaxError
+        Jekyll.logger.error "Error:", "YAML Exception reading #{path}: #{error.message}"
+      else
+        Jekyll.logger.error "Error:", "could not read file #{path}: #{error.message}"
+      end
+
+      if site.config["strict_front_matter"] || error.is_a?(Jekyll::Errors::FatalException)
+        raise error
+      end
+    end
+
     private
     def populate_title
       if relative_path =~ DATE_FILENAME_MATCHER
diff --git a/test/source/_broken/bad_post.md b/test/source/_broken/bad_post.md
new file mode 100644
index 00000000000..f895dd26ebb
--- /dev/null
+++ b/test/source/_broken/bad_post.md
@@ -0,0 +1,4 @@
+---
+bad yaml: [
+---
+Real content starts here
diff --git a/test/test_convertible.rb b/test/test_convertible.rb
index 82d643748a7..6e6defa6519 100644
--- a/test/test_convertible.rb
+++ b/test/test_convertible.rb
@@ -33,6 +33,14 @@ class TestConvertible < JekyllUnitTest
       assert_match(%r!#{File.join(@base, name)}!, out)
     end
 
+    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
+        @convertible.read_yaml(@base, name)
+      end
+    end
+
     should "not allow ruby objects in YAML" do
       out = capture_stderr do
         @convertible.read_yaml(@base, "exploit_front_matter.erb")
diff --git a/test/test_site.rb b/test/test_site.rb
index 65032ebdfd3..d039cb8a924 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -280,6 +280,24 @@ def generate(site)
           Site.new(site_configuration("destination" => File.join(source_dir, "..")))
         end
       end
+
+      should "raise for bad frontmatter if strict_front_matter is set" do
+        site = Site.new(site_configuration(
+          "collections"         => ["broken"],
+          "strict_front_matter" => true
+        ))
+        assert_raises do
+          site.process
+        end
+      end
+
+      should "not raise for bad frontmatter if strict_front_matter is not set" do
+        site = Site.new(site_configuration(
+          "collections"         => ["broken"],
+          "strict_front_matter" => false
+        ))
+        site.process
+      end
     end
 
     context "with orphaned files in destination" do

From 13b6c502b7d943cd188eca5018a0a93704dfd148 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 9 May 2017 20:17:37 -0400
Subject: [PATCH 2145/4996] Update history to reflect merge of #5832 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5b0cac48e84..c7a432df477 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,7 @@
   * Date filters should never raise an exception (#5722)
   * add `plugins` config key as replacement for `gems` (#5130)
   * create configuration from options only once in the boot process (#5487)
+  * Add option to fail a build with front matter syntax errors (#5832)
 
 ### Documentation
 

From f93c155781a186e4fbf6c7a42048381e021de13a Mon Sep 17 00:00:00 2001
From: Oreonax 
Date: Sat, 13 May 2017 02:24:25 +0200
Subject: [PATCH 2146/4996] Add own plugin -> Jekyll Brand Social Wall (#6064)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index bc6386e2c7c..05d76a20ff4 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -871,6 +871,7 @@ LESS.js files during generation.
 - [Jekyll Cloudinary](https://nhoizey.github.io/jekyll-cloudinary/) by [Nicolas Hoizey](https://nicolas-hoizey.com/): a Jekyll plugin adding a Liquid tag to ease the use of Cloudinary for responsive images in your Markdown/Kramdown posts.
 - [jekyll-include-absolute-plugin](https://github.com/tnhu/jekyll-include-absolute-plugin) by [Tan Nhu](https://github.com/tnhu): A Jekyll plugin to include a file from its path relative to Jekyll's source folder.
 - [Jekyll Download Tag](https://github.com/mattg/jekyll-download-tag): A Liquid tag that acts like `include`, but for external resources.
+- [Jekyll Brand Social Wall](https://github.com/MediaComem/jekyll-brand-social-wall): A jekyll plugin to generate a social wall with your favorite social networks
 
 #### Collections
 

From 72564f179b232f931e76072cdfcc151e6923c629 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 12 May 2017 20:24:26 -0400
Subject: [PATCH 2147/4996] Update history to reflect merge of #6064 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c7a432df477..e2548230d4c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -64,6 +64,7 @@
   * adjusted date-format in sitemap (#6053)
   * Typo fix (welcomed change -> welcome change). (#6070)
   * Fixed documentation inconsistency (#6068)
+  * Add own plugin -> Jekyll Brand Social Wall (#6064)
 
 ### Development Fixes
 

From 3156f74a530246183f0228924048cfa565b4cd06 Mon Sep 17 00:00:00 2001
From: Hendrik Schneider 
Date: Sat, 13 May 2017 03:25:09 +0300
Subject: [PATCH 2148/4996] Added plugin jekyll-analytics (#6042)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 05d76a20ff4..303967ca1e1 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -881,6 +881,7 @@ LESS.js files during generation.
 
 #### Other
 
+- [Analytics for Jekyll](https://github.com/hendrikschneider/jekyll-analytics) by Hendrik Schneider: An effortless way to add  various trackers like Google Analytics, Piwik, etc. to your site
 - [ditaa-ditaa](https://github.com/tmthrgd/ditaa-ditaa) by Tom Thorogood: a drastic revision of jekyll-ditaa that renders diagrams drawn using ASCII art into PNG images.
 - [Pygments Cache Path by Raimonds Simanovskis](https://github.com/rsim/blog.rayapps.com/blob/master/_plugins/pygments_cache_patch.rb): Plugin to cache syntax-highlighted code from Pygments.
 - [Draft/Publish Plugin by Michael Ivey](https://gist.github.com/49630): Save posts as drafts.

From 771bae4ec5eb4714e011d69caf60f31be16c49ce Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 12 May 2017 20:25:10 -0400
Subject: [PATCH 2149/4996] Update history to reflect merge of #6042 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e2548230d4c..a3f63e04e1c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -65,6 +65,7 @@
   * Typo fix (welcomed change -> welcome change). (#6070)
   * Fixed documentation inconsistency (#6068)
   * Add own plugin -> Jekyll Brand Social Wall (#6064)
+  * Added plugin jekyll-analytics (#6042)
 
 ### Development Fixes
 

From 1d55b703655819eebdb0a1f7d6d2970cc1d26c47 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Sat, 13 May 2017 05:58:03 +0530
Subject: [PATCH 2150/4996] Remove `ruby RUBY_VERSION` from generated Gemfile
 (#5803)

Merge pull request 5803
---
 lib/jekyll/commands/new.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index 144fddf7a3e..81ed9201809 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -61,7 +61,6 @@ def initialized_post_name
         def gemfile_contents
           <<-RUBY
 source "https://rubygems.org"
-ruby RUBY_VERSION
 
 # Hello! This is where you manage which Jekyll version is used to run.
 # When you want to use a different version, change it below, save the

From e0dfff01227fb978a634b39afa79819fd7c90813 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 12 May 2017 20:28:04 -0400
Subject: [PATCH 2151/4996] Update history to reflect merge of #5803 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a3f63e04e1c..ccc720ae00a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -83,6 +83,7 @@
   * doc use example.com (#6031)
   * fix typo (#6040)
   * Fix CI  (#6044)
+  * Remove `ruby RUBY_VERSION` from generated Gemfile (#5803)
 
 ### Site Enhancements
 

From 4d9c93e4916627d3aff28db8ca9c22dc8eab2d7d Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Tue, 16 May 2017 01:36:23 +0530
Subject: [PATCH 2152/4996] Disable default layouts for documents with a
 `layout: none` declaration (#5933)

Merge pull request 5933
---
 features/rendering.feature | 38 ++++++++++++++++++++++++++++++++++++++
 lib/jekyll/document.rb     | 13 ++++++++++---
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/features/rendering.feature b/features/rendering.feature
index fbe9ce57415..ecb31094fbc 100644
--- a/features/rendering.feature
+++ b/features/rendering.feature
@@ -40,6 +40,44 @@ 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'
+    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 }}!"
+    And I have a "_trials/test.md" page with layout "null" that contains "Hi there, {{ site.author }}!"
+    And I have a none layout that contains "{{ content }}Welcome!"
+    And I have a page layout that contains "{{ content }}Check this out!"
+    And I have a configuration file with:
+    | key             | value                                          |
+    | author          | John Doe                                       |
+    | collections     | {trials: {output: true}}                       |
+    | defaults        | [{scope: {path: ""}, values: {layout: page}}]  |
+    When I run jekyll build
+    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 "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"
+
+  Scenario: Don't place 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 }}!"
+    And I have a "_trials/test.md" page with layout "page" that contains "Hi there, {{ site.author }}!"
+    And I have a none layout that contains "{{ content }}Welcome!"
+    And I have a page layout that contains "{{ content }}Check this out!"
+    And I have a configuration file with:
+    | key             | value                     |
+    | author          | John Doe                  |
+    | collections     | {trials: {output: true}}  |
+    When I run jekyll build
+    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"
+    But I should see "Check this out!" in "_site/trials/test.html"
+    And I should see "Welcome!" in "_site/index.html"
+
   Scenario: Render liquid in Sass
     Given I have an "index.scss" page that contains ".foo-bar { color:{{site.color}}; }"
     And I have a configuration file with "color" set to "red"
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 90cfd1be97a..002404e6368 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -161,12 +161,19 @@ def render_with_liquid?
       !(coffeescript_file? || yaml_file?)
     end
 
+    # Determine whether the file should be rendered with a layout.
+    #
+    # Returns true if the Front Matter specifies that `layout` is set to `none`.
+    def no_layout?
+      data["layout"] == "none"
+    end
+
     # Determine whether the file should be placed into layouts.
     #
-    # Returns false if the document is either an asset file or a yaml file,
-    #   true otherwise.
+    # Returns false if the document is set to `layouts: none`, or is either an
+    #   asset file or a yaml file. Returns true otherwise.
     def place_in_layout?
-      !(asset_file? || yaml_file?)
+      !(asset_file? || yaml_file? || no_layout?)
     end
 
     # The URL template where the document would be accessible.

From bd104c4ee0ec921f5b681c098595260155cd0106 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 15 May 2017 16:06:25 -0400
Subject: [PATCH 2153/4996] Update history to reflect merge of #5933 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ccc720ae00a..fe8c0fc4f6b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -13,6 +13,7 @@
   * add `plugins` config key as replacement for `gems` (#5130)
   * create configuration from options only once in the boot process (#5487)
   * Add option to fail a build with front matter syntax errors (#5832)
+  * Disable default layouts for documents with a `layout: none` declaration (#5933)
 
 ### Documentation
 

From 33ff62ee03761cae0ff8ac212c2f0ef3386b286d Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Tue, 23 May 2017 14:45:44 +0800
Subject: [PATCH 2154/4996] Update _config.yml: gems to plugins (#6082)

Merge pull request 6082
---
 docs/_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index ab3d4bf3aa1..044cb386c95 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -46,7 +46,7 @@ twitter:
 
 logo: /img/logo-2x.png
 
-gems:
+plugins:
   - jekyll-avatar
   - jekyll-feed
   - jekyll-mentions

From 93c8b8556e0e649f92b6887488749e7431632490 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 23 May 2017 02:45:45 -0400
Subject: [PATCH 2155/4996] Update history to reflect merge of #6082 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fe8c0fc4f6b..772d62a8440 100644
--- a/History.markdown
+++ b/History.markdown
@@ -95,6 +95,7 @@
   * Navigation has been moved out from docs (#5927)
   * Make links in sidebar for current page more prominent (#5820)
   * Update normalize.css to v6.0.0 (#6008)
+  * Docs: rename `gems` to `plugins` (#6082)
 
 ### Bug Fixes
 

From 6c728120beeb363d59cd1adedb8d174840216ef9 Mon Sep 17 00:00:00 2001
From: Krzysztof Szafranek 
Date: Tue, 23 May 2017 08:47:39 +0200
Subject: [PATCH 2156/4996] Use more precise language when explaining links
 (#6078)

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

diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md
index c612df497d8..cc21b36bed7 100644
--- a/docs/_docs/templates.md
+++ b/docs/_docs/templates.md
@@ -542,7 +542,7 @@ You can also use the `link` tag to create a link in Markdown as follows:
 
 The path to the post, page, or collection is defined as the path relative to the root directory (where your config file is) to the file, not the path from your existing page to the other page.
 
-For example, suppose you're creating a link `page_a.md` (stored in `pages/folder1/folder2`) to `page_b.md` (stored in  `pages/folder1`). Your path in the link would not be `../page_b.html`. Instead, it would be `/pages/folder1/page_b.md`.
+For example, suppose you're creating a link in `page_a.md` (stored in `pages/folder1/folder2`) to `page_b.md` (stored in  `pages/folder1`). Your path in the link would not be `../page_b.html`. Instead, it would be `/pages/folder1/page_b.md`.
 
 If you're unsure of the path, add `{% raw %}{{ page.path }}{% endraw %}` to the page and it will display the path.
 

From dcd54adbc0ac211c73ce7c2e0881fa0dc4972860 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 23 May 2017 02:47:40 -0400
Subject: [PATCH 2157/4996] Update history to reflect merge of #6078 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 772d62a8440..e5416d6c6ee 100644
--- a/History.markdown
+++ b/History.markdown
@@ -67,6 +67,7 @@
   * Fixed documentation inconsistency (#6068)
   * Add own plugin -> Jekyll Brand Social Wall (#6064)
   * Added plugin jekyll-analytics (#6042)
+  * Use more precise language when explaining links (#6078)
 
 ### Development Fixes
 

From f1a9af5ba6783ca72533600abb55fd10e9514732 Mon Sep 17 00:00:00 2001
From: Kevin Funk 
Date: Wed, 24 May 2017 17:57:03 -0700
Subject: [PATCH 2158/4996] Update plugins.md (#6088)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 303967ca1e1..653d37a2c6f 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -872,6 +872,7 @@ LESS.js files during generation.
 - [jekyll-include-absolute-plugin](https://github.com/tnhu/jekyll-include-absolute-plugin) by [Tan Nhu](https://github.com/tnhu): A Jekyll plugin to include a file from its path relative to Jekyll's source folder.
 - [Jekyll Download Tag](https://github.com/mattg/jekyll-download-tag): A Liquid tag that acts like `include`, but for external resources.
 - [Jekyll Brand Social Wall](https://github.com/MediaComem/jekyll-brand-social-wall): A jekyll plugin to generate a social wall with your favorite social networks
+- [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.
 
 #### Collections
 

From 2561470039cd290b136b7ad78477c629ec2ba0c5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 24 May 2017 20:57:04 -0400
Subject: [PATCH 2159/4996] Update history to reflect merge of #6088 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e5416d6c6ee..6ec0323be3d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -68,6 +68,7 @@
   * Add own plugin -> Jekyll Brand Social Wall (#6064)
   * Added plugin jekyll-analytics (#6042)
   * Use more precise language when explaining links (#6078)
+  * Update plugins.md (#6088)
 
 ### Development Fixes
 

From b8430df6b1d4b1bc64a7f768d14f5ec05bf71dee Mon Sep 17 00:00:00 2001
From: Henry Kobin 
Date: Wed, 31 May 2017 07:35:54 -0700
Subject: [PATCH 2160/4996] windows 10 tutorial (#6100)

Merge pull request 6100
---
 docs/_docs/windows.md | 59 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 9 deletions(-)

diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index cc284567b6a..b72fd836cd8 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -8,9 +8,57 @@ Jekyll with the proper tweaks. If you are using Windows 10 Anniversary Update,
 the easiest way to run Jekyll is to use the new [Bash on Ubuntu on Windows](https://msdn.microsoft.com/en-us/commandline/wsl/about?f=255&MSPPError=-2147217396).
 For older installations, this page aims to collect some of the general knowledge and lessons that have been unearthed by Windows users.
 
-## Installation
+## Installation via Bash on Windows 10
 
-A quick way to install Jekyll is to follow the [installation instructions by David Burela](https://davidburela.wordpress.com/2015/11/28/easily-install-jekyll-on-windows-with-3-command-prompt-entries-and-chocolatey/):
+*Please note:* You must have [Bash on Ubuntu on Windows](https://msdn.microsoft.com/en-us/commandline/wsl/about?f=255&MSPPError=-2147217396) enabled.
+
+First let's make sure all our packages / repositories are up to date. Open a new Command Prompt instance, and type the following:
+
+```
+bash
+```
+Your Command Prompt instance should now be a Bash instance. Now we must update our repo lists and packages.
+
+```
+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.
+
+```
+sudo apt-add-repository ppa:brightbox/ruby-ng
+sudo apt-get update
+sudo apt-get install ruby2.3 ruby2.3-dev build-essentials
+```
+Next let's update our Ruby gems:
+
+```
+sudo gem update
+
+```
+
+Now all that is left to do is install Jekyll.
+
+```
+sudo gem install jekyll bundler
+
+```
+
+You can test by running:
+
+```
+jekyll new my_project
+```
+
+**And that's it!**
+If you `cd` into the folder, you can make sure time management is working by opening your `_posts` folder. You should see a markdown file with the current date listed.
+
+*Please note* Bash on Ubuntu on Windows is still under development, so you may run into issues. If you see an Auto-Regeneration error warning in your Bash instance, you can ignore it.
+
+## Installation via Chocolatey
+
+
+A quick way to install Jekyll using Chocolatey is to follow the [installation instructions by David Burela](https://davidburela.wordpress.com/2015/11/28/easily-install-jekyll-on-windows-with-3-command-prompt-entries-and-chocolatey/):
 
  1. Install a package manager for Windows called [Chocolatey](https://chocolatey.org/install)
  2. Install Ruby via Chocolatey: `choco install ruby -y`
@@ -24,8 +72,6 @@ For a more conventional way of installing Jekyll you can follow this [complete g
 
 [windows-installjekyll3]: https://labs.sverrirs.com/jekyll/
 
-## Encoding
-
 If you use UTF-8 encoding, make sure that no `BOM` header
 characters exist in your files or very, very bad things will happen to
 Jekyll. This is especially relevant if you're running Jekyll on Windows.
@@ -37,9 +83,6 @@ the site generation process. It can be done with the following command:
 ```sh
 $ chcp 65001
 ```
-
-## Timezone 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.
 
@@ -51,8 +94,6 @@ While 'new' blogs created with Jekyll v3.4 and greater, will have the following
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 ```
 
-## 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 requires an extra gem for compatibility

From 59db714d8bc5ba47c848ccfccafe8cb56232f10c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 31 May 2017 10:35:55 -0400
Subject: [PATCH 2161/4996] Update history to reflect merge of #6100 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6ec0323be3d..8fd01aaba57 100644
--- a/History.markdown
+++ b/History.markdown
@@ -69,6 +69,7 @@
   * Added plugin jekyll-analytics (#6042)
   * Use more precise language when explaining links (#6078)
   * Update plugins.md (#6088)
+  * windows 10 tutorial (#6100)
 
 ### Development Fixes
 

From 8a8b055150fca150c972397cebdf4df53fed93e4 Mon Sep 17 00:00:00 2001
From: Antonio Argote 
Date: Thu, 1 Jun 2017 04:10:10 +0800
Subject: [PATCH 2162/4996] Explain how to override theme styles (#6107)

Merge pull request 6107
---
 docs/_docs/themes.md | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index 6770a9ca998..c79ce54c4e1 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -35,23 +35,15 @@ The goal of gem-based themes is to allow you to get all the benefits of a robust
 
 Jekyll themes set default layouts, includes, and stylesheets. However, you can override any of the theme defaults with your own site content.
 
-For example, if your selected theme has a `page` layout, you can override the theme's layout by creating your own `page` layout in the `_layouts` directory (that is, `_layouts/page.html`).
-
-Jekyll will look first to your site's content before looking to the theme's defaults for any requested file in the following folders:
-
-- `/assets`
-- `/_layouts`
-- `/_includes`
-- `/_sass`
+To replace layouts or includes in your theme, make a copy in your `_layouts` or `_includes` directory of the specific file you wish to modify, or create the file from scratch giving it the same name as the file you wish to override.
 
-Refer to your selected theme's documentation and source repository for more information on what files you can override.
-{: .note .info}
+For example, if your selected theme has a `page` layout, you can override the theme's layout by creating your own `page` layout in the `_layouts` directory (that is, `_layouts/page.html`).
 
-To locate theme's files on your computer:
+To locate a theme's files on your computer:
 
-1. Run `bundle show` followed by the name of the theme's gem, e.g., `bundle show minima` for default Jekyll's theme.
+1. Run `bundle show` followed by the name of the theme's gem, e.g., `bundle show minima` for Jekyll's default theme.
 
-   This returns the location of the gem-based theme files. For example, Minima theme's files are located in `/usr/local/lib/ruby/gems/2.3.0/gems/minima-2.1.0` on macOS.
+   This returns the location of the gem-based theme files. For example, the Minima theme's files might be located in `/usr/local/lib/ruby/gems/2.3.0/gems/minima-2.1.0` on macOS.
 
 2. Open the theme's directory in Finder or Explorer:
 
@@ -92,9 +84,23 @@ To locate theme's files on your computer:
         └── main.scss
      ```
 
-     With a clear understanding of the theme's files, you can now override any theme file by creating a similarly named file in your Jekyll site directory.
+With a clear understanding of the theme's files, you can now override any theme file by creating a similarly named file in your Jekyll site directory.
+
+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.
 
-     Let's say 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. 
+
+Jekyll will look first to your site's content before looking to the theme's defaults for any requested file in the following folders:
+
+- `/assets`
+- `/_layouts`
+- `/_includes`
+- `/_sass`
+
+Note that making copies of theme files will prevent you from receiving any theme updates on those files. An alternative, to continue getting theme updates on all stylesheets, is to use higher specificity CSS selectors in your own additional, originally named CSS files.
+
+Refer to your selected theme's documentation and source repository for more information on what files you can override.
+{: .note .info}
 
 ## Converting gem-based themes to regular themes
 

From 5790510bebffc242458539454d1fc2b5252b44cd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 31 May 2017 16:10:12 -0400
Subject: [PATCH 2163/4996] Update history to reflect merge of #6107 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8fd01aaba57..71837442d7f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -70,6 +70,7 @@
   * Use more precise language when explaining links (#6078)
   * Update plugins.md (#6088)
   * windows 10 tutorial (#6100)
+  * Explain how to override theme styles (#6107)
 
 ### Development Fixes
 

From b2e6e408eded454a8b4ee9be2d29de023c8d5b8d Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Thu, 1 Jun 2017 15:14:50 +0200
Subject: [PATCH 2164/4996] plugins -> gems (#6110)

Merge pull request 6110
---
 docs/_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index 044cb386c95..ab3d4bf3aa1 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -46,7 +46,7 @@ twitter:
 
 logo: /img/logo-2x.png
 
-plugins:
+gems:
   - jekyll-avatar
   - jekyll-feed
   - jekyll-mentions

From 22b18543ef42730bd8157b51e489ce82edf4a6ae Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 1 Jun 2017 09:14:51 -0400
Subject: [PATCH 2165/4996] Update history to reflect merge of #6110 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 71837442d7f..8cc05ddd9be 100644
--- a/History.markdown
+++ b/History.markdown
@@ -100,6 +100,7 @@
   * Make links in sidebar for current page more prominent (#5820)
   * Update normalize.css to v6.0.0 (#6008)
   * Docs: rename `gems` to `plugins` (#6082)
+  * plugins -> gems (#6110)
 
 ### Bug Fixes
 

From 52b7e5245c88806333fd1f4b435821177c6a75bb Mon Sep 17 00:00:00 2001
From: Henry Kobin 
Date: Thu, 1 Jun 2017 12:54:01 -0700
Subject: [PATCH 2166/4996] updated Bash on Ubuntu on Windows link in tutorial
 (#6111)

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

diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index b72fd836cd8..cd489634142 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -5,7 +5,7 @@ permalink: /docs/windows/
 
 While Windows is not an officially-supported platform, it can be used to run
 Jekyll with the proper tweaks. If you are using Windows 10 Anniversary Update, 
-the easiest way to run Jekyll is to use the new [Bash on Ubuntu on Windows](https://msdn.microsoft.com/en-us/commandline/wsl/about?f=255&MSPPError=-2147217396).
+the easiest way to run Jekyll is to use the new [Bash on Ubuntu on Windows](https://msdn.microsoft.com/en-us/commandline/wsl/install_guide).
 For older installations, this page aims to collect some of the general knowledge and lessons that have been unearthed by Windows users.
 
 ## Installation via Bash on Windows 10

From 18d8144dc19da0d9c7b8f207dcb2b9b91e80706e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 1 Jun 2017 15:54:02 -0400
Subject: [PATCH 2167/4996] Update history to reflect merge of #6111 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8cc05ddd9be..632a399010d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -71,6 +71,7 @@
   * Update plugins.md (#6088)
   * windows 10 tutorial (#6100)
   * Explain how to override theme styles (#6107)
+  * updated Bash on Ubuntu on Windows link in tutorial (#6111)
 
 ### Development Fixes
 

From 5a1d78cadfc85a0e01be81656bed1b079175a3c4 Mon Sep 17 00:00:00 2001
From: sean delaney 
Date: Thu, 1 Jun 2017 16:54:23 -0700
Subject: [PATCH 2168/4996] Fix wording in _docs/templates.md links section
 (#6114)

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

diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md
index cc21b36bed7..c4eba3c888b 100644
--- a/docs/_docs/templates.md
+++ b/docs/_docs/templates.md
@@ -552,7 +552,7 @@ Note you cannot add filters to `link` tags. For example, you cannot append a str
 
 ### Linking to posts
 
-If you want like 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.
+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 %}

From 00d0b5de6bbfdea1902d0fe98eee5941b58dfcd9 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 1 Jun 2017 19:54:24 -0400
Subject: [PATCH 2169/4996] Update history to reflect merge of #6114 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 632a399010d..03cf4d1294f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -72,6 +72,7 @@
   * windows 10 tutorial (#6100)
   * Explain how to override theme styles (#6107)
   * updated Bash on Ubuntu on Windows link in tutorial (#6111)
+  * Fix wording in _docs/templates.md links section (#6114)
 
 ### Development Fixes
 

From 20c0576862fe2885aecf702a439be0ae55353607 Mon Sep 17 00:00:00 2001
From: Ashton Hellwig 
Date: Fri, 2 Jun 2017 03:32:07 -0600
Subject: [PATCH 2170/4996] Update windows.md (#6115)

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

diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index cd489634142..12e15815fef 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -28,7 +28,7 @@ Now we can install Ruby. To do this we will use a repository from [BrightBox](ht
 ```
 sudo apt-add-repository ppa:brightbox/ruby-ng
 sudo apt-get update
-sudo apt-get install ruby2.3 ruby2.3-dev build-essentials
+sudo apt-get install ruby2.3 ruby2.3-dev build-essential
 ```
 Next let's update our Ruby gems:
 

From b6bd2f79d67673ccab0ddf3b73906e5cf0207554 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 2 Jun 2017 05:32:08 -0400
Subject: [PATCH 2171/4996] Update history to reflect merge of #6115 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 03cf4d1294f..7768548b84f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -73,6 +73,7 @@
   * Explain how to override theme styles (#6107)
   * updated Bash on Ubuntu on Windows link in tutorial (#6111)
   * Fix wording in _docs/templates.md links section (#6114)
+  * Update windows.md (#6115)
 
 ### Development Fixes
 

From 9c7ac163cc3b9e4720f66080f463228a85fe2006 Mon Sep 17 00:00:00 2001
From: Henry Kobin 
Date: Fri, 2 Jun 2017 05:19:09 -0700
Subject: [PATCH 2172/4996] Added windows to docs.yml (#6109)

Merge pull request 6109
---
 docs/_data/docs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_data/docs.yml b/docs/_data/docs.yml
index bb9d3b14c74..ef468fa1c9b 100644
--- a/docs/_data/docs.yml
+++ b/docs/_data/docs.yml
@@ -3,6 +3,7 @@
   - home
   - quickstart
   - installation
+  - windows
   - usage
   - structure
   - configuration

From 729472bbdaf65efdd0b0a0af730ada0036ab4b45 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 2 Jun 2017 08:19:11 -0400
Subject: [PATCH 2173/4996] Update history to reflect merge of #6109 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7768548b84f..76e4791f6cc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -74,6 +74,7 @@
   * updated Bash on Ubuntu on Windows link in tutorial (#6111)
   * Fix wording in _docs/templates.md links section (#6114)
   * Update windows.md (#6115)
+  * Added windows to docs.yml (#6109)
 
 ### Development Fixes
 

From 4b7ebeb0141d6ff762065d2cebae7af57802589f Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 5 Jun 2017 01:23:17 +0200
Subject: [PATCH 2174/4996] Upload the `_site` folder *content* (#6119)

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

diff --git a/docs/_docs/deployment-methods.md b/docs/_docs/deployment-methods.md
index 3e5fcfdcc90..ebf8bf12732 100644
--- a/docs/_docs/deployment-methods.md
+++ b/docs/_docs/deployment-methods.md
@@ -7,7 +7,7 @@ Sites built using Jekyll can be deployed in a large number of ways due to the st
 
 ## Web hosting providers (FTP)
 
-Just about any traditional web hosting provider will let you upload files to their servers over FTP. To upload a Jekyll site to a web host using FTP, simply run the `jekyll build` command and copy the generated `_site` folder to the root folder of your hosting account. This is most likely to be the `httpdocs` or `public_html` folder on most hosting providers.
+Just about any traditional web hosting provider will let you upload files to their servers over FTP. To upload a Jekyll site to a web host using FTP, simply run the `jekyll build` command and copy the contents of the generated `_site` folder to the root folder of your hosting account. This is most likely to be the `httpdocs` or `public_html` folder on most hosting providers.
 
 ## Self-managed web server
 
@@ -78,7 +78,7 @@ Another way to deploy your Jekyll site is to use [Rake](https://github.com/ruby/
 
 ### scp
 
-Once you’ve generated the `_site` directory, you can easily scp it using a
+Once you’ve generated the `_site` directory, you can easily scp its content using a
 `tasks/deploy` shell script similar to [this deploy script][]. You’d obviously
 need to change the values to reflect your site’s details. There is even [a
 matching TextMate command][] that will help you run this script.
@@ -89,7 +89,7 @@ matching TextMate command][] that will help you run this script.
 
 ### rsync
 
-Once you’ve generated the `_site` directory, you can easily rsync it using a `tasks/deploy` shell script similar to [this deploy script here](https://github.com/vitalyrepin/vrepinblog/blob/master/transfer.sh). You’d obviously need to change the values to reflect your site’s details.
+Once you’ve generated the `_site` directory, you can easily rsync its content using a `tasks/deploy` shell script similar to [this deploy script here](https://github.com/vitalyrepin/vrepinblog/blob/master/transfer.sh). You’d obviously need to change the values to reflect your site’s details.
 
 Certificate-based authorization is another way to simplify the publishing
 process. It makes sense to restrict rsync access only to the directory which it is supposed to sync. This can be done using rrsync.

From 307c0c933d31ded13d5564e51b8c8ce32d689044 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 4 Jun 2017 19:23:18 -0400
Subject: [PATCH 2175/4996] Update history to reflect merge of #6119 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 76e4791f6cc..4fee3da83ae 100644
--- a/History.markdown
+++ b/History.markdown
@@ -75,6 +75,7 @@
   * Fix wording in _docs/templates.md links section (#6114)
   * Update windows.md (#6115)
   * Added windows to docs.yml (#6109)
+  * Be more specific on what to upload (#6119)
 
 ### Development Fixes
 

From 5dedd233bd8462e49517dd46c4a3cfcec15ae2b7 Mon Sep 17 00:00:00 2001
From: Eric Leong 
Date: Fri, 9 Jun 2017 04:07:16 -0400
Subject: [PATCH 2176/4996] Remove blank newlines. (#6126)

Merge pull request 6126
---
 docs/_docs/windows.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index 12e15815fef..7c02fdc29f7 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -34,14 +34,12 @@ Next let's update our Ruby gems:
 
 ```
 sudo gem update
-
 ```
 
 Now all that is left to do is install Jekyll.
 
 ```
 sudo gem install jekyll bundler
-
 ```
 
 You can test by running:

From 466a4a69eb3eda644f92b1e5d448e4c5ce04a721 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 9 Jun 2017 04:07:17 -0400
Subject: [PATCH 2177/4996] Update history to reflect merge of #6126 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4fee3da83ae..ae2a82cae9b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -76,6 +76,7 @@
   * Update windows.md (#6115)
   * Added windows to docs.yml (#6109)
   * Be more specific on what to upload (#6119)
+  * Remove Blank Newlines from "Jekyll on Windows" Page (#6126)
 
 ### Development Fixes
 

From 33aafe0a45bfe754da85264cdefbdddcd130aeaf Mon Sep 17 00:00:00 2001
From: Kaligule 
Date: Wed, 14 Jun 2017 09:42:09 +0200
Subject: [PATCH 2178/4996] Link the troubleshooting page in the quickstart
 page (#6134)

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

diff --git a/docs/_docs/quickstart.md b/docs/_docs/quickstart.md
index 9bd164b3b5e..08d2fd5f620 100644
--- a/docs/_docs/quickstart.md
+++ b/docs/_docs/quickstart.md
@@ -22,7 +22,7 @@ If you already have a full [Ruby](https://www.ruby-lang.org/en/downloads/) devel
 # Now browse to http://localhost:4000
 ```
 
-If you encounter any unexpected errors during the above, please refer to the already-mentioned [requirements](/docs/installation/#requirements) page, as you might be missing development headers or other prerequisites.
+If you encounter any unexpected errors during the above, please refer to the [troubleshooting](/docs/troubleshooting/#configuration-problems) page or the already-mentioned [requirements](/docs/installation/#requirements) page, as you might be missing development headers or other prerequisites.
 
 ## About Bundler
 

From 35684dd1b8fd319f31a4b48bb21326cd15cd1425 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 14 Jun 2017 03:42:10 -0400
Subject: [PATCH 2179/4996] Update history to reflect merge of #6134 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ae2a82cae9b..c69e986fa0e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -77,6 +77,7 @@
   * Added windows to docs.yml (#6109)
   * Be more specific on what to upload (#6119)
   * Remove Blank Newlines from "Jekyll on Windows" Page (#6126)
+  * Link the troubleshooting page in the quickstart page (#6134)
 
 ### Development Fixes
 

From 73368f8f0d4c5476b80b96f9fb39fa19d120dbfa Mon Sep 17 00:00:00 2001
From: Christopher League 
Date: Wed, 14 Jun 2017 15:02:59 -0400
Subject: [PATCH 2180/4996] In `jekyll new`, make copied site template
 user-writable (#6072)

Merge pull request 6072
---
 lib/jekyll/commands/new.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index 81ed9201809..ce1d5e7fe11 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -108,6 +108,7 @@ def preserve_source_location?(path, options)
 
         def create_sample_files(path)
           FileUtils.cp_r site_template + "/.", path
+          FileUtils.chmod_R "u+w", path
           FileUtils.rm File.expand_path(scaffold_path, path)
         end
 

From c71c27a397e9fe15c5fbb458e3c480110e9897a5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 14 Jun 2017 15:03:02 -0400
Subject: [PATCH 2181/4996] Update history to reflect merge of #6072 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c69e986fa0e..7234ef65bf8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -14,6 +14,7 @@
   * create configuration from options only once in the boot process (#5487)
   * Add option to fail a build with front matter syntax errors (#5832)
   * Disable default layouts for documents with a `layout: none` declaration (#5933)
+  * In `jekyll new`, make copied site template user-writable (#6072)
 
 ### Documentation
 

From 2cfcb23a495372355ac2e7660e014fcbd129491c Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Thu, 15 Jun 2017 04:05:38 +0900
Subject: [PATCH 2182/4996] Fix layout front-matter variables rendering. #6071
 (#6073)

Merge pull request 6073
---
 lib/jekyll/renderer.rb            | 9 +++++++++
 test/source/_layouts/default.html | 3 +++
 test/source/index.html            | 2 ++
 test/test_generated_site.rb       | 4 ++++
 4 files changed, 18 insertions(+)

diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index eb1f54ab509..b0f544e35e5 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -54,6 +54,7 @@ def run
       assign_pages!
       assign_related_posts!
       assign_highlighter_options!
+      assign_layout_data!
 
       Jekyll.logger.debug "Pre-Render Hooks:", document.relative_path
       document.trigger_hooks(:pre_render, payload)
@@ -233,6 +234,14 @@ def assign_highlighter_options!
       payload["highlighter_suffix"] = converters.first.highlighter_suffix
     end
 
+    private
+    def assign_layout_data!
+      layout = layouts[document.data["layout"]]
+      if layout
+        payload["layout"] = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
+      end
+    end
+
     private
     def permalink_ext
       if document.permalink && !document.permalink.end_with?("/")
diff --git a/test/source/_layouts/default.html b/test/source/_layouts/default.html
index 1d51c496796..ef2d4384ba2 100644
--- a/test/source/_layouts/default.html
+++ b/test/source/_layouts/default.html
@@ -1,3 +1,6 @@
+---
+front_matter_var: variable from layout
+---
 
 
diff --git a/test/source/index.html b/test/source/index.html
index 493fce7cbc0..ec542002ce5 100644
--- a/test/source/index.html
+++ b/test/source/index.html
@@ -5,6 +5,8 @@
 
 h1. Welcome to my site
 
+{{ layout.front_matter_var }}
+
 h2. Please read our {{ site.posts | size }} Posts
 
 
      
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 46f55484fba..84345524d74 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -21,6 +21,10 @@ class TestGeneratedSite < JekyllUnitTest
       assert @index.include?("#{@site.posts.size} Posts")
     end
 
+    should "insert variable from layout into the index" do
+      assert @index.include?("variable from layout")
+    end
+
     should "render latest post's content" do
       assert @index.include?(@site.posts.last.content)
     end

From cee3cc506e22b13faca25dccb019d8eae2411d75 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 14 Jun 2017 15:05:40 -0400
Subject: [PATCH 2183/4996] Update history to reflect merge of #6073 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7234ef65bf8..c8b88e0dd09 100644
--- a/History.markdown
+++ b/History.markdown
@@ -15,6 +15,7 @@
   * Add option to fail a build with front matter syntax errors (#5832)
   * Disable default layouts for documents with a `layout: none` declaration (#5933)
   * In `jekyll new`, make copied site template user-writable (#6072)
+  * Add top-level `layout` liquid variable to Documents (#6073)
 
 ### Documentation
 

From 2a4d33e61515edb6be1cf299ddea42f4c5b8d56d Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Thu, 15 Jun 2017 00:36:55 +0530
Subject: [PATCH 2184/4996] patch URLFilters to prevent `//` (#6058)

Merge pull request 6058
---
 lib/jekyll/filters/url_filters.rb | 15 +++++++++----
 test/test_filters.rb              | 36 +++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/lib/jekyll/filters/url_filters.rb b/lib/jekyll/filters/url_filters.rb
index 7db83c800c9..40cacc22f13 100644
--- a/lib/jekyll/filters/url_filters.rb
+++ b/lib/jekyll/filters/url_filters.rb
@@ -11,7 +11,6 @@ module URLFilters
       def absolute_url(input)
         return if input.nil?
         return input if Addressable::URI.parse(input).absolute?
-        site = @context.registers[:site]
         return relative_url(input).to_s if site.config["url"].nil?
         Addressable::URI.parse(site.config["url"] + relative_url(input)).normalize.to_s
       end
@@ -23,14 +22,22 @@ def absolute_url(input)
       # Returns a URL relative to the domain root as a String.
       def relative_url(input)
         return if input.nil?
-        site = @context.registers[:site]
-        return ensure_leading_slash(input.to_s) if site.config["baseurl"].nil?
+        return ensure_leading_slash(input.to_s) if sanitized_baseurl.nil?
         Addressable::URI.parse(
-          ensure_leading_slash(site.config["baseurl"]) + ensure_leading_slash(input.to_s)
+          ensure_leading_slash(sanitized_baseurl) + ensure_leading_slash(input.to_s)
         ).normalize.to_s
       end
 
       private
+
+      def site
+        @context.registers[:site]
+      end
+
+      def sanitized_baseurl
+        site.config["baseurl"].chomp("/")
+      end
+
       def ensure_leading_slash(input)
         return input if input.nil? || input.empty? || input.start_with?("/")
         "/#{input}"
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 03d2732abd5..76da6042177 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -394,6 +394,15 @@ def select; end
         assert_equal "http://example.com/", filter.absolute_url(page_url)
       end
 
+      should "not append a forward slash if both input and baseurl are simply '/'" do
+        page_url = "/"
+        filter = make_filter_mock({
+          "url"     => "http://example.com",
+          "baseurl" => "/",
+        })
+        assert_equal "http://example.com/", filter.absolute_url(page_url)
+      end
+
       should "normalize international URLs" do
         page_url = ""
         filter = make_filter_mock({
@@ -448,6 +457,33 @@ def select; end
         })
         assert_equal "/base", filter.relative_url(page_url)
       end
+
+      should "not prepend a forward slash if baseurl ends with a single '/'" do
+        page_url = "/css/main.css"
+        filter = make_filter_mock({
+          "url"     => "http://example.com",
+          "baseurl" => "/base/",
+        })
+        assert_equal "/base/css/main.css", filter.relative_url(page_url)
+      end
+
+      should "not return valid URI if baseurl ends with multiple '/'" do
+        page_url = "/css/main.css"
+        filter = make_filter_mock({
+          "url"     => "http://example.com",
+          "baseurl" => "/base//",
+        })
+        refute_equal "/base/css/main.css", filter.relative_url(page_url)
+      end
+
+      should "not prepend a forward slash if both input and baseurl are simply '/'" do
+        page_url = "/"
+        filter = make_filter_mock({
+          "url"     => "http://example.com",
+          "baseurl" => "/",
+        })
+        assert_equal "/", filter.relative_url(page_url)
+      end
     end
 
     context "jsonify filter" do

From 61cdebf272726b3706fc866ebb580d6cb62c4fa2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 14 Jun 2017 15:06:56 -0400
Subject: [PATCH 2185/4996] Update history to reflect merge of #6058 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c8b88e0dd09..c1f2fcf91ee 100644
--- a/History.markdown
+++ b/History.markdown
@@ -120,6 +120,7 @@
   * Allow colons in `uri_escape` filter (#5957)
   * Re-surface missing public methods in `Jekyll::Document` (#5975)
   * absolute_url should not mangle URL if called more than once (#5789)
+  * patch URLFilters to prevent `//` (#6058)
 
 ### fix
 

From b76b4a4e8a16125ffe511ec9429a67819a304ebb Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Wed, 31 Aug 2016 00:43:07 +0200
Subject: [PATCH 2186/4996] add test to use variable in where_exp condition

---
 test/test_filters.rb | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index 76da6042177..243f97af759 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -9,7 +9,7 @@ class JekyllFilter
 
     def initialize(opts = {})
       @site = Jekyll::Site.new(opts.merge("skip_config_files" => true))
-      @context = Liquid::Context.new({}, {}, { :site => @site })
+      @context = Liquid::Context.new(@site.site_payload, {}, { :site => @site })
     end
   end
 
@@ -26,12 +26,13 @@ def select; end
 
   context "filters" do
     setup do
+      @sample_time = Time.utc(2013, 3, 27, 11, 22, 33)
       @filter = make_filter_mock({
-        "timezone" => "UTC",
-        "url"      => "http://example.com",
-        "baseurl"  => "/base",
+        "timezone"               => "UTC",
+        "url"                    => "http://example.com",
+        "baseurl"                => "/base",
+        "dont_show_posts_before" => @sample_time,
       })
-      @sample_time = Time.utc(2013, 3, 27, 11, 22, 33)
       @sample_date = Date.parse("2013-03-27")
       @time_as_string = "September 11, 2001 12:46:30 -0000"
       @time_as_numeric = 1_399_680_607
@@ -816,6 +817,14 @@ def to_liquid
         results = @filter.where_exp(SelectDummy.new, "obj", "1 == 1")
         assert_equal [], results
       end
+
+      should "filter by variable values" do
+        @filter.site.tap(&:read)
+        posts = @filter.site.site_payload["site"]["posts"]
+        results = @filter.where_exp(posts, "post",
+          "post.date > site.dont_show_posts_before")
+        assert_equal posts.select { |p| p.date > @sample_time }.count, results.length
+      end
     end
 
     context "group_by_exp filter" do

From b0afe5125c152f1a30543725447af79282952ff1 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 14 Jun 2017 15:23:47 -0400
Subject: [PATCH 2187/4996] Update history to reflect merge of #5315

[ci skip]
---
 History.markdown | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/History.markdown b/History.markdown
index c1f2fcf91ee..5e63e1fc282 100644
--- a/History.markdown
+++ b/History.markdown
@@ -74,7 +74,7 @@
   * windows 10 tutorial (#6100)
   * Explain how to override theme styles (#6107)
   * updated Bash on Ubuntu on Windows link in tutorial (#6111)
-  * Fix wording in _docs/templates.md links section (#6114)
+  * Fix wording in `_docs/templates.md` links section (#6114)
   * Update windows.md (#6115)
   * Added windows to docs.yml (#6109)
   * Be more specific on what to upload (#6119)
@@ -121,6 +121,7 @@
   * Re-surface missing public methods in `Jekyll::Document` (#5975)
   * absolute_url should not mangle URL if called more than once (#5789)
   * patch URLFilters to prevent `//` (#6058)
+  * add test to ensure variables work in `where_exp` condition (#5315)
 
 ### fix
 

From fcde83431e9389b57ede544bffd368e1301651e5 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Thu, 15 Jun 2017 01:08:38 +0530
Subject: [PATCH 2188/4996] Address reading non-binary static files in themes
 (#5918)

Merge pull request 5918
---
 features/theme.feature                    | 11 +++++++++++
 lib/jekyll/readers/theme_assets_reader.rb |  2 +-
 test/fixtures/test-theme/assets/base.js   |  1 +
 test/source/assets/base.js                |  1 +
 test/test_theme_assets_reader.rb          | 11 ++++++++---
 5 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 test/fixtures/test-theme/assets/base.js
 create mode 100644 test/source/assets/base.js

diff --git a/features/theme.feature b/features/theme.feature
index 820283e889d..650c167577e 100644
--- a/features/theme.feature
+++ b/features/theme.feature
@@ -46,6 +46,17 @@ Feature: Writing themes
     And I should see "default.html from test-theme: I'm content." in "_site/index.html"
     And I should see "post.html from the project: I'm more content." in "_site/post.html"
 
+  Scenario: A theme with assets
+    Given I have a configuration file with "theme" set to "test-theme"
+    And I have an assets directory
+    And I have an "assets/application.coffee" file that contains "From your site."
+    And I have an "assets/base.js" file that contains "From your site."
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "From your site." in "_site/assets/application.coffee"
+    And I should see "From your site." in "_site/assets/base.js"
+
   Scenario: Requiring dependencies of a theme
     Given I have a configuration file with "theme" set to "test-dependency-theme"
     When I run jekyll build
diff --git a/lib/jekyll/readers/theme_assets_reader.rb b/lib/jekyll/readers/theme_assets_reader.rb
index 035c0607832..80a6547d8a7 100644
--- a/lib/jekyll/readers/theme_assets_reader.rb
+++ b/lib/jekyll/readers/theme_assets_reader.rb
@@ -29,7 +29,7 @@ def read_theme_asset(path)
           Jekyll::Page.new(site, base, dir, name)
       else
         append_unless_exists site.static_files,
-          Jekyll::StaticFile.new(site, base, dir, name)
+          Jekyll::StaticFile.new(site, base, "/#{dir}", name)
       end
     end
 
diff --git a/test/fixtures/test-theme/assets/base.js b/test/fixtures/test-theme/assets/base.js
new file mode 100644
index 00000000000..00c238eddbc
--- /dev/null
+++ b/test/fixtures/test-theme/assets/base.js
@@ -0,0 +1 @@
+alert("From your theme.");
diff --git a/test/source/assets/base.js b/test/source/assets/base.js
new file mode 100644
index 00000000000..40e8a468987
--- /dev/null
+++ b/test/source/assets/base.js
@@ -0,0 +1 @@
+alert("From your site.");
diff --git a/test/test_theme_assets_reader.rb b/test/test_theme_assets_reader.rb
index fc335248084..8d792f735d9 100644
--- a/test/test_theme_assets_reader.rb
+++ b/test/test_theme_assets_reader.rb
@@ -27,7 +27,7 @@ def refute_file_with_relative_path(haystack, relative_path)
     should "read all assets" do
       @site.reset
       ThemeAssetsReader.new(@site).read
-      assert_file_with_relative_path @site.static_files, "assets/img/logo.png"
+      assert_file_with_relative_path @site.static_files, "/assets/img/logo.png"
       assert_file_with_relative_path @site.pages, "assets/style.scss"
     end
 
@@ -45,8 +45,13 @@ def refute_file_with_relative_path(haystack, relative_path)
       @site.read
 
       file = @site.pages.find { |f| f.relative_path == "assets/application.coffee" }
+      static_script = File.read(
+        @site.static_files.find { |f| f.relative_path == "/assets/base.js" }.path
+      )
       refute_nil file
+      refute_nil static_script
       assert_includes file.content, "alert \"From your site.\""
+      assert_includes static_script, "alert(\"From your site.\");"
     end
   end
 
@@ -55,7 +60,7 @@ def refute_file_with_relative_path(haystack, relative_path)
       site = fixture_site("theme" => "test-theme")
       allow(site.theme).to receive(:assets_path).and_return(nil)
       ThemeAssetsReader.new(site).read
-      refute_file_with_relative_path site.static_files, "assets/img/logo.png"
+      refute_file_with_relative_path site.static_files, "/assets/img/logo.png"
       refute_file_with_relative_path site.pages, "assets/style.scss"
     end
   end
@@ -64,7 +69,7 @@ def refute_file_with_relative_path(haystack, relative_path)
     should "not read any assets" do
       site = fixture_site("theme" => nil)
       ThemeAssetsReader.new(site).read
-      refute_file_with_relative_path site.static_files, "assets/img/logo.png"
+      refute_file_with_relative_path site.static_files, "/assets/img/logo.png"
       refute_file_with_relative_path site.pages, "assets/style.scss"
     end
   end

From 4e3b5ba5b4e5c55aefb8006930c19c4a78052376 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 14 Jun 2017 15:38:40 -0400
Subject: [PATCH 2189/4996] Update history to reflect merge of #5918 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5e63e1fc282..6a0d321f8f1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Disable default layouts for documents with a `layout: none` declaration (#5933)
   * In `jekyll new`, make copied site template user-writable (#6072)
   * Add top-level `layout` liquid variable to Documents (#6073)
+  * Address reading non-binary static files in themes (#5918)
 
 ### Documentation
 

From 2ceff6ab3e420e36af28761e224da7d04e726f2d Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Thu, 15 Jun 2017 04:42:43 +0900
Subject: [PATCH 2190/4996] Read explicitly included dot-files in collections.
 #6091 (#6092)

Merge pull request 6092
---
 lib/jekyll/collection.rb                  |  2 +-
 lib/jekyll/entry_filter.rb                |  3 ++-
 test/source/_methods/with.dots/.gitignore |  1 +
 test/source/_methods/with.dots/.htaccess  |  1 +
 test/test_collections.rb                  | 29 +++++++++++++++++++++++
 5 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 test/source/_methods/with.dots/.gitignore
 create mode 100644 test/source/_methods/with.dots/.htaccess

diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index 9e906ab044f..08432933493 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -72,7 +72,7 @@ def read
     def entries
       return [] unless exists?
       @entries ||=
-        Utils.safe_glob(collection_dir, ["**", "*"]).map do |entry|
+        Utils.safe_glob(collection_dir, ["**", "*"], File::FNM_DOTMATCH).map do |entry|
           entry["#{collection_dir}/"] = ""
           entry
         end
diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb
index e4187d42d8e..f4425037afc 100644
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -36,7 +36,8 @@ def filter(entries)
     end
 
     def included?(entry)
-      glob_include?(site.include, entry)
+      glob_include?(site.include, entry) ||
+        glob_include?(site.include, File.basename(entry))
     end
 
     def special?(entry)
diff --git a/test/source/_methods/with.dots/.gitignore b/test/source/_methods/with.dots/.gitignore
new file mode 100644
index 00000000000..87e42cfcb65
--- /dev/null
+++ b/test/source/_methods/with.dots/.gitignore
@@ -0,0 +1 @@
+I should be copied
diff --git a/test/source/_methods/with.dots/.htaccess b/test/source/_methods/with.dots/.htaccess
new file mode 100644
index 00000000000..87e42cfcb65
--- /dev/null
+++ b/test/source/_methods/with.dots/.htaccess
@@ -0,0 +1 @@
+I should be copied
diff --git a/test/test_collections.rb b/test/test_collections.rb
index 5b80a6c7e03..cb122cd9e65 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -222,4 +222,33 @@ class TestCollections < JekyllUnitTest
       )
     end
   end
+
+  context "a collection with included dotfiles" do
+    setup do
+      @site = fixture_site({
+        "collections" => {
+          "methods" => {
+            "permalink" => "/awesome/:path/",
+          },
+        },
+        "include"     => %w(.htaccess .gitignore),
+      })
+      @site.process
+      @collection = @site.collections["methods"]
+    end
+
+    should "contain .htaccess file" do
+      assert(@collection.files.any? { |d| d.name == ".htaccess" })
+    end
+
+    should "contain .gitignore file" do
+      assert(@collection.files.any? { |d| d.name == ".gitignore" })
+    end
+
+    should "have custom URL in static file" do
+      assert(
+        @collection.files.any? { |d| d.url.include?("/awesome/with.dots/") }
+      )
+    end
+  end
 end

From 158ab6ce930e6feb690ef9a96397b285cf43c867 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 14 Jun 2017 15:42:45 -0400
Subject: [PATCH 2191/4996] Update history to reflect merge of #6092 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6a0d321f8f1..31d81a99167 100644
--- a/History.markdown
+++ b/History.markdown
@@ -123,6 +123,7 @@
   * absolute_url should not mangle URL if called more than once (#5789)
   * patch URLFilters to prevent `//` (#6058)
   * add test to ensure variables work in `where_exp` condition (#5315)
+  * Read explicitly included dot-files in collections. (#6092)
 
 ### fix
 

From e031ac9b27bb3c76d318107edf8178c60ff67b21 Mon Sep 17 00:00:00 2001
From: Martin Desrumaux 
Date: Wed, 14 Jun 2017 22:18:07 +0200
Subject: [PATCH 2192/4996] Allow filters to sort & select based on subvalues
 (#5622)

Merge pull request 5622
---
 lib/jekyll/filters.rb | 4 +++-
 test/test_filters.rb  | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index c8da0e526ce..e15cf7c66dd 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -361,7 +361,9 @@ def time(input)
     private
     def item_property(item, property)
       if item.respond_to?(:to_liquid)
-        item.to_liquid[property.to_s]
+        property.to_s.split(".").reduce(item.to_liquid) do |subvalue, attribute|
+          subvalue[attribute]
+        end
       elsif item.respond_to?(:data)
         item.data[property.to_s]
       else
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 243f97af759..93ddb2cdd96 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -949,6 +949,12 @@ def to_liquid
         assert_equal [{ "a" => 1 }, { "a" => 2 }, { "b" => 1 }],
           @filter.sort([{ "a" => 2 }, { "b" => 1 }, { "a" => 1 }], "a", "last")
       end
+      should "return sorted by subproperty array" do
+        assert_equal [{ "a" => { "b" => 1 } }, { "a" => { "b" => 2 } },
+                      { "a" => { "b" => 3 } }, ],
+          @filter.sort([{ "a" => { "b" => 2 } }, { "a" => { "b" => 1 } },
+                        { "a" => { "b" => 3 } }, ], "a.b")
+      end
     end
 
     context "to_integer filter" do

From 82218557356e259f2c03bdbcb25ffaf4399cf27b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 14 Jun 2017 16:18:08 -0400
Subject: [PATCH 2193/4996] Update history to reflect merge of #5622 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 31d81a99167..22b83e0a49b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
   * In `jekyll new`, make copied site template user-writable (#6072)
   * Add top-level `layout` liquid variable to Documents (#6073)
   * Address reading non-binary static files in themes (#5918)
+  * Allow filters to sort & select based on subvalues (#5622)
 
 ### Documentation
 

From 4299539db5373c0fdbce837c40c5871345abbdcf Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Thu, 15 Jun 2017 01:56:56 +0530
Subject: [PATCH 2194/4996] Test if hidden collections output a document with a
 future date (#6103)

Merge pull request 6103
---
 features/collections.feature | 45 ++++++++++++++++++++++++++++++++++++
 features/step_definitions.rb | 13 +++++++++++
 2 files changed, 58 insertions(+)

diff --git a/features/collections.feature b/features/collections.feature
index de5e2a22ed7..ba663510403 100644
--- a/features/collections.feature
+++ b/features/collections.feature
@@ -94,6 +94,51 @@ Feature: Collections
     And I should see "Collections: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" unless Windows
     And I should see "Collections: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/yaml_with_dots.md" in "_site/index.html" if on Windows
 
+  Scenario: Rendered collection with document with future date
+    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: true
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "content for Rover" in "_site/puppies/rover.html"
+    And the "_site/puppies/fido.html" file should not exist
+    When I run jekyll build --future
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And the "_site/puppies/fido.html" file should exist
+
+  Scenario: Hidden collection with document with future date
+    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 "foo.txt" file that contains "random static file"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And the "_site/puppies/rover.html" file should not exist
+    And the "_site/puppies/fido.html" file should not exist
+    When I run jekyll build --future
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And the "_site/puppies/fido.html" file should not exist
+
   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
diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index bcbfcb9a362..c22adb48667 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -93,6 +93,19 @@
 
 #
 
+Given(%r!^I have the following documents? under the (.*) collection:$!) do |folder, table|
+  table.hashes.each do |input_hash|
+    title = slug(input_hash["title"])
+    filename = "#{title}.md"
+    dest_folder = "_#{folder}"
+
+    path = File.join(dest_folder, filename)
+    File.write(path, file_content_from_hash(input_hash))
+  end
+end
+
+#
+
 Given(%r!^I have a configuration file with "(.*)" set to "(.*)"$!) do |key, value|
   config = \
     if source_dir.join("_config.yml").exist?

From 36265128cd2233ad90c77b2de3e022f94670dcf2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 14 Jun 2017 16:26:58 -0400
Subject: [PATCH 2195/4996] Update history to reflect merge of #6103 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 22b83e0a49b..6ecb615fbd0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -100,6 +100,7 @@
   * fix typo (#6040)
   * Fix CI  (#6044)
   * Remove `ruby RUBY_VERSION` from generated Gemfile (#5803)
+  * Test if hidden collections output a document with a future date (#6103)
 
 ### Site Enhancements
 

From 551d2ea8582ca8e2f5f2056e5cff95405ee15435 Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Thu, 15 Jun 2017 04:36:40 +0800
Subject: [PATCH 2196/4996] Add test for uri_escape on reserved characters
 (#6086)

Merge pull request 6086
---
 test/test_filters.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index 93ddb2cdd96..4370b31ee23 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -316,9 +316,15 @@ def select; end
       assert_equal "my%20things", @filter.uri_escape("my things")
     end
 
-    should "allow colons in URI" do
-      assert_equal "foo:bar", @filter.uri_escape("foo:bar")
-      assert_equal "foo%20bar:baz", @filter.uri_escape("foo bar:baz")
+    should "allow reserver characters in URI" do
+      assert_equal(
+        "foo!*'();:@&=+$,/?#[]bar",
+        @filter.uri_escape("foo!*'();:@&=+$,/?#[]bar")
+      )
+      assert_equal(
+        "foo%20bar!*'();:@&=+$,/?#[]baz",
+        @filter.uri_escape("foo bar!*'();:@&=+$,/?#[]baz")
+      )
     end
 
     context "absolute_url filter" do

From 1dd3e3b593a96186f2c41cbdafc86463ed4ff6fb Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 14 Jun 2017 16:36:41 -0400
Subject: [PATCH 2197/4996] Update history to reflect merge of #6086 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6ecb615fbd0..511dce6afdb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -101,6 +101,7 @@
   * Fix CI  (#6044)
   * Remove `ruby RUBY_VERSION` from generated Gemfile (#5803)
   * Test if hidden collections output a document with a future date (#6103)
+  * Add test for uri_escape on reserved characters (#6086)
 
 ### Site Enhancements
 

From 13b9dcd466316b69d9ef1dd59d5c4130060b0ee1 Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Thu, 15 Jun 2017 04:37:21 +0800
Subject: [PATCH 2198/4996] Document difference between cgi_escape and
 uri_escape #5970 (#6081)

Merge pull request 6081
---
 docs/_docs/templates.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md
index c4eba3c888b..40a3e0327e9 100644
--- a/docs/_docs/templates.md
+++ b/docs/_docs/templates.md
@@ -178,15 +178,15 @@ common tasks easier.
         
      CGI Escape
      
         
      
           CGI escape a string for use in a URL. Replaces any special characters
-          with appropriate %XX replacements.
+          with appropriate %XX replacements. CGI escape normally replaces a space with a plus + sign.
         
      
       
       
         
      
-         {% raw %}{{ "foo,bar;baz?" | cgi_escape }}{% endraw %}
+         {% raw %}{{ "foo, bar; baz?" | cgi_escape }}{% endraw %}
         
      
         
      
-          foo%2Cbar%3Bbaz%3F
+          foo%2C+bar%3B+baz%3F
         
      
       
     
@@ -194,15 +194,15 @@ common tasks easier.
       
         
      URI Escape
      
         
      
-          Percent encodes any special characters in a URI.
+          Percent encodes any special characters in a URI. URI escape normally replaces a space with %20. Reserved characters will not be escaped.
         
      
       
       
         
      
-         {% raw %}{{ "http://foo.com/?query=foo, bar \baz?" | uri_escape }}{% endraw %}
+         {% raw %}{{ "http://foo.com/?q=foo, \bar?" | uri_escape }}{% endraw %}
         
      
         
      
-          http://foo.com/?query=foo,%20bar%20%5Cbaz?
+          http://foo.com/?q=foo,%20%5Cbar?
         
      
       
     

From ae8889ae2b3cc3b9257296e667f7442c4554c913 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 14 Jun 2017 16:37:22 -0400
Subject: [PATCH 2199/4996] Update history to reflect merge of #6081 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 511dce6afdb..cdef91efae0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -114,6 +114,7 @@
   * Update normalize.css to v6.0.0 (#6008)
   * Docs: rename `gems` to `plugins` (#6082)
   * plugins -> gems (#6110)
+  * Document difference between cgi_escape and uri_escape #5970 (#6081)
 
 ### Bug Fixes
 

From 79b3f00b21a558ac6c4a010dcd4498bce81bf995 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 15 Jun 2017 08:29:02 -0400
Subject: [PATCH 2200/4996] Allow you to specify the rouge version via an
 environemnt variable for testing (#6138)

Merge pull request 6138
---
 .travis.yml    | 2 ++
 jekyll.gemspec | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c8b8671bd42..587ca6f36f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,8 @@ matrix:
       env: TEST_SUITE=fmt
     - rvm: *ruby1
       env: TEST_SUITE=default-site
+    - rvm: *ruby1
+      env: ROUGE_VERSION=1.11.1 # runs everything with this version
   exclude:
     - rvm: *jruby
       env: TEST_SUITE=cucumber
diff --git a/jekyll.gemspec b/jekyll.gemspec
index f95862594e2..8fd62e81828 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -38,6 +38,6 @@ 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")
-  s.add_runtime_dependency("rouge",                 "~> 1.7")
+  s.add_runtime_dependency("rouge",                 "~> #{ENV["ROUGE_VERSION"] || "1.7"}")
   s.add_runtime_dependency("safe_yaml",             "~> 1.0")
 end

From 2c0f5b30594da8f7b70b1517182599b3223666f8 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 15 Jun 2017 08:29:04 -0400
Subject: [PATCH 2201/4996] Update history to reflect merge of #6138 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index cdef91efae0..07d84b55ae5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -102,6 +102,7 @@
   * Remove `ruby RUBY_VERSION` from generated Gemfile (#5803)
   * Test if hidden collections output a document with a future date (#6103)
   * Add test for uri_escape on reserved characters (#6086)
+  * Allow you to specify the rouge version via an environment variable for testing (#6138)
 
 ### Site Enhancements
 

From d3b00cb84c8c796855d9b2c50109f903e1572158 Mon Sep 17 00:00:00 2001
From: Anatoliy Yastreb 
Date: Thu, 15 Jun 2017 21:29:35 +0900
Subject: [PATCH 2202/4996] Bump Rubocop to 0.49.1 (#6093)

Merge pull request 6093
---
 .rubocop.yml                        | 65 ++++++++++++++---------------
 Gemfile                             |  2 +-
 features/support/helpers.rb         |  2 +-
 lib/jekyll/collection.rb            |  2 +-
 lib/jekyll/commands/serve.rb        |  2 +-
 lib/jekyll/converter.rb             |  4 +-
 lib/jekyll/convertible.rb           |  2 +-
 lib/jekyll/document.rb              |  4 +-
 lib/jekyll/hooks.rb                 |  2 +-
 lib/jekyll/liquid_renderer/table.rb |  4 +-
 lib/jekyll/plugin.rb                |  2 +-
 lib/jekyll/utils/win_tz.rb          |  4 +-
 test/test_document.rb               | 10 ++---
 test/test_filters.rb                | 10 ++---
 14 files changed, 57 insertions(+), 58 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 5ab7a7e84ed..e5b26bccc9c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -9,6 +9,38 @@ AllCops:
     - benchmark/**/*
     - script/**/*
     - vendor/**/*
+Layout/AlignArray:
+  Enabled: false
+Layout/AlignHash:
+  EnforcedHashRocketStyle: table
+Layout/AlignParameters:
+  Enabled: false
+Layout/EmptyLinesAroundAccessModifier:
+  Enabled: false
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: false
+Layout/EndOfLine:
+  EnforcedStyle: lf
+Layout/ExtraSpacing:
+  AllowForAlignment: true
+Layout/FirstParameterIndentation:
+  EnforcedStyle: consistent
+Layout/IndentationWidth:
+  Severity: error
+Layout/IndentArray:
+  EnforcedStyle: consistent
+Layout/IndentHash:
+  EnforcedStyle: consistent
+Layout/IndentHeredoc:
+  Enabled: false
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+Layout/MultilineOperationIndentation:
+  EnforcedStyle: indented
+Layout/SpaceAroundOperators:
+  Enabled: true
+Layout/SpaceInsideBrackets:
+  Enabled: false
 Lint/EndAlignment:
   Severity: error
 Lint/UnreachableCode:
@@ -59,13 +91,6 @@ Security/YAMLLoad:
     - !ruby/regexp /test\/.*.rb$/
 Style/Alias:
   Enabled: false
-Style/AlignArray:
-  Enabled: false
-Style/AlignHash:
-  EnforcedHashRocketStyle: table
-Style/AlignParameters:
-  Enabled: false
-  EnforcedStyle: with_fixed_indentation
 Style/AndOr:
   Severity: error
 Style/Attr:
@@ -80,18 +105,8 @@ Style/Documentation:
     - !ruby/regexp /features\/.*.rb$/
 Style/DoubleNegation:
   Enabled: false
-Style/EmptyLinesAroundAccessModifier:
-  Enabled: false
-Style/EmptyLinesAroundModuleBody:
-  Enabled: false
-Style/EndOfLine:
-  EnforcedStyle: lf
-Style/ExtraSpacing:
-  AllowForAlignment: true
 Style/FileName:
   Enabled: false
-Style/FirstParameterIndentation:
-  EnforcedStyle: consistent
 Style/GuardClause:
   Enabled: false
 Style/HashSyntax:
@@ -99,22 +114,10 @@ Style/HashSyntax:
   Severity: error
 Style/IfUnlessModifier:
   Enabled: false
-Style/IndentArray:
-  EnforcedStyle: consistent
-Style/IndentHash:
-  EnforcedStyle: consistent
-Style/IndentHeredoc:
-  Enabled: false
-Style/IndentationWidth:
-  Severity: error
 Style/InverseMethods:
   Enabled: false
 Style/ModuleFunction:
   Enabled: false
-Style/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-Style/MultilineOperationIndentation:
-  EnforcedStyle: indented
 Style/MultilineTernaryOperator:
   Severity: error
 Style/PercentLiteralDelimiters:
@@ -138,10 +141,6 @@ Style/SignalException:
   EnforcedStyle: only_raise
 Style/SingleLineMethods:
   Enabled: false
-Style/SpaceAroundOperators:
-  Enabled: false
-Style/SpaceInsideBrackets:
-  Enabled: false
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 Style/StringLiteralsInInterpolation:
diff --git a/Gemfile b/Gemfile
index 5da04ca66c7..53cab0a5182 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ group :test do
   gem "nokogiri"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.48.1"
+  gem "rubocop", "~> 0.49.1"
   gem "test-dependency-theme", :path => File.expand_path("./test/fixtures/test-dependency-theme", File.dirname(__FILE__))
   gem "test-theme", :path => File.expand_path("./test/fixtures/test-theme", File.dirname(__FILE__))
 
diff --git a/features/support/helpers.rb b/features/support/helpers.rb
index 5081d3f1aae..118dd9cf925 100644
--- a/features/support/helpers.rb
+++ b/features/support/helpers.rb
@@ -55,7 +55,7 @@ def source_dir(*files)
 def all_steps_to_path(path)
   source = source_dir
   dest = Pathname.new(path).expand_path
-  paths  = []
+  paths = []
 
   dest.ascend do |f|
     break if f == source
diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index 08432933493..f839915f599 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -34,7 +34,7 @@ def method_missing(method, *args, &blck)
       if docs.respond_to?(method.to_sym)
         Jekyll.logger.warn "Deprecation:",
           "#{label}.#{method} should be changed to #{label}.docs.#{method}."
-        Jekyll.logger.warn "", "Called by #{caller.first}."
+        Jekyll.logger.warn "", "Called by #{caller(0..0)}."
         docs.public_send(method.to_sym, *args, &blck)
       else
         super
diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 622eda49b49..c16d5433740 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -136,7 +136,7 @@ def server_address(server, options = {})
 
         private
         def format_url(ssl_enabled, address, port, baseurl = nil)
-          format("%{prefix}://%{address}:%{port}%{baseurl}", {
+          format("%s://%
      s:%i%s", {
             :prefix  => ssl_enabled ? "https" : "http",
             :address => address,
             :port    => port,
diff --git a/lib/jekyll/converter.rb b/lib/jekyll/converter.rb
index f9d2ce16d11..b7fa0091cb3 100644
--- a/lib/jekyll/converter.rb
+++ b/lib/jekyll/converter.rb
@@ -8,7 +8,7 @@ class Converter < Plugin
     #
     # Returns the String prefix.
     def self.highlighter_prefix(highlighter_prefix = nil)
-      if !defined?(@highlighter_prefix) || !highlighter_prefix.nil?
+      unless defined?(@highlighter_prefix) && highlighter_prefix.nil?
         @highlighter_prefix = highlighter_prefix
       end
       @highlighter_prefix
@@ -22,7 +22,7 @@ def self.highlighter_prefix(highlighter_prefix = nil)
     #
     # Returns the String suffix.
     def self.highlighter_suffix(highlighter_suffix = nil)
-      if !defined?(@highlighter_suffix) || !highlighter_suffix.nil?
+      unless defined?(@highlighter_suffix) && highlighter_suffix.nil?
         @highlighter_suffix = highlighter_suffix
       end
       @highlighter_suffix
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 16745dd5b6a..74125f09b1d 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -160,7 +160,7 @@ def sass_file?
     #
     # Returns true if extname == .coffee, false otherwise.
     def coffeescript_file?
-      ".coffee" == ext
+      ext == ".coffee"
     end
 
     # Determine whether the file should be rendered with Liquid.
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 002404e6368..8634082c4d9 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -150,7 +150,7 @@ def sass_file?
     #
     # Returns true if extname == .coffee, false otherwise.
     def coffeescript_file?
-      ".coffee" == extname
+      extname == ".coffee"
     end
 
     # Determine whether the file should be rendered with Liquid.
@@ -371,7 +371,7 @@ def method_missing(method, *args, &blck)
       if data.key?(method.to_s)
         Jekyll::Deprecator.deprecation_message "Document##{method} is now a key "\
                            "in the #data hash."
-        Jekyll::Deprecator.deprecation_message "Called by #{caller.first}."
+        Jekyll::Deprecator.deprecation_message "Called by #{caller(0..0)}."
         data[method.to_s]
       else
         super
diff --git a/lib/jekyll/hooks.rb b/lib/jekyll/hooks.rb
index 5f21b5f6fea..241dce3a7f1 100644
--- a/lib/jekyll/hooks.rb
+++ b/lib/jekyll/hooks.rb
@@ -60,7 +60,7 @@ def self.priority_value(priority)
 
     # register a single hook to be called later, internal API
     def self.register_one(owner, event, priority, &block)
-      @registry[owner] ||={
+      @registry[owner] ||= {
         :post_init   => [],
         :pre_render  => [],
         :post_render => [],
diff --git a/lib/jekyll/liquid_renderer/table.rb b/lib/jekyll/liquid_renderer/table.rb
index a078f831e61..aab7fdf7845 100644
--- a/lib/jekyll/liquid_renderer/table.rb
+++ b/lib/jekyll/liquid_renderer/table.rb
@@ -32,7 +32,7 @@ def generate_table_head_border(row_data, widths)
 
       row_data.each_index do |cell_index|
         str << "-" * widths[cell_index]
-        str << "-+-" unless cell_index == row_data.length-1
+        str << "-+-" unless cell_index == row_data.length - 1
       end
 
       str << "\n"
@@ -49,7 +49,7 @@ def generate_row(row_data, widths)
                  cell_data.rjust(widths[cell_index], " ")
                end
 
-        str << " | " unless cell_index == row_data.length-1
+        str << " | " unless cell_index == row_data.length - 1
       end
 
       str << "\n"
diff --git a/lib/jekyll/plugin.rb b/lib/jekyll/plugin.rb
index 4680be32434..b6e5023d80e 100644
--- a/lib/jekyll/plugin.rb
+++ b/lib/jekyll/plugin.rb
@@ -60,7 +60,7 @@ def self.priority(priority = nil)
     #
     # Returns the safety Boolean.
     def self.safe(safe = nil)
-      if !defined?(@safe) || !safe.nil?
+      unless defined?(@safe) && safe.nil?
         @safe = safe
       end
       @safe || false
diff --git a/lib/jekyll/utils/win_tz.rb b/lib/jekyll/utils/win_tz.rb
index 0c2b5bd2923..06a10422274 100644
--- a/lib/jekyll/utils/win_tz.rb
+++ b/lib/jekyll/utils/win_tz.rb
@@ -46,7 +46,7 @@ def calculate(timezone)
       #
       # Returns a rational number.
       def rational_hour(seconds)
-        seconds.to_r/3600
+        seconds.to_r / 3600
       end
 
       # Private: Convert given seconds to an hour as an absolute number.
@@ -56,7 +56,7 @@ def rational_hour(seconds)
       #
       # Returns an integer.
       def absolute_hour(seconds)
-        seconds.abs/3600
+        seconds.abs / 3600
       end
 
       # Private: Perform a modulo operation on a given fraction.
diff --git a/test/test_document.rb b/test/test_document.rb
index 37e709ac6dc..0c880a6b5b7 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -115,7 +115,7 @@ def assert_equal_value(key, one, other)
       @site = fixture_site({
         "collections" => ["slides"],
         "defaults"    => [{
-          "scope"  => { "path"=>"", "type"=>"slides" },
+          "scope"  => { "path" => "", "type" => "slides" },
           "values" => {
             "nested" => {
               "key" => "myval",
@@ -139,7 +139,7 @@ def assert_equal_value(key, one, other)
       @site = fixture_site({
         "collections" => ["slides"],
         "defaults"    => [{
-          "scope"  => { "path"=>"", "type"=>"slides" },
+          "scope"  => { "path" => "", "type" => "slides" },
           "values" => {
             "nested" => {
               "test1" => "default1",
@@ -156,7 +156,7 @@ def assert_equal_value(key, one, other)
       assert_equal "Override title", @document.data["title"]
       assert_equal "slide", @document.data["layout"]
       assert_equal(
-        { "test1"=>"override1", "test2"=>"override2" },
+        { "test1" => "override1", "test2" => "override2" },
         @document.data["nested"]
       )
     end
@@ -167,7 +167,7 @@ def assert_equal_value(key, one, other)
       @site = fixture_site({
         "collections" => ["slides"],
         "defaults"    => [{
-          "scope"  => { "path"=>"_slides", "type"=>"slides" },
+          "scope"  => { "path" => "_slides", "type" => "slides" },
           "values" => {
             "nested" => {
               "key" => "value123",
@@ -191,7 +191,7 @@ def assert_equal_value(key, one, other)
       @site = fixture_site({
         "collections" => ["slides"],
         "defaults"    => [{
-          "scope"  => { "path"=>"somepath", "type"=>"slides" },
+          "scope"  => { "path" => "somepath", "type" => "slides" },
           "values" => {
             "nested" => {
               "key" => "myval",
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 4370b31ee23..e0af37a58bf 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -689,7 +689,7 @@ def to_liquid
       end
 
       should "filter objects in a hash appropriately" do
-        hash = { "a"=>{ "color"=>"red" }, "b"=>{ "color"=>"blue" } }
+        hash = { "a" => { "color"=>"red" }, "b" => { "color"=>"blue" } }
         assert_equal 1, @filter.where(hash, "color", "red").length
         assert_equal [{ "color"=>"red" }], @filter.where(hash, "color", "red")
       end
@@ -754,7 +754,7 @@ def to_liquid
       end
 
       should "filter objects in a hash appropriately" do
-        hash = { "a"=>{ "color"=>"red" }, "b"=>{ "color"=>"blue" } }
+        hash = { "a" => { "color"=>"red" }, "b" => { "color"=>"blue" } }
         assert_equal 1, @filter.where_exp(hash, "item", "item.color == 'red'").length
         assert_equal(
           [{ "color"=>"red" }],
@@ -882,9 +882,9 @@ def to_liquid
 
       should "allow more complex filters" do
         items = [
-          { "version"=>"1.0", "result"=>"slow" },
-          { "version"=>"1.1.5", "result"=>"medium" },
-          { "version"=>"2.7.3", "result"=>"fast" },
+          { "version" => "1.0", "result" => "slow" },
+          { "version" => "1.1.5", "result" => "medium" },
+          { "version" => "2.7.3", "result" => "fast" },
         ]
 
         result = @filter.group_by_exp(items, "item", "item.version | split: '.' | first")

From 401e20cfa6a908c226b8bfcd5a536ebed670729e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 15 Jun 2017 08:29:37 -0400
Subject: [PATCH 2203/4996] Update history to reflect merge of #6093 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 07d84b55ae5..1922edbc435 100644
--- a/History.markdown
+++ b/History.markdown
@@ -103,6 +103,7 @@
   * Test if hidden collections output a document with a future date (#6103)
   * Add test for uri_escape on reserved characters (#6086)
   * Allow you to specify the rouge version via an environment variable for testing (#6138)
+  * Bump Rubocop to 0.49.1 (#6093)
 
 ### Site Enhancements
 

From 69e97fa06fde3b73cee2e79b4f622e132821cc56 Mon Sep 17 00:00:00 2001
From: Ben Balter 
Date: Thu, 15 Jun 2017 14:28:41 -0400
Subject: [PATCH 2204/4996] Add strip_index filter (#6075)

Merge pull request 6075
---
 lib/jekyll/filters/url_filters.rb | 10 ++++++++++
 test/test_filters.rb              | 26 ++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/filters/url_filters.rb b/lib/jekyll/filters/url_filters.rb
index 40cacc22f13..fa2dc16a79d 100644
--- a/lib/jekyll/filters/url_filters.rb
+++ b/lib/jekyll/filters/url_filters.rb
@@ -28,6 +28,16 @@ def relative_url(input)
         ).normalize.to_s
       end
 
+      # Strips trailing `/index.html` from URLs to create pretty permalinks
+      #
+      # input - the URL with a possible `/index.html`
+      #
+      # Returns a URL with the trailing `/index.html` removed
+      def strip_index(input)
+        return if input.nil? || input.to_s.empty?
+        input.sub(%r!/index\.html?$!, "/")
+      end
+
       private
 
       def site
diff --git a/test/test_filters.rb b/test/test_filters.rb
index e0af37a58bf..91ac386a5db 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -493,6 +493,28 @@ def select; end
       end
     end
 
+    context "strip_index filter" do
+      should "strip trailing /index.html" do
+        assert_equal "/foo/", @filter.strip_index("/foo/index.html")
+      end
+
+      should "strip trailing /index.htm" do
+        assert_equal "/foo/", @filter.strip_index("/foo/index.htm")
+      end
+
+      should "not strip HTML in the middle of URLs" do
+        assert_equal "/index.html/foo", @filter.strip_index("/index.html/foo")
+      end
+
+      should "not raise an error on nil strings" do
+        assert_nil @filter.strip_index(nil)
+      end
+
+      should "not mangle other URLs" do
+        assert_equal "/foo/", @filter.strip_index("/foo/")
+      end
+    end
+
     context "jsonify filter" do
       should "convert hash to json" do
         assert_equal "{\"age\":18}", @filter.jsonify({ :age => 18 })
@@ -742,7 +764,7 @@ def to_liquid
         assert_equal 4.7, results[0]["rating"]
       end
 
-      should "always return an array if the object responds to `select`" do
+      should "always return an array if the object responds to 'select'" do
         results = @filter.where(SelectDummy.new, "obj", "1 == 1")
         assert_equal [], results
       end
@@ -819,7 +841,7 @@ def to_liquid
         assert_equal site.posts.find { |p| p.title == "Foo Bar" }, results.first
       end
 
-      should "always return an array if the object responds to `select`" do
+      should "always return an array if the object responds to 'select'" do
         results = @filter.where_exp(SelectDummy.new, "obj", "1 == 1")
         assert_equal [], results
       end

From 3439a0d947b592893bfde489c6a0f4362bf3be88 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 15 Jun 2017 14:28:42 -0400
Subject: [PATCH 2205/4996] Update history to reflect merge of #6075 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1922edbc435..5056d3d360b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -18,6 +18,7 @@
   * Add top-level `layout` liquid variable to Documents (#6073)
   * Address reading non-binary static files in themes (#5918)
   * Allow filters to sort & select based on subvalues (#5622)
+  * Add strip_index filter (#6075)
 
 ### Documentation
 

From 1ae0e83b2d3369bfb26329626b1dd2661b3629a4 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 15 Jun 2017 14:29:07 -0400
Subject: [PATCH 2206/4996] Default `baseurl` to `nil` instead of empty string
 (#6137)

Merge pull request 6137
---
 lib/jekyll/commands/serve.rb      | 2 +-
 lib/jekyll/configuration.rb       | 2 +-
 lib/jekyll/filters/url_filters.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index c16d5433740..50a85fac9be 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -104,7 +104,7 @@ def webrick_opts(opts)
         private
         def start_up_webrick(opts, destination)
           server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
-          server.mount(opts["baseurl"], Servlet, destination, file_handler_opts)
+          server.mount(opts["baseurl"].to_s, Servlet, destination, file_handler_opts)
           Jekyll.logger.info "Server address:", server_address(server, opts)
           launch_browser server, opts if opts["open_url"]
           boot_or_detach server, opts
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 153d98fe009..ec8e2a22dc0 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -47,7 +47,7 @@ class Configuration < Hash
       "detach"              => false, # default to not detaching the server
       "port"                => "4000",
       "host"                => "127.0.0.1",
-      "baseurl"             => "",
+      "baseurl"             => nil, # this mounts at /, i.e. no subdirectory
       "show_dir_listing"    => false,
 
       # Output Configuration
diff --git a/lib/jekyll/filters/url_filters.rb b/lib/jekyll/filters/url_filters.rb
index fa2dc16a79d..80ffa850aba 100644
--- a/lib/jekyll/filters/url_filters.rb
+++ b/lib/jekyll/filters/url_filters.rb
@@ -45,7 +45,7 @@ def site
       end
 
       def sanitized_baseurl
-        site.config["baseurl"].chomp("/")
+        site.config["baseurl"].to_s.chomp("/")
       end
 
       def ensure_leading_slash(input)

From fbdfbbb28ddc37226d8210d2e799687321359a24 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 15 Jun 2017 14:29:08 -0400
Subject: [PATCH 2207/4996] Update history to reflect merge of #6137 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5056d3d360b..e4e8480764c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -131,6 +131,7 @@
   * patch URLFilters to prevent `//` (#6058)
   * add test to ensure variables work in `where_exp` condition (#5315)
   * Read explicitly included dot-files in collections. (#6092)
+  * Default `baseurl` to `nil` instead of empty string (#6137)
 
 ### fix
 

From aeb0fd7ddf452e48f95fb0ea01b81a9e7dc1b16e Mon Sep 17 00:00:00 2001
From: penny 
Date: Thu, 15 Jun 2017 23:33:47 +0200
Subject: [PATCH 2208/4996] add documentation about the "pinned" label (#6147)

Merge pull request 6147
---
 docs/_docs/maintaining/special-labels.md    | 4 ++++
 docs/_docs/maintaining/triaging-an-issue.md | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/maintaining/special-labels.md b/docs/_docs/maintaining/special-labels.md
index a8696174191..964ff0e2e07 100644
--- a/docs/_docs/maintaining/special-labels.md
+++ b/docs/_docs/maintaining/special-labels.md
@@ -18,3 +18,7 @@ These labels are used to indicate that the Git state of a pull request must chan
 ## `stale`
 
 This label is automatically added and removed by @jekyllbot based on activity on an issue or pull request. The rules for this label are laid out in [Triaging an Issue: Staleness and automatic closure](../triaging-an-issue/#staleness-and-automatic-closure).
+
+## `pinned`
+
+This label is for @jekyllbot to ignore the age of the issue, which means that the `stale` label won't be automatically added, and the issue won't be closed after a while. This needs to be set manually, and should be set with care. (The `has-pull-request` label does the same thing, but shouldn't be used to _only_ keep an issue open)
diff --git a/docs/_docs/maintaining/triaging-an-issue.md b/docs/_docs/maintaining/triaging-an-issue.md
index bc87d96e19f..23660b17ef8 100644
--- a/docs/_docs/maintaining/triaging-an-issue.md
+++ b/docs/_docs/maintaining/triaging-an-issue.md
@@ -51,4 +51,4 @@ Is what they wanted to get something we want to happen? Sometimes a bug report i
 
 ### Staleness and automatic closure
 
-@jekyllbot will automatically mark issues as `stale` if no activity occurs for at least one month. @jekyllbot leaves a comment asking for information about reproducibility in current versions. If no one responds after another month, the issue is automatically closed.
+@jekyllbot will automatically mark issues as `stale` if no activity occurs for at least one month. @jekyllbot leaves a comment asking for information about reproducibility in current versions. If no one responds after another month, the issue is automatically closed. This behaviour can be suppressed by setting the [`pinned` label](../maintaining/special-labels.md/#pinned).

From 7236e514eafb17382725c7aeeebd96cac0e74f74 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 15 Jun 2017 17:33:49 -0400
Subject: [PATCH 2209/4996] Update history to reflect merge of #6147 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e4e8480764c..e31248f24be 100644
--- a/History.markdown
+++ b/History.markdown
@@ -83,6 +83,7 @@
   * Be more specific on what to upload (#6119)
   * Remove Blank Newlines from "Jekyll on Windows" Page (#6126)
   * Link the troubleshooting page in the quickstart page (#6134)
+  * add documentation about the "pinned" label (#6147)
 
 ### Development Fixes
 

From 8dd76bc6c70c71f7f0a1ec82969acce3f996d67f Mon Sep 17 00:00:00 2001
From: KeJun 
Date: Sat, 17 Jun 2017 00:42:32 +0800
Subject: [PATCH 2210/4996] docs(JekyllOnWindows): Add a new Installation way
 (#6141)

Merge pull request 6141
---
 docs/_docs/windows.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index 7c02fdc29f7..3cfc7ccea61 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -171,3 +171,26 @@ 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"
 [nokogiriFails]: https://github.com/sparklemotion/nokogiri/issues/1456#issuecomment-206481794 "Nokogiri fails to install on Ruby 2.3 for Windows"
+
+## Installation via RubyInstaller
+
+RubyInstaller is a self-contained Windows-based installer that includes the Ruby language, an execution environment, important documentation, and more.
+
+1. Install a package manager for Windows called [RubyInstaller](https://rubyinstaller.org/).
+2. Install Jekyll and Bundler via a command prompt window: `gem install jekyll bundler`
+3. Check if the installation is accessible: `jekyll -v`
+
+See [Autoinstall Jekyll for Windows](https://github.com/KeJunMao/fastjekyll#autoinstall-jekyll-for-windows)
+
+### Auto-regeneration
+
+Although jekyll would suggest:
+
+```
+Please add the following to your Gemfile to avoid polling for changes:
+    gem 'wdm', '>= 0.1.0' if Gem.win_platform?
+```
+
+Auto-regeneration will work fine without including `gem 'wdm'`
+
+### [time-zone](/docs/windows/#timezone-management)

From 6384724a091d7982bea8b29cf2bceba84f8e6e4e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 16 Jun 2017 12:42:34 -0400
Subject: [PATCH 2211/4996] Update history to reflect merge of #6141 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e31248f24be..8140b5940bd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -84,6 +84,7 @@
   * Remove Blank Newlines from "Jekyll on Windows" Page (#6126)
   * Link the troubleshooting page in the quickstart page (#6134)
   * add documentation about the "pinned" label (#6147)
+  * docs(JekyllOnWindows): Add a new Installation way (#6141)
 
 ### Development Fixes
 

From 5ceef94c1b6fb15d01ff8db91ff46c6df5faead4 Mon Sep 17 00:00:00 2001
From: Henry Kobin 
Date: Sun, 18 Jun 2017 04:27:41 -0700
Subject: [PATCH 2212/4996] corrected windows.md (#6149)

Merge pull request 6149
---
 docs/_docs/windows.md | 68 ++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index 3cfc7ccea61..a785a3d5e5b 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -12,7 +12,8 @@ For older installations, this page aims to collect some of the general knowledge
 
 *Please note:* You must have [Bash on Ubuntu on Windows](https://msdn.microsoft.com/en-us/commandline/wsl/about?f=255&MSPPError=-2147217396) enabled.
 
-First let's make sure all our packages / repositories are up to date. Open a new Command Prompt instance, and type the following:
+First let's make sure all our packages / repositories are up to date. 
+Open a new Command Prompt instance, and type the following:
 
 ```
 bash
@@ -42,16 +43,24 @@ Now all that is left to do is install Jekyll.
 sudo gem install jekyll bundler
 ```
 
-You can test by running:
+Check to see if your installation worked.
 
 ```
-jekyll new my_project
+jekyll -v
 ```
 
 **And that's it!**
+
+To start a new project, just run:
+```
+jekyll new my_project
+```
+
+replacing `my_project` with the name of your website.
+
 If you `cd` into the folder, you can make sure time management is working by opening your `_posts` folder. You should see a markdown file with the current date listed.
 
-*Please note* Bash on Ubuntu on Windows is still under development, so you may run into issues. If you see an Auto-Regeneration error warning in your Bash instance, you can ignore it.
+*Please note* Bash on Ubuntu on Windows is still under development, so you may run into issues. If you see an Auto-Regeneration error warning in your Bash instance, you can ignore it. 
 
 ## Installation via Chocolatey
 
@@ -81,27 +90,8 @@ the site generation process. It can be done with the following command:
 ```sh
 $ chcp 65001
 ```
-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.
-
-Jekyll now uses a rubygem to internally configure Timezone based on established [IANA Timezone Database](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
-While 'new' blogs created with Jekyll v3.4 and greater, will have the following added to their 'Gemfile' by default, existing sites *will* have to update their 'Gemfile' (and installed) to enable development on Windows:
-
-```ruby
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-```
-
-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 requires an extra gem for compatibility
-with Windows. Add the following to the Gemfile for your site:
-
-```ruby
-gem 'wdm', '~> 0.1.0' if Gem.win_platform?
-```
 
-### How to install github-pages
+## How to install github-pages (Chocolatey Method)
 
 This section is part of an article written by [Jens Willmer][jwillmerPost]. To follow the instructions you need to have [Chocolatey][] installed on your system. If you already have a version of Ruby installed you need to uninstall it before you can continue.
 
@@ -145,7 +135,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
@@ -172,6 +162,8 @@ In the future the installation process of the github-pages should be as simple a
 [nokogiriReleases]: https://github.com/sparklemotion/nokogiri/releases "Nokogiri Releases"
 [nokogiriFails]: https://github.com/sparklemotion/nokogiri/issues/1456#issuecomment-206481794 "Nokogiri fails to install on Ruby 2.3 for Windows"
 
+
+
 ## Installation via RubyInstaller
 
 RubyInstaller is a self-contained Windows-based installer that includes the Ruby language, an execution environment, important documentation, and more.
@@ -180,17 +172,27 @@ RubyInstaller is a self-contained Windows-based installer that includes the Ruby
 2. Install Jekyll and Bundler via a command prompt window: `gem install jekyll bundler`
 3. Check if the installation is accessible: `jekyll -v`
 
-See [Autoinstall Jekyll for Windows](https://github.com/KeJunMao/fastjekyll#autoinstall-jekyll-for-windows)
+Optionally you can use [Autoinstall Jekyll for Windows](https://github.com/KeJunMao/fastjekyll#autoinstall-jekyll-for-windows).
 
-### Auto-regeneration
 
-Although jekyll would suggest:
+## 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.
 
-```
-Please add the following to your Gemfile to avoid polling for changes:
-    gem 'wdm', '>= 0.1.0' if Gem.win_platform?
+Jekyll now uses a rubygem to internally configure Timezone based on established [IANA Timezone Database](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
+While 'new' blogs created with Jekyll v3.4 and greater, will have the following added to their 'Gemfile' by default, existing sites *will* have to update their 'Gemfile' (and installed) to enable development on Windows:
+
+```ruby
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 ```
 
-Auto-regeneration will work fine without including `gem 'wdm'`
+## 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 requires an extra gem for compatibility
+with Windows. Add the following to the Gemfile for your site:
 
-### [time-zone](/docs/windows/#timezone-management)
+```ruby
+gem 'wdm', '~> 0.1.0' if Gem.win_platform?
+```

From 0d96ac4700f68c4fa0b61ef450ff4f8482e8ccbb Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 18 Jun 2017 07:27:42 -0400
Subject: [PATCH 2213/4996] Update history to reflect merge of #6149 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8140b5940bd..c50dc4606aa 100644
--- a/History.markdown
+++ b/History.markdown
@@ -85,6 +85,7 @@
   * Link the troubleshooting page in the quickstart page (#6134)
   * add documentation about the "pinned" label (#6147)
   * docs(JekyllOnWindows): Add a new Installation way (#6141)
+  * corrected windows.md (#6149)
 
 ### Development Fixes
 

From 01dd356564fa76eb82f393d63aa6937570fe60cd Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sun, 18 Jun 2017 13:20:09 -0400
Subject: [PATCH 2214/4996] Lock nokogiri to 1.7.x for Ruby 2.1 (#6140)

Merge pull request 6140
---
 Gemfile      | 3 ++-
 appveyor.yml | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 53cab0a5182..146100698ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,8 @@ group :test do
   gem "cucumber", "~> 2.1"
   gem "jekyll_test_plugin"
   gem "jekyll_test_plugin_malicious"
-  gem "nokogiri"
+  # nokogiri v1.8 does not work with ruby 2.1 and below
+  gem "nokogiri", RUBY_VERSION >= "2.2" ? "~> 1.7" : "~> 1.7.0"
   gem "rspec"
   gem "rspec-mocks"
   gem "rubocop", "~> 0.49.1"
diff --git a/appveyor.yml b/appveyor.yml
index 2fe407f4cd6..34f4d726b0d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,8 +20,6 @@ environment:
       TEST_SUITE: "test"
     - RUBY_FOLDER_VER: "23"
       TEST_SUITE: "cucumber"
-    - RUBY_FOLDER_VER: "23"
-      TEST_SUITE: "fmt"
     - RUBY_FOLDER_VER: "23"
       TEST_SUITE: "default-site"
     - RUBY_FOLDER_VER: "23-x64"

From 6c88e5c24128d613073dd2d1972a64f00ceed9c6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 18 Jun 2017 13:20:10 -0400
Subject: [PATCH 2215/4996] Update history to reflect merge of #6140 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c50dc4606aa..2a636f8c303 100644
--- a/History.markdown
+++ b/History.markdown
@@ -108,6 +108,7 @@
   * Add test for uri_escape on reserved characters (#6086)
   * Allow you to specify the rouge version via an environment variable for testing (#6138)
   * Bump Rubocop to 0.49.1 (#6093)
+  * Lock nokogiri to 1.7.x for Ruby 2.1 (#6140)
 
 ### Site Enhancements
 

From 88e79430845c40091d90e67660d44753dd216c38 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Mon, 19 Jun 2017 01:40:47 +0530
Subject: [PATCH 2216/4996] Refine doc for Windows (#6153)

Merge pull request 6153
---
 docs/_docs/windows.md | 120 ++++++++++++++++++++++++------------------
 1 file changed, 69 insertions(+), 51 deletions(-)

diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index a785a3d5e5b..6ebc33db065 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -3,17 +3,19 @@ title: Jekyll on Windows
 permalink: /docs/windows/
 ---
 
-While Windows is not an officially-supported platform, it can be used to run
-Jekyll with the proper tweaks. If you are using Windows 10 Anniversary Update, 
-the easiest way to run Jekyll is to use the new [Bash on Ubuntu on Windows](https://msdn.microsoft.com/en-us/commandline/wsl/install_guide).
-For older installations, this page aims to collect some of the general knowledge and lessons that have been unearthed by Windows users.
+While Windows is not an officially-supported platform, it can be used to run Jekyll with the proper tweaks. This page aims to collect some of the general knowledge and lessons that have been unearthed by Windows users.
 
-## Installation via Bash on Windows 10
 
-*Please note:* You must have [Bash on Ubuntu on Windows](https://msdn.microsoft.com/en-us/commandline/wsl/about?f=255&MSPPError=-2147217396) enabled.
+## Installing Jekyll
 
-First let's make sure all our packages / repositories are up to date. 
-Open a new Command Prompt instance, and type the following:
+If you are using Windows 10 Anniversary Update, the easiest way to run Jekyll is by [installing][WSL-Guide] the new Bash on Ubuntu on Windows.
+
+
+### Installation via Bash on Windows 10
+
+*Note:* You must have [Bash on Ubuntu on Windows][BASH-WSL] enabled.
+
+First let's make sure all our packages / repositories are up to date. Open a new Command Prompt instance, and type the following:
 
 ```
 bash
@@ -23,7 +25,6 @@ Your Command Prompt instance should now be a Bash instance. Now we must update o
 ```
 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.
 
 ```
@@ -31,6 +32,7 @@ sudo apt-add-repository ppa:brightbox/ruby-ng
 sudo apt-get update
 sudo apt-get install ruby2.3 ruby2.3-dev build-essential
 ```
+
 Next let's update our Ruby gems:
 
 ```
@@ -43,7 +45,7 @@ Now all that is left to do is install Jekyll.
 sudo gem install jekyll bundler
 ```
 
-Check to see if your installation worked.
+Check if Jekyll installed properly by running:
 
 ```
 jekyll -v
@@ -51,23 +53,38 @@ jekyll -v
 
 **And that's it!**
 
-To start a new project, just run:
+To start a new project named `my_blog`, just run:
+
 ```
-jekyll new my_project
+jekyll new my_blog
 ```
 
-replacing `my_project` with the name of your website.
+You can make sure time management is working properly by inspecting your `_posts` folder. You should see a markdown file with the current date in the filename.
+
+**Note:** Bash on Ubuntu on Windows is still under development, so you may run into issues.
+
+
+[WSL-Guide]: https://msdn.microsoft.com/en-us/commandline/wsl/install_guide
+[BASH-WSL]: https://msdn.microsoft.com/en-us/commandline/wsl/about
+
+
+### Installation via RubyInstaller
 
-If you `cd` into the folder, you can make sure time management is working by opening your `_posts` folder. You should see a markdown file with the current date listed.
+[RubyInstaller][] is a self-contained Windows-based installer that includes the Ruby language, an execution environment, important documentation, and more.
 
-*Please note* Bash on Ubuntu on Windows is still under development, so you may run into issues. If you see an Auto-Regeneration error warning in your Bash instance, you can ignore it. 
+1. Download and Install a package manager version from [RubyInstaller Downloads][RubyInstaller-downloads].
+2. Install Jekyll and Bundler via a command prompt window: `gem install jekyll bundler`
+3. Check if Jekyll installed properly: `jekyll -v`
+
+[RubyInstaller]: https://rubyinstaller.org/
+[RubyInstaller-downloads]: https://rubyinstaller.org/downloads/
 
-## Installation via Chocolatey
 
+### Installation via Chocolatey
 
 A quick way to install Jekyll using Chocolatey is to follow the [installation instructions by David Burela](https://davidburela.wordpress.com/2015/11/28/easily-install-jekyll-on-windows-with-3-command-prompt-entries-and-chocolatey/):
 
- 1. Install a package manager for Windows called [Chocolatey](https://chocolatey.org/install)
+ 1. Install a package manager for Windows called [Chocolatey][]
  2. Install Ruby via Chocolatey: `choco install ruby -y`
  3. Reopen a command prompt and install Jekyll: `gem install jekyll`
 
@@ -75,26 +92,12 @@ Updates in the infrastructure of Ruby may cause SSL errors when attempting to us
 
 [ssl-certificate-update]: http://guides.rubygems.org/ssl-certificate-update/#installing-using-update-packages
 
-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].
-
-[windows-installjekyll3]: https://labs.sverrirs.com/jekyll/
-
-If you use UTF-8 encoding, make sure that no `BOM` header
-characters exist in your files or very, very bad things will happen to
-Jekyll. This is especially relevant if 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
-```
-
-## How to install github-pages (Chocolatey Method)
+### Installing *github-pages* via Chocolatey
 
 This section is part of an article written by [Jens Willmer][jwillmerPost]. To follow the instructions you need to have [Chocolatey][] installed on your system. If you already have a version of Ruby installed you need to uninstall it before you can continue.
 
+
 #### Install Ruby and Ruby development kit
 
 Open a command prompt and execute the following commands:
@@ -102,6 +105,7 @@ Open a command prompt and execute the following commands:
  * `choco install ruby -version 2.2.4`
  * `choco install ruby2.devkit` - _needed for compilation of json gem_
 
+
 #### Configure Ruby development kit
 
 The development kit did not set the environment path for Ruby so we need to do it.
@@ -111,14 +115,13 @@ The development kit did not set the environment path for Ruby so we need to do i
  * Edit the `config.yml` file and include the path to Ruby `- C:/tools/ruby22`
  * Execute the following command to set the path: `ruby dk.rb install`
 
+
 #### Nokogiri gem installation
 
 This gem is also needed in the github-pages and to get it running on Windows x64 we have to install a few things.
 
-
 **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}
 
 `choco install libxslt -Source "https://www.nuget.org/api/v2/"`{:.language-ruby}
@@ -137,9 +140,9 @@ This gem is also needed in the github-pages and to get it running on Windows x64
 
 #### 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
- * Copy & paste the two lines into the file:
+  * Open command prompt and install [Bundler][]: `gem install bundler`
+  * Create a file called `Gemfile` without any extension in your root directory of your blog
+  * Copy & paste the two lines into the file:
 
 
 ```ruby
@@ -151,35 +154,47 @@ gem 'github-pages', group: :jekyll_plugins
  * Open a command prompt, target your local blog repository root, and install github-pages: `bundle install`
 
 
-After this process you should have github-pages installed on your system and you can host your blog again with `jekyll s`. \\
+After this process you should have github-pages installed on your system and you can host your blog again with `jekyll s`.
 There will be a warning on startup that you should include `gem 'wdm', '>= 0.1.0' if Gem.win_platform?` to your `Gemfile` but I could not get `jekyll s` working if I include that line so for the moment I ignore that warning.
 
 In the future the installation process of the github-pages should be as simple as the setup of the blog. But as long as the new version of the Nokogiri ([v1.6.8][nokogiriReleases]) is not stable and referenced, it is work to get it up and running on Windows.
 
 [jwillmerPost]: https://jwillmer.de/blog/tutorial/how-to-install-jekyll-and-pages-gem-on-windows-10-x46 "Installation instructions by Jens Willmer"
 [Chocolatey]: https://chocolatey.org/install "Package manager for Windows"
+[nokogiriFails]: https://github.com/sparklemotion/nokogiri/issues/1456#issuecomment-206481794 "Nokogiri fails to install on Ruby 2.3 for Windows"
 [Bundler]: http://bundler.io/ "Ruby Dependencie Manager"
 [nokogiriReleases]: https://github.com/sparklemotion/nokogiri/releases "Nokogiri Releases"
-[nokogiriFails]: https://github.com/sparklemotion/nokogiri/issues/1456#issuecomment-206481794 "Nokogiri fails to install on Ruby 2.3 for Windows"
 
+---
+
+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].
 
-## Installation via RubyInstaller
+---
 
-RubyInstaller is a self-contained Windows-based installer that includes the Ruby language, an execution environment, important documentation, and more.
+[windows-installjekyll3]: https://labs.sverrirs.com/jekyll/
+[fastjekyll-autoinstall]: https://github.com/KeJunMao/fastjekyll#autoinstall-jekyll-for-windows
 
-1. Install a package manager for Windows called [RubyInstaller](https://rubyinstaller.org/).
-2. Install Jekyll and Bundler via a command prompt window: `gem install jekyll bundler`
-3. Check if the installation is accessible: `jekyll -v`
 
-Optionally you can use [Autoinstall Jekyll for Windows](https://github.com/KeJunMao/fastjekyll#autoinstall-jekyll-for-windows).
+## Encoding
+
+If you use UTF-8 encoding, make sure that no `BOM` header characters exist in your files or very, very bad things will happen to
+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
+```
 
 
 ## 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.
 
-Jekyll now uses a rubygem to internally configure Timezone based on established [IANA Timezone Database](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
+Jekyll now uses a rubygem to internally configure Timezone based on established [IANA Timezone Database][IANA-database].
 While 'new' blogs created with Jekyll v3.4 and greater, will have the following added to their 'Gemfile' by default, existing sites *will* have to update their 'Gemfile' (and installed) to enable development on Windows:
 
 ```ruby
@@ -187,11 +202,14 @@ While 'new' blogs created with Jekyll v3.4 and greater, will have the following
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 ```
 
+[IANA-database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+
+
 ## 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 requires an extra gem for compatibility
-with Windows. Add the following to the Gemfile for your site:
+
+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.
+
+Add the following to the Gemfile for your site if you have issues with auto-regeneration on Windows alone:
 
 ```ruby
 gem 'wdm', '~> 0.1.0' if Gem.win_platform?

From e3917b6fa28bec6b98eec9cb6380cc353d0dccf3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 18 Jun 2017 16:10:48 -0400
Subject: [PATCH 2217/4996] Update history to reflect merge of #6153 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2a636f8c303..31d3a35b449 100644
--- a/History.markdown
+++ b/History.markdown
@@ -86,6 +86,7 @@
   * add documentation about the "pinned" label (#6147)
   * docs(JekyllOnWindows): Add a new Installation way (#6141)
   * corrected windows.md (#6149)
+  * Refine documentation for Windows (#6153)
 
 ### Development Fixes
 

From 9f302b34ae6a56b415aaef9f4e30495d5210af1b Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sun, 18 Jun 2017 18:15:48 -0400
Subject: [PATCH 2218/4996] Release post for Jekyll v3.5 (#6144)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add draft of release post for Jekyll v3.5

* add a few details about Liquid 4

* remove @ashmaroli doppelgânger

* change layout: nil to layout: null
---
 .../2017-06-14-jekyll-3-5-0-released.markdown | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 docs/_posts/2017-06-14-jekyll-3-5-0-released.markdown

diff --git a/docs/_posts/2017-06-14-jekyll-3-5-0-released.markdown b/docs/_posts/2017-06-14-jekyll-3-5-0-released.markdown
new file mode 100644
index 00000000000..54d1aed77df
--- /dev/null
+++ b/docs/_posts/2017-06-14-jekyll-3-5-0-released.markdown
@@ -0,0 +1,38 @@
+---
+title: 'Jekyll turns 3.5, oh my!'
+date: 2017-06-15 17:32:32 -0400
+author: parkr
+version: 3.5.0
+categories: [release]
+---
+
+Good news! Nearly 400 commits later, Jekyll 3.5.0 has been released into
+the wild. Some new shiny things you might want to test out:
+
+- Jekyll now uses Liquid 4, the latest! It comes with whitespace control, new filters `concat` annd `compact`, loop performance improvements and [many fixes](https://github.com/Shopify/liquid/blob/master/History.md#400--2016-12-14--branch-4-0-stable)
+- Themes can specify runtime dependencies (in their gemspecs) and we'll require those. This makes it easier for theme writers to use plugins.
+- Speaking of themes, we'll properly handle the discrepancy between a convertible file in the local site and a static file in the theme. Overriding a file locally now doesn't matter if it's convertible or static.
+- Pages, posts, and other documents can now access layout variables via `{% raw %}{{ layout }}{% endraw %}`.
+- The `gems` key in the `_config.yml` is now `plugins`. This is backwards-compatible, as Jekyll will gracefully upgrade `gems` to `plugins` if you use the former.
+- Filters like `sort` now allow you to sort based on a subvalue, e.g. `{% raw %}{% assign sorted = site.posts | sort: "image.alt_text" %}{% endraw %}`.
+- You can now create tab-separated data files.
+- Using `layout: none` will now produce a file with no layout. Equivalent to `layout: null`, with the exception that `none` is a truthy value and won't be overwritten by front matter defaults.
+- No more pesky errors if your URL contains a colon (sorry about those!)
+- We now automatically exclude the `Gemfile` from the site manifest when compiling your site. No more `_site/Gemfile`!
+- We fixed a bug where abbreviated post dates were ignored, e.g. `_posts/2016-4-4-april-fourth.md`.
+
+And [so much more!](/docs/history/)
+
+There was a huge amount of effort put into this release by our maintainers,
+especially @pathawks, @DirtyF, and @pup. Huge thanks to them for ushering
+this release along and keeping the contributions flowing! Jekyll wouldn't
+work without the tireless dedication of our team captains & maintainers.
+Thank you, all!
+
+A huge thanks as well to our contributors to this release: Adam Hollett, Aleksander Kuś, Alfred Myers, Anatoliy Yastreb, Antonio Argote, Ashton Hellwig, Ashwin Maroli, Ben Balter, BlueberryFoxtrot, Brent Yi, Chris Finazzo, Christoph Päper, Christopher League, Chun Fei Lung, Colin, David Zhang, Eric Leong, Finn Ellis, Florian Thomas, Frank Taillandier, Hendrik Schneider, Henry Kobin, Ivan Storck, Jakub Klímek, Jan Pobořil, Jeff Puckett, Jonathan Hooper, Kaligule, Kevin Funk, Krzysztof Szafranek, Liu Cheng, Lukasz Brodowski, Marc Bruins, Marcelo Canina, Martin Desrumaux, Mer, Nate, Oreonax, Parker Moore, Pat Hawks, Pedro Lamas, Phil Nash, Ricardo N Feliciano, Ricky Han, Roger Sheen, Ryan Lue, Ryan Streur, Shane Neuville, Sven Meyer, Tom Johnson, William Entriken, Yury V. Zaytsev, Zarino Zappia, dyang, jekylltools, sean delaney, zenHeart
+
+Please file any bugs with detailed replication instructions if you find any
+bugs. Better yet, submit a patch if you find the bug in the code and know
+how to fix it! :heart:
+
+Happy Jekylling! :tada:

From 22072235598838311eb14d26f3aeebf39d435234 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sat, 17 Jun 2017 21:42:59 -0400
Subject: [PATCH 2219/4996] Bump to v3.4.4

---
 History.markdown      | 4 ++++
 lib/jekyll/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/History.markdown b/History.markdown
index 31d3a35b449..273193e609a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -142,6 +142,10 @@
 
   * Filters#time helper: Duplicate time before calling #localtime. (#5996)
 
+## 3.4.4 / 2016-06-17
+
+  * Backport #6137 for v3.4.x: Default `baseurl` to `nil` instead of empty string (#6146)
+
 ## 3.4.3 / 2017-03-21
 
   * Backport #5957 for v3.4.x: Allow colons in `uri_escape` filter (#5968)
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 1c4a0b96025..23ea0c2cf7a 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.4.3".freeze
+  VERSION = "3.4.4".freeze
 end

From 9eba49cd61dec8e72157a129e9fe9bb38ab4054d Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sun, 18 Jun 2017 18:40:35 -0400
Subject: [PATCH 2220/4996] Release :gem: 3.5.0

---
 History.markdown        |   5 +-
 docs/_docs/history.md   | 153 ++++++++++++++++++++++++++++++++++++++++
 docs/latest_version.txt |   2 +-
 lib/jekyll/version.rb   |   2 +-
 4 files changed, 156 insertions(+), 6 deletions(-)

diff --git a/History.markdown b/History.markdown
index 273193e609a..13997d04e69 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,4 +1,4 @@
-## HEAD
+## 3.5.0 / 2017-06-18
 
 ### Minor Enhancements
 
@@ -137,9 +137,6 @@
   * add test to ensure variables work in `where_exp` condition (#5315)
   * Read explicitly included dot-files in collections. (#6092)
   * Default `baseurl` to `nil` instead of empty string (#6137)
-
-### fix
-
   * Filters#time helper: Duplicate time before calling #localtime. (#5996)
 
 ## 3.4.4 / 2016-06-17
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index c67f978ab08..de5dc4d822d 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,159 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.5.0 / 2017-06-18
+{: #v3-5-0}
+
+### Minor Enhancements
+{: #minor-enhancements-v3-5-0}
+
+- Upgrade to Liquid v4 ([#4362]({{ site.repository }}/issues/4362))
+- Convert StaticFile liquid representation to a Drop & add front matter defaults support to StaticFiles ([#5871]({{ site.repository }}/issues/5871))
+- Add support for Tab-Separated Values data files (`*.tsv`) ([#5985]({{ site.repository }}/issues/5985))
+- Specify version constraint in subcommand error message. ([#5974]({{ site.repository }}/issues/5974))
+- Add a template for custom 404 page ([#5945]({{ site.repository }}/issues/5945))
+- Require `runtime_dependencies` of a Gem-based theme from its `.gemspec` file ([#5914]({{ site.repository }}/issues/5914))
+- Don't raise an error if URL contains a colon ([#5889]({{ site.repository }}/issues/5889))
+- Date filters should never raise an exception ([#5722]({{ site.repository }}/issues/5722))
+- add `plugins` config key as replacement for `gems` ([#5130]({{ site.repository }}/issues/5130))
+- create configuration from options only once in the boot process ([#5487]({{ site.repository }}/issues/5487))
+- Add option to fail a build with front matter syntax errors ([#5832]({{ site.repository }}/issues/5832))
+- Disable default layouts for documents with a `layout: none` declaration ([#5933]({{ site.repository }}/issues/5933))
+- In `jekyll new`, make copied site template user-writable ([#6072]({{ site.repository }}/issues/6072))
+- Add top-level `layout` liquid variable to Documents ([#6073]({{ site.repository }}/issues/6073))
+- Address reading non-binary static files in themes ([#5918]({{ site.repository }}/issues/5918))
+- Allow filters to sort & select based on subvalues ([#5622]({{ site.repository }}/issues/5622))
+- Add strip_index filter ([#6075]({{ site.repository }}/issues/6075))
+
+### Documentation
+
+- Install troubleshooting on Ubuntu ([#5817]({{ site.repository }}/issues/5817))
+- Add Termux section on troubleshooting ([#5837]({{ site.repository }}/issues/5837))
+- fix ial css classes in theme doc ([#5876]({{ site.repository }}/issues/5876))
+- Update installation.md ([#5880]({{ site.repository }}/issues/5880))
+- Update Aerobatic docs ([#5883]({{ site.repository }}/issues/5883))
+- Add note to collections doc on hard-coded collections. ([#5882]({{ site.repository }}/issues/5882))
+- Makes uri_escape template docs more specific. ([#5887]({{ site.repository }}/issues/5887))
+- Remove duplicate footnote_nr from default config ([#5891]({{ site.repository }}/issues/5891))
+- Fixed tutorial for publishing gem to include repo. ([#5900]({{ site.repository }}/issues/5900))
+- update broken links ([#5905]({{ site.repository }}/issues/5905))
+- Fix typo in contribution information ([#5910]({{ site.repository }}/issues/5910))
+- update plugin repo URL to reflect repo move ([#5916]({{ site.repository }}/issues/5916))
+- Update exclude array in configuration.md ([#5947]({{ site.repository }}/issues/5947))
+- Fixed path in "Improve this page" link in Tutorials section ([#5951]({{ site.repository }}/issues/5951))
+- Corrected permalink ([#5949]({{ site.repository }}/issues/5949))
+- Included more details about adding defaults to static files ([#5971]({{ site.repository }}/issues/5971))
+- Create buddyworks ([#5962]({{ site.repository }}/issues/5962))
+- added (buddyworks) to ci list ([#5965]({{ site.repository }}/issues/5965))
+- Add a tutorial on serving custom Error 404 page ([#5946]({{ site.repository }}/issues/5946))
+- add custom 404 to tutorial navigation ([#5978]({{ site.repository }}/issues/5978))
+- Add link to order of interpretation tutorial in Tutorials nav ([#5952]({{ site.repository }}/issues/5952))
+- Document Jekyll's Philosophy ([#5792]({{ site.repository }}/issues/5792))
+- Require Ruby > 2.1.0 ([#5983]({{ site.repository }}/issues/5983))
+- Fix broken link ([#5994]({{ site.repository }}/issues/5994))
+- Default options for script/proof ([#5995]({{ site.repository }}/issues/5995))
+- Mention Bash on Ubuntu on Windows ([#5960]({{ site.repository }}/issues/5960))
+- Document `--unpublished` flag introduced in 91e9ecf ([#5959]({{ site.repository }}/issues/5959))
+- Update upgrading.md to mention usage of `bundle update` ([#5604]({{ site.repository }}/issues/5604))
+- Fix missing quotation mark ([#6002]({{ site.repository }}/issues/6002))
+- New tutorial: Convert an HTML site to Jekyll ([#5881]({{ site.repository }}/issues/5881))
+- Revamp Permalink section ([#5912]({{ site.repository }}/issues/5912))
+- Fixup tutorial on creating theme from existing HTML templates ([#6006]({{ site.repository }}/issues/6006))
+- Standardise on "URLs" without apostrophe in docs ([#6018]({{ site.repository }}/issues/6018))
+- Added txtpen in tutorial ([#6021]({{ site.repository }}/issues/6021))
+- fix typo using past participle ([#6026]({{ site.repository }}/issues/6026))
+- changed formatting to fit the style of the documentation ([#6027]({{ site.repository }}/issues/6027))
+- doc fix typo word usage ([#6028]({{ site.repository }}/issues/6028))
+- corrected reference to layout in index.md ([#6032]({{ site.repository }}/issues/6032))
+- (Minor) Update MathJax CDN ([#6013]({{ site.repository }}/issues/6013))
+- Add MvvmCross to samples ([#6035]({{ site.repository }}/issues/6035))
+- Update travis-ci.md to correct procedure ([#6043]({{ site.repository }}/issues/6043))
+- fix sentence in documentation ([#6048]({{ site.repository }}/issues/6048))
+- rephrase a sentence in posts.md to be more direct ([#6049]({{ site.repository }}/issues/6049))
+- Compress Website Sass output ([#6009]({{ site.repository }}/issues/6009))
+- doc correct spelling error ([#6050]({{ site.repository }}/issues/6050))
+- adjusted date-format in sitemap ([#6053]({{ site.repository }}/issues/6053))
+- Typo fix (welcomed change -> welcome change). ([#6070]({{ site.repository }}/issues/6070))
+- Fixed documentation inconsistency ([#6068]({{ site.repository }}/issues/6068))
+- Add own plugin -> Jekyll Brand Social Wall ([#6064]({{ site.repository }}/issues/6064))
+- Added plugin jekyll-analytics ([#6042]({{ site.repository }}/issues/6042))
+- Use more precise language when explaining links ([#6078]({{ site.repository }}/issues/6078))
+- Update plugins.md ([#6088]({{ site.repository }}/issues/6088))
+- windows 10 tutorial ([#6100]({{ site.repository }}/issues/6100))
+- Explain how to override theme styles ([#6107]({{ site.repository }}/issues/6107))
+- updated Bash on Ubuntu on Windows link in tutorial ([#6111]({{ site.repository }}/issues/6111))
+- Fix wording in `_docs/templates.md` links section ([#6114]({{ site.repository }}/issues/6114))
+- Update windows.md ([#6115]({{ site.repository }}/issues/6115))
+- Added windows to docs.yml ([#6109]({{ site.repository }}/issues/6109))
+- 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))
+- 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))
+
+### Development Fixes
+{: #development-fixes-v3-5-0}
+
+- [Rubocop] add missing comma ([#5835]({{ site.repository }}/issues/5835))
+- Appease classifier-reborn ([#5934]({{ site.repository }}/issues/5934))
+- Allow releases & development on `*-stable` branches ([#5926]({{ site.repository }}/issues/5926))
+- Add script/backport-pr ([#5925]({{ site.repository }}/issues/5925))
+- Prefer .yaml over .toml ([#5966]({{ site.repository }}/issues/5966))
+- Fix Appveyor with DST-aware cucumber steps ([#5961]({{ site.repository }}/issues/5961))
+- Use Rubocop v0.47.1 till we're ready for v0.48 ([#5989]({{ site.repository }}/issues/5989))
+- Test against Ruby 2.4.0 ([#5687]({{ site.repository }}/issues/5687))
+- rubocop: lib/jekyll/renderer.rb complexity fixes ([#5052]({{ site.repository }}/issues/5052))
+- Use yajl-ruby 1.2.2 (now with 2.4 support) ([#6007]({{ site.repository }}/issues/6007))
+- Bump Rubocop to v0.48 ([#5997]({{ site.repository }}/issues/5997))
+- doc use example.com ([#6031]({{ site.repository }}/issues/6031))
+- fix typo ([#6040]({{ site.repository }}/issues/6040))
+- Fix CI  ([#6044]({{ site.repository }}/issues/6044))
+- Remove `ruby RUBY_VERSION` from generated Gemfile ([#5803]({{ site.repository }}/issues/5803))
+- Test if hidden collections output a document with a future date ([#6103]({{ site.repository }}/issues/6103))
+- Add test for uri_escape on reserved characters ([#6086]({{ site.repository }}/issues/6086))
+- Allow you to specify the rouge version via an environment variable for testing ([#6138]({{ site.repository }}/issues/6138))
+- Bump Rubocop to 0.49.1 ([#6093]({{ site.repository }}/issues/6093))
+- Lock nokogiri to 1.7.x for Ruby 2.1 ([#6140]({{ site.repository }}/issues/6140))
+
+### Site Enhancements
+{: #site-enhancements-v3-5-0}
+
+- Corrected date for version 3.4.0 ([#5842]({{ site.repository }}/issues/5842))
+- Add the correct year to the 3.4.0 release date ([#5858]({{ site.repository }}/issues/5858))
+- Add documentation about order of interpretation ([#5834]({{ site.repository }}/issues/5834))
+- Documentation on how to build navigation ([#5698]({{ site.repository }}/issues/5698))
+- Navigation has been moved out from docs ([#5927]({{ site.repository }}/issues/5927))
+- Make links in sidebar for current page more prominent ([#5820]({{ site.repository }}/issues/5820))
+- Update normalize.css to v6.0.0 ([#6008]({{ site.repository }}/issues/6008))
+- Docs: rename `gems` to `plugins` ([#6082]({{ site.repository }}/issues/6082))
+- plugins -> gems ([#6110]({{ site.repository }}/issues/6110))
+- Document difference between cgi_escape and uri_escape [#5970]({{ site.repository }}/issues/5970) ([#6081]({{ site.repository }}/issues/6081))
+
+### Bug Fixes
+{: #bug-fixes-v3-5-0}
+
+- Exclude Gemfile by default ([#5860]({{ site.repository }}/issues/5860))
+- Convertible#validate_permalink!: ensure the return value of data["permalink"] is a string before asking if it is empty ([#5878]({{ site.repository }}/issues/5878))
+- Allow abbreviated post dates ([#5920]({{ site.repository }}/issues/5920))
+- Remove dependency on include from default about.md ([#5903]({{ site.repository }}/issues/5903))
+- Allow colons in `uri_escape` filter ([#5957]({{ site.repository }}/issues/5957))
+- Re-surface missing public methods in `Jekyll::Document` ([#5975]({{ site.repository }}/issues/5975))
+- absolute_url should not mangle URL if called more than once ([#5789]({{ site.repository }}/issues/5789))
+- patch URLFilters to prevent `//` ([#6058]({{ site.repository }}/issues/6058))
+- add test to ensure variables work in `where_exp` condition ([#5315]({{ site.repository }}/issues/5315))
+- Read explicitly included dot-files in collections. ([#6092]({{ site.repository }}/issues/6092))
+- Default `baseurl` to `nil` instead of empty string ([#6137]({{ site.repository }}/issues/6137))
+- Filters#time helper: Duplicate time before calling #localtime. ([#5996]({{ site.repository }}/issues/5996))
+
+
+## 3.4.4 / 2016-06-17
+{: #v3-4-4}
+
+- Backport [#6137]({{ site.repository }}/issues/6137) for v3.4.x: Default `baseurl` to `nil` instead of empty string ([#6146]({{ site.repository }}/issues/6146))
+
+
 ## 3.4.3 / 2017-03-21
 {: #v3-4-3}
 
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index 6cb9d3dd0d6..1545d966571 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.4.3
+3.5.0
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 23ea0c2cf7a..0af816ca2ca 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.4.4".freeze
+  VERSION = "3.5.0".freeze
 end

From 5380b4fd8392a8ea7dc6f98adf087e3b8935579e Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sun, 18 Jun 2017 18:40:44 -0400
Subject: [PATCH 2221/4996] Release :gem: 3.5.0


From 0dcc7cb20e1440f4c40359bc936d868b65c330b7 Mon Sep 17 00:00:00 2001
From: "jaybe@jekyll" 
Date: Mon, 19 Jun 2017 06:52:58 -0500
Subject: [PATCH 2222/4996] Update reference to trouble with OS X/macOS (#6139)

Merge pull request 6139
---
 README.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.markdown b/README.markdown
index 60f11c471fc..9718f24d52b 100644
--- a/README.markdown
+++ b/README.markdown
@@ -22,9 +22,9 @@ Jekyll is a simple, blog-aware, static site generator perfect for personal, proj
 
 Jekyll does what you tell it to do — no more, no less. It doesn't try to outsmart users by making bold assumptions, nor does it burden them with needless complexity and configuration. Put simply, Jekyll gets out of your way and allows you to concentrate on what truly matters: your content.
 
-## Having trouble with OS X El Capitan?
+## Having trouble with OS X/macOS?
 
-See: https://jekyllrb.com/docs/troubleshooting/#jekyll-amp-mac-os-x-1011
+See: https://jekyllrb.com/docs/troubleshooting/
 
 ## Getting Started
 

From 056cebd16b0fb9c1e92ee5120a619df81d428d5b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 19 Jun 2017 07:52:59 -0400
Subject: [PATCH 2223/4996] Update history to reflect merge of #6139 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 13997d04e69..5d2727b1edd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,3 +1,9 @@
+## HEAD
+
+### Documentation
+
+  * Update reference to trouble with OS X/macOS (#6139)
+
 ## 3.5.0 / 2017-06-18
 
 ### Minor Enhancements

From 483951be7554ffbf34fa2a5842a4f9dd0ce2e002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20J=C3=A4schke?= 
Date: Mon, 19 Jun 2017 13:31:08 +0100
Subject: [PATCH 2224/4996] added BibSonomy plugin (#6143)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 653d37a2c6f..1da8eb1a2c0 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -873,6 +873,9 @@ LESS.js files during generation.
 - [Jekyll Download Tag](https://github.com/mattg/jekyll-download-tag): A Liquid tag that acts like `include`, but for external resources.
 - [Jekyll Brand Social Wall](https://github.com/MediaComem/jekyll-brand-social-wall): A jekyll plugin to generate a social wall with your favorite social networks
 - [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/).
+
 
 #### Collections
 

From 3a527bcecfba533bb0bf833cafb7d749c72bc1bc Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 19 Jun 2017 08:31:09 -0400
Subject: [PATCH 2225/4996] Update history to reflect merge of #6143 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5d2727b1edd..59870b01b62 100644
--- a/History.markdown
+++ b/History.markdown
@@ -3,6 +3,7 @@
 ### Documentation
 
   * Update reference to trouble with OS X/macOS (#6139)
+  * added BibSonomy plugin (#6143)
 
 ## 3.5.0 / 2017-06-18
 

From 82809bbc6d118f5d0d25ae9348f9fab86636efb2 Mon Sep 17 00:00:00 2001
From: Fadhil 
Date: Mon, 19 Jun 2017 20:32:37 +0800
Subject: [PATCH 2226/4996] add `plugins` for multiple page pagination (#6055)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 1da8eb1a2c0..f576e442622 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -754,6 +754,7 @@ LESS.js files during generation.
 - [AMP-Jekyll by Juuso Mikkonen](https://github.com/juusaw/amp-jekyll): Generate [Accelerated Mobile Pages](https://www.ampproject.org) of Jekyll posts.
 - [Jekyll Art Gallery plugin](https://github.com/alexivkin/Jekyll-Art-Gallery-Plugin): An advanced art/photo gallery generation plugin for creating galleries from a set of image folders. Supports image tagging, thumbnails, sorting, image rotation, post-processing (remove EXIF, add watermark), multiple collections and much more.
 - [jekyll-ga](https://github.com/developmentseed/jekyll-ga): A Jekyll plugin that downloads Google Analytics data and adds it to posts. Useful for making a site that lists "most popular" content. [Read the introduction](https://developmentseed.org/blog/google-analytics-jekyll-plugin/) post on the developmentSEED blog.
+- [jekyll-multi-paginate](https://github.com/fadhilnapis/jekyll-multi-paginate): Simple Jekyll paginator for multiple page. Ease you to make pagination on multiple page especially like multiple language.
 
 #### Converters
 

From ffbccb63bacc5654e4db11c6b2f482edfce2e565 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 19 Jun 2017 08:32:38 -0400
Subject: [PATCH 2227/4996] Update history to reflect merge of #6055 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 59870b01b62..85c0ef686d8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,7 @@
 
   * Update reference to trouble with OS X/macOS (#6139)
   * added BibSonomy plugin (#6143)
+  * add plugins for multiple page pagination (#6055)
 
 ## 3.5.0 / 2017-06-18
 

From 3a52866cced3abe4c379c1c30e4385b618d2d2cf Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 19 Jun 2017 17:45:13 +0200
Subject: [PATCH 2228/4996] Update History.markdown (#6156)

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

diff --git a/History.markdown b/History.markdown
index 85c0ef686d8..610f6ecc807 100644
--- a/History.markdown
+++ b/History.markdown
@@ -147,7 +147,7 @@
   * Default `baseurl` to `nil` instead of empty string (#6137)
   * Filters#time helper: Duplicate time before calling #localtime. (#5996)
 
-## 3.4.4 / 2016-06-17
+## 3.4.4 / 2017-06-17
 
   * Backport #6137 for v3.4.x: Default `baseurl` to `nil` instead of empty string (#6146)
 

From 0f0dab0239b3c9a8a7abc19c18bcb4b382e7c79a Mon Sep 17 00:00:00 2001
From: "James, please" 
Date: Wed, 21 Jun 2017 01:13:53 -0700
Subject: [PATCH 2229/4996] Update minimum Ruby version in installation.md
 (#6164)

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

diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index 5a8fc7a1286..659becc9603 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -14,7 +14,7 @@ Installing Jekyll should be straight-forward if all requirements are met.
 Before you start, make sure your system has the following:
 
 - GNU/Linux, Unix, or macOS
-- [Ruby](https://www.ruby-lang.org/en/downloads/) version 2.0 or above, including all development
+- [Ruby](https://www.ruby-lang.org/en/downloads/) version 2.1 or above, including all development
   headers
 - [RubyGems](https://rubygems.org/pages/download)
 - [GCC](https://gcc.gnu.org/install/) and [Make](https://www.gnu.org/software/make/) (in case your system doesn't have them installed, which you can check by running `gcc -v` and `make -v` in your system's command line interface)

From e24fd073fe7acf1fba441c151ceb68c00ed97e5f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 21 Jun 2017 04:13:54 -0400
Subject: [PATCH 2230/4996] Update history to reflect merge of #6164 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 610f6ecc807..27df087f8e3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -5,6 +5,7 @@
   * Update reference to trouble with OS X/macOS (#6139)
   * added BibSonomy plugin (#6143)
   * add plugins for multiple page pagination (#6055)
+  * Update minimum Ruby version in installation.md (#6164)
 
 ## 3.5.0 / 2017-06-18
 

From 285fe73b2e6f5b74875addb05577d609dc78452b Mon Sep 17 00:00:00 2001
From: Adam Voss 
Date: Wed, 21 Jun 2017 10:43:12 -0500
Subject: [PATCH 2231/4996] Add information about finding a collection in
 `site.collections` (#6165)

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

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index fa82e096324..43ff533f28c 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -309,6 +309,8 @@ you specified in your `_config.yml` (if present) and the following information:
   you have a _posts directory or not. This is something to note 
   when iterating through site.collections as you may need to 
   filter it out.
      
+  
      You may wish to use filters to find your collection:
+  {{ site.collections | where: "label", "myCollection" | first }}
      
 
    
 
 

From ca39b1525571ffc044bd3a8b7ba7159f63cd5d40 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 21 Jun 2017 11:43:13 -0400
Subject: [PATCH 2232/4996] Update history to reflect merge of #6165 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 27df087f8e3..c0887d26b5d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,7 @@
   * added BibSonomy plugin (#6143)
   * add plugins for multiple page pagination (#6055)
   * Update minimum Ruby version in installation.md (#6164)
+  * [docs] Add information about finding a collection in `site.collections` (#6165)
 
 ## 3.5.0 / 2017-06-18
 

From 7a853762467d410ca84e7570758ec19bcd0cb66f Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Wed, 21 Jun 2017 23:54:14 +0530
Subject: [PATCH 2233/4996] backward compatiblize URLFilters (#6163)

Merge pull request 6163
---
 lib/jekyll/filters/url_filters.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/jekyll/filters/url_filters.rb b/lib/jekyll/filters/url_filters.rb
index 80ffa850aba..783dad4a481 100644
--- a/lib/jekyll/filters/url_filters.rb
+++ b/lib/jekyll/filters/url_filters.rb
@@ -11,6 +11,7 @@ module URLFilters
       def absolute_url(input)
         return if input.nil?
         return input if Addressable::URI.parse(input).absolute?
+        site = @context.registers[:site]
         return relative_url(input).to_s if site.config["url"].nil?
         Addressable::URI.parse(site.config["url"] + relative_url(input)).normalize.to_s
       end
@@ -40,11 +41,8 @@ def strip_index(input)
 
       private
 
-      def site
-        @context.registers[:site]
-      end
-
       def sanitized_baseurl
+        site = @context.registers[:site]
         site.config["baseurl"].to_s.chomp("/")
       end
 

From 19a84584c99bfaaea5c4b33a78a485bf979d9eba Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 21 Jun 2017 14:24:16 -0400
Subject: [PATCH 2234/4996] Update history to reflect merge of #6163 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c0887d26b5d..ebc10c8b87a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,10 @@
   * Update minimum Ruby version in installation.md (#6164)
   * [docs] Add information about finding a collection in `site.collections` (#6165)
 
+### Bug Fixes
+
+  * Backward compatiblize URLFilters module (#6163)
+
 ## 3.5.0 / 2017-06-18
 
 ### Minor Enhancements

From f1410c7e239c0f2d1205e09968803b4b9db078b4 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 24 Jun 2017 18:31:58 +0200
Subject: [PATCH 2235/4996] run `jekyll doctor` to check the config (#6169)

Merge pull request 6169
---
 .github/ISSUE_TEMPLATE.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 77602bc6ea2..b1d43598e2c 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -18,6 +18,7 @@
 
 - [ ] I believe this to be a bug, not a question about using Jekyll.
 - [ ] I updated to the latest Jekyll (or) if on GitHub Pages to the latest `github-pages`
+- [ ] I ran `jekyll doctor` to check my configuration
 - [ ] I read the CONTRIBUTION file at https://jekyllrb.com/docs/contributing/
 - [ ] This is a feature request.
 

From 374de56062eaacda135e4d28c79ebc83acf76bf3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 24 Jun 2017 12:31:59 -0400
Subject: [PATCH 2236/4996] Update history to reflect merge of #6169 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ebc10c8b87a..9afe44cd787 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,10 @@
 
   * Backward compatiblize URLFilters module (#6163)
 
+### Development Fixes
+
+  * Add jekyll doctor to GitHub Issue Template (#6169)
+
 ## 3.5.0 / 2017-06-18
 
 ### Minor Enhancements

From 17c888dcab755f977f4b2940937f6260b645da75 Mon Sep 17 00:00:00 2001
From: Adam Voss 
Date: Sun, 25 Jun 2017 13:00:01 -0500
Subject: [PATCH 2237/4996] Add raw tags to prevent template rendering (#6179)

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

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index 43ff533f28c..6114e08ec9b 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -310,7 +310,7 @@ you specified in your `_config.yml` (if present) and the following information:
   when iterating through site.collections as you may need to 
   filter it out.
    
   
    You may wish to use filters to find your collection:
-  {{ site.collections | where: "label", "myCollection" | first }}
    
+  {% raw %}{{ site.collections | where: "label", "myCollection" | first }}{% endraw %}
    
 
    
 
 

From e836de3205888e6016e913a1b65d681000eb5eb7 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 25 Jun 2017 14:00:03 -0400
Subject: [PATCH 2238/4996] Update history to reflect merge of #6179 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9afe44cd787..fd2a7e73c6d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
   * add plugins for multiple page pagination (#6055)
   * Update minimum Ruby version in installation.md (#6164)
   * [docs] Add information about finding a collection in `site.collections` (#6165)
+  * Add {%raw%} to Liquid example on site (#6179)
 
 ### Bug Fixes
 

From 6aa8f741c9907482eb403f79502924dcbe547fc5 Mon Sep 17 00:00:00 2001
From: Doug Beney 
Date: Sun, 25 Jun 2017 18:39:05 -0400
Subject: [PATCH 2239/4996] Added improved Pug plugin - removed 404 Jade plugin
 (#6174)

Merge pull request 6174
---
 docs/_docs/plugins.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index f576e442622..d630b106cf6 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -758,10 +758,9 @@ LESS.js files during generation.
 
 #### Converters
 
+- [Pug plugin by Doug Beney](https://github.com/DougBeney/jekyll-pug): Pug (previously Jade) converter for Jekyll.
 - [Textile converter](https://github.com/jekyll/jekyll-textile-converter): Convert `.textile` files into HTML. Also includes the `textilize` Liquid filter.
 - [Slim plugin](https://github.com/slim-template/jekyll-slim): Slim converter and includes for Jekyll with support for Liquid tags.
-- [Jade plugin by John Papandriopoulos](https://github.com/snappylabs/jade-jekyll-plugin): Jade converter for Jekyll.
-- [Pug plugin by Josh Waller](https://github.com/mdxprograms/pug-jekyll-plugin): Pug (previously Jade) converter for Jekyll.
 - [HAML plugin by Sam Z](https://gist.github.com/517556): HAML converter for Jekyll.
 - [HAML-Sass Converter by Adam Pearson](https://gist.github.com/481456): Simple HAML-Sass converter for Jekyll. [Fork](https://gist.github.com/528642) by Sam X.
 - [Sass SCSS Converter by Mark Wolfe](https://gist.github.com/960150): Sass converter which uses the new CSS compatible syntax, based Sam X’s fork above.

From 605a14412db2f80c7b5f9198ee0879b358556098 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 25 Jun 2017 18:39:06 -0400
Subject: [PATCH 2240/4996] Update history to reflect merge of #6174 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fd2a7e73c6d..d61137ae9cf 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,5 +1,7 @@
 ## HEAD
 
+  * Added improved Pug plugin - removed 404 Jade plugin (#6174)
+
 ### Documentation
 
   * Update reference to trouble with OS X/macOS (#6139)

From 141b1afd509bec454db78c6c50f5dd2e2530dd01 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Mon, 26 Jun 2017 12:23:33 +0530
Subject: [PATCH 2241/4996] test with Ruby 2.4.1-1 on AppVeyor (#6176)

Merge pull request 6176
---
 appveyor.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 34f4d726b0d..b744534b89c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,13 +16,15 @@ install:
 environment:
   BUNDLE_WITHOUT: "benchmark:site:development"
   matrix:
-    - RUBY_FOLDER_VER: "23"
+    - RUBY_FOLDER_VER: "24"
       TEST_SUITE: "test"
-    - RUBY_FOLDER_VER: "23"
+    - RUBY_FOLDER_VER: "24"
       TEST_SUITE: "cucumber"
-    - RUBY_FOLDER_VER: "23"
+    - RUBY_FOLDER_VER: "24"
       TEST_SUITE: "default-site"
-    - RUBY_FOLDER_VER: "23-x64"
+    - RUBY_FOLDER_VER: "24-x64"
+      TEST_SUITE: "test"
+    - RUBY_FOLDER_VER: "23"
       TEST_SUITE: "test"
     - RUBY_FOLDER_VER: "22"
       TEST_SUITE: "test"

From 00cca72c7bc90b9c5c21b69ff556b80471a63f58 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 26 Jun 2017 02:53:34 -0400
Subject: [PATCH 2242/4996] Update history to reflect merge of #6176 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d61137ae9cf..cf1cdf13ac6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -18,6 +18,7 @@
 ### Development Fixes
 
   * Add jekyll doctor to GitHub Issue Template (#6169)
+  * Test with Ruby 2.4.1-1 on AppVeyor (#6176)
 
 ## 3.5.0 / 2017-06-18
 

From a0cf39524619566596ab93b209cbdc3280d2b16c Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Tue, 27 Jun 2017 00:51:09 +0100
Subject: [PATCH 2243/4996] set minimum requirement for jekyll-feed (#6184)

Merge pull request 6184
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 146100698ff..c8b4694f324 100644
--- a/Gemfile
+++ b/Gemfile
@@ -65,7 +65,7 @@ group :jekyll_optional_dependencies do
   gem "coderay", "~> 1.1.0"
   gem "jekyll-coffeescript"
   gem "jekyll-docs", :path => "../docs" if Dir.exist?("../docs") && ENV["JEKYLL_VERSION"]
-  gem "jekyll-feed"
+  gem "jekyll-feed", "~> 0.9"
   gem "jekyll-gist"
   gem "jekyll-paginate"
   gem "jekyll-redirect-from"

From 4f4d42444ac73174d857ad0a630e23d4ba8f41be Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 26 Jun 2017 19:51:10 -0400
Subject: [PATCH 2244/4996] Update history to reflect merge of #6184 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index cf1cdf13ac6..f9d91176ca1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
 
   * Add jekyll doctor to GitHub Issue Template (#6169)
   * Test with Ruby 2.4.1-1 on AppVeyor (#6176)
+  * set minimum requirement for jekyll-feed (#6184)
 
 ## 3.5.0 / 2017-06-18
 

From f91b614793710409b2f3efc6e0e7487552e3ab09 Mon Sep 17 00:00:00 2001
From: Ben Balter <282759+benbalter@users.noreply.github.com>
Date: Fri, 30 Jun 2017 21:51:55 -0400
Subject: [PATCH 2245/4996] Static files contain front matter default keys when
 to_liquid'd  (#6162)

Merge pull request 6162
---
 lib/jekyll/static_file.rb | 11 ++---------
 test/test_document.rb     |  6 ++++++
 test/test_static_file.rb  | 22 ++++++++++++++++++++++
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index beea9ddf99c..29d71cbe8e7 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -1,6 +1,6 @@
 module Jekyll
   class StaticFile
-    attr_reader :relative_path, :extname, :name
+    attr_reader :relative_path, :extname, :name, :data
 
     class << self
       # The cache of last modification times [path] -> mtime.
@@ -28,10 +28,7 @@ def initialize(site, base, dir, name, collection = nil)
       @collection = collection
       @relative_path = File.join(*[@dir, @name].compact)
       @extname = File.extname(@name)
-
-      data.default_proc = proc do |_, key|
-        site.frontmatter_defaults.find(relative_path, type, key)
-      end
+      @data = @site.frontmatter_defaults.all(relative_path, type)
     end
     # rubocop: enable ParameterLists
 
@@ -103,10 +100,6 @@ def to_liquid
       @to_liquid ||= Drops::StaticFileDrop.new(self)
     end
 
-    def data
-      @data ||= {}
-    end
-
     def basename
       File.basename(name, extname)
     end
diff --git a/test/test_document.rb b/test/test_document.rb
index 0c880a6b5b7..8726c83cd6a 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -132,6 +132,12 @@ def assert_equal_value(key, one, other)
       assert_equal "slide", @document.data["layout"]
       assert_equal({ "key"=>"myval" }, @document.data["nested"])
     end
+
+    should "return front matter defaults via to_liquid" do
+      hash = @document.to_liquid
+      assert hash.key? "nested"
+      assert_equal({ "key"=>"myval" }, hash["nested"])
+    end
   end
 
   context "a document as part of a collection with overridden default values" do
diff --git a/test/test_static_file.rb b/test/test_static_file.rb
index 1603420a8dd..49adc96b79f 100644
--- a/test/test_static_file.rb
+++ b/test/test_static_file.rb
@@ -109,6 +109,28 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
         "`published: false`")
     end
 
+    should "respect front matter defaults" do
+      defaults = [{
+        "scope"  => { "path" => "" },
+        "values" => { "front-matter" => "default" },
+      },]
+
+      static_file = setup_static_file_with_defaults "", "", "file.pdf", defaults
+      assert_equal "default", static_file.data["front-matter"]
+    end
+
+    should "include front matter defaults in to_liquid" do
+      defaults = [{
+        "scope"  => { "path" => "" },
+        "values" => { "front-matter" => "default" },
+      },]
+
+      static_file = setup_static_file_with_defaults "", "", "file.pdf", defaults
+      hash = static_file.to_liquid
+      assert hash.key? "front-matter"
+      assert_equal "default", hash["front-matter"]
+    end
+
     should "know its last modification time" do
       assert_equal Time.new.to_i, @static_file.mtime
     end

From 5c95201c9828b4aa4c7c293def3867c7d875ea25 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 30 Jun 2017 21:51:57 -0400
Subject: [PATCH 2246/4996] Update history to reflect merge of #6162 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f9d91176ca1..b7967a66051 100644
--- a/History.markdown
+++ b/History.markdown
@@ -14,6 +14,7 @@
 ### Bug Fixes
 
   * Backward compatiblize URLFilters module (#6163)
+  * Static files contain front matter default keys when to_liquid'd  (#6162)
 
 ### Development Fixes
 

From b089e440168ff4945cde0b1bcf63f814c5b7e016 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 30 Jun 2017 21:54:33 -0400
Subject: [PATCH 2247/4996] Move Bug Fixes to the top of the current HEAD's
 history.

---
 History.markdown | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/History.markdown b/History.markdown
index b7967a66051..13c5c478543 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,6 +1,9 @@
 ## HEAD
 
-  * Added improved Pug plugin - removed 404 Jade plugin (#6174)
+### Bug Fixes
+
+  * Backward compatiblize URLFilters module (#6163)
+  * Static files contain front matter default keys when `to_liquid`'d  (#6162)
 
 ### Documentation
 
@@ -10,11 +13,7 @@
   * Update minimum Ruby version in installation.md (#6164)
   * [docs] Add information about finding a collection in `site.collections` (#6165)
   * Add {%raw%} to Liquid example on site (#6179)
-
-### Bug Fixes
-
-  * Backward compatiblize URLFilters module (#6163)
-  * Static files contain front matter default keys when to_liquid'd  (#6162)
+  * Added improved Pug plugin - removed 404 Jade plugin (#6174)
 
 ### Development Fixes
 

From 9f7815786b68f853dfabb33293f494e4222c5c1b Mon Sep 17 00:00:00 2001
From: Ben Balter <282759+benbalter@users.noreply.github.com>
Date: Fri, 30 Jun 2017 21:58:25 -0400
Subject: [PATCH 2248/4996] Always normalize the result of the relative_url
 filter (#6185)

Merge pull request 6185
---
 lib/jekyll/filters/url_filters.rb | 4 ++--
 test/test_filters.rb              | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/filters/url_filters.rb b/lib/jekyll/filters/url_filters.rb
index 783dad4a481..53b4e253c4b 100644
--- a/lib/jekyll/filters/url_filters.rb
+++ b/lib/jekyll/filters/url_filters.rb
@@ -23,9 +23,9 @@ def absolute_url(input)
       # Returns a URL relative to the domain root as a String.
       def relative_url(input)
         return if input.nil?
-        return ensure_leading_slash(input.to_s) if sanitized_baseurl.nil?
+        parts = [sanitized_baseurl, input]
         Addressable::URI.parse(
-          ensure_leading_slash(sanitized_baseurl) + ensure_leading_slash(input.to_s)
+          parts.compact.map { |part| ensure_leading_slash(part.to_s) }.join
         ).normalize.to_s
       end
 
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 91ac386a5db..bb4aa79795b 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -491,6 +491,15 @@ def select; end
         })
         assert_equal "/", filter.relative_url(page_url)
       end
+
+      should "not return the url by reference" do
+        filter = make_filter_mock({ :baseurl => nil })
+        page = Page.new(filter.site, test_dir("fixtures"), "", "front_matter.erb")
+        assert_equal "/front_matter.erb", page.url
+        url = filter.relative_url(page.url)
+        url << "foo"
+        assert_equal "/front_matter.erb", page.url
+      end
     end
 
     context "strip_index filter" do

From 17370b5992c1d8b05b98e4b2b78c14dc0e1875f3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 30 Jun 2017 21:58:27 -0400
Subject: [PATCH 2249/4996] Update history to reflect merge of #6185 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 13c5c478543..636bbd61d52 100644
--- a/History.markdown
+++ b/History.markdown
@@ -21,6 +21,10 @@
   * Test with Ruby 2.4.1-1 on AppVeyor (#6176)
   * set minimum requirement for jekyll-feed (#6184)
 
+### fix
+
+  * Always normalize the result of the relative_url filter (#6185)
+
 ## 3.5.0 / 2017-06-18
 
 ### Minor Enhancements

From b0136fccfab51fd7885207fa79bc3dbf3f64c6f4 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 30 Jun 2017 21:59:02 -0400
Subject: [PATCH 2250/4996] Fix History entry for #6185

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

diff --git a/History.markdown b/History.markdown
index 636bbd61d52..ad7d76fd494 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,7 @@
 
   * Backward compatiblize URLFilters module (#6163)
   * Static files contain front matter default keys when `to_liquid`'d  (#6162)
+  * Always normalize the result of the `relative_url` filter (#6185)
 
 ### Documentation
 
@@ -21,10 +22,6 @@
   * Test with Ruby 2.4.1-1 on AppVeyor (#6176)
   * set minimum requirement for jekyll-feed (#6184)
 
-### fix
-
-  * Always normalize the result of the relative_url filter (#6185)
-
 ## 3.5.0 / 2017-06-18
 
 ### Minor Enhancements

From 409a36e6c0b441dc30555bee7c7a0f85c72d0df7 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 30 Jun 2017 22:18:50 -0400
Subject: [PATCH 2251/4996] Include v3.4.5 release notes in site and in
 History.markdown

---
 History.markdown      | 4 ++++
 docs/_docs/history.md | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/History.markdown b/History.markdown
index ad7d76fd494..7e3f89ff99c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -163,6 +163,10 @@
   * Default `baseurl` to `nil` instead of empty string (#6137)
   * Filters#time helper: Duplicate time before calling #localtime. (#5996)
 
+## 3.4.5 / 2017-06-30
+
+  * Backport #6185 for v3.4.x: Always normalize the result of the `relative_url` filter (#6186)
+
 ## 3.4.4 / 2017-06-17
 
   * Backport #6137 for v3.4.x: Default `baseurl` to `nil` instead of empty string (#6146)
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index de5dc4d822d..c2ba544a1e4 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -151,7 +151,13 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Filters#time helper: Duplicate time before calling #localtime. ([#5996]({{ site.repository }}/issues/5996))
 
 
-## 3.4.4 / 2016-06-17
+## 3.4.5 / 2017-06-30
+{: #v3-4-5}
+
+- Backport [#6185]({{ site.repository }}/issues/6185) for v3.4.x: Always normalize the result of the `relative_url` filter ([#6186]({{ site.repository }}/issues/6186))
+
+
+## 3.4.4 / 2017-06-17
 {: #v3-4-4}
 
 - Backport [#6137]({{ site.repository }}/issues/6137) for v3.4.x: Default `baseurl` to `nil` instead of empty string ([#6146]({{ site.repository }}/issues/6146))

From a641568da885b43b711e10156a94d343ed9dbc59 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 1 Jul 2017 20:25:50 +0200
Subject: [PATCH 2252/4996] Warn for deprecation message (#6192)

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

diff --git a/lib/jekyll/deprecator.rb b/lib/jekyll/deprecator.rb
index 5fa0c0ac8ba..e5574bdf952 100644
--- a/lib/jekyll/deprecator.rb
+++ b/lib/jekyll/deprecator.rb
@@ -38,7 +38,7 @@ def arg_is_present?(args, deprecated_argument, message)
     end
 
     def deprecation_message(message)
-      Jekyll.logger.error "Deprecation:", message
+      Jekyll.logger.warn "Deprecation:", message
     end
 
     def defaults_deprecate_type(old, current)

From e059a18ef0c5b041fa9b484d95ea975e985432cd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 1 Jul 2017 14:25:51 -0400
Subject: [PATCH 2253/4996] Update history to reflect merge of #6192 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7e3f89ff99c..a160dc0c64d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -22,6 +22,10 @@
   * Test with Ruby 2.4.1-1 on AppVeyor (#6176)
   * set minimum requirement for jekyll-feed (#6184)
 
+### Minor Enhancements
+
+  * Use Warn for deprecation messages (#6192)
+
 ## 3.5.0 / 2017-06-18
 
 ### Minor Enhancements

From 2253b9dd8548648d74bdc588e07bfc4897f5f6de Mon Sep 17 00:00:00 2001
From: Kevin Plattret 
Date: Sat, 1 Jul 2017 22:55:35 +0200
Subject: [PATCH 2254/4996] Small correction in documentation for includes
 (#6193)

Merge pull request 6193
---
 docs/_docs/includes.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/includes.md b/docs/_docs/includes.md
index ae6409cd5ee..b7eb17cc4a2 100644
--- a/docs/_docs/includes.md
+++ b/docs/_docs/includes.md
@@ -151,7 +151,7 @@ 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:
 
 ```liquid
-{% raw %}{% for person in {{ include.participants }} %}
+{% raw %}{% for person in include.participants %}
 {% if person.login_age == "new" %}
 {{ person.name }}
 {% endif %}
@@ -164,4 +164,4 @@ Now when you insert the `spotlight.html` include file, you can submit the YAML f
 {% raw %}{% include spotlight.html participants=site.data.profiles %}{% 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`.
+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`.

From 74373baa550282a8630368e7b609ca9370f6d560 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 1 Jul 2017 16:55:36 -0400
Subject: [PATCH 2255/4996] Update history to reflect merge of #6193 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a160dc0c64d..23506fe5ab2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -26,6 +26,10 @@
 
   * Use Warn for deprecation messages (#6192)
 
+### Site Enhancements
+
+  * Small correction in documentation for includes (#6193)
+
 ## 3.5.0 / 2017-06-18
 
 ### Minor Enhancements

From 735411e27f076a20e812cb6ece2fb316185daf7f Mon Sep 17 00:00:00 2001
From: Joshua Byrd 
Date: Sat, 8 Jul 2017 19:57:55 +1000
Subject: [PATCH 2256/4996] Linking the link (#6210)

Merge pull request 6210
---
 docs/_docs/continuous-integration/buddyworks.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/continuous-integration/buddyworks.md b/docs/_docs/continuous-integration/buddyworks.md
index 1dea8be53db..8729c7c8d86 100644
--- a/docs/_docs/continuous-integration/buddyworks.md
+++ b/docs/_docs/continuous-integration/buddyworks.md
@@ -12,7 +12,7 @@ title: "BuddyWorks"
 
 ## 1. Getting started
 
-1. Log in at https://buddy.works with your GitHub/Bitbucket account or email
+1. Log in at [https://buddy.works](https://buddy.works) with your GitHub/Bitbucket account or email
 2. Choose your Git provider and select or push your Jekyll Project
 3. Create a new pipeline and set the trigger mode to 'On every push'
 4. Add and configure the Jekyll action and save the pipeline

From e946bbf331487cbe62d04104cd8a6ff16ea70d8c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 8 Jul 2017 05:57:56 -0400
Subject: [PATCH 2257/4996] Update history to reflect merge of #6210 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 23506fe5ab2..90fe8317647 100644
--- a/History.markdown
+++ b/History.markdown
@@ -15,6 +15,7 @@
   * [docs] Add information about finding a collection in `site.collections` (#6165)
   * Add {%raw%} to Liquid example on site (#6179)
   * Added improved Pug plugin - removed 404 Jade plugin (#6174)
+  * Linking the link (#6210)
 
 ### Development Fixes
 

From 355436f1ee694c697a2525a8e3eed6b47d2b74c0 Mon Sep 17 00:00:00 2001
From: Coby Chapple 
Date: Sun, 9 Jul 2017 17:55:09 +0100
Subject: [PATCH 2258/4996] tweak page margin, and adjust mobile nav
 accordingly (#6214)

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

diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss
index 005781b6e12..7399c34ef66 100644
--- a/docs/_sass/_style.scss
+++ b/docs/_sass/_style.scss
@@ -22,6 +22,7 @@ body {
   -o-font-feature-settings: "kern" 1;
   font-feature-settings: "kern" 1;
   font-kerning: normal;
+  margin: 0;
 }
 
 .clear {
@@ -101,6 +102,7 @@ nav {
 }
 
 .mobile-nav {
+  padding: 0 5px;
 
   ul {
     overflow: hidden;

From fa2aa394d6eea2809fc48e26482d50bcce45a44b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 9 Jul 2017 12:55:10 -0400
Subject: [PATCH 2259/4996] Update history to reflect merge of #6214 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 90fe8317647..a623ceadd01 100644
--- a/History.markdown
+++ b/History.markdown
@@ -30,6 +30,7 @@
 ### Site Enhancements
 
   * Small correction in documentation for includes (#6193)
+  * Fix docs site page margin (#6214)
 
 ## 3.5.0 / 2017-06-18
 

From 59a42230c7c7f9f5da8361a6eafec603f6117cca Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 10 Jul 2017 15:46:48 +0200
Subject: [PATCH 2260/4996] Avoid deprecation message (#6045)

Merge pull request 6045
---
 lib/site_template/_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
index 8cb35c70e85..5cea6d25d54 100644
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -27,7 +27,7 @@ github_username:  jekyll
 # Build settings
 markdown: kramdown
 theme: minima
-gems:
+plugins:
   - jekyll-feed
 
 # Exclude from processing.

From c7d98cae2652b2df7ebd3c60b4f8c87950760e47 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 10 Jul 2017 09:46:49 -0400
Subject: [PATCH 2261/4996] Update history to reflect merge of #6045 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a623ceadd01..c5aae12b987 100644
--- a/History.markdown
+++ b/History.markdown
@@ -26,6 +26,7 @@
 ### Minor Enhancements
 
   * Use Warn for deprecation messages (#6192)
+  * site template: Use plugins key instead of gems  (#6045)
 
 ### Site Enhancements
 

From 848bd4edcc5152814a80a77c48cdf18fbd6d7bf0 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Mon, 17 Jul 2017 13:14:00 -0400
Subject: [PATCH 2262/4996] Release :gem: 3.5.1

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

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

From f904a7201e7a9a52a085b2bfcfcab35b68abe80c Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Tue, 18 Jul 2017 12:25:54 +0530
Subject: [PATCH 2263/4996] strip unnecessary leading whitespace (#6228)

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

diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index ce1d5e7fe11..8c5dd8f8344 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -81,7 +81,7 @@ def gemfile_contents
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-   gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-feed", "~> 0.6"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

From 33cb629079aeb9d8849002a54cc1b847165fa5f4 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 18 Jul 2017 02:55:56 -0400
Subject: [PATCH 2264/4996] Update history to reflect merge of #6228 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 59613ea8ff0..b7c465ed525 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,3 +1,9 @@
+## HEAD
+
+### Development Fixes
+
+  * Strip unnecessary leading whitespace in template (#6228)
+
 ## 3.5.1 / 2017-07-17
 
 ### Minor Enhancements

From 026f8280e0434be0b44e67b4d423b723c9306b5a Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Tue, 18 Jul 2017 12:59:33 +0530
Subject: [PATCH 2265/4996] Ignore final newline in folded YAML string (#6054)

Merge pull request 6054
---
 lib/site_template/_config.yml  |  2 +-
 test/source/_config_folded.yml |  8 ++++++++
 test/test_configuration.rb     | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 test/source/_config_folded.yml

diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
index 5cea6d25d54..f91333e5102 100644
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -15,7 +15,7 @@
 # in the templates via {{ site.myvariable }}.
 title: Your awesome title
 email: your-email@example.com
-description: > # this means to ignore newlines until "baseurl:"
+description: >- # this means to ignore newlines until "baseurl:"
   Write an awesome description for your new site here. You can edit this
   line in _config.yml. It will appear in your document head meta (for
   Google search results) and in your feed.xml site description.
diff --git a/test/source/_config_folded.yml b/test/source/_config_folded.yml
new file mode 100644
index 00000000000..9b0bfa4c2c5
--- /dev/null
+++ b/test/source/_config_folded.yml
@@ -0,0 +1,8 @@
+folded_string: >
+  This string of text will ignore
+  newlines till the next key.
+foo: bar
+clean_folded_string: >-
+  This string of text will ignore
+  newlines till the next key.
+baz: foo
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index c9988d163bc..50156926202 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -494,4 +494,36 @@ class TestConfiguration < JekyllUnitTest
       })
     end
   end
+
+  context "folded YAML string" do
+    setup do
+      @tester = Configuration.new
+    end
+
+    should "ignore newlines in that string entirely from a sample file" do
+      config = Jekyll.configuration(
+        @tester.read_config_file(
+          source_dir("_config_folded.yml")
+        )
+      )
+      assert_equal(
+        config["folded_string"],
+        "This string of text will ignore newlines till the next key.\n"
+      )
+      assert_equal(
+        config["clean_folded_string"],
+        "This string of text will ignore newlines till the next key."
+      )
+    end
+
+    should "ignore newlines in that string entirely from the template file" do
+      config = Jekyll.configuration(
+        @tester.read_config_file(
+          File.expand_path("../lib/site_template/_config.yml", File.dirname(__FILE__))
+        )
+      )
+      assert_includes config["description"], "an awesome description"
+      refute_includes config["description"], "\n"
+    end
+  end
 end

From 2b28f9fd57f2624b1c618fc7699c773ecb8de8da Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 18 Jul 2017 03:29:34 -0400
Subject: [PATCH 2266/4996] Update history to reflect merge of #6054 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b7c465ed525..5a832764383 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,10 @@
 
   * Strip unnecessary leading whitespace in template (#6228)
 
+### Minor Enhancements
+
+  * Ignore final newline in folded YAML string (#6054)
+
 ## 3.5.1 / 2017-07-17
 
 ### Minor Enhancements

From da65e947286542ea05a887e24979900947482122 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Tue, 18 Jul 2017 07:06:05 -0500
Subject: [PATCH 2267/4996] Add URL checks to Doctor (#5760)

Merge pull request 5760
---
 lib/jekyll/commands/doctor.rb | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb
index 59004c96049..5c235dac132 100644
--- a/lib/jekyll/commands/doctor.rb
+++ b/lib/jekyll/commands/doctor.rb
@@ -1,3 +1,5 @@
+require "addressable/uri"
+
 module Jekyll
   module Commands
     class Doctor < Command
@@ -36,6 +38,7 @@ def healthy?(site)
             !deprecated_relative_permalinks(site),
             !conflicting_urls(site),
             !urls_only_differ_by_case(site),
+            proper_site_url?(site),
           ].all?
         end
 
@@ -91,6 +94,15 @@ def urls_only_differ_by_case(site)
           urls_only_differ_by_case
         end
 
+        def proper_site_url?(site)
+          url = site.config["url"]
+          [
+            url_exists?(url),
+            url_valid?(url),
+            url_absolute(url),
+          ].all?
+        end
+
         private
         def collect_urls(urls, things, destination)
           things.each do |thing|
@@ -110,6 +122,29 @@ def case_insensitive_urls(things, destination)
             (memo[dest.downcase] ||= []) << dest
           end
         end
+
+        def url_exists?(url)
+          return true unless url.nil? || url.empty?
+          Jekyll.logger.warn "Warning:", "You didn't set an URL in the config file, "\
+              "you may encounter problems with some plugins."
+          false
+        end
+
+        def url_valid?(url)
+          Addressable::URI.parse(url)
+          true
+        rescue
+          Jekyll.logger.warn "Warning:", "The site URL does not seem to be valid, "\
+              "check the value of `url` in your config file."
+          false
+        end
+
+        def url_absolute(url)
+          return true if Addressable::URI.parse(url).absolute?
+          Jekyll.logger.warn "Warning:", "Your site URL does not seem to be absolute, "\
+              "check the value of `url` in your config file."
+          false
+        end
       end
     end
   end

From c2b240e9b5a79c59c250c51a36596d47b406c363 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 18 Jul 2017 08:06:07 -0400
Subject: [PATCH 2268/4996] Update history to reflect merge of #5760 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5a832764383..44f0a935073 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
 ### Minor Enhancements
 
   * Ignore final newline in folded YAML string (#6054)
+  * Add URL checks to Doctor (#5760)
 
 ## 3.5.1 / 2017-07-17
 

From c0c1185c56a3ee6e10ef892036d9e0eee2cb3864 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Tue, 18 Jul 2017 17:41:23 +0530
Subject: [PATCH 2269/4996] deprecator.rb: fix typo for --serve command (#6229)

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

diff --git a/lib/jekyll/deprecator.rb b/lib/jekyll/deprecator.rb
index e5574bdf952..ca2b8b3f74a 100644
--- a/lib/jekyll/deprecator.rb
+++ b/lib/jekyll/deprecator.rb
@@ -5,7 +5,7 @@ module Deprecator
     def process(args)
       arg_is_present? args, "--server", "The --server command has been replaced by the \
                           'serve' subcommand."
-      arg_is_present? args, "--serve", "The --server command has been replaced by the \
+      arg_is_present? args, "--serve", "The --serve command has been replaced by the \
                           'serve' subcommand."
       arg_is_present? args, "--no-server", "To build Jekyll without launching a server, \
                           use the 'build' subcommand."
@@ -46,6 +46,5 @@ def defaults_deprecate_type(old, current)
       Jekyll.logger.warn "Defaults:", "Please update your front-matter defaults to use \
                         'type: #{current}'."
     end
-
   end
 end

From 56546a28fda95098c44b31090050db0f415be574 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 18 Jul 2017 08:11:25 -0400
Subject: [PATCH 2270/4996] Update history to reflect merge of #6229 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 44f0a935073..74379b02988 100644
--- a/History.markdown
+++ b/History.markdown
@@ -9,6 +9,10 @@
   * Ignore final newline in folded YAML string (#6054)
   * Add URL checks to Doctor (#5760)
 
+### Bug Fixes
+
+  * deprecator.rb: fix typo for --serve command (#6229)
+
 ## 3.5.1 / 2017-07-17
 
 ### Minor Enhancements

From a54906c78a9c14e960457553177c4325a2b903f8 Mon Sep 17 00:00:00 2001
From: Maciej Bembenista 
Date: Mon, 24 Jul 2017 11:55:06 +0200
Subject: [PATCH 2271/4996] Update custom-404-page.md - fix a typo (#6218)

Merge pull request 6218
---
 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 40bb3262752..2512618e2ef 100644
--- a/docs/_tutorials/custom-404-page.md
+++ b/docs/_tutorials/custom-404-page.md
@@ -53,7 +53,7 @@ More info on configuring Apache Error Pages can found in [official documentation
 
 The procedure is just as simple as configuring Apache servers, but slightly different.
 
-Add the following to the ngnix configuration file, `nginx.conf`, which is usually located inside `/etc/nginx/` or `/etc/nginx/conf/`:
+Add the following to the nginx configuration file, `nginx.conf`, which is usually located inside `/etc/nginx/` or `/etc/nginx/conf/`:
 
 ```
 server {

From 1a592c57575a8986ae8b106b9e4c3eaff16754e6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 24 Jul 2017 05:55:07 -0400
Subject: [PATCH 2272/4996] Update history to reflect merge of #6218 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 74379b02988..b4d87a5e9d8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -13,6 +13,10 @@
 
   * deprecator.rb: fix typo for --serve command (#6229)
 
+### Documentation
+
+  * Update custom-404-page.md - fix a typo (#6218)
+
 ## 3.5.1 / 2017-07-17
 
 ### Minor Enhancements

From e25c4af59066169d0e10056866759911198087c6 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell 
Date: Mon, 24 Jul 2017 05:02:24 -0500
Subject: [PATCH 2273/4996] Users should be installing patch versions. (#6198)

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

diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index 8c5dd8f8344..a3a850febbf 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -70,7 +70,7 @@ def gemfile_contents
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "#{Jekyll::VERSION}"
+gem "jekyll", "~> #{Jekyll::VERSION}"
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 gem "minima", "~> 2.0"

From 66c39d3bf91d9a6fedc639be9095a532ea8b8cb3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 24 Jul 2017 06:02:25 -0400
Subject: [PATCH 2274/4996] Update history to reflect merge of #6198 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b4d87a5e9d8..bea49764f70 100644
--- a/History.markdown
+++ b/History.markdown
@@ -3,6 +3,7 @@
 ### Development Fixes
 
   * Strip unnecessary leading whitespace in template (#6228)
+  * Users should be installing patch versions. (#6198)
 
 ### Minor Enhancements
 

From 00a1d70e8f7f1f47b5b1d3640632e9c4eab99ac0 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Tue, 25 Jul 2017 15:58:17 +0530
Subject: [PATCH 2275/4996] fix tests (#6240)

Merge pull request 6240
---
 test/test_new_command.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_new_command.rb b/test/test_new_command.rb
index a02f1565770..6a448eec011 100644
--- a/test/test_new_command.rb
+++ b/test/test_new_command.rb
@@ -34,7 +34,7 @@ def site_template
       refute_exist @full_path
       capture_output { Jekyll::Commands::New.process(@args) }
       assert_exist gemfile
-      assert_match(%r!gem "jekyll", "#{Jekyll::VERSION}"!, File.read(gemfile))
+      assert_match(%r!gem "jekyll", "~> #{Jekyll::VERSION}"!, File.read(gemfile))
       assert_match(%r!gem "github-pages"!, File.read(gemfile))
     end
 

From 819491b99c5953453a025507279760bb91b00983 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 25 Jul 2017 06:28:18 -0400
Subject: [PATCH 2276/4996] Update history to reflect merge of #6240 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index bea49764f70..22566692e2f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,7 @@
 
   * Strip unnecessary leading whitespace in template (#6228)
   * Users should be installing patch versions. (#6198)
+  * fix tests (#6240)
 
 ### Minor Enhancements
 

From ec84bec6d60ce2a6d475054395fce2b1253dbff3 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon 
Date: Tue, 25 Jul 2017 23:22:40 +0100
Subject: [PATCH 2277/4996] Fix serving files that clash with directories
 (#6231)

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

diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb
index 3ae5cf32367..2e20ace81d5 100644
--- a/lib/jekyll/commands/serve/servlet.rb
+++ b/lib/jekyll/commands/serve/servlet.rb
@@ -22,7 +22,7 @@ def initialize(server, root, callbacks)
 
         def search_file(req, res, basename)
           # /file.* > /file/index.html > /file.html
-          super || super(req, res, "#{basename}.html")
+          super || super(req, res, ".html") || super(req, res, "#{basename}.html")
         end
 
         # rubocop:disable Style/MethodName

From 897cdbb4276ae931e87f9198eb3e050209408921 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 25 Jul 2017 18:22:41 -0400
Subject: [PATCH 2278/4996] Update history to reflect merge of #6231 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 22566692e2f..0dc2ac1528c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -10,6 +10,7 @@
 
   * Ignore final newline in folded YAML string (#6054)
   * Add URL checks to Doctor (#5760)
+  * Fix serving files that clash with directories (#6222) (#6231)
 
 ### Bug Fixes
 

From 188bc71713b84a9266597d863aff4315d68de8f2 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 25 Jul 2017 18:23:02 -0400
Subject: [PATCH 2279/4996] Reader#read_directories: guard against an entry not
 being a directory (#6226)

Merge pull request 6226
---
 lib/jekyll/reader.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index cdd45ab0f74..903e36d3a48 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -39,6 +39,8 @@ def sort_files!
     def read_directories(dir = "")
       base = site.in_source_dir(dir)
 
+      return unless File.directory?(base)
+
       dot = Dir.chdir(base) { filter_entries(Dir.entries("."), base) }
       dot_dirs = dot.select { |file| File.directory?(@site.in_source_dir(base, file)) }
       dot_files = (dot - dot_dirs)

From 7b255baac2ba4acf64ae2a1e9bb4213fca44b12d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 25 Jul 2017 18:23:04 -0400
Subject: [PATCH 2280/4996] Update history to reflect merge of #6226 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0dc2ac1528c..403f076fa5c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -15,6 +15,7 @@
 ### Bug Fixes
 
   * deprecator.rb: fix typo for --serve command (#6229)
+  * Reader#read_directories: guard against an entry not being a directory (#6226)
 
 ### Documentation
 

From 93169f60c32ada3822db8f5e61ef886bb9bd1d9f Mon Sep 17 00:00:00 2001
From: Joshua Byrd 
Date: Wed, 26 Jul 2017 08:23:38 +1000
Subject: [PATCH 2281/4996] Adding DevKit helpers (#6225)

Merge pull request 6225
---
 docs/_docs/windows.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index 6ebc33db065..9f21b6edf8b 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -212,5 +212,7 @@ As of v1.3.0, Jekyll uses the `listen` gem to watch for changes when the `--watc
 Add the following to the Gemfile for your site if you have issues with auto-regeneration on Windows alone:
 
 ```ruby
-gem 'wdm', '~> 0.1.0' if Gem.win_platform?
+gem 'wdm', '~> 0.1.1' if Gem.win_platform?
 ```
+
+You may first have to download and install the [Ruby DevKit](https://rubyinstaller.org/downloads/) by following [the instructions here](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit).

From 4493f2a58b9cf271c1278f17edb0baa09598e0b0 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 25 Jul 2017 18:23:39 -0400
Subject: [PATCH 2282/4996] Update history to reflect merge of #6225 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 403f076fa5c..d9019a93097 100644
--- a/History.markdown
+++ b/History.markdown
@@ -21,6 +21,10 @@
 
   * Update custom-404-page.md - fix a typo (#6218)
 
+### Site Enhancements
+
+  * Adding DevKit helpers (#6225)
+
 ## 3.5.1 / 2017-07-17
 
 ### Minor Enhancements

From 96724af03e947d3ea5bc9f403fa9a574dde1ec1b Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Wed, 26 Jul 2017 04:15:44 +0530
Subject: [PATCH 2283/4996] Bump supported Ruby version to >= 2.1.0 (#6220)

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

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 8fd62e81828..5ae9277f424 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.rubygems_version = "2.2.2"
-  s.required_ruby_version = ">= 2.0.0"
+  s.required_ruby_version = ">= 2.1.0"
 
   s.name          = "jekyll"
   s.version       = Jekyll::VERSION

From 8a017b5a2a2373d125a2dd87da58b2bfd7384916 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 25 Jul 2017 18:45:45 -0400
Subject: [PATCH 2284/4996] Update history to reflect merge of #6220 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d9019a93097..5bd903eed4c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
   * Ignore final newline in folded YAML string (#6054)
   * Add URL checks to Doctor (#5760)
   * Fix serving files that clash with directories (#6222) (#6231)
+  * Bump supported Ruby version to >= 2.1.0 (#6220)
 
 ### Bug Fixes
 

From 8f1959bbc40ec430105ed6b74b850ff2b19e9dfd Mon Sep 17 00:00:00 2001
From: Bogdan 
Date: Wed, 26 Jul 2017 02:20:20 +0300
Subject: [PATCH 2285/4996] Define path with __dir__ (#6087)

Merge pull request 6087
---
 Gemfile                      | 4 ++--
 Rakefile                     | 2 +-
 exe/jekyll                   | 2 +-
 jekyll.gemspec               | 2 +-
 lib/jekyll.rb                | 4 ++--
 lib/jekyll/commands/new.rb   | 2 +-
 lib/jekyll/commands/serve.rb | 2 +-
 script/console               | 4 ++--
 script/stackprof             | 4 ++--
 script/vendor-mimes          | 2 +-
 test/helper.rb               | 4 ++--
 test/test_convertible.rb     | 4 ++--
 test/test_new_command.rb     | 2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Gemfile b/Gemfile
index c8b4694f324..0306c71afc1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,8 +27,8 @@ group :test do
   gem "rspec"
   gem "rspec-mocks"
   gem "rubocop", "~> 0.49.1"
-  gem "test-dependency-theme", :path => File.expand_path("./test/fixtures/test-dependency-theme", File.dirname(__FILE__))
-  gem "test-theme", :path => File.expand_path("./test/fixtures/test-theme", File.dirname(__FILE__))
+  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__)
 
   gem "jruby-openssl" if RUBY_ENGINE == "jruby"
 end
diff --git a/Rakefile b/Rakefile
index 949e0fd8e76..c80324aba5d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,7 +4,7 @@ require "rdoc"
 require "date"
 require "yaml"
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
+$LOAD_PATH.unshift File.expand_path("lib", __dir__)
 require "jekyll/version"
 
 Dir.glob("rake/**.rake").each { |f| import f }
diff --git a/exe/jekyll b/exe/jekyll
index f0f41c93e6f..baac099791a 100755
--- a/exe/jekyll
+++ b/exe/jekyll
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 STDOUT.sync = true
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 
 require "jekyll"
 require "mercenary"
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 5ae9277f424..5ec2e9a25f6 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "jekyll/version"
 
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 25bbaa0a47e..5e5923c2bd1 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) # For use/testing when no gem is installed
+$LOAD_PATH.unshift __dir__ # For use/testing when no gem is installed
 
 # Require all of the Ruby files in the given directory.
 #
@@ -6,7 +6,7 @@
 #
 # Returns nothing.
 def require_all(path)
-  glob = File.join(File.dirname(__FILE__), path, "*.rb")
+  glob = File.join(__dir__, path, "*.rb")
   Dir[glob].sort.each do |f|
     require f
   end
diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index a3a850febbf..d1aeb5a0281 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -113,7 +113,7 @@ def create_sample_files(path)
         end
 
         def site_template
-          File.expand_path("../../site_template", File.dirname(__FILE__))
+          File.expand_path("../../site_template", __dir__)
         end
 
         def scaffold_path
diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 50a85fac9be..4bc9eaf0da8 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -234,7 +234,7 @@ def start_callback(detached)
 
         private
         def mime_types
-          file = File.expand_path("../mime.types", File.dirname(__FILE__))
+          file = File.expand_path("../mime.types", __dir__)
           WEBrick::HTTPUtils.load_mime_types(file)
         end
       end
diff --git a/script/console b/script/console
index 34ad6e8a30d..38ca96a111c 100755
--- a/script/console
+++ b/script/console
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'pry'
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w{ .. lib })
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 require 'jekyll'
 
-TEST_DIR = File.expand_path(File.join(File.dirname(__FILE__), *%w{ .. test }))
+TEST_DIR = File.expand_path("../test", __dir__)
 
 def fixture_site(overrides = {})
   Jekyll::Site.new(site_configuration(overrides))
diff --git a/script/stackprof b/script/stackprof
index e6e77f8d85f..12cbdd21138 100755
--- a/script/stackprof
+++ b/script/stackprof
@@ -3,10 +3,10 @@
 require "bundler/setup"
 require "json"
 require "stackprof"
-require File.expand_path("../../lib/jekyll", __FILE__)
+require File.expand_path("../lib/jekyll", __dir__)
 
 MODE = ARGV.first || "cpu"
-PROF_OUTPUT_FILE = File.expand_path("../../tmp/stackprof-#{MODE}-#{Time.now.strftime("%Y%m%d%H%M")}.dump", __FILE__)
+PROF_OUTPUT_FILE = File.expand_path("../tmp/stackprof-#{MODE}-#{Time.now.strftime("%Y%m%d%H%M")}.dump", __dir__)
 
 puts "Stackprof Mode: #{MODE}"
 
diff --git a/script/vendor-mimes b/script/vendor-mimes
index ea77923253e..6ea9c377a64 100755
--- a/script/vendor-mimes
+++ b/script/vendor-mimes
@@ -5,7 +5,7 @@
 require 'json'
 require 'open-uri'
 
-config = File.expand_path "../lib/jekyll/mime.types", File.dirname(__FILE__)
+config = File.expand_path "../lib/jekyll/mime.types", __dir__
 
 # Create an array of vendored mimetype => [extensions]
 mimes = {}
diff --git a/test/helper.rb b/test/helper.rb
index 74f2682e36b..83beaad3c1c 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -13,7 +13,7 @@ def jruby?
   require "simplecov"
   SimpleCov.start
 else
-  require File.expand_path("../simplecov_custom_profile", __FILE__)
+  require File.expand_path("simplecov_custom_profile", __dir__)
   SimpleCov.start "gem" do
     add_filter "/vendor/gem"
     add_filter "/vendor/bundle"
@@ -63,7 +63,7 @@ def refute_exist(filename, msg = nil)
 
 module DirectoryHelpers
   def root_dir(*subdirs)
-    File.join(File.dirname(File.dirname(__FILE__)), *subdirs)
+    File.expand_path(File.join("..", *subdirs), __dir__)
   end
 
   def dest_dir(*subdirs)
diff --git a/test/test_convertible.rb b/test/test_convertible.rb
index 6e6defa6519..ef70307062f 100644
--- a/test/test_convertible.rb
+++ b/test/test_convertible.rb
@@ -6,11 +6,11 @@ class TestConvertible < JekyllUnitTest
     setup do
       @convertible = OpenStruct.new(
         "site" => Site.new(Jekyll.configuration(
-          "source" => File.expand_path("../fixtures", __FILE__)
+          "source" => File.expand_path("fixtures", __dir__)
         ))
       )
       @convertible.extend Jekyll::Convertible
-      @base = File.expand_path("../fixtures", __FILE__)
+      @base = File.expand_path("fixtures", __dir__)
     end
 
     should "parse the front matter correctly" do
diff --git a/test/test_new_command.rb b/test/test_new_command.rb
index 6a448eec011..32db566d98b 100644
--- a/test/test_new_command.rb
+++ b/test/test_new_command.rb
@@ -9,7 +9,7 @@ def dir_contents(path)
   end
 
   def site_template
-    File.expand_path("../lib/site_template", File.dirname(__FILE__))
+    File.expand_path("../lib/site_template", __dir__)
   end
 
   context "when args contains a path" do

From 590dd6cf8090af943ca4d720d27a844cba8c0e5c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 25 Jul 2017 19:20:21 -0400
Subject: [PATCH 2286/4996] Update history to reflect merge of #6087 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5bd903eed4c..da42f8044bc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -5,6 +5,7 @@
   * Strip unnecessary leading whitespace in template (#6228)
   * Users should be installing patch versions. (#6198)
   * fix tests (#6240)
+  * Define path with __dir__ (#6087)
 
 ### Minor Enhancements
 

From 82c219a2e790becebd152927fcdaa9d11730f994 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Thu, 27 Jul 2017 05:39:33 +0530
Subject: [PATCH 2287/4996] exit site.process sooner (#6239)

Merge pull request 6239
---
 lib/jekyll/site.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 6476027577b..0bc3f1d577c 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -73,13 +73,11 @@ def process
       render
       cleanup
       write
-      print_stats
+      print_stats if config["profile"]
     end
 
     def print_stats
-      if @config["profile"]
-        puts @liquid_renderer.stats_table
-      end
+      puts @liquid_renderer.stats_table
     end
 
     # Reset Site details.

From 592daf4ce2fd305f5c3c6aefc4c83e08731f9492 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 26 Jul 2017 20:09:35 -0400
Subject: [PATCH 2288/4996] Update history to reflect merge of #6239 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index da42f8044bc..c8204ad70ad 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,7 @@
   * Users should be installing patch versions. (#6198)
   * fix tests (#6240)
   * Define path with __dir__ (#6087)
+  * exit site.process sooner (#6239)
 
 ### Minor Enhancements
 

From 143367c5ca801a152315ee2de6f4766c6ae1df55 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 28 Jul 2017 12:05:43 -0400
Subject: [PATCH 2289/4996] kramdown: symbolize keys in-place (#6247)

Merge pull request 6247
---
 .../converters/markdown/kramdown_parser.rb    | 12 +++-----
 test/test_kramdown.rb                         | 28 +++++++++++++++++--
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index a7252f1a689..d1f93c63f09 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -43,13 +43,9 @@ def convert(content)
 
         private
         def make_accessible(hash = @config)
-          proc_ = proc { |hash_, key| hash_[key.to_s] if key.is_a?(Symbol) }
-          hash.default_proc = proc_
-
-          hash.each do |_, val|
-            make_accessible val if val.is_a?(
-              Hash
-            )
+          hash.keys.each do |key|
+            hash[key.to_sym] = hash[key]
+            make_accessible(hash[key]) if hash[key].is_a?(Hash)
           end
         end
 
@@ -86,7 +82,7 @@ def highlighter
         private
         def strip_coderay_prefix(hash)
           hash.each_with_object({}) do |(key, val), hsh|
-            cleaned_key = key.gsub(%r!\Acoderay_!, "")
+            cleaned_key = key.to_s.gsub(%r!\Acoderay_!, "")
 
             if key != cleaned_key
               Jekyll::Deprecator.deprecation_message(
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index d8f886a4c1a..6396d67201b 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -20,11 +20,33 @@ class TestKramdown < JekyllUnitTest
           },
         },
       }
+      @kramdown_config_keys = @config["kramdown"].keys
+      @syntax_highlighter_opts_config_keys = \
+        @config["kramdown"]["syntax_highlighter_opts"].keys
 
       @config = Jekyll.configuration(@config)
-      @markdown = Converters::Markdown.new(
-        @config
-      )
+      @markdown = Converters::Markdown.new(@config)
+      @markdown.setup
+    end
+
+    should "fill symbolized keys into config for compatibility with kramdown" do
+      kramdown_config = @markdown.instance_variable_get(:@parser)
+        .instance_variable_get(:@config)
+
+      @kramdown_config_keys.each do |key|
+        assert kramdown_config.key?(key.to_sym),
+          "Expected #{kramdown_config} to include key #{key.to_sym.inspect}"
+      end
+
+      @syntax_highlighter_opts_config_keys.each do |key|
+        assert kramdown_config["syntax_highlighter_opts"].key?(key.to_sym),
+          "Expected #{kramdown_config["syntax_highlighter_opts"]} to include " \
+          "key #{key.to_sym.inspect}"
+      end
+
+      assert_equal kramdown_config["smart_quotes"], kramdown_config[:smart_quotes]
+      assert_equal kramdown_config["syntax_highlighter_opts"]["css"],
+        kramdown_config[:syntax_highlighter_opts][:css]
     end
 
     should "run Kramdown" do

From f8d06f20aa187eddeb8b8f6ab874116294065dfe Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 28 Jul 2017 12:05:45 -0400
Subject: [PATCH 2290/4996] Update history to reflect merge of #6247 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c8204ad70ad..16f58a61f45 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,10 @@
 
   * Adding DevKit helpers (#6225)
 
+### fix
+
+  * kramdown: symbolize keys in-place (#6247)
+
 ## 3.5.1 / 2017-07-17
 
 ### Minor Enhancements

From 12832af98ea74591394f4bb8d3edfc1cc03bc530 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 30 Jul 2017 20:32:25 +0200
Subject: [PATCH 2291/4996] docs: add missing backticks in History (#6255)

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

diff --git a/History.markdown b/History.markdown
index 16f58a61f45..1d2be0f23d8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -52,7 +52,7 @@
   * add plugins for multiple page pagination (#6055)
   * Update minimum Ruby version in installation.md (#6164)
   * [docs] Add information about finding a collection in `site.collections` (#6165)
-  * Add {%raw%} to Liquid example on site (#6179)
+  * Add `{% raw %}` to Liquid example on site (#6179)
   * Added improved Pug plugin - removed 404 Jade plugin (#6174)
   * Linking the link (#6210)
   * Small correction in documentation for includes (#6193)

From a6efa488836a31e35c6610167a4dcc3948b51afd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 30 Jul 2017 14:32:26 -0400
Subject: [PATCH 2292/4996] Update history to reflect merge of #6255 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1d2be0f23d8..6ff5006aaaa 100644
--- a/History.markdown
+++ b/History.markdown
@@ -23,6 +23,7 @@
 ### Documentation
 
   * Update custom-404-page.md - fix a typo (#6218)
+  * Docs: fix links to issues in History.markdown (#6255)
 
 ### Site Enhancements
 

From b35c0d860725a7e8e1f3a75101610d0085a92c5e Mon Sep 17 00:00:00 2001
From: Ben Balter <282759+benbalter@users.noreply.github.com>
Date: Sun, 30 Jul 2017 15:12:42 -0400
Subject: [PATCH 2293/4996] Call to_s on site.url before attempting to
 concatenate strings (#6253)

Merge pull request 6253
---
 lib/jekyll/filters/url_filters.rb |  4 +++-
 test/test_filters.rb              | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/filters/url_filters.rb b/lib/jekyll/filters/url_filters.rb
index 53b4e253c4b..6ededc956d1 100644
--- a/lib/jekyll/filters/url_filters.rb
+++ b/lib/jekyll/filters/url_filters.rb
@@ -13,7 +13,9 @@ def absolute_url(input)
         return input if Addressable::URI.parse(input).absolute?
         site = @context.registers[:site]
         return relative_url(input).to_s if site.config["url"].nil?
-        Addressable::URI.parse(site.config["url"] + relative_url(input)).normalize.to_s
+        Addressable::URI.parse(
+          site.config["url"].to_s + relative_url(input)
+        ).normalize.to_s
       end
 
       # Produces a URL relative to the domain root based on site.baseurl.
diff --git a/test/test_filters.rb b/test/test_filters.rb
index bb4aa79795b..e0eb2feee87 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -13,6 +13,16 @@ def initialize(opts = {})
     end
   end
 
+  class Value
+    def initialize(value)
+      @value = value
+    end
+
+    def to_s
+      @value.respond_to?(:call) ? @value.call : @value.to_s
+    end
+  end
+
   def make_filter_mock(opts = {})
     JekyllFilter.new(site_configuration(opts)).tap do |f|
       tz = f.site.config["timezone"]
@@ -423,6 +433,12 @@ def select; end
         page_url = "http://example.com/"
         assert_equal "http://example.com/", @filter.absolute_url(page_url)
       end
+
+      should "transform the input URL to a string" do
+        page_url = "/my-page.html"
+        filter = make_filter_mock({ "url" => Value.new(proc { "http://example.org" }) })
+        assert_equal "http://example.org#{page_url}", filter.absolute_url(page_url)
+      end
     end
 
     context "relative_url filter" do
@@ -500,6 +516,12 @@ def select; end
         url << "foo"
         assert_equal "/front_matter.erb", page.url
       end
+
+      should "transform the input baseurl to a string" do
+        page_url = "/my-page.html"
+        filter = make_filter_mock({ "baseurl" => Value.new(proc { "/baseurl/" }) })
+        assert_equal "/baseurl#{page_url}", filter.relative_url(page_url)
+      end
     end
 
     context "strip_index filter" do

From 34967978c2e9005a410242c8d1aa84ac190cdefb Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 30 Jul 2017 15:12:43 -0400
Subject: [PATCH 2294/4996] Update history to reflect merge of #6253 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6ff5006aaaa..96e36911d8d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -32,6 +32,7 @@
 ### fix
 
   * kramdown: symbolize keys in-place (#6247)
+  * Call to_s on site.url before attempting to concatenate strings (#6253)
 
 ## 3.5.1 / 2017-07-17
 

From 56436f46fe7a0c77a066695e54ca72373e248de0 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sun, 30 Jul 2017 19:20:21 -0400
Subject: [PATCH 2295/4996] Update History.markdown to unify Bug Fixes and fix

---
 History.markdown | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/History.markdown b/History.markdown
index 96e36911d8d..9ce8ae06983 100644
--- a/History.markdown
+++ b/History.markdown
@@ -13,27 +13,24 @@
   * Ignore final newline in folded YAML string (#6054)
   * Add URL checks to Doctor (#5760)
   * Fix serving files that clash with directories (#6222) (#6231)
-  * Bump supported Ruby version to >= 2.1.0 (#6220)
+  * Bump supported Ruby version to `>= 2.1.0` (#6220)
 
 ### Bug Fixes
 
-  * deprecator.rb: fix typo for --serve command (#6229)
-  * Reader#read_directories: guard against an entry not being a directory (#6226)
+  * `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)
 
 ### Documentation
 
-  * Update custom-404-page.md - fix a typo (#6218)
+  * Fix a typo in `custom-404-page.md` (#6218)
   * Docs: fix links to issues in History.markdown (#6255)
 
 ### Site Enhancements
 
   * Adding DevKit helpers (#6225)
 
-### fix
-
-  * kramdown: symbolize keys in-place (#6247)
-  * Call to_s on site.url before attempting to concatenate strings (#6253)
-
 ## 3.5.1 / 2017-07-17
 
 ### Minor Enhancements

From eac51ba1896c9fa1c4e59e4c1a07ba6e73da884c Mon Sep 17 00:00:00 2001
From: Sid Verma 
Date: Thu, 3 Aug 2017 18:10:14 +0530
Subject: [PATCH 2296/4996] Update deprecated gems key to plugins. (#6262)

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

diff --git a/docs/_docs/pagination.md b/docs/_docs/pagination.md
index b05b6bb21b9..c60b47e0360 100644
--- a/docs/_docs/pagination.md
+++ b/docs/_docs/pagination.md
@@ -9,7 +9,7 @@ multiple pages. Jekyll offers a pagination plugin, so you can automatically
 generate the appropriate files and folders you need for paginated listings.
 
 For Jekyll 3, include the `jekyll-paginate` plugin in your Gemfile and in
-your `_config.yml` under `gems`. For Jekyll 2, this is standard.
+your `_config.yml` under `plugins`. For Jekyll 2, this is standard.
 
 
    
   
    Pagination only works within HTML files
    

From f9f05e3f755b630041dad5ef460d790ff4e65820 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 3 Aug 2017 08:40:15 -0400
Subject: [PATCH 2297/4996] Update history to reflect merge of #6262 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9ce8ae06983..b7848fa8aca 100644
--- a/History.markdown
+++ b/History.markdown
@@ -26,6 +26,7 @@
 
   * Fix a typo in `custom-404-page.md` (#6218)
   * Docs: fix links to issues in History.markdown (#6255)
+  * Update deprecated gems key to plugins. (#6262)
 
 ### Site Enhancements
 

From 7cf5f51ca287aa5903eaec807f24c88ddfbd115a Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 3 Aug 2017 21:27:32 -0400
Subject: [PATCH 2298/4996] Enforce Style/FrozenStringLiteralComment. (#6265)

Merge pull request 6265
---
 .rubocop.yml                                              | 4 ++++
 Gemfile                                                   | 2 ++
 Rakefile                                                  | 2 ++
 exe/jekyll                                                | 2 ++
 features/step_definitions.rb                              | 2 ++
 features/support/formatter.rb                             | 2 ++
 features/support/helpers.rb                               | 5 ++++-
 jekyll.gemspec                                            | 1 +
 lib/jekyll.rb                                             | 7 +++++--
 lib/jekyll/cleaner.rb                                     | 2 ++
 lib/jekyll/collection.rb                                  | 2 ++
 lib/jekyll/command.rb                                     | 2 ++
 lib/jekyll/commands/build.rb                              | 2 ++
 lib/jekyll/commands/clean.rb                              | 2 ++
 lib/jekyll/commands/doctor.rb                             | 2 ++
 lib/jekyll/commands/help.rb                               | 2 ++
 lib/jekyll/commands/new.rb                                | 2 ++
 lib/jekyll/commands/new_theme.rb                          | 2 ++
 lib/jekyll/commands/serve.rb                              | 2 ++
 lib/jekyll/commands/serve/servlet.rb                      | 2 ++
 lib/jekyll/configuration.rb                               | 1 +
 lib/jekyll/converter.rb                                   | 2 ++
 lib/jekyll/converters/identity.rb                         | 2 ++
 lib/jekyll/converters/markdown.rb                         | 2 ++
 lib/jekyll/converters/markdown/rdiscount_parser.rb        | 2 ++
 lib/jekyll/converters/markdown/redcarpet_parser.rb        | 6 +++---
 lib/jekyll/converters/smartypants.rb                      | 2 ++
 lib/jekyll/convertible.rb                                 | 1 +
 lib/jekyll/deprecator.rb                                  | 2 ++
 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/static_file_drop.rb                      | 2 ++
 lib/jekyll/drops/unified_payload_drop.rb                  | 1 +
 lib/jekyll/drops/url_drop.rb                              | 1 +
 lib/jekyll/entry_filter.rb                                | 2 ++
 lib/jekyll/errors.rb                                      | 2 ++
 lib/jekyll/excerpt.rb                                     | 4 +++-
 lib/jekyll/external.rb                                    | 2 ++
 lib/jekyll/filters.rb                                     | 2 ++
 lib/jekyll/filters/grouping_filters.rb                    | 2 ++
 lib/jekyll/filters/url_filters.rb                         | 2 ++
 lib/jekyll/frontmatter_defaults.rb                        | 2 ++
 lib/jekyll/generator.rb                                   | 2 ++
 lib/jekyll/hooks.rb                                       | 2 ++
 lib/jekyll/layout.rb                                      | 2 ++
 lib/jekyll/liquid_extensions.rb                           | 2 ++
 lib/jekyll/liquid_renderer.rb                             | 2 ++
 lib/jekyll/liquid_renderer/file.rb                        | 2 ++
 lib/jekyll/liquid_renderer/table.rb                       | 8 +++++---
 lib/jekyll/log_adapter.rb                                 | 2 ++
 lib/jekyll/page.rb                                        | 2 ++
 lib/jekyll/plugin.rb                                      | 2 ++
 lib/jekyll/plugin_manager.rb                              | 2 ++
 lib/jekyll/publisher.rb                                   | 2 ++
 lib/jekyll/reader.rb                                      | 1 +
 lib/jekyll/readers/collection_reader.rb                   | 2 ++
 lib/jekyll/readers/data_reader.rb                         | 2 ++
 lib/jekyll/readers/layout_reader.rb                       | 2 ++
 lib/jekyll/readers/page_reader.rb                         | 2 ++
 lib/jekyll/readers/post_reader.rb                         | 2 ++
 lib/jekyll/readers/static_file_reader.rb                  | 2 ++
 lib/jekyll/readers/theme_assets_reader.rb                 | 2 ++
 lib/jekyll/regenerator.rb                                 | 2 ++
 lib/jekyll/related_posts.rb                               | 2 ++
 lib/jekyll/renderer.rb                                    | 1 +
 lib/jekyll/site.rb                                        | 1 +
 lib/jekyll/static_file.rb                                 | 2 ++
 lib/jekyll/stevenson.rb                                   | 2 ++
 lib/jekyll/tags/highlight.rb                              | 2 ++
 lib/jekyll/tags/include.rb                                | 1 +
 lib/jekyll/tags/link.rb                                   | 2 ++
 lib/jekyll/tags/post_url.rb                               | 2 ++
 lib/jekyll/theme.rb                                       | 2 ++
 lib/jekyll/theme_builder.rb                               | 2 ++
 lib/jekyll/url.rb                                         | 4 +++-
 lib/jekyll/utils.rb                                       | 7 ++++++-
 lib/jekyll/utils/exec.rb                                  | 2 ++
 lib/jekyll/utils/platforms.rb                             | 2 ++
 lib/jekyll/utils/win_tz.rb                                | 2 ++
 lib/jekyll/version.rb                                     | 2 ++
 lib/theme_template/Gemfile                                | 2 ++
 rake/docs.rake                                            | 2 ++
 rake/release.rake                                         | 2 ++
 rake/site.rake                                            | 2 ++
 .../test-dependency-theme/test-dependency-theme.gemspec   | 2 ++
 test/fixtures/test-theme/test-theme.gemspec               | 2 ++
 test/helper.rb                                            | 2 ++
 test/simplecov_custom_profile.rb                          | 2 ++
 test/source/_plugins/dummy.rb                             | 2 ++
 test/test_ansi.rb                                         | 2 ++
 test/test_cleaner.rb                                      | 2 ++
 test/test_coffeescript.rb                                 | 2 ++
 test/test_collections.rb                                  | 2 ++
 test/test_command.rb                                      | 2 ++
 test/test_commands_serve.rb                               | 2 ++
 test/test_configuration.rb                                | 2 ++
 test/test_convertible.rb                                  | 2 ++
 test/test_doctor_command.rb                               | 2 ++
 test/test_document.rb                                     | 2 ++
 test/test_drop.rb                                         | 2 ++
 test/test_entry_filter.rb                                 | 2 ++
 test/test_excerpt.rb                                      | 2 ++
 test/test_excerpt_drop.rb                                 | 2 ++
 test/test_filters.rb                                      | 1 +
 test/test_front_matter_defaults.rb                        | 2 ++
 test/test_generated_site.rb                               | 2 ++
 test/test_kramdown.rb                                     | 1 +
 test/test_layout_reader.rb                                | 2 ++
 test/test_liquid_extensions.rb                            | 2 ++
 test/test_liquid_renderer.rb                              | 2 ++
 test/test_log_adapter.rb                                  | 2 ++
 test/test_new_command.rb                                  | 2 ++
 test/test_page.rb                                         | 2 ++
 test/test_path_sanitization.rb                            | 2 ++
 test/test_plugin_manager.rb                               | 2 ++
 test/test_rdiscount.rb                                    | 2 ++
 test/test_redcarpet.rb                                    | 2 ++
 test/test_regenerator.rb                                  | 2 ++
 test/test_related_posts.rb                                | 2 ++
 test/test_sass.rb                                         | 2 ++
 test/test_site.rb                                         | 2 ++
 test/test_site_drop.rb                                    | 2 ++
 test/test_static_file.rb                                  | 2 ++
 test/test_tags.rb                                         | 1 +
 test/test_theme.rb                                        | 2 ++
 test/test_theme_assets_reader.rb                          | 2 ++
 test/test_url.rb                                          | 2 ++
 test/test_utils.rb                                        | 2 ++
 133 files changed, 264 insertions(+), 12 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index e5b26bccc9c..ea3aa1062fc 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -9,6 +9,7 @@ AllCops:
     - benchmark/**/*
     - script/**/*
     - vendor/**/*
+    - tmp/**/*
 Layout/AlignArray:
   Enabled: false
 Layout/AlignHash:
@@ -99,6 +100,9 @@ Style/BracesAroundHashParameters:
   Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  EnforcedStyle: always
 Style/Documentation:
   Enabled: false
   Exclude:
diff --git a/Gemfile b/Gemfile
index 0306c71afc1..0dcb47767d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 gemspec :name => "jekyll"
 
diff --git a/Rakefile b/Rakefile
index c80324aba5d..a7d50088d93 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rubygems"
 require "rake"
 require "rdoc"
diff --git a/exe/jekyll b/exe/jekyll
index baac099791a..07e13717771 100755
--- a/exe/jekyll
+++ b/exe/jekyll
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 STDOUT.sync = true
 
 $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index c22adb48667..29900491989 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Before do
   FileUtils.rm_rf(Paths.test_dir) if Paths.test_dir.exist?
   FileUtils.mkdir_p(Paths.test_dir) unless Paths.test_dir.directory?
diff --git a/features/support/formatter.rb b/features/support/formatter.rb
index 79d1466480f..745c74ec905 100644
--- a/features/support/formatter.rb
+++ b/features/support/formatter.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "fileutils"
 require "colorator"
 require "cucumber/formatter/console"
diff --git a/features/support/helpers.rb b/features/support/helpers.rb
index 118dd9cf925..36a726b4f00 100644
--- a/features/support/helpers.rb
+++ b/features/support/helpers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "fileutils"
 require "jekyll"
 require "time"
@@ -107,7 +109,8 @@ def run_in_shell(*args)
 
   File.write(Paths.status_file, p.exitstatus)
   File.open(Paths.output_file, "wb") do |f|
-    f.puts "$ " << args.join(" ")
+    f.print "$ "
+    f.puts args.join(" ")
     f.puts output
     f.puts "EXIT STATUS: #{p.exitstatus}"
   end
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 5ec2e9a25f6..87031a8000c 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 5e5923c2bd1..fb5db3d43e1 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift __dir__ # For use/testing when no gem is installed
 
 # Require all of the Ruby files in the given directory.
@@ -162,8 +164,9 @@ def sites
     def sanitized_path(base_directory, questionable_path)
       return base_directory if base_directory.eql?(questionable_path)
 
-      questionable_path.insert(0, "/") if questionable_path.start_with?("~")
-      clean_path = File.expand_path(questionable_path, "/")
+      clean_path = questionable_path.dup
+      clean_path.insert(0, "/") if clean_path.start_with?("~")
+      clean_path = File.expand_path(clean_path, "/")
 
       return clean_path if clean_path.eql?(base_directory)
 
diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb
index db8a9180f94..fee6418a99c 100644
--- a/lib/jekyll/cleaner.rb
+++ b/lib/jekyll/cleaner.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "set"
 
 module Jekyll
diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index f839915f599..ebafea38f97 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Collection
     attr_reader :site, :label, :metadata
diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index f9f243dd9e6..7de98e76ea8 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Command
     class << self
diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb
index 3cea607cbd0..1bd176b8be4 100644
--- a/lib/jekyll/commands/build.rb
+++ b/lib/jekyll/commands/build.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Commands
     class Build < Command
diff --git a/lib/jekyll/commands/clean.rb b/lib/jekyll/commands/clean.rb
index 3a44d59683e..1c3e40bf6c4 100644
--- a/lib/jekyll/commands/clean.rb
+++ b/lib/jekyll/commands/clean.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Commands
     class Clean < Command
diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb
index 5c235dac132..1ef87e714d5 100644
--- a/lib/jekyll/commands/doctor.rb
+++ b/lib/jekyll/commands/doctor.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "addressable/uri"
 
 module Jekyll
diff --git a/lib/jekyll/commands/help.rb b/lib/jekyll/commands/help.rb
index b4f136bf3e5..42a8017ae8a 100644
--- a/lib/jekyll/commands/help.rb
+++ b/lib/jekyll/commands/help.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Commands
     class Help < Command
diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index d1aeb5a0281..b1c8bb0bc4b 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "erb"
 
 module Jekyll
diff --git a/lib/jekyll/commands/new_theme.rb b/lib/jekyll/commands/new_theme.rb
index 65125d58d50..c55e68127d8 100644
--- a/lib/jekyll/commands/new_theme.rb
+++ b/lib/jekyll/commands/new_theme.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "erb"
 
 class Jekyll::Commands::NewTheme < Jekyll::Command
diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 4bc9eaf0da8..53973b66cb4 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Commands
     class Serve < Command
diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb
index 2e20ace81d5..b661940c30a 100644
--- a/lib/jekyll/commands/serve/servlet.rb
+++ b/lib/jekyll/commands/serve/servlet.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "webrick"
 
 module Jekyll
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index ec8e2a22dc0..2931cba4500 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   class Configuration < Hash
diff --git a/lib/jekyll/converter.rb b/lib/jekyll/converter.rb
index b7fa0091cb3..3cb74de2123 100644
--- a/lib/jekyll/converter.rb
+++ b/lib/jekyll/converter.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Converter < Plugin
     # Public: Get or set the highlighter prefix. When an argument is specified,
diff --git a/lib/jekyll/converters/identity.rb b/lib/jekyll/converters/identity.rb
index 9574769d1a9..2296aff1966 100644
--- a/lib/jekyll/converters/identity.rb
+++ b/lib/jekyll/converters/identity.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Converters
     class Identity < Converter
diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb
index c718d539b7c..3e53992104d 100644
--- a/lib/jekyll/converters/markdown.rb
+++ b/lib/jekyll/converters/markdown.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Converters
     class Markdown < Converter
diff --git a/lib/jekyll/converters/markdown/rdiscount_parser.rb b/lib/jekyll/converters/markdown/rdiscount_parser.rb
index f1679e796c4..654a3a6d0ed 100644
--- a/lib/jekyll/converters/markdown/rdiscount_parser.rb
+++ b/lib/jekyll/converters/markdown/rdiscount_parser.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Converters
     class Markdown
diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb
index aa170feb3b7..fae09621da2 100644
--- a/lib/jekyll/converters/markdown/redcarpet_parser.rb
+++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Jekyll::Converters::Markdown::RedcarpetParser
   module CommonMethods
     def add_code_tags(code, lang)
@@ -48,9 +50,7 @@ module WithRouge
     def block_code(code, lang)
       code = "
    #{super}
    "
 
-      output = "
    "
-      output << add_code_tags(code, lang)
-      output << "
    "
+      "
    #{add_code_tags(code, lang)}
    "
     end
 
     protected
diff --git a/lib/jekyll/converters/smartypants.rb b/lib/jekyll/converters/smartypants.rb
index d1bc81039a1..37fecb12172 100644
--- a/lib/jekyll/converters/smartypants.rb
+++ b/lib/jekyll/converters/smartypants.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Kramdown::Parser::SmartyPants < Kramdown::Parser::Kramdown
   def initialize(source, options)
     super
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 74125f09b1d..aea33fdcb86 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 require "set"
 
diff --git a/lib/jekyll/deprecator.rb b/lib/jekyll/deprecator.rb
index ca2b8b3f74a..327358c2d4f 100644
--- a/lib/jekyll/deprecator.rb
+++ b/lib/jekyll/deprecator.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Deprecator
     extend self
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 8634082c4d9..b6493f3c075 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   class Document
diff --git a/lib/jekyll/drops/collection_drop.rb b/lib/jekyll/drops/collection_drop.rb
index 5f5025b1f2d..2c9c01320ea 100644
--- a/lib/jekyll/drops/collection_drop.rb
+++ b/lib/jekyll/drops/collection_drop.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Drops
diff --git a/lib/jekyll/drops/document_drop.rb b/lib/jekyll/drops/document_drop.rb
index ed851821eb1..7796980c7a4 100644
--- a/lib/jekyll/drops/document_drop.rb
+++ b/lib/jekyll/drops/document_drop.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Drops
diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index 6227213e4dd..1ded11eb7d2 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Drops
diff --git a/lib/jekyll/drops/excerpt_drop.rb b/lib/jekyll/drops/excerpt_drop.rb
index 5d61aeb1b2d..06f8ae7d016 100644
--- a/lib/jekyll/drops/excerpt_drop.rb
+++ b/lib/jekyll/drops/excerpt_drop.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Drops
diff --git a/lib/jekyll/drops/jekyll_drop.rb b/lib/jekyll/drops/jekyll_drop.rb
index e3d2eb38d52..1686da418f1 100644
--- a/lib/jekyll/drops/jekyll_drop.rb
+++ b/lib/jekyll/drops/jekyll_drop.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Drops
diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb
index 97b41806444..cb4a007eb15 100644
--- a/lib/jekyll/drops/site_drop.rb
+++ b/lib/jekyll/drops/site_drop.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Drops
diff --git a/lib/jekyll/drops/static_file_drop.rb b/lib/jekyll/drops/static_file_drop.rb
index e0af2f09ed1..f855cf33629 100644
--- a/lib/jekyll/drops/static_file_drop.rb
+++ b/lib/jekyll/drops/static_file_drop.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Drops
     class StaticFileDrop < Drop
diff --git a/lib/jekyll/drops/unified_payload_drop.rb b/lib/jekyll/drops/unified_payload_drop.rb
index b642bda2620..833443a46f9 100644
--- a/lib/jekyll/drops/unified_payload_drop.rb
+++ b/lib/jekyll/drops/unified_payload_drop.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Drops
diff --git a/lib/jekyll/drops/url_drop.rb b/lib/jekyll/drops/url_drop.rb
index 5c97190da59..e67d24d47b8 100644
--- a/lib/jekyll/drops/url_drop.rb
+++ b/lib/jekyll/drops/url_drop.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Drops
diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb
index f4425037afc..019133195d3 100644
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class EntryFilter
     attr_reader :site
diff --git a/lib/jekyll/errors.rb b/lib/jekyll/errors.rb
index 95aa04b4ccd..8d659e8d285 100644
--- a/lib/jekyll/errors.rb
+++ b/lib/jekyll/errors.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Errors
     FatalException = Class.new(::RuntimeError)
diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb
index 61344e7964b..7adfec9861c 100644
--- a/lib/jekyll/excerpt.rb
+++ b/lib/jekyll/excerpt.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Excerpt
     extend Forwardable
@@ -117,7 +119,7 @@ def extract_excerpt(doc_content)
       if tail.empty?
         head
       else
-        "" << head << "\n\n" << tail.scan(%r!^ {0,3}\[[^\]]+\]:.+$!).join("\n")
+        head.to_s.dup << "\n\n" << tail.scan(%r!^ {0,3}\[[^\]]+\]:.+$!).join("\n")
       end
     end
   end
diff --git a/lib/jekyll/external.rb b/lib/jekyll/external.rb
index bdefc798ae8..0a65dfad058 100644
--- a/lib/jekyll/external.rb
+++ b/lib/jekyll/external.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module External
     class << self
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index e15cf7c66dd..35ed4d9f63e 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "addressable/uri"
 require "json"
 require "date"
diff --git a/lib/jekyll/filters/grouping_filters.rb b/lib/jekyll/filters/grouping_filters.rb
index c1029256106..4086bbe9854 100644
--- a/lib/jekyll/filters/grouping_filters.rb
+++ b/lib/jekyll/filters/grouping_filters.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Filters
     module GroupingFilters
diff --git a/lib/jekyll/filters/url_filters.rb b/lib/jekyll/filters/url_filters.rb
index 6ededc956d1..5bae1b1794e 100644
--- a/lib/jekyll/filters/url_filters.rb
+++ b/lib/jekyll/filters/url_filters.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "addressable/uri"
 
 module Jekyll
diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb
index 7cbfa358677..fc1bcc2d867 100644
--- a/lib/jekyll/frontmatter_defaults.rb
+++ b/lib/jekyll/frontmatter_defaults.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   # This class handles custom defaults for YAML frontmatter settings.
   # These are set in _config.yml and apply both to internal use (e.g. layout)
diff --git a/lib/jekyll/generator.rb b/lib/jekyll/generator.rb
index bf7c0f19aba..649715f840c 100644
--- a/lib/jekyll/generator.rb
+++ b/lib/jekyll/generator.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   Generator = Class.new(Plugin)
 end
diff --git a/lib/jekyll/hooks.rb b/lib/jekyll/hooks.rb
index 241dce3a7f1..8007edff59c 100644
--- a/lib/jekyll/hooks.rb
+++ b/lib/jekyll/hooks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Hooks
     DEFAULT_PRIORITY = 20
diff --git a/lib/jekyll/layout.rb b/lib/jekyll/layout.rb
index 3a08ad0d3be..f62fec08be2 100644
--- a/lib/jekyll/layout.rb
+++ b/lib/jekyll/layout.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Layout
     include Convertible
diff --git a/lib/jekyll/liquid_extensions.rb b/lib/jekyll/liquid_extensions.rb
index 5ba7dd8e79f..4551ac19bbd 100644
--- a/lib/jekyll/liquid_extensions.rb
+++ b/lib/jekyll/liquid_extensions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module LiquidExtensions
 
diff --git a/lib/jekyll/liquid_renderer.rb b/lib/jekyll/liquid_renderer.rb
index 919930ef8b0..2e15dbc6dcd 100644
--- a/lib/jekyll/liquid_renderer.rb
+++ b/lib/jekyll/liquid_renderer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "jekyll/liquid_renderer/file"
 require "jekyll/liquid_renderer/table"
 
diff --git a/lib/jekyll/liquid_renderer/file.rb b/lib/jekyll/liquid_renderer/file.rb
index eec8c7b52a8..574bbd31300 100644
--- a/lib/jekyll/liquid_renderer/file.rb
+++ b/lib/jekyll/liquid_renderer/file.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class LiquidRenderer
     class File
diff --git a/lib/jekyll/liquid_renderer/table.rb b/lib/jekyll/liquid_renderer/table.rb
index aab7fdf7845..7aa2e49ee4e 100644
--- a/lib/jekyll/liquid_renderer/table.rb
+++ b/lib/jekyll/liquid_renderer/table.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class LiquidRenderer::Table
     def initialize(stats)
@@ -13,7 +15,7 @@ def to_s(n = 50)
     private
 
     def generate_table(data, widths)
-      str = "\n"
+      str = String.new("\n")
 
       table_head = data.shift
       str << generate_row(table_head, widths)
@@ -28,7 +30,7 @@ def generate_table(data, widths)
     end
 
     def generate_table_head_border(row_data, widths)
-      str = ""
+      str = String.new("")
 
       row_data.each_index do |cell_index|
         str << "-" * widths[cell_index]
@@ -40,7 +42,7 @@ def generate_table_head_border(row_data, widths)
     end
 
     def generate_row(row_data, widths)
-      str = ""
+      str = String.new("")
 
       row_data.each_with_index do |cell_data, cell_index|
         str << if cell_index.zero?
diff --git a/lib/jekyll/log_adapter.rb b/lib/jekyll/log_adapter.rb
index 965f3295702..ec33b4d90d8 100644
--- a/lib/jekyll/log_adapter.rb
+++ b/lib/jekyll/log_adapter.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class LogAdapter
     attr_reader :writer, :messages
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 02c6cfae9f1..3b3d9353879 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Page
     include Convertible
diff --git a/lib/jekyll/plugin.rb b/lib/jekyll/plugin.rb
index b6e5023d80e..2a9dbeed41b 100644
--- a/lib/jekyll/plugin.rb
+++ b/lib/jekyll/plugin.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Plugin
     PRIORITIES = {
diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb
index 979004d63b6..f53d187a337 100644
--- a/lib/jekyll/plugin_manager.rb
+++ b/lib/jekyll/plugin_manager.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class PluginManager
     attr_reader :site
diff --git a/lib/jekyll/publisher.rb b/lib/jekyll/publisher.rb
index 0b67b8c6025..26fe4a3869b 100644
--- a/lib/jekyll/publisher.rb
+++ b/lib/jekyll/publisher.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Publisher
     def initialize(site)
diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 903e36d3a48..5804d1f963a 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 require "csv"
 
diff --git a/lib/jekyll/readers/collection_reader.rb b/lib/jekyll/readers/collection_reader.rb
index 062be42a4b4..7d605f421c4 100644
--- a/lib/jekyll/readers/collection_reader.rb
+++ b/lib/jekyll/readers/collection_reader.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class CollectionReader
     SPECIAL_COLLECTIONS = %w(posts data).freeze
diff --git a/lib/jekyll/readers/data_reader.rb b/lib/jekyll/readers/data_reader.rb
index 63db7c6d920..e2671f2d3b4 100644
--- a/lib/jekyll/readers/data_reader.rb
+++ b/lib/jekyll/readers/data_reader.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class DataReader
     attr_reader :site, :content
diff --git a/lib/jekyll/readers/layout_reader.rb b/lib/jekyll/readers/layout_reader.rb
index 985491c67a7..706dfed8c43 100644
--- a/lib/jekyll/readers/layout_reader.rb
+++ b/lib/jekyll/readers/layout_reader.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class LayoutReader
     attr_reader :site
diff --git a/lib/jekyll/readers/page_reader.rb b/lib/jekyll/readers/page_reader.rb
index 507c609e507..62d7419efec 100644
--- a/lib/jekyll/readers/page_reader.rb
+++ b/lib/jekyll/readers/page_reader.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class PageReader
     attr_reader :site, :dir, :unfiltered_content
diff --git a/lib/jekyll/readers/post_reader.rb b/lib/jekyll/readers/post_reader.rb
index 70688875da5..510192793b0 100644
--- a/lib/jekyll/readers/post_reader.rb
+++ b/lib/jekyll/readers/post_reader.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class PostReader
     attr_reader :site, :unfiltered_content
diff --git a/lib/jekyll/readers/static_file_reader.rb b/lib/jekyll/readers/static_file_reader.rb
index 1d43d69c659..6bf07f5a0c3 100644
--- a/lib/jekyll/readers/static_file_reader.rb
+++ b/lib/jekyll/readers/static_file_reader.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class StaticFileReader
     attr_reader :site, :dir, :unfiltered_content
diff --git a/lib/jekyll/readers/theme_assets_reader.rb b/lib/jekyll/readers/theme_assets_reader.rb
index 80a6547d8a7..2706690c5ce 100644
--- a/lib/jekyll/readers/theme_assets_reader.rb
+++ b/lib/jekyll/readers/theme_assets_reader.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class ThemeAssetsReader
     attr_reader :site
diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb
index 09ff309a28d..91ce3003bdf 100644
--- a/lib/jekyll/regenerator.rb
+++ b/lib/jekyll/regenerator.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Regenerator
     attr_reader :site, :metadata, :cache
diff --git a/lib/jekyll/related_posts.rb b/lib/jekyll/related_posts.rb
index 3526a73b76f..fcccdd80eeb 100644
--- a/lib/jekyll/related_posts.rb
+++ b/lib/jekyll/related_posts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class RelatedPosts
     class << self
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index b0f544e35e5..5a2d32a8d27 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   class Renderer
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 0bc3f1d577c..54155d0c8e2 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 require "csv"
 
diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index 29d71cbe8e7..55f0256c24f 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class StaticFile
     attr_reader :relative_path, :extname, :name, :data
diff --git a/lib/jekyll/stevenson.rb b/lib/jekyll/stevenson.rb
index bf20b22f752..bbec66171f6 100644
--- a/lib/jekyll/stevenson.rb
+++ b/lib/jekyll/stevenson.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Stevenson < ::Logger
     def initialize
diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index 86b9171b1fb..7ea95b0b101 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Tags
     class HighlightBlock < Liquid::Block
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index 08843047a2e..ef6c8f732ca 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   module Tags
diff --git a/lib/jekyll/tags/link.rb b/lib/jekyll/tags/link.rb
index a076c417252..77f4da9ca48 100644
--- a/lib/jekyll/tags/link.rb
+++ b/lib/jekyll/tags/link.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Tags
     class Link < Liquid::Tag
diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb
index f7e52f42b57..9a1b8337c91 100644
--- a/lib/jekyll/tags/post_url.rb
+++ b/lib/jekyll/tags/post_url.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Tags
     class PostComparer
diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb
index 045c91aa0c8..031c61b1e7a 100644
--- a/lib/jekyll/theme.rb
+++ b/lib/jekyll/theme.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Theme
     extend Forwardable
diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb
index f1c97e37974..aca89dd655c 100644
--- a/lib/jekyll/theme_builder.rb
+++ b/lib/jekyll/theme_builder.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Jekyll::ThemeBuilder
   SCAFFOLD_DIRECTORIES = %w(
     assets _layouts _includes _sass
diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 8f3047d30cf..f91578507da 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "addressable/uri"
 
 # Public: Methods that generate a URL for a resource such as a Post or a Page.
@@ -93,7 +95,7 @@ def possible_keys(key)
 
     def generate_url_from_drop(template)
       template.gsub(%r!:([a-z_]+)!) do |match|
-        pool = possible_keys(match.sub(":".freeze, "".freeze))
+        pool = possible_keys(match.sub(":", ""))
 
         winner = pool.find { |key| @placeholders.key?(key) }
         if winner.nil?
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 3f91a2b00fd..c9dcf2fd324 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -1,4 +1,6 @@
 
+# frozen_string_literal: true
+
 module Jekyll
   module Utils
     extend self
@@ -247,6 +249,8 @@ def slugify(string, mode: nil, cased: false)
     #
     # Returns the updated permalink template
     def add_permalink_suffix(template, permalink_style)
+      template = template.dup
+
       case permalink_style
       when :pretty
         template << "/"
@@ -256,6 +260,7 @@ def add_permalink_suffix(template, permalink_style)
         template << "/" if permalink_style.to_s.end_with?("/")
         template << ":output_ext" if permalink_style.to_s.end_with?(":output_ext")
       end
+
       template
     end
 
@@ -296,7 +301,7 @@ def safe_glob(dir, patterns, flags = 0)
     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"].insert(0, "bom|")
+        merged["encoding"] = "bom|#{merged["encoding"]}"
       end
       merged
     end
diff --git a/lib/jekyll/utils/exec.rb b/lib/jekyll/utils/exec.rb
index 33403dbc50d..fee8b2d2e5b 100644
--- a/lib/jekyll/utils/exec.rb
+++ b/lib/jekyll/utils/exec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "open3"
 
 module Jekyll
diff --git a/lib/jekyll/utils/platforms.rb b/lib/jekyll/utils/platforms.rb
index f66ef795bbd..f4f3382a240 100644
--- a/lib/jekyll/utils/platforms.rb
+++ b/lib/jekyll/utils/platforms.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Utils
     module Platforms
diff --git a/lib/jekyll/utils/win_tz.rb b/lib/jekyll/utils/win_tz.rb
index 06a10422274..322f5ac6230 100644
--- a/lib/jekyll/utils/win_tz.rb
+++ b/lib/jekyll/utils/win_tz.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Utils
     module WinTZ
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 8a8b2b30c11..6a27620408a 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   VERSION = "3.5.1".freeze
 end
diff --git a/lib/theme_template/Gemfile b/lib/theme_template/Gemfile
index 3be9c3cd812..bb94df82938 100644
--- a/lib/theme_template/Gemfile
+++ b/lib/theme_template/Gemfile
@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 gemspec
diff --git a/rake/docs.rake b/rake/docs.rake
index fcae4f20162..e64c6cfdccd 100644
--- a/rake/docs.rake
+++ b/rake/docs.rake
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #############################################################################
 #
 # Packaging tasks for jekyll-docs
diff --git a/rake/release.rake b/rake/release.rake
index 9d9220a49a7..ce7bf41ca94 100644
--- a/rake/release.rake
+++ b/rake/release.rake
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #############################################################################
 #
 # Packaging tasks
diff --git a/rake/site.rake b/rake/site.rake
index 00ffd228b44..94aa969ea22 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #############################################################################
 #
 # Site tasks - https://jekyllrb.com
diff --git a/test/fixtures/test-dependency-theme/test-dependency-theme.gemspec b/test/fixtures/test-dependency-theme/test-dependency-theme.gemspec
index 5c260329d3b..ebc8a83c3a1 100644
--- a/test/fixtures/test-dependency-theme/test-dependency-theme.gemspec
+++ b/test/fixtures/test-dependency-theme/test-dependency-theme.gemspec
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Gem::Specification.new do |s|
   s.name          = "test-dependency-theme"
   s.version       = "0.1.0"
diff --git a/test/fixtures/test-theme/test-theme.gemspec b/test/fixtures/test-theme/test-theme.gemspec
index 73e5deb2e94..970e1b8abdd 100644
--- a/test/fixtures/test-theme/test-theme.gemspec
+++ b/test/fixtures/test-theme/test-theme.gemspec
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Gem::Specification.new do |s|
   s.name        = "test-theme"
   s.version     = "0.1.0"
diff --git a/test/helper.rb b/test/helper.rb
index 83beaad3c1c..3f3227bab4f 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $stdout.puts "# -------------------------------------------------------------"
 $stdout.puts "# SPECS AND TESTS ARE RUNNING WITH WARNINGS OFF."
 $stdout.puts "# SEE: https://github.com/Shopify/liquid/issues/730"
diff --git a/test/simplecov_custom_profile.rb b/test/simplecov_custom_profile.rb
index 0aaec88a58c..555acec3d7e 100644
--- a/test/simplecov_custom_profile.rb
+++ b/test/simplecov_custom_profile.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "simplecov"
 
 SimpleCov.profiles.define "gem" do
diff --git a/test/source/_plugins/dummy.rb b/test/source/_plugins/dummy.rb
index fd11d0e1044..25eef88e21b 100644
--- a/test/source/_plugins/dummy.rb
+++ b/test/source/_plugins/dummy.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Dummy < Generator
     priority :high
diff --git a/test/test_ansi.rb b/test/test_ansi.rb
index 8f18f56ec7b..9b4fd01668c 100644
--- a/test/test_ansi.rb
+++ b/test/test_ansi.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestAnsi < JekyllUnitTest
diff --git a/test/test_cleaner.rb b/test/test_cleaner.rb
index d3072e54977..65442cedc0d 100644
--- a/test/test_cleaner.rb
+++ b/test/test_cleaner.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestCleaner < JekyllUnitTest
diff --git a/test/test_coffeescript.rb b/test/test_coffeescript.rb
index 189ce05df3e..a60e0595430 100644
--- a/test/test_coffeescript.rb
+++ b/test/test_coffeescript.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestCoffeeScript < JekyllUnitTest
diff --git a/test/test_collections.rb b/test/test_collections.rb
index cb122cd9e65..e4dbe951a25 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestCollections < JekyllUnitTest
diff --git a/test/test_command.rb b/test/test_command.rb
index 90767013b92..33e13798cc6 100644
--- a/test/test_command.rb
+++ b/test/test_command.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestCommand < JekyllUnitTest
diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb
index ef98bab4e2b..135e83e2dba 100644
--- a/test/test_commands_serve.rb
+++ b/test/test_commands_serve.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "webrick"
 require "mercenary"
 require "helper"
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 50156926202..dddb61b8671 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 require "colorator"
 
diff --git a/test/test_convertible.rb b/test/test_convertible.rb
index ef70307062f..cc5be8785a7 100644
--- a/test/test_convertible.rb
+++ b/test/test_convertible.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 require "ostruct"
 
diff --git a/test/test_doctor_command.rb b/test/test_doctor_command.rb
index 8861440255c..182878689cc 100644
--- a/test/test_doctor_command.rb
+++ b/test/test_doctor_command.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 require "jekyll/commands/doctor"
 
diff --git a/test/test_document.rb b/test/test_document.rb
index 8726c83cd6a..42ba3c5748b 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestDocument < JekyllUnitTest
diff --git a/test/test_drop.rb b/test/test_drop.rb
index 80b0d0ff693..00d2116471d 100644
--- a/test/test_drop.rb
+++ b/test/test_drop.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestDrop < JekyllUnitTest
diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb
index 7f32653c957..c9025092318 100644
--- a/test/test_entry_filter.rb
+++ b/test/test_entry_filter.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestEntryFilter < JekyllUnitTest
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index e0960f69663..2bcf3ba8cac 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestExcerpt < JekyllUnitTest
diff --git a/test/test_excerpt_drop.rb b/test/test_excerpt_drop.rb
index 901b06a6f79..1eb6687266d 100644
--- a/test/test_excerpt_drop.rb
+++ b/test/test_excerpt_drop.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestExcerptDrop < JekyllUnitTest
diff --git a/test/test_filters.rb b/test/test_filters.rb
index e0eb2feee87..cb95a6449fb 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 require "helper"
 
diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb
index d45ab6de9a5..9bf9629a9ed 100644
--- a/test/test_front_matter_defaults.rb
+++ b/test/test_front_matter_defaults.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestFrontMatterDefaults < JekyllUnitTest
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 84345524d74..136f5fc9e68 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestGeneratedSite < JekyllUnitTest
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index 6396d67201b..3861416ff2e 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 require "helper"
 
diff --git a/test/test_layout_reader.rb b/test/test_layout_reader.rb
index 1d32fa57892..96d2045a148 100644
--- a/test/test_layout_reader.rb
+++ b/test/test_layout_reader.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestLayoutReader < JekyllUnitTest
diff --git a/test/test_liquid_extensions.rb b/test/test_liquid_extensions.rb
index a76f378623e..e281e10e5fd 100644
--- a/test/test_liquid_extensions.rb
+++ b/test/test_liquid_extensions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestLiquidExtensions < JekyllUnitTest
diff --git a/test/test_liquid_renderer.rb b/test/test_liquid_renderer.rb
index 6ba29299d67..32e980b8af9 100644
--- a/test/test_liquid_renderer.rb
+++ b/test/test_liquid_renderer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestLiquidRenderer < JekyllUnitTest
diff --git a/test/test_log_adapter.rb b/test/test_log_adapter.rb
index 7e0873ca33f..2bcd2f1d7c9 100644
--- a/test/test_log_adapter.rb
+++ b/test/test_log_adapter.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestLogAdapter < JekyllUnitTest
diff --git a/test/test_new_command.rb b/test/test_new_command.rb
index 32db566d98b..c2b7def4001 100644
--- a/test/test_new_command.rb
+++ b/test/test_new_command.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 require "jekyll/commands/new"
 
diff --git a/test/test_page.rb b/test/test_page.rb
index 431c57a63ca..ed4c2c31a9a 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestPage < JekyllUnitTest
diff --git a/test/test_path_sanitization.rb b/test/test_path_sanitization.rb
index 31a4b92ebff..184385fabd3 100644
--- a/test/test_path_sanitization.rb
+++ b/test/test_path_sanitization.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestPathSanitization < JekyllUnitTest
diff --git a/test/test_plugin_manager.rb b/test/test_plugin_manager.rb
index 90f057641e7..213bcef6b12 100644
--- a/test/test_plugin_manager.rb
+++ b/test/test_plugin_manager.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestPluginManager < JekyllUnitTest
diff --git a/test/test_rdiscount.rb b/test/test_rdiscount.rb
index 32289a64368..7116c29a238 100644
--- a/test/test_rdiscount.rb
+++ b/test/test_rdiscount.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestRdiscount < JekyllUnitTest
diff --git a/test/test_redcarpet.rb b/test/test_redcarpet.rb
index 4e979f4d2ee..f4208570931 100644
--- a/test/test_redcarpet.rb
+++ b/test/test_redcarpet.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestRedcarpet < JekyllUnitTest
diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb
index 9e1559d4bec..3a5d35a8aa8 100644
--- a/test/test_regenerator.rb
+++ b/test/test_regenerator.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestRegenerator < JekyllUnitTest
diff --git a/test/test_related_posts.rb b/test/test_related_posts.rb
index 2d6165505e3..d6a8fe6f1f3 100644
--- a/test/test_related_posts.rb
+++ b/test/test_related_posts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestRelatedPosts < JekyllUnitTest
diff --git a/test/test_sass.rb b/test/test_sass.rb
index 3a9df0aeae3..15b04162f01 100644
--- a/test/test_sass.rb
+++ b/test/test_sass.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestSass < JekyllUnitTest
diff --git a/test/test_site.rb b/test/test_site.rb
index d039cb8a924..adc69e33436 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestSite < JekyllUnitTest
diff --git a/test/test_site_drop.rb b/test/test_site_drop.rb
index b836c70d3eb..43c52d708a5 100644
--- a/test/test_site_drop.rb
+++ b/test/test_site_drop.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestSiteDrop < JekyllUnitTest
diff --git a/test/test_static_file.rb b/test/test_static_file.rb
index 49adc96b79f..edfc9facf0e 100644
--- a/test/test_static_file.rb
+++ b/test/test_static_file.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestStaticFile < JekyllUnitTest
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 68fd40398a8..7a60ec9dc18 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 require "helper"
 
diff --git a/test/test_theme.rb b/test/test_theme.rb
index 3d557dc8ca0..69628dde1ba 100644
--- a/test/test_theme.rb
+++ b/test/test_theme.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestTheme < JekyllUnitTest
diff --git a/test/test_theme_assets_reader.rb b/test/test_theme_assets_reader.rb
index 8d792f735d9..358789f529a 100644
--- a/test/test_theme_assets_reader.rb
+++ b/test/test_theme_assets_reader.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestThemeAssetsReader < JekyllUnitTest
diff --git a/test/test_url.rb b/test/test_url.rb
index 23ab9735861..859babd4574 100644
--- a/test/test_url.rb
+++ b/test/test_url.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestURL < JekyllUnitTest
diff --git a/test/test_utils.rb b/test/test_utils.rb
index 5f5611ce55e..1b4d4813b66 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "helper"
 
 class TestUtils < JekyllUnitTest

From 73419cb374be1b8f45818a23116cf71db93549ce Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 3 Aug 2017 21:27:33 -0400
Subject: [PATCH 2299/4996] Update history to reflect merge of #6265 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b7848fa8aca..fe4aeb8df43 100644
--- a/History.markdown
+++ b/History.markdown
@@ -21,6 +21,7 @@
   * `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)
+  * Enforce Style/FrozenStringLiteralComment (#6265)
 
 ### Documentation
 

From cc1cb8150a599448fbaa6e356c835e08e76789f3 Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Fri, 4 Aug 2017 03:00:24 +0100
Subject: [PATCH 2300/4996] set `LiquidError#template_name` for errors in
 included file (#6206)

Merge pull request 6206
---
 features/rendering.feature    | 13 +++++++++++--
 lib/jekyll/liquid_renderer.rb |  3 ---
 lib/jekyll/tags/include.rb    | 14 +++++++++++---
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/features/rendering.feature b/features/rendering.feature
index ecb31094fbc..1d9f2aa949b 100644
--- a/features/rendering.feature
+++ b/features/rendering.feature
@@ -12,14 +12,23 @@ Feature: Rendering
     Then  I should get a non-zero exit-status
     And   I should see "Liquid Exception" in the build output
 
-  Scenario: When receiving bad Liquid in included file
+  Scenario: When receiving a liquid syntax error in included file
     Given I have a _includes directory
     And   I have a "_includes/invalid.html" file that contains "{% INVALID %}"
     And   I have a "index.html" page with layout "simple" that contains "{% include invalid.html %}"
     And   I have a simple layout that contains "{{ content }}"
     When  I run jekyll build
     Then  I should get a non-zero exit-status
-    And   I should see "Liquid Exception.*Unknown tag 'INVALID' in.*_includes/invalid\.html" in the build output
+    And   I should see "Liquid Exception: Liquid syntax error \(.+/invalid\.html line 1\): Unknown tag 'INVALID' included in index\.html" in the build output
+
+  Scenario: When receiving a generic liquid error in included file
+    Given I have a _includes directory
+    And   I have a "_includes/invalid.html" file that contains "{{ site.title | prepend 'Prepended Text' }}"
+    And   I have a "index.html" page with layout "simple" that contains "{% include invalid.html %}"
+    And   I have a simple layout that contains "{{ content }}"
+    When  I run jekyll build
+    Then  I should get a non-zero exit-status
+    And   I should see "Liquid Exception: Liquid error \(.+/_includes/invalid\.html line 1\): wrong number of arguments (\(given 1, expected 2\)|\(1 for 2\)) included in index\.html" in the build output
 
   Scenario: Render Liquid and place in layout
     Given I have a "index.html" page with layout "simple" that contains "Hi there, Jekyll {{ jekyll.environment }}!"
diff --git a/lib/jekyll/liquid_renderer.rb b/lib/jekyll/liquid_renderer.rb
index 2e15dbc6dcd..a79f06bd3c8 100644
--- a/lib/jekyll/liquid_renderer.rb
+++ b/lib/jekyll/liquid_renderer.rb
@@ -43,9 +43,6 @@ def stats_table(n = 50)
     end
 
     def self.format_error(e, path)
-      if e.is_a? Tags::IncludeTagError
-        return "#{e.message} in #{e.path}, included in #{path}"
-      end
       "#{e.message} in #{path}"
     end
   end
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index ef6c8f732ca..b2f6ffb40a2 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -136,7 +136,13 @@ def render(context)
 
         context.stack do
           context["include"] = parse_params(context) if @params
-          partial.render!(context)
+          begin
+            partial.render!(context)
+          rescue Liquid::Error => e
+            e.template_name = path
+            e.markup_context = "included " if e.markup_context.nil?
+            raise e
+          end
         end
       end
 
@@ -161,8 +167,10 @@ def load_cached_partial(path, context)
             .file(path)
           begin
             cached_partial[path] = unparsed_file.parse(read_file(path, context))
-          rescue Liquid::SyntaxError => ex
-            raise IncludeTagError.new(ex.message, path)
+          rescue Liquid::Error => e
+            e.template_name = path
+            e.markup_context = "included " if e.markup_context.nil?
+            raise e
           end
         end
       end

From 828ee760c23f5f03399e2bb65d213ee04f3a4695 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 3 Aug 2017 22:00:25 -0400
Subject: [PATCH 2301/4996] Update history to reflect merge of #6206 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fe4aeb8df43..4b298be6e81 100644
--- a/History.markdown
+++ b/History.markdown
@@ -14,6 +14,7 @@
   * Add URL checks to Doctor (#5760)
   * Fix serving files that clash with directories (#6222) (#6231)
   * Bump supported Ruby version to `>= 2.1.0` (#6220)
+  * set `LiquidError#template_name` for errors in included file (#6206)
 
 ### Bug Fixes
 

From 922fa534011f27ee46cc656cc6da57d7bd0866c9 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 3 Aug 2017 22:47:28 -0400
Subject: [PATCH 2302/4996] Update history in docs site based on recent updates
 to History.markdown

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

diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index e5832bf0998..725321bddae 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -27,7 +27,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - add plugins for multiple page pagination ([#6055]({{ site.repository }}/issues/6055))
 - Update minimum Ruby version in installation.md ([#6164]({{ site.repository }}/issues/6164))
 - [docs] Add information about finding a collection in `site.collections` ([#6165]({{ site.repository }}/issues/6165))
-- Add {%raw%} to Liquid example on site ([#6179]({{ site.repository }}/issues/6179))
+- Add {% raw %}`{% raw %}`{% endraw %} to Liquid example on site ([#6179]({{ site.repository }}/issues/6179))
 - Added improved Pug plugin - removed 404 Jade plugin ([#6174]({{ site.repository }}/issues/6174))
 - Linking the link ([#6210]({{ site.repository }}/issues/6210))
 - Small correction in documentation for includes ([#6193]({{ site.repository }}/issues/6193))

From 8cade08de01aa154f4bcd6b820dc644c955b47d0 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Fri, 4 Aug 2017 08:40:18 +0530
Subject: [PATCH 2303/4996] update theme-template README (#6257)

Merge pull request 6257
---
 lib/theme_template/README.md.erb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/theme_template/README.md.erb b/lib/theme_template/README.md.erb
index 9eca48c78d1..ff8ad05fb28 100644
--- a/lib/theme_template/README.md.erb
+++ b/lib/theme_template/README.md.erb
@@ -1,9 +1,12 @@
 # <%= theme_name %>
 
-Welcome to your new Jekyll theme! In this directory, you'll find the files you need to be able to package up your theme into a gem. Put your layouts in `_layouts`, your includes in `_includes` and your sass in `_sass`. To experiment with this code, add some sample content and run `bundle exec jekyll serve` – this directory is setup just like a Jekyll site!
+Welcome to your new Jekyll theme! In this directory, you'll find the files you need to be able to package up your theme into a gem. Put your layouts in `_layouts`, your includes in `_includes`, your sass files in `_sass` and any other assets in `assets`.
+
+To experiment with this code, add some sample content and run `bundle exec jekyll serve` – this directory is setup just like a Jekyll site!
 
 TODO: Delete this and the text above, and describe your gem
 
+
 ## Installation
 
 Add this line to your Jekyll site's `Gemfile`:
@@ -28,7 +31,7 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here. Describe your available layouts, includes, and/or sass.
+TODO: Write usage instructions here. Describe your available layouts, includes, sass and/or assets.
 
 ## Contributing
 
@@ -40,7 +43,8 @@ To set up your environment to develop this theme, run `bundle install`.
 
 Your theme is setup just like a normal Jekyll site! To test your theme, run `bundle exec jekyll serve` and open your browser at `http://localhost:4000`. This starts a Jekyll server using your theme. Add pages, documents, data, etc. like normal to test your theme's contents. As you make modifications to your theme and to your content, your site will regenerate and you should see the changes in the browser after a refresh, just like normal.
 
-When your theme is released, only the files in `_layouts`, `_includes`, and `_sass` tracked with Git will be released.
+When your theme is released, only the files in `_layouts`, `_includes`, `_sass` and `assets` tracked with Git will be bundled.
+To add a custom directory to your theme-gem, please edit the regexp in `<%= theme_name %>.gemspec` accordingly.
 
 ## License
 

From 305e293d46251cd6e12831290d7860680c43e07d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 3 Aug 2017 23:10:19 -0400
Subject: [PATCH 2304/4996] Update history to reflect merge of #6257 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4b298be6e81..9526da30eb8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -23,6 +23,7 @@
   * kramdown: symbolize keys in-place (#6247)
   * Call to_s on site.url before attempting to concatenate strings (#6253)
   * Enforce Style/FrozenStringLiteralComment (#6265)
+  * Update theme-template README to note 'assets' directory (#6257)
 
 ### Documentation
 

From d8dfc33b8b12651922c1d4d8fa2a610110e18a06 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Fri, 4 Aug 2017 15:53:26 -0400
Subject: [PATCH 2305/4996] Memoize the return value of Document#url (#6266)

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

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index b6493f3c075..d42e544c62f 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -204,7 +204,7 @@ def permalink
     #
     # Returns the computed URL for the document.
     def url
-      @url = URL.new({
+      @url ||= URL.new({
         :template     => url_template,
         :placeholders => url_placeholders,
         :permalink    => permalink,

From 5c2e75823a394d0bb38b9fb004404bb5b11f6c95 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 4 Aug 2017 15:53:27 -0400
Subject: [PATCH 2306/4996] Update history to reflect merge of #6266 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9526da30eb8..faaea140995 100644
--- a/History.markdown
+++ b/History.markdown
@@ -24,6 +24,7 @@
   * Call to_s on site.url before attempting to concatenate strings (#6253)
   * Enforce Style/FrozenStringLiteralComment (#6265)
   * Update theme-template README to note 'assets' directory (#6257)
+  * Memoize the return value of Document#url (#6266)
 
 ### Documentation
 

From a99186fe0a36dfef004db80249b16c9bd57445f9 Mon Sep 17 00:00:00 2001
From: Kyle Zhao 
Date: Sat, 5 Aug 2017 11:01:40 -0400
Subject: [PATCH 2307/4996] delegate `StaticFile#to_json` to
 `StaticFile#to_liquid` for a more (#6273)

Merge pull request 6273
---
 lib/jekyll/static_file.rb | 4 ++++
 test/test_static_file.rb  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index 55f0256c24f..fd537107f56 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -2,8 +2,12 @@
 
 module Jekyll
   class StaticFile
+    extend Forwardable
+
     attr_reader :relative_path, :extname, :name, :data
 
+    def_delegator :to_liquid, :to_json, :to_json
+
     class << self
       # The cache of last modification times [path] -> mtime.
       def mtimes
diff --git a/test/test_static_file.rb b/test/test_static_file.rb
index edfc9facf0e..f74d8c1a001 100644
--- a/test/test_static_file.rb
+++ b/test/test_static_file.rb
@@ -176,5 +176,9 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
       }
       assert_equal expected, @static_file.to_liquid.to_h
     end
+
+    should "jsonify its liquid drop instead of itself" do
+      assert_equal @static_file.to_liquid.to_json, @static_file.to_json
+    end
   end
 end

From 6b1aa4ce014b2c0801faf77f8eafaa5ac9107581 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 5 Aug 2017 11:01:42 -0400
Subject: [PATCH 2308/4996] Update history to reflect merge of #6273 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index faaea140995..93afaf6897b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Enforce Style/FrozenStringLiteralComment (#6265)
   * Update theme-template README to note 'assets' directory (#6257)
   * Memoize the return value of Document#url (#6266)
+  * delegate `StaticFile#to_json` to `StaticFile#to_liquid` (#6273)
 
 ### Documentation
 

From 39631db0bd764e594e3443f23ead4a4e6148d7ab Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Sun, 6 Aug 2017 15:49:01 +0100
Subject: [PATCH 2309/4996] make flakey test more robust (#6277)

Merge pull request 6277
---
 test/test_static_file.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_static_file.rb b/test/test_static_file.rb
index f74d8c1a001..e306d2a299e 100644
--- a/test/test_static_file.rb
+++ b/test/test_static_file.rb
@@ -134,7 +134,7 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
     end
 
     should "know its last modification time" do
-      assert_equal Time.new.to_i, @static_file.mtime
+      assert_equal File.stat(@static_file.path).mtime.to_i, @static_file.mtime
     end
 
     should "only set modified time if not a symlink" do

From adde25120cce8444b7a97657dbb3187954c3500c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 6 Aug 2017 10:49:02 -0400
Subject: [PATCH 2310/4996] Update history to reflect merge of #6277 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 93afaf6897b..597b6e17406 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
   * fix tests (#6240)
   * Define path with __dir__ (#6087)
   * exit site.process sooner (#6239)
+  * make flakey test more robust (#6277)
 
 ### Minor Enhancements
 

From c8eee7ffcbf5c8067ebde43edbb311b78ba6e7d7 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Mon, 7 Aug 2017 21:43:33 +0530
Subject: [PATCH 2311/4996] Access custom config array throughout session
 (#6200)

Merge pull request 6200
---
 lib/jekyll/configuration.rb   |  2 +-
 lib/jekyll/drops/site_drop.rb |  3 +++
 test/test_configuration.rb    | 28 +++++++++++++++++++++-------
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 2931cba4500..a9965d29f5b 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -156,7 +156,7 @@ def config_files(override)
       )
 
       # Get configuration from /_config.yml or /
-      config_files = override.delete("config")
+      config_files = override["config"]
       if config_files.to_s.empty?
         default = %w(yml yaml).find(-> { "yml" }) do |ext|
           File.exist?(Jekyll.sanitized_path(source(override), "_config.#{ext}"))
diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb
index cb4a007eb15..20b0332a43c 100644
--- a/lib/jekyll/drops/site_drop.rb
+++ b/lib/jekyll/drops/site_drop.rb
@@ -38,6 +38,9 @@ def collections
         @site_collections ||= @obj.collections.values.sort_by(&:label).map(&:to_liquid)
       end
 
+      # return nil for `{{ site.config }}` even if --config was passed via CLI
+      def config; end
+
       private
       def_delegator :@obj, :config, :fallback_data
     end
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index dddb61b8671..3dbd5ca1c4e 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -356,7 +356,10 @@ class TestConfiguration < JekyllUnitTest
         .and_return({ "baseurl" => "http://example.com" })
       allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}")
       assert_equal \
-        site_configuration({ "baseurl" => "http://example.com" }),
+        site_configuration({
+          "baseurl" => "http://example.com",
+          "config"  => @paths[:other],
+        }),
         Jekyll.configuration(test_config.merge({ "config" => @paths[:other] }))
     end
 
@@ -368,7 +371,10 @@ class TestConfiguration < JekyllUnitTest
         .and_return({ "baseurl" => "http://example.com" })
       allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}")
       assert_equal \
-        site_configuration({ "baseurl" => "http://example.com" }),
+        site_configuration({
+          "baseurl" => "http://example.com",
+          "config"  => @paths[:other],
+        }),
         Jekyll.configuration(test_config.merge({ :config => @paths[:other] }))
     end
 
@@ -376,15 +382,18 @@ class TestConfiguration < JekyllUnitTest
       allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return({})
       allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}")
       assert_equal \
-        site_configuration,
+        site_configuration({ "config" => [@paths[:empty]] }),
         Jekyll.configuration(test_config.merge({ "config" => [@paths[:empty]] }))
     end
 
     should "successfully load a TOML file" do
       Jekyll.logger.log_level = :warn
       assert_equal \
-        site_configuration({ "baseurl" => "/you-beautiful-blog-you",
-                             "title"   => "My magnificent site, wut", }),
+        site_configuration({
+          "baseurl" => "/you-beautiful-blog-you",
+          "title"   => "My magnificent site, wut",
+          "config"  => [@paths[:toml]],
+        }),
         Jekyll.configuration(test_config.merge({ "config" => [@paths[:toml]] }))
       Jekyll.logger.log_level = :info
     end
@@ -399,7 +408,9 @@ class TestConfiguration < JekyllUnitTest
       allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}")
       allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:toml]}")
       assert_equal(
-        site_configuration,
+        site_configuration({
+          "config" => [@paths[:default], @paths[:other], @paths[:toml]],
+        }),
         Jekyll.configuration(
           test_config.merge(
             { "config" => [@paths[:default], @paths[:other], @paths[:toml]] }
@@ -424,7 +435,10 @@ class TestConfiguration < JekyllUnitTest
         .to receive(:puts)
         .with("Configuration file: #{@paths[:other]}")
       assert_equal \
-        site_configuration({ "baseurl" => "http://example.com" }),
+        site_configuration({
+          "baseurl" => "http://example.com",
+          "config"  => [@paths[:default], @paths[:other]],
+        }),
         Jekyll.configuration(
           test_config.merge({ "config" => [@paths[:default], @paths[:other]] })
         )

From 3fab69e3c966076f3ccc92fd6abbc42a11867343 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 7 Aug 2017 12:13:35 -0400
Subject: [PATCH 2312/4996] Update history to reflect merge of #6200 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 597b6e17406..4605be9e948 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Fix serving files that clash with directories (#6222) (#6231)
   * Bump supported Ruby version to `>= 2.1.0` (#6220)
   * set `LiquidError#template_name` for errors in included file (#6206)
+  * Access custom config array throughout session (#6200)
 
 ### Bug Fixes
 

From bd31986ad6073d8174549fc75820a003cbd46b25 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 8 Aug 2017 23:10:38 -0400
Subject: [PATCH 2313/4996] Fix Drop#key? so it can handle a nil argument
 (#6281)

Merge pull request 6281
---
 lib/jekyll/drops/drop.rb | 4 ++--
 test/test_drop.rb        | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index 1ded11eb7d2..09623ef9ac0 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -72,7 +72,7 @@ def [](key)
       def []=(key, val)
         if respond_to?("#{key}=")
           public_send("#{key}=", val)
-        elsif respond_to? key
+        elsif respond_to?(key.to_s)
           if self.class.mutable?
             @mutations[key] = val
           else
@@ -106,7 +106,7 @@ def key?(key)
         if self.class.mutable
           @mutations.key?(key)
         else
-          respond_to?(key) || fallback_data.key?(key)
+          !key.nil? && (respond_to?(key) || fallback_data.key?(key))
         end
       end
 
diff --git a/test/test_drop.rb b/test/test_drop.rb
index 00d2116471d..eb23feb0f20 100644
--- a/test/test_drop.rb
+++ b/test/test_drop.rb
@@ -15,6 +15,10 @@ class TestDrop < JekyllUnitTest
       @drop = @document.to_liquid
     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")

From fbabb1eb26d78e8fc6ea11c0d938f00ad2e44a59 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 8 Aug 2017 23:10:39 -0400
Subject: [PATCH 2314/4996] Update history to reflect merge of #6281 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4605be9e948..fddedfbcebc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * Update theme-template README to note 'assets' directory (#6257)
   * 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)
 
 ### Documentation
 

From bc962fe7d837927789b540f29903b7809800063a Mon Sep 17 00:00:00 2001
From: lymaconsulting 
Date: Tue, 8 Aug 2017 23:25:04 -0400
Subject: [PATCH 2315/4996] Customizing url in collection elements clarified
 (#6264)

Merge pull request 6264
---
 docs/_docs/collections.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index 6114e08ec9b..39bd99eb0d7 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -198,7 +198,13 @@ each of the following `permalink` configurations will produce the document struc
         
    :title
    
       
       
-        
    The document's lowercase title (as defined in its front matter), with every sequence of spaces and non-alphanumeric characters replaced by a hyphen. If the document does not define a title in its front matter, this is equivalent to name.
    
+        
    
+          The :title template variable will take the
+          slug front matter
+          variable value if any is present in the document; if none is
+          defined then :title will be equivalent to
+          :name, aka the slug generated from the filename.
+        
    
       
     
     

From e39558f8370916b480471edfcc44f3a7625bf40e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 8 Aug 2017 23:25:06 -0400
Subject: [PATCH 2316/4996] Update history to reflect merge of #6264 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fddedfbcebc..88eb8742404 100644
--- a/History.markdown
+++ b/History.markdown
@@ -39,6 +39,7 @@
 ### Site Enhancements
 
   * Adding DevKit helpers (#6225)
+  * Customizing url in collection elements clarified (#6264)
 
 ## 3.5.1 / 2017-07-17
 

From a4181459b915d654bfccb2279f24022cd84a696a Mon Sep 17 00:00:00 2001
From: Pedro Lamas 
Date: Thu, 10 Aug 2017 00:16:05 +0100
Subject: [PATCH 2317/4996] Fixes minor typo in post text (#6283)

Merge pull request 6283
---
 docs/_posts/2017-06-14-jekyll-3-5-0-released.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_posts/2017-06-14-jekyll-3-5-0-released.markdown b/docs/_posts/2017-06-14-jekyll-3-5-0-released.markdown
index 54d1aed77df..28d21a4e869 100644
--- a/docs/_posts/2017-06-14-jekyll-3-5-0-released.markdown
+++ b/docs/_posts/2017-06-14-jekyll-3-5-0-released.markdown
@@ -9,7 +9,7 @@ categories: [release]
 Good news! Nearly 400 commits later, Jekyll 3.5.0 has been released into
 the wild. Some new shiny things you might want to test out:
 
-- Jekyll now uses Liquid 4, the latest! It comes with whitespace control, new filters `concat` annd `compact`, loop performance improvements and [many fixes](https://github.com/Shopify/liquid/blob/master/History.md#400--2016-12-14--branch-4-0-stable)
+- Jekyll now uses Liquid 4, the latest! It comes with whitespace control, new filters `concat` and `compact`, loop performance improvements and [many fixes](https://github.com/Shopify/liquid/blob/master/History.md#400--2016-12-14--branch-4-0-stable)
 - Themes can specify runtime dependencies (in their gemspecs) and we'll require those. This makes it easier for theme writers to use plugins.
 - Speaking of themes, we'll properly handle the discrepancy between a convertible file in the local site and a static file in the theme. Overriding a file locally now doesn't matter if it's convertible or static.
 - Pages, posts, and other documents can now access layout variables via `{% raw %}{{ layout }}{% endraw %}`.

From 29b96f440815419ad3c4fbdc9749537903c5b291 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 9 Aug 2017 19:16:06 -0400
Subject: [PATCH 2318/4996] Update history to reflect merge of #6283 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 88eb8742404..ddcee9744e4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -35,6 +35,7 @@
   * Fix a typo in `custom-404-page.md` (#6218)
   * Docs: fix links to issues in History.markdown (#6255)
   * Update deprecated gems key to plugins. (#6262)
+  * Fixes minor typo in post text (#6283)
 
 ### Site Enhancements
 

From 045226f160d7cfe8bc2c7bc6d4bbce660f3ddd2d Mon Sep 17 00:00:00 2001
From: Ben Balter 
Date: Thu, 10 Aug 2017 11:14:52 -0400
Subject: [PATCH 2319/4996] Guard against type error in absolute url (#6280)

Merge pull request 6280
---
 lib/jekyll/filters/url_filters.rb | 4 ++--
 test/test_filters.rb              | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/filters/url_filters.rb b/lib/jekyll/filters/url_filters.rb
index 5bae1b1794e..151c4e71a55 100644
--- a/lib/jekyll/filters/url_filters.rb
+++ b/lib/jekyll/filters/url_filters.rb
@@ -12,9 +12,9 @@ module URLFilters
       # Returns the absolute URL as a String.
       def absolute_url(input)
         return if input.nil?
-        return input if Addressable::URI.parse(input).absolute?
+        return input if Addressable::URI.parse(input.to_s).absolute?
         site = @context.registers[:site]
-        return relative_url(input).to_s if site.config["url"].nil?
+        return relative_url(input) if site.config["url"].nil?
         Addressable::URI.parse(
           site.config["url"].to_s + relative_url(input)
         ).normalize.to_s
diff --git a/test/test_filters.rb b/test/test_filters.rb
index cb95a6449fb..0499b73c2df 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -440,6 +440,10 @@ def select; end
         filter = make_filter_mock({ "url" => Value.new(proc { "http://example.org" }) })
         assert_equal "http://example.org#{page_url}", filter.absolute_url(page_url)
       end
+
+      should "not raise a TypeError when passed a hash" do
+        assert @filter.absolute_url({ "foo" => "bar" })
+      end
     end
 
     context "relative_url filter" do

From dfdefcf367599000e1841cb6c35eae33014fdc9e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 10 Aug 2017 11:14:54 -0400
Subject: [PATCH 2320/4996] Update history to reflect merge of #6280 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ddcee9744e4..80ac17128b0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * 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)
+  * Guard against type error in absolute url (#6280)
 
 ### Documentation
 

From 3f0c77cfd5bde557ce0e89b6684d50a0ddd37dba Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 10 Aug 2017 16:27:14 -0400
Subject: [PATCH 2321/4996] Add a quick test for DataReader (#6284)

Merge pull request 6284
---
 lib/jekyll/readers/data_reader.rb |  4 ++--
 test/test_data_reader.rb          | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 test/test_data_reader.rb

diff --git a/lib/jekyll/readers/data_reader.rb b/lib/jekyll/readers/data_reader.rb
index e2671f2d3b4..445d548802b 100644
--- a/lib/jekyll/readers/data_reader.rb
+++ b/lib/jekyll/readers/data_reader.rb
@@ -70,8 +70,8 @@ def read_data_file(path)
     end
 
     def sanitize_filename(name)
-      name.gsub!(%r![^\w\s-]+|(?<=^|\b\s)\s+(?=$|\s?\b)!, "".freeze)
-      name.gsub(%r!\s+!, "_")
+      name.gsub(%r![^\w\s-]+|(?<=^|\b\s)\s+(?=$|\s?\b)!, "")
+        .gsub(%r!\s+!, "_")
     end
   end
 end
diff --git a/test/test_data_reader.rb b/test/test_data_reader.rb
new file mode 100644
index 00000000000..038ec679e3d
--- /dev/null
+++ b/test/test_data_reader.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "helper"
+
+class TestDataReader < JekyllUnitTest
+  context "#sanitize_filename" do
+    setup do
+      @reader = DataReader.new(fixture_site)
+    end
+
+    should "remove evil characters" do
+      assert_equal "helpwhathaveIdone", @reader.sanitize_filename(
+        "help/what^&$^#*(!^%*!#haveId&&&&&&&&&one"
+      )
+    end
+  end
+end

From 073d2f1e6a7519d91986ab3d5223ec93c94026d4 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 10 Aug 2017 16:27:16 -0400
Subject: [PATCH 2322/4996] Update history to reflect merge of #6284 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 80ac17128b0..71f5e0daee3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,7 @@
   * Define path with __dir__ (#6087)
   * exit site.process sooner (#6239)
   * make flakey test more robust (#6277)
+  * Add a quick test for DataReader (#6284)
 
 ### Minor Enhancements
 

From c059675bcc782622d63e10b303bfd105dee5689d Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 10 Aug 2017 16:40:06 -0400
Subject: [PATCH 2323/4996] script/backport-pr: commit message no longer
 includes the # (#6289)

Merge pull request 6289
---
 script/backport-pr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/backport-pr b/script/backport-pr
index 5ef6c4dec7a..7c74edea309 100755
--- a/script/backport-pr
+++ b/script/backport-pr
@@ -45,7 +45,7 @@ git clean -q -fdx
 git pull -q
 git checkout -q -f -B $prbranch
 
-commit=`git log -1 --pretty=%H "--grep=Merge pull request #$pr" "--grep=Merge branch '.*$headref'" master`
+commit=`git log -1 --pretty=%H "--grep=Merge pull request $pr" "--grep=Merge branch '.*$headref'" master`
 
 echo "Backporting:\n"
 

From a761a7acbc1cfae35ef939df012caaa4642bb882 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 10 Aug 2017 16:40:08 -0400
Subject: [PATCH 2324/4996] Update history to reflect merge of #6289 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 71f5e0daee3..e17a670fb7c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -9,6 +9,7 @@
   * 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)
 
 ### Minor Enhancements
 

From d4443e43d6887cce12905891cd3b7df52a3262bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Jaenisch?= 
Date: Sat, 12 Aug 2017 21:18:51 +0200
Subject: [PATCH 2325/4996] Execute build command using bundle. (#6274)

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

diff --git a/docs/_docs/deployment-methods.md b/docs/_docs/deployment-methods.md
index ebf8bf12732..3146b372e79 100644
--- a/docs/_docs/deployment-methods.md
+++ b/docs/_docs/deployment-methods.md
@@ -47,7 +47,7 @@ TMP_GIT_CLONE=$HOME/tmp/myrepo
 PUBLIC_WWW=/var/www/myrepo
 
 git clone $GIT_REPO $TMP_GIT_CLONE
-jekyll build -s $TMP_GIT_CLONE -d $PUBLIC_WWW
+bundle exec jekyll build -s $TMP_GIT_CLONE -d $PUBLIC_WWW
 rm -Rf $TMP_GIT_CLONE
 exit
 ```

From c810d761f7981bc3144c37c42098a9eaf760e7f1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 12 Aug 2017 15:18:52 -0400
Subject: [PATCH 2326/4996] Update history to reflect merge of #6274 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e17a670fb7c..a054598ad92 100644
--- a/History.markdown
+++ b/History.markdown
@@ -39,6 +39,7 @@
   * Docs: fix links to issues in History.markdown (#6255)
   * Update deprecated gems key to plugins. (#6262)
   * Fixes minor typo in post text (#6283)
+  * Execute build command using bundle. (#6274)
 
 ### Site Enhancements
 

From 722c49cd6feee44bead83c28d829b5003bb10c06 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sat, 12 Aug 2017 16:08:10 -0400
Subject: [PATCH 2327/4996] script/backport-pr: cherry-pick the commit properly

We used to do traditional merges but since we started doing squash merges,
we don't want the -m1 flag for git-cherry-pick.
---
 script/backport-pr | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/script/backport-pr b/script/backport-pr
index 7c74edea309..a2b2c33fea1 100755
--- a/script/backport-pr
+++ b/script/backport-pr
@@ -53,7 +53,9 @@ git log -1 $commit
 
 conflicts=""
 
-git cherry-pick -x --allow-empty -m1 $commit &> /dev/null || {
+# If we used regular merges, we'd use the `-m 1` flag for the cherry-pick
+# command, but since we do squash-merges, we don't want this.
+git cherry-pick -x --allow-empty $commit &> /dev/null || {
   unmerged=$(git ls-files --unmerged --stage | cut -f 2 -d$'\t' | uniq)
   conflicts="\n\nConflicting files:"
   for file in $unmerged; do

From 48fafd9fc0bcc1d06ba6c3622478d31e6bad5ad6 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sat, 12 Aug 2017 16:28:34 -0400
Subject: [PATCH 2328/4996] Release :gem: 3.5.2

---
 History.markdown      | 11 +++++++++++
 lib/jekyll/version.rb |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/History.markdown b/History.markdown
index a054598ad92..bcc9ceaac94 100644
--- a/History.markdown
+++ b/History.markdown
@@ -46,6 +46,17 @@
   * Adding DevKit helpers (#6225)
   * Customizing url in collection elements clarified (#6264)
 
+## 3.5.2 / 2017-08-12
+
+### Bug Fixes
+
+  * Backport #6281 for v3.5.x: Fix `Drop#key?` so it can handle a nil argument (#6288)
+  * Backport #6280 for v3.5.x: Guard against type error in `absolute_url` (#6287)
+  * Backport #6266 for v3.5.x: Memoize the return value of `Document#url` (#6301)
+  * Backport #6273 for v3.5.x: delegate `StaticFile#to_json` to `StaticFile#to_liquid` (#6302)
+  * Backport #6226 for v3.5.x: `Reader#read_directories`: guard against an entry not being a directory (#6304)
+  * Backport #6247 for v3.5.x: kramdown: symbolize keys in-place (#6303)
+
 ## 3.5.1 / 2017-07-17
 
 ### Minor Enhancements
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 6a27620408a..46b238124be 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "3.5.1".freeze
+  VERSION = "3.5.2".freeze
 end

From 97c0c6cc7735a97a482221f80e71c37bad40a863 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sat, 12 Aug 2017 16:30:47 -0400
Subject: [PATCH 2329/4996] Update site for v3.5.2

---
 docs/_docs/history.md   | 14 ++++++++++++++
 docs/latest_version.txt |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 725321bddae..d64d0b1c0e5 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,20 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.5.2 / 2017-08-12
+{: #v3-5-2}
+
+### Bug Fixes
+{: #bug-fixes-v3-5-2}
+
+- Backport [#6281]({{ site.repository }}/issues/6281) for v3.5.x: Fix `Drop#key?` so it can handle a nil argument ([#6288]({{ site.repository }}/issues/6288))
+- Backport [#6280]({{ site.repository }}/issues/6280) for v3.5.x: Guard against type error in `absolute_url` ([#6287]({{ site.repository }}/issues/6287))
+- Backport [#6266]({{ site.repository }}/issues/6266) for v3.5.x: Memoize the return value of `Document#url` ([#6301]({{ site.repository }}/issues/6301))
+- Backport [#6273]({{ site.repository }}/issues/6273) for v3.5.x: delegate `StaticFile#to_json` to `StaticFile#to_liquid` ([#6302]({{ site.repository }}/issues/6302))
+- Backport [#6226]({{ site.repository }}/issues/6226) for v3.5.x: `Reader#read_directories`: guard against an entry not being a directory ([#6304]({{ site.repository }}/issues/6304))
+- Backport [#6247]({{ site.repository }}/issues/6247) for v3.5.x: kramdown: symbolize keys in-place ([#6303]({{ site.repository }}/issues/6303))
+
+
 ## 3.5.1 / 2017-07-17
 {: #v3-5-1}
 
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index d5c0c991428..87ce492908a 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.5.1
+3.5.2

From 07d4c36652b7d4acb9851fb547de61ee281f0726 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sat, 12 Aug 2017 16:36:29 -0400
Subject: [PATCH 2330/4996] Add release post for v3.5.2

---
 .../2017-08-12-jekyll-3-5-2-released.markdown | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 docs/_posts/2017-08-12-jekyll-3-5-2-released.markdown

diff --git a/docs/_posts/2017-08-12-jekyll-3-5-2-released.markdown b/docs/_posts/2017-08-12-jekyll-3-5-2-released.markdown
new file mode 100644
index 00000000000..ecf91be573f
--- /dev/null
+++ b/docs/_posts/2017-08-12-jekyll-3-5-2-released.markdown
@@ -0,0 +1,20 @@
+---
+title: 'Jekyll 3.5.2 Released'
+date: 2017-08-12 16:31:40 -0400
+author: parkr
+version: 3.5.2
+categories: [release]
+---
+
+3.5.2 is out with 6 great bug fixes, most notably one which should dramatically speed up generation of your site! In testing #6266, jekyllrb.com generation when from 18 seconds down to 8! Here is the full line-up of fixes:
+
+  * Backport #6266 for v3.5.x: Memoize the return value of `Document#url` (#6301)
+  * Backport #6247 for v3.5.x: kramdown: symbolize keys in-place (#6303)
+  * Backport #6281 for v3.5.x: Fix `Drop#key?` so it can handle a nil argument (#6288)
+  * Backport #6280 for v3.5.x: Guard against type error in `absolute_url` (#6287)
+  * Backport #6273 for v3.5.x: delegate `StaticFile#to_json` to `StaticFile#to_liquid` (#6302)
+  * Backport #6226 for v3.5.x: `Reader#read_directories`: guard against an entry not being a directory (#6304
+
+A [full history](/docs/history/#v3-5-2) is available for your perusal. As always, please file bugs if you encounter them! Opening a pull request with a failing test for your expected behaviour is the easiest way for us to address the issue since we have a reproducible example to test again. Short of that, please fill out our issue template to the best of your ability and we'll try to get to it quickly!
+
+Happy Jekylling!

From 6b8de2a75794be30d9816cf44e914088fca9a31e Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sat, 12 Aug 2017 16:42:53 -0400
Subject: [PATCH 2331/4996] 3.5.2: thank the contributors

---
 docs/_posts/2017-08-12-jekyll-3-5-2-released.markdown | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/_posts/2017-08-12-jekyll-3-5-2-released.markdown b/docs/_posts/2017-08-12-jekyll-3-5-2-released.markdown
index ecf91be573f..0534e49eb92 100644
--- a/docs/_posts/2017-08-12-jekyll-3-5-2-released.markdown
+++ b/docs/_posts/2017-08-12-jekyll-3-5-2-released.markdown
@@ -17,4 +17,7 @@ categories: [release]
 
 A [full history](/docs/history/#v3-5-2) is available for your perusal. As always, please file bugs if you encounter them! Opening a pull request with a failing test for your expected behaviour is the easiest way for us to address the issue since we have a reproducible example to test again. Short of that, please fill out our issue template to the best of your ability and we'll try to get to it quickly!
 
+Many thanks to our contributors without whom this release could not be
+possible: Ben Balter & Kyle Zhao.
+
 Happy Jekylling!

From 4c15b9e5e4ed659fabbd16dc5c563f099e0d04a2 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 17 Aug 2017 11:16:18 -0400
Subject: [PATCH 2332/4996] [WIP] Add shim that works for both Rouge 1 and
 Rouge 2 (#5919)

Merge pull request 5919
---
 .travis.yml                                   |  2 +
 Gemfile                                       |  4 +-
 jekyll.gemspec                                |  5 +-
 .../converters/markdown/redcarpet_parser.rb   |  2 +-
 lib/jekyll/tags/highlight.rb                  |  8 ++-
 lib/jekyll/utils.rb                           |  1 +
 lib/jekyll/utils/rouge.rb                     | 19 +++++
 test/test_kramdown.rb                         | 10 ++-
 test/test_tags.rb                             | 69 +++++++++++++++++--
 9 files changed, 105 insertions(+), 15 deletions(-)
 create mode 100644 lib/jekyll/utils/rouge.rb

diff --git a/.travis.yml b/.travis.yml
index 587ca6f36f1..00e21f93e19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,8 @@ rvm:
 
 matrix:
   include:
+    - rvm: *ruby1
+      env: TEST_SUITE=test ROUGE=1.11.1
     - rvm: *ruby1
       env: TEST_SUITE=fmt
     - rvm: *ruby1
diff --git a/Gemfile b/Gemfile
index 0dcb47767d4..216c2626f19 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,8 @@ gemspec :name => "jekyll"
 
 gem "rake", "~> 12.0"
 
+gem "rouge", ENV["ROUGE"] if ENV["ROUGE"]
+
 # Dependency of jekyll-mentions. RubyGems in Ruby 2.1 doesn't shield us from this.
 gem "activesupport", "~> 4.2", :groups => [:test_legacy, :site] if RUBY_VERSION < "2.2.2"
 
@@ -71,7 +73,7 @@ group :jekyll_optional_dependencies do
   gem "jekyll-gist"
   gem "jekyll-paginate"
   gem "jekyll-redirect-from"
-  gem "kramdown", "~> 1.9"
+  gem "kramdown", "~> 1.14"
   gem "mime-types", "~> 3.0"
   gem "rdoc", "~> 5.0"
   gem "toml", "~> 0.1.0"
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 87031a8000c..606d09daae4 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -35,10 +35,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("colorator",             "~> 1.0")
   s.add_runtime_dependency("jekyll-sass-converter", "~> 1.0")
   s.add_runtime_dependency("jekyll-watch",          "~> 1.1")
-  s.add_runtime_dependency("kramdown",              "~> 1.3")
+  s.add_runtime_dependency("kramdown",              "~> 1.14")
   s.add_runtime_dependency("liquid",                "~> 4.0")
   s.add_runtime_dependency("mercenary",             "~> 0.3.3")
   s.add_runtime_dependency("pathutil",              "~> 0.9")
-  s.add_runtime_dependency("rouge",                 "~> #{ENV["ROUGE_VERSION"] || "1.7"}")
+  rouge_versions = ENV["ROUGE_VERSION"] ? ["~> #{ENV["ROUGE_VERSION"]}"] : [">= 1.7", "< 3"]
+  s.add_runtime_dependency("rouge",                 *rouge_versions)
   s.add_runtime_dependency("safe_yaml",             "~> 1.0")
 end
diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb
index fae09621da2..35c6e5feef7 100644
--- a/lib/jekyll/converters/markdown/redcarpet_parser.rb
+++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb
@@ -55,7 +55,7 @@ def block_code(code, lang)
 
     protected
     def rouge_formatter(_lexer)
-      Rouge::Formatters::HTML.new(:wrap => false)
+      Jekyll::Utils::Rouge.html_formatter(:wrap => false)
     end
   end
 
diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index 7ea95b0b101..687f9b717b3 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -111,10 +111,12 @@ def render_pygments(code, is_safe)
       end
 
       def render_rouge(code)
-        Jekyll::External.require_with_graceful_fail("rouge")
-        formatter = Rouge::Formatters::HTML.new(
+        formatter = Jekyll::Utils::Rouge.html_formatter(
           :line_numbers => @highlight_options[:linenos],
-          :wrap         => false
+          :wrap         => false,
+          :css_class    => "highlight",
+          :gutter_class => "gutter",
+          :code_class   => "code"
         )
         lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText
         formatter.format(lexer.lex(code))
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index c9dcf2fd324..70605a34c18 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -7,6 +7,7 @@ module Utils
     autoload :Ansi, "jekyll/utils/ansi"
     autoload :Exec, "jekyll/utils/exec"
     autoload :Platforms, "jekyll/utils/platforms"
+    autoload :Rouge, "jekyll/utils/rouge"
     autoload :WinTZ, "jekyll/utils/win_tz"
 
     # Constants for use in #slugify
diff --git a/lib/jekyll/utils/rouge.rb b/lib/jekyll/utils/rouge.rb
new file mode 100644
index 00000000000..a00a5f9e743
--- /dev/null
+++ b/lib/jekyll/utils/rouge.rb
@@ -0,0 +1,19 @@
+module Jekyll
+  module Utils
+    module Rouge
+
+      def self.html_formatter(*args)
+        Jekyll::External.require_with_graceful_fail("rouge")
+        if old_api?
+          ::Rouge::Formatters::HTML.new(*args)
+        else
+          ::Rouge::Formatters::HTMLLegacy.new(*args)
+        end
+      end
+
+      def self.old_api?
+        ::Rouge.version.to_s < "2"
+      end
+    end
+  end
+end
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index 3861416ff2e..e1bf15a4b4e 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -17,7 +17,10 @@ class TestKramdown < JekyllUnitTest
 
           "syntax_highlighter"      => "rouge",
           "syntax_highlighter_opts" => {
-            "bold_every" => 8, "css" => :class,
+            "bold_every" => 8,
+            "css"        => :class,
+            "css_class"  => "highlight",
+            "formatter"  => Jekyll::Utils::Rouge.html_formatter.class,
           },
         },
       }
@@ -82,8 +85,9 @@ class TestKramdown < JekyllUnitTest
         puts "Hello World"
         ~~~
       MARKDOWN
-
-      selector = "div.highlighter-rouge>pre.highlight>code"
+      div_highlight = ""
+      div_highlight = ">div.highlight" unless Utils::Rouge.old_api?
+      selector = "div.highlighter-rouge#{div_highlight}>pre.highlight>code"
       refute result.css(selector).empty?
     end
 
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 7a60ec9dc18..8a7ed7d0e6e 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -319,7 +319,20 @@ def highlight_block_with_opts(options_string)
         )
       end
 
-      should "render markdown with rouge with line numbers" do
+      should "render markdown with rouge 2 with line numbers" do
+        skip "Skipped because using an older version of Rouge" if Utils::Rouge.old_api?
+        assert_match(
+          %() +
+            %() +
+            %() +
+            %(
    ) +
+            %(
    1\n
    test
    ),
+          @result
+        )
+      end
+
+      should "render markdown with rouge 1 with line numbers" do
+        skip "Skipped because using a newer version of Rouge" unless Utils::Rouge.old_api?
         assert_match(
           %() +
             %(
    ) +
@@ -331,6 +344,42 @@ def highlight_block_with_opts(options_string)
       end
     end
 
+    context "post content has raw tag" do
+      setup do
+        content = <<-CONTENT
+---
+title: This is a test
+---
+
+```liquid
+{% raw %}
+{{ site.baseurl }}{% link _collection/name-of-document.md %}
+{% endraw %}
+```
+CONTENT
+        create_post(content)
+      end
+
+      should "render markdown with rouge 1" do
+        skip "Skipped because using a newer version of Rouge" unless Utils::Rouge.old_api?
+
+        assert_match(
+          %(
    ),
+          @result
+        )
+      end
+
+      should "render markdown with rouge 2" do
+        skip "Skipped because using an older version of Rouge" if Utils::Rouge.old_api?
+
+        assert_match(
+          %(
    ) +
+            %(
    ),
+          @result
+        )
+      end
+    end
+
     context "post content has highlight with file reference" do
       setup do
         fill_post("./jekyll.gemspec")
@@ -418,13 +467,23 @@ def highlight_block_with_opts(options_string)
 EOS
       end
 
-      should "should stop highlighting at boundary" do
+      should "should stop highlighting at boundary with rouge 2" do
+        skip "Skipped because using an older version of Rouge" if Utils::Rouge.old_api?
         expected = <<-EOS
-
    This is not yet highlighted
    
+
    This is not yet highlighted
    \n
+
    1
+
    test
    \n
+
    This should not be highlighted, right?
    
+EOS
+        assert_match(expected, @result)
+      end
 
+      should "should stop highlighting at boundary with rouge 1" do
+        skip "Skipped because using a newer version of Rouge" unless Utils::Rouge.old_api?
+        expected = <<-EOS
+
    This is not yet highlighted
    \n
 
    1
    test
-
    
-
+
    \n

    This should not be highlighted, right?

    EOS assert_match(expected, @result) From 21fa0d7755d26d2cbce864c11c67b68206580751 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Thu, 17 Aug 2017 11:16:20 -0400 Subject: [PATCH 2333/4996] Update history to reflect merge of #5919 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index bcc9ceaac94..d13c06678d5 100644 --- a/History.markdown +++ b/History.markdown @@ -19,6 +19,7 @@ * Bump supported Ruby version to `>= 2.1.0` (#6220) * set `LiquidError#template_name` for errors in included file (#6206) * Access custom config array throughout session (#6200) + * [WIP] Add shim that works for both Rouge 1 and Rouge 2 (#5919) ### Bug Fixes From 8e9605a32cba6bc4be3ebcc68f14670807a1e642 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 17 Aug 2017 14:06:06 -0400 Subject: [PATCH 2334/4996] Update history note for #5919 --- History.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/History.markdown b/History.markdown index d13c06678d5..805219c7df4 100644 --- a/History.markdown +++ b/History.markdown @@ -19,7 +19,7 @@ * Bump supported Ruby version to `>= 2.1.0` (#6220) * set `LiquidError#template_name` for errors in included file (#6206) * Access custom config array throughout session (#6200) - * [WIP] Add shim that works for both Rouge 1 and Rouge 2 (#5919) + * Add support for Rouge 2, in addition to Rouge 1 (#5919) ### Bug Fixes From 62c822e834190b59c2f71dec04c1c3b9c6e7ce79 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 17 Aug 2017 22:19:53 -0400 Subject: [PATCH 2335/4996] Utils::Rouge: add missing frozen_string_literal comment. --- lib/jekyll/utils/rouge.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/jekyll/utils/rouge.rb b/lib/jekyll/utils/rouge.rb index a00a5f9e743..d1befa1a212 100644 --- a/lib/jekyll/utils/rouge.rb +++ b/lib/jekyll/utils/rouge.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Jekyll module Utils module Rouge From 9b6e85203a573be06148e5ce7efce6ea37c1ee88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksander=20Ku=C5=9B?= Date: Fri, 18 Aug 2017 17:09:07 +0200 Subject: [PATCH 2336/4996] name unification (#6317) Merge pull request 6317 --- docs/_docs/continuous-integration/buddyworks.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/_docs/continuous-integration/buddyworks.md b/docs/_docs/continuous-integration/buddyworks.md index 8729c7c8d86..5cce1f75487 100644 --- a/docs/_docs/continuous-integration/buddyworks.md +++ b/docs/_docs/continuous-integration/buddyworks.md @@ -1,10 +1,10 @@ --- -title: "BuddyWorks" +title: "Buddy" --- -[BuddyWorks][buddyworks-homepage] is a [Docker][docker-homepage]-based CI server that you can set up in 15-20 minutes to build, test, and deploy your Jekyll websites. It supports [GitHub][github-homepage], [Bitbucket][bitbucket-homepage], and [GitLab][gitlab-homepage] repositories, and can be installed on-premises or used in cloud. The following guide will show you how to set up a free environment to build and test your Jekyll project. +[Buddy][buddy-homepage] is a [Docker][docker-homepage]-based CI server that you can set up in 15-20 minutes to build, test, and deploy your Jekyll websites. It supports [GitHub][github-homepage], [Bitbucket][bitbucket-homepage], and [GitLab][gitlab-homepage] repositories, and can be installed on-premises or used in cloud. The following guide will show you how to set up a free environment to build and test your Jekyll project. -[buddyworks-homepage]: https://buddy.works +[buddy-homepage]: https://buddy.works [docker-homepage]: https://www.docker.com/ [github-homepage]: https://github.com [bitbucket-homepage]: https://bitbucket.org/ @@ -12,7 +12,7 @@ title: "BuddyWorks" ## 1. Getting started -1. Log in at [https://buddy.works](https://buddy.works) with your GitHub/Bitbucket account or email +1. Log in at [https://buddy.works][buddy-homepage] with your GitHub/Bitbucket account or email 2. Choose your Git provider and select or push your Jekyll Project 3. Create a new pipeline and set the trigger mode to 'On every push' 4. Add and configure the Jekyll action and save the pipeline @@ -45,7 +45,7 @@ If you prefer configuration as code over GUI, you can generate a `buddy.yml` tha ## 4. Setting up on-premises server -The self-hosted version of BuddyWorks can be installed on any type of server supporting Docker, including [Linux][bw-linux], [Mac][bw-mac], [AWS EC2][bw-aws-ec2], [DigitalOcean][bw-digitalocean], and [Microsoft Azure][bw-azure]. +The self-hosted version of Buddy can be installed on any type of server supporting Docker, including [Linux][bw-linux], [Mac][bw-mac], [AWS EC2][bw-aws-ec2], [DigitalOcean][bw-digitalocean], and [Microsoft Azure][bw-azure]. [bw-linux]: https://buddy.works/knowledge/standalone/installation-linux [bw-mac]: https://buddy.works/knowledge/standalone/installation-mac-osx @@ -55,8 +55,8 @@ The self-hosted version of BuddyWorks can be installed on any type of server sup ## 5. Questions? -This entire guide is open-source. Go ahead and [edit it][jekyll-docs-ci-buddyworks] if you want to expand it or have a fix or [ask for help][jekyll-help] if you run into trouble and need assistance. BuddyWorks also has an [online community][buddyworks-forum] for help. +This entire guide is open-source. Go ahead and [edit it][jekyll-docs-ci-buddy] if you want to expand it or have a fix or [ask for help][jekyll-help] if you run into trouble and need assistance. Buddy also has an [online community][buddy-forum] for help. -[jekyll-docs-ci-buddyworks]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration/buddyworks.md +[jekyll-docs-ci-buddy]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration/buddyworks.md [jekyll-help]: https://jekyllrb.com/help/ -[buddyworks-forum]: http://forum.buddy.works/ +[buddy-forum]: http://forum.buddy.works/ From 2ce17697d318a13fe6e6fdc28e22c1a6bfeba728 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 18 Aug 2017 11:09:08 -0400 Subject: [PATCH 2337/4996] Update history to reflect merge of #6317 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 805219c7df4..828b08bb935 100644 --- a/History.markdown +++ b/History.markdown @@ -41,6 +41,7 @@ * Update deprecated gems key to plugins. (#6262) * Fixes minor typo in post text (#6283) * Execute build command using bundle. (#6274) + * name unification - buddy details (#6317) ### Site Enhancements From db4ab43bdb12b242fcb1ad9c48b32870c8bc9371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksander=20Ku=C5=9B?= Date: Fri, 18 Aug 2017 17:09:34 +0200 Subject: [PATCH 2338/4996] name unification (#6318) Merge pull request 6318 --- docs/_docs/continuous-integration/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_docs/continuous-integration/index.md b/docs/_docs/continuous-integration/index.md index a9a12267502..c0826fc54a6 100644 --- a/docs/_docs/continuous-integration/index.md +++ b/docs/_docs/continuous-integration/index.md @@ -7,4 +7,4 @@ Continuous Integration (CI) enables you to publish your Jekyll generated website * [Travis CI](travis-ci) * [CircleCI](circleci) -* [BuddyWorks](buddyworks) +* [Buddy](buddyworks) From 54c1e5515edee52d121122341b74d612be3d08ea Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 18 Aug 2017 11:09:36 -0400 Subject: [PATCH 2339/4996] Update history to reflect merge of #6318 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 828b08bb935..e11de9c77da 100644 --- a/History.markdown +++ b/History.markdown @@ -42,6 +42,7 @@ * Fixes minor typo in post text (#6283) * Execute build command using bundle. (#6274) * name unification - buddy details (#6317) + * name unification - application index (#6318) ### Site Enhancements From 22cc59905b2100d9f3358abbeeb45f54b44a2511 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 18 Aug 2017 11:38:32 -0400 Subject: [PATCH 2340/4996] Add CODEOWNERS file to help automate reviews. Documentation from GitHub: https://help.github.com/articles/about-codeowners/ jekyllbot does too much already -- I'd like to see GitHub help us keep organized. This is also an exercise in logically splitting up the codebase. The build team is pretty overloaded it looks like -- can we split anything out? --- CODEOWNERS | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 CODEOWNERS diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 00000000000..d3d2214518e --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1,87 @@ +# The Jekyll project has 6 affinity teams, shown here: https://teams.jekyllrb.com/ +# They are as follows: +# +# 1. @jekyll/build +# 2. @jekyll/documentation +# 3. @jekyll/ecosystem +# 4. @jekyll/performance +# 5. @jekyll/stability +# 6. @jekyll/windows +# +# Each of these teams has a mission. Wherever possible, GitHub should +# automatically require review from these teams on the pieces of the +# repository they maintain. + +# @jekyll/documentation +/docs/ @jekyll/documentation + +# @jekyll/build +/exe/ @jekyll/build +/lib/jekyll.rb @jekyll/build +/lib/jekyll/cleaner.rb @jekyll/build +/lib/jekyll/collection.rb @jekyll/build +/lib/jekyll/command.rb @jekyll/build +/lib/jekyll/commands/ @jekyll/build +/lib/jekyll/converter.rb @jekyll/build +/lib/jekyll/converters/ @jekyll/build +/lib/jekyll/convertible.rb @jekyll/build +/lib/jekyll/document.rb @jekyll/build +/lib/jekyll/drops/ @jekyll/build +/lib/jekyll/entry_filter.rb @jekyll/build +/lib/jekyll/errors.rb @jekyll/build +/lib/jekyll/excerpt.rb @jekyll/build +/lib/jekyll/filters/ @jekyll/build +/lib/jekyll/filters.rb @jekyll/build +/lib/jekyll/layout.rb @jekyll/build +/lib/jekyll/liquid_extensions.rb @jekyll/build +/lib/jekyll/liquid_renderer/ @jekyll/build +/lib/jekyll/liquid_renderer.rb @jekyll/build +/lib/jekyll/log_adapter.rb @jekyll/build +/lib/jekyll/mime.types @jekyll/build +/lib/jekyll/page.rb @jekyll/build +/lib/jekyll/publisher.rb @jekyll/build +/lib/jekyll/reader.rb @jekyll/build +/lib/jekyll/readers/ @jekyll/build +/lib/jekyll/regenerator.rb @jekyll/build +/lib/jekyll/related_posts.rb @jekyll/build +/lib/jekyll/renderer.rb @jekyll/build +/lib/jekyll/site.rb @jekyll/build +/lib/jekyll/static_file.rb @jekyll/build +/lib/jekyll/stevenson.rb @jekyll/build +/lib/jekyll/tags/ @jekyll/build +/lib/jekyll/url.rb @jekyll/build +/lib/jekyll/utils/ @jekyll/build +/lib/jekyll/utils.rb @jekyll/build + +# @jekyll/ecosystem +/lib/jekyll/external.rb @jekyll/ecosystem +/lib/jekyll/generator.rb @jekyll/ecosystem +/lib/jekyll/hooks.rb @jekyll/ecosystem +/lib/jekyll/plugin.rb @jekyll/ecosystem +/lib/jekyll/plugin_manager.rb @jekyll/ecosystem +/lib/jekyll/theme.rb @jekyll/ecosystem +/lib/jekyll/theme_builder.rb @jekyll/ecosystem + +# @jekyll/stability +Gemfile @jekyll/stability +*.gemspec @jekyll/stability +.travis.yml @jekyll/stability +appveyor.yml @jekyll/stability +/lib/jekyll/configuration.rb @jekyll/stability +/lib/jekyll/deprecator.rb @jekyll/stability +/lib/jekyll/frontmatter_defaults.rb @jekyll/stability +/lib/site_template @jekyll/stability +/lib/theme_template @jekyll/stability +/features/ @jekyll/stability +/test/ @jekyll/stability + +# Special cases +.github/ @jekyll/affinity-team-captains +CODEOWNERS @jekyll/affinity-team-captains +CONDUCT.markdown @jekyll/affinity-team-captains +History.markdown @jekyll/affinity-team-captains +LICENSE @jekyll/affinity-team-captains # This file should never change. +README.markdown @jekyll/affinity-team-captains +/lib/jekyll/version.rb @jekyll/affinity-team-captains +/rake/ @jekyll/affinity-team-captains +/script/ @jekyll/affinity-team-captains From f232e1039af7a5d19ee7d15db043fd64f88eef4d Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Fri, 18 Aug 2017 18:18:34 +0200 Subject: [PATCH 2341/4996] move CODEOWNERS to .github --- CODEOWNERS => .github/CODEOWNERS | 1 - 1 file changed, 1 deletion(-) rename CODEOWNERS => .github/CODEOWNERS (98%) diff --git a/CODEOWNERS b/.github/CODEOWNERS similarity index 98% rename from CODEOWNERS rename to .github/CODEOWNERS index d3d2214518e..67a51c50667 100644 --- a/CODEOWNERS +++ b/.github/CODEOWNERS @@ -77,7 +77,6 @@ appveyor.yml @jekyll/stability # Special cases .github/ @jekyll/affinity-team-captains -CODEOWNERS @jekyll/affinity-team-captains CONDUCT.markdown @jekyll/affinity-team-captains History.markdown @jekyll/affinity-team-captains LICENSE @jekyll/affinity-team-captains # This file should never change. From f2860047b7e012e20f6dbce3ae43b0d9c4acf9b6 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Fri, 18 Aug 2017 18:20:24 +0200 Subject: [PATCH 2342/4996] /cc a team is now handled by CODEOWNERS --- .github/ISSUE_TEMPLATE.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index b1d43598e2c..fdba86159e2 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -10,9 +10,6 @@ a generic usage question, please consider asking your question at https://talk.jekyllrb.com where non-bug questions go. - Please make sure to mention an affinity team whose responsibilities - most closely align with your issue. - Thanks! --> @@ -79,5 +76,3 @@ The minimum should be personal information. Though we normally don't log anything like that so there should be no need to alter it. --> - -/cc include any Jekyll affinity teams here (see https://teams.jekyllrb.com/ for more info) From 08840946f3a142ec04d41618234db067092cfce9 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 18 Aug 2017 12:42:58 -0400 Subject: [PATCH 2343/4996] Update history to reflect merge of #6320 [ci skip] --- History.markdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/History.markdown b/History.markdown index e11de9c77da..189466ffa83 100644 --- a/History.markdown +++ b/History.markdown @@ -9,7 +9,8 @@ * 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) + * script/backport-pr: commit message no longer includes the `#` (#6289) + * Add Add CODEOWNERS file to help automate reviews. (#6320) ### Minor Enhancements From 232ec4679a808f0f3371e5326ff856a8a635334b Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 18 Aug 2017 12:45:23 -0400 Subject: [PATCH 2344/4996] Allow `yield` to logger methods & bail early on no-op messages (#6315) Merge pull request 6315 --- lib/jekyll/log_adapter.rb | 64 ++++++++++++++++++++++++++++----------- test/helper.rb | 7 +++-- test/test_log_adapter.rb | 24 ++++++++++----- test/test_new_command.rb | 13 +++----- test/test_site.rb | 8 ++--- 5 files changed, 78 insertions(+), 38 deletions(-) diff --git a/lib/jekyll/log_adapter.rb b/lib/jekyll/log_adapter.rb index ec33b4d90d8..65b8f9deb7b 100644 --- a/lib/jekyll/log_adapter.rb +++ b/lib/jekyll/log_adapter.rb @@ -2,7 +2,7 @@ module Jekyll class LogAdapter - attr_reader :writer, :messages + attr_reader :writer, :messages, :level LOG_LEVELS = { :debug => ::Logger::DEBUG, @@ -30,6 +30,7 @@ def initialize(writer, level = :info) # Returns nothing def log_level=(level) writer.level = LOG_LEVELS.fetch(level) + @level = level end def adjust_verbosity(options = {}) @@ -48,8 +49,8 @@ def adjust_verbosity(options = {}) # message - the message detail # # Returns nothing - def debug(topic, message = nil) - writer.debug(message(topic, message)) + def debug(topic, message = nil, &block) + write(:debug, topic, message, &block) end # Public: Print a message @@ -58,8 +59,8 @@ def debug(topic, message = nil) # message - the message detail # # Returns nothing - def info(topic, message = nil) - writer.info(message(topic, message)) + def info(topic, message = nil, &block) + write(:info, topic, message, &block) end # Public: Print a message @@ -68,8 +69,8 @@ def info(topic, message = nil) # message - the message detail # # Returns nothing - def warn(topic, message = nil) - writer.warn(message(topic, message)) + def warn(topic, message = nil, &block) + write(:warn, topic, message, &block) end # Public: Print an error message @@ -78,8 +79,8 @@ def warn(topic, message = nil) # message - the message detail # # Returns nothing - def error(topic, message = nil) - writer.error(message(topic, message)) + def error(topic, message = nil, &block) + write(:error, topic, message, &block) end # Public: Print an error message and immediately abort the process @@ -88,8 +89,8 @@ def error(topic, message = nil) # message - the message detail (can be omitted) # # Returns nothing - def abort_with(topic, message = nil) - error(topic, message) + def abort_with(topic, message = nil, &block) + error(topic, message, &block) abort end @@ -99,19 +100,48 @@ def abort_with(topic, message = nil) # message - the message detail # # Returns the formatted message - def message(topic, message) - msg = formatted_topic(topic) + message.to_s.gsub(%r!\s+!, " ") - messages << msg - msg + def message(topic, message = nil) + raise ArgumentError, "block or message, not both" if block_given? && message + + message = yield if block_given? + message = message.to_s.gsub(%r!\s+!, " ") + topic = formatted_topic(topic, block_given?) + out = topic + message + messages << out + out end # Internal: Format the topic # # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc. + # colon - # # Returns the formatted topic statement - def formatted_topic(topic) - "#{topic} ".rjust(20) + def formatted_topic(topic, colon = false) + "#{topic}#{colon ? ": " : " "}".rjust(20) + end + + # Internal: Check if the message should be written given the log level. + # + # level_of_message - the Symbol level of message, one of :debug, :info, :warn, :error + # + # Returns whether the message should be written. + def write_message?(level_of_message) + LOG_LEVELS.fetch(level) <= LOG_LEVELS.fetch(level_of_message) + end + + # Internal: Log a message. + # + # level_of_message - the Symbol level of message, one of :debug, :info, :warn, :error + # topic - the String topic or full message + # message - the String message (optional) + # block - a block containing the message (optional) + # + # Returns false if the message was not written, otherwise returns the value of calling + # the appropriate writer method, e.g. writer.info. + def write(level_of_message, topic, message = nil, &block) + return false unless write_message?(level_of_message) + writer.public_send(level_of_message, message(topic, message, &block)) end end end diff --git a/test/helper.rb b/test/helper.rb index 3f3227bab4f..672fedd2862 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -32,7 +32,7 @@ def jruby? require "rspec/mocks" require_relative "../lib/jekyll.rb" -Jekyll.logger = Logger.new(StringIO.new) +Jekyll.logger = Logger.new(StringIO.new, :error) unless jruby? require "rdiscount" @@ -168,12 +168,15 @@ def with_env(key, value) ENV[key] = old_value end - def capture_output + def capture_output(level = :debug) buffer = StringIO.new Jekyll.logger = Logger.new(buffer) + Jekyll.logger.log_level = level yield buffer.rewind buffer.string.to_s + ensure + Jekyll.logger = Logger.new(StringIO.new, :error) end alias_method :capture_stdout, :capture_output alias_method :capture_stderr, :capture_output diff --git a/test/test_log_adapter.rb b/test/test_log_adapter.rb index 2bcd2f1d7c9..b15dca5020b 100644 --- a/test/test_log_adapter.rb +++ b/test/test_log_adapter.rb @@ -53,7 +53,7 @@ def error(*); end should "call #debug on writer return true" do writer = LoggerDouble.new - logger = Jekyll::LogAdapter.new(writer) + logger = Jekyll::LogAdapter.new(writer, :debug) allow(writer).to receive(:debug).and_return(true) assert logger.adjust_verbosity end @@ -62,7 +62,7 @@ def error(*); end context "#debug" do should "call #debug on writer return true" do writer = LoggerDouble.new - logger = Jekyll::LogAdapter.new(writer) + logger = Jekyll::LogAdapter.new(writer, :debug) allow(writer).to receive(:debug) .with("topic ".rjust(20) + "log message").and_return(true) assert logger.debug("topic", "log message") @@ -72,7 +72,7 @@ def error(*); end context "#info" do should "call #info on writer return true" do writer = LoggerDouble.new - logger = Jekyll::LogAdapter.new(writer) + logger = Jekyll::LogAdapter.new(writer, :info) allow(writer).to receive(:info) .with("topic ".rjust(20) + "log message").and_return(true) assert logger.info("topic", "log message") @@ -82,7 +82,7 @@ def error(*); end context "#warn" do should "call #warn on writer return true" do writer = LoggerDouble.new - logger = Jekyll::LogAdapter.new(writer) + logger = Jekyll::LogAdapter.new(writer, :warn) allow(writer).to receive(:warn) .with("topic ".rjust(20) + "log message").and_return(true) assert logger.warn("topic", "log message") @@ -92,7 +92,7 @@ def error(*); end context "#error" do should "call #error on writer return true" do writer = LoggerDouble.new - logger = Jekyll::LogAdapter.new(writer) + logger = Jekyll::LogAdapter.new(writer, :error) allow(writer).to receive(:error) .with("topic ".rjust(20) + "log message").and_return(true) assert logger.error("topic", "log message") @@ -101,7 +101,7 @@ def error(*); end context "#abort_with" do should "call #error and abort" do - logger = Jekyll::LogAdapter.new(LoggerDouble.new) + logger = Jekyll::LogAdapter.new(LoggerDouble.new, :error) allow(logger).to receive(:error).with("topic", "log message").and_return(true) assert_raises(SystemExit) { logger.abort_with("topic", "log message") } end @@ -113,7 +113,7 @@ def error(*); end end should "store each log value in the array" do - logger = Jekyll::LogAdapter.new(LoggerDouble.new) + logger = Jekyll::LogAdapter.new(LoggerDouble.new, :debug) values = %w(one two three four) logger.debug(values[0]) logger.info(values[1]) @@ -122,4 +122,14 @@ def error(*); end assert_equal values.map { |value| "#{value} ".rjust(20) }, logger.messages end end + + context "#write_message?" do + should "return false up to the desired logging level" do + subject = Jekyll::LogAdapter.new(LoggerDouble.new, :warn) + refute subject.write_message?(:debug), "Should not print debug messages" + refute subject.write_message?(:info), "Should not print info messages" + assert subject.write_message?(:warn), "Should print warn messages" + assert subject.write_message?(:error), "Should print error messages" + end + end end diff --git a/test/test_new_command.rb b/test/test_new_command.rb index c2b7def4001..632ad3d57c6 100644 --- a/test/test_new_command.rb +++ b/test/test_new_command.rb @@ -22,7 +22,7 @@ def site_template end teardown do - FileUtils.rm_r @full_path + FileUtils.rm_r @full_path if File.directory?(@full_path) end should "create a new directory" do @@ -41,8 +41,7 @@ def site_template end should "display a success message" do - Jekyll::Commands::New.process(@args) - output = Jekyll.logger.messages + output = capture_output { Jekyll::Commands::New.process(@args) } success_message = "New jekyll site installed in #{@full_path.cyan}. " bundle_message = "Running bundle install in #{@full_path.cyan}... " assert_includes output, success_message @@ -88,8 +87,7 @@ def site_template should "create blank project" do blank_contents = %w(/_drafts /_layouts /_posts /index.html) - capture_output { Jekyll::Commands::New.process(@args, "--blank") } - output = Jekyll.logger.messages.last + output = capture_output { Jekyll::Commands::New.process(@args, "--blank") } bundle_message = "Running bundle install in #{@full_path.cyan}..." assert_same_elements blank_contents, dir_contents(@full_path) refute_includes output, bundle_message @@ -98,12 +96,11 @@ def site_template should "force created folder" do capture_output { Jekyll::Commands::New.process(@args) } output = capture_output { Jekyll::Commands::New.process(@args, "--force") } - assert_match(%r!New jekyll site installed in!, output) + assert_match %r!New jekyll site installed in!, output end should "skip bundle install when opted to" do - capture_output { Jekyll::Commands::New.process(@args, "--skip-bundle") } - output = Jekyll.logger.messages.last + output = capture_output { Jekyll::Commands::New.process(@args, "--skip-bundle") } bundle_message = "Bundle install skipped." assert_includes output, bundle_message end diff --git a/test/test_site.rb b/test/test_site.rb index adc69e33436..f50990e0511 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -562,13 +562,13 @@ def convert(*_args) end expected_msg = "Theme: value of 'theme' in config should be String " \ "to use gem-based themes, but got Hash\n" - assert output.end_with?(expected_msg), - "Expected #{output.inspect} to end with #{expected_msg.inspect}" + assert_includes output, expected_msg end should "set a theme if the config is a string" do - expect($stderr).not_to receive(:puts) - expect($stdout).not_to receive(:puts) + [:debug, :info, :warn, :error].each do |level| + expect(Jekyll.logger.writer).not_to receive(level) + end site = fixture_site({ "theme" => "test-theme" }) assert_instance_of Jekyll::Theme, site.theme assert_equal "test-theme", site.theme.name From 02767d612e1aec4833515aa4db3aab1082863405 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 18 Aug 2017 12:45:24 -0400 Subject: [PATCH 2345/4996] Update history to reflect merge of #6315 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 189466ffa83..1e938f5bab2 100644 --- a/History.markdown +++ b/History.markdown @@ -21,6 +21,7 @@ * set `LiquidError#template_name` for errors in included file (#6206) * Access custom config array throughout session (#6200) * Add support for Rouge 2, in addition to Rouge 1 (#5919) + * Allow `yield` to logger methods & bail early on no-op messages (#6315) ### Bug Fixes From 2321370119203ef44fecab4246098fcce0517c42 Mon Sep 17 00:00:00 2001 From: Antonio Argote Date: Sat, 19 Aug 2017 00:46:54 +0800 Subject: [PATCH 2346/4996] trim plugins page, clarify intention of templates (#6311) Merge pull request 6311 --- docs/_docs/plugins.md | 30 ++++++++++++++++-------------- docs/_docs/resources.md | 8 ++++++++ docs/_docs/templates.md | 33 +++++++++------------------------ 3 files changed, 33 insertions(+), 38 deletions(-) diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md index d630b106cf6..ae55aa23d01 100644 --- a/docs/_docs/plugins.md +++ b/docs/_docs/plugins.md @@ -31,21 +31,26 @@ Jekyll generates your site. values of the gem names of the plugins you'd like to use. An example: - plugins: [jekyll-coffeescript, jekyll-watch, jekyll-assets] + plugins: + - jekyll-gist + - jekyll-coffeescript + - jekyll-assets + - another-jekyll-plugin # This will require each of these plugins automatically. - Then install your plugins using `gem install jekyll-coffeescript jekyll-watch jekyll-assets` + 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 "my-jekyll-plugin" + 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`.
    @@ -59,7 +64,7 @@ values of the gem names of the plugins you'd like to use. An example:

    -In general, plugins you make will fall into one of five categories: +In general, plugins you make will fall broadly into one of five categories: 1. [Generators](#generators) 2. [Converters](#converters) @@ -67,6 +72,8 @@ In general, plugins you make will fall into one of five categories: 4. [Tags](#tags) 5. [Hooks](#hooks) +See the bottom of the page for a [list of available plugins](#available-plugins) + ## Generators You can create a generator when you need Jekyll to create additional content @@ -810,6 +817,9 @@ LESS.js files during generation. #### Tags +You can find a few useful plugins at the following locations: + +- [Jekyll-gist](https://github.com/jekyll/jekyll-gist): Use the `gist` tag to easily embed a GitHub Gist onto your site. This works with public or secret gists. - [Asset Path Tag](https://github.com/samrayner/jekyll-asset-path-plugin) by [Sam Rayner](http://www.samrayner.com/): Allows organisation of assets into subdirectories by outputting a path for a given file relative to the current post or page. - [Delicious Plugin by Christian Hellsten](https://github.com/christianhellsten/jekyll-plugins): Fetches and renders bookmarks from delicious.com. - [Ultraviolet Plugin by Steve Alex](https://gist.github.com/480380): Jekyll tag for the [Ultraviolet](https://github.com/grosser/ultraviolet) code highligher. @@ -930,14 +940,6 @@ LESS.js files during generation. - [jekyll-numbered-headings](https://github.com/muratayusuke/jekyll-numbered-headings): Adds ordered number to headings. - [jekyll-pre-commit](https://github.com/mpchadwick/jekyll-pre-commit): A framework for running checks against your posts using a git pre-commit hook before you publish them. -#### Editors - -- [sublime-jekyll](https://github.com/23maverick23/sublime-jekyll): A Sublime Text package for Jekyll static sites. This package should help creating Jekyll sites and posts easier by providing access to key template tags and filters, as well as common completions and a current date/datetime command (for dating posts). You can install this package manually via GitHub, or via [Package Control](https://packagecontrol.io/packages/Jekyll). -- [vim-jekyll](https://github.com/parkr/vim-jekyll): A vim plugin to generate - new posts and run `jekyll build` all without leaving vim. -- [markdown-writer](https://atom.io/packages/markdown-writer): An Atom package for Jekyll. It can create new posts/drafts, manage tags/categories, insert link/images and add many useful key mappings. -- [Wordpress2Jekyll](https://wordpress.org/plugins/wp2jekyll/): A Wordpress plugin that allows you to use Wordpress as your editor and (automatically) export content in to Jekyll. WordPress2Jekyll attempts to marry these two systems together in order to make a site that can be easily managed from all devices. -
    Jekyll Plugins Wanted

    diff --git a/docs/_docs/resources.md b/docs/_docs/resources.md index 0f90fae8f25..a8da04c5d24 100644 --- a/docs/_docs/resources.md +++ b/docs/_docs/resources.md @@ -5,6 +5,14 @@ permalink: /docs/resources/ Jekyll’s growing use is producing a wide variety of tutorials, frameworks, extensions, examples, and other resources that can be very helpful. Below is a collection of links to some of the most popular Jekyll resources. +#### Editors + +- [sublime-jekyll](https://github.com/23maverick23/sublime-jekyll): A Sublime Text package for Jekyll static sites. This package should help creating Jekyll sites and posts easier by providing access to key template tags and filters, as well as common completions and a current date/datetime command (for dating posts). You can install this package manually via GitHub, or via [Package Control](https://packagecontrol.io/packages/Jekyll). +- [vim-jekyll](https://github.com/parkr/vim-jekyll): A vim plugin to generate + new posts and run `jekyll build` all without leaving vim. +- [markdown-writer](https://atom.io/packages/markdown-writer): An Atom package for Jekyll. It can create new posts/drafts, manage tags/categories, insert link/images and add many useful key mappings. +- [Wordpress2Jekyll](https://wordpress.org/plugins/wp2jekyll/): A Wordpress plugin that allows you to use Wordpress as your editor and (automatically) export content in to Jekyll. WordPress2Jekyll attempts to marry these two systems together in order to make a site that can be easily managed from all devices. + ### Useful Guides - [Jekyll Tips](http://jekyll.tips) is a set of resources created by [CloudCannon](https://cloudcannon.com) to help folks get up and running with Jekyll. They cover all skill levels, and even include some great video tutorials. diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md index 40a3e0327e9..c37b93b5b97 100644 --- a/docs/_docs/templates.md +++ b/docs/_docs/templates.md @@ -6,8 +6,9 @@ permalink: /docs/templates/ Jekyll uses the [Liquid](https://shopify.github.io/liquid/) templating language to process templates. All of the standard Liquid [tags](https://shopify.github.io/liquid/tags/control-flow/) and [filters](https://shopify.github.io/liquid/filters/abs/) are -supported. Jekyll even adds a few handy filters and tags of its own to make -common tasks easier. +supported. To make common tasks easier, Jekyll even adds a few handy filters +and tags of its own, all of which you can find on this page. Jekyll even lets +you come up with your own tags via plugins. ## Filters @@ -418,6 +419,11 @@ The default is `default`. They are as follows (with what they filter): ## Tags +* [Includes](#includes) +* [Code snippet highlighting](#code-snippet-highlighting) +* [Linking to pages, collections and posts (the new and improved way)](#links) +* [Linking to posts (the old way)](#linking-to-posts) + ### Includes 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: @@ -488,27 +494,6 @@ site. If you use `linenos`, you might want to include an additional CSS class definition for the `.lineno` class in `syntax.css` to distinguish the line numbers from the highlighted code. -### Gist - -Use the `gist` tag to easily embed a GitHub Gist onto your site. This works -with public or secret gists: - -```liquid -{% raw %} -{% gist parkr/931c1c8d465a04042403 %} -{% endraw %} -``` - -You may also optionally specify the filename in the gist to display: - -```liquid -{% raw %} -{% gist parkr/931c1c8d465a04042403 jekyll-private-gist.markdown %} -{% endraw %} -``` - -To use the `gist` tag, you'll need to add the -[jekyll-gist](https://github.com/jekyll/jekyll-gist) gem to your project. ## Links @@ -546,7 +531,7 @@ For example, suppose you're creating a link in `page_a.md` (stored in `pages/fol If you're unsure of the path, add `{% raw %}{{ page.path }}{% endraw %}` to the page and it will display the path. -One major benefit of using the `link` tag is link validation. If the link doesn't exist, Jekyll won't build your site. This is a good thing, as it will alert you to a broken link so you can fix it (rather than allowing you to build and deploy a site with broken links). +One major benefit of using the `link` or `post_url` tag is link validation. If the link doesn't exist, Jekyll won't build your site. This is a good thing, as it will alert you to a broken link so you can fix it (rather than allowing you to build and deploy a site with broken links). Note you cannot add filters to `link` tags. For example, you cannot append a string using Liquid filters, such as `{% raw %}{% link mypage.html | append: "#section1" %} {% endraw %}`. To link to sections on a page, you will need to use regular HTML or Markdown linking techniques. From 22449496b834e39e87871e64b1cc20c4e4502cbc Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 18 Aug 2017 12:46:56 -0400 Subject: [PATCH 2347/4996] Update history to reflect merge of #6311 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 1e938f5bab2..6fb43a6019d 100644 --- a/History.markdown +++ b/History.markdown @@ -45,6 +45,7 @@ * Execute build command using bundle. (#6274) * name unification - buddy details (#6317) * name unification - application index (#6318) + * trim and relocate plugin info across docs (#6311) ### Site Enhancements From 72877a9b078a044279fa6caf4f4e71f26dd5c637 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Fri, 18 Aug 2017 19:20:37 +0200 Subject: [PATCH 2348/4996] update links (#6321) Merge pull request 6321 --- README.markdown | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.markdown b/README.markdown index 9718f24d52b..b38ed6fa6a4 100644 --- a/README.markdown +++ b/README.markdown @@ -22,7 +22,9 @@ Jekyll is a simple, blog-aware, static site generator perfect for personal, proj Jekyll does what you tell it to do — no more, no less. It doesn't try to outsmart users by making bold assumptions, nor does it burden them with needless complexity and configuration. Put simply, Jekyll gets out of your way and allows you to concentrate on what truly matters: your content. -## Having trouble with OS X/macOS? +See: https://jekyllrb.com/philosophy + +## Having trouble? See: https://jekyllrb.com/docs/troubleshooting/ @@ -43,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 maintainer ([@parkr](https://github.com/parkr), [@envygeeks](https://github.com/envygeeks), [@mattr-](https://github.com/mattr-), or [@alfredxing](https://github.com/alfredxing)) know and we will address it as soon as possible. +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. ## Diving In From d08256d1cec4218143de55ce5dfcb0c2deaffe3c Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 18 Aug 2017 13:20:39 -0400 Subject: [PATCH 2349/4996] Update history to reflect merge of #6321 [ci skip] --- History.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/History.markdown b/History.markdown index 6fb43a6019d..2d72a30d9ac 100644 --- a/History.markdown +++ b/History.markdown @@ -1,5 +1,7 @@ ## HEAD + * update Jekyll's README (#6321) + ### Development Fixes * Strip unnecessary leading whitespace in template (#6228) From ee23d065072a574a7eec70ea7f8b37278621eafe Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Sat, 19 Aug 2017 00:01:02 +0200 Subject: [PATCH 2350/4996] add SUPPORT file for GitHub (#6324) Merge pull request 6324 --- .github/CONTRIBUTING.markdown | 5 +---- .github/SUPPORT.md | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 .github/SUPPORT.md diff --git a/.github/CONTRIBUTING.markdown b/.github/CONTRIBUTING.markdown index 14442f6dc55..fe53b2f3682 100644 --- a/.github/CONTRIBUTING.markdown +++ b/.github/CONTRIBUTING.markdown @@ -4,10 +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 -* 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/.github/SUPPORT.md b/.github/SUPPORT.md new file mode 100644 index 00000000000..0939723dff8 --- /dev/null +++ b/.github/SUPPORT.md @@ -0,0 +1,20 @@ +# Jekyll Support + +## 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 — 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 — 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'! From 5cc2b6affc821996e043e6661de4f6dd390e9c08 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 18 Aug 2017 18:01:03 -0400 Subject: [PATCH 2351/4996] Update history to reflect merge of #6324 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 2d72a30d9ac..2448112e2fe 100644 --- a/History.markdown +++ b/History.markdown @@ -1,6 +1,7 @@ ## HEAD * update Jekyll's README (#6321) + * add SUPPORT file for GitHub (#6324) ### Development Fixes From 1d3fa81d53178189c788af798ef37c5d6271fe22 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Sat, 19 Aug 2017 13:11:29 +0200 Subject: [PATCH 2352/4996] plugins is the new gems (#6326) Merge pull request 6326 --- docs/_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_config.yml b/docs/_config.yml index ab3d4bf3aa1..044cb386c95 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -46,7 +46,7 @@ twitter: logo: /img/logo-2x.png -gems: +plugins: - jekyll-avatar - jekyll-feed - jekyll-mentions From 851c36d8283730d9972b55a9804199edec979675 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sat, 19 Aug 2017 07:11:30 -0400 Subject: [PATCH 2353/4996] Update history to reflect merge of #6326 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 2448112e2fe..bd64aa87d59 100644 --- a/History.markdown +++ b/History.markdown @@ -2,6 +2,7 @@ * update Jekyll's README (#6321) * add SUPPORT file for GitHub (#6324) + * Plugins is the new gems (#6326) ### Development Fixes From df25873ed4724df3cb78ba98fa46465a6157ca4d Mon Sep 17 00:00:00 2001 From: David Zhang Date: Sat, 19 Aug 2017 19:19:59 +0800 Subject: [PATCH 2354/4996] Rename CODE_OF_CONDUCT to show in banner (#6325) Merge pull request 6325 --- .github/CODEOWNERS | 2 +- CONDUCT.markdown => CODE_OF_CONDUCT.markdown | 0 README.markdown | 2 +- rake/site.rake | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename CONDUCT.markdown => CODE_OF_CONDUCT.markdown (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 67a51c50667..a6f9434cb94 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -77,7 +77,7 @@ appveyor.yml @jekyll/stability # Special cases .github/ @jekyll/affinity-team-captains -CONDUCT.markdown @jekyll/affinity-team-captains +CODE_OF_CONDUCT.markdown @jekyll/affinity-team-captains History.markdown @jekyll/affinity-team-captains LICENSE @jekyll/affinity-team-captains # This file should never change. README.markdown @jekyll/affinity-team-captains diff --git a/CONDUCT.markdown b/CODE_OF_CONDUCT.markdown similarity index 100% rename from CONDUCT.markdown rename to CODE_OF_CONDUCT.markdown diff --git a/README.markdown b/README.markdown index b38ed6fa6a4..1350d019e0b 100644 --- a/README.markdown +++ b/README.markdown @@ -39,7 +39,7 @@ See: https://jekyllrb.com/docs/troubleshooting/ ## Code of Conduct In order to have a more open and welcoming community, Jekyll adheres to a -[code of conduct](CONDUCT.markdown) adapted from the Ruby on Rails code of +[code of conduct](CODE_OF_CONDUCT.markdown) adapted from the Ruby on Rails code of conduct. Please adhere to this code of conduct in any interactions you have in the diff --git a/rake/site.rake b/rake/site.rake index 94aa969ea22..15680b15afe 100644 --- a/rake/site.rake +++ b/rake/site.rake @@ -69,7 +69,7 @@ namespace :site do "redirect_from" => "/conduct/index.html", "editable" => false, } - siteify_file("CONDUCT.markdown", front_matter) + siteify_file("CODE_OF_CONDUCT.markdown", front_matter) end desc "Copy the contributing file" From 2989a9a81be6e374af08832cf1d7d2f24f73eac1 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sat, 19 Aug 2017 07:20:01 -0400 Subject: [PATCH 2355/4996] Update history to reflect merge of #6325 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index bd64aa87d59..44c94640fb8 100644 --- a/History.markdown +++ b/History.markdown @@ -3,6 +3,7 @@ * update Jekyll's README (#6321) * add SUPPORT file for GitHub (#6324) * Plugins is the new gems (#6326) + * Rename CODE_OF_CONDUCT to show in banner (#6325) ### Development Fixes From f808593fbf1e7b5f28c7338cbbdbcee26e6b8b2a Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Sat, 19 Aug 2017 15:54:18 +0200 Subject: [PATCH 2356/4996] Fix History Some of the latest PRs weren't affected to the good category. My bad. Note to self: Space matters. :milky_way: --- History.markdown | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/History.markdown b/History.markdown index 44c94640fb8..4d1b3abde24 100644 --- a/History.markdown +++ b/History.markdown @@ -1,10 +1,5 @@ ## HEAD - * update Jekyll's README (#6321) - * add SUPPORT file for GitHub (#6324) - * Plugins is the new gems (#6326) - * Rename CODE_OF_CONDUCT to show in banner (#6325) - ### Development Fixes * Strip unnecessary leading whitespace in template (#6228) @@ -51,11 +46,15 @@ * name unification - buddy details (#6317) * name unification - application index (#6318) * trim and relocate plugin info across docs (#6311) - + * update Jekyll's README (#6321) + * add SUPPORT file for GitHub (#6324) + * Rename CODE_OF_CONDUCT to show in banner (#6325) + ### Site Enhancements * Adding DevKit helpers (#6225) * Customizing url in collection elements clarified (#6264) + * Plugins is the new gems (#6326) ## 3.5.2 / 2017-08-12 From 88f5af23b13d097b22de0edf710bd284a65e8a77 Mon Sep 17 00:00:00 2001 From: Antonio Argote Date: Wed, 23 Aug 2017 05:55:59 +0800 Subject: [PATCH 2357/4996] document application of page.id (#6329) Merge pull request 6329 --- docs/_docs/variables.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/_docs/variables.md b/docs/_docs/variables.md index f32bddd6d9d..cec351968b5 100644 --- a/docs/_docs/variables.md +++ b/docs/_docs/variables.md @@ -265,8 +265,9 @@ following is a reference of the available data.

    page.id

    - An identifier unique to the Post (useful in RSS feeds). e.g. + An identifier unique to a document in a Collection or a Post (useful in RSS feeds). e.g. /2008/12/14/my-post + /my-collection/my-document

    From fe0c105ff066304f9b4698b977bf5fd049d2f96a Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 22 Aug 2017 17:56:00 -0400 Subject: [PATCH 2358/4996] Update history to reflect merge of #6329 [ci skip] --- History.markdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/History.markdown b/History.markdown index 4d1b3abde24..87cbdcb9902 100644 --- a/History.markdown +++ b/History.markdown @@ -49,7 +49,8 @@ * update Jekyll's README (#6321) * add SUPPORT file for GitHub (#6324) * Rename CODE_OF_CONDUCT to show in banner (#6325) - + * Docs : illustrate page.id for a collection's document (#6329) + ### Site Enhancements * Adding DevKit helpers (#6225) From 709a3444de5aa0060b9ff936c3b3c543118c06ed Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 23 Aug 2017 12:56:09 -0400 Subject: [PATCH 2359/4996] Release :gem: 3.6.0.pre.beta1 --- lib/jekyll/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index 46b238124be..3a69700216e 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Jekyll - VERSION = "3.5.2".freeze + VERSION = "3.6.0.pre.beta1".freeze end From 1a7bcb09f648b26bad6a39e89c8e564f4786b9f9 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Mon, 28 Aug 2017 21:00:44 +0200 Subject: [PATCH 2360/4996] Docs: post's date can be overriden in YAML front matter (#6334) Merge pull request 6334 --- docs/_docs/permalinks.md | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/docs/_docs/permalinks.md b/docs/_docs/permalinks.md index f0e16770b36..42e68e85ff8 100644 --- a/docs/_docs/permalinks.md +++ b/docs/_docs/permalinks.md @@ -66,7 +66,10 @@ The following table lists the template variables available for permalinks. You c

    year

    -

    Year from the post's filename

    +

    + Year from the post's filename. May be overridden via the document’s + date YAML front matter +

    @@ -74,7 +77,10 @@ The following table lists the template variables available for permalinks. You c

    month

    -

    Month from the post's filename

    +

    + Month from the post's filename. May be overridden via the document’s + date YAML front matter +

    @@ -82,7 +88,10 @@ The following table lists the template variables available for permalinks. You c

    i_month

    -

    Month from the post's filename without leading zeros.

    +

    + Month without leading zeros from the post's filename. May be + overridden via the document’s date YAML front matter +

    @@ -90,7 +99,10 @@ The following table lists the template variables available for permalinks. You c

    day

    -

    Day from the post's filename

    +

    + Day from the post's filename. May be overridden via the document’s + date YAML front matter +

    @@ -98,7 +110,10 @@ The following table lists the template variables available for permalinks. You c

    i_day

    -

    Day from the post's filename without leading zeros.

    +

    + Day without leading zeros from the post's filename. May be overridden + via the document’s date YAML front matter +

    @@ -106,7 +121,10 @@ The following table lists the template variables available for permalinks. You c

    short_year

    -

    Year from the post's filename without the century.

    +

    + Year without the century from the post's filename. May be overridden + via the document’s date YAML front matter +

    @@ -115,7 +133,8 @@ The following table lists the template variables available for permalinks. You c

    - Hour of the day, 24-hour clock, zero-padded from the post's date front matter. (00..23) + Hour of the day, 24-hour clock, zero-padded from the post's + date front matter. (00..23)

    From 0aa55dbffb3aa3e15e57ff791aa9395335e9efb7 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 28 Aug 2017 15:00:46 -0400 Subject: [PATCH 2361/4996] Update history to reflect merge of #6334 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 87cbdcb9902..46d577c1bcc 100644 --- a/History.markdown +++ b/History.markdown @@ -50,6 +50,7 @@ * add SUPPORT file for GitHub (#6324) * Rename CODE_OF_CONDUCT to show in banner (#6325) * Docs : illustrate page.id for a collection's document (#6329) + * Docs: post's date can be overriden in YAML front matter (#6334) ### Site Enhancements From 06d16504ff6774388bc022ee986babde1caecc81 Mon Sep 17 00:00:00 2001 From: Natanael Arndt Date: Wed, 30 Aug 2017 14:48:15 +0200 Subject: [PATCH 2362/4996] Docs: `site.url` behavior on development and production environments (#6270) Merge pull request 6270 --- docs/_docs/variables.md | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/docs/_docs/variables.md b/docs/_docs/variables.md index cec351968b5..5bb44e6b276 100644 --- a/docs/_docs/variables.md +++ b/docs/_docs/variables.md @@ -185,17 +185,32 @@ following is a reference of the available data.

    + +

    site.url

    +

    + + Contains the url of your site as it is configured in the _config.yml. + For example, if you have url: http://mysite.com + in your configuration file, then it will be accessible in Liquid as + site.url. For the development environment there is + an exception, + if you are running jekyll serve in a development environment + site.url will be set to the value of host, + port, and SSL-related options. This defaults to + url: http://localhost:4000). + +

    +

    site.[CONFIGURATION_DATA]

    All the variables set via the command line and your _config.yml are available through the site - variable. For example, if you have url: http://mysite.com - in your configuration file, then in your Posts and Pages it will be - stored in site.url. Jekyll does not parse changes to - _config.yml in watch mode, you must restart - Jekyll to see changes to variables. + variable. For example, if you have foo: bar + in your configuration file, then it will be accessible in Liquid as site.foo. + Jekyll does not parse changes to _config.yml in + watch mode, you must restart Jekyll to see changes to variables.

    From e2b3ab85a030e1bf6f2853e330a2a44dd0070b8c Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 30 Aug 2017 08:48:16 -0400 Subject: [PATCH 2363/4996] Update history to reflect merge of #6270 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 46d577c1bcc..3aaf6f12c11 100644 --- a/History.markdown +++ b/History.markdown @@ -51,6 +51,7 @@ * Rename CODE_OF_CONDUCT to show in banner (#6325) * Docs : illustrate page.id for a collection's document (#6329) * Docs: post's date can be overriden in YAML front matter (#6334) + * Docs: `site.url` behavior on development and production environments (#6270) ### Site Enhancements From 692ce4946036f98f9b7414d3b5b4313218bb6967 Mon Sep 17 00:00:00 2001 From: Natanael Arndt Date: Wed, 30 Aug 2017 15:20:38 +0200 Subject: [PATCH 2364/4996] Fix typo in site.url section of variables.md :-[ (#6337) Merge pull request 6337 --- docs/_docs/variables.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_docs/variables.md b/docs/_docs/variables.md index 5bb44e6b276..0fac9e66152 100644 --- a/docs/_docs/variables.md +++ b/docs/_docs/variables.md @@ -197,7 +197,7 @@ following is a reference of the available data. if you are running jekyll serve in a development environment site.url will be set to the value of host, port, and SSL-related options. This defaults to - url: http://localhost:4000). + url: http://localhost:4000.

    From 6a2a33d09d614377e62eba804496ad37ab63f427 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 30 Aug 2017 09:20:40 -0400 Subject: [PATCH 2365/4996] Update history to reflect merge of #6337 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 3aaf6f12c11..eb8293179b0 100644 --- a/History.markdown +++ b/History.markdown @@ -52,6 +52,7 @@ * Docs : illustrate page.id for a collection's document (#6329) * Docs: post's date can be overriden in YAML front matter (#6334) * Docs: `site.url` behavior on development and production environments (#6270) + * Fix typo in site.url section of variables.md :-[ (#6337) ### Site Enhancements From 53500a215a1bc5c6fdb31e3b94e4b7714f65996b Mon Sep 17 00:00:00 2001 From: Bradley Meck Date: Wed, 30 Aug 2017 13:17:18 -0500 Subject: [PATCH 2366/4996] Update mime-types. (#6336) Merge pull request 6336 --- lib/jekyll/mime.types | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/lib/jekyll/mime.types b/lib/jekyll/mime.types index 15828b91c4c..af68d359e11 100644 --- a/lib/jekyll/mime.types +++ b/lib/jekyll/mime.types @@ -14,7 +14,7 @@ application/cdmi-domain cdmid application/cdmi-object cdmio application/cdmi-queue cdmiq application/cu-seeme cu -application/dash+xml mdp +application/dash+xml mpd application/davmount+xml davmount application/docbook+xml dbk application/dssc+der dssc @@ -26,16 +26,18 @@ application/exi exi application/font-tdpfr pfr application/font-woff woff application/font-woff2 woff2 +application/geo+json geojson application/gml+xml gml application/gpx+xml gpx application/gxf gxf +application/gzip gz application/hyperstudio stk application/inkml+xml ink inkml application/ipfix ipfix application/java-archive jar war ear application/java-serialized-object ser application/java-vm class -application/javascript js +application/javascript js mjs application/json json map application/json5 json5 application/jsonml+json jsonml @@ -142,6 +144,7 @@ application/vnd.anser-web-funds-transfer-initiation fti application/vnd.antix.game-component atx application/vnd.apple.installer+xml mpkg application/vnd.apple.mpegurl m3u8 +application/vnd.apple.pkpass pkpass application/vnd.aristanetworks.swi swi application/vnd.astraea-software.iota iota application/vnd.audiograph aep @@ -220,6 +223,9 @@ application/vnd.geonext gxt application/vnd.geoplan g2w application/vnd.geospace g3w application/vnd.gmx gmx +application/vnd.google-apps.document gdoc +application/vnd.google-apps.presentation gslides +application/vnd.google-apps.spreadsheet gsheet application/vnd.google-earth.kml+xml kml application/vnd.google-earth.kmz kmz application/vnd.grafeq gqf gqs @@ -317,6 +323,7 @@ application/vnd.ms-htmlhelp chm application/vnd.ms-ims ims application/vnd.ms-lrm lrm application/vnd.ms-officetheme thmx +application/vnd.ms-outlook msg application/vnd.ms-pki.seccat cat application/vnd.ms-pki.stl stl application/vnd.ms-powerpoint ppt pps pot @@ -422,6 +429,7 @@ application/vnd.stardivision.writer sdw vo application/vnd.stardivision.writer-global sgl application/vnd.stepmania.package smzip application/vnd.stepmania.stepchart sm +application/vnd.sun.wadl+xml wadl application/vnd.sun.xml.calc sxc application/vnd.sun.xml.calc.template stc application/vnd.sun.xml.draw sxd @@ -481,6 +489,7 @@ application/wspolicy+xml wspoli application/x-7z-compressed 7z application/x-abiword abw application/x-ace-compressed ace +application/x-arj arj application/x-authorware-bin aab x32 u32 vox application/x-authorware-map aam application/x-authorware-seg aas @@ -582,6 +591,14 @@ application/x-tex-tfm tfm application/x-texinfo texinfo texi application/x-tgif obj application/x-ustar ustar +application/x-virtualbox-hdd hdd +application/x-virtualbox-ova ova +application/x-virtualbox-ovf ovf +application/x-virtualbox-vbox vbox +application/x-virtualbox-vbox-extpack vbox-extpack +application/x-virtualbox-vdi vdi +application/x-virtualbox-vhd vhd +application/x-virtualbox-vmdk vmdk application/x-wais-source src application/x-web-app-manifest+json webapp application/x-x509-ca-cert der crt pem @@ -594,7 +611,7 @@ application/xaml+xml xaml application/xcap-diff+xml xdf application/xenc+xml xenc application/xhtml+xml xhtml xht -application/xml xml xsl xsd +application/xml xml xsl xsd rng application/xml-dtd dtd application/xop+xml xop application/xproc+xml xpl @@ -604,11 +621,13 @@ application/xv+xml mxml x application/yang yang application/yin+xml yin application/zip zip +audio/3gpp 3gpp audio/adpcm adp audio/basic au snd audio/midi mid midi kar rmi -audio/mp4 mp4a m4a -audio/mpeg mpga mp2 mp2a mp3 m2a m3a +audio/mp3 mp3 +audio/mp4 m4a mp4a +audio/mpeg mpga mp2 mp2a m2a m3a audio/ogg oga ogg spx audio/s3m s3m audio/silk sil @@ -642,6 +661,7 @@ chemical/x-cmdf cmdf chemical/x-cml cml chemical/x-csml csml chemical/x-xyz xyz +image/apng apng image/bmp bmp image/cgm cgm image/g3fax g3 @@ -690,6 +710,8 @@ image/x-xbitmap xbm image/x-xpixmap xpm image/x-xwindowdump xwd message/rfc822 eml mime +model/gltf+json gltf +model/gltf-binary glb model/iges igs iges model/mesh msh mesh silo model/vnd.collada+xml dae @@ -712,12 +734,14 @@ text/html html h text/jade jade text/jsx jsx text/less less +text/markdown markdown md text/mathml mml text/n3 n3 text/plain txt text conf def list log in ini text/prs.lines.tag dsc text/richtext rtx text/sgml sgml sgm +text/slim slim slm text/stylus stylus styl text/tab-separated-values tsv text/troff t tr roff man me ms @@ -744,7 +768,7 @@ text/x-fortran f for text/x-handlebars-template hbs text/x-java-source java text/x-lua lua -text/x-markdown markdown md mkd +text/x-markdown mkd text/x-nfo nfo text/x-opml opml text/x-pascal p pas @@ -753,11 +777,12 @@ text/x-sass sass text/x-scss scss text/x-setext etx text/x-sfv sfv +text/x-suse-ymp ymp text/x-uuencode uu text/x-vcalendar vcs text/x-vcard vcf text/yaml yaml yml -video/3gpp 3gp 3gpp +video/3gpp 3gp video/3gpp2 3g2 video/h261 h261 video/h263 h263 From 68d0214c6c21bfd29b5e11fb1af2f4273bcd40d1 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 30 Aug 2017 14:17:19 -0400 Subject: [PATCH 2367/4996] Update history to reflect merge of #6336 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index eb8293179b0..a831a55a522 100644 --- a/History.markdown +++ b/History.markdown @@ -22,6 +22,7 @@ * Access custom config array throughout session (#6200) * Add support for Rouge 2, in addition to Rouge 1 (#5919) * Allow `yield` to logger methods & bail early on no-op messages (#6315) + * Update mime-types. (#6336) ### Bug Fixes From 94f377eed559fc1555de4116b1d003d8e24852dc Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Wed, 30 Aug 2017 21:30:57 +0200 Subject: [PATCH 2368/4996] use latest rubocop channel on codeclimate (#6333) Merge pull request 6333 --- .codeclimate.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.codeclimate.yml b/.codeclimate.yml index b3d26d655a1..f64d0bfabe0 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -3,6 +3,7 @@ engines: enabled: false rubocop: enabled: true + channel: rubocop-0-49 exclude_paths: - .codeclimate.yml From fb27b2e296219943f3c6b563b21a2443b1337de1 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 30 Aug 2017 15:30:58 -0400 Subject: [PATCH 2369/4996] Update history to reflect merge of #6333 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index a831a55a522..589396f956d 100644 --- a/History.markdown +++ b/History.markdown @@ -11,6 +11,7 @@ * 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) ### Minor Enhancements From cb58716310a2ecd46e572e942972680ead4a82d9 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Sat, 2 Sep 2017 00:36:25 +0200 Subject: [PATCH 2370/4996] Docs: updates (#6343) Merge pull request 6343 --- docs/_docs/deployment-methods.md | 44 +++++++++++++++++------------- docs/_docs/resources.md | 47 ++++++++++++++++++-------------- 2 files changed, 52 insertions(+), 39 deletions(-) diff --git a/docs/_docs/deployment-methods.md b/docs/_docs/deployment-methods.md index 3146b372e79..608b0661210 100644 --- a/docs/_docs/deployment-methods.md +++ b/docs/_docs/deployment-methods.md @@ -5,6 +5,31 @@ permalink: /docs/deployment-methods/ Sites built using Jekyll can be deployed in a large number of ways due to the static nature of the generated output. A few of the most common deployment techniques are described below. +
    +
    ProTip™: Use GitHub Pages for zero-hassle Jekyll hosting
    +

    GitHub Pages are powered by Jekyll behind the scenes, so if you’re looking for a zero-hassle, zero-cost solution, GitHub Pages are a great way to host your Jekyll-powered website for free.

    +
    + +## Netlify + +Netlify provides Global CDN, Continuous Deployment, one click HTTPS and [much more](https://www.netlify.com/features/), providing developers the most robust toolset available for modern web projects, without added complexity. Netlify supports custom plugins for Jekyll and has a free plan for open source projects. + +Read this [Jekyll step-by-step guide](https://www.netlify.com/blog/2015/10/28/a-step-by-step-guide-jekyll-3.0-on-netlify/) to setup your Jekyll site on Netlify. + +## Aerobatic + +[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. + +## Kickster + +Use [Kickster](http://kickster.nielsenramon.com/) for easy (automated) deploys to GitHub Pages when using unsupported plugins on GitHub Pages. + +Kickster provides a basic Jekyll project setup packed with web best practises and useful optimization tools increasing your overall project quality. Kickster ships with automated and worry-free deployment scripts for GitHub Pages. + +Setting up Kickster is very easy, just install the gem and you are good to go. More documentation can here found [here](https://github.com/nielsenramon/kickster#kickster). If you do not want to use the gem or start a new project you can just copy paste the deployment scripts for [Travis CI](https://github.com/nielsenramon/kickster/tree/master/snippets/travis) or [Circle CI](https://github.com/nielsenramon/kickster#automated-deployment-with-circle-ci). + ## Web hosting providers (FTP) Just about any traditional web hosting provider will let you upload files to their servers over FTP. To upload a Jekyll site to a web host using FTP, simply run the `jekyll build` command and copy the contents of the generated `_site` folder to the root folder of your hosting account. This is most likely to be the `httpdocs` or `public_html` folder on most hosting providers. @@ -187,22 +212,3 @@ low-volume blogs as you only pay for what you use. If you'd like to deploy your site to an OpenShift gear, there's [a cartridge for that](https://github.com/openshift-quickstart/jekyll-openshift). - -
    -
    ProTip™: Use GitHub Pages for zero-hassle Jekyll hosting
    -

    GitHub Pages are powered by Jekyll behind the scenes, so if you’re looking for a zero-hassle, zero-cost solution, GitHub Pages are a great way to host your Jekyll-powered website for free.

    -
    - -## Kickster - -Use [Kickster](http://kickster.nielsenramon.com/) for easy (automated) deploys to GitHub Pages when using unsupported plugins on GitHub Pages. - -Kickster provides a basic Jekyll project setup packed with web best practises and useful optimization tools increasing your overall project quality. Kickster ships with automated and worry-free deployment scripts for GitHub Pages. - -Setting up Kickster is very easy, just install the gem and you are good to go. More documentation can here found [here](https://github.com/nielsenramon/kickster#kickster). If you do not want to use the gem or start a new project you can just copy paste the deployment scripts for [Travis CI](https://github.com/nielsenramon/kickster/tree/master/snippets/travis) or [Circle CI](https://github.com/nielsenramon/kickster#automated-deployment-with-circle-ci). - -## Aerobatic - -[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. diff --git a/docs/_docs/resources.md b/docs/_docs/resources.md index a8da04c5d24..24a9ab49739 100644 --- a/docs/_docs/resources.md +++ b/docs/_docs/resources.md @@ -3,49 +3,56 @@ title: Resources permalink: /docs/resources/ --- -Jekyll’s growing use is producing a wide variety of tutorials, frameworks, extensions, examples, and other resources that can be very helpful. Below is a collection of links to some of the most popular Jekyll resources. +Jekyll's growing use is producing a wide variety of tutorials, frameworks, extensions, examples, and other resources that can be very helpful. Below is a collection of links to some of the most popular Jekyll resources. -#### Editors +## Editors -- [sublime-jekyll](https://github.com/23maverick23/sublime-jekyll): A Sublime Text package for Jekyll static sites. This package should help creating Jekyll sites and posts easier by providing access to key template tags and filters, as well as common completions and a current date/datetime command (for dating posts). You can install this package manually via GitHub, or via [Package Control](https://packagecontrol.io/packages/Jekyll). -- [vim-jekyll](https://github.com/parkr/vim-jekyll): A vim plugin to generate - new posts and run `jekyll build` all without leaving vim. +- [jekyll-atom](https://atom.io/packages/jekyll): A collection of snippets and tools for Jekyll in Atom - [markdown-writer](https://atom.io/packages/markdown-writer): An Atom package for Jekyll. It can create new posts/drafts, manage tags/categories, insert link/images and add many useful key mappings. +- [sublime-jekyll](https://github.com/23maverick23/sublime-jekyll): A Sublime Text package for Jekyll static sites. This package should help creating Jekyll sites and posts easier by providing access to key template tags and filters, as well as common completions and a current date/datetime command (for dating posts). You can install this package manually via GitHub, or via [Package Control](https://packagecontrol.io/packages/Jekyll). +- [vim-jekyll](https://github.com/parkr/vim-jekyll): A vim plugin to generate new posts and run `jekyll build` all without leaving vim. - [Wordpress2Jekyll](https://wordpress.org/plugins/wp2jekyll/): A Wordpress plugin that allows you to use Wordpress as your editor and (automatically) export content in to Jekyll. WordPress2Jekyll attempts to marry these two systems together in order to make a site that can be easily managed from all devices. -### Useful Guides +## Useful Guides - [Jekyll Tips](http://jekyll.tips) is a set of resources created by [CloudCannon](https://cloudcannon.com) to help folks get up and running with Jekyll. They cover all skill levels, and even include some great video tutorials. - [Jekyll Cheatsheet](http://jekyll.tips/jekyll-cheat-sheet/) is a single-page resource for Jekyll filters, variables, and the like. -- [“Creating and Hosting a Personal Site on GitHub”](http://jmcglone.com/guides/github-pages/) -- [‘Build A Blog With Jekyll And GitHub Pages’ on Smashing Magazine](https://www.smashingmagazine.com/2014/08/01/build-blog-jekyll-github-pages/) +- ["Creating and Hosting a Personal Site on GitHub"](http://jmcglone.com/guides/github-pages/) +- ['Build A Blog With Jekyll And GitHub Pages' on Smashing Magazine](https://www.smashingmagazine.com/2014/08/01/build-blog-jekyll-github-pages/) - Publishing to GitHub Pages? [Check out our documentation page for just that purpose](/docs/github-pages/). - [Blogging with Git, Emacs and Jekyll](https://metajack.im/2009/01/23/blogging-with-git-emacs-and-jekyll/) - [Tips for working with GitHub Pages Integration](https://gist.github.com/jedschneider/2890453) -### Integrations +## Integrations - Use a saas service as a backend for forms (contact forms, hiring forms, etc.) - - [Formspree (also open source)](https://formspree.io/) + + - [Formspree (open source)](https://formspree.io/) - [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) -- [Jekyll Bootstrap](http://jekyllbootstrap.com), 0 to Blog in 3 minutes. Provides detailed explanations, examples, and helper-code to make getting started with Jekyll easier. -- [Integrating Twitter with Jekyll](http://www.justkez.com/integrating-twitter-with-jekyll/) - > “Having migrated Justkez.com to be based on Jekyll, I was pondering how I might include my recent twitterings on the front page of the site. In the WordPress world, this would have been done via a plugin which may or may not have hung the loading of the page, might have employed caching, but would certainly have had some overheads. … Not in Jekyll.” -- [Staticman](https://staticman.net): Add user-generated content to a Jekyll site (free and open source) + - [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. + - [Algolia](https://blog.algolia.com/instant-search-blog-documentation-jekyll-plugin/): Add a powerful instant search to your Jekyll site -### Other commentary +## Other commentary -- [‘My Jekyll Fork’, by Mike West](https://mikewest.org/2009/11/my-jekyll-fork) +- [How I'm using Jekyll in 2016](https://mademistakes.com/articles/using-jekyll-2016/) - > “Jekyll is a well-architected throwback to a time before WordPress, when men were men, and HTML was static. I like the ideas it espouses, and have made a few improvements to it’s core. Here, I’ll point out some highlights of my fork in the hopes that they see usage beyond this site.” +- [Static Comments with Jekyll & Staticman](https://mademistakes.com/articles/improving-jekyll-static-comments/) + +- [Adding Ajax pagination to Jekyll](https://eduardoboucas.com/blog/2014/11/05/adding-ajax-pagination-to-jekyll.html) -- [‘About this Website’, by Carter Allen](http://cartera.me/2010/08/12/about-this-website/) +- ['My Jekyll Fork', by Mike West](https://mikewest.org/2009/11/my-jekyll-fork) - > “Jekyll is everything that I ever wanted in a blogging engine. Really. It isn’t perfect, but what’s excellent about it is that if there’s something wrong, I know exactly how it works and how to fix it. It runs on the your machine only, and is essentially an added”build" step between you and the browser. I coded this entire site in TextMate using standard HTML5 and CSS3, and then at the end I added just a few little variables to the markup. Presto-chango, my site is built and I am at peace with the world.” + > "Jekyll is a well-architected throwback to a time before WordPress, when men were men, and HTML was static. I like the ideas it espouses, and have made a few improvements to it's core. Here, I'll point out some highlights of my fork in the hopes that they see usage beyond this site." + +- ['About this Website', by Carter Allen](http://cartera.me/2010/08/12/about-this-website/) + + > "Jekyll is everything that I ever wanted in a blogging engine. Really. It isn't perfect, but what's excellent about it is that if there's something wrong, I know exactly how it works and how to fix it. It runs on the your machine only, and is essentially an added"build" step between you and the browser. I coded this entire site in TextMate using standard HTML5 and CSS3, and then at the end I added just a few little variables to the markup. Presto-chango, my site is built and I am at peace with the world." - [Generating a Tag Cloud in Jekyll](http://www.justkez.com/generating-a-tag-cloud-in-jekyll/) – A guide to implementing a tag cloud and per-tag content pages using Jekyll. + - A way to [extend Jekyll](https://github.com/rfelix/jekyll_ext) without forking and modifying the Jekyll gem codebase and some [portable Jekyll extensions](https://wiki.github.com/rfelix/jekyll_ext/extensions) that can be reused and shared. - [Using your Rails layouts in Jekyll](http://numbers.brighterplanet.com/2010/08/09/sharing-rails-views-with-jekyll) -- [Adding Ajax pagination to Jekyll](https://eduardoboucas.com/blog/2014/11/05/adding-ajax-pagination-to-jekyll.html) From 1a4f53de1478786151891fbfeaf4fda6eda2089e Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 1 Sep 2017 18:36:26 -0400 Subject: [PATCH 2371/4996] Update history to reflect merge of #6343 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 589396f956d..50ba202e33d 100644 --- a/History.markdown +++ b/History.markdown @@ -55,6 +55,7 @@ * Docs: post's date can be overriden in YAML front matter (#6334) * Docs: `site.url` behavior on development and production environments (#6270) * Fix typo in site.url section of variables.md :-[ (#6337) + * Docs: updates (#6343) ### Site Enhancements From 6ce912e9573893babb6ca9b0e3aa1377f9804373 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 2 Sep 2017 10:38:07 -0400 Subject: [PATCH 2372/4996] 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 Date: Sat, 2 Sep 2017 10:38:09 -0400 Subject: [PATCH 2373/4996] 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 & 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 Date: Mon, 4 Sep 2017 23:54:28 +0300 Subject: [PATCH 2374/4996] 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 Date: Mon, 4 Sep 2017 16:54:29 -0400 Subject: [PATCH 2375/4996] 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 Date: Wed, 6 Sep 2017 12:52:34 -0400 Subject: [PATCH 2376/4996] 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 Date: Wed, 6 Sep 2017 12:52:36 -0400 Subject: [PATCH 2377/4996] 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 & 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 Date: Fri, 15 Sep 2017 20:27:50 +0530 Subject: [PATCH 2378/4996] 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 Date: Fri, 15 Sep 2017 10:57:51 -0400 Subject: [PATCH 2379/4996] 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 Date: Wed, 20 Sep 2017 20:04:36 +0100 Subject: [PATCH 2380/4996] 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 Date: Wed, 20 Sep 2017 15:04:37 -0400 Subject: [PATCH 2381/4996] 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 Date: Wed, 20 Sep 2017 21:05:40 +0200 Subject: [PATCH 2382/4996] 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 Date: Wed, 20 Sep 2017 15:05:42 -0400 Subject: [PATCH 2383/4996] 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 Date: Thu, 21 Sep 2017 15:57:24 -0400 Subject: [PATCH 2384/4996] 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 Date: Thu, 21 Sep 2017 15:57:26 -0400 Subject: [PATCH 2385/4996] 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't present (#6350) ### Documentation From 47bcbfb65431fcb2a1a45e84088d132075e10496 Mon Sep 17 00:00:00 2001 From: Florian Thomas Date: Thu, 21 Sep 2017 21:30:23 +0100 Subject: [PATCH 2386/4996] 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 Date: Thu, 21 Sep 2017 16:30:25 -0400 Subject: [PATCH 2387/4996] 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't present (#6350) + * skip adding binary files as posts (#6344) ### Documentation From ca3a56b37c7359964900d441582d8913adca8b74 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 21 Sep 2017 16:31:37 -0400 Subject: [PATCH 2388/4996] 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 Date: Fri, 22 Sep 2017 02:06:26 +0530 Subject: [PATCH 2389/4996] 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 Date: Thu, 21 Sep 2017 16:36:28 -0400 Subject: [PATCH 2390/4996] 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't present (#6350) * skip adding binary files as posts (#6344) + * Don't break if bundler is not installed (#6377) ### Documentation From ec3a7b9078ef998259f7ef5c79ac4a02eada378f Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 21 Sep 2017 16:49:02 -0400 Subject: [PATCH 2391/4996] 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 Date: Thu, 21 Sep 2017 17:30:21 -0400 Subject: [PATCH 2392/4996] 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 & 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 'assets' 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't present (#6350) - * skip adding binary files as posts (#6344) + * Skip adding binary files as posts (#6344) * Don'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 & 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 Date: Fri, 22 Sep 2017 02:54:38 -0400 Subject: [PATCH 2393/4996] 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

    + + +

    y_day

    + _ + +

    Day of the year from the post's filename, with leading zeros.

    + +

    short_year

    From dc4acbc66c0c309bb7fd50b7d4041c6920f59dad Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 22 Sep 2017 02:54:39 -0400 Subject: [PATCH 2394/4996] 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 Date: Fri, 22 Sep 2017 14:55:19 +0800 Subject: [PATCH 2395/4996] 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 - _layouts directory. + _layouts directory.

    +
      +
    • + Using null 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 + frontmatter defaults. +
      • +
    • + Starting from version 3.5.0, using none in a post/document will + produce a file without using a layout file regardless of frontmatter defaults. + Using none in a page, however, will cause Jekyll to attempt to + use a layout named "none". +
      • +
    From 7dccfcf2b5086c23ee84ee9bf72e836fd575a4fd Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 22 Sep 2017 02:55:21 -0400 Subject: [PATCH 2396/4996] 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 Date: Fri, 22 Sep 2017 13:08:05 +0530 Subject: [PATCH 2397/4996] 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 Date: Fri, 22 Sep 2017 03:38:07 -0400 Subject: [PATCH 2398/4996] 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 Date: Fri, 22 Sep 2017 18:36:32 +0530 Subject: [PATCH 2399/4996] 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 [linenos] -eos +MSG end end @@ -95,14 +95,14 @@ def render_pygments(code, is_safe) ) if highlighted_code.nil? - Jekyll.logger.error < 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 Date: Fri, 22 Sep 2017 09:06:34 -0400 Subject: [PATCH 2400/4996] 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 Date: Fri, 22 Sep 2017 15:11:23 +0200 Subject: [PATCH 2401/4996] 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 Date: Fri, 22 Sep 2017 09:11:25 -0400 Subject: [PATCH 2402/4996] 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 Date: Fri, 22 Sep 2017 15:51:58 +0200 Subject: [PATCH 2403/4996] 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 Date: Fri, 22 Sep 2017 09:51:59 -0400 Subject: [PATCH 2404/4996] 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 "available" (#6380) ### Development Fixes From e5403396b7db1264cc68b8a34d9275f1a1a8cec6 Mon Sep 17 00:00:00 2001 From: ashmaroli Date: Sun, 24 Sep 2017 01:33:40 +0530 Subject: [PATCH 2405/4996] 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 Date: Sat, 23 Sep 2017 16:03:42 -0400 Subject: [PATCH 2406/4996] 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 Date: Sat, 23 Sep 2017 22:11:17 +0200 Subject: [PATCH 2407/4996] 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 Date: Sat, 23 Sep 2017 16:11:19 -0400 Subject: [PATCH 2408/4996] 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 Date: Sun, 24 Sep 2017 11:50:55 -0400 Subject: [PATCH 2409/4996] 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. `/_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:
    A Hard-Coded Collection
    -

    In addition to any collections you create yourself, the - posts collection is hard-coded into Jekyll. It exists whether - you have a _posts directory or not. This is something to note - when iterating through site.collections as you may need to +

    In addition to any collections you create yourself, the + posts collection is hard-coded into Jekyll. It exists whether + you have a _posts directory or not. This is something to note + when iterating through site.collections as you may need to filter it out.

    You may wish to use filters to find your collection: {% raw %}{{ site.collections | where: "label", "myCollection" | first }}{% endraw %}

    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 Date: Sun, 24 Sep 2017 11:50:56 -0400 Subject: [PATCH 2410/4996] 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 Date: Mon, 25 Sep 2017 16:41:58 +0200 Subject: [PATCH 2411/4996] 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. + +
    +
    GitHub Pages Documentation, Help, and Support
    +

    + For more information about what you can do with GitHub Pages, as well as for + troubleshooting guides, you should check out + GitHub’s Pages Help section. + If all else fails, you should contact GitHub Support. +

    +
    ### 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 %} - - - -[{{ page.title }}]("{{ page.url | prepend: site.github.url }}") + + + +[{{ 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. -
    -
    -
    - -##### 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`: - -
    -
    -
    - -```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'] -``` -
    - -This will ensure that when you run `bundle install`, you -have the correct version of the `github-pages` gem. - -If that fails, simplify it: - -
    -
    -
    - -```ruby -source 'https://rubygems.org' - -gem 'github-pages' -``` -
    - -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). -
    - -
    -
    Installing github-pages gem on Windows
    -

    - While Windows is not officially supported, it is possible - to install github-pages gem on Windows. - Special instructions can be found on our - Windows-specific docs page. -

    -
    - ### 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.
    -
    Source Files Must be in the Root Directory
    +
    Source files must be in the root directory

    GitHub Pages overrides the “Site Source” @@ -149,12 +128,13 @@ to see more detailed examples.

    -
    -
    GitHub Pages Documentation, Help, and Support
    +
    +
    Installing the github-pages gem on Windows
    +

    - For more information about what you can do with GitHub Pages, as well as for - troubleshooting guides, you should check out - GitHub’s Pages Help section. - If all else fails, you should contact GitHub Support. + While Windows is not officially supported, it is possible + to install the github-pages gem on Windows. + Special instructions can be found on our + Windows-specific docs page.

    From cfec06cdba69b8eaf728d4a4c52fb91fe8267adb Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 25 Sep 2017 10:41:59 -0400 Subject: [PATCH 2412/4996] 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 "available" (#6380) + * Docs: GitHub Pages instructions (#6384) ### Development Fixes From eadad9eb7ea0a764802a81175a02c1c0487e4d80 Mon Sep 17 00:00:00 2001 From: ashmaroli Date: Wed, 27 Sep 2017 14:48:13 +0530 Subject: [PATCH 2413/4996] 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 Date: Wed, 27 Sep 2017 05:18:14 -0400 Subject: [PATCH 2414/4996] 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 "available" (#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 Date: Wed, 27 Sep 2017 14:49:52 +0530 Subject: [PATCH 2415/4996] 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 Date: Wed, 27 Sep 2017 05:19:54 -0400 Subject: [PATCH 2416/4996] 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 "available" (#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 Date: Fri, 29 Sep 2017 09:39:19 +0200 Subject: [PATCH 2417/4996] 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 Date: Fri, 29 Sep 2017 03:39:20 -0400 Subject: [PATCH 2418/4996] 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 Date: Fri, 29 Sep 2017 14:41:39 +0200 Subject: [PATCH 2419/4996] 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 + +
    +
    Stay Up to Date
    +

    We recommend you update Jekyll as often as possible to benefit from + the latest bug fixes. +

    +
    + +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 Date: Fri, 29 Sep 2017 08:41:41 -0400 Subject: [PATCH 2420/4996] 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 Date: Sat, 30 Sep 2017 04:42:36 +0530 Subject: [PATCH 2421/4996] 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 Date: Fri, 29 Sep 2017 19:12:37 -0400 Subject: [PATCH 2422/4996] 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 Date: Mon, 2 Oct 2017 12:27:54 +0530 Subject: [PATCH 2423/4996] 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`.
    @@ -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 Date: Mon, 2 Oct 2017 02:57:56 -0400 Subject: [PATCH 2424/4996] 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 Date: Mon, 2 Oct 2017 08:47:05 -0500 Subject: [PATCH 2425/4996] 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] %} + + {{ post.title }} + +
    +{% 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 Date: Mon, 2 Oct 2017 09:47:07 -0400 Subject: [PATCH 2426/4996] 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 Date: Mon, 2 Oct 2017 09:32:47 -0500 Subject: [PATCH 2427/4996] 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 Date: Mon, 2 Oct 2017 10:32:48 -0400 Subject: [PATCH 2428/4996] 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 Date: Tue, 3 Oct 2017 09:52:13 +0200 Subject: [PATCH 2429/4996] 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: -
    $ script/bootstrap
    +```sh +script/bootstrap +``` Before you make any changes, run the tests and make sure that they pass (to confirm your environment is configured properly): -
    $ script/cibuild
    +```sh +script/cibuild +``` If you are only updating a file in `test/`, you can use the command: -
    $ script/test test/blah_test.rb
    +```sh +script/test test/blah_test.rb +``` If you are only updating a `.feature` file, you can use the command: -
    $ script/cucumber features/blah.feature
    +```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 %}

    {{ album.title }}

    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: -
    $ script/bootstrap
    +```sh +script/bootstrap +``` Before you make any changes, run the tests and make sure that they pass (to confirm your environment is configured properly): -
    $ script/cibuild
    +```sh +script/cibuild +``` If you are only updating a file in `test/`, you can use the command: -
    $ script/test test/blah_test.rb
    +```sh +script/test test/blah_test.rb +``` If you are only updating a `.feature` file, you can use the command: -
    $ script/cucumber features/blah.feature
    +```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
      {% for member in site.data.members %}
    • @@ -67,8 +67,8 @@ You can now render the list of members in a template:
      • {% endfor %}
    -{% 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
      {% for org_hash in site.data.orgs %} {% assign org = org_hash[1] %} @@ -119,8 +119,8 @@ file name: {% endfor %}
    -{% 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 }} - -{% 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 - _layouts directory. + _layouts directory.

    +
    +
    Pagination for categories, tags and collections
    +

    + The more recent jekyll-paginate-v2 plugin supports more features. See the pagination examples in the repository. + This plugin is not supported by GitHub Pages. +

    +
    + ## 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 Next {% endif %}
    -{% endraw %} ``` +{% endraw %}
    Beware the page one edge-case
    @@ -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 %} {% 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

    {% render_time page rendered at: %}

    -{% 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 %} + +
    -
    -
    ProTip™: Link using just the site root URL
    -

    - You can skip the {% raw %}{{ site.url }}{% endraw %} variable - if you know your site will only ever be displayed at the - root URL of your domain. In this case you can reference assets directly with - just /path/file.jpg. -

    ## 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 ``` +{% 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] %} - + {{ post.title }} -
    {% 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 ``` +{% 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: '

    ' | remove: '

    ' }}{% endraw %} +{% raw %} +```liquid +{{ post.excerpt | remove: '

    ' | remove: '

    ' }} ``` +{% 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: --- @@ -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:
    -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 — 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.
    Please report issues you encounter!

    - If you come across a bug, please create an issue + If you come across a bug, please create an issue on GitHub describing the problem and any work-arounds you find so we can document it here for others.

    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 ```
    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 }
    -
    Diving in
    -

    Want to get a new Jekyll site up and running quickly? Simply +

    Diving in
    +

    Want to get a new Jekyll site up and running quickly? Simply run jekyll new SITENAME to create a new folder with a bare bones Jekyll site.

    @@ -68,7 +69,7 @@ generate when running `jekyll build` or `jekyll serve`.
    Future Posts on GitHub Pages

    An exception to the above rule are GitHub Pages sites, where the --future flag remains enabled - by default to maintain historical consistency for those sites. + by default to maintain historical consistency for those sites.

    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 +jekyll build --destination # => The current folder will be generated into -$ jekyll build --source --destination +jekyll build --source --destination # => The folder will be generated into -$ jekyll build --watch +jekyll build --watch # => The current folder will be generated into ./_site, # watched for changes, and regenerated automatically. ```
    -
    Changes to _config.yml are not included during automatic regeneration.
    +
    Changes to _config.yml are not included during automatic regeneration.

    The _config.yml master configuration file contains global configurations and variable definitions that are read once at execution time. Changes made to _config.yml @@ -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. ``` - -

    -
    Be aware of default behavior
    -

    - As of version 2.4, the serve command will watch for changes automatically. To disable this, you can use jekyll serve --no-watch, which preserves the old behavior. -

    +
    +
    Livereload
    +

    If you want to enable Livereload, you can enable the jekyll-livereload plugin in a development config file.

    ```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 — 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 %}
  • {{ item.title }}
    • -{% 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 %}

    {{ item.title }}

    - {% endfor %}{% endraw %} + {% endfor %} ``` +{% endraw %} **Result**
    @@ -242,8 +248,9 @@ toc2: **Liquid** +{% raw %} ```liquid -{% raw %}
    +
    {% if site.data.samplelist.toc2[0] %} {% for item in site.data.samplelist.toc2 %}

    {{ item.title }}

    @@ -263,8 +270,9 @@ toc2: {% endif %} {% endfor %} {% endif %} -
    {% endraw %} +
    ``` +{% endraw %} **Result** @@ -327,13 +335,16 @@ sidebar: toc **Liquid** +{% raw %} ```liquid -{% raw %}
      +
        {% for item in site.data.samplelist[page.sidebar] %}
      • {{ item.title }}
        • {% endfor %} -
      {% endraw %} +
    ``` +{% endraw %} + **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 %}
  • {{ item.title }}
    • -{% endfor %}{% endraw %} +{% endfor %} ``` +{% endraw %} **Result** @@ -412,15 +425,17 @@ docs2: **Liquid** +{% raw %} ```liquid -{% raw %}
      +
        {% for item in site.data.samplelist.docs2 %} {% if item.version == 1 %}
      • {{ item.title }}
        • {% endif %} {% endfor %} -
      {% endraw %} +
    ``` +{% 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 %}

    Getting Started

    +

    Getting Started

      {% for doc in site.docs %} {% if doc.category == "getting-started" %}
    • {{ doc.title }}
      • {% endif %} {% endfor %} -
    {% endraw %} + ``` +{% 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 %}

    {{ cat.name | capitalize }}

      @@ -533,8 +551,9 @@ Here's the code for getting lists of pages grouped under their corresponding cat
    • {{ item.title }}
      • {% endfor %}
    -{% 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 %} +

    @@ -97,15 +106,17 @@ Suppose you try to mix Liquid's `assign` tag with JavaScript, like this: function someFunction() { document.getElementById("intro").innerHTML = someContent; } -{% endraw %} + ``` +{% 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 %} +

    @@ -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 }}"; } -{% endraw %} + ``` +{% 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 Date: Tue, 3 Oct 2017 03:52:14 -0400 Subject: [PATCH 2430/4996] 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 Date: Tue, 3 Oct 2017 13:26:42 +0530 Subject: [PATCH 2431/4996] 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 Date: Tue, 3 Oct 2017 03:56:43 -0400 Subject: [PATCH 2432/4996] 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 Date: Wed, 4 Oct 2017 13:18:50 +0200 Subject: [PATCH 2433/4996] 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 Date: Wed, 4 Oct 2017 07:18:52 -0400 Subject: [PATCH 2434/4996] 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 "Scenario 6" to "Scenario 7" (#6411) ### Development Fixes From 1d29f505c0dedffe0ef2915e640537f63a315d65 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Wed, 4 Oct 2017 17:36:37 +0200 Subject: [PATCH 2435/4996] 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: +
    +
    Gather your collections
    -```yaml -collections_dir: my_collections -collections: - books: - foo: bar - output: true - recipes: - foo: baz - output: true -``` +

    From v3.7.0 you can optionally specify a directory to store all your collections in the same place with 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. +

    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} From 4a2ab9247c63ae05962f9b502eb22e3d9b7fec83 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 4 Oct 2017 11:36:38 -0400 Subject: [PATCH 2436/4996] 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 "Scenario 6" to "Scenario 7" (#6411) + * Docs: Mark `collection_dir` as unreleased (#6412) ### Development Fixes From d48412401ae1fef5259d562312797cf7376c9538 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Sat, 7 Oct 2017 18:54:32 -0500 Subject: [PATCH 2437/4996] 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 Date: Sat, 7 Oct 2017 19:54:34 -0400 Subject: [PATCH 2438/4996] 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 Date: Sun, 8 Oct 2017 15:50:09 +0200 Subject: [PATCH 2439/4996] 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 — 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 — 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 Date: Sun, 8 Oct 2017 09:50:10 -0400 Subject: [PATCH 2440/4996] 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 "Scenario 6" to "Scenario 7" (#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 Date: Sun, 8 Oct 2017 07:41:10 -0700 Subject: [PATCH 2441/4996] 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. + +
    + +
    + +## 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 Date: Sun, 8 Oct 2017 10:41:12 -0400 Subject: [PATCH 2442/4996] 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 "Scenario 6" to "Scenario 7" (#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 Date: Mon, 9 Oct 2017 13:52:19 +0300 Subject: [PATCH 2443/4996] 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 Date: Mon, 9 Oct 2017 06:52:20 -0400 Subject: [PATCH 2444/4996] 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 Date: Mon, 9 Oct 2017 15:15:55 +0200 Subject: [PATCH 2445/4996] 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' %} +
      {% for item in doclist %}
    1. {{ item.title }}
      2. {% endfor %} +
    ``` {% endraw %} **Result**
    -
  • Configuration
    • -
  • Deployment
    • -
  • Introduction
    • +
      +
    1. Configuration
      2. +
    2. Deployment
      3. +
    3. Introduction
      4. +
    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 -
    diff --git a/docs/_includes/search/input.html b/docs/_includes/search/input.html new file mode 100644 index 00000000000..729f5cabdfd --- /dev/null +++ b/docs/_includes/search/input.html @@ -0,0 +1 @@ + diff --git a/docs/_includes/search/script.html b/docs/_includes/search/script.html new file mode 100644 index 00000000000..f770c63aeaf --- /dev/null +++ b/docs/_includes/search/script.html @@ -0,0 +1,9 @@ + + diff --git a/docs/_includes/top.html b/docs/_includes/top.html index 155ffbcacaf..b67648d9d82 100644 --- a/docs/_includes/top.html +++ b/docs/_includes/top.html @@ -7,6 +7,7 @@ {% feed_meta %} + {% seo %} diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 77ebd5f7d82..8e9574adc63 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -8,6 +8,6 @@ {% include footer.html %} {% include anchor_links.html %} {% include analytics.html %} - + {% include search/script.html %} diff --git a/docs/_sass/_docsearch.scss b/docs/_sass/_docsearch.scss new file mode 100644 index 00000000000..bebe3125bf8 --- /dev/null +++ b/docs/_sass/_docsearch.scss @@ -0,0 +1,50 @@ +.searchbox { + .searchbox__input { + padding: 5px 5px 5px 29px; + border: none; + border-radius: 5px; + color: #444; + + &::-webkit-input-placeholder { + color: #aaa; + } + + &:-ms-input-placeholder { + color: #aaa; + } + + &::placeholder { + color: #aaa; + } + } +} + +.algolia-autocomplete { + .ds-dropdown-menu { + font-size: 1rem; + text-shadow: none; + + .ds-suggestion.ds-cursor .algolia-docsearch-suggestion:not(.suggestion-layout-simple) .algolia-docsearch-suggestion--content { + background-color: rgba(221, 221, 221, 0.5); + } + } + + .algolia-docsearch-suggestion--category-header { + background-color: #444; + color: #ddd; + padding: 0.35em; + } + + .algolia-docsearch-suggestion--subcategory-column { + color: #444; + } + + .algolia-docsearch-suggestion--highlight { + background-color: #fc0; + color: #222; + } + + .algolia-docsearch-suggestion--text .algolia-docsearch-suggestion--highlight { + box-shadow: inset 0 -2px 0 0 #fc0; + } +} diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss index 38276c8f461..fe84083a372 100644 --- a/docs/_sass/_style.scss +++ b/docs/_sass/_style.scss @@ -62,6 +62,7 @@ nav { padding: 0; margin: 0; white-space: nowrap; + display: inline-block; } li { display: inline-block; } diff --git a/docs/css/screen.scss b/docs/css/screen.scss index 2eff7f89df7..4bc6bec3330 100644 --- a/docs/css/screen.scss +++ b/docs/css/screen.scss @@ -7,3 +7,4 @@ @import "pygments"; @import "font-awesome"; @import "style"; +@import "docsearch"; From 1a398c48b8d22f54083f9c220fa1808fd4808789 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 15 Nov 2017 10:19:40 -0500 Subject: [PATCH 2568/4996] Update history to reflect merge of #6557 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 1e421c38023..595e02585f5 100644 --- a/History.markdown +++ b/History.markdown @@ -79,6 +79,7 @@ * (#6519) Optimize images * (#6544) Site: Back to original main navigation * (#6545) Style mobile-docs select element + * Site: Search with DocSearch by @Algolia (#6557) ### Bug Fixes From dd5685bb781b667c911794bc1f837f8c4e6c9eb6 Mon Sep 17 00:00:00 2001 From: ashmaroli Date: Thu, 16 Nov 2017 00:55:16 +0530 Subject: [PATCH 2569/4996] Bump JRuby version in Travis config (#6561) Merge pull request 6561 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2cfe51b7697..1da8963ace7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ rvm: - &ruby2 2.3.5 - &ruby3 2.2.8 - &ruby4 2.1.10 - - &jruby jruby-9.1.13.0 + - &jruby jruby-9.1.14.0 matrix: include: From f421aa4070b5fc15822fdeabbe8ce11c50f02336 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 15 Nov 2017 14:25:18 -0500 Subject: [PATCH 2570/4996] Update history to reflect merge of #6561 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 595e02585f5..ca4f2e6dc43 100644 --- a/History.markdown +++ b/History.markdown @@ -52,6 +52,7 @@ * Use double-quotes around gem name (#6535) * Dependencies: upgrade to toml 0.2.0 (#6541) * Lock to cucumber 3.0.1 on Ruby 2.1 (#6546) + * Bump JRuby version in Travis config (#6561) ### Minor Enhancements From d63792b4e7240d4dad83e92628252602a92cba5f Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Wed, 15 Nov 2017 21:28:25 +0100 Subject: [PATCH 2571/4996] Site: Display search only on large resolutions --- docs/_sass/_style.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss index fe84083a372..8ade52e6f75 100644 --- a/docs/_sass/_style.scss +++ b/docs/_sass/_style.scss @@ -172,6 +172,10 @@ h6:hover .header-link { } } +@media (max-width: 950px) { + .searchbox { display: none;} +} + /* Footer */ footer { From 04f4e891f0fef3d8ae363cb988dfa11303ce6874 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Thu, 16 Nov 2017 22:20:38 +0100 Subject: [PATCH 2572/4996] Reformat --- History.markdown | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/History.markdown b/History.markdown index ca4f2e6dc43..c92be8607c0 100644 --- a/History.markdown +++ b/History.markdown @@ -71,16 +71,16 @@ ### Site Enhancements - * (#6389) Add special styling for code-blocks run in shell - * (#6447) Add post about diversity - * (#6457) Update list of files excluded from Docs site - * (#6460) Update site History - * (#6476) Add default twitter card image - * (#6491) Update normalize.css to v7.0.0 - * (#6519) Optimize images - * (#6544) Site: Back to original main navigation - * (#6545) Style mobile-docs select element - * Site: Search with DocSearch by @Algolia (#6557) + * Add special styling for code-blocks run in shell (#6389) + * Add post about diversity (#6447) + * Update list of files excluded from Docs site (#6457) + * Update site History (#6460) + * Add default twitter card image (#6476) + * Update normalize.css to v7.0.0 (#6491) + * Optimize images (#6519) + * Back to original main navigation (#6544) + * Styles: mobile-docs select element (#6545) + * Search with DocSearch by @Algolia (#6557) ### Bug Fixes From 2c646a304cb2901acb6f53396523bf9ac24f6d36 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 17 Nov 2017 16:36:11 -0500 Subject: [PATCH 2573/4996] Avoid block parser warning in SmartyPants (#6565) Merge pull request 6565 --- lib/jekyll/converters/smartypants.rb | 7 ++++++- test/test_filters.rb | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/converters/smartypants.rb b/lib/jekyll/converters/smartypants.rb index 16161e1dca6..6d7c994bf50 100644 --- a/lib/jekyll/converters/smartypants.rb +++ b/lib/jekyll/converters/smartypants.rb @@ -3,9 +3,14 @@ class Kramdown::Parser::SmartyPants < Kramdown::Parser::Kramdown def initialize(source, options) super - @block_parsers = [:block_html] + @block_parsers = [:block_html, :content] @span_parsers = [:smart_quotes, :html_entity, :typographic_syms, :span_html] end + + def parse_content + add_text @src.scan(%r!\A.*\n!) + end + define_parser(:content, %r!\A!) end module Jekyll diff --git a/test/test_filters.rb b/test/test_filters.rb index a56df6da309..afedf7467bc 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -100,6 +100,10 @@ def select; end assert_equal "“", @filter.smartify("“") end + should "convert multiple lines" do + assert_equal "…\n…", @filter.smartify("...\n...") + end + should "allow raw HTML passthrough" do assert_equal( "Span HTML is not escaped", @@ -123,6 +127,12 @@ def select; end @filter.smartify(404) ) end + + should "not output any warnings" do + assert_empty( + capture_output { @filter.smartify("Test") } + ) + end end should "sassify with simple string" do From 73675070f59d5c1a17af96634649764b1e4c77c6 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 17 Nov 2017 16:36:12 -0500 Subject: [PATCH 2574/4996] Update history to reflect merge of #6565 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index c92be8607c0..e7f21d83f51 100644 --- a/History.markdown +++ b/History.markdown @@ -85,6 +85,7 @@ ### Bug Fixes * Raise when theme root directory is not available (#6455) + * Avoid block parser warning in SmartyPants (#6565) ## 3.6.2 / 2017-10-21 From b59078ed264e3f11b5cc3b7ae38a7a5f5711c194 Mon Sep 17 00:00:00 2001 From: ashmaroli Date: Mon, 20 Nov 2017 00:30:38 +0530 Subject: [PATCH 2575/4996] Site header redesign (#6567) Merge pull request 6567 --- docs/_includes/header.html | 26 +++++++++---- docs/_includes/mobile-nav-items.html | 17 ++++++++ docs/_includes/primary-nav-items.html | 3 -- docs/_sass/_docsearch.scss | 18 +++++++-- docs/_sass/_style.scss | 56 ++++++++++++++++++++------- 5 files changed, 91 insertions(+), 29 deletions(-) create mode 100644 docs/_includes/mobile-nav-items.html diff --git a/docs/_includes/header.html b/docs/_includes/header.html index cca35e89fa7..7cdcb970bc0 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -1,19 +1,31 @@
    -
    -
    +
    +

    - +

    -
    diff --git a/docs/_includes/mobile-nav-items.html b/docs/_includes/mobile-nav-items.html new file mode 100644 index 00000000000..12fe4016e76 --- /dev/null +++ b/docs/_includes/mobile-nav-items.html @@ -0,0 +1,17 @@ + diff --git a/docs/_includes/primary-nav-items.html b/docs/_includes/primary-nav-items.html index 12fe4016e76..7609bd7e906 100644 --- a/docs/_includes/primary-nav-items.html +++ b/docs/_includes/primary-nav-items.html @@ -11,7 +11,4 @@
  • Help
    • -
  • - GitHub -
    • diff --git a/docs/_sass/_docsearch.scss b/docs/_sass/_docsearch.scss index bebe3125bf8..e984edea90e 100644 --- a/docs/_sass/_docsearch.scss +++ b/docs/_sass/_docsearch.scss @@ -1,24 +1,34 @@ .searchbox { + padding-top: 1px; .searchbox__input { - padding: 5px 5px 5px 29px; + padding: 6px 5px 5px 29px; + font-size: 0.75em; border: none; border-radius: 5px; - color: #444; + color: #555; + background-color: #333 !important; + box-shadow: 0 0 1px 0 #555; &::-webkit-input-placeholder { color: #aaa; } - &:-ms-input-placeholder { color: #aaa; } - &::placeholder { color: #aaa; } + + &:focus, &:active { + color: #eaeaea; + background-color: #252525 !important; + } } } +.searchbox__submit svg { fill: #fc0 } +.searchbox__reset svg { fill: #999 } + .algolia-autocomplete { .ds-dropdown-menu { font-size: 1rem; diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss index 8ade52e6f75..52e6e8e3008 100644 --- a/docs/_sass/_style.scss +++ b/docs/_sass/_style.scss @@ -14,7 +14,6 @@ body { font: 300 21px Lato, 'Helvetica Neue', Helvetica, Arial, sans-serif; color: #ddd; background-color: #333; - border-top: 5px solid #fc0; @include box-shadow(inset 0 3px 30px rgba(0,0,0,.3)); text-shadow: 0 1px 3px rgba(0,0,0,.5); -webkit-font-feature-settings: "kern" 1; @@ -50,13 +49,28 @@ footer { /* Header */ header { + padding: 15px; + background: darken(#333, 3%); h1, nav { display: inline-block; } + .flexbox { + display: flex; + height: 50px; + + & > * { margin: auto } + } + + .logo { + display: block; + img { margin-top: -7px } + } + + .search .svg-icons { display: none } } -nav { +nav, .meta { ul { padding: 0; @@ -68,16 +82,20 @@ nav { li { display: inline-block; } } -.main-nav { - margin-top: 52px; +.meta ul { + margin-left: 10px; + + li { vertical-align: middle; } +} + +.main-nav, .meta { li { - margin-right: 10px; a { @include border-radius(5px); font-weight: 900; - font-size: 14px; + font-size: 0.75em; padding: 0.5em 1em; text-shadow: none; text-transform: uppercase; @@ -101,7 +119,6 @@ nav { } } } - .mobile-nav { padding: 0 5px; @@ -118,9 +135,9 @@ nav { color: #fc0; text-align: center; text-transform: uppercase; - font-size: 14px; + font-size: 0.625em; font-weight: 900; - padding: 5px; + padding: 10px 5px; @include border-radius(5px); } @@ -160,20 +177,29 @@ h6:hover .header-link { opacity: 1; } -@media (max-width: 768px) { - .main-nav ul { - text-align: right; +@media (max-width: 568px) { + header { padding-bottom: 0 } +} +@media (max-width: 580px) { + header { + .flexbox { height: auto } + .logo img { margin-top: 0 } } } +@media (max-width: 699px) { + .searchbox { display: none } +} +@media (max-width: 768px) { + .main-nav ul { text-align: right } +} @media (max-width: 830px) { .main-nav { .show-on-mobiles { display: inline; } .hide-on-mobiles { display: none; } } } - -@media (max-width: 950px) { - .searchbox { display: none;} +@media (max-width: 890px) { + .meta { display: none; } } /* Footer */ From 5d71314e1668249635ca3599f0bd2e5ac999ed38 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 19 Nov 2017 14:00:39 -0500 Subject: [PATCH 2576/4996] Update history to reflect merge of #6567 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index e7f21d83f51..b71e88bc429 100644 --- a/History.markdown +++ b/History.markdown @@ -81,6 +81,7 @@ * Back to original main navigation (#6544) * Styles: mobile-docs select element (#6545) * Search with DocSearch by @Algolia (#6557) + * Site header redesign (#6567) ### Bug Fixes From e88b81318c52bcd7a76769ad41797b7e8a1cb6ca Mon Sep 17 00:00:00 2001 From: ashmaroli Date: Mon, 20 Nov 2017 18:36:47 +0530 Subject: [PATCH 2577/4996] move logo above navigation on small screens (#6570) Merge pull request 6570 --- docs/_includes/header.html | 6 +++--- docs/_sass/_style.scss | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 7cdcb970bc0..b289550d2d8 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -1,7 +1,4 @@
    -

    @@ -28,4 +25,7 @@

    +
    diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss index 52e6e8e3008..fb185972394 100644 --- a/docs/_sass/_style.scss +++ b/docs/_sass/_style.scss @@ -177,9 +177,6 @@ h6:hover .header-link { opacity: 1; } -@media (max-width: 568px) { - header { padding-bottom: 0 } -} @media (max-width: 580px) { header { .flexbox { height: auto } From 28f64fb2b3aba2211b7e0aac79a39ef4e271719e Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 20 Nov 2017 08:06:48 -0500 Subject: [PATCH 2578/4996] Update history to reflect merge of #6570 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index b71e88bc429..94da8dcd180 100644 --- a/History.markdown +++ b/History.markdown @@ -82,6 +82,7 @@ * Styles: mobile-docs select element (#6545) * Search with DocSearch by @Algolia (#6557) * Site header redesign (#6567) + * Move logo above site navigation on small screens (#6570) ### Bug Fixes From c2586bbae7c0d7b447fecd59bda9243abe0215e5 Mon Sep 17 00:00:00 2001 From: ashmaroli Date: Wed, 22 Nov 2017 00:58:08 +0530 Subject: [PATCH 2579/4996] fail gracefully if "sass" gem cannot be loaded (#6573) Merge pull request 6573 --- lib/jekyll/theme.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb index cf9829ea322..edd041eea5c 100644 --- a/lib/jekyll/theme.rb +++ b/lib/jekyll/theme.rb @@ -38,7 +38,7 @@ def assets_path def configure_sass return unless sass_path - require "sass" + Jekyll::External.require_with_graceful_fail "sass" Sass.load_paths << sass_path end From f6cf8b934a31a13c84b478d02d3c1eec62538182 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 21 Nov 2017 14:28:10 -0500 Subject: [PATCH 2580/4996] Update history to reflect merge of #6573 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 94da8dcd180..85ca98c6371 100644 --- a/History.markdown +++ b/History.markdown @@ -88,6 +88,7 @@ * Raise when theme root directory is not available (#6455) * Avoid block parser warning in SmartyPants (#6565) + * Fail gracefully if "sass" gem cannot be loaded (#6573) ## 3.6.2 / 2017-10-21 From 1c469eb53a90ae22e36560a500f97ff3d6a5317c Mon Sep 17 00:00:00 2001 From: Jonathan Hooper Date: Wed, 22 Nov 2017 08:37:18 -0600 Subject: [PATCH 2581/4996] Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML (#5828) Merge pull request 5828 --- lib/jekyll/convertible.rb | 2 +- lib/jekyll/document.rb | 4 ++-- test/test_convertible.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index 1236d9d1662..d3749a1ad1d 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -46,7 +46,7 @@ def read_yaml(base, name, opts = {}) self.content = $POSTMATCH self.data = SafeYAML.load(Regexp.last_match(1)) end - rescue SyntaxError => e + rescue Psych::SyntaxError => e Jekyll.logger.warn "YAML Exception reading #{filename}: #{e.message}" raise e if self.site.config["strict_front_matter"] rescue StandardError => e diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 5bb255666ea..1eb8418605e 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 SyntaxError, StandardError, Errors::FatalException => e + rescue StandardError => e handle_read_error(e) end end @@ -463,7 +463,7 @@ def read_post_data private def handle_read_error(error) - if error.is_a? SyntaxError + if error.is_a? Psych::SyntaxError Jekyll.logger.error "Error:", "YAML Exception reading #{path}: #{error.message}" else Jekyll.logger.error "Error:", "could not read file #{path}: #{error.message}" diff --git a/test/test_convertible.rb b/test/test_convertible.rb index f05cb4fb2c7..5b73e252815 100644 --- a/test/test_convertible.rb +++ b/test/test_convertible.rb @@ -31,7 +31,7 @@ class TestConvertible < JekyllUnitTest ret = @convertible.read_yaml(@base, name) assert_equal({}, ret) end - assert_match(%r!YAML Exception|syntax error|Error reading file!, out) + assert_match(%r!YAML Exception!, out) assert_match(%r!#{File.join(@base, name)}!, out) end From cebcff14120f8365feaf4bbabfa5ebd50b5704c6 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 22 Nov 2017 09:37:20 -0500 Subject: [PATCH 2582/4996] Update history to reflect merge of #5828 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 85ca98c6371..ba659ed6be6 100644 --- a/History.markdown +++ b/History.markdown @@ -53,6 +53,7 @@ * Dependencies: upgrade to toml 0.2.0 (#6541) * Lock to cucumber 3.0.1 on Ruby 2.1 (#6546) * Bump JRuby version in Travis config (#6561) + * Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML (#5828) ### Minor Enhancements From 46b2501df6b7e3e2f101bdb7c4d3d4701f7fd785 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 24 Nov 2017 03:43:37 -0500 Subject: [PATCH 2583/4996] Docs: Include version badge for latest features (#6574) Merge pull request 6574 --- docs/_docs/collections.md | 6 +++--- docs/_docs/configuration.md | 2 +- docs/_docs/templates.md | 2 +- docs/_includes/docs_version_badge.html | 1 + docs/_sass/_style.scss | 24 ++++++++++++++++++++++++ 5 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 docs/_includes/docs_version_badge.html diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md index 0b59b7db6d1..30ea5592c65 100644 --- a/docs/_docs/collections.md +++ b/docs/_docs/collections.md @@ -46,10 +46,10 @@ defaults: layout: page ``` -     diff --git a/docs/_includes/news_contents_mobile.html b/docs/_includes/news_contents_mobile.html index 8f8ba563947..3f8c18f785e 100644 --- a/docs/_includes/news_contents_mobile.html +++ b/docs/_includes/news_contents_mobile.html @@ -3,9 +3,9 @@ - {% for post in site.posts %} + {% for post in site.posts -%} - {% endfor %} + {% endfor -%}
    -
    Gather your collections
    +
    +
    Gather your collections {%- include docs_version_badge.html version="3.7.0" -%}
    -

    From v3.7.0 you can optionally specify a directory to store all your collections in the same place with collections_dir: my_collections

    +

    You can optionally specify a directory to store all your collections in the same place with 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.

    diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md index cd0f20583f2..4a3c0fe7a27 100644 --- a/docs/_docs/configuration.md +++ b/docs/_docs/configuration.md @@ -549,7 +549,7 @@ 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. +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. {%- include docs_version_badge.html version="3.7.0" -%} ```yaml collections: diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md index 81eb5b2a696..390410aaf92 100644 --- a/docs/_docs/templates.md +++ b/docs/_docs/templates.md @@ -429,7 +429,7 @@ The default is `default`. They are as follows (with what they filter): - `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`) +- `latin`: like `default`, except Latin characters are first transliterated (e.g. `àèïòü` to `aeiou`) {%- include docs_version_badge.html version="3.7.0" -%} ## Tags diff --git a/docs/_includes/docs_version_badge.html b/docs/_includes/docs_version_badge.html new file mode 100644 index 00000000000..3c358109ffe --- /dev/null +++ b/docs/_includes/docs_version_badge.html @@ -0,0 +1 @@ +{{ include.version }} diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss index fb185972394..11d89adf3a8 100644 --- a/docs/_sass/_style.scss +++ b/docs/_sass/_style.scss @@ -1030,6 +1030,30 @@ code.output { text-shadow: 0 1px 0 rgba(255,255,255,.25); } +/* Version badge */ + +.version-badge { + margin-left: .25em; + padding: 0.2em; + font-size: .75em; + font-weight: 400; + background-color: #fc0; + color: #222; + text-shadow: none; + vertical-align: middle; + border-radius: 3.75px; +} + +.note { + .version-badge { + font-size: 0.9rem; + padding: 0.1em 0.2em; + background-color: rgba(0,0,0,0.2); + color: #fff; + box-shadow: inset 0 1px 10px rgba(0,0,0,0.3),0 1px 0 rgba(255,255,255,0.1),0 -1px 0 rgba(0,0,0,0.5); + } +} + /* Responsive tables */ @media (max-width: 768px) { From c7c31e014cc4b263aec62cfb38185d0580d3724e Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 24 Nov 2017 03:43:39 -0500 Subject: [PATCH 2584/4996] Update history to reflect merge of #6574 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index ba659ed6be6..b9fb48435e1 100644 --- a/History.markdown +++ b/History.markdown @@ -84,6 +84,7 @@ * Search with DocSearch by @Algolia (#6557) * Site header redesign (#6567) * Move logo above site navigation on small screens (#6570) + * Docs: Include version badge for latest features (#6574) ### Bug Fixes From 368fa1f72305eae3c9c70e59cfb6d4b4f8bb563f Mon Sep 17 00:00:00 2001 From: Florian Thomas Date: Fri, 24 Nov 2017 08:49:13 +0000 Subject: [PATCH 2585/4996] return correct file in dir if dir has same name as file (#6569) Merge pull request 6569 --- lib/jekyll/commands/serve/servlet.rb | 6 +++- test/fixtures/webrick/bar.html | 1 + test/fixtures/webrick/bar/baz.html | 1 + test/helper.rb | 54 ++++++++++++++++++++++++++++ test/test_commands_serve_servlet.rb | 38 ++++++++++++++++++++ 5 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 test/fixtures/webrick/bar.html create mode 100644 test/fixtures/webrick/bar/baz.html create mode 100644 test/test_commands_serve_servlet.rb diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb index 2e41b697524..70b6d66df34 100644 --- a/lib/jekyll/commands/serve/servlet.rb +++ b/lib/jekyll/commands/serve/servlet.rb @@ -18,13 +18,17 @@ def initialize(server, root, callbacks) super end + def search_index_file(req, res) + super || search_file(req, res, ".html") + end + # Add the ability to tap file.html the same way that Nginx does on our # Docker images (or on GitHub Pages.) The difference is that we might end # up with a different preference on which comes first. def search_file(req, res, basename) # /file.* > /file/index.html > /file.html - super || super(req, res, ".html") || super(req, res, "#{basename}.html") + super || super(req, res, "#{basename}.html") end # rubocop:disable Naming/MethodName diff --git a/test/fixtures/webrick/bar.html b/test/fixtures/webrick/bar.html new file mode 100644 index 00000000000..76870bf2f38 --- /dev/null +++ b/test/fixtures/webrick/bar.html @@ -0,0 +1 @@ +Content of bar.html diff --git a/test/fixtures/webrick/bar/baz.html b/test/fixtures/webrick/bar/baz.html new file mode 100644 index 00000000000..794d5f2202d --- /dev/null +++ b/test/fixtures/webrick/bar/baz.html @@ -0,0 +1 @@ +Content of baz.html diff --git a/test/helper.rb b/test/helper.rb index 672fedd2862..aa94be13e61 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -44,6 +44,8 @@ def jruby? include Jekyll +require "jekyll/commands/serve/servlet" + # Report with color. Minitest::Reporters.use! [ Minitest::Reporters::DefaultReporter.new( @@ -194,3 +196,55 @@ def skip_if_windows(msg = nil) end end end + +class FakeLogger + def <<(str); end +end + +module TestWEBrick + + module_function + + def mount_server(&block) + server = WEBrick::HTTPServer.new(config) + + begin + server.mount("/", Jekyll::Commands::Serve::Servlet, document_root, + document_root_options) + + server.start + addr = server.listeners[0].addr + block.yield([server, addr[3], addr[1]]) + rescue StandardError => e + raise e + ensure + server.shutdown + sleep 0.1 until server.status == :Stop + end + end + + def config + logger = FakeLogger.new + { + :BindAddress => "127.0.0.1", :Port => 0, + :ShutdownSocketWithoutClose => true, + :ServerType => Thread, + :Logger => WEBrick::Log.new(logger), + :AccessLog => [[logger, ""]], + :JekyllOptions => {}, + } + end + + def document_root + "#{File.dirname(__FILE__)}/fixtures/webrick" + end + + def document_root_options + WEBrick::Config::FileHandler.merge({ + :FancyIndexing => true, + :NondisclosureName => [ + ".ht*", "~*", + ], + }) + end +end diff --git a/test/test_commands_serve_servlet.rb b/test/test_commands_serve_servlet.rb new file mode 100644 index 00000000000..1f84cbbbe64 --- /dev/null +++ b/test/test_commands_serve_servlet.rb @@ -0,0 +1,38 @@ +# frozen_string_literal: true + +require "webrick" +require "helper" +require "net/http" + +class TestCommandsServeServlet < JekyllUnitTest + def get(path) + TestWEBrick.mount_server do |_server, addr, port| + http = Net::HTTP.new(addr, port) + req = Net::HTTP::Get.new(path) + + http.request(req) { |response| yield(response) } + end + end + + context "with a directory and file with the same name" do + should "find that file" do + get("/bar/") do |response| + assert_equal("200", response.code) + assert_equal("Content of bar.html", response.body.strip) + end + end + + should "find file in directory" do + get("/bar/baz") do |response| + assert_equal("200", response.code) + assert_equal("Content of baz.html", response.body.strip) + end + end + + should "return 404 for non-existing files" do + get("/bar/missing") do |response| + assert_equal("404", response.code) + end + end + end +end From bd3c395cfcca50e18d930c1a1135ef917b079751 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 24 Nov 2017 03:49:15 -0500 Subject: [PATCH 2586/4996] Update history to reflect merge of #6569 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index b9fb48435e1..94d3c9ecf35 100644 --- a/History.markdown +++ b/History.markdown @@ -91,6 +91,7 @@ * Raise when theme root directory is not available (#6455) * Avoid block parser warning in SmartyPants (#6565) * Fail gracefully if "sass" gem cannot be loaded (#6573) + * return correct file in dir if dir has same name as file (#6569) ## 3.6.2 / 2017-10-21 From 01806bcec49ba0202fe73173acdb487bc13c4018 Mon Sep 17 00:00:00 2001 From: ashmaroli Date: Fri, 24 Nov 2017 17:49:08 +0530 Subject: [PATCH 2587/4996] use version-badge on an existing feature intro (#6575) Merge pull request 6575 --- docs/_docs/themes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md index 6907ffb0c00..b5423a6b56c 100644 --- a/docs/_docs/themes.md +++ b/docs/_docs/themes.md @@ -224,9 +224,9 @@ Your theme's styles can be included in the user's stylesheet using the `@import` ``` {% endraw %} -### Theme-gem dependencies +### Theme-gem dependencies {%- include docs_version_badge.html version="3.5.0" -%} -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.) +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. From 110b4734876eae19b9de7b7f4acdd7adf3b5e10c Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 24 Nov 2017 07:19:10 -0500 Subject: [PATCH 2588/4996] Update history to reflect merge of #6575 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 94d3c9ecf35..d878b8d1fdc 100644 --- a/History.markdown +++ b/History.markdown @@ -85,6 +85,7 @@ * Site header redesign (#6567) * Move logo above site navigation on small screens (#6570) * Docs: Include version badge for latest features (#6574) + * Use version-badge on an existing feature intro (#6575) ### Bug Fixes From 0b4f657039b4e56820ee9e9eb3e4dc493b4e3f1f Mon Sep 17 00:00:00 2001 From: ashmaroli Date: Mon, 27 Nov 2017 01:06:41 +0530 Subject: [PATCH 2589/4996] drop forwarding to private methods (#6577) Merge pull request 6577 --- lib/jekyll/theme_builder.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb index aca89dd655c..9b43e0a3714 100644 --- a/lib/jekyll/theme_builder.rb +++ b/lib/jekyll/theme_builder.rb @@ -21,6 +21,14 @@ def create! initialize_git_repo end + def user_name + @user_name ||= `git config user.name`.chomp + end + + def user_email + @user_email ||= `git config user.email`.chomp + end + private def root @@ -85,14 +93,6 @@ def initialize_git_repo write_file(".gitignore", template("gitignore")) end - def user_name - @user_name ||= `git config user.name`.chomp - end - - def user_email - @user_email ||= `git config user.email`.chomp - end - class ERBRenderer extend Forwardable From fce3cbfd8194ae9c3cb576cbb2ea6c0f25748250 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 26 Nov 2017 14:36:43 -0500 Subject: [PATCH 2590/4996] Update history to reflect merge of #6577 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index d878b8d1fdc..f05f90020c6 100644 --- a/History.markdown +++ b/History.markdown @@ -54,6 +54,7 @@ * Lock to cucumber 3.0.1 on Ruby 2.1 (#6546) * Bump JRuby version in Travis config (#6561) * Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML (#5828) + * Drop forwarding to private methods by exposing those methods as public (#6577) ### Minor Enhancements From c14b8b5864386a09028fa04bbea674a3c3263b73 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 29 Nov 2017 03:17:08 -0500 Subject: [PATCH 2591/4996] Upgrade pygments to v1.x (#5937) Merge pull request 5937 --- Gemfile | 2 +- lib/jekyll/tags/highlight.rb | 4 ++-- test/test_redcarpet.rb | 13 +++++++------ test/test_tags.rb | 23 ++++++++++++++--------- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index 2ba32da780c..8590544ed3a 100644 --- a/Gemfile +++ b/Gemfile @@ -81,7 +81,7 @@ group :jekyll_optional_dependencies do platform :ruby, :mswin, :mingw, :x64_mingw do gem "classifier-reborn", "~> 2.1.0" gem "liquid-c", "~> 3.0" - gem "pygments.rb", "~> 0.6.0" + gem "pygments.rb", "~> 1.0" gem "rdiscount", "~> 2.0" gem "redcarpet", "~> 3.2", ">= 3.2.3" gem "yajl-ruby", "~> 1.2" diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index 683e3b2b456..256342c3fe6 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -86,7 +86,7 @@ def parse_options(input) end def render_pygments(code, is_safe) - Jekyll::External.require_with_graceful_fail("pygments") + Jekyll::External.require_with_graceful_fail("pygments") unless defined?(Pygments) highlighted_code = Pygments.highlight( code, @@ -118,7 +118,7 @@ def render_rouge(code) :gutter_class => "gutter", :code_class => "code" ) - lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText + lexer = ::Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText formatter.format(lexer.lex(code)) end diff --git a/test/test_redcarpet.rb b/test/test_redcarpet.rb index f4208570931..29d787ae62f 100644 --- a/test/test_redcarpet.rb +++ b/test/test_redcarpet.rb @@ -46,16 +46,17 @@ class TestRedcarpet < JekyllUnitTest end should "render fenced code blocks with syntax highlighting" do - assert_equal "
    puts "Hello world"\n
    ", - @markdown.convert( - <<-EOS + assert_equal \ + "
    puts "Hello world"\n
    ", + @markdown.convert( + <<-EOS ```ruby puts "Hello world" ``` EOS - ).strip + ).strip end end diff --git a/test/test_tags.rb b/test/test_tags.rb index 43d83464362..a76f0df138a 100644 --- a/test/test_tags.rb +++ b/test/test_tags.rb @@ -185,7 +185,8 @@ def highlight_block_with_opts(options_string) should "render markdown with pygments" do assert_match( - %(
    test
    ), + %(
    ) +
+          %(test
    ), @result ) end @@ -193,7 +194,7 @@ def highlight_block_with_opts(options_string) should "render markdown with pygments with line numbers" do assert_match( %(
    ) +
-          %(1 test
    ), + %(1 test    ), @result ) end @@ -206,7 +207,7 @@ def highlight_block_with_opts(options_string) should "not embed the file" do assert_match( - %(
    ) +
+          %(
    ) +
           %(./jekyll.gemspec
    ),
           @result
         )
@@ -220,7 +221,8 @@ def highlight_block_with_opts(options_string)
 
       should "render markdown with pygments line handling" do
         assert_match(
-          %(
    Æ
    ),
+          %(
    ) +
+          %(Æ
    ),
           @result
         )
       end
@@ -240,7 +242,8 @@ def highlight_block_with_opts(options_string)
 
       should "only strip the preceding newlines" do
         assert_match(
-          %(
         [,1] [,2]),
+          %(
    ) +
+          %(     [,1] [,2]),
           @result
         )
       end
@@ -265,8 +268,8 @@ def highlight_block_with_opts(options_string)
 
       should "only strip the newlines which precede and succeed the entire block" do
         assert_match(
-          "
    " \
-          "     [,1] [,2]\n\n\n[1,] FALSE TRUE\n[2,] FALSE TRUE
    ",
+          %(
    ) +
+          %(     [,1] [,2]\n\n\n[1,] FALSE TRUE\n[2,] FALSE TRUE
    ),
           @result
         )
       end
@@ -280,7 +283,8 @@ def highlight_block_with_opts(options_string)
 
       should "only strip the preceding newlines" do
         assert_match(
-          %(
         [,1] [,2]),
+          %(
    ) +
+          %(     [,1] [,2]),
           @result
         )
       end
@@ -298,7 +302,8 @@ def highlight_block_with_opts(options_string)
 
       should "only strip the preceding newlines" do
         assert_match(
-          %(
         [,1] [,2]),
+          %(
    ) +
+          %(     [,1] [,2]),
           @result
         )
       end

From b77593ce74c67cdb06c1f7eae4ee17b0db381510 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 29 Nov 2017 03:17:09 -0500
Subject: [PATCH 2592/4996] Update history to reflect merge of #5937 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f05f90020c6..06d286eb9eb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -55,6 +55,7 @@
   * Bump JRuby version in Travis config (#6561)
   * Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML (#5828)
   * Drop forwarding to private methods by exposing those methods as public (#6577)
+  * Upgrade pygments to v1.x (#5937)
 
 ### Minor Enhancements
 

From a13740839acc536f2629840dc7acb5a3127a1f99 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 29 Nov 2017 03:37:07 -0500
Subject: [PATCH 2593/4996] Bump yajl-ruby (#6582)

Merge pull request 6582
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 8590544ed3a..68bc28c24a5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -84,7 +84,7 @@ group :jekyll_optional_dependencies do
     gem "pygments.rb", "~> 1.0"
     gem "rdiscount", "~> 2.0"
     gem "redcarpet", "~> 3.2", ">= 3.2.3"
-    gem "yajl-ruby", "~> 1.2"
+    gem "yajl-ruby", "~> 1.3.1"
   end
 
   # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

From 64c87c92533bb42b4d8f7fb83d977c11861f3473 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 29 Nov 2017 03:37:08 -0500
Subject: [PATCH 2594/4996] Update history to reflect merge of #6582 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 06d286eb9eb..49bfec78dda 100644
--- a/History.markdown
+++ b/History.markdown
@@ -56,6 +56,7 @@
   * Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML (#5828)
   * Drop forwarding to private methods by exposing those methods as public (#6577)
   * Upgrade pygments to v1.x (#5937)
+  * Bump yajl-ruby (#6582)
 
 ### Minor Enhancements
 

From da0df228cd14d745a46fbd0f910c06a4fd488d96 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Wed, 29 Nov 2017 19:26:46 +0530
Subject: [PATCH 2595/4996] cleanup test_redcarpet.rb (#6584)

Merge pull request 6584
---
 test/test_redcarpet.rb | 57 ++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/test/test_redcarpet.rb b/test/test_redcarpet.rb
index 29d787ae62f..51da49c58e4 100644
--- a/test/test_redcarpet.rb
+++ b/test/test_redcarpet.rb
@@ -19,6 +19,13 @@ class TestRedcarpet < JekyllUnitTest
       }
 
       @markdown = Converters::Markdown.new @config
+
+      @sample = Jekyll::Utils.strip_heredoc(<<-EOS
+        ```ruby
+        puts "Hello world"
+        ```
+      EOS
+                                           )
     end
 
     should "pass redcarpet options" do
@@ -35,7 +42,7 @@ class TestRedcarpet < JekyllUnitTest
 
     should "pass redcarpet render options" do
       assert_equal "
    bad code not here: i am bad
    ",
-              @markdown.convert("**bad code not here**: ").strip
+        @markdown.convert("**bad code not here**: ").strip
     end
 
     context "with pygments enabled" do
@@ -46,17 +53,12 @@ class TestRedcarpet < JekyllUnitTest
       end
 
       should "render fenced code blocks with syntax highlighting" do
-        assert_equal \
-          "
    puts "Hello world"\n
    ",
-          @markdown.convert(
-            <<-EOS
-```ruby
-puts "Hello world"
-```
-EOS
-          ).strip
+        assert_equal(
+          %(
    puts "Hello world"\n
    ),
+          @markdown.convert(@sample).strip
+        )
       end
     end
 
@@ -66,16 +68,12 @@ class TestRedcarpet < JekyllUnitTest
       end
 
       should "render fenced code blocks with syntax highlighting" do
-        assert_equal "
    puts \"Hello world\"\n
    ",
-                     @markdown.convert(
-                       <<-EOS
-```ruby
-puts "Hello world"
-```
-          EOS
-                     ).strip
+        assert_equal(
+          %(
    puts "Hello world"\n
    ),
+          @markdown.convert(@sample).strip
+        )
       end
     end
 
@@ -85,16 +83,11 @@ class TestRedcarpet < JekyllUnitTest
       end
 
       should "render fenced code blocks without syntax highlighting" do
-        assert_equal "
    puts "Hello world"\n
    "\
-                     "
    ",
-                     @markdown.convert(
-                       <<-EOS
-```ruby
-puts "Hello world"
-```
-          EOS
-                     ).strip
+        assert_equal(
+          %(
    puts "Hello world"\n
    ),
+          @markdown.convert(@sample).strip
+        )
       end
     end
   end

From f7b45c44403d18e6b21cb78abe74cd19e538ad97 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 29 Nov 2017 08:56:47 -0500
Subject: [PATCH 2596/4996] Update history to reflect merge of #6584 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 49bfec78dda..75ca663c772 100644
--- a/History.markdown
+++ b/History.markdown
@@ -57,6 +57,7 @@
   * Drop forwarding to private methods by exposing those methods as public (#6577)
   * Upgrade pygments to v1.x (#5937)
   * Bump yajl-ruby (#6582)
+  * Cleanup test_redcarpet.rb (#6584)
 
 ### Minor Enhancements
 

From 38342006a361041029c46547a74972c85a30fd41 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Thu, 30 Nov 2017 23:46:35 +0530
Subject: [PATCH 2597/4996] Add PageWithoutAFile class from jekyll plugins
 (#6556)

Merge pull request 6556
---
 lib/jekyll.rb                     |   1 +
 lib/jekyll/page_without_a_file.rb |  18 ++++
 test/fixtures/physical.html       |   6 ++
 test/test_page_without_a_file.rb  | 159 ++++++++++++++++++++++++++++++
 4 files changed, 184 insertions(+)
 create mode 100644 lib/jekyll/page_without_a_file.rb
 create mode 100644 test/fixtures/physical.html
 create mode 100644 test/test_page_without_a_file.rb

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 733796cc2af..c909c3d13e4 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -61,6 +61,7 @@ module Jekyll
   autoload :ThemeAssetsReader,   "jekyll/readers/theme_assets_reader"
   autoload :LogAdapter,          "jekyll/log_adapter"
   autoload :Page,                "jekyll/page"
+  autoload :PageWithoutAFile,    "jekyll/page_without_a_file"
   autoload :PluginManager,       "jekyll/plugin_manager"
   autoload :Publisher,           "jekyll/publisher"
   autoload :Reader,              "jekyll/reader"
diff --git a/lib/jekyll/page_without_a_file.rb b/lib/jekyll/page_without_a_file.rb
new file mode 100644
index 00000000000..2d30af51116
--- /dev/null
+++ b/lib/jekyll/page_without_a_file.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Jekyll
+  # A Jekyll::Page subclass to handle processing files without reading it to
+  # determine the page-data and page-content based on Front Matter delimiters.
+  #
+  # The class instance is basically just a bare-bones entity with just
+  # attributes "dir", "name", "path", "url" defined on it.
+  class PageWithoutAFile < Page
+    def read_yaml(*)
+      @data ||= {}
+    end
+
+    def inspect
+      "#"
+    end
+  end
+end
diff --git a/test/fixtures/physical.html b/test/fixtures/physical.html
new file mode 100644
index 00000000000..8913980af32
--- /dev/null
+++ b/test/fixtures/physical.html
@@ -0,0 +1,6 @@
+---
+title: Physical file
+permalink: /physical/
+---
+
+A physical file entity
diff --git a/test/test_page_without_a_file.rb b/test/test_page_without_a_file.rb
new file mode 100644
index 00000000000..b1fa9c04c9a
--- /dev/null
+++ b/test/test_page_without_a_file.rb
@@ -0,0 +1,159 @@
+# frozen_string_literal: true
+
+require "helper"
+
+class TestPageWithoutAFile < JekyllUnitTest
+  def setup_page(*args, base: source_dir, klass: PageWithoutAFile)
+    dir, file = args
+    if file.nil?
+      file = dir
+      dir = ""
+    end
+    klass.new(@site, base, dir, file)
+  end
+
+  def render_and_write
+    @site.render
+    @site.cleanup
+    @site.write
+  end
+
+  context "A PageWithoutAFile" do
+    setup do
+      clear_dest
+      @site = Site.new(Jekyll.configuration({
+        "source"            => source_dir,
+        "destination"       => dest_dir,
+        "skip_config_files" => true,
+      }))
+    end
+
+    context "with default site configuration" do
+      setup do
+        @page = setup_page("properties.html")
+      end
+
+      should "not have page-content and page-data defined within it" do
+        assert_equal "pages", @page.type.to_s
+        assert_nil @page.content
+        assert_empty @page.data
+      end
+
+      should "have basic attributes defined in it" do
+        regular_page = setup_page("properties.html", :klass => Page)
+        basic_attrs = %w(dir name path url)
+        attrs = {
+          "content"   => "All the properties.\n",
+          "dir"       => "/",
+          "excerpt"   => nil,
+          "foo"       => "bar",
+          "layout"    => "default",
+          "name"      => "properties.html",
+          "path"      => "properties.html",
+          "permalink" => "/properties/",
+          "published" => nil,
+          "title"     => "Properties Page",
+          "url"       => "/properties.html",
+        }
+        attrs.each do |prop, value|
+          # assert the props being accessible in a Jekyll::Page instance
+          assert_equal "All the properties.\n", regular_page["content"]
+          assert_equal "properties.html", regular_page["name"]
+
+          # assert differences with Jekyll::PageWithoutAFile instance
+          if basic_attrs.include?(prop)
+            assert_equal @page[prop], value, "For :"
+          else
+            assert_nil @page[prop]
+          end
+        end
+      end
+    end
+
+    context "with site-wide permalink configuration" do
+      setup do
+        @site.permalink_style = :title
+      end
+
+      should "generate page url accordingly" do
+        page = setup_page("properties.html")
+        assert_equal "/properties", page.url
+      end
+    end
+
+    context "with default front matter configuration" do
+      setup do
+        @site.config["defaults"] = [
+          {
+            "scope"  => {
+              "path" => "",
+              "type" => "pages",
+            },
+            "values" => {
+              "layout" => "default",
+              "author" => "John Doe",
+            },
+          },
+        ]
+
+        @page = setup_page("info.md")
+      end
+
+      should "respect front matter defaults" do
+        assert_nil @page.data["title"]
+        assert_equal "John Doe", @page.data["author"]
+        assert_equal "default", @page.data["layout"]
+      end
+    end
+
+    context "with a path outside site.source" do
+      should "not access its contents" do
+        base = "../../../"
+        page = setup_page("pwd", :base => base)
+
+        assert_equal "pwd", page.path
+        assert_nil page.content
+      end
+    end
+
+    context "while processing" do
+      setup do
+        clear_dest
+        @site.config["title"] = "Test Site"
+        @page = setup_page("physical.html", :base => test_dir("fixtures"))
+      end
+
+      should "recieve content provided to it" do
+        assert_nil @page.content
+
+        @page.content = "{{ site.title }}"
+        assert_equal "{{ site.title }}", @page.content
+      end
+
+      should "not be processed and written to disk at destination" do
+        @page.content = "Lorem ipsum dolor sit amet"
+        @page.data["permalink"] = "/virtual-about/"
+
+        render_and_write
+
+        refute_exist dest_dir("physical")
+        refute_exist dest_dir("virtual-about")
+        refute File.exist?(dest_dir("virtual-about", "index.html"))
+      end
+
+      should "be processed and written to destination when passed as "\
+        "an entry in 'site.pages' array" do
+        @page.content = "{{ site.title }}"
+        @page.data["permalink"] = "/virtual-about/"
+
+        @site.pages << @page
+        render_and_write
+
+        refute_exist dest_dir("physical")
+        assert_exist dest_dir("virtual-about")
+        assert File.exist?(dest_dir("virtual-about", "index.html"))
+        assert_equal "Test Site", File.read(dest_dir("virtual-about", "index.html"))
+      end
+    end
+  end
+end

From 5a10887f86e2425b882800868ded8e05a82b7a0d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 30 Nov 2017 12:16:37 -0600
Subject: [PATCH 2598/4996] Update history to reflect merge of #6556 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 75ca663c772..fcd419fb053 100644
--- a/History.markdown
+++ b/History.markdown
@@ -58,6 +58,7 @@
   * Upgrade pygments to v1.x (#5937)
   * Bump yajl-ruby (#6582)
   * Cleanup test_redcarpet.rb (#6584)
+  * Add PageWithoutAFile class from jekyll plugins (#6556)
 
 ### Minor Enhancements
 

From a37bde52b3d1acf5e3a50385f2c492d10f2871d1 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 3 Dec 2017 01:51:07 +0100
Subject: [PATCH 2599/4996] Dependency: Bump jekyll-watch to 2.0 (#6589)

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

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 98fd53824f4..90ad0ceb846 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   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("jekyll-watch",          "~> 2.0")
   s.add_runtime_dependency("kramdown",              "~> 1.14")
   s.add_runtime_dependency("liquid",                "~> 4.0")
   s.add_runtime_dependency("mercenary",             "~> 0.3.3")

From 4c97f5ef222465916c499f5d7a1bace9d1a40650 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 2 Dec 2017 18:51:09 -0600
Subject: [PATCH 2600/4996] Update history to reflect merge of #6589 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fcd419fb053..54bd43db93d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -74,6 +74,7 @@
   * Add latin mode to slugify (#6509)
   * Log Kramdown warnings if log level is WARN (#6522)
   * Add json extension to list of directory indices (#6550)
+  * Dependency: Bump jekyll-watch to 2.0 (#6589)
 
 ### Site Enhancements
 

From 2ea970d2b5ae8a5ea5739b9f41e68de52127d055 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 3 Dec 2017 19:38:34 +0100
Subject: [PATCH 2601/4996] Docs: Avoid Kramdown warnings

---
 docs/_docs/history.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 85e493616af..a7308287028 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -153,7 +153,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - added BibSonomy plugin ([#6143]({{ site.repository }}/issues/6143))
 - add plugins for multiple page pagination ([#6055]({{ site.repository }}/issues/6055))
 - Update minimum Ruby version in installation.md ([#6164]({{ site.repository }}/issues/6164))
-- [docs] Add information about finding a collection in `site.collections` ([#6165]({{ site.repository }}/issues/6165))
+- Add information about finding a collection in `site.collections` ([#6165]({{ site.repository }}/issues/6165))
 - Add {% raw %}`{% raw %}`{% endraw %} to Liquid example on site ([#6179]({{ site.repository }}/issues/6179))
 - Added improved Pug plugin - removed 404 Jade plugin ([#6174]({{ site.repository }}/issues/6174))
 - Linking the link ([#6210]({{ site.repository }}/issues/6210))
@@ -263,7 +263,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Development Fixes
 {: #development-fixes-v3-5-0}
 
-- [Rubocop] add missing comma ([#5835]({{ site.repository }}/issues/5835))
+- Rubocop: add missing comma ([#5835]({{ site.repository }}/issues/5835))
 - Appease classifier-reborn ([#5934]({{ site.repository }}/issues/5934))
 - Allow releases & development on `*-stable` branches ([#5926]({{ site.repository }}/issues/5926))
 - Add script/backport-pr ([#5925]({{ site.repository }}/issues/5925))
@@ -302,7 +302,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 {: #bug-fixes-v3-5-0}
 
 - Exclude Gemfile by default ([#5860]({{ site.repository }}/issues/5860))
-- Convertible#validate_permalink!: ensure the return value of data["permalink"] is a string before asking if it is empty ([#5878]({{ site.repository }}/issues/5878))
+- Convertible#validate_permalink!: ensure the return value of `data["permalink"]` is a string before asking if it is empty ([#5878]({{ site.repository }}/issues/5878))
 - Allow abbreviated post dates ([#5920]({{ site.repository }}/issues/5920))
 - Remove dependency on include from default about.md ([#5903]({{ site.repository }}/issues/5903))
 - Allow colons in `uri_escape` filter ([#5957]({{ site.repository }}/issues/5957))
@@ -378,7 +378,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Switch to `https` when possible. ([#5611]({{ site.repository }}/issues/5611))
 - Update `_font-awesome.scss` to move .woff file before .ttf ([#5614]({{ site.repository }}/issues/5614))
 - Update documentation on updating FontAwesome Iconset ([#5655]({{ site.repository }}/issues/5655))
-- [site] Use defaults for docs and news-items ([#5744]({{ site.repository }}/issues/5744))
+- Use defaults for docs and news-items ([#5744]({{ site.repository }}/issues/5744))
 - Sort gems in `docs/_config.yml` ([#5746]({{ site.repository }}/issues/5746))
 - Add missing class ([#5791]({{ site.repository }}/issues/5791))
 - Improve template docs ([#5694]({{ site.repository }}/issues/5694))
@@ -440,7 +440,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Update quickstart.md ([#5758]({{ site.repository }}/issues/5758))
 - Correct minor typo ([#5764]({{ site.repository }}/issues/5764))
 - Fix a markdown link to look properly on the web ([#5769]({{ site.repository }}/issues/5769))
-- [docs] Info about the help command usage ([#5312]({{ site.repository }}/issues/5312))
+- Info about the help command usage ([#5312]({{ site.repository }}/issues/5312))
 - Add missing merge labels for jekyllbot ([#5753]({{ site.repository }}/issues/5753))
 - Fix broken links in documentation ([#5736]({{ site.repository }}/issues/5736))
 - Docs: add `match_regex` and `replace_regex` filters ([#5799]({{ site.repository }}/issues/5799))
@@ -583,10 +583,10 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Site: exclude README.md and .gitignore ([#5304]({{ site.repository }}/issues/5304))
 - Add link to Staticman ([#5224]({{ site.repository }}/issues/5224))
 - Update url for OpenShift ([#5320]({{ site.repository }}/issues/5320))
-- [docs] add help for missing static_file e.g. on heroku ([#5334]({{ site.repository }}/issues/5334))
+- Add help for missing static_file e.g. on heroku ([#5334]({{ site.repository }}/issues/5334))
 - Add a line about updating theme-gems in the docs ([#5318]({{ site.repository }}/issues/5318))
 - Explain how to copy a theme's files ([#5335]({{ site.repository }}/issues/5335))
-- [docs] .md as default extension in examples ([#5316]({{ site.repository }}/issues/5316))
+- .md as default extension in examples ([#5316]({{ site.repository }}/issues/5316))
 - Fix small typo in docs ([#5347]({{ site.repository }}/issues/5347))
 - Add missing period to sentence in first paragraph. ([#5372]({{ site.repository }}/issues/5372))
 - added jekyll-spotify plugin ([#5369]({{ site.repository }}/issues/5369))
@@ -595,7 +595,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Add documentation for `relative_url` and `absolute_url` ([#5405]({{ site.repository }}/issues/5405))
 - Bugfix on logo in JSON-LD ([#5421]({{ site.repository }}/issues/5421))
 - Fix Travis.ci documentation ([#5413]({{ site.repository }}/issues/5413))
-- [docs] Update documentation regarding `bundle install` after `jekyll new` ([#5428]({{ site.repository }}/issues/5428))
+- Update documentation regarding `bundle install` after `jekyll new` ([#5428]({{ site.repository }}/issues/5428))
 - Replace classic box-sizing reset with inheritance reset ([#5411]({{ site.repository }}/issues/5411))
 - Update Wikipedia YAML list link ([#5452]({{ site.repository }}/issues/5452))
 - Add Jekyll 3.3 release post ([#5442]({{ site.repository }}/issues/5442))
@@ -929,7 +929,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Fix broken links to the Code of Conduct ([#4436]({{ site.repository }}/issues/4436))
 - Upgrade notes: mention trailing slash in permalink; fixes [#4440]({{ site.repository }}/issues/4440) ([#4455]({{ site.repository }}/issues/4455))
 - Add hooks to the plugin categories toc ([#4463]({{ site.repository }}/issues/4463))
-- [add note] Jekyll 3 requires newer version of Ruby. ([#4461]({{ site.repository }}/issues/4461))
+- Jekyll 3 requires newer version of Ruby. ([#4461]({{ site.repository }}/issues/4461))
 - Fix typo in upgrading docs ([#4473]({{ site.repository }}/issues/4473))
 - Add note about upgrading documentation on jekyllrb.com/help/ ([#4484]({{ site.repository }}/issues/4484))
 - Update Rake link ([#4496]({{ site.repository }}/issues/4496))
@@ -1005,7 +1005,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Fix deep_merge_hashes! handling of drops and hashes ([#4359]({{ site.repository }}/issues/4359))
 - Page should respect output extension of its permalink ([#4373]({{ site.repository }}/issues/4373))
 - Disable auto-regeneration when running server detached ([#4376]({{ site.repository }}/issues/4376))
-- Drop#[]: only use public_send for keys in the content_methods array ([#4388]({{ site.repository }}/issues/4388))
+- Drop#: only use public_send for keys in the content_methods array ([#4388]({{ site.repository }}/issues/4388))
 - Extract title from filename successfully when no date. ([#4195]({{ site.repository }}/issues/4195))
 
 ### Development Fixes

From 0186bdb38445044e555f8c2b9be6f7e48694c781 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 3 Dec 2017 19:39:02 +0100
Subject: [PATCH 2602/4996] Docs: Build for production

---
 docs/_docs/usage.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/_docs/usage.md b/docs/_docs/usage.md
index dc273b29e90..d4dffa01099 100644
--- a/docs/_docs/usage.md
+++ b/docs/_docs/usage.md
@@ -21,6 +21,13 @@ jekyll build --watch
 #    watched for changes, and regenerated automatically.
 ```
 
+Default URL is set to `http://localhost:4000` in development environment. {% include docs_version_badge.html version="3.3.0" %} 
+
+If you want to build for your production environment:
+
+  - Set your production URL in `_config.yml` e.g. `url: https://example.com`.
+  - Run `JEKYLL_ENV=production bundle exec jekyll build`.
+
 
    
   
    Changes to _config.yml are not included during automatic regeneration.
    
   
    

From a58629f97dba80b6ececb29ebfeb64d81f0057b0 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 3 Dec 2017 19:40:10 +0100
Subject: [PATCH 2603/4996] Dev: Run preview in incremental mode

---
 rake/site.rake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rake/site.rake b/rake/site.rake
index 10d48c52651..d260e4472be 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -27,6 +27,8 @@ namespace :site do
     options = {
       "source"      => File.expand_path(docs_folder),
       "destination" => File.expand_path("#{docs_folder}/_site"),
+      "incremental" => true,
+      "profile"     => true,
       "watch"       => true,
       "serving"     => true,
     }

From 9ec9273ed9f04a666e6bc434baa2790321675c8f Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 3 Dec 2017 19:52:37 +0100
Subject: [PATCH 2604/4996] Docs: Add title and anchor

---
 docs/_docs/usage.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/usage.md b/docs/_docs/usage.md
index d4dffa01099..a4201c1e1d3 100644
--- a/docs/_docs/usage.md
+++ b/docs/_docs/usage.md
@@ -21,7 +21,9 @@ jekyll build --watch
 #    watched for changes, and regenerated automatically.
 ```
 
-Default URL is set to `http://localhost:4000` in development environment. {% include docs_version_badge.html version="3.3.0" %} 
+## Override default development settings
+
+Default URL is set to `http://localhost:4000` in development environment. {% include docs_version_badge.html version="3.3.0" %}
 
 If you want to build for your production environment:
 

From 8e2c240fa66e1cf0ab1729da48e4891b13c928ee Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 4 Dec 2017 13:03:39 +0530
Subject: [PATCH 2605/4996] use a shorter topic label for readability

Jekyll's logger like the first parameter to be of 20 chars or lesser
---
 lib/jekyll/collection.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index 4a3a70f6018..51c2f98ff3f 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -210,7 +210,7 @@ def read_document(full_path)
       if site.publisher.publish?(doc) || !write?
         docs << doc
       else
-        Jekyll.logger.debug "Skipped From Publishing:", doc.relative_path
+        Jekyll.logger.debug "Skipped Publishing:", doc.relative_path
       end
     end
 

From 9d68b1b134a50ee2ba670920b32b0f72f7af88f7 Mon Sep 17 00:00:00 2001
From: Alex Wood 
Date: Wed, 6 Dec 2017 16:33:51 -0500
Subject: [PATCH 2606/4996] Add LiveReload functionality to Jekyll. (#5142)

Merge pull request 5142
---
 Gemfile                                       |    1 +
 jekyll.gemspec                                |    1 +
 lib/jekyll/commands/serve.rb                  |  179 ++-
 .../commands/serve/live_reload_reactor.rb     |  153 +++
 .../serve/livereload_assets/livereload.js     | 1183 +++++++++++++++++
 lib/jekyll/commands/serve/servlet.rb          |  137 ++
 lib/jekyll/commands/serve/websockets.rb       |   80 ++
 lib/jekyll/utils.rb                           |    1 +
 lib/jekyll/utils/thread_event.rb              |   35 +
 test/test_commands_serve.rb                   |  125 ++
 10 files changed, 1875 insertions(+), 20 deletions(-)
 create mode 100644 lib/jekyll/commands/serve/live_reload_reactor.rb
 create mode 100644 lib/jekyll/commands/serve/livereload_assets/livereload.js
 create mode 100644 lib/jekyll/commands/serve/websockets.rb
 create mode 100644 lib/jekyll/utils/thread_event.rb

diff --git a/Gemfile b/Gemfile
index 68bc28c24a5..f7000acb61a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,6 +24,7 @@ end
 group :test do
   gem "codeclimate-test-reporter", "~> 1.0.5"
   gem "cucumber", RUBY_VERSION >= "2.2" ? "~> 3.0" : "3.0.1"
+  gem "httpclient"
   gem "jekyll_test_plugin"
   gem "jekyll_test_plugin_malicious"
   # nokogiri v1.8 does not work with ruby 2.1 and below
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 90ad0ceb846..b434881cace 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("em-websocket",          "~> 0.5")
   s.add_runtime_dependency("i18n",                  "~> 0.7")
   s.add_runtime_dependency("jekyll-sass-converter", "~> 1.0")
   s.add_runtime_dependency("jekyll-watch",          "~> 2.0")
diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 9861d2c68d7..50438b5f7d5 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -1,20 +1,43 @@
 # frozen_string_literal: true
 
+require "thread"
+
 module Jekyll
   module Commands
     class Serve < Command
+      # Similar to the pattern in Utils::ThreadEvent except we are maintaining the
+      # state of @running instead of just signaling an event.  We have to maintain this
+      # state since Serve is just called via class methods instead of an instance
+      # being created each time.
+      @mutex = Mutex.new
+      @run_cond = ConditionVariable.new
+      @running = false
+
       class << self
         COMMAND_OPTIONS = {
-          "ssl_cert"           => ["--ssl-cert [CERT]", "X.509 (SSL) certificate."],
-          "host"               => ["host", "-H", "--host [HOST]", "Host to bind to"],
-          "open_url"           => ["-o", "--open-url", "Launch your site in a browser"],
-          "detach"             => ["-B", "--detach", "Run the server in the background"],
-          "ssl_key"            => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."],
-          "port"               => ["-P", "--port [PORT]", "Port to listen on"],
-          "show_dir_listing"   => ["--show-dir-listing",
+          "ssl_cert"             => ["--ssl-cert [CERT]", "X.509 (SSL) certificate."],
+          "host"                 => ["host", "-H", "--host [HOST]", "Host to bind to"],
+          "open_url"             => ["-o", "--open-url", "Launch your site in a browser"],
+          "detach"               => ["-B", "--detach",
+            "Run the server in the background",],
+          "ssl_key"              => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."],
+          "port"                 => ["-P", "--port [PORT]", "Port to listen on"],
+          "show_dir_listing"     => ["--show-dir-listing",
             "Show a directory listing instead of loading your index file.",],
-          "skip_initial_build" => ["skip_initial_build", "--skip-initial-build",
+          "skip_initial_build"   => ["skip_initial_build", "--skip-initial-build",
             "Skips the initial site build which occurs before the server is started.",],
+          "livereload"           => ["-l", "--livereload",
+            "Use LiveReload to automatically refresh browsers",],
+          "livereload_ignore"    => ["--livereload-ignore ignore GLOB1[,GLOB2[,...]]",
+            Array,
+            "Files for LiveReload to ignore. Remember to quote the values so your shell "\
+            "won't expand them",],
+          "livereload_min_delay" => ["--livereload-min-delay [SECONDS]",
+            "Minimum reload delay",],
+          "livereload_max_delay" => ["--livereload-max-delay [SECONDS]",
+            "Maximum reload delay",],
+          "livereload_port"      => ["--livereload-port [PORT]", Integer,
+            "Port for LiveReload to listen on",],
         }.freeze
 
         DIRECTORY_INDEX = %w(
@@ -26,7 +49,11 @@ class << self
           index.json
         ).freeze
 
-        #
+        LIVERELOAD_PORT = 35_729
+        LIVERELOAD_DIR = File.join(__dir__, "serve", "livereload_assets")
+
+        attr_reader :mutex, :run_cond, :running
+        alias_method :running?, :running
 
         def init_with_program(prog)
           prog.command(:serve) do |cmd|
@@ -41,20 +68,34 @@ def init_with_program(prog)
             end
 
             cmd.action do |_, opts|
+              opts["livereload_port"] ||= LIVERELOAD_PORT
               opts["serving"] = true
               opts["watch"  ] = true unless opts.key?("watch")
 
-              config = configuration_from_options(opts)
-              if Jekyll.env == "development"
-                config["url"] = default_url(config)
-              end
-              [Build, Serve].each { |klass| klass.process(config) }
+              start(opts)
             end
           end
         end
 
         #
 
+        def start(opts)
+          # Set the reactor to nil so any old reactor will be GCed.
+          # We can't unregister a hook so in testing when Serve.start is
+          # called multiple times we don't want to inadvertently keep using
+          # a reactor created by a previous test when our test might not
+          @reload_reactor = nil
+
+          register_reload_hooks(opts) if opts["livereload"]
+          config = configuration_from_options(opts)
+          if Jekyll.env == "development"
+            config["url"] = default_url(config)
+          end
+          [Build, Serve].each { |klass| klass.process(config) }
+        end
+
+        #
+
         def process(opts)
           opts = configuration_from_options(opts)
           destination = opts["destination"]
@@ -63,6 +104,76 @@ def process(opts)
           start_up_webrick(opts, destination)
         end
 
+        def shutdown
+          @server.shutdown if running?
+        end
+
+        # Perform logical validation of CLI options
+
+        private
+        def validate_options(opts)
+          if opts["livereload"]
+            if opts["detach"]
+              Jekyll.logger.warn "Warning:",
+                "--detach and --livereload are mutually exclusive. Choosing --livereload"
+              opts["detach"] = false
+            end
+            if opts["ssl_cert"] || opts["ssl_key"]
+              # This is not technically true.  LiveReload works fine over SSL, but
+              # EventMachine's SSL support in Windows requires building the gem's
+              # native extensions against OpenSSL and that proved to be a process
+              # so tedious that expecting users to do it is a non-starter.
+              Jekyll.logger.abort_with "Error:", "LiveReload does not support SSL"
+            end
+            unless opts["watch"]
+              # Using livereload logically implies you want to watch the files
+              opts["watch"] = true
+            end
+          elsif %w(livereload_min_delay
+              livereload_max_delay
+              livereload_ignore
+              livereload_port).any? { |o| opts[o] }
+            Jekyll.logger.abort_with "--livereload-min-delay, "\
+               "--livereload-max-delay, --livereload-ignore, and "\
+               "--livereload-port require the --livereload option."
+          end
+        end
+
+        #
+
+        private
+        # rubocop:disable Metrics/AbcSize
+        def register_reload_hooks(opts)
+          require_relative "serve/live_reload_reactor"
+          @reload_reactor = LiveReloadReactor.new
+
+          Jekyll::Hooks.register(:site, :post_render) do |site|
+            regenerator = Jekyll::Regenerator.new(site)
+            @changed_pages = site.pages.select do |p|
+              regenerator.regenerate?(p)
+            end
+          end
+
+          # A note on ignoring files: LiveReload errs on the side of reloading when it
+          # comes to the message it gets.  If, for example, a page is ignored but a CSS
+          # file linked in the page isn't, the page will still be reloaded if the CSS
+          # file is contained in the message sent to LiveReload.  Additionally, the
+          # path matching is very loose so that a message to reload "/" will always
+          # lead the page to reload since every page starts with "/".
+          Jekyll::Hooks.register(:site, :post_write) do
+            if @changed_pages && @reload_reactor && @reload_reactor.running?
+              ignore, @changed_pages = @changed_pages.partition do |p|
+                Array(opts["livereload_ignore"]).any? do |filter|
+                  File.fnmatch(filter, Jekyll.sanitized_path(p.relative_path))
+                end
+              end
+              Jekyll.logger.debug "LiveReload:", "Ignoring #{ignore.map(&:relative_path)}"
+              @reload_reactor.reload(@changed_pages)
+            end
+            @changed_pages = nil
+          end
+        end
+
         # Do a base pre-setup of WEBRick so that everything is in place
         # when we get ready to party, checking for an setting up an error page
         # and making sure our destination exists.
@@ -92,6 +203,7 @@ def webrick_opts(opts)
             :MimeTypes          => mime_types,
             :DocumentRoot       => opts["destination"],
             :StartCallback      => start_callback(opts["detach"]),
+            :StopCallback       => stop_callback(opts["detach"]),
             :BindAddress        => opts["host"],
             :Port               => opts["port"],
             :DirectoryIndex     => DIRECTORY_INDEX,
@@ -108,11 +220,16 @@ def webrick_opts(opts)
 
         private
         def start_up_webrick(opts, destination)
-          server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
-          server.mount(opts["baseurl"].to_s, Servlet, destination, file_handler_opts)
-          Jekyll.logger.info "Server address:", server_address(server, opts)
-          launch_browser server, opts if opts["open_url"]
-          boot_or_detach server, opts
+          if opts["livereload"]
+            @reload_reactor.start(opts)
+          end
+
+          @server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
+          @server.mount(opts["baseurl"].to_s, Servlet, destination, file_handler_opts)
+
+          Jekyll.logger.info "Server address:", server_address(@server, opts)
+          launch_browser @server, opts if opts["open_url"]
+          boot_or_detach @server, opts
         end
 
         # Recreate NondisclosureName under utf-8 circumstance
@@ -227,7 +344,29 @@ def enable_ssl(opts)
         def start_callback(detached)
           unless detached
             proc do
-              Jekyll.logger.info("Server running...", "press ctrl-c to stop.")
+              mutex.synchronize do
+                # Block until EventMachine reactor starts
+                @reload_reactor.started_event.wait unless @reload_reactor.nil?
+                @running = true
+                Jekyll.logger.info("Server running...", "press ctrl-c to stop.")
+                @run_cond.broadcast
+              end
+            end
+          end
+        end
+
+        private
+        def stop_callback(detached)
+          unless detached
+            proc do
+              mutex.synchronize do
+                unless @reload_reactor.nil?
+                  @reload_reactor.stop
+                  @reload_reactor.stopped_event.wait
+                end
+                @running = false
+                @run_cond.broadcast
+              end
             end
           end
         end
diff --git a/lib/jekyll/commands/serve/live_reload_reactor.rb b/lib/jekyll/commands/serve/live_reload_reactor.rb
new file mode 100644
index 00000000000..498e78aeee4
--- /dev/null
+++ b/lib/jekyll/commands/serve/live_reload_reactor.rb
@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+require "json"
+require "em-websocket"
+
+require_relative "websockets"
+
+module Jekyll
+  module Commands
+    class Serve
+      class LiveReloadReactor
+        attr_reader :started_event
+        attr_reader :stopped_event
+        attr_reader :thread
+
+        def initialize
+          @thread = nil
+          @websockets = []
+          @connections_count = 0
+          @started_event = Utils::ThreadEvent.new
+          @stopped_event = Utils::ThreadEvent.new
+        end
+
+        def stop
+          # There is only one EventMachine instance per Ruby process so stopping
+          # it here will stop the reactor thread we have running.
+          EM.stop if EM.reactor_running?
+          Jekyll.logger.debug("LiveReload Server:", "halted")
+        end
+
+        def running?
+          EM.reactor_running?
+        end
+
+        def handle_websockets_event(ws)
+          ws.onopen do |handshake|
+            connect(ws, handshake)
+          end
+
+          ws.onclose do
+            disconnect(ws)
+          end
+
+          ws.onmessage do |msg|
+            print_message(msg)
+          end
+
+          ws.onerror do |error|
+            log_error(error)
+          end
+        end
+
+        # rubocop:disable Metrics/MethodLength
+        def start(opts)
+          @thread = Thread.new do
+            # Use epoll if the kernel supports it
+            EM.epoll
+            EM.run do
+              EM.error_handler do |e|
+                log_error(e)
+              end
+
+              EM.start_server(
+                opts["host"],
+                opts["livereload_port"],
+                HttpAwareConnection,
+                opts
+              ) do |ws|
+                handle_websockets_event(ws)
+              end
+
+              # Notify blocked threads that EventMachine has started or shutdown
+              EM.schedule do
+                @started_event.set
+              end
+
+              EM.add_shutdown_hook do
+                @stopped_event.set
+              end
+
+              Jekyll.logger.info(
+                "LiveReload address:", "#{opts["host"]}:#{opts["livereload_port"]}"
+              )
+            end
+          end
+          @thread.abort_on_exception = true
+        end
+
+        # For a description of the protocol see
+        # http://feedback.livereload.com/knowledgebase/articles/86174-livereload-protocol
+        def reload(pages)
+          pages.each do |p|
+            msg = {
+              :command => "reload",
+              :path    => p.url,
+              :liveCSS => true,
+            }
+
+            Jekyll.logger.debug("LiveReload:", "Reloading #{p.url}")
+            Jekyll.logger.debug(JSON.dump(msg))
+            @websockets.each do |ws|
+              ws.send(JSON.dump(msg))
+            end
+          end
+        end
+
+        private
+        def connect(ws, handshake)
+          @connections_count += 1
+          if @connections_count == 1
+            message = "Browser connected"
+            message += " over SSL/TLS" if handshake.secure?
+            Jekyll.logger.info("LiveReload:", message)
+          end
+          ws.send(
+            JSON.dump(
+              :command    => "hello",
+              :protocols  => ["http://livereload.com/protocols/official-7"],
+              :serverName => "jekyll"
+            )
+          )
+
+          @websockets << ws
+        end
+
+        private
+        def disconnect(ws)
+          @websockets.delete(ws)
+        end
+
+        private
+        def print_message(json_message)
+          msg = JSON.parse(json_message)
+          # Not sure what the 'url' command even does in LiveReload.  The spec is silent
+          # on its purpose.
+          if msg["command"] == "url"
+            Jekyll.logger.info("LiveReload:", "Browser URL: #{msg["url"]}")
+          end
+        end
+
+        private
+        def log_error(e)
+          Jekyll.logger.warn(
+            "LiveReload experienced an error. "\
+            "Run with --verbose for more information."
+          )
+          Jekyll.logger.debug("LiveReload Error:", e.message)
+          Jekyll.logger.debug("LiveReload Error:", e.backtrace.join("\n"))
+        end
+      end
+    end
+  end
+end
diff --git a/lib/jekyll/commands/serve/livereload_assets/livereload.js b/lib/jekyll/commands/serve/livereload_assets/livereload.js
new file mode 100644
index 00000000000..eee60ec8b1d
--- /dev/null
+++ b/lib/jekyll/commands/serve/livereload_assets/livereload.js
@@ -0,0 +1,1183 @@
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o tag");
+          return;
+        }
+      }
+      this.reloader = new Reloader(this.window, this.console, Timer);
+      this.connector = new Connector(this.options, this.WebSocket, Timer, {
+        connecting: (function(_this) {
+          return function() {};
+        })(this),
+        socketConnected: (function(_this) {
+          return function() {};
+        })(this),
+        connected: (function(_this) {
+          return function(protocol) {
+            var _base;
+            if (typeof (_base = _this.listeners).connect === "function") {
+              _base.connect();
+            }
+            _this.log("LiveReload is connected to " + _this.options.host + ":" + _this.options.port + " (protocol v" + protocol + ").");
+            return _this.analyze();
+          };
+        })(this),
+        error: (function(_this) {
+          return function(e) {
+            if (e instanceof ProtocolError) {
+              if (typeof console !== "undefined" && console !== null) {
+                return console.log("" + e.message + ".");
+              }
+            } else {
+              if (typeof console !== "undefined" && console !== null) {
+                return console.log("LiveReload internal error: " + e.message);
+              }
+            }
+          };
+        })(this),
+        disconnected: (function(_this) {
+          return function(reason, nextDelay) {
+            var _base;
+            if (typeof (_base = _this.listeners).disconnect === "function") {
+              _base.disconnect();
+            }
+            switch (reason) {
+              case 'cannot-connect':
+                return _this.log("LiveReload cannot connect to " + _this.options.host + ":" + _this.options.port + ", will retry in " + nextDelay + " sec.");
+              case 'broken':
+                return _this.log("LiveReload disconnected from " + _this.options.host + ":" + _this.options.port + ", reconnecting in " + nextDelay + " sec.");
+              case 'handshake-timeout':
+                return _this.log("LiveReload cannot connect to " + _this.options.host + ":" + _this.options.port + " (handshake timeout), will retry in " + nextDelay + " sec.");
+              case 'handshake-failed':
+                return _this.log("LiveReload cannot connect to " + _this.options.host + ":" + _this.options.port + " (handshake failed), will retry in " + nextDelay + " sec.");
+              case 'manual':
+                break;
+              case 'error':
+                break;
+              default:
+                return _this.log("LiveReload disconnected from " + _this.options.host + ":" + _this.options.port + " (" + reason + "), reconnecting in " + nextDelay + " sec.");
+            }
+          };
+        })(this),
+        message: (function(_this) {
+          return function(message) {
+            switch (message.command) {
+              case 'reload':
+                return _this.performReload(message);
+              case 'alert':
+                return _this.performAlert(message);
+            }
+          };
+        })(this)
+      });
+      this.initialized = true;
+    }
+
+    LiveReload.prototype.on = function(eventName, handler) {
+      return this.listeners[eventName] = handler;
+    };
+
+    LiveReload.prototype.log = function(message) {
+      return this.console.log("" + message);
+    };
+
+    LiveReload.prototype.performReload = function(message) {
+      var _ref, _ref1;
+      this.log("LiveReload received reload request: " + (JSON.stringify(message, null, 2)));
+      return this.reloader.reload(message.path, {
+        liveCSS: (_ref = message.liveCSS) != null ? _ref : true,
+        liveImg: (_ref1 = message.liveImg) != null ? _ref1 : true,
+        originalPath: message.originalPath || '',
+        overrideURL: message.overrideURL || '',
+        serverURL: "http://" + this.options.host + ":" + this.options.port
+      });
+    };
+
+    LiveReload.prototype.performAlert = function(message) {
+      return alert(message.message);
+    };
+
+    LiveReload.prototype.shutDown = function() {
+      var _base;
+      if (!this.initialized) {
+        return;
+      }
+      this.connector.disconnect();
+      this.log("LiveReload disconnected.");
+      return typeof (_base = this.listeners).shutdown === "function" ? _base.shutdown() : void 0;
+    };
+
+    LiveReload.prototype.hasPlugin = function(identifier) {
+      return !!this.pluginIdentifiers[identifier];
+    };
+
+    LiveReload.prototype.addPlugin = function(pluginClass) {
+      var plugin;
+      if (!this.initialized) {
+        return;
+      }
+      if (this.hasPlugin(pluginClass.identifier)) {
+        return;
+      }
+      this.pluginIdentifiers[pluginClass.identifier] = true;
+      plugin = new pluginClass(this.window, {
+        _livereload: this,
+        _reloader: this.reloader,
+        _connector: this.connector,
+        console: this.console,
+        Timer: Timer,
+        generateCacheBustUrl: (function(_this) {
+          return function(url) {
+            return _this.reloader.generateCacheBustUrl(url);
+          };
+        })(this)
+      });
+      this.plugins.push(plugin);
+      this.reloader.addPlugin(plugin);
+    };
+
+    LiveReload.prototype.analyze = function() {
+      var plugin, pluginData, pluginsData, _i, _len, _ref;
+      if (!this.initialized) {
+        return;
+      }
+      if (!(this.connector.protocol >= 7)) {
+        return;
+      }
+      pluginsData = {};
+      _ref = this.plugins;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        plugin = _ref[_i];
+        pluginsData[plugin.constructor.identifier] = pluginData = (typeof plugin.analyze === "function" ? plugin.analyze() : void 0) || {};
+        pluginData.version = plugin.constructor.version;
+      }
+      this.connector.sendCommand({
+        command: 'info',
+        plugins: pluginsData,
+        url: this.window.location.href
+      });
+    };
+
+    return LiveReload;
+
+  })();
+
+}).call(this);
+
+},{"./connector":1,"./options":5,"./reloader":7,"./timer":9}],5:[function(require,module,exports){
+(function() {
+  var Options;
+
+  exports.Options = Options = (function() {
+    function Options() {
+      this.https = false;
+      this.host = null;
+      this.port = 35729;
+      this.snipver = null;
+      this.ext = null;
+      this.extver = null;
+      this.mindelay = 1000;
+      this.maxdelay = 60000;
+      this.handshake_timeout = 5000;
+    }
+
+    Options.prototype.set = function(name, value) {
+      if (typeof value === 'undefined') {
+        return;
+      }
+      if (!isNaN(+value)) {
+        value = +value;
+      }
+      return this[name] = value;
+    };
+
+    return Options;
+
+  })();
+
+  Options.extract = function(document) {
+    var element, keyAndValue, m, mm, options, pair, src, _i, _j, _len, _len1, _ref, _ref1;
+    _ref = document.getElementsByTagName('script');
+    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+      element = _ref[_i];
+      if ((src = element.src) && (m = src.match(/^[^:]+:\/\/(.*)\/z?livereload\.js(?:\?(.*))?$/))) {
+        options = new Options();
+        options.https = src.indexOf("https") === 0;
+        if (mm = m[1].match(/^([^\/:]+)(?::(\d+))?$/)) {
+          options.host = mm[1];
+          if (mm[2]) {
+            options.port = parseInt(mm[2], 10);
+          }
+        }
+        if (m[2]) {
+          _ref1 = m[2].split('&');
+          for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+            pair = _ref1[_j];
+            if ((keyAndValue = pair.split('=')).length > 1) {
+              options.set(keyAndValue[0].replace(/-/g, '_'), keyAndValue.slice(1).join('='));
+            }
+          }
+        }
+        return options;
+      }
+    }
+    return null;
+  };
+
+}).call(this);
+
+},{}],6:[function(require,module,exports){
+(function() {
+  var PROTOCOL_6, PROTOCOL_7, Parser, ProtocolError,
+    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+
+  exports.PROTOCOL_6 = PROTOCOL_6 = 'http://livereload.com/protocols/official-6';
+
+  exports.PROTOCOL_7 = PROTOCOL_7 = 'http://livereload.com/protocols/official-7';
+
+  exports.ProtocolError = ProtocolError = (function() {
+    function ProtocolError(reason, data) {
+      this.message = "LiveReload protocol error (" + reason + ") after receiving data: \"" + data + "\".";
+    }
+
+    return ProtocolError;
+
+  })();
+
+  exports.Parser = Parser = (function() {
+    function Parser(handlers) {
+      this.handlers = handlers;
+      this.reset();
+    }
+
+    Parser.prototype.reset = function() {
+      return this.protocol = null;
+    };
+
+    Parser.prototype.process = function(data) {
+      var command, e, message, options, _ref;
+      try {
+        if (this.protocol == null) {
+          if (data.match(/^!!ver:([\d.]+)$/)) {
+            this.protocol = 6;
+          } else if (message = this._parseMessage(data, ['hello'])) {
+            if (!message.protocols.length) {
+              throw new ProtocolError("no protocols specified in handshake message");
+            } else if (__indexOf.call(message.protocols, PROTOCOL_7) >= 0) {
+              this.protocol = 7;
+            } else if (__indexOf.call(message.protocols, PROTOCOL_6) >= 0) {
+              this.protocol = 6;
+            } else {
+              throw new ProtocolError("no supported protocols found");
+            }
+          }
+          return this.handlers.connected(this.protocol);
+        } else if (this.protocol === 6) {
+          message = JSON.parse(data);
+          if (!message.length) {
+            throw new ProtocolError("protocol 6 messages must be arrays");
+          }
+          command = message[0], options = message[1];
+          if (command !== 'refresh') {
+            throw new ProtocolError("unknown protocol 6 command");
+          }
+          return this.handlers.message({
+            command: 'reload',
+            path: options.path,
+            liveCSS: (_ref = options.apply_css_live) != null ? _ref : true
+          });
+        } else {
+          message = this._parseMessage(data, ['reload', 'alert']);
+          return this.handlers.message(message);
+        }
+      } catch (_error) {
+        e = _error;
+        if (e instanceof ProtocolError) {
+          return this.handlers.error(e);
+        } else {
+          throw e;
+        }
+      }
+    };
+
+    Parser.prototype._parseMessage = function(data, validCommands) {
+      var e, message, _ref;
+      try {
+        message = JSON.parse(data);
+      } catch (_error) {
+        e = _error;
+        throw new ProtocolError('unparsable JSON', data);
+      }
+      if (!message.command) {
+        throw new ProtocolError('missing "command" key', data);
+      }
+      if (_ref = message.command, __indexOf.call(validCommands, _ref) < 0) {
+        throw new ProtocolError("invalid command '" + message.command + "', only valid commands are: " + (validCommands.join(', ')) + ")", data);
+      }
+      return message;
+    };
+
+    return Parser;
+
+  })();
+
+}).call(this);
+
+},{}],7:[function(require,module,exports){
+(function() {
+  var IMAGE_STYLES, Reloader, numberOfMatchingSegments, pathFromUrl, pathsMatch, pickBestMatch, splitUrl;
+
+  splitUrl = function(url) {
+    var hash, index, params;
+    if ((index = url.indexOf('#')) >= 0) {
+      hash = url.slice(index);
+      url = url.slice(0, index);
+    } else {
+      hash = '';
+    }
+    if ((index = url.indexOf('?')) >= 0) {
+      params = url.slice(index);
+      url = url.slice(0, index);
+    } else {
+      params = '';
+    }
+    return {
+      url: url,
+      params: params,
+      hash: hash
+    };
+  };
+
+  pathFromUrl = function(url) {
+    var path;
+    url = splitUrl(url).url;
+    if (url.indexOf('file://') === 0) {
+      path = url.replace(/^file:\/\/(localhost)?/, '');
+    } else {
+      path = url.replace(/^([^:]+:)?\/\/([^:\/]+)(:\d*)?\//, '/');
+    }
+    return decodeURIComponent(path);
+  };
+
+  pickBestMatch = function(path, objects, pathFunc) {
+    var bestMatch, object, score, _i, _len;
+    bestMatch = {
+      score: 0
+    };
+    for (_i = 0, _len = objects.length; _i < _len; _i++) {
+      object = objects[_i];
+      score = numberOfMatchingSegments(path, pathFunc(object));
+      if (score > bestMatch.score) {
+        bestMatch = {
+          object: object,
+          score: score
+        };
+      }
+    }
+    if (bestMatch.score > 0) {
+      return bestMatch;
+    } else {
+      return null;
+    }
+  };
+
+  numberOfMatchingSegments = function(path1, path2) {
+    var comps1, comps2, eqCount, len;
+    path1 = path1.replace(/^\/+/, '').toLowerCase();
+    path2 = path2.replace(/^\/+/, '').toLowerCase();
+    if (path1 === path2) {
+      return 10000;
+    }
+    comps1 = path1.split('/').reverse();
+    comps2 = path2.split('/').reverse();
+    len = Math.min(comps1.length, comps2.length);
+    eqCount = 0;
+    while (eqCount < len && comps1[eqCount] === comps2[eqCount]) {
+      ++eqCount;
+    }
+    return eqCount;
+  };
+
+  pathsMatch = function(path1, path2) {
+    return numberOfMatchingSegments(path1, path2) > 0;
+  };
+
+  IMAGE_STYLES = [
+    {
+      selector: 'background',
+      styleNames: ['backgroundImage']
+    }, {
+      selector: 'border',
+      styleNames: ['borderImage', 'webkitBorderImage', 'MozBorderImage']
+    }
+  ];
+
+  exports.Reloader = Reloader = (function() {
+    function Reloader(window, console, Timer) {
+      this.window = window;
+      this.console = console;
+      this.Timer = Timer;
+      this.document = this.window.document;
+      this.importCacheWaitPeriod = 200;
+      this.plugins = [];
+    }
+
+    Reloader.prototype.addPlugin = function(plugin) {
+      return this.plugins.push(plugin);
+    };
+
+    Reloader.prototype.analyze = function(callback) {
+      return results;
+    };
+
+    Reloader.prototype.reload = function(path, options) {
+      var plugin, _base, _i, _len, _ref;
+      this.options = options;
+      if ((_base = this.options).stylesheetReloadTimeout == null) {
+        _base.stylesheetReloadTimeout = 15000;
+      }
+      _ref = this.plugins;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        plugin = _ref[_i];
+        if (plugin.reload && plugin.reload(path, options)) {
+          return;
+        }
+      }
+      if (options.liveCSS) {
+        if (path.match(/\.css$/i)) {
+          if (this.reloadStylesheet(path)) {
+            return;
+          }
+        }
+      }
+      if (options.liveImg) {
+        if (path.match(/\.(jpe?g|png|gif)$/i)) {
+          this.reloadImages(path);
+          return;
+        }
+      }
+      return this.reloadPage();
+    };
+
+    Reloader.prototype.reloadPage = function() {
+      return this.window.document.location.reload();
+    };
+
+    Reloader.prototype.reloadImages = function(path) {
+      var expando, img, selector, styleNames, styleSheet, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref, _ref1, _ref2, _ref3, _results;
+      expando = this.generateUniqueString();
+      _ref = this.document.images;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        img = _ref[_i];
+        if (pathsMatch(path, pathFromUrl(img.src))) {
+          img.src = this.generateCacheBustUrl(img.src, expando);
+        }
+      }
+      if (this.document.querySelectorAll) {
+        for (_j = 0, _len1 = IMAGE_STYLES.length; _j < _len1; _j++) {
+          _ref1 = IMAGE_STYLES[_j], selector = _ref1.selector, styleNames = _ref1.styleNames;
+          _ref2 = this.document.querySelectorAll("[style*=" + selector + "]");
+          for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
+            img = _ref2[_k];
+            this.reloadStyleImages(img.style, styleNames, path, expando);
+          }
+        }
+      }
+      if (this.document.styleSheets) {
+        _ref3 = this.document.styleSheets;
+        _results = [];
+        for (_l = 0, _len3 = _ref3.length; _l < _len3; _l++) {
+          styleSheet = _ref3[_l];
+          _results.push(this.reloadStylesheetImages(styleSheet, path, expando));
+        }
+        return _results;
+      }
+    };
+
+    Reloader.prototype.reloadStylesheetImages = function(styleSheet, path, expando) {
+      var e, rule, rules, styleNames, _i, _j, _len, _len1;
+      try {
+        rules = styleSheet != null ? styleSheet.cssRules : void 0;
+      } catch (_error) {
+        e = _error;
+      }
+      if (!rules) {
+        return;
+      }
+      for (_i = 0, _len = rules.length; _i < _len; _i++) {
+        rule = rules[_i];
+        switch (rule.type) {
+          case CSSRule.IMPORT_RULE:
+            this.reloadStylesheetImages(rule.styleSheet, path, expando);
+            break;
+          case CSSRule.STYLE_RULE:
+            for (_j = 0, _len1 = IMAGE_STYLES.length; _j < _len1; _j++) {
+              styleNames = IMAGE_STYLES[_j].styleNames;
+              this.reloadStyleImages(rule.style, styleNames, path, expando);
+            }
+            break;
+          case CSSRule.MEDIA_RULE:
+            this.reloadStylesheetImages(rule, path, expando);
+        }
+      }
+    };
+
+    Reloader.prototype.reloadStyleImages = function(style, styleNames, path, expando) {
+      var newValue, styleName, value, _i, _len;
+      for (_i = 0, _len = styleNames.length; _i < _len; _i++) {
+        styleName = styleNames[_i];
+        value = style[styleName];
+        if (typeof value === 'string') {
+          newValue = value.replace(/\burl\s*\(([^)]*)\)/, (function(_this) {
+            return function(match, src) {
+              if (pathsMatch(path, pathFromUrl(src))) {
+                return "url(" + (_this.generateCacheBustUrl(src, expando)) + ")";
+              } else {
+                return match;
+              }
+            };
+          })(this));
+          if (newValue !== value) {
+            style[styleName] = newValue;
+          }
+        }
+      }
+    };
+
+    Reloader.prototype.reloadStylesheet = function(path) {
+      var imported, link, links, match, style, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref, _ref1;
+      links = (function() {
+        var _i, _len, _ref, _results;
+        _ref = this.document.getElementsByTagName('link');
+        _results = [];
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          link = _ref[_i];
+          if (link.rel.match(/^stylesheet$/i) && !link.__LiveReload_pendingRemoval) {
+            _results.push(link);
+          }
+        }
+        return _results;
+      }).call(this);
+      imported = [];
+      _ref = this.document.getElementsByTagName('style');
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        style = _ref[_i];
+        if (style.sheet) {
+          this.collectImportedStylesheets(style, style.sheet, imported);
+        }
+      }
+      for (_j = 0, _len1 = links.length; _j < _len1; _j++) {
+        link = links[_j];
+        this.collectImportedStylesheets(link, link.sheet, imported);
+      }
+      if (this.window.StyleFix && this.document.querySelectorAll) {
+        _ref1 = this.document.querySelectorAll('style[data-href]');
+        for (_k = 0, _len2 = _ref1.length; _k < _len2; _k++) {
+          style = _ref1[_k];
+          links.push(style);
+        }
+      }
+      this.console.log("LiveReload found " + links.length + " LINKed stylesheets, " + imported.length + " @imported stylesheets");
+      match = pickBestMatch(path, links.concat(imported), (function(_this) {
+        return function(l) {
+          return pathFromUrl(_this.linkHref(l));
+        };
+      })(this));
+      if (match) {
+        if (match.object.rule) {
+          this.console.log("LiveReload is reloading imported stylesheet: " + match.object.href);
+          this.reattachImportedRule(match.object);
+        } else {
+          this.console.log("LiveReload is reloading stylesheet: " + (this.linkHref(match.object)));
+          this.reattachStylesheetLink(match.object);
+        }
+      } else {
+        this.console.log("LiveReload will reload all stylesheets because path '" + path + "' did not match any specific one");
+        for (_l = 0, _len3 = links.length; _l < _len3; _l++) {
+          link = links[_l];
+          this.reattachStylesheetLink(link);
+        }
+      }
+      return true;
+    };
+
+    Reloader.prototype.collectImportedStylesheets = function(link, styleSheet, result) {
+      var e, index, rule, rules, _i, _len;
+      try {
+        rules = styleSheet != null ? styleSheet.cssRules : void 0;
+      } catch (_error) {
+        e = _error;
+      }
+      if (rules && rules.length) {
+        for (index = _i = 0, _len = rules.length; _i < _len; index = ++_i) {
+          rule = rules[index];
+          switch (rule.type) {
+            case CSSRule.CHARSET_RULE:
+              continue;
+            case CSSRule.IMPORT_RULE:
+              result.push({
+                link: link,
+                rule: rule,
+                index: index,
+                href: rule.href
+              });
+              this.collectImportedStylesheets(link, rule.styleSheet, result);
+              break;
+            default:
+              break;
+          }
+        }
+      }
+    };
+
+    Reloader.prototype.waitUntilCssLoads = function(clone, func) {
+      var callbackExecuted, executeCallback, poll;
+      callbackExecuted = false;
+      executeCallback = (function(_this) {
+        return function() {
+          if (callbackExecuted) {
+            return;
+          }
+          callbackExecuted = true;
+          return func();
+        };
+      })(this);
+      clone.onload = (function(_this) {
+        return function() {
+          _this.console.log("LiveReload: the new stylesheet has finished loading");
+          _this.knownToSupportCssOnLoad = true;
+          return executeCallback();
+        };
+      })(this);
+      if (!this.knownToSupportCssOnLoad) {
+        (poll = (function(_this) {
+          return function() {
+            if (clone.sheet) {
+              _this.console.log("LiveReload is polling until the new CSS finishes loading...");
+              return executeCallback();
+            } else {
+              return _this.Timer.start(50, poll);
+            }
+          };
+        })(this))();
+      }
+      return this.Timer.start(this.options.stylesheetReloadTimeout, executeCallback);
+    };
+
+    Reloader.prototype.linkHref = function(link) {
+      return link.href || link.getAttribute('data-href');
+    };
+
+    Reloader.prototype.reattachStylesheetLink = function(link) {
+      var clone, parent;
+      if (link.__LiveReload_pendingRemoval) {
+        return;
+      }
+      link.__LiveReload_pendingRemoval = true;
+      if (link.tagName === 'STYLE') {
+        clone = this.document.createElement('link');
+        clone.rel = 'stylesheet';
+        clone.media = link.media;
+        clone.disabled = link.disabled;
+      } else {
+        clone = link.cloneNode(false);
+      }
+      clone.href = this.generateCacheBustUrl(this.linkHref(link));
+      parent = link.parentNode;
+      if (parent.lastChild === link) {
+        parent.appendChild(clone);
+      } else {
+        parent.insertBefore(clone, link.nextSibling);
+      }
+      return this.waitUntilCssLoads(clone, (function(_this) {
+        return function() {
+          var additionalWaitingTime;
+          if (/AppleWebKit/.test(navigator.userAgent)) {
+            additionalWaitingTime = 5;
+          } else {
+            additionalWaitingTime = 200;
+          }
+          return _this.Timer.start(additionalWaitingTime, function() {
+            var _ref;
+            if (!link.parentNode) {
+              return;
+            }
+            link.parentNode.removeChild(link);
+            clone.onreadystatechange = null;
+            return (_ref = _this.window.StyleFix) != null ? _ref.link(clone) : void 0;
+          });
+        };
+      })(this));
+    };
+
+    Reloader.prototype.reattachImportedRule = function(_arg) {
+      var href, index, link, media, newRule, parent, rule, tempLink;
+      rule = _arg.rule, index = _arg.index, link = _arg.link;
+      parent = rule.parentStyleSheet;
+      href = this.generateCacheBustUrl(rule.href);
+      media = rule.media.length ? [].join.call(rule.media, ', ') : '';
+      newRule = "@import url(\"" + href + "\") " + media + ";";
+      rule.__LiveReload_newHref = href;
+      tempLink = this.document.createElement("link");
+      tempLink.rel = 'stylesheet';
+      tempLink.href = href;
+      tempLink.__LiveReload_pendingRemoval = true;
+      if (link.parentNode) {
+        link.parentNode.insertBefore(tempLink, link);
+      }
+      return this.Timer.start(this.importCacheWaitPeriod, (function(_this) {
+        return function() {
+          if (tempLink.parentNode) {
+            tempLink.parentNode.removeChild(tempLink);
+          }
+          if (rule.__LiveReload_newHref !== href) {
+            return;
+          }
+          parent.insertRule(newRule, index);
+          parent.deleteRule(index + 1);
+          rule = parent.cssRules[index];
+          rule.__LiveReload_newHref = href;
+          return _this.Timer.start(_this.importCacheWaitPeriod, function() {
+            if (rule.__LiveReload_newHref !== href) {
+              return;
+            }
+            parent.insertRule(newRule, index);
+            return parent.deleteRule(index + 1);
+          });
+        };
+      })(this));
+    };
+
+    Reloader.prototype.generateUniqueString = function() {
+      return 'livereload=' + Date.now();
+    };
+
+    Reloader.prototype.generateCacheBustUrl = function(url, expando) {
+      var hash, oldParams, originalUrl, params, _ref;
+      if (expando == null) {
+        expando = this.generateUniqueString();
+      }
+      _ref = splitUrl(url), url = _ref.url, hash = _ref.hash, oldParams = _ref.params;
+      if (this.options.overrideURL) {
+        if (url.indexOf(this.options.serverURL) < 0) {
+          originalUrl = url;
+          url = this.options.serverURL + this.options.overrideURL + "?url=" + encodeURIComponent(url);
+          this.console.log("LiveReload is overriding source URL " + originalUrl + " with " + url);
+        }
+      }
+      params = oldParams.replace(/(\?|&)livereload=(\d+)/, function(match, sep) {
+        return "" + sep + expando;
+      });
+      if (params === oldParams) {
+        if (oldParams.length === 0) {
+          params = "?" + expando;
+        } else {
+          params = "" + oldParams + "&" + expando;
+        }
+      }
+      return url + params + hash;
+    };
+
+    return Reloader;
+
+  })();
+
+}).call(this);
+
+},{}],8:[function(require,module,exports){
+(function() {
+  var CustomEvents, LiveReload, k;
+
+  CustomEvents = require('./customevents');
+
+  LiveReload = window.LiveReload = new (require('./livereload').LiveReload)(window);
+
+  for (k in window) {
+    if (k.match(/^LiveReloadPlugin/)) {
+      LiveReload.addPlugin(window[k]);
+    }
+  }
+
+  LiveReload.addPlugin(require('./less'));
+
+  LiveReload.on('shutdown', function() {
+    return delete window.LiveReload;
+  });
+
+  LiveReload.on('connect', function() {
+    return CustomEvents.fire(document, 'LiveReloadConnect');
+  });
+
+  LiveReload.on('disconnect', function() {
+    return CustomEvents.fire(document, 'LiveReloadDisconnect');
+  });
+
+  CustomEvents.bind(document, 'LiveReloadShutDown', function() {
+    return LiveReload.shutDown();
+  });
+
+}).call(this);
+
+},{"./customevents":2,"./less":3,"./livereload":4}],9:[function(require,module,exports){
+(function() {
+  var Timer;
+
+  exports.Timer = Timer = (function() {
+    function Timer(func) {
+      this.func = func;
+      this.running = false;
+      this.id = null;
+      this._handler = (function(_this) {
+        return function() {
+          _this.running = false;
+          _this.id = null;
+          return _this.func();
+        };
+      })(this);
+    }
+
+    Timer.prototype.start = function(timeout) {
+      if (this.running) {
+        clearTimeout(this.id);
+      }
+      this.id = setTimeout(this._handler, timeout);
+      return this.running = true;
+    };
+
+    Timer.prototype.stop = function() {
+      if (this.running) {
+        clearTimeout(this.id);
+        this.running = false;
+        return this.id = null;
+      }
+    };
+
+    return Timer;
+
+  })();
+
+  Timer.start = function(timeout, func) {
+    return setTimeout(func, timeout);
+  };
+
+}).call(this);
+
+},{}]},{},[8]);
diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb
index 70b6d66df34..640720ee7d8 100644
--- a/lib/jekyll/commands/serve/servlet.rb
+++ b/lib/jekyll/commands/serve/servlet.rb
@@ -5,6 +5,128 @@
 module Jekyll
   module Commands
     class Serve
+      # This class is used to determine if the Servlet should modify a served file
+      # to insert the LiveReload script tags
+      class SkipAnalyzer
+        BAD_USER_AGENTS = [%r!MSIE!].freeze
+
+        def self.skip_processing?(request, response, options)
+          new(request, response, options).skip_processing?
+        end
+
+        def initialize(request, response, options)
+          @options = options
+          @request = request
+          @response = response
+        end
+
+        def skip_processing?
+          !html? || chunked? || inline? || bad_browser?
+        end
+
+        def chunked?
+          @response["Transfer-Encoding"] == "chunked"
+        end
+
+        def inline?
+          @response["Content-Disposition"] =~ %r!^inline!
+        end
+
+        def bad_browser?
+          BAD_USER_AGENTS.any? { |pattern| @request["User-Agent"] =~ pattern }
+        end
+
+        def html?
+          @response["Content-Type"] =~ %r!text/html!
+        end
+      end
+
+      # This class inserts the LiveReload script tags into HTML as it is served
+      class BodyProcessor
+        HEAD_TAG_REGEX = %r!|!
+
+        attr_reader :content_length, :new_body, :livereload_added
+
+        def initialize(body, options)
+          @body = body
+          @options = options
+          @processed = false
+        end
+
+        def processed?
+          @processed
+        end
+
+        # rubocop:disable Metrics/MethodLength
+        def process!
+          @new_body = []
+          # @body will usually be a File object but Strings occur in rare cases
+          if @body.respond_to?(:each)
+            begin
+              @body.each { |line| @new_body << line.to_s }
+            ensure
+              @body.close
+            end
+          else
+            @new_body = @body.lines
+          end
+
+          @content_length = 0
+          @livereload_added = false
+
+          @new_body.each do |line|
+            if !@livereload_added && line["
+            document.write(
+              '
+          TEMPLATE
+          ERB.new(Jekyll::Utils.strip_heredoc(template))
+        end
+
+        def livereload_args
+          # XHTML standard requires ampersands to be encoded as entities when in
+          # attributes. See http://stackoverflow.com/a/2190292
+          src = ""
+          if @options["livereload_min_delay"]
+            src += "&mindelay=#{@options["livereload_min_delay"]}"
+          end
+          if @options["livereload_max_delay"]
+            src += "&maxdelay=#{@options["livereload_max_delay"]}"
+          end
+          if @options["livereload_port"]
+            src += "&port=#{@options["livereload_port"]}"
+          end
+          src
+        end
+      end
+
       class Servlet < WEBrick::HTTPServlet::FileHandler
         DEFAULTS = {
           "Cache-Control" => "private, max-age=0, proxy-revalidate, " \
@@ -34,6 +156,21 @@ def search_file(req, res, basename)
         # rubocop:disable Naming/MethodName
         def do_GET(req, res)
           rtn = super
+
+          if @jekyll_opts["livereload"]
+            return rtn if SkipAnalyzer.skip_processing?(req, res, @jekyll_opts)
+
+            processor = BodyProcessor.new(res.body, @jekyll_opts)
+            processor.process!
+            res.body = processor.new_body
+            res.content_length = processor.content_length.to_s
+
+            if processor.livereload_added
+              # Add a header to indicate that the page content has been modified
+              res["X-Rack-LiveReload"] = "1"
+            end
+          end
+
           validate_and_ensure_charset(req, res)
           res.header.merge!(@headers)
           rtn
diff --git a/lib/jekyll/commands/serve/websockets.rb b/lib/jekyll/commands/serve/websockets.rb
new file mode 100644
index 00000000000..1e5f948e2be
--- /dev/null
+++ b/lib/jekyll/commands/serve/websockets.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+require "http/parser"
+
+module Jekyll
+  module Commands
+    class Serve
+      # The LiveReload protocol requires the server to serve livereload.js over HTTP
+      # despite the fact that the protocol itself uses WebSockets.  This custom connection
+      # class addresses the dual protocols that the server needs to understand.
+      class HttpAwareConnection < EventMachine::WebSocket::Connection
+        attr_reader :reload_body, :reload_size
+
+        def initialize(_opts)
+          # If EventMachine SSL support on Windows ever gets better, the code below will
+          # set up the reactor to handle SSL
+          #
+          # @ssl_enabled = opts["ssl_cert"] && opts["ssl_key"]
+          # if @ssl_enabled
+          #   em_opts[:tls_options] = {
+          #   :private_key_file => Jekyll.sanitized_path(opts["source"], opts["ssl_key"]),
+          #   :cert_chain_file  => Jekyll.sanitized_path(opts["source"], opts["ssl_cert"])
+          #   }
+          #   em_opts[:secure] = true
+          # end
+
+          # This is too noisy even for --verbose, but uncomment if you need it for
+          # a specific WebSockets issue.  Adding ?LR-verbose=true onto the URL will
+          # enable logging on the client side.
+          # em_opts[:debug] = true
+
+          em_opts = {}
+          super(em_opts)
+
+          reload_file = File.join(Serve.singleton_class::LIVERELOAD_DIR, "livereload.js")
+
+          @reload_body = File.read(reload_file)
+          @reload_size = @reload_body.bytesize
+        end
+
+        # rubocop:disable Metrics/MethodLength
+        def dispatch(data)
+          parser = Http::Parser.new
+          parser << data
+
+          # WebSockets requests will have a Connection: Upgrade header
+          if parser.http_method != "GET" || parser.upgrade?
+            super
+          elsif parser.request_url =~ %r!^\/livereload.js!
+            headers = [
+              "HTTP/1.1 200 OK",
+              "Content-Type: application/javascript",
+              "Content-Length: #{reload_size}",
+              "",
+              "",
+            ].join("\r\n")
+            send_data(headers)
+
+            # stream_file_data would free us from keeping livereload.js in memory
+            # but JRuby blocks on that call and never returns
+            send_data(reload_body)
+            close_connection_after_writing
+          else
+            body = "This port only serves livereload.js over HTTP.\n"
+            headers = [
+              "HTTP/1.1 400 Bad Request",
+              "Content-Type: text/plain",
+              "Content-Length: #{body.bytesize}",
+              "",
+              "",
+            ].join("\r\n")
+            send_data(headers)
+            send_data(body)
+            close_connection_after_writing
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 55cf9be1e28..1d3cb9c4a72 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -8,6 +8,7 @@ module Utils
     autoload :Internet, "jekyll/utils/internet"
     autoload :Platforms, "jekyll/utils/platforms"
     autoload :Rouge, "jekyll/utils/rouge"
+    autoload :ThreadEvent, "jekyll/utils/thread_event"
     autoload :WinTZ, "jekyll/utils/win_tz"
 
     # Constants for use in #slugify
diff --git a/lib/jekyll/utils/thread_event.rb b/lib/jekyll/utils/thread_event.rb
new file mode 100644
index 00000000000..5afb50d93eb
--- /dev/null
+++ b/lib/jekyll/utils/thread_event.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "thread"
+
+module Jekyll
+  module Utils
+    # Based on the pattern and code from
+    # https://emptysqua.re/blog/an-event-synchronization-primitive-for-ruby/
+    class ThreadEvent
+      attr_reader :flag
+
+      def initialize
+        @lock = Mutex.new
+        @cond = ConditionVariable.new
+        @flag = false
+      end
+
+      def set
+        @lock.synchronize do
+          yield if block_given?
+          @flag = true
+          @cond.broadcast
+        end
+      end
+
+      def wait
+        @lock.synchronize do
+          unless @flag
+            @cond.wait(@lock)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb
index 135e83e2dba..fd1751d8d40 100644
--- a/test/test_commands_serve.rb
+++ b/test/test_commands_serve.rb
@@ -3,7 +3,10 @@
 require "webrick"
 require "mercenary"
 require "helper"
+require "httpclient"
 require "openssl"
+require "thread"
+require "tmpdir"
 
 class TestCommandsServe < JekyllUnitTest
   def custom_opts(what)
@@ -12,6 +15,128 @@ def custom_opts(what)
     )
   end
 
+  def start_server(opts)
+    @thread = Thread.new do
+      merc = nil
+      cmd = Jekyll::Commands::Serve
+      Mercenary.program(:jekyll) do |p|
+        merc = cmd.init_with_program(p)
+      end
+      merc.execute(:serve, opts)
+    end
+    @thread.abort_on_exception = true
+
+    Jekyll::Commands::Serve.mutex.synchronize do
+      unless Jekyll::Commands::Serve.running?
+        Jekyll::Commands::Serve.run_cond.wait(Jekyll::Commands::Serve.mutex)
+      end
+    end
+  end
+
+  def serve(opts)
+    allow(Jekyll).to receive(:configuration).and_return(opts)
+    allow(Jekyll::Commands::Build).to receive(:process)
+
+    start_server(opts)
+
+    opts
+  end
+
+  context "using LiveReload" do
+    setup do
+      @temp_dir = Dir.mktmpdir("jekyll_livereload_test")
+      @destination = File.join(@temp_dir, "_site")
+      Dir.mkdir(@destination) || flunk("Could not make directory #{@destination}")
+      @client = HTTPClient.new
+      @client.connect_timeout = 5
+      @standard_options = {
+        "port"        => 4000,
+        "host"        => "localhost",
+        "baseurl"     => "",
+        "detach"      => false,
+        "livereload"  => true,
+        "source"      => @temp_dir,
+        "destination" => @destination,
+      }
+
+      site = instance_double(Jekyll::Site)
+      simple_page = <<-HTML.gsub(%r!^\s*!, "")
+      
+      
+      
+        
+        Hello World
+      
+      
+        
    Hello!  I am a simple web page.
    
+      
+      
+      HTML
+
+      File.open(File.join(@destination, "hello.html"), "w") do |f|
+        f.write(simple_page)
+      end
+      allow(Jekyll::Site).to receive(:new).and_return(site)
+    end
+
+    teardown do
+      capture_io do
+        Jekyll::Commands::Serve.shutdown
+      end
+
+      Jekyll::Commands::Serve.mutex.synchronize do
+        if Jekyll::Commands::Serve.running?
+          Jekyll::Commands::Serve.run_cond.wait(Jekyll::Commands::Serve.mutex)
+        end
+      end
+
+      FileUtils.remove_entry_secure(@temp_dir, true)
+    end
+
+    should "serve livereload.js over HTTP on the default LiveReload port" do
+      skip_if_windows "EventMachine support on Windows is limited"
+      opts = serve(@standard_options)
+      content = @client.get_content(
+        "http://#{opts["host"]}:#{opts["livereload_port"]}/livereload.js"
+      )
+      assert_match(%r!LiveReload.on!, content)
+    end
+
+    should "serve nothing else over HTTP on the default LiveReload port" do
+      skip_if_windows "EventMachine support on Windows is limited"
+      opts = serve(@standard_options)
+      res = @client.get("http://#{opts["host"]}:#{opts["livereload_port"]}/")
+      assert_equal(400, res.status_code)
+      assert_match(%r!only serves livereload.js!, res.content)
+    end
+
+    should "insert the LiveReload script tags" do
+      skip_if_windows "EventMachine support on Windows is limited"
+      opts = serve(@standard_options)
+      content = @client.get_content(
+        "http://#{opts["host"]}:#{opts["port"]}/#{opts["baseurl"]}/hello.html"
+      )
+      assert_match(
+        %r!livereload.js\?snipver=1&port=#{opts["livereload_port"]}!,
+        content
+      )
+      assert_match(%r!I am a simple web page!, content)
+    end
+
+    should "apply the max and min delay options" do
+      skip_if_windows "EventMachine support on Windows is limited"
+      opts = serve(@standard_options.merge(
+        "livereload_max_delay" => "1066",
+        "livereload_min_delay" => "3"
+      ))
+      content = @client.get_content(
+        "http://#{opts["host"]}:#{opts["port"]}/#{opts["baseurl"]}/hello.html"
+      )
+      assert_match(%r!&mindelay=3!, content)
+      assert_match(%r!&maxdelay=1066!, content)
+    end
+  end
+
   context "with a program" do
     setup do
       @merc = nil

From 3efb1ad85794bdd4e58ac5f2774b83ea34ada18e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 6 Dec 2017 16:33:53 -0500
Subject: [PATCH 2607/4996] Update history to reflect merge of #5142 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 54bd43db93d..9e67e778a8b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -75,6 +75,7 @@
   * Log Kramdown warnings if log level is WARN (#6522)
   * Add json extension to list of directory indices (#6550)
   * Dependency: Bump jekyll-watch to 2.0 (#6589)
+  * Add LiveReload functionality to Jekyll. (#5142)
 
 ### Site Enhancements
 

From fcb1b410e3e93f180312b7a14aa5d1e0f2591c1e Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 7 Dec 2017 23:44:15 +0530
Subject: [PATCH 2608/4996] rename log_warnings to show_warnings

---
 docs/_docs/configuration.md                       | 2 +-
 lib/jekyll/configuration.rb                       | 2 +-
 lib/jekyll/converters/markdown/kramdown_parser.rb | 5 +++--
 lib/jekyll/converters/smartypants.rb              | 5 +++--
 test/test_kramdown.rb                             | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index d5d6ebd7928..77b749815ee 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -688,7 +688,7 @@ kramdown:
   input:          GFM
   hard_wrap:      false
   footnote_nr:    1
-  log_warnings:   false
+  show_warnings:  false
 ```
 
 ## Liquid Options
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 3258ffab3eb..423ab65857d 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -80,7 +80,7 @@ class Configuration < Hash
         "input"         => "GFM",
         "hard_wrap"     => false,
         "footnote_nr"   => 1,
-        "log_warnings"  => false,
+        "show_warnings" => false,
       },
     }.map { |k, v| [k, v.freeze] }].freeze
 
diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index b1015dcc61d..bb03eaaab04 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -38,12 +38,13 @@ def setup
 
         def convert(content)
           document = Kramdown::Document.new(content, @config)
-          if @config["log_warnings"]
+          html_output = document.to_html
+          if @config["show_warnings"]
             document.warnings.each do |warning|
               Jekyll.logger.warn "Kramdown warning:", warning
             end
           end
-          document.to_html
+          html_output
         end
 
         private
diff --git a/lib/jekyll/converters/smartypants.rb b/lib/jekyll/converters/smartypants.rb
index 4882c0e4ffc..40c0aecd01d 100644
--- a/lib/jekyll/converters/smartypants.rb
+++ b/lib/jekyll/converters/smartypants.rb
@@ -30,12 +30,13 @@ def output_ext(_)
 
       def convert(content)
         document = Kramdown::Document.new(content, @config)
-        if @config["log_warnings"]
+        html_output = document.to_html.chomp
+        if @config["show_warnings"]
           document.warnings.each do |warning|
             Jekyll.logger.warn "Kramdown warning:", warning.sub(%r!^Warning:\s+!, "")
           end
         end
-        document.to_html.chomp
+        html_output
       end
     end
   end
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index d40a27e2538..f68bb17ce78 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -13,7 +13,7 @@ class TestKramdown < JekyllUnitTest
           "toc_levels"              => "1..6",
           "auto_ids"                => false,
           "footnote_nr"             => 1,
-          "log_warnings"            => true,
+          "show_warnings"           => true,
 
           "syntax_highlighter"      => "rouge",
           "syntax_highlighter_opts" => {

From 2774a1aeb6048094e718ed7addf929f49742b875 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 13 Nov 2017 17:41:15 +0100
Subject: [PATCH 2609/4996] Fix Kramdown warnings

---
 History.markdown                              | 91 +++++++++----------
 .../2013-07-24-jekyll-1-1-1-released.markdown | 31 +++----
 2 files changed, 57 insertions(+), 65 deletions(-)

diff --git a/History.markdown b/History.markdown
index 9ed4fdc835d..023bb41825c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -2,50 +2,50 @@
 
 ### Documentation
 
-  * Docs: GitHub Pages instructions (#6384)
+  * Add formester to the list of saas form backend (#6059)
+  * GitHub Pages instructions (#6384)
   * Improve documentation for theme-gem installation (#6387)
   * Fix diff syntax-highlighting (#6388)
+  * Update instructions (#6396)
   * Fix code-block highlighting in docs (#6398)
-  * Docs: Filtering Posts with categories, tags, or other variables (#6399)
+  * 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)
-  * Docs: Renaming duplicate of "Scenario 6" to "Scenario 7" (#6411)
-  * Docs: Mark `collection_dir` as unreleased (#6412)
-  * Docs: Fix link to SUPPORT (#6415)
-  * Docs: Added new tutorial to tutorials section on docs (#6406)
+  * Added new tutorial to tutorials section on docs (#6406)
+  * Updates (#6407)
+  * Fix `collections_dir` example (#6408)
+  * Renaming duplicate of "Scenario 6" to "Scenario 7" (#6411)
+  * Mark `collection_dir` as unreleased (#6412)
+  * Fix link to SUPPORT (#6415)
   * 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)
-  * Docs: Add a note about Liquid and syntax highlighting (#6466)
+  * CoC violation correspondants (#6429)
+  * Add a note about Liquid and syntax highlighting (#6466)
+  * Remove `sudo` from macOS troubleshooting instructions (#6486)
   * 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)
   * Fix a few minor issues in the docs (#6494)
+  * Add jekyll-pwa-plugin (#6533)
   * Remove Jekyll-Smartify from plugins directory (#6548)
 
 ### Development Fixes
 
+  * Added direct collection access to future collection item feature test (#6151)
+  * add failing test for non-utf8 encoding (#6339)
   * 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)
   * 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)
   * Rely on jekyll-mentions for linking usernames (#6469)
+  * Update first-timers-issue-template.md (#6472)
   * 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)
+  * 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 `"strict_front_matter"=>true` (#6520)
-  * [RuboCop] Enable `Style/UnneededCapitalW` cop (#6526)
   * Use Kernel#Array instead of explicit Array check (#6525)
+  * RuboCop: Enable `Style/UnneededCapitalW` cop (#6526)
   * Refactor method to reduce ABC Metric size (#6529)
   * Remove parentheses around arguments to raise (#6532)
   * Use double-quotes around gem name (#6535)
@@ -54,30 +54,29 @@
 
 ### Minor Enhancements
 
+  * Add Utils::Internet.connected? to determine whether host machine has internet connection. (#5870)
   * 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)
+  * Allow the user to set collections_dir to put all collections under one subdirectory (#6331)
+  * Upgrade to Rouge 3 (#6381)
+  * Allow URL filters to work directly with documents (#6478)
+  * filter relative_url should keep absolute urls with scheme/authority (#6490)
+  * .sass-cache doesn't *always* land in `options['source']` (#6500)
   * Allow plugins to modify the obsolete files. (#6502)
-  * .sass-cache doesn't *always* land in options['source'] (#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)
-  * Log kramdown warnings if log level is WARN (#6522)
-  * Allow URL filters to work directly with documents (#6478)
+  * Log Kramdown warnings if log level is WARN (#6522)
 
 ### Site Enhancements
 
-  * 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)
-  * Site: Add default twitter card image (#6476)
-  * Update normalize.css to v7.0.0 (#6491)
-  * add jekyll-pwa-plugin (#6533)
-  * [ImgBot] optimizes images (#6519)
-  * Site: Back to original main navigation (#6544)
-  * Style mobile-docs select element (#6545)
+  * (#6389) Add special styling for code-blocks run in shell
+  * (#6447) Add post about diversity
+  * (#6457) Update list of files excluded from Docs site
+  * (#6460) Update site History
+  * (#6476) Add default twitter card image
+  * (#6491) Update normalize.css to v7.0.0
+  * (#6519) Optimize images
+  * (#6544) Site: Back to original main navigation
+  * (#6545) Style mobile-docs select element
 
 ### Bug Fixes
 
@@ -213,7 +212,7 @@
   * added BibSonomy plugin (#6143)
   * add plugins for multiple page pagination (#6055)
   * Update minimum Ruby version in installation.md (#6164)
-  * [docs] Add information about finding a collection in `site.collections` (#6165)
+  * Add information about finding a collection in `site.collections` (#6165)
   * Add `{% raw %}` to Liquid example on site (#6179)
   * Added improved Pug plugin - removed 404 Jade plugin (#6174)
   * Linking the link (#6210)
@@ -318,7 +317,7 @@
 
 ### Development Fixes
 
-  * [Rubocop] add missing comma (#5835)
+  * Rubocop: add missing comma (#5835)
   * Appease classifier-reborn (#5934)
   * Allow releases & development on `*-stable` branches (#5926)
   * Add script/backport-pr (#5925)
@@ -355,7 +354,7 @@
 ### Bug Fixes
 
   * Exclude Gemfile by default (#5860)
-  * Convertible#validate_permalink!: ensure the return value of data["permalink"] is a string before asking if it is empty (#5878)
+  * Convertible#validate_permalink!: ensure the return value of `data["permalink"]` is a string before asking if it is empty (#5878)
   * Allow abbreviated post dates (#5920)
   * Remove dependency on include from default about.md (#5903)
   * Allow colons in `uri_escape` filter (#5957)
@@ -416,7 +415,7 @@
   * Switch to `https` when possible. (#5611)
   * Update `_font-awesome.scss` to move .woff file before .ttf (#5614)
   * Update documentation on updating FontAwesome Iconset (#5655)
-  * [site] Use defaults for docs and news-items (#5744)
+  * Use defaults for docs and news-items (#5744)
   * Sort gems in `docs/_config.yml` (#5746)
   * Add missing class (#5791)
   * Improve template docs (#5694)
@@ -477,7 +476,7 @@
   * Update quickstart.md (#5758)
   * Correct minor typo (#5764)
   * Fix a markdown link to look properly on the web (#5769)
-  * [docs] Info about the help command usage (#5312)
+  * Info about the help command usage (#5312)
   * Add missing merge labels for jekyllbot (#5753)
   * Fix broken links in documentation (#5736)
   * Docs: add `match_regex` and `replace_regex` filters (#5799)
@@ -609,10 +608,10 @@
   * Site: exclude README.md and .gitignore (#5304)
   * Add link to Staticman (#5224)
   * Update url for OpenShift (#5320)
-  * [docs] add help for missing static_file e.g. on heroku (#5334)
+  * Add help for missing static_file e.g. on heroku (#5334)
   * Add a line about updating theme-gems in the docs (#5318)
   * Explain how to copy a theme's files (#5335)
-  * [docs] .md as default extension in examples (#5316)
+  * .md as default extension in examples (#5316)
   * Fix small typo in docs (#5347)
   * Add missing period to sentence in first paragraph. (#5372)
   * added jekyll-spotify plugin (#5369)
@@ -621,7 +620,7 @@
   * Add documentation for `relative_url` and `absolute_url` (#5405)
   * Bugfix on logo in JSON-LD (#5421)
   * Fix Travis.ci documentation (#5413)
-  * [docs] Update documentation regarding `bundle install` after `jekyll new` (#5428)
+  * Update documentation regarding `bundle install` after `jekyll new` (#5428)
   * Replace classic box-sizing reset with inheritance reset (#5411)
   * Update Wikipedia YAML list link (#5452)
   * Add Jekyll 3.3 release post (#5442)
@@ -925,7 +924,7 @@
   * Fix broken links to the Code of Conduct (#4436)
   * Upgrade notes: mention trailing slash in permalink; fixes #4440 (#4455)
   * Add hooks to the plugin categories toc (#4463)
-  * [add note] Jekyll 3 requires newer version of Ruby. (#4461)
+  * Jekyll 3 requires newer version of Ruby. (#4461)
   * Fix typo in upgrading docs (#4473)
   * Add note about upgrading documentation on jekyllrb.com/help/ (#4484)
   * Update Rake link (#4496)
@@ -993,7 +992,7 @@
   * Fix deep_merge_hashes! handling of drops and hashes (#4359)
   * Page should respect output extension of its permalink (#4373)
   * Disable auto-regeneration when running server detached (#4376)
-  * Drop#[]: only use public_send for keys in the content_methods array (#4388)
+  * Drop#: only use public_send for keys in the content_methods array (#4388)
   * Extract title from filename successfully when no date. (#4195)
 
 ### Development Fixes
diff --git a/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown b/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown
index 90b81847682..acbd58ad06e 100644
--- a/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown
+++ b/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown
@@ -6,25 +6,18 @@ version: 1.1.1
 categories: [release]
 ---
 
+Coming just 10 days after the release of v1.1.0, v1.1.1 is out with a patch for
+the nasty excerpt inception bug ([#1339]({{ site.repository }}/issues/1339)) and
+non-zero exit codes for invalid commands ([#1338]({{ site.repository
+}}/issues/1338)).
 
-Coming just 10 days after the release of v1.1.0, v1.1.1 is out with a patch for the nasty
-excerpt inception bug ([#1339][]) and non-zero exit codes for invalid commands
-([#1338][]).
+To all those affected by the [strange excerpt bug in v1.1.0]({{ site.repository
+}}/issues/1321), I'm sorry. I think we have it all patched up and it should be
+deployed to [GitHub Pages](https://pages.github.com/) in the next couple weeks.
+Thank you for your patience!
 
-To all those affected by the [strange excerpt bug in v1.1.0][#1321], I'm sorry. I think we
-have it all patched up and it should be deployed to [GitHub Pages][gh_pages] in the next
-couple weeks. Thank you for your patience!
+If you're checking out v1.1.x for the first time, definitely check out [what
+shipped with v1.1.0!]({{ site.repository }}/releases/tag/v1.1.0)
 
-If you're checking out v1.1.x for the first time, definitely check out [what shipped with
-v1.1.0!][v1_1_0]
-
-See the [GitHub Release][] page for more a more detailed changelog for this release.
-
-{% assign issue_numbers = "1339|1338|1321" | split: "|" %}
-{% for issue in issue_numbers %}
-[#{{ issue }}]: {{ site.repository }}/issues/{{ issue }}
-{% endfor %}
-
-[GitHub Release]: {{ site.repository }}/releases/tag/v1.1.1
-[gh_pages]: https://pages.github.com/
-[v1_1_0]: {{ site.repository }}/releases/tag/v1.1.0
+See the [GitHub Release]({{ site.repository }}/releases/tag/v1.1.1) page for
+more a more detailed changelog for this release.

From 57ec30d6ef20dc21b9c162a56314325ec4d3aa20 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 13 Nov 2017 18:21:04 +0100
Subject: [PATCH 2610/4996] Site: Kramdown and Rouge are set by default

---
 docs/_config.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index d6e4443cf6f..8ce439891cf 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,5 +1,3 @@
-markdown: kramdown
-highlighter: rouge
 sass:
   style: compressed
 

From a74853501aed84ba1d7fb2d77d8312790cea28df Mon Sep 17 00:00:00 2001
From: Doug Beney 
Date: Mon, 13 Nov 2017 14:49:39 -0500
Subject: [PATCH 2611/4996] Update plugins.md (#6555)

Merge pull request 6555
---
 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 7564252fc31..61d484768a7 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -785,7 +785,7 @@ LESS.js files during generation.
 
 #### Converters
 
-- [Pug plugin by Doug Beney](https://github.com/DougBeney/jekyll-pug): Pug (previously Jade) converter for Jekyll.
+- [Pug plugin by Doug Beney](http://jekyll-pug.dougie.io): Use the popular Pug (previously Jade) templating language in Jekyll. Complete with caching, includes support, and much more.
 - [Textile converter](https://github.com/jekyll/jekyll-textile-converter): Convert `.textile` files into HTML. Also includes the `textilize` Liquid filter.
 - [Slim plugin](https://github.com/slim-template/jekyll-slim): Slim converter and includes for Jekyll with support for Liquid tags.
 - [HAML plugin by Sam Z](https://gist.github.com/517556): HAML converter for Jekyll.

From d8d6360107bbe9943709243ae7cd76a66e0f1b20 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 13 Nov 2017 14:49:41 -0500
Subject: [PATCH 2612/4996] Update history to reflect merge of #6555 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 023bb41825c..966e90404e3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -27,6 +27,7 @@
   * Fix a few minor issues in the docs (#6494)
   * Add jekyll-pwa-plugin (#6533)
   * Remove Jekyll-Smartify from plugins directory (#6548)
+  * Updated Jekyll-Pug listing to include official website (#6555)
 
 ### Development Fixes
 

From 32d1b43fc030090ff49fa776dc5b20b6e194c20d Mon Sep 17 00:00:00 2001
From: Aaron D Borden 
Date: Mon, 13 Nov 2017 13:30:23 -0800
Subject: [PATCH 2613/4996] Add json extension to list of directory indices
 (#6550)

Merge pull request 6550
---
 lib/jekyll/commands/serve.rb | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index a89d152e8c4..9861d2c68d7 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -17,6 +17,15 @@ class << self
             "Skips the initial site build which occurs before the server is started.",],
         }.freeze
 
+        DIRECTORY_INDEX = %w(
+          index.htm
+          index.html
+          index.rhtml
+          index.cgi
+          index.xml
+          index.json
+        ).freeze
+
         #
 
         def init_with_program(prog)
@@ -85,13 +94,7 @@ def webrick_opts(opts)
             :StartCallback      => start_callback(opts["detach"]),
             :BindAddress        => opts["host"],
             :Port               => opts["port"],
-            :DirectoryIndex     => %w(
-              index.htm
-              index.html
-              index.rhtml
-              index.cgi
-              index.xml
-            ),
+            :DirectoryIndex     => DIRECTORY_INDEX,
           }
 
           opts[:DirectoryIndex] = [] if opts[:JekyllOptions]["show_dir_listing"]

From c2ee73ef8df4704028e6419306f766e1eec02007 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 13 Nov 2017 16:30:25 -0500
Subject: [PATCH 2614/4996] Update history to reflect merge of #6550 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 966e90404e3..1e421c38023 100644
--- a/History.markdown
+++ b/History.markdown
@@ -66,6 +66,7 @@
   * Allow plugins to modify the obsolete files. (#6502)
   * Add latin mode to slugify (#6509)
   * Log Kramdown warnings if log level is WARN (#6522)
+  * Add json extension to list of directory indices (#6550)
 
 ### Site Enhancements
 

From 7c72e62552af1a4d1e597f0db60b5caab648d6b0 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 15 Nov 2017 10:19:37 -0500
Subject: [PATCH 2615/4996] Site: Search with @Algolia DocSearch (#6557)

Merge pull request 6557
---
 docs/_includes/header.html        |  1 +
 docs/_includes/search/input.html  |  1 +
 docs/_includes/search/script.html |  9 ++++++
 docs/_includes/top.html           |  1 +
 docs/_layouts/default.html        |  2 +-
 docs/_sass/_docsearch.scss        | 50 +++++++++++++++++++++++++++++++
 docs/_sass/_style.scss            |  1 +
 docs/css/screen.scss              |  1 +
 8 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 docs/_includes/search/input.html
 create mode 100644 docs/_includes/search/script.html
 create mode 100644 docs/_sass/_docsearch.scss

diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index 2577a807828..cca35e89fa7 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -13,6 +13,7 @@
    diff --git a/docs/_includes/search/input.html b/docs/_includes/search/input.html new file mode 100644 index 00000000000..729f5cabdfd --- /dev/null +++ b/docs/_includes/search/input.html @@ -0,0 +1 @@ + diff --git a/docs/_includes/search/script.html b/docs/_includes/search/script.html new file mode 100644 index 00000000000..f770c63aeaf --- /dev/null +++ b/docs/_includes/search/script.html @@ -0,0 +1,9 @@ + + diff --git a/docs/_includes/top.html b/docs/_includes/top.html index 155ffbcacaf..b67648d9d82 100644 --- a/docs/_includes/top.html +++ b/docs/_includes/top.html @@ -7,6 +7,7 @@ {% feed_meta %} + {% seo %} diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 77ebd5f7d82..8e9574adc63 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -8,6 +8,6 @@ {% include footer.html %} {% include anchor_links.html %} {% include analytics.html %} - + {% include search/script.html %} diff --git a/docs/_sass/_docsearch.scss b/docs/_sass/_docsearch.scss new file mode 100644 index 00000000000..bebe3125bf8 --- /dev/null +++ b/docs/_sass/_docsearch.scss @@ -0,0 +1,50 @@ +.searchbox { + .searchbox__input { + padding: 5px 5px 5px 29px; + border: none; + border-radius: 5px; + color: #444; + + &::-webkit-input-placeholder { + color: #aaa; + } + + &:-ms-input-placeholder { + color: #aaa; + } + + &::placeholder { + color: #aaa; + } + } +} + +.algolia-autocomplete { + .ds-dropdown-menu { + font-size: 1rem; + text-shadow: none; + + .ds-suggestion.ds-cursor .algolia-docsearch-suggestion:not(.suggestion-layout-simple) .algolia-docsearch-suggestion--content { + background-color: rgba(221, 221, 221, 0.5); + } + } + + .algolia-docsearch-suggestion--category-header { + background-color: #444; + color: #ddd; + padding: 0.35em; + } + + .algolia-docsearch-suggestion--subcategory-column { + color: #444; + } + + .algolia-docsearch-suggestion--highlight { + background-color: #fc0; + color: #222; + } + + .algolia-docsearch-suggestion--text .algolia-docsearch-suggestion--highlight { + box-shadow: inset 0 -2px 0 0 #fc0; + } +} diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss index 38276c8f461..fe84083a372 100644 --- a/docs/_sass/_style.scss +++ b/docs/_sass/_style.scss @@ -62,6 +62,7 @@ nav { padding: 0; margin: 0; white-space: nowrap; + display: inline-block; } li { display: inline-block; } diff --git a/docs/css/screen.scss b/docs/css/screen.scss index 2eff7f89df7..4bc6bec3330 100644 --- a/docs/css/screen.scss +++ b/docs/css/screen.scss @@ -7,3 +7,4 @@ @import "pygments"; @import "font-awesome"; @import "style"; +@import "docsearch"; From 977cfb0ac09b2beece3be73015a1a42e53a56481 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 15 Nov 2017 10:19:40 -0500 Subject: [PATCH 2616/4996] Update history to reflect merge of #6557 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 1e421c38023..595e02585f5 100644 --- a/History.markdown +++ b/History.markdown @@ -79,6 +79,7 @@ * (#6519) Optimize images * (#6544) Site: Back to original main navigation * (#6545) Style mobile-docs select element + * Site: Search with DocSearch by @Algolia (#6557) ### Bug Fixes From 22cba713dcf29e592a70b892e8fa512ad5f8c141 Mon Sep 17 00:00:00 2001 From: ashmaroli Date: Thu, 16 Nov 2017 00:55:16 +0530 Subject: [PATCH 2617/4996] Bump JRuby version in Travis config (#6561) Merge pull request 6561 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2cfe51b7697..1da8963ace7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ rvm: - &ruby2 2.3.5 - &ruby3 2.2.8 - &ruby4 2.1.10 - - &jruby jruby-9.1.13.0 + - &jruby jruby-9.1.14.0 matrix: include: From e4888f2e5220b529147273338449feca20341b9f Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 15 Nov 2017 14:25:18 -0500 Subject: [PATCH 2618/4996] Update history to reflect merge of #6561 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 595e02585f5..ca4f2e6dc43 100644 --- a/History.markdown +++ b/History.markdown @@ -52,6 +52,7 @@ * Use double-quotes around gem name (#6535) * Dependencies: upgrade to toml 0.2.0 (#6541) * Lock to cucumber 3.0.1 on Ruby 2.1 (#6546) + * Bump JRuby version in Travis config (#6561) ### Minor Enhancements From 3f8cd30d4dec40342f6a1926e962755f349e6baa Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Wed, 15 Nov 2017 21:28:25 +0100 Subject: [PATCH 2619/4996] Site: Display search only on large resolutions --- docs/_sass/_style.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss index fe84083a372..8ade52e6f75 100644 --- a/docs/_sass/_style.scss +++ b/docs/_sass/_style.scss @@ -172,6 +172,10 @@ h6:hover .header-link { } } +@media (max-width: 950px) { + .searchbox { display: none;} +} + /* Footer */ footer { From 68935f1bda79875c3da1a62dbdee2a553e6d741f Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Thu, 16 Nov 2017 22:20:38 +0100 Subject: [PATCH 2620/4996] Reformat --- History.markdown | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/History.markdown b/History.markdown index ca4f2e6dc43..c92be8607c0 100644 --- a/History.markdown +++ b/History.markdown @@ -71,16 +71,16 @@ ### Site Enhancements - * (#6389) Add special styling for code-blocks run in shell - * (#6447) Add post about diversity - * (#6457) Update list of files excluded from Docs site - * (#6460) Update site History - * (#6476) Add default twitter card image - * (#6491) Update normalize.css to v7.0.0 - * (#6519) Optimize images - * (#6544) Site: Back to original main navigation - * (#6545) Style mobile-docs select element - * Site: Search with DocSearch by @Algolia (#6557) + * Add special styling for code-blocks run in shell (#6389) + * Add post about diversity (#6447) + * Update list of files excluded from Docs site (#6457) + * Update site History (#6460) + * Add default twitter card image (#6476) + * Update normalize.css to v7.0.0 (#6491) + * Optimize images (#6519) + * Back to original main navigation (#6544) + * Styles: mobile-docs select element (#6545) + * Search with DocSearch by @Algolia (#6557) ### Bug Fixes From 0fdb39bbd6925d63966c155ed4665c0e2f67886a Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 17 Nov 2017 16:36:11 -0500 Subject: [PATCH 2621/4996] Avoid block parser warning in SmartyPants (#6565) Merge pull request 6565 --- lib/jekyll/converters/smartypants.rb | 7 ++++++- test/test_filters.rb | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/converters/smartypants.rb b/lib/jekyll/converters/smartypants.rb index 40c0aecd01d..a3c3c1560d0 100644 --- a/lib/jekyll/converters/smartypants.rb +++ b/lib/jekyll/converters/smartypants.rb @@ -3,9 +3,14 @@ class Kramdown::Parser::SmartyPants < Kramdown::Parser::Kramdown def initialize(source, options) super - @block_parsers = [:block_html] + @block_parsers = [:block_html, :content] @span_parsers = [:smart_quotes, :html_entity, :typographic_syms, :span_html] end + + def parse_content + add_text @src.scan(%r!\A.*\n!) + end + define_parser(:content, %r!\A!) end module Jekyll diff --git a/test/test_filters.rb b/test/test_filters.rb index a56df6da309..afedf7467bc 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -100,6 +100,10 @@ def select; end assert_equal "“", @filter.smartify("“") end + should "convert multiple lines" do + assert_equal "…\n…", @filter.smartify("...\n...") + end + should "allow raw HTML passthrough" do assert_equal( "Span HTML is not escaped", @@ -123,6 +127,12 @@ def select; end @filter.smartify(404) ) end + + should "not output any warnings" do + assert_empty( + capture_output { @filter.smartify("Test") } + ) + end end should "sassify with simple string" do From 13911961b9b30792ceda92f48a0847ec8dabbce2 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 17 Nov 2017 16:36:12 -0500 Subject: [PATCH 2622/4996] Update history to reflect merge of #6565 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index c92be8607c0..e7f21d83f51 100644 --- a/History.markdown +++ b/History.markdown @@ -85,6 +85,7 @@ ### Bug Fixes * Raise when theme root directory is not available (#6455) + * Avoid block parser warning in SmartyPants (#6565) ## 3.6.2 / 2017-10-21 From 0f354704804673331138706d8e1db5975733e665 Mon Sep 17 00:00:00 2001 From: ashmaroli Date: Mon, 20 Nov 2017 00:30:38 +0530 Subject: [PATCH 2623/4996] Site header redesign (#6567) Merge pull request 6567 --- docs/_includes/header.html | 26 +++++++++---- docs/_includes/mobile-nav-items.html | 17 ++++++++ docs/_includes/primary-nav-items.html | 3 -- docs/_sass/_docsearch.scss | 18 +++++++-- docs/_sass/_style.scss | 56 ++++++++++++++++++++------- 5 files changed, 91 insertions(+), 29 deletions(-) create mode 100644 docs/_includes/mobile-nav-items.html diff --git a/docs/_includes/header.html b/docs/_includes/header.html index cca35e89fa7..7cdcb970bc0 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -1,19 +1,31 @@
    -
    -
    +
    +

    - +

    -
    diff --git a/docs/_includes/mobile-nav-items.html b/docs/_includes/mobile-nav-items.html new file mode 100644 index 00000000000..12fe4016e76 --- /dev/null +++ b/docs/_includes/mobile-nav-items.html @@ -0,0 +1,17 @@ + diff --git a/docs/_includes/primary-nav-items.html b/docs/_includes/primary-nav-items.html index 12fe4016e76..7609bd7e906 100644 --- a/docs/_includes/primary-nav-items.html +++ b/docs/_includes/primary-nav-items.html @@ -11,7 +11,4 @@
  • Help
    • -
  • - GitHub -
    • diff --git a/docs/_sass/_docsearch.scss b/docs/_sass/_docsearch.scss index bebe3125bf8..e984edea90e 100644 --- a/docs/_sass/_docsearch.scss +++ b/docs/_sass/_docsearch.scss @@ -1,24 +1,34 @@ .searchbox { + padding-top: 1px; .searchbox__input { - padding: 5px 5px 5px 29px; + padding: 6px 5px 5px 29px; + font-size: 0.75em; border: none; border-radius: 5px; - color: #444; + color: #555; + background-color: #333 !important; + box-shadow: 0 0 1px 0 #555; &::-webkit-input-placeholder { color: #aaa; } - &:-ms-input-placeholder { color: #aaa; } - &::placeholder { color: #aaa; } + + &:focus, &:active { + color: #eaeaea; + background-color: #252525 !important; + } } } +.searchbox__submit svg { fill: #fc0 } +.searchbox__reset svg { fill: #999 } + .algolia-autocomplete { .ds-dropdown-menu { font-size: 1rem; diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss index 8ade52e6f75..52e6e8e3008 100644 --- a/docs/_sass/_style.scss +++ b/docs/_sass/_style.scss @@ -14,7 +14,6 @@ body { font: 300 21px Lato, 'Helvetica Neue', Helvetica, Arial, sans-serif; color: #ddd; background-color: #333; - border-top: 5px solid #fc0; @include box-shadow(inset 0 3px 30px rgba(0,0,0,.3)); text-shadow: 0 1px 3px rgba(0,0,0,.5); -webkit-font-feature-settings: "kern" 1; @@ -50,13 +49,28 @@ footer { /* Header */ header { + padding: 15px; + background: darken(#333, 3%); h1, nav { display: inline-block; } + .flexbox { + display: flex; + height: 50px; + + & > * { margin: auto } + } + + .logo { + display: block; + img { margin-top: -7px } + } + + .search .svg-icons { display: none } } -nav { +nav, .meta { ul { padding: 0; @@ -68,16 +82,20 @@ nav { li { display: inline-block; } } -.main-nav { - margin-top: 52px; +.meta ul { + margin-left: 10px; + + li { vertical-align: middle; } +} + +.main-nav, .meta { li { - margin-right: 10px; a { @include border-radius(5px); font-weight: 900; - font-size: 14px; + font-size: 0.75em; padding: 0.5em 1em; text-shadow: none; text-transform: uppercase; @@ -101,7 +119,6 @@ nav { } } } - .mobile-nav { padding: 0 5px; @@ -118,9 +135,9 @@ nav { color: #fc0; text-align: center; text-transform: uppercase; - font-size: 14px; + font-size: 0.625em; font-weight: 900; - padding: 5px; + padding: 10px 5px; @include border-radius(5px); } @@ -160,20 +177,29 @@ h6:hover .header-link { opacity: 1; } -@media (max-width: 768px) { - .main-nav ul { - text-align: right; +@media (max-width: 568px) { + header { padding-bottom: 0 } +} +@media (max-width: 580px) { + header { + .flexbox { height: auto } + .logo img { margin-top: 0 } } } +@media (max-width: 699px) { + .searchbox { display: none } +} +@media (max-width: 768px) { + .main-nav ul { text-align: right } +} @media (max-width: 830px) { .main-nav { .show-on-mobiles { display: inline; } .hide-on-mobiles { display: none; } } } - -@media (max-width: 950px) { - .searchbox { display: none;} +@media (max-width: 890px) { + .meta { display: none; } } /* Footer */ From f85a039633628b59baf01aede9940df51e4b1bf0 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 19 Nov 2017 14:00:39 -0500 Subject: [PATCH 2624/4996] Update history to reflect merge of #6567 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index e7f21d83f51..b71e88bc429 100644 --- a/History.markdown +++ b/History.markdown @@ -81,6 +81,7 @@ * Back to original main navigation (#6544) * Styles: mobile-docs select element (#6545) * Search with DocSearch by @Algolia (#6557) + * Site header redesign (#6567) ### Bug Fixes From 0f249eec9fc507db920f2e3b14cb94c707835d9f Mon Sep 17 00:00:00 2001 From: ashmaroli Date: Mon, 20 Nov 2017 18:36:47 +0530 Subject: [PATCH 2625/4996] move logo above navigation on small screens (#6570) Merge pull request 6570 --- docs/_includes/header.html | 6 +++--- docs/_sass/_style.scss | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 7cdcb970bc0..b289550d2d8 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -1,7 +1,4 @@
    -

    @@ -28,4 +25,7 @@

    +
    diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss index 52e6e8e3008..fb185972394 100644 --- a/docs/_sass/_style.scss +++ b/docs/_sass/_style.scss @@ -177,9 +177,6 @@ h6:hover .header-link { opacity: 1; } -@media (max-width: 568px) { - header { padding-bottom: 0 } -} @media (max-width: 580px) { header { .flexbox { height: auto } From c2195b01181fd54874bc2eb5877231af3b437075 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 20 Nov 2017 08:06:48 -0500 Subject: [PATCH 2626/4996] Update history to reflect merge of #6570 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index b71e88bc429..94da8dcd180 100644 --- a/History.markdown +++ b/History.markdown @@ -82,6 +82,7 @@ * Styles: mobile-docs select element (#6545) * Search with DocSearch by @Algolia (#6557) * Site header redesign (#6567) + * Move logo above site navigation on small screens (#6570) ### Bug Fixes From 6b003a443887771eced77d3d6011f08bf6aad71d Mon Sep 17 00:00:00 2001 From: ashmaroli Date: Wed, 22 Nov 2017 00:58:08 +0530 Subject: [PATCH 2627/4996] fail gracefully if "sass" gem cannot be loaded (#6573) Merge pull request 6573 --- lib/jekyll/theme.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb index cf9829ea322..edd041eea5c 100644 --- a/lib/jekyll/theme.rb +++ b/lib/jekyll/theme.rb @@ -38,7 +38,7 @@ def assets_path def configure_sass return unless sass_path - require "sass" + Jekyll::External.require_with_graceful_fail "sass" Sass.load_paths << sass_path end From 398e7d50894a2a20975342ed27ffc6bbd0a1ec12 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 21 Nov 2017 14:28:10 -0500 Subject: [PATCH 2628/4996] Update history to reflect merge of #6573 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 94da8dcd180..85ca98c6371 100644 --- a/History.markdown +++ b/History.markdown @@ -88,6 +88,7 @@ * Raise when theme root directory is not available (#6455) * Avoid block parser warning in SmartyPants (#6565) + * Fail gracefully if "sass" gem cannot be loaded (#6573) ## 3.6.2 / 2017-10-21 From f906a3cb597c049b7febb9767bed2802d47a659d Mon Sep 17 00:00:00 2001 From: Jonathan Hooper Date: Wed, 22 Nov 2017 08:37:18 -0600 Subject: [PATCH 2629/4996] Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML (#5828) Merge pull request 5828 --- lib/jekyll/convertible.rb | 2 +- lib/jekyll/document.rb | 4 ++-- test/test_convertible.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index 1236d9d1662..d3749a1ad1d 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -46,7 +46,7 @@ def read_yaml(base, name, opts = {}) self.content = $POSTMATCH self.data = SafeYAML.load(Regexp.last_match(1)) end - rescue SyntaxError => e + rescue Psych::SyntaxError => e Jekyll.logger.warn "YAML Exception reading #{filename}: #{e.message}" raise e if self.site.config["strict_front_matter"] rescue StandardError => e diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 5bb255666ea..1eb8418605e 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 SyntaxError, StandardError, Errors::FatalException => e + rescue StandardError => e handle_read_error(e) end end @@ -463,7 +463,7 @@ def read_post_data private def handle_read_error(error) - if error.is_a? SyntaxError + if error.is_a? Psych::SyntaxError Jekyll.logger.error "Error:", "YAML Exception reading #{path}: #{error.message}" else Jekyll.logger.error "Error:", "could not read file #{path}: #{error.message}" diff --git a/test/test_convertible.rb b/test/test_convertible.rb index f05cb4fb2c7..5b73e252815 100644 --- a/test/test_convertible.rb +++ b/test/test_convertible.rb @@ -31,7 +31,7 @@ class TestConvertible < JekyllUnitTest ret = @convertible.read_yaml(@base, name) assert_equal({}, ret) end - assert_match(%r!YAML Exception|syntax error|Error reading file!, out) + assert_match(%r!YAML Exception!, out) assert_match(%r!#{File.join(@base, name)}!, out) end From a25fd7233435010ea75dd66485a0217548e0663f Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 22 Nov 2017 09:37:20 -0500 Subject: [PATCH 2630/4996] Update history to reflect merge of #5828 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 85ca98c6371..ba659ed6be6 100644 --- a/History.markdown +++ b/History.markdown @@ -53,6 +53,7 @@ * Dependencies: upgrade to toml 0.2.0 (#6541) * Lock to cucumber 3.0.1 on Ruby 2.1 (#6546) * Bump JRuby version in Travis config (#6561) + * Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML (#5828) ### Minor Enhancements From ed03ca5c16eb45bcda315d63ccdfccc5513fb347 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 24 Nov 2017 03:43:37 -0500 Subject: [PATCH 2631/4996] Docs: Include version badge for latest features (#6574) Merge pull request 6574 --- docs/_docs/collections.md | 6 +++--- docs/_docs/configuration.md | 2 +- docs/_docs/templates.md | 2 +- docs/_includes/docs_version_badge.html | 1 + docs/_sass/_style.scss | 24 ++++++++++++++++++++++++ 5 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 docs/_includes/docs_version_badge.html diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md index 0b59b7db6d1..30ea5592c65 100644 --- a/docs/_docs/collections.md +++ b/docs/_docs/collections.md @@ -46,10 +46,10 @@ defaults: layout: page ``` -
    -
    Gather your collections
    +
    +
    Gather your collections {%- include docs_version_badge.html version="3.7.0" -%}
    -

    From v3.7.0 you can optionally specify a directory to store all your collections in the same place with collections_dir: my_collections

    +

    You can optionally specify a directory to store all your collections in the same place with 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.

    diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md index 77b749815ee..362d33c5525 100644 --- a/docs/_docs/configuration.md +++ b/docs/_docs/configuration.md @@ -549,7 +549,7 @@ 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. +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. {%- include docs_version_badge.html version="3.7.0" -%} ```yaml collections: diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md index 81eb5b2a696..390410aaf92 100644 --- a/docs/_docs/templates.md +++ b/docs/_docs/templates.md @@ -429,7 +429,7 @@ The default is `default`. They are as follows (with what they filter): - `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`) +- `latin`: like `default`, except Latin characters are first transliterated (e.g. `àèïòü` to `aeiou`) {%- include docs_version_badge.html version="3.7.0" -%} ## Tags diff --git a/docs/_includes/docs_version_badge.html b/docs/_includes/docs_version_badge.html new file mode 100644 index 00000000000..3c358109ffe --- /dev/null +++ b/docs/_includes/docs_version_badge.html @@ -0,0 +1 @@ +{{ include.version }} diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss index fb185972394..11d89adf3a8 100644 --- a/docs/_sass/_style.scss +++ b/docs/_sass/_style.scss @@ -1030,6 +1030,30 @@ code.output { text-shadow: 0 1px 0 rgba(255,255,255,.25); } +/* Version badge */ + +.version-badge { + margin-left: .25em; + padding: 0.2em; + font-size: .75em; + font-weight: 400; + background-color: #fc0; + color: #222; + text-shadow: none; + vertical-align: middle; + border-radius: 3.75px; +} + +.note { + .version-badge { + font-size: 0.9rem; + padding: 0.1em 0.2em; + background-color: rgba(0,0,0,0.2); + color: #fff; + box-shadow: inset 0 1px 10px rgba(0,0,0,0.3),0 1px 0 rgba(255,255,255,0.1),0 -1px 0 rgba(0,0,0,0.5); + } +} + /* Responsive tables */ @media (max-width: 768px) { From f58d5988fa24e2770c38a47c72289101a363e6af Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 24 Nov 2017 03:43:39 -0500 Subject: [PATCH 2632/4996] Update history to reflect merge of #6574 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index ba659ed6be6..b9fb48435e1 100644 --- a/History.markdown +++ b/History.markdown @@ -84,6 +84,7 @@ * Search with DocSearch by @Algolia (#6557) * Site header redesign (#6567) * Move logo above site navigation on small screens (#6570) + * Docs: Include version badge for latest features (#6574) ### Bug Fixes From 7ef3260327ecaf69540f1828b2a16198dff0dd8c Mon Sep 17 00:00:00 2001 From: Florian Thomas Date: Fri, 24 Nov 2017 08:49:13 +0000 Subject: [PATCH 2633/4996] return correct file in dir if dir has same name as file (#6569) Merge pull request 6569 --- lib/jekyll/commands/serve/servlet.rb | 6 +++- test/fixtures/webrick/bar.html | 1 + test/fixtures/webrick/bar/baz.html | 1 + test/helper.rb | 54 ++++++++++++++++++++++++++++ test/test_commands_serve_servlet.rb | 38 ++++++++++++++++++++ 5 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 test/fixtures/webrick/bar.html create mode 100644 test/fixtures/webrick/bar/baz.html create mode 100644 test/test_commands_serve_servlet.rb diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb index 2e41b697524..70b6d66df34 100644 --- a/lib/jekyll/commands/serve/servlet.rb +++ b/lib/jekyll/commands/serve/servlet.rb @@ -18,13 +18,17 @@ def initialize(server, root, callbacks) super end + def search_index_file(req, res) + super || search_file(req, res, ".html") + end + # Add the ability to tap file.html the same way that Nginx does on our # Docker images (or on GitHub Pages.) The difference is that we might end # up with a different preference on which comes first. def search_file(req, res, basename) # /file.* > /file/index.html > /file.html - super || super(req, res, ".html") || super(req, res, "#{basename}.html") + super || super(req, res, "#{basename}.html") end # rubocop:disable Naming/MethodName diff --git a/test/fixtures/webrick/bar.html b/test/fixtures/webrick/bar.html new file mode 100644 index 00000000000..76870bf2f38 --- /dev/null +++ b/test/fixtures/webrick/bar.html @@ -0,0 +1 @@ +Content of bar.html diff --git a/test/fixtures/webrick/bar/baz.html b/test/fixtures/webrick/bar/baz.html new file mode 100644 index 00000000000..794d5f2202d --- /dev/null +++ b/test/fixtures/webrick/bar/baz.html @@ -0,0 +1 @@ +Content of baz.html diff --git a/test/helper.rb b/test/helper.rb index 672fedd2862..aa94be13e61 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -44,6 +44,8 @@ def jruby? include Jekyll +require "jekyll/commands/serve/servlet" + # Report with color. Minitest::Reporters.use! [ Minitest::Reporters::DefaultReporter.new( @@ -194,3 +196,55 @@ def skip_if_windows(msg = nil) end end end + +class FakeLogger + def <<(str); end +end + +module TestWEBrick + + module_function + + def mount_server(&block) + server = WEBrick::HTTPServer.new(config) + + begin + server.mount("/", Jekyll::Commands::Serve::Servlet, document_root, + document_root_options) + + server.start + addr = server.listeners[0].addr + block.yield([server, addr[3], addr[1]]) + rescue StandardError => e + raise e + ensure + server.shutdown + sleep 0.1 until server.status == :Stop + end + end + + def config + logger = FakeLogger.new + { + :BindAddress => "127.0.0.1", :Port => 0, + :ShutdownSocketWithoutClose => true, + :ServerType => Thread, + :Logger => WEBrick::Log.new(logger), + :AccessLog => [[logger, ""]], + :JekyllOptions => {}, + } + end + + def document_root + "#{File.dirname(__FILE__)}/fixtures/webrick" + end + + def document_root_options + WEBrick::Config::FileHandler.merge({ + :FancyIndexing => true, + :NondisclosureName => [ + ".ht*", "~*", + ], + }) + end +end diff --git a/test/test_commands_serve_servlet.rb b/test/test_commands_serve_servlet.rb new file mode 100644 index 00000000000..1f84cbbbe64 --- /dev/null +++ b/test/test_commands_serve_servlet.rb @@ -0,0 +1,38 @@ +# frozen_string_literal: true + +require "webrick" +require "helper" +require "net/http" + +class TestCommandsServeServlet < JekyllUnitTest + def get(path) + TestWEBrick.mount_server do |_server, addr, port| + http = Net::HTTP.new(addr, port) + req = Net::HTTP::Get.new(path) + + http.request(req) { |response| yield(response) } + end + end + + context "with a directory and file with the same name" do + should "find that file" do + get("/bar/") do |response| + assert_equal("200", response.code) + assert_equal("Content of bar.html", response.body.strip) + end + end + + should "find file in directory" do + get("/bar/baz") do |response| + assert_equal("200", response.code) + assert_equal("Content of baz.html", response.body.strip) + end + end + + should "return 404 for non-existing files" do + get("/bar/missing") do |response| + assert_equal("404", response.code) + end + end + end +end From 65fd99045926ed3331d59356dc765936b9bb0dff Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 24 Nov 2017 03:49:15 -0500 Subject: [PATCH 2634/4996] Update history to reflect merge of #6569 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index b9fb48435e1..94d3c9ecf35 100644 --- a/History.markdown +++ b/History.markdown @@ -91,6 +91,7 @@ * Raise when theme root directory is not available (#6455) * Avoid block parser warning in SmartyPants (#6565) * Fail gracefully if "sass" gem cannot be loaded (#6573) + * return correct file in dir if dir has same name as file (#6569) ## 3.6.2 / 2017-10-21 From abeee6fdf6849ce24ddb5987a282e2e35302ebeb Mon Sep 17 00:00:00 2001 From: ashmaroli Date: Fri, 24 Nov 2017 17:49:08 +0530 Subject: [PATCH 2635/4996] use version-badge on an existing feature intro (#6575) Merge pull request 6575 --- docs/_docs/themes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md index 6907ffb0c00..b5423a6b56c 100644 --- a/docs/_docs/themes.md +++ b/docs/_docs/themes.md @@ -224,9 +224,9 @@ Your theme's styles can be included in the user's stylesheet using the `@import` ``` {% endraw %} -### Theme-gem dependencies +### Theme-gem dependencies {%- include docs_version_badge.html version="3.5.0" -%} -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.) +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. From 8060934f9689d77cc9ee4549057364a9a9d4c165 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 24 Nov 2017 07:19:10 -0500 Subject: [PATCH 2636/4996] Update history to reflect merge of #6575 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 94d3c9ecf35..d878b8d1fdc 100644 --- a/History.markdown +++ b/History.markdown @@ -85,6 +85,7 @@ * Site header redesign (#6567) * Move logo above site navigation on small screens (#6570) * Docs: Include version badge for latest features (#6574) + * Use version-badge on an existing feature intro (#6575) ### Bug Fixes From e063ac530c9c8508533128eae59fb3e7f23d4576 Mon Sep 17 00:00:00 2001 From: ashmaroli Date: Mon, 27 Nov 2017 01:06:41 +0530 Subject: [PATCH 2637/4996] drop forwarding to private methods (#6577) Merge pull request 6577 --- lib/jekyll/theme_builder.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb index aca89dd655c..9b43e0a3714 100644 --- a/lib/jekyll/theme_builder.rb +++ b/lib/jekyll/theme_builder.rb @@ -21,6 +21,14 @@ def create! initialize_git_repo end + def user_name + @user_name ||= `git config user.name`.chomp + end + + def user_email + @user_email ||= `git config user.email`.chomp + end + private def root @@ -85,14 +93,6 @@ def initialize_git_repo write_file(".gitignore", template("gitignore")) end - def user_name - @user_name ||= `git config user.name`.chomp - end - - def user_email - @user_email ||= `git config user.email`.chomp - end - class ERBRenderer extend Forwardable From 05bca8128c5069fdac4735afb79e390265be6727 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Sun, 26 Nov 2017 14:36:43 -0500 Subject: [PATCH 2638/4996] Update history to reflect merge of #6577 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index d878b8d1fdc..f05f90020c6 100644 --- a/History.markdown +++ b/History.markdown @@ -54,6 +54,7 @@ * Lock to cucumber 3.0.1 on Ruby 2.1 (#6546) * Bump JRuby version in Travis config (#6561) * Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML (#5828) + * Drop forwarding to private methods by exposing those methods as public (#6577) ### Minor Enhancements From bd1d44493f559039c877203ffb52add57b47d732 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 29 Nov 2017 03:17:08 -0500 Subject: [PATCH 2639/4996] Upgrade pygments to v1.x (#5937) Merge pull request 5937 --- Gemfile | 2 +- lib/jekyll/tags/highlight.rb | 4 ++-- test/test_redcarpet.rb | 13 +++++++------ test/test_tags.rb | 23 ++++++++++++++--------- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index 2ba32da780c..8590544ed3a 100644 --- a/Gemfile +++ b/Gemfile @@ -81,7 +81,7 @@ group :jekyll_optional_dependencies do platform :ruby, :mswin, :mingw, :x64_mingw do gem "classifier-reborn", "~> 2.1.0" gem "liquid-c", "~> 3.0" - gem "pygments.rb", "~> 0.6.0" + gem "pygments.rb", "~> 1.0" gem "rdiscount", "~> 2.0" gem "redcarpet", "~> 3.2", ">= 3.2.3" gem "yajl-ruby", "~> 1.2" diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index 683e3b2b456..256342c3fe6 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -86,7 +86,7 @@ def parse_options(input) end def render_pygments(code, is_safe) - Jekyll::External.require_with_graceful_fail("pygments") + Jekyll::External.require_with_graceful_fail("pygments") unless defined?(Pygments) highlighted_code = Pygments.highlight( code, @@ -118,7 +118,7 @@ def render_rouge(code) :gutter_class => "gutter", :code_class => "code" ) - lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText + lexer = ::Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText formatter.format(lexer.lex(code)) end diff --git a/test/test_redcarpet.rb b/test/test_redcarpet.rb index f4208570931..29d787ae62f 100644 --- a/test/test_redcarpet.rb +++ b/test/test_redcarpet.rb @@ -46,16 +46,17 @@ class TestRedcarpet < JekyllUnitTest end should "render fenced code blocks with syntax highlighting" do - assert_equal "
    puts "Hello world"\n
    ", - @markdown.convert( - <<-EOS + assert_equal \ + "
    puts "Hello world"\n
    ", + @markdown.convert( + <<-EOS ```ruby puts "Hello world" ``` EOS - ).strip + ).strip end end diff --git a/test/test_tags.rb b/test/test_tags.rb index 43d83464362..a76f0df138a 100644 --- a/test/test_tags.rb +++ b/test/test_tags.rb @@ -185,7 +185,8 @@ def highlight_block_with_opts(options_string) should "render markdown with pygments" do assert_match( - %(
    test
    ), + %(
    ) +
+          %(test
    ), @result ) end @@ -193,7 +194,7 @@ def highlight_block_with_opts(options_string) should "render markdown with pygments with line numbers" do assert_match( %(
    ) +
-          %(1 test
    ), + %(1 test    ), @result ) end @@ -206,7 +207,7 @@ def highlight_block_with_opts(options_string) should "not embed the file" do assert_match( - %(
    ) +
+          %(
    ) +
           %(./jekyll.gemspec
    ),
           @result
         )
@@ -220,7 +221,8 @@ def highlight_block_with_opts(options_string)
 
       should "render markdown with pygments line handling" do
         assert_match(
-          %(
    Æ
    ),
+          %(
    ) +
+          %(Æ
    ),
           @result
         )
       end
@@ -240,7 +242,8 @@ def highlight_block_with_opts(options_string)
 
       should "only strip the preceding newlines" do
         assert_match(
-          %(
         [,1] [,2]),
+          %(
    ) +
+          %(     [,1] [,2]),
           @result
         )
       end
@@ -265,8 +268,8 @@ def highlight_block_with_opts(options_string)
 
       should "only strip the newlines which precede and succeed the entire block" do
         assert_match(
-          "
    " \
-          "     [,1] [,2]\n\n\n[1,] FALSE TRUE\n[2,] FALSE TRUE
    ",
+          %(
    ) +
+          %(     [,1] [,2]\n\n\n[1,] FALSE TRUE\n[2,] FALSE TRUE
    ),
           @result
         )
       end
@@ -280,7 +283,8 @@ def highlight_block_with_opts(options_string)
 
       should "only strip the preceding newlines" do
         assert_match(
-          %(
         [,1] [,2]),
+          %(
    ) +
+          %(     [,1] [,2]),
           @result
         )
       end
@@ -298,7 +302,8 @@ def highlight_block_with_opts(options_string)
 
       should "only strip the preceding newlines" do
         assert_match(
-          %(
         [,1] [,2]),
+          %(
    ) +
+          %(     [,1] [,2]),
           @result
         )
       end

From ff4718d82438512e297f035a4ccc66c848e75e7a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 29 Nov 2017 03:17:09 -0500
Subject: [PATCH 2640/4996] Update history to reflect merge of #5937 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f05f90020c6..06d286eb9eb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -55,6 +55,7 @@
   * Bump JRuby version in Travis config (#6561)
   * Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML (#5828)
   * Drop forwarding to private methods by exposing those methods as public (#6577)
+  * Upgrade pygments to v1.x (#5937)
 
 ### Minor Enhancements
 

From 79bf9f286589c8a5991c480ddf53f946cfa36ba7 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 29 Nov 2017 03:37:07 -0500
Subject: [PATCH 2641/4996] Bump yajl-ruby (#6582)

Merge pull request 6582
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 8590544ed3a..68bc28c24a5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -84,7 +84,7 @@ group :jekyll_optional_dependencies do
     gem "pygments.rb", "~> 1.0"
     gem "rdiscount", "~> 2.0"
     gem "redcarpet", "~> 3.2", ">= 3.2.3"
-    gem "yajl-ruby", "~> 1.2"
+    gem "yajl-ruby", "~> 1.3.1"
   end
 
   # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

From 664b20d3752a81f5073b238906300203733db3d2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 29 Nov 2017 03:37:08 -0500
Subject: [PATCH 2642/4996] Update history to reflect merge of #6582 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 06d286eb9eb..49bfec78dda 100644
--- a/History.markdown
+++ b/History.markdown
@@ -56,6 +56,7 @@
   * Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML (#5828)
   * Drop forwarding to private methods by exposing those methods as public (#6577)
   * Upgrade pygments to v1.x (#5937)
+  * Bump yajl-ruby (#6582)
 
 ### Minor Enhancements
 

From 61e53b6b6199263f6937979c1ed68b1ed888c192 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Wed, 29 Nov 2017 19:26:46 +0530
Subject: [PATCH 2643/4996] cleanup test_redcarpet.rb (#6584)

Merge pull request 6584
---
 test/test_redcarpet.rb | 57 ++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/test/test_redcarpet.rb b/test/test_redcarpet.rb
index 29d787ae62f..51da49c58e4 100644
--- a/test/test_redcarpet.rb
+++ b/test/test_redcarpet.rb
@@ -19,6 +19,13 @@ class TestRedcarpet < JekyllUnitTest
       }
 
       @markdown = Converters::Markdown.new @config
+
+      @sample = Jekyll::Utils.strip_heredoc(<<-EOS
+        ```ruby
+        puts "Hello world"
+        ```
+      EOS
+                                           )
     end
 
     should "pass redcarpet options" do
@@ -35,7 +42,7 @@ class TestRedcarpet < JekyllUnitTest
 
     should "pass redcarpet render options" do
       assert_equal "
    bad code not here: i am bad
    ",
-              @markdown.convert("**bad code not here**: ").strip
+        @markdown.convert("**bad code not here**: ").strip
     end
 
     context "with pygments enabled" do
@@ -46,17 +53,12 @@ class TestRedcarpet < JekyllUnitTest
       end
 
       should "render fenced code blocks with syntax highlighting" do
-        assert_equal \
-          "
    puts "Hello world"\n
    ",
-          @markdown.convert(
-            <<-EOS
-```ruby
-puts "Hello world"
-```
-EOS
-          ).strip
+        assert_equal(
+          %(
    puts "Hello world"\n
    ),
+          @markdown.convert(@sample).strip
+        )
       end
     end
 
@@ -66,16 +68,12 @@ class TestRedcarpet < JekyllUnitTest
       end
 
       should "render fenced code blocks with syntax highlighting" do
-        assert_equal "
    puts \"Hello world\"\n
    ",
-                     @markdown.convert(
-                       <<-EOS
-```ruby
-puts "Hello world"
-```
-          EOS
-                     ).strip
+        assert_equal(
+          %(
    puts "Hello world"\n
    ),
+          @markdown.convert(@sample).strip
+        )
       end
     end
 
@@ -85,16 +83,11 @@ class TestRedcarpet < JekyllUnitTest
       end
 
       should "render fenced code blocks without syntax highlighting" do
-        assert_equal "
    puts "Hello world"\n
    "\
-                     "
    ",
-                     @markdown.convert(
-                       <<-EOS
-```ruby
-puts "Hello world"
-```
-          EOS
-                     ).strip
+        assert_equal(
+          %(
    puts "Hello world"\n
    ),
+          @markdown.convert(@sample).strip
+        )
       end
     end
   end

From e3b8ba33da2666dc28a77c3e14945f5c93859a72 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 29 Nov 2017 08:56:47 -0500
Subject: [PATCH 2644/4996] Update history to reflect merge of #6584 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 49bfec78dda..75ca663c772 100644
--- a/History.markdown
+++ b/History.markdown
@@ -57,6 +57,7 @@
   * Drop forwarding to private methods by exposing those methods as public (#6577)
   * Upgrade pygments to v1.x (#5937)
   * Bump yajl-ruby (#6582)
+  * Cleanup test_redcarpet.rb (#6584)
 
 ### Minor Enhancements
 

From 65f7deca98964f93e51af44253d4e5a27c1949b9 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Thu, 30 Nov 2017 23:46:35 +0530
Subject: [PATCH 2645/4996] Add PageWithoutAFile class from jekyll plugins
 (#6556)

Merge pull request 6556
---
 lib/jekyll.rb                     |   1 +
 lib/jekyll/page_without_a_file.rb |  18 ++++
 test/fixtures/physical.html       |   6 ++
 test/test_page_without_a_file.rb  | 159 ++++++++++++++++++++++++++++++
 4 files changed, 184 insertions(+)
 create mode 100644 lib/jekyll/page_without_a_file.rb
 create mode 100644 test/fixtures/physical.html
 create mode 100644 test/test_page_without_a_file.rb

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 733796cc2af..c909c3d13e4 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -61,6 +61,7 @@ module Jekyll
   autoload :ThemeAssetsReader,   "jekyll/readers/theme_assets_reader"
   autoload :LogAdapter,          "jekyll/log_adapter"
   autoload :Page,                "jekyll/page"
+  autoload :PageWithoutAFile,    "jekyll/page_without_a_file"
   autoload :PluginManager,       "jekyll/plugin_manager"
   autoload :Publisher,           "jekyll/publisher"
   autoload :Reader,              "jekyll/reader"
diff --git a/lib/jekyll/page_without_a_file.rb b/lib/jekyll/page_without_a_file.rb
new file mode 100644
index 00000000000..2d30af51116
--- /dev/null
+++ b/lib/jekyll/page_without_a_file.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Jekyll
+  # A Jekyll::Page subclass to handle processing files without reading it to
+  # determine the page-data and page-content based on Front Matter delimiters.
+  #
+  # The class instance is basically just a bare-bones entity with just
+  # attributes "dir", "name", "path", "url" defined on it.
+  class PageWithoutAFile < Page
+    def read_yaml(*)
+      @data ||= {}
+    end
+
+    def inspect
+      "#"
+    end
+  end
+end
diff --git a/test/fixtures/physical.html b/test/fixtures/physical.html
new file mode 100644
index 00000000000..8913980af32
--- /dev/null
+++ b/test/fixtures/physical.html
@@ -0,0 +1,6 @@
+---
+title: Physical file
+permalink: /physical/
+---
+
+A physical file entity
diff --git a/test/test_page_without_a_file.rb b/test/test_page_without_a_file.rb
new file mode 100644
index 00000000000..b1fa9c04c9a
--- /dev/null
+++ b/test/test_page_without_a_file.rb
@@ -0,0 +1,159 @@
+# frozen_string_literal: true
+
+require "helper"
+
+class TestPageWithoutAFile < JekyllUnitTest
+  def setup_page(*args, base: source_dir, klass: PageWithoutAFile)
+    dir, file = args
+    if file.nil?
+      file = dir
+      dir = ""
+    end
+    klass.new(@site, base, dir, file)
+  end
+
+  def render_and_write
+    @site.render
+    @site.cleanup
+    @site.write
+  end
+
+  context "A PageWithoutAFile" do
+    setup do
+      clear_dest
+      @site = Site.new(Jekyll.configuration({
+        "source"            => source_dir,
+        "destination"       => dest_dir,
+        "skip_config_files" => true,
+      }))
+    end
+
+    context "with default site configuration" do
+      setup do
+        @page = setup_page("properties.html")
+      end
+
+      should "not have page-content and page-data defined within it" do
+        assert_equal "pages", @page.type.to_s
+        assert_nil @page.content
+        assert_empty @page.data
+      end
+
+      should "have basic attributes defined in it" do
+        regular_page = setup_page("properties.html", :klass => Page)
+        basic_attrs = %w(dir name path url)
+        attrs = {
+          "content"   => "All the properties.\n",
+          "dir"       => "/",
+          "excerpt"   => nil,
+          "foo"       => "bar",
+          "layout"    => "default",
+          "name"      => "properties.html",
+          "path"      => "properties.html",
+          "permalink" => "/properties/",
+          "published" => nil,
+          "title"     => "Properties Page",
+          "url"       => "/properties.html",
+        }
+        attrs.each do |prop, value|
+          # assert the props being accessible in a Jekyll::Page instance
+          assert_equal "All the properties.\n", regular_page["content"]
+          assert_equal "properties.html", regular_page["name"]
+
+          # assert differences with Jekyll::PageWithoutAFile instance
+          if basic_attrs.include?(prop)
+            assert_equal @page[prop], value, "For :"
+          else
+            assert_nil @page[prop]
+          end
+        end
+      end
+    end
+
+    context "with site-wide permalink configuration" do
+      setup do
+        @site.permalink_style = :title
+      end
+
+      should "generate page url accordingly" do
+        page = setup_page("properties.html")
+        assert_equal "/properties", page.url
+      end
+    end
+
+    context "with default front matter configuration" do
+      setup do
+        @site.config["defaults"] = [
+          {
+            "scope"  => {
+              "path" => "",
+              "type" => "pages",
+            },
+            "values" => {
+              "layout" => "default",
+              "author" => "John Doe",
+            },
+          },
+        ]
+
+        @page = setup_page("info.md")
+      end
+
+      should "respect front matter defaults" do
+        assert_nil @page.data["title"]
+        assert_equal "John Doe", @page.data["author"]
+        assert_equal "default", @page.data["layout"]
+      end
+    end
+
+    context "with a path outside site.source" do
+      should "not access its contents" do
+        base = "../../../"
+        page = setup_page("pwd", :base => base)
+
+        assert_equal "pwd", page.path
+        assert_nil page.content
+      end
+    end
+
+    context "while processing" do
+      setup do
+        clear_dest
+        @site.config["title"] = "Test Site"
+        @page = setup_page("physical.html", :base => test_dir("fixtures"))
+      end
+
+      should "recieve content provided to it" do
+        assert_nil @page.content
+
+        @page.content = "{{ site.title }}"
+        assert_equal "{{ site.title }}", @page.content
+      end
+
+      should "not be processed and written to disk at destination" do
+        @page.content = "Lorem ipsum dolor sit amet"
+        @page.data["permalink"] = "/virtual-about/"
+
+        render_and_write
+
+        refute_exist dest_dir("physical")
+        refute_exist dest_dir("virtual-about")
+        refute File.exist?(dest_dir("virtual-about", "index.html"))
+      end
+
+      should "be processed and written to destination when passed as "\
+        "an entry in 'site.pages' array" do
+        @page.content = "{{ site.title }}"
+        @page.data["permalink"] = "/virtual-about/"
+
+        @site.pages << @page
+        render_and_write
+
+        refute_exist dest_dir("physical")
+        assert_exist dest_dir("virtual-about")
+        assert File.exist?(dest_dir("virtual-about", "index.html"))
+        assert_equal "Test Site", File.read(dest_dir("virtual-about", "index.html"))
+      end
+    end
+  end
+end

From 7826bfe552d2e2209b4d3bbd909170b687fb9704 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 13 Nov 2017 16:43:27 +0530
Subject: [PATCH 2646/4996] last released version is at 3.6.2

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

diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 6e0c1cf6ca6..8f0106064ce 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".freeze
+  VERSION = "3.6.2".freeze
 end

From 0c4b12e6aaffe3416b0bd066001e7cc3a8e8b804 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 30 Nov 2017 12:16:37 -0600
Subject: [PATCH 2647/4996] Update history to reflect merge of #6556 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 75ca663c772..fcd419fb053 100644
--- a/History.markdown
+++ b/History.markdown
@@ -58,6 +58,7 @@
   * Upgrade pygments to v1.x (#5937)
   * Bump yajl-ruby (#6582)
   * Cleanup test_redcarpet.rb (#6584)
+  * Add PageWithoutAFile class from jekyll plugins (#6556)
 
 ### Minor Enhancements
 

From 2fe54170b4b12eba92cc85229ea2d2cae6aa5e99 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 3 Dec 2017 01:51:07 +0100
Subject: [PATCH 2648/4996] Dependency: Bump jekyll-watch to 2.0 (#6589)

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

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 98fd53824f4..90ad0ceb846 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   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("jekyll-watch",          "~> 2.0")
   s.add_runtime_dependency("kramdown",              "~> 1.14")
   s.add_runtime_dependency("liquid",                "~> 4.0")
   s.add_runtime_dependency("mercenary",             "~> 0.3.3")

From 760d586de21982cc7df62e61d259950da9e861e7 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 2 Dec 2017 18:51:09 -0600
Subject: [PATCH 2649/4996] Update history to reflect merge of #6589 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fcd419fb053..54bd43db93d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -74,6 +74,7 @@
   * Add latin mode to slugify (#6509)
   * Log Kramdown warnings if log level is WARN (#6522)
   * Add json extension to list of directory indices (#6550)
+  * Dependency: Bump jekyll-watch to 2.0 (#6589)
 
 ### Site Enhancements
 

From cdb031084c7deddd518b1dfaddccbbf8fd8c12bf Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 3 Dec 2017 19:38:34 +0100
Subject: [PATCH 2650/4996] Docs: Avoid Kramdown warnings

---
 docs/_docs/history.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 85e493616af..a7308287028 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -153,7 +153,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - added BibSonomy plugin ([#6143]({{ site.repository }}/issues/6143))
 - add plugins for multiple page pagination ([#6055]({{ site.repository }}/issues/6055))
 - Update minimum Ruby version in installation.md ([#6164]({{ site.repository }}/issues/6164))
-- [docs] Add information about finding a collection in `site.collections` ([#6165]({{ site.repository }}/issues/6165))
+- Add information about finding a collection in `site.collections` ([#6165]({{ site.repository }}/issues/6165))
 - Add {% raw %}`{% raw %}`{% endraw %} to Liquid example on site ([#6179]({{ site.repository }}/issues/6179))
 - Added improved Pug plugin - removed 404 Jade plugin ([#6174]({{ site.repository }}/issues/6174))
 - Linking the link ([#6210]({{ site.repository }}/issues/6210))
@@ -263,7 +263,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Development Fixes
 {: #development-fixes-v3-5-0}
 
-- [Rubocop] add missing comma ([#5835]({{ site.repository }}/issues/5835))
+- Rubocop: add missing comma ([#5835]({{ site.repository }}/issues/5835))
 - Appease classifier-reborn ([#5934]({{ site.repository }}/issues/5934))
 - Allow releases & development on `*-stable` branches ([#5926]({{ site.repository }}/issues/5926))
 - Add script/backport-pr ([#5925]({{ site.repository }}/issues/5925))
@@ -302,7 +302,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 {: #bug-fixes-v3-5-0}
 
 - Exclude Gemfile by default ([#5860]({{ site.repository }}/issues/5860))
-- Convertible#validate_permalink!: ensure the return value of data["permalink"] is a string before asking if it is empty ([#5878]({{ site.repository }}/issues/5878))
+- Convertible#validate_permalink!: ensure the return value of `data["permalink"]` is a string before asking if it is empty ([#5878]({{ site.repository }}/issues/5878))
 - Allow abbreviated post dates ([#5920]({{ site.repository }}/issues/5920))
 - Remove dependency on include from default about.md ([#5903]({{ site.repository }}/issues/5903))
 - Allow colons in `uri_escape` filter ([#5957]({{ site.repository }}/issues/5957))
@@ -378,7 +378,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Switch to `https` when possible. ([#5611]({{ site.repository }}/issues/5611))
 - Update `_font-awesome.scss` to move .woff file before .ttf ([#5614]({{ site.repository }}/issues/5614))
 - Update documentation on updating FontAwesome Iconset ([#5655]({{ site.repository }}/issues/5655))
-- [site] Use defaults for docs and news-items ([#5744]({{ site.repository }}/issues/5744))
+- Use defaults for docs and news-items ([#5744]({{ site.repository }}/issues/5744))
 - Sort gems in `docs/_config.yml` ([#5746]({{ site.repository }}/issues/5746))
 - Add missing class ([#5791]({{ site.repository }}/issues/5791))
 - Improve template docs ([#5694]({{ site.repository }}/issues/5694))
@@ -440,7 +440,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Update quickstart.md ([#5758]({{ site.repository }}/issues/5758))
 - Correct minor typo ([#5764]({{ site.repository }}/issues/5764))
 - Fix a markdown link to look properly on the web ([#5769]({{ site.repository }}/issues/5769))
-- [docs] Info about the help command usage ([#5312]({{ site.repository }}/issues/5312))
+- Info about the help command usage ([#5312]({{ site.repository }}/issues/5312))
 - Add missing merge labels for jekyllbot ([#5753]({{ site.repository }}/issues/5753))
 - Fix broken links in documentation ([#5736]({{ site.repository }}/issues/5736))
 - Docs: add `match_regex` and `replace_regex` filters ([#5799]({{ site.repository }}/issues/5799))
@@ -583,10 +583,10 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Site: exclude README.md and .gitignore ([#5304]({{ site.repository }}/issues/5304))
 - Add link to Staticman ([#5224]({{ site.repository }}/issues/5224))
 - Update url for OpenShift ([#5320]({{ site.repository }}/issues/5320))
-- [docs] add help for missing static_file e.g. on heroku ([#5334]({{ site.repository }}/issues/5334))
+- Add help for missing static_file e.g. on heroku ([#5334]({{ site.repository }}/issues/5334))
 - Add a line about updating theme-gems in the docs ([#5318]({{ site.repository }}/issues/5318))
 - Explain how to copy a theme's files ([#5335]({{ site.repository }}/issues/5335))
-- [docs] .md as default extension in examples ([#5316]({{ site.repository }}/issues/5316))
+- .md as default extension in examples ([#5316]({{ site.repository }}/issues/5316))
 - Fix small typo in docs ([#5347]({{ site.repository }}/issues/5347))
 - Add missing period to sentence in first paragraph. ([#5372]({{ site.repository }}/issues/5372))
 - added jekyll-spotify plugin ([#5369]({{ site.repository }}/issues/5369))
@@ -595,7 +595,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Add documentation for `relative_url` and `absolute_url` ([#5405]({{ site.repository }}/issues/5405))
 - Bugfix on logo in JSON-LD ([#5421]({{ site.repository }}/issues/5421))
 - Fix Travis.ci documentation ([#5413]({{ site.repository }}/issues/5413))
-- [docs] Update documentation regarding `bundle install` after `jekyll new` ([#5428]({{ site.repository }}/issues/5428))
+- Update documentation regarding `bundle install` after `jekyll new` ([#5428]({{ site.repository }}/issues/5428))
 - Replace classic box-sizing reset with inheritance reset ([#5411]({{ site.repository }}/issues/5411))
 - Update Wikipedia YAML list link ([#5452]({{ site.repository }}/issues/5452))
 - Add Jekyll 3.3 release post ([#5442]({{ site.repository }}/issues/5442))
@@ -929,7 +929,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Fix broken links to the Code of Conduct ([#4436]({{ site.repository }}/issues/4436))
 - Upgrade notes: mention trailing slash in permalink; fixes [#4440]({{ site.repository }}/issues/4440) ([#4455]({{ site.repository }}/issues/4455))
 - Add hooks to the plugin categories toc ([#4463]({{ site.repository }}/issues/4463))
-- [add note] Jekyll 3 requires newer version of Ruby. ([#4461]({{ site.repository }}/issues/4461))
+- Jekyll 3 requires newer version of Ruby. ([#4461]({{ site.repository }}/issues/4461))
 - Fix typo in upgrading docs ([#4473]({{ site.repository }}/issues/4473))
 - Add note about upgrading documentation on jekyllrb.com/help/ ([#4484]({{ site.repository }}/issues/4484))
 - Update Rake link ([#4496]({{ site.repository }}/issues/4496))
@@ -1005,7 +1005,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Fix deep_merge_hashes! handling of drops and hashes ([#4359]({{ site.repository }}/issues/4359))
 - Page should respect output extension of its permalink ([#4373]({{ site.repository }}/issues/4373))
 - Disable auto-regeneration when running server detached ([#4376]({{ site.repository }}/issues/4376))
-- Drop#[]: only use public_send for keys in the content_methods array ([#4388]({{ site.repository }}/issues/4388))
+- Drop#: only use public_send for keys in the content_methods array ([#4388]({{ site.repository }}/issues/4388))
 - Extract title from filename successfully when no date. ([#4195]({{ site.repository }}/issues/4195))
 
 ### Development Fixes

From 75ba9366df98d7743334b0ee9969b84b132fc9d3 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 3 Dec 2017 19:39:02 +0100
Subject: [PATCH 2651/4996] Docs: Build for production

---
 docs/_docs/usage.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/_docs/usage.md b/docs/_docs/usage.md
index dc273b29e90..d4dffa01099 100644
--- a/docs/_docs/usage.md
+++ b/docs/_docs/usage.md
@@ -21,6 +21,13 @@ jekyll build --watch
 #    watched for changes, and regenerated automatically.
 ```
 
+Default URL is set to `http://localhost:4000` in development environment. {% include docs_version_badge.html version="3.3.0" %} 
+
+If you want to build for your production environment:
+
+  - Set your production URL in `_config.yml` e.g. `url: https://example.com`.
+  - Run `JEKYLL_ENV=production bundle exec jekyll build`.
+
 
    
   
    Changes to _config.yml are not included during automatic regeneration.
    
   
    

From e8c8eacf7bf24fa5cacc4e434aa15774c3a728a0 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 3 Dec 2017 19:40:10 +0100
Subject: [PATCH 2652/4996] Dev: Run preview in incremental mode

---
 rake/site.rake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rake/site.rake b/rake/site.rake
index 10d48c52651..d260e4472be 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -27,6 +27,8 @@ namespace :site do
     options = {
       "source"      => File.expand_path(docs_folder),
       "destination" => File.expand_path("#{docs_folder}/_site"),
+      "incremental" => true,
+      "profile"     => true,
       "watch"       => true,
       "serving"     => true,
     }

From e3142e4c5a9b3a1001513f5970b482c23a1f80c0 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 3 Dec 2017 19:52:37 +0100
Subject: [PATCH 2653/4996] Docs: Add title and anchor

---
 docs/_docs/usage.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/usage.md b/docs/_docs/usage.md
index d4dffa01099..a4201c1e1d3 100644
--- a/docs/_docs/usage.md
+++ b/docs/_docs/usage.md
@@ -21,7 +21,9 @@ jekyll build --watch
 #    watched for changes, and regenerated automatically.
 ```
 
-Default URL is set to `http://localhost:4000` in development environment. {% include docs_version_badge.html version="3.3.0" %} 
+## Override default development settings
+
+Default URL is set to `http://localhost:4000` in development environment. {% include docs_version_badge.html version="3.3.0" %}
 
 If you want to build for your production environment:
 

From 50ff219ba2aa4c9c8b267d231eed3813997fdd6d Mon Sep 17 00:00:00 2001
From: Alex Wood 
Date: Wed, 6 Dec 2017 16:33:51 -0500
Subject: [PATCH 2654/4996] Add LiveReload functionality to Jekyll. (#5142)

Merge pull request 5142
---
 Gemfile                                       |    1 +
 jekyll.gemspec                                |    1 +
 lib/jekyll/commands/serve.rb                  |  179 ++-
 .../commands/serve/live_reload_reactor.rb     |  153 +++
 .../serve/livereload_assets/livereload.js     | 1183 +++++++++++++++++
 lib/jekyll/commands/serve/servlet.rb          |  137 ++
 lib/jekyll/commands/serve/websockets.rb       |   80 ++
 lib/jekyll/utils.rb                           |    1 +
 lib/jekyll/utils/thread_event.rb              |   35 +
 test/test_commands_serve.rb                   |  125 ++
 10 files changed, 1875 insertions(+), 20 deletions(-)
 create mode 100644 lib/jekyll/commands/serve/live_reload_reactor.rb
 create mode 100644 lib/jekyll/commands/serve/livereload_assets/livereload.js
 create mode 100644 lib/jekyll/commands/serve/websockets.rb
 create mode 100644 lib/jekyll/utils/thread_event.rb

diff --git a/Gemfile b/Gemfile
index 68bc28c24a5..f7000acb61a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,6 +24,7 @@ end
 group :test do
   gem "codeclimate-test-reporter", "~> 1.0.5"
   gem "cucumber", RUBY_VERSION >= "2.2" ? "~> 3.0" : "3.0.1"
+  gem "httpclient"
   gem "jekyll_test_plugin"
   gem "jekyll_test_plugin_malicious"
   # nokogiri v1.8 does not work with ruby 2.1 and below
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 90ad0ceb846..b434881cace 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("em-websocket",          "~> 0.5")
   s.add_runtime_dependency("i18n",                  "~> 0.7")
   s.add_runtime_dependency("jekyll-sass-converter", "~> 1.0")
   s.add_runtime_dependency("jekyll-watch",          "~> 2.0")
diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 9861d2c68d7..50438b5f7d5 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -1,20 +1,43 @@
 # frozen_string_literal: true
 
+require "thread"
+
 module Jekyll
   module Commands
     class Serve < Command
+      # Similar to the pattern in Utils::ThreadEvent except we are maintaining the
+      # state of @running instead of just signaling an event.  We have to maintain this
+      # state since Serve is just called via class methods instead of an instance
+      # being created each time.
+      @mutex = Mutex.new
+      @run_cond = ConditionVariable.new
+      @running = false
+
       class << self
         COMMAND_OPTIONS = {
-          "ssl_cert"           => ["--ssl-cert [CERT]", "X.509 (SSL) certificate."],
-          "host"               => ["host", "-H", "--host [HOST]", "Host to bind to"],
-          "open_url"           => ["-o", "--open-url", "Launch your site in a browser"],
-          "detach"             => ["-B", "--detach", "Run the server in the background"],
-          "ssl_key"            => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."],
-          "port"               => ["-P", "--port [PORT]", "Port to listen on"],
-          "show_dir_listing"   => ["--show-dir-listing",
+          "ssl_cert"             => ["--ssl-cert [CERT]", "X.509 (SSL) certificate."],
+          "host"                 => ["host", "-H", "--host [HOST]", "Host to bind to"],
+          "open_url"             => ["-o", "--open-url", "Launch your site in a browser"],
+          "detach"               => ["-B", "--detach",
+            "Run the server in the background",],
+          "ssl_key"              => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."],
+          "port"                 => ["-P", "--port [PORT]", "Port to listen on"],
+          "show_dir_listing"     => ["--show-dir-listing",
             "Show a directory listing instead of loading your index file.",],
-          "skip_initial_build" => ["skip_initial_build", "--skip-initial-build",
+          "skip_initial_build"   => ["skip_initial_build", "--skip-initial-build",
             "Skips the initial site build which occurs before the server is started.",],
+          "livereload"           => ["-l", "--livereload",
+            "Use LiveReload to automatically refresh browsers",],
+          "livereload_ignore"    => ["--livereload-ignore ignore GLOB1[,GLOB2[,...]]",
+            Array,
+            "Files for LiveReload to ignore. Remember to quote the values so your shell "\
+            "won't expand them",],
+          "livereload_min_delay" => ["--livereload-min-delay [SECONDS]",
+            "Minimum reload delay",],
+          "livereload_max_delay" => ["--livereload-max-delay [SECONDS]",
+            "Maximum reload delay",],
+          "livereload_port"      => ["--livereload-port [PORT]", Integer,
+            "Port for LiveReload to listen on",],
         }.freeze
 
         DIRECTORY_INDEX = %w(
@@ -26,7 +49,11 @@ class << self
           index.json
         ).freeze
 
-        #
+        LIVERELOAD_PORT = 35_729
+        LIVERELOAD_DIR = File.join(__dir__, "serve", "livereload_assets")
+
+        attr_reader :mutex, :run_cond, :running
+        alias_method :running?, :running
 
         def init_with_program(prog)
           prog.command(:serve) do |cmd|
@@ -41,20 +68,34 @@ def init_with_program(prog)
             end
 
             cmd.action do |_, opts|
+              opts["livereload_port"] ||= LIVERELOAD_PORT
               opts["serving"] = true
               opts["watch"  ] = true unless opts.key?("watch")
 
-              config = configuration_from_options(opts)
-              if Jekyll.env == "development"
-                config["url"] = default_url(config)
-              end
-              [Build, Serve].each { |klass| klass.process(config) }
+              start(opts)
             end
           end
         end
 
         #
 
+        def start(opts)
+          # Set the reactor to nil so any old reactor will be GCed.
+          # We can't unregister a hook so in testing when Serve.start is
+          # called multiple times we don't want to inadvertently keep using
+          # a reactor created by a previous test when our test might not
+          @reload_reactor = nil
+
+          register_reload_hooks(opts) if opts["livereload"]
+          config = configuration_from_options(opts)
+          if Jekyll.env == "development"
+            config["url"] = default_url(config)
+          end
+          [Build, Serve].each { |klass| klass.process(config) }
+        end
+
+        #
+
         def process(opts)
           opts = configuration_from_options(opts)
           destination = opts["destination"]
@@ -63,6 +104,76 @@ def process(opts)
           start_up_webrick(opts, destination)
         end
 
+        def shutdown
+          @server.shutdown if running?
+        end
+
+        # Perform logical validation of CLI options
+
+        private
+        def validate_options(opts)
+          if opts["livereload"]
+            if opts["detach"]
+              Jekyll.logger.warn "Warning:",
+                "--detach and --livereload are mutually exclusive. Choosing --livereload"
+              opts["detach"] = false
+            end
+            if opts["ssl_cert"] || opts["ssl_key"]
+              # This is not technically true.  LiveReload works fine over SSL, but
+              # EventMachine's SSL support in Windows requires building the gem's
+              # native extensions against OpenSSL and that proved to be a process
+              # so tedious that expecting users to do it is a non-starter.
+              Jekyll.logger.abort_with "Error:", "LiveReload does not support SSL"
+            end
+            unless opts["watch"]
+              # Using livereload logically implies you want to watch the files
+              opts["watch"] = true
+            end
+          elsif %w(livereload_min_delay
+              livereload_max_delay
+              livereload_ignore
+              livereload_port).any? { |o| opts[o] }
+            Jekyll.logger.abort_with "--livereload-min-delay, "\
+               "--livereload-max-delay, --livereload-ignore, and "\
+               "--livereload-port require the --livereload option."
+          end
+        end
+
+        #
+
+        private
+        # rubocop:disable Metrics/AbcSize
+        def register_reload_hooks(opts)
+          require_relative "serve/live_reload_reactor"
+          @reload_reactor = LiveReloadReactor.new
+
+          Jekyll::Hooks.register(:site, :post_render) do |site|
+            regenerator = Jekyll::Regenerator.new(site)
+            @changed_pages = site.pages.select do |p|
+              regenerator.regenerate?(p)
+            end
+          end
+
+          # A note on ignoring files: LiveReload errs on the side of reloading when it
+          # comes to the message it gets.  If, for example, a page is ignored but a CSS
+          # file linked in the page isn't, the page will still be reloaded if the CSS
+          # file is contained in the message sent to LiveReload.  Additionally, the
+          # path matching is very loose so that a message to reload "/" will always
+          # lead the page to reload since every page starts with "/".
+          Jekyll::Hooks.register(:site, :post_write) do
+            if @changed_pages && @reload_reactor && @reload_reactor.running?
+              ignore, @changed_pages = @changed_pages.partition do |p|
+                Array(opts["livereload_ignore"]).any? do |filter|
+                  File.fnmatch(filter, Jekyll.sanitized_path(p.relative_path))
+                end
+              end
+              Jekyll.logger.debug "LiveReload:", "Ignoring #{ignore.map(&:relative_path)}"
+              @reload_reactor.reload(@changed_pages)
+            end
+            @changed_pages = nil
+          end
+        end
+
         # Do a base pre-setup of WEBRick so that everything is in place
         # when we get ready to party, checking for an setting up an error page
         # and making sure our destination exists.
@@ -92,6 +203,7 @@ def webrick_opts(opts)
             :MimeTypes          => mime_types,
             :DocumentRoot       => opts["destination"],
             :StartCallback      => start_callback(opts["detach"]),
+            :StopCallback       => stop_callback(opts["detach"]),
             :BindAddress        => opts["host"],
             :Port               => opts["port"],
             :DirectoryIndex     => DIRECTORY_INDEX,
@@ -108,11 +220,16 @@ def webrick_opts(opts)
 
         private
         def start_up_webrick(opts, destination)
-          server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
-          server.mount(opts["baseurl"].to_s, Servlet, destination, file_handler_opts)
-          Jekyll.logger.info "Server address:", server_address(server, opts)
-          launch_browser server, opts if opts["open_url"]
-          boot_or_detach server, opts
+          if opts["livereload"]
+            @reload_reactor.start(opts)
+          end
+
+          @server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
+          @server.mount(opts["baseurl"].to_s, Servlet, destination, file_handler_opts)
+
+          Jekyll.logger.info "Server address:", server_address(@server, opts)
+          launch_browser @server, opts if opts["open_url"]
+          boot_or_detach @server, opts
         end
 
         # Recreate NondisclosureName under utf-8 circumstance
@@ -227,7 +344,29 @@ def enable_ssl(opts)
         def start_callback(detached)
           unless detached
             proc do
-              Jekyll.logger.info("Server running...", "press ctrl-c to stop.")
+              mutex.synchronize do
+                # Block until EventMachine reactor starts
+                @reload_reactor.started_event.wait unless @reload_reactor.nil?
+                @running = true
+                Jekyll.logger.info("Server running...", "press ctrl-c to stop.")
+                @run_cond.broadcast
+              end
+            end
+          end
+        end
+
+        private
+        def stop_callback(detached)
+          unless detached
+            proc do
+              mutex.synchronize do
+                unless @reload_reactor.nil?
+                  @reload_reactor.stop
+                  @reload_reactor.stopped_event.wait
+                end
+                @running = false
+                @run_cond.broadcast
+              end
             end
           end
         end
diff --git a/lib/jekyll/commands/serve/live_reload_reactor.rb b/lib/jekyll/commands/serve/live_reload_reactor.rb
new file mode 100644
index 00000000000..498e78aeee4
--- /dev/null
+++ b/lib/jekyll/commands/serve/live_reload_reactor.rb
@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+require "json"
+require "em-websocket"
+
+require_relative "websockets"
+
+module Jekyll
+  module Commands
+    class Serve
+      class LiveReloadReactor
+        attr_reader :started_event
+        attr_reader :stopped_event
+        attr_reader :thread
+
+        def initialize
+          @thread = nil
+          @websockets = []
+          @connections_count = 0
+          @started_event = Utils::ThreadEvent.new
+          @stopped_event = Utils::ThreadEvent.new
+        end
+
+        def stop
+          # There is only one EventMachine instance per Ruby process so stopping
+          # it here will stop the reactor thread we have running.
+          EM.stop if EM.reactor_running?
+          Jekyll.logger.debug("LiveReload Server:", "halted")
+        end
+
+        def running?
+          EM.reactor_running?
+        end
+
+        def handle_websockets_event(ws)
+          ws.onopen do |handshake|
+            connect(ws, handshake)
+          end
+
+          ws.onclose do
+            disconnect(ws)
+          end
+
+          ws.onmessage do |msg|
+            print_message(msg)
+          end
+
+          ws.onerror do |error|
+            log_error(error)
+          end
+        end
+
+        # rubocop:disable Metrics/MethodLength
+        def start(opts)
+          @thread = Thread.new do
+            # Use epoll if the kernel supports it
+            EM.epoll
+            EM.run do
+              EM.error_handler do |e|
+                log_error(e)
+              end
+
+              EM.start_server(
+                opts["host"],
+                opts["livereload_port"],
+                HttpAwareConnection,
+                opts
+              ) do |ws|
+                handle_websockets_event(ws)
+              end
+
+              # Notify blocked threads that EventMachine has started or shutdown
+              EM.schedule do
+                @started_event.set
+              end
+
+              EM.add_shutdown_hook do
+                @stopped_event.set
+              end
+
+              Jekyll.logger.info(
+                "LiveReload address:", "#{opts["host"]}:#{opts["livereload_port"]}"
+              )
+            end
+          end
+          @thread.abort_on_exception = true
+        end
+
+        # For a description of the protocol see
+        # http://feedback.livereload.com/knowledgebase/articles/86174-livereload-protocol
+        def reload(pages)
+          pages.each do |p|
+            msg = {
+              :command => "reload",
+              :path    => p.url,
+              :liveCSS => true,
+            }
+
+            Jekyll.logger.debug("LiveReload:", "Reloading #{p.url}")
+            Jekyll.logger.debug(JSON.dump(msg))
+            @websockets.each do |ws|
+              ws.send(JSON.dump(msg))
+            end
+          end
+        end
+
+        private
+        def connect(ws, handshake)
+          @connections_count += 1
+          if @connections_count == 1
+            message = "Browser connected"
+            message += " over SSL/TLS" if handshake.secure?
+            Jekyll.logger.info("LiveReload:", message)
+          end
+          ws.send(
+            JSON.dump(
+              :command    => "hello",
+              :protocols  => ["http://livereload.com/protocols/official-7"],
+              :serverName => "jekyll"
+            )
+          )
+
+          @websockets << ws
+        end
+
+        private
+        def disconnect(ws)
+          @websockets.delete(ws)
+        end
+
+        private
+        def print_message(json_message)
+          msg = JSON.parse(json_message)
+          # Not sure what the 'url' command even does in LiveReload.  The spec is silent
+          # on its purpose.
+          if msg["command"] == "url"
+            Jekyll.logger.info("LiveReload:", "Browser URL: #{msg["url"]}")
+          end
+        end
+
+        private
+        def log_error(e)
+          Jekyll.logger.warn(
+            "LiveReload experienced an error. "\
+            "Run with --verbose for more information."
+          )
+          Jekyll.logger.debug("LiveReload Error:", e.message)
+          Jekyll.logger.debug("LiveReload Error:", e.backtrace.join("\n"))
+        end
+      end
+    end
+  end
+end
diff --git a/lib/jekyll/commands/serve/livereload_assets/livereload.js b/lib/jekyll/commands/serve/livereload_assets/livereload.js
new file mode 100644
index 00000000000..eee60ec8b1d
--- /dev/null
+++ b/lib/jekyll/commands/serve/livereload_assets/livereload.js
@@ -0,0 +1,1183 @@
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o tag");
+          return;
+        }
+      }
+      this.reloader = new Reloader(this.window, this.console, Timer);
+      this.connector = new Connector(this.options, this.WebSocket, Timer, {
+        connecting: (function(_this) {
+          return function() {};
+        })(this),
+        socketConnected: (function(_this) {
+          return function() {};
+        })(this),
+        connected: (function(_this) {
+          return function(protocol) {
+            var _base;
+            if (typeof (_base = _this.listeners).connect === "function") {
+              _base.connect();
+            }
+            _this.log("LiveReload is connected to " + _this.options.host + ":" + _this.options.port + " (protocol v" + protocol + ").");
+            return _this.analyze();
+          };
+        })(this),
+        error: (function(_this) {
+          return function(e) {
+            if (e instanceof ProtocolError) {
+              if (typeof console !== "undefined" && console !== null) {
+                return console.log("" + e.message + ".");
+              }
+            } else {
+              if (typeof console !== "undefined" && console !== null) {
+                return console.log("LiveReload internal error: " + e.message);
+              }
+            }
+          };
+        })(this),
+        disconnected: (function(_this) {
+          return function(reason, nextDelay) {
+            var _base;
+            if (typeof (_base = _this.listeners).disconnect === "function") {
+              _base.disconnect();
+            }
+            switch (reason) {
+              case 'cannot-connect':
+                return _this.log("LiveReload cannot connect to " + _this.options.host + ":" + _this.options.port + ", will retry in " + nextDelay + " sec.");
+              case 'broken':
+                return _this.log("LiveReload disconnected from " + _this.options.host + ":" + _this.options.port + ", reconnecting in " + nextDelay + " sec.");
+              case 'handshake-timeout':
+                return _this.log("LiveReload cannot connect to " + _this.options.host + ":" + _this.options.port + " (handshake timeout), will retry in " + nextDelay + " sec.");
+              case 'handshake-failed':
+                return _this.log("LiveReload cannot connect to " + _this.options.host + ":" + _this.options.port + " (handshake failed), will retry in " + nextDelay + " sec.");
+              case 'manual':
+                break;
+              case 'error':
+                break;
+              default:
+                return _this.log("LiveReload disconnected from " + _this.options.host + ":" + _this.options.port + " (" + reason + "), reconnecting in " + nextDelay + " sec.");
+            }
+          };
+        })(this),
+        message: (function(_this) {
+          return function(message) {
+            switch (message.command) {
+              case 'reload':
+                return _this.performReload(message);
+              case 'alert':
+                return _this.performAlert(message);
+            }
+          };
+        })(this)
+      });
+      this.initialized = true;
+    }
+
+    LiveReload.prototype.on = function(eventName, handler) {
+      return this.listeners[eventName] = handler;
+    };
+
+    LiveReload.prototype.log = function(message) {
+      return this.console.log("" + message);
+    };
+
+    LiveReload.prototype.performReload = function(message) {
+      var _ref, _ref1;
+      this.log("LiveReload received reload request: " + (JSON.stringify(message, null, 2)));
+      return this.reloader.reload(message.path, {
+        liveCSS: (_ref = message.liveCSS) != null ? _ref : true,
+        liveImg: (_ref1 = message.liveImg) != null ? _ref1 : true,
+        originalPath: message.originalPath || '',
+        overrideURL: message.overrideURL || '',
+        serverURL: "http://" + this.options.host + ":" + this.options.port
+      });
+    };
+
+    LiveReload.prototype.performAlert = function(message) {
+      return alert(message.message);
+    };
+
+    LiveReload.prototype.shutDown = function() {
+      var _base;
+      if (!this.initialized) {
+        return;
+      }
+      this.connector.disconnect();
+      this.log("LiveReload disconnected.");
+      return typeof (_base = this.listeners).shutdown === "function" ? _base.shutdown() : void 0;
+    };
+
+    LiveReload.prototype.hasPlugin = function(identifier) {
+      return !!this.pluginIdentifiers[identifier];
+    };
+
+    LiveReload.prototype.addPlugin = function(pluginClass) {
+      var plugin;
+      if (!this.initialized) {
+        return;
+      }
+      if (this.hasPlugin(pluginClass.identifier)) {
+        return;
+      }
+      this.pluginIdentifiers[pluginClass.identifier] = true;
+      plugin = new pluginClass(this.window, {
+        _livereload: this,
+        _reloader: this.reloader,
+        _connector: this.connector,
+        console: this.console,
+        Timer: Timer,
+        generateCacheBustUrl: (function(_this) {
+          return function(url) {
+            return _this.reloader.generateCacheBustUrl(url);
+          };
+        })(this)
+      });
+      this.plugins.push(plugin);
+      this.reloader.addPlugin(plugin);
+    };
+
+    LiveReload.prototype.analyze = function() {
+      var plugin, pluginData, pluginsData, _i, _len, _ref;
+      if (!this.initialized) {
+        return;
+      }
+      if (!(this.connector.protocol >= 7)) {
+        return;
+      }
+      pluginsData = {};
+      _ref = this.plugins;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        plugin = _ref[_i];
+        pluginsData[plugin.constructor.identifier] = pluginData = (typeof plugin.analyze === "function" ? plugin.analyze() : void 0) || {};
+        pluginData.version = plugin.constructor.version;
+      }
+      this.connector.sendCommand({
+        command: 'info',
+        plugins: pluginsData,
+        url: this.window.location.href
+      });
+    };
+
+    return LiveReload;
+
+  })();
+
+}).call(this);
+
+},{"./connector":1,"./options":5,"./reloader":7,"./timer":9}],5:[function(require,module,exports){
+(function() {
+  var Options;
+
+  exports.Options = Options = (function() {
+    function Options() {
+      this.https = false;
+      this.host = null;
+      this.port = 35729;
+      this.snipver = null;
+      this.ext = null;
+      this.extver = null;
+      this.mindelay = 1000;
+      this.maxdelay = 60000;
+      this.handshake_timeout = 5000;
+    }
+
+    Options.prototype.set = function(name, value) {
+      if (typeof value === 'undefined') {
+        return;
+      }
+      if (!isNaN(+value)) {
+        value = +value;
+      }
+      return this[name] = value;
+    };
+
+    return Options;
+
+  })();
+
+  Options.extract = function(document) {
+    var element, keyAndValue, m, mm, options, pair, src, _i, _j, _len, _len1, _ref, _ref1;
+    _ref = document.getElementsByTagName('script');
+    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+      element = _ref[_i];
+      if ((src = element.src) && (m = src.match(/^[^:]+:\/\/(.*)\/z?livereload\.js(?:\?(.*))?$/))) {
+        options = new Options();
+        options.https = src.indexOf("https") === 0;
+        if (mm = m[1].match(/^([^\/:]+)(?::(\d+))?$/)) {
+          options.host = mm[1];
+          if (mm[2]) {
+            options.port = parseInt(mm[2], 10);
+          }
+        }
+        if (m[2]) {
+          _ref1 = m[2].split('&');
+          for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+            pair = _ref1[_j];
+            if ((keyAndValue = pair.split('=')).length > 1) {
+              options.set(keyAndValue[0].replace(/-/g, '_'), keyAndValue.slice(1).join('='));
+            }
+          }
+        }
+        return options;
+      }
+    }
+    return null;
+  };
+
+}).call(this);
+
+},{}],6:[function(require,module,exports){
+(function() {
+  var PROTOCOL_6, PROTOCOL_7, Parser, ProtocolError,
+    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+
+  exports.PROTOCOL_6 = PROTOCOL_6 = 'http://livereload.com/protocols/official-6';
+
+  exports.PROTOCOL_7 = PROTOCOL_7 = 'http://livereload.com/protocols/official-7';
+
+  exports.ProtocolError = ProtocolError = (function() {
+    function ProtocolError(reason, data) {
+      this.message = "LiveReload protocol error (" + reason + ") after receiving data: \"" + data + "\".";
+    }
+
+    return ProtocolError;
+
+  })();
+
+  exports.Parser = Parser = (function() {
+    function Parser(handlers) {
+      this.handlers = handlers;
+      this.reset();
+    }
+
+    Parser.prototype.reset = function() {
+      return this.protocol = null;
+    };
+
+    Parser.prototype.process = function(data) {
+      var command, e, message, options, _ref;
+      try {
+        if (this.protocol == null) {
+          if (data.match(/^!!ver:([\d.]+)$/)) {
+            this.protocol = 6;
+          } else if (message = this._parseMessage(data, ['hello'])) {
+            if (!message.protocols.length) {
+              throw new ProtocolError("no protocols specified in handshake message");
+            } else if (__indexOf.call(message.protocols, PROTOCOL_7) >= 0) {
+              this.protocol = 7;
+            } else if (__indexOf.call(message.protocols, PROTOCOL_6) >= 0) {
+              this.protocol = 6;
+            } else {
+              throw new ProtocolError("no supported protocols found");
+            }
+          }
+          return this.handlers.connected(this.protocol);
+        } else if (this.protocol === 6) {
+          message = JSON.parse(data);
+          if (!message.length) {
+            throw new ProtocolError("protocol 6 messages must be arrays");
+          }
+          command = message[0], options = message[1];
+          if (command !== 'refresh') {
+            throw new ProtocolError("unknown protocol 6 command");
+          }
+          return this.handlers.message({
+            command: 'reload',
+            path: options.path,
+            liveCSS: (_ref = options.apply_css_live) != null ? _ref : true
+          });
+        } else {
+          message = this._parseMessage(data, ['reload', 'alert']);
+          return this.handlers.message(message);
+        }
+      } catch (_error) {
+        e = _error;
+        if (e instanceof ProtocolError) {
+          return this.handlers.error(e);
+        } else {
+          throw e;
+        }
+      }
+    };
+
+    Parser.prototype._parseMessage = function(data, validCommands) {
+      var e, message, _ref;
+      try {
+        message = JSON.parse(data);
+      } catch (_error) {
+        e = _error;
+        throw new ProtocolError('unparsable JSON', data);
+      }
+      if (!message.command) {
+        throw new ProtocolError('missing "command" key', data);
+      }
+      if (_ref = message.command, __indexOf.call(validCommands, _ref) < 0) {
+        throw new ProtocolError("invalid command '" + message.command + "', only valid commands are: " + (validCommands.join(', ')) + ")", data);
+      }
+      return message;
+    };
+
+    return Parser;
+
+  })();
+
+}).call(this);
+
+},{}],7:[function(require,module,exports){
+(function() {
+  var IMAGE_STYLES, Reloader, numberOfMatchingSegments, pathFromUrl, pathsMatch, pickBestMatch, splitUrl;
+
+  splitUrl = function(url) {
+    var hash, index, params;
+    if ((index = url.indexOf('#')) >= 0) {
+      hash = url.slice(index);
+      url = url.slice(0, index);
+    } else {
+      hash = '';
+    }
+    if ((index = url.indexOf('?')) >= 0) {
+      params = url.slice(index);
+      url = url.slice(0, index);
+    } else {
+      params = '';
+    }
+    return {
+      url: url,
+      params: params,
+      hash: hash
+    };
+  };
+
+  pathFromUrl = function(url) {
+    var path;
+    url = splitUrl(url).url;
+    if (url.indexOf('file://') === 0) {
+      path = url.replace(/^file:\/\/(localhost)?/, '');
+    } else {
+      path = url.replace(/^([^:]+:)?\/\/([^:\/]+)(:\d*)?\//, '/');
+    }
+    return decodeURIComponent(path);
+  };
+
+  pickBestMatch = function(path, objects, pathFunc) {
+    var bestMatch, object, score, _i, _len;
+    bestMatch = {
+      score: 0
+    };
+    for (_i = 0, _len = objects.length; _i < _len; _i++) {
+      object = objects[_i];
+      score = numberOfMatchingSegments(path, pathFunc(object));
+      if (score > bestMatch.score) {
+        bestMatch = {
+          object: object,
+          score: score
+        };
+      }
+    }
+    if (bestMatch.score > 0) {
+      return bestMatch;
+    } else {
+      return null;
+    }
+  };
+
+  numberOfMatchingSegments = function(path1, path2) {
+    var comps1, comps2, eqCount, len;
+    path1 = path1.replace(/^\/+/, '').toLowerCase();
+    path2 = path2.replace(/^\/+/, '').toLowerCase();
+    if (path1 === path2) {
+      return 10000;
+    }
+    comps1 = path1.split('/').reverse();
+    comps2 = path2.split('/').reverse();
+    len = Math.min(comps1.length, comps2.length);
+    eqCount = 0;
+    while (eqCount < len && comps1[eqCount] === comps2[eqCount]) {
+      ++eqCount;
+    }
+    return eqCount;
+  };
+
+  pathsMatch = function(path1, path2) {
+    return numberOfMatchingSegments(path1, path2) > 0;
+  };
+
+  IMAGE_STYLES = [
+    {
+      selector: 'background',
+      styleNames: ['backgroundImage']
+    }, {
+      selector: 'border',
+      styleNames: ['borderImage', 'webkitBorderImage', 'MozBorderImage']
+    }
+  ];
+
+  exports.Reloader = Reloader = (function() {
+    function Reloader(window, console, Timer) {
+      this.window = window;
+      this.console = console;
+      this.Timer = Timer;
+      this.document = this.window.document;
+      this.importCacheWaitPeriod = 200;
+      this.plugins = [];
+    }
+
+    Reloader.prototype.addPlugin = function(plugin) {
+      return this.plugins.push(plugin);
+    };
+
+    Reloader.prototype.analyze = function(callback) {
+      return results;
+    };
+
+    Reloader.prototype.reload = function(path, options) {
+      var plugin, _base, _i, _len, _ref;
+      this.options = options;
+      if ((_base = this.options).stylesheetReloadTimeout == null) {
+        _base.stylesheetReloadTimeout = 15000;
+      }
+      _ref = this.plugins;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        plugin = _ref[_i];
+        if (plugin.reload && plugin.reload(path, options)) {
+          return;
+        }
+      }
+      if (options.liveCSS) {
+        if (path.match(/\.css$/i)) {
+          if (this.reloadStylesheet(path)) {
+            return;
+          }
+        }
+      }
+      if (options.liveImg) {
+        if (path.match(/\.(jpe?g|png|gif)$/i)) {
+          this.reloadImages(path);
+          return;
+        }
+      }
+      return this.reloadPage();
+    };
+
+    Reloader.prototype.reloadPage = function() {
+      return this.window.document.location.reload();
+    };
+
+    Reloader.prototype.reloadImages = function(path) {
+      var expando, img, selector, styleNames, styleSheet, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref, _ref1, _ref2, _ref3, _results;
+      expando = this.generateUniqueString();
+      _ref = this.document.images;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        img = _ref[_i];
+        if (pathsMatch(path, pathFromUrl(img.src))) {
+          img.src = this.generateCacheBustUrl(img.src, expando);
+        }
+      }
+      if (this.document.querySelectorAll) {
+        for (_j = 0, _len1 = IMAGE_STYLES.length; _j < _len1; _j++) {
+          _ref1 = IMAGE_STYLES[_j], selector = _ref1.selector, styleNames = _ref1.styleNames;
+          _ref2 = this.document.querySelectorAll("[style*=" + selector + "]");
+          for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
+            img = _ref2[_k];
+            this.reloadStyleImages(img.style, styleNames, path, expando);
+          }
+        }
+      }
+      if (this.document.styleSheets) {
+        _ref3 = this.document.styleSheets;
+        _results = [];
+        for (_l = 0, _len3 = _ref3.length; _l < _len3; _l++) {
+          styleSheet = _ref3[_l];
+          _results.push(this.reloadStylesheetImages(styleSheet, path, expando));
+        }
+        return _results;
+      }
+    };
+
+    Reloader.prototype.reloadStylesheetImages = function(styleSheet, path, expando) {
+      var e, rule, rules, styleNames, _i, _j, _len, _len1;
+      try {
+        rules = styleSheet != null ? styleSheet.cssRules : void 0;
+      } catch (_error) {
+        e = _error;
+      }
+      if (!rules) {
+        return;
+      }
+      for (_i = 0, _len = rules.length; _i < _len; _i++) {
+        rule = rules[_i];
+        switch (rule.type) {
+          case CSSRule.IMPORT_RULE:
+            this.reloadStylesheetImages(rule.styleSheet, path, expando);
+            break;
+          case CSSRule.STYLE_RULE:
+            for (_j = 0, _len1 = IMAGE_STYLES.length; _j < _len1; _j++) {
+              styleNames = IMAGE_STYLES[_j].styleNames;
+              this.reloadStyleImages(rule.style, styleNames, path, expando);
+            }
+            break;
+          case CSSRule.MEDIA_RULE:
+            this.reloadStylesheetImages(rule, path, expando);
+        }
+      }
+    };
+
+    Reloader.prototype.reloadStyleImages = function(style, styleNames, path, expando) {
+      var newValue, styleName, value, _i, _len;
+      for (_i = 0, _len = styleNames.length; _i < _len; _i++) {
+        styleName = styleNames[_i];
+        value = style[styleName];
+        if (typeof value === 'string') {
+          newValue = value.replace(/\burl\s*\(([^)]*)\)/, (function(_this) {
+            return function(match, src) {
+              if (pathsMatch(path, pathFromUrl(src))) {
+                return "url(" + (_this.generateCacheBustUrl(src, expando)) + ")";
+              } else {
+                return match;
+              }
+            };
+          })(this));
+          if (newValue !== value) {
+            style[styleName] = newValue;
+          }
+        }
+      }
+    };
+
+    Reloader.prototype.reloadStylesheet = function(path) {
+      var imported, link, links, match, style, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref, _ref1;
+      links = (function() {
+        var _i, _len, _ref, _results;
+        _ref = this.document.getElementsByTagName('link');
+        _results = [];
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          link = _ref[_i];
+          if (link.rel.match(/^stylesheet$/i) && !link.__LiveReload_pendingRemoval) {
+            _results.push(link);
+          }
+        }
+        return _results;
+      }).call(this);
+      imported = [];
+      _ref = this.document.getElementsByTagName('style');
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        style = _ref[_i];
+        if (style.sheet) {
+          this.collectImportedStylesheets(style, style.sheet, imported);
+        }
+      }
+      for (_j = 0, _len1 = links.length; _j < _len1; _j++) {
+        link = links[_j];
+        this.collectImportedStylesheets(link, link.sheet, imported);
+      }
+      if (this.window.StyleFix && this.document.querySelectorAll) {
+        _ref1 = this.document.querySelectorAll('style[data-href]');
+        for (_k = 0, _len2 = _ref1.length; _k < _len2; _k++) {
+          style = _ref1[_k];
+          links.push(style);
+        }
+      }
+      this.console.log("LiveReload found " + links.length + " LINKed stylesheets, " + imported.length + " @imported stylesheets");
+      match = pickBestMatch(path, links.concat(imported), (function(_this) {
+        return function(l) {
+          return pathFromUrl(_this.linkHref(l));
+        };
+      })(this));
+      if (match) {
+        if (match.object.rule) {
+          this.console.log("LiveReload is reloading imported stylesheet: " + match.object.href);
+          this.reattachImportedRule(match.object);
+        } else {
+          this.console.log("LiveReload is reloading stylesheet: " + (this.linkHref(match.object)));
+          this.reattachStylesheetLink(match.object);
+        }
+      } else {
+        this.console.log("LiveReload will reload all stylesheets because path '" + path + "' did not match any specific one");
+        for (_l = 0, _len3 = links.length; _l < _len3; _l++) {
+          link = links[_l];
+          this.reattachStylesheetLink(link);
+        }
+      }
+      return true;
+    };
+
+    Reloader.prototype.collectImportedStylesheets = function(link, styleSheet, result) {
+      var e, index, rule, rules, _i, _len;
+      try {
+        rules = styleSheet != null ? styleSheet.cssRules : void 0;
+      } catch (_error) {
+        e = _error;
+      }
+      if (rules && rules.length) {
+        for (index = _i = 0, _len = rules.length; _i < _len; index = ++_i) {
+          rule = rules[index];
+          switch (rule.type) {
+            case CSSRule.CHARSET_RULE:
+              continue;
+            case CSSRule.IMPORT_RULE:
+              result.push({
+                link: link,
+                rule: rule,
+                index: index,
+                href: rule.href
+              });
+              this.collectImportedStylesheets(link, rule.styleSheet, result);
+              break;
+            default:
+              break;
+          }
+        }
+      }
+    };
+
+    Reloader.prototype.waitUntilCssLoads = function(clone, func) {
+      var callbackExecuted, executeCallback, poll;
+      callbackExecuted = false;
+      executeCallback = (function(_this) {
+        return function() {
+          if (callbackExecuted) {
+            return;
+          }
+          callbackExecuted = true;
+          return func();
+        };
+      })(this);
+      clone.onload = (function(_this) {
+        return function() {
+          _this.console.log("LiveReload: the new stylesheet has finished loading");
+          _this.knownToSupportCssOnLoad = true;
+          return executeCallback();
+        };
+      })(this);
+      if (!this.knownToSupportCssOnLoad) {
+        (poll = (function(_this) {
+          return function() {
+            if (clone.sheet) {
+              _this.console.log("LiveReload is polling until the new CSS finishes loading...");
+              return executeCallback();
+            } else {
+              return _this.Timer.start(50, poll);
+            }
+          };
+        })(this))();
+      }
+      return this.Timer.start(this.options.stylesheetReloadTimeout, executeCallback);
+    };
+
+    Reloader.prototype.linkHref = function(link) {
+      return link.href || link.getAttribute('data-href');
+    };
+
+    Reloader.prototype.reattachStylesheetLink = function(link) {
+      var clone, parent;
+      if (link.__LiveReload_pendingRemoval) {
+        return;
+      }
+      link.__LiveReload_pendingRemoval = true;
+      if (link.tagName === 'STYLE') {
+        clone = this.document.createElement('link');
+        clone.rel = 'stylesheet';
+        clone.media = link.media;
+        clone.disabled = link.disabled;
+      } else {
+        clone = link.cloneNode(false);
+      }
+      clone.href = this.generateCacheBustUrl(this.linkHref(link));
+      parent = link.parentNode;
+      if (parent.lastChild === link) {
+        parent.appendChild(clone);
+      } else {
+        parent.insertBefore(clone, link.nextSibling);
+      }
+      return this.waitUntilCssLoads(clone, (function(_this) {
+        return function() {
+          var additionalWaitingTime;
+          if (/AppleWebKit/.test(navigator.userAgent)) {
+            additionalWaitingTime = 5;
+          } else {
+            additionalWaitingTime = 200;
+          }
+          return _this.Timer.start(additionalWaitingTime, function() {
+            var _ref;
+            if (!link.parentNode) {
+              return;
+            }
+            link.parentNode.removeChild(link);
+            clone.onreadystatechange = null;
+            return (_ref = _this.window.StyleFix) != null ? _ref.link(clone) : void 0;
+          });
+        };
+      })(this));
+    };
+
+    Reloader.prototype.reattachImportedRule = function(_arg) {
+      var href, index, link, media, newRule, parent, rule, tempLink;
+      rule = _arg.rule, index = _arg.index, link = _arg.link;
+      parent = rule.parentStyleSheet;
+      href = this.generateCacheBustUrl(rule.href);
+      media = rule.media.length ? [].join.call(rule.media, ', ') : '';
+      newRule = "@import url(\"" + href + "\") " + media + ";";
+      rule.__LiveReload_newHref = href;
+      tempLink = this.document.createElement("link");
+      tempLink.rel = 'stylesheet';
+      tempLink.href = href;
+      tempLink.__LiveReload_pendingRemoval = true;
+      if (link.parentNode) {
+        link.parentNode.insertBefore(tempLink, link);
+      }
+      return this.Timer.start(this.importCacheWaitPeriod, (function(_this) {
+        return function() {
+          if (tempLink.parentNode) {
+            tempLink.parentNode.removeChild(tempLink);
+          }
+          if (rule.__LiveReload_newHref !== href) {
+            return;
+          }
+          parent.insertRule(newRule, index);
+          parent.deleteRule(index + 1);
+          rule = parent.cssRules[index];
+          rule.__LiveReload_newHref = href;
+          return _this.Timer.start(_this.importCacheWaitPeriod, function() {
+            if (rule.__LiveReload_newHref !== href) {
+              return;
+            }
+            parent.insertRule(newRule, index);
+            return parent.deleteRule(index + 1);
+          });
+        };
+      })(this));
+    };
+
+    Reloader.prototype.generateUniqueString = function() {
+      return 'livereload=' + Date.now();
+    };
+
+    Reloader.prototype.generateCacheBustUrl = function(url, expando) {
+      var hash, oldParams, originalUrl, params, _ref;
+      if (expando == null) {
+        expando = this.generateUniqueString();
+      }
+      _ref = splitUrl(url), url = _ref.url, hash = _ref.hash, oldParams = _ref.params;
+      if (this.options.overrideURL) {
+        if (url.indexOf(this.options.serverURL) < 0) {
+          originalUrl = url;
+          url = this.options.serverURL + this.options.overrideURL + "?url=" + encodeURIComponent(url);
+          this.console.log("LiveReload is overriding source URL " + originalUrl + " with " + url);
+        }
+      }
+      params = oldParams.replace(/(\?|&)livereload=(\d+)/, function(match, sep) {
+        return "" + sep + expando;
+      });
+      if (params === oldParams) {
+        if (oldParams.length === 0) {
+          params = "?" + expando;
+        } else {
+          params = "" + oldParams + "&" + expando;
+        }
+      }
+      return url + params + hash;
+    };
+
+    return Reloader;
+
+  })();
+
+}).call(this);
+
+},{}],8:[function(require,module,exports){
+(function() {
+  var CustomEvents, LiveReload, k;
+
+  CustomEvents = require('./customevents');
+
+  LiveReload = window.LiveReload = new (require('./livereload').LiveReload)(window);
+
+  for (k in window) {
+    if (k.match(/^LiveReloadPlugin/)) {
+      LiveReload.addPlugin(window[k]);
+    }
+  }
+
+  LiveReload.addPlugin(require('./less'));
+
+  LiveReload.on('shutdown', function() {
+    return delete window.LiveReload;
+  });
+
+  LiveReload.on('connect', function() {
+    return CustomEvents.fire(document, 'LiveReloadConnect');
+  });
+
+  LiveReload.on('disconnect', function() {
+    return CustomEvents.fire(document, 'LiveReloadDisconnect');
+  });
+
+  CustomEvents.bind(document, 'LiveReloadShutDown', function() {
+    return LiveReload.shutDown();
+  });
+
+}).call(this);
+
+},{"./customevents":2,"./less":3,"./livereload":4}],9:[function(require,module,exports){
+(function() {
+  var Timer;
+
+  exports.Timer = Timer = (function() {
+    function Timer(func) {
+      this.func = func;
+      this.running = false;
+      this.id = null;
+      this._handler = (function(_this) {
+        return function() {
+          _this.running = false;
+          _this.id = null;
+          return _this.func();
+        };
+      })(this);
+    }
+
+    Timer.prototype.start = function(timeout) {
+      if (this.running) {
+        clearTimeout(this.id);
+      }
+      this.id = setTimeout(this._handler, timeout);
+      return this.running = true;
+    };
+
+    Timer.prototype.stop = function() {
+      if (this.running) {
+        clearTimeout(this.id);
+        this.running = false;
+        return this.id = null;
+      }
+    };
+
+    return Timer;
+
+  })();
+
+  Timer.start = function(timeout, func) {
+    return setTimeout(func, timeout);
+  };
+
+}).call(this);
+
+},{}]},{},[8]);
diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb
index 70b6d66df34..640720ee7d8 100644
--- a/lib/jekyll/commands/serve/servlet.rb
+++ b/lib/jekyll/commands/serve/servlet.rb
@@ -5,6 +5,128 @@
 module Jekyll
   module Commands
     class Serve
+      # This class is used to determine if the Servlet should modify a served file
+      # to insert the LiveReload script tags
+      class SkipAnalyzer
+        BAD_USER_AGENTS = [%r!MSIE!].freeze
+
+        def self.skip_processing?(request, response, options)
+          new(request, response, options).skip_processing?
+        end
+
+        def initialize(request, response, options)
+          @options = options
+          @request = request
+          @response = response
+        end
+
+        def skip_processing?
+          !html? || chunked? || inline? || bad_browser?
+        end
+
+        def chunked?
+          @response["Transfer-Encoding"] == "chunked"
+        end
+
+        def inline?
+          @response["Content-Disposition"] =~ %r!^inline!
+        end
+
+        def bad_browser?
+          BAD_USER_AGENTS.any? { |pattern| @request["User-Agent"] =~ pattern }
+        end
+
+        def html?
+          @response["Content-Type"] =~ %r!text/html!
+        end
+      end
+
+      # This class inserts the LiveReload script tags into HTML as it is served
+      class BodyProcessor
+        HEAD_TAG_REGEX = %r!|!
+
+        attr_reader :content_length, :new_body, :livereload_added
+
+        def initialize(body, options)
+          @body = body
+          @options = options
+          @processed = false
+        end
+
+        def processed?
+          @processed
+        end
+
+        # rubocop:disable Metrics/MethodLength
+        def process!
+          @new_body = []
+          # @body will usually be a File object but Strings occur in rare cases
+          if @body.respond_to?(:each)
+            begin
+              @body.each { |line| @new_body << line.to_s }
+            ensure
+              @body.close
+            end
+          else
+            @new_body = @body.lines
+          end
+
+          @content_length = 0
+          @livereload_added = false
+
+          @new_body.each do |line|
+            if !@livereload_added && line["
+            document.write(
+              '
+          TEMPLATE
+          ERB.new(Jekyll::Utils.strip_heredoc(template))
+        end
+
+        def livereload_args
+          # XHTML standard requires ampersands to be encoded as entities when in
+          # attributes. See http://stackoverflow.com/a/2190292
+          src = ""
+          if @options["livereload_min_delay"]
+            src += "&mindelay=#{@options["livereload_min_delay"]}"
+          end
+          if @options["livereload_max_delay"]
+            src += "&maxdelay=#{@options["livereload_max_delay"]}"
+          end
+          if @options["livereload_port"]
+            src += "&port=#{@options["livereload_port"]}"
+          end
+          src
+        end
+      end
+
       class Servlet < WEBrick::HTTPServlet::FileHandler
         DEFAULTS = {
           "Cache-Control" => "private, max-age=0, proxy-revalidate, " \
@@ -34,6 +156,21 @@ def search_file(req, res, basename)
         # rubocop:disable Naming/MethodName
         def do_GET(req, res)
           rtn = super
+
+          if @jekyll_opts["livereload"]
+            return rtn if SkipAnalyzer.skip_processing?(req, res, @jekyll_opts)
+
+            processor = BodyProcessor.new(res.body, @jekyll_opts)
+            processor.process!
+            res.body = processor.new_body
+            res.content_length = processor.content_length.to_s
+
+            if processor.livereload_added
+              # Add a header to indicate that the page content has been modified
+              res["X-Rack-LiveReload"] = "1"
+            end
+          end
+
           validate_and_ensure_charset(req, res)
           res.header.merge!(@headers)
           rtn
diff --git a/lib/jekyll/commands/serve/websockets.rb b/lib/jekyll/commands/serve/websockets.rb
new file mode 100644
index 00000000000..1e5f948e2be
--- /dev/null
+++ b/lib/jekyll/commands/serve/websockets.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+require "http/parser"
+
+module Jekyll
+  module Commands
+    class Serve
+      # The LiveReload protocol requires the server to serve livereload.js over HTTP
+      # despite the fact that the protocol itself uses WebSockets.  This custom connection
+      # class addresses the dual protocols that the server needs to understand.
+      class HttpAwareConnection < EventMachine::WebSocket::Connection
+        attr_reader :reload_body, :reload_size
+
+        def initialize(_opts)
+          # If EventMachine SSL support on Windows ever gets better, the code below will
+          # set up the reactor to handle SSL
+          #
+          # @ssl_enabled = opts["ssl_cert"] && opts["ssl_key"]
+          # if @ssl_enabled
+          #   em_opts[:tls_options] = {
+          #   :private_key_file => Jekyll.sanitized_path(opts["source"], opts["ssl_key"]),
+          #   :cert_chain_file  => Jekyll.sanitized_path(opts["source"], opts["ssl_cert"])
+          #   }
+          #   em_opts[:secure] = true
+          # end
+
+          # This is too noisy even for --verbose, but uncomment if you need it for
+          # a specific WebSockets issue.  Adding ?LR-verbose=true onto the URL will
+          # enable logging on the client side.
+          # em_opts[:debug] = true
+
+          em_opts = {}
+          super(em_opts)
+
+          reload_file = File.join(Serve.singleton_class::LIVERELOAD_DIR, "livereload.js")
+
+          @reload_body = File.read(reload_file)
+          @reload_size = @reload_body.bytesize
+        end
+
+        # rubocop:disable Metrics/MethodLength
+        def dispatch(data)
+          parser = Http::Parser.new
+          parser << data
+
+          # WebSockets requests will have a Connection: Upgrade header
+          if parser.http_method != "GET" || parser.upgrade?
+            super
+          elsif parser.request_url =~ %r!^\/livereload.js!
+            headers = [
+              "HTTP/1.1 200 OK",
+              "Content-Type: application/javascript",
+              "Content-Length: #{reload_size}",
+              "",
+              "",
+            ].join("\r\n")
+            send_data(headers)
+
+            # stream_file_data would free us from keeping livereload.js in memory
+            # but JRuby blocks on that call and never returns
+            send_data(reload_body)
+            close_connection_after_writing
+          else
+            body = "This port only serves livereload.js over HTTP.\n"
+            headers = [
+              "HTTP/1.1 400 Bad Request",
+              "Content-Type: text/plain",
+              "Content-Length: #{body.bytesize}",
+              "",
+              "",
+            ].join("\r\n")
+            send_data(headers)
+            send_data(body)
+            close_connection_after_writing
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 55cf9be1e28..1d3cb9c4a72 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -8,6 +8,7 @@ module Utils
     autoload :Internet, "jekyll/utils/internet"
     autoload :Platforms, "jekyll/utils/platforms"
     autoload :Rouge, "jekyll/utils/rouge"
+    autoload :ThreadEvent, "jekyll/utils/thread_event"
     autoload :WinTZ, "jekyll/utils/win_tz"
 
     # Constants for use in #slugify
diff --git a/lib/jekyll/utils/thread_event.rb b/lib/jekyll/utils/thread_event.rb
new file mode 100644
index 00000000000..5afb50d93eb
--- /dev/null
+++ b/lib/jekyll/utils/thread_event.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "thread"
+
+module Jekyll
+  module Utils
+    # Based on the pattern and code from
+    # https://emptysqua.re/blog/an-event-synchronization-primitive-for-ruby/
+    class ThreadEvent
+      attr_reader :flag
+
+      def initialize
+        @lock = Mutex.new
+        @cond = ConditionVariable.new
+        @flag = false
+      end
+
+      def set
+        @lock.synchronize do
+          yield if block_given?
+          @flag = true
+          @cond.broadcast
+        end
+      end
+
+      def wait
+        @lock.synchronize do
+          unless @flag
+            @cond.wait(@lock)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb
index 135e83e2dba..fd1751d8d40 100644
--- a/test/test_commands_serve.rb
+++ b/test/test_commands_serve.rb
@@ -3,7 +3,10 @@
 require "webrick"
 require "mercenary"
 require "helper"
+require "httpclient"
 require "openssl"
+require "thread"
+require "tmpdir"
 
 class TestCommandsServe < JekyllUnitTest
   def custom_opts(what)
@@ -12,6 +15,128 @@ def custom_opts(what)
     )
   end
 
+  def start_server(opts)
+    @thread = Thread.new do
+      merc = nil
+      cmd = Jekyll::Commands::Serve
+      Mercenary.program(:jekyll) do |p|
+        merc = cmd.init_with_program(p)
+      end
+      merc.execute(:serve, opts)
+    end
+    @thread.abort_on_exception = true
+
+    Jekyll::Commands::Serve.mutex.synchronize do
+      unless Jekyll::Commands::Serve.running?
+        Jekyll::Commands::Serve.run_cond.wait(Jekyll::Commands::Serve.mutex)
+      end
+    end
+  end
+
+  def serve(opts)
+    allow(Jekyll).to receive(:configuration).and_return(opts)
+    allow(Jekyll::Commands::Build).to receive(:process)
+
+    start_server(opts)
+
+    opts
+  end
+
+  context "using LiveReload" do
+    setup do
+      @temp_dir = Dir.mktmpdir("jekyll_livereload_test")
+      @destination = File.join(@temp_dir, "_site")
+      Dir.mkdir(@destination) || flunk("Could not make directory #{@destination}")
+      @client = HTTPClient.new
+      @client.connect_timeout = 5
+      @standard_options = {
+        "port"        => 4000,
+        "host"        => "localhost",
+        "baseurl"     => "",
+        "detach"      => false,
+        "livereload"  => true,
+        "source"      => @temp_dir,
+        "destination" => @destination,
+      }
+
+      site = instance_double(Jekyll::Site)
+      simple_page = <<-HTML.gsub(%r!^\s*!, "")
+      
+      
+      
+        
+        Hello World
+      
+      
+        
    Hello!  I am a simple web page.
    
+      
+      
+      HTML
+
+      File.open(File.join(@destination, "hello.html"), "w") do |f|
+        f.write(simple_page)
+      end
+      allow(Jekyll::Site).to receive(:new).and_return(site)
+    end
+
+    teardown do
+      capture_io do
+        Jekyll::Commands::Serve.shutdown
+      end
+
+      Jekyll::Commands::Serve.mutex.synchronize do
+        if Jekyll::Commands::Serve.running?
+          Jekyll::Commands::Serve.run_cond.wait(Jekyll::Commands::Serve.mutex)
+        end
+      end
+
+      FileUtils.remove_entry_secure(@temp_dir, true)
+    end
+
+    should "serve livereload.js over HTTP on the default LiveReload port" do
+      skip_if_windows "EventMachine support on Windows is limited"
+      opts = serve(@standard_options)
+      content = @client.get_content(
+        "http://#{opts["host"]}:#{opts["livereload_port"]}/livereload.js"
+      )
+      assert_match(%r!LiveReload.on!, content)
+    end
+
+    should "serve nothing else over HTTP on the default LiveReload port" do
+      skip_if_windows "EventMachine support on Windows is limited"
+      opts = serve(@standard_options)
+      res = @client.get("http://#{opts["host"]}:#{opts["livereload_port"]}/")
+      assert_equal(400, res.status_code)
+      assert_match(%r!only serves livereload.js!, res.content)
+    end
+
+    should "insert the LiveReload script tags" do
+      skip_if_windows "EventMachine support on Windows is limited"
+      opts = serve(@standard_options)
+      content = @client.get_content(
+        "http://#{opts["host"]}:#{opts["port"]}/#{opts["baseurl"]}/hello.html"
+      )
+      assert_match(
+        %r!livereload.js\?snipver=1&port=#{opts["livereload_port"]}!,
+        content
+      )
+      assert_match(%r!I am a simple web page!, content)
+    end
+
+    should "apply the max and min delay options" do
+      skip_if_windows "EventMachine support on Windows is limited"
+      opts = serve(@standard_options.merge(
+        "livereload_max_delay" => "1066",
+        "livereload_min_delay" => "3"
+      ))
+      content = @client.get_content(
+        "http://#{opts["host"]}:#{opts["port"]}/#{opts["baseurl"]}/hello.html"
+      )
+      assert_match(%r!&mindelay=3!, content)
+      assert_match(%r!&maxdelay=1066!, content)
+    end
+  end
+
   context "with a program" do
     setup do
       @merc = nil

From 28e20b933494edfe147645cd0dbbe3878e1e5659 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 6 Dec 2017 16:33:53 -0500
Subject: [PATCH 2655/4996] Update history to reflect merge of #5142 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 54bd43db93d..9e67e778a8b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -75,6 +75,7 @@
   * Log Kramdown warnings if log level is WARN (#6522)
   * Add json extension to list of directory indices (#6550)
   * Dependency: Bump jekyll-watch to 2.0 (#6589)
+  * Add LiveReload functionality to Jekyll. (#5142)
 
 ### Site Enhancements
 

From 64ef79291f625c5df1e1323bb0541a403a74e297 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Fri, 8 Dec 2017 10:50:49 +0100
Subject: [PATCH 2656/4996] Update History.markdown

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

diff --git a/History.markdown b/History.markdown
index 9e67e778a8b..426f3976d00 100644
--- a/History.markdown
+++ b/History.markdown
@@ -73,6 +73,7 @@
   * Allow plugins to modify the obsolete files. (#6502)
   * Add latin mode to slugify (#6509)
   * Log Kramdown warnings if log level is WARN (#6522)
+  * Add an option to configure kramdown warning output (#6554)
   * Add json extension to list of directory indices (#6550)
   * Dependency: Bump jekyll-watch to 2.0 (#6589)
   * Add LiveReload functionality to Jekyll. (#5142)

From 713467817aaaee559455d32838e57d8993a78cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20Rusiczki?= 
Date: Fri, 8 Dec 2017 16:43:37 +0200
Subject: [PATCH 2657/4996] Remove link to severly outdated asset plugin
 (#6613)

Merge pull request 6613
---
 docs/_docs/plugins.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 61d484768a7..0cd17474ee4 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -929,7 +929,6 @@ You can find a few useful plugins at the following locations:
 - [Jekyll-pagination](https://github.com/blackwinter/jekyll-pagination): Jekyll plugin to extend the pagination generator.
 - [Jekyll-tagging](https://github.com/pattex/jekyll-tagging): Jekyll plugin to automatically generate a tag cloud and tag pages.
 - [Jekyll-scholar](https://github.com/inukshuk/jekyll-scholar): Jekyll extensions for the blogging scholar.
-- [Jekyll-asset_bundler](https://github.com/moshen/jekyll-asset_bundler): Bundles and minifies JavaScript and CSS.
 - [Jekyll-assets](http://jekyll.github.io/jekyll-assets/) by [ixti](https://github.com/ixti): Rails-alike assets pipeline (write assets in CoffeeScript, Sass, LESS etc; specify dependencies for automatic bundling using simple declarative comments in assets; minify and compress; use JST templates; cache bust; and many-many more).
 - [JAPR](https://github.com/kitsched/japr): Jekyll Asset Pipeline Reborn - Powerful asset pipeline for Jekyll that collects, converts and compresses JavaScript and CSS assets.
 - [File compressor](https://gist.github.com/2758691) by [mytharcher](https://github.com/mytharcher): Compress HTML and JavaScript files on site build.

From 1691685c775f2721c1984f6632dee0fc971dfcf9 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 8 Dec 2017 09:43:38 -0500
Subject: [PATCH 2658/4996] Update history to reflect merge of #6613 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 426f3976d00..1a96151eaa5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * Add jekyll-pwa-plugin (#6533)
   * Remove Jekyll-Smartify from plugins directory (#6548)
   * Updated Jekyll-Pug listing to include official website (#6555)
+  * Remove link to severly outdated asset plugin (#6613)
 
 ### Development Fixes
 

From ba75c87f63c7cc8e3165be53a29a98ebbb5a55d8 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 10 Dec 2017 08:35:12 -0500
Subject: [PATCH 2659/4996] Remove paginate check (#6606)

Merge pull request 6606
---
 lib/jekyll/configuration.rb | 17 ++++-------------
 test/test_configuration.rb  | 23 ++---------------------
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 423ab65857d..bfa61799f6a 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -97,7 +97,7 @@ class << self
       # problems and backwards-compatibility.
       def from(user_config)
         Utils.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys)
-          .fix_common_issues.add_default_collections
+          .add_default_collections
       end
     end
 
@@ -210,7 +210,7 @@ def read_config_files(files)
         warn err
       end
 
-      configuration.fix_common_issues.backwards_compatibilize.add_default_collections
+      configuration.backwards_compatibilize.add_default_collections
     end
 
     # Public: Split a CSV string into an array containing its values
@@ -246,18 +246,9 @@ def backwards_compatibilize
       config
     end
 
+    # DEPRECATED.
     def fix_common_issues
-      config = clone
-
-      if config.key?("paginate") && (!config["paginate"].is_a?(Integer) ||
-             config["paginate"] < 1)
-
-        Jekyll.logger.warn "Config Warning:", "The `paginate` key must be a positive" \
-          " integer or nil. It's currently set to '#{config["paginate"].inspect}'."
-        config["paginate"] = nil
-      end
-
-      config
+      self
     end
 
     def add_default_collections
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 3dbd5ca1c4e..e0f1b8b5b14 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -20,13 +20,8 @@ class TestConfiguration < JekyllUnitTest
       assert_equal result["source"], "blah"
     end
 
-    should "fix common mistakes" do
-      result = Configuration.from({ "paginate" => 0 })
-      assert_nil(
-        result["paginate"],
-        "Expected 'paginate' to be corrected to 'nil', " \
-        "but was #{result["paginate"].inspect}"
-      )
+    should "return a valid Configuration instance" do
+      assert_instance_of Configuration, Configuration.from({}).fix_common_issues
     end
 
     should "add default collections" do
@@ -263,20 +258,6 @@ class TestConfiguration < JekyllUnitTest
       assert @config.backwards_compatibilize["plugins"]
     end
   end
-  context "#fix_common_issues" do
-    setup do
-      @config = proc do |val|
-        Configuration[{
-          "paginate" => val,
-        }]
-      end
-    end
-    should "sets an invalid 'paginate' value to nil" do
-      assert_nil @config.call(0).fix_common_issues["paginate"]
-      assert_nil @config.call(-1).fix_common_issues["paginate"]
-      assert_nil @config.call(true).fix_common_issues["paginate"]
-    end
-  end
   context "loading configuration" do
     setup do
       @path = source_dir("_config.yml")

From fc783cd13cf965823ffbb9e8e9e397bb7c5000a9 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 10 Dec 2017 08:35:14 -0500
Subject: [PATCH 2660/4996] Update history to reflect merge of #6606 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1a96151eaa5..b2dcb30c820 100644
--- a/History.markdown
+++ b/History.markdown
@@ -78,6 +78,7 @@
   * Add json extension to list of directory indices (#6550)
   * Dependency: Bump jekyll-watch to 2.0 (#6589)
   * Add LiveReload functionality to Jekyll. (#5142)
+  * Remove paginate check (#6606)
 
 ### Site Enhancements
 

From f9044ac5c630809613d0d1c9e7c5f542dcc6826e Mon Sep 17 00:00:00 2001
From: Yashu Mittal 
Date: Mon, 11 Dec 2017 00:08:27 +0530
Subject: [PATCH 2661/4996] Default time zone depends upon server (#6617)

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

diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index 362d33c5525..63ebd047440 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -108,7 +108,7 @@ class="flag">flags     (specified on the command-line) that control them.
             IANA Time Zone
             Database is valid, e.g. America/New_York. A list of all
             available values can be found 
-            here. The default is the local time zone, as set by your operating system.
+            here. When serving on a local machine, the default time zone is set by your operating system. But when served on a remote host/server, the default time zone depends on the server's setting or location.
         
    
       
       

From 0801caae8ec29eecd8fc5dce909b4cd0bf2a5fba Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 10 Dec 2017 13:38:28 -0500
Subject: [PATCH 2662/4996] Update history to reflect merge of #6617 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b2dcb30c820..96321510813 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * Remove Jekyll-Smartify from plugins directory (#6548)
   * Updated Jekyll-Pug listing to include official website (#6555)
   * Remove link to severly outdated asset plugin (#6613)
+  * Default time zone depends upon server (#6617)
 
 ### Development Fixes
 

From 36d70ecb8eaa811290f87b2588d5583af2f3bf0a Mon Sep 17 00:00:00 2001
From: Kacper Duras 
Date: Mon, 11 Dec 2017 00:28:52 +0100
Subject: [PATCH 2663/4996] Add `disqus-for-jekyll` to plugins. (#6618)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 0cd17474ee4..0d9593f94f3 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -905,6 +905,7 @@ You can find a few useful plugins at the following locations:
 - [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.
+- [disqus-for-jekyll](https://github.com/kacperduras/disqus-for-jekyll): A Jekyll plugin to view the comments powered by Disqus.
 
 
 #### Collections

From 977837fa3a524385609a33ffa47841b50a8f8a1a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 10 Dec 2017 18:28:54 -0500
Subject: [PATCH 2664/4996] Update history to reflect merge of #6618 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 96321510813..79210b93cd5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -30,6 +30,7 @@
   * Updated Jekyll-Pug listing to include official website (#6555)
   * Remove link to severly outdated asset plugin (#6613)
   * Default time zone depends upon server (#6617)
+  * Add `disqus-for-jekyll` to plugins. (#6618)
 
 ### Development Fixes
 

From bc8fee97c56bb9b01dab3936030ec507cfbf3a03 Mon Sep 17 00:00:00 2001
From: Junko Suzuki 
Date: Tue, 12 Dec 2017 20:28:05 +0900
Subject: [PATCH 2665/4996] Update "Requirements" for Ruby version (#6623)

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

diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index 62377b698bd..8a87744d1f0 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -14,7 +14,7 @@ Installing Jekyll should be straight-forward if all requirements are met.
 Before you start, make sure your system has the following:
 
 - GNU/Linux, Unix, or macOS
-- [Ruby](https://www.ruby-lang.org/en/downloads/) version 2.1 or above, including all development
+- [Ruby](https://www.ruby-lang.org/en/downloads/) version 2.2.5 or above, including all development
   headers
 - [RubyGems](https://rubygems.org/pages/download)
 - [GCC](https://gcc.gnu.org/install/) and [Make](https://www.gnu.org/software/make/) (in case your system doesn't have them installed, which you can check by running `gcc -v` and `make -v` in your system's command line interface)

From 71e3bce63d12ad1849507782db8e3a8d51a32770 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 12 Dec 2017 06:28:07 -0500
Subject: [PATCH 2666/4996] Update history to reflect merge of #6623 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 79210b93cd5..e90f1b62d9e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -31,6 +31,7 @@
   * Remove link to severly outdated asset plugin (#6613)
   * Default time zone depends upon server (#6617)
   * Add `disqus-for-jekyll` to plugins. (#6618)
+  * Update "Requirements" for Ruby version (#6623)
 
 ### Development Fixes
 

From acb82c92a8b014c01588fa68e79ff1f0d6db722f Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Fri, 15 Dec 2017 02:13:18 +0530
Subject: [PATCH 2667/4996] Cleanup LiveReloadReactor (#6607)

Merge pull request 6607
---
 .../commands/serve/live_reload_reactor.rb     | 66 ++++++-------------
 1 file changed, 20 insertions(+), 46 deletions(-)

diff --git a/lib/jekyll/commands/serve/live_reload_reactor.rb b/lib/jekyll/commands/serve/live_reload_reactor.rb
index 498e78aeee4..e9261f4f8fc 100644
--- a/lib/jekyll/commands/serve/live_reload_reactor.rb
+++ b/lib/jekyll/commands/serve/live_reload_reactor.rb
@@ -14,7 +14,6 @@ class LiveReloadReactor
         attr_reader :thread
 
         def initialize
-          @thread = nil
           @websockets = []
           @connections_count = 0
           @started_event = Utils::ThreadEvent.new
@@ -25,7 +24,7 @@ def stop
           # There is only one EventMachine instance per Ruby process so stopping
           # it here will stop the reactor thread we have running.
           EM.stop if EM.reactor_running?
-          Jekyll.logger.debug("LiveReload Server:", "halted")
+          Jekyll.logger.debug "LiveReload Server:", "halted"
         end
 
         def running?
@@ -33,32 +32,18 @@ def running?
         end
 
         def handle_websockets_event(ws)
-          ws.onopen do |handshake|
-            connect(ws, handshake)
-          end
-
-          ws.onclose do
-            disconnect(ws)
-          end
-
-          ws.onmessage do |msg|
-            print_message(msg)
-          end
-
-          ws.onerror do |error|
-            log_error(error)
-          end
+          ws.onopen { |handshake| connect(ws, handshake) }
+          ws.onclose { disconnect(ws) }
+          ws.onmessage { |msg| print_message(msg) }
+          ws.onerror { |error| log_error(error) }
         end
 
-        # rubocop:disable Metrics/MethodLength
         def start(opts)
           @thread = Thread.new do
             # Use epoll if the kernel supports it
             EM.epoll
             EM.run do
-              EM.error_handler do |e|
-                log_error(e)
-              end
+              EM.error_handler { |e| log_error(e) }
 
               EM.start_server(
                 opts["host"],
@@ -70,17 +55,11 @@ def start(opts)
               end
 
               # Notify blocked threads that EventMachine has started or shutdown
-              EM.schedule do
-                @started_event.set
-              end
-
-              EM.add_shutdown_hook do
-                @stopped_event.set
-              end
+              EM.schedule { @started_event.set }
+              EM.add_shutdown_hook { @stopped_event.set }
 
-              Jekyll.logger.info(
-                "LiveReload address:", "#{opts["host"]}:#{opts["livereload_port"]}"
-              )
+              Jekyll.logger.info "LiveReload address:",
+                "http://#{opts["host"]}:#{opts["livereload_port"]}"
             end
           end
           @thread.abort_on_exception = true
@@ -90,17 +69,15 @@ def start(opts)
         # http://feedback.livereload.com/knowledgebase/articles/86174-livereload-protocol
         def reload(pages)
           pages.each do |p|
-            msg = {
+            json_message = JSON.dump({
               :command => "reload",
               :path    => p.url,
               :liveCSS => true,
-            }
+            })
 
-            Jekyll.logger.debug("LiveReload:", "Reloading #{p.url}")
-            Jekyll.logger.debug(JSON.dump(msg))
-            @websockets.each do |ws|
-              ws.send(JSON.dump(msg))
-            end
+            Jekyll.logger.debug "LiveReload:", "Reloading #{p.url}"
+            Jekyll.logger.debug "", json_message
+            @websockets.each { |ws| ws.send(json_message) }
           end
         end
 
@@ -110,7 +87,7 @@ def connect(ws, handshake)
           if @connections_count == 1
             message = "Browser connected"
             message += " over SSL/TLS" if handshake.secure?
-            Jekyll.logger.info("LiveReload:", message)
+            Jekyll.logger.info "LiveReload:", message
           end
           ws.send(
             JSON.dump(
@@ -134,18 +111,15 @@ def print_message(json_message)
           # Not sure what the 'url' command even does in LiveReload.  The spec is silent
           # on its purpose.
           if msg["command"] == "url"
-            Jekyll.logger.info("LiveReload:", "Browser URL: #{msg["url"]}")
+            Jekyll.logger.info "LiveReload:", "Browser URL: #{msg["url"]}"
           end
         end
 
         private
         def log_error(e)
-          Jekyll.logger.warn(
-            "LiveReload experienced an error. "\
-            "Run with --verbose for more information."
-          )
-          Jekyll.logger.debug("LiveReload Error:", e.message)
-          Jekyll.logger.debug("LiveReload Error:", e.backtrace.join("\n"))
+          Jekyll.logger.error "LiveReload experienced an error. " \
+            "Run with --trace for more information."
+          raise e
         end
       end
     end

From 3b9ed96c3074b4ebc2dda3f910ff819929f54b52 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 14 Dec 2017 15:43:20 -0500
Subject: [PATCH 2668/4996] Update history to reflect merge of #6607 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e90f1b62d9e..3a9627f51bf 100644
--- a/History.markdown
+++ b/History.markdown
@@ -63,6 +63,7 @@
   * Bump yajl-ruby (#6582)
   * Cleanup test_redcarpet.rb (#6584)
   * Add PageWithoutAFile class from jekyll plugins (#6556)
+  * Cleanup LiveReloadReactor (#6607)
 
 ### Minor Enhancements
 

From 1082a394174ac0a3dfe3c52900263280330e9988 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Fri, 15 Dec 2017 13:40:22 +0530
Subject: [PATCH 2669/4996] Register reload hooks in Server#process (#6605)

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

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 50438b5f7d5..849d37ed329 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -86,7 +86,6 @@ def start(opts)
           # a reactor created by a previous test when our test might not
           @reload_reactor = nil
 
-          register_reload_hooks(opts) if opts["livereload"]
           config = configuration_from_options(opts)
           if Jekyll.env == "development"
             config["url"] = default_url(config)
@@ -99,6 +98,7 @@ def start(opts)
         def process(opts)
           opts = configuration_from_options(opts)
           destination = opts["destination"]
+          register_reload_hooks(opts) if opts["livereload"]
           setup(destination)
 
           start_up_webrick(opts, destination)

From c471f943470b1853648b136723a2a6383512c7b0 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Dec 2017 03:10:23 -0500
Subject: [PATCH 2670/4996] Update history to reflect merge of #6605 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3a9627f51bf..73080421108 100644
--- a/History.markdown
+++ b/History.markdown
@@ -107,6 +107,7 @@
   * Avoid block parser warning in SmartyPants (#6565)
   * Fail gracefully if "sass" gem cannot be loaded (#6573)
   * return correct file in dir if dir has same name as file (#6569)
+  * Register reload hooks in Server#process (#6605)
 
 ## 3.6.2 / 2017-10-21
 

From e149803e99641f88393c78ef5b21ab63788b769f Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Fri, 15 Dec 2017 13:41:39 +0530
Subject: [PATCH 2671/4996] memoize path to metadata file (#6602)

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

diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb
index 91ce3003bdf..948de27ca27 100644
--- a/lib/jekyll/regenerator.rb
+++ b/lib/jekyll/regenerator.rb
@@ -128,7 +128,7 @@ def write_metadata
     #
     # Returns the String path of the file.
     def metadata_file
-      site.in_source_dir(".jekyll-metadata")
+      @metadata_file ||= site.in_source_dir(".jekyll-metadata")
     end
 
     # Check if metadata has been disabled

From d1440b9738eedb11208d3e66a128263e705b6fc9 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Dec 2017 03:11:40 -0500
Subject: [PATCH 2672/4996] Update history to reflect merge of #6602 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 73080421108..fc9aa60edc7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -108,6 +108,7 @@
   * Fail gracefully if "sass" gem cannot be loaded (#6573)
   * return correct file in dir if dir has same name as file (#6569)
   * Register reload hooks in Server#process (#6605)
+  * Memoize path to metadata file (#6602)
 
 ## 3.6.2 / 2017-10-21
 

From d854b2265619674376ee21c48bea5a1f1b72f2cf Mon Sep 17 00:00:00 2001
From: "Dr. Wolfram Schroers" 
Date: Fri, 15 Dec 2017 11:33:54 +0100
Subject: [PATCH 2673/4996] Add jekyll-category-pages plugin (#6632)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 0d9593f94f3..0764784a220 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -782,6 +782,7 @@ LESS.js files during generation.
 - [Jekyll Art Gallery plugin](https://github.com/alexivkin/Jekyll-Art-Gallery-Plugin): An advanced art/photo gallery generation plugin for creating galleries from a set of image folders. Supports image tagging, thumbnails, sorting, image rotation, post-processing (remove EXIF, add watermark), multiple collections and much more.
 - [jekyll-ga](https://github.com/developmentseed/jekyll-ga): A Jekyll plugin that downloads Google Analytics data and adds it to posts. Useful for making a site that lists "most popular" content. [Read the introduction](https://developmentseed.org/blog/google-analytics-jekyll-plugin/) post on the developmentSEED blog.
 - [jekyll-multi-paginate](https://github.com/fadhilnapis/jekyll-multi-paginate): Simple Jekyll paginator for multiple page. Ease you to make pagination on multiple page especially like multiple language.
+- [jekyll-category-pages](https://github.com/field-theory/jekyll-category-pages): Easy-to-use category index pages with and without pagination. Supports non-URL-safe category keywords and has extensive documentation and test coverage.
 
 #### Converters
 

From 72ccd29edc9ed4a3494b451c303117165ef9c044 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Dec 2017 05:33:55 -0500
Subject: [PATCH 2674/4996] Update history to reflect merge of #6632 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fc9aa60edc7..5b6ec05d761 100644
--- a/History.markdown
+++ b/History.markdown
@@ -100,6 +100,7 @@
   * Move logo above site navigation on small screens (#6570)
   * Docs: Include version badge for latest features (#6574)
   * Use version-badge on an existing feature intro (#6575)
+  * Add jekyll-category-pages plugin (#6632)
 
 ### Bug Fixes
 

From 1971ddd7a35f890b70bcb5ab9a9ca806f3460eea Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Fri, 15 Dec 2017 19:05:53 +0530
Subject: [PATCH 2675/4996] use `require_relative` to load Jekyll classes
 (#6609)

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

diff --git a/lib/jekyll/liquid_renderer.rb b/lib/jekyll/liquid_renderer.rb
index 547fa4c7f3d..3c731724657 100644
--- a/lib/jekyll/liquid_renderer.rb
+++ b/lib/jekyll/liquid_renderer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "jekyll/liquid_renderer/file"
-require "jekyll/liquid_renderer/table"
+require_relative "liquid_renderer/file"
+require_relative "liquid_renderer/table"
 
 module Jekyll
   class LiquidRenderer

From ff2795f98b0c08384e17065da8071051b370f1fc Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Dec 2017 08:35:55 -0500
Subject: [PATCH 2676/4996] Update history to reflect merge of #6609 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5b6ec05d761..b2d04c0009e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -110,6 +110,7 @@
   * return correct file in dir if dir has same name as file (#6569)
   * Register reload hooks in Server#process (#6605)
   * Memoize path to metadata file (#6602)
+  * Use `require_relative` to load Jekyll classes (#6609)
 
 ## 3.6.2 / 2017-10-21
 

From ffe8b28c682494f1e7eeccf295a686a22998ea2e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Dec 2017 15:55:53 -0500
Subject: [PATCH 2677/4996] update classifier-reborn to 2.2.0 (#6631)

Merge pull request 6631
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index f7000acb61a..055b7295869 100644
--- a/Gemfile
+++ b/Gemfile
@@ -80,7 +80,7 @@ group :jekyll_optional_dependencies do
   gem "toml", "~> 0.2.0"
 
   platform :ruby, :mswin, :mingw, :x64_mingw do
-    gem "classifier-reborn", "~> 2.1.0"
+    gem "classifier-reborn", "~> 2.2.0"
     gem "liquid-c", "~> 3.0"
     gem "pygments.rb", "~> 1.0"
     gem "rdiscount", "~> 2.0"

From 999151dcaad7209254a4513f256ef87612690eff Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Dec 2017 15:55:55 -0500
Subject: [PATCH 2678/4996] Update history to reflect merge of #6631 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b2d04c0009e..1a9a9ecd817 100644
--- a/History.markdown
+++ b/History.markdown
@@ -83,6 +83,7 @@
   * Dependency: Bump jekyll-watch to 2.0 (#6589)
   * Add LiveReload functionality to Jekyll. (#5142)
   * Remove paginate check (#6606)
+  * update classifier-reborn to 2.2.0 (#6631)
 
 ### Site Enhancements
 

From 94f74ff4ec41e78e0ce9e1e085a695fc792afdbc Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sat, 16 Dec 2017 07:33:20 +0530
Subject: [PATCH 2679/4996] correct custom inspect string for Jekyll::Page

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

diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 3b3d9353879..caea9cd924e 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -163,7 +163,7 @@ def destination(dest)
 
     # Returns the object as a debug String.
     def inspect
-      "#"
+      "#"
     end
 
     # Returns the Boolean of whether this Page is HTML or not.

From 16b9ce908efc6ab3a9d7de3dd1ae16a1175186ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= 
Date: Sun, 17 Dec 2017 13:56:55 +0100
Subject: [PATCH 2680/4996] Fix: Update link to i18n_filter plugin (#6638)

Merge pull request 6638
---
 docs/_docs/plugins.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 0764784a220..57a52e3b361 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -813,7 +813,6 @@ LESS.js files during generation.
 - [Truncate HTML](https://github.com/MattHall/truncatehtml) by [Matt Hall](https://codebeef.com/): A Jekyll filter that truncates HTML while preserving markup structure.
 - [Domain Name Filter by Lawrence Woodman](https://github.com/LawrenceWoodman/domain_name-liquid_filter): Filters the input text so that just the domain name is left.
 - [Summarize Filter by Mathieu Arnold](https://gist.github.com/731597): Remove markup after a `
    ` tag.
-- [i18n_filter](https://github.com/gacha/gacha.id.lv/blob/master/_plugins/i18n_filter.rb): Liquid filter to use I18n localization.
 - [Smilify](https://github.com/SaswatPadhi/jekyll_smilify) by [SaswatPadhi](https://github.com/SaswatPadhi): Convert text emoticons in your content to themeable smiley pics.
 - [Read in X Minutes](https://gist.github.com/zachleat/5792681) by [zachleat](https://github.com/zachleat): Estimates the reading time of a string (for blog post content).
 - [Jekyll-timeago](https://github.com/markets/jekyll-timeago): Converts a time value to the time ago in words.

From 76a0fc38887e684f65237dd35861a54dc4ab97e2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 17 Dec 2017 07:56:56 -0500
Subject: [PATCH 2681/4996] Update history to reflect merge of #6638 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1a9a9ecd817..e8da4b625ad 100644
--- a/History.markdown
+++ b/History.markdown
@@ -32,6 +32,7 @@
   * Default time zone depends upon server (#6617)
   * Add `disqus-for-jekyll` to plugins. (#6618)
   * Update "Requirements" for Ruby version (#6623)
+  * Fix: Update link to i18n_filter plugin (#6638)
 
 ### Development Fixes
 

From d6152578155729756d6ae6ef0c13cd5c8266d839 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Thu, 21 Dec 2017 21:03:43 +0530
Subject: [PATCH 2682/4996] Improve docs styling for code to be run in shell
 (#6641)

Merge pull request 6641
---
 docs/_sass/_pygments.scss |  2 +-
 docs/_sass/_style.scss    | 30 +++++++++++++++++++++---------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/docs/_sass/_pygments.scss b/docs/_sass/_pygments.scss
index 4b45bf60521..d5759a0fca3 100644
--- a/docs/_sass/_pygments.scss
+++ b/docs/_sass/_pygments.scss
@@ -1,6 +1,6 @@
 .highlight {
   .hll { background-color: #ffffcc }
-  .c { color: #87ceeb} /* Comment */
+  .c { color: #999; font-style: italic } /* Comment */
   .err { color: #ffffff} /* Error */
   .g { color: #ffffff} /* Generic */
   .k { color: #f0e68c} /* Keyword */
diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss
index 11d89adf3a8..69cc55ea9ee 100644
--- a/docs/_sass/_style.scss
+++ b/docs/_sass/_style.scss
@@ -1126,21 +1126,33 @@ code.output {
 }
 
 .language-sh {
+  position: relative;
   &:before {
     display: table;
-    padding: 5px 8px;
+    padding: 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;
+    padding: 5px 0;
+    font: 400 16px/24px 'Helvetica Neue', Helvetica, Arial, sans-serif;
+    color: #444;
+    text-shadow: 0 1px 0 rgba(255,255,255,.5);
+    background-color: #f7f7f7;
+    background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y3ZjdmNyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjclIiBzdG9wLWNvbG9yPSIjY2ZjZmNmIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2FhYWFhYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=);
+    background-image: -webkit-gradient(linear, left top, left bottom, from(#f7f7f7), color-stop(7%, #cfcfcf), to(#aaaaaa));
+    background-image: -webkit-linear-gradient(top, #f7f7f7 0%, #cfcfcf 7%, #aaaaaa 100%);
+    background-image: -moz-linear-gradient(top, #f7f7f7 0%, #cfcfcf 7%, #aaaaaa 100%);
+    background-image: -o-linear-gradient(top, #f7f7f7 0%, #cfcfcf 7%, #aaaaaa 100%);
+    background-image: linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7f7f7', endColorstr='#aaaaaa',GradientType=0 );
+    border-bottom: 1px solid #111;
+    text-align: center;
+    content: "terminal";
     @include border-radius(5px 5px 0 0);
+    @include box-shadow(0 3px 10px rgba(0,0,0,.5));
   }
   .highlight {
     @include border-radius(0 0 5px 5px);
   }
+  pre.highlight {
+    background: #1c1c1c;
+  }
 }

From aef0e1c2527160c0a8f4f472811eacc5687c986f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 21 Dec 2017 10:33:45 -0500
Subject: [PATCH 2683/4996] Update history to reflect merge of #6641 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e8da4b625ad..c95a16e8bcc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -103,6 +103,7 @@
   * Docs: Include version badge for latest features (#6574)
   * Use version-badge on an existing feature intro (#6575)
   * Add jekyll-category-pages plugin (#6632)
+  * Improve docs styling for code to be run in shell (#6641)
 
 ### Bug Fixes
 

From 14ab1bc9b297f43006f3e081ba89ab65b0d07909 Mon Sep 17 00:00:00 2001
From: Christian Oliff 
Date: Fri, 22 Dec 2017 00:35:47 +0900
Subject: [PATCH 2684/4996] Correct WordPress capitalization (#6645)

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

diff --git a/docs/_docs/resources.md b/docs/_docs/resources.md
index d2a15c8ff8e..35963e22087 100644
--- a/docs/_docs/resources.md
+++ b/docs/_docs/resources.md
@@ -11,7 +11,7 @@ Jekyll's growing use is producing a wide variety of tutorials, frameworks, exten
 - [markdown-writer](https://atom.io/packages/markdown-writer): An Atom package for Jekyll. It can create new posts/drafts, manage tags/categories, insert link/images and add many useful key mappings.
 - [sublime-jekyll](https://github.com/23maverick23/sublime-jekyll): A Sublime Text package for Jekyll static sites. This package should help creating Jekyll sites and posts easier by providing access to key template tags and filters, as well as common completions and a current date/datetime command (for dating posts). You can install this package manually via GitHub, or via [Package Control](https://packagecontrol.io/packages/Jekyll).
 - [vim-jekyll](https://github.com/parkr/vim-jekyll): A vim plugin to generate new posts and run `jekyll build` all without leaving vim.
-- [Wordpress2Jekyll](https://wordpress.org/plugins/wp2jekyll/): A Wordpress plugin that allows you to use Wordpress as your editor and (automatically) export content in to Jekyll. WordPress2Jekyll attempts to marry these two systems together in order to make a site that can be easily managed from all devices.
+- [WordPress2Jekyll](https://wordpress.org/plugins/wp2jekyll/): A WordPress plugin that allows you to use WordPress as your editor and (automatically) export content in to Jekyll. WordPress2Jekyll attempts to marry these two systems together in order to make a site that can be easily managed from all devices.
 
 ## Useful Guides
 

From 47e9304342721772a8e5f422728169e2f9150de9 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 21 Dec 2017 10:35:49 -0500
Subject: [PATCH 2685/4996] Update history to reflect merge of #6645 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c95a16e8bcc..0c00be17e69 100644
--- a/History.markdown
+++ b/History.markdown
@@ -33,6 +33,7 @@
   * Add `disqus-for-jekyll` to plugins. (#6618)
   * Update "Requirements" for Ruby version (#6623)
   * Fix: Update link to i18n_filter plugin (#6638)
+  * Correct WordPress capitalization (#6645)
 
 ### Development Fixes
 

From 96d3b5e986b463e5ad15c342f265e58fda017023 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Thu, 21 Dec 2017 16:44:29 +0100
Subject: [PATCH 2686/4996] Docs: Remove requirements for Jekyll 2.x

---
 docs/_docs/installation.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index 8a87744d1f0..398b5e1a38a 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -19,11 +19,6 @@ Before you start, make sure your system has the following:
 - [RubyGems](https://rubygems.org/pages/download)
 - [GCC](https://gcc.gnu.org/install/) and [Make](https://www.gnu.org/software/make/) (in case your system doesn't have them installed, which you can check by running `gcc -v` and `make -v` in your system's command line interface)
 
-#### Only required for Jekyll 2 and earlier
-
-- [NodeJS](https://nodejs.org/), or another JavaScript runtime (for CoffeeScript support).
-- [Python 2.7](https://www.python.org/downloads/)
-
 
    
   
    Problems installing Jekyll?
    
   
    

From 60f645eb769d49d1fe8f96ec442ffe164ff609a8 Mon Sep 17 00:00:00 2001
From: Alex Ibrado 
Date: Wed, 27 Dec 2017 00:26:12 +0800
Subject: [PATCH 2687/4996] Add Tweetsert, Stickyposts, Paginate::Content
 (#6651)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 57a52e3b361..61aed9ae5e8 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -783,6 +783,9 @@ LESS.js files during generation.
 - [jekyll-ga](https://github.com/developmentseed/jekyll-ga): A Jekyll plugin that downloads Google Analytics data and adds it to posts. Useful for making a site that lists "most popular" content. [Read the introduction](https://developmentseed.org/blog/google-analytics-jekyll-plugin/) post on the developmentSEED blog.
 - [jekyll-multi-paginate](https://github.com/fadhilnapis/jekyll-multi-paginate): Simple Jekyll paginator for multiple page. Ease you to make pagination on multiple page especially like multiple language.
 - [jekyll-category-pages](https://github.com/field-theory/jekyll-category-pages): Easy-to-use category index pages with and without pagination. Supports non-URL-safe category keywords and has extensive documentation and test coverage.
+- [Tweetsert](https://github.com/ibrado/jekyll-tweetsert): Imports tweets (Twitter statuses) as new posts. Features multiple timeline support, hashtag import, filtering, automatic category and/or tags, optional retweets and replies.
+- [Stickyposts](https://github.com/ibrado/jekyll-stickyposts): Moves or copies (pins) posts marked `sticky: true` to the top of the list. Perfect for keeping important announcements on the home page, or giving collections a descriptive entry. Paginator friendly.
+- [Jekyll::Paginate::Content](https://github.com/ibrado/jekyll-paginate-content): Content paginator in the style of jekyll-paginator-v2 that splits pages, posts, and collection entries into several pages. Specify a separator or use HTML <h1> etc. headers. Automatic splitting, single-page view, pager/trail, self-adjusting links, multipage TOC, SEO support.
 
 #### Converters
 

From 53cfa642fb50379b8795f80622bf9a5b934f2729 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 26 Dec 2017 11:26:13 -0500
Subject: [PATCH 2688/4996] Update history to reflect merge of #6651 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0c00be17e69..95094fa6d73 100644
--- a/History.markdown
+++ b/History.markdown
@@ -34,6 +34,7 @@
   * Update "Requirements" for Ruby version (#6623)
   * Fix: Update link to i18n_filter plugin (#6638)
   * Correct WordPress capitalization (#6645)
+  * Add Tweetsert, Stickyposts, Paginate::Content (#6651)
 
 ### Development Fixes
 

From b3286e7468964015d9fb611d81bede752230de01 Mon Sep 17 00:00:00 2001
From: Miguel Piedrafita 
Date: Mon, 1 Jan 2018 00:59:11 +0100
Subject: [PATCH 2689/4996] Update license year

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index e177b1bfea7..c98bc25f316 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2008-2017 Tom Preston-Werner and Jekyll contributors
+Copyright (c) 2008-2018 Tom Preston-Werner and Jekyll contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From a9fe56830b466917cfbcdd9bce1c0fdff49aa113 Mon Sep 17 00:00:00 2001
From: Jashank Jeremy 
Date: Wed, 3 Jan 2018 03:36:58 +1000
Subject: [PATCH 2690/4996] Switch to an actively-maintained TOML parser.
 (#6652)

Merge pull request 6652
---
 Gemfile                     | 2 +-
 lib/jekyll/configuration.rb | 4 ++--
 test/test_configuration.rb  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 055b7295869..90ccf0a5197 100644
--- a/Gemfile
+++ b/Gemfile
@@ -77,7 +77,7 @@ group :jekyll_optional_dependencies do
   gem "kramdown", "~> 1.14"
   gem "mime-types", "~> 3.0"
   gem "rdoc", "~> 5.0"
-  gem "toml", "~> 0.2.0"
+  gem "tomlrb", "~> 1.2"
 
   platform :ruby, :mswin, :mingw, :x64_mingw do
     gem "classifier-reborn", "~> 2.2.0"
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index bfa61799f6a..601e1f97cf5 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -134,8 +134,8 @@ def verbose(override = {})
     def safe_load_file(filename)
       case File.extname(filename)
       when %r!\.toml!i
-        Jekyll::External.require_with_graceful_fail("toml") unless defined?(TOML)
-        TOML.load_file(filename)
+        Jekyll::External.require_with_graceful_fail("tomlrb") unless defined?(Tomlrb)
+        Tomlrb.load_file(filename)
       when %r!\.ya?ml!i
         SafeYAML.load_file(filename) || {}
       else
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index e0f1b8b5b14..17c0d21985d 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -380,11 +380,11 @@ class TestConfiguration < JekyllUnitTest
     end
 
     should "load multiple config files" do
-      External.require_with_graceful_fail("toml")
+      External.require_with_graceful_fail("tomlrb")
 
       allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return({})
       allow(SafeYAML).to receive(:load_file).with(@paths[:other]).and_return({})
-      allow(TOML).to receive(:load_file).with(@paths[:toml]).and_return({})
+      allow(Tomlrb).to receive(:load_file).with(@paths[:toml]).and_return({})
       allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}")
       allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}")
       allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:toml]}")

From 34694ae6d10bb6d2f8341d3adeb88177d46eb0e6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 2 Jan 2018 12:37:00 -0500
Subject: [PATCH 2691/4996] Update history to reflect merge of #6652 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 95094fa6d73..1ff7b423f63 100644
--- a/History.markdown
+++ b/History.markdown
@@ -87,6 +87,7 @@
   * Add LiveReload functionality to Jekyll. (#5142)
   * Remove paginate check (#6606)
   * update classifier-reborn to 2.2.0 (#6631)
+  * Switch to an actively-maintained TOML parser. (#6652)
 
 ### Site Enhancements
 

From bf8837e4955559ee3e4650adc3ac83b1c63ecad1 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Tue, 2 Jan 2018 23:20:43 +0530
Subject: [PATCH 2692/4996] fix permalink icon markup in news-item layout
 (#6639)

Merge pull request 6639
---
 docs/_layouts/news_item.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/_layouts/news_item.html b/docs/_layouts/news_item.html
index 273db2e8384..de6508d069b 100644
--- a/docs/_layouts/news_item.html
+++ b/docs/_layouts/news_item.html
@@ -5,7 +5,10 @@
 
    
   
    
     {{ page.title }}
-    
+    
+      Permalink
+      
+    
   
    
   
     

From c07985eca8a0caf24572918fcd6af5a91a923578 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 2 Jan 2018 12:50:45 -0500
Subject: [PATCH 2693/4996] Update history to reflect merge of #6639 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1ff7b423f63..174d6df994c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -107,6 +107,7 @@
   * Use version-badge on an existing feature intro (#6575)
   * Add jekyll-category-pages plugin (#6632)
   * Improve docs styling for code to be run in shell (#6641)
+  * Fix permalink icon markup in news-item layout (#6639)
 
 ### Bug Fixes
 

From c3026bdf3149a54cef0b83830a1fd79a696f403b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 2 Jan 2018 14:17:20 -0500
Subject: [PATCH 2694/4996] Post: Jekyll 3.7.0 released (#6634)

Merge pull request 6634
---
 .../2018-01-02-jekyll-3-7-0-released.md       | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 docs/_posts/2018-01-02-jekyll-3-7-0-released.md

diff --git a/docs/_posts/2018-01-02-jekyll-3-7-0-released.md b/docs/_posts/2018-01-02-jekyll-3-7-0-released.md
new file mode 100644
index 00000000000..0a54b212240
--- /dev/null
+++ b/docs/_posts/2018-01-02-jekyll-3-7-0-released.md
@@ -0,0 +1,37 @@
+---
+title: "Jekyll 3.7.0 Released"
+description: "Jekyll 3.7.0 brings LiveReload, a directory for your collections and much more…"
+date: 2017-01-02 12:31:40 +0100
+author: DirtyF
+version: 3.7.0
+categories: [release]
+---
+
+We're happy to release a new minor for the new year.
+Here are a few of the latest additions from our contributors:
+
+ * LiveReload is available as an option during development: with `jekyll serve --livereload` no more manual page refresh. A big thanks to @awood for this feature and to @andreyvit, LiveReload author.
+ * New `collections_dir` configuration option allows you to store all your [collections](/docs/collections) in a single folder. Your source root folder should now look cleaner :sparkles: .
+ * If you're using a [gem-based theme](/docs/themes/) in coordination with the `--incremental` option, you should notice some significant speed during the regeneration process, we did see build time went down **from 12s to 2s** with @mmistakes [minimal-mistakes theme](https://github.com/mmistakes/minimal-mistakes) during our tests.
+ * Jekyll will now check to determine whether host machine has internet connection.
+ * A new `latin` option is available to better [handle URLs slugs](/docs/templates/#options-for-the-slugify-filter).
+ * And of course many bug fixes and updates to our documentation — which you can now search thanks to our friends @Algolia.
+ * [Full history is here]((/docs/history/#v3-7-0)).
+
+This release wouldn't have been possible without all the following people:
+
+Aaron Borden, Alex Tsui, Alex Wood, Alexey Pelykh, Andrew Dassonville, Angelika Tyborska, Ankit Singhaniya, Ashwin Maroli, bellvat, Brandon Dusseau, Chris Finazzo, Doug Beney, Dr. Wolfram Schroers, Edward Shen, Florian Thomas, Frank Taillandier, Gert-jan Theunissen, Goulven Champenois, János Rusiczki, Jed Fox, Johannes Müller, Jon Anning, Jonathan Hooper, Jordon Bedwell, Junko Suzuki, Kacper Duras, Kenton Hansen, Kewin Dousse, Matt Rogers, Maximiliano Kotvinsky, mrHoliday, Olivia, Parker Moore, Pat Hawks, Sebastian Kulig, Vishesh Ruparelia, Xiaoiver and Yashu Mittal.
+
+A big thanks to everyone!
+
+Oh, one last thing…
+
+### :pray: upgrade your Ruby
+
+Prepare for the next major update, as next major version Jekyll 4.0 will drop support for Ruby 2.1 and 2.2.
+
+> Ruby 2.2 is now under the state of the security maintenance phase, until the end of the March of 2018. After the date, maintenance of Ruby 2.2 will be ended. We recommend you start planning migration to newer versions of Ruby, such as 2.4 or 2.3. — [Ruby Core Team](https://www.ruby-lang.org/en/news/2017/12/14/ruby-2-2-9-released/)
+
+We strongly encourage you to upgrade to at least Ruby 2.4.x [like our friends at GitHub Pages](https://pages.github.com/versions/) or even go with [Ruby 2.5](https://www.ruby-lang.org/en/news/2017/12/25/ruby-2-5-0-released/).
+
+Happy new year to all from the Jekyll team!

From 9b8db401e756ed2503447603121f539be3df497c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 2 Jan 2018 14:17:22 -0500
Subject: [PATCH 2695/4996] Update history to reflect merge of #6634 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 174d6df994c..5502ffa00ea 100644
--- a/History.markdown
+++ b/History.markdown
@@ -35,6 +35,7 @@
   * Fix: Update link to i18n_filter plugin (#6638)
   * Correct WordPress capitalization (#6645)
   * Add Tweetsert, Stickyposts, Paginate::Content (#6651)
+  * Post: Jekyll 3.7.0 released (#6634)
 
 ### Development Fixes
 

From 3c959af8d133b1f3317c8f6696873a6c00fd596e Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Wed, 3 Jan 2018 00:48:26 +0530
Subject: [PATCH 2696/4996] Do not coerce layout paths in theme-gem to the
 source directory (#6603)

Merge pull request 6603
---
 features/incremental_rebuild.feature | 17 +++++++++++++++++
 lib/jekyll/renderer.rb               |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/features/incremental_rebuild.feature b/features/incremental_rebuild.feature
index 128f5800456..2ced57a6d81 100644
--- a/features/incremental_rebuild.feature
+++ b/features/incremental_rebuild.feature
@@ -66,3 +66,20 @@ Feature: Incremental rebuild
     Then I should get a zero exit status
     And the _site directory should exist
     And I should see "Basic Site with include tag: Regenerated by Jekyll" in "_site/index.html"
+
+  Scenario: A themed-site and incremental regeneration
+    Given I have a configuration file with "theme" set to "test-theme"
+    And I have an "index.md" page that contains "Themed site"
+    When I run jekyll build --incremental --verbose
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Rendering: index.md" in the build output
+    And I should see "Themed site" in "_site/index.html"
+    When I wait 1 second
+    And I have an "about.md" page that contains "About Themed site"
+    When I run jekyll build --incremental --verbose
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should not see "Rendering: index.md" in the build output
+    But I should see "Themed site" in "_site/index.html"
+    And I should see "About Themed site" in "_site/about.html"
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index 71e5b87c317..1f83e2e56aa 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -198,7 +198,7 @@ def add_regenerator_dependencies(layout)
       return unless document.write?
       site.regenerator.add_dependency(
         site.in_source_dir(document.path),
-        site.in_source_dir(layout.path)
+        layout.path
       )
     end
 

From 3d624cd290c752f2a7324ab512e7425bcbc58bc2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 2 Jan 2018 14:18:28 -0500
Subject: [PATCH 2697/4996] Update history to reflect merge of #6603 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5502ffa00ea..cd0bb6223ca 100644
--- a/History.markdown
+++ b/History.markdown
@@ -89,6 +89,7 @@
   * Remove paginate check (#6606)
   * update classifier-reborn to 2.2.0 (#6631)
   * Switch to an actively-maintained TOML parser. (#6652)
+  * Do not coerce layout paths in theme-gem to the source directory (#6603)
 
 ### Site Enhancements
 

From abacae55ec45caa2b8b80704b73836f177b1841f Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 2 Jan 2018 20:24:20 +0100
Subject: [PATCH 2698/4996] Release :gem: 3.7.0

---
 History.markdown        | 130 ++++++++++++++++++++--------------------
 docs/_docs/history.md   | 129 +++++++++++++++++++++++++++++++++++++++
 docs/latest_version.txt |   2 +-
 lib/jekyll/version.rb   |   2 +-
 4 files changed, 196 insertions(+), 67 deletions(-)

diff --git a/History.markdown b/History.markdown
index cd0bb6223ca..653d0a3212e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,4 +1,68 @@
-## HEAD
+## 3.7.0 / 2018-01-02
+
+### Minor Enhancements
+
+  * Add LiveReload functionality to Jekyll. (#5142)
+  * Add Utils::Internet.connected? to determine whether host machine has internet connection. (#5870)
+  * Disable default layouts for Pages with a `layout: none` declaration (#6182)
+  * Scope path glob (#6268)
+  * Allow the user to set collections_dir to put all collections under one subdirectory (#6331)
+  * Upgrade to Rouge 3 (#6381)
+  * Allow URL filters to work directly with documents (#6478)
+  * filter relative_url should keep absolute urls with scheme/authority (#6490)
+  * `.sass-cache` doesn't *always* land in `options['source']` (#6500)
+  * Allow plugins to modify the obsolete files. (#6502)
+  * Add latin mode to `slugify` (#6509)
+  * Log Kramdown warnings if log level is WARN (#6522)
+  * Add an option to configure kramdown warning output (#6554)
+  * Add `json` extension to list of directory indices (#6550)
+  * Dependency: Bump jekyll-watch to 2.0 (#6589)
+  * Remove paginate check (#6606)
+  * update classifier-reborn to 2.2.0 (#6631)
+  * Switch to an actively-maintained TOML parser. (#6652)
+  * Do not coerce layout paths in theme-gem to the source directory (#6603)
+
+### Bug Fixes
+
+  * Raise when theme root directory is not available (#6455)
+  * Avoid block parser warning in SmartyPants (#6565)
+  * Fail gracefully if "sass" gem cannot be loaded (#6573)
+  * return correct file in dir if dir has same name as file (#6569)
+  * Register reload hooks in Server#process (#6605)
+  * Memoize path to metadata file (#6602)
+  * Use `require_relative` to load Jekyll classes (#6609)
+
+### Development Fixes
+
+  * Added direct collection access to future collection item feature test(#6151)
+  * add failing test for non-utf8 encoding (#6339)
+  * Upgrade to Cucumber 3.0 (#6395)
+  * Provide a better default hash for tracking liquid stats (#6417)
+  * Add configuration for first-timers bot (#6431)
+  * Do not linkify escaped characters as PRs in History (#6468)
+  * Rely on jekyll-mentions for linking usernames (#6469)
+  * Update first-timers-issue-template.md (#6472)
+  * Enable `Lint/RescueWithoutErrorClass` Cop (#6482)
+  * Clean up Rubocop config (#6495)
+  * 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`"strict_front_matter"=>true` (#6520)
+  * Use Kernel#Array instead of explicit Array check (#6525)
+  * RuboCop: Enable `Style/UnneededCapitalW` cop (#6526)
+  * Refactor method to reduce ABC Metric size (#6529)
+  * Remove parentheses around arguments to raise (#6532)
+  * Use double-quotes around gem name (#6535)
+  * Dependencies: upgrade to toml 0.2.0 (#6541)
+  * Lock to cucumber 3.0.1 on Ruby 2.1 (#6546)
+  * Bump JRuby version in Travis config (#6561)
+  * Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML(#5828)
+  * Drop forwarding to private methods by exposing those methods as public(#6577)
+  * Upgrade pygments to v1.x (#5937)
+  * Bump yajl-ruby (#6582)
+  * Cleanup test_redcarpet.rb (#6584)
+  * Add PageWithoutAFile class from jekyll plugins (#6556)
+  * Cleanup LiveReloadReactor (#6607)
 
 ### Documentation
 
@@ -37,60 +101,6 @@
   * Add Tweetsert, Stickyposts, Paginate::Content (#6651)
   * Post: Jekyll 3.7.0 released (#6634)
 
-### Development Fixes
-
-  * Added direct collection access to future collection item feature test (#6151)
-  * add failing test for non-utf8 encoding (#6339)
-  * Upgrade to Cucumber 3.0 (#6395)
-  * Provide a better default hash for tracking liquid stats (#6417)
-  * Add configuration for first-timers bot (#6431)
-  * Do not linkify escaped characters as PRs in History (#6468)
-  * Rely on jekyll-mentions for linking usernames (#6469)
-  * Update first-timers-issue-template.md (#6472)
-  * Enable `Lint/RescueWithoutErrorClass` Cop (#6482)
-  * Clean up Rubocop config (#6495)
-  * 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 `"strict_front_matter"=>true` (#6520)
-  * Use Kernel#Array instead of explicit Array check (#6525)
-  * RuboCop: Enable `Style/UnneededCapitalW` cop (#6526)
-  * Refactor method to reduce ABC Metric size (#6529)
-  * Remove parentheses around arguments to raise (#6532)
-  * Use double-quotes around gem name (#6535)
-  * Dependencies: upgrade to toml 0.2.0 (#6541)
-  * Lock to cucumber 3.0.1 on Ruby 2.1 (#6546)
-  * Bump JRuby version in Travis config (#6561)
-  * Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML (#5828)
-  * Drop forwarding to private methods by exposing those methods as public (#6577)
-  * Upgrade pygments to v1.x (#5937)
-  * Bump yajl-ruby (#6582)
-  * Cleanup test_redcarpet.rb (#6584)
-  * Add PageWithoutAFile class from jekyll plugins (#6556)
-  * Cleanup LiveReloadReactor (#6607)
-
-### Minor Enhancements
-
-  * Add Utils::Internet.connected? to determine whether host machine has internet connection. (#5870)
-  * Disable default layouts for Pages with a `layout: none` declaration (#6182)
-  * Scope path glob (#6268)
-  * Allow the user to set collections_dir to put all collections under one subdirectory (#6331)
-  * Upgrade to Rouge 3 (#6381)
-  * Allow URL filters to work directly with documents (#6478)
-  * filter relative_url should keep absolute urls with scheme/authority (#6490)
-  * .sass-cache doesn't *always* land in `options['source']` (#6500)
-  * Allow plugins to modify the obsolete files. (#6502)
-  * Add latin mode to slugify (#6509)
-  * Log Kramdown warnings if log level is WARN (#6522)
-  * Add an option to configure kramdown warning output (#6554)
-  * Add json extension to list of directory indices (#6550)
-  * Dependency: Bump jekyll-watch to 2.0 (#6589)
-  * Add LiveReload functionality to Jekyll. (#5142)
-  * Remove paginate check (#6606)
-  * update classifier-reborn to 2.2.0 (#6631)
-  * Switch to an actively-maintained TOML parser. (#6652)
-  * Do not coerce layout paths in theme-gem to the source directory (#6603)
-
 ### Site Enhancements
 
   * Add special styling for code-blocks run in shell (#6389)
@@ -111,16 +121,6 @@
   * Improve docs styling for code to be run in shell (#6641)
   * Fix permalink icon markup in news-item layout (#6639)
 
-### Bug Fixes
-
-  * Raise when theme root directory is not available (#6455)
-  * Avoid block parser warning in SmartyPants (#6565)
-  * Fail gracefully if "sass" gem cannot be loaded (#6573)
-  * return correct file in dir if dir has same name as file (#6569)
-  * Register reload hooks in Server#process (#6605)
-  * Memoize path to metadata file (#6602)
-  * Use `require_relative` to load Jekyll classes (#6609)
-
 ## 3.6.2 / 2017-10-21
 
 ### Development Fixes
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index a7308287028..db4a74ac119 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,135 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.7.0 / 2018-01-02
+{: #v3-7-0}
+
+### Minor Enhancements
+{: #minor-enhancements-v3-7-0}
+
+- Add LiveReload functionality to Jekyll. ([#5142]({{ site.repository }}/issues/5142))
+- Add Utils::Internet.connected? to determine whether host machine has internet connection. ([#5870]({{ site.repository }}/issues/5870))
+- Disable default layouts for Pages with a `layout: none` declaration ([#6182]({{ site.repository }}/issues/6182))
+- Scope path glob ([#6268]({{ site.repository }}/issues/6268))
+- Allow the user to set collections_dir to put all collections under one subdirectory ([#6331]({{ site.repository }}/issues/6331))
+- Upgrade to Rouge 3 ([#6381]({{ site.repository }}/issues/6381))
+- Allow URL filters to work directly with documents ([#6478]({{ site.repository }}/issues/6478))
+- filter relative_url should keep absolute urls with scheme/authority ([#6490]({{ site.repository }}/issues/6490))
+- `.sass-cache` doesn't *always* land in `options['source']` ([#6500]({{ site.repository }}/issues/6500))
+- Allow plugins to modify the obsolete files. ([#6502]({{ site.repository }}/issues/6502))
+- Add latin mode to `slugify` ([#6509]({{ site.repository }}/issues/6509))
+- Log Kramdown warnings if log level is WARN ([#6522]({{ site.repository }}/issues/6522))
+- Add an option to configure kramdown warning output ([#6554]({{ site.repository }}/issues/6554))
+- Add `json` extension to list of directory indices ([#6550]({{ site.repository }}/issues/6550))
+- Dependency: Bump jekyll-watch to 2.0 ([#6589]({{ site.repository }}/issues/6589))
+- Remove paginate check ([#6606]({{ site.repository }}/issues/6606))
+- update classifier-reborn to 2.2.0 ([#6631]({{ site.repository }}/issues/6631))
+- Switch to an actively-maintained TOML parser. ([#6652]({{ site.repository }}/issues/6652))
+- Do not coerce layout paths in theme-gem to the source directory ([#6603]({{ site.repository }}/issues/6603))
+
+### Bug Fixes
+{: #bug-fixes-v3-7-0}
+
+- Raise when theme root directory is not available ([#6455]({{ site.repository }}/issues/6455))
+- Avoid block parser warning in SmartyPants ([#6565]({{ site.repository }}/issues/6565))
+- Fail gracefully if "sass" gem cannot be loaded ([#6573]({{ site.repository }}/issues/6573))
+- return correct file in dir if dir has same name as file ([#6569]({{ site.repository }}/issues/6569))
+- Register reload hooks in Server#process ([#6605]({{ site.repository }}/issues/6605))
+- Memoize path to metadata file ([#6602]({{ site.repository }}/issues/6602))
+- Use `require_relative` to load Jekyll classes ([#6609]({{ site.repository }}/issues/6609))
+
+### Development Fixes
+{: #development-fixes-v3-7-0}
+
+- Added direct collection access to future collection item feature test([#6151]({{ site.repository }}/issues/6151))
+- add failing test for non-utf8 encoding ([#6339]({{ site.repository }}/issues/6339))
+- Upgrade to Cucumber 3.0 ([#6395]({{ site.repository }}/issues/6395))
+- Provide a better default hash for tracking liquid stats ([#6417]({{ site.repository }}/issues/6417))
+- Add configuration for first-timers bot ([#6431]({{ site.repository }}/issues/6431))
+- Do not linkify escaped characters as PRs in History ([#6468]({{ site.repository }}/issues/6468))
+- Rely on jekyll-mentions for linking usernames ([#6469]({{ site.repository }}/issues/6469))
+- Update first-timers-issue-template.md ([#6472]({{ site.repository }}/issues/6472))
+- Enable `Lint/RescueWithoutErrorClass` Cop ([#6482]({{ site.repository }}/issues/6482))
+- Clean up Rubocop config ([#6495]({{ site.repository }}/issues/6495))
+- Use Gem to discover the location of bundler ([#6499]({{ site.repository }}/issues/6499))
+- Remove unnecessary encoding comment ([#6513]({{ site.repository }}/issues/6513))
+- Suggest using Rubocop to automatically fix errors ([#6514]({{ site.repository }}/issues/6514))
+- Assert raising Psych::SyntaxError when`"strict_front_matter"=>true` ([#6520]({{ site.repository }}/issues/6520))
+- Use Kernel#Array instead of explicit Array check ([#6525]({{ site.repository }}/issues/6525))
+- RuboCop: Enable `Style/UnneededCapitalW` cop ([#6526]({{ site.repository }}/issues/6526))
+- Refactor method to reduce ABC Metric size ([#6529]({{ site.repository }}/issues/6529))
+- Remove parentheses around arguments to raise ([#6532]({{ site.repository }}/issues/6532))
+- Use double-quotes around gem name ([#6535]({{ site.repository }}/issues/6535))
+- Dependencies: upgrade to toml 0.2.0 ([#6541]({{ site.repository }}/issues/6541))
+- Lock to cucumber 3.0.1 on Ruby 2.1 ([#6546]({{ site.repository }}/issues/6546))
+- Bump JRuby version in Travis config ([#6561]({{ site.repository }}/issues/6561))
+- Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML([#5828]({{ site.repository }}/issues/5828))
+- Drop forwarding to private methods by exposing those methods as public([#6577]({{ site.repository }}/issues/6577))
+- Upgrade pygments to v1.x ([#5937]({{ site.repository }}/issues/5937))
+- Bump yajl-ruby ([#6582]({{ site.repository }}/issues/6582))
+- Cleanup test_redcarpet.rb ([#6584]({{ site.repository }}/issues/6584))
+- Add PageWithoutAFile class from jekyll plugins ([#6556]({{ site.repository }}/issues/6556))
+- Cleanup LiveReloadReactor ([#6607]({{ site.repository }}/issues/6607))
+
+### Documentation
+
+- Add formester to the list of saas form backend ([#6059]({{ site.repository }}/issues/6059))
+- GitHub Pages instructions ([#6384]({{ site.repository }}/issues/6384))
+- Improve documentation for theme-gem installation ([#6387]({{ site.repository }}/issues/6387))
+- Fix diff syntax-highlighting ([#6388]({{ site.repository }}/issues/6388))
+- Update instructions ([#6396]({{ site.repository }}/issues/6396))
+- Fix code-block highlighting in docs ([#6398]({{ site.repository }}/issues/6398))
+- Filtering Posts with categories, tags, or other variables ([#6399]({{ site.repository }}/issues/6399))
+- Fixes formatting on pre-formatted text. ([#6405]({{ site.repository }}/issues/6405))
+- Added new tutorial to tutorials section on docs ([#6406]({{ site.repository }}/issues/6406))
+- Updates ([#6407]({{ site.repository }}/issues/6407))
+- Fix `collections_dir` example ([#6408]({{ site.repository }}/issues/6408))
+- Renaming duplicate of "Scenario 6" to "Scenario 7" ([#6411]({{ site.repository }}/issues/6411))
+- Mark `collection_dir` as unreleased ([#6412]({{ site.repository }}/issues/6412))
+- Fix link to SUPPORT ([#6415]({{ site.repository }}/issues/6415))
+- Fix list appearance by adding missing `ol` tag ([#6421]({{ site.repository }}/issues/6421))
+- Explain how to override output collection index page ([#6424]({{ site.repository }}/issues/6424))
+- Added github-cards to the list of plugins ([#6425]({{ site.repository }}/issues/6425))
+- CoC violation correspondants ([#6429]({{ site.repository }}/issues/6429))
+- Add a note about Liquid and syntax highlighting ([#6466]({{ site.repository }}/issues/6466))
+- Remove `sudo` from macOS troubleshooting instructions ([#6486]({{ site.repository }}/issues/6486))
+- Add a note on `:jekyll_plugins` group in the docs ([#6488]({{ site.repository }}/issues/6488))
+- Updated custom-404-page.md ([#6489]({{ site.repository }}/issues/6489))
+- Fix a few minor issues in the docs ([#6494]({{ site.repository }}/issues/6494))
+- Add jekyll-pwa-plugin ([#6533]({{ site.repository }}/issues/6533))
+- Remove Jekyll-Smartify from plugins directory ([#6548]({{ site.repository }}/issues/6548))
+- Updated Jekyll-Pug listing to include official website ([#6555]({{ site.repository }}/issues/6555))
+- Remove link to severly outdated asset plugin ([#6613]({{ site.repository }}/issues/6613))
+- Default time zone depends upon server ([#6617]({{ site.repository }}/issues/6617))
+- Add `disqus-for-jekyll` to plugins. ([#6618]({{ site.repository }}/issues/6618))
+- Update "Requirements" for Ruby version ([#6623]({{ site.repository }}/issues/6623))
+- Fix: Update link to i18n_filter plugin ([#6638]({{ site.repository }}/issues/6638))
+- Correct WordPress capitalization ([#6645]({{ site.repository }}/issues/6645))
+- Add Tweetsert, Stickyposts, Paginate::Content ([#6651]({{ site.repository }}/issues/6651))
+- Post: Jekyll 3.7.0 released ([#6634]({{ site.repository }}/issues/6634))
+
+### Site Enhancements
+{: #site-enhancements-v3-7-0}
+
+- Add special styling for code-blocks run in shell ([#6389]({{ site.repository }}/issues/6389))
+- Add post about diversity ([#6447]({{ site.repository }}/issues/6447))
+- Update list of files excluded from Docs site ([#6457]({{ site.repository }}/issues/6457))
+- Update site History ([#6460]({{ site.repository }}/issues/6460))
+- Add default twitter card image ([#6476]({{ site.repository }}/issues/6476))
+- Update normalize.css to v7.0.0 ([#6491]({{ site.repository }}/issues/6491))
+- Optimize images ([#6519]({{ site.repository }}/issues/6519))
+- Back to original main navigation ([#6544]({{ site.repository }}/issues/6544))
+- Styles: mobile-docs select element ([#6545]({{ site.repository }}/issues/6545))
+- Search with DocSearch by @Algolia ([#6557]({{ site.repository }}/issues/6557))
+- Site header redesign ([#6567]({{ site.repository }}/issues/6567))
+- Move logo above site navigation on small screens ([#6570]({{ site.repository }}/issues/6570))
+- Docs: Include version badge for latest features ([#6574]({{ site.repository }}/issues/6574))
+- Use version-badge on an existing feature intro ([#6575]({{ site.repository }}/issues/6575))
+- Add jekyll-category-pages plugin ([#6632]({{ site.repository }}/issues/6632))
+- Improve docs styling for code to be run in shell ([#6641]({{ site.repository }}/issues/6641))
+- Fix permalink icon markup in news-item layout ([#6639]({{ site.repository }}/issues/6639))
+
+
 ## 3.6.2 / 2017-10-21
 {: #v3-6-2}
 
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index b72762837ea..7c69a55dbb1 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.6.2
+3.7.0
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 8f0106064ce..8597ff199bb 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "3.6.2".freeze
+  VERSION = "3.7.0".freeze
 end

From 4d6959ca4c57aa966189b0addee354985b10ac66 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 2 Jan 2018 20:25:21 +0100
Subject: [PATCH 2699/4996] Release :gem: 3.7.0


From 5ba27d1edf1e69c32aa6a6a9d21591fe0004f3c0 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 2 Jan 2018 20:27:47 +0100
Subject: [PATCH 2700/4996] Fix date

---
 docs/_posts/2018-01-02-jekyll-3-7-0-released.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_posts/2018-01-02-jekyll-3-7-0-released.md b/docs/_posts/2018-01-02-jekyll-3-7-0-released.md
index 0a54b212240..c06a6e277ae 100644
--- a/docs/_posts/2018-01-02-jekyll-3-7-0-released.md
+++ b/docs/_posts/2018-01-02-jekyll-3-7-0-released.md
@@ -1,7 +1,7 @@
 ---
 title: "Jekyll 3.7.0 Released"
 description: "Jekyll 3.7.0 brings LiveReload, a directory for your collections and much more…"
-date: 2017-01-02 12:31:40 +0100
+date: 2017-01-02 11:21:40 +0100
 author: DirtyF
 version: 3.7.0
 categories: [release]

From 32e9522ef14d607622dbf953c06eacd585d462bb Mon Sep 17 00:00:00 2001
From: olivia 
Date: Tue, 2 Jan 2018 20:34:59 +0100
Subject: [PATCH 2701/4996] fix post year

---
 docs/_posts/2018-01-02-jekyll-3-7-0-released.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_posts/2018-01-02-jekyll-3-7-0-released.md b/docs/_posts/2018-01-02-jekyll-3-7-0-released.md
index c06a6e277ae..abf5c28e37b 100644
--- a/docs/_posts/2018-01-02-jekyll-3-7-0-released.md
+++ b/docs/_posts/2018-01-02-jekyll-3-7-0-released.md
@@ -1,7 +1,7 @@
 ---
 title: "Jekyll 3.7.0 Released"
 description: "Jekyll 3.7.0 brings LiveReload, a directory for your collections and much more…"
-date: 2017-01-02 11:21:40 +0100
+date: 2018-01-02 11:21:40 +0100
 author: DirtyF
 version: 3.7.0
 categories: [release]

From c9da3c424a2eac0888431a8119e6e359fe7959da Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 2 Jan 2018 20:45:44 +0100
Subject: [PATCH 2702/4996] Fix link

---
 docs/_posts/2018-01-02-jekyll-3-7-0-released.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_posts/2018-01-02-jekyll-3-7-0-released.md b/docs/_posts/2018-01-02-jekyll-3-7-0-released.md
index abf5c28e37b..55c5d7a2920 100644
--- a/docs/_posts/2018-01-02-jekyll-3-7-0-released.md
+++ b/docs/_posts/2018-01-02-jekyll-3-7-0-released.md
@@ -16,7 +16,7 @@ Here are a few of the latest additions from our contributors:
  * Jekyll will now check to determine whether host machine has internet connection.
  * A new `latin` option is available to better [handle URLs slugs](/docs/templates/#options-for-the-slugify-filter).
  * And of course many bug fixes and updates to our documentation — which you can now search thanks to our friends @Algolia.
- * [Full history is here]((/docs/history/#v3-7-0)).
+ * [Full history is here](/docs/history/#v3-7-0).
 
 This release wouldn't have been possible without all the following people:
 

From a3351cff4f7756251f7670de6cb781c99b25fde4 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 2 Jan 2018 22:22:05 +0100
Subject: [PATCH 2703/4996] Docs: LiveReload option

---
 docs/_docs/usage.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/_docs/usage.md b/docs/_docs/usage.md
index a4201c1e1d3..c71fc97a277 100644
--- a/docs/_docs/usage.md
+++ b/docs/_docs/usage.md
@@ -65,15 +65,17 @@ jekyll serve
 # => A development server will run at http://localhost:4000/
 # Auto-regeneration: enabled. Use `--no-watch` to disable.
 
+jekyll serve --livreload
+# LiveReload refreshes your browser after a change.
+
+jekyll serve --incremental
+# Incremental will perform a partial build in order to reduce regeneration time.
+
 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.
 ```
-
    
-  
    Livereload
    
-  
    If you want to enable Livereload, you can enable the jekyll-livereload plugin in a development config file.
    
-
    
 
 ```sh
 jekyll serve --no-watch

From 401f8fef5b969387b55730d74c660e2a6aa69887 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Wed, 3 Jan 2018 16:23:03 +0100
Subject: [PATCH 2704/4996] Typo

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

diff --git a/docs/_docs/usage.md b/docs/_docs/usage.md
index c71fc97a277..5f4d863fb6b 100644
--- a/docs/_docs/usage.md
+++ b/docs/_docs/usage.md
@@ -65,7 +65,7 @@ jekyll serve
 # => A development server will run at http://localhost:4000/
 # Auto-regeneration: enabled. Use `--no-watch` to disable.
 
-jekyll serve --livreload
+jekyll serve --livereload
 # LiveReload refreshes your browser after a change.
 
 jekyll serve --incremental

From c96289f4ca520e6ca74ed780d68f986f63616430 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 5 Jan 2018 09:27:08 -0500
Subject: [PATCH 2705/4996] CI: Test against Ruby 2.5.0 (#6664)

Merge pull request 6664
---
 .travis.yml  | 12 +++++-------
 appveyor.yml |  2 --
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1da8963ace7..69fe263316f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,16 +5,14 @@ language: ruby
 sudo: false
 
 rvm:
-  - &ruby1 2.4.2
-  - &ruby2 2.3.5
-  - &ruby3 2.2.8
-  - &ruby4 2.1.10
-  - &jruby jruby-9.1.14.0
+  - &ruby1 2.5.0
+  - &ruby2 2.4.3
+  - &ruby3 2.3.6
+  - &ruby4 2.2.9
+  - &jruby jruby-9.1.15.0
 
 matrix:
   include:
-    - rvm: *ruby1
-      env: TEST_SUITE=test ROUGE=1.11.1
     - rvm: *ruby1
       env: TEST_SUITE=fmt
     - rvm: *ruby1
diff --git a/appveyor.yml b/appveyor.yml
index b744534b89c..66c44d9f1eb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,8 +28,6 @@ environment:
       TEST_SUITE: "test"
     - RUBY_FOLDER_VER: "22"
       TEST_SUITE: "test"
-    - RUBY_FOLDER_VER: "21"
-      TEST_SUITE: "test"
 
 test_script:
   - ruby --version

From 7f39de67d6ecf22e4d313d282c2dc96c3670e138 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 5 Jan 2018 09:27:09 -0500
Subject: [PATCH 2706/4996] Update history to reflect merge of #6664 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 653d0a3212e..ece6aa6caea 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,3 +1,9 @@
+## HEAD
+
+### Development Fixes
+
+  * CI: Test against Ruby 2.5.0 (#6664)
+
 ## 3.7.0 / 2018-01-02
 
 ### Minor Enhancements

From 4dccca27e054d007dd45479ea465e3509470f5fd Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 6 Jan 2018 10:35:41 +0100
Subject: [PATCH 2707/4996] Docs: Mention previous config key for plugins

fix #6674
---
 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 61aed9ae5e8..e3ce9c2a9e3 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -28,7 +28,7 @@ You have 3 options for installing 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
+2. In your `_config.yml` file, add a new array with the key `plugins` (or `gems`for Jekyll < `3.5.0`) and the
    values of the gem names of the plugins you'd like to use. An example:
 
    ```yaml

From 5ef2debefba10eb8f4295f79fa4bee9dcf2961fb Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 6 Jan 2018 13:45:07 +0100
Subject: [PATCH 2708/4996] typo

---
 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 e3ce9c2a9e3..562ef73087c 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -28,7 +28,7 @@ You have 3 options for installing 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` (or `gems`for Jekyll < `3.5.0`) and the
+2. In your `_config.yml` file, add a new array with the key `plugins` (or `gems` for Jekyll < `3.5.0`) and the
    values of the gem names of the plugins you'd like to use. An example:
 
    ```yaml

From 413de6a9b3b2860d0f0947dd7cb9a51d09c20d02 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 6 Jan 2018 09:39:48 -0500
Subject: [PATCH 2709/4996] Display latest version in header (#6676)

Merge pull request 6676
---
 docs/_config.yml           |  1 +
 docs/_includes/header.html |  2 +-
 rake/site.rake             | 12 ++++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index 8ce439891cf..e91ae126cc3 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,6 +1,7 @@
 sass:
   style: compressed
 
+version: 3.7.0 # latest version displayed in header
 gauges_id: 503c5af6613f5d0f19000027
 google_analytics_id: UA-50755011-1
 google_site_verification: onQcXpAvtHBrUI5LlroHNE_FP0b2qvFyPq7VZw36iEY
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index b289550d2d8..418e04d5746 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -17,7 +17,7 @@ 
    
     
    
       
      
         
    • 
-          v{{ jekyll.version }}
+          v{{ site.version }}
         
      • 
         
    • 
           GitHub
diff --git a/rake/site.rake b/rake/site.rake
index d260e4472be..05be2f7f233 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -7,7 +7,7 @@
 #############################################################################
 
 namespace :site do
-  task :generated_pages => [:history, :version_file, :conduct, :contributing, :support]
+  task :generated_pages => [:history, :latest_version, :conduct, :contributing, :support]
 
   desc "Generate and view the site locally"
   task :preview => :generated_pages do
@@ -84,9 +84,13 @@ namespace :site 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
+  desc "Write the latest Jekyll version"
+  task :latest_version do
+    return if version =~ %r!(beta|rc|alpha)!i
+    config_file = File.join(docs_folder, "_config.yml")
+    contents = File.read(config_file)
+    File.write(config_file, contents.sub(%r!(?:version\s*:\s+)(.+)!, "version: #{version}"))
+    File.open("#{docs_folder}/latest_version.txt", "wb") { |f| f.puts(version) }
   end
 
   namespace :releases do

From a84e9e1f6df6f057d2825c594d157e52fdb46e44 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 6 Jan 2018 09:39:49 -0500
Subject: [PATCH 2710/4996] Update history to reflect merge of #6676 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ece6aa6caea..2af5aad93bd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,10 @@
 
   * CI: Test against Ruby 2.5.0 (#6664)
 
+### Site Enhancements
+
+  * Display latest version in header (#6676)
+
 ## 3.7.0 / 2018-01-02
 
 ### Minor Enhancements

From 6a827547abeda554846b3864a5955dad811d8614 Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Sat, 6 Jan 2018 16:10:31 +0000
Subject: [PATCH 2711/4996] Update version in `config.yml` via YAML load / dump
 (#6677)

Merge pull request 6677
---
 docs/_config.yml | 85 +++++++++++++++++++++---------------------------
 rake/site.rake   |  6 ++--
 2 files changed, 41 insertions(+), 50 deletions(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index e91ae126cc3..fe500a58387 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,60 +1,49 @@
-sass:
-  style: compressed
-
-version: 3.7.0 # latest version displayed in header
+---
+version: 3.7.0
+name: Jekyll • Simple, blog-aware, static sites
+description: Transform your plain text into static websites and blogs
+url: https://jekyllrb.com
+repository: https://github.com/jekyll/jekyll
+timezone: America/Los_Angeles
+twitter:
+  username: jekyllrb
+logo: "/img/logo-2x.png"
 gauges_id: 503c5af6613f5d0f19000027
 google_analytics_id: UA-50755011-1
 google_site_verification: onQcXpAvtHBrUI5LlroHNE_FP0b2qvFyPq7VZw36iEY
-
-repository: https://github.com/jekyll/jekyll
-
-timezone: America/Los_Angeles
-
-defaults:
-  -
-    scope:
-      path: "_docs"
-      type: "docs"
-    values:
-      layout: "docs"
-  -
-    scope:
-      path: "_posts"
-      type: "posts"
-    values:
-      layout: "news_item"
-      image: /img/twitter-card.png
-
 collections:
   docs:
-    permalink: /:collection/:path/
+    permalink: "/:collection/:path/"
     output: true
   posts:
-    permalink: /news/:year/:month/:day/:title/
+    permalink: "/news/:year/:month/:day/:title/"
     output: true
   tutorials:
     output: true
-
-name: Jekyll • Simple, blog-aware, static sites
-description: Transform your plain text into static websites and blogs
-url: https://jekyllrb.com
-
-twitter:
-  username: jekyllrb
-
-logo: /img/logo-2x.png
-
+defaults:
+- scope:
+    path: _docs
+    type: docs
+  values:
+    layout: docs
+- scope:
+    path: _posts
+    type: posts
+  values:
+    layout: news_item
+    image: "/img/twitter-card.png"
 plugins:
-  - jekyll-avatar
-  - jekyll-feed
-  - jekyll-mentions
-  - jekyll-redirect-from
-  - jekyll-seo-tag
-  - jekyll-sitemap
-  - jemoji
-
+- jekyll-avatar
+- jekyll-feed
+- jekyll-mentions
+- jekyll-redirect-from
+- jekyll-seo-tag
+- jekyll-sitemap
+- jemoji
+sass:
+  style: compressed
 exclude:
-  - .gitignore
-  - CNAME
-  - icomoon-selection.json
-  - readme.md
+- ".gitignore"
+- CNAME
+- icomoon-selection.json
+- readme.md
diff --git a/rake/site.rake b/rake/site.rake
index 05be2f7f233..87299a3a5ef 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -87,9 +87,11 @@ namespace :site do
   desc "Write the latest Jekyll version"
   task :latest_version do
     return if version =~ %r!(beta|rc|alpha)!i
+    require "safe_yaml/load"
     config_file = File.join(docs_folder, "_config.yml")
-    contents = File.read(config_file)
-    File.write(config_file, contents.sub(%r!(?:version\s*:\s+)(.+)!, "version: #{version}"))
+    config = SafeYAML.load_file(config_file)
+    config["version"] = version
+    File.write(config_file, YAML.dump(config))
     File.open("#{docs_folder}/latest_version.txt", "wb") { |f| f.puts(version) }
   end
 

From 7895168cff9719f20ea9932c934ef4f199d130dd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 6 Jan 2018 11:10:33 -0500
Subject: [PATCH 2712/4996] Update history to reflect merge of #6677 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2af5aad93bd..59b5942ec1c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
 ### Site Enhancements
 
   * Display latest version in header (#6676)
+  * Update version in `config.yml` via YAML load / dump (#6677)
 
 ## 3.7.0 / 2018-01-02
 

From a8a62304743fc758e5667bcbad32ad45da2bcc6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= 
Date: Sun, 7 Jan 2018 12:40:57 +0100
Subject: [PATCH 2713/4996] Fix: Add note about posts directory in context of
 custom collections directory (#6680)

Merge pull request 6680
---
 docs/_docs/collections.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index 30ea5592c65..d95e2739e76 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -49,12 +49,18 @@ defaults:
 
      
   
      Gather your collections {%- include docs_version_badge.html version="3.7.0" -%}
      
 
-  
      You can optionally specify a directory to store all your collections in the same place with collections_dir: my_collections
      
+  
      You can optionally specify a directory to store all your collections in the same place with 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.
      
 
      
 
+
      
+  
      Be sure to move posts into custom collections directory
      
+
+  
      If you specify a directory to store all your collections in the same place with collections_dir: my_collections, then you will need to move your _posts directory to my_collections/_posts.
      
+
      
+
 ### Step 2: Add your content {#step2}
 
 Create a corresponding folder (e.g. `/_my_collection`) and add

From f77d704a1b97ac43684df85e92a8738412d1725a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 7 Jan 2018 06:40:58 -0500
Subject: [PATCH 2714/4996] Update history to reflect merge of #6680 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 59b5942ec1c..efa094f30e9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -9,6 +9,10 @@
   * Display latest version in header (#6676)
   * Update version in `config.yml` via YAML load / dump (#6677)
 
+### Documentation
+
+  * Fix: Add note about posts in context of collections_dir (#6680)
+
 ## 3.7.0 / 2018-01-02
 
 ### Minor Enhancements

From 082e0623af3168fd1109b3fc992594f13fdda59e Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Sun, 14 Jan 2018 20:47:53 +0000
Subject: [PATCH 2715/4996] inform that symlinks are not allowed in safe mode
 (#6670)

Merge pull request 6670
---
 lib/jekyll/tags/include.rb | 16 +++++++++++++---
 test/test_tags.rb          |  8 +++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index e7464786454..6199251508b 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -115,9 +115,7 @@ def locate_include_file(context, file, safe)
           path = File.join(dir.to_s, file.to_s)
           return path if valid_include_file?(path, dir.to_s, safe)
         end
-        raise IOError, "Could not locate the included file '#{file}' in any of "\
-          "#{includes_dirs}. Ensure it exists in one of those directories and, "\
-          "if it is a symlink, does not point outside your site source."
+        raise IOError, could_not_locate_message(file, includes_dirs, safe)
       end
 
       def render(context)
@@ -192,6 +190,18 @@ def realpath_prefixed_with?(path, dir)
       def read_file(file, context)
         File.read(file, file_read_opts(context))
       end
+
+      private
+
+      def could_not_locate_message(file, includes_dirs, safe)
+        message = "Could not locate the included file '#{file}' in any of "\
+          "#{includes_dirs}. Ensure it exists in one of those directories and"
+        message + if safe
+                    " is not a symlink as those are not allowed in safe mode."
+                  else
+                    ", if it is a symlink, does not point outside your site source."
+                  end
+      end
     end
 
     class IncludeRelativeTag < IncludeTag
diff --git a/test/test_tags.rb b/test/test_tags.rb
index a76f0df138a..5712a9f090b 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -912,7 +912,9 @@ def highlight_block_with_opts(options_string)
         end
         assert_match(
           "Could not locate the included file 'tmp/pages-test-does-not-exist' " \
-          "in any of [\"#{source_dir}/_includes\"].",
+          "in any of [\"#{source_dir}/_includes\"]. Ensure it exists in one of " \
+          "those directories and is not a symlink as those are not allowed in " \
+          "safe mode.",
           ex.message
         )
       end
@@ -1271,8 +1273,8 @@ def highlight_block_with_opts(options_string)
           })
         end
         assert_match(
-          "Ensure it exists in one of those directories and, if it is a symlink, does " \
-          "not point outside your site source.",
+          "Ensure it exists in one of those directories and is not a symlink "\
+          "as those are not allowed in safe mode.",
           ex.message
         )
       end

From 9cc6e2a1d1e34f0cac974c8ec28ed0baee4cdcbd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 14 Jan 2018 15:47:55 -0500
Subject: [PATCH 2716/4996] Update history to reflect merge of #6670 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index efa094f30e9..6a541115e0b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -13,6 +13,10 @@
 
   * Fix: Add note about posts in context of collections_dir (#6680)
 
+### Bug Fixes
+
+  * inform that symlinks are not allowed in safe mode (#6670)
+
 ## 3.7.0 / 2018-01-02
 
 ### Minor Enhancements

From 9a88900246b246ca7f68440a186e9a5e22c67813 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Mon, 15 Jan 2018 02:58:12 +0530
Subject: [PATCH 2717/4996] require external library only if necessary (#6596)

Merge pull request 6596
---
 lib/jekyll/converters/markdown/kramdown_parser.rb  | 4 +++-
 lib/jekyll/converters/markdown/rdiscount_parser.rb | 4 +++-
 lib/jekyll/converters/markdown/redcarpet_parser.rb | 8 ++++++--
 lib/jekyll/converters/smartypants.rb               | 4 +++-
 lib/jekyll/theme.rb                                | 2 +-
 lib/jekyll/utils/rouge.rb                          | 2 +-
 lib/jekyll/utils/win_tz.rb                         | 2 +-
 7 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index bb03eaaab04..aaa32e2df00 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -14,7 +14,9 @@ class KramdownParser
         }.freeze
 
         def initialize(config)
-          Jekyll::External.require_with_graceful_fail "kramdown"
+          unless defined?(Kramdown)
+            Jekyll::External.require_with_graceful_fail "kramdown"
+          end
           @main_fallback_highlighter = config["highlighter"] || "rouge"
           @config = config["kramdown"] || {}
           @highlighter = nil
diff --git a/lib/jekyll/converters/markdown/rdiscount_parser.rb b/lib/jekyll/converters/markdown/rdiscount_parser.rb
index 654a3a6d0ed..d3493ecb8a4 100644
--- a/lib/jekyll/converters/markdown/rdiscount_parser.rb
+++ b/lib/jekyll/converters/markdown/rdiscount_parser.rb
@@ -5,7 +5,9 @@ module Converters
     class Markdown
       class RDiscountParser
         def initialize(config)
-          Jekyll::External.require_with_graceful_fail "rdiscount"
+          unless defined?(RDiscount)
+            Jekyll::External.require_with_graceful_fail "rdiscount"
+          end
           @config = config
           @rdiscount_extensions = @config["rdiscount"]["extensions"].map(&:to_sym)
         end
diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb
index 7a8c6ec5923..d148e06d206 100644
--- a/lib/jekyll/converters/markdown/redcarpet_parser.rb
+++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb
@@ -16,7 +16,9 @@ def add_code_tags(code, lang)
   module WithPygments
     include CommonMethods
     def block_code(code, lang)
-      Jekyll::External.require_with_graceful_fail("pygments")
+      unless defined?(Pygments)
+        Jekyll::External.require_with_graceful_fail("pygments")
+      end
       lang = lang && lang.split.first || "text"
       add_code_tags(
         Pygments.highlight(
@@ -60,7 +62,9 @@ def rouge_formatter(_lexer)
   end
 
   def initialize(config)
-    Jekyll::External.require_with_graceful_fail("redcarpet")
+    unless defined?(Redcarpet)
+      Jekyll::External.require_with_graceful_fail("redcarpet")
+    end
     @config = config
     @redcarpet_extensions = {}
     @config["redcarpet"]["extensions"].each do |e|
diff --git a/lib/jekyll/converters/smartypants.rb b/lib/jekyll/converters/smartypants.rb
index a3c3c1560d0..8234a41afc1 100644
--- a/lib/jekyll/converters/smartypants.rb
+++ b/lib/jekyll/converters/smartypants.rb
@@ -20,7 +20,9 @@ class SmartyPants < Converter
       priority :low
 
       def initialize(config)
-        Jekyll::External.require_with_graceful_fail "kramdown"
+        unless defined?(Kramdown)
+          Jekyll::External.require_with_graceful_fail "kramdown"
+        end
         @config = config["kramdown"].dup || {}
         @config[:input] = :SmartyPants
       end
diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb
index edd041eea5c..d392a2a69c7 100644
--- a/lib/jekyll/theme.rb
+++ b/lib/jekyll/theme.rb
@@ -38,7 +38,7 @@ def assets_path
 
     def configure_sass
       return unless sass_path
-      Jekyll::External.require_with_graceful_fail "sass"
+      External.require_with_graceful_fail("sass") unless defined?(Sass)
       Sass.load_paths << sass_path
     end
 
diff --git a/lib/jekyll/utils/rouge.rb b/lib/jekyll/utils/rouge.rb
index d1befa1a212..9ee90dacba7 100644
--- a/lib/jekyll/utils/rouge.rb
+++ b/lib/jekyll/utils/rouge.rb
@@ -5,7 +5,7 @@ module Utils
     module Rouge
 
       def self.html_formatter(*args)
-        Jekyll::External.require_with_graceful_fail("rouge")
+        Jekyll::External.require_with_graceful_fail("rouge") unless defined?(::Rouge)
         if old_api?
           ::Rouge::Formatters::HTML.new(*args)
         else
diff --git a/lib/jekyll/utils/win_tz.rb b/lib/jekyll/utils/win_tz.rb
index 322f5ac6230..239650f71fe 100644
--- a/lib/jekyll/utils/win_tz.rb
+++ b/lib/jekyll/utils/win_tz.rb
@@ -12,7 +12,7 @@ module WinTZ
       #
       # Returns a string that ultimately re-defines ENV["TZ"] in Windows
       def calculate(timezone)
-        External.require_with_graceful_fail("tzinfo")
+        External.require_with_graceful_fail("tzinfo") unless defined?(TZInfo)
         tz = TZInfo::Timezone.get(timezone)
         difference = Time.now.to_i - tz.now.to_i
         #

From 8e62993fc814ba4dbdfb621c33032a08c34bceff Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 14 Jan 2018 16:28:13 -0500
Subject: [PATCH 2718/4996] Update history to reflect merge of #6596 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6a541115e0b..d871a5917f5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,10 @@
 
   * inform that symlinks are not allowed in safe mode (#6670)
 
+### Minor Enhancements
+
+  * Require external library only if necessary (#6596)
+
 ## 3.7.0 / 2018-01-02
 
 ### Minor Enhancements

From 4a43a65969ffa8ab884d78dd641b8cfbde40c001 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 14 Jan 2018 16:35:39 -0500
Subject: [PATCH 2719/4996] Bump rdoc to 6.0 (#6600)

Merge pull request 6600
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 90ccf0a5197..f523a93a0da 100644
--- a/Gemfile
+++ b/Gemfile
@@ -76,7 +76,7 @@ group :jekyll_optional_dependencies do
   gem "jekyll-redirect-from"
   gem "kramdown", "~> 1.14"
   gem "mime-types", "~> 3.0"
-  gem "rdoc", "~> 5.0"
+  gem "rdoc", RUBY_VERSION >= "2.2.2" ? "~> 6.0" : "~> 5.1"
   gem "tomlrb", "~> 1.2"
 
   platform :ruby, :mswin, :mingw, :x64_mingw do

From 1dc0702e29f34af1a3eaf9c8657fe9da191698cf Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 14 Jan 2018 16:35:40 -0500
Subject: [PATCH 2720/4996] Update history to reflect merge of #6600 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d871a5917f5..f5e9b6d4472 100644
--- a/History.markdown
+++ b/History.markdown
@@ -3,6 +3,7 @@
 ### Development Fixes
 
   * CI: Test against Ruby 2.5.0 (#6664)
+  * Bump rdoc to 6.0 (#6600)
 
 ### Site Enhancements
 

From 2cb5375519506736c6d8b21303b98edc9e205ba2 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Mon, 15 Jan 2018 03:08:17 +0530
Subject: [PATCH 2721/4996] Update deploy-script in documentation (#6666)

Merge pull request 6666
---
 docs/_docs/deployment-methods.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/deployment-methods.md b/docs/_docs/deployment-methods.md
index 972db33667f..5bc255b4f48 100644
--- a/docs/_docs/deployment-methods.md
+++ b/docs/_docs/deployment-methods.md
@@ -66,13 +66,15 @@ server$ mkdir /var/www/myrepo
 Next, add the following lines to hooks/post-receive and be sure Jekyll is
 installed on the server:
 
-```sh
+```bash
 GIT_REPO=$HOME/myrepo.git
 TMP_GIT_CLONE=$HOME/tmp/myrepo
+GEMFILE=$TMP_GIT_CLONE/Gemfile
 PUBLIC_WWW=/var/www/myrepo
 
 git clone $GIT_REPO $TMP_GIT_CLONE
-bundle exec jekyll build -s $TMP_GIT_CLONE -d $PUBLIC_WWW
+BUNDLE_GEMFILE=$GEMFILE bundle install
+BUNDLE_GEMFILE=$GEMFILE bundle exec jekyll build -s $TMP_GIT_CLONE -d $PUBLIC_WWW
 rm -Rf $TMP_GIT_CLONE
 exit
 ```

From 603f2ea52f52cd3a64e37371349d8292f3a83655 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 14 Jan 2018 16:38:19 -0500
Subject: [PATCH 2722/4996] Update history to reflect merge of #6666 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f5e9b6d4472..f19cbf50179 100644
--- a/History.markdown
+++ b/History.markdown
@@ -13,6 +13,7 @@
 ### Documentation
 
   * Fix: Add note about posts in context of collections_dir (#6680)
+  * Update deploy-script in documentation (#6666)
 
 ### Bug Fixes
 

From 7a78da840da7dfb3d719e4d5feac236c93cec1e5 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Fri, 19 Jan 2018 16:50:23 +0100
Subject: [PATCH 2723/4996] Lint file and bump theme dependencies (#6698)

Merge pull request 6698
---
 lib/theme_template/theme.gemspec.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/theme_template/theme.gemspec.erb b/lib/theme_template/theme.gemspec.erb
index 44c8feba61a..3b41e491693 100644
--- a/lib/theme_template/theme.gemspec.erb
+++ b/lib/theme_template/theme.gemspec.erb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 Gem::Specification.new do |spec|
   spec.name          = <%= theme_name.inspect %>
@@ -6,14 +6,14 @@ Gem::Specification.new do |spec|
   spec.authors       = [<%= user_name.inspect %>]
   spec.email         = [<%= user_email.inspect %>]
 
-  spec.summary       = %q{TODO: Write a short summary, because Rubygems requires one.}
+  spec.summary       = "TODO: Write a short summary, because Rubygems requires one."
   spec.homepage      = "TODO: Put your gem's website or public repo URL here."
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(<%= theme_directories.join("|") %>|LICENSE|README)}i) }
+  spec.files         = `git ls-files -z`.split("\x0").select { |f| f.match(%r!^(<%= theme_directories.join("|") %>|LICENSE|README)!i) }
 
   spec.add_runtime_dependency "jekyll", "~> <%= jekyll_version_with_minor %>"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "rake", "~> 12.0"
 end

From 59231607569337c0ce6e180624c00649f320ea31 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 19 Jan 2018 10:50:24 -0500
Subject: [PATCH 2724/4996] Update history to reflect merge of #6698 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f19cbf50179..5c38f7a8787 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,7 @@
 
   * CI: Test against Ruby 2.5.0 (#6664)
   * Bump rdoc to 6.0 (#6600)
+  * Lint file and bump theme dependencies (#6698)
 
 ### Site Enhancements
 

From af88add27370b8abd7dde93547549eadae8c2af9 Mon Sep 17 00:00:00 2001
From: Paul Robert Lloyd 
Date: Fri, 19 Jan 2018 19:22:10 +0000
Subject: [PATCH 2725/4996] Update note about naming of collections_dir.
 (#6703)

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

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index d95e2739e76..bd57c302cfb 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -58,7 +58,7 @@ defaults:
 
      
   
      Be sure to move posts into custom collections directory
      
 
-  
      If you specify a directory to store all your collections in the same place with collections_dir: my_collections, then you will need to move your _posts directory to my_collections/_posts.
      
+  
      If you specify a directory to store all your collections in the same place with collections_dir: my_collections, then you will need to move your _posts directory to my_collections/_posts. Note that, the name of your collections directory cannot start with an underscore (`_`).
      
 
      
 
 ### Step 2: Add your content {#step2}

From 578ad7695ff6b8755fe98ba6558be7b0b4bd733b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 19 Jan 2018 14:22:12 -0500
Subject: [PATCH 2726/4996] Update history to reflect merge of #6703 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5c38f7a8787..4111a2daf8b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -15,6 +15,7 @@
 
   * Fix: Add note about posts in context of collections_dir (#6680)
   * Update deploy-script in documentation (#6666)
+  * Add note about naming of collections_dir (#6703)
 
 ### Bug Fixes
 

From 009d308f9fa92015b280d81b3a5038da45e8d144 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Sat, 20 Jan 2018 00:56:47 +0530
Subject: [PATCH 2727/4996] Glob scope path only if configured with a pattern
 (#6692)

Merge pull request 6692
---
 docs/_docs/configuration.md        | 15 ++++++++++++++-
 lib/jekyll/frontmatter_defaults.rb | 20 +++++++++++++-------
 test/test_front_matter_defaults.rb | 12 ++++++++++--
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index 63ebd047440..6f00ab535de 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -549,7 +549,9 @@ 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. {%- include docs_version_badge.html version="3.7.0" -%}
+### Glob patterns in Front Matter defaults
+
+It is also possible to use glob patterns (currently limited to patterns that contain `*`) when matching defaults. For example, it is possible to set specific layout for each `special-page.html` in any subfolder of `section` folder. {%- include docs_version_badge.html version="3.7.0" -%}
 
 ```yaml
 collections:
@@ -564,6 +566,17 @@ defaults:
       layout: "specific-layout"
 ```
 
+
      
+  
      Globbing and Performance
      
+  
      
+    Please note that globbing a path is known to have a negative effect on
+    performance and is currently not optimized, especially on Windows.
+    Globbing a path will increase your build times in proportion to the size
+    of the associated collection directory.
+  
      
+
      
+
+
 ### 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 f6b89f6bb60..be749384c6b 100644
--- a/lib/jekyll/frontmatter_defaults.rb
+++ b/lib/jekyll/frontmatter_defaults.rb
@@ -97,21 +97,27 @@ def applies?(scope, path, type)
       applies_path?(scope, path) && applies_type?(scope, type)
     end
 
+    # rubocop:disable Metrics/AbcSize
     def applies_path?(scope, path)
       return true if !scope.key?("path") || scope["path"].empty?
 
       sanitized_path = Pathname.new(sanitize_path(path))
-
-      site_path = Pathname.new(@site.source)
+      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)
+      if scope["path"].to_s.include?("*")
+        Dir.glob(abs_scope_path).each do |scope_path|
+          scope_path = Pathname.new(scope_path).relative_path_from site_path
+          Jekyll.logger.debug "Globbed Scope Path:", scope_path
+          return true if path_is_subpath?(sanitized_path, scope_path)
+        end
+        false
+      else
+        path_is_subpath?(sanitized_path, rel_scope_path)
+      end
     end
+    # rubocop:enable Metrics/AbcSize
 
     def path_is_subpath?(path, parent_path)
       path.ascend do |ascended_path|
diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb
index b1773ba0ecb..2f996a9f303 100644
--- a/test/test_front_matter_defaults.rb
+++ b/test/test_front_matter_defaults.rb
@@ -16,7 +16,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
           },
         },],
       })
-      @site.process
+      @output = capture_output { @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
@@ -25,6 +25,10 @@ class TestFrontMatterDefaults < JekyllUnitTest
       assert_equal @affected.data["key"], "val"
       assert_nil @not_affected.data["key"]
     end
+
+    should "not call Dir.glob block" do
+      refute_includes @output, "Globbed Scope Path:"
+    end
   end
 
   context "A site with full front matter defaults (glob)" do
@@ -40,7 +44,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
           },
         },],
       })
-      @site.process
+      @output = capture_output { @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
@@ -49,6 +53,10 @@ class TestFrontMatterDefaults < JekyllUnitTest
       assert_equal @affected.data["key"], "val"
       assert_nil @not_affected.data["key"]
     end
+
+    should "call Dir.glob block" do
+      assert_includes @output, "Globbed Scope Path:"
+    end
   end
 
   context "A site with front matter type pages and an extension" do

From 6b98a5c9cf38bf94b288bbefc19b9482f425bea5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 19 Jan 2018 14:26:49 -0500
Subject: [PATCH 2728/4996] Update history to reflect merge of #6692 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4111a2daf8b..81aa7205118 100644
--- a/History.markdown
+++ b/History.markdown
@@ -20,6 +20,7 @@
 ### Bug Fixes
 
   * inform that symlinks are not allowed in safe mode (#6670)
+  * Glob scope path only if configured with a pattern (#6692)
 
 ### Minor Enhancements
 

From 44ffce977c0fcba9847dd266b4ec2ff60c04e791 Mon Sep 17 00:00:00 2001
From: Alexandr 
Date: Sun, 21 Jan 2018 00:41:59 +0300
Subject: [PATCH 2729/4996] Update installation.md (#6694)

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

diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index 398b5e1a38a..e416d680ddb 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -15,9 +15,9 @@ Before you start, make sure your system has the following:
 
 - GNU/Linux, Unix, or macOS
 - [Ruby](https://www.ruby-lang.org/en/downloads/) version 2.2.5 or above, including all development
-  headers
-- [RubyGems](https://rubygems.org/pages/download)
-- [GCC](https://gcc.gnu.org/install/) and [Make](https://www.gnu.org/software/make/) (in case your system doesn't have them installed, which you can check by running `gcc -v` and `make -v` in your system's command line interface)
+  headers (ruby installation can be checked by running `ruby -v`, development headers can be checked on Ubuntu by running `apt list --installed  ruby-dev`)
+- [RubyGems](https://rubygems.org/pages/download) (which you can check by running `gem -v`)
+- [GCC](https://gcc.gnu.org/install/) and [Make](https://www.gnu.org/software/make/) (in case your system doesn't have them installed, which you can check by running `gcc -v`,`g++ -v`  and `make -v` in your system's command line interface)
 
 
      
   
      Problems installing Jekyll?
      

From 53c00c0a18a78ee005423f56170e38dededf4170 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 20 Jan 2018 16:42:00 -0500
Subject: [PATCH 2730/4996] Update history to reflect merge of #6694 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 81aa7205118..7b6fd7db2c8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Fix: Add note about posts in context of collections_dir (#6680)
   * Update deploy-script in documentation (#6666)
   * Add note about naming of collections_dir (#6703)
+  * Update installation.md (#6694)
 
 ### Bug Fixes
 

From 4490d2cfbf8727153b987c690fa794d85a14c45e Mon Sep 17 00:00:00 2001
From: Kacper Duras 
Date: Sat, 20 Jan 2018 22:45:14 +0100
Subject: [PATCH 2731/4996] Add `jekyll-html` to plugins. (#6654)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 562ef73087c..df20aad78cd 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -909,6 +909,7 @@ You can find a few useful plugins at the following locations:
   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.
 - [disqus-for-jekyll](https://github.com/kacperduras/disqus-for-jekyll): A Jekyll plugin to view the comments powered by Disqus.
+- [jekyll-html](https://github.com/kacperduras/jekyll-html): A Jekyll plugin to use HTML tags in Jekyll pages, posts and collections. 
 
 
 #### Collections

From 707dd03fb0ea50948c187501624c15e02a7e6947 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 20 Jan 2018 16:45:15 -0500
Subject: [PATCH 2732/4996] Update history to reflect merge of #6654 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7b6fd7db2c8..e4e2684caff 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
   * Update deploy-script in documentation (#6666)
   * Add note about naming of collections_dir (#6703)
   * Update installation.md (#6694)
+  * Add `jekyll-html` to plugins. (#6654)
 
 ### Bug Fixes
 

From 3f4bb55e07718526fa3bff59d1b48f88d61bdcb5 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Sat, 20 Jan 2018 17:04:52 -0500
Subject: [PATCH 2733/4996] Write a Rubocop Cop to ensure no `#p` or `#puts`
 calls get committed to master. (#6615)

Merge pull request 6615
---
 .rubocop.yml                      |  8 ++++++++
 jekyll.gemspec                    |  2 +-
 lib/jekyll/commands/help.rb       |  4 ++--
 lib/jekyll/site.rb                |  2 +-
 rubocop/jekyll.rb                 |  5 +++++
 rubocop/jekyll/no_p_allowed.rb    | 23 +++++++++++++++++++++++
 rubocop/jekyll/no_puts_allowed.rb | 23 +++++++++++++++++++++++
 test/test_filters.rb              |  1 -
 8 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 rubocop/jekyll.rb
 create mode 100644 rubocop/jekyll/no_p_allowed.rb
 create mode 100644 rubocop/jekyll/no_puts_allowed.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index 969c065ff70..09e774fdb39 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,4 +1,12 @@
 ---
+
+require:
+  - ./rubocop/jekyll
+
+Jekyll/NoPutsAllowed:
+  Exclude:
+    - rake/*.rake
+
 AllCops:
   TargetRubyVersion: 2.1
   Include:
diff --git a/jekyll.gemspec b/jekyll.gemspec
index b434881cace..e00cdb001ab 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.homepage      = "https://github.com/jekyll/jekyll"
 
   all_files       = `git ls-files -z`.split("\x0")
-  s.files         = all_files.grep(%r!^(exe|lib)/|^.rubocop.yml$!)
+  s.files         = all_files.grep(%r!^(exe|lib|rubocop)/|^.rubocop.yml$!)
   s.executables   = all_files.grep(%r!^exe/!) { |f| File.basename(f) }
   s.bindir        = "exe"
   s.require_paths = ["lib"]
diff --git a/lib/jekyll/commands/help.rb b/lib/jekyll/commands/help.rb
index 42a8017ae8a..80c80e9aeac 100644
--- a/lib/jekyll/commands/help.rb
+++ b/lib/jekyll/commands/help.rb
@@ -12,9 +12,9 @@ def init_with_program(prog)
             c.action do |args, _|
               cmd = (args.first || "").to_sym
               if args.empty?
-                puts prog
+                Jekyll.logger.info prog.to_s
               elsif prog.has_command? cmd
-                puts prog.commands[cmd]
+                Jekyll.logger.info prog.commands[cmd].to_s
               else
                 invalid_command(prog, cmd)
                 abort
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 2af8e09e62c..9510bb4c0eb 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -77,7 +77,7 @@ def process
     end
 
     def print_stats
-      puts @liquid_renderer.stats_table
+      Jekyll.logger.info @liquid_renderer.stats_table
     end
 
     # Reset Site details.
diff --git a/rubocop/jekyll.rb b/rubocop/jekyll.rb
new file mode 100644
index 00000000000..31236b8ab15
--- /dev/null
+++ b/rubocop/jekyll.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Dir[File.join(File.expand_path("jekyll", __dir__), "*.rb")].each do |ruby_file|
+  require ruby_file
+end
diff --git a/rubocop/jekyll/no_p_allowed.rb b/rubocop/jekyll/no_p_allowed.rb
new file mode 100644
index 00000000000..cc7d997b71f
--- /dev/null
+++ b/rubocop/jekyll/no_p_allowed.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "rubocop"
+
+module RuboCop
+  module Cop
+    module Jekyll
+      class NoPAllowed < Cop
+        MSG = "Avoid using `p` to print things. Use `Jekyll.logger` instead.".freeze
+
+        def_node_search :p_called?, <<-PATTERN
+        (send _ :p _)
+        PATTERN
+
+        def on_send(node)
+          if p_called?(node)
+            add_offense(node, :location => :selector)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/rubocop/jekyll/no_puts_allowed.rb b/rubocop/jekyll/no_puts_allowed.rb
new file mode 100644
index 00000000000..a666aacbfc3
--- /dev/null
+++ b/rubocop/jekyll/no_puts_allowed.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "rubocop"
+
+module RuboCop
+  module Cop
+    module Jekyll
+      class NoPutsAllowed < Cop
+        MSG = "Avoid using `puts` to print things. Use `Jekyll.logger` instead.".freeze
+
+        def_node_search :puts_called?, <<-PATTERN
+        (send nil? :puts _)
+        PATTERN
+
+        def on_send(node)
+          if puts_called?(node)
+            add_offense(node, :location => :selector)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/test/test_filters.rb b/test/test_filters.rb
index afedf7467bc..bd782ea8010 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -779,7 +779,6 @@ def to_liquid
       should "include the size of each grouping" do
         grouping = @filter.group_by(@filter.site.pages, "layout")
         grouping.each do |g|
-          p g
           assert_equal(
             g["items"].size,
             g["size"],

From 8ee052d4548c8582f570fb33ec8d68342345099d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 20 Jan 2018 17:04:54 -0500
Subject: [PATCH 2734/4996] Update history to reflect merge of #6615 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e4e2684caff..ae07a46edd2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -5,6 +5,7 @@
   * CI: Test against Ruby 2.5.0 (#6664)
   * Bump rdoc to 6.0 (#6600)
   * Lint file and bump theme dependencies (#6698)
+  * Write a Rubocop Cop to ensure no `#p` or `#puts` calls get committed to master. (#6615)
 
 ### Site Enhancements
 

From 83a6aebb2d23106fae0ef56c484781ac32e3da17 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 22 Jan 2018 21:36:30 +0100
Subject: [PATCH 2735/4996] Docs: Showcase sites and themes

---
 docs/help/index.md | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/help/index.md b/docs/help/index.md
index 925195404af..abc7ea2adba 100644
--- a/docs/help/index.md
+++ b/docs/help/index.md
@@ -5,10 +5,15 @@ title: Getting Help
 
 Need help with Jekyll? Try these resources.
 
+### [Documentation](/docs/home/)
+
+Start with our official guide to Jekyll covering installation, writing, customization, deployment, and more.
+
 ### [Jekyll Talk](https://talk.jekyllrb.com/)
 
-Jekyll Talk is our official Discourse forum. Here, users and contributors
+Our official Discourse forum. Here, users and contributors
 can ask questions and discuss all aspects of Jekyll.
+Also the place to [showcase your jekyll sites](https://talk.jekyllrb.com/t/jekyll-showcase-share-your-sites-built-with-jekyll/44/80) and [share your jekyll themes](https://talk.jekyllrb.com/t/jekyll-theme-showcase-share-your-jekyll-themes/1382/2).
 
 ### [Jekyll on StackOverflow](https://stackoverflow.com/questions/tagged/jekyll)
 
@@ -21,9 +26,9 @@ question!
 Get live support at **#jekyll** on **irc.freenode.net**, the official
 Jekyll IRC channel.
 
-### [Documentation](/docs/home/)
+### View source
 
-Our guide to Jekyll covering installation, writing, customization, deployment, and more.
+Learn from the source of others, you'll find plenty of [jekyll sites](https://github.com/topics/jekyll-site) and [jekyll themes](https://github.com/topics/jekyll-themes) carefully handcrafted on GitHub.
 
 ### [Tutorials](/tutorials/home)
 
@@ -38,10 +43,6 @@ Known breaking changes are listed in the upgrading docs.
 
 Watch videos from members of the Jekyll community speak about interesting use cases, tricks they've learned or meta Jekyll topics.
 
-### [View source](https://github.com/jekyll/jekyll/wiki/sites)
-
-Learn from the source of others' Jekyll-powered sites.
-
 ### [Google](https://www.google.com/?q=jekyll)
 
 Add **jekyll** to almost any query, and you'll find just what you need.

From 4d68304dea43be48bb79af20067fc38a7bf81095 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Wed, 24 Jan 2018 20:46:35 +0530
Subject: [PATCH 2736/4996] add gem "wdm" to all newly generated Gemfiles
 (#6711)

Merge pull request 6711
---
 lib/jekyll/commands/new.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index f930d4d7ff8..3947ce43a3e 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -89,6 +89,9 @@ def gemfile_contents
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
+# Performance-booster for watching directories on Windows
+gem "wdm", "~> 0.1.0" if Gem.win_platform?
+
 RUBY
         end
 

From 85cd6105dfc285067c906643d6201dd4584e8819 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 24 Jan 2018 10:16:37 -0500
Subject: [PATCH 2737/4996] Update history to reflect merge of #6711 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ae07a46edd2..49e8f8b9f0c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,7 @@
   * Bump rdoc to 6.0 (#6600)
   * Lint file and bump theme dependencies (#6698)
   * Write a Rubocop Cop to ensure no `#p` or `#puts` calls get committed to master. (#6615)
+  * Add gem "wdm" to all newly generated Gemfiles (#6711)
 
 ### Site Enhancements
 

From 00cb17d3c4c1ead1be6edecd428c06c382224422 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Wed, 24 Jan 2018 16:20:01 +0100
Subject: [PATCH 2738/4996] Update History.markdown

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

diff --git a/History.markdown b/History.markdown
index 49e8f8b9f0c..5fb9d16e54f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,7 +6,6 @@
   * Bump rdoc to 6.0 (#6600)
   * Lint file and bump theme dependencies (#6698)
   * Write a Rubocop Cop to ensure no `#p` or `#puts` calls get committed to master. (#6615)
-  * Add gem "wdm" to all newly generated Gemfiles (#6711)
 
 ### Site Enhancements
 
@@ -25,6 +24,7 @@
 
   * inform that symlinks are not allowed in safe mode (#6670)
   * Glob scope path only if configured with a pattern (#6692)
+  * Add gem "wdm" to all newly generated Gemfiles (#6711)
 
 ### Minor Enhancements
 

From 07ec68a5d03984ee2301eddfc1b589b7a50f1359 Mon Sep 17 00:00:00 2001
From: Hendrik Schneider 
Date: Thu, 25 Jan 2018 16:37:05 +0100
Subject: [PATCH 2739/4996] Update plugins.md (#6716)

Merge pull request 6716
---
 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 df20aad78cd..1348f36d1b2 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -920,7 +920,7 @@ You can find a few useful plugins at the following locations:
 
 #### Other
 
-- [Analytics for Jekyll](https://github.com/hendrikschneider/jekyll-analytics) by Hendrik Schneider: An effortless way to add  various trackers like Google Analytics, Piwik, etc. to your site
+- [Analytics for Jekyll](https://github.com/hendrikschneider/jekyll-analytics) by Hendrik Schneider: An effortless way to add various trackers like Google Analytics, Matomo (formerly Piwik), mPulse, etc. to your site.
 - [ditaa-ditaa](https://github.com/tmthrgd/ditaa-ditaa) by Tom Thorogood: a drastic revision of jekyll-ditaa that renders diagrams drawn using ASCII art into PNG images.
 - [Pygments Cache Path by Raimonds Simanovskis](https://github.com/rsim/blog.rayapps.com/blob/master/_plugins/pygments_cache_patch.rb): Plugin to cache syntax-highlighted code from Pygments.
 - [Draft/Publish Plugin by Michael Ivey](https://gist.github.com/49630): Save posts as drafts.

From 2ab15486a6187fc3ed0fa85f20fe35d089bce109 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 25 Jan 2018 10:37:06 -0500
Subject: [PATCH 2740/4996] Update history to reflect merge of #6716 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5fb9d16e54f..0c8f43d4856 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
   * Add note about naming of collections_dir (#6703)
   * Update installation.md (#6694)
   * Add `jekyll-html` to plugins. (#6654)
+  * Update plugins.md (#6716)
 
 ### Bug Fixes
 

From 731960e6e3f5ef3be64009b51c9197bf55694c4c Mon Sep 17 00:00:00 2001
From: Chayoung You 
Date: Fri, 26 Jan 2018 00:42:50 +0900
Subject: [PATCH 2741/4996] Remove redgreen gem as reflect of #204, 093a5ef
 (#6720)

Merge pull request 6720
---
 Gemfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index f523a93a0da..99af78c443d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,7 +48,6 @@ group :test_legacy do
   gem "minitest"
   gem "minitest-profile"
   gem "minitest-reporters"
-  gem "redgreen"
   gem "shoulda"
   gem "simplecov"
 end

From c9d2da8722f431d454fb68b1fa4ca199837e14c3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 25 Jan 2018 10:42:51 -0500
Subject: [PATCH 2742/4996] Update history to reflect merge of #6720 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0c8f43d4856..40d649843c3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,7 @@
   * Bump rdoc to 6.0 (#6600)
   * Lint file and bump theme dependencies (#6698)
   * Write a Rubocop Cop to ensure no `#p` or `#puts` calls get committed to master. (#6615)
+  * Remove redgreen gem (#6720)
 
 ### Site Enhancements
 

From cf5c689d9414c7ba5b6300e44178b2735faf8c06 Mon Sep 17 00:00:00 2001
From: Florian Thomas 
Date: Thu, 25 Jan 2018 23:43:56 +0800
Subject: [PATCH 2743/4996] Fix timezone incosistencies between different ruby
 version (#6697)

Merge pull request 6697
---
 features/permalinks.feature                 | 10 ++---
 features/step_definitions.rb                |  4 ++
 lib/jekyll/document.rb                      |  2 +-
 test/source/_dates/date_without_time.md     |  4 ++
 test/source/_dates/time_with_timezone.md    |  4 ++
 test/source/_dates/time_without_timezone.md |  4 ++
 test/test_document.rb                       | 43 +++++++++++++++++++++
 7 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 test/source/_dates/date_without_time.md
 create mode 100644 test/source/_dates/time_with_timezone.md
 create mode 100644 test/source/_dates/time_without_timezone.md

diff --git a/features/permalinks.feature b/features/permalinks.feature
index ca0482fce90..a69e059bf94 100644
--- a/features/permalinks.feature
+++ b/features/permalinks.feature
@@ -71,14 +71,14 @@ Feature: Fancy permalinks
     And I should see "Totally custom." in "_site/03-27-2009/custom-permalink-schema.html"
 
   Scenario: Use custom permalink schema with date and time
-    Given I have a _posts directory
+    Given I have a configuration file with:
+    | key         | value              |
+    | permalink   | "/:year:month:day:hour:minute:second.html" |
+    | timezone    | UTC                |
+    And I have a _posts directory
     And I have the following post:
       | title                   | category | date                | content         |
       | Custom Permalink Schema | stuff    | 2009-03-27 22:31:07 | Totally custom. |
-    And I have a configuration file with:
-      | key         | value              |
-      | permalink   | "/:year:month:day:hour:minute:second.html" |
-      | timezone    | UTC                |
     When I run jekyll build
     Then I should get a zero exit status
     And the _site directory should exist
diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index c69cc0891d3..f4e80e770d9 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -4,6 +4,7 @@
   FileUtils.rm_rf(Paths.test_dir) if Paths.test_dir.exist?
   FileUtils.mkdir_p(Paths.test_dir) unless Paths.test_dir.directory?
   Dir.chdir(Paths.test_dir)
+  @timezone_before_scenario = ENV["TZ"]
 end
 
 #
@@ -13,6 +14,7 @@
   Paths.output_file.delete if Paths.output_file.exist?
   Paths.status_file.delete if Paths.status_file.exist?
   Dir.chdir(Paths.test_dir.parent)
+  ENV["TZ"] = @timezone_before_scenario
 end
 
 #
@@ -85,6 +87,7 @@
 
     if status == "post"
       parsed_date = Time.xmlschema(input_hash["date"]) rescue Time.parse(input_hash["date"])
+      input_hash["date"] = parsed_date
       filename = "#{parsed_date.strftime("%Y-%m-%d")}-#{title}.#{ext}"
     end
 
@@ -116,6 +119,7 @@
       {}
     end
   config[key] = YAML.load(value)
+  Jekyll.set_timezone(value) if key == "timezone"
   File.write("_config.yml", YAML.dump(config))
 end
 
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 1eb8418605e..f7a05a12d0f 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -426,7 +426,7 @@ def merge_categories!(other)
 
     private
     def merge_date!(source)
-      if data.key?("date") && !data["date"].is_a?(Time)
+      if data.key?("date")
         data["date"] = Utils.parse_date(
           data["date"].to_s,
           "Document '#{relative_path}' does not have a valid date in the #{source}."
diff --git a/test/source/_dates/date_without_time.md b/test/source/_dates/date_without_time.md
new file mode 100644
index 00000000000..7e5ee003808
--- /dev/null
+++ b/test/source/_dates/date_without_time.md
@@ -0,0 +1,4 @@
+---
+date: 2015-10-01
+---
+Here is the content.
diff --git a/test/source/_dates/time_with_timezone.md b/test/source/_dates/time_with_timezone.md
new file mode 100644
index 00000000000..5a7c9277bc0
--- /dev/null
+++ b/test/source/_dates/time_with_timezone.md
@@ -0,0 +1,4 @@
+---
+date: 2015-10-01 01:00:00 +0800
+---
+Here is the content.
diff --git a/test/source/_dates/time_without_timezone.md b/test/source/_dates/time_without_timezone.md
new file mode 100644
index 00000000000..ae0423e10cb
--- /dev/null
+++ b/test/source/_dates/time_without_timezone.md
@@ -0,0 +1,4 @@
+---
+date: 2015-10-01 01:00:00
+---
+Here is the content.
diff --git a/test/test_document.rb b/test/test_document.rb
index 6ce71230680..213271c8b87 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -16,6 +16,19 @@ def setup_encoded_document(filename)
     }).tap(&:read)
   end
 
+  def setup_document_with_dates(filename)
+    site = fixture_site("collections" => ["dates"])
+    site.process
+    docs = nil
+    with_env("TZ", "UTC") do
+      docs = Document.new(site.in_source_dir(File.join("_dates", filename)), {
+        :site       => site,
+        :collection => site.collections["dates"],
+      }).tap(&:read)
+    end
+    docs
+  end
+
   context "a document in a collection" do
     setup do
       @site = fixture_site({
@@ -558,4 +571,34 @@ def setup_encoded_document(filename)
       Jekyll::Renderer.new(@document.site, @document).render_document
     end
   end
+
+  context "a document with a date with timezone" do
+    setup do
+      @document = setup_document_with_dates "time_with_timezone.md"
+    end
+
+    should "have the expected date" do
+      assert_equal "2015/09/30", @document.data["date"].strftime("%Y/%m/%d")
+    end
+  end
+
+  context "a document with a date with time but without timezone" do
+    setup do
+      @document = setup_document_with_dates "time_without_timezone.md"
+    end
+
+    should "have the expected date" do
+      assert_equal "2015/10/01", @document.data["date"].strftime("%Y/%m/%d")
+    end
+  end
+
+  context "a document with a date without time" do
+    setup do
+      @document = setup_document_with_dates "date_without_time.md"
+    end
+
+    should "have the expected date" do
+      assert_equal "2015/10/01", @document.data["date"].strftime("%Y/%m/%d")
+    end
+  end
 end

From c8d729830c4f0a9de8176d5e61de9546a8e63bfc Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 25 Jan 2018 10:43:58 -0500
Subject: [PATCH 2744/4996] Update history to reflect merge of #6697 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 40d649843c3..ef9fad1292e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -27,6 +27,7 @@
   * inform that symlinks are not allowed in safe mode (#6670)
   * Glob scope path only if configured with a pattern (#6692)
   * Add gem "wdm" to all newly generated Gemfiles (#6711)
+  * Fix timezone incosistencies between different ruby version (#6697)
 
 ### Minor Enhancements
 

From a6b4ce0928a63d383fc0aa46dce45dc0f69faac2 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Thu, 25 Jan 2018 21:15:35 +0530
Subject: [PATCH 2745/4996] Refactor collections_dir feature for consistency
 (#6685)

Merge pull request 6685
---
 features/collections_dir.feature | 161 +++++++++++++++++++++++++++++++
 features/step_definitions.rb     |  24 +++++
 lib/jekyll/collection.rb         |  17 ++--
 lib/jekyll/document.rb           |  17 ++--
 lib/jekyll/reader.rb             |  16 +++
 lib/jekyll/site.rb               |   9 ++
 lib/jekyll/static_file.rb        |   7 +-
 7 files changed, 235 insertions(+), 16 deletions(-)
 create mode 100644 features/collections_dir.feature

diff --git a/features/collections_dir.feature b/features/collections_dir.feature
new file mode 100644
index 00000000000..9572f568653
--- /dev/null
+++ b/features/collections_dir.feature
@@ -0,0 +1,161 @@
+Feature: Collections Directory
+  As a hacker who likes to structure content without clutter
+  I want to be able to organize my collections under a single directory
+  And render them from there
+
+  Scenario: Custom collections_dir containing only posts
+    And I have a collections/_posts directory
+    And I have the following post within the "collections" directory:
+      | title         | date       | content         |
+      | Gathered Post | 2009-03-27 | Random Content. |
+    And I have a "_config.yml" file with content:
+    """
+    collections_dir: collections
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Random Content." in "_site/2009/03/27/gathered-post.html"
+
+  Scenario: Rendered collection in custom collections_dir also containing posts
+    Given I have a collections/_puppies directory
+    And I have the following document under the "puppies" collection within the "collections" directory:
+      | title  | date       | content            |
+      | Rover  | 2007-12-31 | content for Rover. |
+    And I have a collections/_posts directory
+    And I have the following post within the "collections" directory:
+      | title         | date       | content         |
+      | Gathered Post | 2009-03-27 | Random Content. |
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      puppies:
+        output: true
+
+    collections_dir: collections
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And the "_site/puppies/rover.html" file should exist
+    And I should see "Random Content." in "_site/2009/03/27/gathered-post.html"
+
+  Scenario: Rendered collection in custom collections_dir with posts at the site root
+    Given I have a collections/_puppies directory
+    And I have the following document under the "puppies" collection within the "collections" directory:
+      | title  | date       | content            |
+      | Rover  | 2007-12-31 | content for Rover. |
+    And I have a _posts directory
+    And I have the following post:
+      | title        | date       | content         |
+      | Post At Root | 2009-03-27 | Random Content. |
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      puppies:
+        output: true
+
+    collections_dir: collections
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And the "_site/puppies/rover.html" file should exist
+    And the "_site/2009/03/27/post-at-root.html" file should not exist
+    And the _site/_posts directory should not exist
+
+  Scenario: Rendered collection in custom collections_dir also containing drafts
+    Given I have a collections/_puppies directory
+    And I have the following document under the "puppies" collection within the "collections" directory:
+      | title  | date       | content            |
+      | Rover  | 2007-12-31 | content for Rover. |
+    And I have a collections/_drafts directory
+    And I have the following draft within the "collections" directory:
+      | title          | date       | content         |
+      | Gathered Draft | 2009-03-27 | Random Content. |
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      puppies:
+        output: true
+
+    collections_dir: collections
+    """
+    When I run jekyll build --drafts
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And the "_site/puppies/rover.html" file should exist
+    And I should see "Random Content." in "_site/2009/03/27/gathered-draft.html"
+    And the _site/collections directory should not exist
+
+  Scenario: Rendered collection in custom collections_dir with drafts at the site root
+    Given I have a collections/_puppies directory
+    And I have the following document under the "puppies" collection within the "collections" directory:
+      | title  | date       | content            |
+      | Rover  | 2007-12-31 | content for Rover. |
+    And I have a _drafts directory
+    And I have the following draft:
+      | title         | date       | content         |
+      | Draft At Root | 2009-03-27 | Random Content. |
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      puppies:
+        output: true
+
+    collections_dir: collections
+    """
+    When I run jekyll build --drafts
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And the "_site/puppies/rover.html" file should exist
+    And the "_site/2009/03/27/draft-at-root.html" file should not exist
+
+  Scenario: A complex site with collections posts and drafts at various locations
+    Given I have a gathering/_puppies directory
+    And I have a gathering/_posts directory
+    And I have a gathering/_drafts directory
+    And I have a _puppies directory
+    And I have a _posts directory
+    And I have a _drafts directory
+    And I have the following document under the "puppies" collection within the "gathering" directory:
+      | title               | date       | content            |
+      | Rover in Gathering  | 2007-12-31 | content for Rover. |
+    And I have the following document under the puppies collection:
+      | title               | date       | content            |
+      | Rover At Root       | 2007-12-31 | content for Rover. |
+    And I have the following post within the "gathering" directory:
+      | title               | date       | content            |
+      | Post in Gathering   | 2009-03-27 | Totally nothing.   |
+    And I have the following post:
+      | title               | date       | content            |
+      | Post At Root        | 2009-03-27 | Totally nothing.   |
+    And I have the following draft within the "gathering" directory:
+      | title               | date       | content            |
+      | Draft In Gathering  | 2009-03-27 | This is a draft.   |
+    And I have the following draft:
+      | title               | date       | content            |
+      | Draft At Root       | 2009-03-27 | This is a draft.   |
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      puppies:
+        output: true
+
+    collections_dir: gathering
+    """
+    And I have a "gathering/_puppies/static_file.txt" file that contains "Static content."
+    And I have a gathering/_puppies/nested directory
+    And I have a "gathering/_puppies/nested/static_file.txt" file that contains "Nested Static content."
+    When I run jekyll build --drafts
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And the "_site/puppies/rover-in-gathering.html" file should exist
+    And the "_site/2009/03/27/post-in-gathering.html" file should exist
+    And the "_site/2009/03/27/draft-in-gathering.html" file should exist
+    And the "_site/2009/03/27/draft-at-root.html" file should not exist
+    And the "_site/puppies/rover-at-root.html" file should not exist
+    And I should see exactly "Static content." in "_site/puppies/static_file.txt"
+    And I should see exactly "Nested Static content." in "_site/puppies/nested/static_file.txt"
+    And the _site/gathering directory should not exist
+    And the _site/_posts directory should not exist
diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index f4e80e770d9..4bd023dfc7f 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -98,6 +98,20 @@
 
 #
 
+Given(%r!^I have the following (draft|post)s? within the "(.*)" directory:$!) do |type, folder, table|
+  table.hashes.each do |input_hash|
+    title = slug(input_hash["title"])
+    parsed_date = Time.xmlschema(input_hash["date"]) rescue Time.parse(input_hash["date"])
+
+    filename = type == "draft" ? "#{title}.markdown" : "#{parsed_date.strftime("%Y-%m-%d")}-#{title}.markdown"
+
+    path = File.join(folder, "_#{type}s", filename)
+    File.write(path, file_content_from_hash(input_hash))
+  end
+end
+
+#
+
 Given(%r!^I have the following documents? under the (.*) collection:$!) do |folder, table|
   table.hashes.each do |input_hash|
     title = slug(input_hash["title"])
@@ -111,6 +125,16 @@
 
 #
 
+Given(%r!^I have the following documents? under the "(.*)" collection within the "(.*)" directory:$!) do |label, dir, table|
+  table.hashes.each do |input_hash|
+    title = slug(input_hash["title"])
+    path = File.join(dir, "_#{label}", "#{title}.md")
+    File.write(path, file_content_from_hash(input_hash))
+  end
+end
+
+#
+
 Given(%r!^I have a configuration file with "(.*)" set to "(.*)"$!) do |key, value|
   config = \
     if source_dir.join("_config.yml").exist?
diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index 51c2f98ff3f..2ec4d20d2e3 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -95,14 +95,13 @@ def filtered_entries
         end
     end
 
-    # The directory for this Collection, relative to the site source.
+    # The directory for this Collection, relative to the site source or the directory
+    # containing the collection.
     #
     # Returns a String containing the directory name where the collection
     #   is stored on the filesystem.
     def relative_directory
-      @relative_directory ||= Pathname.new(directory).relative_path_from(
-        Pathname.new(site.source)
-      ).to_s
+      @relative_directory ||= "_#{label}"
     end
 
     # The full path to the directory containing the collection.
@@ -111,7 +110,7 @@ def relative_directory
     #   is stored on the filesystem.
     def directory
       @directory ||= site.in_source_dir(
-        File.join(site.config["collections_dir"], "_#{label}")
+        File.join(container, relative_directory)
       )
     end
 
@@ -125,7 +124,7 @@ def directory
     #   is stored on the filesystem.
     def collection_dir(*files)
       return directory if files.empty?
-      site.in_source_dir(relative_directory, *files)
+      site.in_source_dir(container, relative_directory, *files)
     end
 
     # Checks whether the directory "exists" for this collection.
@@ -204,6 +203,12 @@ def extract_metadata
 
     private
 
+    def container
+      @container ||= site.config["collections_dir"]
+    end
+
+    private
+
     def read_document(full_path)
       doc = Jekyll::Document.new(full_path, :site => site, :collection => self)
       doc.read
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index f7a05a12d0f..ab17afc3aa4 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -78,12 +78,13 @@ def draft?
         collection.label == "posts"
     end
 
-    # The path to the document, relative to the site source.
+    # The path to the document, relative to the collections_dir.
     #
-    # Returns a String path which represents the relative path
-    #   from the site source to this document
+    # Returns a String path which represents the relative path from the collections_dir
+    # to this document.
     def relative_path
-      @relative_path ||= Pathutil.new(path).relative_path_from(site.source).to_s
+      @relative_path ||=
+        Pathutil.new(path).relative_path_from(site.collections_path).to_s
     end
 
     # The output extension of the document.
@@ -399,11 +400,9 @@ def categories_from_path(special_dir)
     def populate_categories
       merge_data!({
         "categories" => (
-        Array(data["categories"]) + Utils.pluralized_array_from_hash(
-          data,
-          "category",
-          "categories"
-        )
+          Array(data["categories"]) + Utils.pluralized_array_from_hash(
+            data, "category", "categories"
+          )
         ).map(&:to_s).flatten.uniq,
       })
     end
diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 7b5c3b158ea..0a08be87e3f 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -62,6 +62,7 @@ def read_directories(dir = "")
     #
     # Returns nothing.
     def retrieve_posts(dir)
+      return if outside_configured_directory?(dir)
       site.posts.docs.concat(PostReader.new(site).read_posts(dir))
       site.posts.docs.concat(PostReader.new(site).read_drafts(dir)) if site.show_drafts
     end
@@ -130,5 +131,20 @@ def get_entries(dir, subfolder)
       entries = Dir.chdir(base) { filter_entries(Dir["**/*"], base) }
       entries.delete_if { |e| File.directory?(site.in_source_dir(base, e)) }
     end
+
+    private
+
+    # Internal
+    #
+    # Determine if the directory is supposed to contain posts and drafts.
+    # If the user has defined a custom collections_dir, then attempt to read
+    # posts and drafts only from within that directory.
+    #
+    # Returns true if a custom collections_dir has been set but current directory lies
+    # outside that directory.
+    def outside_configured_directory?(dir)
+      collections_dir = site.config["collections_dir"]
+      !collections_dir.empty? && !dir.start_with?("/#{collections_dir}")
+    end
   end
 end
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 9510bb4c0eb..8cd86fffc4b 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -391,6 +391,15 @@ def in_dest_dir(*paths)
       end
     end
 
+    # Public: The full path to the directory that houses all the collections registered
+    # with the current site.
+    #
+    # Returns the source directory or the absolute path to the custom collections_dir
+    def collections_path
+      dir_str = config["collections_dir"]
+      @collections_path ||= dir_str.empty? ? source : in_source_dir(dir_str)
+    end
+
     # Limits the current posts; removes the posts which exceed the limit_posts
     #
     # Returns nothing
diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index fd537107f56..cdc785655d4 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -40,7 +40,12 @@ def initialize(site, base, dir, name, collection = nil)
 
     # Returns source file path.
     def path
-      File.join(*[@base, @dir, @name].compact)
+      # Static file is from a collection inside custom collections directory
+      if !@collection.nil? && !@site.config["collections_dir"].empty?
+        File.join(*[@base, @site.config["collections_dir"], @dir, @name].compact)
+      else
+        File.join(*[@base, @dir, @name].compact)
+      end
     end
 
     # Obtain destination path.

From 641545821da2c86908fbcc73f7e8d0eb58f8f5ca Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 25 Jan 2018 10:45:36 -0500
Subject: [PATCH 2746/4996] Update history to reflect merge of #6685 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ef9fad1292e..6e7468e89ca 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * Glob scope path only if configured with a pattern (#6692)
   * Add gem "wdm" to all newly generated Gemfiles (#6711)
   * Fix timezone incosistencies between different ruby version (#6697)
+  * Refactor collections_dir feature for consistency (#6685)
 
 ### Minor Enhancements
 

From 5ca193eed99ca35401bcee28f2495554225dba68 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Thu, 25 Jan 2018 23:34:16 +0530
Subject: [PATCH 2747/4996] Release v3.7.1 (#6695)

Merge pull request 6695
---
 .../2018-01-25-jekyll-3-7-1-released.md       | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 docs/_posts/2018-01-25-jekyll-3-7-1-released.md

diff --git a/docs/_posts/2018-01-25-jekyll-3-7-1-released.md b/docs/_posts/2018-01-25-jekyll-3-7-1-released.md
new file mode 100644
index 00000000000..fa4f121b4aa
--- /dev/null
+++ b/docs/_posts/2018-01-25-jekyll-3-7-1-released.md
@@ -0,0 +1,66 @@
+---
+title: "Jekyll 3.7.1 Released"
+date: 2018-01-25 22:22:22 +0530
+author: ashmaroli
+version: 3.7.1
+categories: [release]
+---
+
+Close on the heels of shipping 3.7.0, we were informed of a couple of
+regressions due to the changes made in that release. In due time, Team Jekyll
+set out to address those issues as early as possible.
+
+Days later here we're, announcing 3.7.1 that fixes numerous issues! :tada:
+The highlights being:
+
+  * A major regression in 3.7.0 was that when a Front Matter Default was
+    configured with a `scope["path"]` set to a directory, Jekyll would scan
+    that directory for any subfolders and files, for each document in that
+    `path`.
+    Though this is intended, it increases build times in proportion to the size
+    of the directory.
+
+    We addressed this by having Jekyll scan the directory path only if the user
+    explicitly configures the `scope["path"]` using wildcards.
+
+    Read our [documentation](/docs/configuration/#glob-patterns-in-front-matter-defaults)
+    for more details.
+
+    A huge shout-out to @mmistakes for bringing this to our notice and
+    additionally providing us with a test repository to aid in resolving the issue.
+
+  * Another regression reported was related to our "Custom collections
+    directory" feature introduced in 3.7.0.
+
+    Users setting `collection_dir` to a certain directory would have *altered*
+    paths to their posts still at the root of their site's source. This
+    roughly translated to 404 errors on URLs to their posts.
+
+    Props to @localheinz for bringing this regression to our notice.
+
+    We decided to resolve this by having Jekyll ignore posts and drafts at the
+    root of the site's source directory if the user customizes the
+    `collection_dir` setting.
+
+    Ergo, if you set a custom location for your collections, please ensure you
+    move all of your collections into that directory. **This includes posts and
+    drafts as well**. Your links generated by
+    `{% raw %}{% post_url %}{% endraw %}` or `{% raw %}{% link %}{% endraw %}`
+    will adapt automatically.
+
+  * We also found out that `gem "wdm"` boosts performance while directories are
+    being watched on Windows. So we recommend having it included in your Gemfile
+    for a better development experience on Windows. (Newly generated Gemfiles
+    will hereafter have that gem listed automatically :wink:)
+
+In addition to the above, numerous other minor fixes and documentation updates
+have been made that should improve your Jekyll experience. All of which, would
+not have been possible without our wonderful contributors:
+
+Alexandr, Andreas Möller, Ashwin Maroli, Chayoung You, Florian Thomas,
+Frank Taillandier, Hendrik Schneider, Kacper Duras, Olivia, Parker Moore and
+Paul Robert Lloyd.
+
+As always, you can see our full changelog on [the History page](/docs/history/).
+
+Happy Jekylling! :sparkles:

From b2086eb1d4ac4574eba81e626a4bf11da4275fbe Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 25 Jan 2018 13:04:18 -0500
Subject: [PATCH 2748/4996] Update history to reflect merge of #6695 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6e7468e89ca..4d73d4e3971 100644
--- a/History.markdown
+++ b/History.markdown
@@ -21,6 +21,7 @@
   * Update installation.md (#6694)
   * Add `jekyll-html` to plugins. (#6654)
   * Update plugins.md (#6716)
+  * Release v3.7.1 (#6695)
 
 ### Bug Fixes
 

From 50b9858d3a2fbcc4abefc19de608a41f8af34368 Mon Sep 17 00:00:00 2001
From: olivia 
Date: Thu, 25 Jan 2018 19:10:24 +0100
Subject: [PATCH 2749/4996] Release :gem: 3.7.1


From 0c4eff0653f04217c180337107870e5b670e2576 Mon Sep 17 00:00:00 2001
From: olivia 
Date: Thu, 25 Jan 2018 19:21:00 +0100
Subject: [PATCH 2750/4996] Prepare for 3.7.1 release

---
 History.markdown        |  2 +-
 docs/_docs/history.md   | 43 +++++++++++++++++++++++++++++++++++++++++
 docs/latest_version.txt |  2 +-
 lib/jekyll/version.rb   |  2 +-
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/History.markdown b/History.markdown
index 4d73d4e3971..9504939d7e5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,4 +1,4 @@
-## HEAD
+## 3.7.1 / 2018-01-25
 
 ### Development Fixes
 
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index db4a74ac119..ace22e25300 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,49 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.7.1 / 2018-01-25
+{: #v3-7-1}
+
+### Development Fixes
+{: #development-fixes-v3-7-1}
+
+- CI: Test against Ruby 2.5.0 ([#6664]({{ site.repository }}/issues/6664))
+- Bump rdoc to 6.0 ([#6600]({{ site.repository }}/issues/6600))
+- Lint file and bump theme dependencies ([#6698]({{ site.repository }}/issues/6698))
+- Write a Rubocop Cop to ensure no `#p` or `#puts` calls get committed to master. ([#6615]({{ site.repository }}/issues/6615))
+- Remove redgreen gem ([#6720]({{ site.repository }}/issues/6720))
+
+### Site Enhancements
+{: #site-enhancements-v3-7-1}
+
+- Display latest version in header ([#6676]({{ site.repository }}/issues/6676))
+- Update version in `config.yml` via YAML load / dump ([#6677]({{ site.repository }}/issues/6677))
+
+### Documentation
+
+- Fix: Add note about posts in context of collections_dir ([#6680]({{ site.repository }}/issues/6680))
+- Update deploy-script in documentation ([#6666]({{ site.repository }}/issues/6666))
+- Add note about naming of collections_dir ([#6703]({{ site.repository }}/issues/6703))
+- Update installation.md ([#6694]({{ site.repository }}/issues/6694))
+- Add `jekyll-html` to plugins. ([#6654]({{ site.repository }}/issues/6654))
+- Update plugins.md ([#6716]({{ site.repository }}/issues/6716))
+- Release v3.7.1 ([#6695]({{ site.repository }}/issues/6695))
+
+### Bug Fixes
+{: #bug-fixes-v3-7-1}
+
+- inform that symlinks are not allowed in safe mode ([#6670]({{ site.repository }}/issues/6670))
+- Glob scope path only if configured with a pattern ([#6692]({{ site.repository }}/issues/6692))
+- Add gem "wdm" to all newly generated Gemfiles ([#6711]({{ site.repository }}/issues/6711))
+- Fix timezone incosistencies between different ruby version ([#6697]({{ site.repository }}/issues/6697))
+- Refactor collections_dir feature for consistency ([#6685]({{ site.repository }}/issues/6685))
+
+### Minor Enhancements
+{: #minor-enhancements-v3-7-1}
+
+- Require external library only if necessary ([#6596]({{ site.repository }}/issues/6596))
+
+
 ## 3.7.0 / 2018-01-02
 {: #v3-7-0}
 
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index 7c69a55dbb1..a76ccff2a6e 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.7.0
+3.7.1
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 8597ff199bb..3c9c6a00495 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "3.7.0".freeze
+  VERSION = "3.7.1".freeze
 end

From 50dbf1ace788e1f99ec6ddf2b3ea1d5720e5d56f Mon Sep 17 00:00:00 2001
From: olivia 
Date: Thu, 25 Jan 2018 19:22:48 +0100
Subject: [PATCH 2751/4996] Release :gem: 3.7.1


From c04f4e901a6ed5f76986104bc022144f68fd4067 Mon Sep 17 00:00:00 2001
From: olivia 
Date: Thu, 25 Jan 2018 19:32:54 +0100
Subject: [PATCH 2752/4996] We're skipping 3.6.1

---
 History.markdown        |  2 +-
 docs/_docs/history.md   | 12 ++++++------
 docs/latest_version.txt |  2 +-
 lib/jekyll/version.rb   |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/History.markdown b/History.markdown
index 9504939d7e5..b5d70118cf9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,4 +1,4 @@
-## 3.7.1 / 2018-01-25
+## 3.7.2 / 2018-01-25
 
 ### Development Fixes
 
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index ace22e25300..4e65e235e0d 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,11 +4,11 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
-## 3.7.1 / 2018-01-25
-{: #v3-7-1}
+## 3.7.2 / 2018-01-25
+{: #v3-7-2}
 
 ### Development Fixes
-{: #development-fixes-v3-7-1}
+{: #development-fixes-v3-7-2}
 
 - CI: Test against Ruby 2.5.0 ([#6664]({{ site.repository }}/issues/6664))
 - Bump rdoc to 6.0 ([#6600]({{ site.repository }}/issues/6600))
@@ -17,7 +17,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Remove redgreen gem ([#6720]({{ site.repository }}/issues/6720))
 
 ### Site Enhancements
-{: #site-enhancements-v3-7-1}
+{: #site-enhancements-v3-7-2}
 
 - Display latest version in header ([#6676]({{ site.repository }}/issues/6676))
 - Update version in `config.yml` via YAML load / dump ([#6677]({{ site.repository }}/issues/6677))
@@ -33,7 +33,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Release v3.7.1 ([#6695]({{ site.repository }}/issues/6695))
 
 ### Bug Fixes
-{: #bug-fixes-v3-7-1}
+{: #bug-fixes-v3-7-2}
 
 - inform that symlinks are not allowed in safe mode ([#6670]({{ site.repository }}/issues/6670))
 - Glob scope path only if configured with a pattern ([#6692]({{ site.repository }}/issues/6692))
@@ -42,7 +42,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Refactor collections_dir feature for consistency ([#6685]({{ site.repository }}/issues/6685))
 
 ### Minor Enhancements
-{: #minor-enhancements-v3-7-1}
+{: #minor-enhancements-v3-7-2}
 
 - Require external library only if necessary ([#6596]({{ site.repository }}/issues/6596))
 
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index a76ccff2a6e..0b2eb36f508 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.7.1
+3.7.2
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 3c9c6a00495..ed2594ff773 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "3.7.1".freeze
+  VERSION = "3.7.2".freeze
 end

From ece1a307c57e89522390374ff174bbde7034c3b0 Mon Sep 17 00:00:00 2001
From: olivia 
Date: Thu, 25 Jan 2018 19:33:16 +0100
Subject: [PATCH 2753/4996] Bump version in docs config.yml

---
 docs/_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index fe500a58387..2132c22e05e 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,5 +1,5 @@
 ---
-version: 3.7.0
+version: 3.7.2
 name: Jekyll • Simple, blog-aware, static sites
 description: Transform your plain text into static websites and blogs
 url: https://jekyllrb.com

From 053acd31ac69f915d2e5035dac8a6c6e71ad413c Mon Sep 17 00:00:00 2001
From: olivia 
Date: Thu, 25 Jan 2018 19:34:49 +0100
Subject: [PATCH 2754/4996] Release :gem: 3.7.2


From 0978bbe12070132cce322a43a9c336f0cd323201 Mon Sep 17 00:00:00 2001
From: olivia 
Date: Thu, 25 Jan 2018 19:38:08 +0100
Subject: [PATCH 2755/4996] update release post

---
 ...7-1-released.md => 2018-01-25-jekyll-3-7-2-released.md} | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename docs/_posts/{2018-01-25-jekyll-3-7-1-released.md => 2018-01-25-jekyll-3-7-2-released.md} (93%)

diff --git a/docs/_posts/2018-01-25-jekyll-3-7-1-released.md b/docs/_posts/2018-01-25-jekyll-3-7-2-released.md
similarity index 93%
rename from docs/_posts/2018-01-25-jekyll-3-7-1-released.md
rename to docs/_posts/2018-01-25-jekyll-3-7-2-released.md
index fa4f121b4aa..2d3b8785170 100644
--- a/docs/_posts/2018-01-25-jekyll-3-7-1-released.md
+++ b/docs/_posts/2018-01-25-jekyll-3-7-2-released.md
@@ -1,8 +1,8 @@
 ---
-title: "Jekyll 3.7.1 Released"
+title: "Jekyll 3.7.2 Released"
 date: 2018-01-25 22:22:22 +0530
 author: ashmaroli
-version: 3.7.1
+version: 3.7.2
 categories: [release]
 ---
 
@@ -10,7 +10,8 @@ Close on the heels of shipping 3.7.0, we were informed of a couple of
 regressions due to the changes made in that release. In due time, Team Jekyll
 set out to address those issues as early as possible.
 
-Days later here we're, announcing 3.7.1 that fixes numerous issues! :tada:
+Days later here we're, announcing 3.7.2 (sorry for skipping 3.7.1, 
+RubyGems didn't want to play nice) that fixes numerous issues! :tada:
 The highlights being:
 
   * A major regression in 3.7.0 was that when a Front Matter Default was

From 5d12f318b3d67d9570a352a4c26636ec0edbd5ea Mon Sep 17 00:00:00 2001
From: olivia 
Date: Sat, 27 Jan 2018 20:02:10 +0100
Subject: [PATCH 2756/4996] update post username from "pup" to "oe"

---
 docs/_posts/2017-10-19-diversity-open-source.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_posts/2017-10-19-diversity-open-source.markdown b/docs/_posts/2017-10-19-diversity-open-source.markdown
index 0b1e24eccbb..f5267de6f95 100644
--- a/docs/_posts/2017-10-19-diversity-open-source.markdown
+++ b/docs/_posts/2017-10-19-diversity-open-source.markdown
@@ -1,7 +1,7 @@
 ---
 title: "Diversity in Open Source, and Jekyll's role in it"
 date: 2017-10-19 21:33:00 +0200
-author: pup
+author: oe
 categories: [community]
 ---
 

From 8b72fa3fbf78e399c84a1e9b5bf08c2a3aeb8d22 Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Mon, 29 Jan 2018 22:06:38 +0530
Subject: [PATCH 2757/4996] move duplicate code to a single private method
 (#6593)

Merge pull request 6593
---
 lib/jekyll/site.rb | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 8cd86fffc4b..fafa3dd6557 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -458,10 +458,7 @@ def configure_file_read_opts
     def render_docs(payload)
       collections.each_value do |collection|
         collection.docs.each do |document|
-          if regenerator.regenerate?(document)
-            document.output = Jekyll::Renderer.new(self, document, payload).run
-            document.trigger_hooks(:post_render)
-          end
+          render_regenerated(document, payload)
         end
       end
     end
@@ -469,11 +466,15 @@ def render_docs(payload)
     private
     def render_pages(payload)
       pages.flatten.each do |page|
-        if regenerator.regenerate?(page)
-          page.output = Jekyll::Renderer.new(self, page, payload).run
-          page.trigger_hooks(:post_render)
-        end
+        render_regenerated(page, payload)
       end
     end
+
+    private
+    def render_regenerated(document, payload)
+      return unless regenerator.regenerate?(document)
+      document.output = Jekyll::Renderer.new(self, document, payload).run
+      document.trigger_hooks(:post_render)
+    end
   end
 end

From 138a12c481a98645ebd6287c1623d12e8be8e46b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 29 Jan 2018 11:36:39 -0500
Subject: [PATCH 2758/4996] Update history to reflect merge of #6593 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b5d70118cf9..9fc00102d83 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,3 +1,9 @@
+## HEAD
+
+### Development Fixes
+
+  * move duplicate code to a single private method (#6593)
+
 ## 3.7.2 / 2018-01-25
 
 ### Development Fixes

From b4985d1e63cc9bbbdb947f2d09b3fd97874c1e76 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Wed, 31 Jan 2018 15:32:51 -0500
Subject: [PATCH 2759/4996] Two massive performance improvements for large
 sites (#6730)

Merge pull request 6730
---
 lib/jekyll/document.rb        |  2 +-
 lib/jekyll/drops/site_drop.rb | 10 ++++++++++
 lib/jekyll/related_posts.rb   |  2 +-
 lib/jekyll/renderer.rb        | 10 +++-------
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index ab17afc3aa4..4697a146a68 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -358,7 +358,7 @@ def id
     #
     # Returns an Array of related Posts.
     def related_posts
-      Jekyll::RelatedPosts.new(self).build
+      @related_posts ||= Jekyll::RelatedPosts.new(self).build
     end
 
     # Override of normal respond_to? to match method_missing's logic for
diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb
index 632f81ce118..0a9002fee2f 100644
--- a/lib/jekyll/drops/site_drop.rb
+++ b/lib/jekyll/drops/site_drop.rb
@@ -37,6 +37,16 @@ def collections
         @site_collections ||= @obj.collections.values.sort_by(&:label).map(&:to_liquid)
       end
 
+      # `{{ site.related_posts }}` is how posts can get posts related to
+      # them, either through LSI if it's enabled, or through the most
+      # recent posts.
+      # We should remove this in 4.0 and switch to `{{ post.related_posts }}`.
+      def related_posts
+        return nil unless @current_document.is_a?(Jekyll::Document)
+        @current_document.related_posts
+      end
+      attr_writer :current_document
+
       # return nil for `{{ site.config }}` even if --config was passed via CLI
       def config; end
 
diff --git a/lib/jekyll/related_posts.rb b/lib/jekyll/related_posts.rb
index fcccdd80eeb..4ad16ef4b7f 100644
--- a/lib/jekyll/related_posts.rb
+++ b/lib/jekyll/related_posts.rb
@@ -46,7 +46,7 @@ def lsi_related_posts
     end
 
     def most_recent_posts
-      @most_recent_posts ||= (site.posts.docs.reverse - [post]).first(10)
+      @most_recent_posts ||= (site.posts.docs.last(11).reverse - [post]).first(10)
     end
   end
 end
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index 1f83e2e56aa..26637139d83 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -52,7 +52,7 @@ def run
       Jekyll.logger.debug "Rendering:", document.relative_path
 
       assign_pages!
-      assign_related_posts!
+      assign_current_document!
       assign_highlighter_options!
       assign_layout_data!
 
@@ -217,12 +217,8 @@ def assign_pages!
     #
     # Returns nothing
     private
-    def assign_related_posts!
-      if document.is_a?(Document) && document.collection.label == "posts"
-        payload["site"]["related_posts"] = document.related_posts
-      else
-        payload["site"]["related_posts"] = nil
-      end
+    def assign_current_document!
+      payload["site"].current_document = document
     end
 
     # Set highlighter prefix and suffix

From 23491541f630b1e4857fc9eb0a5f2ce5e067bed2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 31 Jan 2018 15:32:53 -0500
Subject: [PATCH 2760/4996] Update history to reflect merge of #6730 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9fc00102d83..a68078c59a3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,10 @@
 
   * move duplicate code to a single private method (#6593)
 
+### Minor Enhancements
+
+  * Two massive performance improvements for large sites (#6730)
+
 ## 3.7.2 / 2018-01-25
 
 ### Development Fixes

From bc06e241eaa9adfd66f718a7814b90a0a9ef9bae Mon Sep 17 00:00:00 2001
From: ashmaroli 
Date: Thu, 1 Feb 2018 02:25:55 +0530
Subject: [PATCH 2761/4996] replace simple regex with a native Ruby method
 (#6732)

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

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 0a08be87e3f..da2d1e1d16f 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -78,7 +78,7 @@ def retrieve_dirs(_base, dir, dot_dirs)
       dot_dirs.each do |file|
         dir_path = site.in_source_dir(dir, file)
         rel_path = File.join(dir, file)
-        unless @site.dest.sub(%r!/$!, "") == dir_path
+        unless @site.dest.chomp("/") == dir_path
           @site.reader.read_directories(rel_path)
         end
       end

From 3fb325998d1bfa55642841d71f73ffa01c925138 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 31 Jan 2018 15:55:57 -0500
Subject: [PATCH 2762/4996] Update history to reflect merge of #6732 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a68078c59a3..2a0efecd835 100644
--- a/History.markdown
+++ b/History.markdown
@@ -3,6 +3,7 @@
 ### Development Fixes
 
   * move duplicate code to a single private method (#6593)
+  * Replace simple regex with a native Ruby method (#6732)
 
 ### Minor Enhancements
 

From 6563350deda60e6bd884eba5f1922c1ff94294ea Mon Sep 17 00:00:00 2001
From: Tim Carry 
Date: Thu, 1 Feb 2018 21:02:40 +0100
Subject: [PATCH 2763/4996] Adding the jekyll-algolia plugin to the list of
 plugins (#6737)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 1348f36d1b2..f5adb0c9222 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -964,6 +964,7 @@ You can find a few useful plugins at the following locations:
 - [jekyll-numbered-headings](https://github.com/muratayusuke/jekyll-numbered-headings): Adds ordered number to headings.
 - [jekyll-pre-commit](https://github.com/mpchadwick/jekyll-pre-commit): A framework for running checks against your posts using a git pre-commit hook before you publish them.
 - [jekyll-pwa-plugin](https://github.com/lavas-project/jekyll-pwa): A plugin provides PWA support for Jekyll. It generates a service worker in Jekyll build process and makes precache and runtime cache available in the runtime with Google Workbox.
+- [jekyll-algolia](https://community.algolia.com/jekyll-algolia/): Add fast and relevant search to your Jekyll site through the Algolia API.
 
 
      
   
      Jekyll Plugins Wanted
      

From 19cd07f059350ecb891918148a4a91af00e4a4d6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 1 Feb 2018 15:02:41 -0500
Subject: [PATCH 2764/4996] Update history to reflect merge of #6737 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2a0efecd835..a88d514a8b9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,5 +1,7 @@
 ## HEAD
 
+  * Adding the jekyll-algolia plugin to the list of plugins (#6737)
+
 ### Development Fixes
 
   * move duplicate code to a single private method (#6593)

From 0f2c27bcb0a491a1eca0c2f801139992377bd6e2 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 3 Feb 2018 23:12:42 +0100
Subject: [PATCH 2765/4996] update link to Sass example

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

diff --git a/docs/_docs/assets.md b/docs/_docs/assets.md
index b31cf16cfe3..1ead08af464 100644
--- a/docs/_docs/assets.md
+++ b/docs/_docs/assets.md
@@ -53,7 +53,7 @@ sass:
 The Sass converter will default the `sass_dir` configuration option to
 `_sass`.
 
-[example-sass]: https://github.com/jekyll/jekyll-sass-converter/tree/master/example
+[example-sass]: https://github.com/jekyll/jekyll-sass-converter/tree/master/docs
 
 
      
   
      The sass_dir is only used by Sass
      

From 64c98ef08beea82436d23e5850ed05c2765206d2 Mon Sep 17 00:00:00 2001
From: Jakob Vad Nielsen 
Date: Tue, 6 Feb 2018 19:17:23 +0100
Subject: [PATCH 2766/4996] Update plugins.md (#6750)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index f5adb0c9222..28f878c1736 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -786,6 +786,7 @@ LESS.js files during generation.
 - [Tweetsert](https://github.com/ibrado/jekyll-tweetsert): Imports tweets (Twitter statuses) as new posts. Features multiple timeline support, hashtag import, filtering, automatic category and/or tags, optional retweets and replies.
 - [Stickyposts](https://github.com/ibrado/jekyll-stickyposts): Moves or copies (pins) posts marked `sticky: true` to the top of the list. Perfect for keeping important announcements on the home page, or giving collections a descriptive entry. Paginator friendly.
 - [Jekyll::Paginate::Content](https://github.com/ibrado/jekyll-paginate-content): Content paginator in the style of jekyll-paginator-v2 that splits pages, posts, and collection entries into several pages. Specify a separator or use HTML <h1> etc. headers. Automatic splitting, single-page view, pager/trail, self-adjusting links, multipage TOC, SEO support.
+- [Premonition](https://github.com/amedia/premonition): Adds block-styled side content to your page. For example summary, notes, hints or warning boxes.
 
 #### Converters
 

From 17065444e9738a44166401096507299b76421d3b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 6 Feb 2018 13:17:25 -0500
Subject: [PATCH 2767/4996] Update history to reflect merge of #6750 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a88d514a8b9..e01c39d742f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,6 +1,7 @@
 ## HEAD
 
   * Adding the jekyll-algolia plugin to the list of plugins (#6737)
+  * Added Premonition plugin to liste of plugins (#6750)
 
 ### Development Fixes
 

From 1727db8ee59f7c9f5500909d857adeefd585c4ed Mon Sep 17 00:00:00 2001
From: olivia 
Date: Tue, 6 Feb 2018 19:20:27 +0100
Subject: [PATCH 2768/4996] fix contribution title in history document

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

diff --git a/History.markdown b/History.markdown
index e01c39d742f..53e1b738c7d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,7 +1,7 @@
 ## HEAD
 
   * Adding the jekyll-algolia plugin to the list of plugins (#6737)
-  * Added Premonition plugin to liste of plugins (#6750)
+  * Added Premonition plugin to list of plugins (#6750)
 
 ### Development Fixes
 

From 4c9166a9e1eeddef0c6c25abfce0763e54960b51 Mon Sep 17 00:00:00 2001
From: olivia 
Date: Wed, 7 Feb 2018 11:11:46 +0100
Subject: [PATCH 2769/4996] Add document on releasing a new version (#6745)

Merge pull request 6745
---
 docs/_docs/maintaining/avoiding-burnout.md    |  4 +-
 docs/_docs/maintaining/index.md               | 15 ++--
 .../maintaining/merging-a-pull-request.md     |  8 +-
 .../maintaining/releasing-a-new-version.md    | 81 +++++++++++++++++++
 4 files changed, 95 insertions(+), 13 deletions(-)
 create mode 100644 docs/_docs/maintaining/releasing-a-new-version.md

diff --git a/docs/_docs/maintaining/avoiding-burnout.md b/docs/_docs/maintaining/avoiding-burnout.md
index e6acf4028e6..ea9f88a2c84 100644
--- a/docs/_docs/maintaining/avoiding-burnout.md
+++ b/docs/_docs/maintaining/avoiding-burnout.md
@@ -7,11 +7,11 @@ title: "Avoiding Burnout"
 
 # 1. Use Jekyll
 
-Maintainers of Jekyll should be using it regularly. This is partly because you won't be a good maintainer unless you can put yourself in the shoes of our users but also because you may decide to stop using Jekyll and at that point you should also decide not to be a maintainer and find other things to work on.
+Maintainers of Jekyll should be using it regularly. This is partly because you won't be a good maintainer unless you can put yourself in the shoes of our users, but also because you may at some point decide to stop using Jekyll, and at that point you should also decide to stop being a maintainer and find other things to work on.
 
 # 2. No Guilt About Leaving
 
-All maintainers can stop working on Jekyll at any time without any guilt or explanation (like a job). We may still ask for your help with questions after you leave but you are under no obligation to answer them. Like a job, if you create a big mess and then leave you still have no obligations but we may think less of you (or, realistically, probably just revert the problematic work). Like a job, you should probably take a break from Jekyll at least a few times a year.
+All maintainers can stop working on Jekyll at any time without any guilt or explanation (like at a job). We may still ask for your help with questions after you leave but you are under no obligation to answer them. If you create a big mess and then leave you still have no obligations but we may think less of you (or, realistically, probably just revert the problematic work). Also, you should probably take a break from Jekyll at least a few times a year.
 
 This also means contributors should be consumers. If a maintainer finds they are not using a project in the real-world, they should reconsider their involvement with the project.
 
diff --git a/docs/_docs/maintaining/index.md b/docs/_docs/maintaining/index.md
index 383bc6eeb64..645030e28c9 100644
--- a/docs/_docs/maintaining/index.md
+++ b/docs/_docs/maintaining/index.md
@@ -8,13 +8,14 @@ permalink: /docs/maintaining/
 
 Hello! This is where we document various processes for maintaining Jekyll. Being a maintainer for any Jekyll project is a big responsibility, so we put together some helpful documentation for various tasks you might do as a maintainer.
 
-1. [Affinity teams & their captains](affinity-team-captain/)
-2. [Triaging and issue](triaging-an-issue/)
-3. [Reviewing a pull request](reviewing-a-pull-request/)
-4. [Merging a pull request](merging-a-pull-request/)
-5. [Avoiding burnout](avoiding-burnout/)
-6. [Special Labels](special-labels/)
+- [Affinity teams & their captains](affinity-team-captain/)
+- [Triaging an issue](triaging-an-issue/)
+- [Reviewing a pull request](reviewing-a-pull-request/)
+- [Merging a pull request](merging-a-pull-request/)
+- [Avoiding burnout](avoiding-burnout/)
+- [Special Labels](special-labels/)
+- [Releasing a new version](releasing-a-new-version/)
 
 Interested in becoming a maintainer? Here is some documentation for **contributors**:
 
-1. [Becoming a maintainer](becoming-a-maintainer/)
+- [Becoming a maintainer](becoming-a-maintainer/)
diff --git a/docs/_docs/maintaining/merging-a-pull-request.md b/docs/_docs/maintaining/merging-a-pull-request.md
index ec5599bb019..c89e7e4a13d 100644
--- a/docs/_docs/maintaining/merging-a-pull-request.md
+++ b/docs/_docs/maintaining/merging-a-pull-request.md
@@ -16,7 +16,7 @@ All pull requests should be subject to code review. Code review is a [foundation
 We have [a helpful little bot](https://github.com/jekyllbot) which we use to merge pull requests. We don't use the GitHub.com interface for two reasons:
 
 1. You can't modify anything on mobile (e.g. titles, labels)
-2. Provide a consistent paper trail in the `History.markdown` file for each release
+2. We like to provide a consistent paper trail in the `History.markdown` file for each release
 
 To merge a pull request, leave a comment thanking the contributor, then add the special merge request:
 
@@ -30,12 +30,12 @@ The merge request is made up of three things:
 
 1. `@jekyllbot:` – this is the prefix our bot looks for when processing commands
 2. `merge` – the command
-3. `+dev` – the category to which the changes belong
+3. `+dev` – the category to which the changes belong.
 
-The categories match the H3's in the history/changelog file, and they are:
+The categories match the headings in the `History.markdown` file, and they are:
 
 1. Major Enhancements (`+major`) – major updates or breaking changes to the code which necessitate a major version bump (v3 ~> v4)
-2. Minor Enhancements (`+minor`) – minor updates (feature, enhancement) which necessitate a minor version bump (v3.1 ~> v3.2)
+2. Minor Enhancements (`+minor`) – minor updates (with the labels `feature` or `enhancement`) which necessitate a minor version bump (v3.1 ~> v3.2)
 3. Bug Fixes (`+bug`) – corrections to code which do not change or add functionality, which necessitate a patch version bump (v3.1.0 ~> v3.1.1)
 4. Documentation (`+doc`) - changes to the documentation found in `docs/_docs/`
 5. Site Enhancements (`+site`) – changes to the source of [https://jekyllrb.com](https://jekyllrb.com) found in `docs/`
diff --git a/docs/_docs/maintaining/releasing-a-new-version.md b/docs/_docs/maintaining/releasing-a-new-version.md
new file mode 100644
index 00000000000..6d6750fc6c2
--- /dev/null
+++ b/docs/_docs/maintaining/releasing-a-new-version.md
@@ -0,0 +1,81 @@
+---
+title: "Releasing a new version"
+---
+
+**This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
+{: .note .info }
+
+The most important thing to understand before making a release is that there's no need to feel nervous. Most things are revertable, and even if you do publish an incomplete gem version, we can always skip that one. Don't hestitate to contact the other maintainers if you feel unsure or don't know what to do next.
+
+### Bump the version
+
+The only important place you need to manually bump the version is in `lib/jekyll/version.rb`. Adjust that, and everything else should work fine.
+
+### Update the history document
+
+Replace the first header of the history document with a version milestone. This looks like the following:
+
+```diff
+-## HEAD
++## 3.7.1 / 2018-01-25
+```
+
+Adjust the version number and the date. The `## HEAD` heading will be regenerated next time a pull request is merged.
+
+Once you've done this, update the website by running the following command:
+
+```sh
+bundle exec rake site:generate
+```
+
+This updates the website's changelog, and pushes the versions in various other places.
+
+It's recommended that you go over the `History.markdown` file manually one more time, in case there are any spelling errors or such. Feel free to fix those manually, and after you're done generating the website changelog, commit your changes.
+
+## Write a release post
+
+In case this isn't done already, you can generate a new release post using the included `rake` command:
+
+```sh
+bundle exec rake site:releases:new[3.8.0]
+```
+
+where `3.8.0` should be replaced with the new version. Then, write the post. Be sure to thank all of the collaborators and maintainers who have contributed since the last release. You can generate a log of their names using the following command:
+
+```sh
+git shortlog -sn master...v3.7.2
+```
+
+where, again `v3.7.2` is the last release. Be sure to open a pull request for your release post.
+
+### Push the version
+
+Before you do this step, make sure the following things are done:
+
+- You have permission to push a new gem version to RubyGems
+- You're logged into RubyGems on your command line
+- A release post has been prepared, and is ideally already live
+- All of the prior steps are done, committed, and pushed to `master`
+
+Really the only thing left to do is to run this command:
+
+```sh
+bundle exec rake release
+```
+
+This will automatically build the new gem, make a release commit and tag and then push the new gem to RubyGems. Don't worry about creating a GitHub release, @jekyllbot should take care of that.
+
+And then, you're done! :tada: Feel free to celebrate!
+
+If you have access to the [@jekyllrb](https://twitter.com/jekyllrb) Twitter account, you should tweet the release post from there. If not, just ask another maintainer to do it or to give you access.
+
+## For non-core gems
+
+If you're not a maintainer for `jekyll/jekyll`, the procedure is much simpler in a lot of cases. Generally, the procedure still looks like this:
+
+- Bump the gem version manually, usually in `lib//version.rb`
+- Adjust the history file
+- Run `bundle exec rake release` or `script/release`, depending on which of the two exists
+- Rejoice
+
+Be sure to ask your project's maintainers if you're unsure!

From 68dee159c57baea40a3e936e91082a62d56c69bf Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 7 Feb 2018 05:11:47 -0500
Subject: [PATCH 2770/4996] Update history to reflect merge of #6745 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 53e1b738c7d..afd10282659 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,10 @@
 
   * Two massive performance improvements for large sites (#6730)
 
+### Documentation
+
+  * Add document on releasing a new version (#6745)
+
 ## 3.7.2 / 2018-01-25
 
 ### Development Fixes

From d343b0345e78f176816343e4bd92ef5f9c7ab2ad Mon Sep 17 00:00:00 2001
From: olivia 
Date: Wed, 7 Feb 2018 11:16:41 +0100
Subject: [PATCH 2771/4996] fix uncategorized entries in history file

---
 History.markdown | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/History.markdown b/History.markdown
index afd10282659..5c97d0b1f57 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,8 +1,5 @@
 ## HEAD
 
-  * Adding the jekyll-algolia plugin to the list of plugins (#6737)
-  * Added Premonition plugin to list of plugins (#6750)
-
 ### Development Fixes
 
   * move duplicate code to a single private method (#6593)
@@ -14,6 +11,8 @@
 
 ### Documentation
 
+  * Adding the jekyll-algolia plugin to the list of plugins (#6737)
+  * Added Premonition plugin to list of plugins (#6750)
   * Add document on releasing a new version (#6745)
 
 ## 3.7.2 / 2018-01-25

From 49b040c94e061f890193d08928ee811e9498f108 Mon Sep 17 00:00:00 2001
From: KajMagnus 
Date: Wed, 7 Feb 2018 11:35:15 +0100
Subject: [PATCH 2772/4996] Mention Talkyard, a new commenting system for
 Jekyll and others. (#6752)

Merge pull request 6752
---
 docs/_docs/resources.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/_docs/resources.md b/docs/_docs/resources.md
index 35963e22087..f81d34e7fe7 100644
--- a/docs/_docs/resources.md
+++ b/docs/_docs/resources.md
@@ -32,6 +32,7 @@ Jekyll's growing use is producing a wide variety of tutorials, frameworks, exten
   - [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)
+  - [Talkyard](https://www.talkyard.io/blog-comments): Embedded comments for Jekyll and others (free and open source, or hosted serverless)
   - [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.
@@ -41,6 +42,8 @@ Jekyll's growing use is producing a wide variety of tutorials, frameworks, exten
 
 - [How I'm using Jekyll in 2016](https://mademistakes.com/articles/using-jekyll-2016/)
 
+- [Talkyard comments instructions for Jekyll](https://jekyll-demo.talkyard.io/2018/01/09/installation-instructions.html)
+
 - [Static Comments with Jekyll & Staticman](https://mademistakes.com/articles/improving-jekyll-static-comments/)
 
 - [Adding Ajax pagination to Jekyll](https://eduardoboucas.com/blog/2014/11/05/adding-ajax-pagination-to-jekyll.html)

From 8077019fc1ba961312ecff4add6654bd22b4806e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 7 Feb 2018 05:35:16 -0500
Subject: [PATCH 2773/4996] Update history to reflect merge of #6752 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5c97d0b1f57..3ed066d1174 100644
--- a/History.markdown
+++ b/History.markdown
@@ -14,6 +14,7 @@
   * Adding the jekyll-algolia plugin to the list of plugins (#6737)
   * Added Premonition plugin to list of plugins (#6750)
   * Add document on releasing a new version (#6745)
+  * Mention Talkyard, a new commenting system for Jekyll and others. (#6752)
 
 ## 3.7.2 / 2018-01-25
 

From 067d1e907f113429e2de0603948987db5d123282 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 7 Feb 2018 08:54:11 -0500
Subject: [PATCH 2774/4996] Remove links to Gists (#6751)

Merge pull request 6751
---
 docs/_docs/plugins.md | 43 ++-----------------------------------------
 1 file changed, 2 insertions(+), 41 deletions(-)

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 28f878c1736..9cd906e42f4 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -753,10 +753,6 @@ You can find a few useful plugins at the following locations:
 
 #### Generators
 
-- [ArchiveGenerator by Ilkka Laukkanen](https://gist.github.com/707909): Uses [this archive page](https://gist.github.com/707020) to generate archives.
-- [LESS.js Generator by Andy Fowler](https://gist.github.com/642739): Renders
-LESS.js files during generation.
-- [Version Reporter by Blake Smith](https://gist.github.com/449491): Creates a version.html file containing the Jekyll version.
 - [Sitemap.xml Generator by Michael Levin](https://github.com/kinnetica/jekyll-plugins): Generates a sitemap.xml file by traversing all of the available posts and pages.
 - [Full-text search by Pascal Widdershoven](https://github.com/PascalW/jekyll_indextank): Adds full-text search to your Jekyll site with a plugin and a bit of JavaScript.
 - [AliasGenerator by Thomas Mango](https://github.com/tsmango/jekyll_alias_generator): Generates redirect pages for posts when an alias is specified in the YAML Front Matter.
@@ -772,7 +768,6 @@ LESS.js files during generation.
 - [Typescript Generator by Matt Sheehan](https://github.com/sheehamj13/jekyll_ts): Generate Javascript on build from your Typescript.
 - [Jekyll::AutolinkEmail by Ivan Tse](https://github.com/ivantsepp/jekyll-autolink_email): Autolink your emails.
 - [Jekyll::GitMetadata by Ivan Tse](https://github.com/ivantsepp/jekyll-git_metadata): Expose Git metadata for your templates.
-- [Jekyll Http Basic Auth Plugin](https://gist.github.com/snrbrnjna/422a4b7e017192c284b3): Plugin to manage http basic auth for jekyll generated pages and directories.
 - [Jekyll Auto Image by Merlos](https://github.com/merlos/jekyll-auto-image): Gets the first image of a post. Useful to list your posts with images or to add [twitter cards](https://dev.twitter.com/cards/overview) to your site.
 - [Jekyll Portfolio Generator by Shannon Babincsak](https://github.com/codeinpink/jekyll-portfolio-generator): Generates project pages and computes related projects out of project data files.
 - [Jekyll-Umlauts by Arne Gockeln](https://github.com/webchef/jekyll-umlauts): This generator replaces all german umlauts (äöüß) case sensitive with html.
@@ -793,19 +788,9 @@ LESS.js files during generation.
 - [Pug plugin by Doug Beney](http://jekyll-pug.dougie.io): Use the popular Pug (previously Jade) templating language in Jekyll. Complete with caching, includes support, and much more.
 - [Textile converter](https://github.com/jekyll/jekyll-textile-converter): Convert `.textile` files into HTML. Also includes the `textilize` Liquid filter.
 - [Slim plugin](https://github.com/slim-template/jekyll-slim): Slim converter and includes for Jekyll with support for Liquid tags.
-- [HAML plugin by Sam Z](https://gist.github.com/517556): HAML converter for Jekyll.
-- [HAML-Sass Converter by Adam Pearson](https://gist.github.com/481456): Simple HAML-Sass converter for Jekyll. [Fork](https://gist.github.com/528642) by Sam X.
-- [Sass SCSS Converter by Mark Wolfe](https://gist.github.com/960150): Sass converter which uses the new CSS compatible syntax, based Sam X’s fork above.
-- [LESS Converter by Jason Graham](https://gist.github.com/639920): Convert LESS files to CSS.
-- [LESS Converter by Josh Brown](https://gist.github.com/760265): Simple LESS converter.
-- [Upcase Converter by Blake Smith](https://gist.github.com/449463): An example Jekyll converter.
-- [CoffeeScript Converter by phaer](https://gist.github.com/959938): A [CoffeeScript](http://coffeescript.org) to Javascript converter.
 - [Markdown References by Olov Lassus](https://github.com/olov/jekyll-references): Keep all your markdown reference-style link definitions in one \_references.md file.
-- [Stylus Converter](https://gist.github.com/988201): Convert .styl to .css.
 - [ReStructuredText Converter](https://github.com/xdissent/jekyll-rst): Converts ReST documents to HTML with Pygments syntax highlighting.
 - [Jekyll-pandoc-multiple-formats](https://github.com/fauno/jekyll-pandoc-multiple-formats) by [edsl](https://github.com/edsl): Use pandoc to generate your site in multiple formats. Supports pandoc’s markdown extensions.
-- [Transform Layouts](https://gist.github.com/1472645): Allows HAML layouts (you need a HAML Converter plugin for this to work).
-- [Org-mode Converter](https://gist.github.com/abhiyerra/7377603): Org-mode converter for Jekyll.
 - [Customized Kramdown Converter](https://github.com/mvdbos/kramdown-with-pygments): Enable Pygments syntax highlighting for Kramdown-parsed fenced code blocks.
 - [Bigfootnotes Plugin](https://github.com/TheFox/jekyll-bigfootnotes): Enables big footnotes for Kramdown.
 - [AsciiDoc Plugin](https://github.com/asciidoctor/jekyll-asciidoc): AsciiDoc convertor for Jekyll using [Asciidoctor](http://asciidoctor.org/).
@@ -816,9 +801,7 @@ LESS.js files during generation.
 
 - [Truncate HTML](https://github.com/MattHall/truncatehtml) by [Matt Hall](https://codebeef.com/): A Jekyll filter that truncates HTML while preserving markup structure.
 - [Domain Name Filter by Lawrence Woodman](https://github.com/LawrenceWoodman/domain_name-liquid_filter): Filters the input text so that just the domain name is left.
-- [Summarize Filter by Mathieu Arnold](https://gist.github.com/731597): Remove markup after a `
      ` tag.
 - [Smilify](https://github.com/SaswatPadhi/jekyll_smilify) by [SaswatPadhi](https://github.com/SaswatPadhi): Convert text emoticons in your content to themeable smiley pics.
-- [Read in X Minutes](https://gist.github.com/zachleat/5792681) by [zachleat](https://github.com/zachleat): Estimates the reading time of a string (for blog post content).
 - [Jekyll-timeago](https://github.com/markets/jekyll-timeago): Converts a time value to the time ago in words.
 - [pluralize](https://github.com/bdesham/pluralize): Easily combine a number and a word into a grammatically-correct amount like “1 minute” or “2 minute**s**”.
 - [reading_time](https://github.com/bdesham/reading_time): Count words and estimate reading time for a piece of text, ignoring HTML elements that are unlikely to contain running text.
@@ -845,30 +828,16 @@ You can find a few useful plugins at the following locations:
 - [Jekyll-gist](https://github.com/jekyll/jekyll-gist): Use the `gist` tag to easily embed a GitHub Gist onto your site. This works with public or secret gists.
 - [Asset Path Tag](https://github.com/samrayner/jekyll-asset-path-plugin) by [Sam Rayner](http://www.samrayner.com/): Allows organisation of assets into subdirectories by outputting a path for a given file relative to the current post or page.
 - [Delicious Plugin by Christian Hellsten](https://github.com/christianhellsten/jekyll-plugins): Fetches and renders bookmarks from delicious.com.
-- [Ultraviolet Plugin by Steve Alex](https://gist.github.com/480380): Jekyll tag for the [Ultraviolet](https://github.com/grosser/ultraviolet) code highligher.
-- [Tag Cloud Plugin by Ilkka Laukkanen](https://gist.github.com/710577): Generate a tag cloud that links to tag pages.
-- [GIT Tag by Alexandre Girard](https://gist.github.com/730347): Add Git activity inside a list.
-- [MathJax Liquid Tags by Jessy Cowan-Sharp](https://gist.github.com/834610): Simple liquid tags for Jekyll that convert inline math and block equations to the appropriate MathJax script tags.
-- [Non-JS Gist Tag by Brandon Tilley](https://gist.github.com/1027674) A Liquid tag that embeds Gists and shows code for non-JavaScript enabled browsers and readers.
-- [Render Time Tag by Blake Smith](https://gist.github.com/449509): Displays the time a Jekyll page was generated.
-- [Status.net/OStatus Tag by phaer](https://gist.github.com/912466): Displays the notices in a given status.net/ostatus feed.
 - [Embed.ly client by Robert Böhnke](https://github.com/robb/jekyll-embedly-client): Autogenerate embeds from URLs using oEmbed.
-- [Logarithmic Tag Cloud](https://gist.github.com/2290195): Flexible. Logarithmic distribution. Documentation inline.
-- [oEmbed Tag by Tammo van Lessen](https://gist.github.com/1455726): Enables easy content embedding (e.g. from YouTube, Flickr, Slideshare) via oEmbed.
 - [FlickrSetTag by Thomas Mango](https://github.com/tsmango/jekyll_flickr_set_tag): Generates image galleries from Flickr sets.
 - [Tweet Tag by Scott W. Bradley](https://github.com/scottwb/jekyll-tweet-tag): Liquid tag for [Embedded Tweets](https://dev.twitter.com/docs/embedded-tweets) using Twitter’s shortcodes.
 - [Jekyll Twitter Plugin](https://github.com/rob-murray/jekyll-twitter-plugin): A Liquid tag plugin that renders Tweets from Twitter API. Currently supports the [oEmbed](https://dev.twitter.com/rest/reference/get/statuses/oembed) API.
 - [Jekyll-contentblocks](https://github.com/rustygeldmacher/jekyll-contentblocks): Lets you use Rails-like content_for tags in your templates, for passing content from your posts up to your layouts.
-- [Generate YouTube Embed](https://gist.github.com/1805814) by [joelverhagen](https://github.com/joelverhagen): Jekyll plugin which allows you to embed a YouTube video in your page with the YouTube ID. Optionally specify width and height dimensions. Like “oEmbed Tag” but just for YouTube.
 - [Jekyll-beastiepress](https://github.com/okeeblow/jekyll-beastiepress): FreeBSD utility tags for Jekyll sites.
-- [Jsonball](https://gist.github.com/1895282): Reads json files and produces maps for use in Jekyll files.
 - [Bibjekyll](https://github.com/pablooliveira/bibjekyll): Render BibTeX-formatted bibliographies/citations included in posts and pages using bibtex2html.
 - [Jekyll-citation](https://github.com/archome/jekyll-citation): Render BibTeX-formatted bibliographies/citations included in posts and pages (pure Ruby).
 - [Jekyll Dribbble Set Tag](https://github.com/ericdfields/Jekyll-Dribbble-Set-Tag): Builds Dribbble image galleries from any user.
-- [Debbugs](https://gist.github.com/2218470): Allows posting links to Debian BTS easily.
-- [Jekyll-devonly_tag](https://gist.github.com/2403522): A block tag for including markup only during development.
 - [JekyllGalleryTag](https://github.com/redwallhp/JekyllGalleryTag) by [redwallhp](https://github.com/redwallhp): Generates thumbnails from a directory of images and displays them in a grid.
-- [Youku and Tudou Embed](https://gist.github.com/Yexiaoxing/5891929): Liquid plugin for embedding Youku and Tudou videos.
 - [Jekyll-swfobject](https://github.com/sectore/jekyll-swfobject): Liquid plugin for embedding Adobe Flash files (.swf) using [SWFObject](https://github.com/swfobject/swfobject).
 - [Jekyll Picture Tag](https://github.com/robwierzbowski/jekyll-picture-tag): Easy responsive images for Jekyll. Based on the proposed [``](https://html.spec.whatwg.org/multipage/embedded-content.html#the-picture-element) element, polyfilled with Scott Jehl’s [Picturefill](https://github.com/scottjehl/picturefill).
 - [Jekyll Image Tag](https://github.com/robwierzbowski/jekyll-image-tag): Better images for Jekyll. Save image presets, generate resized images, and add classes, alt text, and other attributes.
@@ -878,8 +847,6 @@ You can find a few useful plugins at the following locations:
 - [Jekyll Date Chart](https://github.com/GSI/jekyll_date_chart) by [GSI](https://github.com/GSI): Block that renders date line charts based on textile-formatted tables.
 - [Jekyll Image Encode](https://github.com/GSI/jekyll_image_encode) by [GSI](https://github.com/GSI): Tag that renders base64 codes of images fetched from the web.
 - [Jekyll Quick Man](https://github.com/GSI/jekyll_quick_man) by [GSI](https://github.com/GSI): Tag that renders pretty links to man page sources on the internet.
-- [jekyll-font-awesome](https://gist.github.com/23maverick23/8532525): Quickly and easily add Font Awesome icons to your posts.
-- [Lychee Gallery Tag](https://gist.github.com/tobru/9171700) by [tobru](https://github.com/tobru): Include [Lychee](https://lychee.electerious.com/) albums into a post. For an introduction, see [Jekyll meets Lychee - A Liquid Tag plugin](https://tobrunet.ch/articles/jekyll-meets-lychee-a-liquid-tag-plugin/)
 - [Image Set/Gallery Tag](https://github.com/callmeed/jekyll-image-set) by [callmeed](https://github.com/callmeed): Renders HTML for an image gallery from a folder in your Jekyll site. Just pass it a folder name and class/tag options.
 - [jekyll_figure](https://github.com/lmullen/jekyll_figure): Generate figures and captions with links to the figure in a variety of formats
 - [Jekyll GitHub Sample Tag](https://github.com/bwillis/jekyll-github-sample): A liquid tag to include a sample of a github repo file in your Jekyll site.
@@ -924,12 +891,8 @@ You can find a few useful plugins at the following locations:
 - [Analytics for Jekyll](https://github.com/hendrikschneider/jekyll-analytics) by Hendrik Schneider: An effortless way to add various trackers like Google Analytics, Matomo (formerly Piwik), mPulse, etc. to your site.
 - [ditaa-ditaa](https://github.com/tmthrgd/ditaa-ditaa) by Tom Thorogood: a drastic revision of jekyll-ditaa that renders diagrams drawn using ASCII art into PNG images.
 - [Pygments Cache Path by Raimonds Simanovskis](https://github.com/rsim/blog.rayapps.com/blob/master/_plugins/pygments_cache_patch.rb): Plugin to cache syntax-highlighted code from Pygments.
-- [Draft/Publish Plugin by Michael Ivey](https://gist.github.com/49630): Save posts as drafts.
-- [Growl Notification Generator by Tate Johnson](https://gist.github.com/490101): Send Jekyll notifications to Growl.
-- [Growl Notification Hook by Tate Johnson](https://gist.github.com/525267): Better alternative to the above, but requires his “hook” fork.
 - [Related Posts by Lawrence Woodman](https://github.com/LawrenceWoodman/related_posts-jekyll_plugin): Overrides `site.related_posts` to use categories to assess relationship.
 - [jekyll-tagging-related_posts](https://github.com/toshimaru/jekyll-tagging-related_posts): Jekyll related_posts function based on tags (works on Jekyll3).
-- [Tiered Archives by Eli Naeher](https://gist.github.com/88cda643aa7e3b0ca1e5): Create tiered template variable that allows you to group archives by year and month.
 - [Jekyll-localization](https://github.com/blackwinter/jekyll-localization): Jekyll plugin that adds localization features to the rendering engine.
 - [Jekyll-rendering](https://github.com/blackwinter/jekyll-rendering): Jekyll plugin to provide alternative rendering engines.
 - [Jekyll-pagination](https://github.com/blackwinter/jekyll-pagination): Jekyll plugin to extend the pagination generator.
@@ -937,7 +900,6 @@ You can find a few useful plugins at the following locations:
 - [Jekyll-scholar](https://github.com/inukshuk/jekyll-scholar): Jekyll extensions for the blogging scholar.
 - [Jekyll-assets](http://jekyll.github.io/jekyll-assets/) by [ixti](https://github.com/ixti): Rails-alike assets pipeline (write assets in CoffeeScript, Sass, LESS etc; specify dependencies for automatic bundling using simple declarative comments in assets; minify and compress; use JST templates; cache bust; and many-many more).
 - [JAPR](https://github.com/kitsched/japr): Jekyll Asset Pipeline Reborn - Powerful asset pipeline for Jekyll that collects, converts and compresses JavaScript and CSS assets.
-- [File compressor](https://gist.github.com/2758691) by [mytharcher](https://github.com/mytharcher): Compress HTML and JavaScript files on site build.
 - [Jekyll-minibundle](https://github.com/tkareine/jekyll-minibundle): Asset bundling and cache busting using external minification tool of your choice. No gem dependencies.
 - [Singlepage-jekyll](https://github.com/JCB-K/singlepage-jekyll) by [JCB-K](https://github.com/JCB-K): Turns Jekyll into a dynamic one-page website.
 - [generator-jekyllrb](https://github.com/robwierzbowski/generator-jekyllrb): A generator that wraps Jekyll in [Yeoman](http://yeoman.io/), a tool collection and workflow for building modern web apps.
@@ -968,10 +930,9 @@ You can find a few useful plugins at the following locations:
 - [jekyll-algolia](https://community.algolia.com/jekyll-algolia/): Add fast and relevant search to your Jekyll site through the Algolia API.
 
 
      
-  
      Jekyll Plugins Wanted
      
+  
      Submit your gem plugins
      
   
      
-    If you have a Jekyll plugin that you would like to see added to this list,
-    you should read the contributing page to find
+    You're encouraged to add your Jekyll gem plugins to this list, read the contributing page to find
     out how to make that happen.
   
      
 
      

From e6876b288a3680e58717bcdcb70f9dbd54009a4c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 7 Feb 2018 08:54:13 -0500
Subject: [PATCH 2775/4996] Update history to reflect merge of #6751 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3ed066d1174..8b6e44f4218 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,10 @@
   * Add document on releasing a new version (#6745)
   * Mention Talkyard, a new commenting system for Jekyll and others. (#6752)
 
+### Site Enhancements
+
+  * Remove links to Gists (#6751)
+
 ## 3.7.2 / 2018-01-25
 
 ### Development Fixes

From c0d891b08bcae703b87db2b281b42785e72142f5 Mon Sep 17 00:00:00 2001
From: Eric Cornelissen 
Date: Thu, 8 Feb 2018 14:51:13 +0100
Subject: [PATCH 2776/4996] Add jekyll-fontello to plugins (#6757)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 9cd906e42f4..f52c6f87d08 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -782,6 +782,7 @@ You can find a few useful plugins at the following locations:
 - [Stickyposts](https://github.com/ibrado/jekyll-stickyposts): Moves or copies (pins) posts marked `sticky: true` to the top of the list. Perfect for keeping important announcements on the home page, or giving collections a descriptive entry. Paginator friendly.
 - [Jekyll::Paginate::Content](https://github.com/ibrado/jekyll-paginate-content): Content paginator in the style of jekyll-paginator-v2 that splits pages, posts, and collection entries into several pages. Specify a separator or use HTML <h1> etc. headers. Automatic splitting, single-page view, pager/trail, self-adjusting links, multipage TOC, SEO support.
 - [Premonition](https://github.com/amedia/premonition): Adds block-styled side content to your page. For example summary, notes, hints or warning boxes.
+- [jekyll-fontello](https://github.com/ericcornelissen/jekyll-fontello): A Jekyll plugin that automatically downloads your webfont from Fontello.
 
 #### Converters
 

From 0b09c4ad8d790f9ed0fa923b370d907fedd029e1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 8 Feb 2018 08:51:15 -0500
Subject: [PATCH 2777/4996] Update history to reflect merge of #6757 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8b6e44f4218..9774c5db5fe 100644
--- a/History.markdown
+++ b/History.markdown
@@ -15,6 +15,7 @@
   * Added Premonition plugin to list of plugins (#6750)
   * Add document on releasing a new version (#6745)
   * Mention Talkyard, a new commenting system for Jekyll and others. (#6752)
+  * Add 'jekyll-fontello' to plugins (#6757)
 
 ### Site Enhancements
 

From 8ebe5e3a3eeebca1ec692f27e2d6836d9447c36f Mon Sep 17 00:00:00 2001
From: Damien Solodow 
Date: Sat, 10 Feb 2018 15:34:45 -0500
Subject: [PATCH 2778/4996] Update windows.md (#6765)

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

diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index d1a30b2752f..e0ca4d7b6fd 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -30,7 +30,7 @@ Now we can install Ruby. To do this we will use a repository from [BrightBox](ht
 ```sh
 sudo apt-add-repository ppa:brightbox/ruby-ng
 sudo apt-get update
-sudo apt-get install ruby2.3 ruby2.3-dev build-essential
+sudo apt-get install ruby2.3 ruby2.3-dev build-essential dh-autoreconf
 ```
 
 Next let's update our Ruby gems:

From 33017b702d44f6446f353620daf1f12dda29f331 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 10 Feb 2018 15:34:46 -0500
Subject: [PATCH 2779/4996] Update history to reflect merge of #6765 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9774c5db5fe..b150e4a301e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Add document on releasing a new version (#6745)
   * Mention Talkyard, a new commenting system for Jekyll and others. (#6752)
   * Add 'jekyll-fontello' to plugins (#6757)
+  * Update windows.md (#6765)
 
 ### Site Enhancements
 

From 8fae0052c8e0888953da159045909ea2c1336b3d Mon Sep 17 00:00:00 2001
From: Semen Zhydenko 
Date: Sun, 11 Feb 2018 03:58:13 +0100
Subject: [PATCH 2780/4996] Fix typos (#6764)

Merge pull request 6764
---
 .github/ISSUE_TEMPLATE.md              | 2 +-
 .github/first-timers-issue-template.md | 2 +-
 History.markdown                       | 8 ++++----
 docs/_docs/history.md                  | 8 ++++----
 docs/_docs/themes.md                   | 2 +-
 test/test_page_without_a_file.rb       | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index fdba86159e2..73c8928dbbe 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -48,7 +48,7 @@
 ## My Reproduction Steps
 
 
-  
-{% endif %}
-
 {% if site.google_analytics_id %}
   
   ").strip
-    end
-
-    context "with pygments enabled" do
-      setup do
-        @markdown = Converters::Markdown.new @config.merge(
-          { "highlighter" => "pygments" }
-        )
-      end
-
-      should "render fenced code blocks with syntax highlighting" do
-        assert_equal(
-          %(
      puts "Hello world"\n
      ),
-          @markdown.convert(@sample).strip
-        )
-      end
-    end
-
-    context "with rouge enabled" do
-      setup do
-        @markdown = Converters::Markdown.new @config.merge({ "highlighter" => "rouge" })
-      end
-
-      should "render fenced code blocks with syntax highlighting" do
-        assert_equal(
-          %(
      puts "Hello world"\n
      ),
-          @markdown.convert(@sample).strip
-        )
-      end
-    end
-
-    context "without any highlighter" do
-      setup do
-        @markdown = Converters::Markdown.new @config.merge({ "highlighter" => nil })
-      end
-
-      should "render fenced code blocks without syntax highlighting" do
-        assert_equal(
-          %(
      puts "Hello world"\n
      ),
-          @markdown.convert(@sample).strip
-        )
-      end
-    end
-  end
-end
diff --git a/test/test_tags.rb b/test/test_tags.rb
index ee01a596549..739ced21483 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -494,7 +494,7 @@ def highlight_block_with_opts(options_string)
     setup do
       @content = <FINISH HIM!, @result
       end
     end
-
-    context "using Redcarpet" do
-      setup do
-        if jruby?
-          skip(
-            "JRuby does not perform well with CExt, test disabled."
-          )
-        end
-
-        create_post(@content, {
-          "markdown" => "redcarpet",
-        })
-      end
-
-      should "parse correctly" do
-        assert_match %r{FIGHT!}, @result
-        assert_match %r!FINISH HIM!, @result
-      end
-    end
   end
 
   context "simple page with post linking" do

From 7612056bed8ce1a929508390b9bb3fe48ea3c503 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 6 May 2018 10:18:04 -0400
Subject: [PATCH 3003/4996] Update history to reflect merge of #6987 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5fa186004b2..69a08b1c855 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * bump i18n (#6931)
   * We are not using Ruby 2.2 anymore (#6977)
   * Drop support for older versions of Rouge (#6978)
+  * Remove support for Redcarpet (#6987)
 
 ### Development Fixes
 

From 694800270ae0e1efa4926ed4492c8db6dc51560c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 7 May 2018 03:45:34 -0400
Subject: [PATCH 3004/4996] Update history to reflect merge of #6990 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 69a08b1c855..ce9fc970c98 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,7 @@
   * Fix typo (#6969)
   * Add version number for group_by_exp doc (#6956)
   * Update Windows install docs (#6926)
+  * Remove documentation for using Redcarpet (#6990)
 
 ### Minor Enhancements
 

From 192df096b037902de3274ca78ce68bd71e9fc448 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 7 May 2018 13:43:41 +0530
Subject: [PATCH 3005/4996] Revert update to docs meant for v4.0

---
 docs/_docs/templates.md | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md
index e91de10dbfb..4b93b75afd1 100644
--- a/docs/_docs/templates.md
+++ b/docs/_docs/templates.md
@@ -588,23 +588,6 @@ One major benefit of using the `link` or `post_url` tag is link validation. If t
 
 Note you cannot add filters to `link` tags. For example, you cannot append a string using Liquid filters, such as `{% raw %}{% link mypage.html | append: "#section1" %} {% endraw %}`. To link to sections on a page, you will need to use regular HTML or Markdown linking techniques.
 
-The name of the file you want to link can be specified as a variable instead of an actual file name. For example, suppose you defined a variable in your page's front matter like this:
-
-```yaml
----
-title: My page
-my_variable: footer_company_a.html
----
-```
-
-You could then reference that variable in your link:
-
-```liquid
-{% raw %}{% link {{ page.my_variable }} %}{% endraw %}
-```
-
-In this example, the link would add link to the file `footer_company_a.html`.
-
 ### Linking to posts
 
 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.

From cec17d03f8c6a83df31952a8681db986ad12d7a0 Mon Sep 17 00:00:00 2001
From: Arjun Thakur 
Date: Mon, 7 May 2018 23:19:55 +0530
Subject: [PATCH 3006/4996] Updated nginx configuration for custom-404-page
 documentation (#6994)

Merge pull request 6994
---
 docs/_tutorials/custom-404-page.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/_tutorials/custom-404-page.md b/docs/_tutorials/custom-404-page.md
index 47efe958247..91cd9c87686 100644
--- a/docs/_tutorials/custom-404-page.md
+++ b/docs/_tutorials/custom-404-page.md
@@ -53,7 +53,7 @@ More info on configuring Apache Error Pages can found in [official documentation
 
 The procedure is just as simple as configuring Apache servers, but slightly different.
 
-Add the following to the nginx configuration file, `nginx.conf`, which is usually located inside `/etc/nginx/` or `/etc/nginx/conf/`:
+The nginx configuration file depends on the system in which it is installed. In most systems, it is the `nginx.conf` file, which is usually located inside `/etc/nginx/` or `/etc/nginx/conf/`. However, in other systems like Ubuntu, you would have to look for a `default` nginx configuration file, containing server related information, which is usually located inside `/etc/nginx/sites-available/` or `/etc/nginx/sites-enabled/`. Add the following to your nginx configuration file, _i.e._ either to `nginx.conf` file or to `default` file:
 
 ```nginx
 server {
@@ -63,5 +63,11 @@ server {
   }
 }
 ```
-
+If the `server` block already exists, only add the code inside the `server` block given above.
 The `location` directive prevents users from directly browsing the 404.html page.
+
+More info on nginx error page can be found on [nginx official documentation](http://nginx.org/en/docs/http/ngx_http_core_module.html#error_page).
+
+
      
+  Proceed with caution while editing the configuration file.
+
      

From 0c5b74377bd59c5e8001643800ca8a812818b491 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 7 May 2018 13:49:56 -0400
Subject: [PATCH 3007/4996] Update history to reflect merge of #6994 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ce9fc970c98..95eab348cc5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -13,6 +13,7 @@
   * Add version number for group_by_exp doc (#6956)
   * Update Windows install docs (#6926)
   * Remove documentation for using Redcarpet (#6990)
+  * Updated nginx configuration for custom-404-page documentation (#6994)
 
 ### Minor Enhancements
 

From 66f8e748fe5a1a8b3980ab4a445636a409228d84 Mon Sep 17 00:00:00 2001
From: olivia 
Date: Mon, 7 May 2018 19:52:59 +0200
Subject: [PATCH 3008/4996] Replace individual core team emails

---
 README.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index c6864b4b3ad..fe5e91f7b13 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 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.
+these terms, please let one of our [core team members](https://jekyllrb.com/team/#core-team) know and we will address it as soon as possible.
 
 ## Diving In
 

From e2d8d3b92f8bfe09dc5bbfa63ae08b044f936c07 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Wed, 9 May 2018 12:20:23 +0200
Subject: [PATCH 3009/4996] List all static files variables (#7002)

Merge pull request 7002
---
 docs/_docs/variables.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/_docs/variables.md b/docs/_docs/variables.md
index a53d9285deb..d39def6e7ff 100644
--- a/docs/_docs/variables.md
+++ b/docs/_docs/variables.md
@@ -124,8 +124,7 @@ following is a reference of the available data.
 
         A list of all static files (i.e.
         files not processed by Jekyll's converters or the Liquid renderer).
-        Each file has three properties: path,
-        modified_time and extname.
+        Each file has five properties: path, modified_time, name, basename and extname.
 
       
      
     

From a59eaff78963483d41602f62e3d8f53e46d1e166 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 9 May 2018 06:20:25 -0400
Subject: [PATCH 3010/4996] Update history to reflect merge of #7002 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 95eab348cc5..196d1d2724f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -14,6 +14,7 @@
   * Update Windows install docs (#6926)
   * Remove documentation for using Redcarpet (#6990)
   * Updated nginx configuration for custom-404-page documentation (#6994)
+  * List all static files variables (#7002)
 
 ### Minor Enhancements
 

From e9b507a0df0d9d18ba17bffebe819085ffe4bccd Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Wed, 9 May 2018 13:45:18 +0200
Subject: [PATCH 3011/4996] Textile is only supported through a converter
 plugin (#7003)

Merge pull request 7003
---
 docs/_docs/pagination.md       | 2 +-
 docs/_docs/structure.md        | 5 +++--
 docs/_docs/upgrading/2-to-3.md | 4 ++++
 docs/index.html                | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/_docs/pagination.md b/docs/_docs/pagination.md
index 41a3a8a26e5..1735ee64012 100644
--- a/docs/_docs/pagination.md
+++ b/docs/_docs/pagination.md
@@ -14,7 +14,7 @@ your `_config.yml` under `plugins`. For Jekyll 2, this is standard.
 
      
   
      Pagination only works within HTML files
      
   
      
-    Pagination does not work from within Markdown or Textile files from
+    Pagination does not work from within Markdown files from
     your Jekyll site. Pagination works when called from within the HTML
     file, named index.html, which optionally may reside in and
     produce pagination from within a subdirectory, via the
diff --git a/docs/_docs/structure.md b/docs/_docs/structure.md
index 6735d6e02ac..6a069f29fca 100644
--- a/docs/_docs/structure.md
+++ b/docs/_docs/structure.md
@@ -5,7 +5,8 @@ permalink: /docs/structure/
 
 Jekyll is, at its core, a text transformation engine. The concept behind the
 system is this: you give it text written in your favorite markup language, be
-that Markdown, Textile, or just plain HTML, and it churns that through a layout
+that Markdown, [Textile](https://github.com/jekyll/jekyll-textile-converter)
+, or just plain HTML, and it churns that through a layout
 or a series of layout files. Throughout that process you can tweak how you want
 the site URLs to look, what data gets displayed in the layout, and more. This
 is all done through editing text files; the static web site is the final
@@ -185,7 +186,7 @@ An overview of what each of these does:
     
       
         
      index.html or index.md and other HTML,
-        Markdown, Textile files
      
+        Markdown files
      
       
       
         
      
diff --git a/docs/_docs/upgrading/2-to-3.md b/docs/_docs/upgrading/2-to-3.md
index c12a1a91f41..bafda35ffae 100644
--- a/docs/_docs/upgrading/2-to-3.md
+++ b/docs/_docs/upgrading/2-to-3.md
@@ -44,6 +44,10 @@ For `site.collections.myCollection` in Jekyll 2, you now do:
 
 This is a bit cumbersome at first, but is easier than a big `for` loop.
 
+### Textile support
+
+We dropped native support for Textile, from now on you have to install our  [jekyll-textile-converter](https://github.com/jekyll/jekyll-textile-converter) plugin to work with Textile files.
+
 ### Dropped dependencies
 
 We dropped a number of dependencies the Core Team felt were optional. As such, in 3.0, they must be explicitly installed and included if you use any of the features. They are:
diff --git a/docs/index.html b/docs/index.html
index 082e02d8eee..a33774784c8 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -21,7 +21,7 @@ 
      Simple
      
     
      
     
      
       
      Static
      
-      
      Markdown (or Textile), Liquid, HTML & CSS go in. Static sites come out ready for deployment.
      
+      
      Markdown, Liquid, HTML & CSS go in. Static sites come out ready for deployment.
      
       Jekyll template guide →
     
      
     
      

From 56593bf8973982ee474ffdf95854d324b4afb954 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 9 May 2018 07:45:21 -0400
Subject: [PATCH 3012/4996] Update history to reflect merge of #7003 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 196d1d2724f..7e5b2830061 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,5 +1,7 @@
 ## HEAD
 
+  * Textile is only supported through a converter plugin (#7003)
+
 ### Documentation
 
   * Release post for v3.8.0 (#6849)

From 0b196ebd00f6d235ea4f2863bd24a1f4130df30c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= 
Date: Wed, 9 May 2018 13:52:11 +0200
Subject: [PATCH 3013/4996] Mention _drafts in custom collections_dir note
 (#6985)

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

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index c45a38682e7..6309517c011 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -56,9 +56,9 @@ defaults:
 
      
 
 
      
-  
      Be sure to move posts into custom collections directory
      
+  
      Be sure to move drafts and posts into custom collections directory
      
 
-  
      If you specify a directory to store all your collections in the same place with collections_dir: my_collections, then you will need to move your _posts directory to my_collections/_posts. Note that, the name of your collections directory cannot start with an underscore (`_`).
      
+  
      If you specify a directory to store all your collections in the same place with collections_dir: my_collections, then you will need to move your _drafts and _posts directory to my_collections/_drafts and my_collections/_posts. Note that, the name of your collections directory cannot start with an underscore (`_`).
      
 
      
 
 ### Step 2: Add your content {#step2}

From c2211eec0c514cb6f1a0a595eb15dbbc2039951f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 9 May 2018 07:52:13 -0400
Subject: [PATCH 3014/4996] Update history to reflect merge of #6985 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7e5b2830061..c13d624d4ea 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
   * Remove documentation for using Redcarpet (#6990)
   * Updated nginx configuration for custom-404-page documentation (#6994)
   * List all static files variables (#7002)
+  * Document that _drafts need to be contained within the custom collection directory (#6985)
 
 ### Minor Enhancements
 

From 149d5de59a6c506490cf7cd7c3d52e7b5a1812a7 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 9 May 2018 09:44:36 -0400
Subject: [PATCH 3015/4996] Remove support for rdiscount (#6988)

Merge pull request 6988
---
 Gemfile                                       |  1 -
 features/site_configuration.feature           |  8 ---
 lib/jekyll/configuration.rb                   |  4 --
 lib/jekyll/converters/markdown.rb             |  7 ++-
 .../converters/markdown/rdiscount_parser.rb   | 37 --------------
 test/helper.rb                                |  4 --
 test/test_rdiscount.rb                        | 51 -------------------
 test/test_tags.rb                             | 21 +-------
 8 files changed, 4 insertions(+), 129 deletions(-)
 delete mode 100644 lib/jekyll/converters/markdown/rdiscount_parser.rb
 delete mode 100644 test/test_rdiscount.rb

diff --git a/Gemfile b/Gemfile
index 1f31549e962..08ab18af225 100644
--- a/Gemfile
+++ b/Gemfile
@@ -76,7 +76,6 @@ group :jekyll_optional_dependencies do
     gem "classifier-reborn", "~> 2.2.0"
     gem "liquid-c", "~> 3.0"
     gem "pygments.rb", "~> 1.0"
-    gem "rdiscount", "~> 2.0"
     gem "yajl-ruby", "~> 1.3"
   end
 
diff --git a/features/site_configuration.feature b/features/site_configuration.feature
index 4baa36a87a3..698c59bca7d 100644
--- a/features/site_configuration.feature
+++ b/features/site_configuration.feature
@@ -65,14 +65,6 @@ Feature: Site configuration
     And the "_site/Rakefile" file should not exist
     And the "_site/README" file should not exist
 
-  Scenario: Use RDiscount for markup
-    Given I have an "index.markdown" page that contains "[Google](https://www.google.com)"
-    And I have a configuration file with "markdown" set to "rdiscount"
-    When I run jekyll build
-    Then I should get a zero exit status
-    And the _site directory should exist
-    And I should see "Google" in "_site/index.html"
-
   Scenario: Use Kramdown for markup
     Given I have an "index.markdown" page that contains "[Google](https://www.google.com)"
     And I have a configuration file with "markdown" set to "kramdown"
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index fb51cd5b626..e49eb62bd9d 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -66,10 +66,6 @@ class Configuration < Hash
         "strict_variables" => false,
       },
 
-      "rdiscount"           => {
-        "extensions" => [],
-      },
-
       "kramdown"            => {
         "auto_ids"      => true,
         "toc_levels"    => "1..6",
diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb
index 567bc120e36..3c1c3458761 100644
--- a/lib/jekyll/converters/markdown.rb
+++ b/lib/jekyll/converters/markdown.rb
@@ -30,8 +30,7 @@ def setup
       # rubocop:disable Naming/AccessorMethodName
       def get_processor
         case @config["markdown"].downcase
-        when "kramdown"  then return KramdownParser.new(@config)
-        when "rdiscount" then return RDiscountParser.new(@config)
+        when "kramdown" then return KramdownParser.new(@config)
         else
           custom_processor
         end
@@ -43,7 +42,7 @@ def get_processor
       # are not in safe mode.)
 
       def valid_processors
-        %w(rdiscount kramdown) + third_party_processors
+        %w(kramdown) + third_party_processors
       end
 
       # Public: A list of processors that you provide via plugins.
@@ -52,7 +51,7 @@ def valid_processors
 
       def third_party_processors
         self.class.constants - \
-          %w(KramdownParser RDiscountParser PRIORITIES).map(
+          %w(KramdownParser PRIORITIES).map(
             &:to_sym
           )
       end
diff --git a/lib/jekyll/converters/markdown/rdiscount_parser.rb b/lib/jekyll/converters/markdown/rdiscount_parser.rb
deleted file mode 100644
index 9da177d4bad..00000000000
--- a/lib/jekyll/converters/markdown/rdiscount_parser.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module Jekyll
-  module Converters
-    class Markdown
-      class RDiscountParser
-        def initialize(config)
-          unless defined?(RDiscount)
-            Jekyll::External.require_with_graceful_fail "rdiscount"
-          end
-          @config = config
-          @rdiscount_extensions = @config["rdiscount"]["extensions"].map(&:to_sym)
-        end
-
-        def convert(content)
-          rd = RDiscount.new(content, *@rdiscount_extensions)
-          html = rd.to_html
-          if @config["rdiscount"]["toc_token"]
-            html = replace_generated_toc(rd, html, @config["rdiscount"]["toc_token"])
-          end
-          html
-        end
-
-        private
-        def replace_generated_toc(rd_instance, html, toc_token)
-          if rd_instance.generate_toc && html.include?(toc_token)
-            utf8_toc = rd_instance.toc_content
-            utf8_toc.force_encoding("utf-8") if utf8_toc.respond_to?(:force_encoding)
-            html.gsub(toc_token, utf8_toc)
-          else
-            html
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/test/helper.rb b/test/helper.rb
index a3cd6568c94..9e01b7de2e1 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -34,10 +34,6 @@ def jruby?
 
 Jekyll.logger = Logger.new(StringIO.new, :error)
 
-unless jruby?
-  require "rdiscount"
-end
-
 require "kramdown"
 require "shoulda"
 
diff --git a/test/test_rdiscount.rb b/test/test_rdiscount.rb
deleted file mode 100644
index 7116c29a238..00000000000
--- a/test/test_rdiscount.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require "helper"
-
-class TestRdiscount < JekyllUnitTest
-  context "rdiscount" do
-    setup do
-      if jruby?
-        then skip(
-          "JRuby does not perform well with CExt, test disabled."
-        )
-      end
-
-      config = {
-        "markdown"  => "rdiscount",
-        "rdiscount" => {
-          "toc_token"  => "{:toc}",
-          "extensions" => %w(smart generate_toc),
-        },
-      }
-
-      @markdown = Converters::Markdown.new config
-    end
-
-    should "pass rdiscount extensions" do
-      assert_equal "
      “smart”
      ", @markdown.convert('"smart"').strip
-    end
-
-    should "render toc" do
-      toc = <<-TOC
-
-
      Header 1
      
-
-
-
      Header 2
      
-
-
      
-
-
      
-TOC
-      assert_equal toc.strip,
-                   @markdown.convert("# Header 1\n\n## Header 2\n\n{:toc}").strip
-    end
-  end
-end
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 739ced21483..54b8e4b7a63 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -494,7 +494,7 @@ def highlight_block_with_opts(options_string)
     setup do
       @content = < "rdiscount",
-        })
-      end
-
-      should "parse correctly" do
-        assert_match %r{FIGHT!}, @result
-        assert_match %r!FINISH HIM!, @result
-      end
-    end
-
     context "using Kramdown" do
       setup do
         create_post(@content, "markdown" => "kramdown")

From 5d1823b604f1ae220ced957bf327afa4b70e65d6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 9 May 2018 09:44:38 -0400
Subject: [PATCH 3016/4996] Update history to reflect merge of #6988 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c13d624d4ea..5eb713b4748 100644
--- a/History.markdown
+++ b/History.markdown
@@ -35,6 +35,7 @@
   * We are not using Ruby 2.2 anymore (#6977)
   * Drop support for older versions of Rouge (#6978)
   * Remove support for Redcarpet (#6987)
+  * Remove support for rdiscount (#6988)
 
 ### Development Fixes
 

From 9343d2e6bb90a496d3a92aa9e035682862b93823 Mon Sep 17 00:00:00 2001
From: penguinpet <34348929+penguinpet@users.noreply.github.com>
Date: Thu, 10 May 2018 10:40:54 -0400
Subject: [PATCH 3017/4996] proposed change for passive voice. (#7005)

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

diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index f1c643d3f71..f42f6f09b7e 100644
--- a/docs/_docs/contributing.md
+++ b/docs/_docs/contributing.md
@@ -16,7 +16,7 @@ Whether you're a developer, a designer, or just a Jekyll devotee, there are lots
 
 * [Install Jekyll on your computer](https://jekyllrb.com/docs/installation/) and kick the tires. Does it work? Does it do what you'd expect? If not, [open an issue](https://github.com/jekyll/jekyll/issues/new) and let us know.
 * Comment on some of the project's [open issues](https://github.com/jekyll/jekyll/issues). Have you experienced the same problem? Know a work around? Do you have a suggestion for how the feature could be better?
-* Read through [the documentation](https://jekyllrb.com/docs/home/), and click the "improve this page" button, any time you see something confusing, or have a suggestion for something that could be improved.
+* Read through [the documentation](https://jekyllrb.com/docs/home/), and click the "improve this page" button, any time you see something confusing, or have a suggestion for to improve something.
 * Browse through [the Jekyll discussion forum](https://talk.jekyllrb.com/), and lend a hand answering questions. There's a good chance you've already experienced what another user is experiencing.
 * Find [an open issue](https://github.com/jekyll/jekyll/issues) (especially [those labeled `help-wanted`](https://github.com/jekyll/jekyll/issues?q=is%3Aopen+is%3Aissue+label%3Ahelp-wanted)), and submit a proposed fix. If it's your first pull request, we promise we won't bite, and are glad to answer any questions.
 * Help evaluate [open pull requests](https://github.com/jekyll/jekyll/pulls), by testing the changes locally and reviewing what's proposed.

From b63036989abe87830fd6cb4fdd9caf53c32a2e09 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 10 May 2018 10:40:55 -0400
Subject: [PATCH 3018/4996] Update history to reflect merge of #7005 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5eb713b4748..7d2969008e3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -18,6 +18,7 @@
   * Updated nginx configuration for custom-404-page documentation (#6994)
   * List all static files variables (#7002)
   * Document that _drafts need to be contained within the custom collection directory (#6985)
+  * proposed change for passive voice. (#7005)
 
 ### Minor Enhancements
 

From c6000597d9efe3c10e944ecf6e6f7f5bcb690b14 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Thu, 10 May 2018 18:35:18 +0200
Subject: [PATCH 3019/4996] Rephrase sentence

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

diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index f42f6f09b7e..9eea7282d13 100644
--- a/docs/_docs/contributing.md
+++ b/docs/_docs/contributing.md
@@ -16,7 +16,7 @@ Whether you're a developer, a designer, or just a Jekyll devotee, there are lots
 
 * [Install Jekyll on your computer](https://jekyllrb.com/docs/installation/) and kick the tires. Does it work? Does it do what you'd expect? If not, [open an issue](https://github.com/jekyll/jekyll/issues/new) and let us know.
 * Comment on some of the project's [open issues](https://github.com/jekyll/jekyll/issues). Have you experienced the same problem? Know a work around? Do you have a suggestion for how the feature could be better?
-* Read through [the documentation](https://jekyllrb.com/docs/home/), and click the "improve this page" button, any time you see something confusing, or have a suggestion for to improve something.
+* Read through [the documentation](https://jekyllrb.com/docs/home/), and click the "improve this page" button, any time you see something confusing, or have a suggestion on how to improve something.
 * Browse through [the Jekyll discussion forum](https://talk.jekyllrb.com/), and lend a hand answering questions. There's a good chance you've already experienced what another user is experiencing.
 * Find [an open issue](https://github.com/jekyll/jekyll/issues) (especially [those labeled `help-wanted`](https://github.com/jekyll/jekyll/issues?q=is%3Aopen+is%3Aissue+label%3Ahelp-wanted)), and submit a proposed fix. If it's your first pull request, we promise we won't bite, and are glad to answer any questions.
 * Help evaluate [open pull requests](https://github.com/jekyll/jekyll/pulls), by testing the changes locally and reviewing what's proposed.

From 4f06767ac8fd9402d08411f705a4cb3e93f1fdd7 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 11 May 2018 03:58:39 +0530
Subject: [PATCH 3020/4996] Load Rouge for TestKramdown (#7007)

Merge pull request 7007
---
 test/test_kramdown.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index f7b5ea70d47..62b70ddddc4 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "helper"
+require "rouge"
 
 class TestKramdown < JekyllUnitTest
   context "kramdown" do

From 5a41149b7bc70f9b0ecc8f79af81b8c2afcfdeca Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 10 May 2018 18:28:40 -0400
Subject: [PATCH 3021/4996] Update history to reflect merge of #7007 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7d2969008e3..db99bcc3bff 100644
--- a/History.markdown
+++ b/History.markdown
@@ -44,6 +44,7 @@
   * Loggers should accept both numbers and symbols (#6967)
   * Update instructions for releasing docs Gem (#6975)
   * yajl-ruby update to v1.4.0 (#6976)
+  * Load Rouge for TestKramdown (#7007)
 
 ## 3.8.1 / 2018-05-01
 

From df0a5f7b0b520a1512cdbbf272afab6924284325 Mon Sep 17 00:00:00 2001
From: Martin Scharm 
Date: Mon, 14 May 2018 16:05:22 +0200
Subject: [PATCH 3022/4996] added the CAT plugin to the plugin list (#7011)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index ee3da917a75..1c3332e3fb9 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-onebox](https://github.com/rriemann/jekyll-onebox): Liquid tag for displaying HTML previews (embeds) for links to popular domains. Plugin is based on [Onebox](https://github.com/discourse/onebox) that powers link previews in [Discourse](http://github.com/discourse/discourse) forums.
 - [jekyll-w2m](https://github.com/kacperduras/jekyll-w2m): A Jekyll plugin to liberate content from Microsoft Word documents (powered by [word-to-markdown](https://github.com/benbalter/word-to-markdown)).
 - [jekyll-flickr](https://github.com/rriemann/jekyll-flickr): Liquid tag for responsive Flickr images using HTML5 srcset. Subtitles and automatic license notices are supported.
+- [CAT](https://github.com/binfalse/jekyll-cat): Include the contents of any file (like the `include` command, but also for files outside of `_include`). Similar to Unix' `cat` tool; useful for including source code etc. in posts and pages.
 
 #### Collections
 

From 62d297d4a0bf231f22d2145ff7ee84ce2d9f4488 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 14 May 2018 10:05:24 -0400
Subject: [PATCH 3023/4996] Update history to reflect merge of #7011 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index db99bcc3bff..6b47fbd9c3b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
   * List all static files variables (#7002)
   * Document that _drafts need to be contained within the custom collection directory (#6985)
   * proposed change for passive voice. (#7005)
+  * added the CAT plugin to the plugin list (#7011)
 
 ### Minor Enhancements
 

From fbaf591c12eab3109d8b739945b75d0c393c922d Mon Sep 17 00:00:00 2001
From: Nikita Skalkin 
Date: Tue, 15 May 2018 22:37:05 +0300
Subject: [PATCH 3024/4996] Update rubocop version (#7016)

Merge pull request 7016
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 08ab18af225..ce43b6798f9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.55.0"
+  gem "rubocop", "~> 0.56.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__)
 

From 3bf940b7eea7c025323237fd109ee91a9b9c346f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 15 May 2018 15:37:08 -0400
Subject: [PATCH 3025/4996] Update history to reflect merge of #7016 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6b47fbd9c3b..0a51d4a62d6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -46,6 +46,7 @@
   * Update instructions for releasing docs Gem (#6975)
   * yajl-ruby update to v1.4.0 (#6976)
   * Load Rouge for TestKramdown (#7007)
+  * Update rubocop version (#7016)
 
 ## 3.8.1 / 2018-05-01
 

From b915c7577b7f2f68c4b82474f49062f700855082 Mon Sep 17 00:00:00 2001
From: Kyle Barbour 
Date: Thu, 17 May 2018 15:22:32 -0700
Subject: [PATCH 3026/4996] Add whitespace control to LIQUID_TAG_REGEX (#7015)

Merge pull request 7015
---
 lib/jekyll/excerpt.rb                         |  9 +++-
 ...liquid-block-excerpt-whitespace-control.md |  9 ++++
 ...-15-excerpt-whitespace-control-variable.md |  7 +++
 ...liquid-block-excerpt-whitespace-control.md | 10 ++++
 test/test_excerpt.rb                          | 52 +++++++++++++++++++
 test/test_generated_site.rb                   |  2 +-
 6 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 test/source/_posts/2018-05-15-closed-liquid-block-excerpt-whitespace-control.md
 create mode 100644 test/source/_posts/2018-05-15-excerpt-whitespace-control-variable.md
 create mode 100644 test/source/_posts/2018-05-15-open-liquid-block-excerpt-whitespace-control.md

diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb
index 18d456ea847..41bcb18a58a 100644
--- a/lib/jekyll/excerpt.rb
+++ b/lib/jekyll/excerpt.rb
@@ -128,7 +128,7 @@ def render_with_liquid?
     #
     # Returns excerpt String
 
-    LIQUID_TAG_REGEX = %r!{%\s*(\w+).+\s*%}!m
+    LIQUID_TAG_REGEX = %r!{%-?\s*(\w+).+\s*-?%}!m
     MKDWN_LINK_REF_REGEX = %r!^ {0,3}\[[^\]]+\]:.+$!
 
     def extract_excerpt(doc_content)
@@ -141,7 +141,7 @@ def extract_excerpt(doc_content)
         head =~ LIQUID_TAG_REGEX
         tag_name = Regexp.last_match(1)
 
-        if liquid_block?(tag_name) && head.match(%r!{%\s*end#{tag_name}\s*%}!).nil?
+        if liquid_block?(tag_name) && head.match(%r!{%-?\s*end#{tag_name}\s*-?%}!).nil?
           print_build_warning
           head << "\n{% end#{tag_name} %}"
         end
@@ -158,6 +158,11 @@ def extract_excerpt(doc_content)
 
     def liquid_block?(tag_name)
       Liquid::Template.tags[tag_name].superclass == Liquid::Block
+    rescue NoMethodError
+      Jekyll.logger.error "Error:",
+        "A Liquid tag in the excerpt of #{doc.relative_path} couldn't be " \
+        "parsed."
+      raise
     end
 
     def print_build_warning
diff --git a/test/source/_posts/2018-05-15-closed-liquid-block-excerpt-whitespace-control.md b/test/source/_posts/2018-05-15-closed-liquid-block-excerpt-whitespace-control.md
new file mode 100644
index 00000000000..c43559244df
--- /dev/null
+++ b/test/source/_posts/2018-05-15-closed-liquid-block-excerpt-whitespace-control.md
@@ -0,0 +1,9 @@
+---
+title:  LIQUID_TAG_REGEX excerpt whitespace control test
+layout: post
+---
+
+{%- for post in site.posts -%}
+    You are in a maze of twisty little passages, all alike.
+    There's lots more to say about this, but that's enough for now.
+{%- endfor -%}
diff --git a/test/source/_posts/2018-05-15-excerpt-whitespace-control-variable.md b/test/source/_posts/2018-05-15-excerpt-whitespace-control-variable.md
new file mode 100644
index 00000000000..aad1207a355
--- /dev/null
+++ b/test/source/_posts/2018-05-15-excerpt-whitespace-control-variable.md
@@ -0,0 +1,7 @@
+---
+title:  LIQUID_TAG_REGEX excerpt whitespace control test
+layout: post
+---
+
+{%- assign xyzzy = 'You are in a maze of twisty little passages, all alike.' %}
+{{- xyzzy -}}
diff --git a/test/source/_posts/2018-05-15-open-liquid-block-excerpt-whitespace-control.md b/test/source/_posts/2018-05-15-open-liquid-block-excerpt-whitespace-control.md
new file mode 100644
index 00000000000..4ed799585d3
--- /dev/null
+++ b/test/source/_posts/2018-05-15-open-liquid-block-excerpt-whitespace-control.md
@@ -0,0 +1,10 @@
+---
+title:  LIQUID_TAG_REGEX excerpt whitespace control test
+layout: post
+---
+
+{%- for post in site.posts -%}
+    You are in a maze of twisty little passages, all alike.
+
+    There's lots more to say about this, but that's enough for now.
+{%- endfor -%}
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index c4b4538d2ee..24647decada 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -212,4 +212,56 @@ def do_render(document)
       assert_equal true, @excerpt.is_a?(Jekyll::Excerpt)
     end
   end
+
+  context "An excerpt with non-closed but valid Liquid block tag with whitespace control" do
+    setup do
+      clear_dest
+      @site = fixture_site
+      @post = setup_post("2018-05-15-open-liquid-block-excerpt-whitespace-control.md")
+      @excerpt = @post.data["excerpt"]
+
+      assert_includes @post.content, "{%- for"
+      refute_includes @post.content.split("\n\n")[0], "{%- endfor -%}"
+    end
+
+    should "be appended to as necessary and generated" do
+      assert_includes @excerpt.content, "{% endfor %}"
+      refute_includes @excerpt.content, "{% endfor %}\n\n{% endfor %}"
+      assert_equal true, @excerpt.is_a?(Jekyll::Excerpt)
+    end
+  end
+
+  context "An excerpt with valid closed Liquid block tag with whitespace control" do
+    setup do
+      clear_dest
+      @site = fixture_site
+      @post = setup_post("2018-05-15-closed-liquid-block-excerpt-whitespace-control.md")
+      @excerpt = @post.data["excerpt"]
+
+      assert_includes @post.content, "{%- for"
+      assert_includes @post.content.split("\n\n")[0], "{%- endfor -%}"
+    end
+
+    should "not be appended to but generated as is" do
+      assert_includes @excerpt.content, "{%- endfor -%}"
+      refute_includes @excerpt.content, "{% endfor %}\n\n{% endfor %}"
+      assert_equal true, @excerpt.is_a?(Jekyll::Excerpt)
+    end
+  end
+
+  context "An excerpt with valid Liquid variable with whitespace control" do
+    setup do
+      clear_dest
+      @site = fixture_site
+      @post = setup_post("2018-05-15-excerpt-whitespace-control-variable.md")
+      @excerpt = @post.data["excerpt"]
+
+      assert_includes @post.content, "{%- assign"
+    end
+
+    should "not be appended to but generated as is" do
+      assert_includes @excerpt.content, "{{- xyzzy -}}"
+      assert_equal true, @excerpt.is_a?(Jekyll::Excerpt)
+    end
+  end
 end
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 4eaddb29f37..7ce093536ff 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -16,7 +16,7 @@ class TestGeneratedSite < JekyllUnitTest
     end
 
     should "ensure post count is as expected" do
-      assert_equal 54, @site.posts.size
+      assert_equal 57, @site.posts.size
     end
 
     should "insert site.posts into the index" do

From aed72f6464f675c4426324123ee81e94dab3de43 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 17 May 2018 18:22:33 -0400
Subject: [PATCH 3027/4996] Update history to reflect merge of #7015 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0a51d4a62d6..9d1b7c80791 100644
--- a/History.markdown
+++ b/History.markdown
@@ -48,6 +48,10 @@
   * Load Rouge for TestKramdown (#7007)
   * Update rubocop version (#7016)
 
+### Bug Fixes
+
+  * Add whitespace control to LIQUID_TAG_REGEX (#7015)
+
 ## 3.8.1 / 2018-05-01
 
 ### Bug Fixes

From 74581422e3dbdf754ee519386d59db4e3c73f28f Mon Sep 17 00:00:00 2001
From: Kyle Barbour 
Date: Thu, 17 May 2018 15:22:32 -0700
Subject: [PATCH 3028/4996] Add whitespace control to LIQUID_TAG_REGEX (#7015)

Merge pull request 7015
---
 lib/jekyll/excerpt.rb                         |  9 +++-
 ...liquid-block-excerpt-whitespace-control.md |  9 ++++
 ...-15-excerpt-whitespace-control-variable.md |  7 +++
 ...liquid-block-excerpt-whitespace-control.md | 10 ++++
 test/test_excerpt.rb                          | 52 +++++++++++++++++++
 test/test_generated_site.rb                   |  2 +-
 6 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 test/source/_posts/2018-05-15-closed-liquid-block-excerpt-whitespace-control.md
 create mode 100644 test/source/_posts/2018-05-15-excerpt-whitespace-control-variable.md
 create mode 100644 test/source/_posts/2018-05-15-open-liquid-block-excerpt-whitespace-control.md

diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb
index d270624c062..1df15e09a53 100644
--- a/lib/jekyll/excerpt.rb
+++ b/lib/jekyll/excerpt.rb
@@ -128,7 +128,7 @@ def render_with_liquid?
     #
     # Returns excerpt String
 
-    LIQUID_TAG_REGEX = %r!{%\s*(\w+).+\s*%}!m
+    LIQUID_TAG_REGEX = %r!{%-?\s*(\w+).+\s*-?%}!m
     MKDWN_LINK_REF_REGEX = %r!^ {0,3}\[[^\]]+\]:.+$!
 
     def extract_excerpt(doc_content)
@@ -141,7 +141,7 @@ def extract_excerpt(doc_content)
         head =~ LIQUID_TAG_REGEX
         tag_name = Regexp.last_match(1)
 
-        if liquid_block?(tag_name) && head.match(%r!{%\s*end#{tag_name}\s*%}!).nil?
+        if liquid_block?(tag_name) && head.match(%r!{%-?\s*end#{tag_name}\s*-?%}!).nil?
           print_build_warning
           head << "\n{% end#{tag_name} %}"
         end
@@ -158,6 +158,11 @@ def extract_excerpt(doc_content)
 
     def liquid_block?(tag_name)
       Liquid::Template.tags[tag_name].superclass == Liquid::Block
+    rescue NoMethodError
+      Jekyll.logger.error "Error:",
+        "A Liquid tag in the excerpt of #{doc.relative_path} couldn't be " \
+        "parsed."
+      raise
     end
 
     def print_build_warning
diff --git a/test/source/_posts/2018-05-15-closed-liquid-block-excerpt-whitespace-control.md b/test/source/_posts/2018-05-15-closed-liquid-block-excerpt-whitespace-control.md
new file mode 100644
index 00000000000..c43559244df
--- /dev/null
+++ b/test/source/_posts/2018-05-15-closed-liquid-block-excerpt-whitespace-control.md
@@ -0,0 +1,9 @@
+---
+title:  LIQUID_TAG_REGEX excerpt whitespace control test
+layout: post
+---
+
+{%- for post in site.posts -%}
+    You are in a maze of twisty little passages, all alike.
+    There's lots more to say about this, but that's enough for now.
+{%- endfor -%}
diff --git a/test/source/_posts/2018-05-15-excerpt-whitespace-control-variable.md b/test/source/_posts/2018-05-15-excerpt-whitespace-control-variable.md
new file mode 100644
index 00000000000..aad1207a355
--- /dev/null
+++ b/test/source/_posts/2018-05-15-excerpt-whitespace-control-variable.md
@@ -0,0 +1,7 @@
+---
+title:  LIQUID_TAG_REGEX excerpt whitespace control test
+layout: post
+---
+
+{%- assign xyzzy = 'You are in a maze of twisty little passages, all alike.' %}
+{{- xyzzy -}}
diff --git a/test/source/_posts/2018-05-15-open-liquid-block-excerpt-whitespace-control.md b/test/source/_posts/2018-05-15-open-liquid-block-excerpt-whitespace-control.md
new file mode 100644
index 00000000000..4ed799585d3
--- /dev/null
+++ b/test/source/_posts/2018-05-15-open-liquid-block-excerpt-whitespace-control.md
@@ -0,0 +1,10 @@
+---
+title:  LIQUID_TAG_REGEX excerpt whitespace control test
+layout: post
+---
+
+{%- for post in site.posts -%}
+    You are in a maze of twisty little passages, all alike.
+
+    There's lots more to say about this, but that's enough for now.
+{%- endfor -%}
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index c4b4538d2ee..24647decada 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -212,4 +212,56 @@ def do_render(document)
       assert_equal true, @excerpt.is_a?(Jekyll::Excerpt)
     end
   end
+
+  context "An excerpt with non-closed but valid Liquid block tag with whitespace control" do
+    setup do
+      clear_dest
+      @site = fixture_site
+      @post = setup_post("2018-05-15-open-liquid-block-excerpt-whitespace-control.md")
+      @excerpt = @post.data["excerpt"]
+
+      assert_includes @post.content, "{%- for"
+      refute_includes @post.content.split("\n\n")[0], "{%- endfor -%}"
+    end
+
+    should "be appended to as necessary and generated" do
+      assert_includes @excerpt.content, "{% endfor %}"
+      refute_includes @excerpt.content, "{% endfor %}\n\n{% endfor %}"
+      assert_equal true, @excerpt.is_a?(Jekyll::Excerpt)
+    end
+  end
+
+  context "An excerpt with valid closed Liquid block tag with whitespace control" do
+    setup do
+      clear_dest
+      @site = fixture_site
+      @post = setup_post("2018-05-15-closed-liquid-block-excerpt-whitespace-control.md")
+      @excerpt = @post.data["excerpt"]
+
+      assert_includes @post.content, "{%- for"
+      assert_includes @post.content.split("\n\n")[0], "{%- endfor -%}"
+    end
+
+    should "not be appended to but generated as is" do
+      assert_includes @excerpt.content, "{%- endfor -%}"
+      refute_includes @excerpt.content, "{% endfor %}\n\n{% endfor %}"
+      assert_equal true, @excerpt.is_a?(Jekyll::Excerpt)
+    end
+  end
+
+  context "An excerpt with valid Liquid variable with whitespace control" do
+    setup do
+      clear_dest
+      @site = fixture_site
+      @post = setup_post("2018-05-15-excerpt-whitespace-control-variable.md")
+      @excerpt = @post.data["excerpt"]
+
+      assert_includes @post.content, "{%- assign"
+    end
+
+    should "not be appended to but generated as is" do
+      assert_includes @excerpt.content, "{{- xyzzy -}}"
+      assert_equal true, @excerpt.is_a?(Jekyll::Excerpt)
+    end
+  end
 end
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 4eaddb29f37..7ce093536ff 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -16,7 +16,7 @@ class TestGeneratedSite < JekyllUnitTest
     end
 
     should "ensure post count is as expected" do
-      assert_equal 54, @site.posts.size
+      assert_equal 57, @site.posts.size
     end
 
     should "insert site.posts into the index" do

From b18872b658528b725825fd2911e84468bbd21908 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 17 May 2018 18:22:33 -0400
Subject: [PATCH 3029/4996] Update history to reflect merge of #7015 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5cef9fef342..1333ff194a3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,3 +1,9 @@
+## HEAD
+
+### Bug Fixes
+
+  * Add whitespace control to LIQUID_TAG_REGEX (#7015)
+
 ## 3.8.1 / 2018-05-01
 
 ### Bug Fixes

From 450da91b4b0c0f25868f6492cbc0c3db257dba90 Mon Sep 17 00:00:00 2001
From: Nikita Skalkin 
Date: Tue, 15 May 2018 22:37:05 +0300
Subject: [PATCH 3030/4996] Update rubocop version (#7016)

Merge pull request 7016
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index c20ea23406d..af7e21902a0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,7 @@ group :test do
   gem "nokogiri", RUBY_VERSION >= "2.2" ? "~> 1.7" : "~> 1.7.0"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.55.0"
+  gem "rubocop", "~> 0.56.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__)
 

From b89efa5d5d6a5f7284bf91370a8e759b99d17b5c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 15 May 2018 15:37:08 -0400
Subject: [PATCH 3031/4996] Update history to reflect merge of #7016 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1333ff194a3..6ddf11c3364 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,5 +1,9 @@
 ## HEAD
 
+### Development Fixes
+
+  * Update rubocop version (#7016)
+
 ### Bug Fixes
 
   * Add whitespace control to LIQUID_TAG_REGEX (#7015)

From d22b8ee3920c28a1a540462d931896eaf695f33c Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Sat, 19 May 2018 10:30:00 -0500
Subject: [PATCH 3032/4996] Release :gem: 3.8.2

---
 History.markdown                              |  2 +-
 docs/_config.yml                              |  2 +-
 docs/_docs/history.md                         | 14 ++++++++++++++
 .../2018-05-18-jekyll-3-8-2-released.markdown | 19 +++++++++++++++++++
 docs/latest_version.txt                       |  2 +-
 lib/jekyll/version.rb                         |  2 +-
 6 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 docs/_posts/2018-05-18-jekyll-3-8-2-released.markdown

diff --git a/History.markdown b/History.markdown
index 6ddf11c3364..64f743f5a32 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,4 +1,4 @@
-## HEAD
+## 3.8.2 / 2018-05-18
 
 ### Development Fixes
 
diff --git a/docs/_config.yml b/docs/_config.yml
index 4084cdd6700..e608b1b6e8d 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,5 +1,5 @@
 ---
-version: 3.8.1
+version: 3.8.2
 name: Jekyll • Simple, blog-aware, static sites
 description: Transform your plain text into static websites and blogs
 url: https://jekyllrb.com
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index e30472b2c42..4a9faf7f29a 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,20 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.8.2 / 2018-05-18
+{: #v3-8-2}
+
+### Development Fixes
+{: #development-fixes-v3-8-2}
+
+- Update rubocop version ([#7016]({{ site.repository }}/issues/7016))
+
+### Bug Fixes
+{: #bug-fixes-v3-8-2}
+
+- Add whitespace control to LIQUID_TAG_REGEX ([#7015]({{ site.repository }}/issues/7015))
+
+
 ## 3.8.1 / 2018-05-01
 {: #v3-8-1}
 
diff --git a/docs/_posts/2018-05-18-jekyll-3-8-2-released.markdown b/docs/_posts/2018-05-18-jekyll-3-8-2-released.markdown
new file mode 100644
index 00000000000..7d964e8602a
--- /dev/null
+++ b/docs/_posts/2018-05-18-jekyll-3-8-2-released.markdown
@@ -0,0 +1,19 @@
+---
+title: 'Jekyll 3.8.2 Released'
+date: 2018-05-19 10:30:00 -0500
+author: pathawks
+version: 3.8.2
+categories: [release]
+---
+
+Hello Jekyllers!!
+
+Today we are releasing `v3.8.2`, which fixes the way Jekyll generates excerpts
+for posts when the first paragraph of the post contains Liquid tags that take
+advantage of [Liquid's whitespace control feature][Liquid whitespace].
+
+Big thanks to @kylebarbour, who first reported this issue and also very quickly
+submitted a fix. Also thanks to @nickskalkin for making sure that we are using
+the latest version of Rubocop to lint our code.
+
+[Liquid whitespace]: https://shopify.github.io/liquid/basics/whitespace/
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index f2807196747..a08ffae0cae 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.8.1
+3.8.2
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index f958b6af05d..0a6a8a2d3d7 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "3.8.1".freeze
+  VERSION = "3.8.2".freeze
 end

From bc8460301724fd502a0c3143fe574cea3da41e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?=
 
Date: Sat, 19 May 2018 21:49:54 +0200
Subject: [PATCH 3033/4996] Useless privates removed (#6768)

Merge pull request 6768
---
 .rubocop.yml                                  |  2 --
 lib/jekyll/collection.rb                      |  4 ---
 lib/jekyll/commands/serve.rb                  | 33 +------------------
 .../commands/serve/live_reload_reactor.rb     |  4 +--
 lib/jekyll/commands/serve/servlet.rb          |  6 +---
 lib/jekyll/configuration.rb                   |  9 +----
 lib/jekyll/converters/markdown.rb             |  3 +-
 .../converters/markdown/kramdown_parser.rb    |  6 +---
 lib/jekyll/document.rb                        |  9 +----
 lib/jekyll/filters.rb                         |  3 --
 lib/jekyll/filters/date_filters.rb            |  2 --
 lib/jekyll/filters/grouping_filters.rb        |  3 +-
 lib/jekyll/regenerator.rb                     |  3 --
 lib/jekyll/renderer.rb                        | 13 ++------
 lib/jekyll/site.rb                            | 11 ++-----
 lib/jekyll/utils.rb                           |  4 +--
 lib/jekyll/utils/internet.rb                  |  2 --
 17 files changed, 13 insertions(+), 104 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index f94395cd496..ce750ace645 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -57,8 +57,6 @@ Lint/UnneededRequireStatement:
   Enabled: false
 Lint/UnreachableCode:
   Severity: error
-Lint/UselessAccessModifier:
-  Enabled: false
 Lint/Void:
   Enabled: false
 Metrics/AbcSize:
diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index bdfa4b8674f..5f2aa12aadc 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -207,16 +207,12 @@ def container
       @container ||= site.config["collections_dir"]
     end
 
-    private
-
     def read_document(full_path)
       doc = Document.new(full_path, :site => site, :collection => self)
       doc.read
       docs << doc unless doc.data["published"] == false
     end
 
-    private
-
     def read_static_file(file_path, full_path)
       relative_dir = Jekyll.sanitized_path(
         relative_directory,
diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index efdaea67cf0..9b8417cdd5a 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -103,6 +103,7 @@ def shutdown
         # Perform logical validation of CLI options
 
         private
+
         def validate_options(opts)
           if opts["livereload"]
             if opts["detach"]
@@ -131,9 +132,6 @@ def validate_options(opts)
           end
         end
 
-        #
-
-        private
         # rubocop:disable Metrics/AbcSize
         def register_reload_hooks(opts)
           require_relative "serve/live_reload_reactor"
@@ -171,7 +169,6 @@ def register_reload_hooks(opts)
         # when we get ready to party, checking for an setting up an error page
         # and making sure our destination exists.
 
-        private
         def setup(destination)
           require_relative "serve/servlet"
 
@@ -186,9 +183,6 @@ def create_error_page
           end
         end
 
-        #
-
-        private
         def webrick_opts(opts)
           opts = {
             :JekyllOptions      => opts,
@@ -209,9 +203,6 @@ def webrick_opts(opts)
           opts
         end
 
-        #
-
-        private
         def start_up_webrick(opts, destination)
           if opts["livereload"]
             @reload_reactor.start(opts)
@@ -226,8 +217,6 @@ def start_up_webrick(opts, destination)
         end
 
         # Recreate NondisclosureName under utf-8 circumstance
-
-        private
         def file_handler_opts
           WEBrick::Config::FileHandler.merge({
             :FancyIndexing     => true,
@@ -237,9 +226,6 @@ def file_handler_opts
           })
         end
 
-        #
-
-        private
         def server_address(server, options = {})
           format_url(
             server.config[:SSLEnable],
@@ -249,7 +235,6 @@ def server_address(server, options = {})
           )
         end
 
-        private
         def format_url(ssl_enabled, address, port, baseurl = nil)
           format("%s://%
      s:%i%s", {
             :prefix  => ssl_enabled ? "https" : "http",
@@ -259,9 +244,6 @@ def format_url(ssl_enabled, address, port, baseurl = nil)
           })
         end
 
-        #
-
-        private
         def default_url(opts)
           config = configuration_from_options(opts)
           format_url(
@@ -271,9 +253,6 @@ def default_url(opts)
           )
         end
 
-        #
-
-        private
         def launch_browser(server, opts)
           address = server_address(server, opts)
           return system "start", address if Utils::Platforms.windows?
@@ -286,8 +265,6 @@ def launch_browser(server, opts)
         # Keep in our area with a thread or detach the server as requested
         # by the user.  This method determines what we do based on what you
         # ask us to do.
-
-        private
         def boot_or_detach(server, opts)
           if opts["detach"]
             pid = Process.fork do
@@ -305,8 +282,6 @@ def boot_or_detach(server, opts)
         end
 
         # Make the stack verbose if the user requests it.
-
-        private
         def enable_logging(opts)
           opts[:AccessLog] = []
           level = WEBrick::Log.const_get(opts[:JekyllOptions]["verbose"] ? :DEBUG : :WARN)
@@ -316,8 +291,6 @@ def enable_logging(opts)
         # Add SSL to the stack if the user triggers --enable-ssl and they
         # provide both types of certificates commonly needed.  Raise if they
         # forget to add one of the certificates.
-
-        private
         def enable_ssl(opts)
           cert, key, src =
             opts[:JekyllOptions].values_at("ssl_cert", "ssl_key", "source")
@@ -333,7 +306,6 @@ def enable_ssl(opts)
           opts[:SSLEnable] = true
         end
 
-        private
         def start_callback(detached)
           unless detached
             proc do
@@ -348,7 +320,6 @@ def start_callback(detached)
           end
         end
 
-        private
         def stop_callback(detached)
           unless detached
             proc do
@@ -364,13 +335,11 @@ def stop_callback(detached)
           end
         end
 
-        private
         def mime_types
           file = File.expand_path("../mime.types", __dir__)
           WEBrick::HTTPUtils.load_mime_types(file)
         end
 
-        private
         def read_file(source_dir, file_path)
           File.read(Jekyll.sanitized_path(source_dir, file_path))
         end
diff --git a/lib/jekyll/commands/serve/live_reload_reactor.rb b/lib/jekyll/commands/serve/live_reload_reactor.rb
index 5f3a4877cce..eeafa236e72 100644
--- a/lib/jekyll/commands/serve/live_reload_reactor.rb
+++ b/lib/jekyll/commands/serve/live_reload_reactor.rb
@@ -81,6 +81,7 @@ def reload(pages)
         end
 
         private
+
         def connect(websocket, handshake)
           @connections_count += 1
           if @connections_count == 1
@@ -99,12 +100,10 @@ def connect(websocket, handshake)
           @websockets << websocket
         end
 
-        private
         def disconnect(websocket)
           @websockets.delete(websocket)
         end
 
-        private
         def print_message(json_message)
           msg = JSON.parse(json_message)
           # Not sure what the 'url' command even does in LiveReload.  The spec is silent
@@ -114,7 +113,6 @@ def print_message(json_message)
           end
         end
 
-        private
         def log_error(error)
           Jekyll.logger.error "LiveReload experienced an error. " \
             "Run with --trace for more information."
diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb
index 567ec313cbe..3b05bf87fe1 100644
--- a/lib/jekyll/commands/serve/servlet.rb
+++ b/lib/jekyll/commands/serve/servlet.rb
@@ -178,9 +178,8 @@ def do_GET(req, res)
         end
         # rubocop:enable Naming/MethodName
 
-        #
-
         private
+
         def validate_and_ensure_charset(_req, res)
           key = res.header.keys.grep(%r!content-type!i).first
           typ = res.header[key]
@@ -190,9 +189,6 @@ def validate_and_ensure_charset(_req, res)
           end
         end
 
-        #
-
-        private
         def set_defaults
           hash_ = @jekyll_opts.fetch("webrick", {}).fetch("headers", {})
           DEFAULTS.each_with_object(@headers = hash_) do |(key, val), hash|
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index e49eb62bd9d..cf7fea55397 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -278,6 +278,7 @@ def renamed_key(old, new, config, _ = nil)
     end
 
     private
+
     def style_to_permalink(permalink_style)
       case permalink_style.to_sym
       when :pretty
@@ -299,14 +300,12 @@ def style_to_permalink(permalink_style)
     # file - the file from which the config was extracted
     #
     # Raises an ArgumentError if given config is not a hash
-    private
     def check_config_is_hash!(extracted_config, file)
       unless extracted_config.is_a?(Hash)
         raise ArgumentError, "Configuration file: (INVALID) #{file}".yellow
       end
     end
 
-    private
     def check_auto(config)
       if config.key?("auto") || config.key?("watch")
         Jekyll::Deprecator.deprecation_message "Auto-regeneration can no longer" \
@@ -317,7 +316,6 @@ def check_auto(config)
       end
     end
 
-    private
     def check_server(config)
       if config.key?("server")
         Jekyll::Deprecator.deprecation_message "The 'server' configuration option" \
@@ -327,7 +325,6 @@ def check_server(config)
       end
     end
 
-    private
     def check_pygments(config)
       if config.key?("pygments")
         Jekyll::Deprecator.deprecation_message "The 'pygments' configuration option" \
@@ -340,7 +337,6 @@ def check_pygments(config)
       end
     end
 
-    private
     def check_include_exclude(config)
       %w(include exclude).each do |option|
         if config[option].is_a?(String)
@@ -354,7 +350,6 @@ def check_include_exclude(config)
       end
     end
 
-    private
     def check_coderay(config)
       if (config["kramdown"] || {}).key?("use_coderay")
         Jekyll::Deprecator.deprecation_message "Please change 'use_coderay'" \
@@ -363,7 +358,6 @@ def check_coderay(config)
       end
     end
 
-    private
     def check_maruku(config)
       if config.fetch("markdown", "kramdown").to_s.casecmp("maruku").zero?
         Jekyll.logger.abort_with "Error:", "You're using the 'maruku' " \
@@ -380,7 +374,6 @@ def check_maruku(config)
     #
     # Raises a Jekyll::Errors::InvalidConfigurationError if the config `plugins`
     # is a string
-    private
     def check_plugins(config)
       if config.key?("plugins") && config["plugins"].is_a?(String)
         Jekyll.logger.error "Configuration Error:", "You specified the" \
diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb
index 3c1c3458761..220bc3820d4 100644
--- a/lib/jekyll/converters/markdown.rb
+++ b/lib/jekyll/converters/markdown.rb
@@ -76,6 +76,7 @@ def convert(content)
       end
 
       private
+
       def custom_processor
         converter_name = @config["markdown"]
         if custom_class_allowed?(converter_name)
@@ -90,8 +91,6 @@ def custom_processor
       #
       # Returns true if the parser name contains only alphanumeric
       # characters and is defined within Jekyll::Converters::Markdown
-
-      private
       def custom_class_allowed?(parser_name)
         parser_name !~ %r![^A-Za-z0-9_]! && self.class.constants.include?(
           parser_name.to_sym
diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index b7caab551d4..cdae8664a3f 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -47,6 +47,7 @@ def convert(content)
         end
 
         private
+
         def make_accessible(hash = @config)
           hash.keys.each do |key|
             hash[key.to_sym] = hash[key]
@@ -59,8 +60,6 @@ def make_accessible(hash = @config)
         #   config[highlighter]
         # Where `enable_coderay` is now deprecated because Kramdown
         # supports Rouge now too.
-
-        private
         def highlighter
           return @highlighter if @highlighter
 
@@ -84,7 +83,6 @@ def highlighter
           end
         end
 
-        private
         def strip_coderay_prefix(hash)
           hash.each_with_object({}) do |(key, val), hsh|
             cleaned_key = key.to_s.gsub(%r!\Acoderay_!, "")
@@ -102,8 +100,6 @@ def strip_coderay_prefix(hash)
         # If our highlighter is CodeRay we go in to merge the CodeRay defaults
         # with your "coderay" key if it's there, deprecating it in the
         # process of you using it.
-
-        private
         def modernize_coderay_config
           unless @config["coderay"].empty?
             Jekyll::Deprecator.deprecation_message(
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 061839f13b5..a4f989b88c6 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -416,6 +416,7 @@ def populate_tags
     end
 
     private
+
     def merge_categories!(other)
       if other.key?("categories") && !other["categories"].nil?
         if other["categories"].is_a?(String)
@@ -425,7 +426,6 @@ def merge_categories!(other)
       end
     end
 
-    private
     def merge_date!(source)
       if data.key?("date")
         data["date"] = Utils.parse_date(
@@ -435,7 +435,6 @@ def merge_date!(source)
       end
     end
 
-    private
     def merge_defaults
       defaults = @site.frontmatter_defaults.all(
         relative_path,
@@ -444,7 +443,6 @@ def merge_defaults
       merge_data!(defaults, :source => "front matter defaults") unless defaults.empty?
     end
 
-    private
     def read_content(opts)
       self.content = File.read(path, Utils.merged_file_read_opts(site, opts))
       if content =~ YAML_FRONT_MATTER_REGEXP
@@ -454,7 +452,6 @@ def read_content(opts)
       end
     end
 
-    private
     def read_post_data
       populate_title
       populate_categories
@@ -462,7 +459,6 @@ def read_post_data
       generate_excerpt
     end
 
-    private
     def handle_read_error(error)
       if error.is_a? Psych::SyntaxError
         Jekyll.logger.error "Error:", "YAML Exception reading #{path}: #{error.message}"
@@ -475,7 +471,6 @@ def handle_read_error(error)
       end
     end
 
-    private
     def populate_title
       if relative_path =~ DATE_FILENAME_MATCHER
         date, slug, ext = Regexp.last_match.captures
@@ -491,14 +486,12 @@ def populate_title
       data["ext"]   ||= ext
     end
 
-    private
     def modify_date(date)
       if !data["date"] || data["date"].to_i == site.time.to_i
         merge_data!({ "date" => date }, :source => "filename")
       end
     end
 
-    private
     def generate_excerpt
       if generate_excerpt?
         data["excerpt"] ||= Jekyll::Excerpt.new(self)
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 209a3e0e331..1708d5fa9f3 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -316,7 +316,6 @@ def sort_input(input, property, order)
         .map!(&:last)
     end
 
-    private
     def item_property(item, property)
       if item.respond_to?(:to_liquid)
         property.to_s.split(".").reduce(item.to_liquid) do |subvalue, attribute|
@@ -329,7 +328,6 @@ def item_property(item, property)
       end
     end
 
-    private
     def as_liquid(item)
       case item
       when Hash
@@ -353,7 +351,6 @@ def as_liquid(item)
     end
 
     # Parse a string to a Liquid Condition
-    private
     def parse_condition(exp)
       parser = Liquid::Parser.new(exp)
       left_expr = parser.expression
diff --git a/lib/jekyll/filters/date_filters.rb b/lib/jekyll/filters/date_filters.rb
index 40028c88c77..7bdf0fffd1b 100644
--- a/lib/jekyll/filters/date_filters.rb
+++ b/lib/jekyll/filters/date_filters.rb
@@ -81,7 +81,6 @@ def stringify_date(date, month_type, type = nil, style = nil)
         time.strftime("%d #{month_type} %Y")
       end
 
-      private
       def ordinal(number)
         return "th" if (11..13).cover?(number)
 
@@ -93,7 +92,6 @@ def ordinal(number)
         end
       end
 
-      private
       def time(input)
         date = Liquid::Utils.to_date(input)
         unless date.respond_to?(:to_time)
diff --git a/lib/jekyll/filters/grouping_filters.rb b/lib/jekyll/filters/grouping_filters.rb
index 4086bbe9854..c9cdc6544cc 100644
--- a/lib/jekyll/filters/grouping_filters.rb
+++ b/lib/jekyll/filters/grouping_filters.rb
@@ -41,16 +41,15 @@ def group_by_exp(input, variable, expression)
       end
 
       private
+
       def parse_expression(str)
         Liquid::Variable.new(str, Liquid::ParseContext.new)
       end
 
-      private
       def groupable?(element)
         element.respond_to?(:group_by)
       end
 
-      private
       def grouped_array(groups)
         groups.each_with_object([]) do |item, array|
           array << {
diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb
index 178cb1a90c6..864bb0c8072 100644
--- a/lib/jekyll/regenerator.rb
+++ b/lib/jekyll/regenerator.rb
@@ -165,7 +165,6 @@ def read_metadata
         end
     end
 
-    private
     def regenerate_page?(document)
       document.asset_file? || document.data["regenerate"] ||
         source_modified_or_dest_missing?(
@@ -173,7 +172,6 @@ def regenerate_page?(document)
         )
     end
 
-    private
     def regenerate_document?(document)
       !document.write? || document.data["regenerate"] ||
         source_modified_or_dest_missing?(
@@ -181,7 +179,6 @@ def regenerate_document?(document)
         )
     end
 
-    private
     def existing_file_modified?(path)
       # If one of this file dependencies have been modified,
       # set the regeneration bit for both the dependency and the file to true
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index 9c47b2568e1..acd9a4ee426 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -166,11 +166,12 @@ def place_in_layouts(content, payload, info)
       output
     end
 
+    private
+
     # Checks if the layout specified in the document actually exists
     #
     # layout - the layout to check
     # Returns nothing
-    private
     def validate_layout(layout)
       if invalid_layout?(layout)
         Jekyll.logger.warn(
@@ -187,7 +188,6 @@ def validate_layout(layout)
     # Render layout content into document.output
     #
     # Returns String rendered content
-    private
     def render_layout(output, layout, info)
       payload["content"] = output
       payload["layout"]  = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
@@ -200,7 +200,6 @@ def render_layout(output, layout, info)
       )
     end
 
-    private
     def add_regenerator_dependencies(layout)
       return unless document.write?
       site.regenerator.add_dependency(
@@ -212,7 +211,6 @@ def add_regenerator_dependencies(layout)
     # Set page content to payload and assign pager if document has one.
     #
     # Returns nothing
-    private
     def assign_pages!
       payload["page"] = document.to_liquid
       payload["paginator"] = if document.respond_to?(:pager)
@@ -223,7 +221,6 @@ def assign_pages!
     # Set related posts to payload if document is a post.
     #
     # Returns nothing
-    private
     def assign_current_document!
       payload["site"].current_document = document
     end
@@ -231,13 +228,11 @@ def assign_current_document!
     # Set highlighter prefix and suffix
     #
     # Returns nothing
-    private
     def assign_highlighter_options!
       payload["highlighter_prefix"] = converters.first.highlighter_prefix
       payload["highlighter_suffix"] = converters.first.highlighter_suffix
     end
 
-    private
     def assign_layout_data!
       layout = layouts[document.data["layout"]]
       if layout
@@ -245,7 +240,6 @@ def assign_layout_data!
       end
     end
 
-    private
     def permalink_ext
       document_permalink = document.permalink
       if document_permalink && !document_permalink.end_with?("/")
@@ -254,7 +248,6 @@ def permalink_ext
       end
     end
 
-    private
     def converter_output_ext
       if output_exts.size == 1
         output_exts.last
@@ -263,14 +256,12 @@ def converter_output_ext
       end
     end
 
-    private
     def output_exts
       @output_exts ||= converters.map do |c|
         c.output_ext(document.extname)
       end.compact
     end
 
-    private
     def liquid_options
       @liquid_options ||= site.config["liquid"]
     end
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 25257a64c0d..6264c102bba 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -403,10 +403,11 @@ def collections_path
       @collections_path ||= dir_str.empty? ? source : in_source_dir(dir_str)
     end
 
+    private
+
     # Limits the current posts; removes the posts which exceed the limit_posts
     #
     # Returns nothing
-    private
     def limit_posts!
       if limit_posts > 0
         limit = posts.docs.length < limit_posts ? posts.docs.length : limit_posts
@@ -418,18 +419,15 @@ def limit_posts!
     # already exist.
     #
     # Returns The Cleaner
-    private
     def site_cleaner
       @site_cleaner ||= Cleaner.new(self)
     end
 
-    private
     def configure_plugins
       self.plugin_manager = Jekyll::PluginManager.new(self)
       self.plugins        = plugin_manager.plugins_path
     end
 
-    private
     def configure_theme
       self.theme = nil
       return if config["theme"].nil?
@@ -444,20 +442,17 @@ def configure_theme
         end
     end
 
-    private
     def configure_include_paths
       @includes_load_paths = Array(in_source_dir(config["includes_dir"].to_s))
       @includes_load_paths << theme.includes_path if theme && theme.includes_path
     end
 
-    private
     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
     def render_docs(payload)
       collections.each_value do |collection|
         collection.docs.each do |document|
@@ -466,14 +461,12 @@ def render_docs(payload)
       end
     end
 
-    private
     def render_pages(payload)
       pages.flatten.each do |page|
         render_regenerated(page, payload)
       end
     end
 
-    private
     def render_regenerated(document, payload)
       return unless regenerator.regenerate?(document)
       document.output = Jekyll::Renderer.new(self, document, payload).run
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index e17a4cdc1bd..f52a62ff439 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -313,6 +313,7 @@ def merged_file_read_opts(site, opts)
     end
 
     private
+
     def merge_values(target, overwrite)
       target.merge!(overwrite) do |_key, old_val, new_val|
         if new_val.nil?
@@ -325,14 +326,12 @@ def merge_values(target, overwrite)
       end
     end
 
-    private
     def merge_default_proc(target, overwrite)
       if target.is_a?(Hash) && overwrite.is_a?(Hash) && target.default_proc.nil?
         target.default_proc = overwrite.default_proc
       end
     end
 
-    private
     def duplicate_frozen_values(target)
       target.each do |key, val|
         target[key] = val.dup if val.frozen? && duplicable?(val)
@@ -343,7 +342,6 @@ def duplicate_frozen_values(target)
     #
     # 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
diff --git a/lib/jekyll/utils/internet.rb b/lib/jekyll/utils/internet.rb
index f895596c548..f723469b49a 100644
--- a/lib/jekyll/utils/internet.rb
+++ b/lib/jekyll/utils/internet.rb
@@ -23,8 +23,6 @@ def connected?
         !dns("example.com").nil?
       end
 
-      private
-      module_function
       def dns(domain)
         require "resolv"
         Resolv::DNS.open do |resolver|

From 9968df06b3fb61dc356c0f0488a604b03df6e6ec Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 19 May 2018 15:49:56 -0400
Subject: [PATCH 3034/4996] Update history to reflect merge of #6768 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4eb0cac7bc5..2bd80e6545b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -46,6 +46,7 @@
   * Update instructions for releasing docs Gem (#6975)
   * yajl-ruby update to v1.4.0 (#6976)
   * Load Rouge for TestKramdown (#7007)
+  * Useless privates removed (#6768)
 
 ## 3.8.2 / 2018-05-18
 

From 9aec161550dcf48ebb816a9998c03b4e8c12c9ae Mon Sep 17 00:00:00 2001
From: Philip Belesky 
Date: Mon, 21 May 2018 02:30:15 +1000
Subject: [PATCH 3035/4996] Fix --unpublished not affecting collection
 documents (#7027)

Merge pull request 7027
---
 features/collections.feature | 98 ++++++++++++++++++++++++++++++++++++
 lib/jekyll/collection.rb     |  4 +-
 2 files changed, 101 insertions(+), 1 deletion(-)

diff --git a/features/collections.feature b/features/collections.feature
index 33a01ade6ed..03f10dc1e6f 100644
--- a/features/collections.feature
+++ b/features/collections.feature
@@ -263,6 +263,104 @@ Feature: Collections
     And the "_site/puppies/snowy.html" file should not exist
     And the "_site/puppies/hardy.html" file should not exist
 
+  Scenario: Access rendered collection with future date and unpublished flag via Liquid
+    Given I have a _puppies directory
+    And I have the following documents under the puppies collection:
+      | title  | date       | content             | published |
+      | Rover  | 2007-12-31 | content for Rover.  | true      |
+      | Figor  | 2007-12-31 | content for Figor.  | false     |
+      | Snowy  | 2199-12-31 | content for Snowy.  | true      |
+      | Hardy  | 2199-12-31 | content for Hardy.  | false     |
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      puppies:
+        output: true
+    """
+    And I have a "index.md" page that contains "{% for puppy in site.puppies %}
      {{ puppy.title }}
      {% endfor %}"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
      Rover
      " in "_site/index.html"
+    But I should see "
      Snowy
      " in "_site/index.html"
+    And I should not see "
      Figor
      " in "_site/index.html"
+    And I should not see "
      Hardy
      " in "_site/index.html"
+    And the "_site/puppies/rover.html" file should exist
+    And the "_site/puppies/snowy.html" file should not exist
+    And the "_site/puppies/figor.html" file should not exist
+    And the "_site/puppies/hardy.html" file should not exist
+    When I run jekyll build --unpublished
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
      Rover
      " in "_site/index.html"
+    And I should see "
      Snowy
      " in "_site/index.html"
+    And I should see "
      Figor
      " in "_site/index.html"
+    But I should see "
      Hardy
      " in "_site/index.html"
+    And the "_site/puppies/rover.html" file should exist
+    And the "_site/puppies/snowy.html" file should not exist
+    And the "_site/puppies/figor.html" file should exist
+    And the "_site/puppies/hardy.html" file should not exist
+    When I run jekyll build --unpublished --future
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
      Rover
      " in "_site/index.html"
+    And I should see "
      Snowy
      " in "_site/index.html"
+    And I should see "
      Figor
      " in "_site/index.html"
+    But I should see "
      Hardy
      " in "_site/index.html"
+    And the "_site/puppies/rover.html" file should exist
+    And the "_site/puppies/snowy.html" file should exist
+    And the "_site/puppies/figor.html" file should exist
+    And the "_site/puppies/hardy.html" file should exist
+
+  Scenario: Access unrendered collection with future date and unpublished flag via Liquid
+    Given I have a _puppies directory
+    And I have the following documents under the puppies collection:
+      | title  | date       | content             | published |
+      | Rover  | 2007-12-31 | content for Rover.  | true      |
+      | Figor  | 2007-12-31 | content for Figor.  | false     |
+      | Snowy  | 2199-12-31 | content for Snowy.  | true      |
+      | Hardy  | 2199-12-31 | content for Hardy.  | false     |
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      puppies:
+        output: false
+    """
+    And I have a "index.md" page that contains "{% for puppy in site.puppies %}
      {{ puppy.title }}
      {% endfor %}"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
      Rover
      " in "_site/index.html"
+    But I should see "
      Snowy
      " in "_site/index.html"
+    And I should not see "
      Figor
      " in "_site/index.html"
+    And I should not see "
      Hardy
      " in "_site/index.html"
+    And the "_site/puppies/rover.html" file should not exist
+    And the "_site/puppies/snowy.html" file should not exist
+    And the "_site/puppies/figor.html" file should not exist
+    And the "_site/puppies/hardy.html" file should not exist
+    When I run jekyll build --unpublished
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
      Rover
      " in "_site/index.html"
+    And I should see "
      Snowy
      " in "_site/index.html"
+    And I should see "
      Figor
      " in "_site/index.html"
+    But I should see "
      Hardy
      " in "_site/index.html"
+    And the "_site/puppies/rover.html" file should not exist
+    And the "_site/puppies/snowy.html" file should not exist
+    And the "_site/puppies/figor.html" file should not exist
+    And the "_site/puppies/hardy.html" file should not exist
+    When I run jekyll build --unpublished --future
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
      Rover
      " in "_site/index.html"
+    And I should see "
      Snowy
      " in "_site/index.html"
+    And I should see "
      Figor
      " in "_site/index.html"
+    But I should see "
      Hardy
      " in "_site/index.html"
+    And the "_site/puppies/rover.html" file should not exist
+    And the "_site/puppies/snowy.html" file should not exist
+    And the "_site/puppies/figor.html" file should not exist
+    And the "_site/puppies/hardy.html" file should not exist
+
   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
diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index 5f2aa12aadc..92dff21aeae 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -210,7 +210,9 @@ def container
     def read_document(full_path)
       doc = Document.new(full_path, :site => site, :collection => self)
       doc.read
-      docs << doc unless doc.data["published"] == false
+      if site.unpublished || doc.published?
+        docs << doc
+      end
     end
 
     def read_static_file(file_path, full_path)

From e932a1e27f7f1fb103d94d07c470cc5d9f666295 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 20 May 2018 12:30:17 -0400
Subject: [PATCH 3036/4996] Update history to reflect merge of #7027 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2bd80e6545b..d79d45c650b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -48,6 +48,10 @@
   * Load Rouge for TestKramdown (#7007)
   * Useless privates removed (#6768)
 
+### Bug Fixes
+
+  * Fix --unpublished not affecting collection documents (#7027)
+
 ## 3.8.2 / 2018-05-18
 
 ### Development Fixes

From 6792ff936c987972ec686d749647675d91dcd593 Mon Sep 17 00:00:00 2001
From: Philip Belesky 
Date: Mon, 21 May 2018 02:30:15 +1000
Subject: [PATCH 3037/4996] Fix --unpublished not affecting collection
 documents (#7027)

Merge pull request 7027
---
 features/collections.feature | 98 ++++++++++++++++++++++++++++++++++++
 lib/jekyll/collection.rb     |  4 +-
 2 files changed, 101 insertions(+), 1 deletion(-)

diff --git a/features/collections.feature b/features/collections.feature
index 33a01ade6ed..03f10dc1e6f 100644
--- a/features/collections.feature
+++ b/features/collections.feature
@@ -263,6 +263,104 @@ Feature: Collections
     And the "_site/puppies/snowy.html" file should not exist
     And the "_site/puppies/hardy.html" file should not exist
 
+  Scenario: Access rendered collection with future date and unpublished flag via Liquid
+    Given I have a _puppies directory
+    And I have the following documents under the puppies collection:
+      | title  | date       | content             | published |
+      | Rover  | 2007-12-31 | content for Rover.  | true      |
+      | Figor  | 2007-12-31 | content for Figor.  | false     |
+      | Snowy  | 2199-12-31 | content for Snowy.  | true      |
+      | Hardy  | 2199-12-31 | content for Hardy.  | false     |
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      puppies:
+        output: true
+    """
+    And I have a "index.md" page that contains "{% for puppy in site.puppies %}
      {{ puppy.title }}
      {% endfor %}"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
      Rover
      " in "_site/index.html"
+    But I should see "
      Snowy
      " in "_site/index.html"
+    And I should not see "
      Figor
      " in "_site/index.html"
+    And I should not see "
      Hardy
      " in "_site/index.html"
+    And the "_site/puppies/rover.html" file should exist
+    And the "_site/puppies/snowy.html" file should not exist
+    And the "_site/puppies/figor.html" file should not exist
+    And the "_site/puppies/hardy.html" file should not exist
+    When I run jekyll build --unpublished
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
      Rover
      " in "_site/index.html"
+    And I should see "
      Snowy
      " in "_site/index.html"
+    And I should see "
      Figor
      " in "_site/index.html"
+    But I should see "
      Hardy
      " in "_site/index.html"
+    And the "_site/puppies/rover.html" file should exist
+    And the "_site/puppies/snowy.html" file should not exist
+    And the "_site/puppies/figor.html" file should exist
+    And the "_site/puppies/hardy.html" file should not exist
+    When I run jekyll build --unpublished --future
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
      Rover
      " in "_site/index.html"
+    And I should see "
      Snowy
      " in "_site/index.html"
+    And I should see "
      Figor
      " in "_site/index.html"
+    But I should see "
      Hardy
      " in "_site/index.html"
+    And the "_site/puppies/rover.html" file should exist
+    And the "_site/puppies/snowy.html" file should exist
+    And the "_site/puppies/figor.html" file should exist
+    And the "_site/puppies/hardy.html" file should exist
+
+  Scenario: Access unrendered collection with future date and unpublished flag via Liquid
+    Given I have a _puppies directory
+    And I have the following documents under the puppies collection:
+      | title  | date       | content             | published |
+      | Rover  | 2007-12-31 | content for Rover.  | true      |
+      | Figor  | 2007-12-31 | content for Figor.  | false     |
+      | Snowy  | 2199-12-31 | content for Snowy.  | true      |
+      | Hardy  | 2199-12-31 | content for Hardy.  | false     |
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      puppies:
+        output: false
+    """
+    And I have a "index.md" page that contains "{% for puppy in site.puppies %}
      {{ puppy.title }}
      {% endfor %}"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
      Rover
      " in "_site/index.html"
+    But I should see "
      Snowy
      " in "_site/index.html"
+    And I should not see "
      Figor
      " in "_site/index.html"
+    And I should not see "
      Hardy
      " in "_site/index.html"
+    And the "_site/puppies/rover.html" file should not exist
+    And the "_site/puppies/snowy.html" file should not exist
+    And the "_site/puppies/figor.html" file should not exist
+    And the "_site/puppies/hardy.html" file should not exist
+    When I run jekyll build --unpublished
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
      Rover
      " in "_site/index.html"
+    And I should see "
      Snowy
      " in "_site/index.html"
+    And I should see "
      Figor
      " in "_site/index.html"
+    But I should see "
      Hardy
      " in "_site/index.html"
+    And the "_site/puppies/rover.html" file should not exist
+    And the "_site/puppies/snowy.html" file should not exist
+    And the "_site/puppies/figor.html" file should not exist
+    And the "_site/puppies/hardy.html" file should not exist
+    When I run jekyll build --unpublished --future
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
      Rover
      " in "_site/index.html"
+    And I should see "
      Snowy
      " in "_site/index.html"
+    And I should see "
      Figor
      " in "_site/index.html"
+    But I should see "
      Hardy
      " in "_site/index.html"
+    And the "_site/puppies/rover.html" file should not exist
+    And the "_site/puppies/snowy.html" file should not exist
+    And the "_site/puppies/figor.html" file should not exist
+    And the "_site/puppies/hardy.html" file should not exist
+
   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
diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index bdfa4b8674f..4a8b6f5320e 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -212,7 +212,9 @@ def container
     def read_document(full_path)
       doc = Document.new(full_path, :site => site, :collection => self)
       doc.read
-      docs << doc unless doc.data["published"] == false
+      if site.unpublished || doc.published?
+        docs << doc
+      end
     end
 
     private

From 03c252ba4d659c6758f39e96507e38820fba2189 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 20 May 2018 12:30:17 -0400
Subject: [PATCH 3038/4996] Update history to reflect merge of #7027 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 64f743f5a32..b50563f8e3b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,3 +1,9 @@
+## HEAD
+
+### Bug Fixes
+
+  * Fix --unpublished not affecting collection documents (#7027)
+
 ## 3.8.2 / 2018-05-18
 
 ### Development Fixes

From 97c28f54956f582d80e4733a1914cf71af015953 Mon Sep 17 00:00:00 2001
From: Dan Friedman 
Date: Mon, 21 May 2018 01:45:03 -0500
Subject: [PATCH 3039/4996] Updated to supported version (#7031)

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

diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index 63a52a15753..e4835a9861f 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -89,7 +89,7 @@ Now we can install Ruby. To do this we will use a repository from [BrightBox](ht
 ```sh
 sudo apt-add-repository ppa:brightbox/ruby-ng
 sudo apt-get update
-sudo apt-get install ruby2.3 ruby2.3-dev build-essential dh-autoreconf
+sudo apt-get install ruby2.4 ruby2.4-dev build-essential dh-autoreconf
 ```
 
 Next let's update our Ruby gems:

From a96f846bdb7ca7086011e2d194884c163948ec77 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 21 May 2018 02:45:05 -0400
Subject: [PATCH 3040/4996] Update history to reflect merge of #7031 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d79d45c650b..afd7f93c91d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -20,6 +20,7 @@
   * Document that _drafts need to be contained within the custom collection directory (#6985)
   * proposed change for passive voice. (#7005)
   * added the CAT plugin to the plugin list (#7011)
+  * Updated to supported version (#7031)
 
 ### Minor Enhancements
 

From e3b325931b9ea3846a8cea75c11630ccfaee9995 Mon Sep 17 00:00:00 2001
From: Ali Thompson 
Date: Thu, 24 May 2018 13:27:57 -0700
Subject: [PATCH 3041/4996] Update drafts.md (#7037)

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

diff --git a/docs/_docs/drafts.md b/docs/_docs/drafts.md
index c4b4f9f0514..0e6bfd7dfb8 100644
--- a/docs/_docs/drafts.md
+++ b/docs/_docs/drafts.md
@@ -3,7 +3,7 @@ title: Working with drafts
 permalink: /docs/drafts/
 ---
 
-Drafts are posts without a date. They're posts you're still working on and
+Drafts are posts without a date in the filename. They're posts you're still working on and
 don't want to publish yet. To get up and running with drafts, create a
 `_drafts` folder in your site's root (as described in the [site structure](/docs/structure/) section) and create your
 first draft:

From d64493806c55caa959ccdc5fe62ed27c71a10745 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 24 May 2018 16:27:59 -0400
Subject: [PATCH 3042/4996] Update history to reflect merge of #7037 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index afd7f93c91d..27df3c522a3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -21,6 +21,7 @@
   * proposed change for passive voice. (#7005)
   * added the CAT plugin to the plugin list (#7011)
   * Updated to supported version (#7031)
+  * Clarify definition of 'draft' (#7037)
 
 ### Minor Enhancements
 

From 1684905ec793be16ebb3ca4e81406aff5cbdbd10 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Thu, 31 May 2018 10:13:45 -0600
Subject: [PATCH 3043/4996] Allow i18n v0.9.5 and higher (#7044)

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

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 107fe7c3db5..76f92f41bc0 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("addressable",           "~> 2.4")
   s.add_runtime_dependency("colorator",             "~> 1.0")
   s.add_runtime_dependency("em-websocket",          "~> 0.5")
-  s.add_runtime_dependency("i18n",                  "~> 1.0")
+  s.add_runtime_dependency("i18n",                  ">= 0.9.5", "< 2")
   s.add_runtime_dependency("jekyll-sass-converter", "~> 1.0")
   s.add_runtime_dependency("jekyll-watch",          "~> 2.0")
   s.add_runtime_dependency("kramdown",              "~> 1.14")

From 6805f1c342e9e3d0332ff3b46841af1d37779876 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 31 May 2018 12:13:47 -0400
Subject: [PATCH 3044/4996] Update history to reflect merge of #7044 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 27df3c522a3..20e4bf01a7e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -49,6 +49,7 @@
   * yajl-ruby update to v1.4.0 (#6976)
   * Load Rouge for TestKramdown (#7007)
   * Useless privates removed (#6768)
+  * Allow i18n v0.9.5 and higher (#7044)
 
 ### Bug Fixes
 

From 6c771608e5cf347414692520d1055d90d4dadbee Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 2 Jun 2018 12:50:32 +0200
Subject: [PATCH 3045/4996] Update Rubocop's config (#7050)

Merge pull request 7050
---
 .rubocop.yml                                  |  66 ++-----
 lib/jekyll/collection.rb                      |   6 +-
 lib/jekyll/command.rb                         |  12 +-
 lib/jekyll/commands/build.rb                  |  14 +-
 lib/jekyll/commands/doctor.rb                 |  14 +-
 lib/jekyll/commands/help.rb                   |   2 +-
 lib/jekyll/commands/new.rb                    |  56 +++---
 lib/jekyll/commands/new_theme.rb              |  58 +++---
 lib/jekyll/commands/serve.rb                  |  61 +++---
 .../commands/serve/live_reload_reactor.rb     |  12 +-
 lib/jekyll/commands/serve/servlet.rb          |   4 +-
 lib/jekyll/configuration.rb                   |   6 +-
 lib/jekyll/converters/markdown.rb             |  10 +-
 lib/jekyll/converters/smartypants.rb          |  26 +--
 lib/jekyll/convertible.rb                     |  20 +-
 lib/jekyll/deprecator.rb                      |   4 +-
 lib/jekyll/document.rb                        |  36 ++--
 lib/jekyll/drops/collection_drop.rb           |   5 +-
 lib/jekyll/drops/drop.rb                      |   2 +-
 lib/jekyll/drops/site_drop.rb                 |   3 +-
 lib/jekyll/drops/unified_payload_drop.rb      |   1 +
 lib/jekyll/drops/url_drop.rb                  |   1 +
 lib/jekyll/entry_filter.rb                    |   4 +-
 lib/jekyll/excerpt.rb                         |  24 +--
 lib/jekyll/external.rb                        |  10 +-
 lib/jekyll/filters.rb                         |   5 +-
 lib/jekyll/filters/date_filters.rb            |   3 +-
 lib/jekyll/filters/url_filters.rb             |   1 -
 lib/jekyll/frontmatter_defaults.rb            |   4 +-
 lib/jekyll/hooks.rb                           |   4 +-
 lib/jekyll/liquid_extensions.rb               |   2 -
 lib/jekyll/liquid_renderer/table.rb           | 132 ++++++-------
 lib/jekyll/page.rb                            |   6 +-
 lib/jekyll/plugin.rb                          |  16 +-
 lib/jekyll/reader.rb                          |   4 +-
 lib/jekyll/readers/data_reader.rb             |  16 +-
 lib/jekyll/readers/layout_reader.rb           |   4 +-
 lib/jekyll/readers/post_reader.rb             |   7 +-
 lib/jekyll/readers/theme_assets_reader.rb     |  11 +-
 lib/jekyll/regenerator.rb                     |  12 +-
 lib/jekyll/renderer.rb                        |  16 +-
 lib/jekyll/site.rb                            |  30 ++-
 lib/jekyll/static_file.rb                     |   7 +-
 lib/jekyll/stevenson.rb                       |   4 +-
 lib/jekyll/tags/highlight.rb                  |  24 +--
 lib/jekyll/tags/include.rb                    |  26 +--
 lib/jekyll/tags/link.rb                       |  10 +-
 lib/jekyll/tags/post_url.rb                   |  30 +--
 lib/jekyll/theme.rb                           |  12 +-
 lib/jekyll/theme_builder.rb                   | 180 +++++++++---------
 lib/jekyll/url.rb                             |   4 +-
 lib/jekyll/utils/exec.rb                      |   1 -
 lib/jekyll/utils/internet.rb                  |   4 +-
 lib/jekyll/utils/platforms.rb                 |   3 +-
 lib/jekyll/utils/thread_event.rb              |   6 +-
 lib/jekyll/utils/win_tz.rb                    |   2 +-
 lib/jekyll/version.rb                         |   2 +-
 57 files changed, 473 insertions(+), 572 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index ce750ace645..9edab2bd064 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -18,30 +18,14 @@ AllCops:
     - script/**/*
     - vendor/**/*
     - tmp/**/*
-Layout/AlignArray:
-  Enabled: false
 Layout/AlignHash:
   EnforcedHashRocketStyle: table
-Layout/AlignParameters:
-  Enabled: false
-Layout/EmptyLinesAroundAccessModifier:
-  Enabled: false
-Layout/EmptyLinesAroundModuleBody:
-  Enabled: false
-Layout/EndOfLine:
-  EnforcedStyle: native
-Layout/ExtraSpacing:
-  AllowForAlignment: true
-Layout/FirstParameterIndentation:
-  EnforcedStyle: consistent
 Layout/IndentationWidth:
   Severity: error
 Layout/IndentArray:
   EnforcedStyle: consistent
 Layout/IndentHash:
   EnforcedStyle: consistent
-Layout/IndentHeredoc:
-  Enabled: false
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 Layout/MultilineOperationIndentation:
@@ -53,12 +37,11 @@ Layout/EmptyComment:
   Enabled: false
 Layout/EndAlignment:
   Severity: error
-Lint/UnneededRequireStatement:
-  Enabled: false
 Lint/UnreachableCode:
   Severity: error
 Lint/Void:
-  Enabled: false
+  Exclude:
+    - lib/jekyll/site.rb
 Metrics/AbcSize:
   Max: 21
 Metrics/BlockLength:
@@ -66,22 +49,26 @@ Metrics/BlockLength:
     - test/**/*.rb
     - lib/jekyll/configuration.rb
     - rake/*.rake
-    - jekyll.gemspec
 Metrics/ClassLength:
   Exclude:
     - !ruby/regexp /features\/.*.rb$/
     - !ruby/regexp /test\/.*.rb$/
-  Max: 300
+    - lib/jekyll/document.rb
+    - lib/jekyll/site.rb
+    - lib/jekyll/commands/serve.rb
+    - lib/jekyll/configuration.rb
+  Max: 240
 Metrics/CyclomaticComplexity:
-  Max: 9
+  Exclude:
+    - lib/jekyll/utils.rb
+    - lib/jekyll/commands/serve.rb
 Metrics/LineLength:
   Exclude:
     - !ruby/regexp /features\/.*.rb/
     - Rakefile
     - rake/*.rake
     - Gemfile
-    - jekyll.gemspec
-  Max: 90
+  Max: 100
   Severity: warning
 Metrics/MethodLength:
   CountComments: false
@@ -95,8 +82,6 @@ Metrics/PerceivedComplexity:
   Max: 8
 Naming/FileName:
   Enabled: false
-Naming/HeredocDelimiterNaming:
-  Enabled: false
 Naming/MemoizedInstanceVariableName:
   Exclude:
     - lib/jekyll/page_without_a_file.rb
@@ -105,8 +90,6 @@ Naming/MemoizedInstanceVariableName:
 Naming/UncommunicativeMethodParamName:
   AllowedNames:
     - _
-Performance/UnfreezeString:
-  Enabled: false
 Security/MarshalLoad:
   Exclude:
     - !ruby/regexp /test\/.*.rb$/
@@ -116,19 +99,13 @@ Security/YAMLLoad:
     - !ruby/regexp /features\/.*.rb/
     - !ruby/regexp /test\/.*.rb$/
 Style/Alias:
-  Enabled: false
+  EnforcedStyle: prefer_alias_method
 Style/AndOr:
   Severity: error
-Style/BracesAroundHashParameters:
-  Enabled: false
-Style/ClassAndModuleChildren:
-  Enabled: false
 Style/FrozenStringLiteralComment:
   EnforcedStyle: always
 Style/Documentation:
   Enabled: false
-  Exclude:
-    - !ruby/regexp /features\/.*.rb$/
 Style/DoubleNegation:
   Enabled: false
 Style/FormatStringToken:
@@ -139,10 +116,6 @@ Style/GuardClause:
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
   Severity: error
-Style/IfUnlessModifier:
-  Enabled: false
-Style/InverseMethods:
-  Enabled: false
 Style/MixinUsage:
   Exclude:
     - test/helper.rb
@@ -150,8 +123,6 @@ Style/ModuleFunction:
   Enabled: false
 Style/MultilineTernaryOperator:
   Severity: error
-Style/NumericPredicate:
-  Enabled: false
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     "%q": "{}"
@@ -161,28 +132,21 @@ Style/PercentLiteralDelimiters:
     "%w": "()"
     "%W": "()"
     "%x": "()"
-Style/RedundantFreeze:
-  Enabled: false
-Style/RedundantReturn:
-  Enabled: false
-Style/RedundantSelf:
-  Enabled: false
 Style/RegexpLiteral:
   EnforcedStyle: percent_r
 Style/RescueModifier:
   Enabled: false
 Style/SafeNavigation:
-  Enabled: false
+  Exclude:
+    - lib/jekyll/document.rb
 Style/SignalException:
   EnforcedStyle: only_raise
-Style/SingleLineMethods:
-  Enabled: false
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 Style/SymbolArray:
-  Enabled: false
+  EnforcedStyle: brackets
 Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: consistent_comma
 Style/TrailingCommaInHashLiteral:
diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index 92dff21aeae..e4af6a3a10c 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -35,7 +35,7 @@ def respond_to_missing?(method, include_private = false)
     def method_missing(method, *args, &blck)
       if docs.respond_to?(method.to_sym)
         Jekyll.logger.warn "Deprecation:",
-          "#{label}.#{method} should be changed to #{label}.docs.#{method}."
+                           "#{label}.#{method} should be changed to #{label}.docs.#{method}."
         Jekyll.logger.warn "", "Called by #{caller(0..0)}."
         docs.public_send(method.to_sym, *args, &blck)
       else
@@ -210,9 +210,7 @@ def container
     def read_document(full_path)
       doc = Document.new(full_path, :site => site, :collection => self)
       doc.read
-      if site.unpublished || doc.published?
-        docs << doc
-      end
+      docs << doc if site.unpublished || doc.published?
     end
 
     def read_static_file(file_path, full_path)
diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index 50cfe8de6dc..d81ccef59cd 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -51,26 +51,26 @@ def configuration_from_options(options)
       # rubocop:disable Metrics/MethodLength
       def add_build_options(cmd)
         cmd.option "config", "--config CONFIG_FILE[,CONFIG_FILE2,...]",
-          Array, "Custom configuration file"
+                   Array, "Custom configuration file"
         cmd.option "destination", "-d", "--destination DESTINATION",
-          "The current folder will be generated into DESTINATION"
+                   "The current folder will be generated into DESTINATION"
         cmd.option "source", "-s", "--source SOURCE", "Custom source directory"
         cmd.option "future", "--future", "Publishes posts with a future date"
         cmd.option "limit_posts", "--limit_posts MAX_POSTS", Integer,
-          "Limits the number of posts to parse and publish"
+                   "Limits the number of posts to parse and publish"
         cmd.option "watch", "-w", "--[no-]watch", "Watch for changes and rebuild"
         cmd.option "baseurl", "-b", "--baseurl URL",
-          "Serve the website from the given base URL"
+                   "Serve the website from the given base URL"
         cmd.option "force_polling", "--force_polling", "Force watch to use polling"
         cmd.option "lsi", "--lsi", "Use LSI for improved related posts"
         cmd.option "show_drafts", "-D", "--drafts", "Render posts in the _drafts folder"
         cmd.option "unpublished", "--unpublished",
-          "Render posts that were marked as unpublished"
+                   "Render posts that were marked as unpublished"
         cmd.option "quiet", "-q", "--quiet", "Silence output."
         cmd.option "verbose", "-V", "--verbose", "Print verbose output."
         cmd.option "incremental", "-I", "--incremental", "Enable incremental rebuild."
         cmd.option "strict_front_matter", "--strict_front_matter",
-          "Fail if errors are present in front matter"
+                   "Fail if errors are present in front matter"
       end
       # rubocop:enable Metrics/MethodLength
 
diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb
index a5b26704b46..3e0b715edcd 100644
--- a/lib/jekyll/commands/build.rb
+++ b/lib/jekyll/commands/build.rb
@@ -31,14 +31,14 @@ def process(options)
 
           if options.fetch("skip_initial_build", false)
             Jekyll.logger.warn "Build Warning:", "Skipping the initial build." \
-                        " This may result in an out-of-date site."
+                               " This may result in an out-of-date site."
           else
             build(site, options)
           end
 
           if options.fetch("detach", false)
             Jekyll.logger.info "Auto-regeneration:",
-              "disabled when running server detached."
+                               "disabled when running server detached."
           elsif options.fetch("watch", false)
             watch(site, options)
           else
@@ -60,7 +60,7 @@ def build(site, options)
           Jekyll.logger.info "Source:", source
           Jekyll.logger.info "Destination:", destination
           Jekyll.logger.info "Incremental build:",
-            (incremental ? "enabled" : "disabled. Enable with --incremental")
+                             (incremental ? "enabled" : "disabled. Enable with --incremental")
           Jekyll.logger.info "Generating..."
           process_site(site)
           Jekyll.logger.info "", "done in #{(Time.now - t).round(3)} seconds."
@@ -76,12 +76,12 @@ def watch(site, options)
           # Warn Windows users that they might need to upgrade.
           if Utils::Platforms.bash_on_windows?
             Jekyll.logger.warn "",
-              "Auto-regeneration may not work on some Windows versions."
+                               "Auto-regeneration may not work on some Windows versions."
             Jekyll.logger.warn "",
-              "Please see: https://github.com/Microsoft/BashOnWindows/issues/216"
+                               "Please see: https://github.com/Microsoft/BashOnWindows/issues/216"
             Jekyll.logger.warn "",
-              "If it does not work, please upgrade Bash on Windows or "\
-                "run Jekyll with --no-watch."
+                               "If it does not work, please upgrade Bash on Windows or "\
+                               "run Jekyll with --no-watch."
           end
 
           External.require_with_graceful_fail "jekyll-watch"
diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb
index bb313152c37..4cc196cdd15 100644
--- a/lib/jekyll/commands/doctor.rb
+++ b/lib/jekyll/commands/doctor.rb
@@ -11,7 +11,7 @@ def init_with_program(prog)
             c.alias(:hyde)
 
             c.option "config", "--config CONFIG_FILE[,CONFIG_FILE2,...]", Array,
-                            "Custom configuration file"
+                     "Custom configuration file"
 
             c.action do |_, options|
               Jekyll::Commands::Doctor.process(options)
@@ -48,19 +48,18 @@ def properly_gathered_posts?(site)
           posts_at_root = site.in_source_dir("_posts")
           return true unless File.directory?(posts_at_root)
           Jekyll.logger.warn "Warning:",
-            "Detected '_posts' directory outside custom `collections_dir`!"
+                             "Detected '_posts' directory outside custom `collections_dir`!"
           Jekyll.logger.warn "",
-            "Please move '#{posts_at_root}' into the custom directory at " \
+                             "Please move '#{posts_at_root}' into the custom directory at " \
             "'#{site.in_source_dir(site.config["collections_dir"])}'"
           false
         end
 
         def deprecated_relative_permalinks(site)
           if site.config["relative_permalinks"]
-            Jekyll::Deprecator.deprecation_message "Your site still uses relative" \
-                                " permalinks, which was removed in" \
-                                " Jekyll v3.0.0."
-            return true
+            Jekyll::Deprecator.deprecation_message "Your site still uses relative permalinks," \
+                                                   " which was removed in Jekyll v3.0.0."
+            true
           end
         end
 
@@ -117,6 +116,7 @@ def proper_site_url?(site)
         end
 
         private
+
         def collect_urls(urls, things, destination)
           things.each do |thing|
             dest = thing.destination(destination)
diff --git a/lib/jekyll/commands/help.rb b/lib/jekyll/commands/help.rb
index 80c80e9aeac..90403dfd06c 100644
--- a/lib/jekyll/commands/help.rb
+++ b/lib/jekyll/commands/help.rb
@@ -25,7 +25,7 @@ def init_with_program(prog)
 
         def invalid_command(prog, cmd)
           Jekyll.logger.error "Error:",
-                "Hmm... we don't know what the '#{cmd}' command is."
+                              "Hmm... we don't know what the '#{cmd}' command is."
           Jekyll.logger.info  "Valid commands:", prog.commands.keys.join(", ")
         end
       end
diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index b123015641e..dc5d7284a11 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -62,38 +62,32 @@ def initialized_post_name
         private
 
         def gemfile_contents
-          <<-RUBY
-source "https://rubygems.org"
-
-# Hello! This is where you manage which Jekyll version is used to run.
-# When you want to use a different version, change it below, save the
-# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
-#
-#     bundle exec jekyll serve
-#
-# This will help ensure the proper Jekyll version is running.
-# Happy Jekylling!
-gem "jekyll", "~> #{Jekyll::VERSION}"
-
-# This is the default theme for new Jekyll sites. You may change this to anything you like.
-gem "minima", "~> 2.0"
-
-# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
-# uncomment the line below. To upgrade, run `bundle update github-pages`.
-# gem "github-pages", group: :jekyll_plugins
-
-# If you have any plugins, put them here!
-group :jekyll_plugins do
-  gem "jekyll-feed", "~> 0.6"
-end
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-
-# Performance-booster for watching directories on Windows
-gem "wdm", "~> 0.1.0" if Gem.win_platform?
+          <<~RUBY
+            source "https://rubygems.org"
+            # Hello! This is where you manage which Jekyll version is used to run.
+            # When you want to use a different version, change it below, save the
+            # file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
+            #
+            #     bundle exec jekyll serve
+            #
+            # This will help ensure the proper Jekyll version is running.
+            # Happy Jekylling!
+            gem "jekyll", "~> #{Jekyll::VERSION}"
+            # This is the default theme for new Jekyll sites. You may change this to anything you like.
+            gem "minima", "~> 2.0"
+            # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
+            # uncomment the line below. To upgrade, run `bundle update github-pages`.
+            # gem "github-pages", group: :jekyll_plugins
+            # If you have any plugins, put them here!
+            group :jekyll_plugins do
+              gem "jekyll-feed", "~> 0.6"
+            end
+            # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+            gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+            # Performance-booster for watching directories on Windows
+            gem "wdm", "~> 0.1.0" if Gem.win_platform?
 
-RUBY
+          RUBY
         end
 
         def create_site(new_blog_path)
diff --git a/lib/jekyll/commands/new_theme.rb b/lib/jekyll/commands/new_theme.rb
index c55e68127d8..b26dabe4c18 100644
--- a/lib/jekyll/commands/new_theme.rb
+++ b/lib/jekyll/commands/new_theme.rb
@@ -2,39 +2,41 @@
 
 require "erb"
 
-class Jekyll::Commands::NewTheme < Jekyll::Command
-  class << self
-    def init_with_program(prog)
-      prog.command(:"new-theme") do |c|
-        c.syntax "new-theme NAME"
-        c.description "Creates a new Jekyll theme scaffold"
-        c.option "code_of_conduct", \
-          "-c", "--code-of-conduct", \
-          "Include a Code of Conduct. (defaults to false)"
+module Jekyll
+  module Commands
+    class NewTheme < Jekyll::Command
+      class << self
+        def init_with_program(prog)
+          prog.command(:"new-theme") do |c|
+            c.syntax "new-theme NAME"
+            c.description "Creates a new Jekyll theme scaffold"
+            c.option "code_of_conduct", \
+                     "-c", "--code-of-conduct", \
+                     "Include a Code of Conduct. (defaults to false)"
 
-        c.action do |args, opts|
-          Jekyll::Commands::NewTheme.process(args, opts)
+            c.action do |args, opts|
+              Jekyll::Commands::NewTheme.process(args, opts)
+            end
+          end
         end
-      end
-    end
 
-    # rubocop:disable Metrics/AbcSize
-    def process(args, opts)
-      if !args || args.empty?
-        raise Jekyll::Errors::InvalidThemeName, "You must specify a theme name."
-      end
+        # rubocop:disable Metrics/AbcSize
+        def process(args, opts)
+          if !args || args.empty?
+            raise Jekyll::Errors::InvalidThemeName, "You must specify a theme name."
+          end
 
-      new_theme_name = args.join("_")
-      theme = Jekyll::ThemeBuilder.new(new_theme_name, opts)
-      if theme.path.exist?
-        Jekyll.logger.abort_with "Conflict:", "#{theme.path} already exists."
-      end
+          new_theme_name = args.join("_")
+          theme = Jekyll::ThemeBuilder.new(new_theme_name, opts)
+          Jekyll.logger.abort_with "Conflict:", "#{theme.path} already exists." if theme.path.exist?
 
-      theme.create!
-      Jekyll.logger.info "Your new Jekyll theme, #{theme.name.cyan}," \
-        " is ready for you in #{theme.path.to_s.cyan}!"
-      Jekyll.logger.info "For help getting started, read #{theme.path}/README.md."
+          theme.create!
+          Jekyll.logger.info "Your new Jekyll theme, #{theme.name.cyan}," \
+                             " is ready for you in #{theme.path.to_s.cyan}!"
+          Jekyll.logger.info "For help getting started, read #{theme.path}/README.md."
+        end
+        # rubocop:enable Metrics/AbcSize
+      end
     end
-    # rubocop:enable Metrics/AbcSize
   end
 end
diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 9b8417cdd5a..ecf6fe67cdb 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "thread"
-
 module Jekyll
   module Commands
     class Serve < Command
@@ -19,25 +17,28 @@ class << self
           "host"                 => ["host", "-H", "--host [HOST]", "Host to bind to"],
           "open_url"             => ["-o", "--open-url", "Launch your site in a browser"],
           "detach"               => ["-B", "--detach",
-            "Run the server in the background",],
+                                     "Run the server in the background",],
           "ssl_key"              => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."],
           "port"                 => ["-P", "--port [PORT]", "Port to listen on"],
           "show_dir_listing"     => ["--show-dir-listing",
-            "Show a directory listing instead of loading your index file.",],
+                                     "Show a directory listing instead of loading" \
+                                     " your index file.",],
           "skip_initial_build"   => ["skip_initial_build", "--skip-initial-build",
-            "Skips the initial site build which occurs before the server is started.",],
+                                     "Skips the initial site build which occurs before" \
+                                     " the server is started.",],
           "livereload"           => ["-l", "--livereload",
-            "Use LiveReload to automatically refresh browsers",],
+                                     "Use LiveReload to automatically refresh browsers",],
           "livereload_ignore"    => ["--livereload-ignore ignore GLOB1[,GLOB2[,...]]",
-            Array,
-            "Files for LiveReload to ignore. Remember to quote the values so your shell "\
-            "won't expand them",],
+                                     Array,
+                                     "Files for LiveReload to ignore. " \
+                                     "Remember to quote the values so your shell " \
+                                     "won't expand them",],
           "livereload_min_delay" => ["--livereload-min-delay [SECONDS]",
-            "Minimum reload delay",],
+                                     "Minimum reload delay",],
           "livereload_max_delay" => ["--livereload-max-delay [SECONDS]",
-            "Maximum reload delay",],
+                                     "Maximum reload delay",],
           "livereload_port"      => ["--livereload-port [PORT]", Integer,
-            "Port for LiveReload to listen on",],
+                                     "Port for LiveReload to listen on",],
         }.freeze
 
         DIRECTORY_INDEX = %w(
@@ -107,8 +108,8 @@ def shutdown
         def validate_options(opts)
           if opts["livereload"]
             if opts["detach"]
-              Jekyll.logger.warn "Warning:",
-                "--detach and --livereload are mutually exclusive. Choosing --livereload"
+              Jekyll.logger.warn "Warning:", "--detach and --livereload are mutually exclusive." \
+                                 " Choosing --livereload"
               opts["detach"] = false
             end
             if opts["ssl_cert"] || opts["ssl_key"]
@@ -123,9 +124,9 @@ def validate_options(opts)
               opts["watch"] = true
             end
           elsif %w(livereload_min_delay
-              livereload_max_delay
-              livereload_ignore
-              livereload_port).any? { |o| opts[o] }
+                   livereload_max_delay
+                   livereload_ignore
+                   livereload_port).any? { |o| opts[o] }
             Jekyll.logger.abort_with "--livereload-min-delay, "\
                "--livereload-max-delay, --livereload-ignore, and "\
                "--livereload-port require the --livereload option."
@@ -204,9 +205,7 @@ def webrick_opts(opts)
         end
 
         def start_up_webrick(opts, destination)
-          if opts["livereload"]
-            @reload_reactor.start(opts)
-          end
+          @reload_reactor.start(opts) if opts["livereload"]
 
           @server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
           @server.mount(opts["baseurl"].to_s, Servlet, destination, file_handler_opts)
@@ -218,12 +217,12 @@ def start_up_webrick(opts, destination)
 
         # Recreate NondisclosureName under utf-8 circumstance
         def file_handler_opts
-          WEBrick::Config::FileHandler.merge({
+          WEBrick::Config::FileHandler.merge(
             :FancyIndexing     => true,
             :NondisclosureName => [
               ".ht*", "~*",
-            ],
-          })
+            ]
+          )
         end
 
         def server_address(server, options = {})
@@ -236,12 +235,11 @@ def server_address(server, options = {})
         end
 
         def format_url(ssl_enabled, address, port, baseurl = nil)
-          format("%s://%
      s:%i%s", {
-            :prefix  => ssl_enabled ? "https" : "http",
-            :address => address,
-            :port    => port,
-            :baseurl => baseurl ? "#{baseurl}/" : "",
-          })
+          format("%s://%
      s:%i%s",
+                 :prefix  => ssl_enabled ? "https" : "http",
+                 :address => address,
+                 :port    => port,
+                 :baseurl => baseurl ? "#{baseurl}/" : "")
         end
 
         def default_url(opts)
@@ -273,7 +271,8 @@ def boot_or_detach(server, opts)
 
             Process.detach(pid)
             Jekyll.logger.info "Server detached with pid '#{pid}'.", \
-              "Run `pkill -f jekyll' or `kill -9 #{pid}' to stop the server."
+                               "Run `pkill -f jekyll' or `kill -9 #{pid}'" \
+                               " to stop the server."
           else
             t = Thread.new { server.start }
             trap("INT") { server.shutdown }
@@ -311,7 +310,7 @@ def start_callback(detached)
             proc do
               mutex.synchronize do
                 # Block until EventMachine reactor starts
-                @reload_reactor.started_event.wait unless @reload_reactor.nil?
+                @reload_reactor&.started_event&.wait
                 @running = true
                 Jekyll.logger.info("Server running...", "press ctrl-c to stop.")
                 @run_cond.broadcast
diff --git a/lib/jekyll/commands/serve/live_reload_reactor.rb b/lib/jekyll/commands/serve/live_reload_reactor.rb
index eeafa236e72..960b558259e 100644
--- a/lib/jekyll/commands/serve/live_reload_reactor.rb
+++ b/lib/jekyll/commands/serve/live_reload_reactor.rb
@@ -58,7 +58,7 @@ def start(opts)
               EM.add_shutdown_hook { @stopped_event.set }
 
               Jekyll.logger.info "LiveReload address:",
-                "http://#{opts["host"]}:#{opts["livereload_port"]}"
+                                 "http://#{opts["host"]}:#{opts["livereload_port"]}"
             end
           end
           @thread.abort_on_exception = true
@@ -68,11 +68,11 @@ def start(opts)
         # http://feedback.livereload.com/knowledgebase/articles/86174-livereload-protocol
         def reload(pages)
           pages.each do |p|
-            json_message = JSON.dump({
+            json_message = JSON.dump(
               :command => "reload",
               :path    => p.url,
-              :liveCSS => true,
-            })
+              :liveCSS => true
+            )
 
             Jekyll.logger.debug "LiveReload:", "Reloading #{p.url}"
             Jekyll.logger.debug "", json_message
@@ -108,9 +108,7 @@ def print_message(json_message)
           msg = JSON.parse(json_message)
           # Not sure what the 'url' command even does in LiveReload.  The spec is silent
           # on its purpose.
-          if msg["command"] == "url"
-            Jekyll.logger.info "LiveReload:", "Browser URL: #{msg["url"]}"
-          end
+          Jekyll.logger.info "LiveReload:", "Browser URL: #{msg["url"]}" if msg["command"] == "url"
         end
 
         def log_error(error)
diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb
index 3b05bf87fe1..b25f1d9d7fd 100644
--- a/lib/jekyll/commands/serve/servlet.rb
+++ b/lib/jekyll/commands/serve/servlet.rb
@@ -121,9 +121,7 @@ def livereload_args
           if @options["livereload_max_delay"]
             src += "&maxdelay=#{@options["livereload_max_delay"]}"
           end
-          if @options["livereload_port"]
-            src += "&port=#{@options["livereload_port"]}"
-          end
+          src += "&port=#{@options["livereload_port"]}" if @options["livereload_port"]
           src
         end
       end
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index cf7fea55397..95cd87fbe7d 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -346,7 +346,7 @@ def check_include_exclude(config)
             " as a list of comma-separated values."
           config[option] = csv_to_array(config[option])
         end
-        config[option].map!(&:to_s) if config[option]
+        config[option]&.map!(&:to_s)
       end
     end
 
@@ -381,8 +381,8 @@ def check_plugins(config)
           " use an array instead. If you wanted to set the directory of your" \
           " plugins, use the config key `plugins_dir` instead."
         raise Jekyll::Errors::InvalidConfigurationError,
-          "'plugins' should not be a string, but was: " \
-          "#{config["plugins"].inspect}. Use 'plugins_dir' instead."
+              "'plugins' should not be a string, but was: " \
+              "#{config["plugins"].inspect}. Use 'plugins_dir' instead."
       end
     end
   end
diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb
index 220bc3820d4..67b10409ba1 100644
--- a/lib/jekyll/converters/markdown.rb
+++ b/lib/jekyll/converters/markdown.rb
@@ -11,9 +11,7 @@ def setup
         return if @setup ||= false
         unless (@parser = get_processor)
           Jekyll.logger.error "Invalid Markdown processor given:", @config["markdown"]
-          if @config["safe"]
-            Jekyll.logger.info "", "Custom processors are not loaded in safe mode"
-          end
+          Jekyll.logger.info "", "Custom processors are not loaded in safe mode" if @config["safe"]
           Jekyll.logger.error(
             "",
             "Available processors are: #{valid_processors.join(", ")}"
@@ -30,7 +28,7 @@ def setup
       # rubocop:disable Naming/AccessorMethodName
       def get_processor
         case @config["markdown"].downcase
-        when "kramdown" then return KramdownParser.new(@config)
+        when "kramdown" then KramdownParser.new(@config)
         else
           custom_processor
         end
@@ -79,9 +77,7 @@ def convert(content)
 
       def custom_processor
         converter_name = @config["markdown"]
-        if custom_class_allowed?(converter_name)
-          self.class.const_get(converter_name).new(@config)
-        end
+        self.class.const_get(converter_name).new(@config) if custom_class_allowed?(converter_name)
       end
 
       # Private: Determine whether a class name is an allowed custom
diff --git a/lib/jekyll/converters/smartypants.rb b/lib/jekyll/converters/smartypants.rb
index 8234a41afc1..29c19b1bac6 100644
--- a/lib/jekyll/converters/smartypants.rb
+++ b/lib/jekyll/converters/smartypants.rb
@@ -1,16 +1,20 @@
 # frozen_string_literal: true
 
-class Kramdown::Parser::SmartyPants < Kramdown::Parser::Kramdown
-  def initialize(source, options)
-    super
-    @block_parsers = [:block_html, :content]
-    @span_parsers =  [:smart_quotes, :html_entity, :typographic_syms, :span_html]
-  end
+module Kramdown
+  module Parser
+    class SmartyPants < Kramdown::Parser::Kramdown
+      def initialize(source, options)
+        super
+        @block_parsers = [:block_html, :content]
+        @span_parsers =  [:smart_quotes, :html_entity, :typographic_syms, :span_html]
+      end
 
-  def parse_content
-    add_text @src.scan(%r!\A.*\n!)
+      def parse_content
+        add_text @src.scan(%r!\A.*\n!)
+      end
+      define_parser(:content, %r!\A!)
+    end
   end
-  define_parser(:content, %r!\A!)
 end
 
 module Jekyll
@@ -20,9 +24,7 @@ class SmartyPants < Converter
       priority :low
 
       def initialize(config)
-        unless defined?(Kramdown)
-          Jekyll::External.require_with_graceful_fail "kramdown"
-        end
+        Jekyll::External.require_with_graceful_fail "kramdown" unless defined?(Kramdown)
         @config = config["kramdown"].dup || {}
         @config[:input] = :SmartyPants
       end
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index bfd03986329..5e703505f7b 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -46,10 +46,10 @@ def read_yaml(base, name, opts = {})
         end
       rescue Psych::SyntaxError => e
         Jekyll.logger.warn "YAML Exception reading #{filename}: #{e.message}"
-        raise e if self.site.config["strict_front_matter"]
+        raise e if site.config["strict_front_matter"]
       rescue StandardError => e
         Jekyll.logger.warn "Error reading file #{filename}: #{e.message}"
-        raise e if self.site.config["strict_front_matter"]
+        raise e if site.config["strict_front_matter"]
       end
 
       self.data ||= {}
@@ -64,12 +64,12 @@ def read_yaml(base, name, opts = {})
     def validate_data!(filename)
       unless self.data.is_a?(Hash)
         raise Errors::InvalidYAMLFrontMatterError,
-          "Invalid YAML front matter in #{filename}"
+              "Invalid YAML front matter in #{filename}"
       end
     end
 
     def validate_permalink!(filename)
-      if self.data["permalink"] && self.data["permalink"].to_s.empty?
+      if self.data["permalink"]&.to_s&.empty?
         raise Errors::InvalidPermalinkError, "Invalid permalink in #{filename}"
       end
     end
@@ -125,16 +125,12 @@ def to_liquid(attrs = nil)
     #
     # Returns the type of self.
     def type
-      if is_a?(Page)
-        :pages
-      end
+      :pages if is_a?(Page)
     end
 
     # returns the owner symbol for hook triggering
     def hook_owner
-      if is_a?(Page)
-        :pages
-      end
+      :pages if is_a?(Page)
     end
 
     # Determine whether the document is an asset file.
@@ -181,7 +177,7 @@ def place_in_layout?
     #
     # Returns true if the layout is invalid, false if otherwise
     def invalid_layout?(layout)
-      !data["layout"].nil? && layout.nil? && !(self.is_a? Jekyll::Excerpt)
+      !data["layout"].nil? && layout.nil? && !(is_a? Jekyll::Excerpt)
     end
 
     # Recursively render layouts
@@ -210,7 +206,7 @@ def do_layout(payload, layouts)
         renderer.payload = payload
       end.run
 
-      Jekyll.logger.debug "Post-Render Hooks:", self.relative_path
+      Jekyll.logger.debug "Post-Render Hooks:", relative_path
       Jekyll::Hooks.trigger hook_owner, :post_render, self
     ensure
       @_renderer = nil # this will allow the modifications above to disappear
diff --git a/lib/jekyll/deprecator.rb b/lib/jekyll/deprecator.rb
index 327358c2d4f..748c8be71e1 100644
--- a/lib/jekyll/deprecator.rb
+++ b/lib/jekyll/deprecator.rb
@@ -34,9 +34,7 @@ def no_subcommand(args)
     end
 
     def arg_is_present?(args, deprecated_argument, message)
-      if args.include?(deprecated_argument)
-        deprecation_message(message)
-      end
+      deprecation_message(message) if args.include?(deprecated_argument)
     end
 
     def deprecation_message(message)
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index a4f989b88c6..dbc1a6d82a0 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -204,11 +204,11 @@ def permalink
     #
     # Returns the computed URL for the document.
     def url
-      @url ||= URL.new({
+      @url ||= URL.new(
         :template     => url_template,
         :placeholders => url_placeholders,
-        :permalink    => permalink,
-      }).to_s
+        :permalink    => permalink
+      ).to_s
     end
 
     def [](key)
@@ -315,7 +315,7 @@ def <=>(other)
     # method returns true, and if the site's Publisher will publish the document.
     # False otherwise.
     def write?
-      collection && collection.write? && site.publisher.publish?(self)
+      collection&.write? && site.publisher.publish?(self)
     end
 
     # The Document excerpt_separator, from the YAML Front-Matter or site
@@ -335,16 +335,12 @@ def generate_excerpt?
 
     def next_doc
       pos = collection.docs.index { |post| post.equal?(self) }
-      if pos && pos < collection.docs.length - 1
-        collection.docs[pos + 1]
-      end
+      collection.docs[pos + 1] if pos && pos < collection.docs.length - 1
     end
 
     def previous_doc
       pos = collection.docs.index { |post| post.equal?(self) }
-      if pos && pos > 0
-        collection.docs[pos - 1]
-      end
+      collection.docs[pos - 1] if pos && pos.positive?
     end
 
     def trigger_hooks(hook_name, *args)
@@ -400,28 +396,26 @@ def categories_from_path(special_dir)
     end
 
     def populate_categories
-      merge_data!({
+      merge_data!(
         "categories" => (
           Array(data["categories"]) + Utils.pluralized_array_from_hash(
             data, "category", "categories"
           )
-        ).map(&:to_s).flatten.uniq,
-      })
+        ).map(&:to_s).flatten.uniq
+      )
     end
 
     def populate_tags
-      merge_data!({
-        "tags" => Utils.pluralized_array_from_hash(data, "tag", "tags").flatten,
-      })
+      merge_data!(
+        "tags" => Utils.pluralized_array_from_hash(data, "tag", "tags").flatten
+      )
     end
 
     private
 
     def merge_categories!(other)
       if other.key?("categories") && !other["categories"].nil?
-        if other["categories"].is_a?(String)
-          other["categories"] = other["categories"].split
-        end
+        other["categories"] = other["categories"].split if other["categories"].is_a?(String)
         other["categories"] = (data["categories"] || []) | other["categories"]
       end
     end
@@ -493,9 +487,7 @@ def modify_date(date)
     end
 
     def generate_excerpt
-      if generate_excerpt?
-        data["excerpt"] ||= Jekyll::Excerpt.new(self)
-      end
+      data["excerpt"] ||= Jekyll::Excerpt.new(self) if generate_excerpt?
     end
   end
 end
diff --git a/lib/jekyll/drops/collection_drop.rb b/lib/jekyll/drops/collection_drop.rb
index 858a721a6f6..ff28039bafb 100644
--- a/lib/jekyll/drops/collection_drop.rb
+++ b/lib/jekyll/drops/collection_drop.rb
@@ -7,9 +7,8 @@ class CollectionDrop < Drop
 
       mutable false
 
-      def_delegator :@obj, :write?, :output
-      def_delegators :@obj, :label, :docs, :files, :directory,
-                            :relative_directory
+      def_delegator  :@obj, :write?, :output
+      def_delegators :@obj, :label, :docs, :files, :directory, :relative_directory
 
       private def_delegator :@obj, :metadata, :fallback_data
 
diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index be842737b19..412c279145e 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -173,7 +173,7 @@ def each
       end
 
       def merge(other, &block)
-        self.dup.tap do |me|
+        dup.tap do |me|
           if block.nil?
             me.merge!(other)
           else
diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb
index 1cb636d8825..3ec2dc51379 100644
--- a/lib/jekyll/drops/site_drop.rb
+++ b/lib/jekyll/drops/site_drop.rb
@@ -8,8 +8,7 @@ class SiteDrop < Drop
       mutable false
 
       def_delegator  :@obj, :site_data, :data
-      def_delegators :@obj, :time, :pages, :static_files, :documents,
-                            :tags, :categories
+      def_delegators :@obj, :time, :pages, :static_files, :documents, :tags, :categories
 
       private def_delegator :@obj, :config, :fallback_data
 
diff --git a/lib/jekyll/drops/unified_payload_drop.rb b/lib/jekyll/drops/unified_payload_drop.rb
index 52647f98bf6..24aefde2012 100644
--- a/lib/jekyll/drops/unified_payload_drop.rb
+++ b/lib/jekyll/drops/unified_payload_drop.rb
@@ -17,6 +17,7 @@ def site
       end
 
       private
+
       def fallback_data
         @fallback_data ||= {}
       end
diff --git a/lib/jekyll/drops/url_drop.rb b/lib/jekyll/drops/url_drop.rb
index 0571558bf4e..f0641e23cd5 100644
--- a/lib/jekyll/drops/url_drop.rb
+++ b/lib/jekyll/drops/url_drop.rb
@@ -80,6 +80,7 @@ def y_day
       end
 
       private
+
       def fallback_data
         {}
       end
diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb
index d016e0c2043..44b6cdbd2d5 100644
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -31,9 +31,7 @@ def relative_to_source(entry)
 
     def filter(entries)
       entries.reject do |e|
-        unless included?(e)
-          special?(e) || backup?(e) || excluded?(e) || symlink?(e)
-        end
+        special?(e) || backup?(e) || excluded?(e) || symlink?(e) unless included?(e)
       end
     end
 
diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb
index 41bcb18a58a..6f4ac3d8ed0 100644
--- a/lib/jekyll/excerpt.rb
+++ b/lib/jekyll/excerpt.rb
@@ -8,10 +8,11 @@ class Excerpt
     attr_accessor :content, :ext
     attr_writer   :output
 
-    def_delegators :@doc, :site, :name, :ext, :extname,
-                          :collection, :related_posts,
-                          :coffeescript_file?, :yaml_file?,
-                          :url, :next_doc, :previous_doc
+    def_delegators :@doc,
+                   :site, :name, :ext, :extname,
+                   :collection, :related_posts,
+                   :coffeescript_file?, :yaml_file?,
+                   :url, :next_doc, :previous_doc
 
     private :coffeescript_file?, :yaml_file?
 
@@ -55,7 +56,7 @@ def relative_path
     #
     # Returns true if the string passed in
     def include?(something)
-      (output && output.include?(something)) || content.include?(something)
+      (output&.include?(something)) || content.include?(something)
     end
 
     # The UID for this doc (useful in feeds).
@@ -76,7 +77,7 @@ def to_liquid
 
     # Returns the shorthand String identifier of this doc.
     def inspect
-      ""
+      ""
     end
 
     def output
@@ -160,19 +161,18 @@ def liquid_block?(tag_name)
       Liquid::Template.tags[tag_name].superclass == Liquid::Block
     rescue NoMethodError
       Jekyll.logger.error "Error:",
-        "A Liquid tag in the excerpt of #{doc.relative_path} couldn't be " \
-        "parsed."
+                          "A Liquid tag in the excerpt of #{doc.relative_path} couldn't be parsed."
       raise
     end
 
     def print_build_warning
       Jekyll.logger.warn "Warning:", "Excerpt modified in #{doc.relative_path}!"
       Jekyll.logger.warn "",
-        "Found a Liquid block containing separator '#{doc.excerpt_separator}' and has " \
-        "been modified with the appropriate closing tag."
+                         "Found a Liquid block containing separator '#{doc.excerpt_separator}'" \
+                         " and has been modified with the appropriate closing tag."
       Jekyll.logger.warn "",
-        "Feel free to define a custom excerpt or excerpt_separator in the document's " \
-        "Front Matter if the generated excerpt is unsatisfactory."
+                         "Feel free to define a custom excerpt or excerpt_separator in the" \
+                         " document's Front Matter if the generated excerpt is unsatisfactory."
     end
   end
 end
diff --git a/lib/jekyll/external.rb b/lib/jekyll/external.rb
index cedd4881c3b..15b30a5f51a 100644
--- a/lib/jekyll/external.rb
+++ b/lib/jekyll/external.rb
@@ -58,13 +58,13 @@ def require_with_graceful_fail(names)
             Jekyll.logger.debug "Requiring:", name.to_s
             require name
           rescue LoadError => e
-            Jekyll.logger.error "Dependency Error:", <<-MSG
-Yikes! It looks like you don't have #{name} or one of its dependencies installed.
-In order to use Jekyll as currently configured, you'll need to install this gem.
+            Jekyll.logger.error "Dependency Error:", <<~MSG
+              Yikes! It looks like you don't have #{name} or one of its dependencies installed.
+              In order to use Jekyll as currently configured, you'll need to install this gem.
 
-The full error message from Ruby is: '#{e.message}'
+              The full error message from Ruby is: '#{e.message}'
 
-If you run into trouble, you can find helpful resources at https://jekyllrb.com/help/!
+              If you run into trouble, you can find helpful resources at https://jekyllrb.com/help/!
             MSG
             raise Jekyll::Errors::MissingDependencyException, name
           end
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 1708d5fa9f3..2a390f06503 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -225,9 +225,7 @@ def to_integer(input)
     #
     # Returns the filtered array of objects
     def sort(input, property = nil, nils = "first")
-      if input.nil?
-        raise ArgumentError, "Cannot sort a null object."
-      end
+      raise ArgumentError, "Cannot sort a null object." if input.nil?
       if property.nil?
         input.sort
       else
@@ -367,7 +365,6 @@ def parse_condition(exp)
 
       condition
     end
-
   end
 end
 
diff --git a/lib/jekyll/filters/date_filters.rb b/lib/jekyll/filters/date_filters.rb
index 7bdf0fffd1b..d804a1db7f7 100644
--- a/lib/jekyll/filters/date_filters.rb
+++ b/lib/jekyll/filters/date_filters.rb
@@ -64,6 +64,7 @@ def date_to_rfc822(date)
       end
 
       private
+
       # month_type: Notations that evaluate to 'Month' via `Time#strftime` ("%b", "%B")
       # type: nil (default) or "ordinal"
       # style: nil (default) or "US"
@@ -96,7 +97,7 @@ def time(input)
         date = Liquid::Utils.to_date(input)
         unless date.respond_to?(:to_time)
           raise Errors::InvalidDateError,
-            "Invalid Date: '#{input.inspect}' is not a valid datetime."
+                "Invalid Date: '#{input.inspect}' is not a valid datetime."
         end
         date.to_time.dup.localtime
       end
diff --git a/lib/jekyll/filters/url_filters.rb b/lib/jekyll/filters/url_filters.rb
index 67abe137caa..55835167f63 100644
--- a/lib/jekyll/filters/url_filters.rb
+++ b/lib/jekyll/filters/url_filters.rb
@@ -57,7 +57,6 @@ def ensure_leading_slash(input)
         return input if input.nil? || input.empty? || input.start_with?("/")
         "/#{input}"
       end
-
     end
   end
 end
diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb
index 7d96b8cade7..95c46900e30 100644
--- a/lib/jekyll/frontmatter_defaults.rb
+++ b/lib/jekyll/frontmatter_defaults.rb
@@ -122,9 +122,7 @@ def applies_path?(scope, path)
 
     def path_is_subpath?(path, parent_path)
       path.ascend do |ascended_path|
-        if ascended_path.to_s == parent_path.to_s
-          return true
-        end
+        return true if ascended_path.to_s == parent_path.to_s
       end
 
       false
diff --git a/lib/jekyll/hooks.rb b/lib/jekyll/hooks.rb
index 64496b53119..23b2776b06d 100644
--- a/lib/jekyll/hooks.rb
+++ b/lib/jekyll/hooks.rb
@@ -77,9 +77,7 @@ def self.register_one(owner, event, priority, &block)
           "following hooks #{@registry[owner].keys.inspect}"
       end
 
-      unless block.respond_to? :call
-        raise Uncallable, "Hooks must respond to :call"
-      end
+      raise Uncallable, "Hooks must respond to :call" unless block.respond_to? :call
 
       insert_hook owner, event, priority, &block
     end
diff --git a/lib/jekyll/liquid_extensions.rb b/lib/jekyll/liquid_extensions.rb
index 4551ac19bbd..87e06ef7c7e 100644
--- a/lib/jekyll/liquid_extensions.rb
+++ b/lib/jekyll/liquid_extensions.rb
@@ -2,7 +2,6 @@
 
 module Jekyll
   module LiquidExtensions
-
     # Lookup a Liquid variable in the given context.
     #
     # context  - the Liquid context in question.
@@ -19,6 +18,5 @@ def lookup_variable(context, variable)
 
       lookup || variable
     end
-
   end
 end
diff --git a/lib/jekyll/liquid_renderer/table.rb b/lib/jekyll/liquid_renderer/table.rb
index b2d91fecd6f..b60802681b4 100644
--- a/lib/jekyll/liquid_renderer/table.rb
+++ b/lib/jekyll/liquid_renderer/table.rb
@@ -1,96 +1,98 @@
 # frozen_string_literal: true
 
 module Jekyll
-  class LiquidRenderer::Table
-    def initialize(stats)
-      @stats = stats
-    end
+  class LiquidRenderer
+    class Table
+      def initialize(stats)
+        @stats = stats
+      end
 
-    def to_s(num_of_rows = 50)
-      data = data_for_table(num_of_rows)
-      widths = table_widths(data)
-      generate_table(data, widths)
-    end
+      def to_s(num_of_rows = 50)
+        data = data_for_table(num_of_rows)
+        widths = table_widths(data)
+        generate_table(data, widths)
+      end
 
-    private
+      private
 
-    def generate_table(data, widths)
-      str = String.new("\n")
+      def generate_table(data, widths)
+        str = +"\n"
 
-      table_head = data.shift
-      str << generate_row(table_head, widths)
-      str << generate_table_head_border(table_head, widths)
+        table_head = data.shift
+        str << generate_row(table_head, widths)
+        str << generate_table_head_border(table_head, widths)
 
-      data.each do |row_data|
-        str << generate_row(row_data, widths)
+        data.each do |row_data|
+          str << generate_row(row_data, widths)
+        end
+
+        str << "\n"
+        str
       end
 
-      str << "\n"
-      str
-    end
+      def generate_table_head_border(row_data, widths)
+        str = +""
 
-    def generate_table_head_border(row_data, widths)
-      str = String.new("")
+        row_data.each_index do |cell_index|
+          str << "-" * widths[cell_index]
+          str << "-+-" unless cell_index == row_data.length - 1
+        end
 
-      row_data.each_index do |cell_index|
-        str << "-" * widths[cell_index]
-        str << "-+-" unless cell_index == row_data.length - 1
+        str << "\n"
+        str
       end
 
-      str << "\n"
-      str
-    end
+      def generate_row(row_data, widths)
+        str = +""
 
-    def generate_row(row_data, widths)
-      str = String.new("")
+        row_data.each_with_index do |cell_data, cell_index|
+          str << if cell_index.zero?
+                   cell_data.ljust(widths[cell_index], " ")
+                 else
+                   cell_data.rjust(widths[cell_index], " ")
+                 end
 
-      row_data.each_with_index do |cell_data, cell_index|
-        str << if cell_index.zero?
-                 cell_data.ljust(widths[cell_index], " ")
-               else
-                 cell_data.rjust(widths[cell_index], " ")
-               end
+          str << " | " unless cell_index == row_data.length - 1
+        end
 
-        str << " | " unless cell_index == row_data.length - 1
+        str << "\n"
+        str
       end
 
-      str << "\n"
-      str
-    end
-
-    def table_widths(data)
-      widths = []
+      def table_widths(data)
+        widths = []
 
-      data.each do |row|
-        row.each_with_index do |cell, index|
-          widths[index] = [cell.length, widths[index]].compact.max
+        data.each do |row|
+          row.each_with_index do |cell, index|
+            widths[index] = [cell.length, widths[index]].compact.max
+          end
         end
+
+        widths
       end
 
-      widths
-    end
+      def data_for_table(num_of_rows)
+        sorted = @stats.sort_by { |_, file_stats| -file_stats[:time] }
+        sorted = sorted.slice(0, num_of_rows)
 
-    def data_for_table(num_of_rows)
-      sorted = @stats.sort_by { |_, file_stats| -file_stats[:time] }
-      sorted = sorted.slice(0, num_of_rows)
+        table = [%w(Filename Count Bytes Time)]
 
-      table = [%w(Filename Count Bytes Time)]
+        sorted.each do |filename, file_stats|
+          row = []
+          row << filename
+          row << file_stats[:count].to_s
+          row << format_bytes(file_stats[:bytes])
+          row << format("%.3f", file_stats[:time])
+          table << row
+        end
 
-      sorted.each do |filename, file_stats|
-        row = []
-        row << filename
-        row << file_stats[:count].to_s
-        row << format_bytes(file_stats[:bytes])
-        row << format("%.3f", file_stats[:time])
-        table << row
+        table
       end
 
-      table
-    end
-
-    def format_bytes(bytes)
-      bytes /= 1024.0
-      format("%.2fK", bytes)
+      def format_bytes(bytes)
+        bytes /= 1024.0
+        format("%.2fK", bytes)
+      end
     end
   end
 end
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 9843b10165f..965786a0768 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -95,11 +95,11 @@ def template
     #
     # Returns the String url.
     def url
-      @url ||= URL.new({
+      @url ||= URL.new(
         :template     => template,
         :placeholders => url_placeholders,
-        :permalink    => permalink,
-      }).to_s
+        :permalink    => permalink
+      ).to_s
     end
 
     # Returns a hash of URL placeholder names (as symbols) mapping to the
diff --git a/lib/jekyll/plugin.rb b/lib/jekyll/plugin.rb
index 2a9dbeed41b..1157e12a688 100644
--- a/lib/jekyll/plugin.rb
+++ b/lib/jekyll/plugin.rb
@@ -13,7 +13,7 @@ class Plugin
     #
 
     def self.inherited(const)
-      return catch_inheritance(const) do |const_|
+      catch_inheritance(const) do |const_|
         catch_inheritance(const_)
       end
     end
@@ -23,9 +23,7 @@ def self.inherited(const)
     def self.catch_inheritance(const)
       const.define_singleton_method :inherited do |const_|
         (@children ||= Set.new).add const_
-        if block_given?
-          yield const_
-        end
+        yield const_ if block_given?
       end
     end
 
@@ -48,9 +46,7 @@ def self.descendants
     # Returns the Symbol priority.
     def self.priority(priority = nil)
       @priority ||= nil
-      if priority && PRIORITIES.key?(priority)
-        @priority = priority
-      end
+      @priority = priority if priority && PRIORITIES.key?(priority)
       @priority || :normal
     end
 
@@ -62,9 +58,7 @@ def self.priority(priority = nil)
     #
     # Returns the safety Boolean.
     def self.safe(safe = nil)
-      unless defined?(@safe) && safe.nil?
-        @safe = safe
-      end
+      @safe = safe unless defined?(@safe) && safe.nil?
       @safe || false
     end
 
@@ -74,7 +68,7 @@ def self.safe(safe = nil)
     #
     # Returns -1, 0, 1.
     def self.<=>(other)
-      PRIORITIES[other.priority] <=> PRIORITIES[self.priority]
+      PRIORITIES[other.priority] <=> PRIORITIES[priority]
     end
 
     # Spaceship is priority [higher -> lower]
diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index fed76a16303..78a76e97921 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -76,9 +76,7 @@ def retrieve_dirs(_base, dir, dot_dirs)
       dot_dirs.each do |file|
         dir_path = site.in_source_dir(dir, file)
         rel_path = File.join(dir, file)
-        unless @site.dest.chomp("/") == dir_path
-          @site.reader.read_directories(rel_path)
-        end
+        @site.reader.read_directories(rel_path) unless @site.dest.chomp("/") == dir_path
       end
     end
 
diff --git a/lib/jekyll/readers/data_reader.rb b/lib/jekyll/readers/data_reader.rb
index 445d548802b..8d5803cbec8 100644
--- a/lib/jekyll/readers/data_reader.rb
+++ b/lib/jekyll/readers/data_reader.rb
@@ -54,16 +54,14 @@ def read_data_to(dir, data)
     def read_data_file(path)
       case File.extname(path).downcase
       when ".csv"
-        CSV.read(path, {
-          :headers  => true,
-          :encoding => site.config["encoding"],
-        }).map(&:to_hash)
+        CSV.read(path,
+                 :headers  => true,
+                 :encoding => site.config["encoding"]).map(&:to_hash)
       when ".tsv"
-        CSV.read(path, {
-          :col_sep  => "\t",
-          :headers  => true,
-          :encoding => site.config["encoding"],
-        }).map(&:to_hash)
+        CSV.read(path,
+                 :col_sep  => "\t",
+                 :headers  => true,
+                 :encoding => site.config["encoding"]).map(&:to_hash)
       else
         SafeYAML.load_file(path)
       end
diff --git a/lib/jekyll/readers/layout_reader.rb b/lib/jekyll/readers/layout_reader.rb
index 706dfed8c43..f1dbe5993a3 100644
--- a/lib/jekyll/readers/layout_reader.rb
+++ b/lib/jekyll/readers/layout_reader.rb
@@ -63,9 +63,7 @@ def layout_directory_inside_source
 
     def layout_directory_in_cwd
       dir = Jekyll.sanitized_path(Dir.pwd, site.config["layouts_dir"])
-      if File.directory?(dir) && !site.safe
-        dir
-      end
+      dir if File.directory?(dir) && !site.safe
     end
   end
 end
diff --git a/lib/jekyll/readers/post_reader.rb b/lib/jekyll/readers/post_reader.rb
index b0dc30326b5..050bd9308b8 100644
--- a/lib/jekyll/readers/post_reader.rb
+++ b/lib/jekyll/readers/post_reader.rb
@@ -62,10 +62,9 @@ def read_content(dir, magic_dir, matcher)
       @site.reader.get_entries(dir, magic_dir).map do |entry|
         next unless entry =~ matcher
         path = @site.in_source_dir(File.join(dir, magic_dir, entry))
-        Document.new(path, {
-          :site       => @site,
-          :collection => @site.posts,
-        })
+        Document.new(path,
+                     :site       => @site,
+                     :collection => @site.posts)
       end.reject(&:nil?)
     end
   end
diff --git a/lib/jekyll/readers/theme_assets_reader.rb b/lib/jekyll/readers/theme_assets_reader.rb
index 2706690c5ce..afccf8130d6 100644
--- a/lib/jekyll/readers/theme_assets_reader.rb
+++ b/lib/jekyll/readers/theme_assets_reader.rb
@@ -8,7 +8,7 @@ def initialize(site)
     end
 
     def read
-      return unless site.theme && site.theme.assets_path
+      return unless site.theme&.assets_path
 
       Find.find(site.theme.assets_path) do |path|
         next if File.directory?(path)
@@ -21,6 +21,7 @@ def read
     end
 
     private
+
     def read_theme_asset(path)
       base = site.theme.root
       dir = File.dirname(path.sub("#{site.theme.root}/", ""))
@@ -28,18 +29,18 @@ def read_theme_asset(path)
 
       if Utils.has_yaml_header?(path)
         append_unless_exists site.pages,
-          Jekyll::Page.new(site, base, dir, name)
+                             Jekyll::Page.new(site, base, dir, name)
       else
         append_unless_exists site.static_files,
-          Jekyll::StaticFile.new(site, base, "/#{dir}", name)
+                             Jekyll::StaticFile.new(site, base, "/#{dir}", name)
       end
     end
 
     def append_unless_exists(haystack, new_item)
       if haystack.any? { |file| file.relative_path == new_item.relative_path }
         Jekyll.logger.debug "Theme:",
-          "Ignoring #{new_item.relative_path} in theme due to existing file " \
-          "with that path in site."
+                            "Ignoring #{new_item.relative_path} in theme due to existing file " \
+                            "with that path in site."
         return
       end
 
diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb
index 864bb0c8072..444b7884438 100644
--- a/lib/jekyll/regenerator.rb
+++ b/lib/jekyll/regenerator.rb
@@ -28,9 +28,7 @@ def regenerate?(document)
         regenerate_document?(document)
       else
         source_path = document.respond_to?(:path) ? document.path : nil
-        dest_path = if document.respond_to?(:destination)
-                      document.destination(@site.dest)
-                    end
+        dest_path = document.destination(@site.dest) if document.respond_to?(:destination)
         source_modified_or_dest_missing?(source_path, dest_path)
       end
     end
@@ -89,9 +87,7 @@ def modified?(path)
       return true if path.nil?
 
       # Check for path in cache
-      if cache.key? path
-        return cache[path]
-      end
+      return cache[path] if cache.key? path
 
       if metadata[path]
         # If we have seen this file before,
@@ -183,9 +179,7 @@ def existing_file_modified?(path)
       # If one of this file dependencies have been modified,
       # set the regeneration bit for both the dependency and the file to true
       metadata[path]["deps"].each do |dependency|
-        if modified?(dependency)
-          return cache[dependency] = cache[path] = true
-        end
+        return cache[dependency] = cache[path] = true if modified?(dependency)
       end
 
       if File.exist?(path) && metadata[path]["mtime"].eql?(File.mtime(path))
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index acd9a4ee426..030b9a3cf58 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -101,8 +101,8 @@ def convert(content)
           converter.convert output
         rescue StandardError => e
           Jekyll.logger.error "Conversion error:",
-            "#{converter.class} encountered an error while "\
-            "converting '#{document.relative_path}':"
+                              "#{converter.class} encountered an error while "\
+                              "converting '#{document.relative_path}':"
           Jekyll.logger.error("", e.to_s)
           raise e
         end
@@ -121,13 +121,13 @@ def render_liquid(content, payload, info, path = nil)
       template = site.liquid_renderer.file(path).parse(content)
       template.warnings.each do |e|
         Jekyll.logger.warn "Liquid Warning:",
-          LiquidRenderer.format_error(e, path || document.relative_path)
+                           LiquidRenderer.format_error(e, path || document.relative_path)
       end
       template.render!(payload, info)
     # rubocop: disable RescueException
     rescue Exception => e
       Jekyll.logger.error "Liquid Exception:",
-        LiquidRenderer.format_error(e, path || document.relative_path)
+                          LiquidRenderer.format_error(e, path || document.relative_path)
       raise e
     end
     # rubocop: enable RescueException
@@ -213,9 +213,7 @@ def add_regenerator_dependencies(layout)
     # Returns nothing
     def assign_pages!
       payload["page"] = document.to_liquid
-      payload["paginator"] = if document.respond_to?(:pager)
-                               document.pager.to_liquid
-                             end
+      payload["paginator"] = (document.pager.to_liquid if document.respond_to?(:pager))
     end
 
     # Set related posts to payload if document is a post.
@@ -235,9 +233,7 @@ def assign_highlighter_options!
 
     def assign_layout_data!
       layout = layouts[document.data["layout"]]
-      if layout
-        payload["layout"] = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
-      end
+      payload["layout"] = Utils.deep_merge_hashes(layout.data, payload["layout"] || {}) if layout
     end
 
     def permalink_ext
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 6264c102bba..5c4ac78e83c 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -44,8 +44,8 @@ def config=(config)
       @config = config.clone
 
       %w(safe lsi highlighter baseurl exclude include future unpublished
-        show_drafts limit_posts keep_files).each do |opt|
-        self.send("#{opt}=", config[opt])
+         show_drafts limit_posts keep_files).each do |opt|
+        send("#{opt}=", config[opt])
       end
 
       # keep using `gems` to avoid breaking change
@@ -98,9 +98,7 @@ def reset
       @liquid_renderer.reset
       @site_cleaner = nil
 
-      if limit_posts < 0
-        raise ArgumentError, "limit_posts must be a non-negative number"
-      end
+      raise ArgumentError, "limit_posts must be a non-negative number" if limit_posts.negative?
 
       Jekyll::Hooks.trigger :site, :after_reset, self
     end
@@ -124,7 +122,7 @@ def ensure_not_in_dest
       Pathname.new(source).ascend do |path|
         if path == dest_pathname
           raise Errors::FatalException,
-            "Destination directory cannot be or contain the Source directory."
+                "Destination directory cannot be or contain the Source directory."
         end
       end
     end
@@ -174,7 +172,7 @@ def generate
         start = Time.now
         generator.generate(self)
         Jekyll.logger.debug "Generating:",
-          "#{generator.class} finished in #{Time.now - start} seconds."
+                            "#{generator.class} finished in #{Time.now - start} seconds."
       end
     end
 
@@ -234,7 +232,7 @@ def post_attr_hash(post_attr)
       # array of posts ) then sort each array in reverse order.
       hash = Hash.new { |h, key| h[key] = [] }
       posts.docs.each do |p|
-        p.data[post_attr].each { |t| hash[t] << p } if p.data[post_attr]
+        p.data[post_attr]&.each { |t| hash[t] << p }
       end
       hash.each_value { |posts| posts.sort!.reverse! }
       hash
@@ -303,10 +301,10 @@ def instantiate_subclasses(klass)
     def relative_permalinks_are_deprecated
       if config["relative_permalinks"]
         Jekyll.logger.abort_with "Since v3.0, permalinks for pages" \
-                                " in subfolders must be relative to the" \
-                                " site source directory, not the parent" \
-                                " directory. Check https://jekyllrb.com/docs/upgrading/"\
-                                " for more info."
+                                 " in subfolders must be relative to the" \
+                                 " site source directory, not the parent" \
+                                 " directory. Check https://jekyllrb.com/docs/upgrading/"\
+                                 " for more info."
       end
     end
 
@@ -409,9 +407,9 @@ def collections_path
     #
     # Returns nothing
     def limit_posts!
-      if limit_posts > 0
+      if limit_posts.positive?
         limit = posts.docs.length < limit_posts ? posts.docs.length : limit_posts
-        self.posts.docs = posts.docs[-limit, limit]
+        posts.docs = posts.docs[-limit, limit]
       end
     end
 
@@ -444,12 +442,12 @@ def configure_theme
 
     def configure_include_paths
       @includes_load_paths = Array(in_source_dir(config["includes_dir"].to_s))
-      @includes_load_paths << theme.includes_path if theme && theme.includes_path
+      @includes_load_paths << theme.includes_path if theme&.includes_path
     end
 
     def configure_file_read_opts
       self.file_read_opts = {}
-      self.file_read_opts[:encoding] = config["encoding"] if config["encoding"]
+      file_read_opts[:encoding] = config["encoding"] if config["encoding"]
       self.file_read_opts = Jekyll::Utils.merged_file_read_opts(self, {})
     end
 
diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index ea89b6d2be9..01c950d8a93 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -133,10 +133,10 @@ def url
       @url ||= if @collection.nil?
                  relative_path
                else
-                 ::Jekyll::URL.new({
+                 ::Jekyll::URL.new(
                    :template     => @collection.url_template,
-                   :placeholders => placeholders,
-                 })
+                   :placeholders => placeholders
+                 )
                end.to_s.chomp("/")
     end
 
@@ -152,6 +152,7 @@ def defaults
     end
 
     private
+
     def copy_file(dest_path)
       if @site.safe || Jekyll.env == "production"
         FileUtils.cp(path, dest_path)
diff --git a/lib/jekyll/stevenson.rb b/lib/jekyll/stevenson.rb
index bbec66171f6..1d27bcd884f 100644
--- a/lib/jekyll/stevenson.rb
+++ b/lib/jekyll/stevenson.rb
@@ -16,9 +16,7 @@ def add(severity, message = nil, progname = nil)
       severity ||= UNKNOWN
       @logdev = logdevice(severity)
 
-      if @logdev.nil? || severity < @level
-        return true
-      end
+      return true if @logdev.nil? || severity < @level
       progname ||= @progname
       if message.nil?
         if block_given?
diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index e2ef3adb038..78e4f5ed081 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, <<-MSG
-Syntax Error in tag 'highlight' while parsing the following markup:
+          raise SyntaxError, <<~MSG
+            Syntax Error in tag 'highlight' while parsing the following markup:
 
-  #{markup}
+            #{markup}
 
-Valid syntax: highlight  [linenos]
-MSG
+            Valid syntax: highlight  [linenos]
+          MSG
         end
       end
 
@@ -75,7 +75,7 @@ def parse_options(input)
         input.scan(OPTIONS_REGEX) do |opt|
           key, value = opt.split("=")
           # If a quoted list, convert to array
-          if value && value.include?('"')
+          if value&.include?('"')
             value.delete!('"')
             value = value.split
           end
@@ -96,14 +96,14 @@ def render_pygments(code, is_safe)
         )
 
         if highlighted_code.nil?
-          Jekyll.logger.error <<-MSG
-There was an error highlighting your code:
+          Jekyll.logger.error <<~MSG
+            There was an error highlighting your code:
 
-#{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.
-MSG
+            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.
+          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 db31af7c1bb..389b6be9c79 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -55,31 +55,31 @@ def parse_params(context)
 
       def validate_file_name(file)
         if file =~ INVALID_SEQUENCES || file !~ VALID_FILENAME_CHARS
-          raise ArgumentError, <<-MSG
-Invalid syntax for include tag. File contains invalid characters or sequences:
+          raise ArgumentError, <<~MSG
+            Invalid syntax for include tag. File contains invalid characters or sequences:
 
-  #{file}
+              #{file}
 
-Valid syntax:
+            Valid syntax:
 
-  #{syntax_example}
+              #{syntax_example}
 
-MSG
+          MSG
         end
       end
 
       def validate_params
         unless @params =~ FULL_VALID_SYNTAX
-          raise ArgumentError, <<-MSG
-Invalid syntax for include tag:
+          raise ArgumentError, <<~MSG
+            Invalid syntax for include tag:
 
-  #{@params}
+            #{@params}
 
-Valid syntax:
+            Valid syntax:
 
-  #{syntax_example}
+            #{syntax_example}
 
-MSG
+          MSG
         end
       end
 
@@ -138,7 +138,7 @@ def render(context)
       end
 
       def add_include_to_dependency(site, path, context)
-        if context.registers[:page] && context.registers[:page].key?("path")
+        if context.registers[:page]&.key?("path")
           site.regenerator.add_dependency(
             site.in_source_dir(context.registers[:page]["path"]),
             path
diff --git a/lib/jekyll/tags/link.rb b/lib/jekyll/tags/link.rb
index 9dc035f7453..124830e2719 100644
--- a/lib/jekyll/tags/link.rb
+++ b/lib/jekyll/tags/link.rb
@@ -5,7 +5,7 @@ module Tags
     class Link < Liquid::Tag
       class << self
         def tag_name
-          self.name.split("::").last.downcase
+          name.split("::").last.downcase
         end
       end
 
@@ -27,11 +27,11 @@ def render(context)
           return item.url if item.relative_path == "/#{relative_path}"
         end
 
-        raise ArgumentError, <<-MSG
-Could not find document '#{relative_path}' in tag '#{self.class.tag_name}'.
+        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.
-MSG
+          Make sure the document exists and the path is correct.
+        MSG
       end
     end
   end
diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb
index db0b3fa06f6..b12d8d0a702 100644
--- a/lib/jekyll/tags/post_url.rb
+++ b/lib/jekyll/tags/post_url.rb
@@ -13,7 +13,7 @@ def initialize(name)
         all, @path, @date, @slug = *name.sub(%r!^/!, "").match(MATCHER)
         unless all
           raise Jekyll::Errors::InvalidPostNameError,
-            "'#{name}' does not contain valid date and/or title."
+                "'#{name}' does not contain valid date and/or title."
         end
 
         escaped_slug = Regexp.escape(slug)
@@ -22,8 +22,10 @@ def initialize(name)
       end
 
       def post_date
-        @post_date ||= Utils.parse_date(date,
-          "\"#{date}\" does not contain valid date and/or title.")
+        @post_date ||= Utils.parse_date(
+          date,
+          "'#{date}' does not contain valid date and/or title."
+        )
       end
 
       def ==(other)
@@ -38,6 +40,7 @@ def deprecated_equality(other)
       end
 
       private
+
       # Construct the directory-aware post slug for a Jekyll::Post
       #
       # other - the Jekyll::Post
@@ -60,13 +63,11 @@ def initialize(tag_name, post, tokens)
         begin
           @post = PostComparer.new(@orig_post)
         rescue StandardError => e
-          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}
-MSG
+          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}
+          MSG
         end
       end
 
@@ -90,11 +91,10 @@ def render(context)
           return p.url
         end
 
-        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.
-MSG
+        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.
+        MSG
       end
     end
   end
diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb
index a21b4bdfea1..e649010890d 100644
--- a/lib/jekyll/theme.rb
+++ b/lib/jekyll/theme.rb
@@ -3,7 +3,7 @@
 module Jekyll
   class Theme
     extend Forwardable
-    attr_reader :name
+    attr_reader   :name
     def_delegator :gemspec, :version, :version
 
     def initialize(name)
@@ -23,19 +23,19 @@ def root
     end
 
     def includes_path
-      @includes_path ||= path_for "_includes".freeze
+      @includes_path ||= path_for "_includes"
     end
 
     def layouts_path
-      @layouts_path ||= path_for "_layouts".freeze
+      @layouts_path ||= path_for "_layouts"
     end
 
     def sass_path
-      @sass_path ||= path_for "_sass".freeze
+      @sass_path ||= path_for "_sass"
     end
 
     def assets_path
-      @assets_path ||= path_for "assets".freeze
+      @assets_path ||= path_for "assets"
     end
 
     def configure_sass
@@ -66,7 +66,7 @@ def gemspec
       @gemspec ||= Gem::Specification.find_by_name(name)
     rescue Gem::LoadError
       raise Jekyll::Errors::MissingDependencyException,
-        "The #{name} theme could not be found."
+            "The #{name} theme could not be found."
     end
   end
 end
diff --git a/lib/jekyll/theme_builder.rb b/lib/jekyll/theme_builder.rb
index 36ef71611d4..ac97e63aac7 100644
--- a/lib/jekyll/theme_builder.rb
+++ b/lib/jekyll/theme_builder.rb
@@ -1,119 +1,121 @@
 # frozen_string_literal: true
 
-class Jekyll::ThemeBuilder
-  SCAFFOLD_DIRECTORIES = %w(
-    assets _layouts _includes _sass
-  ).freeze
-
-  attr_reader :name, :path, :code_of_conduct
+module Jekyll
+  class ThemeBuilder
+    SCAFFOLD_DIRECTORIES = %w(
+      assets _layouts _includes _sass
+    ).freeze
+
+    attr_reader :name, :path, :code_of_conduct
+
+    def initialize(theme_name, opts)
+      @name = theme_name.to_s.tr(" ", "_").squeeze("_")
+      @path = Pathname.new(File.expand_path(name, Dir.pwd))
+      @code_of_conduct = !!opts["code_of_conduct"]
+    end
 
-  def initialize(theme_name, opts)
-    @name = theme_name.to_s.tr(" ", "_").squeeze("_")
-    @path = Pathname.new(File.expand_path(name, Dir.pwd))
-    @code_of_conduct = !!opts["code_of_conduct"]
-  end
+    def create!
+      create_directories
+      create_starter_files
+      create_gemspec
+      create_accessories
+      initialize_git_repo
+    end
 
-  def create!
-    create_directories
-    create_starter_files
-    create_gemspec
-    create_accessories
-    initialize_git_repo
-  end
+    def user_name
+      @user_name ||= `git config user.name`.chomp
+    end
 
-  def user_name
-    @user_name ||= `git config user.name`.chomp
-  end
+    def user_email
+      @user_email ||= `git config user.email`.chomp
+    end
 
-  def user_email
-    @user_email ||= `git config user.email`.chomp
-  end
+    private
 
-  private
+    def root
+      @root ||= Pathname.new(File.expand_path("../", __dir__))
+    end
 
-  def root
-    @root ||= Pathname.new(File.expand_path("../", __dir__))
-  end
+    def template_file(filename)
+      [
+        root.join("theme_template", "#{filename}.erb"),
+        root.join("theme_template", filename.to_s),
+      ].find(&:exist?)
+    end
 
-  def template_file(filename)
-    [
-      root.join("theme_template", "#{filename}.erb"),
-      root.join("theme_template", filename.to_s),
-    ].find(&:exist?)
-  end
+    def template(filename)
+      erb.render(template_file(filename).read)
+    end
 
-  def template(filename)
-    erb.render(template_file(filename).read)
-  end
+    def erb
+      @erb ||= ERBRenderer.new(self)
+    end
 
-  def erb
-    @erb ||= ERBRenderer.new(self)
-  end
+    def mkdir_p(directories)
+      Array(directories).each do |directory|
+        full_path = path.join(directory)
+        Jekyll.logger.info "create", full_path.to_s
+        FileUtils.mkdir_p(full_path)
+      end
+    end
 
-  def mkdir_p(directories)
-    Array(directories).each do |directory|
-      full_path = path.join(directory)
+    def write_file(filename, contents)
+      full_path = path.join(filename)
       Jekyll.logger.info "create", full_path.to_s
-      FileUtils.mkdir_p(full_path)
+      File.write(full_path, contents)
     end
-  end
-
-  def write_file(filename, contents)
-    full_path = path.join(filename)
-    Jekyll.logger.info "create", full_path.to_s
-    File.write(full_path, contents)
-  end
 
-  def create_directories
-    mkdir_p(SCAFFOLD_DIRECTORIES)
-  end
+    def create_directories
+      mkdir_p(SCAFFOLD_DIRECTORIES)
+    end
 
-  def create_starter_files
-    %w(page post default).each do |layout|
-      write_file("_layouts/#{layout}.html", template("_layouts/#{layout}.html"))
+    def create_starter_files
+      %w(page post default).each do |layout|
+        write_file("_layouts/#{layout}.html", template("_layouts/#{layout}.html"))
+      end
     end
-  end
 
-  def create_gemspec
-    write_file("Gemfile", template("Gemfile"))
-    write_file("#{name}.gemspec", template("theme.gemspec"))
-  end
+    def create_gemspec
+      write_file("Gemfile", template("Gemfile"))
+      write_file("#{name}.gemspec", template("theme.gemspec"))
+    end
 
-  def create_accessories
-    accessories = %w(README.md LICENSE.txt)
-    accessories << "CODE_OF_CONDUCT.md" if code_of_conduct
-    accessories.each do |filename|
-      write_file(filename, template(filename))
+    def create_accessories
+      accessories = %w(README.md LICENSE.txt)
+      accessories << "CODE_OF_CONDUCT.md" if code_of_conduct
+      accessories.each do |filename|
+        write_file(filename, template(filename))
+      end
     end
-  end
 
-  def initialize_git_repo
-    Jekyll.logger.info "initialize", path.join(".git").to_s
-    Dir.chdir(path.to_s) { `git init` }
-    write_file(".gitignore", template("gitignore"))
-  end
+    def initialize_git_repo
+      Jekyll.logger.info "initialize", path.join(".git").to_s
+      Dir.chdir(path.to_s) { `git init` }
+      write_file(".gitignore", template("gitignore"))
+    end
 
-  class ERBRenderer
-    extend Forwardable
+    class ERBRenderer
+      extend Forwardable
 
-    def_delegator :@theme_builder, :name, :theme_name
-    def_delegator :@theme_builder, :user_name, :user_name
-    def_delegator :@theme_builder, :user_email, :user_email
+      def_delegator :@theme_builder, :name, :theme_name
+      def_delegator :@theme_builder, :user_name, :user_name
+      def_delegator :@theme_builder, :user_email, :user_email
 
-    def initialize(theme_builder)
-      @theme_builder = theme_builder
-    end
+      def initialize(theme_builder)
+        @theme_builder = theme_builder
+      end
 
-    def jekyll_version_with_minor
-      Jekyll::VERSION.split(".").take(2).join(".")
-    end
+      def jekyll_version_with_minor
+        Jekyll::VERSION.split(".").take(2).join(".")
+      end
 
-    def theme_directories
-      SCAFFOLD_DIRECTORIES
-    end
+      def theme_directories
+        SCAFFOLD_DIRECTORIES
+      end
 
-    def render(contents)
-      ERB.new(contents).result binding
+      def render(contents)
+        ERB.new(contents).result binding
+      end
     end
   end
 end
diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 87f20e138eb..39c0b3cd1e6 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -98,8 +98,8 @@ def generate_url_from_drop(template)
         winner = pool.find { |key| @placeholders.key?(key) }
         if winner.nil?
           raise NoMethodError,
-            "The URL template doesn't have #{pool.join(" or ")} keys. "\
-              "Check your permalink template!"
+                "The URL template doesn't have #{pool.join(" or ")} keys. "\
+                "Check your permalink template!"
         end
 
         value = @placeholders[winner]
diff --git a/lib/jekyll/utils/exec.rb b/lib/jekyll/utils/exec.rb
index fee8b2d2e5b..5838ecba9e6 100644
--- a/lib/jekyll/utils/exec.rb
+++ b/lib/jekyll/utils/exec.rb
@@ -21,7 +21,6 @@ def run(*args)
         [stdin, stdout, stderr].each(&:close)
         [process.value, out + err]
       end
-
     end
   end
 end
diff --git a/lib/jekyll/utils/internet.rb b/lib/jekyll/utils/internet.rb
index f723469b49a..945267f1e5d 100644
--- a/lib/jekyll/utils/internet.rb
+++ b/lib/jekyll/utils/internet.rb
@@ -3,7 +3,6 @@
 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.
@@ -18,7 +17,9 @@ module Internet
       #   end
       #
       # Returns true if a DNS call can successfully be made, or false if not.
+
       module_function
+
       def connected?
         !dns("example.com").nil?
       end
@@ -31,7 +32,6 @@ def dns(domain)
       rescue Resolv::ResolvError, Resolv::ResolvTimeout
         nil
       end
-
     end
   end
 end
diff --git a/lib/jekyll/utils/platforms.rb b/lib/jekyll/utils/platforms.rb
index 6665527a726..e0e2e331a11 100644
--- a/lib/jekyll/utils/platforms.rb
+++ b/lib/jekyll/utils/platforms.rb
@@ -31,7 +31,7 @@ def vanilla_windows?
       # --
 
       alias_method :really_windows?, \
-        :vanilla_windows?
+                   :vanilla_windows?
 
       #
 
@@ -68,6 +68,7 @@ def linux?
       #
 
       private
+
       def proc_version
         @proc_version ||= begin
           Pathutil.new(
diff --git a/lib/jekyll/utils/thread_event.rb b/lib/jekyll/utils/thread_event.rb
index 5afb50d93eb..801022e4721 100644
--- a/lib/jekyll/utils/thread_event.rb
+++ b/lib/jekyll/utils/thread_event.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "thread"
-
 module Jekyll
   module Utils
     # Based on the pattern and code from
@@ -25,9 +23,7 @@ def set
 
       def wait
         @lock.synchronize do
-          unless @flag
-            @cond.wait(@lock)
-          end
+          @cond.wait(@lock) unless @flag
         end
       end
     end
diff --git a/lib/jekyll/utils/win_tz.rb b/lib/jekyll/utils/win_tz.rb
index 239650f71fe..965cbc95be3 100644
--- a/lib/jekyll/utils/win_tz.rb
+++ b/lib/jekyll/utils/win_tz.rb
@@ -21,7 +21,7 @@ def calculate(timezone)
         #   is denoted as:
         #     EST+5 (or) EST+05:00
         # Reference: http://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html
-        sign = difference < 0 ? "-" : "+"
+        sign = difference.negative? ? "-" : "+"
         offset = sign == "-" ? "+" : "-" unless difference.zero?
         #
         # convert the difference (in seconds) to hours, as a rational number, and perform
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 0a6a8a2d3d7..5934f0a34d3 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "3.8.2".freeze
+  VERSION = "3.8.2"
 end

From 035ea729ff5668dfc96e7f56a86d214e5a633291 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 2 Jun 2018 06:50:34 -0400
Subject: [PATCH 3046/4996] Update history to reflect merge of #7050 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 20e4bf01a7e..401263ca44e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -50,6 +50,7 @@
   * Load Rouge for TestKramdown (#7007)
   * Useless privates removed (#6768)
   * Allow i18n v0.9.5 and higher (#7044)
+  * Update Rubocop's config (#7050)
 
 ### Bug Fixes
 

From 0e360623cbffd75676882c2e83660d716e5d5bcb Mon Sep 17 00:00:00 2001
From: Keith Mifsud 
Date: Sat, 2 Jun 2018 23:41:27 +0545
Subject: [PATCH 3047/4996] Listed the keyll-target-blank plugin in plugins
 list. (#7046)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 1c3332e3fb9..2b3f758bbcc 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -787,6 +787,7 @@ You can find a few useful plugins at the following locations:
 - [Jekyll::Paginate::Content](https://github.com/ibrado/jekyll-paginate-content): Content paginator in the style of jekyll-paginator-v2 that splits pages, posts, and collection entries into several pages. Specify a separator or use HTML <h1> etc. headers. Automatic splitting, single-page view, pager/trail, self-adjusting links, multipage TOC, SEO support.
 - [Premonition](https://github.com/amedia/premonition): Adds block-styled side content to your page. For example summary, notes, hints or warning boxes.
 - [jekyll-fontello](https://github.com/ericcornelissen/jekyll-fontello): A Jekyll plugin that automatically downloads your webfont from Fontello.
+- [Target Blank](https://github.com/keithmifsud/jekyll-target-blank): A Jekyll plugin to automatically open external links in a new browser tab or window.
 
 #### Converters
 

From c6415ce08158698a43c14fcb56fc1875b4ced153 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 2 Jun 2018 13:56:29 -0400
Subject: [PATCH 3048/4996] Update history to reflect merge of #7046 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 401263ca44e..59e97f07a72 100644
--- a/History.markdown
+++ b/History.markdown
@@ -22,6 +22,7 @@
   * added the CAT plugin to the plugin list (#7011)
   * Updated to supported version (#7031)
   * Clarify definition of 'draft' (#7037)
+  * Listed the jekyll-target-blank plugin in plugins list. (#7046)
 
 ### Minor Enhancements
 

From 5687a092554599e8c2cf1247764a7eaf87f3d05f Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Mon, 4 Jun 2018 21:39:43 -0500
Subject: [PATCH 3049/4996] Release :gem: 3.8.3

---
 History.markdown                                    |  2 +-
 docs/_config.yml                                    |  2 +-
 docs/_docs/history.md                               |  9 +++++++++
 .../2018-06-04-jekyll-3-8-3-released.markdown       | 13 +++++++++++++
 docs/latest_version.txt                             |  2 +-
 lib/jekyll/version.rb                               |  2 +-
 6 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 docs/_posts/2018-06-04-jekyll-3-8-3-released.markdown

diff --git a/History.markdown b/History.markdown
index b50563f8e3b..7c5bdb82e44 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,4 +1,4 @@
-## HEAD
+## 3.8.3 / 2018-06-05
 
 ### Bug Fixes
 
diff --git a/docs/_config.yml b/docs/_config.yml
index e608b1b6e8d..27ad51ffc8d 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,5 +1,5 @@
 ---
-version: 3.8.2
+version: 3.8.3
 name: Jekyll • Simple, blog-aware, static sites
 description: Transform your plain text into static websites and blogs
 url: https://jekyllrb.com
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 4a9faf7f29a..1e6c14d8716 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,15 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.8.3 / 2018-06-05
+{: #v3-8-3}
+
+### Bug Fixes
+{: #bug-fixes-v3-8-3}
+
+- Fix --unpublished not affecting collection documents ([#7027]({{ site.repository }}/issues/7027))
+
+
 ## 3.8.2 / 2018-05-18
 {: #v3-8-2}
 
diff --git a/docs/_posts/2018-06-04-jekyll-3-8-3-released.markdown b/docs/_posts/2018-06-04-jekyll-3-8-3-released.markdown
new file mode 100644
index 00000000000..5678b0ad8b3
--- /dev/null
+++ b/docs/_posts/2018-06-04-jekyll-3-8-3-released.markdown
@@ -0,0 +1,13 @@
+---
+title: 'Jekyll 3.8.3 Released'
+date: 2018-06-05 09:00:00 -0500
+author: pathawks
+version: 3.8.3
+categories: [release]
+---
+
+This release fixes a regression in 3.8 where collections with `published: false`
+do not show when using the `--unpublished` flag.
+
+Thanks to @philipbelesky for reporting and fixing this issue; collections with
+`published: false` now behave the same way as Posts.
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index a08ffae0cae..269aa9c86de 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.8.2
+3.8.3
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 0a6a8a2d3d7..9a62ec6f3af 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "3.8.2".freeze
+  VERSION = "3.8.3".freeze
 end

From 48e2de862d8396e6ff2f30e2231ac67c5f233b61 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Tue, 5 Jun 2018 08:23:52 -0500
Subject: [PATCH 3050/4996] Release :gem: 3.8.3


From 4baa0093edad6dc22eed43e2c33a82116e5bd354 Mon Sep 17 00:00:00 2001
From: Stephan Fischer 
Date: Tue, 5 Jun 2018 18:09:24 +0200
Subject: [PATCH 3051/4996] [Doc] Fixing a small typo (#7058)

Merge pull request 7058
---
 docs/_tutorials/using-jekyll-with-bundler.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_tutorials/using-jekyll-with-bundler.md b/docs/_tutorials/using-jekyll-with-bundler.md
index 321f550516f..3aa34bbb0c6 100644
--- a/docs/_tutorials/using-jekyll-with-bundler.md
+++ b/docs/_tutorials/using-jekyll-with-bundler.md
@@ -90,7 +90,7 @@ If you're storing your new site in version control, you'll want to ignore the
 `./vendor/` and `./.bundle/` folders since they contain user- or
 platform-specific information. New users will be able to install the correct
 dependencies based on `Gemfile` and `Gemfile.lock`, which should both be checked
-in. You can use this `.gitigonre` to get started, if you want.
+in. You can use this `.gitignore` to get started, if you want.
 
 **.gitignore**
 

From e47dad9d205648c9b3a1523489948415e59d8bd1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 5 Jun 2018 12:09:26 -0400
Subject: [PATCH 3052/4996] Update history to reflect merge of #7058 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f4d904819b8..35796fe27a2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -23,6 +23,7 @@
   * Updated to supported version (#7031)
   * Clarify definition of 'draft' (#7037)
   * Listed the jekyll-target-blank plugin in plugins list. (#7046)
+  * Typo (#7058)
 
 ### Minor Enhancements
 

From 10b23f7466e1c3b144fd3a08a0e7783973434669 Mon Sep 17 00:00:00 2001
From: Patrick Favre-Bulle 
Date: Tue, 5 Jun 2018 19:27:02 +0200
Subject: [PATCH 3053/4996] Add Hints for some Improved Travis Config in Doc
 (#7049)

Merge pull request 7049
---
 .../_docs/continuous-integration/travis-ci.md | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/continuous-integration/travis-ci.md b/docs/_docs/continuous-integration/travis-ci.md
index cbff5267e2e..cfca495c05e 100644
--- a/docs/_docs/continuous-integration/travis-ci.md
+++ b/docs/_docs/continuous-integration/travis-ci.md
@@ -90,7 +90,7 @@ Your `.travis.yml` file should look like this:
 ```yaml
 language: ruby
 rvm:
-- 2.3.3
+  - 2.4.1
 
 before_script:
  - chmod +x ./script/cibuild # or do this locally and commit
@@ -110,6 +110,12 @@ env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
 
 sudo: false # route your build to the container-based infrastructure for a faster build
+
+cache: bundler # caching bundler gem packages will speed up build
+
+# Optional: disable email notifications about the outcome of your builds
+notifications:
+  email: false
 ```
 
 Ok, now for an explanation of each line:
@@ -123,12 +129,13 @@ access to Bundler, RubyGems, and a Ruby runtime.
 
 ```yaml
 rvm:
-- 2.3.3
+  - 2.4.1
 ```
 
 RVM is a popular Ruby Version Manager (like rbenv, chruby, etc). This
 directive tells Travis the Ruby version to use when running your test
-script.
+script. Use a [version which is pre-installed on the Travis build docker][5]
+image to speed up the build.
 
 ```yaml
 before_script:
@@ -210,6 +217,23 @@ does need `sudo` access, modify the line to `sudo: required`.
 sudo: false
 ```
 
+To speed up the build, you should cache the gem packages created by `bundler`. 
+Travis has a pre-defined [cache strategy for this tool][6] which should have
+all the default configs to do exactly that.
+
+```yaml
+cache: bundler
+```
+
+Optionally, if you are not interested in the build email notifications you
+can disable them with this configuration. Travis supports a wide array of
+notification services, you may find [another one more useful (e.g. slack)][7].
+
+```yaml
+notifications:
+  email: false
+```
+
 ### Troubleshooting
 
 **Travis error:** *"You are trying to install in deployment mode after changing
@@ -227,3 +251,6 @@ fix or [ask for help][4] if you run into trouble and need some help.
 
 [3]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration/travis-ci.md
 [4]: https://jekyllrb.com/help/
+[5]: https://docs.travis-ci.com/user/languages/ruby/#Specifying-Ruby-versions-and-implementations
+[6]: https://docs.travis-ci.com/user/caching/#Caching-directories-(Bundler%2C-dependencies)
+[7]: https://docs.travis-ci.com/user/notifications/

From baf70295f957a6b42542b260bf86168a2c955b33 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 5 Jun 2018 13:27:04 -0400
Subject: [PATCH 3054/4996] Update history to reflect merge of #7049 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 35796fe27a2..464efdcfb2b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -24,6 +24,7 @@
   * Clarify definition of 'draft' (#7037)
   * Listed the jekyll-target-blank plugin in plugins list. (#7046)
   * Typo (#7058)
+  * Add Hints for some Improved Travis Config in Doc (#7049)
 
 ### Minor Enhancements
 

From cd996387a50dfc3599bbe7365815513a3bbc7eac Mon Sep 17 00:00:00 2001
From: chrisfinazzo 
Date: Mon, 11 Jun 2018 22:05:38 -0400
Subject: [PATCH 3055/4996] Remove Gemnasium badge

---
 README.markdown | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.markdown b/README.markdown
index fe5e91f7b13..787d2c6cba7 100644
--- a/README.markdown
+++ b/README.markdown
@@ -5,11 +5,9 @@
 [![Windows Build status](https://img.shields.io/appveyor/ci/jekyll/jekyll/master.svg?label=Windows%20build)][appveyor]
 [![Maintainability](https://api.codeclimate.com/v1/badges/8ba0cb5b17bb9848e128/maintainability)](codeclimate)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/8ba0cb5b17bb9848e128/test_coverage)](coverage)
-[![Dependency Status](https://img.shields.io/gemnasium/jekyll/jekyll.svg)][gemnasium]
 [![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)][hakiri]
 
 [ruby-gems]: https://rubygems.org/gems/jekyll
-[gemnasium]: https://gemnasium.com/jekyll/jekyll
 [codeclimate]: https://codeclimate.com/github/jekyll/jekyll
 [coverage]: https://codeclimate.com/github/jekyll/jekyll/coverage
 [hakiri]: https://hakiri.io/github/jekyll/jekyll/master

From bbc9c99cf98b49c23600d9264a9d2cb09083f78b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 17 Jun 2018 11:36:54 -0400
Subject: [PATCH 3056/4996] Remember to release docs gem (#7066)

Merge pull request 7066
---
 rake/release.rake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rake/release.rake b/rake/release.rake
index ce7bf41ca94..7064f6751bd 100644
--- a/rake/release.rake
+++ b/rake/release.rake
@@ -18,6 +18,8 @@ task :release => :build do
   sh "git push origin #{current_branch}"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
+  puts "Do not forget to build and release the docs gem as well."
+  puts "https://github.com/jekyll/jekyll-docs#releasing"
 end
 
 desc "Build #{name} v#{version} into pkg/"

From 55ea4c840ba7f3d7279c679d677e16e62f0fd3eb Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 17 Jun 2018 11:36:56 -0400
Subject: [PATCH 3057/4996] Update history to reflect merge of #7066 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 464efdcfb2b..ba971abb7c6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -54,6 +54,7 @@
   * Useless privates removed (#6768)
   * Allow i18n v0.9.5 and higher (#7044)
   * Update Rubocop's config (#7050)
+  * Remember to release docs gem (#7066)
 
 ## 3.8.3 / 2018-06-05
 

From f0cbbbb304384ab7da646a622d1803c5c43d188e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pobo=C5=99il?= 
Date: Wed, 20 Jun 2018 17:43:48 +0200
Subject: [PATCH 3058/4996] Added plugin json-get. (#7086)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 2b3f758bbcc..32cdb4a5b73 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -938,6 +938,7 @@ You can find a few useful plugins at the following locations:
 - [jekyll-pre-commit](https://github.com/mpchadwick/jekyll-pre-commit): A framework for running checks against your posts using a git pre-commit hook before you publish them.
 - [jekyll-pwa-plugin](https://github.com/lavas-project/jekyll-pwa): A plugin provides PWA support for Jekyll. It generates a service worker in Jekyll build process and makes precache and runtime cache available in the runtime with Google Workbox.
 - [jekyll-algolia](https://community.algolia.com/jekyll-algolia/): Add fast and relevant search to your Jekyll site through the Algolia API.
+- [jekyll-get](https://github.com/18F/jekyll-get): Download data from external JSON API sources to use in generating a site.
 
 
      
   
      Submit your gem plugins
      

From 8b63fbed6b06f3b36b1a4e797f2b5410d117aac6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 20 Jun 2018 11:43:50 -0400
Subject: [PATCH 3059/4996] Update history to reflect merge of #7086 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ba971abb7c6..647e544332a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Listed the jekyll-target-blank plugin in plugins list. (#7046)
   * Typo (#7058)
   * Add Hints for some Improved Travis Config in Doc (#7049)
+  * Added plugin json-get. (#7086)
 
 ### Minor Enhancements
 

From 1d461224ddf39f7a26edb4ebd40b0ffadf19dcee Mon Sep 17 00:00:00 2001
From: Anne Gentle 
Date: Thu, 21 Jun 2018 04:25:50 -0500
Subject: [PATCH 3060/4996] Update travis-ci.md (#7089)

Merge pull request 7089
---
 docs/_docs/continuous-integration/travis-ci.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/continuous-integration/travis-ci.md b/docs/_docs/continuous-integration/travis-ci.md
index cfca495c05e..b2fa78625cf 100644
--- a/docs/_docs/continuous-integration/travis-ci.md
+++ b/docs/_docs/continuous-integration/travis-ci.md
@@ -76,7 +76,7 @@ with Ruby and requires RubyGems to install, we use the Ruby language build
 environment. Below is a sample `.travis.yml` file, followed by
 an explanation of each line.
 
-**Note:** You will need a Gemfile as well, [Travis will automatically install](https://docs.travis-ci.com/user/languages/ruby/#Dependency-Management) the dependencies based on the referenced gems:
+**Note:** You will need a Gemfile as well, [Travis will automatically install](https://docs.travis-ci.com/user/languages/ruby/#Dependency-Management) the dependencies based on the referenced gems. Here is an example `Gemfile` with two referenced gems, "jekyll" and "html-proofer":
 
 ```ruby
 source "https://rubygems.org"

From 76919eea3b3da8fe8f23150bf62fdb5ac178b282 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 21 Jun 2018 05:25:52 -0400
Subject: [PATCH 3061/4996] Update history to reflect merge of #7089 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 647e544332a..a0ef5b8d569 100644
--- a/History.markdown
+++ b/History.markdown
@@ -26,6 +26,7 @@
   * Typo (#7058)
   * Add Hints for some Improved Travis Config in Doc (#7049)
   * Added plugin json-get. (#7086)
+  * Update travis-ci.md to point out "this is an example Gemfile" (#7089)
 
 ### Minor Enhancements
 

From 76422b03b7725d196898ab15196e2c0ebb0679b5 Mon Sep 17 00:00:00 2001
From: Steven Westmoreland 
Date: Sat, 23 Jun 2018 08:27:30 -0500
Subject: [PATCH 3062/4996] Adding `jekyll-info` plugin (#7091)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 32cdb4a5b73..ba18ce30d18 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -788,6 +788,7 @@ You can find a few useful plugins at the following locations:
 - [Premonition](https://github.com/amedia/premonition): Adds block-styled side content to your page. For example summary, notes, hints or warning boxes.
 - [jekyll-fontello](https://github.com/ericcornelissen/jekyll-fontello): A Jekyll plugin that automatically downloads your webfont from Fontello.
 - [Target Blank](https://github.com/keithmifsud/jekyll-target-blank): A Jekyll plugin to automatically open external links in a new browser tab or window.
+- [jekyll-info](https://github.com/swestmoreland/jekyll-info): A plugin to provide information about your Jekyll site’s configuration.
 
 #### Converters
 

From 3204445d6f2edce50fe9372684395be60e7b11a3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 23 Jun 2018 09:27:32 -0400
Subject: [PATCH 3063/4996] Update history to reflect merge of #7091 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a0ef5b8d569..6f7d45a2b2d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -27,6 +27,7 @@
   * Add Hints for some Improved Travis Config in Doc (#7049)
   * Added plugin json-get. (#7086)
   * Update travis-ci.md to point out "this is an example Gemfile" (#7089)
+  * Adding `jekyll-info` plugin (#7091)
 
 ### Minor Enhancements
 

From 0b6962cfe976819b577059e8535fde5b3d3c7e58 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 23 Jun 2018 16:57:35 -0400
Subject: [PATCH 3064/4996] Use assert_include (#7093)

Merge pull request 7093
---
 test/test_generated_site.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 7ce093536ff..65b82fe8b3a 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -20,15 +20,15 @@ class TestGeneratedSite < JekyllUnitTest
     end
 
     should "insert site.posts into the index" do
-      assert @index.include?("#{@site.posts.size} Posts")
+      assert_includes @index, "#{@site.posts.size} Posts"
     end
 
     should "insert variable from layout into the index" do
-      assert @index.include?("variable from layout")
+      assert_includes @index, "variable from layout"
     end
 
     should "render latest post's content" do
-      assert @index.include?(@site.posts.last.content)
+      assert_includes @index, @site.posts.last.content
     end
 
     should "hide unpublished posts" do

From 0728ccf08b08759d75b6bac40091151a80556565 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 23 Jun 2018 16:57:36 -0400
Subject: [PATCH 3065/4996] Update history to reflect merge of #7093 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6f7d45a2b2d..15537802fe6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -58,6 +58,7 @@
   * Allow i18n v0.9.5 and higher (#7044)
   * Update Rubocop's config (#7050)
   * Remember to release docs gem (#7066)
+  * Use assert_include (#7093)
 
 ## 3.8.3 / 2018-06-05
 

From cb84017bbe1eae2bd8accfd83d3cbb5ce3e80437 Mon Sep 17 00:00:00 2001
From: Ralph 
Date: Mon, 25 Jun 2018 21:43:33 -0400
Subject: [PATCH 3066/4996] Update rubocop version to 0.57.x (#7078)

Merge pull request 7078
---
 .rubocop.yml             | 2 ++
 Gemfile                  | 2 +-
 lib/jekyll/drops/drop.rb | 6 +-----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 9edab2bd064..81e11e29765 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -98,6 +98,8 @@ Security/YAMLLoad:
   Exclude:
     - !ruby/regexp /features\/.*.rb/
     - !ruby/regexp /test\/.*.rb$/
+Style/AccessModifierDeclarations:
+  Enabled: false
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 Style/AndOr:
diff --git a/Gemfile b/Gemfile
index ce43b6798f9..34e9be49859 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.56.0"
+  gem "rubocop", "~> 0.57.2"
   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/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index 412c279145e..208b266b370 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -15,11 +15,7 @@ class Drop < Liquid::Drop
       #
       # Returns the mutability of the class
       def self.mutable(is_mutable = nil)
-        @is_mutable = if is_mutable
-                        is_mutable
-                      else
-                        false
-                      end
+        @is_mutable = is_mutable || false
       end
 
       def self.mutable?

From caae9d2ecaa130eeab916e1df2daba45bcd8adf2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 25 Jun 2018 21:43:35 -0400
Subject: [PATCH 3067/4996] Update history to reflect merge of #7078 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 15537802fe6..c61043a4197 100644
--- a/History.markdown
+++ b/History.markdown
@@ -59,6 +59,7 @@
   * Update Rubocop's config (#7050)
   * Remember to release docs gem (#7066)
   * Use assert_include (#7093)
+  * Update rubocop version to 0.57.x (#7078)
 
 ## 3.8.3 / 2018-06-05
 

From 67331185c21713e5f72e9bb2a870e899a8b798f9 Mon Sep 17 00:00:00 2001
From: olivia 
Date: Tue, 26 Jun 2018 22:48:26 +0200
Subject: [PATCH 3068/4996] add sponsor display in website footer

---
 docs/_data/sponsors.yml    |  3 +++
 docs/_includes/footer.html | 10 ++++++++++
 docs/_sass/_style.scss     |  3 +--
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 docs/_data/sponsors.yml

diff --git a/docs/_data/sponsors.yml b/docs/_data/sponsors.yml
new file mode 100644
index 00000000000..b03eefecb73
--- /dev/null
+++ b/docs/_data/sponsors.yml
@@ -0,0 +1,3 @@
+- name: Forestry.io
+  image: http://via.placeholder.com/200x100
+  url: https://forestry.io
\ No newline at end of file
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index cc9568d42cd..ade88894ee4 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -11,5 +11,15 @@
         
       
      
     
      
+    
      
+      
      
+        Sponsored by
+        {% for sponsor in site.data.sponsors %}
+          
+            {{ sponsor.name }}
+          
+        {% endfor %}
+      
      
+    
      
   
      
 
diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss
index 69cc55ea9ee..b23bee5d98d 100644
--- a/docs/_sass/_style.scss
+++ b/docs/_sass/_style.scss
@@ -224,8 +224,7 @@ footer {
 
   img {
     display: inline-block;
-    position: relative;
-    top: 8px;
+    vertical-align: middle;
     margin-left: 5px;
     opacity: .8;
     padding: 1px;

From efb7819d2e0f1e038fd5479a83e008cbeb2fa8a9 Mon Sep 17 00:00:00 2001
From: olivia 
Date: Thu, 28 Jun 2018 17:55:29 +0200
Subject: [PATCH 3069/4996] add forestry logo

---
 docs/_data/sponsors.yml    |   2 +-
 docs/_docs/contributing.md |   2 +-
 docs/_includes/footer.html |   2 +-
 docs/img/forestry-logo.png | Bin 0 -> 25542 bytes
 4 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 docs/img/forestry-logo.png

diff --git a/docs/_data/sponsors.yml b/docs/_data/sponsors.yml
index b03eefecb73..812f8dec837 100644
--- a/docs/_data/sponsors.yml
+++ b/docs/_data/sponsors.yml
@@ -1,3 +1,3 @@
 - name: Forestry.io
-  image: http://via.placeholder.com/200x100
+  image: /img/forestry-logo.png
   url: https://forestry.io
\ No newline at end of file
diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index 9eea7282d13..f1c643d3f71 100644
--- a/docs/_docs/contributing.md
+++ b/docs/_docs/contributing.md
@@ -16,7 +16,7 @@ Whether you're a developer, a designer, or just a Jekyll devotee, there are lots
 
 * [Install Jekyll on your computer](https://jekyllrb.com/docs/installation/) and kick the tires. Does it work? Does it do what you'd expect? If not, [open an issue](https://github.com/jekyll/jekyll/issues/new) and let us know.
 * Comment on some of the project's [open issues](https://github.com/jekyll/jekyll/issues). Have you experienced the same problem? Know a work around? Do you have a suggestion for how the feature could be better?
-* Read through [the documentation](https://jekyllrb.com/docs/home/), and click the "improve this page" button, any time you see something confusing, or have a suggestion on how to improve something.
+* Read through [the documentation](https://jekyllrb.com/docs/home/), and click the "improve this page" button, any time you see something confusing, or have a suggestion for something that could be improved.
 * Browse through [the Jekyll discussion forum](https://talk.jekyllrb.com/), and lend a hand answering questions. There's a good chance you've already experienced what another user is experiencing.
 * Find [an open issue](https://github.com/jekyll/jekyll/issues) (especially [those labeled `help-wanted`](https://github.com/jekyll/jekyll/issues?q=is%3Aopen+is%3Aissue+label%3Ahelp-wanted)), and submit a proposed fix. If it's your first pull request, we promise we won't bite, and are glad to answer any questions.
 * Help evaluate [open pull requests](https://github.com/jekyll/jekyll/pulls), by testing the changes locally and reviewing what's proposed.
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index ade88894ee4..a5674addc31 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -16,7 +16,7 @@
         Sponsored by
         {% for sponsor in site.data.sponsors %}
           
-            {{ sponsor.name }}
+            {{ sponsor.name }}
           
         {% endfor %}
       
      
diff --git a/docs/img/forestry-logo.png b/docs/img/forestry-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..de7fb17d1f5f23a6ca4b300bf16df83a7692804b
GIT binary patch
literal 25542
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
      Y6c&w%q
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

literal 0
HcmV?d00001


From 2dcdc49a3630093281af6d2a57e058fae298abda Mon Sep 17 00:00:00 2001
From: olivia 
Date: Thu, 28 Jun 2018 19:17:50 +0200
Subject: [PATCH 3070/4996] add sponsoring post

---
 .../2018-06-26-jekyll-sponsoring.markdown     | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 docs/_posts/2018-06-26-jekyll-sponsoring.markdown

diff --git a/docs/_posts/2018-06-26-jekyll-sponsoring.markdown b/docs/_posts/2018-06-26-jekyll-sponsoring.markdown
new file mode 100644
index 00000000000..10b7a3b90af
--- /dev/null
+++ b/docs/_posts/2018-06-26-jekyll-sponsoring.markdown
@@ -0,0 +1,49 @@
+---
+title: 'Jekyll and Sponsoring'
+date: 2018-06-26 16:00:00 +0200
+author: oe
+categories: [community]
+---
+
+_(TL;DR: We're open for sponsorships over our [OpenCollective page](https://opencollective.com/jekyll))_
+
+Hi Jekyllers,
+
+As you may know, Jekyll is a completely free and open source project. We offer our
+software and its related plugins and documentation at no cost because we believe
+that good software should not cost anything. We're not planning on changing that,
+but today I want to talk about a different monetary aspect of open source.
+
+Open source developers being paid for the work they do is a rare sight. Most open source
+software is effectively the result of hundreds and thousands of hours of free labor provided
+by individuals who are passionate enough to work outside of their day job to create
+software that, ironically, is being used by almost every company that offers
+digital services. It's a problem that has gotten more attention in recent years, with
+the open source community becoming more diverse and more and more companies actively
+investing in providing monetary support for open source developers.
+
+Jekyll has always been a product of volunteers. Rarely has someone been paid to implement
+a certain plugin or feature. Today, we're excited to announce that we will finally
+be able to fund our contributors! __We are opening an OpenCollective to receive
+individual and corporate sponsorships__. This is not unheard of, [Hugo](http://gohugo.io)
+is also funded by sponsorships, as are many other similar projects.
+
+OpenCollective is a service that makes it easy for open source projects to receive funding
+from individuals and companies alike. It's specifically designed for open source and
+many other projects already use it for funding.
+
+With that, we would like to announce our very first sponsor: [__Forestry.io__](https://forestry.io)! Forestry is
+a CMS that integrates with your Jekyll sites and lets you update content using a beautiful
+interface, and then automatically commits it back to your GitHub repository. We're excited to have
+them on board on a new, exciting step of our journey.
+
+Will anything change for Jekyll users? The answer is no - this step does not impact the Jekyll software
+in any aspect. In fact, you might see positive changes, such as more features and better
+performance. Surprisingly, that's what happens when you properly fund people for their work!
+
+If you have been a long time user for Jekyll and would like to give something back to the project,
+you can consider a small monthly donation to our [OpenCollective page](http://opencollective.com/jekyll).
+If your company heavily relies on Jekyll, consider sponsoring us! Contact me at
+`olivia at fastmail dot com` and we'll figure something out together.
+
+Thanks for sticking with us, and happy Jekylling! :tada:
\ No newline at end of file

From e418d9b2f4f52f688de031da1ef997ea46fffd2b Mon Sep 17 00:00:00 2001
From: Tom Harvey 
Date: Fri, 29 Jun 2018 12:36:37 -0700
Subject: [PATCH 3071/4996] Example of CircleCI deployment through CircleCI v2
 (#7024)

Merge pull request 7024
---
 docs/_docs/continuous-integration/circleci.md | 71 ++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/continuous-integration/circleci.md b/docs/_docs/continuous-integration/circleci.md
index b4aadc616b4..baf5f78ea17 100644
--- a/docs/_docs/continuous-integration/circleci.md
+++ b/docs/_docs/continuous-integration/circleci.md
@@ -61,7 +61,7 @@ test:
 
 ## Complete Example circle.yml File
 
-When you put it all together, here's an example of what that `circle.yml` file could look like:
+When you put it all together, here's an example of what that `circle.yml` file could look like in v1:
 
 ```yaml
 machine:
@@ -83,6 +83,75 @@ deployment:
       - rsync -va --delete ./_site username@my-website:/var/html
 ```
 
+for CircleCI v2, a Docker-based system which new projects will follow, set the `S3_BUCKET_NAME` environment variable (an example of the required config file is shown below).
+
+```yaml
+defaults: &defaults
+  working_directory: ~/repo
+version: 2
+jobs:
+  build:
+    <<: *defaults
+    docker:
+      - image: circleci/ruby:2.5
+    environment:
+      BUNDLE_PATH: ~/repo/vendor/bundle
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - rubygems-v1-{{ checksum "Gemfile.lock" }}
+            - rubygems-v1-fallback
+      - run:
+          name: Bundle Install
+          command: bundle check || bundle install
+      - run:
+          name: HTMLProofer tests
+          command: |
+            bundle exec htmlproofer ./_site \
+              --allow-hash-href \
+              --check-favicon  \
+              --check-html \
+              --disable-external
+      - save_cache:
+          key: rubygems-v1-{{ checksum "Gemfile.lock" }}
+          paths:
+            - vendor/bundle
+      - run:
+          name: Jekyll build
+          command: bundle exec jekyll build
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - _site
+  deploy:
+    <<: *defaults
+    docker:
+      - image: circleci/python:3.6.3
+    environment:
+      S3_BUCKET_NAME: <>
+    steps:
+      - attach_workspace:
+          at: ./
+      - run:
+          name: Install AWS CLI
+          command: pip install awscli --upgrade --user
+      - run:
+          name: Upload to s3
+          command: ~/.local/bin/aws s3 sync ./_site s3://$S3_BUCKET_NAME/ --delete --acl public-read
+workflows:
+  version: 2
+  test-deploy:
+    jobs:
+      - build
+      - deploy:
+          requires:
+            - build
+          filters:
+            branches:
+              only: master
+```
+
 ## Questions?
 
 This entire guide is open-source. Go ahead and [edit it][7] if you have a fix or [ask for help][8] if you run into trouble and need some help. CircleCI also has an [online community][9] for help.

From 4d96e4b7bde82c3d68510828152b81a5d679a2bf Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 29 Jun 2018 15:36:39 -0400
Subject: [PATCH 3072/4996] Update history to reflect merge of #7024 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c61043a4197..58d812be7eb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -61,6 +61,10 @@
   * Use assert_include (#7093)
   * Update rubocop version to 0.57.x (#7078)
 
+### -docs
+
+  * Example of CircleCI deployment through CircleCI v2 (#7024)
+
 ## 3.8.3 / 2018-06-05
 
 ### Bug Fixes

From 43f4fc6c70a5f1f1aac1b2438a9c7fb47bad8aac Mon Sep 17 00:00:00 2001
From: Boris van Hoytema 
Date: Fri, 6 Jul 2018 20:47:03 +0200
Subject: [PATCH 3073/4996] GitHub enables you to use themes from other repos
 (#7112)

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

diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index b9fdf5ecaf4..d4b8aa6d2b5 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -201,7 +201,7 @@ To install a gem-based theme:
 You can have multiple themes listed in your site's `Gemfile`, but only one theme can be selected in your site's `_config.yml`.
 {: .note .info }
 
-If you're publishing your Jekyll site on [GitHub Pages](https://pages.github.com/), note that GitHub Pages supports only some gem-based themes. See [Supported Themes](https://pages.github.com/themes/) in GitHub's documentation to see which themes are supported.
+If you're publishing your Jekyll site on [GitHub Pages](https://pages.github.com/), note that GitHub Pages supports only [some gem-based themes](https://pages.github.com/themes/). GitHub Pages also supports [using any theme hosted on GitHub](https://help.github.com/articles/adding-a-jekyll-theme-to-your-github-pages-site/#adding-a-jekyll-theme-in-your-sites-_configyml-file) using the `remote_theme` configuration as if it were a gem-based theme.
 
 ## Creating a gem-based theme
 

From bfd58fa94932f71d32fc8593103e0b358cd6f968 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 6 Jul 2018 14:47:05 -0400
Subject: [PATCH 3074/4996] Update history to reflect merge of #7112 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 58d812be7eb..63f1220a6da 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * Added plugin json-get. (#7086)
   * Update travis-ci.md to point out "this is an example Gemfile" (#7089)
   * Adding `jekyll-info` plugin (#7091)
+  * GitHub enables you to use themes from other repos (#7112)
 
 ### Minor Enhancements
 
@@ -59,10 +60,7 @@
   * Update Rubocop's config (#7050)
   * Remember to release docs gem (#7066)
   * Use assert_include (#7093)
-  * Update rubocop version to 0.57.x (#7078)
-
-### -docs
-
+  * Update rubocop version to 0.57.x ### -docs (#7078)
   * Example of CircleCI deployment through CircleCI v2 (#7024)
 
 ## 3.8.3 / 2018-06-05

From 70f4d4908de10239b4774210a0e720b7df3b32f9 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 7 Jul 2018 13:01:41 +0200
Subject: [PATCH 3075/4996] Fix: Escape Liquid

---
 docs/_docs/continuous-integration/circleci.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/continuous-integration/circleci.md b/docs/_docs/continuous-integration/circleci.md
index baf5f78ea17..ce58a0092ae 100644
--- a/docs/_docs/continuous-integration/circleci.md
+++ b/docs/_docs/continuous-integration/circleci.md
@@ -100,7 +100,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - rubygems-v1-{{ checksum "Gemfile.lock" }}
+            - rubygems-v1-{% raw %}{{ checksum "Gemfile.lock" }}{% endraw %}
             - rubygems-v1-fallback
       - run:
           name: Bundle Install
@@ -114,7 +114,7 @@ jobs:
               --check-html \
               --disable-external
       - save_cache:
-          key: rubygems-v1-{{ checksum "Gemfile.lock" }}
+          key: rubygems-v1-{% raw %}{{ checksum "Gemfile.lock" }}{% endraw %}
           paths:
             - vendor/bundle
       - run:

From 385bf36724e87a597feacf9c041292f005ededca Mon Sep 17 00:00:00 2001
From: Christian Oliff 
Date: Mon, 9 Jul 2018 03:04:41 +0900
Subject: [PATCH 3076/4996] Updates to v1.4 (#7105)

Merge pull request 7105
---
 CODE_OF_CONDUCT.markdown | 67 +++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 35 deletions(-)

diff --git a/CODE_OF_CONDUCT.markdown b/CODE_OF_CONDUCT.markdown
index 8425dfc7a93..7d1d32140b4 100644
--- a/CODE_OF_CONDUCT.markdown
+++ b/CODE_OF_CONDUCT.markdown
@@ -1,49 +1,46 @@
 # Code of Conduct
 
-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.
+## Our Pledge
 
-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.
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing other's private information, such as physical or electronic
-  addresses, without explicit permission
-* Other unethical or unprofessional conduct
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+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.
+
+## Scope
 
-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.
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
 
-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.
+## Enforcement
 
-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. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
-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.
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 
+## Attribution
 
-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]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html][version]
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/
+[homepage]: https://www.contributor-covenant.org/
+[version]: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

From 565567ac08ac1c3db5129aa55e3c6996f2070c82 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 8 Jul 2018 14:04:43 -0400
Subject: [PATCH 3077/4996] Update history to reflect merge of #7105 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 63f1220a6da..f8aa4ecdba2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * Update travis-ci.md to point out "this is an example Gemfile" (#7089)
   * Adding `jekyll-info` plugin (#7091)
   * GitHub enables you to use themes from other repos (#7112)
+  * Updates to CODE OF CONDUCT  (v1.4.0) (#7105)
 
 ### Minor Enhancements
 

From d57715031a3c8fea19e7eaa4b46376f42111ee43 Mon Sep 17 00:00:00 2001
From: Alexey Kopytko 
Date: Mon, 9 Jul 2018 03:12:11 +0900
Subject: [PATCH 3078/4996] =?UTF-8?q?Instructions=20to=20view=20theme?=
 =?UTF-8?q?=E2=80=99s=20files=20under=20Linux=20(#7095)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge pull request 7095
---
 docs/_docs/themes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index d4b8aa6d2b5..b8f469e5d7f 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -52,6 +52,8 @@ To locate a theme's files on your computer:
    open $(bundle show minima)
    # On Windows
    explorer /usr/local/lib/ruby/gems/2.3.0/gems/minima-2.1.0
+   # On Linux
+   xdg-open $(bundle show minima)
    ```
 
    A Finder or Explorer window opens showing the theme's files and directories. The Minima theme gem contains these files:

From caa0846e7bef0e95312a0122041b7c41b7bd201c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 8 Jul 2018 14:12:13 -0400
Subject: [PATCH 3079/4996] Update history to reflect merge of #7095 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f8aa4ecdba2..632d7b58993 100644
--- a/History.markdown
+++ b/History.markdown
@@ -30,6 +30,7 @@
   * Adding `jekyll-info` plugin (#7091)
   * GitHub enables you to use themes from other repos (#7112)
   * Updates to CODE OF CONDUCT  (v1.4.0) (#7105)
+  * Instructions to view theme’s files under Linux (#7095)
 
 ### Minor Enhancements
 

From f4fcfbdaa02e11777fa776ed9e29341f4efefb79 Mon Sep 17 00:00:00 2001
From: Kelly-Ann Green 
Date: Mon, 9 Jul 2018 01:25:32 -0400
Subject: [PATCH 3080/4996] Update item_property to return numbers as numbers
 instead of strings (#6608)

Merge pull request 6608
---
 lib/jekyll/filters.rb | 25 ++++++++++++++++---------
 test/test_filters.rb  | 16 ++++++++++++----
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 2a390f06503..ed8c31638ec 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -299,16 +299,16 @@ def inspect(input)
     # We also utilize the Schwartzian transform to make this more efficient.
     def sort_input(input, property, order)
       input.map { |item| [item_property(item, property), item] }
-        .sort! do |apple_info, orange_info|
-          apple_property = apple_info.first
-          orange_property = orange_info.first
+        .sort! do |a_info, b_info|
+          a_property = a_info.first
+          b_property = b_info.first
 
-          if !apple_property.nil? && orange_property.nil?
+          if !a_property.nil? && b_property.nil?
             - order
-          elsif apple_property.nil? && !orange_property.nil?
+          elsif a_property.nil? && !b_property.nil?
             + order
           else
-            apple_property <=> orange_property
+            a_property <=> b_property || a_property.to_s <=> b_property.to_s
           end
         end
         .map!(&:last)
@@ -317,15 +317,22 @@ def sort_input(input, property, order)
     def item_property(item, property)
       if item.respond_to?(:to_liquid)
         property.to_s.split(".").reduce(item.to_liquid) do |subvalue, attribute|
-          subvalue[attribute]
+          parse_sort_input(subvalue[attribute])
         end
       elsif item.respond_to?(:data)
-        item.data[property.to_s]
+        parse_sort_input(item.data[property.to_s])
       else
-        item[property.to_s]
+        parse_sort_input(item[property.to_s])
       end
     end
 
+    # return numeric values as numbers for proper sorting
+    def parse_sort_input(property)
+      number_like = %r!\A\s*-?(?:\d+\.?\d*|\.\d+)\s*\Z!
+      return property.to_f if property =~ number_like
+      property
+    end
+
     def as_liquid(item)
       case item
       when Hash
diff --git a/test/test_filters.rb b/test/test_filters.rb
index a3dd142ad3e..ef9cbaaab1f 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -1074,10 +1074,6 @@ def to_liquid
       end
       should "return sorted strings" do
         assert_equal %w(10 2), @filter.sort(%w(10 2))
-        assert_equal(
-          [{ "a" => "10" }, { "a" => "2" }],
-          @filter.sort([{ "a" => "10" }, { "a" => "2" }], "a")
-        )
         assert_equal %w(FOO Foo foo), @filter.sort(%w(foo Foo FOO))
         assert_equal %w(_foo foo foo_), @filter.sort(%w(foo_ _foo foo))
         # Cyrillic
@@ -1090,6 +1086,18 @@ def to_liquid
         assert_equal [{ "a" => 1 }, { "a" => 2 }, { "a" => 3 }, { "a" => 4 }],
           @filter.sort([{ "a" => 4 }, { "a" => 3 }, { "a" => 1 }, { "a" => 2 }], "a")
       end
+      should "return sorted by property array with numeric strings sorted as numbers" do
+        assert_equal([{ "a" => ".5" }, { "a" => "0.65" }, { "a" => "10" }],
+          @filter.sort([{ "a" => "10" }, { "a" => ".5" }, { "a" => "0.65" }], "a"))
+      end
+      should "return sorted by property array with numeric strings first" do
+        assert_equal([{ "a" => ".5" }, { "a" => "0.6" }, { "a" => "twelve" }],
+          @filter.sort([{ "a" => "twelve" }, { "a" => ".5" }, { "a" => "0.6" }], "a"))
+      end
+      should "return sorted by property array with numbers and strings " do
+        assert_equal([{ "a" => "1" }, { "a" => "1abc" }, { "a" => "20" }],
+          @filter.sort([{ "a" => "20" }, { "a" => "1" }, { "a" => "1abc" }], "a"))
+      end
       should "return sorted by property array with nils first" do
         ary = [{ "a" => 2 }, { "b" => 1 }, { "a" => 1 }]
         assert_equal [{ "b" => 1 }, { "a" => 1 }, { "a" => 2 }], @filter.sort(ary, "a")

From c124937e69b9dbd6a401a9ce650686bd14c70092 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 9 Jul 2018 01:25:34 -0400
Subject: [PATCH 3081/4996] Update history to reflect merge of #6608 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 632d7b58993..3dd1f881e10 100644
--- a/History.markdown
+++ b/History.markdown
@@ -38,6 +38,7 @@
   * Memoize computing excerpt's relative_path (#6951)
   * Liquefied link tag (#6269)
   * Suggest re-running command with --trace on fail (#6551)
+  * Update item_property to return numbers as numbers instead of strings (#6608)
 
 ### Major Enhancements
 

From 4c7dbb691572d24e312c0345929e12bca934bdba Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Mon, 9 Jul 2018 11:10:35 -0500
Subject: [PATCH 3082/4996] Fix tests to have "expected value" as the first
 argument passed to `assert_equal` (#7104)

* assert_equal(exp, act)

* improve clarity of PageWithoutAFile test

* Hoist invariant out of loop
---
 test/test_document.rb              |  4 ++--
 test/test_excerpt_drop.rb          |  4 ++--
 test/test_filters.rb               |  3 ++-
 test/test_front_matter_defaults.rb |  8 ++++----
 test/test_page_without_a_file.rb   | 16 ++++++++++------
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/test/test_document.rb b/test/test_document.rb
index ce8dbeda78d..b652b454aef 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -126,11 +126,11 @@ def setup_document_with_dates(filename)
     end
 
     should "output the collection name in the #to_liquid method" do
-      assert_equal @document.to_liquid["collection"], "methods"
+      assert_equal "methods", @document.to_liquid["collection"]
     end
 
     should "output its relative path as path in Liquid" do
-      assert_equal @document.to_liquid["path"], "_methods/configuration.md"
+      assert_equal "_methods/configuration.md", @document.to_liquid["path"]
     end
   end
 
diff --git a/test/test_excerpt_drop.rb b/test/test_excerpt_drop.rb
index 1eb6687266d..e9e387de1ab 100644
--- a/test/test_excerpt_drop.rb
+++ b/test/test_excerpt_drop.rb
@@ -28,7 +28,7 @@ class TestExcerptDrop < JekyllUnitTest
 
     should "inherit the layout for the drop but not the excerpt" do
       assert_nil @excerpt.data["layout"]
-      assert_equal @excerpt_drop["layout"], @doc_drop["layout"]
+      assert_equal @doc_drop["layout"], @excerpt_drop["layout"]
     end
 
     should "be inspectable" do
@@ -36,7 +36,7 @@ class TestExcerptDrop < JekyllUnitTest
     end
 
     should "inherit values from the document" do
-      assert_equal @excerpt_drop.keys.sort, @doc_drop.keys.sort
+      assert_equal @doc_drop.keys.sort, @excerpt_drop.keys.sort
     end
   end
 end
diff --git a/test/test_filters.rb b/test/test_filters.rb
index ef9cbaaab1f..f0f37c4e95c 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -687,10 +687,11 @@ def select; end
       should "convert drop with drops to json" do
         @filter.site.read
         actual = @filter.jsonify(@filter.site.to_liquid)
-        assert_equal JSON.parse(actual)["jekyll"], {
+        expected = {
           "environment" => "development",
           "version"     => Jekyll::VERSION,
         }
+        assert_equal expected, JSON.parse(actual)["jekyll"]
       end
 
       # rubocop:disable Style/StructInheritance
diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb
index 2f996a9f303..dab4385c94b 100644
--- a/test/test_front_matter_defaults.rb
+++ b/test/test_front_matter_defaults.rb
@@ -22,7 +22,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
     end
 
     should "affect only the specified path and type" do
-      assert_equal @affected.data["key"], "val"
+      assert_equal "val", @affected.data["key"]
       assert_nil @not_affected.data["key"]
     end
 
@@ -50,7 +50,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
     end
 
     should "affect only the specified path and type" do
-      assert_equal @affected.data["key"], "val"
+      assert_equal "val", @affected.data["key"]
       assert_nil @not_affected.data["key"]
     end
 
@@ -78,7 +78,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
     end
 
     should "affect only the specified path" do
-      assert_equal @affected.data["key"], "val"
+      assert_equal "val", @affected.data["key"]
       assert_nil @not_affected.data["key"]
     end
   end
@@ -102,7 +102,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
     end
 
     should "affect only the specified path and all types" do
-      assert_equal @affected.data["key"], "val"
+      assert_equal "val", @affected.data["key"]
       assert_nil @not_affected.data["key"]
     end
   end
diff --git a/test/test_page_without_a_file.rb b/test/test_page_without_a_file.rb
index d52d82fd7fd..50624890c4e 100644
--- a/test/test_page_without_a_file.rb
+++ b/test/test_page_without_a_file.rb
@@ -41,6 +41,10 @@ def render_and_write
 
       should "have basic attributes defined in it" do
         regular_page = setup_page("properties.html", :klass => Page)
+        # assert a couple of attributes accessible in a regular Jekyll::Page instance
+        assert_equal "All the properties.\n", regular_page["content"]
+        assert_equal "properties.html", regular_page["name"]
+
         basic_attrs = %w(dir name path url)
         attrs = {
           "content"   => "All the properties.\n",
@@ -56,13 +60,13 @@ def render_and_write
           "url"       => "/properties.html",
         }
         attrs.each do |prop, value|
-          # assert the props being accessible in a Jekyll::Page instance
-          assert_equal "All the properties.\n", regular_page["content"]
-          assert_equal "properties.html", regular_page["name"]
-
-          # assert differences with Jekyll::PageWithoutAFile instance
+          # assert that all attributes (of a Jekyll::PageWithoutAFile instance) other than
+          # "dir", "name", "path", "url" are `nil`.
+          # For example, @page[dir] should be "/" but @page[content] or @page[layout], should
+          # simply be nil.
+          #
           if basic_attrs.include?(prop)
-            assert_equal @page[prop], value, "For :"
+            assert_equal value, @page[prop], "For Jekyll::PageWithoutAFile attribute '#{prop}':"
           else
             assert_nil @page[prop]
           end

From 3650baa5dbd6ccff1f5735ca0d406a4697a654bf Mon Sep 17 00:00:00 2001
From: Derek Smart 
Date: Mon, 9 Jul 2018 12:12:37 -0400
Subject: [PATCH 3083/4996] add jekyll-xml-source (#7114)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index ba18ce30d18..2a2f2647347 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -940,6 +940,7 @@ You can find a few useful plugins at the following locations:
 - [jekyll-pwa-plugin](https://github.com/lavas-project/jekyll-pwa): A plugin provides PWA support for Jekyll. It generates a service worker in Jekyll build process and makes precache and runtime cache available in the runtime with Google Workbox.
 - [jekyll-algolia](https://community.algolia.com/jekyll-algolia/): Add fast and relevant search to your Jekyll site through the Algolia API.
 - [jekyll-get](https://github.com/18F/jekyll-get): Download data from external JSON API sources to use in generating a site.
+- [jekyll-xml-source](https://github.com/mcred/jekyll-xml-source): Download XML and RSS from external sites for use in site data.
 
 
      
   
      Submit your gem plugins
      

From a1ea95d445b39e6887882422a96c1ae79acc262d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 9 Jul 2018 12:12:39 -0400
Subject: [PATCH 3084/4996] Update history to reflect merge of #7114 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3dd1f881e10..f57e2bbf46e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -31,6 +31,7 @@
   * GitHub enables you to use themes from other repos (#7112)
   * Updates to CODE OF CONDUCT  (v1.4.0) (#7105)
   * Instructions to view theme’s files under Linux (#7095)
+  * add jekyll-xml-source (#7114)
 
 ### Minor Enhancements
 

From 8846741ed21c5c9c19cbd62b295a8382ebd682a6 Mon Sep 17 00:00:00 2001
From: Alex Wood 
Date: Mon, 9 Jul 2018 23:06:54 -0400
Subject: [PATCH 3085/4996] Fix #7082 Add call to unused method (#7122)

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

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index ecf6fe67cdb..a5b58897a89 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -91,7 +91,10 @@ def init_with_program(prog)
         def process(opts)
           opts = configuration_from_options(opts)
           destination = opts["destination"]
-          register_reload_hooks(opts) if opts["livereload"]
+          if opts["livereload"]
+            validate_options(opts)
+            register_reload_hooks(opts)
+          end
           setup(destination)
 
           start_up_webrick(opts, destination)

From 5950a7c11370b5af3cea52a745053febf26bef0a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 9 Jul 2018 23:06:56 -0400
Subject: [PATCH 3086/4996] Update history to reflect merge of #7122 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f57e2bbf46e..6b3b974d03b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -67,6 +67,10 @@
   * Update rubocop version to 0.57.x ### -docs (#7078)
   * Example of CircleCI deployment through CircleCI v2 (#7024)
 
+### Bug Fixes
+
+  * Add call to unused method `validate_options` in `commands/serve.rb` (#7122)
+
 ## 3.8.3 / 2018-06-05
 
 ### Bug Fixes

From 402ee84abb3799097eb7ac16c4dfa4f77c2c1a59 Mon Sep 17 00:00:00 2001
From: Nicolas Hoizey 
Date: Wed, 11 Jul 2018 13:14:14 +0000
Subject: [PATCH 3087/4996] Add the jekyll-firstimage filter plugin (#7127)

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

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 2a2f2647347..f44d7383822 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -828,6 +828,7 @@ You can find a few useful plugins at the following locations:
 - [replace_regex](https://github.com/sparanoid/replace_regex): A Liquid filter to perform regex replace.
 - [Jekyll Money](https://rubygems.org/gems/jekyll-money): A Jekyll plugin for dealing with money. Because we all have to at some point.
 - [jekyll-random](https://github.com/codecalm/jekyll-random) by [codecalm](https://nodecalm.net): A Jekyll plugin that generates pseudo-random data. Very useful when you want to generate a large amount of random data.
+- [jekyll-firstimage](https://github.com/nhoizey/jekyll-firstimage) adds a Liquid filter finding the first image in a HTML content string, including responsive images srcset.
 
 #### Tags
 

From 0e0960e2c33d26e4da831c83fb082b93a9b09d53 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 11 Jul 2018 09:14:16 -0400
Subject: [PATCH 3088/4996] Update history to reflect merge of #7127 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6b3b974d03b..0ccf4be54e6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -32,6 +32,7 @@
   * Updates to CODE OF CONDUCT  (v1.4.0) (#7105)
   * Instructions to view theme’s files under Linux (#7095)
   * add jekyll-xml-source (#7114)
+  * Add the jekyll-firstimage filter plugin (#7127)
 
 ### Minor Enhancements
 

From 180179303515cf82ed99503fedfe6f3f5497657b Mon Sep 17 00:00:00 2001
From: Jakob Krigovsky 
Date: Wed, 11 Jul 2018 16:01:17 +0200
Subject: [PATCH 3089/4996] Use .markdown for page templates (#7126)

Merge pull request 7126
---
 docs/_docs/themes.md                           | 4 ++--
 lib/site_template/{about.md => about.markdown} | 0
 lib/site_template/{index.md => index.markdown} | 0
 test/test_new_command.rb                       | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/site_template/{about.md => about.markdown} (100%)
 rename lib/site_template/{index.md => index.markdown} (100%)

diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index b8f469e5d7f..a2fcc4c9a48 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -19,8 +19,8 @@ In the case of Minima, you see only the following files in your Jekyll site dire
 ├── _config.yml
 ├── _posts
 │   └── 2016-12-04-welcome-to-jekyll.markdown
-├── about.md
-└── index.md
+├── about.markdown
+└── index.markdown
 ```
 
 The `Gemfile` and `Gemfile.lock` files are used by Bundler to keep track of the required gems and gem versions you need to build your Jekyll site.
diff --git a/lib/site_template/about.md b/lib/site_template/about.markdown
similarity index 100%
rename from lib/site_template/about.md
rename to lib/site_template/about.markdown
diff --git a/lib/site_template/index.md b/lib/site_template/index.markdown
similarity index 100%
rename from lib/site_template/index.md
rename to lib/site_template/index.markdown
diff --git a/test/test_new_command.rb b/test/test_new_command.rb
index 632ad3d57c6..6bb6ed3c2f3 100644
--- a/test/test_new_command.rb
+++ b/test/test_new_command.rb
@@ -57,7 +57,7 @@ def site_template
       capture_output { Jekyll::Commands::New.process(@args) }
 
       new_site_files = dir_contents(@full_path).reject do |f|
-        File.extname(f) == ".markdown"
+        f.end_with?("welcome-to-jekyll.markdown")
       end
 
       assert_same_elements static_template_files, new_site_files

From dcbc4433878ac9496f19e838197f17d56c0d1221 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 11 Jul 2018 10:01:20 -0400
Subject: [PATCH 3090/4996] Update history to reflect merge of #7126 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0ccf4be54e6..9a32843dfa2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -41,6 +41,7 @@
   * Liquefied link tag (#6269)
   * Suggest re-running command with --trace on fail (#6551)
   * Update item_property to return numbers as numbers instead of strings (#6608)
+  * Use .markdown for page templates (#7126)
 
 ### Major Enhancements
 

From 5d1f85928ad6f764b3f0a71611462752f1203703 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 11 Jul 2018 13:32:39 -0400
Subject: [PATCH 3091/4996] Use a real theme in the example (#7125)

Merge pull request 7125
---
 docs/_docs/themes.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index a2fcc4c9a48..460686157d6 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -166,20 +166,21 @@ For example, search for [jekyll theme on RubyGems](https://rubygems.org/search?u
 
 To install a gem-based theme:
 
-1. Add the theme to your site's `Gemfile`:
+1. Add the theme gem to your site's `Gemfile`:
 
    ```ruby
    # ./Gemfile
 
-   gem "jekyll-theme-awesome"
+   # This is an example, declare the theme gem you want to use here
+   gem "jekyll-theme-minimal"
    ```
-  Or if you've started with the `jekyll new` command, replace `gem "minima", "~> 2.0"` with your theme-gem:
+  Or if you've started with the `jekyll new` command, replace `gem "minima", "~> 2.0"` with the gem you want, e.g:
 
    ```diff
    # ./Gemfile
 
    - gem "minima", "~> 2.0"
-   + gem "jekyll-theme-awesome"
+   + gem "jekyll-theme-minimal"
    ```
 
 2. Install the theme:
@@ -191,7 +192,7 @@ To install a gem-based theme:
 3. Add the following to your site's `_config.yml` to activate the theme:
 
    ```yaml
-   theme: jekyll-theme-awesome
+   theme: jekyll-theme-minimal
    ```
 
 4. Build your site:

From 06125425820eadbc412faaea087161fd8ef75da9 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 11 Jul 2018 13:32:41 -0400
Subject: [PATCH 3092/4996] Update history to reflect merge of #7125 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9a32843dfa2..39f23f52be2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -33,6 +33,7 @@
   * Instructions to view theme’s files under Linux (#7095)
   * add jekyll-xml-source (#7114)
   * Add the jekyll-firstimage filter plugin (#7127)
+  * Use a real theme in the example (#7125)
 
 ### Minor Enhancements
 

From 9adac3a11ea405b5395247ae224cf40553a7abb6 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 12 Jul 2018 19:51:23 +0530
Subject: [PATCH 3093/4996] Fix Rubocop offences in test files (#7128)

Merge pull request 7128
---
 .rubocop.yml                       |   7 +
 test/helper.rb                     |  29 +-
 test/test_coffeescript.rb          |  52 +-
 test/test_collections.rb           |  40 +-
 test/test_command.rb               |   4 +-
 test/test_commands_serve.rb        |  52 +-
 test/test_configuration.rb         | 108 ++--
 test/test_convertible.rb           |   4 +-
 test/test_doctor_command.rb        |  16 +-
 test/test_document.rb              | 110 ++--
 test/test_drop.rb                  |   6 +-
 test/test_entry_filter.rb          |   2 +-
 test/test_excerpt.rb               |  11 +-
 test/test_filters.rb               | 132 ++---
 test/test_front_matter_defaults.rb |  66 +--
 test/test_generated_site.rb        |  12 +-
 test/test_kramdown.rb              |  31 +-
 test/test_layout_reader.rb         |   4 +-
 test/test_liquid_extensions.rb     |   4 +-
 test/test_page.rb                  |  10 +-
 test/test_page_without_a_file.rb   |  10 +-
 test/test_plugin_manager.rb        |  36 +-
 test/test_regenerator.rb           |  34 +-
 test/test_related_posts.rb         |   6 +-
 test/test_sass.rb                  |   8 +-
 test/test_site.rb                  |  84 ++-
 test/test_site_drop.rb             |   6 +-
 test/test_static_file.rb           |  10 +-
 test/test_tags.rb                  | 923 ++++++++++++++---------------
 test/test_utils.rb                 |  12 +-
 30 files changed, 899 insertions(+), 930 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 81e11e29765..630941352ee 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -11,6 +11,7 @@ AllCops:
   TargetRubyVersion: 2.3
   Include:
     - lib/**/*.rb
+    - test/**/*.rb
   Exclude:
     - bin/**/*
     - exe/**/*
@@ -82,6 +83,9 @@ Metrics/PerceivedComplexity:
   Max: 8
 Naming/FileName:
   Enabled: false
+Naming/HeredocDelimiterNaming:
+  Exclude:
+    - test/**/*.rb
 Naming/MemoizedInstanceVariableName:
   Exclude:
     - lib/jekyll/page_without_a_file.rb
@@ -104,6 +108,9 @@ Style/Alias:
   EnforcedStyle: prefer_alias_method
 Style/AndOr:
   Severity: error
+Style/ClassAndModuleChildren:
+  Exclude:
+    - test/**/*.rb
 Style/FrozenStringLiteralComment:
   EnforcedStyle: always
 Style/Documentation:
diff --git a/test/helper.rb b/test/helper.rb
index 9e01b7de2e1..29185427a9c 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -111,13 +111,13 @@ def after_teardown
   end
 
   def fixture_document(relative_path)
-    site = fixture_site({
+    site = fixture_site(
       "collections" => {
         "methods" => {
           "output" => true,
         },
-      },
-    })
+      }
+    )
     site.read
     matching_doc = site.collections["methods"].docs.find do |doc|
       doc.relative_path == relative_path
@@ -138,13 +138,13 @@ def build_configs(overrides, base_hash = default_configuration)
   end
 
   def site_configuration(overrides = {})
-    full_overrides = build_configs(overrides, build_configs({
-      "destination" => dest_dir,
-      "incremental" => false,
-    }))
-    Configuration.from(full_overrides.merge({
-      "source" => source_dir,
-    }))
+    full_overrides = build_configs(overrides, build_configs(
+                                                "destination" => dest_dir,
+                                                "incremental" => false
+                                              ))
+    Configuration.from(full_overrides.merge(
+                         "source" => source_dir
+                       ))
   end
 
   def clear_dest
@@ -197,7 +197,6 @@ def <<(str); end
 end
 
 module TestWEBrick
-
   module_function
 
   def mount_server(&block)
@@ -205,7 +204,7 @@ def mount_server(&block)
 
     begin
       server.mount("/", Jekyll::Commands::Serve::Servlet, document_root,
-        document_root_options)
+                   document_root_options)
 
       server.start
       addr = server.listeners[0].addr
@@ -235,11 +234,11 @@ def document_root
   end
 
   def document_root_options
-    WEBrick::Config::FileHandler.merge({
+    WEBrick::Config::FileHandler.merge(
       :FancyIndexing     => true,
       :NondisclosureName => [
         ".ht*", "~*",
-      ],
-    })
+      ]
+    )
   end
 end
diff --git a/test/test_coffeescript.rb b/test/test_coffeescript.rb
index a60e0595430..6c6c376b214 100644
--- a/test/test_coffeescript.rb
+++ b/test/test_coffeescript.rb
@@ -9,33 +9,33 @@ class TestCoffeeScript < JekyllUnitTest
       @site = fixture_site
       @site.process
       @test_coffeescript_file = dest_dir("js/coffeescript.js")
-      @js_output = <<-JS
-(function() {
-  $(function() {
-    var cube, cubes, list, num, square;
-    list = [1, 2, 3, 4, 5];
-    square = function(x) {
-      return x * x;
-    };
-    cube = function(x) {
-      return square(x) * x;
-    };
-    cubes = (function() {
-      var i, len, results;
-      results = [];
-      for (i = 0, len = list.length; i < len; i++) {
-        num = list[i];
-        results.push(math.cube(num));
-      }
-      return results;
-    })();
-    if (typeof elvis !== "undefined" && elvis !== null) {
-      return alert("I knew it!");
-    }
-  });
+      @js_output = <<~JS
+        (function() {
+          $(function() {
+            var cube, cubes, list, num, square;
+            list = [1, 2, 3, 4, 5];
+            square = function(x) {
+              return x * x;
+            };
+            cube = function(x) {
+              return square(x) * x;
+            };
+            cubes = (function() {
+              var i, len, results;
+              results = [];
+              for (i = 0, len = list.length; i < len; i++) {
+                num = list[i];
+                results.push(math.cube(num));
+              }
+              return results;
+            })();
+            if (typeof elvis !== "undefined" && elvis !== null) {
+              return alert("I knew it!");
+            }
+          });
 
-}).call(this);
-JS
+        }).call(this);
+      JS
     end
 
     should "write a JS file in place" do
diff --git a/test/test_collections.rb b/test/test_collections.rb
index 33d3f912963..7af86dd8c87 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -94,13 +94,13 @@ class TestCollections < JekyllUnitTest
 
   context "a collection with permalink" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => {
           "methods" => {
             "permalink" => "/awesome/:path/",
           },
-        },
-      })
+        }
+      )
       @site.process
       @collection = @site.collections["methods"]
     end
@@ -112,9 +112,9 @@ class TestCollections < JekyllUnitTest
 
   context "with a collection" do
     setup do
-      @site = fixture_site({
-        "collections" => ["methods"],
-      })
+      @site = fixture_site(
+        "collections" => ["methods"]
+      )
       @site.process
       @collection = @site.collections["methods"]
     end
@@ -154,35 +154,35 @@ class TestCollections < JekyllUnitTest
     should "not include the underscored files in the list of docs" do
       refute_includes @collection.docs.map(&:relative_path), "_methods/_do_not_read_me.md"
       refute_includes @collection.docs.map(&:relative_path),
-                                           "_methods/site/_dont_include_me_either.md"
+                      "_methods/site/_dont_include_me_either.md"
     end
   end
 
   context "with a collection with metadata" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => {
           "methods" => {
             "foo" => "bar",
             "baz" => "whoo",
           },
-        },
-      })
+        }
+      )
       @site.process
       @collection = @site.collections["methods"]
     end
 
     should "extract the configuration collection information as metadata" do
-      assert_equal @collection.metadata, { "foo" => "bar", "baz" => "whoo" }
+      assert_equal @collection.metadata, "foo" => "bar", "baz" => "whoo"
     end
   end
 
   context "in safe mode" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => ["methods"],
-        "safe"        => true,
-      })
+        "safe"        => true
+      )
       @site.process
       @collection = @site.collections["methods"]
     end
@@ -202,10 +202,10 @@ class TestCollections < JekyllUnitTest
 
   context "with dots in the filenames" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => ["with.dots"],
-        "safe"        => true,
-      })
+        "safe"        => true
+      )
       @site.process
       @collection = @site.collections["with.dots"]
     end
@@ -231,14 +231,14 @@ class TestCollections < JekyllUnitTest
 
   context "a collection with included dotfiles" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => {
           "methods" => {
             "permalink" => "/awesome/:path/",
           },
         },
-        "include"     => %w(.htaccess .gitignore),
-      })
+        "include"     => %w(.htaccess .gitignore)
+      )
       @site.process
       @collection = @site.collections["methods"]
     end
diff --git a/test/test_command.rb b/test/test_command.rb
index 33e13798cc6..d202628c4f2 100644
--- a/test/test_command.rb
+++ b/test/test_command.rb
@@ -15,7 +15,9 @@ class TestCommand < JekyllUnitTest
     context "when fatal error occurs" do
       should "exit with non-zero error code" do
         site = Object.new
-        def site.process; raise Jekyll::Errors::FatalException; end
+        def site.process
+          raise Jekyll::Errors::FatalException
+        end
         error = assert_raises(SystemExit) { Command.process_site(site) }
         refute_equal 0, error.status
       end
diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb
index ce9f1c65c8a..b589de2f37a 100644
--- a/test/test_commands_serve.rb
+++ b/test/test_commands_serve.rb
@@ -5,7 +5,6 @@
 require "helper"
 require "httpclient"
 require "openssl"
-require "thread"
 require "tmpdir"
 
 class TestCommandsServe < JekyllUnitTest
@@ -126,9 +125,9 @@ def serve(opts)
     should "apply the max and min delay options" do
       skip_if_windows "EventMachine support on Windows is limited"
       opts = serve(@standard_options.merge(
-        "livereload_max_delay" => "1066",
-        "livereload_min_delay" => "3"
-      ))
+                     "livereload_max_delay" => "1066",
+                     "livereload_min_delay" => "3"
+                   ))
       content = @client.get_content(
         "http://#{opts["host"]}:#{opts["port"]}/#{opts["baseurl"]}/hello.html"
       )
@@ -191,14 +190,14 @@ def serve(opts)
       end
 
       should "use user destinations" do
-        assert_equal "foo", custom_opts({ "destination" => "foo" })[
+        assert_equal "foo", custom_opts("destination" => "foo")[
           :DocumentRoot
         ]
       end
 
       should "use user port" do
         # WHAT?!?!1 Over 9000? That's impossible.
-        assert_equal 9001, custom_opts({ "port" => 9001 })[
+        assert_equal 9001, custom_opts("port" => 9001)[
           :Port
         ]
       end
@@ -237,21 +236,20 @@ def serve(opts)
           expect(Jekyll::Commands::Serve).to receive(:start_up_webrick)
         end
         should "set the site url by default to `http://localhost:4000`" do
-          @merc.execute(:serve, { "watch" => false, "url" => "https://jekyllrb.com/" })
+          @merc.execute(:serve, "watch" => false, "url" => "https://jekyllrb.com/")
 
           assert_equal 1, Jekyll.sites.count
           assert_equal "http://localhost:4000", Jekyll.sites.first.config["url"]
         end
 
         should "take `host`, `port` and `ssl` into consideration if set" do
-          @merc.execute(:serve, {
-            "watch"    => false,
-            "host"     => "example.com",
-            "port"     => "9999",
-            "url"      => "https://jekyllrb.com/",
-            "ssl_cert" => "foo",
-            "ssl_key"  => "bar",
-          })
+          @merc.execute(:serve,
+                        "watch"    => false,
+                        "host"     => "example.com",
+                        "port"     => "9999",
+                        "url"      => "https://jekyllrb.com/",
+                        "ssl_cert" => "foo",
+                        "ssl_key"  => "bar")
 
           assert_equal 1, Jekyll.sites.count
           assert_equal "https://example.com:9999", Jekyll.sites.first.config["url"]
@@ -262,7 +260,7 @@ def serve(opts)
         should "not update the site url" do
           expect(Jekyll).to receive(:env).and_return("production")
           expect(Jekyll::Commands::Serve).to receive(:start_up_webrick)
-          @merc.execute(:serve, { "watch" => false, "url" => "https://jekyllrb.com/" })
+          @merc.execute(:serve, "watch" => false, "url" => "https://jekyllrb.com/")
 
           assert_equal 1, Jekyll.sites.count
           assert_equal "https://jekyllrb.com/", Jekyll.sites.first.config["url"]
@@ -271,7 +269,7 @@ def serve(opts)
 
       context "verbose" do
         should "debug when verbose" do
-          assert_equal custom_opts({ "verbose" => true })[:Logger].level, 5
+          assert_equal custom_opts("verbose" => true)[:Logger].level, 5
         end
 
         should "warn when not verbose" do
@@ -282,15 +280,15 @@ def serve(opts)
       context "enabling SSL" do
         should "raise if enabling without key or cert" do
           assert_raises RuntimeError do
-            custom_opts({
-              "ssl_key" => "foo",
-            })
+            custom_opts(
+              "ssl_key" => "foo"
+            )
           end
 
           assert_raises RuntimeError do
-            custom_opts({
-              "ssl_key" => "foo",
-            })
+            custom_opts(
+              "ssl_key" => "foo"
+            )
           end
         end
 
@@ -299,12 +297,12 @@ def serve(opts)
           expect(OpenSSL::X509::Certificate).to receive(:new).and_return("c1")
           allow(File).to receive(:read).and_return("foo")
 
-          result = custom_opts({
+          result = custom_opts(
             "ssl_cert"   => "foo",
             "source"     => "bar",
             "enable_ssl" => true,
-            "ssl_key"    => "bar",
-          })
+            "ssl_key"    => "bar"
+          )
 
           assert result[:SSLEnable]
           assert_equal result[:SSLPrivateKey],  "c2"
@@ -317,7 +315,7 @@ def serve(opts)
       allow(Jekyll::Commands::Serve).to receive(:start_up_webrick)
 
       expect(Jekyll).to receive(:configuration).once.and_call_original
-      @merc.execute(:serve, { "watch" => false })
+      @merc.execute(:serve, "watch" => false)
     end
   end
 end
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 17c0d21985d..3f19949a846 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -15,7 +15,7 @@ class TestConfiguration < JekyllUnitTest
     end
 
     should "merge input over defaults" do
-      result = Configuration.from({ "source" => "blah" })
+      result = Configuration.from("source" => "blah")
       refute_equal result["source"], Configuration::DEFAULTS["source"]
       assert_equal result["source"], "blah"
     end
@@ -28,11 +28,9 @@ class TestConfiguration < JekyllUnitTest
       result = Configuration.from({})
       assert_equal(
         result["collections"],
-        {
-          "posts" => {
-            "output"    => true,
-            "permalink" => "/:categories/:year/:month/:day/:title:output_ext",
-          },
+        "posts" => {
+          "output"    => true,
+          "permalink" => "/:categories/:year/:month/:day/:title:output_ext",
         }
       )
     end
@@ -72,7 +70,7 @@ class TestConfiguration < JekyllUnitTest
       assert_instance_of Hash, result["collections"]
       assert_equal(
         result["collections"],
-        { "posts" => { "output" => true }, "methods" => {} }
+        "posts" => { "output" => true }, "methods" => {}
       )
     end
 
@@ -81,17 +79,15 @@ class TestConfiguration < JekyllUnitTest
         .add_default_collections
       assert_equal(
         result["collections"],
-        {
-          "posts" => {
-            "output"    => true,
-            "permalink" => "/:categories/:year/:month/:day/:title/",
-          },
+        "posts" => {
+          "output"    => true,
+          "permalink" => "/:categories/:year/:month/:day/:title/",
         }
       )
 
       result = Configuration[{ "permalink" => nil, "collections" => {} }]
         .add_default_collections
-      assert_equal result["collections"], { "posts" => { "output" => true } }
+      assert_equal result["collections"], "posts" => { "output" => true }
     end
 
     should "forces posts to output" do
@@ -186,7 +182,7 @@ class TestConfiguration < JekyllUnitTest
       allow(SafeYAML)
         .to receive(:load_file)
         .with("not_empty.yml")
-        .and_return({ "foo" => "bar", "include" => "", "exclude" => "" })
+        .and_return("foo" => "bar", "include" => "", "exclude" => "")
       Jekyll.logger.log_level = :warn
       read_config = @config.read_config_files(["empty.yml", "not_empty.yml"])
       Jekyll.logger.log_level = :info
@@ -301,11 +297,11 @@ class TestConfiguration < JekyllUnitTest
       allow($stderr)
         .to receive(:puts)
         .with(Colorator.red(
-          "Fatal: ".rjust(20) + \
-          "The configuration file '#{@user_config}' could not be found."
-        ))
+                "Fatal: ".rjust(20) + \
+                "The configuration file '#{@user_config}' could not be found."
+              ))
       assert_raises LoadError do
-        Jekyll.configuration({ "config" => [@user_config] })
+        Jekyll.configuration("config" => [@user_config])
       end
     end
 
@@ -334,14 +330,14 @@ class TestConfiguration < JekyllUnitTest
       allow(SafeYAML)
         .to receive(:load_file)
         .with(@paths[:other])
-        .and_return({ "baseurl" => "http://example.com" })
+        .and_return("baseurl" => "http://example.com")
       allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}")
       assert_equal \
-        site_configuration({
+        site_configuration(
           "baseurl" => "http://example.com",
-          "config"  => @paths[:other],
-        }),
-        Jekyll.configuration(test_config.merge({ "config" => @paths[:other] }))
+          "config"  => @paths[:other]
+        ),
+        Jekyll.configuration(test_config.merge("config" => @paths[:other]))
     end
 
     should "load different config if specified with symbol key" do
@@ -349,33 +345,33 @@ class TestConfiguration < JekyllUnitTest
       allow(SafeYAML)
         .to receive(:load_file)
         .with(@paths[:other])
-        .and_return({ "baseurl" => "http://example.com" })
+        .and_return("baseurl" => "http://example.com")
       allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}")
       assert_equal \
-        site_configuration({
+        site_configuration(
           "baseurl" => "http://example.com",
-          "config"  => @paths[:other],
-        }),
-        Jekyll.configuration(test_config.merge({ :config => @paths[:other] }))
+          "config"  => @paths[:other]
+        ),
+        Jekyll.configuration(test_config.merge(:config => @paths[:other]))
     end
 
     should "load default config if path passed is empty" do
       allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return({})
       allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}")
       assert_equal \
-        site_configuration({ "config" => [@paths[:empty]] }),
-        Jekyll.configuration(test_config.merge({ "config" => [@paths[:empty]] }))
+        site_configuration("config" => [@paths[:empty]]),
+        Jekyll.configuration(test_config.merge("config" => [@paths[:empty]]))
     end
 
     should "successfully load a TOML file" do
       Jekyll.logger.log_level = :warn
       assert_equal \
-        site_configuration({
+        site_configuration(
           "baseurl" => "/you-beautiful-blog-you",
           "title"   => "My magnificent site, wut",
-          "config"  => [@paths[:toml]],
-        }),
-        Jekyll.configuration(test_config.merge({ "config" => [@paths[:toml]] }))
+          "config"  => [@paths[:toml]]
+        ),
+        Jekyll.configuration(test_config.merge("config" => [@paths[:toml]]))
       Jekyll.logger.log_level = :info
     end
 
@@ -389,12 +385,12 @@ class TestConfiguration < JekyllUnitTest
       allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}")
       allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:toml]}")
       assert_equal(
-        site_configuration({
-          "config" => [@paths[:default], @paths[:other], @paths[:toml]],
-        }),
+        site_configuration(
+          "config" => [@paths[:default], @paths[:other], @paths[:toml]]
+        ),
         Jekyll.configuration(
           test_config.merge(
-            { "config" => [@paths[:default], @paths[:other], @paths[:toml]] }
+            "config" => [@paths[:default], @paths[:other], @paths[:toml]]
           )
         )
       )
@@ -404,11 +400,11 @@ class TestConfiguration < JekyllUnitTest
       allow(SafeYAML)
         .to receive(:load_file)
         .with(@paths[:default])
-        .and_return({ "baseurl" => "http://example.dev" })
+        .and_return("baseurl" => "http://example.dev")
       allow(SafeYAML)
         .to receive(:load_file)
         .with(@paths[:other])
-        .and_return({ "baseurl" => "http://example.com" })
+        .and_return("baseurl" => "http://example.com")
       allow($stdout)
         .to receive(:puts)
         .with("Configuration file: #{@paths[:default]}")
@@ -416,12 +412,12 @@ class TestConfiguration < JekyllUnitTest
         .to receive(:puts)
         .with("Configuration file: #{@paths[:other]}")
       assert_equal \
-        site_configuration({
+        site_configuration(
           "baseurl" => "http://example.com",
-          "config"  => [@paths[:default], @paths[:other]],
-        }),
+          "config"  => [@paths[:default], @paths[:other]]
+        ),
         Jekyll.configuration(
-          test_config.merge({ "config" => [@paths[:default], @paths[:other]] })
+          test_config.merge("config" => [@paths[:default], @paths[:other]])
         )
     end
   end
@@ -437,41 +433,41 @@ class TestConfiguration < JekyllUnitTest
       conf = Configuration[default_configuration].tap do |c|
         c["collections"] = ["docs"]
       end
-      assert_equal conf.add_default_collections, conf.merge({
+      assert_equal conf.add_default_collections, conf.merge(
         "collections" => {
           "docs"  => {},
           "posts" => {
             "output"    => true,
             "permalink" => "/:categories/:year/:month/:day/:title:output_ext",
           },
-        },
-      })
+        }
+      )
     end
 
     should "force collections.posts.output = true" do
       conf = Configuration[default_configuration].tap do |c|
         c["collections"] = { "posts" => { "output" => false } }
       end
-      assert_equal conf.add_default_collections, conf.merge({
+      assert_equal conf.add_default_collections, conf.merge(
         "collections" => {
           "posts" => {
             "output"    => true,
             "permalink" => "/:categories/:year/:month/:day/:title:output_ext",
           },
-        },
-      })
+        }
+      )
     end
 
     should "set collections.posts.permalink if it's not set" do
       conf = Configuration[default_configuration]
-      assert_equal conf.add_default_collections, conf.merge({
+      assert_equal conf.add_default_collections, conf.merge(
         "collections" => {
           "posts" => {
             "output"    => true,
             "permalink" => "/:categories/:year/:month/:day/:title:output_ext",
           },
-        },
-      })
+        }
+      )
     end
 
     should "leave collections.posts.permalink alone if it is set" do
@@ -481,14 +477,14 @@ class TestConfiguration < JekyllUnitTest
           "posts" => { "permalink" => posts_permalink },
         }
       end
-      assert_equal conf.add_default_collections, conf.merge({
+      assert_equal conf.add_default_collections, conf.merge(
         "collections" => {
           "posts" => {
             "output"    => true,
             "permalink" => posts_permalink,
           },
-        },
-      })
+        }
+      )
     end
   end
 
diff --git a/test/test_convertible.rb b/test/test_convertible.rb
index 5b73e252815..a3bea6baf48 100644
--- a/test/test_convertible.rb
+++ b/test/test_convertible.rb
@@ -8,8 +8,8 @@ class TestConvertible < JekyllUnitTest
     setup do
       @convertible = OpenStruct.new(
         "site" => Site.new(Jekyll.configuration(
-          "source" => File.expand_path("fixtures", __dir__)
-        ))
+                             "source" => File.expand_path("fixtures", __dir__)
+                           ))
       )
       @convertible.extend Jekyll::Convertible
       @base = File.expand_path("fixtures", __dir__)
diff --git a/test/test_doctor_command.rb b/test/test_doctor_command.rb
index 182878689cc..ac453810304 100644
--- a/test/test_doctor_command.rb
+++ b/test/test_doctor_command.rb
@@ -10,10 +10,10 @@ class TestDoctorCommand < JekyllUnitTest
     end
 
     should "return success on a valid site/page" do
-      @site = Site.new(Jekyll.configuration({
-        "source"      => File.join(source_dir, "/_urls_differ_by_case_valid"),
-        "destination" => dest_dir,
-      }))
+      @site = Site.new(Jekyll.configuration(
+                         "source"      => File.join(source_dir, "/_urls_differ_by_case_valid"),
+                         "destination" => dest_dir
+                       ))
       @site.process
       output = capture_stderr do
         ret = Jekyll::Commands::Doctor.urls_only_differ_by_case(@site)
@@ -23,10 +23,10 @@ class TestDoctorCommand < JekyllUnitTest
     end
 
     should "return warning for pages only differing by case" do
-      @site = Site.new(Jekyll.configuration({
-        "source"      => File.join(source_dir, "/_urls_differ_by_case_invalid"),
-        "destination" => dest_dir,
-      }))
+      @site = Site.new(Jekyll.configuration(
+                         "source"      => File.join(source_dir, "/_urls_differ_by_case_invalid"),
+                         "destination" => dest_dir
+                       ))
       @site.process
       output = capture_stderr do
         ret = Jekyll::Commands::Doctor.urls_only_differ_by_case(@site)
diff --git a/test/test_document.rb b/test/test_document.rb
index b652b454aef..7f449c754e1 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -10,10 +10,9 @@ def assert_equal_value(key, one, other)
   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)
+    Document.new(site.in_source_dir(File.join("_encodings", filename)),
+                 :site       => site,
+                 :collection => site.collections["encodings"]).tap(&:read)
   end
 
   def setup_document_with_dates(filename)
@@ -21,19 +20,18 @@ def setup_document_with_dates(filename)
     site.process
     docs = nil
     with_env("TZ", "UTC") do
-      docs = Document.new(site.in_source_dir(File.join("_dates", filename)), {
-        :site       => site,
-        :collection => site.collections["dates"],
-      }).tap(&:read)
+      docs = Document.new(site.in_source_dir(File.join("_dates", filename)),
+                          :site       => site,
+                          :collection => site.collections["dates"]).tap(&:read)
     end
     docs
   end
 
   context "a document in a collection" do
     setup do
-      @site = fixture_site({
-        "collections" => ["methods"],
-      })
+      @site = fixture_site(
+        "collections" => ["methods"]
+      )
       @site.process
       @document = @site.collections["methods"].docs.detect do |d|
         d.relative_path == "_methods/configuration.md"
@@ -112,7 +110,7 @@ def setup_document_with_dates(filename)
 
     context "with YAML ending in three dots" do
       setup do
-        @site = fixture_site({ "collections" => ["methods"] })
+        @site = fixture_site("collections" => ["methods"])
         @site.process
         @document = @site.collections["methods"].docs.detect do |d|
           d.relative_path == "_methods/yaml_with_dots.md"
@@ -136,7 +134,7 @@ def setup_document_with_dates(filename)
 
   context "a document as part of a collection with front matter defaults" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => ["slides"],
         "defaults"    => [{
           "scope"  => { "path" => "", "type" => "slides" },
@@ -145,8 +143,8 @@ def setup_document_with_dates(filename)
               "key" => "myval",
             },
           },
-        },],
-      })
+        },]
+      )
       @site.process
       @document = @site.collections["slides"].docs.select { |d| d.is_a?(Document) }.first
     end
@@ -166,7 +164,7 @@ def setup_document_with_dates(filename)
 
   context "a document as part of a collection with overridden default values" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => ["slides"],
         "defaults"    => [{
           "scope"  => { "path" => "", "type" => "slides" },
@@ -176,8 +174,8 @@ def setup_document_with_dates(filename)
               "test2" => "default1",
             },
           },
-        },],
-      })
+        },]
+      )
       @site.process
       @document = @site.collections["slides"].docs[1]
     end
@@ -194,7 +192,7 @@ def setup_document_with_dates(filename)
 
   context "a document as part of a collection with valid path" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => ["slides"],
         "defaults"    => [{
           "scope"  => { "path" => "_slides", "type" => "slides" },
@@ -203,8 +201,8 @@ def setup_document_with_dates(filename)
               "key" => "value123",
             },
           },
-        },],
-      })
+        },]
+      )
       @site.process
       @document = @site.collections["slides"].docs.first
     end
@@ -218,7 +216,7 @@ def setup_document_with_dates(filename)
 
   context "a document as part of a collection with invalid path" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => ["slides"],
         "defaults"    => [{
           "scope"  => { "path" => "somepath", "type" => "slides" },
@@ -227,8 +225,8 @@ def setup_document_with_dates(filename)
               "key" => "myval",
             },
           },
-        },],
-      })
+        },]
+      )
       @site.process
       @document = @site.collections["slides"].docs.first
     end
@@ -242,9 +240,9 @@ def setup_document_with_dates(filename)
 
   context "a document in a collection with a custom permalink" do
     setup do
-      @site = fixture_site({
-        "collections" => ["slides"],
-      })
+      @site = fixture_site(
+        "collections" => ["slides"]
+      )
       @site.process
       @document = @site.collections["slides"].docs[2]
       @dest_file = dest_dir("slide/3/index.html")
@@ -261,15 +259,15 @@ def setup_document_with_dates(filename)
 
   context "a document in a collection with custom filename permalinks" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => {
           "slides" => {
             "output"    => true,
             "permalink" => "/slides/test/:name",
           },
         },
-        "permalink"   => "pretty",
-      })
+        "permalink"   => "pretty"
+      )
       @site.process
       @document = @site.collections["slides"].docs[0]
       @dest_file = dest_dir("slides/test/example-slide-1.html")
@@ -290,13 +288,13 @@ def setup_document_with_dates(filename)
 
   context "a document in a collection with pretty permalink style" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => {
           "slides" => {
             "output" => true,
           },
-        },
-      })
+        }
+      )
       @site.permalink_style = :pretty
       @site.process
       @document = @site.collections["slides"].docs[0]
@@ -314,13 +312,13 @@ def setup_document_with_dates(filename)
 
   context "a document in a collection with cased file name" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => {
           "slides" => {
             "output" => true,
           },
-        },
-      })
+        }
+      )
       @site.permalink_style = :pretty
       @site.process
       @document = @site.collections["slides"].docs[7]
@@ -334,13 +332,13 @@ def setup_document_with_dates(filename)
 
   context "a document in a collection with cased file name" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => {
           "slides" => {
             "output" => true,
           },
-        },
-      })
+        }
+      )
       @site.process
       @document = @site.collections["slides"].docs[6]
       @dest_file = dest_dir("slides/example-slide-7.php")
@@ -365,14 +363,14 @@ def setup_document_with_dates(filename)
 
   context "documents in a collection with custom title permalinks" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => {
           "slides" => {
             "output"    => true,
             "permalink" => "/slides/:title",
           },
-        },
-      })
+        }
+      )
       @site.process
       @document = @site.collections["slides"].docs[3]
       @document_without_slug = @site.collections["slides"].docs[4]
@@ -410,9 +408,9 @@ def setup_document_with_dates(filename)
 
   context "document with a permalink with dots & a trailing slash" do
     setup do
-      @site = fixture_site({ "collections" => {
+      @site = fixture_site("collections" => {
         "with.dots" => { "output" => true },
-      }, })
+      })
       @site.process
       @document = @site.collections["with.dots"].docs.last
       @dest_file = dest_dir("with.dots", "permalink.with.slash.tho", "index.html")
@@ -433,13 +431,13 @@ def setup_document_with_dates(filename)
 
   context "documents in a collection" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => {
           "slides" => {
             "output" => true,
           },
-        },
-      })
+        }
+      )
       @site.process
       @files = @site.collections["slides"].docs
     end
@@ -465,13 +463,13 @@ def setup_document_with_dates(filename)
 
   context "a static file in a collection" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => {
           "slides" => {
             "output" => true,
           },
-        },
-      })
+        }
+      )
       @site.process
       @document = @site.collections["slides"].files.find do |doc|
         doc.relative_path == "_slides/octojekyll.png"
@@ -498,13 +496,13 @@ def setup_document_with_dates(filename)
 
   context "a document in a collection with non-alphabetic file name" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => {
           "methods" => {
             "output" => true,
           },
-        },
-      })
+        }
+      )
       @site.process
       @document = @site.collections["methods"].docs.find do |doc|
         doc.relative_path == "_methods/escape-+ #%20[].md"
@@ -527,13 +525,13 @@ def setup_document_with_dates(filename)
 
   context "a document in a collection with dash-separated numeric file name" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => {
           "methods" => {
             "output" => true,
           },
-        },
-      })
+        }
+      )
       @site.process
       @document = @site.collections["methods"].docs.find do |doc|
         doc.relative_path == "_methods/3940394-21-9393050-fifif1323-test.md"
diff --git a/test/test_drop.rb b/test/test_drop.rb
index 5c46d81dc77..aa9387db861 100644
--- a/test/test_drop.rb
+++ b/test/test_drop.rb
@@ -17,9 +17,9 @@ def fallback_data
 class TestDrop < JekyllUnitTest
   context "Drops" do
     setup do
-      @site = fixture_site({
-        "collections" => ["methods"],
-      })
+      @site = fixture_site(
+        "collections" => ["methods"]
+      )
       @site.process
       @document = @site.collections["methods"].docs.detect do |d|
         d.relative_path == "_methods/configuration.md"
diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb
index c9025092318..7e84df70737 100644
--- a/test/test_entry_filter.rb
+++ b/test/test_entry_filter.rb
@@ -10,7 +10,7 @@ class TestEntryFilter < JekyllUnitTest
 
     should "filter entries" do
       ent1 = %w(foo.markdown bar.markdown baz.markdown #baz.markdown#
-              .baz.markdow foo.markdown~ .htaccess _posts _pages ~$benbalter.docx)
+                .baz.markdow foo.markdown~ .htaccess _posts _pages ~$benbalter.docx)
 
       entries = EntryFilter.new(@site).filter(ent1)
       assert_equal %w(foo.markdown bar.markdown baz.markdown .htaccess), entries
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index 24647decada..986ef6b4617 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -4,10 +4,9 @@
 
 class TestExcerpt < JekyllUnitTest
   def setup_post(file)
-    Document.new(@site.in_source_dir(File.join("_posts", file)), {
-      :site       => @site,
-      :collection => @site.posts,
-    }).tap(&:read)
+    Document.new(@site.in_source_dir(File.join("_posts", file)),
+                 :site       => @site,
+                 :collection => @site.posts).tap(&:read)
   end
 
   def do_render(document)
@@ -81,9 +80,9 @@ def do_render(document)
     context "#relative_path" do
       should "return its document's relative path with '/#excerpt' appended" do
         assert_equal "#{@excerpt.doc.relative_path}/#excerpt",
-          @excerpt.relative_path
+                     @excerpt.relative_path
         assert_equal "_posts/2013-07-22-post-excerpt-with-layout.markdown/#excerpt",
-          @excerpt.relative_path
+                     @excerpt.relative_path
       end
     end
 
diff --git a/test/test_filters.rb b/test/test_filters.rb
index f0f37c4e95c..c8909f25555 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -9,7 +9,7 @@ class JekyllFilter
 
     def initialize(opts = {})
       @site = Jekyll::Site.new(opts.merge("skip_config_files" => true))
-      @context = Liquid::Context.new(@site.site_payload, {}, { :site => @site })
+      @context = Liquid::Context.new(@site.site_payload, {}, :site => @site)
     end
   end
 
@@ -37,12 +37,12 @@ def select; end
   context "filters" do
     setup do
       @sample_time = Time.utc(2013, 3, 27, 11, 22, 33)
-      @filter = make_filter_mock({
+      @filter = make_filter_mock(
         "timezone"               => "UTC",
         "url"                    => "http://example.com",
         "baseurl"                => "/base",
-        "dont_show_posts_before" => @sample_time,
-      })
+        "dont_show_posts_before" => @sample_time
+      )
       @sample_date = Date.parse("2013-03-02")
       @time_as_string = "September 11, 2001 12:46:30 -0000"
       @time_as_numeric = 1_399_680_607
@@ -88,7 +88,7 @@ def select; end
       end
 
       should "escapes special characters when configured to do so" do
-        kramdown = make_filter_mock({ :kramdown => { :entity_output => :symbolic } })
+        kramdown = make_filter_mock(:kramdown => { :entity_output => :symbolic })
         assert_equal(
           "“This filter’s test…”",
           kramdown.smartify(%q{"This filter's test..."})
@@ -406,82 +406,82 @@ def select; end
 
       should "ensure the leading slash for the baseurl" do
         page_url = "about/my_favorite_page/"
-        filter = make_filter_mock({
+        filter = make_filter_mock(
           "url"     => "http://example.com",
-          "baseurl" => "base",
-        })
+          "baseurl" => "base"
+        )
         assert_equal "http://example.com/base/#{page_url}", filter.absolute_url(page_url)
       end
 
       should "be ok with a blank but present 'url'" do
         page_url = "about/my_favorite_page/"
-        filter = make_filter_mock({
+        filter = make_filter_mock(
           "url"     => "",
-          "baseurl" => "base",
-        })
+          "baseurl" => "base"
+        )
         assert_equal "/base/#{page_url}", filter.absolute_url(page_url)
       end
 
       should "be ok with a nil 'url'" do
         page_url = "about/my_favorite_page/"
-        filter = make_filter_mock({
+        filter = make_filter_mock(
           "url"     => nil,
-          "baseurl" => "base",
-        })
+          "baseurl" => "base"
+        )
         assert_equal "/base/#{page_url}", filter.absolute_url(page_url)
       end
 
       should "be ok with a nil 'baseurl'" do
         page_url = "about/my_favorite_page/"
-        filter = make_filter_mock({
+        filter = make_filter_mock(
           "url"     => "http://example.com",
-          "baseurl" => nil,
-        })
+          "baseurl" => nil
+        )
         assert_equal "http://example.com/#{page_url}", filter.absolute_url(page_url)
       end
 
       should "not prepend a forward slash if input is empty" do
         page_url = ""
-        filter = make_filter_mock({
+        filter = make_filter_mock(
           "url"     => "http://example.com",
-          "baseurl" => "/base",
-        })
+          "baseurl" => "/base"
+        )
         assert_equal "http://example.com/base", filter.absolute_url(page_url)
       end
 
       should "not append a forward slash if input is '/'" do
         page_url = "/"
-        filter = make_filter_mock({
+        filter = make_filter_mock(
           "url"     => "http://example.com",
-          "baseurl" => "/base",
-        })
+          "baseurl" => "/base"
+        )
         assert_equal "http://example.com/base/", filter.absolute_url(page_url)
       end
 
       should "not append a forward slash if input is '/' and nil 'baseurl'" do
         page_url = "/"
-        filter = make_filter_mock({
+        filter = make_filter_mock(
           "url"     => "http://example.com",
-          "baseurl" => nil,
-        })
+          "baseurl" => nil
+        )
         assert_equal "http://example.com/", filter.absolute_url(page_url)
       end
 
       should "not append a forward slash if both input and baseurl are simply '/'" do
         page_url = "/"
-        filter = make_filter_mock({
+        filter = make_filter_mock(
           "url"     => "http://example.com",
-          "baseurl" => "/",
-        })
+          "baseurl" => "/"
+        )
         assert_equal "http://example.com/", filter.absolute_url(page_url)
       end
 
       should "normalize international URLs" do
         page_url = ""
-        filter = make_filter_mock({
+        filter = make_filter_mock(
           "url"     => "http://ümlaut.example.org/",
-          "baseurl" => nil,
-        })
+          "baseurl" => nil
+        )
         assert_equal "http://xn--mlaut-jva.example.org/", filter.absolute_url(page_url)
       end
 
@@ -492,19 +492,19 @@ def select; end
 
       should "transform the input URL to a string" do
         page_url = "/my-page.html"
-        filter = make_filter_mock({ "url" => Value.new(proc { "http://example.org" }) })
+        filter = make_filter_mock("url" => Value.new(proc { "http://example.org" }))
         assert_equal "http://example.org#{page_url}", filter.absolute_url(page_url)
       end
 
       should "not raise a TypeError when passed a hash" do
-        assert @filter.absolute_url({ "foo" => "bar" })
+        assert @filter.absolute_url("foo" => "bar")
       end
 
       context "with a document" do
         setup do
-          @site = fixture_site({
-            "collections" => ["methods"],
-          })
+          @site = fixture_site(
+            "collections" => ["methods"]
+          )
           @site.process
           @document = @site.collections["methods"].docs.detect do |d|
             d.relative_path == "_methods/configuration.md"
@@ -531,7 +531,7 @@ def select; end
 
       should "ensure the leading slash for the baseurl" do
         page_url = "about/my_favorite_page/"
-        filter = make_filter_mock({ "baseurl" => "base" })
+        filter = make_filter_mock("baseurl" => "base")
         assert_equal "/base/#{page_url}", filter.relative_url(page_url)
       end
 
@@ -542,51 +542,51 @@ def select; end
 
       should "be ok with a nil 'baseurl'" do
         page_url = "about/my_favorite_page/"
-        filter = make_filter_mock({
+        filter = make_filter_mock(
           "url"     => "http://example.com",
-          "baseurl" => nil,
-        })
+          "baseurl" => nil
+        )
         assert_equal "/#{page_url}", filter.relative_url(page_url)
       end
 
       should "not prepend a forward slash if input is empty" do
         page_url = ""
-        filter = make_filter_mock({
+        filter = make_filter_mock(
           "url"     => "http://example.com",
-          "baseurl" => "/base",
-        })
+          "baseurl" => "/base"
+        )
         assert_equal "/base", filter.relative_url(page_url)
       end
 
       should "not prepend a forward slash if baseurl ends with a single '/'" do
         page_url = "/css/main.css"
-        filter = make_filter_mock({
+        filter = make_filter_mock(
           "url"     => "http://example.com",
-          "baseurl" => "/base/",
-        })
+          "baseurl" => "/base/"
+        )
         assert_equal "/base/css/main.css", filter.relative_url(page_url)
       end
 
       should "not return valid URI if baseurl ends with multiple '/'" do
         page_url = "/css/main.css"
-        filter = make_filter_mock({
+        filter = make_filter_mock(
           "url"     => "http://example.com",
-          "baseurl" => "/base//",
-        })
+          "baseurl" => "/base//"
+        )
         refute_equal "/base/css/main.css", filter.relative_url(page_url)
       end
 
       should "not prepend a forward slash if both input and baseurl are simply '/'" do
         page_url = "/"
-        filter = make_filter_mock({
+        filter = make_filter_mock(
           "url"     => "http://example.com",
-          "baseurl" => "/",
-        })
+          "baseurl" => "/"
+        )
         assert_equal "/", filter.relative_url(page_url)
       end
 
       should "not return the url by reference" do
-        filter = make_filter_mock({ :baseurl => nil })
+        filter = make_filter_mock(:baseurl => nil)
         page = Page.new(filter.site, test_dir("fixtures"), "", "front_matter.erb")
         assert_equal "/front_matter.erb", page.url
         url = filter.relative_url(page.url)
@@ -596,7 +596,7 @@ def select; end
 
       should "transform the input baseurl to a string" do
         page_url = "/my-page.html"
-        filter = make_filter_mock({ "baseurl" => Value.new(proc { "/baseurl/" }) })
+        filter = make_filter_mock("baseurl" => Value.new(proc { "/baseurl/" }))
         assert_equal "/baseurl#{page_url}", filter.relative_url(page_url)
       end
 
@@ -640,7 +640,7 @@ def select; end
 
     context "jsonify filter" do
       should "convert hash to json" do
-        assert_equal "{\"age\":18}", @filter.jsonify({ :age => 18 })
+        assert_equal "{\"age\":18}", @filter.jsonify(:age => 18)
       end
 
       should "convert array to json" do
@@ -705,7 +705,7 @@ def to_liquid
           {
             "name" => name,
             :v     => 1,
-            :thing => M.new({ :kay => "jewelers" }),
+            :thing => M.new(:kay => "jewelers"),
             :stuff => true,
           }
         end
@@ -973,7 +973,7 @@ def to_liquid
         @filter.site.tap(&:read)
         posts = @filter.site.site_payload["site"]["posts"]
         results = @filter.where_exp(posts, "post",
-          "post.date > site.dont_show_posts_before")
+                                    "post.date > site.dont_show_posts_before")
         assert_equal posts.select { |p| p.date > @sample_time }.count, results.length
       end
     end
@@ -1085,19 +1085,19 @@ def to_liquid
       end
       should "return sorted by property array" do
         assert_equal [{ "a" => 1 }, { "a" => 2 }, { "a" => 3 }, { "a" => 4 }],
-          @filter.sort([{ "a" => 4 }, { "a" => 3 }, { "a" => 1 }, { "a" => 2 }], "a")
+                     @filter.sort([{ "a" => 4 }, { "a" => 3 }, { "a" => 1 }, { "a" => 2 }], "a")
       end
       should "return sorted by property array with numeric strings sorted as numbers" do
         assert_equal([{ "a" => ".5" }, { "a" => "0.65" }, { "a" => "10" }],
-          @filter.sort([{ "a" => "10" }, { "a" => ".5" }, { "a" => "0.65" }], "a"))
+                     @filter.sort([{ "a" => "10" }, { "a" => ".5" }, { "a" => "0.65" }], "a"))
       end
       should "return sorted by property array with numeric strings first" do
         assert_equal([{ "a" => ".5" }, { "a" => "0.6" }, { "a" => "twelve" }],
-          @filter.sort([{ "a" => "twelve" }, { "a" => ".5" }, { "a" => "0.6" }], "a"))
+                     @filter.sort([{ "a" => "twelve" }, { "a" => ".5" }, { "a" => "0.6" }], "a"))
       end
       should "return sorted by property array with numbers and strings " do
         assert_equal([{ "a" => "1" }, { "a" => "1abc" }, { "a" => "20" }],
-          @filter.sort([{ "a" => "20" }, { "a" => "1" }, { "a" => "1abc" }], "a"))
+                     @filter.sort([{ "a" => "20" }, { "a" => "1" }, { "a" => "1abc" }], "a"))
       end
       should "return sorted by property array with nils first" do
         ary = [{ "a" => 2 }, { "b" => 1 }, { "a" => 1 }]
@@ -1106,13 +1106,13 @@ def to_liquid
       end
       should "return sorted by property array with nils last" do
         assert_equal [{ "a" => 1 }, { "a" => 2 }, { "b" => 1 }],
-          @filter.sort([{ "a" => 2 }, { "b" => 1 }, { "a" => 1 }], "a", "last")
+                     @filter.sort([{ "a" => 2 }, { "b" => 1 }, { "a" => 1 }], "a", "last")
       end
       should "return sorted by subproperty array" do
         assert_equal [{ "a" => { "b" => 1 } }, { "a" => { "b" => 2 } },
                       { "a" => { "b" => 3 } },],
-          @filter.sort([{ "a" => { "b" => 2 } }, { "a" => { "b" => 1 } },
-                        { "a" => { "b" => 3 } },], "a.b")
+                     @filter.sort([{ "a" => { "b" => 2 } }, { "a" => { "b" => 1 } },
+                                   { "a" => { "b" => 3 } },], "a.b")
       end
     end
 
@@ -1140,7 +1140,7 @@ def to_liquid
 
     context "inspect filter" do
       should "return a HTML-escaped string representation of an object" do
-        assert_equal "{"<a>"=>1}", @filter.inspect({ "" => 1 })
+        assert_equal "{"<a>"=>1}", @filter.inspect("" => 1)
       end
 
       should "quote strings" do
diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb
index dab4385c94b..ee12f205598 100644
--- a/test/test_front_matter_defaults.rb
+++ b/test/test_front_matter_defaults.rb
@@ -5,7 +5,7 @@
 class TestFrontMatterDefaults < JekyllUnitTest
   context "A site with full front matter defaults" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "defaults" => [{
           "scope"  => {
             "path" => "contacts",
@@ -14,8 +14,8 @@ class TestFrontMatterDefaults < JekyllUnitTest
           "values" => {
             "key" => "val",
           },
-        },],
-      })
+        },]
+      )
       @output = capture_output { @site.process }
       @affected = @site.pages.find { |page| page.relative_path == "contacts/bar.html" }
       @not_affected = @site.pages.find { |page| page.relative_path == "about.html" }
@@ -33,7 +33,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
 
   context "A site with full front matter defaults (glob)" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "defaults" => [{
           "scope"  => {
             "path" => "contacts/*.html",
@@ -42,8 +42,8 @@ class TestFrontMatterDefaults < JekyllUnitTest
           "values" => {
             "key" => "val",
           },
-        },],
-      })
+        },]
+      )
       @output = capture_output { @site.process }
       @affected = @site.pages.find { |page| page.relative_path == "contacts/bar.html" }
       @not_affected = @site.pages.find { |page| page.relative_path == "about.html" }
@@ -61,7 +61,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
 
   context "A site with front matter type pages and an extension" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "defaults" => [{
           "scope"  => {
             "path" => "index.html",
@@ -69,8 +69,8 @@ class TestFrontMatterDefaults < JekyllUnitTest
           "values" => {
             "key" => "val",
           },
-        },],
-      })
+        },]
+      )
 
       @site.process
       @affected = @site.pages.find { |page| page.relative_path == "index.html" }
@@ -85,7 +85,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
 
   context "A site with front matter defaults with no type" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "defaults" => [{
           "scope"  => {
             "path" => "win",
@@ -93,8 +93,8 @@ class TestFrontMatterDefaults < JekyllUnitTest
           "values" => {
             "key" => "val",
           },
-        },],
-      })
+        },]
+      )
 
       @site.process
       @affected = @site.posts.docs.find { |page| page.relative_path =~ %r!win\/! }
@@ -109,7 +109,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
 
   context "A site with front matter defaults with no path and a deprecated type" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "defaults" => [{
           "scope"  => {
             "type" => "page",
@@ -117,8 +117,8 @@ class TestFrontMatterDefaults < JekyllUnitTest
           "values" => {
             "key" => "val",
           },
-        },],
-      })
+        },]
+      )
 
       @site.process
       @affected = @site.pages
@@ -134,7 +134,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
 
   context "A site with front matter defaults with no path" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "defaults" => [{
           "scope"  => {
             "type" => "pages",
@@ -142,8 +142,8 @@ class TestFrontMatterDefaults < JekyllUnitTest
           "values" => {
             "key" => "val",
           },
-        },],
-      })
+        },]
+      )
       @site.process
       @affected = @site.pages
       @not_affected = @site.posts.docs
@@ -158,15 +158,15 @@ class TestFrontMatterDefaults < JekyllUnitTest
 
   context "A site with front matter defaults with no path or type" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "defaults" => [{
           "scope"  => {
           },
           "values" => {
             "key" => "val",
           },
-        },],
-      })
+        },]
+      )
       @site.process
       @affected = @site.pages
       @not_affected = @site.posts
@@ -180,13 +180,13 @@ class TestFrontMatterDefaults < JekyllUnitTest
 
   context "A site with front matter defaults with no scope" do
     setup do
-      @site = fixture_site({
+      @site = fixture_site(
         "defaults" => [{
           "values" => {
             "key" => "val",
           },
-        },],
-      })
+        },]
+      )
       @site.process
       @affected = @site.pages
       @not_affected = @site.posts
@@ -200,15 +200,15 @@ class TestFrontMatterDefaults < JekyllUnitTest
 
   context "A site with front matter defaults with quoted date" do
     setup do
-      @site = Site.new(Jekyll.configuration({
-        "source"      => source_dir,
-        "destination" => dest_dir,
-        "defaults"    => [{
-          "values" => {
-            "date" => "2015-01-01 00:00:01",
-          },
-        },],
-      }))
+      @site = Site.new(Jekyll.configuration(
+                         "source"      => source_dir,
+                         "destination" => dest_dir,
+                         "defaults"    => [{
+                           "values" => {
+                             "date" => "2015-01-01 00:00:01",
+                           },
+                         },]
+                       ))
     end
 
     should "not raise error" do
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 65b82fe8b3a..56c2bf4ee14 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -70,12 +70,12 @@ class TestGeneratedSite < JekyllUnitTest
       time_regexp = "\\d+:\\d+"
       #
       # adding a pipe character at the beginning preserves formatting with newlines
-      expected_output = Regexp.new <<-OUTPUT
-| - /css/screen.css last edited at #{time_regexp} with extname .css
-  - /pgp.key last edited at #{time_regexp} with extname .key
-  - /products.yml last edited at #{time_regexp} with extname .yml
-  - /symlink-test/symlinked-dir/screen.css last edited at #{time_regexp} with extname .css
-OUTPUT
+      expected_output = Regexp.new <<~OUTPUT
+        | - /css/screen.css last edited at #{time_regexp} with extname .css
+          - /pgp.key last edited at #{time_regexp} with extname .key
+          - /products.yml last edited at #{time_regexp} with extname .yml
+          - /symlink-test/symlinked-dir/screen.css last edited at #{time_regexp} with extname .css
+      OUTPUT
       assert_match expected_output, File.read(dest_dir("static_files.html"))
     end
   end
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index 62b70ddddc4..d95955f4d6b 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -40,18 +40,18 @@ class TestKramdown < JekyllUnitTest
 
       @kramdown_config_keys.each do |key|
         assert kramdown_config.key?(key.to_sym),
-          "Expected #{kramdown_config} to include key #{key.to_sym.inspect}"
+               "Expected #{kramdown_config} to include key #{key.to_sym.inspect}"
       end
 
       @syntax_highlighter_opts_config_keys.each do |key|
         assert kramdown_config["syntax_highlighter_opts"].key?(key.to_sym),
-          "Expected #{kramdown_config["syntax_highlighter_opts"]} to include " \
-          "key #{key.to_sym.inspect}"
+               "Expected #{kramdown_config["syntax_highlighter_opts"]} to include " \
+               "key #{key.to_sym.inspect}"
       end
 
       assert_equal kramdown_config["smart_quotes"], kramdown_config[:smart_quotes]
       assert_equal kramdown_config["syntax_highlighter_opts"]["css"],
-        kramdown_config[:syntax_highlighter_opts][:css]
+                   kramdown_config[:syntax_highlighter_opts][:css]
     end
 
     should "run Kramdown" do
@@ -82,7 +82,7 @@ class TestKramdown < JekyllUnitTest
 
         markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, override))
         assert_match %r!
      («|«)Pit(›|›)hy(»|»)<\/p>!, \
-          markdown.convert(%("Pit'hy")).strip
+                     markdown.convert(%("Pit'hy")).strip
       end
     end
 
@@ -142,16 +142,17 @@ class TestKramdown < JekyllUnitTest
 
     should "move coderay to syntax_highlighter_opts" do
       original = Kramdown::Document.method(:new)
-      markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, {
-        "higlighter" => nil,
-        "markdown"   => "kramdown",
-        "kramdown"   => {
-          "syntax_highlighter" => "coderay",
-          "coderay"            => {
-            "hello" => "world",
-          },
-        },
-      }))
+      markdown = Converters::Markdown.new(
+        Utils.deep_merge_hashes(@config,
+                                "higlighter" => nil,
+                                "markdown"   => "kramdown",
+                                "kramdown"   => {
+                                  "syntax_highlighter" => "coderay",
+                                  "coderay"            => {
+                                    "hello" => "world",
+                                  },
+                                })
+      )
 
       expect(Kramdown::Document).to receive(:new) do |arg1, hash|
         assert_equal hash["syntax_highlighter_opts"]["hello"], "world"
diff --git a/test/test_layout_reader.rb b/test/test_layout_reader.rb
index 96d2045a148..3c88586aa98 100644
--- a/test/test_layout_reader.rb
+++ b/test/test_layout_reader.rb
@@ -5,8 +5,8 @@
 class TestLayoutReader < JekyllUnitTest
   context "reading layouts" do
     setup do
-      config = Jekyll::Configuration::DEFAULTS.merge({ "source"      => source_dir,
-                                                       "destination" => dest_dir, })
+      config = Jekyll::Configuration::DEFAULTS.merge("source"      => source_dir,
+                                                     "destination" => dest_dir)
       @site = fixture_site(config)
     end
 
diff --git a/test/test_liquid_extensions.rb b/test/test_liquid_extensions.rb
index e281e10e5fd..30637b33315 100644
--- a/test/test_liquid_extensions.rb
+++ b/test/test_liquid_extensions.rb
@@ -22,11 +22,11 @@ def render(context)
     end
 
     should "extract the var properly" do
-      assert_equal @template.render({ "page" => { "name" => "tobi" } }), "hi tobi"
+      assert_equal @template.render("page" => { "name" => "tobi" }), "hi tobi"
     end
 
     should "return the variable name if the value isn't there" do
-      assert_equal @template.render({ "page" => { "title" => "tobi" } }), "hi page.name"
+      assert_equal @template.render("page" => { "title" => "tobi" }), "hi page.name"
     end
   end
 end
diff --git a/test/test_page.rb b/test/test_page.rb
index ed4c2c31a9a..a34a5694530 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -22,11 +22,11 @@ def do_render(page)
   context "A Page" do
     setup do
       clear_dest
-      @site = Site.new(Jekyll.configuration({
-        "source"            => source_dir,
-        "destination"       => dest_dir,
-        "skip_config_files" => true,
-      }))
+      @site = Site.new(Jekyll.configuration(
+                         "source"            => source_dir,
+                         "destination"       => dest_dir,
+                         "skip_config_files" => true
+                       ))
     end
 
     context "processing pages" do
diff --git a/test/test_page_without_a_file.rb b/test/test_page_without_a_file.rb
index 50624890c4e..2933bfc8846 100644
--- a/test/test_page_without_a_file.rb
+++ b/test/test_page_without_a_file.rb
@@ -21,11 +21,11 @@ def render_and_write
   context "A PageWithoutAFile" do
     setup do
       clear_dest
-      @site = Site.new(Jekyll.configuration({
-        "source"            => source_dir,
-        "destination"       => dest_dir,
-        "skip_config_files" => true,
-      }))
+      @site = Site.new(Jekyll.configuration(
+                         "source"            => source_dir,
+                         "destination"       => dest_dir,
+                         "skip_config_files" => true
+                       ))
     end
 
     context "with default site configuration" do
diff --git a/test/test_plugin_manager.rb b/test/test_plugin_manager.rb
index 213bcef6b12..b5d1a81cae6 100644
--- a/test/test_plugin_manager.rb
+++ b/test/test_plugin_manager.rb
@@ -24,7 +24,7 @@ def with_no_gemfile
     should "not require from bundler" do
       with_env("JEKYLL_NO_BUNDLER_REQUIRE", "true") do
         refute Jekyll::PluginManager.require_from_bundler,
-                     "Gemfile plugins were required but shouldn't have been"
+               "Gemfile plugins were required but shouldn't have been"
         assert ENV["JEKYLL_NO_BUNDLER_REQUIRE"]
       end
     end
@@ -35,7 +35,7 @@ def with_no_gemfile
       with_env("JEKYLL_NO_BUNDLER_REQUIRE", nil) do
         with_no_gemfile do
           refute Jekyll::PluginManager.require_from_bundler,
-                       "Gemfile plugins were required but shouldn't have been"
+                 "Gemfile plugins were required but shouldn't have been"
           assert_nil ENV["JEKYLL_NO_BUNDLER_REQUIRE"]
         end
       end
@@ -68,9 +68,9 @@ def with_no_gemfile
     end
 
     should "require plugin files" do
-      site = double({ :safe          => false,
-                      :config        => { "plugins_dir" => "_plugins" },
-                      :in_source_dir => "/tmp/", })
+      site = double(:safe          => false,
+                    :config        => { "plugins_dir" => "_plugins" },
+                    :in_source_dir => "/tmp/")
       plugin_manager = PluginManager.new(site)
 
       expect(Jekyll::External).to receive(:require_with_graceful_fail)
@@ -80,7 +80,7 @@ def with_no_gemfile
 
   context "site is marked as safe" do
     should "allow plugins if they are whitelisted" do
-      site = double({ :safe => true, :config => { "whitelist" => ["jemoji"] } })
+      site = double(:safe => true, :config => { "whitelist" => ["jemoji"] })
       plugin_manager = PluginManager.new(site)
 
       assert plugin_manager.plugin_allowed?("jemoji")
@@ -88,7 +88,7 @@ def with_no_gemfile
     end
 
     should "not require plugin files" do
-      site = double({ :safe => true })
+      site = double(:safe => true)
       plugin_manager = PluginManager.new(site)
 
       expect(Jekyll::External).to_not receive(:require_with_graceful_fail)
@@ -98,12 +98,12 @@ def with_no_gemfile
 
   context "plugins_dir is set to the default" do
     should "call site's in_source_dir" do
-      site = double({
+      site = double(
         :config        => {
           "plugins_dir" => Jekyll::Configuration::DEFAULTS["plugins_dir"],
         },
-        :in_source_dir => "/tmp/",
-      })
+        :in_source_dir => "/tmp/"
+      )
       plugin_manager = PluginManager.new(site)
 
       expect(site).to receive(:in_source_dir).with("_plugins")
@@ -113,7 +113,7 @@ def with_no_gemfile
 
   context "plugins_dir is set to a different dir" do
     should "expand plugin path" do
-      site = double({ :config => { "plugins_dir" => "some_other_plugins_path" } })
+      site = double(:config => { "plugins_dir" => "some_other_plugins_path" })
       plugin_manager = PluginManager.new(site)
 
       expect(File).to receive(:expand_path).with("some_other_plugins_path")
@@ -123,7 +123,7 @@ def with_no_gemfile
 
   context "`paginate` config is activated" do
     should "print deprecation warning if jekyll-paginate is not present" do
-      site = double({ :config => { "paginate" => true } })
+      site = double(:config => { "paginate" => true })
       plugin_manager = PluginManager.new(site)
 
       expect(Jekyll::Deprecator).to(
@@ -133,9 +133,9 @@ def with_no_gemfile
     end
 
     should "print no deprecation warning if jekyll-paginate is present" do
-      site = double({
-        :config => { "paginate" => true, "plugins" => ["jekyll-paginate"] },
-      })
+      site = double(
+        :config => { "paginate" => true, "plugins" => ["jekyll-paginate"] }
+      )
       plugin_manager = PluginManager.new(site)
 
       expect(Jekyll::Deprecator).to_not receive(:deprecation_message)
@@ -144,10 +144,10 @@ def with_no_gemfile
   end
 
   should "conscientious require" do
-    site = double({
+    site = double(
       :config      => { "theme" => "test-dependency-theme" },
-      :in_dest_dir => "/tmp/_site/",
-    })
+      :in_dest_dir => "/tmp/_site/"
+    )
     plugin_manager = PluginManager.new(site)
 
     expect(site).to receive(:theme).and_return(true)
diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb
index 3a5d35a8aa8..122bc40f440 100644
--- a/test/test_regenerator.rb
+++ b/test/test_regenerator.rb
@@ -7,14 +7,14 @@ class TestRegenerator < JekyllUnitTest
     setup do
       FileUtils.rm_rf(source_dir(".jekyll-metadata"))
 
-      @site = fixture_site({
+      @site = fixture_site(
         "collections" => {
           "methods" => {
             "output" => true,
           },
         },
-        "incremental" => true,
-      })
+        "incremental" => true
+      )
 
       @site.read
       @page = @site.pages.first
@@ -93,9 +93,9 @@ class TestRegenerator < JekyllUnitTest
   context "The site regenerator" do
     setup do
       FileUtils.rm_rf(source_dir(".jekyll-metadata"))
-      @site = fixture_site({
-        "incremental" => true,
-      })
+      @site = fixture_site(
+        "incremental" => true
+      )
 
       @site.read
       @post = @site.posts.first
@@ -128,11 +128,11 @@ class TestRegenerator < JekyllUnitTest
     setup do
       FileUtils.rm_rf(source_dir(".jekyll-metadata"))
 
-      @site = Site.new(Jekyll.configuration({
-        "source"      => source_dir,
-        "destination" => dest_dir,
-        "incremental" => true,
-      }))
+      @site = Site.new(Jekyll.configuration(
+                         "source"      => source_dir,
+                         "destination" => dest_dir,
+                         "incremental" => true
+                       ))
 
       @site.process
       @path = @site.in_source_dir(@site.pages.first.path)
@@ -183,7 +183,7 @@ class TestRegenerator < JekyllUnitTest
     should "not crash when reading corrupted marshal file" do
       metadata_file = source_dir(".jekyll-metadata")
       File.open(metadata_file, "w") do |file|
-        file.puts Marshal.dump({ :foo => "bar" })[0, 5]
+        file.puts Marshal.dump(:foo => "bar")[0, 5]
       end
 
       @regenerator = Regenerator.new(@site)
@@ -310,11 +310,11 @@ class TestRegenerator < JekyllUnitTest
   context "when incremental regeneration is disabled" do
     setup do
       FileUtils.rm_rf(source_dir(".jekyll-metadata"))
-      @site = Site.new(Jekyll.configuration({
-        "source"      => source_dir,
-        "destination" => dest_dir,
-        "incremental" => false,
-      }))
+      @site = Site.new(Jekyll.configuration(
+                         "source"      => source_dir,
+                         "destination" => dest_dir,
+                         "incremental" => false
+                       ))
 
       @site.process
       @path = @site.in_source_dir(@site.pages.first.path)
diff --git a/test/test_related_posts.rb b/test/test_related_posts.rb
index d6a8fe6f1f3..7f9a978f1a5 100644
--- a/test/test_related_posts.rb
+++ b/test/test_related_posts.rb
@@ -29,9 +29,9 @@ class TestRelatedPosts < JekyllUnitTest
       end
 
       allow_any_instance_of(Jekyll::RelatedPosts).to receive(:display)
-      @site = fixture_site({
-        "lsi" => true,
-      })
+      @site = fixture_site(
+        "lsi" => true
+      )
 
       @site.reset
       @site.read
diff --git a/test/test_sass.rb b/test/test_sass.rb
index 15b04162f01..686631d6020 100644
--- a/test/test_sass.rb
+++ b/test/test_sass.rb
@@ -5,10 +5,10 @@
 class TestSass < JekyllUnitTest
   context "importing partials" do
     setup do
-      @site = Jekyll::Site.new(Jekyll.configuration({
-        "source"      => source_dir,
-        "destination" => dest_dir,
-      }))
+      @site = Jekyll::Site.new(Jekyll.configuration(
+                                 "source"      => source_dir,
+                                 "destination" => dest_dir
+                               ))
       @site.process
       @test_css_file = dest_dir("css/main.css")
     end
diff --git a/test/test_site.rb b/test/test_site.rb
index 0af32fcbeb6..63fb63fde66 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -15,7 +15,7 @@ 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)
+      File.directory?(post) && post !~ Document::DATE_FILENAME_MATCHER
     end
   end
 
@@ -31,15 +31,15 @@ def read_posts
     end
 
     should "have an array for plugins if passed as a string" do
-      site = Site.new(site_configuration({ "plugins_dir" => "/tmp/plugins" }))
+      site = Site.new(site_configuration("plugins_dir" => "/tmp/plugins"))
       array = Utils::Platforms.windows? ? ["C:/tmp/plugins"] : ["/tmp/plugins"]
       assert_equal array, site.plugins
     end
 
     should "have an array for plugins if passed as an array" do
-      site = Site.new(site_configuration({
-        "plugins_dir" => ["/tmp/plugins", "/tmp/otherplugins"],
-      }))
+      site = Site.new(site_configuration(
+                        "plugins_dir" => ["/tmp/plugins", "/tmp/otherplugins"]
+                      ))
       array = if Utils::Platforms.windows?
                 ["C:/tmp/plugins", "C:/tmp/otherplugins"]
               else
@@ -49,12 +49,12 @@ def read_posts
     end
 
     should "have an empty array for plugins if nothing is passed" do
-      site = Site.new(site_configuration({ "plugins_dir" => [] }))
+      site = Site.new(site_configuration("plugins_dir" => []))
       assert_equal [], site.plugins
     end
 
     should "have the default for plugins if nil is passed" do
-      site = Site.new(site_configuration({ "plugins_dir" => nil }))
+      site = Site.new(site_configuration("plugins_dir" => nil))
       assert_equal [source_dir("_plugins")], site.plugins
     end
 
@@ -64,19 +64,19 @@ def read_posts
     end
 
     should "expose baseurl passed in from config" do
-      site = Site.new(site_configuration({ "baseurl" => "/blog" }))
+      site = Site.new(site_configuration("baseurl" => "/blog"))
       assert_equal "/blog", site.baseurl
     end
 
     should "only include theme includes_path if the path exists" do
-      site = fixture_site({ "theme" => "test-theme" })
+      site = fixture_site("theme" => "test-theme")
       assert_equal [source_dir("_includes"), theme_dir("_includes")],
-        site.includes_load_paths
+                   site.includes_load_paths
 
       allow(File).to receive(:directory?).with(theme_dir("_sass")).and_return(true)
       allow(File).to receive(:directory?).with(theme_dir("_layouts")).and_return(true)
       allow(File).to receive(:directory?).with(theme_dir("_includes")).and_return(false)
-      site = fixture_site({ "theme" => "test-theme" })
+      site = fixture_site("theme" => "test-theme")
       assert_equal [source_dir("_includes")], site.includes_load_paths
     end
   end
@@ -87,9 +87,7 @@ def read_posts
     end
 
     teardown do
-      if defined?(MyGenerator)
-        self.class.send(:remove_const, :MyGenerator)
-      end
+      self.class.send(:remove_const, :MyGenerator) if defined?(MyGenerator)
     end
 
     should "have an empty tag hash by default" do
@@ -279,7 +277,7 @@ def generate(site)
 
       posts = Dir[source_dir("**", "_posts", "**", "*")]
       posts.delete_if do |post|
-        File.directory?(post) && !(post =~ Document::DATE_FILENAME_MATCHER)
+        File.directory?(post) && post !~ Document::DATE_FILENAME_MATCHER
       end
       categories = %w(
         2013 bar baz category foo z_category MixedCase Mixedcase publish_test win
@@ -305,9 +303,9 @@ def generate(site)
 
       should "raise for bad frontmatter if strict_front_matter is set" do
         site = Site.new(site_configuration(
-          "collections"         => ["broken"],
-          "strict_front_matter" => true
-        ))
+                          "collections"         => ["broken"],
+                          "strict_front_matter" => true
+                        ))
         assert_raises(Psych::SyntaxError) do
           site.process
         end
@@ -315,9 +313,9 @@ def generate(site)
 
       should "not raise for bad frontmatter if strict_front_matter is not set" do
         site = Site.new(site_configuration(
-          "collections"         => ["broken"],
-          "strict_front_matter" => false
-        ))
+                          "collections"         => ["broken"],
+                          "strict_front_matter" => false
+                        ))
         site.process
       end
     end
@@ -412,9 +410,9 @@ def convert(*_args)
 
         bad_processor = "Custom::Markdown"
         s = Site.new(site_configuration(
-          "markdown"    => bad_processor,
-          "incremental" => false
-        ))
+                       "markdown"    => bad_processor,
+                       "incremental" => false
+                     ))
         assert_raises Jekyll::Errors::FatalException do
           s.process
         end
@@ -433,9 +431,9 @@ def convert(*_args)
       should "throw FatalException at process time" do
         bad_processor = "not a processor name"
         s = Site.new(site_configuration(
-          "markdown"    => bad_processor,
-          "incremental" => false
-        ))
+                       "markdown"    => bad_processor,
+                       "incremental" => false
+                     ))
         assert_raises Jekyll::Errors::FatalException do
           s.process
         end
@@ -489,8 +487,8 @@ def convert(*_args)
         site.process
 
         file_content = SafeYAML.load_file(File.join(
-          source_dir, "_data", "categories", "dairy.yaml"
-        ))
+                                            source_dir, "_data", "categories", "dairy.yaml"
+                                          ))
 
         assert_equal site.data["categories"]["dairy"], file_content
         assert_equal(
@@ -504,8 +502,8 @@ def convert(*_args)
         site.process
 
         file_content = SafeYAML.load_file(File.join(
-          source_dir, "_data", "categories.01", "dairy.yaml"
-        ))
+                                            source_dir, "_data", "categories.01", "dairy.yaml"
+                                          ))
 
         assert_equal site.data["categories01"]["dairy"], file_content
         assert_equal(
@@ -536,9 +534,9 @@ def convert(*_args)
 
     context "manipulating the Jekyll environment" do
       setup do
-        @site = Site.new(site_configuration({
-          "incremental" => false,
-        }))
+        @site = Site.new(site_configuration(
+                           "incremental" => false
+                         ))
         @site.process
         @page = @site.pages.find { |p| p.name == "environment.html" }
       end
@@ -550,9 +548,9 @@ def convert(*_args)
       context "in production" do
         setup do
           ENV["JEKYLL_ENV"] = "production"
-          @site = Site.new(site_configuration({
-            "incremental" => false,
-          }))
+          @site = Site.new(site_configuration(
+                             "incremental" => false
+                           ))
           @site.process
           @page = @site.pages.find { |p| p.name == "environment.html" }
         end
@@ -571,13 +569,13 @@ def convert(*_args)
       should "set no theme if config is not set" do
         expect($stderr).not_to receive(:puts)
         expect($stdout).not_to receive(:puts)
-        site = fixture_site({ "theme" => nil })
+        site = fixture_site("theme" => nil)
         assert_nil site.theme
       end
 
       should "set no theme if config is a hash" do
         output = capture_output do
-          site = fixture_site({ "theme" => {} })
+          site = fixture_site("theme" => {})
           assert_nil site.theme
         end
         expected_msg = "Theme: value of 'theme' in config should be String " \
@@ -589,7 +587,7 @@ def convert(*_args)
         [:debug, :info, :warn, :error].each do |level|
           expect(Jekyll.logger.writer).not_to receive(level)
         end
-        site = fixture_site({ "theme" => "test-theme" })
+        site = fixture_site("theme" => "test-theme")
         assert_instance_of Jekyll::Theme, site.theme
         assert_equal "test-theme", site.theme.name
       end
@@ -616,9 +614,9 @@ def convert(*_args)
 
     context "incremental build" do
       setup do
-        @site = Site.new(site_configuration({
-          "incremental" => true,
-        }))
+        @site = Site.new(site_configuration(
+                           "incremental" => true
+                         ))
         @site.read
       end
 
diff --git a/test/test_site_drop.rb b/test/test_site_drop.rb
index 43c52d708a5..01f3bed3ffc 100644
--- a/test/test_site_drop.rb
+++ b/test/test_site_drop.rb
@@ -5,9 +5,9 @@
 class TestSiteDrop < JekyllUnitTest
   context "a site drop" do
     setup do
-      @site = fixture_site({
-        "collections" => ["thanksgiving"],
-      })
+      @site = fixture_site(
+        "collections" => ["thanksgiving"]
+      )
       @site.process
       @drop = @site.to_liquid.site
     end
diff --git a/test/test_static_file.rb b/test/test_static_file.rb
index e306d2a299e..96663bacd69 100644
--- a/test/test_static_file.rb
+++ b/test/test_static_file.rb
@@ -70,7 +70,7 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
         "root",
         "_foo/dir/subdir",
         "file.html",
-        { "output" => true }
+        "output" => true
       )
       assert_equal :foo, static_file.type
       assert_equal "/foo/dir/subdir/file.html", static_file.url
@@ -82,7 +82,7 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
         "root",
         "_foo/dir/subdir",
         "file.html",
-        { "output" => true, "permalink" => "/:path/" }
+        "output" => true, "permalink" => "/:path/"
       )
       assert_equal :foo, static_file.type
       assert_equal "/dir/subdir/file.html", static_file.url
@@ -92,7 +92,7 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
     should "be writable by default" do
       static_file = setup_static_file("root", "dir/subdir", "file.html")
       assert(static_file.write?,
-        "static_file.write? should return true by default")
+             "static_file.write? should return true by default")
     end
 
     should "use the _config.yml defaults to determine writability" do
@@ -107,8 +107,8 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
         defaults
       )
       assert(!static_file.write?,
-        "static_file.write? should return false when _config.yml sets " \
-        "`published: false`")
+             "static_file.write? should return false when _config.yml sets " \
+             "`published: false`")
     end
 
     should "respect front matter defaults" do
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 54b8e4b7a63..4141b13b234 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -26,20 +26,20 @@ def create_post(content, override = {}, converter_class = Jekyll::Converters::Ma
   # rubocop:enable Metrics/AbcSize
 
   def fill_post(code, override = {})
-    content = < "pygments" })
+        fill_post("test", "highlighter" => "pygments")
       end
 
       should "not cause a markdown error" do
@@ -202,7 +202,7 @@ def highlight_block_with_opts(options_string)
 
     context "post content has highlight with file reference" do
       setup do
-        fill_post("./jekyll.gemspec", { "highlighter" => "pygments" })
+        fill_post("./jekyll.gemspec", "highlighter" => "pygments")
       end
 
       should "not embed the file" do
@@ -216,7 +216,7 @@ def highlight_block_with_opts(options_string)
 
     context "post content has highlight tag with UTF character" do
       setup do
-        fill_post("Æ", { "highlighter" => "pygments" })
+        fill_post("Æ", "highlighter" => "pygments")
       end
 
       should "render markdown with pygments line handling" do
@@ -230,14 +230,14 @@ def highlight_block_with_opts(options_string)
 
     context "post content has highlight tag with preceding spaces & lines" do
       setup do
-        code = <<-EOS
+        code = <<~EOS
 
 
-     [,1] [,2]
-[1,] FALSE TRUE
-[2,] FALSE TRUE
-EOS
-        fill_post(code, { "highlighter" => "pygments" })
+               [,1] [,2]
+          [1,] FALSE TRUE
+          [2,] FALSE TRUE
+        EOS
+        fill_post(code, "highlighter" => "pygments")
       end
 
       should "only strip the preceding newlines" do
@@ -252,18 +252,18 @@ def highlight_block_with_opts(options_string)
     context "post content has highlight tag " \
             "with preceding spaces & lines in several places" do
       setup do
-        code = <<-EOS
+        code = <<~EOS
 
 
-     [,1] [,2]
+               [,1] [,2]
 
 
-[1,] FALSE TRUE
-[2,] FALSE TRUE
+          [1,] FALSE TRUE
+          [2,] FALSE TRUE
 
 
-EOS
-        fill_post(code, { "highlighter" => "pygments" })
+        EOS
+        fill_post(code, "highlighter" => "pygments")
       end
 
       should "only strip the newlines which precede and succeed the entire block" do
@@ -278,7 +278,7 @@ def highlight_block_with_opts(options_string)
     context "post content has highlight tag with " \
             "preceding spaces & Windows-style newlines" do
       setup do
-        fill_post "\r\n\r\n\r\n     [,1] [,2]", { "highlighter" => "pygments" }
+        fill_post "\r\n\r\n\r\n     [,1] [,2]", "highlighter" => "pygments"
       end
 
       should "only strip the preceding newlines" do
@@ -292,12 +292,12 @@ def highlight_block_with_opts(options_string)
 
     context "post content has highlight tag with only preceding spaces" do
       setup do
-        code = <<-EOS
-     [,1] [,2]
-[1,] FALSE TRUE
-[2,] FALSE TRUE
-EOS
-        fill_post(code, { "highlighter" => "pygments" })
+        code = <<~EOS
+               [,1] [,2]
+          [1,] FALSE TRUE
+          [2,] FALSE TRUE
+        EOS
+        fill_post(code, "highlighter" => "pygments")
       end
 
       should "only strip the preceding newlines" do
@@ -337,17 +337,17 @@ def highlight_block_with_opts(options_string)
 
     context "post content has raw tag" do
       setup do
-        content = <<-CONTENT
----
-title: This is a test
----
-
-```liquid
-{% raw %}
-{{ site.baseurl }}{% link _collection/name-of-document.md %}
-{% endraw %}
-```
-CONTENT
+        content = <<~CONTENT
+          ---
+          title: This is a test
+          ---
+
+          ```liquid
+          {% raw %}
+          {{ site.baseurl }}{% link _collection/name-of-document.md %}
+          {% endraw %}
+          ```
+        CONTENT
         create_post(content)
       end
 
@@ -389,13 +389,13 @@ def highlight_block_with_opts(options_string)
 
     context "post content has highlight tag with preceding spaces & lines" do
       setup do
-        fill_post <<-EOS
+        fill_post <<~EOS
 
 
-     [,1] [,2]
-[1,] FALSE TRUE
-[2,] FALSE TRUE
-EOS
+               [,1] [,2]
+          [1,] FALSE TRUE
+          [2,] FALSE TRUE
+        EOS
       end
 
       should "only strip the preceding newlines" do
@@ -409,17 +409,17 @@ def highlight_block_with_opts(options_string)
     context "post content has highlight tag with " \
             "preceding spaces & lines in several places" do
       setup do
-        fill_post <<-EOS
+        fill_post <<~EOS
 
 
-     [,1] [,2]
+               [,1] [,2]
 
 
-[1,] FALSE TRUE
-[2,] FALSE TRUE
+          [1,] FALSE TRUE
+          [2,] FALSE TRUE
 
 
-EOS
+        EOS
       end
 
       should "only strip the newlines which precede and succeed the entire block" do
@@ -433,27 +433,27 @@ def highlight_block_with_opts(options_string)
 
     context "post content has highlight tag with linenumbers" do
       setup do
-        create_post <<-EOS
----
-title: This is a test
----
+        create_post <<~EOS
+          ---
+          title: This is a test
+          ---
 
-This is not yet highlighted
-{% highlight php linenos %}
-test
-{% endhighlight %}
+          This is not yet highlighted
+          {% highlight php linenos %}
+          test
+          {% endhighlight %}
 
-This should not be highlighted, right?
-EOS
+          This should not be highlighted, right?
+        EOS
       end
 
       should "should stop highlighting at boundary with rouge" do
-        expected = <<-EOS
-
      This is not yet highlighted
      \n
-
      1
-
      test
      \n
-
      This should not be highlighted, right?
      
-EOS
+        expected = <<~EOS
+          
      This is not yet highlighted
      \n
+          
      1
+          
      test
      \n
+          
      This should not be highlighted, right?
      
+        EOS
         assert_match(expected, @result)
       end
     end
@@ -474,11 +474,11 @@ def highlight_block_with_opts(options_string)
 
     context "post content has highlight tag with only preceding spaces" do
       setup do
-        fill_post <<-EOS
-     [,1] [,2]
-[1,] FALSE TRUE
-[2,] FALSE TRUE
-EOS
+        fill_post <<~EOS
+               [,1] [,2]
+          [1,] FALSE TRUE
+          [2,] FALSE TRUE
+        EOS
       end
 
       should "only strip the preceding newlines" do
@@ -492,19 +492,19 @@ def highlight_block_with_opts(options_string)
 
   context "simple post with markdown and pre tags" do
     setup do
-      @content = < "pretty",
-        "source"      => source_dir,
-        "destination" => dest_dir,
-        "read_posts"  => true,
-      })
+        {% post_url 2008-11-21-complex %}
+      CONTENT
+      create_post(content,
+                  "permalink"   => "pretty",
+                  "source"      => source_dir,
+                  "destination" => dest_dir,
+                  "read_posts"  => true)
     end
 
     should "not cause an error" do
@@ -547,19 +546,18 @@ def highlight_block_with_opts(options_string)
 
   context "simple page with post linking containing special characters" do
     setup do
-      content = < "pretty",
-        "source"      => source_dir,
-        "destination" => dest_dir,
-        "read_posts"  => true,
-      })
+        {% post_url 2016-11-26-special-chars-(+) %}
+      CONTENT
+      create_post(content,
+                  "permalink"   => "pretty",
+                  "source"      => source_dir,
+                  "destination" => dest_dir,
+                  "read_posts"  => true)
     end
 
     should "not cause an error" do
@@ -573,22 +571,21 @@ def highlight_block_with_opts(options_string)
 
   context "simple page with nested post linking" do
     setup do
-      content = < "pretty",
-        "source"      => source_dir,
-        "destination" => dest_dir,
-        "read_posts"  => true,
-      })
+      content = <<~CONTENT
+        ---
+        title: Post linking
+        ---
+
+        - 1 {% post_url 2008-11-21-complex %}
+        - 2 {% post_url /2008-11-21-complex %}
+        - 3 {% post_url es/2008-11-21-nested %}
+        - 4 {% post_url /es/2008-11-21-nested %}
+      CONTENT
+      create_post(content,
+                  "permalink"   => "pretty",
+                  "source"      => source_dir,
+                  "destination" => dest_dir,
+                  "read_posts"  => true)
     end
 
     should "not cause an error" do
@@ -608,19 +605,18 @@ def highlight_block_with_opts(options_string)
 
   context "simple page with nested post linking and path not used in `post_url`" do
     setup do
-      content = < "pretty",
-        "source"      => source_dir,
-        "destination" => dest_dir,
-        "read_posts"  => true,
-      })
+        - 1 {% post_url 2008-11-21-nested %}
+      CONTENT
+      create_post(content,
+                  "permalink"   => "pretty",
+                  "source"      => source_dir,
+                  "destination" => dest_dir,
+                  "read_posts"  => true)
     end
 
     should "not cause an error" do
@@ -642,60 +638,57 @@ def highlight_block_with_opts(options_string)
 
   context "simple page with invalid post name linking" do
     should "cause an error" do
-      content = < "pretty",
-          "source"      => source_dir,
-          "destination" => dest_dir,
-          "read_posts"  => true,
-        })
+        create_post(content,
+                    "permalink"   => "pretty",
+                    "source"      => source_dir,
+                    "destination" => dest_dir,
+                    "read_posts"  => true)
       end
     end
 
     should "cause an error with a bad date" do
-      content = < "pretty",
-          "source"      => source_dir,
-          "destination" => dest_dir,
-          "read_posts"  => true,
-        })
+        create_post(content,
+                    "permalink"   => "pretty",
+                    "source"      => source_dir,
+                    "destination" => dest_dir,
+                    "read_posts"  => true)
       end
     end
   end
 
   context "simple page with linking to a page" do
     setup do
-      content = < source_dir,
-        "destination" => dest_dir,
-        "read_all"    => true,
-      })
+      content = <<~CONTENT
+        ---
+        title: linking
+        ---
+
+        {% link contacts.html %}
+        {% link info.md %}
+        {% link /css/screen.css %}
+      CONTENT
+      create_post(content,
+                  "source"      => source_dir,
+                  "destination" => dest_dir,
+                  "read_all"    => true)
     end
 
     should "not cause an error" do
@@ -717,24 +710,23 @@ def highlight_block_with_opts(options_string)
 
   context "simple page with dynamic linking to a page" do
     setup do
-      content = < source_dir,
-        "destination" => dest_dir,
-        "read_all"    => true,
-      })
+      content = <<~CONTENT
+        ---
+        title: linking
+        ---
+
+        {% assign contacts_filename = 'contacts' %}
+        {% assign contacts_ext = 'html' %}
+        {% link {{contacts_filename}}.{{contacts_ext}} %}
+        {% assign info_path = 'info.md' %}
+        {% link {{\ info_path\ }} %}
+        {% assign screen_css_path = '/css' %}
+        {% link {{ screen_css_path }}/screen.css %}
+      CONTENT
+      create_post(content,
+                  "source"      => source_dir,
+                  "destination" => dest_dir,
+                  "read_all"    => true)
     end
 
     should "not cause an error" do
@@ -756,19 +748,18 @@ def highlight_block_with_opts(options_string)
 
   context "simple page with linking" do
     setup do
-      content = < source_dir,
-        "destination"      => dest_dir,
-        "collections"      => { "methods" => { "output" => true } },
-        "read_collections" => true,
-      })
+        {% link _methods/yaml_with_dots.md %}
+      CONTENT
+      create_post(content,
+                  "source"           => source_dir,
+                  "destination"      => dest_dir,
+                  "collections"      => { "methods" => { "output" => true } },
+                  "read_collections" => true)
     end
 
     should "not cause an error" do
@@ -782,20 +773,19 @@ def highlight_block_with_opts(options_string)
 
   context "simple page with dynamic linking" do
     setup do
-      content = < source_dir,
-        "destination"      => dest_dir,
-        "collections"      => { "methods" => { "output" => true } },
-        "read_collections" => true,
-      })
+      content = <<~CONTENT
+        ---
+        title: linking
+        ---
+
+        {% assign yaml_with_dots_path = '_methods/yaml_with_dots.md' %}
+        {% link {{yaml_with_dots_path}} %}
+      CONTENT
+      create_post(content,
+                  "source"           => source_dir,
+                  "destination"      => dest_dir,
+                  "collections"      => { "methods" => { "output" => true } },
+                  "read_collections" => true)
     end
 
     should "not cause an error" do
@@ -809,20 +799,19 @@ def highlight_block_with_opts(options_string)
 
   context "simple page with nested linking" do
     setup do
-      content = < source_dir,
-        "destination"      => dest_dir,
-        "collections"      => { "methods" => { "output" => true } },
-        "read_collections" => true,
-      })
+      content = <<~CONTENT
+        ---
+        title: linking
+        ---
+
+        - 1 {% link _methods/sanitized_path.md %}
+        - 2 {% link _methods/site/generate.md %}
+      CONTENT
+      create_post(content,
+                  "source"           => source_dir,
+                  "destination"      => dest_dir,
+                  "collections"      => { "methods" => { "output" => true } },
+                  "read_collections" => true)
     end
 
     should "not cause an error" do
@@ -840,43 +829,41 @@ def highlight_block_with_opts(options_string)
 
   context "simple page with invalid linking" do
     should "cause an error" do
-      content = < source_dir,
-          "destination"      => dest_dir,
-          "collections"      => { "methods" => { "output" => true } },
-          "read_collections" => true,
-        })
+        create_post(content,
+                    "source"           => source_dir,
+                    "destination"      => dest_dir,
+                    "collections"      => { "methods" => { "output" => true } },
+                    "read_collections" => true)
       end
     end
   end
 
   context "simple page with invalid dynamic linking" do
     should "cause an error" do
-      content = < source_dir,
-          "destination"      => dest_dir,
-          "collections"      => { "methods" => { "output" => true } },
-          "read_collections" => true,
-        })
+        create_post(content,
+                    "source"           => source_dir,
+                    "destination"      => dest_dir,
+                    "collections"      => { "methods" => { "output" => true } },
+                    "read_collections" => true)
       end
     end
   end
@@ -886,21 +873,20 @@ def highlight_block_with_opts(options_string)
       should "not allow symlink includes" do
         File.open("tmp/pages-test", "w") { |file| file.write("SYMLINK TEST") }
         assert_raises IOError do
-          content = < "pretty",
-            "source"      => source_dir,
-            "destination" => dest_dir,
-            "read_posts"  => true,
-            "safe"        => true,
-          })
+          content = <<~CONTENT
+            ---
+            title: Include symlink
+            ---
+
+            {% include tmp/pages-test %}
+
+          CONTENT
+          create_post(content,
+                      "permalink"   => "pretty",
+                      "source"      => source_dir,
+                      "destination" => dest_dir,
+                      "read_posts"  => true,
+                      "safe"        => true)
         end
         @result ||= ""
         refute_match(%r!SYMLINK TEST!, @result)
@@ -908,21 +894,20 @@ def highlight_block_with_opts(options_string)
 
       should "not expose the existence of symlinked files" do
         ex = assert_raises IOError do
-          content = < "pretty",
-            "source"      => source_dir,
-            "destination" => dest_dir,
-            "read_posts"  => true,
-            "safe"        => true,
-          })
+          content = <<~CONTENT
+            ---
+            title: Include symlink
+            ---
+
+            {% include tmp/pages-test-does-not-exist %}
+
+          CONTENT
+          create_post(content,
+                      "permalink"   => "pretty",
+                      "source"      => source_dir,
+                      "destination" => dest_dir,
+                      "read_posts"  => true,
+                      "safe"        => true)
         end
         assert_match(
           "Could not locate the included file 'tmp/pages-test-does-not-exist' " \
@@ -936,21 +921,20 @@ def highlight_block_with_opts(options_string)
 
     context "with one parameter" do
       setup do
-        content = < "pretty",
-          "source"      => source_dir,
-          "destination" => dest_dir,
-          "read_posts"  => true,
-        })
+          {% include params.html param="value" %}
+        CONTENT
+        create_post(content,
+                    "permalink"   => "pretty",
+                    "source"      => source_dir,
+                    "destination" => dest_dir,
+                    "read_posts"  => true)
       end
 
       should "correctly output include variable" do
@@ -964,22 +948,21 @@ def highlight_block_with_opts(options_string)
 
     context "with simple syntax but multiline markup" do
       setup do
-        content = < "pretty",
-          "source"      => source_dir,
-          "destination" => dest_dir,
-          "read_posts"  => true,
-        })
+          {% include params.html
+            param="value" %}
+        CONTENT
+        create_post(content,
+                    "permalink"   => "pretty",
+                    "source"      => source_dir,
+                    "destination" => dest_dir,
+                    "read_posts"  => true)
       end
 
       should "correctly output include variable" do
@@ -993,22 +976,21 @@ def highlight_block_with_opts(options_string)
 
     context "with variable syntax but multiline markup" do
       setup do
-        content = < "pretty",
-          "source"      => source_dir,
-          "destination" => dest_dir,
-          "read_posts"  => true,
-        })
+        content = <<~CONTENT
+          ---
+          title: Include tag parameters
+          ---
+
+          {% include sig.markdown myparam="test" %}
+          {% assign path = "params" | append: ".html" %}
+          {% include {{ path }}
+            param="value" %}
+        CONTENT
+        create_post(content,
+                    "permalink"   => "pretty",
+                    "source"      => source_dir,
+                    "destination" => dest_dir,
+                    "read_posts"  => true)
       end
 
       should "correctly output include variable" do
@@ -1022,57 +1004,54 @@ def highlight_block_with_opts(options_string)
 
     context "with invalid parameter syntax" do
       should "throw a ArgumentError" do
-        content = < "pretty",
-            "source"      => source_dir,
-            "destination" => dest_dir,
-            "read_posts"  => true,
-          })
+          create_post(content,
+                      "permalink"   => "pretty",
+                      "source"      => source_dir,
+                      "destination" => dest_dir,
+                      "read_posts"  => true)
         end
 
-        content = < "pretty",
-            "source"      => source_dir,
-            "destination" => dest_dir,
-            "read_posts"  => true,
-          })
+          create_post(content,
+                      "permalink"   => "pretty",
+                      "source"      => source_dir,
+                      "destination" => dest_dir,
+                      "read_posts"  => true)
         end
       end
     end
 
     context "with several parameters" do
       setup do
-        content = < "pretty",
-          "source"      => source_dir,
-          "destination" => dest_dir,
-          "read_posts"  => true,
-        })
+          {% include params.html param1="new_value" param2="another" %}
+        CONTENT
+        create_post(content,
+                    "permalink"   => "pretty",
+                    "source"      => source_dir,
+                    "destination" => dest_dir,
+                    "read_posts"  => true)
       end
 
       should "list all parameters" do
@@ -1087,19 +1066,18 @@ def highlight_block_with_opts(options_string)
 
     context "without parameters" do
       setup do
-        content = < "pretty",
-          "source"      => source_dir,
-          "destination" => dest_dir,
-          "read_posts"  => true,
-        })
+          {% include params.html %}
+        CONTENT
+        create_post(content,
+                    "permalink"   => "pretty",
+                    "source"      => source_dir,
+                    "destination" => dest_dir,
+                    "read_posts"  => true)
       end
 
       should "include file with empty parameters" do
@@ -1109,20 +1087,19 @@ def highlight_block_with_opts(options_string)
 
     context "with custom includes directory" do
       setup do
-        content = < "_includes_custom",
-          "permalink"    => "pretty",
-          "source"       => source_dir,
-          "destination"  => dest_dir,
-          "read_posts"   => true,
-        })
+        content = <<~CONTENT
+          ---
+          title: custom includes directory
+          ---
+
+          {% include custom.html %}
+        CONTENT
+        create_post(content,
+                    "includes_dir" => "_includes_custom",
+                    "permalink"    => "pretty",
+                    "source"       => source_dir,
+                    "destination"  => dest_dir,
+                    "read_posts"   => true)
       end
 
       should "include file from custom directory" do
@@ -1132,19 +1109,18 @@ def highlight_block_with_opts(options_string)
 
     context "without parameters within if statement" do
       setup do
-        content = < "pretty",
-          "source"      => source_dir,
-          "destination" => dest_dir,
-          "read_posts"  => true,
-        })
+          {% if true %}{% include params.html %}{% endif %}
+        CONTENT
+        create_post(content,
+                    "permalink"   => "pretty",
+                    "source"      => source_dir,
+                    "destination" => dest_dir,
+                    "read_posts"  => true)
       end
 
       should "include file with empty parameters within if statement" do
@@ -1154,23 +1130,22 @@ def highlight_block_with_opts(options_string)
 
     context "include missing file" do
       setup do
-        @content = < "pretty",
-            "source"      => source_dir,
-            "destination" => dest_dir,
-            "read_posts"  => true,
-          })
+          create_post(@content,
+                      "permalink"   => "pretty",
+                      "source"      => source_dir,
+                      "destination" => dest_dir,
+                      "read_posts"  => true)
         end
         assert_match(
           "Could not locate the included file 'missing.html' in any of " \
@@ -1182,7 +1157,7 @@ def highlight_block_with_opts(options_string)
 
     context "include tag with variable and liquid filters" do
       setup do
-        site = fixture_site({ "pygments" => true }).tap(&:read).tap(&:render)
+        site = fixture_site("pygments" => true).tap(&:read).tap(&:render)
         post = site.posts.docs.find do |p|
           p.basename.eql? "2013-12-17-include-variable-filters.markdown"
         end
@@ -1214,7 +1189,7 @@ def highlight_block_with_opts(options_string)
 
   context "relative include tag with variable and liquid filters" do
     setup do
-      site = fixture_site({ "pygments" => true }).tap(&:read).tap(&:render)
+      site = fixture_site("pygments" => true).tap(&:read).tap(&:render)
       post = site.posts.docs.find do |p|
         p.basename.eql? "2014-09-02-relative-includes.markdown"
       end
@@ -1249,23 +1224,22 @@ def highlight_block_with_opts(options_string)
     context "trying to do bad stuff" do
       context "include missing file" do
         setup do
-          @content = < "pretty",
-              "source"      => source_dir,
-              "destination" => dest_dir,
-              "read_posts"  => true,
-            })
+            create_post(@content,
+                        "permalink"   => "pretty",
+                        "source"      => source_dir,
+                        "destination" => dest_dir,
+                        "read_posts"  => true)
           end
           assert_match "Could not locate the included file 'missing.html' in any of " \
                        "[\"#{source_dir}\"].", exception.message
@@ -1274,23 +1248,22 @@ def highlight_block_with_opts(options_string)
 
       context "include existing file above you" do
         setup do
-          @content = < "pretty",
-              "source"      => source_dir,
-              "destination" => dest_dir,
-              "read_posts"  => true,
-            })
+            create_post(@content,
+                        "permalink"   => "pretty",
+                        "source"      => source_dir,
+                        "destination" => dest_dir,
+                        "read_posts"  => true)
           end
           assert_equal(
             "Invalid syntax for include tag. File contains invalid characters or " \
@@ -1306,21 +1279,20 @@ def highlight_block_with_opts(options_string)
       should "not allow symlink includes" do
         File.open("tmp/pages-test", "w") { |file| file.write("SYMLINK TEST") }
         assert_raises IOError do
-          content = < "pretty",
-            "source"      => source_dir,
-            "destination" => dest_dir,
-            "read_posts"  => true,
-            "safe"        => true,
-          })
+          content = <<~CONTENT
+            ---
+            title: Include symlink
+            ---
+
+            {% include_relative tmp/pages-test %}
+
+          CONTENT
+          create_post(content,
+                      "permalink"   => "pretty",
+                      "source"      => source_dir,
+                      "destination" => dest_dir,
+                      "read_posts"  => true,
+                      "safe"        => true)
         end
         @result ||= ""
         refute_match(%r!SYMLINK TEST!, @result)
@@ -1328,21 +1300,20 @@ def highlight_block_with_opts(options_string)
 
       should "not expose the existence of symlinked files" do
         ex = assert_raises IOError do
-          content = < "pretty",
-            "source"      => source_dir,
-            "destination" => dest_dir,
-            "read_posts"  => true,
-            "safe"        => true,
-          })
+          content = <<~CONTENT
+            ---
+            title: Include symlink
+            ---
+
+            {% include_relative tmp/pages-test-does-not-exist %}
+
+          CONTENT
+          create_post(content,
+                      "permalink"   => "pretty",
+                      "source"      => source_dir,
+                      "destination" => dest_dir,
+                      "read_posts"  => true,
+                      "safe"        => true)
         end
         assert_match(
           "Ensure it exists in one of those directories and is not a symlink "\
diff --git a/test/test_utils.rb b/test/test_utils.rb
index 844ef825d35..509f92e861d 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -202,20 +202,20 @@ class TestUtils < JekyllUnitTest
 
     should "replace everything else but ASCII characters" do
       assert_equal "the-config-yml-file",
-        Utils.slugify("The _config.yml file?", :mode => "ascii")
+                   Utils.slugify("The _config.yml file?", :mode => "ascii")
       assert_equal "f-rtive-glance",
-        Utils.slugify("fürtive glance!!!!", :mode => "ascii")
+                   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")
+                   Utils.slugify("The _config.yml file?", :mode => "latin")
       assert_equal "furtive-glance",
-        Utils.slugify("fürtive glance!!!!", :mode => "latin")
+                   Utils.slugify("fürtive glance!!!!", :mode => "latin")
       assert_equal "aaceeiioouu",
-        Utils.slugify("àáçèéíïòóúü", :mode => "latin")
+                   Utils.slugify("àáçèéíïòóúü", :mode => "latin")
       assert_equal "a-z",
-        Utils.slugify("Aあわれ鬱господинZ", :mode => "latin")
+                   Utils.slugify("Aあわれ鬱господинZ", :mode => "latin")
     end
 
     should "only replace whitespace if mode is raw" do

From e10444abf754116ce834e9b8e300342c394c7a9f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 12 Jul 2018 10:21:25 -0400
Subject: [PATCH 3094/4996] Update history to reflect merge of #7128 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 39f23f52be2..cbb7bebfff4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -69,6 +69,7 @@
   * Use assert_include (#7093)
   * Update rubocop version to 0.57.x ### -docs (#7078)
   * Example of CircleCI deployment through CircleCI v2 (#7024)
+  * Fix Rubocop offences in test files (#7128)
 
 ### Bug Fixes
 

From f9ada3ced6974330ee3e34facc49c82144e23a9c Mon Sep 17 00:00:00 2001
From: Scott Killen 
Date: Fri, 13 Jul 2018 06:33:56 -0400
Subject: [PATCH 3095/4996] Fix custom 404 page for GitHub pages (#7132)

Merge pull request 7132
---
 lib/site_template/404.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/site_template/404.html b/lib/site_template/404.html
index c472b4ea0a7..086a5c9ea98 100644
--- a/lib/site_template/404.html
+++ b/lib/site_template/404.html
@@ -1,4 +1,5 @@
 ---
+permalink: /404.html
 layout: default
 ---
 

From b69196cad3449ccb4134dba8b42594dae563bdbc Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 13 Jul 2018 06:33:58 -0400
Subject: [PATCH 3096/4996] Update history to reflect merge of #7132 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index cbb7bebfff4..9a59584e10d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -43,6 +43,7 @@
   * Suggest re-running command with --trace on fail (#6551)
   * Update item_property to return numbers as numbers instead of strings (#6608)
   * Use .markdown for page templates (#7126)
+  * Fix custom 404 page for GitHub pages (#7132)
 
 ### Major Enhancements
 

From 7a4b3fe03da3cb0c6f008ed3ce4ee4e417186b58 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Fri, 13 Jul 2018 11:12:49 -0500
Subject: [PATCH 3097/4996] Disable Liquid via front matter (#6824)

Merge pull request 6824
---
 features/post_data.feature  | 13 +++++++++++++
 lib/jekyll/convertible.rb   |  1 +
 lib/jekyll/document.rb      |  1 +
 test/fixtures/no_liquid.erb |  4 ++++
 test/test_convertible.rb    |  7 +++++++
 5 files changed, 26 insertions(+)
 create mode 100644 test/fixtures/no_liquid.erb

diff --git a/features/post_data.feature b/features/post_data.feature
index 79b92c2677a..c288115d393 100644
--- a/features/post_data.feature
+++ b/features/post_data.feature
@@ -251,6 +251,19 @@ Feature: Post data
     And I should see "Post categories: scifi and Movies" in "_site/scifi/movies/2009/03/27/star-wars.html"
     And I should see "Post categories: SciFi and movies" in "_site/scifi/movies/2013/03/17/star-trek.html"
 
+Scenario: Use page.render_with_liquid variable
+  Given I have a _posts directory
+  And I have the following posts:
+    | title           | render_with_liquid | date       | content                |
+    | Unrendered Post | false              | 2017-07-06 | Hello {{ page.title }} |
+    | Rendered Post   | true               | 2017-07-06 | Hello {{ page.title }} |
+  When I run jekyll build
+  Then I should get a zero exit status
+  And the _site directory should exist
+  And I should not see "Hello Unrendered Post" in "_site/2017/07/06/unrendered-post.html"
+  But I should see "Hello {{ page.title }}" in "_site/2017/07/06/unrendered-post.html"
+  And I should see "Hello Rendered Post" in "_site/2017/07/06/rendered-post.html"
+
   Scenario Outline: Use page.path variable
     Given I have a       /_posts directory
     And I have the following post in "":
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 5e703505f7b..85532ba9d02 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -160,6 +160,7 @@ def coffeescript_file?
     #
     # Returns true if the file has Liquid Tags or Variables, false otherwise.
     def render_with_liquid?
+      return false if data["render_with_liquid"] == false
       Jekyll::Utils.has_liquid_construct?(content)
     end
 
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index dbc1a6d82a0..8b6e54e3e12 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -159,6 +159,7 @@ def coffeescript_file?
     #   or if the document doesn't contain any Liquid Tags or Variables,
     #   true otherwise.
     def render_with_liquid?
+      return false if data["render_with_liquid"] == false
       !(coffeescript_file? || yaml_file? || !Utils.has_liquid_construct?(content))
     end
 
diff --git a/test/fixtures/no_liquid.erb b/test/fixtures/no_liquid.erb
new file mode 100644
index 00000000000..bfb7fc46fe7
--- /dev/null
+++ b/test/fixtures/no_liquid.erb
@@ -0,0 +1,4 @@
+---
+render_with_liquid: false
+---
+{% raw %}{% endraw %}
diff --git a/test/test_convertible.rb b/test/test_convertible.rb
index a3bea6baf48..8c204ebf514 100644
--- a/test/test_convertible.rb
+++ b/test/test_convertible.rb
@@ -73,5 +73,12 @@ class TestConvertible < JekyllUnitTest
       end
       refute_match(%r!Invalid permalink!, out)
     end
+
+    should "not parse Liquid if disabled in front matter" do
+      name = "no_liquid.erb"
+      @convertible.read_yaml(@base, name)
+      ret = @convertible.content.strip
+      assert_equal("{% raw %}{% endraw %}", ret)
+    end
   end
 end

From 3be9e74942a5aab465d85aeb29bb035248e0d84b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 13 Jul 2018 12:12:51 -0400
Subject: [PATCH 3098/4996] Update history to reflect merge of #6824 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9a59584e10d..194b60b3cb0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -76,6 +76,10 @@
 
   * Add call to unused method `validate_options` in `commands/serve.rb` (#7122)
 
+### feature
+
+  * Disable Liquid via front matter (#6824)
+
 ## 3.8.3 / 2018-06-05
 
 ### Bug Fixes

From c7ce7ae0549b8f79c3598c17f61f44779c30f404 Mon Sep 17 00:00:00 2001
From: Ken Salomon 
Date: Fri, 13 Jul 2018 19:48:00 -0400
Subject: [PATCH 3099/4996] fix up refute_equal call (#7133)

Merge pull request 7133
---
 test/test_collections.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/test_collections.rb b/test/test_collections.rb
index 7af86dd8c87..9d4e9b9d394 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -87,7 +87,8 @@ class TestCollections < JekyllUnitTest
     end
 
     should "contain only the default collections" do
-      refute_equal @site.collections, {}
+      expected = {}
+      refute_equal expected, @site.collections
       refute_nil @site.collections
     end
   end

From 16e9820dac7c29b5ad835ec7ca1023301f7963d0 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 13 Jul 2018 19:48:02 -0400
Subject: [PATCH 3100/4996] Update history to reflect merge of #7133 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 194b60b3cb0..47d54f03b08 100644
--- a/History.markdown
+++ b/History.markdown
@@ -71,6 +71,7 @@
   * Update rubocop version to 0.57.x ### -docs (#7078)
   * Example of CircleCI deployment through CircleCI v2 (#7024)
   * Fix Rubocop offences in test files (#7128)
+  * fix up refute_equal call (#7133)
 
 ### Bug Fixes
 

From 506c764e1e40f0202fa912aa3993c73a099fb314 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 16 Jul 2018 01:41:45 +0530
Subject: [PATCH 3101/4996] fix incorrectly passed arguments to assert_equal
 (#7134)

Merge pull request 7134
---
 test/test_ansi.rb              |  2 +-
 test/test_collections.rb       | 29 ++++++++--------
 test/test_commands_serve.rb    | 12 +++----
 test/test_configuration.rb     | 60 +++++++++++++++-------------------
 test/test_kramdown.rb          |  2 +-
 test/test_liquid_extensions.rb |  4 +--
 test/test_regenerator.rb       |  3 +-
 7 files changed, 52 insertions(+), 60 deletions(-)

diff --git a/test/test_ansi.rb b/test/test_ansi.rb
index e780e0dd521..c8aef1db949 100644
--- a/test/test_ansi.rb
+++ b/test/test_ansi.rb
@@ -15,7 +15,7 @@ class TestAnsi < JekyllUnitTest
     end
 
     should "be able to strip colors" do
-      assert_equal @subject.strip(@subject.yellow(@subject.red("hello"))), "hello"
+      assert_equal "hello", @subject.strip(@subject.yellow(@subject.red("hello")))
     end
 
     should "be able to detect colors" do
diff --git a/test/test_collections.rb b/test/test_collections.rb
index 9d4e9b9d394..eb1eb0f6371 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -9,11 +9,11 @@ class TestCollections < JekyllUnitTest
     end
 
     should "sanitize the label name" do
-      assert_equal @collection.label, "....etcpassword"
+      assert_equal "....etcpassword", @collection.label
     end
 
     should "have a sanitized relative path name" do
-      assert_equal @collection.relative_directory, "_....etcpassword"
+      assert_equal "_....etcpassword", @collection.relative_directory
     end
 
     should "have a sanitized full path" do
@@ -27,11 +27,11 @@ class TestCollections < JekyllUnitTest
     end
 
     should "sanitize the label name" do
-      assert_equal @collection.label, "methods"
+      assert_equal "methods", @collection.label
     end
 
     should "have default URL template" do
-      assert_equal @collection.url_template, "/:collection/:path:output_ext"
+      assert_equal "/:collection/:path:output_ext", @collection.url_template
     end
 
     should "contain no docs when initialized" do
@@ -39,7 +39,7 @@ class TestCollections < JekyllUnitTest
     end
 
     should "know its relative directory" do
-      assert_equal @collection.relative_directory, "_methods"
+      assert_equal "_methods", @collection.relative_directory
     end
 
     should "know the full path to itself on the filesystem" do
@@ -48,15 +48,15 @@ class TestCollections < JekyllUnitTest
 
     context "when turned into Liquid" do
       should "have a label attribute" do
-        assert_equal @collection.to_liquid["label"], "methods"
+        assert_equal "methods", @collection.to_liquid["label"]
       end
 
       should "have a docs attribute" do
-        assert_equal @collection.to_liquid["docs"], []
+        assert_equal [], @collection.to_liquid["docs"]
       end
 
       should "have a files attribute" do
-        assert_equal @collection.to_liquid["files"], []
+        assert_equal [], @collection.to_liquid["files"]
       end
 
       should "have a directory attribute" do
@@ -64,18 +64,18 @@ class TestCollections < JekyllUnitTest
       end
 
       should "have a relative_directory attribute" do
-        assert_equal @collection.to_liquid["relative_directory"], "_methods"
+        assert_equal "_methods", @collection.to_liquid["relative_directory"]
       end
 
       should "have a output attribute" do
-        assert_equal @collection.to_liquid["output"], false
+        assert_equal false, @collection.to_liquid["output"]
       end
     end
 
     should "know whether it should be written or not" do
-      assert_equal @collection.write?, false
+      assert_equal false, @collection.write?
       @collection.metadata["output"] = true
-      assert_equal @collection.write?, true
+      assert_equal true, @collection.write?
       @collection.metadata.delete "output"
     end
   end
@@ -107,7 +107,7 @@ class TestCollections < JekyllUnitTest
     end
 
     should "have custom URL template" do
-      assert_equal @collection.url_template, "/awesome/:path/"
+      assert_equal "/awesome/:path/", @collection.url_template
     end
   end
 
@@ -174,7 +174,8 @@ class TestCollections < JekyllUnitTest
     end
 
     should "extract the configuration collection information as metadata" do
-      assert_equal @collection.metadata, "foo" => "bar", "baz" => "whoo"
+      expected = { "foo" => "bar", "baz" => "whoo" }
+      assert_equal expected, @collection.metadata
     end
   end
 
diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb
index b589de2f37a..2970efb614f 100644
--- a/test/test_commands_serve.rb
+++ b/test/test_commands_serve.rb
@@ -154,9 +154,7 @@ def serve(opts)
     end
 
     should "label itself" do
-      assert_equal(
-        @merc.name, :serve
-      )
+      assert_equal :serve, @merc.name
     end
 
     should "have aliases" do
@@ -269,11 +267,11 @@ def serve(opts)
 
       context "verbose" do
         should "debug when verbose" do
-          assert_equal custom_opts("verbose" => true)[:Logger].level, 5
+          assert_equal 5, custom_opts("verbose" => true)[:Logger].level
         end
 
         should "warn when not verbose" do
-          assert_equal custom_opts({})[:Logger].level, 3
+          assert_equal 3, custom_opts({})[:Logger].level
         end
       end
 
@@ -305,8 +303,8 @@ def serve(opts)
           )
 
           assert result[:SSLEnable]
-          assert_equal result[:SSLPrivateKey],  "c2"
-          assert_equal result[:SSLCertificate], "c1"
+          assert_equal "c2", result[:SSLPrivateKey]
+          assert_equal "c1", result[:SSLCertificate]
         end
       end
     end
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 3f19949a846..d90d970a63e 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -17,7 +17,7 @@ class TestConfiguration < JekyllUnitTest
     should "merge input over defaults" do
       result = Configuration.from("source" => "blah")
       refute_equal result["source"], Configuration::DEFAULTS["source"]
-      assert_equal result["source"], "blah"
+      assert_equal "blah", result["source"]
     end
 
     should "return a valid Configuration instance" do
@@ -26,13 +26,11 @@ class TestConfiguration < JekyllUnitTest
 
     should "add default collections" do
       result = Configuration.from({})
-      assert_equal(
-        result["collections"],
-        "posts" => {
-          "output"    => true,
-          "permalink" => "/:categories/:year/:month/:day/:title:output_ext",
-        }
-      )
+      expected = { "posts" => {
+        "output"    => true,
+        "permalink" => "/:categories/:year/:month/:day/:title:output_ext",
+      }, }
+      assert_equal expected, result["collections"]
     end
 
     should "NOT backwards-compatibilize" do
@@ -68,32 +66,29 @@ class TestConfiguration < JekyllUnitTest
     should "turn an array into a hash" do
       result = Configuration[{ "collections" => %w(methods) }].add_default_collections
       assert_instance_of Hash, result["collections"]
-      assert_equal(
-        result["collections"],
-        "posts" => { "output" => true }, "methods" => {}
-      )
+      expected = { "posts" => { "output" => true }, "methods" => {} }
+      assert_equal expected, result["collections"]
     end
 
     should "only assign collections.posts.permalink if a permalink is specified" do
       result = Configuration[{ "permalink" => "pretty", "collections" => {} }]
         .add_default_collections
-      assert_equal(
-        result["collections"],
-        "posts" => {
-          "output"    => true,
-          "permalink" => "/:categories/:year/:month/:day/:title/",
-        }
-      )
+      expected = { "posts" => {
+        "output"    => true,
+        "permalink" => "/:categories/:year/:month/:day/:title/",
+      }, }
+      assert_equal expected, result["collections"]
 
       result = Configuration[{ "permalink" => nil, "collections" => {} }]
         .add_default_collections
-      assert_equal result["collections"], "posts" => { "output" => true }
+      expected = { "posts" => { "output" => true } }
+      assert_equal expected, result["collections"]
     end
 
     should "forces posts to output" do
       result = Configuration[{ "collections" => { "posts" => { "output" => false } } }]
         .add_default_collections
-      assert_equal result["collections"]["posts"]["output"], true
+      assert_equal true, result["collections"]["posts"]["output"]
     end
   end
 
@@ -216,23 +211,19 @@ class TestConfiguration < JekyllUnitTest
     should "transform string exclude into an array" do
       assert @config.key?("exclude")
       assert @config.backwards_compatibilize.key?("exclude")
-      assert_equal(
-        @config.backwards_compatibilize["exclude"],
-        %w(READ-ME.md Gemfile CONTRIBUTING.hello.markdown)
-      )
+      expected = %w(READ-ME.md Gemfile CONTRIBUTING.hello.markdown)
+      assert_equal expected, @config.backwards_compatibilize["exclude"]
     end
     should "transform string include into an array" do
       assert @config.key?("include")
       assert @config.backwards_compatibilize.key?("include")
-      assert_equal(
-        @config.backwards_compatibilize["include"],
-        %w(STOP_THE_PRESSES.txt .heloses .git)
-      )
+      expected = %w(STOP_THE_PRESSES.txt .heloses .git)
+      assert_equal expected, @config.backwards_compatibilize["include"]
     end
     should "set highlighter to pygments" do
       assert @config.key?("pygments")
       assert !@config.backwards_compatibilize.key?("pygments")
-      assert_equal @config.backwards_compatibilize["highlighter"], "pygments"
+      assert_equal "pygments", @config.backwards_compatibilize["highlighter"]
     end
     should "adjust directory names" do
       assert @config.key?("layouts")
@@ -500,12 +491,13 @@ class TestConfiguration < JekyllUnitTest
         )
       )
       assert_equal(
-        config["folded_string"],
-        "This string of text will ignore newlines till the next key.\n"
+        "This string of text will ignore newlines till the next key.\n",
+        config["folded_string"]
       )
+
       assert_equal(
-        config["clean_folded_string"],
-        "This string of text will ignore newlines till the next key."
+        "This string of text will ignore newlines till the next key.",
+        config["clean_folded_string"]
       )
     end
 
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index d95955f4d6b..94d6a4df5e5 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -155,7 +155,7 @@ class TestKramdown < JekyllUnitTest
       )
 
       expect(Kramdown::Document).to receive(:new) do |arg1, hash|
-        assert_equal hash["syntax_highlighter_opts"]["hello"], "world"
+        assert_equal "world", hash["syntax_highlighter_opts"]["hello"]
         original.call(arg1, hash)
       end
 
diff --git a/test/test_liquid_extensions.rb b/test/test_liquid_extensions.rb
index 30637b33315..5886d80d17a 100644
--- a/test/test_liquid_extensions.rb
+++ b/test/test_liquid_extensions.rb
@@ -22,11 +22,11 @@ def render(context)
     end
 
     should "extract the var properly" do
-      assert_equal @template.render("page" => { "name" => "tobi" }), "hi tobi"
+      assert_equal "hi tobi", @template.render("page" => { "name" => "tobi" })
     end
 
     should "return the variable name if the value isn't there" do
-      assert_equal @template.render("page" => { "title" => "tobi" }), "hi page.name"
+      assert_equal "hi page.name", @template.render("page" => { "title" => "tobi" })
     end
   end
 end
diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb
index 122bc40f440..39b28baa4e7 100644
--- a/test/test_regenerator.rb
+++ b/test/test_regenerator.rb
@@ -153,7 +153,8 @@ class TestRegenerator < JekyllUnitTest
       assert @regenerator.cache[@path]
 
       @regenerator.clear_cache
-      assert_equal @regenerator.cache, {}
+      expected = {}
+      assert_equal expected, @regenerator.cache
     end
 
     should "write to the metadata file" do

From e49f507e4fcd5d71c8e79f70b931fb72c3416872 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 15 Jul 2018 16:11:46 -0400
Subject: [PATCH 3102/4996] Update history to reflect merge of #7134 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 47d54f03b08..8fdf79b5176 100644
--- a/History.markdown
+++ b/History.markdown
@@ -72,6 +72,7 @@
   * Example of CircleCI deployment through CircleCI v2 (#7024)
   * Fix Rubocop offences in test files (#7128)
   * fix up refute_equal call (#7133)
+  * Fix incorrectly passed arguments to assert_equal (#7134)
 
 ### Bug Fixes
 

From b2c6d03b47979a7e058d4ffd824948e4a2a8f7c8 Mon Sep 17 00:00:00 2001
From: 104fps <36814947+104fps@users.noreply.github.com>
Date: Mon, 16 Jul 2018 01:18:43 +0300
Subject: [PATCH 3103/4996] Update docs about post creation (#7138)

Merge pull request 7138
---
 .../_posts/0000-00-00-welcome-to-jekyll.markdown.erb        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb b/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
index 8d8f7c162bd..187a4d9b048 100644
--- a/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
+++ b/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
@@ -6,7 +6,11 @@ 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 `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.
+Jekyll requires blog post files to be named according to the following format:
+
+`YEAR-MONTH-DAY-title.MARKUP`
+
+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. After that, include the necessary front matter. Take a look at the source for this post to get an idea about how it works.
 
 Jekyll also offers powerful support for code snippets:
 

From 34a1b7aeefca27d0100437d84c9564433bfd5430 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 15 Jul 2018 18:18:44 -0400
Subject: [PATCH 3104/4996] Update history to reflect merge of #7138 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8fdf79b5176..939e2a56206 100644
--- a/History.markdown
+++ b/History.markdown
@@ -34,6 +34,7 @@
   * add jekyll-xml-source (#7114)
   * Add the jekyll-firstimage filter plugin (#7127)
   * Use a real theme in the example (#7125)
+  * Update docs about post creation (#7138)
 
 ### Minor Enhancements
 

From af78a1a5682dd116b00d7cba60f4ac343faf0b72 Mon Sep 17 00:00:00 2001
From: Belhassen Chelbi 
Date: Mon, 16 Jul 2018 03:17:22 +0100
Subject: [PATCH 3105/4996] Add DEV Community's Jekyll tag to community page

---
 docs/help/index.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/help/index.md b/docs/help/index.md
index abc7ea2adba..4d0c126b44c 100644
--- a/docs/help/index.md
+++ b/docs/help/index.md
@@ -43,6 +43,10 @@ Known breaking changes are listed in the upgrading docs.
 
 Watch videos from members of the Jekyll community speak about interesting use cases, tricks they've learned or meta Jekyll topics.
 
+### The Dev community
+
+[DEV’s jekyll tag](https://dev.to/t/jekyll) is a place to share Jekyll projects, articles and tutorials as well as start discussions and ask for feedback on Jekyll-related topics. Developers of all skill-levels are welcome to take part.
+
 ### [Google](https://www.google.com/?q=jekyll)
 
 Add **jekyll** to almost any query, and you'll find just what you need.

From ca2766c2a146bec5393cc12b0a52340b66829c23 Mon Sep 17 00:00:00 2001
From: Belhassen Chelbi 
Date: Mon, 16 Jul 2018 14:58:26 +0100
Subject: [PATCH 3106/4996] Add DEV Community's Jekyll tag to community page
 (#7139)

Merge pull request 7139
---
 docs/help/index.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/help/index.md b/docs/help/index.md
index abc7ea2adba..4d0c126b44c 100644
--- a/docs/help/index.md
+++ b/docs/help/index.md
@@ -43,6 +43,10 @@ Known breaking changes are listed in the upgrading docs.
 
 Watch videos from members of the Jekyll community speak about interesting use cases, tricks they've learned or meta Jekyll topics.
 
+### The Dev community
+
+[DEV’s jekyll tag](https://dev.to/t/jekyll) is a place to share Jekyll projects, articles and tutorials as well as start discussions and ask for feedback on Jekyll-related topics. Developers of all skill-levels are welcome to take part.
+
 ### [Google](https://www.google.com/?q=jekyll)
 
 Add **jekyll** to almost any query, and you'll find just what you need.

From 707e48a41272796378f094d5e33612b023c45c9d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 16 Jul 2018 09:58:28 -0400
Subject: [PATCH 3107/4996] Update history to reflect merge of #7139 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 939e2a56206..c2277cee65f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -35,6 +35,7 @@
   * Add the jekyll-firstimage filter plugin (#7127)
   * Use a real theme in the example (#7125)
   * Update docs about post creation (#7138)
+  * Add DEV Community's Jekyll tag to community page (#7139)
 
 ### Minor Enhancements
 

From 6802ec93eb9c6f25489b6c734966ec4099ed9eaa Mon Sep 17 00:00:00 2001
From: Belhassen Chelbi 
Date: Mon, 16 Jul 2018 15:13:26 +0100
Subject: [PATCH 3108/4996] Add Dev.to website link

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

diff --git a/docs/help/index.md b/docs/help/index.md
index 4d0c126b44c..45492aaac3c 100644
--- a/docs/help/index.md
+++ b/docs/help/index.md
@@ -43,7 +43,7 @@ Known breaking changes are listed in the upgrading docs.
 
 Watch videos from members of the Jekyll community speak about interesting use cases, tricks they've learned or meta Jekyll topics.
 
-### The Dev community
+### [The Dev community](https://dev.to/)
 
 [DEV’s jekyll tag](https://dev.to/t/jekyll) is a place to share Jekyll projects, articles and tutorials as well as start discussions and ask for feedback on Jekyll-related topics. Developers of all skill-levels are welcome to take part.
 

From 50e0379444f3b0906d6697934d1c7c49946f666b Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Tue, 17 Jul 2018 00:34:20 +0530
Subject: [PATCH 3109/4996] Initialize upgrading doc for v4.0 (#7140)

Merge pull request 7140
---
 docs/_docs/upgrading/3-to-4.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 docs/_docs/upgrading/3-to-4.md

diff --git a/docs/_docs/upgrading/3-to-4.md b/docs/_docs/upgrading/3-to-4.md
new file mode 100644
index 00000000000..8bd1fde1ae3
--- /dev/null
+++ b/docs/_docs/upgrading/3-to-4.md
@@ -0,0 +1,28 @@
+---
+title: Upgrading from 3.x to 4.x
+permalink: /docs/upgrading/3-to-4/
+---
+
+Upgrading from an older version of Jekyll? A few things have changed in Jekyll 4
+that you'll want to know about.
+
+Before we dive in, you need to have at least Ruby 2.3.0 installed. Run the following
+in your terminal to check
+
+```sh
+ruby -v
+```
+
+If you're using Ruby >= 2.3.0, go ahead and fetch the latest version of Jekyll:
+
+```sh
+gem update jekyll
+```
+
+---
+
+  *Insert sections here*
+
+---
+
+*Did we miss something? Please click "Improve this page" above and add a section. Thanks!*

From ad9fbeb4b1d64b267f19955f50b32da89b5c6ebd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 16 Jul 2018 15:04:22 -0400
Subject: [PATCH 3110/4996] Update history to reflect merge of #7140 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c2277cee65f..efd8a7d0982 100644
--- a/History.markdown
+++ b/History.markdown
@@ -36,6 +36,7 @@
   * Use a real theme in the example (#7125)
   * Update docs about post creation (#7138)
   * Add DEV Community's Jekyll tag to community page (#7139)
+  * Initialize upgrading doc for v4.0 (#7140)
 
 ### Minor Enhancements
 

From 5c41eb743fb323653a5e12af85e5abc548fff0dd Mon Sep 17 00:00:00 2001
From: jess 
Date: Mon, 16 Jul 2018 13:06:18 -0700
Subject: [PATCH 3111/4996] Update README.markdown
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Hi, I'm making updates for Open Collective. Either you or a supporter signed this repo up for Open Collective. This pull request adds backers and sponsors from your Open Collective https://opencollective.com/jekyll❤️

It adds two badges at the top to show the latest number of backers and sponsors. It also adds placeholders so that the avatar/logo of new backers/sponsors can automatically be shown without having to update your README.md. [more info](https://github.com/opencollective/opencollective/wiki/Github-banner). See how it looks on this [repo](https://github.com/apex/apex#backers).

You can also add a postinstall script to let people know after npm|yarn install that you are welcoming donations (optional). [More info](https://github.com/OpenCollective/opencollective-cli)
You can also add a "Donate" button to your website and automatically show your backers and sponsors there with our widgets. Have a look here: https://opencollective.com/widgets

P.S: As with any pull request, feel free to comment or suggest changes. The only thing "required" are the placeholders on the README because we believe it's important to acknowledge the people in your community that are contributing (financially or with code!).

Thank you for your great contribution to the open source community. You are awesome! 🙌
And welcome to the open collective community! 😊

Come chat with us in the #opensource channel on https://slack.opencollective.com - great place to ask questions and share best practices with other open source sustainers!
---
 README.markdown | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/README.markdown b/README.markdown
index 787d2c6cba7..76ea46672c8 100644
--- a/README.markdown
+++ b/README.markdown
@@ -6,6 +6,8 @@
 [![Maintainability](https://api.codeclimate.com/v1/badges/8ba0cb5b17bb9848e128/maintainability)](codeclimate)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/8ba0cb5b17bb9848e128/test_coverage)](coverage)
 [![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)][hakiri]
+[![Backers on Open Collective](https://opencollective.com/jekyll/backers/badge.svg)](#backers)
+[![Sponsors on Open Collective](https://opencollective.com/jekyll/sponsors/badge.svg)](#sponsors) 
 
 [ruby-gems]: https://rubygems.org/gems/jekyll
 [codeclimate]: https://codeclimate.com/github/jekyll/jekyll
@@ -54,6 +56,26 @@ these terms, please let one of our [core team members](https://jekyllrb.com/team
 * Use the built-in [Liquid Extensions](https://jekyllrb.com/docs/templates/) to make your life easier
 * Use custom [Plugins](https://jekyllrb.com/docs/plugins/) to generate content specific to your site
 
+## Credits
+
+### Contributors
+
+This project exists thanks to all the people who contribute.
+
+
+### Backers
+
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/jekyll#backer)]
+
+
+
+
 ## License
 
 See the [LICENSE](https://github.com/jekyll/jekyll/blob/master/LICENSE) file.

From 89ac354d5aa82c1bae7159181572520045d390b9 Mon Sep 17 00:00:00 2001
From: olivia 
Date: Tue, 17 Jul 2018 12:20:09 +0200
Subject: [PATCH 3112/4996] add blank newline

---
 docs/_data/sponsors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_data/sponsors.yml b/docs/_data/sponsors.yml
index 812f8dec837..ca05a0b7293 100644
--- a/docs/_data/sponsors.yml
+++ b/docs/_data/sponsors.yml
@@ -1,3 +1,3 @@
 - name: Forestry.io
   image: /img/forestry-logo.png
-  url: https://forestry.io
\ No newline at end of file
+  url: https://forestry.io

From f0e26e9c1af393a5a73867b6ce6263dae6853eac Mon Sep 17 00:00:00 2001
From: olivia 
Date: Tue, 17 Jul 2018 15:58:16 +0200
Subject: [PATCH 3113/4996] add intentions to post; change title

---
 .../2018-06-26-jekyll-sponsoring.markdown       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/docs/_posts/2018-06-26-jekyll-sponsoring.markdown b/docs/_posts/2018-06-26-jekyll-sponsoring.markdown
index 10b7a3b90af..9c20247df9e 100644
--- a/docs/_posts/2018-06-26-jekyll-sponsoring.markdown
+++ b/docs/_posts/2018-06-26-jekyll-sponsoring.markdown
@@ -1,5 +1,5 @@
 ---
-title: 'Jekyll and Sponsoring'
+title: "Sponsoring Jekyll's development"
 date: 2018-06-26 16:00:00 +0200
 author: oe
 categories: [community]
@@ -32,6 +32,19 @@ OpenCollective is a service that makes it easy for open source projects to recei
 from individuals and companies alike. It's specifically designed for open source and
 many other projects already use it for funding.
 
+Sponsoring is, for us, a method to finally realize some of the more ambitious goals we've had
+with the project for years. The closest thing we want to realize is to __release Jekyll 4.0, and
+to make it as polished as we can__. In the future, we would also like to work on other things that
+will improve the Jekyll ecosystem. Here's a couple of ideas:
+
+- Create a comprehensive official plugin and theme directory site
+- Improve tooling built around measuring and improving Jekyll's performance
+- Improve maintenance for official plugins
+- Including the community into official decisions; making Jekyll more friendly to folks in the community
+
+Again, these are just some ideas, but with the help of sponsoring, they are now one step closer
+to being realized :heart:
+
 With that, we would like to announce our very first sponsor: [__Forestry.io__](https://forestry.io)! Forestry is
 a CMS that integrates with your Jekyll sites and lets you update content using a beautiful
 interface, and then automatically commits it back to your GitHub repository. We're excited to have
@@ -46,4 +59,4 @@ you can consider a small monthly donation to our [OpenCollective page](http://op
 If your company heavily relies on Jekyll, consider sponsoring us! Contact me at
 `olivia at fastmail dot com` and we'll figure something out together.
 
-Thanks for sticking with us, and happy Jekylling! :tada:
\ No newline at end of file
+Thanks for sticking with us, and happy Jekylling! :tada:

From 477dbb34f486e445c4188f9bcc5f815721089501 Mon Sep 17 00:00:00 2001
From: olivia 
Date: Tue, 17 Jul 2018 16:04:14 +0200
Subject: [PATCH 3114/4996] update with suggestions

---
 docs/_posts/2018-06-26-jekyll-sponsoring.markdown | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/_posts/2018-06-26-jekyll-sponsoring.markdown b/docs/_posts/2018-06-26-jekyll-sponsoring.markdown
index 9c20247df9e..62089e871ba 100644
--- a/docs/_posts/2018-06-26-jekyll-sponsoring.markdown
+++ b/docs/_posts/2018-06-26-jekyll-sponsoring.markdown
@@ -5,7 +5,7 @@ author: oe
 categories: [community]
 ---
 
-_(TL;DR: We're open for sponsorships over our [OpenCollective page](https://opencollective.com/jekyll))_
+_(TL;DR: We're open for sponsorships on our [OpenCollective page](https://opencollective.com/jekyll))_
 
 Hi Jekyllers,
 
@@ -26,7 +26,9 @@ Jekyll has always been a product of volunteers. Rarely has someone been paid to
 a certain plugin or feature. Today, we're excited to announce that we will finally
 be able to fund our contributors! __We are opening an OpenCollective to receive
 individual and corporate sponsorships__. This is not unheard of, [Hugo](http://gohugo.io)
-is also funded by sponsorships, as are many other similar projects.
+is also funded by sponsorships, as are many other similar projects, such as
+[webpack](https://opencollective.com/webpack), [Babel](https://opencollective.com/babel) or
+[RuboCop](https://opencollective.com/rubocop).
 
 OpenCollective is a service that makes it easy for open source projects to receive funding
 from individuals and companies alike. It's specifically designed for open source and
@@ -45,6 +47,10 @@ will improve the Jekyll ecosystem. Here's a couple of ideas:
 Again, these are just some ideas, but with the help of sponsoring, they are now one step closer
 to being realized :heart:
 
+
      
+  
+
      
+
 With that, we would like to announce our very first sponsor: [__Forestry.io__](https://forestry.io)! Forestry is
 a CMS that integrates with your Jekyll sites and lets you update content using a beautiful
 interface, and then automatically commits it back to your GitHub repository. We're excited to have
@@ -56,7 +62,7 @@ performance. Surprisingly, that's what happens when you properly fund people for
 
 If you have been a long time user for Jekyll and would like to give something back to the project,
 you can consider a small monthly donation to our [OpenCollective page](http://opencollective.com/jekyll).
-If your company heavily relies on Jekyll, consider sponsoring us! Contact me at
+If your company heavily relies on Jekyll, do consider sponsoring us! Contact me at
 `olivia at fastmail dot com` and we'll figure something out together.
 
 Thanks for sticking with us, and happy Jekylling! :tada:

From e61cc513e96aca4d7955c687bf4119fd6e5d5f57 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Tue, 17 Jul 2018 20:12:10 +0530
Subject: [PATCH 3115/4996] Lock Travis to Bundler-1.16.2 (#7144)

Merge pull request 7144
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2aa960d612d..b8277623c02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,4 +52,4 @@ after_success:
 
 before_install:
   - gem update --system
-  - gem install bundler
+  - gem install bundler --version 1.16.2

From 02a2f9460ad654e4e098402d47fb81407a2223a2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 17 Jul 2018 10:42:12 -0400
Subject: [PATCH 3116/4996] Update history to reflect merge of #7144 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index efd8a7d0982..bce05b63c08 100644
--- a/History.markdown
+++ b/History.markdown
@@ -76,6 +76,7 @@
   * Fix Rubocop offences in test files (#7128)
   * fix up refute_equal call (#7133)
   * Fix incorrectly passed arguments to assert_equal (#7134)
+  * Lock Travis to Bundler-1.16.2 (#7144)
 
 ### Bug Fixes
 

From 5701087e7b2b61dbea84b3782ca55195e348c5d4 Mon Sep 17 00:00:00 2001
From: Ken Salomon 
Date: Fri, 20 Jul 2018 19:22:44 -0400
Subject: [PATCH 3117/4996] Do not process Liquid in post excerpt when disabled
 in front matter (#7146)

Merge pull request 7146
---
 features/post_excerpts.feature | 18 ++++++++++++++++++
 lib/jekyll/excerpt.rb          |  1 +
 2 files changed, 19 insertions(+)

diff --git a/features/post_excerpts.feature b/features/post_excerpts.feature
index 6267fdc6572..38de73528c6 100644
--- a/features/post_excerpts.feature
+++ b/features/post_excerpts.feature
@@ -70,3 +70,21 @@ Feature: Post excerpts
     And the "_site/2007/12/31/entry1.html" file should exist
     And I should see "
      content for entry1.
      " in "_site/index.html"
     And I should see "
      content for entry1.
      \n" in "_site/2007/12/31/entry1.html"
+
+  Scenario: Excerpts from posts having 'render_with_liquid' in their front matter
+    Given I have an "index.html" page that contains "{% for post in site.posts %}{{ post.excerpt }}{% endfor %}"
+    And I have a _posts directory
+    And I have a _layouts directory
+    And I have a post layout that contains "{{ page.excerpt }}"
+    And I have the following posts:
+      | title           | layout | render_with_liquid | date       | content                                  |
+      | Unrendered Post | post   | false              | 2017-07-06 | Liquid is not rendered at {{ page.url }} |
+      | Rendered Post   | post   | true               | 2017-07-06 | Liquid is rendered at {{ page.url }}     |
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site/2017/07/06 directory should exist
+    And the "_site/2017/07/06/unrendered-post.html" file should exist
+    And the "_site/2017/07/06/rendered-post.html" file should exist
+    And I should see "Liquid is not rendered at {{ page.url }}" in "_site/2017/07/06/unrendered-post.html"
+    But I should see "
      Liquid is rendered at /2017/07/06/rendered-post.html
      " in "_site/2017/07/06/rendered-post.html"
+    And I should see "
      Liquid is not rendered at {{ page.url }}
      \n
      Liquid is rendered at /2017/07/06/rendered-post.html
      " in "_site/index.html"
diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb
index 6f4ac3d8ed0..8eea0e2edc0 100644
--- a/lib/jekyll/excerpt.rb
+++ b/lib/jekyll/excerpt.rb
@@ -89,6 +89,7 @@ def place_in_layout?
     end
 
     def render_with_liquid?
+      return false if data["render_with_liquid"] == false
       !(coffeescript_file? || yaml_file? || !Utils.has_liquid_construct?(content))
     end
 

From fe0a6caa7fd7f0414fff6be5c470633fe789449d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 20 Jul 2018 19:22:46 -0400
Subject: [PATCH 3118/4996] Update history to reflect merge of #7146 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index bce05b63c08..3eb521eb83e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -85,6 +85,7 @@
 ### feature
 
   * Disable Liquid via front matter (#6824)
+  * Do not process Liquid in post excerpt when disabled in front matter (#7146)
 
 ## 3.8.3 / 2018-06-05
 

From ef41eeb7d457dd26b5516937582264f47782875f Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Mon, 23 Jul 2018 12:57:56 -0500
Subject: [PATCH 3119/4996] Name some of our Travis builds

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index b8277623c02..d1c4f739a0c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,10 @@ matrix:
   include:
     - rvm: *ruby1
       env: TEST_SUITE=fmt
+      name: "🤖️ Code Format"
     - rvm: *ruby1
       env: TEST_SUITE=default-site
+      name: "🏠️ Default Site"
   exclude:
     - rvm: *jruby
       env: TEST_SUITE=cucumber

From 493757d7cfdfa15dccb9c0746a3e3f3e1dfc38f9 Mon Sep 17 00:00:00 2001
From: Kevin Plattret 
Date: Fri, 27 Jul 2018 20:17:00 +0100
Subject: [PATCH 3120/4996] Add version badge for date filters with ordinal
 (#7162)

Merge pull request 7162
---
 docs/_docs/templates.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md
index 4b93b75afd1..052c74e8da5 100644
--- a/docs/_docs/templates.md
+++ b/docs/_docs/templates.md
@@ -94,7 +94,8 @@ you come up with your own tags via plugins.
     
       
         
      Date to String in ordinal US style
      
-        
      Format a date to ordinal, US, short format.
      
+        
      Format a date to ordinal, US, short format.
+        {% include docs_version_badge.html version="3.8.0" %}
      
       
       
         
      
@@ -122,7 +123,8 @@ you come up with your own tags via plugins.
     
       
         
      Date to Long String in ordinal UK style
      
-        
      Format a date to ordinal, UK, long format.
      
+        
      Format a date to ordinal, UK, long format.
+        {% include docs_version_badge.html version="3.8.0" %}
      
       
       
         
      

From d0f8c86d2f6e87359008302dd6f54cdb8a471c6f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 27 Jul 2018 15:17:03 -0400
Subject: [PATCH 3121/4996] Update history to reflect merge of #7162 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3eb521eb83e..68903a28978 100644
--- a/History.markdown
+++ b/History.markdown
@@ -37,6 +37,7 @@
   * Update docs about post creation (#7138)
   * Add DEV Community's Jekyll tag to community page (#7139)
   * Initialize upgrading doc for v4.0 (#7140)
+  * Add version badge for date filters with ordinal (#7162)
 
 ### Minor Enhancements
 

From 000189596898181b98ebe4bfc542abedefbd1a5b Mon Sep 17 00:00:00 2001
From: Zhang Xiangze 
Date: Sun, 29 Jul 2018 00:22:15 +0800
Subject: [PATCH 3122/4996] Add closing tags for  (#7163)

Merge pull request 7163
---
 docs/_docs/includes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/_docs/includes.md b/docs/_docs/includes.md
index 948720474ab..8fa2af12ed6 100644
--- a/docs/_docs/includes.md
+++ b/docs/_docs/includes.md
@@ -86,6 +86,7 @@ For example, suppose you have a special image syntax with complex formatting, an
    
    Jekyll logo
+   
    
      This is the Jekyll logo
      
 
 ```
@@ -98,6 +99,7 @@ You could templatize this content in your include and make each value available
    
    {{ include.alt }}
+   
    
      {{ include.caption }}
      
 
 ```

From 37c9347422052307ce943d00485b1bb2d195d2a3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 28 Jul 2018 12:22:16 -0400
Subject: [PATCH 3123/4996] Update history to reflect merge of #7163 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 68903a28978..d1f2913ba0b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -38,6 +38,7 @@
   * Add DEV Community's Jekyll tag to community page (#7139)
   * Initialize upgrading doc for v4.0 (#7140)
   * Add version badge for date filters with ordinal (#7162)
+  * Add closing tags for <a> (#7163)
 
 ### Minor Enhancements
 

From 6e980f3f6a86f2fd72ac111203b504dd46053638 Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Tue, 31 Jul 2018 15:12:57 -0500
Subject: [PATCH 3124/4996] Remove 'cache_dir' during `jekyll clean` (#7158)

Merge pull request 7158
---
 lib/jekyll/commands/clean.rb | 2 ++
 lib/jekyll/configuration.rb  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/lib/jekyll/commands/clean.rb b/lib/jekyll/commands/clean.rb
index 1ef65db22db..9bebd5176bf 100644
--- a/lib/jekyll/commands/clean.rb
+++ b/lib/jekyll/commands/clean.rb
@@ -22,10 +22,12 @@ def process(options)
           options = configuration_from_options(options)
           destination = options["destination"]
           metadata_file = File.join(options["source"], ".jekyll-metadata")
+          cache_dir = File.join(options["source"], options["cache_dir"])
           sass_cache = ".sass-cache"
 
           remove(destination, :checker_func => :directory?)
           remove(metadata_file, :checker_func => :file?)
+          remove(cache_dir, :checker_func => :directory?)
           remove(sass_cache, :checker_func => :directory?)
         end
 
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 95cd87fbe7d..804686e68bd 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -9,6 +9,7 @@ class Configuration < Hash
       "source"              => Dir.pwd,
       "destination"         => File.join(Dir.pwd, "_site"),
       "collections_dir"     => "",
+      "cache_dir"           => ".jekyll-cache",
       "plugins_dir"         => "_plugins",
       "layouts_dir"         => "_layouts",
       "data_dir"            => "_data",

From 51629865de3e8ebfe68e7e0649c9434689ac4abd Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 31 Jul 2018 16:12:59 -0400
Subject: [PATCH 3125/4996] Update history to reflect merge of #7158 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d1f2913ba0b..42d1f019c3f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -60,6 +60,7 @@
   * Drop support for older versions of Rouge (#6978)
   * Remove support for Redcarpet (#6987)
   * Remove support for rdiscount (#6988)
+  * Remove 'cache_dir' during `jekyll clean` (#7158)
 
 ### Development Fixes
 

From f0da10a77a75aea032fb6572ffe0a2fc0f34c3a0 Mon Sep 17 00:00:00 2001
From: liv 
Date: Wed, 1 Aug 2018 09:56:40 +0200
Subject: [PATCH 3126/4996] update blog post date

---
 ...ponsoring.markdown => 2018-08-01-jekyll-sponsoring.markdown} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename docs/_posts/{2018-06-26-jekyll-sponsoring.markdown => 2018-08-01-jekyll-sponsoring.markdown} (99%)

diff --git a/docs/_posts/2018-06-26-jekyll-sponsoring.markdown b/docs/_posts/2018-08-01-jekyll-sponsoring.markdown
similarity index 99%
rename from docs/_posts/2018-06-26-jekyll-sponsoring.markdown
rename to docs/_posts/2018-08-01-jekyll-sponsoring.markdown
index 62089e871ba..b6682068c67 100644
--- a/docs/_posts/2018-06-26-jekyll-sponsoring.markdown
+++ b/docs/_posts/2018-08-01-jekyll-sponsoring.markdown
@@ -1,6 +1,6 @@
 ---
 title: "Sponsoring Jekyll's development"
-date: 2018-06-26 16:00:00 +0200
+date: 2018-08-01 15:00:00 +0200
 author: oe
 categories: [community]
 ---

From edbd9f3028e03c42d57d6d9aa84dad49fd958fc2 Mon Sep 17 00:00:00 2001
From: liv 
Date: Wed, 1 Aug 2018 14:25:41 +0200
Subject: [PATCH 3127/4996] fix opencollective display in readme

---
 README.markdown | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.markdown b/README.markdown
index 76ea46672c8..19a817d8d5b 100644
--- a/README.markdown
+++ b/README.markdown
@@ -65,15 +65,15 @@ This project exists thanks to all the people who contribute.
 
 ### Backers
 
-Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/jekyll#backer)]
+Thank you to all our backers! 🙏 [Become a backer](https://opencollective.com/jekyll#backer)
 
-
 
 ### Sponsors
 
-Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/jekyll#sponsor)]
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [Become a sponsor!](https://opencollective.com/jekyll#sponsor)
 
-
+
 
 
 ## License

From b4b90a989c8929d4234912cff20f134d7fd050db Mon Sep 17 00:00:00 2001
From: liv 
Date: Thu, 2 Aug 2018 09:22:13 +0200
Subject: [PATCH 3128/4996] use the correct sponsor embed

---
 README.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 19a817d8d5b..8efadcbc6de 100644
--- a/README.markdown
+++ b/README.markdown
@@ -73,7 +73,7 @@ Thank you to all our backers! 🙏 [Become a backer](https://opencollective.com/
 
 Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [Become a sponsor!](https://opencollective.com/jekyll#sponsor)
 
-
+
 
 
 ## License

From ce6173360d7f47ef38bef0e4f9dd5180d285e3d6 Mon Sep 17 00:00:00 2001
From: liv 
Date: Thu, 2 Aug 2018 09:24:04 +0200
Subject: [PATCH 3129/4996] revert and manually use sponsor images

---
 README.markdown | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 8efadcbc6de..c387e567536 100644
--- a/README.markdown
+++ b/README.markdown
@@ -73,7 +73,8 @@ Thank you to all our backers! 🙏 [Become a backer](https://opencollective.com/
 
 Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [Become a sponsor!](https://opencollective.com/jekyll#sponsor)
 
-
+
+
 
 
 ## License

From aaa723373b68fadf0ad0b375d65e00f5d0029358 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 2 Aug 2018 22:30:33 +0530
Subject: [PATCH 3130/4996] Fix links in Code Climate badges

---
 README.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.markdown b/README.markdown
index c387e567536..7325d3c4e30 100644
--- a/README.markdown
+++ b/README.markdown
@@ -3,8 +3,8 @@
 [![Gem Version](https://img.shields.io/gem/v/jekyll.svg)][ruby-gems]
 [![Linux Build Status](https://img.shields.io/travis/jekyll/jekyll/master.svg?label=Linux%20build)][travis]
 [![Windows Build status](https://img.shields.io/appveyor/ci/jekyll/jekyll/master.svg?label=Windows%20build)][appveyor]
-[![Maintainability](https://api.codeclimate.com/v1/badges/8ba0cb5b17bb9848e128/maintainability)](codeclimate)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/8ba0cb5b17bb9848e128/test_coverage)](coverage)
+[![Maintainability](https://api.codeclimate.com/v1/badges/8ba0cb5b17bb9848e128/maintainability)][codeclimate]
+[![Test Coverage](https://api.codeclimate.com/v1/badges/8ba0cb5b17bb9848e128/test_coverage)][coverage]
 [![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)][hakiri]
 [![Backers on Open Collective](https://opencollective.com/jekyll/backers/badge.svg)](#backers)
 [![Sponsors on Open Collective](https://opencollective.com/jekyll/sponsors/badge.svg)](#sponsors) 

From 85be75160c44b922ea7e4c9d8d0a40aeafa1db7e Mon Sep 17 00:00:00 2001
From: Ken Salomon 
Date: Thu, 2 Aug 2018 15:05:09 -0400
Subject: [PATCH 3131/4996] Document TSV as a supported data file format
 (#7168)

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

diff --git a/docs/_docs/structure.md b/docs/_docs/structure.md
index 6a069f29fca..f8a19059e49 100644
--- a/docs/_docs/structure.md
+++ b/docs/_docs/structure.md
@@ -137,9 +137,9 @@ An overview of what each of these does:
         
      
           Well-formatted site data should be placed here. The Jekyll engine
           will autoload all data files (using either the .yml,
-          .yaml, .json or .csv
-          formats and extensions) in this directory, and they will be
-          accessible via `site.data`. If there's a file
+          .yaml, .json, .csv or
+          .tsv formats and extensions) in this directory,
+          and they will be accessible via `site.data`. If there's a file
           members.yml under the directory, then you can access
           contents of the file through site.data.members.
         
      

From 87cc3503132c3d1b218ce44d2f13d8548d14be00 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 2 Aug 2018 15:05:10 -0400
Subject: [PATCH 3132/4996] Update history to reflect merge of #7168 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 42d1f019c3f..5e895fa294f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -39,6 +39,7 @@
   * Initialize upgrading doc for v4.0 (#7140)
   * Add version badge for date filters with ordinal (#7162)
   * Add closing tags for <a> (#7163)
+  * Add TSV to list of supported _data files. (#7168)
 
 ### Minor Enhancements
 

From fb7a13ab1e0fcddb488c4ad217621fbabc9f5b2b Mon Sep 17 00:00:00 2001
From: olivia 
Date: Fri, 3 Aug 2018 13:31:41 +0200
Subject: [PATCH 3133/4996] add siteleaf to site sponsors

---
 docs/_data/sponsors.yml    |   7 +++++++
 docs/_includes/footer.html |   4 ++--
 docs/img/siteleaf-logo.png | Bin 0 -> 10885 bytes
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 docs/img/siteleaf-logo.png

diff --git a/docs/_data/sponsors.yml b/docs/_data/sponsors.yml
index ca05a0b7293..5e772628ee3 100644
--- a/docs/_data/sponsors.yml
+++ b/docs/_data/sponsors.yml
@@ -1,3 +1,10 @@
 - name: Forestry.io
   image: /img/forestry-logo.png
   url: https://forestry.io
+  width: 140
+  height: 30
+- name: Siteleaf
+  image: /img/siteleaf-logo.png
+  url: https://siteleaf.com
+  width: 40
+  height: 50
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index a5674addc31..9d814fbf7cb 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -15,8 +15,8 @@
       
      
         Sponsored by
         {% for sponsor in site.data.sponsors %}
-          
-            {{ sponsor.name }}
+          
+            {{ sponsor.name }}
           
         {% endfor %}
       
      
diff --git a/docs/img/siteleaf-logo.png b/docs/img/siteleaf-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a305376bfb7433ada16bbffb397f8392f68cf4a
GIT binary patch
literal 10885
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
b2L=8gYl}_n9dpr`00000NkvXXu0mjfLSn^Y

literal 0
HcmV?d00001


From 4d6edb3a269e37860aabd2d809d18edb947514f0 Mon Sep 17 00:00:00 2001
From: liv 
Date: Sat, 4 Aug 2018 19:38:08 +0200
Subject: [PATCH 3134/4996] update sponsor links

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

diff --git a/README.markdown b/README.markdown
index 7325d3c4e30..30f63686518 100644
--- a/README.markdown
+++ b/README.markdown
@@ -75,6 +75,7 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 
 
 
+
 
 
 ## License

From 9136e9c3940743249063e9907e4b44d3e25828a5 Mon Sep 17 00:00:00 2001
From: olivia 
Date: Mon, 6 Aug 2018 18:33:31 +0200
Subject: [PATCH 3135/4996] add cloudcannon to site sponsors

---
 docs/_data/sponsors.yml       |   5 +++++
 docs/img/cloudcannon-logo.png | Bin 0 -> 18283 bytes
 2 files changed, 5 insertions(+)
 create mode 100644 docs/img/cloudcannon-logo.png

diff --git a/docs/_data/sponsors.yml b/docs/_data/sponsors.yml
index 5e772628ee3..acd3c340448 100644
--- a/docs/_data/sponsors.yml
+++ b/docs/_data/sponsors.yml
@@ -3,6 +3,11 @@
   url: https://forestry.io
   width: 140
   height: 30
+- name: CloudCannon
+  image: /img/cloudcannon-logo.png
+  url: https://cloudcannon.com
+  width: 75
+  height: 30
 - name: Siteleaf
   image: /img/siteleaf-logo.png
   url: https://siteleaf.com
diff --git a/docs/img/cloudcannon-logo.png b/docs/img/cloudcannon-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3a6253ca70dc41f6dd6e391f8ca575fcd12d0cc
GIT binary patch
literal 18283
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
Date: Tue, 7 Aug 2018 00:32:17 +0530
Subject: [PATCH 3136/4996] Output Jekyll Version while debugging (#7173)

Merge pull request 7173
---
 lib/jekyll/log_adapter.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/jekyll/log_adapter.rb b/lib/jekyll/log_adapter.rb
index e7730ab37cf..b71549112c0 100644
--- a/lib/jekyll/log_adapter.rb
+++ b/lib/jekyll/log_adapter.rb
@@ -43,6 +43,7 @@ def adjust_verbosity(options = {})
         self.log_level = :debug
       end
       debug "Logging at level:", LOG_LEVELS.key(writer.level).to_s
+      debug "Jekyll Version:", Jekyll::VERSION
     end
 
     # Public: Print a debug message

From 4814b45847ab8ebe7b50cb8f088df748e0bad4c1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 6 Aug 2018 15:02:19 -0400
Subject: [PATCH 3137/4996] Update history to reflect merge of #7173 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5e895fa294f..d485d034321 100644
--- a/History.markdown
+++ b/History.markdown
@@ -62,6 +62,7 @@
   * Remove support for Redcarpet (#6987)
   * Remove support for rdiscount (#6988)
   * Remove 'cache_dir' during `jekyll clean` (#7158)
+  * Output Jekyll Version while debugging (#7173)
 
 ### Development Fixes
 

From 5ec7324559374d13660a3fb1c2fccd6c655d1868 Mon Sep 17 00:00:00 2001
From: Victor Afanasev 
Date: Thu, 9 Aug 2018 14:30:20 +0400
Subject: [PATCH 3138/4996] Add info how to deploy using pre-push git hook
 (#7179)

Merge pull request 7179
---
 docs/_docs/deployment-methods.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/_docs/deployment-methods.md b/docs/_docs/deployment-methods.md
index 5bc255b4f48..cfdd465bec3 100644
--- a/docs/_docs/deployment-methods.md
+++ b/docs/_docs/deployment-methods.md
@@ -93,6 +93,10 @@ Deploying is now as easy as telling nginx or Apache to look at
 laptops$ git push deploy master
 ```
 
+### Git pre-push hook
+
+Instead of deploying using server-side hooks, you can deploy using `pre-push` client-side (executes on your desktop machine) git hook. [Check here](https://victorafanasev.info/tech/deploy-jekyll-build-to-github-pages-using-git-pre-push-hook) an example for Github Pages.
+
 ### Static Publisher
 
 [Static Publisher](https://github.com/static-publisher/static-publisher) is another automated deployment option with a server listening for webhook posts, though it's not tied to GitHub specifically. It has a one-click deploy to Heroku, it can watch multiple projects from one server, it has an easy to user admin interface and can publish to either S3 or to a git repository (e.g. gh-pages).

From 9a9c480831c6b491f59427abccead95c117eb9a9 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 9 Aug 2018 06:30:21 -0400
Subject: [PATCH 3139/4996] Update history to reflect merge of #7179 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d485d034321..bad0877302f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,6 +1,7 @@
 ## HEAD
 
   * Textile is only supported through a converter plugin (#7003)
+  * Add info how to deploy using pre-push git hook (#7179)
 
 ### Documentation
 

From 176489b95c51865f2471afa62a780d3735c981d2 Mon Sep 17 00:00:00 2001
From: "David J. Malan" 
Date: Tue, 14 Aug 2018 08:07:19 -0400
Subject: [PATCH 3140/4996] Corrected sample usage of postfiles (#7181)

Merge pull request 7181
---
 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 f44d7383822..70c5a12c984 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -916,7 +916,7 @@ You can find a few useful plugins at the following locations:
 - [Singlepage-jekyll](https://github.com/JCB-K/singlepage-jekyll) by [JCB-K](https://github.com/JCB-K): Turns Jekyll into a dynamic one-page website.
 - [generator-jekyllrb](https://github.com/robwierzbowski/generator-jekyllrb): A generator that wraps Jekyll in [Yeoman](http://yeoman.io/), a tool collection and workflow for building modern web apps.
 - [grunt-jekyll](https://github.com/dannygarcia/grunt-jekyll): A straightforward [Grunt](http://gruntjs.com/) plugin for Jekyll.
-- [jekyll-postfiles](https://github.com/indirect/jekyll-postfiles): Add `_postfiles` directory and {% raw %}`{{ postfile }}`{% endraw %} tag so the files a post refers to will always be right there inside your repo.
+- [jekyll-postfiles](https://github.com/indirect/jekyll-postfiles): Add `_postfiles` directory and {% raw %}`{% postfile %}`{% endraw %} tag so the files a post refers to will always be right there inside your repo.
 - [A layout that compresses HTML](http://jch.penibelst.de/): GitHub Pages compatible, configurable way to compress HTML files on site build.
 - [Jekyll CO₂](https://github.com/wdenton/jekyll-co2): Generates HTML showing the monthly change in atmospheric CO₂ at the Mauna Loa observatory in Hawaii.
 - [remote-include](http://www.northfieldx.co.uk/remote-include/): Includes files using remote URLs

From 19a7c1f06a4e871fe63a740acee1755fef34353d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 14 Aug 2018 08:07:21 -0400
Subject: [PATCH 3141/4996] Update history to reflect merge of #7181 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index bad0877302f..7637516480f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -41,6 +41,7 @@
   * Add version badge for date filters with ordinal (#7162)
   * Add closing tags for <a> (#7163)
   * Add TSV to list of supported _data files. (#7168)
+  * Corrected sample usage of postfiles (#7181)
 
 ### Minor Enhancements
 

From 61bb9e962698553d5b6bd1d70a510aa28f83b498 Mon Sep 17 00:00:00 2001
From: liv 
Date: Wed, 15 Aug 2018 21:32:12 +0200
Subject: [PATCH 3142/4996] change team page phrasing

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

diff --git a/docs/team/index.md b/docs/team/index.md
index 29a07e42589..b24c0e3b7ed 100644
--- a/docs/team/index.md
+++ b/docs/team/index.md
@@ -8,7 +8,7 @@ title: The Jekyll Team
 *The Jekyll Core Team's responsibility is to ensure the development and
 community around the Jekyll ecosystem thrive.*
 
-1. Olivia (@oe, Lead Developer)
+1. Olivia (@oe, Project Lead)
 2. Frank (@DirtyF, Documentation)
 3. Pat (@pathawks)
 4. Matt (@mattr-)

From 7791ad27a2f3454a367e57a58454195a0ed13b90 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Thu, 16 Aug 2018 18:06:56 +0200
Subject: [PATCH 3143/4996] update .gitignore

---
 .gitignore      | 30 ++++++++++++++++++------------
 docs/.gitignore |  2 +-
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index c2960b077fe..231d027f018 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,29 @@
-*.gem
-*.swp
-*~
-.DS_Store
-.analysis
+# Jekyll
+_site/
+.jekyll-cache
+.jekyll-metadata
+.sass-cache
+
+# Ruby
 .bundle/
 .byebug_history
-.jekyll-metadata
 .ruby-gemset
 .ruby-version
-.sass-cache
-/test/source/file_name.txt
-/vendor
+*.gem
 Gemfile.lock
-_site/
-bin/
+
+# Files
+.analysis
+.DS_Store
+*.swp
+*~
+
+# Folders
+/vendor
 bbin/
+bin/
 coverage
 gh-pages/
 pkg/
-site/_site/
 test/dest
 tmp/*
diff --git a/docs/.gitignore b/docs/.gitignore
index 527980f3c80..ab6b6662ffb 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,5 +1,5 @@
 _site/
+.idea/
 *.swp
 pkg/
 test/
-.idea/
\ No newline at end of file

From 30568ca7b8646ec38b5246f272d0f66782dbf86a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 16 Aug 2018 16:30:52 -0400
Subject: [PATCH 3144/4996] Update history to reflect merge of #7184 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7637516480f..fb38128e5c9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -65,6 +65,7 @@
   * Remove support for rdiscount (#6988)
   * Remove 'cache_dir' during `jekyll clean` (#7158)
   * Output Jekyll Version while debugging (#7173)
+  * Ignore cache directory (#7184)
 
 ### Development Fixes
 

From 24dd9f1457692fa21d521ae6470e7b0223d4f91b Mon Sep 17 00:00:00 2001
From: Pat Hawks 
Date: Tue, 21 Aug 2018 02:38:53 -0500
Subject: [PATCH 3145/4996] Add Cache class (#7169)

Merge pull request 7169
---
 docs/_tutorials/cache_api.md     |  87 ++++++++++++++++
 lib/jekyll.rb                    |   1 +
 lib/jekyll/cache.rb              | 168 +++++++++++++++++++++++++++++++
 lib/jekyll/site.rb               |   7 ++
 lib/site_template/.gitignore     |   1 +
 lib/theme_template/gitignore.erb |   1 +
 test/test_site.rb                |   3 +
 7 files changed, 268 insertions(+)
 create mode 100644 docs/_tutorials/cache_api.md
 create mode 100644 lib/jekyll/cache.rb

diff --git a/docs/_tutorials/cache_api.md b/docs/_tutorials/cache_api.md
new file mode 100644
index 00000000000..2690dc1639a
--- /dev/null
+++ b/docs/_tutorials/cache_api.md
@@ -0,0 +1,87 @@
+---
+layout: tutorials
+permalink: /tutorials/cache-api/
+title: Cache API
+---
+
+Jekyll includes a caching API, which is used both internally as well as exposed
+for plugins, which can be used to cache the output of deterministic functions to
+speed up site generation. This cache will be persistent across builds, but
+cleared when Jekyll detects any changes to `_config.yml`.
+
+## Jekyll::Cache.new(name) → new_cache
+
+If there has already been a cache created with `name`, this will return a
+reference to that existing Cache. Otherwise, create a new Cache called `name`.
+
+If this Cache will be used by a Gem-packaged plugin, `name` should either be the
+name of the Gem, or prefixed with the name of the Gem followed by `::` (if a
+plugin expects to use multiple Caches). If this Cache will be used internally by
+Jekyll, `name` should be the name of the class that is using the Cache (ie:
+`"Jekyll::Converters::Markdown"`).
+
+Cached objects are shared between all Caches created with the same `name`, but
+are _not_ shared between Caches with different names. There can be an object
+stored with key `1` in `Jekyll::Cache.new("a")` and an object stored with key
+`1` in `Jekyll::Cache.new("b")` and these will not point to the same cached
+object. This way, you do not need to ensure that keys are globally unique.
+
+## getset(key) {block}
+
+This is the most common way to utilize the Cache.
+
+`block` is a bit of code that takes a lot of time to compute, but always
+generates the same output given a particular input (like converting Markdown to
+HTML). `key` is a `String` (or an object with `to_s`) that uniquely identifies
+the input to the function.
+
+If `key` already exists in the Cache, it will be returned and `block` will never
+be executed. If `key` does not exist in the Cache, `block` will be executed and
+the result will be added to the Cache and returned.
+
+```ruby
+def cache
+  @@cache ||= Jekyll::Cache.new("ConvertMarkdown")
+end
+
+def convert_markdown_to_html(markdown)
+  cache.getset(markdown) do
+    expensive_conversion_method(markdown)
+  end
+end
+```
+
+In the above example, `expensive_conversion_method` will only be called once for
+any given `markdown` input. If `convert_markdown_to_html` is called a second
+time with the same input, the cached output will be returned.
+
+Because posts will frequently remain unchanged from one build to the next, this
+is an effective way to avoid performing the same computations each time the site
+is built.
+
+## clear
+
+This will clear all cached objects from a particular Cache. The Cache will be
+empty, both in memory and on disk.
+
+
+### The following methods will probably only be used in special circumstances
+
+## cache[key] → value
+
+Fetches `key` from Cache and returns its `value`. Raises if `key` does not exist
+in Cache.
+
+## cache[key] = value
+
+Adds `value` to Cache under `key`.
+Returns nothing.
+
+## key?(key) → true or false
+
+Returns `true` if `key` already exists in Cache. False otherwise.
+
+## delete(key)
+
+Removes `key` from Cache.
+Returns nothing.
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 56a9b84f5b2..fe4af08411f 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -54,6 +54,7 @@ module Jekyll
   autoload :FrontmatterDefaults, "jekyll/frontmatter_defaults"
   autoload :Hooks,               "jekyll/hooks"
   autoload :Layout,              "jekyll/layout"
+  autoload :Cache,               "jekyll/cache"
   autoload :CollectionReader,    "jekyll/readers/collection_reader"
   autoload :DataReader,          "jekyll/readers/data_reader"
   autoload :LayoutReader,        "jekyll/readers/layout_reader"
diff --git a/lib/jekyll/cache.rb b/lib/jekyll/cache.rb
new file mode 100644
index 00000000000..ae5138e018d
--- /dev/null
+++ b/lib/jekyll/cache.rb
@@ -0,0 +1,168 @@
+# frozen_string_literal: true
+
+require "digest"
+
+module Jekyll
+  class Cache
+    # rubocop:disable Style/ClassVars
+    @@caches = {}
+    @@disk_cache_enabled = true
+
+    # Get an existing named cache, or create a new one if none exists
+    #
+    # name - name of the cache
+    #
+    # Returns nothing.
+    def initialize(name)
+      @@base_dir ||= File.expand_path(".jekyll-cache/Jekyll/Cache")
+      @cache = @@caches[name] ||= {}
+      @name = name.gsub(%r![^\w\s-]!, "-")
+    end
+
+    # Disable Marshaling cached items to disk
+    def self.disable_disk_cache!
+      @@disk_cache_enabled = false
+    end
+    # rubocop:enable Style/ClassVars
+
+    # Clear all caches
+    def self.clear
+      delete_cache_files
+      @@caches.each_value(&:clear)
+    end
+
+    # Clear this particular cache
+    def clear
+      delete_cache_files
+      @cache.clear
+    end
+
+    # Retrieve a cached item
+    # Raises if key does not exist in cache
+    #
+    # Returns cached value
+    def [](key)
+      return @cache[key] if @cache.key?(key)
+      path = path_to(hash(key))
+      if @@disk_cache_enabled && File.file?(path) && File.readable?(path)
+        @cache[key] = load(path)
+      else
+        raise
+      end
+    end
+
+    # Add an item to cache
+    #
+    # Returns nothing.
+    def []=(key, value)
+      @cache[key] = value
+      return unless @@disk_cache_enabled
+      path = path_to(hash(key))
+      dump(path, value)
+    end
+
+    # If an item already exists in the cache, retrieve it
+    # Else execute code block, and add the result to the cache, and return that
+    #   result
+    def getset(key)
+      self[key]
+    rescue StandardError
+      value = yield
+      self[key] = value
+      value
+    end
+
+    # Remove one particular item from the cache
+    #
+    # Returns nothing.
+    def delete(key)
+      @cache.delete(key)
+      return unless @@disk_cache_enabled
+      path = path_to(hash(key))
+      File.delete(path)
+    end
+
+    # Check if `key` already exists in this cache
+    #
+    # Returns true if key exists in the cache, false otherwise
+    def key?(key)
+      # First, check if item is already cached in memory
+      return true if @cache.key?(key)
+      # Otherwise, it might be cached on disk
+      # but we should not consider the disk cache if it is disabled
+      return false unless @@disk_cache_enabled
+      path = path_to(hash(key))
+      File.file?(path) && File.readable?(path)
+    end
+
+    # Compare the current config to the cached config
+    # If they are different, clear all caches
+    #
+    # Returns nothing.
+    def self.clear_if_config_changed(config)
+      config = config.inspect
+      cache = Jekyll::Cache.new "Jekyll::Cache"
+      return if cache.key?("config") && cache["config"] == config
+      clear
+      cache = Jekyll::Cache.new "Jekyll::Cache"
+      cache["config"] = config
+      nil
+    end
+
+    private
+
+    # Given a hashed key, return the path to where this item would be saved on
+    # disk
+    def path_to(hash = nil)
+      @base_dir ||= File.join(@@base_dir, @name)
+      return @base_dir if hash.nil?
+      File.join(@base_dir, hash[0..1], hash[2..-1]).freeze
+    end
+
+    # Given a key, return a SHA2 hash that can be used for caching this item to
+    # disk
+    def hash(key)
+      Digest::SHA2.hexdigest(key).freeze
+    end
+
+    # Remove all this caches items from disk
+    #
+    # Returns nothing.
+    def delete_cache_files
+      FileUtils.rm_rf(path_to) if @@disk_cache_enabled
+    end
+
+    # Delete all cached items from all caches
+    #
+    # Returns nothing.
+    def self.delete_cache_files
+      FileUtils.rm_rf(@@base_dir) if @@disk_cache_enabled
+    end
+    private_class_method :delete_cache_files
+
+    # Load `path` from disk and return the result
+    # This MUST NEVER be called in Safe Mode
+    # rubocop:disable Security/MarshalLoad
+    def load(path)
+      raise unless @@disk_cache_enabled
+      cached_file = File.open(path, "rb")
+      value = Marshal.load(cached_file)
+      cached_file.close
+      value
+    end
+    # rubocop:enable Security/MarshalLoad
+
+    # Given a path and a value, save value to disk at path
+    # This should NEVER be called in Safe Mode
+    #
+    # Returns nothing.
+    def dump(path, value)
+      return unless @@disk_cache_enabled
+      dir = File.dirname(path)
+      FileUtils.mkdir_p(dir)
+      File.open(path, "wb") do |cached_file|
+        Marshal.dump(value, cached_file)
+      end
+    end
+  end
+end
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 5c4ac78e83c..530e2b233a0 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -51,6 +51,7 @@ def config=(config)
       # keep using `gems` to avoid breaking change
       self.gems = config["plugins"]
 
+      configure_cache
       configure_plugins
       configure_theme
       configure_include_paths
@@ -100,6 +101,7 @@ def reset
 
       raise ArgumentError, "limit_posts must be a non-negative number" if limit_posts.negative?
 
+      Jekyll::Cache.clear_if_config_changed config
       Jekyll::Hooks.trigger :site, :after_reset, self
     end
 
@@ -421,6 +423,11 @@ def site_cleaner
       @site_cleaner ||= Cleaner.new(self)
     end
 
+    # Disable Marshaling cache to disk in Safe Mode
+    def configure_cache
+      Jekyll::Cache.disable_disk_cache! if safe
+    end
+
     def configure_plugins
       self.plugin_manager = Jekyll::PluginManager.new(self)
       self.plugins        = plugin_manager.plugins_path
diff --git a/lib/site_template/.gitignore b/lib/site_template/.gitignore
index bcebd7267eb..f40fbd8ba56 100644
--- a/lib/site_template/.gitignore
+++ b/lib/site_template/.gitignore
@@ -1,4 +1,5 @@
 _site
 .sass-cache
+.jekyll-cache
 .jekyll-metadata
 vendor
diff --git a/lib/theme_template/gitignore.erb b/lib/theme_template/gitignore.erb
index 867d3792d5a..736d7400ff4 100644
--- a/lib/theme_template/gitignore.erb
+++ b/lib/theme_template/gitignore.erb
@@ -1,5 +1,6 @@
 *.gem
 .bundle
+.jekyll-cache
 .sass-cache
 _site
 Gemfile.lock
diff --git a/test/test_site.rb b/test/test_site.rb
index 63fb63fde66..d0322ebbdb3 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -76,6 +76,9 @@ def read_posts
       allow(File).to receive(:directory?).with(theme_dir("_sass")).and_return(true)
       allow(File).to receive(:directory?).with(theme_dir("_layouts")).and_return(true)
       allow(File).to receive(:directory?).with(theme_dir("_includes")).and_return(false)
+      allow(File).to receive(:directory?).with(
+        File.expand_path(".jekyll-cache/Jekyll/Cache/Jekyll--Cache")
+      ).and_return(true)
       site = fixture_site("theme" => "test-theme")
       assert_equal [source_dir("_includes")], site.includes_load_paths
     end

From 3f62fd96d3db77a5f5fee739935cd72a923a2a86 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 21 Aug 2018 03:38:54 -0400
Subject: [PATCH 3146/4996] Update history to reflect merge of #7169 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fb38128e5c9..bb1180f2177 100644
--- a/History.markdown
+++ b/History.markdown
@@ -52,6 +52,7 @@
   * Update item_property to return numbers as numbers instead of strings (#6608)
   * Use .markdown for page templates (#7126)
   * Fix custom 404 page for GitHub pages (#7132)
+  * Add Cache class (#7169)
 
 ### Major Enhancements
 

From 7f09faa95476a372ee5a5a2e34a7a9b1d6cbde74 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Tue, 21 Aug 2018 20:09:31 +0530
Subject: [PATCH 3147/4996] Replace regex arg to :gsub with a string arg
 (#7189)

Merge pull request 7189
---
 lib/jekyll/tags/include.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index 389b6be9c79..1f47324b066 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -41,9 +41,9 @@ def parse_params(context)
           markup = markup[match.end(0)..-1]
 
           value = if match[2]
-                    match[2].gsub(%r!\\"!, '"')
+                    match[2].gsub('\\"', '"')
                   elsif match[3]
-                    match[3].gsub(%r!\\'!, "'")
+                    match[3].gsub("\\'", "'")
                   elsif match[4]
                     context[match[4]]
                   end

From 130292f15e5271bb52082d2919a262d94395ed10 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 21 Aug 2018 10:39:33 -0400
Subject: [PATCH 3148/4996] Update history to reflect merge of #7189 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index bb1180f2177..2c57c7bce71 100644
--- a/History.markdown
+++ b/History.markdown
@@ -86,6 +86,7 @@
   * fix up refute_equal call (#7133)
   * Fix incorrectly passed arguments to assert_equal (#7134)
   * Lock Travis to Bundler-1.16.2 (#7144)
+  * Replace regex arg to :gsub with a string arg (#7189)
 
 ### Bug Fixes
 

From 9195b61d51ccd6f3b1fbf7809646e9fd76aab6f2 Mon Sep 17 00:00:00 2001
From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
Date: Sat, 25 Aug 2018 13:07:28 +0300
Subject: [PATCH 3149/4996] Add support for `*.xhtml` files (#6854)

Merge pull request 6854
---
 lib/jekyll/commands/serve.rb         |  2 ++
 lib/jekyll/commands/serve/servlet.rb |  8 ++++++--
 test/fixtures/webrick/bar/foo.xhtml  |  1 +
 test/test_commands_serve_servlet.rb  | 10 ++++++++++
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/webrick/bar/foo.xhtml

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index a5b58897a89..4c9d5dfcedc 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -45,6 +45,8 @@ class << self
           index.htm
           index.html
           index.rhtml
+          index.xht
+          index.xhtml
           index.cgi
           index.xml
           index.json
diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb
index b25f1d9d7fd..ec528fa6540 100644
--- a/lib/jekyll/commands/serve/servlet.rb
+++ b/lib/jekyll/commands/serve/servlet.rb
@@ -140,7 +140,9 @@ def initialize(server, root, callbacks)
         end
 
         def search_index_file(req, res)
-          super || search_file(req, res, ".html")
+          super ||
+            search_file(req, res, ".html") ||
+            search_file(req, res, ".xhtml")
         end
 
         # Add the ability to tap file.html the same way that Nginx does on our
@@ -149,7 +151,9 @@ def search_index_file(req, res)
 
         def search_file(req, res, basename)
           # /file.* > /file/index.html > /file.html
-          super || super(req, res, "#{basename}.html")
+          super ||
+            super(req, res, "#{basename}.html") ||
+            super(req, res, "#{basename}.xhtml")
         end
 
         # rubocop:disable Naming/MethodName
diff --git a/test/fixtures/webrick/bar/foo.xhtml b/test/fixtures/webrick/bar/foo.xhtml
new file mode 100644
index 00000000000..6890fdca3df
--- /dev/null
+++ b/test/fixtures/webrick/bar/foo.xhtml
@@ -0,0 +1 @@
+Content of foo.xhtml
diff --git a/test/test_commands_serve_servlet.rb b/test/test_commands_serve_servlet.rb
index 1f84cbbbe64..0ccc49b39db 100644
--- a/test/test_commands_serve_servlet.rb
+++ b/test/test_commands_serve_servlet.rb
@@ -34,5 +34,15 @@ def get(path)
         assert_equal("404", response.code)
       end
     end
+
+    should "find xhtml file" do
+      get("/bar/foo") do |response|
+        assert_equal("200", response.code)
+        assert_equal(
+          'Content of foo.xhtml',
+          response.body.strip
+        )
+      end
+    end
   end
 end

From 2913ab2891f184b7e6713db3108a7c946371f939 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 25 Aug 2018 06:07:29 -0400
Subject: [PATCH 3150/4996] Update history to reflect merge of #6854 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2c57c7bce71..63bb4d834b0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -53,6 +53,7 @@
   * Use .markdown for page templates (#7126)
   * Fix custom 404 page for GitHub pages (#7132)
   * Add Cache class (#7169)
+  * Add support for `*.xhtml` files (#6854)
 
 ### Major Enhancements
 

From 535637ba06d7a878e124db2a390228376979dcb6 Mon Sep 17 00:00:00 2001
From: Anny 
Date: Sun, 26 Aug 2018 04:38:00 -0700
Subject: [PATCH 3151/4996] Add missing html end tag for code example in
 section 'For loops' (#7199)

Merge pull request 7199
---
 docs/_tutorials/convert-existing-site-to-jekyll.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/_tutorials/convert-existing-site-to-jekyll.md b/docs/_tutorials/convert-existing-site-to-jekyll.md
index 379edc2e02d..872d78aa7b4 100644
--- a/docs/_tutorials/convert-existing-site-to-jekyll.md
+++ b/docs/_tutorials/convert-existing-site-to-jekyll.md
@@ -316,7 +316,8 @@ We've only scratched the surface of what you can do with `for` loops in retrievi
     
    • {{ post.title}}
     {{ post.date | date: "%b %-d, %Y" }}
     
      • 
-{% endfor %}{% endraw %}
+{% endfor %}
+
    {% endraw %}
 ```
 
 This loop would get the latest three posts that have a category called `podcasts` in the front matter.

From 5666e424744696752ec9d264fa8b251f069744c4 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 26 Aug 2018 07:38:02 -0400
Subject: [PATCH 3152/4996] Update history to reflect merge of #7199 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 63bb4d834b0..47861f349ab 100644
--- a/History.markdown
+++ b/History.markdown
@@ -42,6 +42,7 @@
   * Add closing tags for <a> (#7163)
   * Add TSV to list of supported _data files. (#7168)
   * Corrected sample usage of postfiles (#7181)
+  * Add missing html end tag for code example in section 'For loops' (#7199)
 
 ### Minor Enhancements
 

From a983bac6cacc9af852394cdf4dd0c6f352674531 Mon Sep 17 00:00:00 2001
From: Ma HongJun 
Date: Sun, 26 Aug 2018 20:45:06 +0900
Subject: [PATCH 3153/4996] Resolve "Unable to locate package ruby2.4" error
 (#7196)

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

diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
index e4835a9861f..3e97d297908 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -89,7 +89,7 @@ Now we can install Ruby. To do this we will use a repository from [BrightBox](ht
 ```sh
 sudo apt-add-repository ppa:brightbox/ruby-ng
 sudo apt-get update
-sudo apt-get install ruby2.4 ruby2.4-dev build-essential dh-autoreconf
+sudo apt-get install ruby2.5 ruby2.5-dev build-essential dh-autoreconf
 ```
 
 Next let's update our Ruby gems:

From d3fba977f7a0a121ece44dff75111ef14ca2d6c1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 26 Aug 2018 07:45:08 -0400
Subject: [PATCH 3154/4996] Update history to reflect merge of #7196 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 47861f349ab..fc8ac9bc75a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -43,6 +43,7 @@
   * Add TSV to list of supported _data files. (#7168)
   * Corrected sample usage of postfiles (#7181)
   * Add missing html end tag for code example in section 'For loops' (#7199)
+  * Resolve "Unable to locate package ruby2.4" error (#7196)
 
 ### Minor Enhancements
 

From bd9162a3bb6cef017eb553f74789e71e236c7964 Mon Sep 17 00:00:00 2001
From: Samuel Gruetter <2394355+samuelgruetter@users.noreply.github.com>
Date: Sun, 26 Aug 2018 09:50:35 -0400
Subject: [PATCH 3155/4996] installation instructions for Fedora (#7198)

Merge pull request 7198
---
 docs/_docs/installation.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index 55dd4a401bc..f2a56b31385 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -10,6 +10,7 @@ installed on most systems.
 - [Requirements](#requirements)
 - [Install Jekyll on macOS](#macOS)
 - [Install Jekyll on Ubuntu Linux](#ubuntu)
+- [Install Jekyll on other Linux distros](#otherlinux)
 - [Install Jekyll on Windows](../windows/)
 - [Upgrade Jekyll](#upgrade-jekyll)
 
@@ -142,6 +143,17 @@ gem install jekyll bundler
 
 That's it! You're ready to start using Jekyll.
 
+## Install on other Linux distros {#otherlinux}
+
+Installation on other Linux distributions works similarly as on Ubuntu.
+
+On Fedora, the dependencies can be installed as follows, and the rest
+works the same as on Ubuntu.
+
+```sh
+sudo dnf install ruby ruby-devel @development-tools
+```
+
 ## Upgrade Jekyll
 
 Before you start developing with Jekyll, you may want to check that you're up to date with the latest version. To find the currently installed version of Jekyll, run one of these commands:

From 58f10f8e8a4496244c4cca3c491defe06bedc9ef Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 26 Aug 2018 09:50:36 -0400
Subject: [PATCH 3156/4996] Update history to reflect merge of #7198 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fc8ac9bc75a..3a8b88d5fa5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -44,6 +44,7 @@
   * Corrected sample usage of postfiles (#7181)
   * Add missing html end tag for code example in section 'For loops' (#7199)
   * Resolve "Unable to locate package ruby2.4" error (#7196)
+  * installation instructions for Fedora (#7198)
 
 ### Minor Enhancements
 

From 9f93fd092f13727a1b8d49de0d9909685b79da42 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 29 Aug 2018 22:50:52 +0530
Subject: [PATCH 3157/4996] Interpolate Jekyll::Page subclass on inspection
 (#7203)

Merge pull request 7203
---
 lib/jekyll/page.rb                | 2 +-
 lib/jekyll/page_without_a_file.rb | 4 ----
 test/test_page_without_a_file.rb  | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 965786a0768..c1691156e63 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -161,7 +161,7 @@ def destination(dest)
 
     # Returns the object as a debug String.
     def inspect
-      "#"
+      "#<#{self.class} @name=#{name.inspect}>"
     end
 
     # Returns the Boolean of whether this Page is HTML or not.
diff --git a/lib/jekyll/page_without_a_file.rb b/lib/jekyll/page_without_a_file.rb
index 2d30af51116..e314f970a6d 100644
--- a/lib/jekyll/page_without_a_file.rb
+++ b/lib/jekyll/page_without_a_file.rb
@@ -10,9 +10,5 @@ class PageWithoutAFile < Page
     def read_yaml(*)
       @data ||= {}
     end
-
-    def inspect
-      "#"
-    end
   end
 end
diff --git a/test/test_page_without_a_file.rb b/test/test_page_without_a_file.rb
index 2933bfc8846..586103075d4 100644
--- a/test/test_page_without_a_file.rb
+++ b/test/test_page_without_a_file.rb
@@ -33,6 +33,10 @@ def render_and_write
         @page = setup_page("properties.html")
       end
 
+      should "identify itself properly" do
+        assert_equal "#", @page.inspect
+      end
+
       should "not have page-content and page-data defined within it" do
         assert_equal "pages", @page.type.to_s
         assert_nil @page.content

From 3aa41a6055e3f8952f069e6785d7319bf6d2834e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 29 Aug 2018 13:20:55 -0400
Subject: [PATCH 3158/4996] Update history to reflect merge of #7203 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3a8b88d5fa5..72f1288de52 100644
--- a/History.markdown
+++ b/History.markdown
@@ -91,6 +91,7 @@
   * Fix incorrectly passed arguments to assert_equal (#7134)
   * Lock Travis to Bundler-1.16.2 (#7144)
   * Replace regex arg to :gsub with a string arg (#7189)
+  * Interpolate Jekyll::Page subclass on inspection (#7203)
 
 ### Bug Fixes
 

From 805f438f24466825685506350dc73af132b972a4 Mon Sep 17 00:00:00 2001
From: Mike Neumegen 
Date: Sat, 1 Sep 2018 01:39:57 -0700
Subject: [PATCH 3159/4996] New docs (#7205)

Merge pull request 7205
---
 History.markdown                              |  26 +-
 README.markdown                               |   4 +-
 docs/_data/docs.yml                           |  53 -
 docs/_data/docs_nav.yml                       |  36 +
 docs/_data/jekyllconf-talks.yml               |   6 +-
 docs/_data/primary_nav.yml                    |  15 +
 docs/_data/showcase.yml                       | 222 ++++
 docs/_docs/assets.md                          |  16 +-
 docs/_docs/collections.md                     | 298 +-----
 docs/_docs/community/bug.md                   |   8 +
 docs/_docs/community/community.md             |  38 +
 docs/_docs/configuration.md                   | 841 +---------------
 docs/_docs/configuration/default.md           |  86 ++
 docs/_docs/configuration/environments.md      |  43 +
 .../configuration/front-matter-defaults.md    | 152 +++
 .../configuration/incremental-regeneration.md |  36 +
 docs/_docs/configuration/liquid.md            |  18 +
 docs/_docs/configuration/markdown.md          | 124 +++
 docs/_docs/configuration/options.md           | 409 ++++++++
 docs/_docs/configuration/webrick.md           |  20 +
 .../continuous-integration/buddyworks.md      |   2 -
 docs/_docs/continuous-integration/circleci.md |   2 +-
 docs/_docs/continuous-integration/index.md    |  10 -
 docs/_docs/datafiles.md                       |  12 +-
 docs/_docs/deployment-methods.md              | 220 ----
 docs/_docs/deployment.md                      |  11 +
 docs/_docs/deployment/automated.md            |  63 ++
 docs/_docs/deployment/manual.md               |  36 +
 docs/_docs/deployment/third-party.md          |  39 +
 docs/_docs/drafts.md                          |  19 -
 docs/_docs/extras.md                          |  31 -
 .../_docs/{frontmatter.md => front-matter.md} |  46 +-
 docs/_docs/github-pages.md                    |   8 +-
 docs/_docs/history.md                         |  30 +-
 docs/_docs/includes.md                        |  38 -
 docs/_docs/index.md                           |  72 +-
 docs/_docs/installation.md                    | 212 +---
 docs/_docs/installation/macos.md              |  69 ++
 docs/_docs/installation/other-linux.md        |  11 +
 docs/_docs/installation/ubuntu.md             |  30 +
 docs/_docs/{ => installation}/windows.md      |  41 +-
 docs/_docs/layouts.md                         | 131 +++
 docs/_docs/liquid.md                          |  19 +
 .../_docs/{templates.md => liquid/filters.md} | 175 +---
 docs/_docs/liquid/tags.md                     | 142 +++
 .../maintaining/merging-a-pull-request.md     |   2 +-
 docs/_docs/maintaining/triaging-an-issue.md   |   2 +-
 docs/_docs/markdown-101.md                    |   6 +
 docs/_docs/migrations.md                      |   2 +-
 docs/_docs/pages.md                           |  67 +-
 docs/_docs/pagination.md                      |  65 +-
 docs/_docs/permalinks.md                      | 201 ++--
 docs/_docs/plugins.md                         | 951 +-----------------
 docs/_docs/plugins/commands.md                |  62 ++
 docs/_docs/plugins/converters.md              |  91 ++
 docs/_docs/plugins/filters.md                 |  30 +
 docs/_docs/plugins/generators.md              | 103 ++
 docs/_docs/plugins/hooks.md                   | 244 +++++
 docs/_docs/plugins/installation.md            |  82 ++
 docs/_docs/plugins/tags.md                    |  72 ++
 docs/_docs/plugins/your-first-plugin.md       | 137 +++
 docs/_docs/posts.md                           | 304 ++----
 docs/_docs/quickstart.md                      |  53 -
 docs/_docs/resources.md                       |   2 -
 docs/_docs/ruby-101.md                        |  45 +
 docs/_docs/sites.md                           |  22 -
 docs/_docs/static_files.md                    |   8 +-
 docs/_docs/step-by-step/01-setup.md           |  73 ++
 docs/_docs/step-by-step/02-liquid.md          |  70 ++
 docs/_docs/step-by-step/03-front-matter.md    |  49 +
 docs/_docs/step-by-step/04-layouts.md         |  89 ++
 docs/_docs/step-by-step/05-includes.md        |  83 ++
 docs/_docs/step-by-step/06-data-files.md      |  48 +
 docs/_docs/step-by-step/07-assets.md          |  89 ++
 docs/_docs/step-by-step/08-blogging.md        | 145 +++
 docs/_docs/step-by-step/09-collections.md     | 251 +++++
 docs/_docs/step-by-step/10-deployment.md      | 140 +++
 docs/_docs/structure.md                       |  30 +-
 docs/_docs/support.md                         |   7 -
 docs/_docs/themes.md                          |   8 +-
 docs/_docs/troubleshooting.md                 |  20 +-
 docs/_docs/upgrading/2-to-3.md                |   2 +-
 docs/_docs/usage.md                           | 119 +--
 docs/_docs/variables.md                       |  23 +-
 docs/_includes/docs_contents.html             |   6 +-
 docs/_includes/docs_contents_mobile.html      |   2 +-
 docs/_includes/docs_option.html               |  11 +-
 docs/_includes/docs_ul.html                   |  21 +-
 docs/_includes/footer.html                    |   1 +
 docs/_includes/mobile-nav-items.html          |  24 +-
 docs/_includes/primary-nav-items.html         |  22 +-
 docs/_includes/section_nav.html               |  39 -
 docs/_includes/step-index.html                |  67 ++
 docs/_includes/top.html                       |   2 +-
 docs/_layouts/docs.html                       |   3 +-
 docs/_layouts/step.html                       |  26 +
 .../2014-05-06-jekyll-turns-2-0-0.markdown    |   6 +-
 ...yll-stickers-1-dollar-stickermule.markdown |   4 +-
 .../2014-08-10-jekyll-2-3-0-released.markdown |   2 +-
 ...midlife-crisis-jekyll-turns-2-5-0.markdown |   6 +-
 ...015-02-26-introducing-jekyll-talk.markdown |   2 +-
 .../2016-01-24-jekyll-3-1-0-released.markdown |   2 +-
 docs/_posts/2016-10-06-jekyll-3-3-is-here.md  |   2 +-
 .../2017-01-18-jekyll-3-4-0-released.markdown |   4 +-
 .../2017-03-09-jekyll-3-4-2-released.markdown |  10 +-
 .../2017-10-21-jekyll-3-6-2-released.markdown |   2 +-
 .../2018-01-02-jekyll-3-7-0-released.md       |   2 +-
 .../2018-01-25-jekyll-3-7-2-released.md       |   4 +-
 .../2018-08-01-jekyll-sponsoring.markdown     |   2 +-
 docs/_sass/_style.scss                        |  42 +
 .../convert-existing-site-to-jekyll.md        |  19 +-
 docs/_tutorials/custom-404-page.md            |   2 +-
 docs/_tutorials/navigation.md                 |  26 +-
 docs/_tutorials/orderofinterpretation.md      |   2 +-
 docs/help/index.md                            |  62 --
 docs/{ => pages}/404.html                     |   0
 docs/{ => pages}/index.html                   |   1 +
 .../index.md => pages/jekyllconf.md}          |   1 -
 docs/{news/index.html => pages/news.html}     |   0
 docs/{ => pages}/philosophy.md                |   1 +
 docs/{ => pages}/redirects/github.html        |   0
 docs/{ => pages}/redirects/issues.html        |   0
 .../index.html => pages/releases.html}        |   0
 docs/pages/resources.md                       |  80 ++
 docs/pages/showcase.html                      |  40 +
 docs/{team/index.md => pages/team.md}         |   1 +
 126 files changed, 4496 insertions(+), 3770 deletions(-)
 delete mode 100644 docs/_data/docs.yml
 create mode 100644 docs/_data/docs_nav.yml
 create mode 100644 docs/_data/primary_nav.yml
 create mode 100644 docs/_data/showcase.yml
 create mode 100644 docs/_docs/community/bug.md
 create mode 100644 docs/_docs/community/community.md
 create mode 100644 docs/_docs/configuration/default.md
 create mode 100644 docs/_docs/configuration/environments.md
 create mode 100644 docs/_docs/configuration/front-matter-defaults.md
 create mode 100644 docs/_docs/configuration/incremental-regeneration.md
 create mode 100644 docs/_docs/configuration/liquid.md
 create mode 100644 docs/_docs/configuration/markdown.md
 create mode 100644 docs/_docs/configuration/options.md
 create mode 100644 docs/_docs/configuration/webrick.md
 delete mode 100644 docs/_docs/continuous-integration/index.md
 delete mode 100644 docs/_docs/deployment-methods.md
 create mode 100644 docs/_docs/deployment.md
 create mode 100644 docs/_docs/deployment/automated.md
 create mode 100644 docs/_docs/deployment/manual.md
 create mode 100644 docs/_docs/deployment/third-party.md
 delete mode 100644 docs/_docs/drafts.md
 delete mode 100644 docs/_docs/extras.md
 rename docs/_docs/{frontmatter.md => front-matter.md} (81%)
 create mode 100644 docs/_docs/installation/macos.md
 create mode 100644 docs/_docs/installation/other-linux.md
 create mode 100644 docs/_docs/installation/ubuntu.md
 rename docs/_docs/{ => installation}/windows.md (73%)
 create mode 100644 docs/_docs/layouts.md
 create mode 100644 docs/_docs/liquid.md
 rename docs/_docs/{templates.md => liquid/filters.md} (68%)
 create mode 100644 docs/_docs/liquid/tags.md
 create mode 100644 docs/_docs/markdown-101.md
 create mode 100644 docs/_docs/plugins/commands.md
 create mode 100644 docs/_docs/plugins/converters.md
 create mode 100644 docs/_docs/plugins/filters.md
 create mode 100644 docs/_docs/plugins/generators.md
 create mode 100644 docs/_docs/plugins/hooks.md
 create mode 100644 docs/_docs/plugins/installation.md
 create mode 100644 docs/_docs/plugins/tags.md
 create mode 100644 docs/_docs/plugins/your-first-plugin.md
 delete mode 100644 docs/_docs/quickstart.md
 create mode 100644 docs/_docs/ruby-101.md
 delete mode 100644 docs/_docs/sites.md
 create mode 100644 docs/_docs/step-by-step/01-setup.md
 create mode 100644 docs/_docs/step-by-step/02-liquid.md
 create mode 100644 docs/_docs/step-by-step/03-front-matter.md
 create mode 100644 docs/_docs/step-by-step/04-layouts.md
 create mode 100644 docs/_docs/step-by-step/05-includes.md
 create mode 100644 docs/_docs/step-by-step/06-data-files.md
 create mode 100644 docs/_docs/step-by-step/07-assets.md
 create mode 100644 docs/_docs/step-by-step/08-blogging.md
 create mode 100644 docs/_docs/step-by-step/09-collections.md
 create mode 100644 docs/_docs/step-by-step/10-deployment.md
 delete mode 100644 docs/_includes/section_nav.html
 create mode 100644 docs/_includes/step-index.html
 create mode 100644 docs/_layouts/step.html
 delete mode 100644 docs/help/index.md
 rename docs/{ => pages}/404.html (100%)
 rename docs/{ => pages}/index.html (99%)
 rename docs/{community/index.md => pages/jekyllconf.md} (96%)
 rename docs/{news/index.html => pages/news.html} (100%)
 rename docs/{ => pages}/philosophy.md (98%)
 rename docs/{ => pages}/redirects/github.html (100%)
 rename docs/{ => pages}/redirects/issues.html (100%)
 rename docs/{news/releases/index.html => pages/releases.html} (100%)
 create mode 100644 docs/pages/resources.md
 create mode 100644 docs/pages/showcase.html
 rename docs/{team/index.md => pages/team.md} (98%)

diff --git a/History.markdown b/History.markdown
index 72f1288de52..e373fb98b8b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -457,7 +457,7 @@
   * add SUPPORT file for GitHub (#6324)
   * Rename CODE_OF_CONDUCT to show in banner (#6325)
   * Docs : illustrate page.id for a collection's document (#6329)
-  * Docs: post's date can be overriden in YAML front matter (#6334)
+  * Docs: post's date can be overriden in front matter (#6334)
   * Docs: `site.url` behavior on development and production environments (#6270)
   * Fix typo in site.url section of variables.md :-[ (#6337)
   * Docs: updates (#6343)
@@ -1123,7 +1123,7 @@
   * Fix typo on Chocolatey name in Windows documentation (#4686)
   * Use the correct URL, Fixes #4698 (#4699)
   * Add jekyll-paspagon plugin (#4700)
-  * Bold-italicize note in assets documentation about needing yaml front matter (#4706)
+  * Bold-italicize note in assets documentation about needing front matter (#4706)
   * Highlight the `script/` calls in the Contributing documentation (#4712)
   * Add Hawkins to the list of third-party plugins (#4755)
   * Fix a typo in pagination doc (#4763)
@@ -1291,7 +1291,7 @@
   * Drop: fix hash setter precedence (#4312)
   * utils: `has_yaml_header?` should accept files with extraneous spaces (#4290)
   * Escape html from site.title and page.title in site template (#4307)
-  * Allow custom file extensions if defined in `permalink` YAML front matter (#4314)
+  * Allow custom file extensions if defined in `permalink` front matter (#4314)
   * Fix deep_merge_hashes! handling of drops and hashes (#4359)
   * Page should respect output extension of its permalink (#4373)
   * Disable auto-regeneration when running server detached (#4376)
@@ -1511,7 +1511,7 @@
   * Fix nav items alignment when on multiple rows (#3264)
   * Highlight: Only Strip Newlines/Carriage Returns, not Spaces (#3278)
   * Find variables in front matter defaults by searching with relative file path. (#2774)
-  * Allow variables (e.g `:categories`) in YAML front matter permalinks (#3320)
+  * Allow variables (e.g `:categories`) in front matter permalinks (#3320)
   * Handle nil URL placeholders in permalinks (#3325)
   * Template: Fix nav items alignment when in "burger" mode (#3329)
   * Template: Remove `!important` from nav SCSS introduced in #3329 (#3375)
@@ -1528,7 +1528,7 @@
   * Add WOFF2 font MIME type to Jekyll server MIME types (#3647)
   * Be smarter about extracting the extname in `StaticFile` (#3632)
   * Process metadata for all dependencies (#3608)
-  * Show error message if the YAML front matter on a page/post is invalid. (#3643)
+  * Show error message if the front matter on a page/post is invalid. (#3643)
   * Upgrade redcarpet to 3.2 (Security fix: OSVDB-120415) (#3652)
   * Create #mock_expects that goes directly to RSpec Mocks. (#3658)
   * Open `.jekyll-metadata` in binary mode to read binary Marshal data (#3713)
@@ -1606,7 +1606,7 @@
   * Add a Resources link to tutorial on building dynamic navbars (#3185)
   * Semantic structure improvements to the post and page layouts (#3251)
   * Add new AsciiDoc plugin to list of third-party plugins. (#3277)
-  * Specify that all transformable collection documents must contain YAML front matter (#3271)
+  * Specify that all transformable collection documents must contain front matter (#3271)
   * Assorted accessibility fixes (#3256)
   * Update configuration docs to mention `keep_files` for `destination` (#3288, #3296)
   * Break when we successfully generate nav link to save CPU cycles. (#3291)
@@ -2143,7 +2143,7 @@
   * Clean up the `` in the site template (#2186)
   * Permit YAML blocks to end with three dots to better conform with the YAML spec (#2110)
   * Use `File.exist?` instead of deprecated `File.exists?` (#2214)
-  * Require newline after start of YAML Front Matter header (#2211)
+  * Require newline after start of front matter header (#2211)
   * Add the ability for pages to be marked as `published: false` (#1492)
   * Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy looking up of variable values in a Liquid context. (#2253)
   * Remove literal lang name from class (#2292)
@@ -2821,7 +2821,7 @@
   * Bullet-proof `limit_posts` option (#1004)
   * Read in YAML as UTF-8 to accept non-ASCII chars (#836)
   * Fix the CLI option `--plugins` to actually accept dirs and files (#993)
-  * Allow 'excerpt' in YAML front matter to override the extracted excerpt (#946)
+  * Allow 'excerpt' in front matter to override the extracted excerpt (#946)
   * Fix cascade problem with site.baseurl, site.port and site.host. (#935)
   * Filter out directories with valid post names (#875)
   * Fix symlinked static files not being correctly built in unsafe mode (#909)
@@ -2833,7 +2833,7 @@
   * Patch for multibyte URI problem with `jekyll serve` (#723)
   * Order plugin execution by priority (#864)
   * Fixed Page#dir and Page#url for edge cases (#536)
-  * Fix broken `post_url` with posts with a time in their YAML front matter (#831)
+  * Fix broken `post_url` with posts with a time in their front matter (#831)
   * Look for plugins under the source directory (#654)
   * Tumblr Migrator: finds `_posts` dir correctly, fixes truncation of long post names (#775)
   * Force Categories to be Strings (#767)
@@ -3024,7 +3024,7 @@
 
   * Bug Fixes
   * Require redcloth >= 4.2.1 in tests (#92)
-  * Don't break on triple dashes in yaml front matter (#93)
+  * Don't break on triple dashes in front matter (#93)
 
 ### Minor Enhancements
 
@@ -3056,7 +3056,7 @@
   * Added --paginate option to the executable along with a paginator object for the payload (@calavera)
   * Upgraded RedCloth to 4.2.1, which makes `` tags work once again.
   * 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)
+  * Posts can now have an empty front matter or none at all (@ bahuvrihi)
   * Bug Fixes
   * 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)
@@ -3064,7 +3064,7 @@
   * 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)
+  * Allow CRLFs in front matter (@juretta)
   * Added Date#xmlschema for Ruby versions < 1.9
 
 ## 0.5.1 / 2009-05-06
@@ -3143,7 +3143,7 @@
   * 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)
-  * Merge Post's YAML front matter into its to_liquid payload (@remi)
+  * Merge Post's 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)
diff --git a/README.markdown b/README.markdown
index 30f63686518..ee0a3bda8eb 100644
--- a/README.markdown
+++ b/README.markdown
@@ -7,7 +7,7 @@
 [![Test Coverage](https://api.codeclimate.com/v1/badges/8ba0cb5b17bb9848e128/test_coverage)][coverage]
 [![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)][hakiri]
 [![Backers on Open Collective](https://opencollective.com/jekyll/backers/badge.svg)](#backers)
-[![Sponsors on Open Collective](https://opencollective.com/jekyll/sponsors/badge.svg)](#sponsors) 
+[![Sponsors on Open Collective](https://opencollective.com/jekyll/sponsors/badge.svg)](#sponsors)
 
 [ruby-gems]: https://rubygems.org/gems/jekyll
 [codeclimate]: https://codeclimate.com/github/jekyll/jekyll
@@ -50,7 +50,7 @@ these terms, please let one of our [core team members](https://jekyllrb.com/team
 ## Diving In
 
 * [Migrate](http://import.jekyllrb.com/docs/home/) from your previous system
-* Learn how the [YAML Front Matter](https://jekyllrb.com/docs/frontmatter/) works
+* Learn how [Front Matter](https://jekyllrb.com/docs/front-matter/) works
 * Put information on your site with [Variables](https://jekyllrb.com/docs/variables/)
 * Customize the [Permalinks](https://jekyllrb.com/docs/permalinks/) your posts are generated with
 * Use the built-in [Liquid Extensions](https://jekyllrb.com/docs/templates/) to make your life easier
diff --git a/docs/_data/docs.yml b/docs/_data/docs.yml
deleted file mode 100644
index ef468fa1c9b..00000000000
--- a/docs/_data/docs.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-- title: Getting Started
-  docs:
-  - home
-  - quickstart
-  - installation
-  - windows
-  - usage
-  - structure
-  - configuration
-
-- title: Your Content
-  docs:
-  - frontmatter
-  - posts
-  - drafts
-  - pages
-  - static-files
-  - variables
-  - collections
-  - datafiles
-  - assets
-  - migrations
-
-- title: Customization
-  docs:
-  - templates
-  - includes
-  - permalinks
-  - pagination
-  - plugins
-  - themes
-  - extras
-
-- title: Deployment
-  docs:
-  - github-pages
-  - deployment-methods
-  - continuous-integration
-
-- title: Miscellaneous
-  docs:
-  - troubleshooting
-  - sites
-  - resources
-  - upgrading/0-to-2
-  - upgrading/2-to-3
-
-- title: Meta
-  docs:
-  - contributing
-  - maintaining
-  - conduct
-  - history
diff --git a/docs/_data/docs_nav.yml b/docs/_data/docs_nav.yml
new file mode 100644
index 00000000000..8aac2befcef
--- /dev/null
+++ b/docs/_data/docs_nav.yml
@@ -0,0 +1,36 @@
+- title: Getting Started
+  docs:
+    - link: /docs/
+    - link: /docs/ruby-101/
+    - link: /docs/installation/
+    - link: /docs/community/
+    - link: /docs/step-by-step/01-setup/
+- title: Build
+  docs:
+    - link: /docs/usage/
+    - link: /docs/configuration/
+- title: Content
+  docs:
+    - link: /docs/pages/
+    - link: /docs/posts/
+    - link: /docs/front-matter/
+    - link: /docs/collections/
+    - link: /docs/datafiles/
+    - link: /docs/assets/
+    - link: /docs/static-files/
+- title: Site Structure
+  docs:
+    - link: /docs/structure/
+    - link: /docs/liquid/
+    - link: /docs/variables/
+    - link: /docs/includes/
+    - link: /docs/layouts/
+    - link: /docs/permalinks/
+    - link: /docs/themes/
+    - link: /docs/pagination/
+- title: Guides
+  docs:
+    - link: /docs/plugins/
+    - link: /docs/migrations/
+    - link: /docs/upgrading/
+    - link: /docs/deployment/
diff --git a/docs/_data/jekyllconf-talks.yml b/docs/_data/jekyllconf-talks.yml
index 93bf6252f88..6ef34e429ef 100644
--- a/docs/_data/jekyllconf-talks.yml
+++ b/docs/_data/jekyllconf-talks.yml
@@ -53,7 +53,7 @@
   year: 2016
 
 - speaker: Amy Johnston
-  twitter_handle: amybeukenex
+  twitter_handle: AmyJohnstonXL
   youtube_id: HR12JiUI2Zc
   topic: Jekyll for Technical Documentation
   year: 2016
@@ -83,7 +83,7 @@
   year: 2016
 
 - speaker: Julio Faerman
-  twitter_handle: jmfaerman
+  twitter_handle: juliodevrel
   youtube_id: SOMonG8Iqak
   topic: Jekyll on AWS
   year: 2016
@@ -131,7 +131,7 @@
   year: 2016
 
 - speaker: Nils Borchers
-  twitter_handle: nilsborchers
+  twitter_handle: nilsbo
   youtube_id: DtNMjuv6Rbo
   topic: Building a living brand guide with Jekyll and Hologram
   year: 2016
diff --git a/docs/_data/primary_nav.yml b/docs/_data/primary_nav.yml
new file mode 100644
index 00000000000..02ff6e99a79
--- /dev/null
+++ b/docs/_data/primary_nav.yml
@@ -0,0 +1,15 @@
+- title: Home
+  link: /
+  show_on_mobile: true
+- title: Docs
+  link: /docs/
+  show_on_mobile: true
+- title: Resources
+  link: /resources/
+  show_on_mobile: true
+- title: Showcase
+  link: /showcase/
+  show_on_mobile: false
+- title: News
+  link: /news/
+  show_on_mobile: true
diff --git a/docs/_data/showcase.yml b/docs/_data/showcase.yml
new file mode 100644
index 00000000000..b72092df3c0
--- /dev/null
+++ b/docs/_data/showcase.yml
@@ -0,0 +1,222 @@
+- name: Tom Preston Werner Blog
+  url: http://tom.preston-werner.com/
+  categories:
+    - personal
+    - blog
+- name: GitHub On Demand Training
+  url: https://services.github.com/on-demand/
+  categories:
+    - software
+    - knowledgebase
+- name: MvvmCross
+  url: https://www.mvvmcross.com/
+  categories:
+    - software
+    - marketing-site
+- name: Vidgrid
+  url: https://www.vidgrid.com/
+  categories:
+    - software
+    - marketing-site
+- name: Bitcoin
+  url: https://bitcoin.org/en/
+  categories:
+    - software
+    - marketing-site
+- name: Mapwize
+  url: https://www.mapwize.io/
+  categories:
+    - software
+    - marketing-site
+- name: Auth0 Blog
+  url: https://auth0.com/blog/
+  categories:
+    - software
+    - blog
+- name: AWS Amplify
+  url: https://aws-amplify.github.io/amplify-js/
+  categories:
+    - open-source
+    - marketing-site
+- name: Yeoman
+  url: http://yeoman.io/
+  categories:
+    - open-source
+    - marketing-site
+- name: Ionic Framwork
+  url: https://ionicframework.com/
+  categories:
+    - software
+    - marketing-site
+- name: Release Management Blog
+  url: https://release.mozilla.org/
+  categories:
+    - software
+    - blog
+- name: Freedom of Information Act
+  url: https://www.foia.gov/
+  categories:
+    - government
+- name: Art & About Sydney
+  url: https://www.artandabout.com.au/
+  categories:
+    - government
+- name: Passbolt Help
+  url: https://help.passbolt.com/
+  categories:
+    - knowledgebase
+- name: We are COLLINS
+  url: https://www.wearecollins.com/
+  categories:
+    - agency
+- name: Light Burn
+  url: https://lightburn.co/
+  categories:
+    - agency
+- name: italia.it
+  url: https://developers.italia.it/
+  categories:
+    - community
+- name: Sydney New Years Eve
+  url: https://www.sydneynewyearseve.com/
+  categories:
+    - government
+- name: Login.gov
+  url: https://login.gov/
+  categories:
+    - government
+- name: plainlanguage.gov
+  url: https://plainlanguage.gov/
+  categories:
+    - government
+- name: U.S. Web Design Standards
+  url: https://standards.usa.gov/
+  categories:
+    - government
+- name: Grantmaker Search
+  url: https://www.grantmakers.io/
+  categories:
+    - marketing-site
+- name: Rehan Butt
+  url: http://rehanbutt.com/
+  categories:
+    - personal
+    - portfolio
+- name: The Markdown Guide
+  url: https://www.markdownguide.org/
+  categories:
+    - knowledgebase
+- name: PROBOT
+  url: https://probot.github.io/
+  categories:
+    - documentation
+- name: Matt Grey
+  url: https://himatt.com/
+  categories:
+    - personal
+    - portfolio
+- name: frame.ai
+  url: https://frame.ai/
+  categories:
+    - software
+    - marketing-site
+- name: SiteLeaf
+  url: https://siteleaf.com
+  categories:
+    - software
+    - marketing-site
+- name: CloudCannon
+  url: https://cloudcannon.com/
+  categories:
+    - software
+    - marketing-site
+- name: AdHawk
+  url: https://www.tryadhawk.com/
+  categories:
+    - agency
+- name: City of Boston Budget
+  url: https://budget.boston.gov/
+  categories:
+    - government
+- name: Lattice
+  url: https://latticehq.com/
+  categories:
+    - software
+    - marketing-site
+- name: MailTape
+  url: https://www.mailta.pe/
+  categories:
+    - other
+- name: Digital Democracy
+  url: http://www.digital-democracy.org/
+  categories:
+    - other
+- name: HTML Reference
+  url: http://htmlreference.io/
+  categories:
+    - documentation
+- name: CSS Reference
+  url: http://cssreference.io/
+  categories:
+    - documentation
+- name: Sketch App
+  url: https://sketchapp.com/
+  categories:
+    - software
+    - marketing-site
+- name: Chain
+  url: https://chain.com/
+  categories:
+    - marketing-site
+- name: Pattern Lab
+  url: http://patternlab.io/
+  categories:
+    - documentation
+- name: Netflix Devices
+  url: https://devices.netflix.com/en/
+  categories:
+    - marketing-site
+- name: Ruby on Rails
+  url: http://rubyonrails.org/
+  categories:
+    - marketing-site
+    - documentation
+- name: IBM MobileFirst Foundation
+  url: https://mobilefirstplatform.ibmcloud.com/
+  categories:
+    - documentation
+- name: 18F
+  url: https://18f.gsa.gov/
+  categories:
+    - agency
+    - government
+- name: Mapbox
+  url: https://mapbox.com/
+  categories:
+    - marketing-site
+- name: Development Seed
+  url: https://developmentseed.org/
+  categories:
+    - agency
+- name: White House Social and Behavioral Sciences Team
+  url: https://sbst.gov/
+  categories:
+    - government
+- name: UN World Statistics
+  url: https://worldstatisticsday.org
+  categories:
+    - government
+- name: Vesterheim Norwegian-American Museum
+  url: http://vesterheim.org/
+  categories:
+    - marketing-site
+- name: TwitchCon
+  url: https://www.twitchcon.com/
+  categories:
+    - marketing-site
+    - conference
+- name: Twitch Developer Documentation
+  url: https://dev.twitch.tv/
+  categories:
+    - marketing-site
+    - documentation
diff --git a/docs/_docs/assets.md b/docs/_docs/assets.md
index 1ead08af464..ca407f4dcaa 100644
--- a/docs/_docs/assets.md
+++ b/docs/_docs/assets.md
@@ -3,10 +3,11 @@ title: Assets
 permalink: /docs/assets/
 ---
 
-Jekyll provides built-in support for Sass and can work with CoffeeScript via
-a Ruby gem. In order to use them, you must first create a file with the
-proper extension name (one of `.sass`, `.scss`, or `.coffee`) and ***start the
-file with two lines of triple dashes***, like this:
+Jekyll provides built-in support for [Sass](https://sass-lang.com/)
+and can work with [CoffeeScript](https://coffeescript.org/) via a Ruby gem.
+In order to use them, you must first create a file with the proper extension
+name (one of `.sass`, `.scss`, or `.coffee`) and
+***start the file with two lines of triple dashes***, like this:
 
 ```sass
 ---
@@ -42,8 +43,7 @@ them to be in the output file, such as `/css`. For an example, take
 a look at [this example site using Sass support in Jekyll][example-sass].
 
 If you are using Sass `@import` statements, you'll need to ensure that your
-`sass_dir` is set to the base directory that contains your Sass files. You
-can do that thusly:
+`sass_dir` is set to the base directory that contains your Sass files:
 
 ```yaml
 sass:
@@ -61,7 +61,7 @@ The Sass converter will default the `sass_dir` configuration option to
 
     Note that the sass_dir becomes the load path for Sass imports,
     nothing more. This means that Jekyll does not know about these files
-    directly, so any files here should not contain the YAML Front Matter as
+    directly, so any files here should not contain the front matter as
     described above nor will they be transformed as described above. This
     folder should only contain imports.
 
@@ -89,5 +89,5 @@ To enable Coffeescript in Jekyll 3.0 and up you must
 
 ```yaml
 plugins:
- - jekyll-coffeescript
+  - jekyll-coffeescript
 ```
diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index 6309517c011..45bacc49bac 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -3,47 +3,25 @@ title: Collections
 permalink: /docs/collections/
 ---
 
-Not everything is a post or a page. Maybe you want to document the various
-methods in your open source project, members of a team, or talks at a
-conference. Collections allow you to define a new type of document that behave
-like Pages or Posts do normally, but also have their own unique properties and
-namespace.
+Collections are a great way to group related content like members of a team or
+talks at a conference.
 
-## Using Collections
+## Setup
 
-To start using collections, follow these 3 steps:
-
-* [Step 1: Tell Jekyll to read in your collection](#step1)
-* [Step 2: Add your content](#step2)
-* [Step 3: Optionally render your collection's documents into independent files](#step3)
-
-### Step 1: Tell Jekyll to read in your collection {#step1}
-
-Add the following to your site's `_config.yml` file, replacing `my_collection`
-with the name of your collection:
+To use a Collection you first need to define it in your `_config.yml`. For
+example here's a collection of staff members:
 
 ```yaml
 collections:
-- my_collection
+  - staff_members
 ```
 
 You can optionally specify metadata for your collection in the configuration:
 
 ```yaml
 collections:
-  my_collection:
-    foo: bar
-```
-
-Default attributes can also be set for a collection:
-
-```yaml
-defaults:
-  - scope:
-      path: ""
-      type: my_collection
-    values:
-      layout: page
+  staff_members:
+    people: true
 ```
 
 
    
@@ -61,13 +39,24 @@ defaults:
   
    If you specify a directory to store all your collections in the same place with collections_dir: my_collections, then you will need to move your _drafts and _posts directory to my_collections/_drafts and my_collections/_posts. Note that, the name of your collections directory cannot start with an underscore (`_`).
    
 
    
 
-### Step 2: Add your content {#step2}
+## Add content
 
-Create a corresponding folder (e.g. `/_my_collection`) and add
-documents. YAML front matter is processed if the front matter exists, and everything
-after the front matter is pushed into the document's `content` attribute. If no YAML front
+Create a corresponding folder (e.g. `/_staff_members`) and add
+documents. Front matter is processed if the front matter exists, and everything
+after the front matter is pushed into the document's `content` attribute. If no front
 matter is provided, Jekyll will not generate the file in your collection.
 
+For example here's how you would add an staff member to the collection set above.
+The filename is `./_staff_members/jane.md` with the following content:
+
+```markdown
+---
+name: Jane Doe
+position: Developer
+---
+Jane has worked on Jekyll for the past *five years*.
+```
+
 
    
   
    Be sure to name your directories correctly
    
   
    
@@ -76,190 +65,57 @@ your _config.yml file, with the addition of the preceding _
 
    
 
-### Step 3: Optionally render your collection's documents into independent files {#step3}
-
-If you'd like Jekyll to create a public-facing, rendered version of each
-document in your collection, set the `output` key to `true` in your collection
-metadata in your `_config.yml`:
+## Output
 
-```yaml
-collections:
-  my_collection:
-    output: true
-```
-
-This will produce a file for each document in the collection.
-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 `/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:
+Now you can iterate over `site.staff_members` on a page and output the content
+for each staff member. Similar to posts, the body of the document is accessed
+using the `content` variable:
 
 {% raw %}
 ```liquid
-{% for item in site.my_collection %}
-  
    {{ item.title }}
    
-  
    {{ item.description }}
    
-  
    {{ item.title }}
    
+{% for staff_member in site.staff_members %}
+  
    {{ staff_member.name }} - {{ staff_member.position }}
    
+  
    {{ staff_member.content | markdownify }}
    
 {% endfor %}
 ```
 {% endraw %}
 
-
    
-  
    Don't forget to add YAML for processing
    
-  
    
-  Files in collections that do not have front matter are treated as
-  static files and simply copied to their
-  output location without processing.
-  
    
-
    
-
-## Configuring permalinks for collections {#permalinks}
 
-If you wish to specify a custom pattern for the URLs where your Collection pages
-will reside, you may do so with the [`permalink` property](../permalinks/):
+If you'd like Jekyll to create a rendered page for each document in your
+collection, you can set the `output` key to `true` in your collection
+metadata in `_config.yml`:
 
 ```yaml
 collections:
-  my_collection:
+  staff_members:
     output: true
-    permalink: /:collection/:name
 ```
 
-### Examples
-
-For a collection with the following source file structure,
+You can link to the generated page using the `url` attribute:
 
+{% raw %}
+```liquid
+{% for staff_member in site.staff_members %}
+  
    
+    
+      {{ staff_member.name }} - {{ staff_member.position }}
+    
+  
    
+  
    {{ staff_member.content | markdownify }}
    
+{% endfor %}
 ```
-_my_collection/
-└── some_subdir
-    └── some_doc.md
-```
+{% endraw %}
 
-each of the following `permalink` configurations will produce the document structure shown below it.
-
-* **Default**
-  Same as `permalink: /:collection/:path`.
-
-  ```
-  _site/
-  ├── my_collection
-  │   └── some_subdir
-  │       └── some_doc.html
-  ...
-  ```
-* `permalink: pretty`
-  Same as `permalink: /:collection/:path/`.
-
-  ```
-  _site/
-  ├── my_collection
-  │   └── some_subdir
-  │       └── some_doc
-  │           └── index.html
-  ...
-  ```
-* `permalink: /doc/:path`
-
-  ```
-  _site/
-  ├── doc
-  │   └── some_subdir
-  │       └── some_doc.html
-  ...
-  ```
-* `permalink: /doc/:name`
-
-  ```
-  _site/
-  ├── doc
-  │   └── some_doc.html
-  ...
-  ```
-* `permalink: /:name`
-
-  ```
-  _site/
-  ├── some_doc.html
-  ...
-  ```
-
-### Template Variables
+## Permalinks
 
-
    
-
-  
-    
-      
-      
-    
-  
-  
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-  
-
    VariableDescription
    
-        
    :collection
    
-          		
-        
    Label of the containing collection.
    
-      
    
-        
    :path
    
-          		
-        
    Path to the document relative to the collection's directory.
    
-      
    
-        
    :name
    
-          		
-        
    The document's base filename, with every sequence of spaces
-        and non-alphanumeric characters replaced by a hyphen.
    
-      
    
-        
    :title
    
-          		
-        
    
-          The :title template variable will take the
-          slug front matter
-          variable value if any is present in the document; if none is
-          defined then :title will be equivalent to
-          :name, aka the slug generated from the filename.
-        
    
-      
    
-        
    :output_ext
    
-          		
-        
    Extension of the output file. (Included by default and usually unnecessary.)
    
-      
    
-
    
+There are special [permalink variables for collections](/docs/permalinks/) to
+help you control the output url for the entire collection.
 
 ## Liquid Attributes
 
 ### Collections
 
-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`.
-
-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.
-
-The collections are also available under `site.collections`, with the metadata
+Collections are also available under `site.collections`, with the metadata
 you specified in your `_config.yml` (if present) and the following information:
 
 
    
@@ -365,7 +221,7 @@ you specified in your `_config.yml` (if present) and the following information:
 
 ### Documents
 
-In addition to any YAML Front Matter provided in the document's corresponding
+In addition to any front matter provided in the document's corresponding
 file, each document has the following attributes:
 
 
    
@@ -383,9 +239,9 @@ file, each document has the following attributes:
       
       
         
    
-          The (unrendered) content of the document. If no YAML Front Matter is
+          The (unrendered) content of the document. If no front matter is
           provided, Jekyll will not generate the file in your collection. If
-          YAML Front Matter is used, then this is all the contents of the file
+          front matter is used, then this is all the contents of the file
           after the terminating
           `---` of the front matter.
         
    
@@ -455,51 +311,3 @@ file, each document has the following attributes:
   
 
 
    
-
-## Accessing Collection Attributes
-
-Attributes from the YAML front matter can be accessed as data anywhere in the
-site. Using the above example for configuring a collection as `site.albums`,
-you might have front matter in an individual file structured as follows (which
-must use a supported markup format, and cannot be saved with a `.yaml`
-extension):
-
-```yaml
-title: "Josquin: Missa De beata virgine and Missa Ave maris stella"
-artist: "The Tallis Scholars"
-director: "Peter Phillips"
-works:
-  - title: "Missa De beata virgine"
-    composer: "Josquin des Prez"
-    tracks:
-      - title: "Kyrie"
-        duration: "4:25"
-      - title: "Gloria"
-        duration: "9:53"
-      - title: "Credo"
-        duration: "9:09"
-      - title: "Sanctus & Benedictus"
-        duration: "7:47"
-      - title: "Agnus Dei I, II & III"
-        duration: "6:49"
-```
-
-Every album in the collection could be listed on a single page with a template:
-
-```liquid
-{% raw %}
-{% for album in site.albums %}
-  
    {{ album.title }}
    
-  
    Performed by {{ album.artist }}{% if album.director %}, directed by {{ album.director }}{% endif %}
    
-  {% for work in album.works %}
-    
    {{ work.title }}
    
-    
    Composed by {{ work.composer }}
    
-    
      
-    {% for track in work.tracks %}
-      
    • {{ track.title }} ({{ track.duration }})
      • 
-    {% endfor %}
-    
    
-  {% endfor %}
-{% endfor %}
-{% endraw %}
-```
diff --git a/docs/_docs/community/bug.md b/docs/_docs/community/bug.md
new file mode 100644
index 00000000000..06d4ab5d8a8
--- /dev/null
+++ b/docs/_docs/community/bug.md
@@ -0,0 +1,8 @@
+---
+title: Report a bug
+permalink: "/docs/community/bug/"
+---
+
+If you think you've found a bug within a Jekyll plugin, open an issue in that plugin's repository — 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).
diff --git a/docs/_docs/community/community.md b/docs/_docs/community/community.md
new file mode 100644
index 00000000000..023f0260d81
--- /dev/null
+++ b/docs/_docs/community/community.md
@@ -0,0 +1,38 @@
+---
+title: Community
+permalink: /docs/community/
+redirect_from: "/help/index.html"
+---
+
+## Jekyll Contributor Code of Conduct
+
+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.
+
+[Read the full code of conduct](/docs/conduct/)
+
+## Where to get support
+
+If you're looking for support for Jekyll, there are a lot of options:
+
+* Read [Jekyll Documentation](https://jekyllrb.com/docs/)
+* If you have a question about using Jekyll, start a discussion on [the Jekyll Forum](https://talk.jekyllrb.com/) or [StackOverflow](https://stackoverflow.com/questions/tagged/jekyll)
+* Chat with Jekyllers — 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.
+
+**Reminder: Jekyll's issue tracker is not a support forum.**
+
+## Ways to contribute
+
+* [How to Contribute](/docs/contributing/)
+* [How to file a bug](/docs/community/bug/)
+* [Guide for maintaining Jekyll](/docs/maintaining/)
+
+
+## Jekyllconf
+
+[Watch videos](/jekyllconf/) from members of the Jekyll community speak about interesting use cases, tricks they’ve learned or meta Jekyll topics.
+
+## Jekyll on Twitter
+
+The [official Jekyll Twitter account](https://twitter.com/jekyllrb).
diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index e9c2269e7bb..c2c08ad7935 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -3,831 +3,16 @@ title: Configuration
 permalink: /docs/configuration/
 ---
 
-Jekyll allows you to concoct your sites in any way you can dream up, and it’s
-thanks to the powerful and flexible configuration options that this is possible.
-These options can either be specified in a `_config.yml` file placed in your
-site’s root directory, or can be specified as flags for the `jekyll` executable
-in the terminal.
-
-## Configuration Settings
-
-### Global Configuration
-
-The table below lists the available settings for Jekyll, and the various options (specified in the configuration file) and flags (specified on the command-line) that control them.
-
-
    
-
-  
-    
-      
-      
-    
-  
-  
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-  
-
    Setting
-        Options and Flags
-      
    
-        
    Site Source
    
-        
    Change the directory where Jekyll will read files
    
-          		
-        
    source: DIR
    
-        
    -s, --source DIR
    
-      
    
-        
    Site Destination
    
-        
    Change the directory where Jekyll will write files
    
-          		
-        
    destination: DIR
    
-        
    -d, --destination DIR
    
-      
    
-        
    Safe
    
-        
    Disable custom plugins, and ignore symbolic links.
    
-          		
-        
    safe: BOOL
    
-        
    --safe
    
-      
    
-        
    Exclude
    
-        
    
-          Exclude directories and/or files from the
-          conversion. These exclusions are relative to the site's
-          source directory and cannot be outside the source directory.
-        
    
-          		
-        
    exclude: [DIR, FILE, ...]
    
-      
    
-        
    Include
    
-        
    
-          Force inclusion of directories and/or files in the conversion.
-          .htaccess is a good example since dotfiles are excluded
-          by default.
-        
    
-          		
-        
    include: [DIR, FILE, ...]
    
-      
    
-        
    Keep files
    
-        
    
-          When clobbering the site destination, keep the selected files.
-          Useful for files that are not generated by jekyll; e.g. files or
-          assets that are generated by your build tool.
-          The paths are relative to the destination.
-        
    
-          		
-        
    keep_files: [DIR, FILE, ...]
    
-      
    
-        
    Time Zone
    
-        
    
-            Set the time zone for site generation. This sets the TZ
-            environment variable, which Ruby uses to handle time and date
-            creation and manipulation. Any entry from the
-            IANA Time Zone
-            Database is valid, e.g. America/New_York. A list of all
-            available values can be found 
-            here. When serving on a local machine, the default time zone is set by your operating system. But when served on a remote host/server, the default time zone depends on the server's setting or location.
-        
    
-          		
-        
    timezone: TIMEZONE
    
-      
    
-        
    Encoding
    
-        
    
-            Set the encoding of files by name (only available for Ruby
-            1.9 or later).
-            The default value is utf-8 starting in 2.0.0,
-            and nil before 2.0.0, which will yield the Ruby
-            default of ASCII-8BIT.
-            Available encodings can be shown by the
-            command ruby -e 'puts Encoding::list.join("\n")'.
-        
    
-          		
-        
    encoding: ENCODING
    
-      
    
-        
    Defaults
    
-        
    
-            Set defaults for YAML Front Matter
-            variables.
-        
    
-          		
-        
    see below
    
-      
    
-
    
-
-
    
-  
    Destination folders are cleaned on site builds
    
-  
    
-    The contents of <destination> are automatically
-    cleaned, by default, when the site is built. Files or folders that are not
-    created by your site will be removed. Some files could be retained
-    by specifying them within the <keep_files> configuration directive.
-  
    
-  
    
-    Do not use an important location for <destination>; instead, use it as
-    a staging area and copy files from there to your web server.
-  
    
-
    
-
-### Build Command Options
-
-
    
-
-  
-    
-      
-      
-    
-  
-  
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-  
-
    SettingOptions and Flags
    
-        
    Regeneration
    
-        
    Enable auto-regeneration of the site when files are modified.
    
-          		
-        
    -w, --[no-]watch
    
-      
    
-        
    Configuration
    
-        
    Specify config files instead of using _config.yml automatically. Settings in later files override settings in earlier files.
    
-          		
-        
    --config FILE1[,FILE2,...]
    
-      
    
-        
    Drafts
    
-        
    Process and render draft posts.
    
-          		
-        
    show_drafts: BOOL
    
-        
    --drafts
    
-      
    
-        
    Environment
    
-        
    Use a specific environment value in the build.
    
-          		
-        
    JEKYLL_ENV=production
    
-      
    
-        
    Future
    
-        
    Publish posts or collection documents with a future date.
    
-          		
-        
    future: BOOL
    
-        
    --future
    
-      
    
-        
    Unpublished
    
-        
    Render posts that were marked as unpublished.
    
-          		
-        
    unpublished: BOOL
    
-        
    --unpublished
    
-      
    
-        
    LSI
    
-        
    Produce an index for related posts. Requires the classifier-reborn plugin.
    
-          		
-        
    lsi: BOOL
    
-        
    --lsi
    
-      
    
-        
    Limit Posts
    
-        
    Limit the number of posts to parse and publish.
    
-          		
-        
    limit_posts: NUM
    
-        
    --limit_posts NUM
    
-      
    
-        
    Force polling
    
-        
    Force watch to use polling.
    
-          		
-        
    --force_polling
    
-      
    
-        
    Verbose output
    
-        
    Print verbose output.
    
-          		
-        
    -V, --verbose
    
-      
    
-        
    Silence Output
    
-        
    Silence the normal output from Jekyll
-        during a build
    
-          		
-        
    -q, --quiet
    
-      
    
-        
    Incremental build
    
-        
    
-            Enable the experimental incremental build feature. Incremental build only
-            re-builds posts and pages that have changed, resulting in significant performance
-            improvements for large sites, but may also break site generation in certain
-            cases.
-        
    
-          		
-        
    incremental: BOOL
    
-        
    -I, --incremental
    
-      
    
-        
    Liquid profiler
    
-        
    
-            Generate a Liquid rendering profile to help you identify performance bottlenecks.
-        
    
-          		
-        
    profile: BOOL
    
-        
    --profile
    
-      
    
-        
    Strict Front Matter
    
-        
    
-            Cause a build to fail if there is a YAML syntax error in a page's front matter.
-        
    
-          		
-        
    strict_front_matter: BOOL
    
-        
    --strict_front_matter
    
-      
    
-
    
-
-
-### Serve Command Options
-
-In addition to the options below, the `serve` sub-command can accept any of the options
-for the `build` sub-command, which are then applied to the site build which occurs right
-before your site is served.
-
-
    
-
-  
-    
-      
-      
-    
-  
-  
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-  
-
    SettingOptions and Flags
    
-        
    Local Server Port
    
-        
    Listen on the given port.
    
-          		
-        
    port: PORT
    
-        
    --port PORT
    
-      
    
-        
    Local Server Hostname
    
-        
    Listen at the given hostname.
    
-          		
-        
    host: HOSTNAME
    
-        
    --host HOSTNAME
    
-      
    
-        
    Base URL
    
-        
    Serve the website from the given base URL
    
-          		
-        
    baseurl: URL
    
-        
    --baseurl URL
    
-      
    
-        
    Detach
    
-        
    Detach the server from the terminal
    
-          		
-        
    detach: BOOL
    
-        
    -B, --detach
    
-      
    
-        
    Skips the initial site build.
    
-        
    Skips the initial site build which occurs before the server is started.
    
-          		
-        
    --skip-initial-build
    
-      
    
-        
    X.509 (SSL) Private Key
    
-        
    SSL Private Key.
    
-          		
-        
    --ssl-key
    
-      
    
-        
    X.509 (SSL) Certificate
    
-        
    SSL Public certificate.
    
-          		
-        
    --ssl-cert
    
-      
    
-
    
-
-
    
-  
    Do not use tabs in configuration files
    
-  
    
-    This will either lead to parsing errors, or Jekyll will revert to the
-    default settings. Use spaces instead.
-  
    
-
    
-
-## Custom WEBrick Headers
-
-You can provide custom headers for your site by adding them to `_config.yml`
-
-```yaml
-# File: _config.yml
-webrick:
-  headers:
-    My-Header: My-Value
-    My-Other-Header: My-Other-Value
-```
-
-### Defaults
-
-We provide by default `Content-Type` and `Cache-Control` response headers: one
-dynamic in order to specify the nature of the data being served, the other
-static in order to disable caching so that you don't have to fight with Chrome's
-aggressive caching when you are in development mode.
-
-## Specifying a Jekyll environment at build time
-
-In the build (or serve) arguments, you can specify a Jekyll environment and value. The build will then apply this value in any conditional statements in your content.
-
-For example, suppose you set this conditional statement in your code:
-
-```liquid
-{% raw %}
-{% if jekyll.environment == "production" %}
-   {% include disqus.html %}
-{% endif %}
-{% endraw %}
-```
-
-When you build your Jekyll site, the content inside the `if` statement won't be run unless you also specify a `production` environment in the build command, like this:
-
-```sh
-JEKYLL_ENV=production jekyll build
-```
-
-Specifying an environment value allows you to make certain content available only within specific environments.
-
-The default value for `JEKYLL_ENV` is `development`. Therefore if you omit `JEKYLL_ENV` from the build arguments, the default value will be `JEKYLL_ENV=development`. Any content inside `{% raw %}{% if jekyll.environment == "development" %}{% endraw %}` tags will automatically appear in the build.
-
-Your environment values can be anything you want (not just `development` or `production`). Some elements you might want to hide in development environments include Disqus comment forms or Google Analytics. Conversely, you might want to expose an "Edit me in GitHub" button in a development environment but not include it in production environments.
-
-By specifying the option in the build command, you avoid having to change values in your configuration files when moving from one environment to another.
-
-## Front Matter defaults
-
-Using [YAML Front Matter](../frontmatter/) is one way that you can specify configuration in the pages and posts for your site. Setting things like a default layout, or customizing the title, or specifying a more precise date/time for the post can all be added to your page or post front matter.
-
-Often times, you will find that you are repeating a lot of configuration options. Setting the same layout in each file, adding the same category - or categories - to a post, etc. You can even add custom variables like author names, which might be the same for the majority of posts on your blog.
-
-Instead of repeating this configuration each time you create a new post or page, Jekyll provides a way to set these defaults in the site configuration. To do this, you can specify site-wide defaults using the `defaults` key in the `_config.yml` file in your project's root directory.
-
-The `defaults` key holds an array of scope/values pairs that define what defaults should be set for a particular file path, and optionally, a file type in that path.
-
-Let's say that you want to add a default layout to all pages and posts in your site. You would add this to your `_config.yml` file:
-
-```yaml
-defaults:
-  -
-    scope:
-      path: "" # an empty string here means all files in the project
-    values:
-      layout: "default"
-```
-
-
    
-  
    Please stop and rerun `jekyll serve` command.
    
-  
    
-    The _config.yml master configuration file contains global configurations
-    and variable definitions that are read once at execution time. Changes made to _config.yml
-    during automatic regeneration are not loaded until the next execution.
-  
    
-  
    
-    Note Data Files are included and reloaded during automatic regeneration.
-  
    
-
    
-
-Here, we are scoping the `values` to any file that exists in the path `scope`. Since the path is set as an empty string, it will apply to **all files** in your project. You probably don't want to set a layout on every file in your project - like css files, for example - so you can also specify a `type` value under the `scope` key.
-
-```yaml
-defaults:
-  -
-    scope:
-      path: "" # an empty string here means all files in the project
-      type: "posts" # previously `post` in Jekyll 2.2.
-    values:
-      layout: "default"
-```
-
-Now, this will only set the layout for files where the type is `posts`.
-The different types that are available to you are `pages`, `posts`, `drafts` or any collection in your site. While `type` is optional, you must specify a value for `path` when creating a `scope/values` pair.
-
-As mentioned earlier, you can set multiple scope/values pairs for `defaults`.
-
-```yaml
-defaults:
-  -
-    scope:
-      path: ""
-      type: "pages"
-    values:
-      layout: "my-site"
-  -
-    scope:
-      path: "projects"
-      type: "pages" # previously `page` in Jekyll 2.2.
-    values:
-      layout: "project" # overrides previous default layout
-      author: "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:
-  my_collection:
-    output: true
-
-defaults:
-  -
-    scope:
-      path: ""
-      type: "my_collection" # a collection in your site, in plural form
-    values:
-      layout: "default"
-```
-
-In this example, the `layout` is set to `default` inside the
-[collection](../collections/) with the name `my_collection`.
-
-### Glob patterns in Front Matter defaults
-
-It is also possible to use glob patterns (currently limited to patterns that contain `*`) when matching defaults. For example, it is possible to set specific layout for each `special-page.html` in any subfolder of `section` folder. {%- include docs_version_badge.html version="3.7.0" -%}
-
-```yaml
-collections:
-  my_collection:
-    output: true
-
-defaults:
-  -
-    scope:
-      path: "section/*/special-page.html"
-    values:
-      layout: "specific-layout"
-```
-
-
    
-  
    Globbing and Performance
    
-  
    
-    Please note that globbing a path is known to have a negative effect on
-    performance and is currently not optimized, especially on Windows.
-    Globbing a path will increase your build times in proportion to the size
-    of the associated collection directory.
-  
    
-
    
-
-
-### 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.
-
-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:
-
-```yaml
-# In _config.yml
-...
-defaults:
-  -
-    scope:
-      path: "projects"
-      type: "pages"
-    values:
-      layout: "project"
-      author: "Mr. Hyde"
-      category: "project"
-...
-```
-
-```yaml
-# In projects/foo_project.md
----
-author: "John Smith"
-layout: "foobar"
----
-The post text goes here...
-```
-
-The `projects/foo_project.md` would have the `layout` set to `foobar` instead
-of `project` and the `author` set to `John Smith` instead of `Mr. Hyde` when
-the site is built.
-
-## Default Configuration
-
-Jekyll runs with the following configuration options by default. Alternative
-settings for these options can be explicitly specified in the configuration
-file or on the command-line.
-
-
    
-  
    There are two unsupported kramdown options
    
-  
    
-    Please note that both remove_block_html_tags and
-    remove_span_html_tags are currently unsupported in Jekyll due
-    to the fact that they are not included within the kramdown HTML converter.
-  
    
-
    
-
-```yaml
-# Where things are
-source:          .
-destination:     ./_site
-collections_dir: .
-plugins_dir:     _plugins
-layouts_dir:     _layouts
-data_dir:        _data
-includes_dir:    _includes
-collections:
-  posts:
-    output:   true
-
-# Handling Reading
-safe:                false
-include:             [".htaccess"]
-exclude:             ["Gemfile", "Gemfile.lock", "node_modules", "vendor/bundle/", "vendor/cache/", "vendor/gems/", "vendor/ruby/"]
-keep_files:          [".git", ".svn"]
-encoding:            "utf-8"
-markdown_ext:        "markdown,mkdown,mkdn,mkd,md"
-strict_front_matter: false
-
-# Filtering Content
-show_drafts: null
-limit_posts: 0
-future:      false
-unpublished: false
-
-# Plugins
-whitelist: []
-plugins:   []
-
-# Conversion
-markdown:    kramdown
-highlighter: rouge
-lsi:         false
-excerpt_separator: "\n\n"
-incremental: false
-
-# Serving
-detach:  false
-port:    4000
-host:    127.0.0.1
-baseurl: "" # does not include hostname
-show_dir_listing: false
-
-# Outputting
-permalink:     date
-paginate_path: /page:num
-timezone:      null
-
-quiet:    false
-verbose:  false
-defaults: []
-
-liquid:
-  error_mode:       warn
-  strict_filters:   false
-  strict_variables: false
-
-# Markdown Processors
-rdiscount:
-  extensions: []
-
-redcarpet:
-  extensions: []
-
-kramdown:
-  auto_ids:      true
-  entity_output: as_char
-  toc_levels:    1..6
-  smart_quotes:  lsquo,rsquo,ldquo,rdquo
-  input:         GFM
-  hard_wrap:     false
-  footnote_nr:   1
-  show_warnings: false
-```
-
-## Liquid Options
-
-Liquid's response to errors can be configured by setting `error_mode`. The
-options are
-
-- `lax` --- Ignore all errors.
-- `warn` --- Output a warning on the console for each error.
-- `strict` --- Output an error message and stop the build.
-
-You can also configure Liquid's renderer to catch non-assigned variables and
-non-existing filters by setting `strict_variables` and / or `strict_filters`
-to `true` respectively. {% include docs_version_badge.html version="3.8.0" %}
-
-Do note that while `error_mode` configures Liquid's parser, the `strict_variables`
-and `strict_filters` options configure Liquid's renderer and are consequently,
-mutually exclusive.
-
-## Markdown Options
-
-The various Markdown renderers supported by Jekyll sometimes have extra options
-available.
-
-### Redcarpet
-
-Redcarpet can be configured by providing an `extensions` sub-setting, whose
-value should be an array of strings. Each string should be the name of one of
-the `Redcarpet::Markdown` class's extensions; if present in the array, it will
-set the corresponding extension to `true`.
-
-Jekyll handles two special Redcarpet extensions:
-
-- `no_fenced_code_blocks` --- By default, Jekyll sets the `fenced_code_blocks`
-extension (for delimiting code blocks with triple tildes or triple backticks)
-to `true`, probably because GitHub's eager adoption of them is starting to make
-them inescapable. Redcarpet's normal `fenced_code_blocks` extension is inert
-when used with Jekyll; instead, you can use this inverted version of the
-extension for disabling fenced code.
-
-Note that you can also specify a language for highlighting after the first
-delimiter:
-
-        ```ruby
-        # ...ruby code
-        ```
-
-With both fenced code blocks and highlighter enabled, this will statically
-highlight the code; without any syntax highlighter, it will add a
-`class="LANGUAGE"` attribute to the `` element, which can be used as a
-hint by various JavaScript code highlighting libraries.
-
-- `smart` --- This pseudo-extension turns on SmartyPants, which converts
-  straight quotes to curly quotes and runs of hyphens to em (`---`) and en (`--`) dashes.
-
-All other extensions retain their usual names from Redcarpet, and no renderer
-options aside from `smart` can be specified in Jekyll. [A list of available
-extensions can be found in the Redcarpet README file.][redcarpet_extensions]
-Make sure you're looking at the README for the right version of
-Redcarpet: Jekyll currently uses v3.2.x. The most commonly used
-extensions are:
-
-- `tables`
-- `no_intra_emphasis`
-- `autolink`
-
-[redcarpet_extensions]: https://github.com/vmg/redcarpet/blob/v3.2.2/README.markdown#and-its-like-really-simple-to-use
-
-### Custom Markdown Processors
-
-If you're interested in creating a custom markdown processor, you're in luck! Create a new class in the `Jekyll::Converters::Markdown` namespace:
-
-```ruby
-class Jekyll::Converters::Markdown::MyCustomProcessor
-  def initialize(config)
-    require 'funky_markdown'
-    @config = config
-  rescue LoadError
-    STDERR.puts 'You are missing a library required for Markdown. Please run:'
-    STDERR.puts '  $ [sudo] gem install funky_markdown'
-    raise FatalException.new("Missing dependency: funky_markdown")
-  end
-
-  def convert(content)
-    ::FunkyMarkdown.new(content).convert
-  end
-end
-```
-
-Once you've created your class and have it properly set up either as a plugin
-in the `_plugins` folder or as a gem, specify it in your `_config.yml`:
-
-```yaml
-markdown: MyCustomProcessor
-```
-
-## Incremental Regeneration
-
    
-  
    Incremental regeneration is still an experimental feature
    
-  
    
-    While incremental regeneration will work for the most common cases, it will
-    not work correctly in every scenario. Please be extremely cautious when
-    using the feature, and report any problems not listed below by
-    opening an issue on GitHub.
-  
    
-
    
-
-Incremental regeneration helps shorten build times by only generating documents
-and pages that were updated since the previous build. It does this by keeping
-track of both file modification times and inter-document dependencies in the
-`.jekyll-metadata` file.
-
-Under the current implementation, incremental regeneration will only generate a
-document or page if either it, or one of its dependencies, is modified. Currently,
-the only types of dependencies tracked are includes (using the
-{% raw %}`{% include %}`{% endraw %} tag) and layouts. This means that plain
-references to other documents (for example, the common case of iterating over
-`site.posts` in a post listings page) will not be detected as a dependency.
-
-To remedy some of these shortfalls, putting `regenerate: true` in the front-matter
-of a document will force Jekyll to regenerate it regardless of whether it has been
-modified. Note that this will generate the specified document only; references
-to other documents' contents will not work since they won't be re-rendered.
-
-Incremental regeneration can be enabled via the `--incremental` flag (`-I` for
-short) from the command-line or by setting `incremental: true` in your
-configuration file.
+Jekyll gives you a lot of flexibility to customize how it builds your site. These
+options can either be specified in a `_config.yml` file placed in your site’s
+root directory, or can be specified as flags for the `jekyll` executable in the
+terminal.
+
+* [Configuration Options](/docs/configuration/options/)
+* [Default Configuration](/docs/configuration/default/)
+* [Front Matter Defaults](/docs/configuration/front-matter-defaults/)
+* [Environments](/docs/configuration/environments/)
+* [Markdown Options](/docs/configuration/markdown/)
+* [Liquid Options](/docs/configuration/liquid/)
+* [Webrick Options](/docs/configuration/webrick/)
+* [Incremental Regeneration](/docs/configuration/incremental-regeneration/)
diff --git a/docs/_docs/configuration/default.md b/docs/_docs/configuration/default.md
new file mode 100644
index 00000000000..8908578da0a
--- /dev/null
+++ b/docs/_docs/configuration/default.md
@@ -0,0 +1,86 @@
+---
+title: Default Configuration
+permalink: "/docs/configuration/default/"
+---
+
+Jekyll runs with the following configuration options by default. Alternative
+settings for these options can be explicitly specified in the configuration
+file or on the command-line.
+
+```yaml
+# Where things are
+source              : .
+destination         : ./_site
+collections_dir     : .
+plugins_dir         : _plugins
+layouts_dir         : _layouts
+data_dir            : _data
+includes_dir        : _includes
+collections:
+  posts:
+    output          : true
+
+# Handling Reading
+safe                : false
+include             : [".htaccess"]
+exclude             : ["Gemfile", "Gemfile.lock", "node_modules", "vendor/bundle/", "vendor/cache/", "vendor/gems/", "vendor/ruby/"]
+keep_files          : [".git", ".svn"]
+encoding            : "utf-8"
+markdown_ext        : "markdown,mkdown,mkdn,mkd,md"
+strict_front_matter : false
+
+# Filtering Content
+show_drafts         : null
+limit_posts         : 0
+future              : false
+unpublished         : false
+
+# Plugins
+whitelist           : []
+plugins             : []
+
+# Conversion
+markdown            : kramdown
+highlighter         : rouge
+lsi                 : false
+excerpt_separator   : "\n\n"
+incremental         : false
+
+# Serving
+detach              : false
+port                : 4000
+host                : 127.0.0.1
+baseurl             : "" # does not include hostname
+show_dir_listing    : false
+
+# Outputting
+permalink           : date
+paginate_path       : /page:num
+timezone            : null
+
+quiet               : false
+verbose             : false
+defaults            : []
+
+liquid:
+  error_mode        : warn
+  strict_filters    : false
+  strict_variables  : false
+
+# Markdown Processors
+rdiscount:
+  extensions        : []
+
+redcarpet:
+  extensions        : []
+
+kramdown:
+  auto_ids          : true
+  entity_output     : as_char
+  toc_levels        : 1..6
+  smart_quotes      : lsquo,rsquo,ldquo,rdquo
+  input             : GFM
+  hard_wrap         : false
+  footnote_nr       : 1
+  show_warnings     : false
+```
diff --git a/docs/_docs/configuration/environments.md b/docs/_docs/configuration/environments.md
new file mode 100644
index 00000000000..8ce0e41845c
--- /dev/null
+++ b/docs/_docs/configuration/environments.md
@@ -0,0 +1,43 @@
+---
+title: Environments
+permalink: "/docs/configuration/environments/"
+---
+In the `build` (or `serve`) arguments, you can specify a Jekyll environment
+and value. The build will then apply this value in any conditional statements
+in your content.
+
+For example, suppose you set this conditional statement in your code:
+
+{% raw %}
+```liquid
+{% if jekyll.environment == "production" %}
+   {% include disqus.html %}
+{% endif %}
+```
+{% endraw %}
+
+When you build your Jekyll site, the content inside the `if` statement won't be
+run unless you also specify a `production` environment in the build command,
+like this:
+
+```sh
+JEKYLL_ENV=production jekyll build
+```
+
+Specifying an environment value allows you to make certain content available
+only within specific environments.
+
+The default value for `JEKYLL_ENV` is `development`. Therefore if you omit
+`JEKYLL_ENV` from the build arguments, the default value will be
+`JEKYLL_ENV=development`. Any content inside
+{% raw %}`{% if jekyll.environment == "development" %}`{% endraw %} tags will
+automatically appear in the build.
+
+Your environment values can be anything you want (not just `development` or
+`production`). Some elements you might want to hide in development
+environments include Disqus comment forms or Google Analytics. Conversely,
+you might want to expose an "Edit me in GitHub" button in a development
+environment but not include it in production environments.
+
+By specifying the option in the build command, you avoid having to change
+values in your configuration files when moving from one environment to another.
diff --git a/docs/_docs/configuration/front-matter-defaults.md b/docs/_docs/configuration/front-matter-defaults.md
new file mode 100644
index 00000000000..f8292b2cc2b
--- /dev/null
+++ b/docs/_docs/configuration/front-matter-defaults.md
@@ -0,0 +1,152 @@
+---
+title: Front Matter Defaults
+permalink: "/docs/configuration/front-matter-defaults/"
+---
+
+Using [front matter](/docs/front-matter/) is one way that you can specify configuration in the pages and posts for your site. Setting things like a default layout, or customizing the title, or specifying a more precise date/time for the post can all be added to your page or post front matter.
+
+Often times, you will find that you are repeating a lot of configuration options. Setting the same layout in each file, adding the same category - or categories - to a post, etc. You can even add custom variables like author names, which might be the same for the majority of posts on your blog.
+
+Instead of repeating this configuration each time you create a new post or page, Jekyll provides a way to set these defaults in the site configuration. To do this, you can specify site-wide defaults using the `defaults` key in the `_config.yml` file in your project's root directory.
+
+The `defaults` key holds an array of scope/values pairs that define what defaults should be set for a particular file path, and optionally, a file type in that path.
+
+Let's say that you want to add a default layout to all pages and posts in your site. You would add this to your `_config.yml` file:
+
+```yaml
+defaults:
+  -
+    scope:
+      path: "" # an empty string here means all files in the project
+    values:
+      layout: "default"
+```
+
+
    
+  
    Stop and rerun `jekyll serve` command.
    
+  
    
+    The _config.yml master configuration file contains global configurations
+    and variable definitions that are read once at execution time. Changes made to _config.yml
+    during automatic regeneration are not loaded until the next execution.
+  
    
+  
    
+    Note Data Files are included and reloaded during automatic regeneration.
+  
    
+
    
+
+Here, we are scoping the `values` to any file that exists in the path `scope`. Since the path is set as an empty string, it will apply to **all files** in your project. You probably don't want to set a layout on every file in your project - like css files, for example - so you can also specify a `type` value under the `scope` key.
+
+```yaml
+defaults:
+  -
+    scope:
+      path: "" # an empty string here means all files in the project
+      type: "posts" # previously `post` in Jekyll 2.2.
+    values:
+      layout: "default"
+```
+
+Now, this will only set the layout for files where the type is `posts`.
+The different types that are available to you are `pages`, `posts`, `drafts` or any collection in your site. While `type` is optional, you must specify a value for `path` when creating a `scope/values` pair.
+
+As mentioned earlier, you can set multiple scope/values pairs for `defaults`.
+
+```yaml
+defaults:
+  -
+    scope:
+      path: ""
+      type: "pages"
+    values:
+      layout: "my-site"
+  -
+    scope:
+      path: "projects"
+      type: "pages" # previously `page` in Jekyll 2.2.
+    values:
+      layout: "project" # overrides previous default layout
+      author: "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](/docs/variables/) set to `Mr. Hyde`.
+
+```yaml
+collections:
+  my_collection:
+    output: true
+
+defaults:
+  -
+    scope:
+      path: ""
+      type: "my_collection" # a collection in your site, in plural form
+    values:
+      layout: "default"
+```
+
+In this example, the `layout` is set to `default` inside the
+[collection](/docs/collections/) with the name `my_collection`.
+
+### Glob patterns in Front Matter defaults
+
+It is also possible to use glob patterns (currently limited to patterns that contain `*`) when matching defaults. For example, it is possible to set specific layout for each `special-page.html` in any subfolder of `section` folder. {%- include docs_version_badge.html version="3.7.0" -%}
+
+```yaml
+collections:
+  my_collection:
+    output: true
+
+defaults:
+  -
+    scope:
+      path: "section/*/special-page.html"
+    values:
+      layout: "specific-layout"
+```
+
+
    
+  
    Globbing and Performance
    
+  
    
+    Please note that globbing a path is known to have a negative effect on
+    performance and is currently not optimized, especially on Windows.
+    Globbing a path will increase your build times in proportion to the size
+    of the associated collection directory.
+  
    
+
    
+
+
+### 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.
+
+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:
+
+```yaml
+# In _config.yml
+...
+defaults:
+  -
+    scope:
+      path: "projects"
+      type: "pages"
+    values:
+      layout: "project"
+      author: "Mr. Hyde"
+      category: "project"
+...
+```
+
+```yaml
+# In projects/foo_project.md
+---
+author: "John Smith"
+layout: "foobar"
+---
+The post text goes here...
+```
+
+The `projects/foo_project.md` would have the `layout` set to `foobar` instead
+of `project` and the `author` set to `John Smith` instead of `Mr. Hyde` when
+the site is built.
diff --git a/docs/_docs/configuration/incremental-regeneration.md b/docs/_docs/configuration/incremental-regeneration.md
new file mode 100644
index 00000000000..b538c374491
--- /dev/null
+++ b/docs/_docs/configuration/incremental-regeneration.md
@@ -0,0 +1,36 @@
+---
+title: Default Configuration
+permalink: "/docs/configuration/incremental-regeneration/"
+---
+
+## Incremental Regeneration
+
    
+  
    Incremental regeneration is still an experimental feature
    
+  
    
+    While incremental regeneration will work for the most common cases, it will
+    not work correctly in every scenario. Please be extremely cautious when
+    using the feature, and report any problems not listed below by
+    opening an issue on GitHub.
+  
    
+
    
+
+Incremental regeneration helps shorten build times by only generating documents
+and pages that were updated since the previous build. It does this by keeping
+track of both file modification times and inter-document dependencies in the
+`.jekyll-metadata` file.
+
+Under the current implementation, incremental regeneration will only generate a
+document or page if either it, or one of its dependencies, is modified. Currently,
+the only types of dependencies tracked are includes (using the
+{% raw %}`{% include %}`{% endraw %} tag) and layouts. This means that plain
+references to other documents (for example, the common case of iterating over
+`site.posts` in a post listings page) will not be detected as a dependency.
+
+To remedy some of these shortfalls, putting `regenerate: true` in the front-matter
+of a document will force Jekyll to regenerate it regardless of whether it has been
+modified. Note that this will generate the specified document only; references
+to other documents' contents will not work since they won't be re-rendered.
+
+Incremental regeneration can be enabled via the `--incremental` flag (`-I` for
+short) from the command-line or by setting `incremental: true` in your
+configuration file.
diff --git a/docs/_docs/configuration/liquid.md b/docs/_docs/configuration/liquid.md
new file mode 100644
index 00000000000..fd050f616ef
--- /dev/null
+++ b/docs/_docs/configuration/liquid.md
@@ -0,0 +1,18 @@
+---
+title: Liquid Options
+permalink: "/docs/configuration/liquid/"
+---
+Liquid's response to errors can be configured by setting `error_mode`. The
+options are
+
+- `lax` --- Ignore all errors.
+- `warn` --- Output a warning on the console for each error.
+- `strict` --- Output an error message and stop the build.
+
+You can also configure Liquid's renderer to catch non-assigned variables and
+non-existing filters by setting `strict_variables` and / or `strict_filters`
+to `true` respectively. {% include docs_version_badge.html version="3.8.0" %}
+
+Do note that while `error_mode` configures Liquid's parser, the `strict_variables`
+and `strict_filters` options configure Liquid's renderer and are consequently,
+mutually exclusive.
diff --git a/docs/_docs/configuration/markdown.md b/docs/_docs/configuration/markdown.md
new file mode 100644
index 00000000000..865d6e7e7df
--- /dev/null
+++ b/docs/_docs/configuration/markdown.md
@@ -0,0 +1,124 @@
+---
+title: Markdown Options
+permalink: "/docs/configuration/markdown/"
+---
+The various Markdown renderers supported by Jekyll sometimes have extra options
+available.
+
+### Kramdown
+
+Kramdown is the default Markdown renderer for Jekyll. Below is a list of the
+currently supported options:
+
+* **auto_id_prefix** - Prefix used for automatically generated header IDs
+* **auto_id_stripping** - Strip all formatting from header text for automatic ID generation
+* **auto_ids** - Use automatic header ID generation
+* **coderay_bold_every** - Defines how often a line number should be made bold
+* **coderay_css** - Defines how the highlighted code gets styled
+* **coderay_default_lang** - Sets the default language for highlighting code blocks
+* **coderay_line_number_start** - The start value for the line numbers
+* **coderay_line_numbers** - Defines how and if line numbers should be shown
+* **coderay_tab_width** - The tab width used in highlighted code
+* **coderay_wrap** - Defines how the highlighted code should be wrapped
+* **enable_coderay** - Use coderay for syntax highlighting
+* **entity_output** - Defines how entities are output
+* **footnote_backlink** - Defines the text that should be used for the footnote backlinks
+* **footnote_backlink_inline** - Specifies whether the footnote backlink should always be inline
+* **footnote_nr** - The number of the first footnote
+* **gfm_quirks** - Enables a set of GFM specific quirks
+* **hard_wrap** - Interprets line breaks literally
+* **header_offset** - Sets the output offset for headers
+* **html_to_native** - Convert HTML elements to native elements
+* **line_width** - Defines the line width to be used when outputting a document
+* **link_defs** - Pre-defines link definitions
+* **math_engine** - Set the math engine
+* **math_engine_opts** - Set the math engine options
+* **parse_block_html** - Process kramdown syntax in block HTML tags
+* **parse_span_html** - Process kramdown syntax in span HTML tags
+* **smart_quotes** - Defines the HTML entity names or code points for smart quote output
+* **syntax_highlighter** - Set the syntax highlighter
+* **syntax_highlighter_opts** - Set the syntax highlighter options
+* **toc_levels** - Defines the levels that are used for the table of contents
+* **transliterated_header_ids** - Transliterate the header text before generating the ID
+* **typographic_symbols** - Defines a mapping from typographical symbol to output characters
+
+
    
+  
    There are two unsupported kramdown options
    
+  
    
+    Please note that both remove_block_html_tags and
+    remove_span_html_tags are currently unsupported in Jekyll due
+    to the fact that they are not included within the kramdown HTML converter.
+  
    
+
    
+
+For more details about these options have a look at the [Kramdown configuration documentation](https://kramdown.gettalong.org/options.html).  
+
+### Redcarpet
+
+Redcarpet can be configured by providing an `extensions` sub-setting, whose
+value should be an array of strings. Each string should be the name of one of
+the `Redcarpet::Markdown` class's extensions; if present in the array, it will
+set the corresponding extension to `true`.
+
+Jekyll handles two special Redcarpet extensions:
+
+- `no_fenced_code_blocks` --- By default, Jekyll sets the `fenced_code_blocks`
+extension (for delimiting code blocks with triple tildes or triple backticks)
+to `true`, probably because GitHub's eager adoption of them is starting to make
+them inescapable. Redcarpet's normal `fenced_code_blocks` extension is inert
+when used with Jekyll; instead, you can use this inverted version of the
+extension for disabling fenced code.
+
+Note that you can also specify a language for highlighting after the first
+delimiter:
+
+        ```ruby
+        # ...ruby code
+        ```
+
+With both fenced code blocks and highlighter enabled, this will statically
+highlight the code; without any syntax highlighter, it will add a
+`class="LANGUAGE"` attribute to the `` element, which can be used as a
+hint by various JavaScript code highlighting libraries.
+
+- `smart` --- This pseudo-extension turns on SmartyPants, which converts
+  straight quotes to curly quotes and runs of hyphens to em (`---`) and en (`--`) dashes.
+
+All other extensions retain their usual names from Redcarpet, and no renderer
+options aside from `smart` can be specified in Jekyll. [A list of available
+extensions can be found in the Redcarpet README file.](https://github.com/vmg/redcarpet/blob/v3.2.2/README.markdown#and-its-like-really-simple-to-use)
+Make sure you're looking at the README for the right version of
+Redcarpet: Jekyll currently uses v3.2.x. The most commonly used
+extensions are:
+
+- `tables`
+- `no_intra_emphasis`
+- `autolink`
+
+### Custom Markdown Processors
+
+If you're interested in creating a custom markdown processor, you're in luck! Create a new class in the `Jekyll::Converters::Markdown` namespace:
+
+```ruby
+class Jekyll::Converters::Markdown::MyCustomProcessor
+  def initialize(config)
+    require 'funky_markdown'
+    @config = config
+  rescue LoadError
+    STDERR.puts 'You are missing a library required for Markdown. Please run:'
+    STDERR.puts '  $ [sudo] gem install funky_markdown'
+    raise FatalException.new("Missing dependency: funky_markdown")
+  end
+
+  def convert(content)
+    ::FunkyMarkdown.new(content).convert
+  end
+end
+```
+
+Once you've created your class and have it properly set up either as a plugin
+in the `_plugins` folder or as a gem, specify it in your `_config.yml`:
+
+```yaml
+markdown: MyCustomProcessor
+```
diff --git a/docs/_docs/configuration/options.md b/docs/_docs/configuration/options.md
new file mode 100644
index 00000000000..cd17c0b2356
--- /dev/null
+++ b/docs/_docs/configuration/options.md
@@ -0,0 +1,409 @@
+---
+title: Configuration Options
+permalink: "/docs/configuration/options/"
+---
+
+The tables below list the available settings for Jekyll, and the various options (specified in the configuration file) and flags (specified on the command-line) that control them.
+
+### Global Configuration
+
+
    
+
+  
+    
+      
+      
+    
+  
+  
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+  
+
    Setting
+        Options and Flags
+      
    
+        
    Site Source
    
+        
    Change the directory where Jekyll will read files
    
+          		
+        
    source: DIR
    
+        
    -s, --source DIR
    
+      
    
+        
    Site Destination
    
+        
    Change the directory where Jekyll will write files
    
+          		
+        
    destination: DIR
    
+        
    -d, --destination DIR
    
+      
    
+        
    Safe
    
+        
    Disable custom plugins, and ignore symbolic links.
    
+          		
+        
    safe: BOOL
    
+        
    --safe
    
+      
    
+        
    Exclude
    
+        
    
+          Exclude directories and/or files from the
+          conversion. These exclusions are relative to the site's
+          source directory and cannot be outside the source directory.
+        
    
+          		
+        
    exclude: [DIR, FILE, ...]
    
+      
    
+        
    Include
    
+        
    
+          Force inclusion of directories and/or files in the conversion.
+          .htaccess is a good example since dotfiles are excluded
+          by default.
+        
    
+          		
+        
    include: [DIR, FILE, ...]
    
+      
    
+        
    Keep files
    
+        
    
+          When clobbering the site destination, keep the selected files.
+          Useful for files that are not generated by jekyll; e.g. files or
+          assets that are generated by your build tool.
+          The paths are relative to the destination.
+        
    
+          		
+        
    keep_files: [DIR, FILE, ...]
    
+      
    
+        
    Time Zone
    
+        
    
+            Set the time zone for site generation. This sets the TZ
+            environment variable, which Ruby uses to handle time and date
+            creation and manipulation. Any entry from the
+            IANA Time Zone
+            Database is valid, e.g. America/New_York. A list of all
+            available values can be found 
+            here. When serving on a local machine, the default time zone is set by your operating system. But when served on a remote host/server, the default time zone depends on the server's setting or location.
+        
    
+          		
+        
    timezone: TIMEZONE
    
+      
    
+        
    Encoding
    
+        
    
+            Set the encoding of files by name (only available for Ruby
+            1.9 or later).
+            The default value is utf-8 starting in 2.0.0,
+            and nil before 2.0.0, which will yield the Ruby
+            default of ASCII-8BIT.
+            Available encodings can be shown by the
+            command ruby -e 'puts Encoding::list.join("\n")'.
+        
    
+          		
+        
    encoding: ENCODING
    
+      
    
+        
    Defaults
    
+        
    
+            Set defaults for front matter
+            variables.
+        
    
+          		
+        
    see below
    
+      
    
+
    
+
+
    
+  
    Destination folders are cleaned on site builds
    
+  
    
+    The contents of <destination> are automatically
+    cleaned, by default, when the site is built. Files or folders that are not
+    created by your site will be removed. Some files could be retained
+    by specifying them within the <keep_files> configuration directive.
+  
    
+  
    
+    Do not use an important location for <destination>; instead, use it as
+    a staging area and copy files from there to your web server.
+  
    
+
    
+
+### Build Command Options
+
+
    
+
+  
+    
+      
+      
+    
+  
+  
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+  
+
    SettingOptions and Flags
    
+        
    Regeneration
    
+        
    Enable auto-regeneration of the site when files are modified.
    
+          		
+        
    -w, --[no-]watch
    
+      
    
+        
    Configuration
    
+        
    Specify config files instead of using _config.yml automatically. Settings in later files override settings in earlier files.
    
+          		
+        
    --config FILE1[,FILE2,...]
    
+      
    
+        
    Drafts
    
+        
    Process and render draft posts.
    
+          		
+        
    show_drafts: BOOL
    
+        
    --drafts
    
+      
    
+        
    Environment
    
+        
    Use a specific environment value in the build.
    
+          		
+        
    JEKYLL_ENV=production
    
+      
    
+        
    Future
    
+        
    Publish posts or collection documents with a future date.
    
+          		
+        
    future: BOOL
    
+        
    --future
    
+      
    
+        
    Unpublished
    
+        
    Render posts that were marked as unpublished.
    
+          		
+        
    unpublished: BOOL
    
+        
    --unpublished
    
+      
    
+        
    LSI
    
+        
    Produce an index for related posts. Requires the classifier-reborn plugin.
    
+          		
+        
    lsi: BOOL
    
+        
    --lsi
    
+      
    
+        
    Limit Posts
    
+        
    Limit the number of posts to parse and publish.
    
+          		
+        
    limit_posts: NUM
    
+        
    --limit_posts NUM
    
+      
    
+        
    Force polling
    
+        
    Force watch to use polling.
    
+          		
+        
    --force_polling
    
+      
    
+        
    Verbose output
    
+        
    Print verbose output.
    
+          		
+        
    -V, --verbose
    
+      
    
+        
    Silence Output
    
+        
    Silence the normal output from Jekyll
+        during a build
    
+          		
+        
    -q, --quiet
    
+      
    
+        
    Incremental build
    
+        
    
+            Enable the experimental incremental build feature. Incremental build only
+            re-builds posts and pages that have changed, resulting in significant performance
+            improvements for large sites, but may also break site generation in certain
+            cases.
+        
    
+          		
+        
    incremental: BOOL
    
+        
    -I, --incremental
    
+      
    
+        
    Liquid profiler
    
+        
    
+            Generate a Liquid rendering profile to help you identify performance bottlenecks.
+        
    
+          		
+        
    profile: BOOL
    
+        
    --profile
    
+      
    
+        
    Strict Front Matter
    
+        
    
+            Cause a build to fail if there is a YAML syntax error in a page's front matter.
+        
    
+          		
+        
    strict_front_matter: BOOL
    
+        
    --strict_front_matter
    
+      
    
+
    
+
+
+### Serve Command Options
+
+In addition to the options below, the `serve` sub-command can accept any of the options
+for the `build` sub-command, which are then applied to the site build which occurs right
+before your site is served.
+
+
    
+
+  
+    
+      
+      
+    
+  
+  
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+  
+
    SettingOptions and Flags
    
+        
    Local Server Port
    
+        
    Listen on the given port.
    
+          		
+        
    port: PORT
    
+        
    --port PORT
    
+      
    
+        
    Local Server Hostname
    
+        
    Listen at the given hostname.
    
+          		
+        
    host: HOSTNAME
    
+        
    --host HOSTNAME
    
+      
    
+        
    Base URL
    
+        
    Serve the website from the given base URL
    
+          		
+        
    baseurl: URL
    
+        
    --baseurl URL
    
+      
    
+        
    Detach
    
+        
    Detach the server from the terminal
    
+          		
+        
    detach: BOOL
    
+        
    -B, --detach
    
+      
    
+        
    Skips the initial site build.
    
+        
    Skips the initial site build which occurs before the server is started.
    
+          		
+        
    --skip-initial-build
    
+      
    
+        
    X.509 (SSL) Private Key
    
+        
    SSL Private Key.
    
+          		
+        
    --ssl-key
    
+      
    
+        
    X.509 (SSL) Certificate
    
+        
    SSL Public certificate.
    
+          		
+        
    --ssl-cert
    
+      
    
+
    
+
+
    
+  
    Do not use tabs in configuration files
    
+  
    
+    This will either lead to parsing errors, or Jekyll will revert to the
+    default settings. Use spaces instead.
+  
    
+
    
diff --git a/docs/_docs/configuration/webrick.md b/docs/_docs/configuration/webrick.md
new file mode 100644
index 00000000000..c760b850cf9
--- /dev/null
+++ b/docs/_docs/configuration/webrick.md
@@ -0,0 +1,20 @@
+---
+title: WEBrick Options
+permalink: "/docs/configuration/webrick/"
+---
+You can provide custom headers for your site by adding them to `_config.yml`
+
+```yaml
+# File: _config.yml
+webrick:
+  headers:
+    My-Header: My-Value
+    My-Other-Header: My-Other-Value
+```
+
+### Defaults
+
+Jekyll provides by default `Content-Type` and `Cache-Control` response
+headers: one dynamic in order to specify the nature of the data being served,
+the other static in order to disable caching so that you don't have to fight
+with Chrome's aggressive caching when you are in development mode.
diff --git a/docs/_docs/continuous-integration/buddyworks.md b/docs/_docs/continuous-integration/buddyworks.md
index aef1ce8ed53..5dd43e3ce5e 100644
--- a/docs/_docs/continuous-integration/buddyworks.md
+++ b/docs/_docs/continuous-integration/buddyworks.md
@@ -21,8 +21,6 @@ title: "Buddy"
 
 Whenever you make a push to the selected branch, the Jekyll action runs `jekyll build` in an isolated [Jekyll Docker image][jekyll-docker-image]. The output is generated to the `/filesystem` directory, and can be further deployed to FTP/SFTP and IaaS services. You can add your own commands, install additional packages, attach services, and run Selenium tests, as well as add other actions down the pipeline, eg. a Slack notification or an SSH script that will restart your server.
 
-![Jekyll Build](https://buddy.works/data/blog/_images/buddyworks-jekyll-small.png)
-
 [jekyll-docker-image]: https://hub.docker.com/r/jekyll/jekyll/
 
 ## 3. Using YAML for configuration
diff --git a/docs/_docs/continuous-integration/circleci.md b/docs/_docs/continuous-integration/circleci.md
index ce58a0092ae..9380a90ce8b 100644
--- a/docs/_docs/continuous-integration/circleci.md
+++ b/docs/_docs/continuous-integration/circleci.md
@@ -12,7 +12,7 @@ Building, testing, and deploying your Jekyll-generated website can quickly be do
 
 To start building your project on CircleCI, all you need to do is 'follow' your project from CircleCI's website:
 
-1. Visit the 'Add Projects' page: 
+1. Visit the 'Add Projects' page
 1. From the GitHub or Bitbucket tab on the left, choose a user or organization.
 1. Find your project in the list and click 'Build project' on the right.
 1. The first build will start on its own. You can start telling CircleCI how to build your project by creating a [circle.yml][3] file in the root of your repository.
diff --git a/docs/_docs/continuous-integration/index.md b/docs/_docs/continuous-integration/index.md
deleted file mode 100644
index c0826fc54a6..00000000000
--- a/docs/_docs/continuous-integration/index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: Continuous Integration
-permalink: /docs/continuous-integration/
----
-
-Continuous Integration (CI) enables you to publish your Jekyll generated website with confidence by automating the quality assurance and deployment processes. You can quickly get started using CI with one of the providers below:
-
-* [Travis CI](travis-ci)
-* [CircleCI](circleci)
-* [Buddy](buddyworks)
diff --git a/docs/_docs/datafiles.md b/docs/_docs/datafiles.md
index f59715198c1..9d7cc6864a9 100644
--- a/docs/_docs/datafiles.md
+++ b/docs/_docs/datafiles.md
@@ -18,9 +18,8 @@ Plugins/themes can also leverage Data Files to set configuration variables.
 
 ## The Data Folder
 
-As explained on the [directory structure](../structure/) page, the `_data`
-folder is where you can store additional data for Jekyll to use when generating
-your site. These files must be YAML, JSON, or CSV files (using either
+The `_data` folder is where you can store additional data for Jekyll to use when
+generating your site. These files must be YAML, JSON, or CSV files (using either
 the `.yml`, `.yaml`, `.json` or `.csv` extension), and they will be
 accessible via `site.data`.
 
@@ -70,10 +69,7 @@ You can now render the list of members in a template:
 ```
 {% 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 %}).
-
-## Example: Organizations
+## Subfolders
 
 Data files can also be placed in sub-folders of the `_data` folder. Each folder
 level will be added to a variable's namespace. The example below shows how
@@ -134,7 +130,7 @@ dave:
     twitter: DavidSilvaSmith
 ```
 
-The author can then be specified as a page variable in a post's frontmatter:
+The author can then be specified as a page variable in a post's front matter:
 
 {% raw %}
 ```liquid
diff --git a/docs/_docs/deployment-methods.md b/docs/_docs/deployment-methods.md
deleted file mode 100644
index cfdd465bec3..00000000000
--- a/docs/_docs/deployment-methods.md
+++ /dev/null
@@ -1,220 +0,0 @@
----
-title: Deployment methods
-permalink: /docs/deployment-methods/
----
-
-Sites built using Jekyll can be deployed in a large number of ways due to the static nature of the generated output. A few of the most common deployment techniques are described below.
-
-
    
-  
    ProTip™: Use GitHub Pages for zero-hassle Jekyll hosting
    
-  
    GitHub Pages are powered by Jekyll behind the scenes, so if you’re looking for a zero-hassle, zero-cost solution, GitHub Pages are a great way to host your Jekyll-powered website for free.
    
-
    
-
-## Netlify
-
-Netlify provides Global CDN, Continuous Deployment, one click HTTPS and [much more](https://www.netlify.com/features/), providing developers the most robust toolset available for modern web projects, without added complexity. Netlify supports custom plugins for Jekyll and has a free plan for open source projects.
-
-Read this [Jekyll step-by-step guide](https://www.netlify.com/blog/2015/10/28/a-step-by-step-guide-jekyll-3.0-on-netlify/) to setup your Jekyll site on Netlify.
-
-## Aerobatic
-
-[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 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
-
-Use [Kickster](http://kickster.nielsenramon.com/) for easy (automated) deploys to GitHub Pages when using unsupported plugins on GitHub Pages.
-
-Kickster provides a basic Jekyll project setup packed with web best practises and useful optimization tools increasing your overall project quality. Kickster ships with automated and worry-free deployment scripts for GitHub Pages.
-
-Setting up Kickster is very easy, just install the gem and you are good to go. More documentation can here found [here](https://github.com/nielsenramon/kickster#kickster). If you do not want to use the gem or start a new project you can just copy paste the deployment scripts for [Travis CI](https://github.com/nielsenramon/kickster/tree/master/snippets/travis) or [Circle CI](https://github.com/nielsenramon/kickster#automated-deployment-with-circle-ci).
-
-## Web hosting providers (FTP)
-
-Just about any traditional web hosting provider will let you upload files to their servers over FTP. To upload a Jekyll site to a web host using FTP, simply run the `jekyll build` command and copy the contents of the generated `_site` folder to the root folder of your hosting account. This is most likely to be the `httpdocs` or `public_html` folder on most hosting providers.
-
-## Self-managed web server
-
-If you have direct access to the deployment web server, the process is essentially the same, except you might have other methods available to you (such as `scp`, or even direct filesystem access) for transferring the files. Just remember to make sure the contents of the generated `_site` folder get placed in the appropriate web root directory for your web server.
-
-## Automated methods
-
-There are also a number of ways to easily automate the deployment of a Jekyll site. If you’ve got another method that isn’t listed below, we’d love it if you [contributed](../contributing/) so that everyone else can benefit too.
-
-### Git post-update hook
-
-If you store your Jekyll site in [Git](https://git-scm.com/) (you are using
-version control, right?), it’s pretty easy to automate the
-deployment process by setting up a post-update hook in your Git
-repository, [like
-this](http://web.archive.org/web/20091223025644/http://www.taknado.com/en/2009/03/26/deploying-a-jekyll-generated-site/).
-
-### Git post-receive hook
-
-To have a remote server handle the deploy for you every time you push changes using Git, you can create a user account which has all the public keys that are authorized to deploy in its `authorized_keys` file. With that in place, setting up the post-receive hook is done as follows:
-
-```sh
-laptop$ ssh deployer@example.com
-server$ mkdir myrepo.git
-server$ cd myrepo.git
-server$ git --bare init
-server$ cp hooks/post-receive.sample hooks/post-receive
-server$ mkdir /var/www/myrepo
-```
-
-Next, add the following lines to hooks/post-receive and be sure Jekyll is
-installed on the server:
-
-```bash
-GIT_REPO=$HOME/myrepo.git
-TMP_GIT_CLONE=$HOME/tmp/myrepo
-GEMFILE=$TMP_GIT_CLONE/Gemfile
-PUBLIC_WWW=/var/www/myrepo
-
-git clone $GIT_REPO $TMP_GIT_CLONE
-BUNDLE_GEMFILE=$GEMFILE bundle install
-BUNDLE_GEMFILE=$GEMFILE bundle exec jekyll build -s $TMP_GIT_CLONE -d $PUBLIC_WWW
-rm -Rf $TMP_GIT_CLONE
-exit
-```
-
-Finally, run the following command on any users laptop that needs to be able to
-deploy using this hook:
-
-```sh
-laptops$ git remote add deploy deployer@example.com:~/myrepo.git
-```
-
-Deploying is now as easy as telling nginx or Apache to look at
-`/var/www/myrepo` and running the following:
-
-```sh
-laptops$ git push deploy master
-```
-
-### Git pre-push hook
-
-Instead of deploying using server-side hooks, you can deploy using `pre-push` client-side (executes on your desktop machine) git hook. [Check here](https://victorafanasev.info/tech/deploy-jekyll-build-to-github-pages-using-git-pre-push-hook) an example for Github Pages.
-
-### Static Publisher
-
-[Static Publisher](https://github.com/static-publisher/static-publisher) is another automated deployment option with a server listening for webhook posts, though it's not tied to GitHub specifically. It has a one-click deploy to Heroku, it can watch multiple projects from one server, it has an easy to user admin interface and can publish to either S3 or to a git repository (e.g. gh-pages).
-
-### Rake
-
-Another way to deploy your Jekyll site is to use [Rake](https://github.com/ruby/rake), [HighLine](https://github.com/JEG2/highline), and
-[Net::SSH](https://github.com/net-ssh/net-ssh). A more complex example of deploying Jekyll with Rake that deals with multiple branches can be found in [Git Ready](https://github.com/gitready/gitready/blob/cdfbc4ec5321ff8d18c3ce936e9c749dbbc4f190/Rakefile).
-
-
-### scp
-
-Once you’ve generated the `_site` directory, you can easily scp its content using a
-`tasks/deploy` shell script similar to [this deploy script][]. You’d obviously
-need to change the values to reflect your site’s details. There is even [a
-matching TextMate command][] that will help you run this script.
-
-[this deploy script]: https://github.com/henrik/henrik.nyh.se/blob/master/script/deploy
-
-[a matching TextMate command]: https://gist.github.com/henrik/214959
-
-### rsync
-
-Once you’ve generated the `_site` directory, you can easily rsync its content using a `tasks/deploy` shell script similar to [this deploy script here](https://github.com/vitalyrepin/vrepinblog/blob/master/transfer.sh). You’d obviously need to change the values to reflect your site’s details.
-
-Certificate-based authorization is another way to simplify the publishing
-process. It makes sense to restrict rsync access only to the directory which it is supposed to sync. This can be done using rrsync.
-
-#### Step 1: Install rrsync to your home folder (server-side)
-
-If it is not already installed by your host, you can do it yourself:
-
-- [Download rrsync](https://ftp.samba.org/pub/unpacked/rsync/support/rrsync)
-- Place it in the `bin` subdirectory of your home folder  (`~/bin`)
-- Make it executable (`chmod +x`)
-
-#### Step 2: Set up certificate-based SSH access (server side)
-
-This [process](https://wiki.gentoo.org/wiki/SSH#Passwordless_Authentication) is
-described in several places online. What is different from the typical approach
-is to put the restriction to certificate-based authorization in
-`~/.ssh/authorized_keys`. Then, launch `rrsync` and supply
-it with the folder it shall have read-write access to:
-
-```sh
-command="$HOME/bin/rrsync ",no-agent-forwarding,no-port-forwarding,no-pty,no-user-rc,no-X11-forwarding ssh-rsa 
-```
-
-`` is the path to your site. E.g., `~/public_html/you.org/blog-html/`.
-
-#### Step 3: Rsync (client-side)
-
-Add the `deploy` script to the site source folder:
-
-```sh
-#!/bin/sh
-
-rsync -crvz --rsh='ssh -p2222' --delete-after --delete-excluded    @:
-```
-
-Command line parameters are:
-
-- `--rsh=ssh -p2222` — The port for SSH access. It is required if
-your host uses a different port than the default (e.g, HostGator)
-- `` — The name of the local output folder (defaults to `_site`)
-- `` — The username for your hosting account
-- `` — Your hosting server
-
-Using this setup, you might run the following command:
-
-```sh
-rsync -crvz --rsh='ssh -p2222' --delete-after --delete-excluded _site/ hostuser@example.org:
-```
-
-Don't forget the column `:` after server name!
-
-#### Step 4 (Optional): Exclude the transfer script from being copied to the output folder.
-
-This step is recommended if you use these instructions to deploy your site. If
-you put the `deploy` script in the root folder of your project, Jekyll will
-copy it to the output folder. This behavior can be changed in `_config.yml`.
-
-Just add the following line:
-
-```yaml
-# Do not copy these files to the output directory
-exclude: ["deploy"]
-```
-
-Alternatively, you can use an `rsync-exclude.txt` file to control which files will be transferred to your server.
-
-#### Done!
-
-Now it's possible to publish your website simply by running the `deploy`
-script. If your SSH certificate  is [passphrase-protected](https://martin.kleppmann.com/2013/05/24/improving-security-of-ssh-private-keys.html), you will be asked to enter it when the
-script executes.
-
-## Rack-Jekyll
-
-[Rack-Jekyll](https://github.com/adaoraul/rack-jekyll/) is an easy way to deploy your site on any Rack server such as Amazon EC2, Slicehost, Heroku, and so forth. It also can run with [shotgun](https://github.com/rtomayko/shotgun/), [rackup](https://github.com/rack/rack), [mongrel](https://github.com/mongrel/mongrel), [unicorn](https://github.com/defunkt/unicorn/), and [others](https://github.com/adaoraul/rack-jekyll#readme).
-
-Read [this post](http://andycroll.com/ruby/serving-a-jekyll-blog-using-heroku/) on how to deploy to Heroku using Rack-Jekyll.
-
-## Jekyll-Admin for Rails
-
-If you want to maintain Jekyll inside your existing Rails app, [Jekyll-Admin](https://github.com/zkarpinski/Jekyll-Admin) contains drop in code to make this possible. See Jekyll-Admin’s [README](https://github.com/zkarpinski/Jekyll-Admin/blob/master/README) for more details.
-
-## Amazon S3
-
-If you want to host your site in Amazon S3, you can do so by
-using the [s3_website](https://github.com/laurilehmijoki/s3_website)
-application. It will push your site to Amazon S3 where it can be served like
-any web server,
-dynamically scaling to almost unlimited traffic. This approach has the
-benefit of being about the cheapest hosting option available for
-low-volume blogs as you only pay for what you use.
-
-## OpenShift
-
-If you'd like to deploy your site to an OpenShift gear, there's [a cartridge
-for that](https://github.com/openshift-quickstart/jekyll-openshift).
diff --git a/docs/_docs/deployment.md b/docs/_docs/deployment.md
new file mode 100644
index 00000000000..d6e841c0ae9
--- /dev/null
+++ b/docs/_docs/deployment.md
@@ -0,0 +1,11 @@
+---
+title: Deployment
+permalink: /docs/deployment/
+redirect_from: "/docs/deployment-methods/index.html"
+---
+
+Sites built using Jekyll can be deployed in a large number of ways due to the static nature of the generated output. Here's some of the most common ways:
+
+* [Manually](/docs/deployment/manual/)
+* [Automated](/docs/deployment/automated/)
+* [Third Party](/docs/deployment/third-party/)
diff --git a/docs/_docs/deployment/automated.md b/docs/_docs/deployment/automated.md
new file mode 100644
index 00000000000..8ba9cc53520
--- /dev/null
+++ b/docs/_docs/deployment/automated.md
@@ -0,0 +1,63 @@
+---
+title: Automated Deployment
+permalink: /docs/deployment/automated/
+---
+There are a number of ways to easily automate the deployment of a Jekyll site.
+
+## Continuous Integration Service
+
+One of the easiest ways to set up an automated deployment flow is by using a
+CI.
+
+These services run a script when there's a commit on your Git repository.
+You might want this script to build the site, run tests over the output then deploy it to the
+service of your choice.  
+
+We have guides for the following providers:
+
+* [Travis CI](/docs/continuous-integration/travis-ci/)
+* [CircleCI](/docs/continuous-integration/circleci/)
+* [Buddy](/docs/continuous-integration/buddyworks/)
+
+## Git post-receive hook
+
+To have a remote server handle the deploy for you every time you push changes using Git, you can create a user account which has all the public keys that are authorized to deploy in its `authorized_keys` file. With that in place, setting up the post-receive hook is done as follows:
+
+```sh
+laptop$ ssh deployer@example.com
+server$ mkdir myrepo.git
+server$ cd myrepo.git
+server$ git --bare init
+server$ cp hooks/post-receive.sample hooks/post-receive
+server$ mkdir /var/www/myrepo
+```
+
+Next, add the following lines to hooks/post-receive and be sure Jekyll is
+installed on the server:
+
+```bash
+GIT_REPO=$HOME/myrepo.git
+TMP_GIT_CLONE=$HOME/tmp/myrepo
+GEMFILE=$TMP_GIT_CLONE/Gemfile
+PUBLIC_WWW=/var/www/myrepo
+
+git clone $GIT_REPO $TMP_GIT_CLONE
+BUNDLE_GEMFILE=$GEMFILE bundle install
+BUNDLE_GEMFILE=$GEMFILE bundle exec jekyll build -s $TMP_GIT_CLONE -d $PUBLIC_WWW
+rm -Rf $TMP_GIT_CLONE
+exit
+```
+
+Finally, run the following command on any users laptop that needs to be able to
+deploy using this hook:
+
+```sh
+laptops$ git remote add deploy deployer@example.com:~/myrepo.git
+```
+
+Deploying is now as easy as telling nginx or Apache to look at
+`/var/www/myrepo` and running the following:
+
+```sh
+laptops$ git push deploy master
+```
diff --git a/docs/_docs/deployment/manual.md b/docs/_docs/deployment/manual.md
new file mode 100644
index 00000000000..627fa66c735
--- /dev/null
+++ b/docs/_docs/deployment/manual.md
@@ -0,0 +1,36 @@
+---
+title: Manual Deployment
+permalink: /docs/deployment/manual/
+---
+
+Jekyll generates your static site to the `_site` directory by default. You can
+transfer the contents of this directory to almost any hosting provider to get
+your site live. Here are some manual ways of achieving this:
+
+## FTP
+
+Most traditional web hosting provider let you upload files to their servers over FTP. To upload a Jekyll site to a web host using FTP, simply run the `jekyll build` command and copy the contents of the generated `_site` folder to the root folder of your hosting account. This is most likely to be the `httpdocs` or `public_html` folder on most hosting providers.
+
+## scp
+
+If you have direct access to the deployment web server, the process is essentially the same, except you might have other methods available to you (such as `scp`, or even direct filesystem access) for transferring the files. Just remember to make sure the contents of the generated `_site` folder get placed in the appropriate web root directory for your web server.
+
+## rsync
+
+Rsync is similar to scp except it can be faster as it will only send changed
+parts of files as opposed to the entire file. You can learn more about using
+rsync in the [Digital Ocean tutorial](https://www.digitalocean.com/community/tutorials/how-to-use-rsync-to-sync-local-and-remote-directories-on-a-vps).
+
+## Rack-Jekyll
+
+[Rack-Jekyll](https://github.com/adaoraul/rack-jekyll/) is an easy way to deploy your site on any Rack server such as Amazon EC2, Slicehost, Heroku, and so forth. It also can run with [shotgun](https://github.com/rtomayko/shotgun/), [rackup](https://github.com/rack/rack), [mongrel](https://github.com/mongrel/mongrel), [unicorn](https://github.com/defunkt/unicorn/), and [others](https://github.com/adaoraul/rack-jekyll#readme).
+
+## Amazon S3
+
+If you want to host your site in Amazon S3, you can do so by
+using the [s3_website](https://github.com/laurilehmijoki/s3_website)
+application. It will push your site to Amazon S3 where it can be served like
+any web server,
+dynamically scaling to almost unlimited traffic. This approach has the
+benefit of being about the cheapest hosting option available for
+low-volume blogs as you only pay for what you use.
diff --git a/docs/_docs/deployment/third-party.md b/docs/_docs/deployment/third-party.md
new file mode 100644
index 00000000000..b20d785202d
--- /dev/null
+++ b/docs/_docs/deployment/third-party.md
@@ -0,0 +1,39 @@
+---
+title: 3rd Party
+permalink: /docs/deployment/third-party/
+---
+
+## Aerobatic
+
+[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 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.
+
+## CloudCannon
+
+[CloudCannon](https://cloudcannon.com) has everything you need to build, host
+and update Jekyll websites. Take advantage of our global CDN, automated SSL,
+continuous deployment and [more](https://cloudcannon.com/features/).
+
+## GitHub Pages
+
+Sites on GitHub Pages are powered by Jekyll behind the scenes, so if you’re looking for a zero-hassle, zero-cost solution, GitHub Pages are a great way to [host your Jekyll-powered website for free](/docs/github-pages/).
+
+## Kickster
+
+Use [Kickster](http://kickster.nielsenramon.com/) for easy (automated) deploys to GitHub Pages when using unsupported plugins on GitHub Pages.
+
+Kickster provides a basic Jekyll project setup packed with web best practises and useful optimization tools increasing your overall project quality. Kickster ships with automated and worry-free deployment scripts for GitHub Pages.
+
+Setting up Kickster is very easy, just install the gem and you are good to go. More documentation can here found [here](https://github.com/nielsenramon/kickster#kickster). If you do not want to use the gem or start a new project you can just copy paste the deployment scripts for [Travis CI](https://github.com/nielsenramon/kickster/tree/master/snippets/travis) or [Circle CI](https://github.com/nielsenramon/kickster#automated-deployment-with-circle-ci).
+
+
+## Netlify
+
+Netlify provides Global CDN, Continuous Deployment, one click HTTPS and [much more](https://www.netlify.com/features/), providing developers the most robust toolset available for modern web projects, without added complexity. Netlify supports custom plugins for Jekyll and has a free plan for open source projects.
+
+Read this [Jekyll step-by-step guide](https://www.netlify.com/blog/2015/10/28/a-step-by-step-guide-jekyll-3.0-on-netlify/) to setup your Jekyll site on Netlify.
+
+## Static Publisher
+
+[Static Publisher](https://github.com/static-publisher/static-publisher) is another automated deployment option with a server listening for webhook posts, though it's not tied to GitHub specifically. It has a one-click deploy to Heroku, it can watch multiple projects from one server, it has an easy to user admin interface and can publish to either S3 or to a git repository (e.g. gh-pages).
diff --git a/docs/_docs/drafts.md b/docs/_docs/drafts.md
deleted file mode 100644
index 0e6bfd7dfb8..00000000000
--- a/docs/_docs/drafts.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-title: Working with drafts
-permalink: /docs/drafts/
----
-
-Drafts are posts without a date in the filename. They're posts you're still working on and
-don't want to publish yet. To get up and running with drafts, create a
-`_drafts` folder in your site's root (as described in the [site structure](/docs/structure/) section) and create your
-first draft:
-
-```text
-|-- _drafts/
-|   |-- a-draft-post.md
-```
-
-To preview your site with drafts, simply run `jekyll serve` or `jekyll build`
-with the `--drafts` switch. Each will be assigned the value modification time
-of the draft file for its date, and thus you will see currently edited drafts
-as the latest posts.
diff --git a/docs/_docs/extras.md b/docs/_docs/extras.md
deleted file mode 100644
index 05d4682e874..00000000000
--- a/docs/_docs/extras.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-title: Extras
-permalink: /docs/extras/
----
-
-There are a number of (optional) extra features that Jekyll supports that you
-may want to install, depending on how you plan to use Jekyll.
-
-## Web Highlights and Commenting 
-
-Register your site with [txtpen](https://txtpen.com). Then append 
-
-```html
-
-```
-
-to your template files in `/_layout` folder.
-
-## Math Support
-
-Kramdown comes with optional support for LaTeX to PNG rendering via [MathJax](https://www.mathjax.org) within math blocks. See the Kramdown documentation on [math blocks](http://kramdown.gettalong.org/syntax.html#math-blocks) and [math support](http://kramdown.gettalong.org/converter/html.html#math-support) for more details. MathJax requires you to include JavaScript or CSS to render the LaTeX, e.g.
-
-```html
-
-```
-
-For more information about getting started, check out [this excellent blog post](http://gastonsanchez.com/visually-enforced/opinion/2014/02/16/Mathjax-with-jekyll/).
-
-## Alternative Markdown Processors
-
-See the Markdown section on the [configuration page](/docs/configuration/#markdown-options) for instructions on how to use and configure alternative Markdown processors, as well as how to create [custom processors](/docs/configuration/#custom-markdown-processors).
diff --git a/docs/_docs/frontmatter.md b/docs/_docs/front-matter.md
similarity index 81%
rename from docs/_docs/frontmatter.md
rename to docs/_docs/front-matter.md
index 761c8bb5089..c30530db5be 100644
--- a/docs/_docs/frontmatter.md
+++ b/docs/_docs/front-matter.md
@@ -1,13 +1,13 @@
 ---
 title: Front Matter
-permalink: /docs/frontmatter/
+permalink: /docs/front-matter/
+redirect_from: /docs/frontmatter/index.html
 ---
 
-The front matter is where Jekyll starts to get really cool. Any file that
-contains a [YAML](http://yaml.org/) front matter block will be processed by
-Jekyll as a special file. The front matter must be the first thing in the file
-and must take the form of valid YAML set between triple-dashed lines. Here is a
-basic example:
+Any file that contains a [YAML](http://yaml.org/) front matter block will be
+processed by Jekyll as a special file. The front matter must be the first thing
+in the file and must take the form of valid YAML set between triple-dashed
+lines. Here is a basic example:
 
 ```yaml
 ---
@@ -28,14 +28,14 @@ relies on.
     If you use UTF-8 encoding, make sure that no BOM header
     characters exist in your files or very, very bad things will happen to
     Jekyll. This is especially relevant if you’re running
-    Jekyll on Windows.
+    Jekyll on Windows.
   
    
 
    
 
 
    
   
    ProTip™: Front Matter Variables Are Optional
    
   
    
-    If you want to use Liquid tags and variables
+    If you want to use Liquid tags and variables
     but don’t need anything in your front matter, just leave it empty! The set
     of triple-dashed lines with nothing in between will still get Jekyll to
     process your file. (This is useful for things like CSS and RSS feeds!)
@@ -72,12 +72,12 @@ front matter of a page or post.
           
  • 
             Using null 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 
-            frontmatter defaults.
+            layout defined in the 
+            front matter defaults.
           
    • 
           
  • 
             Starting from version 3.5.0, using none in a post/document will
-            produce a file without using a layout file regardless of frontmatter defaults.
+            produce a file without using a layout file regardless of front matter defaults.
             Using none in a page, however, will cause Jekyll to attempt to
             use a layout named "none".
           
    • 
@@ -117,27 +117,25 @@ front matter of a page or post.
   
    ProTip™: Render Posts Marked As Unpublished
    
   
    
     To preview unpublished pages, simply run `jekyll serve` or `jekyll build`
-    with the `--unpublished` switch. Jekyll also has a handy drafts
+    with the `--unpublished` switch. Jekyll also has a handy drafts
     feature tailored specifically for blog posts.
   
    
 
    
 
 ## Custom Variables
 
-Any variables in the front matter that are not predefined are mixed into the
-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:
+You can also set your own front matter variables you can access in Liquid. For
+instance, if you set a variable called `food`, you can use that in your page:
 
+{% raw %}
 ```liquid
-
-
-  
-    {% raw %}{{ page.title }}{% endraw %}
-  
-  
-    …
+---
+food: Pizza
+---
+
+
    {{ page.food }}
    
 ```
+{% endraw %}
 
 ## Predefined Variables for Posts
 
@@ -206,7 +204,7 @@ These are available out-of-the-box to be used in the front matter for a post.
   
    ProTip™: Don't repeat yourself
    
   
    
     If you don't want to repeat your frequently used front matter variables
-    over and over, just define defaults
+    over and over, just define defaults
     for them and only override them where necessary (or not at all). This works
     both for predefined and custom variables.
   
    
diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index 01af5e50e41..58cbc190453 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -11,7 +11,7 @@ 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.
+simply because Jekyll treats files without front matter as static assets.
 So if you only need to push generated HTML, you're good to go without any
 further setup.
 
@@ -58,7 +58,7 @@ Be sure to run `bundle update` often.
 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 the handy [URL filters](../templates/#filters):
+site builds properly, use the handy [URL filters](/docs/liquid/filters/):
 
 {% raw %}
 ```liquid
@@ -122,7 +122,7 @@ to see more detailed examples.
   
    Source files must be in the root directory
    
   
    
     GitHub Pages overrides
-    the “Site Source”
+    the Windows-specific docs page.
+    Windows-specific docs page.
   
    
 
    
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 1e6c14d8716..cae0a403a35 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -400,7 +400,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - 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's document ([#6329]({{ site.repository }}/issues/6329))
-- Docs: post's date can be overriden in YAML front matter ([#6334]({{ site.repository }}/issues/6334))
+- Docs: post's date can be overriden in 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))
@@ -1122,7 +1122,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Fix typo on Chocolatey name in Windows documentation ([#4686]({{ site.repository }}/issues/4686))
 - Use the correct URL, Fixes [#4698]({{ site.repository }}/issues/4698) ([#4699]({{ site.repository }}/issues/4699))
 - Add jekyll-paspagon plugin ([#4700]({{ site.repository }}/issues/4700))
-- Bold-italicize note in assets documentation about needing yaml front matter ([#4706]({{ site.repository }}/issues/4706))
+- Bold-italicize note in assets documentation about needing front matter ([#4706]({{ site.repository }}/issues/4706))
 - Highlight the `script/` calls in the Contributing documentation ([#4712]({{ site.repository }}/issues/4712))
 - Add Hawkins to the list of third-party plugins ([#4755]({{ site.repository }}/issues/4755))
 - Fix a typo in pagination doc ([#4763]({{ site.repository }}/issues/4763))
@@ -1315,7 +1315,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Drop: fix hash setter precedence ([#4312]({{ site.repository }}/issues/4312))
 - utils: `has_yaml_header?` should accept files with extraneous spaces ([#4290]({{ site.repository }}/issues/4290))
 - Escape html from site.title and page.title in site template ([#4307]({{ site.repository }}/issues/4307))
-- Allow custom file extensions if defined in `permalink` YAML front matter ([#4314]({{ site.repository }}/issues/4314))
+- Allow custom file extensions if defined in `permalink` front matter ([#4314]({{ site.repository }}/issues/4314))
 - Fix deep_merge_hashes! handling of drops and hashes ([#4359]({{ site.repository }}/issues/4359))
 - Page should respect output extension of its permalink ([#4373]({{ site.repository }}/issues/4373))
 - Disable auto-regeneration when running server detached ([#4376]({{ site.repository }}/issues/4376))
@@ -1539,7 +1539,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Internal: trigger hooks by owner symbol ([#3871]({{ site.repository }}/issues/3871))
 - Update MIME types from mime-db ([#3933]({{ site.repository }}/issues/3933))
 - Add header to site template `_config.yml` for clarity & direction ([#3997]({{ site.repository }}/issues/3997))
-- Site template: add timezone offset to post date frontmatter ([#4001]({{ site.repository }}/issues/4001))
+- Site template: add timezone offset to post date front matter ([#4001]({{ site.repository }}/issues/4001))
 - Make a constant for the regex to find hidden files ([#4032]({{ site.repository }}/issues/4032))
 - Site template: refactor github & twitter icons into includes ([#4049]({{ site.repository }}/issues/4049))
 - Site template: add background to Kramdown Rouge-ified backtick code blocks ([#4053]({{ site.repository }}/issues/4053))
@@ -1557,7 +1557,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Fix nav items alignment when on multiple rows ([#3264]({{ site.repository }}/issues/3264))
 - Highlight: Only Strip Newlines/Carriage Returns, not Spaces ([#3278]({{ site.repository }}/issues/3278))
 - Find variables in front matter defaults by searching with relative file path. ([#2774]({{ site.repository }}/issues/2774))
-- Allow variables (e.g `:categories`) in YAML front matter permalinks ([#3320]({{ site.repository }}/issues/3320))
+- Allow variables (e.g `:categories`) in front matter permalinks ([#3320]({{ site.repository }}/issues/3320))
 - Handle nil URL placeholders in permalinks ([#3325]({{ site.repository }}/issues/3325))
 - Template: Fix nav items alignment when in "burger" mode ([#3329]({{ site.repository }}/issues/3329))
 - Template: Remove `!important` from nav SCSS introduced in [#3329]({{ site.repository }}/issues/3329) ([#3375]({{ site.repository }}/issues/3375))
@@ -1574,7 +1574,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Add WOFF2 font MIME type to Jekyll server MIME types ([#3647]({{ site.repository }}/issues/3647))
 - Be smarter about extracting the extname in `StaticFile` ([#3632]({{ site.repository }}/issues/3632))
 - Process metadata for all dependencies ([#3608]({{ site.repository }}/issues/3608))
-- Show error message if the YAML front matter on a page/post is invalid. ([#3643]({{ site.repository }}/issues/3643))
+- Show error message if the front matter on a page/post is invalid. ([#3643]({{ site.repository }}/issues/3643))
 - Upgrade redcarpet to 3.2 (Security fix: OSVDB-120415) ([#3652]({{ site.repository }}/issues/3652))
 - Create #mock_expects that goes directly to RSpec Mocks. ([#3658]({{ site.repository }}/issues/3658))
 - Open `.jekyll-metadata` in binary mode to read binary Marshal data ([#3713]({{ site.repository }}/issues/3713))
@@ -1654,7 +1654,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Add a Resources link to tutorial on building dynamic navbars ([#3185]({{ site.repository }}/issues/3185))
 - Semantic structure improvements to the post and page layouts ([#3251]({{ site.repository }}/issues/3251))
 - Add new AsciiDoc plugin to list of third-party plugins. ([#3277]({{ site.repository }}/issues/3277))
-- Specify that all transformable collection documents must contain YAML front matter ([#3271]({{ site.repository }}/issues/3271))
+- Specify that all transformable collection documents must contain front matter ([#3271]({{ site.repository }}/issues/3271))
 - Assorted accessibility fixes ([#3256]({{ site.repository }}/issues/3256))
 - Update configuration docs to mention `keep_files` for `destination` ([#3288]({{ site.repository }}/issues/3288), [#3296]({{ site.repository }}/issues/3296))
 - Break when we successfully generate nav link to save CPU cycles. ([#3291]({{ site.repository }}/issues/3291))
@@ -1682,7 +1682,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Add a link on all the docs pages to "Improve this page". ([#3510]({{ site.repository }}/issues/3510))
 - Add jekyll-auto-image generator to the list of third-party plugins ([#3489]({{ site.repository }}/issues/3489))
 - Replace link to the proposed `picture` element spec ([#3530]({{ site.repository }}/issues/3530))
-- Add frontmatter date formatting information ([#3469]({{ site.repository }}/issues/3469))
+- Add front matter date formatting information ([#3469]({{ site.repository }}/issues/3469))
 - Improve consistency and clarity of plugins options note ([#3546]({{ site.repository }}/issues/3546))
 - Add permalink warning to pagination docs ([#3551]({{ site.repository }}/issues/3551))
 - Fix grammar in Collections docs API stability warning ([#3560]({{ site.repository }}/issues/3560))
@@ -2254,7 +2254,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Clean up the `` in the site template ([#2186]({{ site.repository }}/issues/2186))
 - Permit YAML blocks to end with three dots to better conform with the YAML spec ([#2110]({{ site.repository }}/issues/2110))
 - Use `File.exist?` instead of deprecated `File.exists?` ([#2214]({{ site.repository }}/issues/2214))
-- Require newline after start of YAML Front Matter header ([#2211]({{ site.repository }}/issues/2211))
+- Require newline after start of front matter header ([#2211]({{ site.repository }}/issues/2211))
 - Add the ability for pages to be marked as `published: false` ([#1492]({{ site.repository }}/issues/1492))
 - Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy looking up of variable values in a Liquid context. ([#2253]({{ site.repository }}/issues/2253))
 - Remove literal lang name from class ([#2292]({{ site.repository }}/issues/2292))
@@ -3022,7 +3022,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Bullet-proof `limit_posts` option ([#1004]({{ site.repository }}/issues/1004))
 - Read in YAML as UTF-8 to accept non-ASCII chars ([#836]({{ site.repository }}/issues/836))
 - Fix the CLI option `--plugins` to actually accept dirs and files ([#993]({{ site.repository }}/issues/993))
-- Allow 'excerpt' in YAML front matter to override the extracted excerpt ([#946]({{ site.repository }}/issues/946))
+- Allow 'excerpt' in front matter to override the extracted excerpt ([#946]({{ site.repository }}/issues/946))
 - Fix cascade problem with site.baseurl, site.port and site.host. ([#935]({{ site.repository }}/issues/935))
 - Filter out directories with valid post names ([#875]({{ site.repository }}/issues/875))
 - Fix symlinked static files not being correctly built in unsafe mode ([#909]({{ site.repository }}/issues/909))
@@ -3034,7 +3034,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Patch for multibyte URI problem with `jekyll serve` ([#723]({{ site.repository }}/issues/723))
 - Order plugin execution by priority ([#864]({{ site.repository }}/issues/864))
 - Fixed Page#dir and Page#url for edge cases ([#536]({{ site.repository }}/issues/536))
-- Fix broken `post_url` with posts with a time in their YAML front matter ([#831]({{ site.repository }}/issues/831))
+- Fix broken `post_url` with posts with a time in their front matter ([#831]({{ site.repository }}/issues/831))
 - Look for plugins under the source directory ([#654]({{ site.repository }}/issues/654))
 - Tumblr Migrator: finds `_posts` dir correctly, fixes truncation of long post names ([#775]({{ site.repository }}/issues/775))
 - Force Categories to be Strings ([#767]({{ site.repository }}/issues/767))
@@ -3265,7 +3265,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 
 - Bug Fixes
 - Require redcloth >= 4.2.1 in tests ([#92]({{ site.repository }}/issues/92))
-- Don't break on triple dashes in yaml front matter ([#93]({{ site.repository }}/issues/93))
+- Don't break on triple dashes in front matter ([#93]({{ site.repository }}/issues/93))
 
 ### Minor Enhancements
 {: #minor-enhancements-v0-5-6}
@@ -3306,7 +3306,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Added --paginate option to the executable along with a paginator object for the payload (@calavera)
 - Upgraded RedCloth to 4.2.1, which makes `` tags work once again.
 - 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)
+- Posts can now have an empty front matter or none at all (@ bahuvrihi)
 - Bug Fixes
 - 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)
@@ -3314,7 +3314,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - 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)
+- Allow CRLFs in front matter (@juretta)
 - Added Date#xmlschema for Ruby versions < 1.9
 
 
@@ -3409,7 +3409,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - 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)
-- Merge Post's YAML front matter into its to_liquid payload (@remi)
+- Merge Post's 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)
diff --git a/docs/_docs/includes.md b/docs/_docs/includes.md
index 8fa2af12ed6..00d0a57f0e5 100644
--- a/docs/_docs/includes.md
+++ b/docs/_docs/includes.md
@@ -152,41 +152,3 @@ Then pass this captured variable into the parameter for the include. Omit the qu
 {% include note.html content=download_note %}
 ```
 {% endraw %}
-
-### Passing references to YAML files as parameter values
-
-Instead of passing string variables to the include, you can pass a reference to a YAML data file stored in the `_data` folder.
-
-Here's an example. In the `_data` folder, suppose you have a YAML file called `profiles.yml`. Its content looks like this:
-
-```yaml
-- name: John Doe
-  login_age: old
-  image: johndoe.jpg
-
-- name: Jane Doe
-  login_age: new
-  image: janedoe.jpg
-```
-
-In the `_includes` folder, assume you have a file called `spotlight.html` with this code:
-
-{% raw %}
-```liquid
-{% for person in include.participants %}
-{% if person.login_age == "new" %}
-{{ person.name }}
-{% endif %}
-{% 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 %}
-```
-{% 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 cbe0bd894d0..d71629fed03 100644
--- a/docs/_docs/index.md
+++ b/docs/_docs/index.md
@@ -1,41 +1,35 @@
 ---
-title: Welcome
-permalink: /docs/home/
-redirect_from: /docs/index.html
+title: Quickstart
+permalink: /docs/
+redirect_from: /docs/home/index.html
 ---
-
-This site aims to be a comprehensive guide to Jekyll. We’ll cover topics such as getting your site up and running, creating and managing content, customizing your build, and deploying.
-
-## What is Jekyll, exactly?
-
-Jekyll is a simple, blog-aware, static site generator.
-
-You create your content as text files ([Markdown](https://daringfireball.net/projects/markdown/)), and organize them into folders. Then, you build the shell of your site using [Liquid](https://shopify.github.io/liquid/)-enhanced HTML templates. Jekyll automatically stitches the content and templates together, generating a website made entirely of static assets, suitable for uploading to any server.
-
-Jekyll happens to be the engine behind [GitHub Pages](https://pages.github.com), so you can host your project’s Jekyll page/blog/website on GitHub’s servers **for free**.
-
-## Navigating the Guide
-
-Throughout this guide, you'll see these special sections that help you get the most out of Jekyll:
-
-
    
-  
    ProTips™
    
-  
    Tips and tricks that'll make you a Jekyll wizard!
    
-
    
-
-
    
-  
    Notes
    
-  
    Extra tidbits that are sometimes necessary to understand Jekyll.
    
-
    
-
-
    
-  
    Warnings
    
-  
    Common pitfalls to avoid.
    
-
    
-
-
    
-  
    Unreleased
    
-  
    Features planned for future versions of Jekyll, but not available yet.
    
-
    
-
-If you find anything we haven’t covered, or would like to share a tip that others might find handy, please [file an issue]({{ site.repository }}/issues/new) and we’ll see about adding it to the guide.
+Jekyll is a simple, extendable, static site generator. You give it text written
+in your favorite markup language and it churns through layouts to create a
+static website. Throughout that process you can tweak how you want the site URLs
+to look, what data gets displayed in the layout, and more.
+
+## Instructions
+
+1. Install a full [Ruby development environment](/docs/installation/)
+2. Install Jekyll and [bundler](/docs/ruby-101/#bundler) [gems](/docs/ruby-101/#gems)
+```
+gem install jekyll bundler
+```
+3. Create a new Jekyll site at `./myblog`
+```
+jekyll new myblog
+```
+4. Change into your new directory
+```
+cd myblog
+```
+5. Build the site and make it available on a local server
+```
+bundle exec jekyll serve
+```
+6. Now browse to [http://localhost:4000](http://localhost:4000){:target="_blank"}
+
+If you encounter any unexpected errors during the above, please refer to the
+[troubleshooting](/docs/troubleshooting/#configuration-problems) page or the
+already-mentioned [requirements](/docs/installation/#requirements) page, as
+you might be missing development headers or other prerequisites.
diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index f2a56b31385..aa0c3f92c99 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -4,211 +4,19 @@ description: Official guide to install Jekyll on macOS, GNU/Linux or Windows.
 permalink: /docs/installation/
 ---
 
-Jekyll is a [Ruby Gem](http://guides.rubygems.org/rubygems-basics/), and can be
-installed on most systems.
-
-- [Requirements](#requirements)
-- [Install Jekyll on macOS](#macOS)
-- [Install Jekyll on Ubuntu Linux](#ubuntu)
-- [Install Jekyll on other Linux distros](#otherlinux)
-- [Install Jekyll on Windows](../windows/)
-- [Upgrade Jekyll](#upgrade-jekyll)
+Jekyll is a [Ruby Gem](/docs/ruby-101/#gems) that can be installed on most systems.
 
 ## Requirements
 
-Before you start, make sure your system has the following:
-
-- [Ruby](https://www.ruby-lang.org/en/downloads/) version 2.2.5 or above, including all development headers (ruby installation can be checked by running `ruby -v`)
-- [RubyGems](https://rubygems.org/pages/download) (which you can check by running `gem -v`)
-- [GCC](https://gcc.gnu.org/install/) and [Make](https://www.gnu.org/software/make/) (in case your system doesn't have them installed, which you can check by running `gcc -v`,`g++ -v`  and `make -v` in your system's command line interface)
-
-## Install on macOS {#macOS}
-
-We only cover macOS High Sierra 10.13 here, which comes with Ruby 2.3.3, older systems will need to [install a more recent Ruby version via Homebrew](#homebrew).
-
-First, you need to install the command-line tools to be able to compile native extensions, open a terminal and run:
-
-```sh
-xcode-select --install
-```
-
-### Set up Ruby included with the OS
-
-Check your Ruby version meet our requirements:
-
-```sh
-ruby -v
-2.3.3
-```
-
-Great, let's install Jekyll. We also need [Bundler](https://bundler.io/) to help us handle [plugins](../plugins) and [themes](../themes):
-
-```sh
-gem install bundler jekyll
-```
-
-That's it, you're ready to go, either by installing our [default minimal blog theme](https://github.com/jekyll/minima) with `jekyll new jekyll-website` or by starting from scratch:
-
-```sh
-mkdir jekyll-website
-cd jekyll-website
-
-# Create a Gemfile
-bundle init
-
-# Add Jekyll
-bundle add jekyll
-
-# Install gems
-bundle install
-```
-
-Great, from there you can now either use a [theme](../themes/) or [create your own layouts](../templates/).
-
-### Install a newer Ruby version via Homebrew {#homebrew}
-
-If you wish to install the latest version of Ruby and get faster builds, we recommend to do it via [Homebrew](https://brew.sh) a handy package manager for macOS.
-
-```sh
-/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-brew install ruby
-ruby -v
-ruby 2.5.1p57 (2018-03-29 revision 63029) [x86_64-darwin17]
-```
-
-Yay! Now you have a shiny Ruby on your system!
-
-### Install multiple Ruby versions with rbenv {#rbenv}
-
-Developers often use [rbenv](https://github.com/rbenv/rbenv) to manage multiple Ruby versions. This can be useful if you want to run the same Ruby version used by [GitHub Pages](https://pages.github.com/versions/) or [Netlify](https://www.netlify.com/docs/#ruby) for instance.
-
-```sh
-# Install rbenv and ruby-build
-brew install rbenv
-
-# Setup rbenv integration to your shell
-rbenv init
-
-# Check your install
-curl -fsSL https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-doctor | bash
-```
-
-Restart your terminal for changes to take effect.
-Now we can install the Ruby version of our choice, let's go with Ruby 2.5.1 here:
-
-```sh
-rbenv install 2.5.1
-rbenv global 2.5.1
-ruby -v
-ruby 2.5.1p57 (2018-03-29 revision 63029) [x86_64-darwin17]
-```
-
-That's it! Head over [rbenv command references](https://github.com/rbenv/rbenv#command-reference) to learn how to use different versions of Ruby in your projects.
-
-
    
-
-##### Problems installing Jekyll?
-
-Check out the [troubleshooting](../troubleshooting/) page or
-[ask for help on our forum](https://talk.jekyllrb.com).
-
-
    
-
-## Install on Ubuntu Linux {#ubuntu}
-
-Before we install Jekyll, we need to make sure we have all the required
-dependencies.
-
-```sh
-sudo apt-get install ruby ruby-dev build-essential
-```
-
-It is best to avoid installing Ruby Gems as the root user. Therefore, we need to
-set up a gem installation directory for your user account. The following
-commands will add environment variables to your `~/.bashrc` file to configure
-the gem installation path. Run them now:
-
-```sh
-echo '# Install Ruby Gems to ~/gems' >> ~/.bashrc
-echo 'export GEM_HOME=$HOME/gems' >> ~/.bashrc
-echo 'export PATH=$HOME/gems/bin:$PATH' >> ~/.bashrc
-source ~/.bashrc
-```
-
-Finally, install Jekyll:
-
-```sh
-gem install jekyll bundler
-```
-
-That's it! You're ready to start using Jekyll.
-
-## Install on other Linux distros {#otherlinux}
-
-Installation on other Linux distributions works similarly as on Ubuntu.
-
-On Fedora, the dependencies can be installed as follows, and the rest
-works the same as on Ubuntu.
-
-```sh
-sudo dnf install ruby ruby-devel @development-tools
-```
-
-## Upgrade Jekyll
-
-Before you start developing with Jekyll, you may want to check that you're up to date with the latest version. To find the currently installed version of Jekyll, run one of these commands:
-
-```sh
-jekyll --version
-gem list jekyll
-```
-
-You can use RubyGems to find [the current version of Jekyll](https://rubygems.org/gems/jekyll). 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
-```
-
-To upgrade to latest Rubygems, run:
-
-```
-gem update --system
-```
-
-Refer to our [upgrading section](../upgrading/) to upgrade from Jekyll 2.x or 1.x.
-
-## Pre-releases
-
-In order to install a pre-release, make sure you have all the requirements
-installed properly and run:
-
-```sh
-gem install jekyll --pre
-```
-
-This will install the latest pre-release. If you want a particular pre-release,
-use the `-v` switch to indicate the version you'd like to install:
-
-```sh
-gem install jekyll -v '2.0.0.alpha.1'
-```
+* [Ruby](https://www.ruby-lang.org/en/downloads/) version 2.2.5 or above, including all development headers (ruby version can be checked by running `ruby -v`)
+* [RubyGems](https://rubygems.org/pages/download) (which you can check by running `gem -v`)
+* [GCC](https://gcc.gnu.org/install/) and [Make](https://www.gnu.org/software/make/) (in case your system doesn't have them installed, which you can check by running `gcc -v`,`g++ -v`  and `make -v` in your system's command line interface)
 
-If you'd like to install a development version of Jekyll, the process is a bit
-more involved. This gives you the advantage of having the latest and greatest,
-but may be unstable.
+## Guides
 
-```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
-```
+For detailed install instructions have a look at the guide for your operating system.
 
-Now that you’ve got everything up-to-date and installed, let’s get to work!
+* [macOS](/docs/installation/macos/)
+* [Ubuntu Linux](/docs/installation/ubuntu/)
+* [Other Linux distros](/docs/installation/other-linux)
+* [Windows](/docs/installation/windows/)
diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md
new file mode 100644
index 00000000000..c8f8f532b4d
--- /dev/null
+++ b/docs/_docs/installation/macos.md
@@ -0,0 +1,69 @@
+---
+title: Jekyll on macOS
+permalink: /docs/installation/macos/
+---
+
+First, you need to install the command-line tools to be able to compile native extensions, open a terminal and run:
+
+```sh
+xcode-select --install
+```
+
+## Set up Ruby included with the OS
+
+Check your Ruby version meets our requirements. Jekyll requires Ruby 2.2.5 or above. If you're running an older version you'll need to [install a more recent Ruby version via Homebrew](#homebrew).
+
+```sh
+ruby -v
+2.3.3
+```
+
+Now install Jekyll and [Bundler](/docs/ruby-101/#bundler).
+
+```sh
+gem install bundler jekyll
+```
+
+### Install a newer Ruby version via Homebrew {#homebrew}
+
+If you wish to install the latest version of Ruby and get faster builds, we recommend doing it via [Homebrew](https://brew.sh) a handy package manager for macOS.
+
+```sh
+/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+brew install ruby
+ruby -v
+ruby 2.5.1p57 (2018-03-29 revision 63029) [x86_64-darwin17]
+```
+
+### Install multiple Ruby versions with rbenv {#rbenv}
+
+Developers often use [rbenv](https://github.com/rbenv/rbenv) to manage multiple
+Ruby versions. This can be useful if you want to run the same Ruby version used
+by your colleagues/collaborators.
+
+```sh
+# Install rbenv and ruby-build
+brew install rbenv
+
+# Setup rbenv integration to your shell
+rbenv init
+
+# Check your install
+curl -fsSL https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-doctor | bash
+```
+
+Restart your terminal for changes to take effect.
+Now we can install the Ruby version of our choice, let's go with Ruby 2.5.1 here:
+
+```sh
+rbenv install 2.5.1
+rbenv global 2.5.1
+ruby -v
+ruby 2.5.1p57 (2018-03-29 revision 63029) [x86_64-darwin17]
+```
+
+That's it! Head over [rbenv command references](https://github.com/rbenv/rbenv#command-reference) to learn how to use different versions of Ruby in your projects.
+
+### Problems?
+
+Check out the [troubleshooting](/docs/troubleshooting/) page or [ask for help on our forum](https://talk.jekyllrb.com).
diff --git a/docs/_docs/installation/other-linux.md b/docs/_docs/installation/other-linux.md
new file mode 100644
index 00000000000..d66ce1c34a7
--- /dev/null
+++ b/docs/_docs/installation/other-linux.md
@@ -0,0 +1,11 @@
+---
+title: Jekyll on Ubuntu
+permalink: /docs/installation/other-linux/
+---
+Installation on other Linux distributions works similarly as on Ubuntu.
+ On Fedora, the dependencies can be installed as follows, and the rest
+works the same as on Ubuntu.
+
+ ```sh
+sudo dnf install ruby ruby-devel @development-tools
+```
diff --git a/docs/_docs/installation/ubuntu.md b/docs/_docs/installation/ubuntu.md
new file mode 100644
index 00000000000..8962b144f0b
--- /dev/null
+++ b/docs/_docs/installation/ubuntu.md
@@ -0,0 +1,30 @@
+---
+title: Jekyll on Ubuntu
+permalink: /docs/installation/ubuntu/
+---
+Before we install Jekyll, we need to make sure we have all the required
+dependencies.
+
+```sh
+sudo apt-get install ruby ruby-dev build-essential
+```
+
+It is best to avoid installing Ruby Gems as the root user. Therefore, we need to
+set up a gem installation directory for your user account. The following
+commands will add environment variables to your `~/.bashrc` file to configure
+the gem installation path. Run them now:
+
+```sh
+echo '# Install Ruby Gems to ~/gems' >> ~/.bashrc
+echo 'export GEM_HOME=$HOME/gems' >> ~/.bashrc
+echo 'export PATH=$HOME/gems/bin:$PATH' >> ~/.bashrc
+source ~/.bashrc
+```
+
+Finally, install Jekyll:
+
+```sh
+gem install jekyll bundler
+```
+
+That's it! You're ready to start using Jekyll.
diff --git a/docs/_docs/windows.md b/docs/_docs/installation/windows.md
similarity index 73%
rename from docs/_docs/windows.md
rename to docs/_docs/installation/windows.md
index 3e97d297908..ebb3ae86d50 100644
--- a/docs/_docs/windows.md
+++ b/docs/_docs/installation/windows.md
@@ -1,31 +1,27 @@
 ---
 title: Jekyll on Windows
-permalink: /docs/windows/
+permalink: /docs/installation/windows/
+redirect_from: "/docs/windows.html"
 ---
 
 While Windows is not an officially-supported platform, it can be used to run Jekyll with the proper tweaks. This page aims to collect some of the general knowledge and lessons that have been unearthed by Windows users.
 
 
 ## Installing Jekyll
-The easiest way to run Jekyll is by using the [RubyInstaller][] for Windows.
+The easiest way to run Jekyll is by using the [RubyInstaller](https://rubyinstaller.org/) for Windows.
 
 ### Installation via RubyInstaller
 
-[RubyInstaller][] is a self-contained Windows-based installer that includes the Ruby language, an execution environment, important documentation, and more.
-We only cover RubyInstaller-2.4 and newer here, older versions need to [install the Devkit][Devkit-install] manually.
+[RubyInstaller](https://rubyinstaller.org/) is a self-contained Windows-based installer that includes the Ruby language, an execution environment, important documentation, and more.
+We only cover RubyInstaller-2.4 and newer here, older versions need to [install the Devkit](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit) manually.
 
-1. Download and Install a **Ruby+Devkit** version from [RubyInstaller Downloads][RubyInstaller-downloads].
+1. Download and Install a **Ruby+Devkit** version from [RubyInstaller Downloads](https://rubyinstaller.org/downloads/).
    Use default options for installation.
 2. Open a new command prompt window from the start menu, so that changes to the `PATH` environment variable becomes effective.
    Install Jekyll and Bundler via: `gem install jekyll bundler`
 3. Check if Jekyll installed properly: `jekyll -v`
 
-That's it, you're ready to install our [default minimal blog theme](https://github.com/jekyll/minima) with `jekyll new jekyll-website`.
-
-[RubyInstaller]: https://rubyinstaller.org/
-[RubyInstaller-downloads]: https://rubyinstaller.org/downloads/
-[Devkit-install]: https://github.com/oneclick/rubyinstaller/wiki/Development-Kit
-
+That's it, you're ready to use Jekyll!
 
 ### Encoding
 
@@ -38,27 +34,24 @@ Additionally, you might need to change the code page of the console window to UT
 chcp 65001
 ```
 
-
 ### 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.
 
-Jekyll now uses a rubygem to internally configure Timezone based on established [IANA Timezone Database][IANA-database].
-While 'new' blogs created with Jekyll v3.4 and greater, will have the following added to their 'Gemfile' by default, existing sites *will* have to update their 'Gemfile' (and installed) to enable development on Windows:
+Jekyll now uses a rubygem to internally configure Timezone based on established [IANA Timezone Database](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
+While 'new' blogs created with Jekyll v3.4 and greater, will have the following added to their `Gemfile` by default, existing sites *will* have to update their `Gemfile` (and installed) to enable development on Windows:
 
 ```ruby
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 ```
 
-[IANA-database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-
 ### Auto Regeneration
 
 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:
+Add the following to the `Gemfile` for your site if you have issues with auto-regeneration on Windows alone:
 
 ```ruby
 gem 'wdm', '~> 0.1.1' if Gem.win_platform?
@@ -69,10 +62,10 @@ You have to use a [Ruby+Devkit](https://rubyinstaller.org/downloads/) version of
 
 ## Installation via Bash on Windows 10
 
-If you are using Windows 10 version 1607 or later, another option to run Jekyll is by [installing][WSL-Guide] the Windows Subsystem for Linux.
+If you are using Windows 10 version 1607 or later, another option to run Jekyll is by [installing](https://msdn.microsoft.com/en-us/commandline/wsl/install_guide) the Windows Subsystem for Linux.
 
 
-*Note:* You must have [Windows Subsystem for Linux][BASH-WSL] enabled.
+*Note:* You must have [Windows Subsystem for Linux](https://msdn.microsoft.com/en-us/commandline/wsl/about) enabled.
 
 First let's make sure all our packages / repositories are up to date. Open a new Command Prompt instance, and type the following:
 
@@ -118,12 +111,6 @@ bundle config path vendor/bundle
 
 **And that's it!**
 
-To start a new project named `my_blog`, just run:
-
-```sh
-jekyll new my_blog
-```
-
 You can make sure time management is working properly by inspecting your `_posts` folder. You should see a markdown file with the current date in the filename.
 
 
    
@@ -132,7 +119,3 @@ You can make sure time management is working properly by inspecting your `_posts
 
    
 
 **Note:** Bash on Ubuntu on Windows is still under development, so you may run into issues.
-
-[WSL-Guide]: https://msdn.microsoft.com/en-us/commandline/wsl/install_guide
-[BASH-WSL]: https://msdn.microsoft.com/en-us/commandline/wsl/about
-
diff --git a/docs/_docs/layouts.md b/docs/_docs/layouts.md
new file mode 100644
index 00000000000..31b10875a65
--- /dev/null
+++ b/docs/_docs/layouts.md
@@ -0,0 +1,131 @@
+---
+title: Layouts
+description: placeholder
+permalink: /docs/layouts/
+---
+Layouts are templates that wrap around your content. They allow you to have the
+source code for your template in one place so you don't have to repeat things
+like your navigation and footer on every page.
+
+Layouts live in the `_layouts` directory. The convention is to have a base
+template called `default.html` and have other layouts [inherit](#inheritance)
+from this as needed.
+
+## Usage
+
+The first step is to put the template source code in `default.html`. `content`
+is a special variable, the value is the rendered content of the post or page
+being wrapped.
+
+
+
+{% raw %}
+```
+
+
+  
+    
+    {{ page.title }}
+    
+  
+  
+    
+    
    {{ page.title }}
    
+    
    
+      {{ content }}
+    
    
+    
    
+      © to me
+    
    
+  
+
+```
+{% endraw %}
+
+You have full access to the front matter of the origin. In the
+example above, `page.title` comes from the page front matter.
+
+Next you need to specify what layout you're using in your page's front matter.
+You can also use
+[front matter defaults](/docs/configuration/front-matter-defaults/) to save you
+from having to set this on every page.
+
+```
+---
+title: My First Page
+layout: default
+---
+
+This is the content of my page
+```
+
+The rendered output of this page is:
+
+```
+
+
+  
+    
+    My First Page
+    
+  
+  
+    
+    
    My First Page
    
+    
    
+      This is the content of my page
+    
    
+    
    
+      © to me
+    
    
+  
+
+```
+
+
+## Inheritance
+
+Layout inheritance is useful when you want to add something to an existing
+layout for a portion of documents on your site. A common example of this is
+blog posts, you might want a post to display the date and author but otherwise
+be identical to your base layout.
+
+To achieve this you need to create another layout which specifies your original
+layout in front matter. For example this layout will live at
+`_layouts/post.html`:
+
+{% raw %}
+```
+---
+layout: default
+---
+
    {{ page.date }} - Written by {{ page.author }}
    
+
+{{ content }}
+```
+{% endraw %}
+
+Now posts can use this layout while the rest of the pages use the default.
+
+## Variables
+
+You can set front matter in layouts, the only difference is when you're
+using in Liquid, you need to use the `layout` variable instead of `page`. For
+example:
+
+{% raw %}
+```
+---
+city: San Francisco
+---
+
    {{ layout.city }}
    
+
+{{ content }}
+```
+{% endraw %}
diff --git a/docs/_docs/liquid.md b/docs/_docs/liquid.md
new file mode 100644
index 00000000000..a7c21550a47
--- /dev/null
+++ b/docs/_docs/liquid.md
@@ -0,0 +1,19 @@
+---
+title: Liquid
+permalink: /docs/liquid/
+redirect_from: "/docs/templates/"
+---
+
+Jekyll uses the [Liquid](https://shopify.github.io/liquid/) templating language
+to process templates.  
+
+Generally in Liquid you output content using two curly braces e.g.
+{% raw %}`{{ variable }}`{% endraw %} and perform logic statements by
+surrounding them in a curly brace percentage sign e.g.
+{% raw %}`{% if statement %}`{% endraw %}. To learn more about Liquid, check
+out the [official Liquid Documentation](https://shopify.github.io/liquid/).
+
+Jekyll provides a number of useful Liquid additions to help you build your site:
+
+* [Filters](/docs/liquid/filters/)
+* [Tags](/docs/liquid/tags/)
diff --git a/docs/_docs/templates.md b/docs/_docs/liquid/filters.md
similarity index 68%
rename from docs/_docs/templates.md
rename to docs/_docs/liquid/filters.md
index 052c74e8da5..078a4b7f6de 100644
--- a/docs/_docs/templates.md
+++ b/docs/_docs/liquid/filters.md
@@ -1,16 +1,12 @@
 ---
-title: Templates
-permalink: /docs/templates/
+title: Liquid Filters
+permalink: "/docs/liquid/filters/"
 ---
-
-Jekyll uses the [Liquid](https://shopify.github.io/liquid/) templating language to
-process templates. All of the standard Liquid [tags](https://shopify.github.io/liquid/tags/control-flow/) and
-[filters](https://shopify.github.io/liquid/filters/abs/) are
-supported. To make common tasks easier, Jekyll even adds a few handy filters
-and tags of its own, all of which you can find on this page. Jekyll even lets
-you come up with your own tags via plugins.
-
-## Filters
+All of the standard Liquid
+[filters](https://shopify.github.io/liquid/filters/abs/) are supported. To make
+common tasks easier, Jekyll even adds a few handy filters of its own,
+all of which you can find on this page. You can also create your own filters
+using [plugins](/docs/plugins/).
 
 
    
 
@@ -461,159 +457,4 @@ The default is `default`. They are as follows (with what they filter):
 - `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`) {%- include docs_version_badge.html version="3.7.0" -%}
-
-## Tags
-
-* [Includes](#includes)
-* [Code snippet highlighting](#code-snippet-highlighting)
-* [Linking to pages, collections and posts (the new and improved way)](#links)
-* [Linking to posts (the old way)](#linking-to-posts)
-
-### Includes
-
-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
-{% 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.
-
-For more advanced information on using includes, see [Includes](../includes).
-
-### Code snippet highlighting
-
-Jekyll has built in support for syntax highlighting of over 60 languages
-thanks to [Rouge](http://rouge.jneen.net). Rouge is the default highlighter
-in Jekyll 3 and above. To use it in Jekyll 2, set `highlighter` to `rouge`
-and ensure the `rouge` gem is installed properly.
-
-Alternatively, you can use [Pygments](http://pygments.org) to highlight
-your code snippets. To use Pygments, you must have Python installed on your
-system, have the `pygments.rb` gem installed and set `highlighter` to
-`pygments` in your site's configuration file. Pygments supports [over 100
-languages](http://pygments.org/languages/)
-
-To render a code block with syntax highlighting, surround your code as follows:
-
-{% raw %}
-```liquid
-{% highlight ruby %}
-def foo
-  puts 'foo'
-end
-{% endhighlight %}
-```
-{% 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
-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/).
-
-
    
-  
    Jekyll processes all Liquid filters in code blocks
    
-  
    If you are using a language that contains curly braces, you
-    will likely need to place {% raw %} and
-    {% endraw %} tags around your code.
    
-
    
-
-#### Line numbers
-
-There is a second argument to `highlight` called `linenos` that is optional.
-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:
-
-{% raw %}
-```liquid
-{% highlight ruby linenos %}
-def foo
-  puts 'foo'
-end
-{% endhighlight %}
-```
-{% endraw %}
-
-#### Stylesheets for syntax highlighting
-
-In order for the highlighting to show up, you’ll need to include a highlighting
-stylesheet. For an example stylesheet you can look at
-[syntax.css](https://github.com/mojombo/tpw/tree/master/css/syntax.css). These
-are the same styles as used by GitHub and you are free to use them for your own
-site. If you use `linenos`, you might want to include an additional CSS class
-definition for the `.lineno` class in `syntax.css` to distinguish the line
-numbers from the highlighted code.
-
-
-## Links
-
-### Linking to pages {#link}
-
-To link to a post, a page, collection item, or file, the `link` tag will generate the correct permalink URL for the path you specify. For example, if you use the `link` tag to link to `mypage.html`, even if you change your permalink style to include the file extension or omit it, the URL formed by the `link` tag will always be valid.
-
-You must include the file's original extension when using the `link` tag. Here are some examples:
-
-{% 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 %}
-
-You can also use the `link` tag to create a link in Markdown as follows:
-
-{% 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 %}
-
-(Including `{% raw %}{{ site.baseurl }}{% endraw %}` is optional — it depends on whether you want to preface the page URL with the `baseurl` value.)
-
-The path to the post, page, or collection is defined as the path relative to the root directory (where your config file is) to the file, not the path from your existing page to the other page.
-
-For example, suppose you're creating a link in `page_a.md` (stored in `pages/folder1/folder2`) to `page_b.md` (stored in  `pages/folder1`). Your path in the link would not be `../page_b.html`. Instead, it would be `/pages/folder1/page_b.md`.
-
-If you're unsure of the path, add `{% raw %}{{ page.path }}{% endraw %}` to the page and it will display the path.
-
-One major benefit of using the `link` or `post_url` tag is link validation. If the link doesn't exist, Jekyll won't build your site. This is a good thing, as it will alert you to a broken link so you can fix it (rather than allowing you to build and deploy a site with broken links).
-
-Note you cannot add filters to `link` tags. For example, you cannot append a string using Liquid filters, such as `{% raw %}{% link mypage.html | append: "#section1" %} {% endraw %}`. To link to sections on a page, you will need to use regular HTML or Markdown linking techniques.
-
-### Linking to posts
-
-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.
-
-{% raw %}
-```liquid
-{{ site.baseurl }}{% post_url 2010-07-21-name-of-post %}
-```
-{% endraw %}
-
-If you organize your posts in subdirectories, you need to include subdirectory path to the post:
-
-{% raw %}
-```liquid
-{{ site.baseurl }}{% post_url /subdir/2010-07-21-name-of-post %}
-```
-{% 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:
-
-{% raw %}
-```liquid
-[Name of Link]({{ site.baseurl }}{% post_url 2010-07-21-name-of-post %})
-```
-{% endraw %}
+- `latin`: like `default`, except Latin characters are first transliterated (e.g. `àèïòü` to `aeiou`) {%- include docs_version_badge.html version="3.7.0" -%}.
diff --git a/docs/_docs/liquid/tags.md b/docs/_docs/liquid/tags.md
new file mode 100644
index 00000000000..50bed0cb133
--- /dev/null
+++ b/docs/_docs/liquid/tags.md
@@ -0,0 +1,142 @@
+---
+title: Tags Filters
+permalink: "/docs/liquid/tags/"
+---
+All of the standard Liquid
+[tags](https://shopify.github.io/liquid/tags/control-flow/) are supported.
+Jekyll has a few built in tags to help you build your site. You can also create
+your own tags using [plugins](/docs/plugins/).
+
+## Includes
+
+If you have page snippets that you use repeatedly across your site, an
+[include](/docs/includes/) is the perfect way to make this more maintainable.
+
+## Code snippet highlighting
+
+Jekyll has built in support for syntax highlighting of over 60 languages
+thanks to [Rouge](http://rouge.jneen.net). Rouge is the default highlighter
+in Jekyll 3 and above. To use it in Jekyll 2, set `highlighter` to `rouge`
+and ensure the `rouge` gem is installed properly.
+
+Alternatively, you can use [Pygments](http://pygments.org) to highlight
+your code snippets. To use Pygments, you must have Python installed on your
+system, have the `pygments.rb` gem installed and set `highlighter` to
+`pygments` in your site's configuration file. Pygments supports [over 100
+languages](http://pygments.org/languages/)
+
+To render a code block with syntax highlighting, surround your code as follows:
+
+{% raw %}
+```liquid
+{% highlight ruby %}
+def foo
+  puts 'foo'
+end
+{% endhighlight %}
+```
+{% 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
+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/).
+
+
    
+  
    Jekyll processes all Liquid filters in code blocks
    
+  
    If you are using a language that contains curly braces, you
+    will likely need to place {% raw %} and
+    {% endraw %} tags around your code.
    
+
    
+
+### Line numbers
+
+There is a second argument to `highlight` called `linenos` that is optional.
+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:
+
+{% raw %}
+```liquid
+{% highlight ruby linenos %}
+def foo
+  puts 'foo'
+end
+{% endhighlight %}
+```
+{% endraw %}
+
+### Stylesheets for syntax highlighting
+
+In order for the highlighting to show up, you’ll need to include a highlighting
+stylesheet. For Pygments or Rouge you can use a stylesheet for Pygments, you
+can find an example gallery [here](http://help.farbox.com/pygments.html).
+
+## Links
+
+### Linking to pages {#link}
+
+To link to a post, a page, collection item, or file, the `link` tag will generate the correct permalink URL for the path you specify. For example, if you use the `link` tag to link to `mypage.html`, even if you change your permalink style to include the file extension or omit it, the URL formed by the `link` tag will always be valid.
+
+You must include the file's original extension when using the `link` tag. Here are some examples:
+
+{% 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 %}
+
+You can also use the `link` tag to create a link in Markdown as follows:
+
+{% 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 %}
+
+(Including `{% raw %}{{ site.baseurl }}{% endraw %}` is optional — it depends on whether you want to preface the page URL with the `baseurl` value.)
+
+The path to the post, page, or collection is defined as the path relative to the root directory (where your config file is) to the file, not the path from your existing page to the other page.
+
+For example, suppose you're creating a link in `page_a.md` (stored in `pages/folder1/folder2`) to `page_b.md` (stored in  `pages/folder1`). Your path in the link would not be `../page_b.html`. Instead, it would be `/pages/folder1/page_b.md`.
+
+If you're unsure of the path, add `{% raw %}{{ page.path }}{% endraw %}` to the page and it will display the path.
+
+One major benefit of using the `link` or `post_url` tag is link validation. If the link doesn't exist, Jekyll won't build your site. This is a good thing, as it will alert you to a broken link so you can fix it (rather than allowing you to build and deploy a site with broken links).
+
+Note you cannot add filters to `link` tags. For example, you cannot append a string using Liquid filters, such as `{% raw %}{% link mypage.html | append: "#section1" %} {% endraw %}`. To link to sections on a page, you will need to use regular HTML or Markdown linking techniques.
+
+### Linking to posts
+
+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.
+
+{% raw %}
+```liquid
+{{ site.baseurl }}{% post_url 2010-07-21-name-of-post %}
+```
+{% endraw %}
+
+If you organize your posts in subdirectories, you need to include subdirectory path to the post:
+
+{% raw %}
+```liquid
+{{ site.baseurl }}{% post_url /subdir/2010-07-21-name-of-post %}
+```
+{% 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:
+
+{% raw %}
+```liquid
+[Name of Link]({{ site.baseurl }}{% post_url 2010-07-21-name-of-post %})
+```
+{% endraw %}
diff --git a/docs/_docs/maintaining/merging-a-pull-request.md b/docs/_docs/maintaining/merging-a-pull-request.md
index c89e7e4a13d..0403d05abc2 100644
--- a/docs/_docs/maintaining/merging-a-pull-request.md
+++ b/docs/_docs/maintaining/merging-a-pull-request.md
@@ -7,7 +7,7 @@ title: "Merging a Pull Request"
 
 ## Code Review
 
-All pull requests should be subject to code review. Code review is a [foundational value](https://blog.fullstory.com/what-we-learned-from-google-code-reviews-arent-just-for-catching-bugs-b125a13aa292) of good engineering teams. Besides providing validation of correctness, it promotes a sense of community and gives other maintainers understanding of all parts of the code base. In short, code review is crucial to a healthy open source project.
+All pull requests should be subject to code review. Code review is a [foundational value](https://blog.fullstory.com/what-we-learned-from-google-code-reviews-arent-just-for-catching-bugs/) of good engineering teams. Besides providing validation of correctness, it promotes a sense of community and gives other maintainers understanding of all parts of the code base. In short, code review is crucial to a healthy open source project.
 
 **Read our guide for [Reviewing a pull request](../reviewing-a-pull-request) before merging.** Notably, the change must have tests if for code, and at least two maintainers must give it an OK.
 
diff --git a/docs/_docs/maintaining/triaging-an-issue.md b/docs/_docs/maintaining/triaging-an-issue.md
index 23660b17ef8..36bfdcc95a9 100644
--- a/docs/_docs/maintaining/triaging-an-issue.md
+++ b/docs/_docs/maintaining/triaging-an-issue.md
@@ -51,4 +51,4 @@ Is what they wanted to get something we want to happen? Sometimes a bug report i
 
 ### Staleness and automatic closure
 
-@jekyllbot will automatically mark issues as `stale` if no activity occurs for at least one month. @jekyllbot leaves a comment asking for information about reproducibility in current versions. If no one responds after another month, the issue is automatically closed. This behaviour can be suppressed by setting the [`pinned` label](../maintaining/special-labels.md/#pinned).
+@jekyllbot will automatically mark issues as `stale` if no activity occurs for at least one month. @jekyllbot leaves a comment asking for information about reproducibility in current versions. If no one responds after another month, the issue is automatically closed. This behavior can be suppressed by setting the [`pinned` label](/docs/maintaining/special-labels/#pinned).
diff --git a/docs/_docs/markdown-101.md b/docs/_docs/markdown-101.md
new file mode 100644
index 00000000000..c1090dbb873
--- /dev/null
+++ b/docs/_docs/markdown-101.md
@@ -0,0 +1,6 @@
+---
+title: Markdown 101
+permalink: /docs/markdown-101/
+---
+
+# TO WRITE
diff --git a/docs/_docs/migrations.md b/docs/_docs/migrations.md
index fd8676a40ea..c3a69caef84 100644
--- a/docs/_docs/migrations.md
+++ b/docs/_docs/migrations.md
@@ -1,5 +1,5 @@
 ---
-title: Blog migrations
+title: Blog Migrations
 permalink: /docs/migrations/
 ---
 
diff --git a/docs/_docs/pages.md b/docs/_docs/pages.md
index 8852bc32b8e..fcfc62d3bbe 100644
--- a/docs/_docs/pages.md
+++ b/docs/_docs/pages.md
@@ -1,74 +1,27 @@
 ---
-title: Creating pages
+title: Pages
 permalink: /docs/pages/
 ---
 
-In addition to [writing posts](../posts/), you might also want to add static pages (content that isn't date-based) to your Jekyll site. By taking advantage of the way Jekyll copies files and directories, this is easy to do.
-
-## Homepage
-
-Just about every web server configuration you come across will look for an HTML
-file called `index.html` (by convention) in the site's root folder and display
-that as the homepage. Unless the web server you’re using is configured to look
-for some different filename as the default, this file will turn into the
-homepage of your Jekyll-generated site.
-
-
    
-  
    ProTip™: Use layouts on your homepage
    
-  
    
-    Any HTML file on your site can use layouts and/or includes, even the
-    homepage. Common content, like headers and footers, make excellent
-    candidates for extraction into a layout.
-  
    
-
    
-
-## Where additional pages live
-
-Where you put HTML or [Markdown](https://daringfireball.net/projects/markdown/)
-files for pages depends on how you want the pages to work. There are two main ways of creating pages:
-
-- Place named HTML or [Markdown](https://daringfireball.net/projects/markdown/)
-files for each page in your site's root folder.
-- Place pages inside folders and subfolders named whatever you want.
-
-Both methods work fine (and can be used in conjunction with each other),
-with the only real difference being the resulting URLs. By default, pages retain the same folder structure in `_site` as they do in the source directory.
-
-### Named HTML files
+Pages are the most basic building block for content. They're useful for standalone
+content (content which is not date based or is not a group of content such as staff
+members or recipes).
 
 The simplest way of adding a page is just to add an HTML file in the root
-directory with a suitable name for the page you want to create. For a site with
+directory with a suitable filename. You can also write a page in Markdown using
+a `.md` extension which converts to HTML on build. For a site with
 a homepage, an about page, and a contact page, here’s what the root directory
 and associated URLs might look like:
 
 ```sh
 .
-|-- _config.yml
-|-- _includes/
-|-- _layouts/
-|-- _posts/
-|-- _site/
-|-- about.html    # => http://example.com/about.html
+|-- about.md    # => http://example.com/about.html
 |-- index.html    # => http://example.com/
-|-- other.md      # => http://example.com/other.html
 └── contact.html  # => http://example.com/contact.html
 ```
 
-If you have a lot of pages, you can organize those pages into subfolders. The same subfolders that are used to group your pages in our project's source will exist in the `_site` folder when your site builds.
-
-## Flattening pages from subfolders into the root directory
-
-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
----
-```
-
-### Named folders containing index HTML files
+If you have a lot of pages, you can organize them into subfolders. The same subfolders that are used to group your pages in our project's source will exist in the `_site` folder when your site builds.
 
-If you don't want file extensions (`.html`) to appear in your page URLs (file extensions are the default), you can choose a [permalink style](../permalinks/#builtinpermalinkstyles) that has a trailing slash instead of a file extension.
+## Changing the output URL
 
-Note if you want to view your site offline *without the Jekyll preview server*, your browser will need the file extension to display the page, and all assets will need to be relative links that function without the server baseurl.
+You might want to have a particular folder structure for your source files that changes for the built site. With [permalinks](/docs/permalinks) you have full control of the output URL.
diff --git a/docs/_docs/pagination.md b/docs/_docs/pagination.md
index 1735ee64012..d9554a99ab6 100644
--- a/docs/_docs/pagination.md
+++ b/docs/_docs/pagination.md
@@ -42,10 +42,10 @@ paginate_path: "/blog/page:num/"
 
 This will read in `blog/index.html`, send it each pagination page in Liquid as
 `paginator` and write the output to `blog/page:num/`, where `:num` is the
-pagination page number, starting with `2`. If a site has 12 posts and specifies
-`paginate: 5`, Jekyll will write `blog/index.html` with the first 5 posts, `blog/page2/index.html` with the next 5 posts
-and `blog/page3/index.html` with the last 2 posts into the destination
-directory.
+pagination page number, starting with `2`. 
    
+If a site has 12 posts and specifies `paginate: 5`, Jekyll will write `blog/index.html`
+with the first 5 posts, `blog/page2/index.html` with the next 5 posts and
+`blog/page3/index.html` with the last 2 posts into the destination directory.
 
 
    
   
    Don't set a permalink
    
@@ -58,8 +58,11 @@ directory.
 
    
   
    Pagination for categories, tags and collections
    
   
    
-    The more recent jekyll-paginate-v2 plugin supports more features. See the pagination examples in the repository.
-    This plugin is not supported by GitHub Pages.
+    The more recent 
+    jekyll-paginate-v2 plugin supports more features. See the
+    
+    pagination examples in the repository. This plugin is not
+    supported by GitHub Pages.
   
    
 
    
 
@@ -100,19 +103,19 @@ attributes:
     
    
@@ -127,10 +130,10 @@ attributes:
     
@@ -140,7 +143,7 @@ attributes:
 
    
   
    Pagination does not support tags or categories
    
   
    Pagination pages through every post in the posts
-  variable unless a post has hidden: true in its YAML Front Matter.
+  variable unless a post has hidden: true in its front matter.
   It does not currently allow paging over groups of posts linked
   by a common tag or category. It cannot include any collection of
   documents because it is restricted to posts.
    
@@ -174,11 +177,15 @@ title: My Blog
 
 
    
       
    previous_page
    		
       
-          
    
-              page number of the previous pagination page,
-              or nil if no previous page exists
-          
    
+        
    
+          page number of the previous pagination page,
+          or nil if no previous page exists
+        
    
           		
     
    
     
    
       
    previous_page_path
    		
       
-          
    
-              path of previous pagination page,
-              or nil if no previous page exists
-          
    
+        
    
+          path of previous pagination page,
+          or nil if no previous page exists
+        
    
           		
     
    
     
    
       
    next_page_path
    		
       
-          
    
-              path of next pagination page,
-              or nil if no subsequent page exists
-          
    
+        
    
+          path of next pagination page,
+          or nil if no subsequent page exists
+        
    
           		
     
    
   
    
@@ -68,7 +62,7 @@ The following table lists the template variables available for permalinks. You c
       
@@ -79,7 +73,7 @@ The following table lists the template variables available for permalinks. You c
       
@@ -90,7 +84,7 @@ The following table lists the template variables available for permalinks. You c
       
@@ -101,7 +95,7 @@ The following table lists the template variables available for permalinks. You c
       
@@ -112,14 +106,14 @@ The following table lists the template variables available for permalinks. You c
       _
+      
@@ -131,7 +125,7 @@ The following table lists the template variables available for permalinks. You c
       
@@ -173,7 +167,7 @@ The following table lists the template variables available for permalinks. You c
       
@@ -185,7 +179,7 @@ The following table lists the template variables available for permalinks. You c
         
    
             Slugified title from the document’s filename (any character
             except numbers and letters is replaced as hyphen). May be
-            overridden via the document’s slug YAML front matter.
+            overridden via the document’s slug front matter.
         
    
@@ -206,11 +200,9 @@ The following table lists the template variables available for permalinks. You c
 
    
         
    
           Year from the post's filename. May be overridden via the document’s
-          date YAML front matter
+          date front matter
         
    
           		
     
    
         
    
           Month from the post's filename. May be overridden via the document’s
-          date YAML front matter
+          date front matter
         
    
           		
     
    
         
    
           Month without leading zeros from the post's filename. May be
-          overridden via the document’s date YAML front matter
+          overridden via the document’s date front matter
         
    
           		
     
    
         
    
           Day from the post's filename. May be overridden via the document’s
-          date YAML front matter
+          date front matter
         
    
           		
     
    
         
    
           Day without leading zeros from the post's filename. May be overridden
-          via the document’s date YAML front matter
+          via the document’s date front matter
         
    
           		
     
    
     
    
       
         
    y_day
    
-          		
       
         
    Day of the year from the post's filename, with leading zeros.
    
           		
         
    
           Year without the century from the post's filename. May be overridden
-          via the document’s date YAML front matter
+          via the document’s date front matter
         
    
           		
     
    
         
    
             Title from the document’s filename. May be overridden via
-            the document’s slug YAML front matter.
+            the document’s slug front matter.
         
    
           		
     
    
       
     
    
 
    
 
-Note that all template variables relating to time or categories are available to posts only.
-
-## Built-in permalink styles {#builtinpermalinkstyles}
+### Built-in formats
 
-Although you can specify a custom permalink pattern using [template variables](#template-variables), Jekyll also provides the following built-in styles for convenience.
+For posts, Jekyll also provides the following built-in styles for convenience:
 
 
    
 
@@ -260,135 +252,80 @@ Although you can specify a custom permalink pattern using [template variables](#
 Rather than typing `permalink: /:categories/:year/:month/:day/:title/`, you can just type `permalink: pretty`.
 
 
    
-
    Specifying permalinks through the YAML Front Matter
    
-
    Built-in permalink styles are not recognized in YAML Front Matter. As a result, permalink: pretty will not work.
    
+
    Specifying permalinks through the front matter
    
+
    Built-in permalink styles are not recognized in front matter. As a result, permalink: pretty will not work.
    
 
    
 
-## Permalink style examples with posts {#permalink-style-examples}
+### Collections
+
+For collections, you have the option to override the global permalink in the
+collection configuration in `_config.yml`:
 
-Here are a few examples to clarify how permalink styles get applied with posts.
+```yaml
+collections:
+  my_collection:
+    output: true
+    permalink: /:collection/:name
+```
 
-Given a post named: `/2009-04-29-slap-chop.md`
+Collections have the following placeholders available:
 
 
    
 
    
-      
-      
+      
+      
    
   
     
    URL TemplateResulting Permalink URLVariableDescription
     
    
       
   
     
    
       
-        
    None specified, or permalink: date
    
+        
    :collection
    
           		
       
-        
    /2009/04/29/slap-chop.html
    
+        
    Label of the containing collection.
    
           		
     
    
     
    
       
-        
    pretty
    
+        
    :path
    
           		
       
-        
    /2009/04/29/slap-chop/
    
+        
    Path to the document relative to the collection's directory.
    
           		
     
    
     
    
       
-        
    /:month-:day-:year/:title:output_ext
    
+        
    :name
    
           		
       
-        
    /04-29-2009/slap-chop.html
    
+        
    The document's base filename, with every sequence of spaces
+        and non-alphanumeric characters replaced by a hyphen.
    
           		
     
    
     
    
       
-        
    /blog/:year/:month/:day/:title/
    
+        
    :title
    
           		
       
-        
    /blog/2009/04/29/slap-chop/
    
+        
    
+          The :title template variable will take the
+          slug front matter
+          variable value if any is present in the document; if none is
+          defined then :title will be equivalent to
+          :name, aka the slug generated from the filename.
+        
    
           		
     
    
     
    
       
-        
    /:year/:month/:title
    
-        
    See Extensionless permalinks with no trailing slashes for details.
    
+        
    :output_ext
    
           		
       
-        
    /2009/04/slap-chop
    
+        
    Extension of the output file. (Included by default and usually unnecessary.)
    
           		
     
    
       
 
    
 
    
-
-## Permalink settings for pages and collections {#pages-and-collections}
-
-The permalink setting in your configuration file specifies the permalink style used for posts, pages, and collections. However, because pages and collections don't have time or categories, these aspects of the permalink style are ignored with pages and collections.
-
-For example:
-
-* 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.
-
-## Permalinks and default paths
-
-The path to the post or page in the built site differs for posts, pages, and collections:
-
-### Posts
-
-The subfolders into which you may have organized your posts inside the `_posts` directory will not be part of the permalink.
-
-If you use a permalink style that omits the `.html` file extension, each post is rendered as an `index.html` file inside a folder with the post's name (for example, `categoryname/2016/12/01/mypostname/index.html`).
-
-### Pages
-
-Unlike posts, pages by default mimic the source directory structure exactly. (The only exception is if your page has a `permalink` declared its front matter — in that case, the structure honors the permalink setting instead of the source folder structure.)
-
-As with posts, if you use a permalink style that omits the `.html` file extension, each page is rendered as an `index.html` file inserted inside a folder with the page's name (for example, `mypage/index.html`).
-
-### Collections
-
-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 (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
-
-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
----
-```
-
-## Extensionless permalinks with no trailing slashes {#extensionless-permalinks}
-
-Jekyll supports permalinks that contain neither a trailing slash nor a file extension, but this requires additional support from the web server to properly serve. When using these types of permalinks, output files written to disk will still have the proper file extension (typically `.html`), so the web server must be able to map requests without file extensions to these files.
-
-Both [GitHub Pages](../github-pages/) and the Jekyll's built-in WEBrick server handle these requests properly without any additional work.
-
-### Apache
-
-The Apache web server has extensive support for content negotiation and can handle extensionless URLs by setting the [multiviews](https://httpd.apache.org/docs/current/content-negotiation.html#multiviews) option in your `httpd.conf` or `.htaccess` file:
-
-{% highlight apache %}
-Options +MultiViews
-{% endhighlight %}
-
-### Nginx
-
-The [try_files](http://nginx.org/en/docs/http/ngx_http_core_module.html#try_files) directive allows you to specify a list of files to search for to process a request. The following configuration will instruct nginx to search for a file with an `.html` extension if an exact match for the requested URI is not found.
-
-{% highlight nginx %}
-try_files $uri $uri.html $uri/ =404;
-{% endhighlight %}
-
-## Linking without regard to permalink styles
-
-You can create links in your topics to other posts, pages, or collection items in a way that is valid no matter what permalink configuration you choose. By using the `link` tag, if you change your permalinks, your links won't break. See [Linking to pages](../templates#link) in Templates for more details.
diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index 70c5a12c984..b53ed8d65e0 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -7,946 +7,11 @@ Jekyll has a plugin system with hooks that allow you to create custom generated
 content specific to your site. You can run custom code for your site without
 having to modify the Jekyll source itself.
 
-
    
-  
    Plugins on GitHub Pages
    
-  
    
-    GitHub Pages is powered by Jekyll.
-    However, all Pages sites are generated using the --safe option
-    to disable custom plugins for security reasons. Unfortunately, this means
-    your plugins won’t work if you’re deploying to GitHub Pages.

    
-    You can still use GitHub Pages to publish your site, but you’ll need to
-    convert the site locally and push the generated static files to your GitHub
-    repository instead of the Jekyll source files.
-  
    
-
    
-
-## Installing a plugin
-
-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` (or `gems` for Jekyll < `3.5.0`) and the
-   values of the gem names of the plugins you'd like to use. An example:
-
-   ```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`
-
-3. Add the relevant plugins to a Bundler group in your `Gemfile`. An
-   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`.
-
-
    
-  
    
-    _plugins, _config.yml and Gemfile
-    can be used simultaneously
-  
    
-  
    
-    You may use any of the aforementioned plugin options simultaneously in the
-    same site if you so choose. Use of one does not restrict the use of the
-    others.
-  
    
-
    
-
-### 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.
-
-
    
-  
    
-    Gems included in the :jekyll-plugins group are activated
-    regardless of the --safe mode setting. Be aware of what
-    gems are included under this group!
-  
    
-
    
-
-
-In general, plugins you make will fall broadly into one of five categories:
-
-1. [Generators](#generators)
-2. [Converters](#converters)
-3. [Commands](#commands)
-4. [Tags](#tags)
-5. [Hooks](#hooks)
-
-See the bottom of the page for a [list of available plugins](#available-plugins).
-
-For further information on how to develop your own plugins, check out the [Liquid documentation](https://github.com/Shopify/liquid/wiki/Liquid-for-Programmers) as well.
-
-If you never developed a Jekyll plugin [check this useful wrap-up](https://ayastreb.me/writing-a-jekyll-plugin/) by @ayastreb to get started.
-
-## Generators
-
-You can create a generator when you need Jekyll to create additional content
-based on your own rules.
-
-A generator is a subclass of `Jekyll::Generator` that defines a `generate`
-method, which receives an instance of
-[`Jekyll::Site`]({{ site.repository }}/blob/master/lib/jekyll/site.rb). The
-return value of `generate` is ignored.
-
-Generators run after Jekyll has made an inventory of the existing content, and
-before the site is generated. Pages with YAML Front Matters are stored as
-instances of
-[`Jekyll::Page`]({{ site.repository }}/blob/master/lib/jekyll/page.rb)
-and are available via `site.pages`. Static files become instances of
-[`Jekyll::StaticFile`]({{ site.repository }}/blob/master/lib/jekyll/static_file.rb)
-and are available via `site.static_files`. See
-[the Variables documentation page](/docs/variables/) and
-[`Jekyll::Site`]({{ site.repository }}/blob/master/lib/jekyll/site.rb)
-for more details.
-
-For instance, a generator can inject values computed at build time for template
-variables. In the following example the template `reading.html` has two
-variables `ongoing` and `done` that we fill in the generator:
-
-```ruby
-module Reading
-  class Generator < Jekyll::Generator
-    def generate(site)
-      ongoing, done = Book.all.partition(&:ongoing?)
-
-      reading = site.pages.detect {|page| page.name == 'reading.html'}
-      reading.data['ongoing'] = ongoing
-      reading.data['done'] = done
-    end
-  end
-end
-```
-
-This is a more complex generator that generates new pages:
-
-```ruby
-module Jekyll
-  class CategoryPage < Page
-    def initialize(site, base, dir, category)
-      @site = site
-      @base = base
-      @dir = dir
-      @name = 'index.html'
-
-      self.process(@name)
-      self.read_yaml(File.join(base, '_layouts'), 'category_index.html')
-      self.data['category'] = category
-
-      category_title_prefix = site.config['category_title_prefix'] || 'Category: '
-      self.data['title'] = "#{category_title_prefix}#{category}"
-    end
-  end
-
-  class CategoryPageGenerator < Generator
-    safe true
-
-    def generate(site)
-      if site.layouts.key? 'category_index'
-        dir = site.config['category_dir'] || 'categories'
-        site.categories.each_key do |category|
-          site.pages << CategoryPage.new(site, site.source, File.join(dir, category), category)
-        end
-      end
-    end
-  end
-end
-```
-
-In this example, our generator will create a series of files under the
-`categories` directory for each category, listing the posts in each category
-using the `category_index.html` layout.
-
-Generators are only required to implement one method:
-
-
    
-
-  
-    
-      
-      
-    
-  
-  
-    
-      
-      
-    
-  
-
    MethodDescription
    
-        
    generate
    
-          		
-        
    Generates content as a side-effect.
    
-      
    
-
    
-
-## Converters
-
-If you have a new markup language you’d like to use with your site, you can
-include it by implementing your own converter. Both the Markdown and
-[Textile](https://github.com/jekyll/jekyll-textile-converter) markup
-languages are implemented using this method.
-
-
    
-  
    Remember your YAML Front Matter
    
-  
    
-    Jekyll will only convert files that have a YAML header at the top, even for
-    converters you add using a plugin.
-  
    
-
    
-
-Below is a converter that will take all posts ending in `.upcase` and process
-them using the `UpcaseConverter`:
-
-```ruby
-module Jekyll
-  class UpcaseConverter < Converter
-    safe true
-    priority :low
-
-    def matches(ext)
-      ext =~ /^\.upcase$/i
-    end
-
-    def output_ext(ext)
-      ".html"
-    end
-
-    def convert(content)
-      content.upcase
-    end
-  end
-end
-```
-
-Converters should implement at a minimum 3 methods:
-
-
    
-
-  
-    
-      
-      
-    
-  
-  
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-  
-
    MethodDescription
    
-        
    matches
    
-      
    
-        Does the given extension match this converter’s list of acceptable
-        extensions? Takes one argument: the file’s extension (including the
-        dot). Must return true if it matches, false
-        otherwise.
-      
    
-        
    output_ext
    
-      
    
-        The extension to be given to the output file (including the dot).
-        Usually this will be ".html".
-      
    
-        
    convert
    
-      
    
-        Logic to do the content conversion. Takes one argument: the raw content
-        of the file (without YAML Front Matter). Must return a String.
-      
    
-
    
-
-In our example, `UpcaseConverter#matches` checks if our filename extension is
-`.upcase`, and will render using the converter if it is. It will call
-`UpcaseConverter#convert` to process the content. In our simple converter we’re
-simply uppercasing the entire content string. Finally, when it saves the page,
-it will do so with a `.html` extension.
-
-## Commands
-
-As of version 2.5.0, Jekyll can be extended with plugins which provide
-subcommands for the `jekyll` executable. This is possible by including the
-relevant plugins in a `Gemfile` group called `:jekyll_plugins`:
-
-```ruby
-group :jekyll_plugins do
-  gem "my_fancy_jekyll_plugin"
-end
-```
-
-Each `Command` must be a subclass of the `Jekyll::Command` class and must
-contain one class method: `init_with_program`. An example:
-
-```ruby
-class MyNewCommand < Jekyll::Command
-  class << self
-    def init_with_program(prog)
-      prog.command(:new) do |c|
-        c.syntax "new [options]"
-        c.description 'Create a new Jekyll site.'
-
-        c.option 'dest', '-d DEST', 'Where the site should go.'
-
-        c.action do |args, options|
-          Jekyll::Site.new_site_at(options['dest'])
-        end
-      end
-    end
-  end
-end
-```
-
-Commands should implement this single class method:
-
-
    
-
-  
-    
-      
-      
-    
-  
-  
-    
-      
-      
-    
-  
-
    MethodDescription
    
-        
    init_with_program
    
-      
    
-        This method accepts one parameter, the
-        Mercenary::Program
-        instance, which is the Jekyll program itself. Upon the program,
-        commands may be created using the above syntax. For more details,
-        visit the Mercenary repository on GitHub.com.
-      
    
-
    
-
-## Tags
-
-If you’d like to include custom liquid tags in your site, you can do so by
-hooking into the tagging system. Built-in examples added by Jekyll include the
-`highlight` and `include` tags. Below is an example of a custom liquid tag that
-will output the time the page was rendered:
-
-```ruby
-module Jekyll
-  class RenderTimeTag < Liquid::Tag
-
-    def initialize(tag_name, text, tokens)
-      super
-      @text = text
-    end
-
-    def render(context)
-      "#{@text} #{Time.now}"
-    end
-  end
-end
-
-Liquid::Template.register_tag('render_time', Jekyll::RenderTimeTag)
-```
-
-At a minimum, liquid tags must implement:
-
-
    
-
-  
-    
-      
-      
-    
-  
-  
-    
-      
-      
-    
-  
-
    MethodDescription
    
-        
    render
    
-          		
-        
    Outputs the content of the tag.
    
-      
    
-
    
-
-You must also register the custom tag with the Liquid template engine as
-follows:
-
-```ruby
-Liquid::Template.register_tag('render_time', Jekyll::RenderTimeTag)
-```
-
-In the example above, we can place the following tag anywhere in one of our
-pages:
-
-{% raw %}
-```ruby
-
    {% render_time page rendered at: %}
    
-```
-{% endraw %}
-
-And we would get something like this on the page:
-
-```html
-
    page rendered at: Tue June 22 23:38:47 –0500 2010
    
-```
-
-### Liquid filters
-
-You can add your own filters to the Liquid template system much like you can
-add tags above. Filters are simply modules that export their methods to liquid.
-All methods will have to take at least one parameter which represents the input
-of the filter. The return value will be the output of the filter.
-
-```ruby
-module Jekyll
-  module AssetFilter
-    def asset_url(input)
-      "http://www.example.com/#{input}?#{Time.now.to_i}"
-    end
-  end
-end
-
-Liquid::Template.register_filter(Jekyll::AssetFilter)
-```
-
-
    
-  
    ProTip™: Access the site object using Liquid
    
-  
    
-    Jekyll lets you access the site object through the
-    context.registers feature of Liquid at context.registers[:site]. For example, you can
-    access the global configuration file _config.yml using
-    context.registers[:site].config.
-  
    
-
    
-
-### Flags
-
-There are two flags to be aware of when writing a plugin:
-
-
    
-
-  
-    
-      
-      
-    
-  
-  
-    
-      
-      
-    
-    
-      
-      
-    
-  
-
    FlagDescription
    
-        
    safe
    
-          		
-        
    
-          A boolean flag that informs Jekyll whether this plugin may be safely
-          executed in an environment where arbitrary code execution is not
-          allowed. This is used by GitHub Pages to determine which core plugins
-          may be used, and which are unsafe to run. If your plugin does not
-          allow for arbitrary code execution, set this to true.
-          GitHub Pages still won’t load your plugin, but if you submit it for
-          inclusion in core, it’s best for this to be correct!
-        
    
-      
    
-        
    priority
    
-          		
-        
    
-          This flag determines what order the plugin is loaded in. Valid values
-          are: :lowest, :low, :normal,
-          :high, and :highest. Highest priority
-          matches are applied first, lowest priority are applied last.
-        
    
-      
    
-
    
-
-To use one of the example plugins above as an illustration, here is how you’d
-specify these two flags:
-
-```ruby
-module Jekyll
-  class UpcaseConverter < Converter
-    safe true
-    priority :low
-    ...
-  end
-end
-```
-
-## Hooks
-
-Using hooks, your plugin can exercise fine-grained control over various aspects
-of the build process. If your plugin defines any hooks, Jekyll will call them
-at pre-defined points.
-
-Hooks are registered to a container and an event name. To register one, you
-call Jekyll::Hooks.register, and pass the container, event name, and code to
-call whenever the hook is triggered. For example, if you want to execute some
-custom functionality every time Jekyll renders a post, you could register a
-hook like this:
-
-```ruby
-Jekyll::Hooks.register :posts, :post_render do |post|
-  # code to call after Jekyll renders a post
-end
-```
-
-Jekyll provides hooks for :site, :pages,
-:posts, and :documents. In all cases, Jekyll calls
-your hooks with the container object as the first callback parameter. However,
-all `:pre_render` hooks and the`:site, :post_render` hook will also provide a
-payload hash as a second parameter. In the case of `:pre_render`, the payload
-gives you full control over the variables that are available while rendering.
-In the case of `:site, :post_render`, the payload contains final values after
-rendering all the site (useful for sitemaps, feeds, etc).
-
-The complete list of available hooks is below:
-
-
    
-
-  
-    
-      
-      
-      
-    
-  
-  
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-    
-      
-      
-      
-    
-  
-
    ContainerEventCalled
    
-        
    :site
    
-          		
-        
    :after_init
    
-          		
-        
    Just after the site initializes, but before setup & render. Good
-        for modifying the configuration of the site.
    
-      
    
-        
    :site
    
-          		
-        
    :after_reset
    
-          		
-        
    Just after site reset
    
-      
    
-        
    :site
    
-          		
-        
    :post_read
    
-          		
-        
    After site data has been read and loaded from disk
    
-      
    
-        
    :site
    
-          		
-        
    :pre_render
    
-          		
-        
    Just before rendering the whole site
    
-      
    
-        
    :site
    
-          		
-        
    :post_render
    
-          		
-        
    After rendering the whole site, but before writing any files
    
-      
    
-        
    :site
    
-          		
-        
    :post_write
    
-          		
-        
    After writing the whole site to disk
    
-      
    
-        
    :pages
    
-          		
-        
    :post_init
    
-          		
-        
    Whenever a page is initialized
    
-      
    
-        
    :pages
    
-          		
-        
    :pre_render
    
-          		
-        
    Just before rendering a page
    
-      
    
-        
    :pages
    
-          		
-        
    :post_render
    
-          		
-        
    After rendering a page, but before writing it to disk
    
-      
    
-        
    :pages
    
-          		
-        
    :post_write
    
-          		
-        
    After writing a page to disk
    
-      
    
-        
    :posts
    
-          		
-        
    :post_init
    
-          		
-        
    Whenever a post is initialized
    
-      
    
-        
    :posts
    
-          		
-        
    :pre_render
    
-          		
-        
    Just before rendering a post
    
-      
    
-        
    :posts
    
-          		
-        
    :post_render
    
-          		
-        
    After rendering a post, but before writing it to disk
    
-      
    
-        
    :posts
    
-          		
-        
    :post_write
    
-          		
-        
    After writing a post to disk
    
-      
    
-        
    :documents
    
-          		
-        
    :post_init
    
-          		
-        
    Whenever a document is initialized
    
-      
    
-        
    :documents
    
-          		
-        
    :pre_render
    
-          		
-        
    Just before rendering a document
    
-      
    
-        
    :documents
    
-          		
-        
    :post_render
    
-          		
-        
    After rendering a document, but before writing it to disk
    
-      
    
-        
    :documents
    
-          		
-        
    :post_write
    
-          		
-        
    After writing a document to disk
    
-      
    
-
    
-
-## Available Plugins
-
-You can find a few useful plugins at the following locations:
-
-#### Generators
-
-- [Sitemap.xml Generator by Michael Levin](https://github.com/kinnetica/jekyll-plugins): Generates a sitemap.xml file by traversing all of the available posts and pages.
-- [Full-text search by Pascal Widdershoven](https://github.com/PascalW/jekyll_indextank): Adds full-text search to your Jekyll site with a plugin and a bit of JavaScript.
-- [AliasGenerator by Thomas Mango](https://github.com/tsmango/jekyll_alias_generator): Generates redirect pages for posts when an alias is specified in the YAML Front Matter.
-- [Pageless Redirect Generator by Nick Quinlan](https://github.com/nquinlan/jekyll-pageless-redirects): Generates redirects based on files in the Jekyll root, with support for htaccess style redirects.
-- [RssGenerator by Assaf Gelber](https://github.com/agelber/jekyll-rss): Automatically creates an RSS 2.0 feed from your posts.
-- [Monthly archive generator by Shigeya Suzuki](https://github.com/shigeya/jekyll-monthly-archive-plugin): Generator and template which renders monthly archive like MovableType style, based on the work by Ilkka Laukkanen and others above.
-- [Category archive generator by Shigeya Suzuki](https://github.com/shigeya/jekyll-category-archive-plugin): Generator and template which renders category archive like MovableType style, based on Monthly archive generator.
-- [Emoji for Jekyll](https://github.com/yihangho/emoji-for-jekyll): Seamlessly enable emoji for all posts and pages.
-- [Compass integration for Jekyll](https://github.com/mscharley/jekyll-compass): Easily integrate Compass and Sass with your Jekyll website.
-- [Pages Directory by Ben Baker-Smith](https://github.com/bbakersmith/jekyll-pages-directory): Defines a `_pages` directory for page files which routes its output relative to the project root.
-- [Page Collections by Jeff Kolesky](https://github.com/jeffkole/jekyll-page-collections): Generates collections of pages with functionality that resembles posts.
-- [Windows 8.1 Live Tile Generation by Matt Sheehan](https://github.com/sheehamj13/jekyll-live-tiles): Generates Internet Explorer 11 config.xml file and Tile Templates for pinning your site to Windows 8.1.
-- [Typescript Generator by Matt Sheehan](https://github.com/sheehamj13/jekyll_ts): Generate Javascript on build from your Typescript.
-- [Jekyll::AutolinkEmail by Ivan Tse](https://github.com/ivantsepp/jekyll-autolink_email): Autolink your emails.
-- [Jekyll::GitMetadata by Ivan Tse](https://github.com/ivantsepp/jekyll-git_metadata): Expose Git metadata for your templates.
-- [Jekyll Auto Image by Merlos](https://github.com/merlos/jekyll-auto-image): Gets the first image of a post. Useful to list your posts with images or to add [twitter cards](https://dev.twitter.com/cards/overview) to your site.
-- [Jekyll Portfolio Generator by Shannon Babincsak](https://github.com/codeinpink/jekyll-portfolio-generator): Generates project pages and computes related projects out of project data files.
-- [Jekyll-Umlauts by Arne Gockeln](https://github.com/webchef/jekyll-umlauts): This generator replaces all german umlauts (äöüß) case sensitive with html.
-- [Jekyll Flickr Plugin](https://github.com/lawmurray/indii-jekyll-flickr) by [Lawrence Murray](http://www.indii.org): Generates posts for photos uploaded to a Flickr photostream.
-- [Jekyll::Paginate::Category](https://github.com/midnightSuyama/jekyll-paginate-category): Pagination Generator for Jekyll Category.
-- [AMP-Jekyll by Juuso Mikkonen](https://github.com/juusaw/amp-jekyll): Generate [Accelerated Mobile Pages](https://www.ampproject.org) of Jekyll posts.
-- [Jekyll Art Gallery plugin](https://github.com/alexivkin/Jekyll-Art-Gallery-Plugin): An advanced art/photo gallery generation plugin for creating galleries from a set of image folders. Supports image tagging, thumbnails, sorting, image rotation, post-processing (remove EXIF, add watermark), multiple collections and much more.
-- [jekyll-ga](https://github.com/developmentseed/jekyll-ga): A Jekyll plugin that downloads Google Analytics data and adds it to posts. Useful for making a site that lists "most popular" content. [Read the introduction](https://developmentseed.org/blog/google-analytics-jekyll-plugin/) post on the developmentSEED blog.
-- [jekyll-multi-paginate](https://github.com/fadhilnapis/jekyll-multi-paginate): Simple Jekyll paginator for multiple page. Ease you to make pagination on multiple page especially like multiple language.
-- [jekyll-category-pages](https://github.com/field-theory/jekyll-category-pages): Easy-to-use category index pages with and without pagination. Supports non-URL-safe category keywords and has extensive documentation and test coverage.
-- [Tweetsert](https://github.com/ibrado/jekyll-tweetsert): Imports tweets (Twitter statuses) as new posts. Features multiple timeline support, hashtag import, filtering, automatic category and/or tags, optional retweets and replies.
-- [Stickyposts](https://github.com/ibrado/jekyll-stickyposts): Moves or copies (pins) posts marked `sticky: true` to the top of the list. Perfect for keeping important announcements on the home page, or giving collections a descriptive entry. Paginator friendly.
-- [Jekyll::Paginate::Content](https://github.com/ibrado/jekyll-paginate-content): Content paginator in the style of jekyll-paginator-v2 that splits pages, posts, and collection entries into several pages. Specify a separator or use HTML <h1> etc. headers. Automatic splitting, single-page view, pager/trail, self-adjusting links, multipage TOC, SEO support.
-- [Premonition](https://github.com/amedia/premonition): Adds block-styled side content to your page. For example summary, notes, hints or warning boxes.
-- [jekyll-fontello](https://github.com/ericcornelissen/jekyll-fontello): A Jekyll plugin that automatically downloads your webfont from Fontello.
-- [Target Blank](https://github.com/keithmifsud/jekyll-target-blank): A Jekyll plugin to automatically open external links in a new browser tab or window.
-- [jekyll-info](https://github.com/swestmoreland/jekyll-info): A plugin to provide information about your Jekyll site’s configuration.
-
-#### Converters
-
-- [Pug plugin by Doug Beney](http://jekyll-pug.dougie.io): Use the popular Pug (previously Jade) templating language in Jekyll. Complete with caching, includes support, and much more.
-- [Textile converter](https://github.com/jekyll/jekyll-textile-converter): Convert `.textile` files into HTML. Also includes the `textilize` Liquid filter.
-- [Slim plugin](https://github.com/slim-template/jekyll-slim): Slim converter and includes for Jekyll with support for Liquid tags.
-- [Markdown References by Olov Lassus](https://github.com/olov/jekyll-references): Keep all your markdown reference-style link definitions in one \_references.md file.
-- [ReStructuredText Converter](https://github.com/xdissent/jekyll-rst): Converts ReST documents to HTML with Pygments syntax highlighting.
-- [Jekyll-pandoc-multiple-formats](https://github.com/fauno/jekyll-pandoc-multiple-formats) by [edsl](https://github.com/edsl): Use pandoc to generate your site in multiple formats. Supports pandoc’s markdown extensions.
-- [Customized Kramdown Converter](https://github.com/mvdbos/kramdown-with-pygments): Enable Pygments syntax highlighting for Kramdown-parsed fenced code blocks.
-- [Bigfootnotes Plugin](https://github.com/TheFox/jekyll-bigfootnotes): Enables big footnotes for Kramdown.
-- [AsciiDoc Plugin](https://github.com/asciidoctor/jekyll-asciidoc): AsciiDoc convertor for Jekyll using [Asciidoctor](http://asciidoctor.org/).
-- [Lazy Tweet Embedding](https://github.com/takuti/jekyll-lazy-tweet-embedding): Automatically convert tweet urls into twitter cards.
-- [jekyll-commonmark](https://github.com/pathawks/jekyll-commonmark): Markdown converter that uses [libcmark](https://github.com/jgm/CommonMark), the reference parser for CommonMark.
-
-#### Filters
-
-- [Truncate HTML](https://github.com/MattHall/truncatehtml) by [Matt Hall](https://codebeef.com/): A Jekyll filter that truncates HTML while preserving markup structure.
-- [Domain Name Filter by Lawrence Woodman](https://github.com/LawrenceWoodman/domain_name-liquid_filter): Filters the input text so that just the domain name is left.
-- [Smilify](https://github.com/SaswatPadhi/jekyll_smilify) by [SaswatPadhi](https://github.com/SaswatPadhi): Convert text emoticons in your content to themeable smiley pics.
-- [Jekyll-timeago](https://github.com/markets/jekyll-timeago): Converts a time value to the time ago in words.
-- [pluralize](https://github.com/bdesham/pluralize): Easily combine a number and a word into a grammatically-correct amount like “1 minute” or “2 minute**s**”.
-- [reading_time](https://github.com/bdesham/reading_time): Count words and estimate reading time for a piece of text, ignoring HTML elements that are unlikely to contain running text.
-- [Table of Content Generator](https://github.com/dafi/jekyll-toc-generator): Generate the HTML code containing a table of content (TOC), the TOC can be customized in many way, for example you can decide which pages can be without TOC.
-- [jekyll-toc](https://github.com/toshimaru/jekyll-toc): A liquid filter plugin for Jekyll which generates a table of contents.
-- [jekyll-humanize](https://github.com/23maverick23/jekyll-humanize): This is a port of the Django app humanize which adds a "human touch" to data. Each method represents a Fluid type filter that can be used in your Jekyll site templates. Given that Jekyll produces static sites, some of the original methods do not make logical sense to port (e.g. naturaltime).
-- [Jekyll-Ordinal](https://github.com/PatrickC8t/Jekyll-Ordinal): Jekyll liquid filter to output a date ordinal such as "st", "nd", "rd", or "th".
-- [Deprecated articles keeper](https://github.com/kzykbys/JekyllPlugins) by [Kazuya Kobayashi](http://blog.kazuya.co/): A simple Jekyll filter which monitor how old an article is.
-- [Jekyll-jalali](https://github.com/mehdisadeghi/jekyll-jalali) by [Mehdi Sadeghi](http://mehdix.ir): A simple Gregorian to Jalali date converter filter.
-- [Jekyll Thumbnail Filter](https://github.com/matallo/jekyll-thumbnail-filter): Related posts thumbnail filter.
-- [liquid-md5](https://github.com/pathawks/liquid-md5): Returns an MD5 hash. Helpful for generating Gravatars in templates.
-- [jekyll-roman](https://github.com/paulrobertlloyd/jekyll-roman): A liquid filter for Jekyll that converts numbers into Roman numerals.
-- [jekyll-typogrify](https://github.com/myles/jekyll-typogrify): A Jekyll plugin that brings the functions of [typogruby](http://avdgaag.github.io/typogruby/).
-- [Jekyll Email Protect](https://github.com/vwochnik/jekyll-email-protect): Email protection liquid filter for Jekyll
-- [Jekyll Uglify Filter](https://github.com/mattg/jekyll-uglify-filter): A Liquid filter that runs your JavaScript through UglifyJS.
-- [match_regex](https://github.com/sparanoid/match_regex): A Liquid filter to perform regex match.
-- [replace_regex](https://github.com/sparanoid/replace_regex): A Liquid filter to perform regex replace.
-- [Jekyll Money](https://rubygems.org/gems/jekyll-money): A Jekyll plugin for dealing with money. Because we all have to at some point.
-- [jekyll-random](https://github.com/codecalm/jekyll-random) by [codecalm](https://nodecalm.net): A Jekyll plugin that generates pseudo-random data. Very useful when you want to generate a large amount of random data.
-- [jekyll-firstimage](https://github.com/nhoizey/jekyll-firstimage) adds a Liquid filter finding the first image in a HTML content string, including responsive images srcset.
-
-#### Tags
-
-You can find a few useful plugins at the following locations:
-
-- [Jekyll-gist](https://github.com/jekyll/jekyll-gist): Use the `gist` tag to easily embed a GitHub Gist onto your site. This works with public or secret gists.
-- [Asset Path Tag](https://github.com/samrayner/jekyll-asset-path-plugin) by [Sam Rayner](http://www.samrayner.com/): Allows organisation of assets into subdirectories by outputting a path for a given file relative to the current post or page.
-- [Delicious Plugin by Christian Hellsten](https://github.com/christianhellsten/jekyll-plugins): Fetches and renders bookmarks from delicious.com.
-- [Embed.ly client by Robert Böhnke](https://github.com/robb/jekyll-embedly-client): Autogenerate embeds from URLs using oEmbed.
-- [FlickrSetTag by Thomas Mango](https://github.com/tsmango/jekyll_flickr_set_tag): Generates image galleries from Flickr sets.
-- [Tweet Tag by Scott W. Bradley](https://github.com/scottwb/jekyll-tweet-tag): Liquid tag for [Embedded Tweets](https://dev.twitter.com/docs/embedded-tweets) using Twitter’s shortcodes.
-- [Jekyll Twitter Plugin](https://github.com/rob-murray/jekyll-twitter-plugin): A Liquid tag plugin that renders Tweets from Twitter API. Currently supports the [oEmbed](https://dev.twitter.com/rest/reference/get/statuses/oembed) API.
-- [Jekyll-contentblocks](https://github.com/rustygeldmacher/jekyll-contentblocks): Lets you use Rails-like content_for tags in your templates, for passing content from your posts up to your layouts.
-- [Jekyll-beastiepress](https://github.com/okeeblow/jekyll-beastiepress): FreeBSD utility tags for Jekyll sites.
-- [Bibjekyll](https://github.com/pablooliveira/bibjekyll): Render BibTeX-formatted bibliographies/citations included in posts and pages using bibtex2html.
-- [Jekyll-citation](https://github.com/archome/jekyll-citation): Render BibTeX-formatted bibliographies/citations included in posts and pages (pure Ruby).
-- [Jekyll Dribbble Set Tag](https://github.com/ericdfields/Jekyll-Dribbble-Set-Tag): Builds Dribbble image galleries from any user.
-- [JekyllGalleryTag](https://github.com/redwallhp/JekyllGalleryTag) by [redwallhp](https://github.com/redwallhp): Generates thumbnails from a directory of images and displays them in a grid.
-- [Jekyll-swfobject](https://github.com/sectore/jekyll-swfobject): Liquid plugin for embedding Adobe Flash files (.swf) using [SWFObject](https://github.com/swfobject/swfobject).
-- [Jekyll Picture Tag](https://github.com/robwierzbowski/jekyll-picture-tag): Easy responsive images for Jekyll. Based on the proposed [``](https://html.spec.whatwg.org/multipage/embedded-content.html#the-picture-element) element, polyfilled with Scott Jehl’s [Picturefill](https://github.com/scottjehl/picturefill).
-- [Jekyll Image Tag](https://github.com/robwierzbowski/jekyll-image-tag): Better images for Jekyll. Save image presets, generate resized images, and add classes, alt text, and other attributes.
-- [Jekyll Responsive Image](https://github.com/wildlyinaccurate/jekyll-responsive-image): Responsive images for Jekyll. Automatically resizes images, supports all responsive methods (``, `srcset`, Imager.js, etc), super-flexible configuration.
-- [Ditaa Tag](https://github.com/matze/jekyll-ditaa) by [matze](https://github.com/matze): Renders ASCII diagram art into PNG images and inserts a figure tag.
-- [Jekyll Suggested Tweet](https://github.com/davidensinger/jekyll-suggested-tweet) by [David Ensinger](https://github.com/davidensinger/): A Liquid tag for Jekyll that allows for the embedding of suggested tweets via Twitter’s Web Intents API.
-- [Jekyll Date Chart](https://github.com/GSI/jekyll_date_chart) by [GSI](https://github.com/GSI): Block that renders date line charts based on textile-formatted tables.
-- [Jekyll Image Encode](https://github.com/GSI/jekyll_image_encode) by [GSI](https://github.com/GSI): Tag that renders base64 codes of images fetched from the web.
-- [Jekyll Quick Man](https://github.com/GSI/jekyll_quick_man) by [GSI](https://github.com/GSI): Tag that renders pretty links to man page sources on the internet.
-- [Image Set/Gallery Tag](https://github.com/callmeed/jekyll-image-set) by [callmeed](https://github.com/callmeed): Renders HTML for an image gallery from a folder in your Jekyll site. Just pass it a folder name and class/tag options.
-- [jekyll_figure](https://github.com/lmullen/jekyll_figure): Generate figures and captions with links to the figure in a variety of formats
-- [Jekyll GitHub Sample Tag](https://github.com/bwillis/jekyll-github-sample): A liquid tag to include a sample of a github repo file in your Jekyll site.
-- [Jekyll Project Version Tag](https://github.com/rob-murray/jekyll-version-plugin): A Liquid tag plugin that renders a version identifier for your Jekyll site sourced from the git repository containing your code.
-- [Piwigo Gallery](https://github.com/AlessandroLorenzi/piwigo_gallery) by [Alessandro Lorenzi](http://blog.alorenzi.eu/): Jekyll plugin to generate thumbnails from a Piwigo gallery and display them with a Liquid tag
-- [mathml.rb](https://github.com/tmthrgd/jekyll-plugins) by Tom Thorogood: A plugin to convert TeX mathematics into MathML for display.
-- [webmention_io.rb](https://github.com/aarongustafson/jekyll-webmention_io) by [Aaron Gustafson](http://aaron-gustafson.com/): A plugin to enable [webmention](https://indieweb.org/webmention) integration using [Webmention.io](https://webmention.io/). Includes an optional JavaScript for updating webmentions automatically between publishes and, if available, in realtime using WebSockets.
-- [Jekyll 500px Embed](https://github.com/lkorth/jekyll-500px-embed) by Luke Korth. A Liquid tag plugin that embeds [500px](https://500px.com/) photos.
-- [inline\_highlight](https://github.com/bdesham/inline_highlight): A tag for inline syntax highlighting.
-- [jekyll-mermaid](https://github.com/jasonbellamy/jekyll-mermaid): Simplify the creation of mermaid diagrams and flowcharts in your posts and pages.
-- [twa](https://github.com/Ezmyrelda/twa): Twemoji Awesome plugin for Jekyll. Liquid tag allowing you to use twitter emoji in your jekyll pages.
-- [Fetch remote file content](https://github.com/dimitri-koenig/jekyll-plugins) by [Dimitri König](https://www.dimitrikoenig.net/): Using `remote_file_content` tag you can fetch the content of a remote file and include it as if you would put the content right into your markdown file yourself. Very useful for including code from github repo's to always have a current repo version.
-- [jekyll-asciinema](https://github.com/mnuessler/jekyll-asciinema): A tag for embedding asciicasts recorded with [asciinema](https://asciinema.org) in your Jekyll pages.
-- [Jekyll-Youtube](https://github.com/dommmel/jekyll-youtube)  A Liquid tag that embeds Youtube videos. The default emded markup is responsive but you can also specify your own by using an include/partial.
-- [Jekyll Flickr Plugin](https://github.com/lawmurray/indii-jekyll-flickr) by [Lawrence Murray](http://www.indii.org): Embeds Flickr photosets (albums) as a gallery of thumbnails, with lightbox links to larger images.
-- [jekyll-figure](https://github.com/paulrobertlloyd/jekyll-figure): A liquid tag for Jekyll that generates `
    ` elements.
-- [Jekyll Video Embed](https://github.com/eug/jekyll-video-embed): It provides several tags to easily embed videos (e.g. Youtube, Vimeo, UStream and Ted Talks)
-- [jekyll-i18n_tags](https://github.com/KrzysiekJ/jekyll-i18n_tags): Translate your templates.
-- [Jekyll Ideal Image Slider](https://github.com/jekylltools/jekyll-ideal-image-slider): Liquid tag plugin to create image sliders using [Ideal Image Slider](https://github.com/gilbitron/Ideal-Image-Slider).
-- [Jekyll Tags List Plugin](https://github.com/crispgm/jekyll-tags-list-plugin): A Liquid tag plugin that creates tags list in specific order.
-- [Jekyll Maps](https://github.com/ayastreb/jekyll-maps) by [Anatoliy Yastreb](https://github.com/ayastreb): A Jekyll plugin to easily embed maps with filterable locations.
-- [Jekyll Cloudinary](https://nhoizey.github.io/jekyll-cloudinary/) by [Nicolas Hoizey](https://nicolas-hoizey.com/): a Jekyll plugin adding a Liquid tag to ease the use of Cloudinary for responsive images in your Markdown/Kramdown posts.
-- [jekyll-include-absolute-plugin](https://github.com/tnhu/jekyll-include-absolute-plugin) by [Tan Nhu](https://github.com/tnhu): A Jekyll plugin to include a file from its path relative to Jekyll's source folder.
-- [Jekyll Download Tag](https://github.com/mattg/jekyll-download-tag): A Liquid tag that acts like `include`, but for external resources.
-- [Jekyll Brand Social Wall](https://github.com/MediaComem/jekyll-brand-social-wall): A jekyll plugin to generate a social wall with your favorite social networks
-- [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.
-- [disqus-for-jekyll](https://github.com/kacperduras/disqus-for-jekyll): A Jekyll plugin to view the comments powered by Disqus.
-- [jekyll-html](https://github.com/kacperduras/jekyll-html): A Jekyll plugin to use HTML tags in Jekyll pages, posts and collections.
-- [jekyll-onebox](https://github.com/rriemann/jekyll-onebox): Liquid tag for displaying HTML previews (embeds) for links to popular domains. Plugin is based on [Onebox](https://github.com/discourse/onebox) that powers link previews in [Discourse](http://github.com/discourse/discourse) forums.
-- [jekyll-w2m](https://github.com/kacperduras/jekyll-w2m): A Jekyll plugin to liberate content from Microsoft Word documents (powered by [word-to-markdown](https://github.com/benbalter/word-to-markdown)).
-- [jekyll-flickr](https://github.com/rriemann/jekyll-flickr): Liquid tag for responsive Flickr images using HTML5 srcset. Subtitles and automatic license notices are supported.
-- [CAT](https://github.com/binfalse/jekyll-cat): Include the contents of any file (like the `include` command, but also for files outside of `_include`). Similar to Unix' `cat` tool; useful for including source code etc. in posts and pages.
-
-#### Collections
-
-- [Jekyll Plugins by Recursive Design](https://github.com/recurser/jekyll-plugins): Plugins to generate Project pages from GitHub readmes, a Category page, and a Sitemap generator.
-- [Company website and blog plugins](https://github.com/flatterline/jekyll-plugins) by Flatterline, a Ruby on Rails development company: Portfolio/project page generator, team/individual page generator, an author bio liquid tag for use on posts, and a few other smaller plugins.
-- [Jekyll plugins by Aucor](https://github.com/aucor/jekyll-plugins): Plugins for trimming unwanted newlines/whitespace and sorting pages by weight attribute.
-
-#### Other
-
-- [Analytics for Jekyll](https://github.com/hendrikschneider/jekyll-analytics) by Hendrik Schneider: An effortless way to add various trackers like Google Analytics, Matomo (formerly Piwik), mPulse, etc. to your site.
-- [ditaa-ditaa](https://github.com/tmthrgd/ditaa-ditaa) by Tom Thorogood: a drastic revision of jekyll-ditaa that renders diagrams drawn using ASCII art into PNG images.
-- [Pygments Cache Path by Raimonds Simanovskis](https://github.com/rsim/blog.rayapps.com/blob/master/_plugins/pygments_cache_patch.rb): Plugin to cache syntax-highlighted code from Pygments.
-- [Related Posts by Lawrence Woodman](https://github.com/LawrenceWoodman/related_posts-jekyll_plugin): Overrides `site.related_posts` to use categories to assess relationship.
-- [jekyll-tagging-related_posts](https://github.com/toshimaru/jekyll-tagging-related_posts): Jekyll related_posts function based on tags (works on Jekyll3).
-- [Jekyll-localization](https://github.com/blackwinter/jekyll-localization): Jekyll plugin that adds localization features to the rendering engine.
-- [Jekyll-rendering](https://github.com/blackwinter/jekyll-rendering): Jekyll plugin to provide alternative rendering engines.
-- [Jekyll-pagination](https://github.com/blackwinter/jekyll-pagination): Jekyll plugin to extend the pagination generator.
-- [Jekyll-tagging](https://github.com/pattex/jekyll-tagging): Jekyll plugin to automatically generate a tag cloud and tag pages.
-- [Jekyll-scholar](https://github.com/inukshuk/jekyll-scholar): Jekyll extensions for the blogging scholar.
-- [Jekyll-assets](http://jekyll.github.io/jekyll-assets/) by [ixti](https://github.com/ixti): Rails-alike assets pipeline (write assets in CoffeeScript, Sass, LESS etc; specify dependencies for automatic bundling using simple declarative comments in assets; minify and compress; use JST templates; cache bust; and many-many more).
-- [JAPR](https://github.com/kitsched/japr): Jekyll Asset Pipeline Reborn - Powerful asset pipeline for Jekyll that collects, converts and compresses JavaScript and CSS assets.
-- [Jekyll-minibundle](https://github.com/tkareine/jekyll-minibundle): Asset bundling and cache busting using external minification tool of your choice. No gem dependencies.
-- [Singlepage-jekyll](https://github.com/JCB-K/singlepage-jekyll) by [JCB-K](https://github.com/JCB-K): Turns Jekyll into a dynamic one-page website.
-- [generator-jekyllrb](https://github.com/robwierzbowski/generator-jekyllrb): A generator that wraps Jekyll in [Yeoman](http://yeoman.io/), a tool collection and workflow for building modern web apps.
-- [grunt-jekyll](https://github.com/dannygarcia/grunt-jekyll): A straightforward [Grunt](http://gruntjs.com/) plugin for Jekyll.
-- [jekyll-postfiles](https://github.com/indirect/jekyll-postfiles): Add `_postfiles` directory and {% raw %}`{% postfile %}`{% endraw %} tag so the files a post refers to will always be right there inside your repo.
-- [A layout that compresses HTML](http://jch.penibelst.de/): GitHub Pages compatible, configurable way to compress HTML files on site build.
-- [Jekyll CO₂](https://github.com/wdenton/jekyll-co2): Generates HTML showing the monthly change in atmospheric CO₂ at the Mauna Loa observatory in Hawaii.
-- [remote-include](http://www.northfieldx.co.uk/remote-include/): Includes files using remote URLs
-- [jekyll-minifier](https://github.com/digitalsparky/jekyll-minifier): Minifies HTML, XML, CSS, and Javascript both inline and as separate files utilising yui-compressor and htmlcompressor.
-- [Jekyll views router](https://bitbucket.org/nyufac/jekyll-views-router): Simple router between generator plugins and templates.
-- [Jekyll Language Plugin](https://github.com/vwochnik/jekyll-language-plugin): Jekyll 3.0-compatible multi-language plugin for posts, pages and includes.
-- [Jekyll Deploy](https://github.com/vwochnik/jekyll-deploy): Adds a `deploy` sub-command to Jekyll.
-- [Official Contentful Jekyll Plugin](https://github.com/contentful/jekyll-contentful-data-import): Adds a `contentful` sub-command to Jekyll to import data from Contentful.
-- [jekyll-paspagon](https://github.com/KrzysiekJ/jekyll-paspagon): Sell your posts in various formats for cryptocurrencies.
-- [Hawkins](https://github.com/awood/hawkins): Adds a `liveserve` sub-command to Jekyll that incorporates [LiveReload](http://livereload.com/) into your pages while you preview them.  No more hitting the refresh button in your browser!
-- [Jekyll Autoprefixer](https://github.com/vwochnik/jekyll-autoprefixer): Autoprefixer integration for Jekyll
-- [Jekyll-breadcrumbs](https://github.com/git-no/jekyll-breadcrumbs): Creates breadcrumbs for Jekyll 3.x, includes features like SEO optimization, optional breadcrumb item translation and more.
-- [generator-jekyllized](https://github.com/sondr3/generator-jekyllized): A Yeoman generator for rapidly developing sites with Gulp. Live reload your site, automatically minify and optimize your assets and much more.
-- [Jekyll-Spotify](https://github.com/MertcanGokgoz/Jekyll-Spotify): Easily output Spotify Embed Player for jekyll
-- [jekyll-menus](https://github.com/forestryio/jekyll-menus): Hugo style menus for your Jekyll site... recursive menus included.
-- [jekyll-data](https://github.com/ashmaroli/jekyll-data): Read data files within Jekyll Theme Gems.
-- [jekyll-pinboard](https://github.com/snaptortoise/jekyll-pinboard-plugin): Access your Pinboard bookmarks within your Jekyll theme.
-- [jekyll-migrate-permalink](https://github.com/mpchadwick/jekyll-migrate-permalink): Adds a `migrate-permalink` sub-command to help deal with side effects of changing your permalink.
-- [Jekyll-Post](https://github.com/robcrocombe/jekyll-post): A CLI tool to easily draft, edit, and publish Jekyll posts.
-- [jekyll-numbered-headings](https://github.com/muratayusuke/jekyll-numbered-headings): Adds ordered number to headings.
-- [jekyll-pre-commit](https://github.com/mpchadwick/jekyll-pre-commit): A framework for running checks against your posts using a git pre-commit hook before you publish them.
-- [jekyll-pwa-plugin](https://github.com/lavas-project/jekyll-pwa): A plugin provides PWA support for Jekyll. It generates a service worker in Jekyll build process and makes precache and runtime cache available in the runtime with Google Workbox.
-- [jekyll-algolia](https://community.algolia.com/jekyll-algolia/): Add fast and relevant search to your Jekyll site through the Algolia API.
-- [jekyll-get](https://github.com/18F/jekyll-get): Download data from external JSON API sources to use in generating a site.
-- [jekyll-xml-source](https://github.com/mcred/jekyll-xml-source): Download XML and RSS from external sites for use in site data.
-
-
    
-  
    Submit your gem plugins
    
-  
    
-    You're encouraged to add your Jekyll gem plugins to this list, read the contributing page to find
-    out how to make that happen.
-  
    
-
    
+* [Installation](/docs/plugins/installation/) - How to install plugins
+* [Your first plugin](/docs/plugins/your-first-plugin/) - How to write plugins
+* [Generators](/docs/plugins/generators/) - Create additional content on your site
+* [Converters](/docs/plugins/converters/) - Change a markup language into another format
+* [Commands](/docs/plugins/commands/) - Extend the `jekyll` executable with subcommands
+* [Tags](/docs/plugins/tags) - Create custom Liquid tags
+* [Filters](/docs/plugins/filters/) - Create custom Liquid filters
+* [Hooks](/docs/plugins/hooks/) - Fine-grained control to extend the build process
diff --git a/docs/_docs/plugins/commands.md b/docs/_docs/plugins/commands.md
new file mode 100644
index 00000000000..cd704346ea8
--- /dev/null
+++ b/docs/_docs/plugins/commands.md
@@ -0,0 +1,62 @@
+---
+title: Commands
+permalink: /docs/plugins/commands/
+---
+As of version 2.5.0, Jekyll can be extended with plugins which provide
+subcommands for the `jekyll` executable. This is possible by including the
+relevant plugins in a `Gemfile` group called `:jekyll_plugins`:
+
+```ruby
+group :jekyll_plugins do
+  gem "my_fancy_jekyll_plugin"
+end
+```
+
+Each `Command` must be a subclass of the `Jekyll::Command` class and must
+contain one class method: `init_with_program`. An example:
+
+```ruby
+class MyNewCommand < Jekyll::Command
+  class << self
+    def init_with_program(prog)
+      prog.command(:new) do |c|
+        c.syntax "new [options]"
+        c.description 'Create a new Jekyll site.'
+
+        c.option 'dest', '-d DEST', 'Where the site should go.'
+
+        c.action do |args, options|
+          Jekyll::Site.new_site_at(options['dest'])
+        end
+      end
+    end
+  end
+end
+```
+
+Commands should implement this single class method:
+
+
    
+
+  
+    
+      
+      
+    
+  
+  
+    
+      
+      
+    
+  
+
    MethodDescription
    
+        
    init_with_program
    
+      
    
+        This method accepts one parameter, the
+        Mercenary::Program
+        instance, which is the Jekyll program itself. Upon the program,
+        commands may be created using the above syntax. For more details,
+        visit the Mercenary repository on GitHub.com.
+      
    
+
    
diff --git a/docs/_docs/plugins/converters.md b/docs/_docs/plugins/converters.md
new file mode 100644
index 00000000000..31c99e939fb
--- /dev/null
+++ b/docs/_docs/plugins/converters.md
@@ -0,0 +1,91 @@
+---
+title: Converters
+permalink: /docs/plugins/converters/
+---
+
+If you have a new markup language you’d like to use with your site, you can
+include it by implementing your own converter. Both the Markdown and
+[Textile](https://github.com/jekyll/jekyll-textile-converter) markup
+languages are implemented using this method.
+
+
    
+  
    Remember your Front Matter
    
+  
    
+    Jekyll will only convert files that have a YAML header at the top, even for
+    converters you add using a plugin.
+  
    
+
    
+
+Below is a converter that will take all posts ending in `.upcase` and process
+them using the `UpcaseConverter`:
+
+```ruby
+module Jekyll
+  class UpcaseConverter < Converter
+    safe true
+    priority :low
+
+    def matches(ext)
+      ext =~ /^\.upcase$/i
+    end
+
+    def output_ext(ext)
+      ".html"
+    end
+
+    def convert(content)
+      content.upcase
+    end
+  end
+end
+```
+
+Converters should implement at a minimum 3 methods:
+
+
    
+
+  
+    
+      
+      
+    
+  
+  
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+  
+
    MethodDescription
    
+        
    matches
    
+      
    
+        Does the given extension match this converter’s list of acceptable
+        extensions? Takes one argument: the file’s extension (including the
+        dot). Must return true if it matches, false
+        otherwise.
+      
    
+        
    output_ext
    
+      
    
+        The extension to be given to the output file (including the dot).
+        Usually this will be ".html".
+      
    
+        
    convert
    
+      
    
+        Logic to do the content conversion. Takes one argument: the raw content
+        of the file (without front matter). Must return a String.
+      
    
+
    
+
+In our example, `UpcaseConverter#matches` checks if our filename extension is
+`.upcase`, and will render using the converter if it is. It will call
+`UpcaseConverter#convert` to process the content. In our simple converter we’re
+simply uppercasing the entire content string. Finally, when it saves the page,
+it will do so with a `.html` extension.
diff --git a/docs/_docs/plugins/filters.md b/docs/_docs/plugins/filters.md
new file mode 100644
index 00000000000..811b0f0afb5
--- /dev/null
+++ b/docs/_docs/plugins/filters.md
@@ -0,0 +1,30 @@
+---
+title: Filters
+permalink: /docs/plugins/filters/
+---
+
+Filters are simply modules that export their methods to liquid.
+All methods will have to take at least one parameter which represents the input
+of the filter. The return value will be the output of the filter.
+
+```ruby
+module Jekyll
+  module AssetFilter
+    def asset_url(input)
+      "http://www.example.com/#{input}?#{Time.now.to_i}"
+    end
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::AssetFilter)
+```
+
+
    
+  
    ProTip™: Access the site object using Liquid
    
+  
    
+    Jekyll lets you access the site object through the
+    context.registers feature of Liquid at context.registers[:site]. For example, you can
+    access the global configuration file _config.yml using
+    context.registers[:site].config.
+  
    
+
    
diff --git a/docs/_docs/plugins/generators.md b/docs/_docs/plugins/generators.md
new file mode 100644
index 00000000000..43b5b06856e
--- /dev/null
+++ b/docs/_docs/plugins/generators.md
@@ -0,0 +1,103 @@
+---
+title: Generators
+permalink: /docs/plugins/generators/
+---
+
+You can create a generator when you need Jekyll to create additional content
+based on your own rules.
+
+A generator is a subclass of `Jekyll::Generator` that defines a `generate`
+method, which receives an instance of
+[`Jekyll::Site`]({{ site.repository }}/blob/master/lib/jekyll/site.rb). The
+return value of `generate` is ignored.
+
+Generators run after Jekyll has made an inventory of the existing content, and
+before the site is generated. Pages with front matter are stored as
+instances of
+[`Jekyll::Page`]({{ site.repository }}/blob/master/lib/jekyll/page.rb)
+and are available via `site.pages`. Static files become instances of
+[`Jekyll::StaticFile`]({{ site.repository }}/blob/master/lib/jekyll/static_file.rb)
+and are available via `site.static_files`. See
+[the Variables documentation page](/docs/variables/) and
+[`Jekyll::Site`]({{ site.repository }}/blob/master/lib/jekyll/site.rb)
+for more details.
+
+For instance, a generator can inject values computed at build time for template
+variables. In the following example the template `reading.html` has two
+variables `ongoing` and `done` that we fill in the generator:
+
+```ruby
+module Reading
+  class Generator < Jekyll::Generator
+    def generate(site)
+      ongoing, done = Book.all.partition(&:ongoing?)
+
+      reading = site.pages.detect {|page| page.name == 'reading.html'}
+      reading.data['ongoing'] = ongoing
+      reading.data['done'] = done
+    end
+  end
+end
+```
+
+This is a more complex generator that generates new pages:
+
+```ruby
+module Jekyll
+  class CategoryPage < Page
+    def initialize(site, base, dir, category)
+      @site = site
+      @base = base
+      @dir = dir
+      @name = 'index.html'
+
+      self.process(@name)
+      self.read_yaml(File.join(base, '_layouts'), 'category_index.html')
+      self.data['category'] = category
+
+      category_title_prefix = site.config['category_title_prefix'] || 'Category: '
+      self.data['title'] = "#{category_title_prefix}#{category}"
+    end
+  end
+
+  class CategoryPageGenerator < Generator
+    safe true
+
+    def generate(site)
+      if site.layouts.key? 'category_index'
+        dir = site.config['category_dir'] || 'categories'
+        site.categories.each_key do |category|
+          site.pages << CategoryPage.new(site, site.source, File.join(dir, category), category)
+        end
+      end
+    end
+  end
+end
+```
+
+In this example, our generator will create a series of files under the
+`categories` directory for each category, listing the posts in each category
+using the `category_index.html` layout.
+
+Generators are only required to implement one method:
+
+
    
+
+  
+    
+      
+      
+    
+  
+  
+    
+      
+      
+    
+  
+
    MethodDescription
    
+        
    generate
    
+          		
+        
    Generates content as a side-effect.
    
+      
    
+
    
diff --git a/docs/_docs/plugins/hooks.md b/docs/_docs/plugins/hooks.md
new file mode 100644
index 00000000000..55e44dd9843
--- /dev/null
+++ b/docs/_docs/plugins/hooks.md
@@ -0,0 +1,244 @@
+---
+title: Hooks
+permalink: /docs/plugins/hooks/
+---
+
+Using hooks, your plugin can exercise fine-grained control over various aspects
+of the build process. If your plugin defines any hooks, Jekyll will call them
+at pre-defined points.
+
+Hooks are registered to a container and an event name. To register one, you
+call Jekyll::Hooks.register, and pass the container, event name, and code to
+call whenever the hook is triggered. For example, if you want to execute some
+custom functionality every time Jekyll renders a post, you could register a
+hook like this:
+
+```ruby
+Jekyll::Hooks.register :posts, :post_render do |post|
+  # code to call after Jekyll renders a post
+end
+```
+
+Jekyll provides hooks for :site, :pages,
+:posts, and :documents. In all cases, Jekyll calls
+your hooks with the container object as the first callback parameter. However,
+all `:pre_render` hooks and the`:site, :post_render` hook will also provide a
+payload hash as a second parameter. In the case of `:pre_render`, the payload
+gives you full control over the variables that are available while rendering.
+In the case of `:site, :post_render`, the payload contains final values after
+rendering all the site (useful for sitemaps, feeds, etc).
+
+The complete list of available hooks is below:
+
+
    
+
+  
+    
+      
+      
+      
+    
+  
+  
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+  
+
    ContainerEventCalled
    
+        
    :site
    
+          		
+        
    :after_init
    
+          		
+        
    Just after the site initializes, but before setup & render. Good
+        for modifying the configuration of the site.
    
+      
    
+        
    :site
    
+          		
+        
    :after_reset
    
+          		
+        
    Just after site reset
    
+      
    
+        
    :site
    
+          		
+        
    :post_read
    
+          		
+        
    After site data has been read and loaded from disk
    
+      
    
+        
    :site
    
+          		
+        
    :pre_render
    
+          		
+        
    Just before rendering the whole site
    
+      
    
+        
    :site
    
+          		
+        
    :post_render
    
+          		
+        
    After rendering the whole site, but before writing any files
    
+      
    
+        
    :site
    
+          		
+        
    :post_write
    
+          		
+        
    After writing the whole site to disk
    
+      
    
+        
    :pages
    
+          		
+        
    :post_init
    
+          		
+        
    Whenever a page is initialized
    
+      
    
+        
    :pages
    
+          		
+        
    :pre_render
    
+          		
+        
    Just before rendering a page
    
+      
    
+        
    :pages
    
+          		
+        
    :post_render
    
+          		
+        
    After rendering a page, but before writing it to disk
    
+      
    
+        
    :pages
    
+          		
+        
    :post_write
    
+          		
+        
    After writing a page to disk
    
+      
    
+        
    :posts
    
+          		
+        
    :post_init
    
+          		
+        
    Whenever a post is initialized
    
+      
    
+        
    :posts
    
+          		
+        
    :pre_render
    
+          		
+        
    Just before rendering a post
    
+      
    
+        
    :posts
    
+          		
+        
    :post_render
    
+          		
+        
    After rendering a post, but before writing it to disk
    
+      
    
+        
    :posts
    
+          		
+        
    :post_write
    
+          		
+        
    After writing a post to disk
    
+      
    
+        
    :documents
    
+          		
+        
    :post_init
    
+          		
+        
    Whenever a document is initialized
    
+      
    
+        
    :documents
    
+          		
+        
    :pre_render
    
+          		
+        
    Just before rendering a document
    
+      
    
+        
    :documents
    
+          		
+        
    :post_render
    
+          		
+        
    After rendering a document, but before writing it to disk
    
+      
    
+        
    :documents
    
+          		
+        
    :post_write
    
+          		
+        
    After writing a document to disk
    
+      
    
+
    
diff --git a/docs/_docs/plugins/installation.md b/docs/_docs/plugins/installation.md
new file mode 100644
index 00000000000..8c1307dc958
--- /dev/null
+++ b/docs/_docs/plugins/installation.md
@@ -0,0 +1,82 @@
+---
+title: Plugins
+permalink: /docs/plugins/installation/
+---
+
+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` (or `gems` for Jekyll < `3.5.0`) and the
+   values of the gem names of the plugins you'd like to use. An example:
+
+   ```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`
+
+3. Add the relevant plugins to a Bundler group in your `Gemfile`. An
+   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`.
+
+
    
+  
    Plugins on GitHub Pages
    
+  
    
+    GitHub Pages is powered by Jekyll.
+    However, all Pages sites are generated using the --safe option
+    to disable plugins (with the exception of some
+    whitelisted plugins) for
+    security reasons. Unfortunately, this means
+    your plugins won’t work if you’re deploying to GitHub Pages.

    
+    You can still use GitHub Pages to publish your site, but you’ll need to
+    convert the site locally and push the generated static files to your GitHub
+    repository instead of the Jekyll source files.
+  
    
+
    
+
+
    
+  
    
+    _plugins, _config.yml and Gemfile
+    can be used simultaneously
+  
    
+  
    
+    You may use any of the aforementioned plugin options simultaneously in the
+    same site if you so choose. Use of one does not restrict the use of the
+    others.
+  
    
+
    
+
+### 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.
+
+
    
+  
    
+    Gems included in the :jekyll-plugins group are activated
+    regardless of the --safe mode setting. Be aware of what
+    gems are included under this group!
+  
    
+
    
diff --git a/docs/_docs/plugins/tags.md b/docs/_docs/plugins/tags.md
new file mode 100644
index 00000000000..3681d623db5
--- /dev/null
+++ b/docs/_docs/plugins/tags.md
@@ -0,0 +1,72 @@
+---
+title: Tags
+permalink: /docs/plugins/tags/
+---
+
+If you’d like to include custom liquid tags in your site, you can do so by
+hooking into the tagging system. Built-in examples added by Jekyll include the
+`highlight` and `include` tags. Below is an example of a custom liquid tag that
+will output the time the page was rendered:
+
+```ruby
+module Jekyll
+  class RenderTimeTag < Liquid::Tag
+
+    def initialize(tag_name, text, tokens)
+      super
+      @text = text
+    end
+
+    def render(context)
+      "#{@text} #{Time.now}"
+    end
+  end
+end
+
+Liquid::Template.register_tag('render_time', Jekyll::RenderTimeTag)
+```
+
+At a minimum, liquid tags must implement:
+
+
    
+
+  
+    
+      
+      
+    
+  
+  
+    
+      
+      
+    
+  
+
    MethodDescription
    
+        
    render
    
+          		
+        
    Outputs the content of the tag.
    
+      
    
+
    
+
+You must also register the custom tag with the Liquid template engine as
+follows:
+
+```ruby
+Liquid::Template.register_tag('render_time', Jekyll::RenderTimeTag)
+```
+
+In the example above, we can place the following tag anywhere in one of our
+pages:
+
+{% raw %}
+```ruby
+
    {% render_time page rendered at: %}
    
+```
+{% endraw %}
+
+And we would get something like this on the page:
+
+```html
+
    page rendered at: Tue June 22 23:38:47 –0500 2010
    
+```
diff --git a/docs/_docs/plugins/your-first-plugin.md b/docs/_docs/plugins/your-first-plugin.md
new file mode 100644
index 00000000000..dfa15e65a21
--- /dev/null
+++ b/docs/_docs/plugins/your-first-plugin.md
@@ -0,0 +1,137 @@
+---
+title: Your first plugin
+permalink: /docs/plugins/your-first-plugin/
+---
+
+Plugins allow you to extend Jekyll's behavior to fit your needs. There are six
+types of plugins in Jekyll.
+
+## Generators
+
+[Generators](/docs/plugins/generators/) create content on your site.
+For example:
+
+* [jekyll-feed](https://github.com/jekyll/jekyll-feed) creates an Atom feed of
+blog posts.
+* [jekyll-archives](https://github.com/jekyll/jekyll-archives) creates archive
+pages for blog categories and tags.
+* [jekyll-sitemap](https://github.com/jekyll/jekyll-sitemap) creates a sitemap.
+
+## Converters
+
+[Converters](/docs/plugins/converters/) change a markup language into another
+format. For example:
+
+* [jekyll-textile-converter](https://github.com/jekyll/jekyll-textile-converter)
+converts textile to HTML.
+* [jekyll-coffeescript](https://github.com/jekyll/jekyll-coffeescript) converts
+Coffeescript to JavaScript.
+* [jekyll-opal](https://github.com/jekyll/jekyll-opal) converts Ruby to
+JavaScript.
+
+## Commands
+
+[Commands](/docs/plugins/commands/) extend the `jekyll` executable with
+subcommands. For example:
+
+* [jekyll-compose](https://github.com/jekyll/jekyll-compose) adds subcommands
+for creating a post, page or draft.
+
+## Tags
+
+[Tags](/docs/plugins/tags/) create custom Liquid tags. For example:
+
+* [jekyll-youtube](https://github.com/dommmel/jekyll-youtube) embeds a YouTube
+video.
+* [jekyll-asset-path-plugin](https://github.com/samrayner/jekyll-asset-path-plugin)
+outputs a relative URL for assets.
+* [jekyll-swfobject](https://github.com/sectore/jekyll-swfobject) embeds a SWF
+object.
+
+## Filters
+
+[Filters](/docs/plugins/filters/) create custom Liquid filters. For example:
+
+* [jekyll-time-ago](https://github.com/markets/jekyll-timeago) - The distance
+between two dates in words.
+* [jekyll-toc](https://github.com/toshimaru/jekyll-toc) - Generates a table of
+content.
+* [jekyll-email-protect](https://github.com/vwochnik/jekyll-email-protect) -
+Obfuscates emails to protect them from spam bots.
+
+## Hooks
+
+[Hooks](/docs/plugins/hooks/) give fine-grained control to extend the build
+process.
+
+## Flags
+
+There are two flags to be aware of when writing a plugin:
+
+
    
+
+  
+    
+      
+      
+    
+  
+  
+    
+      
+      
+    
+    
+      
+      
+    
+  
+
    FlagDescription
    
+        
    safe
    
+          		
+        
    
+          A boolean flag that informs Jekyll whether this plugin may be safely
+          executed in an environment where arbitrary code execution is not
+          allowed. This is used by GitHub Pages to determine which core plugins
+          may be used, and which are unsafe to run. If your plugin does not
+          allow for arbitrary code execution, set this to true.
+          GitHub Pages still won’t load your plugin, but if you submit it for
+          inclusion in core, it’s best for this to be correct!
+        
    
+      
    
+        
    priority
    
+          		
+        
    
+          This flag determines what order the plugin is loaded in. Valid values
+          are: :lowest, :low, :normal,
+          :high, and :highest. Highest priority
+          matches are applied first, lowest priority are applied last.
+        
    
+      
    
+
    
+
+To use one of the example plugins above as an illustration, here is how you’d
+specify these two flags:
+
+```ruby
+module Jekyll
+  class UpcaseConverter < Converter
+    safe true
+    priority :low
+    ...
+  end
+end
+```
+
+## Best Practices
+
+The guides help you with the specifics of creating plugins. We also have some
+recommended best practices to help structure your plugin.
+
+We recommend using a [gem](/docs/ruby-101/#gems) for your plugin. This will
+help you manage dependencies, keep separation from your site source code and
+allow you to share functionality across multiple projects. For tips on creating
+a gem take a look a the
+[Ruby gems guide](https://guides.rubygems.org/make-your-own-gem/) or look
+through the source code of an existing plugin such as
+[jekyll-feed](https://github.com/jekyll/jekyll-feed).
diff --git a/docs/_docs/posts.md b/docs/_docs/posts.md
index f0019971d29..f678c7d8183 100644
--- a/docs/_docs/posts.md
+++ b/docs/_docs/posts.md
@@ -1,30 +1,21 @@
 ---
-title: Writing posts
+title: Posts
 permalink: /docs/posts/
 ---
 
-One of Jekyll’s best aspects is that it is “blog aware”. What does this mean,
-exactly? Well, simply put, it means that blogging is baked into Jekyll’s
-functionality. If you write articles and publish them online, you can publish
-and maintain a blog simply by managing a folder of text-files on your computer.
-Compared to the hassle of configuring and maintaining databases and web-based
-CMS systems, this will be a welcome change!
+Blogging is baked into Jekyll. You write blog posts as text files and Jekyll
+provides everything you need to turn it into a blog.
 
 ## The Posts Folder
 
-As explained on the [directory structure](../structure/) page, the `_posts`
-folder is where your blog posts will live. These files are generally
-[Markdown](https://daringfireball.net/projects/markdown/) or HTML, but can
-be other formats with the proper converter installed.
-All posts must have [YAML Front Matter](../frontmatter/), and they will be
-converted from their source format into an HTML page that is part of your
-static site.
+The `_posts` folder is where your blog posts live. You typically write posts
+in [Markdown](https://daringfireball.net/projects/markdown/), however HTML is
+also supported.
 
-### Creating Post Files
+## Creating Posts
 
-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:
+To create a post, add a file to your `_posts` directory with the following
+format:
 
 ```
 YEAR-MONTH-DAY-title.MARKUP
@@ -39,25 +30,33 @@ file. For example, the following are examples of valid post filenames:
 2012-09-12-how-to-write-a-blog.md
 ```
 
+All blog post files must begin with [front matter](/docs/front-matter/) which is
+typically used to set a [layout](/docs/layouts/) or other meta data. For a simple
+example this can just be empty:
+
+```markdown
+---
+layout: post
+title:  "Welcome to Jekyll!"
+---
+
+# Welcome
+
+**Hello world**, this is my first Jekyll blog post.
+
+I hope you like it!
+```
+
 
    
   
    ProTip™: Link to other posts
    
   
    
-    Use the post_url
+    Use the post_url
     tag to link to other posts without having to worry about the URLs
     breaking when the site permalink style changes.
   
    
 
    
 
-### Content Formats
 
-All blog post files must begin with [YAML Front Matter](../frontmatter/). After
-that, it's simply a matter of deciding which format you prefer. Jekyll supports
-[Markdown](https://daringfireball.net/projects/markdown/) out of the box,
-and has [myriad extensions for other formats as well](/docs/plugins/#converters-1),
-including the popular [Textile](http://redcloth.org/textile) format. These
-formats each have their own way of marking up different types of content
-within a post, so you should familiarize yourself with these formats and
-decide which one best suits your needs.
 
 
    
   
    Be aware of character sets
    
@@ -73,66 +72,31 @@ decide which one best suits your needs.
 
 ## Including images and resources
 
-Chances are, at some point, you'll want to include images, downloads, or other
-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.
-One common solution is to create a folder in the root of the project directory
-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 `absolute_url`
-filter in a post.
+At some point, you'll want to include images, downloads, or other
+digital assets along with your text content. One common solution is to create
+a folder in the root of the project directory 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. The best way to do this depends on the way your site’s (sub)domain
+and path are configured, but here are some simple examples in Markdown:
 
 Including an image asset in a post:
 
-{% raw %}
 ```markdown
 ... which is shown in the screenshot below:
-![My helpful screenshot]({{ "/assets/screenshot.jpg" | absolute_url }})
+![My helpful screenshot]("/assets/screenshot.jpg")
 ```
-{% endraw %}
 
 Linking to a PDF for readers to download:
 
-{% raw %}
 ```markdown
-... you can [get the PDF]({{ "/assets/mydoc.pdf" | absolute_url }}) directly.
+... you can [get the PDF]("/assets/mydoc.pdf") directly.
 ```
-{% endraw %}
-
-
    
-
-
    
-
-## 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".
 
 ## Displaying an index of posts
 
-It’s all well and good to have posts in a folder, but a blog is no use unless
-you have a list of posts somewhere. Creating an index of posts on another page
-(or in a [template](../templates/)) is easy, thanks to the [Liquid template
-language](https://docs.shopify.com/themes/liquid/basics) and its tags. Here’s a
+Creating an index of posts on another page is easy thanks to
+[Liquid](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 %}
@@ -147,188 +111,98 @@ basic example of how to create a list of links to your blog posts:
 ```
 {% endraw %}
 
-Of course, you have full control over how (and where) you display your posts,
+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
-work](../templates/) with Jekyll if you want to know more.
+work](/docs/templates/) with Jekyll if you want to know more.
 
 Note that the `post` variable only exists inside the `for` loop above. If
 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:
+## Categories and Tags
 
-{% raw %}
-```liquid
----
-layout: page
----
-
-{% for post in site.categories[page.category] %}
-    
-      {{ post.title }}
-    
-{% 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
-
-```yaml
----
-layout: category
-title: Blog
-category: blog
----
-```
+Jekyll has first class support for categories and tags in blog posts. The difference
+between categories and tags is a category can be part of the URL for a post
+whereas a tag cannot.
 
-In this case, the listing pages will be accessible at `{baseurl}/category/blog.html`
+To use these, first set your categories and tags in front matter:
 
-Although categories and tags are very similar, they are used to group posts,
-there are a few differences between them.  Categories and sub-categories create
-hierarchies that, by default, are reflected in the directory structure of your
-site.  A post with the following header
-```yaml
----
-layout: post
-title: A Trip
-category: [ blog, travel ]
----
-```
-will be accessible at `{baseurl}/blog/travel/year/month/day/A-Trip.html`.  On
-the other hand, a tagged post
 ```yaml
 ---
 layout: post
 title: A Trip
-tags: [ blog, travel ]
+categories: [blog, travel]
+tags: [hot, summer]
 ---
 ```
-will be saved as `{baseurl}/year/month/day/A-Trip.html`.  It is up to you to
-create `{baseurl}/tag/blog.html` and `{baseurl}/tag/travel.html` the same way as
-described above for categories.
-
-While this example is done with tags and categories, you can easily extend your
-lists to filter by any other variable created with extensions.
-
-## Post excerpts
 
-Each post automatically takes the first block of text, from the beginning of
-the content to the first occurrence of `excerpt_separator`, and sets it in the
-post's data hash.
-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:
+Jekyll makes the categories available to us at `site.categories`. Iterating over
+`site.categories` on a page gives as another array with two items, the first
+item is the name of the category and the second item is an array of posts in that
+category.
 
 {% raw %}
 ```liquid
-
      
-  {% for post in site.posts %}
-    
    • 
-      {{ post.title }}
-      {{ post.excerpt }}
-    
      • 
-  {% endfor %}
-
    
+{% for category in site.categories %}
+  
    {{ category[0] }}
    
+  
+{% endfor %}
 ```
 {% 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:
+For tags it's exactly the same except the variable is `site.tags`.
 
-{% raw %}
-```liquid
-{{ post.excerpt | remove: '
    ' | remove: '
    ' }}
-```
-{% endraw %}
+## Post excerpts
 
-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:
+You can access a snippet of a posts's content by using `excerpt` variable on a
+post. By default this is the first paragraph of content in the post however it
+can be customized by setting a `excerpt_separator` variable in front matter or
+`_config.yml`.
 
 ```yaml
 ---
 excerpt_separator: 
 ---
 
-Excerpt
+Excerpt with multiple paragraphs
+
+Here's another paragraph in the excerpt.
 
 Out-of-excerpt
 ```
 
-You can also set the `excerpt_separator` globally in your `_config.yml`
-configuration file.
-
-Completely disable excerpts by setting your `excerpt_separator` to `""`.
-
-Also, as with any output generated by Liquid tags, you can pass the
-`| strip_html` filter to remove any html tags in the output. This is
-particularly helpful if you wish to output a post excerpt as a
-`meta="description"` tag within the post `head`, or anywhere else having
-html tags along with the content is not desirable.
-
-## Highlighting code snippets
-
-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:
+Here's an example of outputting a list of blog posts with an excerpt:
 
 {% raw %}
 ```liquid
-{% highlight ruby %}
-def show
-  @widget = Widget(params[:id])
-  respond_to do |format|
-    format.html # show.html.erb
-    format.json { render json: @widget }
-  end
-end
-{% endhighlight %}
+
      
+  {% for post in site.posts %}
+    
    • 
+      {{ post.title }}
+      {{ post.excerpt }}
+    
      • 
+  {% endfor %}
+
    
 ```
 {% endraw %}
 
-And the output will look like this:
+## Drafts
 
-```ruby
-def show
-  @widget = Widget(params[:id])
-  respond_to do |format|
-    format.html # show.html.erb
-    format.json { render json: @widget }
-  end
-end
-```
+Drafts are posts without a date in the filename. They're posts you're still
+working on and don't want to publish yet. To get up and running with drafts,
+create a `_drafts` folder in your site's root and create your first draft:
 
-
    
-  
    ProTip™: Show line numbers
    
-  
    
-    You can make code snippets include line-numbers by adding the word
-    linenos to the end of the opening highlight tag like this:
-    {% raw %}{% highlight ruby linenos %}{% endraw %}.
-  
    
-
    
+```text
+|-- _drafts/
+|   |-- a-draft-post.md
+```
 
-These basics should be enough to get you started writing your first posts. When
-you’re ready to dig into what else is possible, you might be interested in
-doing things like [customizing post permalinks](../permalinks/) or
-using [custom variables](../variables/) in your posts and elsewhere on your
-site.
+To preview your site with drafts, simply run `jekyll serve` or `jekyll build`
+with the `--drafts` switch. Each will be assigned the value modification time
+of the draft file for its date, and thus you will see currently edited drafts
+as the latest posts.
diff --git a/docs/_docs/quickstart.md b/docs/_docs/quickstart.md
deleted file mode 100644
index 9c88d0cf871..00000000000
--- a/docs/_docs/quickstart.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-title: Quick-start guide
-permalink: /docs/quickstart/
----
-
-
-If you already have a full [Ruby](https://www.ruby-lang.org/en/downloads/) development environment with all headers and [RubyGems](https://rubygems.org/pages/download) installed (see Jekyll's [requirements](/docs/installation/#requirements)), you can create a new Jekyll site by doing the following:
-
-```sh
-# Install Jekyll and Bundler gems through RubyGems
-gem install jekyll bundler
-
-# Create a new Jekyll site at ./myblog
-jekyll new myblog
-
-# Change into your new directory
-cd myblog
-
-# Build the site on the preview server
-bundle exec jekyll serve
-
-# Now browse to http://localhost:4000
-```
-
-If you encounter any unexpected errors during the above, please refer to the [troubleshooting](/docs/troubleshooting/#configuration-problems) page or the already-mentioned [requirements](/docs/installation/#requirements) page, as you might be missing development headers or other prerequisites.
-
-## About Bundler
-
-`gem install bundler` installs the [bundler](https://rubygems.org/gems/bundler) gem through [RubyGems](https://rubygems.org/). You only need to install it once — not every time you create a new Jekyll project. Here are some additional details:
-
-* `bundler` is a gem that manages other Ruby gems. It makes sure your gems and gem versions are compatible, and that you have all necessary dependencies each gem requires.
-* The `Gemfile` and `Gemfile.lock` files inform Bundler about the gem requirements in your site. If your site doesn't have these Gemfiles, you can omit `bundle exec` and just run `jekyll serve`.
-
-* When you run `bundle exec jekyll serve`, Bundler uses the gems and versions as specified in `Gemfile.lock` to ensure your Jekyll site builds with no compatibility or dependency conflicts.
-
-For more information about how to use Bundler in your Jekyll project, this [tutorial](https://jekyllrb.com/tutorials/using-jekyll-with-bundler/) should provide answers to the most common questions and explain how to get up and running quickly.
- 
-## Options for creating a new site with Jekyll
-
-`jekyll new ` installs a new Jekyll site at the path specified (relative to current directory). In this case, Jekyll will be installed in a directory called `myblog`. Here are some additional details:
-
-* To install the Jekyll site into the directory you're currently in, run `jekyll new .` If the existing directory isn't empty, you can pass the `--force` option with `jekyll new . --force`.
-* `jekyll new` automatically initiates `bundle install` to install the dependencies required. (If you don't want Bundler to install the gems, use `jekyll new myblog --skip-bundle`.)
-* By default, the Jekyll site installed by `jekyll new` uses a gem-based theme called [Minima](https://github.com/jekyll/minima). With [gem-based themes](../themes), some of the directories and files are stored in the theme-gem, hidden from your immediate view.
-* We recommend setting up Jekyll with a gem-based theme but if you want to start with a blank slate, use `jekyll new myblog --blank`
-* To learn about other parameters you can include with `jekyll new`, type `jekyll new --help`.
-
-When in doubt, use the help command to remind you of all available options and usage, it also works with the new, build and serve subcommands, e.g. jekyll help new or jekyll help build.
-{: .note .info }
-
-## Next steps
-
-Building a Jekyll site with the default theme is just the first step. The real magic happens when you start creating blog posts, using the front matter to control templates and layouts, and taking advantage of all the awesome configuration options Jekyll makes available.
diff --git a/docs/_docs/resources.md b/docs/_docs/resources.md
index d345f0e1600..982a8bae46d 100644
--- a/docs/_docs/resources.md
+++ b/docs/_docs/resources.md
@@ -56,7 +56,5 @@ Jekyll's growing use is producing a wide variety of tutorials, frameworks, exten
 
   > "Jekyll is everything that I ever wanted in a blogging engine. Really. It isn't perfect, but what's excellent about it is that if there's something wrong, I know exactly how it works and how to fix it. It runs on the your machine only, and is essentially an added"build" step between you and the browser. I coded this entire site in TextMate using standard HTML5 and CSS3, and then at the end I added just a few little variables to the markup. Presto-chango, my site is built and I am at peace with the world."
 
-- [Generating a Tag Cloud in Jekyll](http://www.justkez.com/generating-a-tag-cloud-in-jekyll/) – A guide to implementing a tag cloud and per-tag content pages using Jekyll.
-
 - A way to [extend Jekyll](https://github.com/rfelix/jekyll_ext) without forking and modifying the Jekyll gem codebase and some [portable Jekyll extensions](https://wiki.github.com/rfelix/jekyll_ext/extensions) that can be reused and shared.
 - [Using your Rails layouts in Jekyll](http://numbers.brighterplanet.com/2010/08/09/sharing-rails-views-with-jekyll)
diff --git a/docs/_docs/ruby-101.md b/docs/_docs/ruby-101.md
new file mode 100644
index 00000000000..85c1cc11e34
--- /dev/null
+++ b/docs/_docs/ruby-101.md
@@ -0,0 +1,45 @@
+---
+title: Ruby 101
+permalink: /docs/ruby-101/
+---
+
+Jekyll is written in Ruby. If you're new to Ruby, this page is to help you get
+up to speed with some of the terminology.
+
+## Gems
+
+A gem is code you can include in Ruby projects. It allows you to package up functionality and share it across other projects or with other people. Gems can perform functionality such as:
+
+* Converting a Ruby object to JSON
+* Pagination
+* Interacting with APIs such as Github
+* Jekyll itself is a gem as well as many Jekyll plugins including
+[jekyll-feed](https://github.com/jekyll/jekyll-feed),
+[jekyll-seo-tag](https://github.com/jekyll/jekyll-seo-tag) and
+[jekyll-archives](https://github.com/jekyll/jekyll-archives).
+
+
+## Gemfile
+
+A `Gemfile` is a list of gems required for your site. For a simple Jekyll site it might look something like this:
+
+```ruby
+source 'https://rubygems.org'
+
+gem 'jekyll'
+
+group :jekyll_plugins do
+  gem 'jekyll-feed'
+  gem 'jekyll-seo-tag'
+end
+```
+
+## Bundler
+
+Bundler installs the gems in your `Gemfile`. It's not a requirement for you to use a `Gemfile` and `bundler` however it's highly recommended as it ensures you're running the same version of Jekyll and Jekyll plugins across different environments.
+
+`gem install bundler` installs [Bundler](https://rubygems.org/gems/bundler). You only need to install it once — not every time you create a new Jekyll project. Here are some additional details:
+
+If you're using a `Gemfile` you would first run `bundle install` to install the gems, then `bundle exec jekyll serve` to build your site. This guarantees you're using the gem versions set in the `Gemfile`. If you're not using a `Gemfile` you can just run `jekyll serve`.
+
+For more information about how to use Bundler in your Jekyll project, this [tutorial](/tutorials/using-jekyll-with-bundler/) should provide answers to the most common questions and explain how to get up and running quickly.
diff --git a/docs/_docs/sites.md b/docs/_docs/sites.md
deleted file mode 100644
index f01a7a77f15..00000000000
--- a/docs/_docs/sites.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: Sites using Jekyll
-permalink: /docs/sites/
----
-
-It’s interesting to see what designs and features others have come up
-with. Below are some Jekyll-powered blogs which were hand-picked for
-learning purposes.
-
-- [Tom Preston-Werner](http://tom.preston-werner.com/)
-    ([source](https://github.com/mojombo/mojombo.github.io))
-- [GitHub Official Teaching Materials](https://services.github.com/training/)
-    ([source](https://github.com/github/training-kit))
-- [Rasmus Andersson](https://rsms.me/)
-    ([source](https://github.com/rsms/rsms.github.com))
-- [MvvmCross](https://mvvmcross.github.io/MvvmCross/)
-    ([source](https://github.com/MvvmCross/MvvmCross/tree/master/docs))
-
-If you would like to explore more examples, you can find a list of sites
-and their sources on the ["Sites" page in the Jekyll wiki][jekyll-sites].
-
-[jekyll-sites]: {{ site.repository }}/wiki/Sites
diff --git a/docs/_docs/static_files.md b/docs/_docs/static_files.md
index 7b712c13505..2e96527b9ac 100644
--- a/docs/_docs/static_files.md
+++ b/docs/_docs/static_files.md
@@ -2,11 +2,7 @@
 title: Static Files
 permalink: /docs/static-files/
 ---
-
-In addition to renderable and convertible content, we also have **static
-files**.
-
-A static file is a file that does not contain any YAML front matter. These
+A static file is a file that does not contain any front matter. These
 include images, PDFs, and other un-rendered content.
 
 They're accessible in Liquid via `site.static_files` and contain the
@@ -70,7 +66,7 @@ Note that in the above table, `file` can be anything. It's simply an arbitrarily
 
 ## 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](/docs/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:
 
diff --git a/docs/_docs/step-by-step/01-setup.md b/docs/_docs/step-by-step/01-setup.md
new file mode 100644
index 00000000000..8b87645f8e0
--- /dev/null
+++ b/docs/_docs/step-by-step/01-setup.md
@@ -0,0 +1,73 @@
+---
+layout: step
+title: Setup
+menu_name: Step by Step Tutorial
+position: 1
+---
+Welcome to Jekyll's step-by-step tutorial. The goal of this tutorial is to take
+you from having some front end web development experience to building your
+first Jekyll site. Let's get into it!
+
+## Installation
+
+Jekyll is a Ruby program so you need to install Ruby on your machine to begin
+with. Head over to the [install guide](/docs/installation/) and follow the
+instructions for your operating system.
+
+With Ruby setup you can install Jekyll by running the following in your
+terminal:
+
+```
+gem install jekyll bundler
+```
+
+## Create a site
+
+It's time to create a site! Create a new directory for your site, you can name
+it whatever you'd like. Through the rest of this tutorial we'll refer to this
+directory as “root”.
+
+If you're feeling adventurous, you can also initialize a Git repository here.
+One of the great things about Jekyll is there's no database. All content and
+site structure are files which a Git repository can version. Using a repository
+is completely optional but it's a great habit to get into. You can learn more
+about using Git by reading through the
+[Git Handbook](https://guides.github.com/introduction/git-handbook/).
+
+Let's add your first file. Create `index.html` in the root with the following
+content:
+
+```html
+
+
+  
+    
+    Home
+  
+  
+    
    Hello World!
    
+  
+
+```
+
+## Build
+
+Jekyll is a static site generator so we need Jekyll to build the site
+before we can view it. There's two commands you can run in the root of your site
+to build it:
+
+* `jekyll build` - Builds the site and outputs a static site to a directory
+called `_site`.
+* `jekyll serve` - Does the same thing except it rebuilds any time you make
+a change and runs a local web server at `http://localhost:4000`.
+
+When you're developing a site you'll use `jekyll serve` as it updates with any
+changes you make.
+
+Run `jekyll serve` and go to
+http://localhost:4000 in
+your browser. You should see "Hello World!".
+
+Well, you might be thinking what's the point in this? Jekyll just copied an
+HTML file from one place to another. Well patience young grasshopper, there's
+still much to learn!
diff --git a/docs/_docs/step-by-step/02-liquid.md b/docs/_docs/step-by-step/02-liquid.md
new file mode 100644
index 00000000000..56051b4c78a
--- /dev/null
+++ b/docs/_docs/step-by-step/02-liquid.md
@@ -0,0 +1,70 @@
+---
+layout: step
+title: Liquid
+position: 2
+---
+Liquid is where Jekyll starts to get more interesting. Liquid is a templating
+language which has three main parts: [objects](#objects), [tags](#tags) and
+[filters](#filters).
+
+
+## Objects
+
+Objects tell Liquid where to output content. They're denoted by double curly
+braces: {% raw %}`{{`{% endraw %} and {% raw %}`}}`{% endraw %}. For example:
+
+{% raw %}
+```liquid
+{{ page.title }}
+```  
+{% endraw %}
+
+Outputs a variable called `page.title` on the page.
+
+## Tags
+
+Tags create the logic and control flow for templates. They are denoted by curly
+braces and percent signs: {% raw %}`{%`{% endraw %} and
+{% raw %}`%}`{% endraw %}. For example:
+
+{% raw %}
+```liquid
+{% if page.show_sidebar %}
+  
    
+    sidebar content
+  
    
+{% endif %}
+```  
+{% endraw %}
+
+Outputs the sidebar if `page.show_sidebar` is true. You can learn more about the
+tags available to Jekyll [here](/docs/liquid/tags/).
+
+## Filters
+
+Filters change the output of a Liquid object. They are used within an output
+and are separated by a `|`. For example:
+
+{% raw %}
+```liquid
+{{ "hi" | capitalize }}
+```  
+{% endraw %}
+
+Outputs `Hi`. You can learn more about the filters available to Jekyll
+[here](/docs/liquid/filters/).
+
+## Use Liquid
+
+Now it's your turn, change the Hello World! on your page to output as lowercase:
+
+{% raw %}
+```liquid
+...
+
    {{ "Hello World!" | downcase }}
    
+...
+```  
+{% endraw %}
+
+It may not seem like it now, but much of Jekyll's power comes from combining
+Liquid with other features. Let's keep going.
diff --git a/docs/_docs/step-by-step/03-front-matter.md b/docs/_docs/step-by-step/03-front-matter.md
new file mode 100644
index 00000000000..22fb87ac501
--- /dev/null
+++ b/docs/_docs/step-by-step/03-front-matter.md
@@ -0,0 +1,49 @@
+---
+layout: step
+title: Front Matter
+position: 3
+---
+Front matter is a snippet of [YAML](http://yaml.org/) which sits between two
+triple-dashed lines at the top of a file. Front matter is used to set variables
+for the page, for example:
+
+```liquid
+---
+my_number: 5
+---
+```
+
+Front matter variables are available in Liquid under the `page` variable. For
+example to output the variable above you would use:
+
+{% raw %}
+```liquid
+{{ page.my_number }}
+```
+{% endraw %}
+
+## Use front matter
+
+Let's change the `` on your site to populate using front matter:
+
+{% raw %}
+```html
+---
+title: Home
+---
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>{{ page.title }}
+  
+  
+    
    {{ "Hello World!" | downcase }}
    
+  
+
+```
+{% endraw %}
+
+You may still be wondering why you'd output it this way as it takes
+more source code than raw HTML. In this next step, you'll see why we've
+been doing this.
diff --git a/docs/_docs/step-by-step/04-layouts.md b/docs/_docs/step-by-step/04-layouts.md
new file mode 100644
index 00000000000..cb7ecd9e679
--- /dev/null
+++ b/docs/_docs/step-by-step/04-layouts.md
@@ -0,0 +1,89 @@
+---
+layout: step
+title: Layouts
+position: 4
+---
+Websites typically have more than one page and this website is no different.
+
+Jekyll supports [Markdown](https://daringfireball.net/projects/markdown/syntax)
+as well as HTML for pages. Markdown is a great choice for pages with a simple
+content structure (just paragraphs, headings and images), as it's less verbose
+than raw HTML. Let's try it out on the next page.
+
+Create `about.md` in the root.
+
+For the structure you could copy `index.html` and modify it for the about page.
+The problem with doing this is duplicate code. Let's say you wanted to add a
+stylesheet to your site, you would have to go to each page and add it to the
+``. It might not sound so bad for a two page site, imagine doing it
+for 100 pages. Even simple changes will take a long time to make.
+
+## Creating a layout
+
+Using a layout is a much better choice. Layouts are templates that wrap around
+your content. They live in a directory called `_layouts`.
+
+Create your first layout at `_layouts/default.html` with the following content:
+
+{% raw %}
+```liquid
+
+
+  
+    
+    {{ page.title }}
+  
+  
+    {{ content }}
+  
+
+```
+{% endraw %}
+
+You'll notice this is almost identical to `index.html` except there's
+no front matter and the content of the page is replaced with a `content`
+variable. `content` is a special variable which has the value of the rendered
+content of the page its called on.
+
+To have `index.html` use this layout, you can set a `layout` variable in front
+matter. The layout wraps around the content of the page so all you need in
+`index.html` is:
+
+{% raw %}
+```html
+---
+layout: default
+title: Home
+---
+
    {{ "Hello World!" | downcase }}
    
+```
+{% endraw %}
+
+After doing this, the output will be exactly the same as before. Note that you
+can access the `page` front matter from the layout. In this case `title` is
+set in the index page's front matter but is output in the layout.
+
+## About page
+
+Back to the about page, instead of copying from `index.html`, you can use the
+layout.
+
+Add the following to `about.md`:
+
+{% raw %}
+```html
+---
+layout: default
+title: About
+---
+# About page
+
+This page tells you a little bit about me.
+```
+{% endraw %}
+
+Open http://localhost:4000/about.html
+in your browser and view your new page.
+
+Congratulations, you now have a two page website! But how do you
+navigate from one page to another? Keep reading to find out.
diff --git a/docs/_docs/step-by-step/05-includes.md b/docs/_docs/step-by-step/05-includes.md
new file mode 100644
index 00000000000..9aab5f6eb6c
--- /dev/null
+++ b/docs/_docs/step-by-step/05-includes.md
@@ -0,0 +1,83 @@
+---
+layout: step
+title: Includes
+position: 5
+---
+The site is coming together however, there's no way to navigate between
+pages. Let's fix that.
+
+Navigation should be on every page so adding it to your layout is the correct
+place to do this. Instead of adding it directly to the layout, let's use this
+as an opportunity to learn about includes.
+
+## Include tag
+
+The `include` tag allows you to include content from another file stored
+in an `_includes` folder. Includes are useful for having a single source for
+source code that repeats around the site or for improving the readability.
+
+Navigation source code can get complex so sometimes it's nice to move it into an
+include.  
+
+## Include usage
+
+Create a file for the navigation at `_includes/navigation.html` with the
+following content:
+
+```liquid
+
+```
+
+Try using the include tag to add the navigation to `_layouts/default.html`:
+
+{% raw %}
+```liquid
+
+
+  
+    
+    {{ page.title }}
+  
+  
+    {% include navigation.html %}
+    {{ content }}
+  
+
+```
+{% endraw %}
+
+Open http://localhost:4000
+in your browser and try switching between the pages.
+
+## Current page highlighting
+
+Let's take this a step further and highlight the current page in the navigation.
+
+`_includes/navigation.html` needs to know the URL of the page it's inserted into
+so it can add styling. Jekyll has useful [variables](/docs/variables/) available
+one of which is `page.url`.
+
+Using `page.url` you can check if each link is the current page and color it red
+if true:
+
+{% raw %}
+```liquid
+
+```
+{% endraw %}
+
+Take a look at http://localhost:4000
+and see your red link for the current page.
+
+There's still a lot of repetition here if you wanted to add a new item to the
+navigation or change the highlight color. In the next step we'll address this.
diff --git a/docs/_docs/step-by-step/06-data-files.md b/docs/_docs/step-by-step/06-data-files.md
new file mode 100644
index 00000000000..d87a40c99b3
--- /dev/null
+++ b/docs/_docs/step-by-step/06-data-files.md
@@ -0,0 +1,48 @@
+---
+layout: step
+title: Data Files
+position: 6
+---
+Jekyll supports loading data from YAML, JSON, and CSV files located in a `_data`
+directory. Data files are a great way to separate content from source code to
+make the site easier to maintain.
+
+In this step you'll store the contents of the navigation in a data file
+and then iterate over it in the navigation include.
+
+## Data file usage
+
+[YAML](http://yaml.org/) is a format that's common in the Ruby ecosystem. You'll
+use it to store an array of navigation items each with a name and link.
+
+Create a data file for the navigation at `_data/navigation.yml` with the
+following:
+
+```yaml
+- name: Home
+  link: /
+- name: About
+  link: /about.html
+```
+
+Jekyll makes this data file available to you at `site.data.navigation`. Instead
+of outputting each link in `_includes/navigation.html`, now you can iterate over
+the data file instead:
+
+{% raw %}
+```liquid
+
+```
+{% endraw %}
+
+The output will be exactly the same. The difference is you’ve made it easier to
+add new navigation items and change the HTML structure.
+
+What good is a site without CSS, JS and images? Let’s look at how to handle
+assets in Jekyll.
diff --git a/docs/_docs/step-by-step/07-assets.md b/docs/_docs/step-by-step/07-assets.md
new file mode 100644
index 00000000000..a0248d6191c
--- /dev/null
+++ b/docs/_docs/step-by-step/07-assets.md
@@ -0,0 +1,89 @@
+---
+layout: step
+title: Assets
+position: 7
+---
+Using CSS, JS, images and other assets is straight forward with Jekyll. Place
+them in your site folder and they’ll copy across to the built site.
+
+Jekyll sites often use this structure to keep assets organized:
+
+```sh
+.
+├── assets
+|   ├── css
+|   ├── images
+|   └── js
+...
+```
+
+## Sass
+
+The inline styles used in `_includes/navigation.html` is not a best practice,
+let's style the current page with a class instead.
+
+{% raw %}
+```liquid
+
+```
+{% endraw %}
+
+You could use a standard CSS file for styling, we're going to take it a step
+further by using [Sass](https://sass-lang.com/). Sass is a fantastic extension
+to CSS baked right into Jekyll.
+
+First create a Sass file at `/assets/css/styles.scss` with the following
+content:
+
+{% raw %}
+```css
+---
+---
+@import "main";
+```
+{% endraw %}
+
+The empty front matter at the top tells Jekyll it needs to process the file. The
+`@import "main"` tells Sass to look for a file called `main.scss` in the sass
+directory (`_sass/` by default).
+
+At this stage you'll just have a main css file. For larger projects, this is a
+great way to keep your CSS organized.
+
+Create `_sass/main.scss` with the following content:
+
+```sass
+.current {
+  color: green
+}
+```
+
+You'll need to reference the stylesheet in your layout.
+
+Open `_layouts/default.html` and add the stylesheet to the ``:
+
+{% raw %}
+```liquid
+
+
+  
+    
+    {{ page.title }}
+    
+  
+  
+    {% include navigation.html %}
+    {{ content }}
+  
+
+```
+{% endraw %}
+
+Load up http://localhost:4000
+and check the active link in the navigation is green.
+
+Next we're looking at one of Jekyll's most popular features, blogging.
diff --git a/docs/_docs/step-by-step/08-blogging.md b/docs/_docs/step-by-step/08-blogging.md
new file mode 100644
index 00000000000..dfcb3dc0ea2
--- /dev/null
+++ b/docs/_docs/step-by-step/08-blogging.md
@@ -0,0 +1,145 @@
+---
+layout: step
+title: Blogging
+position: 8
+---
+You might be wondering how you can have a blog without a database. In true
+Jekyll style, blogging is powered by text files and is easy to set up.
+
+## Posts
+
+Blog posts live in a folder called `_posts`. The filename for posts have a
+special format: the publish date, then a title, followed by an extension.
+
+Create your first post at `_posts/2018-08-20-bananas.md` with the
+following content:
+
+```markdown
+---
+layout: post
+author: jill
+---
+A banana is an edible fruit – botanically a berry – produced by several kinds
+of large herbaceous flowering plants in the genus Musa.
+
+In some countries, bananas used for cooking may be called "plantains",
+distinguishing them from dessert bananas. The fruit is variable in size, color,
+and firmness, but is usually elongated and curved, with soft flesh rich in
+starch covered with a rind, which may be green, yellow, red, purple, or brown
+when ripe.
+```
+
+This is like the `about.md` you created before except it has an author and
+a different layout. `author` is a custom variable, it's not required and could
+have been named something like `creator`.
+
+## Layout
+
+The `post` layout doesn't exist so you'll need to create it at
+`_layouts/post.html` with the following content:
+
+{% raw %}
+```html
+---
+layout: default
+---
+
    {{ page.title }}
    
+
    {{ page.date | date_to_string }} - {{ page.author }}
    
+
+{{ content }}
+```
+{% endraw %}
+
+This is an example of layout inheritance. The post layout outputs the title,
+date, author and content body which is wrapped by the default layout.
+
+Also note the `date_to_string` filter, this formats a date into a nicer format.
+
+## List posts
+
+There's currently no way to navigate to the blog post. Typically a blog has a
+page which lists all the posts, let's do that next.
+
+Jekyll makes posts available at `site.posts`.
+
+Create `blog.html` with the following content:
+
+{% raw %}
+```html
+---
+layout: default
+title: Blog
+---
+
    Latest Posts
    
+
+
      
+  {% for post in site.posts %}
+    
    • 
+      
      {{ post.title }}
      
+      
      {{ post.excerpt }}
      
+    
      • 
+  {% endfor %}
+
    
+```
+{% endraw %}
+
+There's a few things to note with this code:
+
+* `post.url` is automatically set by Jekyll to the output path of the post
+* `post.title` is pulled from the post filename and can be overridden by
+setting `title` in front matter
+* `post.excerpt` is the first paragraph of content by default
+
+You also need a way to navigate to this page through the main navigation. Open
+`_data/navigation.yml` and add an entry for the blog page:
+
+```yaml
+- name: Home
+  link: /
+- name: About
+  link: /about.html
+- name: Blog
+  link: /blog.html
+```
+
+## More posts
+
+A blog isn't very exciting with a single post. Add a few more:
+
+`_posts/2018-08-21-apples.md`:
+
+```markdown
+---
+layout: post
+author: jill
+---
+An apple is a sweet, edible fruit produced by an apple tree.
+
+Apple trees are cultivated worldwide, and are the most widely grown species in
+the genus Malus. The tree originated in Central Asia, where its wild ancestor,
+Malus sieversii, is still found today. Apples have been grown for thousands of
+years in Asia and Europe, and were brought to North America by European
+colonists.
+```
+
+`_posts/2018-08-22-kiwifruit.md`:
+
+```markdown
+---
+layout: post
+author: ted
+---
+Kiwifruit (often abbreviated as kiwi), or Chinese gooseberry is the edible
+berry of several species of woody vines in the genus Actinidia.
+
+The most common cultivar group of kiwifruit is oval, about the size of a large
+hen's egg (5–8 cm (2.0–3.1 in) in length and 4.5–5.5 cm (1.8–2.2 in) in
+diameter). It has a fibrous, dull greenish-brown skin and bright green or
+golden flesh with rows of tiny, black, edible seeds. The fruit has a soft
+texture, with a sweet and unique flavor.
+```
+
+Open http://localhost:4000 and have
+a look through your blog posts.
+
+Next we'll focus on creating a page for each post author.
diff --git a/docs/_docs/step-by-step/09-collections.md b/docs/_docs/step-by-step/09-collections.md
new file mode 100644
index 00000000000..149b852899f
--- /dev/null
+++ b/docs/_docs/step-by-step/09-collections.md
@@ -0,0 +1,251 @@
+---
+layout: step
+title: Collections
+position: 9
+---
+Let's look at fleshing out authors so each author has their own page with a
+blurb and the posts they've published.
+
+To do this you'll use collections. Collections are similar to posts except the
+content doesn't have to be grouped by date.
+
+## Configuration
+
+To set up a collection you need to tell Jekyll about it. Jekyll configuration
+happens in a file called `_config.yml` (by default).
+
+Create `_config.yml` in the root with the following:
+
+```yaml
+collections:
+  authors:
+```
+
+## Add authors
+
+Documents (the items in a collection) live in a folder in the root of the site
+named  `_*collection_name*`. In this case, `_authors`.
+
+Create a document for each author:
+
+`_authors/jill.md`:
+
+```markdown
+---
+short_name: jill
+name: Jill Smith
+position: Chief Editor
+---
+Jill is an avid fruit grower based in the south of France.
+```
+
+`_authors/ted.md`:
+
+```markdown
+---
+short_name: ted
+name: Ted Doe
+position: Writer
+---
+Ted has been eating fruit since he was baby.
+```
+
+## Staff page
+
+Let's add a page which lists all the authors on the site. Jekyll makes the
+collection available at `site.authors`.
+
+Create `staff.html` and iterate over `site.authors` to output all the staff:
+
+{% raw %}
+```html
+---
+layout: default
+title: Staff
+---
+
    Staff
    
+
+
      
+  {% for author in site.authors %}
+    
    • 
+      
      {{ author.name }}
      
+      
      {{ author.position }}
      
+      
      {{ author.content | markdownify }}
      
+    
      • 
+  {% endfor %}
+
    
+```
+{% endraw %}
+
+Since the content is markdown, you need to run it through the
+`markdownify` filter. This happens automatically when outputting using
+{% raw %}`{{ content }}`{% endraw %} in a layout.
+
+You also need a way to navigate to this page through the main navigation. Open
+`_data/navigation.yml` and add an entry for the staff page:
+
+```yaml
+- name: Home
+  link: /
+- name: About
+  link: /about.html
+- name: Blog
+  link: /blog.html
+- name: Staff
+  link: /staff.html
+```
+
+## Output a page
+
+By default, collections do not output a page for documents. In this case we
+want each author to have their own page so let's tweak the collection
+configuration.
+
+Open `_config.yml` and add `output: true` to the author collection
+configuration:
+
+```yaml
+collections:
+  authors:
+    output: true
+```
+
+You can link to the output page using `author.url`.
+
+Add the link to the `staff.html` page:
+
+{% raw %}
+```html
+---
+layout: default
+---
+
    Staff
    
+
+
      
+  {% for author in site.authors %}
+    
    • 
+      
      {{ author.name }}
      
+      
      {{ author.position }}
      
+      
      {{ author.content | markdownify }}
      
+    
      • 
+  {% endfor %}
+
    
+```
+{% endraw %}
+
+Just like posts you'll need to create a layout for authors.
+
+Create `_layouts/author.html` with the following content:
+
+{% raw %}
+```html
+---
+layout: default
+---
+
    {{ page.name }}
    
+
    {{ page.position }}
    
+
+{{ content }}
+```
+{% endraw %}
+
+## Front matter defaults
+
+Now you need to configure the author documents to use the `author` layout. You
+could do this in the front matter like we have previously but that's getting
+repetitive.
+
+What you really want is all posts to automatically have the post
+layout, authors to have author and everything else to use the default.
+
+You can achieve this by using [front matter defaults](/docs/configuration/front-matter-defaults/)
+in `_config.yml`. You set a scope of what the default applies to, then the
+default front matter you'd like.
+
+Add defaults for layouts to your `_config.yml`,
+
+```yaml
+collections:
+  authors:
+    output: true
+
+defaults:
+  - scope:
+      path: ""
+      type: "authors"
+    values:
+      layout: "author"
+  - scope:
+      path: ""
+      type: "posts"
+    values:
+      layout: "post"
+  - scope:
+      path: ""
+    values:
+      layout: "default"
+```
+
+Now you can remove layout the front matter of all pages and posts. Note that
+any time you update `_config.yml` you'll need to restart Jekyll for the changes
+to take affect.
+
+## List author's posts
+
+Let's list the posts an author has published on their page. To do
+this you need to match the author `short_name` to the post `author`. You
+use this to filter the posts by author.
+
+Iterate over this filtered list in `_layouts/author.html` to output the
+author's posts:
+
+{% raw %}
+```html
+---
+layout: default
+---
+
    {{ page.name }}
    
+
    {{ page.position }}
    
+
+{{ content }}
+
+
    Posts
    
+
      
+  {% assign filtered_posts = site.posts | where: 'author', page.short_name %}
+  {% for post in filtered_posts %}
+    
    • {{ post.title }}
      • 
+  {% endfor %}
+
    
+```
+{% endraw %}
+
+## Link to authors page
+
+The posts have a reference to the author so let's link it to the author's page.
+You can do this using a similar filtering technique in `_layouts/post.html`:
+
+{% raw %}
+```html
+---
+layout: default
+---
+
    {{ page.title }}
    
+
+
    
+  {{ page.date | date_to_string }}
+  {% assign author = site.authors | where: 'short_name', page.author | first %}
+  {% if author %}
+    - {{ author.name }}
+  {% endif %}
+
    
+
+{{ content }}
+```
+{% endraw %}
+
+Open up http://localhost:4000 and
+have a look at the staff page and the author links on posts to check everything
+is linked together correctly.
+
+In the next and final step of this tutorial, we'll add polish to the site and
+get it ready for a production deployment.
diff --git a/docs/_docs/step-by-step/10-deployment.md b/docs/_docs/step-by-step/10-deployment.md
new file mode 100644
index 00000000000..343e07a3d4a
--- /dev/null
+++ b/docs/_docs/step-by-step/10-deployment.md
@@ -0,0 +1,140 @@
+---
+layout: step
+title: Deployment
+position: 10
+---
+In this final step we'll get the site ready for production.
+
+## Gemfile
+
+It's good practice to have a [Gemfile](/docs/ruby-101/#gemfile) for your site.
+This ensures the version of Jekyll and other gems remains consistent across
+different environments.
+
+Create `Gemfile` in the root with the following:
+
+```
+source 'https://rubygems.org'
+
+gem 'jekyll'
+```
+
+Then run `bundle install` in your terminal. This installs the gems and
+creates `Gemfile.lock` which locks the current gem versions for a future
+`bundle install`. If you ever want to update your gem versions you can run
+`bundle update`.
+
+When using a `Gemfile`, you'll run commands like `jekyll serve` with
+`bundle exec` prefixed. So the full command is:
+
+```bash
+bundle exec jekyll serve
+```
+
+This restricts you Ruby environment to only use gems set in your `Gemfile`.
+
+## Plugins
+
+Jekyll plugins allow you to create custom generated content specific to your
+site. There's many [plugins](/docs/plugins/) available or you can even
+write your own.
+
+There's three official plugins which are useful on almost any Jekyll site:
+
+* [jekyll-sitemap](https://github.com/jekyll/jekyll-sitemap) - Creates a sitemap
+file to help search engines index content
+* [jekyll-feed](https://github.com/jekyll/jekyll-feed) - Creates an RSS feed for
+your posts
+* [jekyll-seo-tag](https://github.com/jekyll/jekyll-seo-tag) - Adds meta tags to help
+with SEO
+
+To use these first you need to add them to your `Gemfile`. If you put them
+in a `jekyll_plugins` group they'll automatically be required into Jekyll:
+
+```
+source 'https://rubygems.org'
+
+gem 'jekyll'
+
+group :jekyll_plugins do
+  gem 'jekyll-sitemap'
+  gem 'jekyll-feed'
+  gem 'jekyll-seo-tag'
+end
+```
+
+Now install them by running a `bundle update`.
+
+`jekyll-sitemap` doesn't need any setup, it will create your sitemap on build.
+
+For `jekyll-feed` and `jekyll-seo-tag` you need to add tags to
+`_layouts/default.html`:
+
+{% raw %}
+```liquid
+
+
+  
+    
+    {{ page.title }}
+    
+    {% feed_meta %}
+    {% seo %}
+  
+  
+    {% include navigation.html %}
+    {{ content }}
+  
+
+```
+{% endraw %}
+
+Restart your Jekyll server and check these tags are added to the ``.
+
+## Environments
+
+Sometimes you might want to output something in production but not
+in development. Analytics scripts are the most common example of this.
+
+To do this you can use [environments](/docs/configuration/environments/). You
+can set the environment by using the `JEKYLL_ENV` environment variable when
+running a command. For example:
+
+```bash
+JEKYLL_ENV=production bundle exec jekyll build
+```
+
+By default `JEKYLL_ENV` is development. The `JEKYLL_ENV` is available to you
+in liquid using `jekyll.environment`. So to only output the analytics script
+on production you would do the following:
+
+{% raw %}
+```liquid
+{% if jekyll.environment == "production" %}
+  
+{% endif %}
+```
+{% endraw %}
+
+## Deployment
+
+The final step is to get the site onto a production server. The most basic way
+to do this is to run a production build:
+
+```bash
+JEKYLL_ENV=production bundle exec jekyll build
+```
+
+And copy the contents of `_site` to your server.
+
+A better way is to automate this process using a [CI](/docs/deployment/automated/)
+or [3rd party](/docs/deployment/third-party/).
+
+## Wrap up
+
+That brings us to the end of this step-by-step tutorial and the beginning of
+your Jekyll journey!
+
+* Come say hi to the [community forums](https://talk.jekyllrb.com)
+* Help us make Jekyll better by [contributing](/docs/contributing/)
+* Keep building Jekyll sites!
diff --git a/docs/_docs/structure.md b/docs/_docs/structure.md
index f8a19059e49..b94193ad4d6 100644
--- a/docs/_docs/structure.md
+++ b/docs/_docs/structure.md
@@ -1,17 +1,7 @@
 ---
-title: Directory structure
+title: Directory Structure
 permalink: /docs/structure/
 ---
-
-Jekyll is, at its core, a text transformation engine. The concept behind the
-system is this: you give it text written in your favorite markup language, be
-that Markdown, [Textile](https://github.com/jekyll/jekyll-textile-converter)
-, or just plain HTML, and it churns that through a layout
-or a series of layout files. Throughout that process you can tweak how you want
-the site URLs to look, what data gets displayed in the layout, and more. This
-is all done through editing text files; the static web site is the final
-product.
-
 A basic Jekyll site usually looks something like this:
 
 ```sh
@@ -36,13 +26,13 @@ A basic Jekyll site usually looks something like this:
 |   └── _layout.scss
 ├── _site
 ├── .jekyll-metadata
-└── index.html # can also be an 'index.md' with valid YAML Frontmatter
+└── index.html # can also be an 'index.md' with valid front matter
 ```
 
 
    
   
    Directory structure of Jekyll sites using gem-based themes
    
   
    
-    Starting Jekyll 3.2, a new Jekyll project bootstrapped with jekyll new uses gem-based themes to define the look of the site. This results in a lighter default directory structure : _layouts, _includes and _sass are stored in the theme-gem, by default.
+    Starting Jekyll 3.2, a new Jekyll project bootstrapped with jekyll new uses gem-based themes to define the look of the site. This results in a lighter default directory structure : _layouts, _includes and _sass are stored in the theme-gem, by default.
   
    
   
    
   
    
@@ -67,7 +57,7 @@ An overview of what each of these does:
       
       
         
    
-          Stores configuration data. Many of
+          Stores configuration data. Many of
           these options can be specified from the command line executable but
           it’s easier to specify them here so you don’t have to remember them.
         
    
@@ -80,7 +70,7 @@ An overview of what each of these does:
       
         
    
           Drafts are unpublished posts. The format of these files is without a
-          date: title.MARKUP. Learn how to 
+          date: title.MARKUP. Learn how to 
           work with drafts.
         
    
       
@@ -107,7 +97,7 @@ An overview of what each of these does:
         
    
           These are the templates that wrap posts. Layouts are chosen on a
           post-by-post basis in the
-          YAML Front Matter,
+          front matter,
           which is described in the next section. The liquid tag
           {% raw %}{{ content }}{% endraw %}
           is used to inject content into the web page.
@@ -123,7 +113,7 @@ An overview of what each of these does:
           Your dynamic content, so to speak. The naming convention of these
           files is important, and must follow the format:
           YEAR-MONTH-DAY-title.MARKUP.
-          The permalinks can be customized for
+          The permalinks can be customized for
           each post, but the date and markup language are determined solely by
           the file name.
         
    
@@ -190,8 +180,8 @@ An overview of what each of these does:
       
       
         
    
-          Provided that the file has a YAML Front
-          Matter section, it will be transformed by Jekyll. The same will
+          Provided that the file has a front
+          matter section, it will be transformed by Jekyll. The same will
           happen for any .html, .markdown,
           .md, or .textile file in your site’s root
           directory or directories not listed above.
@@ -207,7 +197,7 @@ An overview of what each of these does:
           Every other directory and file except for those listed above—such as
           css and images folders,
           favicon.ico files, and so forth—will be copied verbatim
-          to the generated site. There are plenty of sites
+          to the generated site. There are plenty of sites
           already using Jekyll if you’re curious to see how they’re laid
           out.
         
    
diff --git a/docs/_docs/support.md b/docs/_docs/support.md
index d22331879e1..4baa421ea69 100644
--- a/docs/_docs/support.md
+++ b/docs/_docs/support.md
@@ -15,10 +15,3 @@ If you're looking for support for Jekyll, there are a lot of options:
 * Chat with Jekyllers — 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 — 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/docs/_docs/themes.md b/docs/_docs/themes.md
index 460686157d6..c687b6253de 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -7,7 +7,7 @@ Jekyll has an extensive theme system that allows you to leverage community-maint
 
 ## Understanding gem-based themes
 
-When you [create a new Jekyll site](/docs/quickstart) (by running the `jekyll new ` command), Jekyll installs a site that uses a gem-based theme called [Minima](https://github.com/jekyll/minima).
+When you [create a new Jekyll site](/docs/) (by running the `jekyll new ` command), Jekyll installs a site that uses a gem-based theme called [Minima](https://github.com/jekyll/minima).
 
 With gem-based themes, some of the site's directories (such as the `assets`, `_layouts`, `_includes`, and `_sass` directories) are stored in the theme's gem, hidden from your immediate view. Yet all of the necessary directories will be read and processed during Jekyll's build process.
 
@@ -238,14 +238,14 @@ Add your template files in the corresponding folders. Then complete the `.gemspe
 
 Theme layouts and includes work just like they work in any Jekyll site. Place layouts in your theme's `/_layouts` folder, and place includes in your themes `/_includes` folder.
 
-For example, if your theme has a `/_layouts/page.html` file, and a page has `layout: page` in its YAML front matter, Jekyll will first look to the site's `_layouts` folder for the `page` layout, and if none exists, will use your theme's `page` layout.
+For example, if your theme has a `/_layouts/page.html` file, and a page has `layout: page` in its front matter, Jekyll will first look to the site's `_layouts` folder for the `page` layout, and if none exists, will use your theme's `page` layout.
 
 ### Assets
 
 Any file in `/assets` will be copied over to the user's site upon build unless they have a file with the same relative path. You can ship any kind of asset here: SCSS, an image, a webfont, etc. These files behave like pages and static files in Jekyll:
 
-- If the file has [YAML front matter](/docs/frontmatter/) at the top, it will be rendered.
-- If the file does not have YAML front matter, it will simply be copied over into the resulting site.
+- If the file has [front matter](/docs/front-matter/) at the top, it will be rendered.
+- If the file does not have front matter, it will simply be copied over into the resulting site.
 
 This allows theme creators to ship a default `/assets/styles.scss` file which their layouts can depend on as `/assets/styles.css`.
 
diff --git a/docs/_docs/troubleshooting.md b/docs/_docs/troubleshooting.md
index 819241218bc..ce062aa0645 100644
--- a/docs/_docs/troubleshooting.md
+++ b/docs/_docs/troubleshooting.md
@@ -103,12 +103,12 @@ Xcode.app can interfere with the command line tools downloaded above. If
 you run into this issue, upgrade Xcode and install the upgraded Command
 Line Tools.
 
-### Running Jekyll as Non-Superuser (no sudo!) 
+### Running Jekyll as Non-Superuser (no sudo!)
 {: #no-sudo}
 
 On most flavors of Linux, macOS, and Bash on Ubuntu on Windows, it is
 possible to run Jekyll as a non-superuser and without having to install
-gems to system-wide locations by adding the following lines to the end 
+gems to system-wide locations by adding the following lines to the end
 of your `.bashrc` file:
 
 ```
@@ -118,16 +118,16 @@ export GEM_HOME=$HOME/gems
 export PATH=$HOME/gems/bin:$PATH
 ```
 
-This tells `gem` to place its gems within the user's home folder, 
-not in a system-wide location, and adds the local `jekyll` command to the 
+This tells `gem` to place its gems within the user's home folder,
+not in a system-wide location, and adds the local `jekyll` command to the
 user's `PATH` ahead of any system-wide paths.
 
 This is also useful for many shared webhosting services, where user accounts
-have only limited privileges. Adding these exports to `.bashrc` before running 
+have only limited privileges. Adding these exports to `.bashrc` before running
 `gem install jekyll bundler` allows a complete non-`sudo` install of Jekyll.
 
-To activate the new exports, either close and restart Bash, logout and 
-log back into your shell account, or run `. .bashrc` in the 
+To activate the new exports, either close and restart Bash, logout and
+log back into your shell account, or run `. .bashrc` in the
 currently-running shell.
 
 If you see the following error when running the `jekyll new` command,
@@ -239,7 +239,7 @@ http://localhost:4000/blog
 
 ## Configuration problems
 
-The order of precedence for conflicting [configuration settings](../configuration/)
+The order of precedence for conflicting [configuration settings](/docs/configuration/)
 is as follows:
 
 1. Command-line flags
@@ -257,7 +257,7 @@ specified elsewhere.
     ------------------------------------
     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.
+    does not have a valid date in 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`.
@@ -309,7 +309,7 @@ run into these errors, try setting `excerpt_separator: ""` in your
 
 If you run into an issue that a static file can't be found in your
 production environment during build since v3.2.0 you should set your
-[environment to `production`](../configuration/#specifying-a-jekyll-environment-at-build-time).
+[environment to `production`](/docs/configuration/environments/).
 The issue is caused by trying to copy a non-existing symlink.
 
 
    
diff --git a/docs/_docs/upgrading/2-to-3.md b/docs/_docs/upgrading/2-to-3.md
index bafda35ffae..7bfbce5c765 100644
--- a/docs/_docs/upgrading/2-to-3.md
+++ b/docs/_docs/upgrading/2-to-3.md
@@ -82,7 +82,7 @@ generate when running `jekyll build` or `jekyll serve`.
 Introducing: `layout`. In Jekyll 2 and below, any metadata in the layout was merged onto
 the `page` variable in Liquid. This caused a lot of confusion in the way the data was
 merged and some unexpected behaviour. In Jekyll 3, all layout data is accessible via `layout`
-in Liquid. For example, if your layout has `class: my-layout` in its YAML front matter,
+in Liquid. For example, if your layout has `class: my-layout` in its front matter,
 then the layout can access that via `{% raw %}{{ layout.class }}{% endraw %}`.
 
 ### Syntax highlighter changed
diff --git a/docs/_docs/usage.md b/docs/_docs/usage.md
index 5f4d863fb6b..97d66c3d852 100644
--- a/docs/_docs/usage.md
+++ b/docs/_docs/usage.md
@@ -1,115 +1,20 @@
 ---
-title: Basic Usage
+title:  Command Line Usage
 permalink: /docs/usage/
 ---
 
-The Jekyll gem makes a `jekyll` executable available to you in your Terminal
-window. You can use this command in a number of ways:
+The Jekyll gem makes a `jekyll` executable available to you in your terminal.
 
-```sh
-jekyll build
-# => The current folder will be generated into ./_site
+You can use this command in a number of ways:
 
-jekyll build --destination 
-# => The current folder will be generated into 
+* `jekyll new` - Creates a new Jekyll site scaffold
+* `jekyll build` or `jekyll b` - Performs a one off build your site to `./_site` (by default)
+* `jekyll serve` or `jekyll s` - Builds your site any time a source file changes and serves it locally
+* `jekyll doctor` - Outputs any deprecation or configuration issues
+* `jekyll new-theme` - Creates a new Jekyll theme scaffold
+* `jekyll clean` - Removes the generated site and metadata file
+* `jekyll help` - Shows a help message or these commands
 
-jekyll build --source  --destination 
-# => The  folder will be generated into 
+Typically you'll use `jekyll serve` while developing locally and `jekyll build` when you need to generate the site for production.
 
-jekyll build --watch
-# => The current folder will be generated into ./_site,
-#    watched for changes, and regenerated automatically.
-```
-
-## Override default development settings
-
-Default URL is set to `http://localhost:4000` in development environment. {% include docs_version_badge.html version="3.3.0" %}
-
-If you want to build for your production environment:
-
-  - Set your production URL in `_config.yml` e.g. `url: https://example.com`.
-  - Run `JEKYLL_ENV=production bundle exec jekyll build`.
-
-
    
-  
    Changes to _config.yml are not included during automatic regeneration.
    
-  
    
-    The _config.yml master configuration file contains global configurations
-    and variable definitions that are read once at execution time. Changes made to _config.yml
-    during automatic regeneration are not loaded until the next execution.
-  
    
-  
    
-    Note Data Files are included and reloaded during automatic regeneration.
-  
    
-
    
-
-
    
-  
    Destination folders are cleaned on site builds
    
-  
    
-    The contents of <destination> are automatically
-    cleaned, by default, when the site is built. Files or folders that are not
-    created by your site will be removed. Files and folders you wish to retain
-    in <destination> may be specified within the <keep_files>
-    configuration directive.
-  
    
-  
    
-    Do not use an important location for <destination>;
-    instead, use it as a staging area and copy files from there to your web server.
-  
    
-
    
-
-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
-# => A development server will run at http://localhost:4000/
-# Auto-regeneration: enabled. Use `--no-watch` to disable.
-
-jekyll serve --livereload
-# LiveReload refreshes your browser after a change.
-
-jekyll serve --incremental
-# Incremental will perform a partial build in order to reduce regeneration time.
-
-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.
-```
-
-```sh
-jekyll serve --no-watch
-# => Same as `jekyll serve` but will not watch for changes.
-```
-
-These are just a few of the available [configuration options](../configuration/).
-Many configuration options can either be specified as flags on the command line,
-or alternatively (and more commonly) they can be specified in a `_config.yml`
-file at the root of the source directory. Jekyll will automatically use the
-options from this file when run. For example, if you place the following lines
-in your `_config.yml` file:
-
-```yaml
-source:      _source
-destination: _deploy
-```
-
-Then the following two commands will be equivalent:
-
-```sh
-jekyll build
-jekyll build --source _source --destination _deploy
-```
-
-For more about the possible configuration options, see the
-[configuration](../configuration/) page.
-
-
    
-  
    Call for help
    
-  
    
-    The help command is always here to remind you of all available options and usage, and also works with the build, serve and new subcommands, e.g jekyll help new or jekyll help build.
-  
    
-
    
-
-If you're interested in browsing these docs on-the-go, install the
-`jekyll-docs` gem and run `jekyll docs` in your terminal.
+To change Jekyll's default build behavior have a look through the [configuration options](/docs/configuration/).
diff --git a/docs/_docs/variables.md b/docs/_docs/variables.md
index d39def6e7ff..df05cba3f24 100644
--- a/docs/_docs/variables.md
+++ b/docs/_docs/variables.md
@@ -3,11 +3,10 @@ title: Variables
 permalink: /docs/variables/
 ---
 
-Jekyll traverses your site looking for files to process. Any files with [YAML
-front matter](../frontmatter/) are subject to processing. For each of these
-files, Jekyll makes a variety of data available via the [Liquid templating
-system](https://github.com/Shopify/liquid/wiki). The
-following is a reference of the available data.
+Jekyll traverses your site looking for files to process. Any files with
+[front matter](/docs/front-matter/) are subject to processing. For each of these
+files, Jekyll makes a variety of data available via the [Liquid](/docs/liquid/).
+The following is a reference of the available data.
 
 ## Global Variables
 
@@ -33,8 +32,8 @@ following is a reference of the available data.
       
    page
    
       
    
 
-        Page specific information + the YAML front
-        matter. Custom variables set via the YAML Front Matter will be
+        Page specific information + the front
+        matter. Custom variables set via the front matter will be
         available here. See below for details.
 
       
    
@@ -43,8 +42,8 @@ following is a reference of the available data.
       
    layout
    
       
    
 
-        Layout specific information + the YAML front
-        matter. Custom variables set via the YAML Front Matter in
+        Layout specific information + the front
+        matter. Custom variables set via front matter in
         layouts will be available here.
 
       
    
@@ -294,7 +293,7 @@ following is a reference of the available data.
         directory. For example, a post at
         /work/code/_posts/2008-12-24-closures.md would have this
         field set to ['work', 'code']. These can also be specified
-        in the YAML Front Matter.
+        in the front matter.
 
       
    
     
@@ -303,7 +302,7 @@ following is a reference of the available data.
       
    
 
         The list of tags to which this post belongs. These can be specified in
-        the YAML Front Matter.
+        the front matter.
 
       
    
     
@@ -313,7 +312,7 @@ following is a reference of the available data.
 
         The path to the raw post or page. Example usage: Linking back to the
         page or post’s source on GitHub. This can be overridden in the
-        YAML Front Matter.
+        front matter.
 
       
    
     
diff --git a/docs/_includes/docs_contents.html b/docs/_includes/docs_contents.html
index 2ac64bb497d..7a51cca7a2c 100644
--- a/docs/_includes/docs_contents.html
+++ b/docs/_includes/docs_contents.html
@@ -1,8 +1,8 @@
 
    
   
 
    
diff --git a/docs/_includes/docs_contents_mobile.html b/docs/_includes/docs_contents_mobile.html
index b3e0110cdfe..65d5afebf59 100644
--- a/docs/_includes/docs_contents_mobile.html
+++ b/docs/_includes/docs_contents_mobile.html
@@ -1,7 +1,7 @@
 
    
   
diff --git a/docs/_includes/docs_option.html b/docs/_includes/docs_option.html
deleted file mode 100644
index 9effc252846..00000000000
--- a/docs/_includes/docs_option.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% for item in include.items %}
-  {% assign p = site.documents | where: "url", item.link | first %}
-  
-{% endfor %}
diff --git a/docs/_includes/docs_ul.html b/docs/_includes/docs_ul.html
deleted file mode 100644
index 4b7221d0169..00000000000
--- a/docs/_includes/docs_ul.html
+++ /dev/null
@@ -1,18 +0,0 @@
-

From 501d0253fad3d83e8c750a8cf894a95eab5a9390 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 28 Oct 2018 11:39:34 -0400
Subject: [PATCH 3314/4996] Update history to reflect merge of #7343 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4f1393a1b99..65dc2b69f90 100644
--- a/History.markdown
+++ b/History.markdown
@@ -73,6 +73,7 @@
   * docs: list all standard liquid filters (#7333)
   * Document Jekyll Filters with YAML data (#7335)
   * Remove redundant instruction comment (#7342)
+  * docs: minimize rendering count (#7343)
 
 ### Minor Enhancements
 

From f0af098abe6b5881f1ea361615e58a6fa3dbb987 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 31 Oct 2018 22:40:19 +0530
Subject: [PATCH 3315/4996] Memoize the return value of Site#documents (#7273)

Merge pull request 7273
---
 lib/jekyll/site.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 32fb5eb37a5..0f1e01f8796 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -97,6 +97,7 @@ def reset
       @post_attr_hash = {}
       @site_data = nil
       @collections = nil
+      @documents = nil
       @docs_to_write = nil
       @regenerator.clear_cache
       @liquid_renderer.reset
@@ -326,7 +327,7 @@ def docs_to_write
     #
     # Returns an Array of all Documents
     def documents
-      collections.reduce(Set.new) do |docs, (_, collection)|
+      @documents ||= collections.reduce(Set.new) do |docs, (_, collection)|
         docs + collection.docs + collection.files
       end.to_a
     end

From b586bed0ee447a2f9e09fed7f752118c5a495a95 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 31 Oct 2018 13:10:21 -0400
Subject: [PATCH 3316/4996] Update history to reflect merge of #7273 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 65dc2b69f90..44af7f057e0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -96,6 +96,7 @@
   * Skip processing posts that can not be read (#7302)
   * Memoize Site#post_attr_hash (#7276)
   * Load config file from within current theme-gem (#7304)
+  * Memoize the return value of Site#documents (#7273)
 
 ### Major Enhancements
 

From 592b530de1bd4ac8bd8e537de6343cb754ff5988 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 5 Nov 2018 00:32:00 +0530
Subject: [PATCH 3317/4996] Re-implement handling Liquid blocks in excerpts
 (#7250)

Merge pull request 7250
---
 lib/jekyll/excerpt.rb                         | 50 +++++++++++--------
 ...01-28-closed-liquid-block-excerpt.markdown | 23 +++++++--
 ...8-01-28-open-liquid-block-excerpt.markdown | 20 ++++++--
 test/test_excerpt.rb                          | 25 +++++++---
 4 files changed, 80 insertions(+), 38 deletions(-)

diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb
index fc8f4a92f17..4a91515241b 100644
--- a/lib/jekyll/excerpt.rb
+++ b/lib/jekyll/excerpt.rb
@@ -131,36 +131,45 @@ def render_with_liquid?
     #
     # Returns excerpt String
 
-    LIQUID_TAG_REGEX = %r!{%-?\s*(\w+).+\s*-?%}!m.freeze
+    LIQUID_TAG_REGEX = %r!{%-?\s*(\w+)\s*.*?-?%}!m.freeze
     MKDWN_LINK_REF_REGEX = %r!^ {0,3}\[[^\]]+\]:.+$!.freeze
 
     def extract_excerpt(doc_content)
       head, _, tail = doc_content.to_s.partition(doc.excerpt_separator)
 
-      # append appropriate closing tag (to a Liquid block), to the "head" if the
-      # partitioning resulted in leaving the closing tag somewhere in the "tail"
-      # partition.
+      # append appropriate closing tag(s) (for each Liquid block), to the `head` if the
+      # partitioning resulted in leaving the closing tag somewhere in the `tail` partition.
       if head.include?("{%")
-        head =~ LIQUID_TAG_REGEX
-        tag_name = Regexp.last_match(1)
-
-        if liquid_block?(tag_name) && head.match(%r!{%-?\s*end#{tag_name}\s*-?%}!).nil?
-          print_build_warning
+        modified  = false
+        tag_names = head.scan(LIQUID_TAG_REGEX)
+        tag_names.flatten!
+        tag_names.reverse_each do |tag_name|
+          next unless liquid_block?(tag_name)
+          next if head =~ endtag_regex_stash(tag_name)
+
+          modified = true
           head << "\n{% end#{tag_name} %}"
         end
+        print_build_warning if modified
       end
 
-      if tail.empty?
-        head
-      else
-        head.to_s.dup << "\n\n" << tail.scan(MKDWN_LINK_REF_REGEX).join("\n")
-      end
+      return head if tail.empty?
+
+      head << "\n\n" << tail.scan(MKDWN_LINK_REF_REGEX).join("\n")
     end
 
     private
 
+    def endtag_regex_stash(tag_name)
+      @endtag_regex_stash ||= {}
+      @endtag_regex_stash[tag_name] ||= %r!{%-?\s*end#{tag_name}.*?\s*-?%}!m
+    end
+
     def liquid_block?(tag_name)
-      Liquid::Template.tags[tag_name].superclass == Liquid::Block
+      return false unless tag_name.is_a?(String)
+      return false if tag_name.start_with?("end")
+
+      Liquid::Template.tags[tag_name].ancestors.include?(Liquid::Block)
     rescue NoMethodError
       Jekyll.logger.error "Error:",
                           "A Liquid tag in the excerpt of #{doc.relative_path} couldn't be parsed."
@@ -169,12 +178,11 @@ def liquid_block?(tag_name)
 
     def print_build_warning
       Jekyll.logger.warn "Warning:", "Excerpt modified in #{doc.relative_path}!"
-      Jekyll.logger.warn "",
-                         "Found a Liquid block containing separator '#{doc.excerpt_separator}'" \
-                         " and has been modified with the appropriate closing tag."
-      Jekyll.logger.warn "",
-                         "Feel free to define a custom excerpt or excerpt_separator in the" \
-                         " document's Front Matter if the generated excerpt is unsatisfactory."
+      Jekyll.logger.warn "", "Found a Liquid block containing the excerpt separator" \
+                         " #{doc.excerpt_separator.inspect}. "
+      Jekyll.logger.warn "", "The block has been modified with the appropriate closing tag."
+      Jekyll.logger.warn "", "Feel free to define a custom excerpt or excerpt_separator in the"
+      Jekyll.logger.warn "", "document's Front Matter if the generated excerpt is unsatisfactory."
     end
   end
 end
diff --git a/test/source/_posts/2018-01-28-closed-liquid-block-excerpt.markdown b/test/source/_posts/2018-01-28-closed-liquid-block-excerpt.markdown
index 991ebf84e5b..a2c9fe56d5a 100644
--- a/test/source/_posts/2018-01-28-closed-liquid-block-excerpt.markdown
+++ b/test/source/_posts/2018-01-28-closed-liquid-block-excerpt.markdown
@@ -2,10 +2,23 @@
 layout: post
 ---
 
-{% if
-  page.layout == "post" %}
-You’ll find this post in your `_posts` directory.
-To add new posts, simply add a file in the `_posts` directory.
-{% endif %}
+{%
+  highlight
+  ruby
+%}
+{% assign foo = 'foobar' %}
+{% raw
+%}
+def print_hi(name)
+  puts "Hi, #{name}"
+end
+print_hi('Tom')
+#=> prints 'Hi, Tom' to STDOUT.
+{%
+  endraw
+%}
+{%
+  endhighlight
+%}
 
 So let's talk business.
diff --git a/test/source/_posts/2018-01-28-open-liquid-block-excerpt.markdown b/test/source/_posts/2018-01-28-open-liquid-block-excerpt.markdown
index bffe45f0b7b..24c2e0eb04d 100644
--- a/test/source/_posts/2018-01-28-open-liquid-block-excerpt.markdown
+++ b/test/source/_posts/2018-01-28-open-liquid-block-excerpt.markdown
@@ -2,10 +2,20 @@
 layout: post
 ---
 
-{% if page.layout == "post" %}
-  You’ll find this post in your `_posts` directory.
+{%
+  highlight
+  ruby
+%}
+{% assign foo = 'foobar' %}
+{% raw
+%}
+def print_hi(name)
+  puts "Hi, #{name}"
+end
 
-{% else %}
+print_hi('Tom')
+#=> prints 'Hi, Tom' to STDOUT.
+{% endraw %}
+{% endhighlight %}
 
-  To add new posts, simply add a file in the `_posts` directory.
-{% endif %}
+So let's talk business.
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index 986ef6b4617..d97dbe1b270 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -184,12 +184,17 @@ def do_render(document)
       @post = setup_post("2018-01-28-open-liquid-block-excerpt.markdown")
       @excerpt = @post.data["excerpt"]
 
-      assert_includes @post.content, "{% if"
-      refute_includes @post.content.split("\n\n")[0], "{% endif %}"
+      head = @post.content.split("\n\n")[0]
+
+      assert_includes @post.content, "{%\n  highlight\n"
+      assert_includes @post.content, "{% raw"
+      refute_includes head, "{% endraw %}"
+      refute_includes head, "{% endhighlight %}"
     end
 
     should "be appended to as necessary and generated" do
-      assert_includes @excerpt.content, "{% endif %}"
+      assert_includes @excerpt.content, "{% endraw %}"
+      assert_includes @excerpt.content, "{% endhighlight %}"
       assert_equal true, @excerpt.is_a?(Jekyll::Excerpt)
     end
   end
@@ -201,13 +206,19 @@ def do_render(document)
       @post = setup_post("2018-01-28-closed-liquid-block-excerpt.markdown")
       @excerpt = @post.data["excerpt"]
 
-      assert_includes @post.content, "{% if"
-      assert_includes @post.content.split("\n\n")[0], "{% endif %}"
+      head = @post.content.split("\n\n")[0]
+
+      assert_includes @post.content, "{%\n  highlight\n"
+      assert_includes @post.content, "{% raw"
+      assert_includes head, "{%\n  endraw\n%}"
+      assert_includes head, "{%\n  endhighlight\n%}"
     end
 
     should "not be appended to but generated as is" do
-      assert_includes @excerpt.content, "{% endif %}"
-      refute_includes @excerpt.content, "{% endif %}\n\n{% endif %}"
+      assert_includes @excerpt.content, "{%\n  endraw\n%}"
+      assert_includes @excerpt.content, "{%\n  endhighlight\n%}"
+      refute_includes @excerpt.content, "{%\n  endraw\n%}\n\n{% endraw %}"
+      refute_includes @excerpt.content, "{%\n  endhighlight\n%}\n\n{% endhighlight %}"
       assert_equal true, @excerpt.is_a?(Jekyll::Excerpt)
     end
   end

From 1825813c939f2d8328fe047f48acbe14dd3470e9 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 4 Nov 2018 14:02:02 -0500
Subject: [PATCH 3318/4996] Update history to reflect merge of #7250 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 44af7f057e0..9101cfec1f7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -152,6 +152,7 @@
   * Check key in collections only if it isn't "posts" (#7277)
   * Revert "Cache converter in renderer" (#7326)
   * Measure the no. of times a template gets rendered (#7316)
+  * Re-implement handling Liquid blocks in excerpts (#7250)
 
 ### feature
 

From d926ebf6880b2fe4022fb49d58a8d52805ffe051 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 5 Nov 2018 00:33:18 +0530
Subject: [PATCH 3319/4996] Incorporate `relative_url` filter in `link` tag
 (#6727)

Merge pull request 6727
---
 features/link_tag.feature | 8 ++++----
 jekyll.gemspec            | 9 +++++++++
 lib/jekyll/tags/link.rb   | 7 +++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/features/link_tag.feature b/features/link_tag.feature
index a94b86760f8..3ea8cf6484e 100644
--- a/features/link_tag.feature
+++ b/features/link_tag.feature
@@ -38,8 +38,8 @@ Feature: Link Tag
     When I run jekyll build
     Then I should get a zero exit status
     And the _site directory should exist
-    And I should see "
    About my projects
    " in "_site/index.html"
-    And I should see "
    Home
    " in "_site/about.html"
+    And I should see "
    About my projects
    " in "_site/index.html"
+    And I should see "
    Home
    " in "_site/about.html"
 
   Scenario: Basic site with two pages and custom baseurl and permalinks
     Given I have an "index.md" page that contains "[About my projects]({% link about.md %})"
@@ -52,8 +52,8 @@ Feature: Link Tag
     When I run jekyll build
     Then I should get a zero exit status
     And the _site directory should exist
-    And I should see "
    About my projects
    " in "_site/index.html"
-    And I should see "
    Home
    " in "_site/about/index.html"
+    And I should see "
    About my projects
    " in "_site/index.html"
+    And I should see "
    Home
    " in "_site/about/index.html"
 
   Scenario: Linking to a ghost file
     Given I have an "index.md" page that contains "[About my projects]({% link about.md %})"
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 76f92f41bc0..3d4a2d7b299 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -30,6 +30,15 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w(README.markdown LICENSE)
 
+  s.post_install_message = <<~MSG
+    ----------------------------------------------------------------------------------
+    This version of Jekyll comes with some major changes. Most notably:
+      * Our `link` tag now comes with the `relative_url` filter incorporated into it.
+        You should no longer prepend `{{ site.baseurl }}` to `{% link foo.md %}`
+        For further details: https://github.com/jekyll/jekyll/pull/6727
+    ----------------------------------------------------------------------------------
+  MSG
+
   s.add_runtime_dependency("addressable",           "~> 2.4")
   s.add_runtime_dependency("colorator",             "~> 1.0")
   s.add_runtime_dependency("em-websocket",          "~> 0.5")
diff --git a/lib/jekyll/tags/link.rb b/lib/jekyll/tags/link.rb
index b8496a0a96d..85411e4d60b 100644
--- a/lib/jekyll/tags/link.rb
+++ b/lib/jekyll/tags/link.rb
@@ -3,6 +3,8 @@
 module Jekyll
   module Tags
     class Link < Liquid::Tag
+      include Jekyll::Filters::URLFilters
+
       class << self
         def tag_name
           name.split("::").last.downcase
@@ -16,13 +18,14 @@ def initialize(tag_name, relative_path, tokens)
       end
 
       def render(context)
+        @context = context
         site = context.registers[:site]
         relative_path = Liquid::Template.parse(@relative_path).render(context)
 
         site.each_site_file do |item|
-          return item.url if item.relative_path == relative_path
+          return relative_url(item) if item.relative_path == relative_path
           # This takes care of the case for static files that have a leading /
-          return item.url if item.relative_path == "/#{relative_path}"
+          return relative_url(item) if item.relative_path == "/#{relative_path}"
         end
 
         raise ArgumentError, <<~MSG

From d971e39b4feca9c8d2e8c7e954aa78713ce4eb90 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 4 Nov 2018 14:03:21 -0500
Subject: [PATCH 3320/4996] Update history to reflect merge of #6727 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9101cfec1f7..c0c8490fa55 100644
--- a/History.markdown
+++ b/History.markdown
@@ -114,6 +114,7 @@
   * Add Cache class (#7169)
   * Cache converted markdown (#7159)
   * Ignore cache directory (#7184)
+  * Incorporate `relative_url` filter in `link` tag (#6727)
 
 ### Development Fixes
 

From 564f7735b35a20af2123d6a34423d12290325c5d Mon Sep 17 00:00:00 2001
From: olivia hugger 
Date: Sun, 4 Nov 2018 20:41:10 +0100
Subject: [PATCH 3321/4996] test for stable and backport branches on travis

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 44e2996802b..51a9ee4f142 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,8 @@ branches:
   only:
     - master
     - themes
-    - /*-stable/
+    - /^.*-stable/
+    - /.*backport.*/
 
 notifications:
   slack:

From d0c1cde9222a362ac0210ba9b7180a5234943f95 Mon Sep 17 00:00:00 2001
From: olivia 
Date: Sun, 4 Nov 2018 21:07:14 +0100
Subject: [PATCH 3322/4996] Add 3.8.5 post

---
 .../2018-11-04-jekyll-3-8-5-released.markdown    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 docs/_posts/2018-11-04-jekyll-3-8-5-released.markdown

diff --git a/docs/_posts/2018-11-04-jekyll-3-8-5-released.markdown b/docs/_posts/2018-11-04-jekyll-3-8-5-released.markdown
new file mode 100644
index 00000000000..8b5a0fce1ec
--- /dev/null
+++ b/docs/_posts/2018-11-04-jekyll-3-8-5-released.markdown
@@ -0,0 +1,16 @@
+---
+title: 'Jekyll 3.8.5 Released'
+date: 2018-11-04 20:58:20 +0100
+author: oe
+version: 3.8.5
+categories: [release]
+---
+
+This release fixes a bug where multiple Liquid tags were not supported in 
+excerpts.
+
+Thanks to @ashmaroli for fixing this issue in [#7250].
+
+Happy Jekylling!
+
+[#7250]: https://github.com/jekyll/jekyll/pull/7250

From 271e476e67ef1581194a944de30b909c184fa00a Mon Sep 17 00:00:00 2001
From: olivia 
Date: Sun, 4 Nov 2018 21:22:28 +0100
Subject: [PATCH 3323/4996] reflect 3.8.5 release

---
 History.markdown        | 5 +++++
 docs/_config.yml        | 2 +-
 docs/_docs/history.md   | 9 +++++++++
 docs/latest_version.txt | 2 +-
 lib/jekyll/version.rb   | 2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/History.markdown b/History.markdown
index c0c8490fa55..d09ae8fba8c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -164,6 +164,11 @@
 
   * Add Release Post for v3.6.3, v3.7.4 and v3.8.4 (#7259)
 
+## 3.8.5 / 2018-11-04
+
+### Bug Fixes
+  * Re-implement handling Liquid blocks in excerpts (#7250)
+
 ## 3.8.4 / 2018-09-18
 
 ### Bug Fixes
diff --git a/docs/_config.yml b/docs/_config.yml
index 7fad0e78a13..e0e7e366d5d 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,5 +1,5 @@
 ---
-version: 3.8.4
+version: 3.8.5
 name: Jekyll • Simple, blog-aware, static sites
 description: Transform your plain text into static websites and blogs
 url: https://jekyllrb.com
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 0070d596c25..e1b5c42fd0a 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,15 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.8.5 / 2018-11-04
+{: #v3-8-5}
+
+### Bug Fixes
+{: #bug-fixes-v3-8-5}
+
+- Re-implement handling Liquid blocks in excerpts ([#7250]({{ site.repository }}/issues/7250))
+
+
 ## 3.8.4 / 2018-09-18
 {: #v3-8-4}
 
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index ff313b8c212..0cbfaed0d9f 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.8.4
+3.8.5
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index b506c7ea8d4..b24d27d851c 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "3.8.4"
+  VERSION = "3.8.5"
 end

From e3f9c452b6fd739911e6327566a2a428849b3036 Mon Sep 17 00:00:00 2001
From: Tushar Prajapati 
Date: Wed, 7 Nov 2018 19:48:37 +0530
Subject: [PATCH 3324/4996] Update posts.md (#7360)

Merge pull request 7360
---
 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 f6ae4b5e4e5..9274ecd3dcb 100644
--- a/docs/_docs/posts.md
+++ b/docs/_docs/posts.md
@@ -140,7 +140,7 @@ tags: [hot, summer]
 ```
 
 Jekyll makes the categories available to us at `site.categories`. Iterating over
-`site.categories` on a page gives as another array with two items, the first
+`site.categories` on a page gives us another array with two items, the first
 item is the name of the category and the second item is an array of posts in that
 category.
 

From afd0a6ff69d3b7ae7f2a475338f4a189b1c98c8b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 7 Nov 2018 09:18:39 -0500
Subject: [PATCH 3325/4996] Update history to reflect merge of #7360 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d09ae8fba8c..517ea368bd1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -3,6 +3,7 @@
   * Textile is only supported through a converter plugin (#7003)
   * Add info how to deploy using pre-push git hook (#7179)
   * chore(release): reflect latest patched releases (#7262)
+  * Update posts.md (#7360)
 
 ### Documentation
 
@@ -167,6 +168,7 @@
 ## 3.8.5 / 2018-11-04
 
 ### Bug Fixes
+
   * Re-implement handling Liquid blocks in excerpts (#7250)
 
 ## 3.8.4 / 2018-09-18

From 9a66a1614e2f6352b19bb281722e6d2b161f7586 Mon Sep 17 00:00:00 2001
From: olivia hugger 
Date: Wed, 7 Nov 2018 15:46:03 +0100
Subject: [PATCH 3326/4996] correct faulty merges

---
 History.markdown | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/History.markdown b/History.markdown
index 517ea368bd1..30693b2d2af 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,10 +1,5 @@
 ## HEAD
 
-  * Textile is only supported through a converter plugin (#7003)
-  * Add info how to deploy using pre-push git hook (#7179)
-  * chore(release): reflect latest patched releases (#7262)
-  * Update posts.md (#7360)
-
 ### Documentation
 
   * Release post for v3.8.0 (#6849)
@@ -75,6 +70,9 @@
   * Document Jekyll Filters with YAML data (#7335)
   * Remove redundant instruction comment (#7342)
   * docs: minimize rendering count (#7343)
+  * Update posts.md (#7360)
+  * Add info how to deploy using pre-push git hook (#7179)
+  * Textile is only supported through a converter plugin (#7003)
 
 ### Minor Enhancements
 

From 7d76d5e48e47514e819c5eca57ef40ebe7047778 Mon Sep 17 00:00:00 2001
From: Sri Pravan Paturi 
Date: Thu, 8 Nov 2018 04:10:10 +0530
Subject: [PATCH 3327/4996] Add documentation for custom tag blocks (#7359)

Merge pull request 7359
---
 docs/_docs/plugins/tags.md | 43 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/docs/_docs/plugins/tags.md b/docs/_docs/plugins/tags.md
index 3681d623db5..a5a3af57361 100644
--- a/docs/_docs/plugins/tags.md
+++ b/docs/_docs/plugins/tags.md
@@ -70,3 +70,46 @@ And we would get something like this on the page:
 ```html
 
    page rendered at: Tue June 22 23:38:47 –0500 2010
    
 ```
+
+## Tag Blocks
+
+The `render_time` tag seen above can also be rewritten as a tag block by 
+inheriting the `Liquid::Block` class. Look at the example below:
+
+```ruby
+module Jekyll
+  class RenderTimeTagBlock < Liquid::Block
+
+    def render(context)
+      text = super
+      "
    #{text} #{Time.now}
    "
+    end
+
+  end
+end
+
+Liquid::Template.register_tag('render_time', Jekyll::RenderTimeTagBlock)
+```
+
+We can now use the tag block anywhere:
+
+{% raw %}
+```liquid
+{% render_time %}
+page rendered at:
+{% endrender_time %}
+```
+{% endraw %}
+
+And we would still get the same output as above on the page:
+
+```html
+
    page rendered at: Tue June 22 23:38:47 –0500 2010
    
+```
+
+
    
+  
    In the above example, the tag block and the tag are both registered with 
+  the name render_time but to register a tag and a tag block using 
+  the same name in the same project is not recommended as this may lead to 
+  conflicts.
    
+
    
\ No newline at end of file

From 1cc84d8d7b083ae1457083620f03c753d94dea51 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 7 Nov 2018 17:40:11 -0500
Subject: [PATCH 3328/4996] Update history to reflect merge of #7359 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 30693b2d2af..b6c64b50709 100644
--- a/History.markdown
+++ b/History.markdown
@@ -73,6 +73,7 @@
   * Update posts.md (#7360)
   * Add info how to deploy using pre-push git hook (#7179)
   * Textile is only supported through a converter plugin (#7003)
+  * Add documentation for custom tag blocks (#7359)
 
 ### Minor Enhancements
 

From 4da289e22deac77addeca3caf0a3e604bb578f39 Mon Sep 17 00:00:00 2001
From: olivia 
Date: Sun, 11 Nov 2018 18:17:19 +0100
Subject: [PATCH 3329/4996] add icons8 to site sponsors

---
 docs/_data/sponsors.yml  |   5 +++++
 docs/img/icons8-logo.png | Bin 0 -> 110994 bytes
 2 files changed, 5 insertions(+)
 create mode 100644 docs/img/icons8-logo.png

diff --git a/docs/_data/sponsors.yml b/docs/_data/sponsors.yml
index d2844db5328..72617e9f96b 100644
--- a/docs/_data/sponsors.yml
+++ b/docs/_data/sponsors.yml
@@ -13,3 +13,8 @@
   url: https://siteleaf.com
   width: 40
   height: 50
+- name: Icons8
+  image: /img/icons8-logo.png
+  width: 140
+  height: 30
+  url: https://icons8.com/
diff --git a/docs/img/icons8-logo.png b/docs/img/icons8-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..13d9d85afd3a83f04d3074f62ce369565a3bea25
GIT binary patch
literal 110994
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ℑ_sv_S~KP
zJ6#>Dr-Nvu5VLpLc!r+k=E!-nXSplzwAK=MBF`(-eJaj4yd}q!hX(eDV2>DcCwr78yK`#uP;*P
zk?M?$QJymQ#@DYAV;H=QI4DW+3xc;y6ZTqu
z=2z5lHyNKswy!pIp0}+upHjebI{z9k&!gz0L1?TfCWSmXWpSK~J8&Js^avfz!8M_LVA0{i|hS3ZX
z^$-nJr8QUI+iF8t>SiB>G$hNO*x2EfL362Ez^P-a$Fo;Oztcji*!c?lyJ6c=LFp6g
zX+$}^{SkK^w9rfM-^uEMp45dOSPiY}hY?Y~*J&({2YV8hRTWXv)7S>W(nRfR@KWI;
z#+nE0Kx&8*V6YlTb^8K3-El`q&>tgJ&B+)YS##e8WQs_liCbQ+dAI`R#i%xFu~)W%
zZ!rIj=KfEJ{K|D|3di8Oe@$!AQ-l$jZ*P)%0y5Vei(AY!h`y2GF30Dm6qrwtm!Mm_
zFR(QkVH=kDgqsW*U1QR>?AVV5Hx!p3*x&xS+9};Oa*)bS_3JP?FFFiT8a?0MjDL;@
zxUKG5k^7GQ7xNUQsV7xxSmlX{FFwUse$}SbMou^LFY*!ZT*NBFja{veMw;r&&5gly
z>VclSK4A|<4**=bpu_HtvdLB>`~5Y=w4bHCzcg_CD-W~HzN?$Z
z!(WNF-Jxx&mkVG$kLh#04$J0@g^r9}+Zs2^qG--!OHD!>g}7x&3sO4z;!(3F7queLME)PHGcm%xP-0a{wsBf|$!GbYSSk^Z
zl@pFo5~9egY&n1o6gZX_BG(feM7GJbHJ^jCw`>4+ez@hvYR^_^pT|#2B;O}BUKlP~
z*6GKyhcC81JgQ5H9ZY4t)hQeHxf#)uGC(vWG~jVnSfGjd)nnez&d*E?in4Dx!gJAO
zVcL~c---kTv3KgoC*dMys+w*8QU8`{t)0fnUI=FOOw3jAfNt*;r`T$G+LfvC8YG0_^lle2Mzd
zg0+j@n|(z%X2fE>WfPVoD3&|a1GXg}ahp{d+dmYj{dmmX`cMcmB}f?I=M;J0-guLA
z=U?*NDbU@8;5`H%zi=-0oQgOP$e3vf!d1=`PTcFnnl13Dr_yAnwY@{n7IY242da5r
zoZ&lu4mgnLe&_#;El%{>9NSG^$SJ2wzr|p#?O4NK;P^==`okvh^~--8dRH3YRDp#g
z`XrdawWE1dwI{rPusBo|deR??-YGxzQN1cBOH)RVGlqtReYsOhvr4d)LJdkAwsd2pFjIUhYXX!>@&PNUseRL?=hYf-g5??N4&KN%Y0Y
z(WP|jI)-Os7B8(9FjV*%T+i}{W;}by^lBRW^b1?mKjs`99)t*tvCU&sUNG2u5(EVl&3-!Z#q=Py*?d~
zD4tIFZn|{LR;&0a39UluhZk|@FWc1R(}IbQg7ZG(Z!ghk7*=J^zMhgU|8j__KKQqb
zDn2Il!x-!9*O~m9+<=>k1qfvJtEzAkNzxQbqYEX1h8K-n@gW&r7@=$>BVkKPZArfQ
zRZ@n!dkE#qT9gaZ_-ZjZ5poM05XICI2u!cej{rm(BWGfA&ZeJ0eCdh2-
zVR1ol7g>k||I&DGhF;HZA=El>76Ph%FIK}*i#$dfuoYoaKXbeaDo?u}7&_W6G@2fDcd1cfX@_vFku*j_TvnLZjamm0J
z{sc>_28X%XiP4va^AtAt5l)Q6;4OJn^e79>(|6G`+w&^v^o>JSiXlp_IN0?gchq>9yWdkJl_!}lKyG73}K7%4v|g%$!pZ~4%kKn^WN
z3X!v^l+H%xq}+XEqsAAhdR
zU!1aD2>urrfbv5c?Wq}ktVH^dhP3MvNMITWk|()vEj2Jcux2UtmF#N&xs9=&l(tGu
z)<+)}2F<}97Y9m2e=+Vi-UpT8(k%eNv?sYW3BN~8%5+ijw7C62I#aV=-Kz7ofLXM1Lm5r|T
zS~BgHcBF~UQrEe(naH3*UqSo&EVY*m(!lHZq)z*?&aXtN7$
z0R(&EEMFF4eq0%070;y-0I|o+`MC1@ZCRZE5S1|kW`}EAn?irq=iEZ-D4B~X
z==KHLVbJ06yC?l_DR4#FKL6CfXxwkdXnA?*1%Uah
zVB1hG!u-aQsCvZL<=?ld#0MfyG_yzty`clL@KAIK^!HJ?({14aV(RBh}T>P-9r{*OEbF8=p+V*1GkPJi2P7toS$Rmy&tb%KE##L
zB541HfcQBb(Cc}60Lf!RBy__0+GY%u4;D*Qho5&LN7bdnV=4Vpo?nBtLm4o?uC`OX
z#G0L|mE;D72vq^vG2VkB9OBVajPLn!;Qf;^Mh$7R^ii|n|C=QKKPT_$iz)@f`-!-T
zrlChgjD_e(Euha*!k=>OBf{>-fwQ}pIX}qm$M%a~9~BQ)s3~sFTBJl*hL@T%m4=j6l?MXU-|?8R&A8~$n*P)ZtxgGL~nK8Is3
zv)R^n@~JKNrllit#wfYXcGLhK3-&9DK_R*G@uE%02-+VDEZtMtr+qf}PVku8k2-Jk
zln9U8w<#Twh!eCyT1Y6f84>3|U{WCPbN;_|(R9tukaHN_jJnLxYMJ{qodovBEhEy5
zYFRrYyZ!*T$Zr1gNGgGrM%fjQ1l8MiRnAFMr)B@nqQ*w~mwnu)_iV62^*>H%Gh-Cx
zD*Cu-Q(=5by;*M2YW`RN+PFI*yIXP~A5;w41*s)XcRI{!Y9|LgfluHb?$9#bKyzTe
z;)?epsCzF^rLIv^l%18)DsB4ON47|KQ)oHKB}I<{Un=
zwJj0aQ5N3dDNxja@6!)VUOU?*!=Ztq{jd>gE8Aq5)U((tMAIT70@nNn0y3nOs-Chv
zBfo!}zO?40Rs)~r1UPLoAWjpGh|=zf1NLep7&RHICQOgvQ%Z;w6QLiY0{Zz?r~bn-
zUeFRw(u`9Ep>@1o-~K~nHL??OC61ra%zluUdXXpv>;ai5{M>sM@X#A9XM+`2+sc7e
zYPilCGi=$16D=ACfvsW{#a3D5Rw6#%NNscj*^?4YmK?U*j|OH7WK%(5aJb6d&9D6taFw=zbuC->5KmOt9kT
zv_(dVxw?8Ce)O$X5{Zf!eJ+jn+VbJ6nl(pH)vZL~VsxMM)$
zz~U%FSwgmgule)u%q^d4^m~Diu9Wuon3WI+_}#nllt+NHy%p%C
z%(SswEOm>wMqUB05*G{e0fl+K`$GH35*ODlCatW1w0aGeB_T|@VU<;#=vfo>W=aEW
zQ@3Zq@$TIgCu37!SpK^l;eqDP`z)uiS=p4OplheV2S4AA6V-DxrWnko5tKeTg@A%5
z8$b(UO8~Y6Bw;C?J*y$kl|XeaU+NK%<`?cu!5Ul(uFdZ$!7)Eur%Sn14bfYzFZJvb
z)J;rVz5D9FWxP(l?ey&YxrSVSNwCltezcD!`z%Pge<8*dM4%5!fs;yd4il#ScX9%|
z!c*sOT=TO4Tp3lsF|xcYA9<#QY4Q#W^A|JMG{+an(9lL{E*e8a+!H=dsLZ*r8Un1)nXgh)KrV
ztwWl&B0Q@p2FvclD~x5(fPVdDvOfRgwCKAlHddZ`G!$(Vfy(2izWd$tL)Z)O-5Rk;
z;P{IyC}X4oMH9COXUo71STo?ht>hO>#p6-k$1+6LxnoZeh
z8>hw{qZH2cTmOVjc4w_LFl7%*c?k6y^e;yz2*jdCyCz!eG%e|9TVt5)oBcZ+7Qavp
zI+e(zS9CILuUsL?t{iT~09#BYr1zh5+~+!GEHv-y)CA(eAoWwC|a71cZuSFLR!4sQz~jH?yS5^bHP
zm!ya6gxkh2x~Oe|=Wc>~D7||EIea7EZ~Ym}7P6(yUt*a1XbF8a#l)I<
zRW|z
z`~$&*VHe?;3tPz=E11?^-{+voX+e~)xZ?TB^MebtX6XOOI2TJ)PsquG*sFI})TIcr
z^IsQX>f21m($lS4jii690Xi_q2|d4VsP$Hccnk!xLRUJiu3%+lME#}vtqH%$E48E#
z%_97O@rXq@fQWV0LdT3B4hiItwdlz@?lq_D_iH(>iYUjE^6Gi&osZR_%l0nDcct3A
zew0Fh0NqyHnGZLIPgE9NpA)gDx=YqZO+o#r8?2v9*n{dRWfBzq$)((T|MSno`#`osHb6zI`
zX{8=aGS~W0tu)fi{Q!SCg2A|+BKkF*sI02N(KY6>9-b`2+eFhx1XJ+hrLz?0{
zdJ3Hr#n0%Ih;x=pz`ZMFNCR+6NBB_%zcfFQX7W*I!#=n>k+K?P>F_Pb0v(+RGww`xn2)7DKLk*jkL;T{
z;yxYTNE#El!lE+FYp_$tLXmDK8eo$7se9#7T|&aH(V`KD>i4|RB^*1N+T|AcrE)T6
zoF`AhRE_6pzw>ICwL8<*U#oXw8)WoYD1qAt{~J5H@vTKG*Y@kHoH*bPIlU!#Pr
zWz%O%)=oncMk0qx<$)4vVZ0y6*7ty~Tid||S2)tTXv5IpL)%RM8d!Q%v{yCdLge+u
zkpJ-l-Z__EWc{kJdh`5kwL4&lxWSmLJXHF}VjU=}ho9fIcJx^0s93OcyO@YyXXN1Z
z9^9-Rc)_~9@o;n-C3_L`-RAiTG8J52XsZp
z;W~i*`S7{eCMSdH~&
zU(<2KmDzl>fil8w9dhhQGm3k#lg4#UkTQVs`rTeLX7|g$>DIe0y~~tjSkXm)sW6oU
zGIv6JI(wy|SNFK$vO?=Lv#2e-nOg8xAyK$WYa5kqBm{Jt!i}w{4v<_%(nSG
zaF%dsdx#e9QxrMk9MtHMi5y8hCnC#ray;I>nOai{xTzgchlF=vL}4DF$}>163L-U8
z;yb&0rC?+Om345Fy9|5uc|?*SLAaBPuDPssxCNf|4SdGcN8`pZ(10^7L5E8Op(3jx
zu_}lC-Ky~JHkJ2acoksx>==*hVcp_&#o1W8x$scz5ABOfm_FMub1bh%?-;99qQ&p9
zrHEOMamopvdMD7F&wcaTz((--lNzkvO8BPz_Uotxz8$=Bx(=>A3G1itYkI0m#bXUg
zdR1PGL^G}d_xb;}a^Afg$?c8&R0_BIur_hx^CUfMrX
zt9m~9O7GH!!tNBPy&mJZDAZz1cl?0054QQT&{tqcf0NJDAhF-|3J_s-QVZ3=8Ris%
zuAnb+YeEEE-;+GO19-9qC_cF^2nT3AtIi<&%5zmZJaUmQJ4x6lQ8
zw25Jr;l$DRsr&{q0!jLQ!I$v$zR9vDgiM$jr@I1P&c*lbCCF@mCMcALeH^g)?$yF&
z{oPCbWyZ(xy2jeg!tUspOjg8Ew5V3~)6oAe
z7W$u)t-C+!eJZnrG*%?AQ!aC9lQV$F;`8{(*DqY`QS+3rI@1(-QppEq^Q#Fq>VQWW@|x<3ZYPo0w!#gIjI=3$vv
zkO^Znad0uQ4w;n<1{e_gT
z*>0~VH0BYih!2dJRZFj&`S^3dpF^DvZC%W4plFG~09_;3wreIM`dI#?6yyNE92wZ=
z#HOjlk*r_N<#c`fQ5sbD*ALp_H*}`Fw5#jWSvTmY_!Kpj4bq2JqnWaMF*Ha83@g)I
zG1`WznMV7%ZtyP>d6kM`J+&;ly;k`$KWah{2DlbyTM_}i{g~@fQG%((X5@dV82d*!
z>9>MH@YzaK%~Sj3LMDX|5uM5_`WN<^Ad4WQt0007%OvX6O3#4zfZ-b7
zb;sIyCVKkSq_NA6swPGc_2fX(eaw0Xy78-1QD@A0w(1dX^>4!SJfoCf
zpb;wj%(#8??{$L2C1`z1>#=6QDoL?N(YuA{FUhCE4#95k*vdJ}gW{JGb>1jvLxOZ!
zzLxwTK(|ktD`R0x+jebc8D43;2>=!{(}L-WD6`Q=eieUdNZxYg1P2?_CJ|QAQV{&x
z?0S^Q7O56wSpfvYTv;vpx1Qb|=PV8Pn1c<2*#}m0Jm`)S^KOT`kgJlveNA?=N`X=`
za=F;SsEMi|*&?o|`kzgnw2rs~g$!n+G23|XMC$!e;vrs5+=-wIM}M9M-l{#N0P*)#
z!wj*+Rfh6Eu7))sjA}(9U$*lNWDJUS)HAkhmSZYO)SIk9%RXzQ4F;#K`l+x20O9#}
zs<@U2jZZz0d|BBdhGN<&mNOXxD~!xLSh^Ul+L1~k|C~-{9uRFko`Vbue3AGhfKTC0
zv@xHr`nQSmb7X;BhY6Jq$}hBXNh!_4_ubVRTG0xlqe@>t3avsB0nqyIwuUXNo4r!w
z$(sc*e&8DR1ZKnk`h;=y=XyO!kwr6>Fcka?{Um68l$v}(HEe=*F6|c1xxVw~Sd%w9
zMxS_j>!&+Ccgc|qRjt#ATxj)ANraH++-buD9#!Rghzc+pKE4%;ut8MA8R7antorLD
zLbMb%Yu*>X$8sYj
z!TPa@(M%(>0~6ZI9qNQ}+k5gwQse3ay-f?|R~P{Qd(DLcI(p?)ndQ3D{1$`(Ov%DY
z#^2z|NZQDyGr;@n%>U5)QL0a
zl7~oSRE$%y6wMlD(hCHf=D{+Ww24)FKejX?WwFG3uAI7s!Mhq(myKh6F|*%IOzjDN
zgPndNIv5_vKzl+RMUaTrWZR$n$l)Y&?Bpx9SXtUcyno3WR=SWWc$ASb;mAy0^7!8MlNiRS8-j6!dfh0R8g-i_
znI%Q73aNe|`?tZxQ4$sV2{11km_Q_vzjuy{AHH;kOnlx`wf%DY1S6rWN2MmqF_a@B
zIpVRyx*gDqZ!;LW>RvO!(A<63_9MY-+5hZKZ)dVQkN_sltI%l}!36)1$z?>MtIF<_
zooDW%5Pe=U3(B(`8y9^s>wYGK_v$Kc9W-B77e&$)riT4bBd?S8U*`zg}#hm)hBRK@*ZL*F?b7Sq&F
zYQjHqackrR{-cog=YU^lwa0-lk14KD%s{ev=73YB?k8MK#GeVv9@Gszl51|e(hoK9
zAMf%OUkXWc*+>V+@AHs~M}V(iXKN4bY0aC0YfX-1jzU_=EClom~D}pPx
zMIsC&ZSp*~scHz{b_ty7Mbk20Fo-D
zsAAi?tEa}3b4X660&|ei3Ms_T@{JU10SqQ+&xrUeUhRL#j7cf6h;A%BN!dhluzfPf
zVL^P#3(a?_Om!47E7GNV5=dr0-fs_~Mf7)KXRp0<=m@_RD_uIGnRf7==qav)Wh9yg
z0-U2~!0!2p9Gw5sJiIk5EA7s!AJbhdci+dGhO(9eRZ<+os*+SYs-j4=3`~#VIz_9+
z2Z5G4eFLw8C6`{}m!*H8HM0+J8}QhHf4W|G_nl|aJwta9E?YdJ_#T-y9uGURvD|1t*;;wok&@
z(UzMXC#@Qy69s2ezf|Iv;S_|(Azc@09-^udKd8Qo~r$Or$l%V0g^rcXenOd
zb0QtJy7Zn{fs;B>6F6nwTA`@?j}|8+TzDEe&OU-;)`A`-XYv-Cx>B)NHv^-CJ^MN5
zT|CUlZINuT{JEDW!T^P8yn#El@^w@qFOjQTqv#QCd_%F}W0gJ|3N53s)6)3&2(t+(
zXL}=$v$tfRCJ=}$b+O5Mj;|dyM?nXmUjpbwk~Jc#Hy1E+_v`ua1>1yRTj^7
zL9IxEw$id9tfk3GZa9W^pb6ezKRK0}<{#NSZ4sry2)s8H7lor0$osp_yI40w6dI>N
z4BD}Z&YM;_`)-BtDHYmCc%i;yA-%||=(g?Ef0(l4W`))Hc
z$v_eM6?KiN8IGBYzNyw^vvwZs29-B;Y;FRt_9ZnXIdnRzO<{U{x*pgfln^CP9^4ZU
zV}kv6x?zans)JRlex*|C4_fFb%>dI3rZQ%-_lusZ@5ID#^~W!sTCSpgy&svJ@I
zg%5KWKRV6D#Uh6pCy#xE|0P|WpL1P%@KvFR6rymUZMhkU@aY0M$l&p=lYyB?BGZ_@>rBT0M7#JS8Aw2r}>
z`%tip(~8vANOm%Tm4!aGC;%d0XRhuNW=x;+;lO2mUSVh?b3>}k+62K)ceo4EKArN19h9w8cI
zjOruBTMWP!?b=Ry=|UbO|8paL^LziUWo;Ja6Pi0l3uYd@kQ~W2L=7{`oYg@DDE-}Lqm$`cR?Y*g2!ku6>YeA4qYX^O~Wo|U(
z90g<|MSSRhqyLjl$DX(6zwsx}!2|;l^TD!aefcybeCY|@X2idaiND<>LVHIgPs&8(
zN7W)F03Kh}#Y{Wyn(mJ7OkV=r^=wuMb6$Ua%=7R4R6W-lOS2c8oG)^r-6RjT{9P5G
z%GNWIHr90MOQo7`JHcBxOJeKZb#*`J3xa$d_kU#v@|*f>f>%AaFHoB?JDkR>YO-+s
z>s&1IJm1%3p^9F5OGA9uo%&fIAW$*3_?615!0Vs&8Ru7tH;nz2%Fjnjo!GftXx
zDbwk_?h17&ER8~czQ`<%FSVN~t6q1REt*Z50qQ+s_-W;t$5UM-)kwAkMV2B*^Ld(`
z3YeXbHHZ&0w;^GiLBg|_GQTT;=z>y-#0^o}QXfC*;cZROEblt9)uXBLVWJ^0zK@Ca
z4f+-5gYK(v^ri7qMv}bIPYi1)e15PtCwcRFG$NhfVG{$cUTSkh^Z;Q2t>jcy4v;>=
z7IbkfG5>T$w~pO2C~;TcadCiMl+4Sv^OZ6X(sdg?c(W;=J7m!5^xk46zG+v6I^hgP
z?RUCt%qD8lOFnvobZ|dXuH+JDeKCLnOdH-58ZAT1K>v?)@O&V#X+|>o)-71gRZ`PQ
z*}I9Bt02he9Y2&X33J4VQNJ>BRd8@PKK53N9yR^-FWwqb$WoPVZ$(@>0tMn3!Wrxt
zim@U-Mw*@*28(@`H?0l)r$4|2;pzJNPD$=b659@A&uPrJyCi>2&ba&xo@(>jbxTr_
zq&So_{)}i(c&i9PNe-dApx3c(7aAL%;i5o#7J@Rx7?^1@`B8T~S7etoB&(eo`Xmyq
zM=#~31|%pT;Go}R0loYtQ$N!D$dEuqhFt&Q{ybtJXss55GACt-gV|Ix^WJqM7MNnm`qYdFP
zQLCG5qFzyG)c><5bo1x^aY=kgbTg#haECI~XlS;k^R|Sd87|~1AxH)0CX;RU6R9)9
z(MI9W>6+!cE+)Ohu1Cr5KxT5ztU9&h_l=us6MkQkK_iMP7(QZb`O!0d4w$B@os72A
z`RqTRqp6-;E`K})%wF%zG^`=DU*`3CRcc|>NlK2v0KYW(v@gb&coWU-f2zq6w&b^$
z7sAjK48u~ZMc;s;ChcGGYtkKnH!+Pi;31
z@l{BQg#JlSOc#_$ZBAi=OZ~|d&E(lN`>#I-Js#zAH<8D)s~jAs%_JvAVCo}AQB*k(
zWJn?Mg#BuG4UP~`>fp~*jJKzXi0+*HVz3JET$mM>4QvEsC;K_O+qXq`L)ul!5rLZfC|*|X|GN=sXf|`cY_b(5TQ}JPltD&)
z?x+$44ww>GKPY}Pl5p6X_5$nnFNxpI5!YB-&;<|ql6Z{;1yYG+S0DOU;);6CgdUKI
zJ_A-OSyo4Jjl_d_Ddu)%aJIWvB|!WYi=0Ku!Ner-!aC@if$s}Wvxh5-@Ls~>0}f7W
z$n@m|hAV6V!z9F9#{Ih6)ky8O88`Cqn3e*7F6jV{iea&yykzycH6&qLTZoWAF0t%;
z@k4i})4jDPb<-~Xf;e7)98E5YJ%Kau5`3CrCa)c#JRt{X%f2vC0Ihy1%W#Z|<8A7C
z9Lcy<4|@Fg;Pt8-v=|#3L!X!7Ld~feTrKvdby+_yn)pWSrP@#iNd>cCcQGf4QC#m!
zo_GTw^07n7EnH2jmM+{ppkqQZpT8scB51JUuM0o1cOL@}Hf=mby~a-N-ukt>?>47z
zK+&#X#SX}-`-L)3Pm#H6_9|!Vx`Mk`NFLgt8pVe(4+31KUmD+)!`ZDXhV=UMkScLe
zG8!zJkLYKu-Rel$?q)4X&#o}t-wH`
z5ZW_!ZE<_&>vHSiJ}q!r@UD+2EZL+ElJo9Oe7|&+zI-ynQ!Ija7>=Qb{GGXMU3S
zll?QvCA4y!%RRuaOY2V)$v&VxwEYPhT*a~k>#;vzDUgno2@IMc%zpV!l6BDOB$g2mj2#tkhQF_Jb
zJa%mi20r87!DHvx-c2-_4V&>KTx9hM@R7Jfj7H^UN4uGkwyBqUGR<0X$ef*s&z`7!
z{mYZ|*VwZS9VpZ`o0Jq04wX$GeFC4J^FZNlnCIoZV8LRk?5tjV7&?sKh30LFqQO?d
zl2>6psQ~u;pT_{3G#YL8K^#OttNs1L5Q_z&dWn2M7s=O?%=0$4AbMv*0~kXDMz-z`wNUpJGqif#Yt)M8%mr?6-PW&&Ay)>g
z!d4EJ72EB49N$hrsCgx)T>i3Nn7koC*|-h)rU3jkr!LitHA%>5`eI4O!=wTT^oxNJ
zyT250VnMEsGcYNB2eZ!hmpzaI>g`&QA(lN^O^}PjcHza%mm^iv8GoCWtDZj&yqSL;
zifa~ibr%;J4TBHONF!pX93&Vx;ky^80h
zw2~o`<3O0{e7oY^oS%B^qBfKXpm2Bc-@;#)XDHW7h(+6DIKy~7qTOCW_~nu0i4u{sz-hmZi<-
zE}UCMn{W;x+rqT{)u8M1Ag@8Pv2m6EzvB!zpbB`jg$caRP~Ts5nuKjah$h*`p}V)L
zx12DaX@U4HjU9``ZX_$9Rp%t7^VFkC&Gs?TJS^U$e8w#6z`j4y?6sF9AB=BlMSe#R
z0Qat6?Br8wOR*5h(O>!$?t&B)1j?<^M_2~6SREL?f=vD9noC6QV#jy7pUyKW@|o57
za|e?xSprg*#7`LM?Fd<4)g$KBl}0ibi}ER77nr{lD*xd#>N}^-U%#ZzQxJ(#hpaKU
z3v6L+l!ylN4!xE&Y_kyGTbhbl5WR;99!hO2K?)s++}_tB)xL_-Gg*gRL(990CyzW`0Vn{!q@6
z64>)GGkSGv>!k#xd$FJUkn|?U0E78|(;tDfz8JOfdDO#v=0iq)jNbAa52#}7-jl~Y
z?n$
zso-}4x!p(Y+->mjp21Nh0u3T&!!NeBKs4q<+%B;7^%0#;p#6F_!%;T-j0|YG^xoem
zs`s>mK!{H8wO+;ZO&CI;1L;#k&H~ttATQ=wXJec$z|A{Q^U4>0tToY0;41^)H&oK^
z%bP9DfVJqqs*%oU`;$55j*I{kc;>3A`REJOM#K%wn0fB{dVLVOKFClX)cQllun%^C
zD&VGGBzKy{>BYE>;53t+jVpYKl_73GNRgi;=L1UW6c)e0>
zIq>h_>&5uI2ZtMM;<0#ws&s@=R43hobd10wdXwW~h|9JC`ZG#9Q5U=|Pk(|(=#B3{
zQ`hT{@rIy>=)9q0!sWLsy9N;H~aAB19
zi7f$zro88vrt(V;vWY-_J*deH>fP&)Yr2T=Dj{!7kbJl*)z2oPewx?GxACyc~z
zEfj9@V-(~{BAVui5S{TT8uKit&LFC2VwMaYYddtG2lI#_bHD=*Qi$_9OXtpJ2C0xa
z0f8}@zxhRo%kRYQtq@C`ywV24MQGhc4%Gao-aI$-sFCIR+KkWxE8@>34SspW8FAM~
zZwA&HlveQ{#m2dX3wOq?*|sNsqmq%MOUUoSm)P2;7Z-vW-6$8!
z5Pm#`^82GFWfJ1i6V23Gtx<>J7^h8_!M%8TAk@*iyqRAX$=#P;Doy6LhD2Iff-=9Q
z_dUg$kC&GG*pW|D6w4s|j$Xj}33Vxb1sdTxSv<}NW}OsV9gaC=n&I2bvFos2
z5<`!Bip`h1F9!A>5mEo^bxUzvHcj_3C}I1CdJcuDDIxq&d|y+rxbY$bc)40bhfys+
z+&&8l>7MODSVU^_jXUe^nkfx954AA}DMl8
zsRGn>Oo-cNO$?CbC&$g~!>8qoP}bYq^sd+v=^NWD|M4!kGIMe6WW@jJJnx|d{$3PDk@$|Bu@*PHy0q9D_|&%&QK)9^yGRL(&4Plg^Gmbuy4S5Ovl@!AW
zck{sfd0LU_0acV+6Ym4$C-K7p-PhS*y>X=XF5ikq+_j$-}Q?ML+~R-
zE_3Lcw+E9)?{6rC=VYlGkkc5Hh*7^VEQcFj%c&ea>giz>h&;C$gYWXM%1JijOm;buNNo>STTMVmVp7iU@FTr%vK~czdufq&dTY=eO`+k;bXsI
zE0P=yQ*Vq+T1;|*Kp%w!g`%*3i5K#vMaPgNe!lr@-zyU&duF}~uq~XlD24oK#Xse9
z1P}&vVI_GoHgutwBPiMJmt3V2aU)L_3p=eKAErj@^b23Uw(l09tIP+Z8;LOD_zxI7
z&Y2osZ&nSD4stMerwc~-P}-qP*hD1v8{=<_Q`7e087r_x#{6_pd&1wv_9$e4aTz_+QoaIOsUi
zfwZQBKs#OBMPu;_1@A3U)fa|$7dD6#s@aPnNna~fT5s6*$(j6jkEfntA
zQplP*2E*nShR6#Ei&4D;HKuL!mIG$^mhEdLUUCppCrb}}!cyGB8tTOVGzmm1t=d{8
zHRKu6aAsIR=Hm8p?{lA-kKdpCd>Z(IJ9%!GiIyWmmu}4{G;%Q{`0;@8(6v4h)+7j+
ztezD6^zb6gBGGo1n;+~>*5zkKv@TV*USvRjGj~ZrR}EVYw?Co>*R(tTGrquEm&F0`
zPvufG*?#xW(XexgeR=sCzUUL->X+l5m@N|K@G6e_k%EAehAeUyfj1$W6tnm8k*o49
z`;-(4g&1;(XT*rPG6vk<@Qe0PmJtW-9AeIg7p$Ix^vM;^Au2|4G^g2AH=ZCfK#2=FKF+AF8yFy&cB-u8@&!L
zob$JlrSyMa)JUX2{Zh`5ztuv%iEoqD6V;0t;|B7?YKdGV)ihkn&~rOmWi|`k4d1s!
zP7=B4u`~?!H^TDd!JHY5&yVKE!LLXOSWulgAhk{?(yGaD^6pr6T9Py;(Q6=fb52`*
z-ndqG8#GPd8#-^x8-E?n+lqgkO==WyGdklI%BYE98`i3n{9*CAESY#((2Kl<;?U_C
zrN2&Grs4aG9kr~xvZp)lN%n)xvd<3U4&rLH*t(0voBmq}F;ze&G`x4eibVYi*H}??
zIGORh*8Mm5c|LHTtaEn{PwY5W*#OQEj(xkGI!3D5)Db05i=((Cg6CbDM*7{3HW=-L
z>zH=?>X<_HyrWaaJFjfF)}m)9Iz((1Zk;h~=b?R6SQe{_7P>Yk-2HcDxje)DD41vW
ze5?EaqwX!k;#!u5Q33&ig%C6lAVGsC5L_m~o#5{7J~#wTa0~A4Ot3+QL4vyk*Wm69
zKFl|J?{l8}p7Z{{-@Wr=o~PI9)lyYmT~%FO75hFebfPec=45&}f_(0omCEirr;;h^
z**hvDst?K$?z1#;gEiH`Cr$bvv``>M+0r^FGxp=!-eSr*RI?l+SJF?2+TXz*XZv!B
ztlaxPupz^ITfnn1N!{vtyW~Ju%Y&PyBqn;qN^#xrUq6h7#l^mGUHBkF#93-P9tEuMmHaSkQl2adAAidd3b%LpN_WM{Jtjfi?um
zy~!k)6!d3=$s`Yoec`+WFQ2fP6ExPi3&qk0cwj4SRnY8}{z3UL}FtrYZTgAZ`*@Z)odV-%rVrQ9O(LuU(KAjaB2>BKemmTi@-yf;x;-L0XbGvXdBH^s&H#nAtI=
zUmMniUP4c5zMfcV_ariB;C7cniVA}q4mB|=5&F!Z@a%9uhBL-&fAuOX==d-kvsO_T
ziz+1>v{WN!JLeuAvVbwi>C_p8b3-@q@~2I2viVH%W>8qyh!wB!Pxn7U{Q-j
z4mL&k8X3v6^=W;4VSKMl3@+8XVr-&o9B{OHv~UHaK?E`=O~~6+
zTsH?4ZR{3;02|0}ELxZrXQ^qj99pz+aQT;pdV?;KQQRvONQ*PNs>N$G4SJ1Ejn5UH
zRfWV|4=a6lg)e7Liv4!JRLpt^fi!Gu1U>0qBbdhBtOJN(u@-@8xry9_2ubBJrxJ|G
z_fBh`AK8F!(x6XTs{`SzFCt?3gzi+ZeEt`neS?Z@d((3x?I`M_XBE%7Bb1rkle;I_
z?(aBmp5CiTGswTdO7DcD{(M*Snz?zFZt=Y;;kbi-F2$1+K~=f5H1$n2kI-Jc2)N^TkZa?BK4gLw{8g)Gj;3HbwRCg&DCoh0==&A$
zHv>CZRfx6$U2M*MIoC6WAFCw6g)1xH?SartqibQ`;Z
zGKvb)C4-5To?>ECeu77bgcwg8IvjbfunC~Lf41#F?<&vxO^>s)^6}66io;-OX2xl*
z?q~1AoyEsRZPumg*aF%56X{Zj`gR7U_K5CI>kx6Yt5=$?tfp(%k8A)$w^A!~rx@W+
z9EI_o;A3?09^sN-jsW9H4h_?L%60u_T^E1^9sf^r3!F|~BvPIOdE!>&R=#Ot2H36m
zyNqy##_Z64QOdV2-Gi;Gp-bXb3=A10aVLZ|#MWx4aL+ANcJurUt-;a}W2Mmhbr>{`
z-j)0?2dONtTqvCBKlZz0(N~~y{b~nC)NaqOGj&h;3
znY!TI$W*80|I&OFoZT&Iy=R6jq`V#K7H5DfD%G#mB%;DXKA|7{mNu`-fWJUhW_hPk
z-`lO$s&JFR@Q_Lroo=lbYXgdH1UGahIs;J=aj}FtfH~
zvN?vD-f_8N^>O$2Oa?lOF6rb%hyx?p@D)eEwTr0z9D5DPLI+BJDnme-f}286at(N&f2o`Cuz0+a2ZFpLLI#{luurH*!>R@czER|X$`E_hwf7ND1`gQUcnZPMXa&-E
zuhh#*%V(|aKn4o}_qvFB#vSZ|y(xGJB^utZPAKDndW2mHKOKuOUONw3Eo*^J*_Sf2
zXXVYVw4=>fj0!jwaWn+f{YQ^%3DSxFeri-w0>e!+y9F&1QlU4%nc@7{^QQ^*Z_TSx
z482uQu2%v!-0l2tSPa)n0O#?K7Yp5~YNfW?MPCfu^j2(}^ZON$$_Q4WbFN8h;>k)>
zNPmNX^~N=OUo%U1+YHY@(fs412)OfPBxEBVNNzz7Z;ms+O!Zo>r#H`Z(k&{
zx*ORL4A~%0YN!ocrahkdgq^j(Y77+Fy$>b$uJ=jDO&ffBz#*iH;(Ohf_&AZ*CjXxf
zYEFcI&>GLq8xdCWJewtLXQ6D5%R0n;sQ&UwcsXBB!Xodr*n~z;b$CB$8z*pbEwWYW
zDT3t#El$I4xCa+r<`o15jz+UAtKDhyGsVBsc*2~(JlY)LS{`Z0h1AB=o_0j~
z_2<`J9<-F5jEW}L{e1ToYBZG7NwTwtPMrv-5J
z8c~%eA1tm_?~IsJb}luk22k1Hrk>N81q_c(BpeNgd2}X*EDo#>XN(Xv2UwmB
z%tvnbS#qN;&J6+!qLF~rtcuf$-QP^e77Kd*P^qy{BNb~LNkVV;4
z;8P6A)>LRj@NFIc!c`;YS@+9lc;Q-W!hKUzeR7jD+t0-kx5Q4}@Y`@cX05oF9bsmK
zy*kaG;!a-|Bs*?HL6H7zLCF6w^{&n4c`D5GFx7mVsd<$>VYfhFLJA%A&*5`wbCMS6
zDZkqj;c0{<2Leg~GF4@W^BuR^9fLQXaAZHkEJlpMzZskWd^gZbu7C=~ScwcF({~%%
zH3e_0<-<(BZ0#>=`4ImQrzk^p7pHX#nGTHj((}`M+)xPBPSz&KHpxVDrIBzrsRgXZ
z1QvMU6Di3u)f?h*snV5DB({`5-!ZYHxaKJ+#q$dJ{Ozj7NUlJva%B2NyADHZE?
zFwPqEFj{du^^1T1OVPSp=~or*D~+dFJY8zX&%@hF@cc${_%Xsy4<2IS*EwItXR&D8
zEIJj9bW-MO16K?|n<>?9IVb0;XRV`Gr^-q16RK!R)76qw#h4bEJM3vB3lV1`-^)|51+=8SHCUxNu&hjCD`!TOCSVb*4axee6jWc{o(^h*0#A
zYeLVpDAt=JnJjL^9}){5qeBZi^*&$FUcIgmM@F*Elle&~Vo|0Zp$*y4nCJ2KOsH=>
za2)i>J4Zw}E^NhCkslUgl*AYX9f>sp|8-wIB_tUe3bkk&N1F>F^Jhc5qyg9HJYMFX%7R$UsTGUdOXT=1gzZwoP
z9F0QxXIZCxp_#5ZMFbMS#
zzs=cOeV0vrGK+)$GV63U9=E!!hmbMm&&ONWfWdp}hWKl-pqMlX>M6F{;&VSse8YxC
zscG59{pua}&u9}U5&<8J6F|(j#gYTFP~v<@~?6fQ=_ta%08`=i2mo@1_#tk?<*z){tIzLv&BJ_-A<4ANV-HGu%hC~;Pc|`rc9;H
zC~o9A?uQSYzqUd;8ZOaHFjcd%X!lI$?KMm7wdkGLRrZTKIrw#r%jW58}vn1alT_J5cTs
zaYUM3;9s-VTQS2~R(Et%tp1&5P62AhYf>Vq0>i#?riX+tqfR&s((Z|#E7;-Z*omZ#$orpa$~1{fJeKDS}=~RRoGx#{^|so
z)P(Z6jCpj1ZBPBpb??{juh!0M-1y_<_AzM64EdB>Rw;Lc_!)~uA^zIhUg=tzsiJF-phsT)3
z?(HH?51|vDSu+c0rOsm96tLQAJ;I*4Tf~_UG%t((w;=qLGw|tYMSwlky)J+tQSJGz-)Se8
zTjXO?V`|e0S^Z|Bq;iPhqrZoX4abi}4NY0TZaTwePDrNR1s35%j|p$M33~M}%Tk=^
zS3F@#FOwbH?sOKiq
z$EL0S#zsj2wEO;{E5~!GA#=ae!Ndh@t0h+&PEF0-Ga9ii{X(DVEqB!NkJ_B$;(83_Qqk|w%_sJPD@Ld)Xz;JVqd
zlUGXH1uk#|+|GNr6V1=&AT~$QG^%XOe3=oWv3`Zui>o(%%SD=qpDB&H(q3pEUdA9J
za8SXXwOzP_2#UJgrjIRSYapcza}mI!;3<-sJr7RnSVcNzd;$5b(E_N0IqII|QTX6$
zk^D;U95|HP*aK^0WE=_<>28!T!mHaJ;t*MsGdP+N|1T~eI=6ZkKIA_$NbLTcy@&dV
zt0$VUmQuq(%+>;9eqO=(KBeL
zgdxq_QaJsgw11_WQ7ZZU1*P;ELsm+?j+>s(t%u>_hxDzB)m!~We_TWT#EJTLz;Le;`pBqj6nO)c;_z)Z
zMP53Rj?%?-3+!z^Yd-d$EiWwB&OxyYabGoNvC2*PIR56x9Wd|4yTUmBi`obOI@3hN*@X7Z**m;67C`+R);XW=v--k>JGC;7Tz)OWVN
z*_fteVCH$0&Ud`!ouIKb!SVi0V!6{RV>Oc3ntLRP?jmIj<&f`z6avRX4|WJ?nyQV&
zw<%<5)7f3IwUGk|JYUq^pZOhxujPukwSQ?{+M4zS5_TMI+YbjVcjT@kyknHTeDySH
zGcr3p%W6lO#si6tN*<_!&%)3?Tw)6nf|DrBR3^^?W0b(9vg8=k0gd`u|I*h(vZi}##_!A7e{b=)
z6uiYK@PmZeqeGhBv@;5PI}z2v1sJ09;4c2MdVBDclXZ>czit6Oe@3qE3KeDB=_~vg
z$jvo_yl_RH{o2YVSHkRTmmMxs%;tWC6eQq}CJ>ZakWS5i>8K$HdgNa%zL~`bR7^V+aUGA~~E{-^4;V*8S87xSWpVu9k
z=Qy*fQCKbH-tVG{yt*$>%R(pdRd2VygQ-c4tG?;Ll?w-lgjD4CC8)-%4OhM|c;?N;
zX0&XiZG}EBU`1hNdKna^GM}SX{Q?jcO|Nl|t{Lg58R_hETV#7%c@XYM;5WJakj@=Q
z&owI7dhC}3#cE}0GRi(&dB3anMcHU6DoffH1SbHTK4^NbG6tlsKHMUrdjOBZo0%M$
z@r^i9=0*dph6ZSh&mI?&VhlS!QMg?D2Os<-xcaW35fMHuY-gV8Hy#~fu6dtnPI2Nf
zOFo0^jCgt4(wXxFWZbfAnr;8go??c?%|7=@vdJP_)PEc#ELG02vBNcbZI(-GKAbT7
z?+uOhKGk{RhIF=&|CS~2T>rC!=s9r>rSG|w3ffWL`5Y*f6`~PjtM%c+<0XU}+a>pX
zU8y}mgY78Sc!=lkKMGvz8pFxdw~>h>?U!p(_cHMyzccMe<2~xv7|4Tm(zZ)^ud0@7
zVW(pK+O!pRh;tDv6P4>@|+9fZN=*?Su0Iu0I-c~2?79{d>t$Urp>9^`3aUVi;g6!^Z=
zL_Og?x0}ORSf(|1D8%R-sr?f3nVvHNJ6KP$&n&~BLgJ#MGHpaU{nx>A)W*(@ltTXb
z-D{%m8dgeQlfuvmT-%z@h7>`OxG!xY&ws5iD()v?(S5}icH7qA?<6|3pa5O`30ihj
z0Mlz>P%_PrxFL;Qb4(`wf@Y9PBVDnqTx%DVltil7ly?&rC6sioZ@4Hf~-leLV~Avc~~TI-#waLv$8sv+%)n
z7&gXk(6*xZxEJyN;d+rl>{t|ZXHy{hd;&Y|RE7ZslSInd-iS5bO>s^Ld3ZQH9P=hg
zqLeZ41K!iDHIz8iwJu`v@8OPr`s&!Yq#roa0@^AccPV(t=++#Thrx{*G;bOp^?Q1@kvL?mod{Ya
z>n8JOCML*ttH;mmu=TYaLD8r_#s}
zf;B;wSA}bj5@7yjU#!O7LieT+kxmB)nqrLs>G#c@iVV*XWRU58XUP7vd*j!c$B#w1
ze?TgEZxvL9N*ZVJ-r^}&pnUpSH*H-oq<3gS*L^dd7mGlDbgrvGL2DS
zJNuP8k~XdifbE4dcV%j?e&fo?e-iTKKg=3Vb$NQB6ctQ@p806iB0MZ@A~8Hnu>s*5
z!p}z}YQ_v$d>L6fT8tLc=F_|BXXq`rnQuJ%?uzJr^CKGG@2wKL1F=kuD
zp?i!z+f{SM0u%A`4w*p$#Zt!lXe~7IFl21^un$m6N-v5S)CF;5Yh#cM
zYju-KRz4LjgN?`6+mDl6nkD0Gp?({_cPvsY{9pKbJK7L?vCwxqjWBmH1rf+ABXYkf
z-LZe0?Nbb5Kto;oNyiOCJnp&P{SJt_rw&*TY*o%WnyEh#_TcBM#lN=k
zfuwAR{x$j=3c49T%!GLo75>kVtTYZt0xzFFW7oVlbl}D
zV3ETh=NT~1AK~&ciZ5+p5|7to@Q;Z3;F6}28?dZok;UA1Bl#xxw8ey7vi-2?DI`aX
zU}$5pZY3IOlEsD0ut6dMT2yc$3u7LL>chJAGe;AWzS^sSuWgP&=27OHx&{3UAMlMw30_UU^nnduw89@Y@qH-uO+*DGzyjeT4>bz>{{ezS>y
z8SiWV>+vd|2@%!nYt@E|u|3z8`%Fu~!E(v$iN5X8o_K-UT6MJO0?xUE6HE{ML#7Hs
zhx_dK4w-;MrEv;zGZ?7IJwigBrjvI2W^+G@k~+jZsf`{_)9fgaPyCRXGZcg#gEV8--~{Kih_djr}R}}c;XHbOzDbItkOq9KQ4tgxW~z&e!G+i&zq~U$2r0MMEnFI16Vi3VE6(q
zoxKcD?p#&&^VdRpxgEOOUA=IyWFiaf0ICm%
zS#Qb51#D*~*l2#NX#XhXorT8OW(zzdi^1FcTzS;9J#(MBuH16pl3IO-dYaK@cG8sA
zuac##6qQcqF3n>_-EX78SsVXNwlXeyg{`B(eWrFf*8#@fSitAAsAxAROdG*q0icFX
z16yo+B&1N;YUt-w%jn3!%11lOK(d357yZYlH3MTA54W`PtzpnOLq?D$e8G0H
z+HA3S0ccj>x=_wGz_YcWwztR(y`REwt7;;}=vQr+b%Jj??y4U@8rSW&s6ABi`UT{z
zI6$kRZolPW7e)|>H29~4cB#LK+Xk_S9a;RH~j7<+r6Nx(r{?;K}apY
z$0%{fA`Q$v!K-nQF{LWlIgNJ=*M-*V-EGgxdb7=1_$r4;BPjtTCf(p}>~V*fF{~|@
zk4b-(+4dZ;4MS977C{n-86z5ho6-v3U5^JOS8yeQf8YC*fpN$cvRP#{D21SzzY5J$
z6s6lLC&cyKwY<1HIr%^E@(*yPTYac-;O3xD;z@r~1}3ebrddg8UFdyJ^~`>nUlPnh
zoo%Wr+^C!2*kicCk3tgA&Qj(`f}k`F+UzOUDAFS5I%vo)yH+5kTdsCoAXgYyxazOW
zE~C;A+{vqi$te3wtz4_reim@^^DJ%ZJMsq8S9qH-It1@R65Q!Q*Q)M~-o!jG_iIq$
z*@C-?<_D)Zlcp>FXwk^rdEKRHMuj1@E{X`2G@i-Tp*bI8(Iaw7m3EPwUX=!ud>t6~
zfmbQWtX!Y^TjHQTpi)Cd^x^YbJ1I^hn|PQy43h-3uP}-NBbqwQ+_5!m#Qb4X;!?$*_r(=c(w5
z{P&vQV_D&zSIr!+L@gAA2YAe+Nt=4uJx7T7lPa}5T>9v(K2jE_Wa|5u@c=nUi%22o
z@11Ue4*|KFiB}2(3kqjdE|)&%W1
zAM3;?U$sB@`nRUD)-a<~KL56&wv_I`;&5iFJKecPHTG-nf=mdu%pGTKf`Fac{rHm7|UlEN|6~PSiIzrM*U?RqO?}Te%hw0hafN%Jd?W+5H
znY0&06{t7+-pv^+E6REk%I#Mz$G#fU@RKqntLJp4htT(*3zDR#%YW85=k2L`CxQZ|
zUB65jT<^08#F_&jnCOWRQKx3TPJM%Eme8j&;hkUEys&X3-v)9>>o~~;Cg{o)e1+)a
zJX<(lV_w>K-KTbxPL?z1A#KRvuH-FmL?U&1xnidyY%IJdR+CrGF5OOSGOX{!QV{M>
zOg=T%TizbF@_XkVy1#e5Th`ZRdPx!BAmi;1`T~&d#A&{wv-kE@coi0GvES`~<|!6p
zJ76wH65O}X@cph}KTmQ0Te2SBK>2LN(pEGXXYn_t6qdR*_=~-;XR7WR>S?0ADyqB^
zxB&)L21CFkhp%yVj9Gh)wDUk*D*F=b#PXcbO_47`jFmr?m5JMcR>-HrO#BHRFA9m_Ll70ZF5ffuSO83
z?NBMp6vN_%tg(Yzm=crcGxpd#J@Vih#~@B~i@}VvEvB!R^s#=fvXie8HCp#GCa@!}
zD%&P*C=qxvcobFOxL&k18yfe0W1gi+OQq@NcNTjOIJ#W(zxP%ZX(vPv)VD6Qx#~tL@&3~@u
zC6U=N6=>&}onuQRu7q}sb<9kg7Gq}SgY{d5I}TZcDjw~RntfYGHMWzUMnsyKH*5Z)!zz01RExPa!N#?0+SqYR_vi29M43Ed
zy+YLW*9PTnQrq{b+a>NG_%a-~Bzu?vdP;s{8OPBC7h^fUD-f|KiR5X%khp5t5)Qr#
zY>QLI=X_4!xOn)7dD=N^g@(pr5QGF7(|5KOl1waCX#V^3h`xtSw<4*jhEzV9jIKw$
zfx-4>S2B|IDty}UD|T&7lH`XkE=gSe3=zEIT6%%@8dZ`P``h0qWW|QSY(qdZFU@2a
z9fwc|XUOM0^H(PYA6)C~JfUOqHWu5lSynF7J(1q=n9oNHAEVpTWW41kS?J*EGN2!q
zoY5y9_$VFA4pNgP^zg7k!<5VWfYWJeh^#is>kvo3^{Qs=nYbwz{G;5TWJJl!T}&xC
zmrcLSe2G=Cqc;s!V=DI&7Zay7X=EIZVS)}7Nz$ge^J%d`U+bgw7uNg03Sjd=p!`Ud
zUY0?14~;4Wci*S1x*b8eIzs5}4(y4E^b8h?|V-r;5FJ%!n5%MK#%pf`VH7+Ki9N*z?8v-c8hGQ(Z*ki6G&a~mEipuP536y
z4K9Qoe=w~GZ&V94rN8y8z|}c@5lnMkV}D%!rRa3M0cJU&ww
zaCqW(F6cS=fwxi|6)8!4_0h7>?*Ea(euAkg{dw$D0op>vv{ao2+4AwHbNLNSCAowW
zwxe>fo?yENRuqcWpr8KWk?bCb%XOh0hibuU{qNwqEA=&i&4UEO_v}^G-O0Hb)tkCu
zF7qNY7o6kcP$pa<5yM6D6{ut5L54Oo(fTS`zfq7kU*M$t@$pSoc>G=8ZTlg$r}!Og1~HI`_4@iiIa!7?#k@$59ml%jJ#~|hQUO>ey3I?ncgas-`aJe;Gj_4JBo9zDqkDKM
zdy^4qU}&yw`!%=h?PT9!H+Xkw0q{8?T?PIcOJ*Ro*nw-tF==Kx3d1#vuEq+s18%JTgKOUl@%D4$#+MKL(C+-==hA(A+V;`U
zV7jtzGenjkZHl;=0)MV?+zeI`Za2@F@_=5ZV}PsLcsw}+O#?n-pCu4Ds*pi5
z)jM6-a<3-bEzeurAlHth*t^d`rgi?%<-W;=K}=`$h?HaVIEWnkMaP98qj}sCaloWA
z(^GVOW|dVnkfBG*fbq=Orz*{!{>if|S?&x9ndiT=Ixzdp>
zmHQ!=VoFX)$ILukT;=8=f9aQw9WRQ2U-emcpN^bGu^8=)Wy}eF=pC^>glL
zPo`Jz+b`z$%sUBVn%Cv&UNes(*V3n#mNZZP0>xL_cLjgxYybRG#s5~`{w{oF`e$?g
zyO8>ig!ljA3p`nr*PMxZ?DHaz6ztj$-%6*UDlD%N20zT$2ae`uWzYQ(Jj36VaQ_+j
zcE}4XK6zO9?#BrM4~Mf8;B4EN=Ly8GTD?3LG88pn)%w-oNBN}*fc?3PjD^4zboXAT
z;s(FzXw?w^?-rauG~%ewe@~T@7BF~Jrc5)0ml5ywn7U?B6iH8^{axh`*<0~n%3q`x
zlIj`u(hJdLh8kj%Jm#-;6@)EGDvdiANGhw0*j$Hp;Ev5+YiZZQ*V&vW5HIC>^25}r
z!QrYrBQ};Q`x=dCuK>7%0rN$h<%(Ras0trL!>=c>{3Vx2C^Es3!AF=dzHqECKc5AZ
zEJdV+6KAG2uE&|8vW!2cZ&&5Zb}*lX*ccaeKT()r*93yUGCq6JU1pZvUV48f+wmX#
zh>3j<>Do^4PC$xwIx4!83O#RRBA!exbH!V@q+lkRy|uLneh^<78nb}+HrvHz)fnLv
z@GBt_9`kM@A(ks_x?46@#Jq#R=KT?u*^!|p+DvnSmc&Z-i$4j&Y>hO!gFd%ut+RY7
zc;|H_b}|k;jXDEcY1g7$m7yBW1&2h9gBEidB*5jMQoeUUfCJj
z%pr{V`O4ws>pW7-yjL?~6|KtPNZmYj2d_g3UTp@zFQ^qZyGNqAhQ(29P7czM<-XS6
zKZkgJ;A3)I_rcQcqQ}J~g>i*l60aDfNf{i0=jh4dhsTiPXvJ-rCi!*}Tqw6!^R{ek
z{2!csi++J6^;y#yT}9P-{qRSj#+{Zs@2!64R;Me+7AH&P?>Tz|D~ATdg*kiXgPll{
zTJ(x4g1b834cJD|(&oxDh|_R|V{)L~a`map7YR
zUKxk(_(J3ce|yw3TB}bI_hc~r!vj$|@@U0>8CNijI=l;$8Dqha_Bz_|Q2IXgEKlnl
zHcoM9)m8ZDNKxN{El&0cw?-{Z`)bf-5lFmzIgbN>(6_`cNi(vi6Jcq7Rc2Cy@U59T
z(MdCpcBnHhq8xZJz;$hsN9IY=3I#Wf8|ZrebagG8U9!#|#<+!JZ}TJv_?5w2yowF1
ze((+{o;4e^pM}@z3n78Ld?jz=MuA7M86thXE-|22lgP1iVc`?z33Yi
zGGgIc0j+hizXdorGzfYD0G8%Je>agyA)6!(nl0l3yOb1i$cU2HcFtbTk}jK|MEo_m
z*NW}OnA3{y)9j)W-oi`q_4L*qyZ?i-IzLSouWN{;6+(dd{xB9$(inSy@0)?g1%S`P
zRJi4+=ZvF}QIUO`CSh1HhcGV%1}%HpNgC+B#n2k$Au_AGCvty=xFZG9n;V`{KkC%E
zy6#EO_?#Rn-ryTP+M>y<5mWoXCd&X&M^MdT>)4=OSCDs&^u^qrW92p)ue~=_b;As4
zw#K++z_o1vP%ME;7g4@FSaLk}s`@(nu?%|JXL!qkY-X$dE*hsq#Aj8}wWPtMs7m)I
ze81l2)_9(`@rT>njubIAzr`2gnI;sDCJniirC3#W6`Bpnm9BlC0T|n6_
zDIzDuzzW2{Y94$@?{bi?xtO>hWUJm{t(mrJ2V&E+IjjfVGp^p;^J*Nq1{dd8`))Zx
zYmFs}Fr(fo)}GUr0xwrj?-;p9B6{|*3lma%<0xFU
zdH@)SgYG~#-2;qIjC_>Qj<~&9D6)jLaf#Uv5`%~CHscM8T$*76oh*jecys3|t`%jW#(H(vuxC5lXuV=3TvicqxEFlZCS^1mbnkfYzqd@3KmC9072%eO
z1f|5g68q@?)TBjNO){w^l|Yvuh_cpv%#>z_Kvf7So1
zFUWtO@V!3%@5vh^fD1>Hfr}zLLn*$R#Z!{b$%QtVqDbZF>FpcSs=6WdSp2
zzOal(PT~AhSBm8AODAa(5|VeQ{}VW71T;^+75?7)^7MZJSEgdV@YxjhB@OH^xgQ0k
zBVOYB)7LMbXO{fWA=E~_{HFutztPLL|4*U#XBMTC^itM;je_NG>F@7P{yzl&|EtLV
z|99tnZ;nN-+R~JNke0^p5IvFlb-s=&@efIK2nQoc@l9ghgjs3GBFkU`%^&Hxl_QmZ
z3A;;N|21=DRhC$tkuYt&Y&Bu044o`tzuLBhNS(ED@3XCdwV@w1q+2+Mx3oj$Pvl1a
z=_2MWatVC(y_^lOJ%n4(hDn3l2`96u`dTz_jx>_Zlhd?;C=Dh#pO?U-*WPf}Ax=4H
z(`u(QlseYja9cZ>$zbzJkkxYO9|}K2`>Qb_57^z@J^L8_mi6o7*{8Op!Z8Y;IJGMr
zK!zZ7$tou;sHd$dmtd~5E>)jFC1}aTBax|23skOnuM8T{`2hTfL2Va)#`+pu^Lv@X
zXEj&}gZBQdVzo}XQM77>|B?+i8Bt>3qW^Tcd_(yxPSj$a187znl!eLb5ZhB4y>fri
z{?YfoL8juvN9&6}XBK-#ut?j-U89&r%8bbG7t6>2jHZ64c(!3OHjDwXQE3FS;aiq6JM
zB%zOc-vT=6_PA2A8#;6CT3Yw};Dbe~BIoW*FBpFF&A-$CSkoV({UeXQ
ztV;R2ILFK(4D)If|FJbmBF*vW5WF;f#pkd?oxFI~Hu}#1hb!mW}JMu-j^J07@{jHEDK+}?XguF3I|8InR
z<$sIZjijAYQr_16VY?p3I*w##vk3@_zuUC&3xeHDF^8}=r5~?2&*qy{38bHNLqCdG
zD}4`HgqhG@<#WjDr0+@`sdA9?RgsE0v8eIr+4zhHL6Yg%ZmfvcgwPt#`3!gdMel!;
zXw#71N}P|>@sLYaoGt%y8DMN+H;yV)2Cb*BCOrz6vLu`mn!G8OkmIx$BAKTv0t(pY
zX)w`co$~n*2`!aqE;rCisARkS3|s&33X+}lSwRNJ1vG7QZ0r@Mrc+6XMBo){b!!6kG1Ko7ttkKb>E=WNGL{e*~S85izRzBwS4vP({6N+u~xTzL5zw*I)epz!$R
zHHc$a?R1wNhaifycQXcQE^@&GDa-Jv!i)171HG9{F}jpHlKY<-y{8j<
zJw;sDj2xv+H#yAhch*~tZARLTiz}yzC#sc6ydzx+Ly9u~IeOP}EryeRq_A)vWKdXR_b(ZN$A@uH<8mQQ^X%L#}eF
zHf;Tql$rZTlumQu@UW`~w*q)~lF1ctQXAQDuoRpy`mTB@eKul9r8+yKh2h8wnWeyu
z`|sIwJp4_9vHn*c?i(3xvN#FJ0ms+1Kkw|iFqV@;KkFV3CFI1reLjy&ph`SYmbuPw
zTQU7UmD!b|+%DFBFbQ6NYU{^&H!ghJY54ni^_IL!t_6_-a9kUt=B{j
z*%Gik|EA}yR^3M@{BEyxoyVk#-;Zg!+YhP%F_GvJ-Wb4tEWc{I0_`tExSh>bYk6L6
zG#}Y>6Jywix+psz47er$QhV*EBT4B1N!}CNbCEuT(7E3PSd!Tfe?aA)mlc<32or6N
z`})dL}|u^Mk71RZJ%fis-Zao84z3
zfxy*z+eJN-VF84gf8V~4v&jZp6{y
zU75&YnZdN#N0#`QJnHtdMepTiP3eS{^Z1e}NE-`BkWiGj^4@T5IjJD^1L=H0@=k&Z
zN3y+FDUx7(EjY4epnNAUtUdBcukBd|8{z9?dkU+k3JHach;0t*gIEXVOIfeeaGjz&
zCpgYblNZx{gwm#0>u6}QkJV6D(59SAR`Nls9Db2{a%{2fO2j6Tu7SX=(?(!c#jkVG
ze;d$T#gNRvY3;yJz;|)@awZ4yJqZ##yoEPFp1@0Q`)+8`tlR}hLd;;B-L`*9E%Uv;
z({28e60>5V$h*dGL?^=l#=WQ^QX;WCnXrRx-X+wnBcqU}!|qOJD8KlarO4eaX
zRt2gdh$OO_kMofMj~VScIS*xqqk7qWA1cBM!-mPpuT1(!F!40wMT&v@J?H}|Tjf=6
z>M>O~va4Y0LSvi|NN))5^CYCX)%OHb9?l8sJuKDms!Z~6FrPU6(tTh=
z-pFv$RL`o}U~^zRKo#NsTe~N>HS2NI%idBG=^CS(z(X9&EBbFPLMx7HQK}>^H+lS<
z!n#$fLBLqX88#kdhLhky*RZvsmig6Q)&??_+-iDup)}~8v&rhpi`k+KZCU
z@SS3@gB-YQ!tAoGQartKdJ7*OPPdidu9B6kTBQP2n=UURd&5mUmTm1*IUQ6;m@qmB
z_m?516J)a<*gDdw+ExaUH8lgxz-4@|pdi9)z9#2;8%QqW>eu|n_bJRWHHN+H}I#xq!8(3^FvoMYnIpRLm%^jMbJ@8CdyMj}zRckcPlbh2;
z{Id?E+v2KSEjI-?ZqX8|qy^T_?&eZev-TTg-%g$i%uW+5fC>NRKz|%QeSg~ezL@N)
zkPG0Z;cPx^EmN|7Vyo=T*}$YJEN|oWP)FGlKCgPV7D-<9DSdX+rXg!N+f0|CN^T*J
z6`hvq`RPI}-K}B$X2ym%xKXR3NT;fn-#^QGI{8Q|v)(YJ
z5}em4Qx?
zB1%g54)G`0|uA!f{oF=HJn4Ot??*oW-QSi&GwzR#(1Ua#-p@cHHWZJyWr
ze%{M{-Pd)^{oZ;$jj1K22T}SG-^(y-%6iZ>07OfYR6Xtm_R%?1-HRH{vz^)u-uad(
z)m*)ap$07pR!K0<0V0kvE0rOxJVHPEg$jy;s9*5>2kdqpR6KmD8DYAX_HD~Qob&1H
zY?d8ua2Xu7@M0#kX;hvN{JJRUh#G>te*x`%Md>W5tyh!jZhP4|-%&heR!Uil5b~a`
zLJN^S_}FR3w2v3FGuu=omFONlH~GMFuLaw>Z-Q8#o4ISjqAYZQ`gsp6=g!g9&`=J@
zzR8(G8byH0{onTMxhNc^lPcBUqKK27jI1vnj8rIX;6h+j$(h(jMBH7{I=t
zYd^Jl7Y?S{2t0!5wqE{6|La-3HUV2_cEhfriM<6
zTh*Q19{lq%9z-}2rPtCPIndYw3*0+-ulgz&Ul$uulZFVN~
z++jTX>-HWcpe=5o(>=bfDLOaqZ*??Z1H`)>2
zU5@*`^Pqo;GsBT$R~L+27Vp?dn0|B#XT|=I!;7psk}^bfjg_30d-z$w
zYeu2UlM-yc43cy9gHCNepTu`a$qHHJ2ItcLs_PPB9V!L&7JFWf?(p*SVQ8TgZVPMw
z02beKYFG+n%;Bk*DQMvyao^0hC&bK?cGSGghDLnB0SmEP4)o}`m=x5r36FKS{t%_J
zl4G--p+0gDmS(zgNZpEHD5dtKySUCI`X?v
zZ~JXm-agRL>hA&mCkT*>Iw$iWXzNh)nTli0DHrvJ+m|0szU561S#Ip_zJEwLJo_pa
z`ZQrIr3&jq7WJd#zgrn`>9or*+?VN8Vg``O#9}WsWwRGYU%J_VWaJ)ydG1-`L@{kg
zZy3FU*OI)i7QVzF=u6GF^!qc`dJ!+yclY_R)_FTeu1|y|jR@*|I#4-n@$9fDy=1p0
zpq)Ltvbfv8s0^v;0A7BJd^kdz>A#A2XNRTe$<6zx4bUYFHVcvAb#auF*xv9fYday!
z4W21T_tKD~AWbq(C~K1)f(5zF^`Gt-7#?D`WPQ0i_G&AV*>LF}#q5+CPyyalEmhgx
z&!RcX+4z>4JTWh#;Sq!SfZ^tC{@Ih9Z3T|vI-k(5Ov$OjwlnMuwHHlRbKP}Qh-CX(
zprb?P)&hLex>Q@7*tWx4%-a3Cyh-T4z!bYa@>1j6a7vXAl-X%8GBnw>)v(Er;Hd3=
zsQ)IaG;y_&y6s7kmd~DN>Eb~t$>!iAG~5-RocCq4uhaZS5C8lK9Y>MJb|5Mv(n{yo
zXa%7+AUr6&@-HfM^o_RgjO@ZOY5C%$(PN16m?6W^CH`dlYx(GbCU40fv)Ku;+<(W#
z1mio`!T$7Y8yD8sANE_slezl>N$1|tlwjZzcNK0Ls&|^JagIRTb@$$>OE2d>f)_oA
zFiVAjT~mVHhnLF>7hdh0LeJnmMi|5#dC~8yX4}RFD{$xl!Ga|vI;Whw6}H^zNt(J+k`5Ba^3`wDD=)aT
zmDg3d;Ch<+B8(P&DFF&o45PU@Cmt(Eu6x79$dftf>%e;wd;vdAe%-N*t#wO|a(8e2_Z*Z4&Ouefqx%F`0l1D7CfiDVgVYuvC`rlhk9287L|kJBAUt@kFq1bCvZYVO+ArnqES
zLRE1MZwi%qR%wAW=@sohHF9|JbJ7S&dZbjkn^=KZVHKVb&Zf?JHv^*#v~K@}XVER$
z{CoyZvD;mQTEzqZ;Pz&RK)SOR7lN4x=&0DK54%4W#P0p2#XBQp)xu24=0a~-O4*+W
zuB%xMJC3$57ZW>F>%9WWFA%CrK9y_#@#8p@b>AWlJWuYwAjl(PQeiW=F|Y2d;31-{
zDki7w#?YHV`LM0}nEWdNChh}pe8KDkIG7O<3_G-`ymVFMJhd1ZN$pR(UrZN!E=_(J
zSzv(8)E~aLcCwFDUNd~lmaU)a1}o#}ryAJwcc(oP!hS;u$QBZzExyl*j0PI!!*T_i9?0trFmm4H
zfk*sfxv_!j9Vp5l4@|^Wh>K@
z4J-RTBtj|K8}O_?L9_9m6&()seZoEJHa8h=h1!^5Oh-BY2?OmOV9)ZRw&x&}LRz0^|?fSyU&y||I2xGK|K!C(!P%1w?^V0w*r)0pRU*n|R;EIM_
z*LaHHsdabOkQ58D3r)pj^&MPe4|XkMk5|WY6FD+g^?>Xv3duw>!?dV!Rkn!}D;|$V
z7E}E6FOL>u9d%CH&oPI*S*I3!;IUPF_PJaC7Ja4wrL^4Ht3-?+h~7J;T4c?7FpnTm
z+ZQW|z9!g?(Dy~qR0G{oUk4d61Ibl*5(zgGf0e9p0q*!TtWlHZEA>k?84qF@oJI}U
z#2V}N+@2T|)ooe!*qp@iSfJApmh2*u^w|whAB{`Z0e4=%D+`RcdY!R@6DBYun;D?f
z^=ar3)>KA}9|7ZA+*of8`TRpkcdF5J=YUTP9y);4|G&>=q
zYJ$Cq$P0^9fcQtu+50_eY?A%&h`=+{ig}e{KAg-f0jYOJ!q_t;Y1`pwzQm&~m4zj<
z9VBM^E^-dP6Vf%+EgTOmzia8M;AZ<1n}#R>&(!e$_`W7z
zosB=VzlO>CLZD9m`YCyGNRcx*v_gB#^WAZhAOkZlf0lgZPOwEF^nHePgnz{3NIb%W
zx%9x_EWrpW(Zf07WW3O0C-2X@#%Lv>p*O0e`t>21UN}n>8yVQqB$`<_zV)`+x!~DY
z@G1J6*Mcc8aH!;8_+qiyvV5LR{$1Yd@?do#tL{ErAh(EnOY$j}7`~lJi4S{rL1GA;VJlW)#dHqfbW~M~jA9b2jaC4%HIFK70{n1(cG{C`Nps6D-L@27s4_XP{weMSkz2
z?X9Ho=MlKZMN5)BT?(d;iUCC-&*zVaOodiT52#T3aXn)5A>~i!SvjTB`MqIJ!mV{0
z)PqkVDqZNF{%Rcb`Fb>5MCQm+jSUU3X$Y3X=u24%AirQ
zW$2kU%P-X-5Vr1uW;zHza*dndTlzVcB~K
zp~&-nRcw>F0XY>2v)z)hL_QrEX%Gv6f`Qbtc>FG$a!38r>|y5J%-!%
zlb@D2L&=SnBe7!%bP{8sii|RDhqf8o^nd-P_RaM5??1M?q5?o=R7|)i$`as&R+{mo
zUUAXrb%h0@XG$M6=|vj{!g-6NS-Gl%8Md9JGPVvG*h>wEQfj{`69D%k3o)rfaZd{t?pS;|}eA^7>d7h}P(R#N_ii@A*=viDgxn;r_N=0?q)Q
zb?Q{IpO^(TU;DF(IX-o$Vvc5Su~+@AjZq4C;8oEZ
zu61gAVSrwO{^?8?kJ_acc(}cyh)GR{W-1x}ppSM&-IYUct&&H!!Q%^Y)-5ni4pR35bu
ziKuYqvtnhKSM3CzhQhM6h#n$>j&#jmwvewusE4CMFPIZ8k7#ypDoe?kgOlBaGJS8+
zB*iwA`7RA(qLR)M1}fyP^z1UIS<=WA3Q;Qy)8DeBm4$5&2I*3=P>4#ZEAxe9&e+V3O3HSn0}$#ox2h8hbQ7zFGngN`c3g@p>*vOn
zgvSSei(YUj*zNMETXBt+L>J9~5$a8IW_xvOkGQ}!MSI;McuHf(U(Ie>ZR<|=dAnnM
zH)LP&T(i-}WoT<;o8fwgBs?|-cWD`9XWc5S#!;yxizA~sOiOv
zRj9tP1hYnah-6dk6{_1&HH;qid4XZVK%kwdtz7QM`uf-TO%9)*rN~7IZU{X2i{@eL
zw*G|@8-dbE7qxBp$Q9<<(i^ZLPPv)R&el9(dVc(C|62chL
zIqbRZ<#O#r3aZi>xM3>~cHA_AusQba
z?NoFpy2vR}mk#HuZQ~)n%4Ve#;d&Vnm=!ZfQPv|Nh-qjt9*Ri7v}B7mR|9Pv$ARD6
zbct_^c6~C>q7m}xXRv%GSC_+;!@yllN|{PBSV1{
z>pr&`sToFF8V$1>_)pjx>!Y
z%kW~TMmMAT@2+n^#oUrq-Re;rU4h)zQmfQO7kDg?*wGXi2J&8pzGmD?F%`#B5pF=3W$_rWoL#1AO+u>Mst{xVU
zTQ=YvzW#@>XKB^r$@1O^FoTUBB*rr@mwHs-}Xb%1ZHy-1P3SkQC{vbYk*x1IKmQ{Wt+Q>H@xCY8
zB<=I7)1nGkd=SBqf4>E(m?eQ@-s=BpV;Yyjq
zlq+B{VXB|uz8!aDkN~%eY5E+5>otr_RbJQ^y`EXMebG<~R}}sUM@gdwf=Mumfm#i|4vAE
YBurM7@43IY`ki=&SlC^lnqRy3e_E9fk^lez

literal 0
HcmV?d00001


From 68b8565c947042ded9070c3782cb32a0508cccfd Mon Sep 17 00:00:00 2001
From: olivia hugger 
Date: Sun, 11 Nov 2018 18:43:04 +0100
Subject: [PATCH 3330/4996] add icons8 to readme

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

diff --git a/README.markdown b/README.markdown
index 15ed9ec5923..3732e34138b 100644
--- a/README.markdown
+++ b/README.markdown
@@ -77,6 +77,7 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 
 
 
+
 
 ## License
 

From fc60ecce2d415dc86919dad71341138bd452aaba Mon Sep 17 00:00:00 2001
From: Matthew Rathbone 
Date: Mon, 12 Nov 2018 13:10:28 -0600
Subject: [PATCH 3331/4996] Added 99inbound's Jekyll post to form resources
 (#7348)

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

diff --git a/docs/pages/resources.md b/docs/pages/resources.md
index 5a1df6d980b..4aaf9488085 100644
--- a/docs/pages/resources.md
+++ b/docs/pages/resources.md
@@ -54,6 +54,7 @@ Use a SaaS service as a backend for functionality on your Jekyll site
 
 ### Forms
 
+  - [99Inbound](https://www.99inbound.com)
   - [Formester](http://www.formester.com)
   - [Formingo](https://www.formingo.co/guides/jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=Jekyll%20Documentation)
   - [FormKeep](https://formkeep.com/guides/contact-form-jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=contact-form-jekyll)

From 84cb2cb06da4fc3c86901a4d489d206ce4fcfde2 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 12 Nov 2018 14:10:29 -0500
Subject: [PATCH 3332/4996] Update history to reflect merge of #7348 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b6c64b50709..659ffffb183 100644
--- a/History.markdown
+++ b/History.markdown
@@ -74,6 +74,7 @@
   * Add info how to deploy using pre-push git hook (#7179)
   * Textile is only supported through a converter plugin (#7003)
   * Add documentation for custom tag blocks (#7359)
+  * Added 99inbound's Jekyll post to form resources (#7348)
 
 ### Minor Enhancements
 

From 2acff4a5bfde5403582b0957a925947dd30b12a5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 13 Nov 2018 02:36:37 -0500
Subject: [PATCH 3333/4996] docs: document page.dir and page.name (#7373)

Merge pull request 7373
---
 docs/_data/jekyll_variables.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/_data/jekyll_variables.yml b/docs/_data/jekyll_variables.yml
index 3bb445b5563..f2812381780 100644
--- a/docs/_data/jekyll_variables.yml
+++ b/docs/_data/jekyll_variables.yml
@@ -124,6 +124,14 @@ page:
     description: >-
       The list of tags to which this post belongs. These can be specified in the
       front matter.
+  - name: page.dir
+    description: >-
+      The path between the source directory and the file of the post or page,  e.g.
+      /pages/.
+      This can be overridden by permalink in the front matter.
+  - name: page.name
+    description: >-
+      The filename of the post or page, e.g. about.md
   - name: page.path
     description: >-
       The path to the raw post or page. Example usage: Linking back to the page or post’s source

From fb0f182a5db18014f55d81a7117859fd638e9a27 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 13 Nov 2018 02:36:38 -0500
Subject: [PATCH 3334/4996] Update history to reflect merge of #7373 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 659ffffb183..1436d8ac13e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -75,6 +75,7 @@
   * Textile is only supported through a converter plugin (#7003)
   * Add documentation for custom tag blocks (#7359)
   * Added 99inbound's Jekyll post to form resources (#7348)
+  * docs: document page.dir and page.name (#7373)
 
 ### Minor Enhancements
 

From fdce19e96659ba108d9e1e1d7a3e020dfffa6040 Mon Sep 17 00:00:00 2001
From: Boris SCHAPIRA 
Date: Tue, 13 Nov 2018 15:59:20 +0100
Subject: [PATCH 3335/4996] :bug: Fix link to Tidelift (#7377)

Merge pull request 7377
---
 docs/_includes/footer.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index b08e8fb9529..f5dd5d8145a 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -16,7 +16,8 @@
       
    
         Get professional Jekyll support and more with
         
-        Tidelift
+          Tidelift
+        
       
    
     
    
     
    

From 39a240a8affc3abf4f3d23ac24cd6cb69e643c55 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 13 Nov 2018 09:59:22 -0500
Subject: [PATCH 3336/4996] Update history to reflect merge of #7377 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1436d8ac13e..de96e269f92 100644
--- a/History.markdown
+++ b/History.markdown
@@ -165,6 +165,7 @@
 ### Site Enhancements
 
   * Add Release Post for v3.6.3, v3.7.4 and v3.8.4 (#7259)
+  * Fix link to Tidelift in site's footer (#7377)
 
 ## 3.8.5 / 2018-11-04
 

From 677aa49aa2d84dec175febfd136973e85bf3ed7f Mon Sep 17 00:00:00 2001
From: Boris SCHAPIRA 
Date: Tue, 13 Nov 2018 16:02:51 +0100
Subject: [PATCH 3337/4996] :sparkles: Add a link to OpenCollective backing
 (#7378)

Merge pull request 7378
---
 docs/_includes/footer.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index f5dd5d8145a..e25286d9713 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -22,7 +22,9 @@
     
    
     
    
       
    
-        Sponsored by
+        
+          Sponsored by
+        
         {% for sponsor in site.data.sponsors %}
           
             {{ sponsor.name }}

From c65b08aef31cf81373cdd80399797aa761162abc Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 13 Nov 2018 10:02:54 -0500
Subject: [PATCH 3338/4996] Update history to reflect merge of #7378 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index de96e269f92..34f34e23ec7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -166,6 +166,7 @@
 
   * Add Release Post for v3.6.3, v3.7.4 and v3.8.4 (#7259)
   * Fix link to Tidelift in site's footer (#7377)
+  * :sparkles: Add a link to OpenCollective backing (#7378)
 
 ## 3.8.5 / 2018-11-04
 

From a642f31144593152587630e1f24d9a6c7f6bfb7f Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 13 Nov 2018 16:04:10 +0100
Subject: [PATCH 3339/4996] chore(deps): upgrade liquid-c to v4.0 (#7375)

Merge pull request 7375
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 2b91fba49dd..a8a1d80811b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -74,7 +74,7 @@ group :jekyll_optional_dependencies do
 
   platform :ruby, :mswin, :mingw, :x64_mingw do
     gem "classifier-reborn", "~> 2.2.0"
-    gem "liquid-c", "~> 3.0"
+    gem "liquid-c", "~> 4.0"
     gem "yajl-ruby", "~> 1.4"
   end
 

From 7c1f065a41d273f69bb7e4d4fd721aa2d1175f1b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 13 Nov 2018 10:04:12 -0500
Subject: [PATCH 3340/4996] Update history to reflect merge of #7375 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 34f34e23ec7..4202a008386 100644
--- a/History.markdown
+++ b/History.markdown
@@ -99,6 +99,7 @@
   * Memoize Site#post_attr_hash (#7276)
   * Load config file from within current theme-gem (#7304)
   * Memoize the return value of Site#documents (#7273)
+  * Upgrade liquid-c to v4.0 (#7375)
 
 ### Major Enhancements
 

From cb245a7e3032986b9b9a0192834fef668c8683ea Mon Sep 17 00:00:00 2001
From: Leandro Facchinetti 
Date: Fri, 16 Nov 2018 03:30:39 -0500
Subject: [PATCH 3341/4996] Remove installation instructions with Homebrew
 (#7381)

Merge pull request 7381
---
 docs/_docs/installation/macos.md | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md
index c8f8f532b4d..0f21b5d6aaf 100644
--- a/docs/_docs/installation/macos.md
+++ b/docs/_docs/installation/macos.md
@@ -24,17 +24,6 @@ Now install Jekyll and [Bundler](/docs/ruby-101/#bundler).
 gem install bundler jekyll
 ```
 
-### Install a newer Ruby version via Homebrew {#homebrew}
-
-If you wish to install the latest version of Ruby and get faster builds, we recommend doing it via [Homebrew](https://brew.sh) a handy package manager for macOS.
-
-```sh
-/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-brew install ruby
-ruby -v
-ruby 2.5.1p57 (2018-03-29 revision 63029) [x86_64-darwin17]
-```
-
 ### Install multiple Ruby versions with rbenv {#rbenv}
 
 Developers often use [rbenv](https://github.com/rbenv/rbenv) to manage multiple
@@ -42,6 +31,9 @@ Ruby versions. This can be useful if you want to run the same Ruby version used
 by your colleagues/collaborators.
 
 ```sh
+# Install Homebrew
+/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+
 # Install rbenv and ruby-build
 brew install rbenv
 

From 26608929dcd12f2ca3463cd12a349bd6dd14dc3f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 16 Nov 2018 03:30:41 -0500
Subject: [PATCH 3342/4996] Update history to reflect merge of #7381 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4202a008386..7922a0e53b9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -76,6 +76,7 @@
   * Add documentation for custom tag blocks (#7359)
   * Added 99inbound's Jekyll post to form resources (#7348)
   * docs: document page.dir and page.name (#7373)
+  * Remove installation instructions with Homebrew (#7381)
 
 ### Minor Enhancements
 

From 7184404c74546c7133207f69f7586b004c407c96 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Fri, 16 Nov 2018 09:39:33 +0100
Subject: [PATCH 3343/4996] docs: use current macOS Ruby versions

---
 docs/_docs/installation/macos.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md
index 0f21b5d6aaf..a995cb90bc4 100644
--- a/docs/_docs/installation/macos.md
+++ b/docs/_docs/installation/macos.md
@@ -15,7 +15,7 @@ Check your Ruby version meets our requirements. Jekyll requires Ruby 2.2.5 or ab
 
 ```sh
 ruby -v
-2.3.3
+ruby 2.3.7p456 (2018-03-28 revision 63024) [universal.x86_64-darwin18]
 ```
 
 Now install Jekyll and [Bundler](/docs/ruby-101/#bundler).
@@ -48,10 +48,10 @@ Restart your terminal for changes to take effect.
 Now we can install the Ruby version of our choice, let's go with Ruby 2.5.1 here:
 
 ```sh
-rbenv install 2.5.1
-rbenv global 2.5.1
+rbenv install 2.5.3
+rbenv global 2.5.3
 ruby -v
-ruby 2.5.1p57 (2018-03-29 revision 63029) [x86_64-darwin17]
+ruby 2.5.3p105 (2018-10-18 revision 65156) [x86_64-darwin18]
 ```
 
 That's it! Head over [rbenv command references](https://github.com/rbenv/rbenv#command-reference) to learn how to use different versions of Ruby in your projects.

From d0753ecd8282325c4de49417bc6cc8b02a51801b Mon Sep 17 00:00:00 2001
From: Leandro Facchinetti 
Date: Fri, 16 Nov 2018 04:46:54 -0500
Subject: [PATCH 3344/4996] Fix dead link and misleading prose (#7383)

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

diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md
index a995cb90bc4..d265fa69302 100644
--- a/docs/_docs/installation/macos.md
+++ b/docs/_docs/installation/macos.md
@@ -11,7 +11,7 @@ xcode-select --install
 
 ## Set up Ruby included with the OS
 
-Check your Ruby version meets our requirements. Jekyll requires Ruby 2.2.5 or above. If you're running an older version you'll need to [install a more recent Ruby version via Homebrew](#homebrew).
+Check your Ruby version meets our requirements. Jekyll requires Ruby 2.2.5 or above. If you're running an older version you'll need to [install a more recent Ruby version](#rbenv).
 
 ```sh
 ruby -v
@@ -24,11 +24,11 @@ Now install Jekyll and [Bundler](/docs/ruby-101/#bundler).
 gem install bundler jekyll
 ```
 
-### Install multiple Ruby versions with rbenv {#rbenv}
+### Install a more recent Ruby version with rbenv {#rbenv}
 
 Developers often use [rbenv](https://github.com/rbenv/rbenv) to manage multiple
-Ruby versions. This can be useful if you want to run the same Ruby version used
-by your colleagues/collaborators.
+Ruby versions. This can be useful when the version included with the OS is
+too old or when you want to run the same version as your colleagues/collaborators.
 
 ```sh
 # Install Homebrew
@@ -45,7 +45,7 @@ curl -fsSL https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-doctor
 ```
 
 Restart your terminal for changes to take effect.
-Now we can install the Ruby version of our choice, let's go with Ruby 2.5.1 here:
+Now we can install the Ruby version of our choice, let's go with Ruby 2.5.3 here:
 
 ```sh
 rbenv install 2.5.3

From e397146acbc9efe4214c372ad1d1f9681db1a39b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 16 Nov 2018 04:46:55 -0500
Subject: [PATCH 3345/4996] Update history to reflect merge of #7383 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7922a0e53b9..2dfe063dc4c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -77,6 +77,7 @@
   * Added 99inbound's Jekyll post to form resources (#7348)
   * docs: document page.dir and page.name (#7373)
   * Remove installation instructions with Homebrew (#7381)
+  * Fix dead link and misleading prose (#7383)
 
 ### Minor Enhancements
 

From ba2019dca96029f6845079864ce31555866ffa86 Mon Sep 17 00:00:00 2001
From: Akshat Kedia 
Date: Sun, 18 Nov 2018 14:06:09 +0530
Subject: [PATCH 3346/4996] Fix content management section (#7385)

Merge pull request 7385
---
 docs/pages/resources.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/pages/resources.md b/docs/pages/resources.md
index 4aaf9488085..15150a7dfd1 100644
--- a/docs/pages/resources.md
+++ b/docs/pages/resources.md
@@ -43,11 +43,10 @@ Use a SaaS service as a backend for functionality on your Jekyll site
   - [Talkyard](https://www.talkyard.io/blog-comments): Embedded comments for Jekyll and others (free and open source, or hosted serverless)
 
 ### Content Management
-  - [Contentful](https://www.contentful.com/ecosystem/jekyll/): use Jekyll together with the API-driven Contentful CMS.
   - [CloudCannon](https://cloudcannon.com/): The Cloud CMS for Jekyll
   - [Forestry.io](https://forestry.io/): A static CMS that commits
   - [Netlify CMS](https://www.netlifycms.org/): Open source content management for your Git workflow
-  - [Site Leaf](https://www.siteleaf.com/): Built for developers, Loved by everyone
+  - [Siteleaf](https://www.siteleaf.com/): Built for developers, Loved by everyone
 
 ### E-commerce
   - [Snipcart](https://snipcart.com/blog/static-site-e-commerce-part-2-integrating-snipcart-with-jekyll): Add a shopping cart to a Jekyll site

From 41b8192b07e8a5f56c2d720637afe05e2efd4ef7 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 18 Nov 2018 03:36:10 -0500
Subject: [PATCH 3347/4996] Update history to reflect merge of #7385 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2dfe063dc4c..0c2cf3cffe4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -78,6 +78,7 @@
   * docs: document page.dir and page.name (#7373)
   * Remove installation instructions with Homebrew (#7381)
   * Fix dead link and misleading prose (#7383)
+  * Fix content management section (#7385)
 
 ### Minor Enhancements
 

From bfc733da90a526a2a61a799fddc0366644d15140 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 18 Nov 2018 17:24:32 +0530
Subject: [PATCH 3348/4996] Only read layouts from source_dir or theme_dir
 (#6788)

Merge pull request 6788
---
 lib/jekyll/readers/layout_reader.rb | 11 +----------
 test/test_layout_reader.rb          |  5 +++--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/lib/jekyll/readers/layout_reader.rb b/lib/jekyll/readers/layout_reader.rb
index 85ebd011299..883ca7245de 100644
--- a/lib/jekyll/readers/layout_reader.rb
+++ b/lib/jekyll/readers/layout_reader.rb
@@ -23,7 +23,7 @@ def read
     end
 
     def layout_directory
-      @layout_directory ||= (layout_directory_in_cwd || layout_directory_inside_source)
+      @layout_directory ||= site.in_source_dir(site.config["layouts_dir"])
     end
 
     def theme_layout_directory
@@ -57,14 +57,5 @@ def within(directory)
 
       Dir.chdir(directory) { yield }
     end
-
-    def layout_directory_inside_source
-      site.in_source_dir(site.config["layouts_dir"])
-    end
-
-    def layout_directory_in_cwd
-      dir = Jekyll.sanitized_path(Dir.pwd, site.config["layouts_dir"])
-      dir if File.directory?(dir) && !site.safe
-    end
   end
 end
diff --git a/test/test_layout_reader.rb b/test/test_layout_reader.rb
index 327def03261..d0e942d2042 100644
--- a/test/test_layout_reader.rb
+++ b/test/test_layout_reader.rb
@@ -27,8 +27,9 @@ class TestLayoutReader < JekyllUnitTest
         allow(Dir).to receive(:pwd).and_return(source_dir("blah"))
       end
 
-      should "know to use the layout directory relative to CWD" do
-        assert_equal LayoutReader.new(@site).layout_directory, source_dir("blah/_layouts")
+      should "ignore the layout directory in CWD and use the directory relative to site source" do
+        refute_equal source_dir("blah/_layouts"), LayoutReader.new(@site).layout_directory
+        assert_equal source_dir("_layouts"), LayoutReader.new(@site).layout_directory
       end
     end
 

From b26ad019c390c9f7906dc0d7beea56dddb6f21a6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 18 Nov 2018 06:54:33 -0500
Subject: [PATCH 3349/4996] Update history to reflect merge of #6788 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0c2cf3cffe4..0208aec95d7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -121,6 +121,7 @@
   * Cache converted markdown (#7159)
   * Ignore cache directory (#7184)
   * Incorporate `relative_url` filter in `link` tag (#6727)
+  * Only read layouts from source_dir or theme_dir (#6788)
 
 ### Development Fixes
 

From 6c5bb7cce197af3bbe4f3adee0fb71a666e50a61 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 18 Nov 2018 16:54:35 +0100
Subject: [PATCH 3350/4996] docs: add Contentul plugin

---
 docs/pages/resources.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/pages/resources.md b/docs/pages/resources.md
index 15150a7dfd1..ecbfc1d86b4 100644
--- a/docs/pages/resources.md
+++ b/docs/pages/resources.md
@@ -44,6 +44,7 @@ Use a SaaS service as a backend for functionality on your Jekyll site
 
 ### Content Management
   - [CloudCannon](https://cloudcannon.com/): The Cloud CMS for Jekyll
+  - [Contentful](https://github.com/contentful/jekyll-contentful-data-import) Content infrastructure for digital teams 
   - [Forestry.io](https://forestry.io/): A static CMS that commits
   - [Netlify CMS](https://www.netlifycms.org/): Open source content management for your Git workflow
   - [Siteleaf](https://www.siteleaf.com/): Built for developers, Loved by everyone

From 6431637fd756249ec4c8fb21d44d981d2367962a Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 19 Nov 2018 22:33:18 +0530
Subject: [PATCH 3351/4996] Update excludes for CodeClimate Analyses (#7365)

Merge pull request 7365
---
 .codeclimate.yml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index b86672f4316..1d5d8236a8a 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -6,29 +6,27 @@ engines:
     channel: rubocop-0-54
 
 exclude_paths:
-  - .codeclimate.yml
-  - .gitignore
-  - .rspec
-  - .rubocop.yml
-  - .travis.yml
+  - "*.*"
+  - ".*"
 
-  - Gemfile.lock
-  - CHANGELOG.{md,markdown,txt,textile}
-  - CONTRIBUTING.{md,markdown,txt,textile}
-  - readme.{md,markdown,txt,textile}
-  - README.{md,markdown,txt,textile}
-  - Readme.{md,markdown,txt,textile}
-  - ReadMe.{md,markdown,txt,textile}
-  - COPYING
+  - Gemfile
   - LICENSE
+  - Rakefile
 
+  - benchmark/**/*
   - features/**/*
   - script/**/*
+  - exe/**/*
   - docs/**/*
+  - rake/**/*
   - spec/**/*
   - test/**/*
   - vendor/**/*
 
+  - lib/blank_template/**/*
+  - lib/site_template/**/*
+  - lib/theme_template/**/*
+  - lib/jekyll/mime.types
   - lib/jekyll/commands/serve/livereload_assets/livereload.js
 
 ratings:

From 470ef47abc451765c3077d6184a9bb4d46896dd5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 19 Nov 2018 12:03:20 -0500
Subject: [PATCH 3352/4996] Update history to reflect merge of #7365 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0208aec95d7..1cc53d0a3ff 100644
--- a/History.markdown
+++ b/History.markdown
@@ -150,6 +150,7 @@
   * Drop support for `jekyll-watch-1.4.0` and older (#7287)
   * CI(Appveyor): shallow clone with 5 last commits (#7312)
   * Bump RuboCop to v0.60.x (#7338)
+  * Update excludes for CodeClimate Analyses (#7365)
 
 ### Bug Fixes
 

From c732da44d5cfaf377fd668d31bb665e69c0865fc Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 19 Nov 2018 22:52:24 +0100
Subject: [PATCH 3353/4996] docs: update CoC to 1.4.1

---
 CODE_OF_CONDUCT.markdown      | 56 +++++++++++++++++------
 docs/_docs/code_of_conduct.md | 56 +++++++++++++++++------
 docs/_docs/conduct.md         | 83 +++++++++++++++++++++++------------
 3 files changed, 141 insertions(+), 54 deletions(-)

diff --git a/CODE_OF_CONDUCT.markdown b/CODE_OF_CONDUCT.markdown
index 7d1d32140b4..0ab543e46ec 100644
--- a/CODE_OF_CONDUCT.markdown
+++ b/CODE_OF_CONDUCT.markdown
@@ -2,11 +2,17 @@
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment include:
+Examples of behavior that contributes to creating a positive environment
+include:
 
 * Using welcoming and inclusive language
 * Being respectful of differing viewpoints and experiences
@@ -16,31 +22,55 @@ Examples of behavior that contributes to creating a positive environment include
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
 
 ## Our Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
 
-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.
+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.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting a project maintainer. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [olivia@jekyllrb.com](mailto:olivia@jekyllrb.com). All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html)
 
-[homepage]: https://www.contributor-covenant.org/
-[version]: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+[https://www.contributor-covenant.org/faq](https://www.contributor-covenant.org/faq)
diff --git a/docs/_docs/code_of_conduct.md b/docs/_docs/code_of_conduct.md
index feaf9890d2b..410eb1db313 100644
--- a/docs/_docs/code_of_conduct.md
+++ b/docs/_docs/code_of_conduct.md
@@ -8,11 +8,17 @@ editable: false
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment include:
+Examples of behavior that contributes to creating a positive environment
+include:
 
 * Using welcoming and inclusive language
 * Being respectful of differing viewpoints and experiences
@@ -22,31 +28,55 @@ Examples of behavior that contributes to creating a positive environment include
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
 
 ## Our Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
 
-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.
+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.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting a project maintainer. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [olivia@jekyllrb.com](mailto:olivia@jekyllrb.com). All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html)
 
-[homepage]: https://www.contributor-covenant.org/
-[version]: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+[https://www.contributor-covenant.org/faq](https://www.contributor-covenant.org/faq)
diff --git a/docs/_docs/conduct.md b/docs/_docs/conduct.md
index 7ba30a5acaf..05f6b01538f 100644
--- a/docs/_docs/conduct.md
+++ b/docs/_docs/conduct.md
@@ -6,25 +6,42 @@ 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.
+## Our Pledge
 
-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.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing other's private information, such as physical or electronic
-  addresses, without explicit permission
-* Other unethical or unprofessional conduct
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
 
 Project maintainers have the right and responsibility to remove, edit, or
 reject comments, commits, code, wiki edits, issues, and other contributions
@@ -32,24 +49,34 @@ 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.
+## Scope
 
 This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
 
 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.
+reported by contacting the project team at [olivia@jekyllrb.com](mailto:olivia@jekyllrb.com). All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
 
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html)
 
-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]: https://www.contributor-covenant.org
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/
+For answers to common questions about this code of conduct, see
+[https://www.contributor-covenant.org/faq](https://www.contributor-covenant.org/faq)

From 842c055ecbe3cdd207f0f2761ad3aec5b64889d8 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 20 Nov 2018 16:35:32 +0100
Subject: [PATCH 3354/4996] Site: Better Performance (#7388)

Merge pull request 7388
---
 docs/_includes/top.html                   |   6 +-
 docs/_sass/_docsearch.scss                | 519 ++++++++++++++++++++++
 docs/_sass/_fonts.scss                    |  87 ++++
 docs/css/screen.scss                      |   3 +-
 docs/fonts/lato-v14-latin-300.woff        | Bin 0 -> 29852 bytes
 docs/fonts/lato-v14-latin-300.woff2       | Bin 0 -> 23208 bytes
 docs/fonts/lato-v14-latin-300italic.woff  | Bin 0 -> 22312 bytes
 docs/fonts/lato-v14-latin-300italic.woff2 | Bin 0 -> 17528 bytes
 docs/fonts/lato-v14-latin-700.woff        | Bin 0 -> 27848 bytes
 docs/fonts/lato-v14-latin-700.woff2       | Bin 0 -> 22820 bytes
 docs/fonts/lato-v14-latin-700italic.woff  | Bin 0 -> 29692 bytes
 docs/fonts/lato-v14-latin-700italic.woff2 | Bin 0 -> 24240 bytes
 docs/fonts/lato-v14-latin-900.woff        | Bin 0 -> 27260 bytes
 docs/fonts/lato-v14-latin-900.woff2       | Bin 0 -> 22352 bytes
 docs/fonts/lato-v14-latin-900italic.woff  | Bin 0 -> 28688 bytes
 docs/fonts/lato-v14-latin-900italic.woff2 | Bin 0 -> 23524 bytes
 docs/fonts/lato-v14-latin-italic.woff     | Bin 0 -> 29600 bytes
 docs/fonts/lato-v14-latin-italic.woff2    | Bin 0 -> 24192 bytes
 docs/fonts/lato-v14-latin-regular.woff    | Bin 0 -> 28412 bytes
 docs/fonts/lato-v14-latin-regular.woff2   | Bin 0 -> 23316 bytes
 docs/img/cloudcannon-logo.png             | Bin 18283 -> 5039 bytes
 docs/img/forestry-logo.png                | Bin 25542 -> 6944 bytes
 docs/img/icons8-logo.png                  | Bin 110994 -> 9593 bytes
 docs/img/siteleaf-logo.png                | Bin 10885 -> 6735 bytes
 docs/img/tidelift-logo.png                | Bin 9318 -> 4009 bytes
 25 files changed, 611 insertions(+), 4 deletions(-)
 create mode 100644 docs/_sass/_fonts.scss
 create mode 100644 docs/fonts/lato-v14-latin-300.woff
 create mode 100644 docs/fonts/lato-v14-latin-300.woff2
 create mode 100644 docs/fonts/lato-v14-latin-300italic.woff
 create mode 100644 docs/fonts/lato-v14-latin-300italic.woff2
 create mode 100644 docs/fonts/lato-v14-latin-700.woff
 create mode 100644 docs/fonts/lato-v14-latin-700.woff2
 create mode 100644 docs/fonts/lato-v14-latin-700italic.woff
 create mode 100644 docs/fonts/lato-v14-latin-700italic.woff2
 create mode 100644 docs/fonts/lato-v14-latin-900.woff
 create mode 100644 docs/fonts/lato-v14-latin-900.woff2
 create mode 100644 docs/fonts/lato-v14-latin-900italic.woff
 create mode 100644 docs/fonts/lato-v14-latin-900italic.woff2
 create mode 100644 docs/fonts/lato-v14-latin-italic.woff
 create mode 100644 docs/fonts/lato-v14-latin-italic.woff2
 create mode 100644 docs/fonts/lato-v14-latin-regular.woff
 create mode 100644 docs/fonts/lato-v14-latin-regular.woff2

diff --git a/docs/_includes/top.html b/docs/_includes/top.html
index 2a28190062c..2e23895e54a 100644
--- a/docs/_includes/top.html
+++ b/docs/_includes/top.html
@@ -6,9 +6,9 @@
   
   {% feed_meta %}
   
-  
-  
-  
+  
+  
+  
   
   
   {% seo %}
diff --git a/docs/_sass/_docsearch.scss b/docs/_sass/_docsearch.scss
index e984edea90e..46d75e73340 100644
--- a/docs/_sass/_docsearch.scss
+++ b/docs/_sass/_docsearch.scss
@@ -1,5 +1,524 @@
 .searchbox {
+  display: inline-block;
+  position: relative;
+  width: 200px;
+  height: 32px !important;
   padding-top: 1px;
+  white-space: nowrap;
+  box-sizing: border-box;
+  visibility: visible !important;
+}
+
+.searchbox .algolia-autocomplete {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+
+.searchbox__wrapper {
+  width: 100%;
+  height: 100%;
+  z-index: 999;
+  position: relative;
+}
+
+.searchbox__input {
+  display: inline-block;
+  box-sizing: border-box;
+  transition: box-shadow 0.4s ease, background 0.4s ease;
+  border: 0;
+  border-radius: 16px;
+  box-shadow: inset 0 0 0 1px #cccccc;
+  background: #ffffff !important;
+  padding: 0;
+  padding-right: 26px;
+  padding-left: 32px;
+  width: 100%;
+  height: 100%;
+  vertical-align: middle;
+  white-space: normal;
+  font-size: 12px;
+  appearance: none;
+}
+
+.searchbox__input::-webkit-search-decoration, .searchbox__input::-webkit-search-cancel-button, .searchbox__input::-webkit-search-results-button, .searchbox__input::-webkit-search-results-decoration {
+  display: none;
+}
+
+.searchbox__input:hover {
+  box-shadow: inset 0 0 0 1px #b3b3b3;
+}
+
+.searchbox__input:focus, .searchbox__input:active {
+  outline: 0;
+  box-shadow: inset 0 0 0 1px #aaaaaa;
+  background: #ffffff;
+}
+
+.searchbox__input::placeholder {
+  color: #aaaaaa;
+}
+
+.searchbox__submit {
+  position: absolute;
+  top: 0;
+  margin: 0;
+  border: 0;
+  border-radius: 16px 0 0 16px;
+  background-color: rgba(69, 142, 225, 0);
+  padding: 0;
+  width: 32px;
+  height: 100%;
+  vertical-align: middle;
+  text-align: center;
+  font-size: inherit;
+  user-select: none;
+  right: inherit;
+  left: 0;
+}
+
+.searchbox__submit::before {
+  display: inline-block;
+  margin-right: -4px;
+  height: 100%;
+  vertical-align: middle;
+  content: '';
+}
+
+.searchbox__submit:hover, .searchbox__submit:active {
+  cursor: pointer;
+}
+
+.searchbox__submit:focus {
+  outline: 0;
+}
+
+.searchbox__submit svg {
+  width: 14px;
+  height: 14px;
+  vertical-align: middle;
+  fill: #6d7e96;
+}
+
+.searchbox__reset {
+  display: block;
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  margin: 0;
+  border: 0;
+  background: none;
+  cursor: pointer;
+  padding: 0;
+  font-size: inherit;
+  user-select: none;
+  fill: rgba(0, 0, 0, 0.5);
+}
+
+.searchbox__reset.hide {
+  display: none;
+}
+
+.searchbox__reset:focus {
+  outline: 0;
+}
+
+.searchbox__reset svg {
+  display: block;
+  margin: 4px;
+  width: 8px;
+  height: 8px;
+}
+
+.searchbox__input:valid ~ .searchbox__reset {
+  display: block;
+  animation-name: sbx-reset-in;
+  animation-duration: 0.15s;
+}
+
+@keyframes sbx-reset-in {
+  0% {
+    transform: translate3d(-20%, 0, 0);
+    opacity: 0;
+  }
+  100% {
+    transform: none;
+    opacity: 1;
+  }
+}
+
+.algolia-autocomplete.algolia-autocomplete-right .ds-dropdown-menu {
+  right: 0 !important;
+  left: inherit !important;
+}
+
+.algolia-autocomplete.algolia-autocomplete-right .ds-dropdown-menu:before {
+  right: 48px;
+}
+
+.algolia-autocomplete.algolia-autocomplete-left .ds-dropdown-menu {
+  left: 0 !important;
+  right: inherit !important;
+}
+
+.algolia-autocomplete.algolia-autocomplete-left .ds-dropdown-menu:before {
+  left: 48px;
+}
+
+.algolia-autocomplete .ds-dropdown-menu {
+  position: relative;
+  top: -6px;
+  border-radius: 4px;
+  margin: 6px 0 0;
+  padding: 0;
+  text-align: left;
+  height: auto;
+  position: relative;
+  background: transparent;
+  border: none;
+  z-index: 999;
+  max-width: 600px;
+  min-width: 500px;
+  box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2), 0 2px 3px 0 rgba(0, 0, 0, 0.1);
+}
+
+.algolia-autocomplete .ds-dropdown-menu:before {
+  display: block;
+  position: absolute;
+  content: '';
+  width: 14px;
+  height: 14px;
+  background: #fff;
+  z-index: 1000;
+  top: -7px;
+  border-top: 1px solid #d9d9d9;
+  border-right: 1px solid #d9d9d9;
+  transform: rotate(-45deg);
+  border-radius: 2px;
+}
+
+.algolia-autocomplete .ds-dropdown-menu .ds-suggestions {
+  position: relative;
+  z-index: 1000;
+  margin-top: 8px;
+}
+
+.algolia-autocomplete .ds-dropdown-menu .ds-suggestions a:hover {
+  text-decoration: none;
+}
+
+.algolia-autocomplete .ds-dropdown-menu .ds-suggestion {
+  cursor: pointer;
+}
+
+.algolia-autocomplete .ds-dropdown-menu .ds-suggestion.ds-cursor .algolia-docsearch-suggestion.suggestion-layout-simple {
+  background-color: rgba(69, 142, 225, 0.05);
+}
+
+.algolia-autocomplete .ds-dropdown-menu .ds-suggestion.ds-cursor .algolia-docsearch-suggestion:not(.suggestion-layout-simple) .algolia-docsearch-suggestion--content {
+  background-color: rgba(69, 142, 225, 0.05);
+}
+
+.algolia-autocomplete .ds-dropdown-menu [class^='ds-dataset-'] {
+  position: relative;
+  border: solid 1px #d9d9d9;
+  background: #fff;
+  border-radius: 4px;
+  overflow: auto;
+  padding: 0 8px 8px;
+}
+
+.algolia-autocomplete .ds-dropdown-menu * {
+  box-sizing: border-box;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion {
+  display: block;
+  position: relative;
+  padding: 0 8px;
+  background: #fff;
+  color: #02060c;
+  overflow: hidden;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion--highlight {
+  color: #174d8c;
+  background: rgba(143, 187, 237, 0.1);
+  padding: 0.1em 0.05em;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion--category-header .algolia-docsearch-suggestion--category-header-lvl0
+.algolia-docsearch-suggestion--highlight,
+.algolia-autocomplete .algolia-docsearch-suggestion--category-header .algolia-docsearch-suggestion--category-header-lvl1
+.algolia-docsearch-suggestion--highlight {
+  padding: 0 0 1px;
+  background: inherit;
+  box-shadow: inset 0 -2px 0 0 rgba(69, 142, 225, 0.8);
+  color: inherit;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion--text .algolia-docsearch-suggestion--highlight {
+  padding: 0 0 1px;
+  background: inherit;
+  box-shadow: inset 0 -2px 0 0 rgba(69, 142, 225, 0.8);
+  color: inherit;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion--content {
+  display: block;
+  float: right;
+  width: 70%;
+  position: relative;
+  padding: 5.33333px 0 5.33333px 10.66667px;
+  cursor: pointer;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion--content:before {
+  content: '';
+  position: absolute;
+  display: block;
+  top: 0;
+  height: 100%;
+  width: 1px;
+  background: #ddd;
+  left: -1px;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion--category-header {
+  position: relative;
+  border-bottom: 1px solid #ddd;
+  display: none;
+  margin-top: 8px;
+  padding: 4px 0;
+  font-size: 1em;
+  color: #33363d;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion--wrapper {
+  width: 100%;
+  float: left;
+  padding: 8px 0 0 0;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion--subcategory-column {
+  float: left;
+  width: 30%;
+  padding-left: 0;
+  text-align: right;
+  position: relative;
+  padding: 5.33333px 10.66667px;
+  color: #a4a7ae;
+  font-size: 0.9em;
+  word-wrap: break-word;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion--subcategory-column:before {
+  content: '';
+  position: absolute;
+  display: block;
+  top: 0;
+  height: 100%;
+  width: 1px;
+  background: #ddd;
+  right: 0;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion--subcategory-inline {
+  display: none;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion--title {
+  margin-bottom: 4px;
+  color: #02060c;
+  font-size: 0.9em;
+  font-weight: bold;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion--text {
+  display: block;
+  line-height: 1.2em;
+  font-size: 0.85em;
+  color: #63676d;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion--no-results {
+  width: 100%;
+  padding: 8px 0;
+  text-align: center;
+  font-size: 1.2em;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion--no-results::before {
+  display: none;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion code {
+  padding: 1px 5px;
+  font-size: 90%;
+  border: none;
+  color: #222222;
+  background-color: #ebebeb;
+  border-radius: 3px;
+  font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion code .algolia-docsearch-suggestion--highlight {
+  background: none;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion.algolia-docsearch-suggestion__main .algolia-docsearch-suggestion--category-header {
+  display: block;
+}
+
+.algolia-autocomplete .algolia-docsearch-suggestion.algolia-docsearch-suggestion__secondary {
+  display: block;
+}
+
+@media all and (min-width: 768px) {
+  .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--subcategory-column {
+    display: block;
+  }
+}
+
+@media all and (max-width: 768px) {
+  .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--subcategory-column {
+    display: inline-block;
+    width: auto;
+    text-align: left;
+    float: left;
+    padding: 0;
+    color: #02060c;
+    font-size: 0.9em;
+    font-weight: bold;
+    text-align: left;
+    opacity: 0.5;
+  }
+  .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--subcategory-column:before {
+    display: none;
+  }
+  .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--subcategory-column:after {
+    content: '|';
+  }
+  .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--content {
+    display: inline-block;
+    width: auto;
+    text-align: left;
+    float: left;
+    padding: 0;
+  }
+  .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--content:before {
+    display: none;
+  }
+}
+
+.algolia-autocomplete .suggestion-layout-simple.algolia-docsearch-suggestion {
+  border-bottom: solid 1px #eee;
+  padding: 8px;
+  margin: 0;
+}
+
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--content {
+  width: 100%;
+  padding: 0;
+}
+
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--content::before {
+  display: none;
+}
+
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--category-header {
+  margin: 0;
+  padding: 0;
+  display: block;
+  width: 100%;
+  border: none;
+}
+
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--category-header-lvl0 {
+  opacity: 0.6;
+  font-size: 0.85em;
+}
+
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--category-header-lvl1 {
+  opacity: 0.6;
+  font-size: 0.85em;
+}
+
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--category-header-lvl1::before {
+  background-image: url('data:image/svg+xml;utf8,');
+  content: '';
+  width: 10px;
+  height: 10px;
+  display: inline-block;
+}
+
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--wrapper {
+  width: 100%;
+  float: left;
+  margin: 0;
+  padding: 0;
+}
+
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--duplicate-content, .algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--subcategory-inline {
+  display: none !important;
+}
+
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--title {
+  margin: 0;
+  color: #458ee1;
+  font-size: 0.9em;
+  font-weight: normal;
+}
+
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--title::before {
+  content: '#';
+  font-weight: bold;
+  color: #458ee1;
+  display: inline-block;
+}
+
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--text {
+  margin: 4px 0 0;
+  display: block;
+  line-height: 1.4em;
+  padding: 5.33333px 8px;
+  background: #f8f8f8;
+  font-size: 0.85em;
+  opacity: 0.8;
+}
+
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--text .algolia-docsearch-suggestion--highlight {
+  color: #3f4145;
+  font-weight: bold;
+  box-shadow: none;
+}
+
+.algolia-autocomplete .algolia-docsearch-footer {
+  width: 134px;
+  height: 20px;
+  z-index: 2000;
+  margin-top: 10.66667px;
+  float: right;
+  font-size: 0;
+  line-height: 0;
+}
+
+.algolia-autocomplete .algolia-docsearch-footer--logo {
+  background-image: url("data:image/svg+xml,%3Csvg width='168' height='24' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Cpath d='M78.988.938h16.594a2.968 2.968 0 0 1 2.966 2.966V20.5a2.967 2.967 0 0 1-2.966 2.964H78.988a2.967 2.967 0 0 1-2.966-2.964V3.897A2.961 2.961 0 0 1 78.988.938zm41.937 17.866c-4.386.02-4.386-3.54-4.386-4.106l-.007-13.336 2.675-.424v13.254c0 .322 0 2.358 1.718 2.364v2.248zm-10.846-2.18c.821 0 1.43-.047 1.855-.129v-2.719a6.334 6.334 0 0 0-1.574-.199c-.295 0-.596.021-.897.069a2.699 2.699 0 0 0-.814.24c-.24.116-.439.28-.582.491-.15.212-.219.335-.219.656 0 .628.219.991.616 1.23s.938.362 1.615.362zm-.233-9.7c.883 0 1.629.109 2.231.328.602.218 1.088.525 1.444.915.363.396.609.922.76 1.483.157.56.232 1.175.232 1.85v6.874c-.41.089-1.034.19-1.868.314-.834.123-1.772.185-2.813.185-.69 0-1.327-.069-1.895-.198a4.001 4.001 0 0 1-1.471-.636 3.085 3.085 0 0 1-.951-1.134c-.226-.465-.343-1.12-.343-1.803 0-.656.13-1.073.384-1.525.26-.45.608-.819 1.047-1.106.445-.287.95-.492 1.532-.615a8.8 8.8 0 0 1 1.82-.185 8.404 8.404 0 0 1 1.972.24v-.438c0-.307-.035-.6-.11-.874a1.88 1.88 0 0 0-.384-.73 1.784 1.784 0 0 0-.724-.493 3.164 3.164 0 0 0-1.143-.205c-.616 0-1.177.075-1.69.164a7.735 7.735 0 0 0-1.26.307l-.321-2.192c.335-.117.834-.233 1.478-.349a10.98 10.98 0 0 1 2.073-.178zm52.842 9.626c.822 0 1.43-.048 1.854-.13V13.7a6.347 6.347 0 0 0-1.574-.199c-.294 0-.595.021-.896.069a2.7 2.7 0 0 0-.814.24 1.46 1.46 0 0 0-.582.491c-.15.212-.218.335-.218.656 0 .628.218.991.615 1.23.404.245.938.362 1.615.362zm-.226-9.694c.883 0 1.629.108 2.231.327.602.219 1.088.526 1.444.915.355.39.609.923.759 1.483.158.56.233 1.175.233 1.852v6.873c-.41.088-1.034.19-1.868.314-.834.123-1.772.184-2.813.184-.69 0-1.327-.068-1.895-.198a4.001 4.001 0 0 1-1.471-.635 3.085 3.085 0 0 1-.951-1.134c-.226-.465-.343-1.12-.343-1.804 0-.656.13-1.073.384-1.524.26-.45.608-.82 1.047-1.107.445-.286.95-.491 1.532-.614a8.803 8.803 0 0 1 2.751-.13c.329.034.671.096 1.04.185v-.437a3.3 3.3 0 0 0-.109-.875 1.873 1.873 0 0 0-.384-.731 1.784 1.784 0 0 0-.724-.492 3.165 3.165 0 0 0-1.143-.205c-.616 0-1.177.075-1.69.164-.514.089-.938.191-1.26.307l-.321-2.193c.335-.116.834-.232 1.478-.348a11.633 11.633 0 0 1 2.073-.177zm-8.034-1.271a1.626 1.626 0 0 1-1.628-1.62c0-.895.725-1.62 1.628-1.62.904 0 1.63.725 1.63 1.62 0 .895-.733 1.62-1.63 1.62zm1.348 13.22h-2.689V7.27l2.69-.423v11.956zm-4.714 0c-4.386.02-4.386-3.54-4.386-4.107l-.008-13.336 2.676-.424v13.254c0 .322 0 2.358 1.718 2.364v2.248zm-8.698-5.903c0-1.156-.253-2.119-.746-2.788-.493-.677-1.183-1.01-2.067-1.01-.882 0-1.574.333-2.065 1.01-.493.676-.733 1.632-.733 2.788 0 1.168.246 1.953.74 2.63.492.683 1.183 1.018 2.066 1.018.882 0 1.574-.342 2.067-1.019.492-.683.738-1.46.738-2.63zm2.737-.007c0 .902-.13 1.584-.397 2.33a5.52 5.52 0 0 1-1.128 1.906 4.986 4.986 0 0 1-1.752 1.223c-.685.286-1.739.45-2.265.45-.528-.006-1.574-.157-2.252-.45a5.096 5.096 0 0 1-1.744-1.223c-.487-.527-.863-1.162-1.137-1.906a6.345 6.345 0 0 1-.41-2.33c0-.902.123-1.77.397-2.508a5.554 5.554 0 0 1 1.15-1.892 5.133 5.133 0 0 1 1.75-1.216c.679-.287 1.425-.423 2.232-.423.808 0 1.553.142 2.237.423.685.286 1.274.69 1.753 1.216a5.644 5.644 0 0 1 1.135 1.892c.287.738.431 1.606.431 2.508zm-20.138 0c0 1.12.246 2.363.738 2.882.493.52 1.13.78 1.91.78.424 0 .828-.062 1.204-.178.377-.116.677-.253.917-.417V9.33a10.476 10.476 0 0 0-1.766-.226c-.971-.028-1.71.37-2.23 1.004-.513.636-.773 1.75-.773 2.788zm7.438 5.274c0 1.824-.466 3.156-1.404 4.004-.936.846-2.367 1.27-4.296 1.27-.705 0-2.17-.137-3.34-.396l.431-2.118c.98.205 2.272.26 2.95.26 1.074 0 1.84-.219 2.299-.656.459-.437.684-1.086.684-1.948v-.437a8.07 8.07 0 0 1-1.047.397c-.43.13-.93.198-1.492.198-.739 0-1.41-.116-2.018-.349a4.206 4.206 0 0 1-1.567-1.025c-.431-.45-.774-1.017-1.013-1.694-.24-.677-.363-1.885-.363-2.773 0-.834.13-1.88.384-2.577.26-.696.629-1.298 1.129-1.796.493-.498 1.095-.881 1.8-1.162a6.605 6.605 0 0 1 2.428-.457c.87 0 1.67.109 2.45.24.78.129 1.444.265 1.985.415V18.17z' fill='%235468FF'/%3E%3Cpath d='M6.972 6.677v1.627c-.712-.446-1.52-.67-2.425-.67-.585 0-1.045.13-1.38.391a1.24 1.24 0 0 0-.502 1.03c0 .425.164.765.494 1.02.33.256.835.532 1.516.83.447.192.795.356 1.045.495.25.138.537.332.862.582.324.25.563.548.718.894.154.345.23.741.23 1.188 0 .947-.334 1.691-1.004 2.234-.67.542-1.537.814-2.601.814-1.18 0-2.16-.229-2.936-.686v-1.708c.84.628 1.814.942 2.92.942.585 0 1.048-.136 1.388-.407.34-.271.51-.646.51-1.125 0-.287-.1-.55-.302-.79-.203-.24-.42-.42-.655-.542-.234-.123-.585-.29-1.053-.503-.276-.127-.47-.218-.582-.271a13.67 13.67 0 0 1-.55-.287 4.275 4.275 0 0 1-.567-.351 6.92 6.92 0 0 1-.455-.4c-.18-.17-.31-.34-.39-.51-.08-.17-.155-.37-.224-.598a2.553 2.553 0 0 1-.104-.742c0-.915.333-1.638.998-2.17.664-.532 1.523-.798 2.576-.798.968 0 1.793.17 2.473.51zm7.468 5.696v-.287c-.022-.607-.187-1.088-.495-1.444-.309-.357-.75-.535-1.324-.535-.532 0-.99.194-1.373.583-.382.388-.622.949-.717 1.683h3.909zm1.005 2.792v1.404c-.596.34-1.383.51-2.362.51-1.255 0-2.255-.377-3-1.132-.744-.755-1.116-1.744-1.116-2.968 0-1.297.34-2.316 1.021-3.055.68-.74 1.548-1.11 2.6-1.11 1.033 0 1.852.323 2.458.966.606.644.91 1.572.91 2.784 0 .33-.033.676-.096 1.038h-5.314c.107.702.405 1.239.894 1.611.49.372 1.106.558 1.85.558.862 0 1.58-.202 2.155-.606zm6.605-1.77h-1.212c-.596 0-1.045.116-1.349.35-.303.234-.454.532-.454.894 0 .372.117.664.35.877.235.213.575.32 1.022.32.51 0 .912-.142 1.204-.424.293-.281.44-.651.44-1.108v-.91zm-4.068-2.554V9.325c.627-.361 1.457-.542 2.489-.542 2.116 0 3.175 1.026 3.175 3.08V17h-1.548v-.957c-.415.68-1.143 1.02-2.186 1.02-.766 0-1.38-.22-1.843-.661-.462-.442-.694-1.003-.694-1.684 0-.776.293-1.38.878-1.81.585-.431 1.404-.647 2.457-.647h1.34V11.8c0-.554-.133-.971-.399-1.253-.266-.282-.707-.423-1.324-.423a4.07 4.07 0 0 0-2.345.718zm9.333-1.93v1.42c.394-1 1.101-1.5 2.123-1.5.148 0 .313.016.494.048v1.531a1.885 1.885 0 0 0-.75-.143c-.542 0-.989.24-1.34.718-.351.479-.527 1.048-.527 1.707V17h-1.563V8.91h1.563zm5.01 4.084c.022.82.272 1.492.75 2.019.479.526 1.15.79 2.01.79.639 0 1.235-.176 1.788-.527v1.404c-.521.319-1.186.479-1.995.479-1.265 0-2.276-.4-3.031-1.197-.755-.798-1.133-1.792-1.133-2.984 0-1.16.38-2.151 1.14-2.975.761-.825 1.79-1.237 3.088-1.237.702 0 1.346.149 1.93.447v1.436a3.242 3.242 0 0 0-1.77-.495c-.84 0-1.513.266-2.019.798-.505.532-.758 1.213-.758 2.042zM40.24 5.72v4.579c.458-1 1.293-1.5 2.505-1.5.787 0 1.42.245 1.899.734.479.49.718 1.17.718 2.042V17h-1.564v-5.106c0-.553-.14-.98-.422-1.284-.282-.303-.652-.455-1.11-.455-.531 0-1.002.202-1.411.606-.41.405-.615 1.022-.615 1.851V17h-1.563V5.72h1.563zm14.966 10.02c.596 0 1.096-.253 1.5-.758.404-.506.606-1.157.606-1.955 0-.915-.202-1.62-.606-2.114-.404-.495-.92-.742-1.548-.742-.553 0-1.05.224-1.491.67-.442.447-.662 1.133-.662 2.058 0 .958.212 1.67.638 2.138.425.469.946.703 1.563.703zM53.004 5.72v4.42c.574-.894 1.388-1.341 2.44-1.341 1.022 0 1.857.383 2.506 1.149.649.766.973 1.781.973 3.047 0 1.138-.309 2.109-.925 2.912-.617.803-1.463 1.205-2.537 1.205-1.075 0-1.894-.447-2.457-1.34V17h-1.58V5.72h1.58zm9.908 11.104l-3.223-7.913h1.739l1.005 2.632 1.26 3.415c.096-.32.48-1.458 1.15-3.415l.909-2.632h1.66l-2.92 7.866c-.777 2.074-1.963 3.11-3.559 3.11a2.92 2.92 0 0 1-.734-.079v-1.34c.17.042.351.064.543.064 1.032 0 1.755-.57 2.17-1.708z' fill='%235D6494'/%3E%3Cpath d='M89.632 5.967v-.772a.978.978 0 0 0-.978-.977h-2.28a.978.978 0 0 0-.978.977v.793c0 .088.082.15.171.13a7.127 7.127 0 0 1 1.984-.28c.65 0 1.295.088 1.917.259.082.02.164-.04.164-.13m-6.248 1.01l-.39-.389a.977.977 0 0 0-1.382 0l-.465.465a.973.973 0 0 0 0 1.38l.383.383c.062.061.15.047.205-.014.226-.307.472-.601.746-.874.281-.28.568-.526.883-.751.068-.042.075-.137.02-.2m4.16 2.453v3.341c0 .096.104.165.192.117l2.97-1.537c.068-.034.089-.117.055-.184a3.695 3.695 0 0 0-3.08-1.866c-.068 0-.136.054-.136.13m0 8.048a4.489 4.489 0 0 1-4.49-4.482 4.488 4.488 0 0 1 4.49-4.482 4.488 4.488 0 0 1 4.489 4.482 4.484 4.484 0 0 1-4.49 4.482m0-10.85a6.363 6.363 0 1 0 0 12.729c3.518 0 6.372-2.85 6.372-6.368a6.358 6.358 0 0 0-6.371-6.36' fill='%23FFF'/%3E%3C/g%3E%3C/svg%3E%0A");
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 100%;
+  overflow: hidden;
+  text-indent: -9000px;
+  padding: 0 !important;
+  width: 100%;
+  height: 100%;
+  display: block;
+}
+
+// Overrides
+
+.searchbox {
   .searchbox__input {
     padding: 6px 5px 5px 29px;
     font-size: 0.75em;
diff --git a/docs/_sass/_fonts.scss b/docs/_sass/_fonts.scss
new file mode 100644
index 00000000000..fa0648e6423
--- /dev/null
+++ b/docs/_sass/_fonts.scss
@@ -0,0 +1,87 @@
+/* lato-300 - latin */
+@font-face {
+  font-family: 'Lato';
+  font-style: normal;
+  font-weight: 300;
+  src: local('Lato Light'), local('Lato-Light'),
+       url('../fonts/lato-v14-latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('../fonts/lato-v14-latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+  font-display: swap;
+}
+
+/* lato-300italic - latin */
+@font-face {
+  font-family: 'Lato';
+  font-style: italic;
+  font-weight: 300;
+  src: local('Lato Light Italic'), local('Lato-LightItalic'),
+       url('../fonts/lato-v14-latin-300italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('../fonts/lato-v14-latin-300italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+  font-display: swap;
+}
+
+/* lato-regular - latin */
+@font-face {
+  font-family: 'Lato';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Lato Regular'), local('Lato-Regular'),
+       url('../fonts/lato-v14-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('../fonts/lato-v14-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+  font-display: swap;
+}
+
+/* lato-italic - latin */
+@font-face {
+  font-family: 'Lato';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Lato Italic'), local('Lato-Italic'),
+       url('../fonts/lato-v14-latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('../fonts/lato-v14-latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+  font-display: swap;
+}
+
+/* lato-700 - latin */
+@font-face {
+  font-family: 'Lato';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Lato Bold'), local('Lato-Bold'),
+       url('../fonts/lato-v14-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('../fonts/lato-v14-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+  font-display: swap;
+}
+
+/* lato-700italic - latin */
+@font-face {
+  font-family: 'Lato';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Lato Bold Italic'), local('Lato-BoldItalic'),
+       url('../fonts/lato-v14-latin-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('../fonts/lato-v14-latin-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+  font-display: swap;
+}
+
+/* lato-900 - latin */
+@font-face {
+  font-family: 'Lato';
+  font-style: normal;
+  font-weight: 900;
+  src: local('Lato Black'), local('Lato-Black'),
+       url('../fonts/lato-v14-latin-900.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('../fonts/lato-v14-latin-900.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+  font-display: swap;
+}
+
+/* lato-900italic - latin */
+@font-face {
+  font-family: 'Lato';
+  font-style: italic;
+  font-weight: 900;
+  src: local('Lato Black Italic'), local('Lato-BlackItalic'),
+       url('../fonts/lato-v14-latin-900italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('../fonts/lato-v14-latin-900italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+  font-display: swap;
+}
diff --git a/docs/css/screen.scss b/docs/css/screen.scss
index 4bc6bec3330..766f964b016 100644
--- a/docs/css/screen.scss
+++ b/docs/css/screen.scss
@@ -6,5 +6,6 @@
 @import "gridism";
 @import "pygments";
 @import "font-awesome";
-@import "style";
+@import "fonts";
 @import "docsearch";
+@import "style";
diff --git a/docs/fonts/lato-v14-latin-300.woff b/docs/fonts/lato-v14-latin-300.woff
new file mode 100644
index 0000000000000000000000000000000000000000..ab45ab76bac3d81c9103c6b662a6497845aacd9b
GIT binary patch
literal 29852
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
ZAW?Bh^NcrN6sER01DOt}BO6KM{{axDic0_h

literal 0
HcmV?d00001

diff --git a/docs/fonts/lato-v14-latin-300.woff2 b/docs/fonts/lato-v14-latin-300.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..136337fdc2cae59ecbc3e94aa67703a5856d73b3
GIT binary patch
literal 23208
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
VH-COz4itWR@JRx|d4UB0{2zU+`k(*+

literal 0
HcmV?d00001

diff --git a/docs/fonts/lato-v14-latin-300italic.woff b/docs/fonts/lato-v14-latin-300italic.woff
new file mode 100644
index 0000000000000000000000000000000000000000..0287996f125d3f881bcecc742185eba99696f700
GIT binary patch
literal 22312
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

literal 0
HcmV?d00001

diff --git a/docs/fonts/lato-v14-latin-300italic.woff2 b/docs/fonts/lato-v14-latin-300italic.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..fd1977b68a9a6b2b877fa39abcadaac6eb7f2e14
GIT binary patch
literal 17528
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

literal 0
HcmV?d00001

diff --git a/docs/fonts/lato-v14-latin-700.woff b/docs/fonts/lato-v14-latin-700.woff
new file mode 100644
index 0000000000000000000000000000000000000000..1d9d75bc6a53cbca1159c91012f116dea6193bc3
GIT binary patch
literal 27848
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

literal 0
HcmV?d00001

diff --git a/docs/fonts/lato-v14-latin-700italic.woff b/docs/fonts/lato-v14-latin-700italic.woff
new file mode 100644
index 0000000000000000000000000000000000000000..f79d9a994ac631f14a502c7e9bb4fe78765afd86
GIT binary patch
literal 29692
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
FD*)a-s$>8F

literal 0
HcmV?d00001

diff --git a/docs/fonts/lato-v14-latin-700italic.woff2 b/docs/fonts/lato-v14-latin-700italic.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..c351d88d811d42400cf8a9c5000d1877eea5e320
GIT binary patch
literal 24240
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

literal 0
HcmV?d00001

diff --git a/docs/fonts/lato-v14-latin-900.woff b/docs/fonts/lato-v14-latin-900.woff
new file mode 100644
index 0000000000000000000000000000000000000000..6f251d9e794936790e7151b2a9ec46602ef03a08
GIT binary patch
literal 27260
zcmY(q19&9S+BMp7GO=xQVmq1Gwr$(V#I|i?V%xTD+sV!OzH{$?|NZo;dfruAZ>`n6
ztE#(QWko~)K!BfO;RQhW&wd%>C;lJiKhgich|0+-0suf(006`?0DvS>6WHr0s;Ddo
z06+=<)cZLGu#4u1_LNop&G^Hm{=}L;(DS4)`82fFxBKB9e&XOCbWD=kei*tq5dZ+c
zynbT3{{Ye*%g@Bl)cS|31OPz%008hq2Mq^)Q+>yuws15*bs+x>1XC+_lOK*508qLC
z0BU7e1!zRfjP;EG07H_WI;{V}C;FYK*$?@{Y5m0bKOjM1fT%FDc5?gSe#Qm<=?}yq
z357-8%GU6wo^jAmem(yIrK*~OwZ7ZWxTgQfjo?23T7h`9(YH4K;eN&e`pFSEh&@=o
z+0NF{2>>wr$rmX3hZBOmRTZ*xF#c(4LI2ZE@;@ksNJ4j8Q;G?6zy(4H?yk`5#9V5!
zUjKP5wKQ$oKsZ~iV+QTNBW3(yALix5`1@Z}i$q8)~xL*w%^-}5)wCc5sz
z6@|}l!Mb7J8$Ms5mn^>l@m$1U5y2@PGIM`3r~MsU(19E{=X;oST%&~EwC<_pe%xNx
zasT|BlXM2mk!RWOGJe_L9u6{?yQa%iiU(68_YSQ|yB!u39Y9Ef*7Pg5Q<1MKM`cU>
z9d>p`HX=9+F>umo+nlUyinO(pWxg8>*NSM|R{9AH+dui(g1QM3-V=&|fT$op4_Sb%
zZ9YNgK_38uIUpCzkck*+z-)*y&OXHCA0}nM$&@;Yb5s{QNTW|VuGWjSR3H6lWyA-;
zKA<1%kcphRi*wxCqg-vDg}rfr=Grn0f_E1>%)QI;+ijFu=RVlA;}``0b-=XiCh8jF
zV+XzawO{w^HirU9j4)8DeuOMU>u#jPk0=~dxTO_yF*C+SJm}DsUa_>MLxz7(;u_$`
zmkX`566_9#gJOr>W|Bt^LL@pe
zG91JWhN&<|AM7EOoDGGmt}l0lq5>Df&hYnl*K^mt_jSf|S8M;~j*Q&dOZJ_{u=B!w
zDma$AU}OpRJ{ZUu4C4SjaU_!I=Y=DGKr_x=^fQS#rebjVPJ{0!
z&j@i2@V$0v3el}iDx5^$vH<3xlH90wBVLd$82n&)Eq!V7axi`X=b1T)h~o>DnZ0+#
zO7$h&rOO=YHJoH1o(FC>%6sDD_^=k=6lj7J!z7I3o5uVVC$?4nAS>5J{V*>C3A@5?
zN<7Q=AjQwjI0xTjgY?LczE;WVm%qoWC@AcT!gU>qo>%o`Qtdw?J1@+OMFJf|U>c+%
zii9!MOaVvG)J^=Vs4Q!r0?)9jn}ln>sGA0YiZ6_$>_-;}LmQ(g36Qw*tk-2A!#52O
zFHSWHzRt`!^z_*gQ@=2QMR#b3ZWRivkQijF!*N7Z3QbyYqiT#kFFlrDLEv_=28oK!
z31zq~TR|BLG&N{=((Jq1X-%4?`c`odSs8^s_8jza_=FpJ;Q4QM_e1}Bh$Lwm`lu|2
z>i>5}*w$B}|2wHIPS+8xEyu!`!aGAlZo)so&~&YPFFbsMC(&qHji^?#Ju^vxD=eKH?`?!*iqFvxdpbempe@hD>n
z{IM0qhvf{#klCCkbHtg815?BUXIGlQtKSp&|0_`p7@E348mfx={Ph1NyO={|H*$T$
zY*rTR>tDwdty@XgY)Fa90>-hj-1zS{%X1oc$K`D`uE{0&hz{iox$Xp=H%vv>OenH6
zgLF*ZN1Nz{uq&~4axJ@2)aOWU_seB(q#0n)}@zW+6(;>&cddPJ2|>ALvu&&V>S
z|7v7;R^8A`rfJpiU(XXe$M4m-$hPdnQ-@b}l@r8x{i>`bT07Ksg7E$2;U=E5uQ(;v
zdZZ0|+ZAdh?21}+z=ey&<*~QJ=fz<(Ur{<-kjHzSE;D;F=be`A<@GLpt_(X1CN{8OV*gadb_)aqcoY8Cc3<
zSS9zJxyst!-&#N@}JLzqCY6q)Q294_5~k$%H)y%Cd-=?5*x?c
zPYin+|BqV|nH1J|(dUi&RKLM94P3baZfk~mMtXWX2K0J%`g#ub_fYyf#Ish*ylfnPxU
z7yus}0vw!_khR8FITCrLnW0)iPcIcF-f-7=6S5EmBNZS>4fF9oee3A~8<-HF0mVn^
zrT^6ji&Zg{1Jtkh(dYzo27gBeNA^k$r`j-V$|K0fD#R+vDaa|-D%i=Z6_7l9^MOF#
z06WtF%Ao_wkyT>lVu30ef+`F@z8}B$zeB!cKXhN7zqi?Zb@^7_^yUMj;FoyRKJ|_Q
zq2QUXae>+bC;$Mw``;WtS4IC{0pbT70rCH53pfI+0|3BQL16)auV%2`?;EgfP~7jE
zuMEJ?ypxnvlM6);N67nk3_PD?Oc;k+HwjYJ@3W>Gk1WX{+5
zjZ~Bh%Rud6vVN^Pq8&SXC4=tu3EW*vpy|FwIs{Qp2KSc?NG#-H*WQ%2cwD!fruHiQ8|v5_}!ap4QQJNU_A7e
zUW%xTgwj3|=L|}}uTVel`x=vnE(;}QCw0e!G#*4Z^jX_$?s2!r_sZyn`uu?
zw8$i`cF3E9Gn(&Y)-4EPRII&phNWfq7^(BF-+JMv$zrBijUC7n%m_N!&`>W%RZ
ze7kzISr4(7N)^WpXtyJdROYqMz#74QS@iyCsIvxSJ^JE&{>!-y^jgvu8gLhq&E-W9
zg`b1)r%AQj7bl3&Rr_;Du1AyBu~&JmAjX3WuJlAT?y<4|pr#c~hoY%Wy=2K$Pl7y`8Fuel&${CG+G7()i&Q<Qs%GPovUMV)aFb(AiU~ldfm)~0j=20GZz5CqM
zMBz4N$Am{txJOuew*Ni(w6<$hPaAiB=ymj2YUo4odUl`cnB!k4n?p)6$ZgFT|j33OT;8S;066y$D!QI$UX
z{W|jw90wtOj$m8%#SS{c`?)Iw`u+yMyRH56f^fnfZanE^YKVZ#2LTNg@gsmjAb|4I
zCLt`B&-ZBbXf#-jue2Dg-!N(&-4xeC<{M_&{{57qfLhYpyqs~LxwU_svv+*wn=MuS
zHE{(@K)EL2!x7CGvFT}Qde!Opj)cJsRLgscLXr#priU<<=oJX^IsfM2*%tBYr07k9
zR?2a-S^R2|QcNPqy6QjY*Ljig$N43hw=-YP6$)(l}8Ja7?#
zDOg0tW+!1{hCB}xYLGiOwE`9Z`RQ1~_*de-IQtJc@(7vVLgGCpEI2WLK4S{TUh!gu
ztc&Reh}wu~=(3?HORAX^Y;CjwmAox^*qex}y`LHU;51He3)9x%_ovB@BNrN;Mmij8
zQ`5qDp6?^(X4#Vzdun7+0io&;6N1^P^nfQ*V`JKuTYfWXu2)(s-`gj!$LWdoMS4?j
z@$Myvc7*5rsK<3WPn33=a5?E&OuF^a!AgglEGL54^T1==rklyE!6+1{4%a)L`5rfu
z0LD_%1)$fjf66zFgbb4rD@+LB2M`Yq&2$Qq3nGy_%V$8NT4WMNC`2?ON<<101`~m?
zC!+|EiLnwpsO=XgzsynduJ(0#Jrk-bQW7eoMX{h}DU_%pJY86kJnw4K?_XYuGdJ}~
z!5R50*y?ZOK#vY{1P%mwQOqVst=o>-aiceCTnA9=K&xp8-ewq=s;=BNWFZ6@fE2JM
zM>0m41!fp4IM}t+ixBI-y^H;!nsw76cwh
zs$obNPXZUTDrU5bhx)HhP-<>kS!4r^UMktIusBmtRG$;E{Z)HaPAP2Bo{p0UL@bn=
z%q@3{ta{I(^dA%qnGm8>eHkQh4nH2?mtGK7L|w2fz@%2p1p1B|b3vRC%msUG5a=K0
zj7Sx$oGket5qa)^5zT;bLL2QW`+#5m=M*k3t;h>9OeaSjJA4pzGf5{{J-kj4-vwZ<
zgxB{=dH!hZ-Hc`kd^`@Ytaj{e`cGL`ZavW}Pj2lfQpO1gdlt67o1Id;0Wf(&rj_1M`_jA8Ujjk=v$Cg6Bd5g3<
z7_^%V_a*LC_Wp|kqLt6}3Izx#fQI`i#ikI}vg*Oe$3kV%3}MQ@-801fS^y2w3V-|5
zI&Tm|jUM?R>JS)3H`-}GL@VQKUEdon%AIv?(`_`%6M{aHvSh6LR7t0$ao+3+LUwrn
z#~Yg>-^UwCDUTtqCMU}ATWA4gnBbT!KfaJY7l`%`U2)5xVT_^qWoSw
zLc%Mhgk8tp>n(c+e{vk8v
zprkl6F)$SYDam{Qf$eNqYWV`Ut(XnPQ5b`-hP=-g9zhvRsVfIQ{-fG;ezD<5x3f!4
z%lGl)b-DWYS1+bH9BBF(PIOx_e=f%!Nr|NfmhbKCvSoc;bCK#4^c31}-mW^e4L7gb
zdTcglC#yDlb$yY9{#oXN85Ic*oH8UE=iq6r-Ri-lh#GXiWmUjEmYxm-C~#}TwS;a`
zc8CCm|8^2LWP@pwiQ=eQ;gAVy9|0WJUuI!;Q}AOrS8@x|G?Um-;TP^if=Lj)O>1#>!;uMB|zS2;#!jNl1N&3=~%i1$=biu#Ow8Fz{tYF6p}c8
z@;1Xk6V>DyjpCqTnuq}@rINQfWteJR3wNP$Y^Dw|$fYvmYJWj?*gl%Jx@PGh!&F<_
zzn&%!he{b;M;M9_WB>^Z(a~U!bU(cQ95u@_wA-Jq(Rngl9h}l@<3h5s{4J8WKOa3=9kI#NB=lNs^vDqs99*LPHj|t;
zPN#*I<#|5Sr|AOY_29GKcV$Kttl5ALl6ymbQ+g&#LzxD|{5v4oxqLcEm>sf>Nm$O6
zK!V{DNMO^JU_a9@{GDm_Mwa#2uU75#7u1M*sDIu-2iiX)IXUG9?sTlnJJHy0<`v57
zd(#rO^}uRm$KP1tA|Z6?o_(0i81qGF_^Zv2jp#DJ;URz#$M<+_zi(xiweCy!x;kC!
zNcWmSamTw}_s$KBNxxW$eKoV(G8PB7kB&lO8WbBtcvI#DV9si)fjG}BDT|_lbMFVV
zmvuasp;TwKxOvWxuiZZfZRs3AX??!(btxWA1vn~5e5Q0!AcInJe0EuGvu%FXYGQ8y
zSc{lkQp{gHTH1HAM{C-&Az|;J?r9T7My>z}F;IjD5bR&SOp5`)a{frlE}`<|O|>^J
zmGV^x=p8C3PWL5mbp)Yoet~^3P?jiv>V`#hG3=X2)(xuLL#|y)xU&;8bX)dV&o>X-
z@qC(RY4L_HSl8bEm8_aStE=E>=-bmD{j22k@*lLVnf`b#>6E5x->$#2d+p6r{tzJg
z+#cji=`Wy}#sh`Mp=kxYm@#BTf~y-O=Jv+Uew2b^k`f^C2N22$1NR*wnFK(VBQTU!
zn}Nx=dj8`#wr~?q=xbrSl49S-wI_Fnd!}rTp>o~Bd&+g#A^*je!`G_`q+fi8<^vZ(
z_^S&k0TYXn)Uh==^QaBwRTgr_flv$nq
zk1emgSQ<`}*H?xlz;v7U-CZMo3mDo+vVO3z+cU9y{Z}6*xNydsNrRiRd{Kd$df<(K
zv!$81(Hh9Gc(bYbvArdQwrR>&(F_!5`c&6AtN3(9_V8GI>xF6U-Bkdx6jxFD5fFOl
z4h`>YxZ=;%MUYBTLP%*iR%@|KnGbebp?GqtwT8!X1q57&*Ks_lYnRtfPlYS3a<(Ka
zosEso!uHHecWJBptzLM?BhTUGyya5nP|tH$i2rdyn{udUAMYa5%b&yUV$9#?b6
z`=V*602~Ot&bgFcu$aV3t@(u&YcdeQL0@S#Oo9Aja6babcat!M12z8mTn%Ayc+NS_
z(xd!eX9@=hf+ppV1_=5h=Nvu!gR9~oa;RWKh9^zY!$*VF^-n`B4LeaW27bI(p^Kmy
zlbScEL9U{@FPN`CCwY=JV%r6#=7Zvyi5~-4Pbkyz(ysD=9|02~W?etf#j0kYc$J3H
zLLh(yIPzBtXAP6sTqH-nOK4aU;8XNT=1hhNu=SW}2SO5Npe@;nunKsP1(7q{
zVm+aSo)iHFL-p^9JQpI_Yp)0Dpz&4!bt%QHSfcO-g)~VR`+ZQ(w=pb1XlJi4$Z*Fw
z!YS#H7WR@$0(uy6V@KfPq!zXD5?(n=xdXch@|>r!a?4X6f&`=-
zO&EjnmN_sm1ZA}ZK!3u*Rh1fT7wb^aG*&20wYY33f|zB#Z?nzZqVBd?(H36W(>_x105`Xh>;h?0GEX9}JJJFDX7_{Qzju03T7>SnPyiy{OMAm~WmZorK
zr*TYuR06?(3r7$!P&k;WRbrCh=)kie_n+t<;>(L>qBChuW=C^1NgNzzK}1E4w(sWh
zh<|Ueo4zXGJZaBF;ThMhT1(K#ZNa(FUD{}}(jw+G<*&5Wl8fNeTzPp-KiO_{xb=n|
zKV82)^So4v-LI4m+SaWmMNcJx+#c+Ndp(2A8{GOQ2|6SL*A`{s;i-{au;KHtZ15`6
zREw(Cpe%NRs4cP+1_+8Vv3axpPk*e|brp;1WfXQuz=sWDj*-HBGHEomnVqc`+;7Mm8c
zWL;gHIdl;OMn=U=hfaqw#$X@<>HV!dDURyf>!)!*QE-C+dd}$#O4ufax@ljEqXmnC
zyni!LnucL+P+Ah!U==FYyCRYlsGQTsbIO+HzSEi^D(HP4(qx_Oy*QuqwlJ?cxmEA{
z_SV%FmyyFIm$`lQe1P`wKr`b0aY>9jn3uS@$j!5?Vd1i>C=~7A32%G4UT0Cv_kNR&
z>Z-l5?R%?D{luO5IIY!KU_0LL39%LC9A%_|?((NV8(NczSewDY()-!2ylVk3>|e^6
zV*lpj9?6Bg^Wi5L8Qp?W|5@7}n4ye)E>a~Rif+_dKBX;L3%3Gn_KtzJR
zEBRomM@+wJNGIxPDp27pKh$lFfoXd}Dwly@RcwUY8E6iEsk1XMfjW_mbv&
zIfYZ`DhtMAeZ3Vy1|!DIIuVq9P_1A`Jc8HJVPJSCe4uo{c>5N7`n0c`Ij!N>mV9gv
zlMfch>>W->=>q)%r%0UexcQ|eNc90GCXL(7z+;1~e0cUnKy$hmGy95;Jlz%Ld{V*XUiRrc0~qRHc~m#rz3gE;_2l5@xbPb=N^EDvl)D
z5kMZ?B2WQ6ck3)bh?b*-CB;&?*5o@B?D_jjTvnI9f?)Zx0-ixTT~*?D`XWO~tb=LC
z`ZQ%mqcB&-=j-D#txm0{xh?~K=Oc8zvJK`L)x+eZY{owHD;DqDKFTqn?-Jc~B3!S<
zioa0N${Gu#CR@#Foy%}O7*p}{W9Tm%nmy+Xm|85=bqK1{4^^;3$!jnJ}eS6
zL@=z_B5n+S#DX&!WO_w|BUKgTJTpQ9%TuFKy;#sZl2HOkV+0|s15Wh2vSl;Hj47^0
z@eC|!l!e3x_w63&F3XC9{Twz9f*kF|N3@TFRb|p8g3K0)w}i4r1S(ISu5xNc*y?sp
z=vRt0^L*Yksz4?}P}sdZuA<(zmCHJFT+H=?}X!TwQLjPI*!;*SN{8Yul>E9=*f7%4?5CZf38w
znEsuP=IDIhc*fA!2cKmv1!vt}{rld5uf1=@we@<<)}Gf$#&^HbMAyB`T2JORjd5ko
zOK76q9E48n0|gfQZJ#p+&fC&$bO_X)PcPRwoXTA9?01
zGIJi@1FC=|2SWrHRTdy$LMaiPDTpya5fI(TP1pXypCmla6Yvn{n4dFL=Xg4jaJ1EU
zMW)=tI#lWS1lR04Ev+$+rj*cD;bieZxfb)b(D?pC3HTKPv@)&qn-PwqCGX(gL*TKp
z)83Y5Xa9KwdHXWV
zP+-=$hfbV~vu(Gh^!wW2JV@BIZr#_e5Yx!unCUr}DOtJ%t-mgNx```_X^}R;Q!h0s
zU3J*Ko$Kh|nfU6MFt=?AA-ww}x5^VC5sZ9c&}~2Yk?~TSx+*NMGO)^UT|yLxZSq`1
z78&`|FbX(JFm;&2oqqH`X{ROAi)l1UW7r(5yP0qV*mdAEY+AV=H8nhWAIoe_7w)(q
z-`1zvs@fYJ(@0RQ2BT8j`O(hLmuJ`8_UC&WAE(}kmbf}L^&3s!J6o!=uQvrJUdFC1
z^yH4+o7XoXAJL~NzNhg#(>Pf4uSfz7u%WTor-*cHDy68eyz-N5n8j1i>O+U`mA>j-
zG1sh9#{REb@nd$%zY0ZNI`cn<6%B1;r%GnN$LJ2ju5h2NzXpG^ZZ{WXbUeo1?MAd0
zDz@v&@qT`|H?W;!{o*hw|ixDERY%X@eycG^H&gzSTZg6kmep#8slJ4;GW;4<$_#hm+(_7hasx^*l#`
zdWOfSD$-)1DvWZKcNUa2%5v?91qBAeKE!jz5q%lp9O06n#+7MrVSx$`e?XeUZR+lGK52mkCC3<
z*>E|f7C*9?vi-4h7Lw$uyV-v443neveiP-X(PT$Xi)5M3WNWU!@163H{KWer&~v~4
zw$otv%=TQQwb+kD30J~*4(kRCmE%4X*S%%GQz2S%zLEG;s^BU*s)O2MuU^H!n#?cJ
z7tT<|`f0bM04`Wg1{|Oviv+*GC@Hc?!igfE$8Y%pBrOSD4ejU9E$f(cZEqfPS5%iU
zmSV@DKJl&1?1FD=`9@u@ezAiG@Cv#16SOVb%d6V>73yIkP@#H~^oIg{XaJ$)FlCo(
z53HPY%^DFks5saOPN;Ip9nRuA!^k{?WN8cN9%NWmjssgZt){Z;uJby{c9@st_eJe2D`?5WinNJ|1o
zRHxlAZt=^3-UJHP20u@i=KfWttDtm5C;W?S(k9k^Rgzkvk%&S~P@Y~sHfDF=q6nNc
zkL)BYY)AOAdS;(3yK|vLxD0sQPsMQ{;C?Z+rfpTQE4?*5SGOvF%>a%?+0WJ~dcdBY
znL38jxQ-8B3KsnK-`(`?QRsA~*XH74o02K%P3THvTZXo{R
z>o6~|8x4h^Z+{I51|23#T8&cKX6|tz^EP;u#g2A~$zC}_+Lsbc+n-R&b7JQL*L{V5
z)YnPdB;P^0EWNr(m7{JnST_#SlQhZ{_zv<^287za2bjNH|CakmB;6_UBeJ}irfXTc
z8_rPF05e4@&3)|Y?Hyp5vJ@{+PM7icYTz=z!xS85%e*-o%LwI>!tQrZ&T4hHHl;Ss?XCYxv^v&84LcA7YtAZBgynNDPh
zks%+zhpF$*nieSzTsX)49X`zm;LxdqbQst+YfS8)sk6X@iC`#`gvq3G+Gim2BBT1{
zrYoTsX8uwHp=h&+GY1!u><3CC@la?a2KnP_ypdLV)$V7mOS03DP{SB}nh=%MXedds
zeUwt9II(9R?ZethA#j@Z#~))eIUO6@JLfupe|*)|c>DV~eP1{x;&rNwV~lqZ-(AA}
zeNnqzXRt?czayUZ`TFE)%l1qDfBbC*$EPg5uIGc%eF&n@b4l{sW{D~%iz}9Ct(Noi
z;iK$M3tJy^T^LZ&M7}X}`{)G$>ehBV=hC0#@8<@;pp8vcu(I2(G&L8$
znm?jOKSpU5I`=V-^=L_Usr%NYmX^U@Yy5^urEgd-J-A7U|B9Pm*AvT?5gs$^Egrcl
zA#dZvoH6HF5d0aWFc{D0<;vrKti9_n3tmhZ6lg|>Vh%Z6p)L{!|JupR*;0{+x=2^t
zKJJ$}yjErII38iH?l50E@^7QAX%7n;@}bR2_u0vNbgXVOavw>PrBZ;(sf7LzHPBOE
zFU|^RbP{bSVMLI$uK{F#drn}ZdI(yy&2c!*I{E9G$Ph2Jy7i+EU&ZnKYK+ASh-S55G
zv}Rns*j1C=KQ&)q>n7FfTb)lmaUhoMA=U0rH<1<3*49RB5Wu@eZljgSTTVpt?MG{k
z=-C}Mh1K+2_p#$CV@1hYauh{|Q9S3it6dL{qDLMXp7DMbF^?cxO)z#4GY&*wZmUzd*Hr=!NhAFc}Brm*d*qR`B^kIfRtvb&N^_|xpS>lv*q1@
zR9|-r8ZYdXuqB#qOZC-wz*JK%An}?vEn@S~EGwvs+TcOu4t0!+$~$Qp7jT+{Q6*pu
zilF$*Sw&}J{?09zaX86j#he)j#j=^|FxDWZRC^p;wqN{$8>Q>^0@`GM
z`-|=KG?LB|^Kk+0^EnbQu4<(0idKmJ60KF+WaPww>%ury!chLIBFuwoP<1t+?k=1=
zf^Xci`f%r2O4(BHDZ!{=?2pfr)4fLp$wwOkL=2$H*yNhe<}VKpj)=OXoE(Z>ZSN`#8&
z7&>ohoZx({zfum1C3jv@r4Gt+c?}51-9gX9=Zy_HRG%%(c#Q^~Mod(Vn3-ixyWJGi
z0~u9gF_9*R+LnsK?qMI<9S08-I+{Jfy3#RGk#(u?s5wIBcSC=Cm#+bZuog;=
z-8WKrf|M532Wv#A&vc)Z_BYDTITrI>Hp-rmZ{v9ODls)>y1r(QUnqS{tV*2D#OSZF
zt(8S$UK?!QYDNJ1QFqoziJf|ZEC$wI|I(ts#g`kiysR5Ns0(&HoRi?F_R`+Q8pg;)
zl`$ABs2#cXHQ2-j9=NJ{kL$xW+mY1|*Mk>R{%B4yHw(i-U44bRUZak0dV0aiU2Z9|
zG`4X!ddl+UlsaF}2E=kLdXdJs(mlpr?fXAT&Czr&syQlcu*Gq@W_=M=tF5)XIwxJ>fB=J}TT?_3#y29)@N{Fu)U3|_bgb>lrJ!=N(
zxA_4}dUyDs_Jx+Ja?v6`RJav}mm&bPyJgPuD#ohKoaYi_zqCdDi+oTeG@?2C(Hv*o
zSLP7h(PKIV2oFBJE7@?aqCU42MHen`D88k5O!+`iOdtjCc6o{y$-=-7LHY}!&;}U5uGEP
z>aYx>nvOErvZM+>xd&gom_PE?W55Bx4bxqc-)Vz+n4J8SU`*ygOImHj^Kq5%A;7%N
z<5oc?R;(%Aa3?W@N%a)isT8zfQ@ny{>6=U=1Gy|1Cva)x7J^lquu;M%>0`tA^WX8}
zkt6ntWn|3blQ|x6aI^(56dqR;2|;2iB`jg&jDq=`85nya$|V0<{8e~CDA2hEtve4#
z%ZgDi6IEMICX%h9YV6&5%cD6UlK(m7xE+rZH?*0!q9)W;R(bZ<)U4ZGN81eYT1(q}
z?ylx-@t2cl%d%q!|4!R<)-w!itkgyd1A(mU*{^Ogou#sG9i{CP6?T+
zpjwLRI_Y5`Ne9D0=8PZtRSN|-a>~MVU;pCb^I?gUyy;Pj@8x7^W8+J($G|L9Ptse}
zGJ(8~IRo=56qIqkuz5)5G>zqbD5aYFWo%PY`&O$I19~Q(b_PK%7`xz+I7F3hlS%U4
z^+o-a4q8ZKfKs|lENgndG7Y1o5U~ir$jG}#AU4{WaV*->hswbxiG>P%jamaA9q_i!cAqe~Z`UDJe8q;g`V
z7D$l>Tw4GzQdE6YQ}&0M}#Q|rs|l{$0B
zkI3~aRN`+eiGcOg;o}DiEo4`B$cYt*dXN{P9-QJL`2`M#mC}Xj{h+Hf2whe91oI>M
zqlWmMj`ACE1*Ie*@Yma3=4f1~9K2PlR}-`p&}Q}QxxD7bRl{tamQd=l%s;|t
zV_|m8l?7GJkR*bF7}Nd|LaDdZpop;$Ftf23DXzBV4i9SUB9kzfr_1##HS7zn2s2SA
zU@r1D+$^CB3ZW1=aOCjeL@g201X_JU
zb||~;#f-voN@O-wiDJC4w_2sAPwj>*Q+7hi=<2HVz@N746bjSQi%`>%a{qk?cg>n@
zX*lMgs>{){dDN?>-!cJrlIhpwH|JX$JD1C$fQga(i9c8^nr!kJ8m+Keoz?EzAIoFd
z6mXXmA2Q{S@-9CX
z4O-kcwTXc+%>DVvx585jF~+3gY_|`iq1dBCIN59%1omhKzQ@8G_HFRGmToIv%+%CE
z{f_|=`x7+p4Q}88GXU}MS1KhYGM%ikvjGBLOg75x>;9Rl=bI>S6mq=whW4_i(IZd<
z$CBBw15(lvm-26M0>qEWnO^RvAmsbY`Db1`0ng$t%Sr!!h$W{A#Z1qKkOGB}~E#taomi8t#+qE}i%2oK@6|8%Vj8yJx1zkq9
zL-NaF(KILcICyxG2iP4R$~>dADd<~Bn9jT&+He`lFA9s%>ftCnM6}iJLj2}~nDH31
zoF;#h(m*512Svon_>FT)H0H;nbI`%~^TR;^L57e@1RnO{fu_LO^mBR3H^_@m8y2&=
zk&14j9}p<`~csELIRb
z_~LwEzkJxK^0gQ96)|$uE33ZLVOxP2NwuP5Rq{PcL`v-XDS&V#U5-fMOed
zQ^1$EBR1x-fert04*f>r5EG{xZj3TPo|T+@yLA>NRmuoP1PaqDtT{_18Q*~>g1CH@$(KJ8!0+G}aAonMc|khmH(WihMq=v9)d(I2kKJDAj#1{%-Z
zQ7a|h_nql^d1RAtDqk~W-66c%Uy4hfCh
z$L4k|;^)^zC)`EqgBK|}oW|}0D`|tQJAW?hi6Mrvjw}jxoqAEC`9!wDW|8jG8v{lR
zxhqIkj~YR|f;%D*3l%FrmBgZ2!~Mh~#|<7=@b;1z
zBQ`BW=;+F|ji$GOH`c=_IhcwN
z#X1Jn)hoMnh~4cVv^~R_YiACy#zV$N!~8eZiZuwHV*W+@1#6kVbEEcld#?*m;>{fU
z`jkN2Ig|3c!|OO>fN4v|p?M}jGQ}BG%1P}wd{a-*+2X~nsG_(yVvLoj){xPy6ln0aZBhnm2HPaO?037
zXra+I?)r>FbULhi1J-r8okstn>(qO`yP##e?j2G`cX^DDjL_ELb?zM^--~p+UxUDJ
zI8Og;sP9m8&mOb@?Q|{uUghc@t3io2&wY
z_zdblOPe~+!x2b4FpQtpXl8B75!GPi`cx$TihYPZH>PLD3m@yv&99Qc-YQ~@-+s3N
z1Lx0u9341F2*7ko@#@v^6YgL|p19%iVX06#lxasNMT$a*6BZUB-gh+1zEx*TA!q@i
znmFAFb;8Lf$nT7=PsM8O%cvF~$q6c6z9`eqO?jL4t|H+dGNy(pb%y_S&Q_PGS?6wF
zf;-#}@3VCilYoRik=HTn`n=>Ym+$Sd81NkphjTlRg4nMV?lUz87A
zYALR9B}7Wl2(P6Iv?#0q_v&2sSAh$1oR9XQFPTCL8}(E2_n
z`unQI?fh<}mKGDv_>Sq~;69n&Kr{U%Yy>vUSO%B&Oip<}@x{00i
zUa(O#_)C4lw8u=F`UPkxr_iorG3~1D
zeKcpvf{AO=$iqsJ2(Y*zM3SV|!Vv`dXO2sO@zu;lO6*4QG|Q
z`cPgLD1Gve#jy3vHb?2vHT^a-y?Z$lU-i~jBy(d`psV^rWHpK;n`P@XQiFzJnP(_@
zup|CGF|IS7=YU61!y}4t8PkE8jrzAC%>5c3y>nTyiuvyF!
zPJ&|`@~z5iDUTJ?n{|89(#UnWDY|+40y?5c6wj?1R4}Y74G`ldb7(O-+Mu(
zaBH;n-;X7_j}rcaf@ctCVTp-K*$IirC{%&#`?aZ7tl$iZBfF8qTFqhSnwL%%##)E(
zaBqii2|;hKF1X}>zaCSbYV90g_5jHlYNZ6BYlHQouZ+d}^5<;EDTghzN5h;xhFNze
z9ivauqc$C~%yl2ppf^G#qOV-4o$t*)%?eykfvNBinTQ$rrP?%r4cUxgt213m7LQGl
zG(?T5Wj8CNve1Sr9{JD2_XpFr<~1rYy0)waGtvvbJ|*{&-${Or+v-e
zuO^Ze$d4aP^74_NI%9(hGZ8$45nO9~3|0|oVF`Klj%dH?F<=?h5U_vOLwgZmhiVbc
zd{!BUqeTj!m1WJ~!~(Hc39L;41FgC+wHgnAyIiRIZ;XvSzL`M;Q=UBzzP(wyUR%&L
ztubp~YGf^G%p=0MEU4XDd!`JT(AsP{KR0=3!E|*So&Z(U%;IKeWktx~X2;-C)}c!7
zdyiJ3*TjIntrLR_wRrd7tNY$A8Ev;HSy6K!tvi`fak6ni6S#4IqI`6yNwlDszoZHW
zpA@}}5iG}N(!V_qNp%f>Kl|44O_)-W!|?gKk?!z)^-uzeOKScUrU^S{_=mS?L{!ZhCg`t{Lo)})^{zKe(OOXkP>vm-tJQd
zM#mtq&wz{EA-0mt2BABNFKkl+WO^qA?m|3q(W{;=6?=w2y2Ze?v+_Pm
zK+ijA3_fZmW_lmq$0qmGD))5iXxPs$$S`ne)@~&{ID1f}7-*+#eJch&I0JpO-De-1
zQIxNgTxj{#({O^^U0!=(T>SHcgkbcV8Su2-C{sU-ux3B^+xKso(WTRxqv4Z%-A(rA
zgP|zdDcTSGZ&VJ*ZVk9G2*``x$ZgPXzFZ)ZTduJggh6s2){Se8!>TQe=0rP4W{8b}
zNt`;@+K+eE*-5prrzD7qqOB-New
z;nmqf+ik6>J?@vpY~*ASV>m+&vOQhp)wD>p8Jla3d9e5E=@gx=CeEt=PXIh1=_&>q^xbNO$~(iR8D-YOnNPkl+*cEBSc&*h$Imy?)$uQ)}BXl5k(2g
zka)#HNEJ|!H8XQmiIPOl2o*KtLhOXWWmNzGGy>27HkXL}(yBCU^bzMj#gdam8ObWT
zp_lmsFyv)S{uJ-zRzY8REH=}2-DCTv4(=Rx--uZS{y=AVY69L^WUsWOU&Fo)vr+g5
zOI2gV*?#Y;X!*0~fl&J^o9;U>Rx`A%b=(>V2Cmxm>a|9ft>{?CmRgwiv?J(Z
zC-0DcCo^N1qpl>&*DK^QsotTK}
zc4y68tYJgwo_p`HW8U`1kKI)>*F-&
zfApubKLQAhF20w067#}`zy@$vs<^Kw8mn1wvJO`>NK`wu*hi7{_
zepNgUjp6FfulZNmBod_xxMV<1LPhnmQ!a5Q{!AGs-0IBk(O`dcbjyw{qtW5%x_I6W
zQhcDLd#HYN>yE9X_2ZM_gtCXUaH?T^dvm#?VSHQ6UB>^=Vl>;$iCSlEAP`Or%(YJ*
zuJv!}&D~e3ulL77RiUPVt-a$n2SR(sGkZ%5ANMua1#PAVS9Pp5V7Jr(wD_<5wdj7~
zL3(0+MS*C>l8lotjhO*Tc&3xfm^2*B%>zM42ju9_fRg+HzvNIR!>!X#0d|Sh1;vVY)Mdnd~2Vp8*F#i>HOR@%yg^^nr`P
zb15eT>(`DBr#hP&0@Y-9jj}dsV2v_=3|h~DX6On)GXT`EaYR7x6ohCZ4nOjX(M+?a
zOe~{H1X?6&iGo5(NeUGRe2PMH@oE(&2OFS@XO()q(%IRcMdk2>)uEcTDYt`r#bDFy
zNIZ1SC7-*xbMU4wZn@?}Y+B>6THV$0@FhE44LzayWVQ3`_V|{gC%(3G=Qobuu_Yeg
za>wy+?A-D76GykiPi#2$;=cVae{!~FWY>W^r}w>hYy+w=XfGQX8@lDoTX)=dQ{QCA
zUQMalW*Z1<&Dp6-1xaSZn@~#?N^M~%^!b@
zdWv(a(GlT0AP8bGnX=V{BH>W1CWhB8^fXhiMS!kdipV>&5^_Qvnc%5&Hks;yBm#P{
z70dc#^HA~aGLd&C12uIhmGeBi3o8LC9m+Av>htIT07?LoeeESQ5f}53l`Bzun@f`X
zHfI9`v4NtBIwf1be2RB^ebXm)-+PN7|UweoviFysi24`_!ygtx-as1CFdl%B1YE#lh<)ZAb{x{R)CfemngcV2FM}k
z^4T>&K<0~=lh=K`@Q;<)6B7ZsrQcq-o-?NP&<_4mlDBFubAeH?0ZJ*`hIJETLj#TV
z(MY&9P+jG*Sv8_AGmmw*L0;2IogM`8U!FPLYBg-u(Ey%fFfU2U65Z5?+ZuVgA1tH@
zkTFSyaY2;@*O+*Wk26&Qb*kVwo;p4k-y44=SvsdLb9mCfgPXU1cw^X#LI3Vh$&I6Hvoj$4-&8}gT#_91p&9h*
za?{=PQ1D+&MjY64xVm?Hs&=fq*<`HurWdD9-K5Nd8;s?3E@#kHOm=4ZN6@Xp6&Eye
ztY{DBVqEccGCV_QfkVPS&^P^>0&jYI0lUJ)EfZ{&=i89a=gYSeLM>YlkBuGK*3z==
z$k^E7tu3c)p`_QF4B0YQe$()Q%`GjP4-609wz;)+^KJd!);foyt`)!O$-BHAATR?a
z`6m8PKo5-Iy~Ll0>|W+lm9&{$0a0~|01XrX0s8>iVg$@$1k7S&?kI^Ij>bwWiuu_C
zAih;)5J-QBd+Tf!|EKiBKTm%PcKsYqo=v>PvOgR`SBv{V6x>R9s-b|)K##(xaspjf
zyDZZ@d&o?&s?D{3ApzY;H!v~;^sWp6U8Ktk0_ujFQ(L+{Wi^TNOS~y(uP?ape2MjW
ztIuh)I!nt8#TDhnB{yoD#x4=}Rd-HBYI-}{Dt77&{>q#CtWnEz*82L0#o@Qwtai?_
zYJF=t-HqmMMDN1=&<-9Y)bn@@lPCjzx-v5vK|5@xPjoez&yr9QHINrdFMwALq3jWA
zr9iY{MaN%_d7ft;5Mm)Eo+lLGd44bM>D<)isZX}HHjZy?Y+g6mYTI09uQwG3%oSC7
zccVYl=+am{jxueLtE|{^wYF(^leo{<+VAUJ=d|>T{P>lnC$B
znaj;ipV@4;WqbB<{zK?gCbo}Ky)*)sjqOt%T9_2)zJdo896N|1J6Oc{L8sDZ?X|vV
zkD8+O!ne|Ywp)Jht|V_a>g`elJaA1W-ofoEwXhRZDRXX3I9kwdMCABV6tYLCfE}Td
z^ZpX%EfFDv9Jw@?Q(AtcxUf<~afb=1YGkLbOx@fT=1B_$%V!FbX_eK@CRS)#vIT&6
zh}gY4_ZOL6T5u&nu0&ly1(196rPPIjz^al9^T)_Px>Z(nK|-m;S8{|qxSAf}5-%o;
zyE)!k)i7OU)Zg1ZfX{Jv3{A3gT&HuD(^sl>l|^?(ewOOsUjq<07DEDtZvhMV9C>c|
zYA!&jbIT~OCSvl%h+!x|nN*jhPzG}fiBLYyC#7WK1G$p^hyf%};sfD~@njW1rt1d4
zsv%qrDb)a}rEo$@eWVNUzZnBaxci0l>2Ie`UwYpSt5@G}-=)GMXWqVA_`us&bBW$-
z?pZtk$*T$Pw*&5nX)X#Zz^`OMSu)>Afj3%*Z`D+N{hC!i->NnB^;4^SXeKh*URBjT
z8Hr4g>jcf;kv@*9feE<4_X&Rjv*L9;A}0cLe_BtxiVRu=P#Gixf#ShJkVlGJfQ|F;
z@<8_F7DUYj$`Sjeu24Bfsv~!K&I6H5X(*TGAq(B+IQi|s%0rdcfSusUh_7NW8DmFa
z%m+O2oUy#rX;WGyNw{_I?1?cTA}tW
zRdSjzOcE;29>kOhFmG|jL$*3wsq^Xiyiei#MsA*s#b$3F8NFpL7Mr_eG}hP{YiVc@
zPKMW9H!^y|Oav23Mn|q&6HW*Frlxv(r>6P<0tc~OcLdvYrJ#=3b#)F4z;>OV(wnVghxRM@X{TG{i*U;V>BELu&rZqT9?iCQKaNmaaoZlS)d^LA<%LaK$HYY
z6q?8?PzwYtKmnbS352kZB}qwsp=aI@lI%S)l&8u-Gk}t}|E3J?(
z4!yzd*&@h3jD
zu(rhOuXP;aCM!l0hhT8G(ebg5m09NC&*s%%$MjE~o!)AXHpdqj12YnvYgC`=7xIpYFrr|3dlp3KRW)|AKGD0#7Zrb}C?H@yS?X716
zg?+nqY@lRd-ZKTX>eYi~ImLOHeVrVKqRot%^+dTo?^l-eShrr(pT7aLR0BF!>XJOw
zx&o>-0w6<3ZUK4|Io{$lAAqL91BTE@m{G}_jUCv&VJJ?{edYGX>Opv
z>`l!NLW8~xYIOmqktQJ!akm@vI=w;H1SG9SBh>;O&`LUa|3m~D5u!kmdMeQC$XSb3vmM9w0tXCNz?R~HbW+%ZGVMkj7EK>
z+*S!Zw<*26zS>)$DWjkljQXbhCb1fzHwb#7J=;1jvR6jo-$H4VT)lc%>c*9~2XHl5
zj8@t%C;}WT%Dk$I3%sg|sF_vxb@k4S{PVoh&N?rA6M);k{A&;W@WM6;&b*fQW+V|S
zU*IS-uBJL;_!t
zR^)HMyH)Ztiu^6LTyiV&*K*`nD)KksF+if0e}O+3DF4a`1=S()oE%?f1@>vjnVst;hd0~GI{Aqf;7Fo~!FqC#*QQQ;39XAcP
zj$1=k6*V6Yq`e^&LGNqdQAcw)q>s}a4r6ed>|qWKB=I}k?;~0Dc!Z^6+RS&SrwsC_
zvrVVvfiMCkz>#xdk>|3p5OixOC#eI)SxID!OOj3UXk@!TwL(>_I#J+PY2}sgWq+<7
zxRf43NayMKBi5C#jhtUjUYH{FVLFr~dGW{oPIAc{VhY*ahbVWxBouNSh!Lu{DbVHe
zK1JXIKmYjjN)l5TNh*u6Uw%weXj|hJ^G(mC|KEA?Rp7)Hmt140%-H~0Tx6LR=(jv1
zfBW&Jfc$l}Ts*DF-+)$CdAA~ejma0U0s#Jz>Iu^Xjj#R-DZLW_^j|9J>qNTv1eU%`
zbu;N3XNdGiSo$@|tw>)xg9RXgZ$+9b(+eI?nJbv{RVm)VF_1x^WMc>jknpr5z=1qO
zv?R%cMIA8=AmC}9ncR93J^OIvg
zc5p++PU3`|+CxtCae}{=rucyC(_f@%KDZ>>M>BlTY#->BS(51^{hp`OhjFqG_C$m$
z>3rNM&&Q9FC&Gx~wC|hbC;ogv`Ri)Acv_La0bf(e&nWV@)N;wK$X_FJ0Kr=DG#}>Q
z4fG^um{uS;!;qwfK`l&bA@9I!i{a0wpG`mgc{q~(-e+MP#<)}1b?m86!2a~ppMWE<
z2z!>0g3m+71!f$~eG=O&SQmVKm5vi;45X!c^Drh7=TRs;F;%=@9@d96>K|l`I
zjZ<((UXmIGi>}N<1*>z2Yogka63=7IjH!s{08?GE~}k6)*{7u1lWMhuOs4fq`XG(2Tp)F)i|NRaix^AlfvUy
zCSTa2kyj<&qi}^zgkC!E_!W)SiOxiIecyCnec#o0PKD>zjWPela3m23wl=ZnZyX@gw7vSD+yv@I?ZZr~!(4x+$_eMKPH1
zFXYehFC4v$UiJ0G6XPIf(d-YY#vF&qHUeAVI
z*QY-Hpd)$l?N45(#@zmJ-&J?kwtsQ+`b|Y}k15!_@Gq2h+fqA-u~P2-+n&0LP#Le=
zgJ%}kPC{iYjr2D(^hZjMz284R($nnW>=)0vye*;CEwm>%AXYZll!N!mrd)9RjvZ|>MRvL{Y&NiF-TJV$kOgEeA@`Z=nbNl#MgNi4mCYG%@1Z(;#xp_$Q7fEefl
z2UErI=2h*@eeph$Cr3GTkJLjBwo-CatjTFH8$}70t7EtF@|-2lTb}LBDHT<@(B*^Q
zXy!Dy0@{;y8)HJ6)d$pMP~cLMg;@4k8VuY~RBDY{L$=DGu6oyV7d_RfH=9=Py=eeL
zgZDmrbgXCp{g=+Zzty^S^rd5w>FyBc-hEMGO^e&pGRpf(Ev5>sO)3&Kb=3~{PE)FJ
z_g0g|d`rWg~Zys)mP2U{5alz!BxP3?0nrfUprh9u&m27!e
z({;oYTSq{iJU>R0qEBjC9v^25%CF6lKcdJ_=E$E=@9~&I1URih>qo&rx`uJmWLOrxA9ZFWWe0d<(vqw*|T|mnR^9
zgJbbg{t&+p_&^En8I$X_gbwXEpFZi44jd0x(Na3H@PqA|$g~5ZXAa9g@=k?#JB&gz0trh3Fo9W^bN@8b^kedAgJ`)YKQVWaT%zHeSf
zkYDwkrPv@myXMpPj<=_$tgvk|2_Lk4nptps2_0SQZnzA|U0C+3yHI5oAv8l*bi46ALU4DLEd?9#PGOzNo
z^%VBILgtR;RnMcwbEJNtFg9LY3qVr9SFm;-b4-+(W9MSyO_pVu@io1z4YqS}V^WnG
z7;kh1?CH$~Xk*H=dQf>*yYRD8$d7yx;6Qg_@}t6OSswAICOk3>DqtD$G$kzm8XQeI
z0U&P{{HdJm4`q)L^clN4=7K=fLo8Eel%;;R#J@m7B#cT68Lw2u!5YI=M{reXsj7ff
zBp)Pz^$>>(qDIM}OFt;d>J=Mjzy&o#rB0h=DFJ2!EQY?oP#!%t^<(M5i_Jnix_rV)Kg2*AR)Dlt4skSjZnLc7O2&#lz?Sb5{CEph$~M4l~|F6
zrpc#uH9E?;&bC8TF~+=FDY<$xaWXR*tLJKz4v^ud6PMHr1YSDVvePbU*Vz=qE;q=q6GFAiplsIhZ|B%@v7y!`x5=fOW5(Rp
zi>EwY-@I|>BL{{@4n4X1+Go1jo>+Kd``q02OEzxg+!-@YZMtEgzR^I5`laEX=-Rmq
z_Hy>3srfAW5?#d%HouSHcUaATNUt3f
z3>u9=7}OY`m&}oC`AsM#nyEKvETyZ!{)ck(%?iS63P#u1Vwq>LHne(uL*r~;DAYIG
z*sy+e=tQuly0*5uCMYDDrrIhi+oqZtCt4~iTP7NPk%%u44&y#M%^yRb7oGqvaIzr1
zgc+nx5dxmFn~-0%=c(sBoIE90s7v6VsPOsvEU(v}iDks4!BT~(Q#cd=mNY5l)!-Cf
z1x`WLOb>nCF2hcNk2)&8>g$|o^rw;$lcW6W)txg9{_aFX*j-lBb;&@$UT$~co53Ky
z0T6r{{+@daeeZ(etiH@OpZy{F-b;Yh7fUX*zOdu%d*%8UaZkYe#3tY*r#2#h`Z`M#
zk{EM4V=>T86lyL>pAQAE+`HAF*GYPp!&K(hIZC-Fx^C*+eR55k#-h_(C4;ZN)muGX
zUs7T&*AVR^+(+PNL?hD&d=lIvJ5Z<|NUW`8{1;Afjb@
z!ha!Mggh7aQ2LhZQS!Vv36B2Vep5L5&VEw}X22DE6WV0qh%v)n1G!n-OI
z(NQQ!ac2C;<2!afe*5_N?T_!=@%WK(G`aoZL!+aI9^Ss~;RB^6WT
zz5rE__yVHQ0^m}y1qGrAmIxUj>xEeWIGoj!Wi`}m*=V9q(V!ervaE*65&+STSDg8-
zReRuFl=Yv3Bto0N9@9+*U|XtUpdUljy6_sgDNq?I(1RzvVhMHyz20g8GkX+VeJ~7j-V$L
z&E!JXq1#rXmDtb%D9VL28Gv3g=!r}O%eJDIeKk6{T&#s8Gnz!J8+ujCRX&!5VFZ2g
zSiA!!eWB~iF8#>Umwn(TU03T}HitL7x^@0=CH$emh6zsBKzM-O{K|P?zP6**T~=l)
zw&;)c{o;eyeeJy)ELUxX+qfsM{npXpt2SP1uvGXf4j-5!X+w+4i+%Lw!|yXWDjX(_
z{)VgGJ@J9>?mOQpq#|R|@lq4d>b|xDkb*f6_X97zxxnw@OalC_%`C
zSurm=a`6%dPo|zKag+o_ffq!coQlWP`J)6u&L72ekc(HdRQ@Q)@<&mdm}QXaKKkNE
zBAb0W6m?#DbfOY{B#oT`aa
z@s)P7gJ71`{Tw2HI;>EC+vG0hGhIx*nMAq28d!NE77*zw4zMp;rmOgKx~c;*N+RHR
z4)C;>kRX!Olqi-}0C=I0KVzXzYA3q}GUZH3v(>!ki|^X{z=j9YKa6dv*tG2zr{oT*
zp1AAX1BSQT`QIbqvhCF*#THzAk7z_Ck_d``n`8vl;5%5v;gPIIP)YJiMlZpGvoD_i
z7j~b^QS{^=%oxpLNWUbBg5Fa6Jd*U<*8p04LHKX$U%w`v&bM4?uT&`J
zDWHHYg+GsEc5Jn5t3m_-tObbt1ZBzrR!k^pxhB2nwSPC)77q&=0sk{xTxc4Kw;_1zlq(t%fD(e9G&j+`@5#2;mKA0k7Vpt@pyD3?smsV
zqT!+D^77`Puwu6YBrKv&i)VlfJiLV6+Dq(B#cmWJxr1uMQ8rh-ylldTGe&12N@rf3
zcW9$7Z=yb5>i(iTG2ZAO=xVl`DS`hFLOz52
z0096100A1HlF%C9Uk^O>02v3+00000%9CDj00000%HJ-2|62Z=2_6S<0000900IC2
z00000c-muNWME+5_AiWqfivKL)PF5bIiLtCxCH=&pat*%c-n1~1FT&^7=&k8+qP}n
zwrw-2Z98h5+D2I0wrvK*c6R&x-c7#zSkK&}`=Kx*eqsh7KjXBTfRTD0(v!TlKgyc*
zC@J1zr0k5=q_)b9${cGiZlk_@j{c0*Rc`m1y~1P`sY{v?OG-x6ZAo=9S{6os5Azvh
z61lI&qM#kgvyMWV+!$x_BELD0ae64}%6b{=*BB?KVU6mJ)Mgd?DKRclM~<;?YooaS
z{Xd$r9IK9$dOOmat?17^k+>(4nq{P^d#{h9FyGNt6?XR-Yx4ZgDm~x6%H7o!(UA2x
zbspsz%j()FFRxRJjNFfXSrr3iMR!zB3;7It7~_0D%$@Z=s;XQ+8X2imUe^6}TO_qz
z0X+ffnL`~$ZJwKw>?K~4){)vXA5OB9u6mw(@8_tWXwJL6wt0E)qiCqU2Y)7c?L%)B
z(yO9D`}T4zDwEpm?e%Ay-N?*)R%bnn{lNi-kP~_V
zDo6T|0PRWU;6+U6MevN#@0GYS@B0*Gsr5zb)sgWl=WV9PoB1E_K$>|}O>`hWHuHPi
z!qj&WMv|HQ4(MC(Vv>G~^n71>?z6yM#WZ&qLm~eG7?;Xx0002m0NMcB0NMdK0j>hG
z18xL)1z-iB1=j`(29XBj2OkGN2Ym;t2o(s32@?s+3P%du3uFti3}Fo74Ob1y4f75l
z4oME*5DpNB5e^Zf5&RNR5}Fe?6POdi6e|?86zLUx73CID7OodE7snW27_}K58F3l)
z8f_ZL8x|W}8;cvx93LD_9EBZG9vdE>A8a4{Af+MuB8(#QBby{bBz+|}CCer)Cj2MK
zD0(RtDbp%xD!VIGE6^-QERroKEmJM(E;lYWE~PI%Fa|K8F-kFpGE6eQGnzDjG|Dvu
zH6%76HbFL|Hwrh7I6F9VIZrvlIrTb)I{75FML@q=+L|;WHMKnb~MNCClMPxFO7cqnOA1RCOCn1yOOQ-0OgT(N
zOi@f-OleIsO+QU;PF_#1PykR#P}NZNQ58`{QFBqEQT9?xQlL`aQ*%?CQ^!;FRP$96
zRmWCVR)1FIR}5ENSEX1d009610N((D00#hG00aO603rY_0672v0FVad00IC3c-nQ4
zHC6-x5JW%jMC3?=sW61@-!^>&$djwKvdBj5b=@d!S_q3b=(K
zF~hVn*fLSTZCtmk6>xh+Oo#NJ0`8RlTfl>?wEVG$L!K`@lEg_6Fv0|HOv)~?z@pyS
z0$P;zs@M?%eXnuI@IsD=lygGTVm{wu`}!t{5;6NGQ|B6G-{{eY3VrBpUc-m~igP}qJ
z006-I@7uO*+jh41YMmBolvC$FHWq^!~;2p+Zq0RR91&gwhYwliL~>ymBTHecpB
zyUxvc?uD0+o+uM7#(-RhVx>w_pho$lrxNXmlI7Zs6nWx}IdG*=tvk2wm1;0!N~2d^
zOZUc{x2DZnGH=16Bk!zQwxY>3{Uhg<&HPVq{}vXXIey
zWaMJx28_io)W?UtG%wS@z|jCoyRf*H7UgrL7bTXZ>Ln)@r}Cy`rWU0ZXBLBbT#3o0
zB@hYzE`0OofHZdF`ON!-42kd%s(sp|3B-PjHBDtZA*Z!hn0+rc_gBx
zqovy=dLq|tkE7v4U=Op!r8|E?meFu){*9M(6{8_OHon29N`P7fZ#y|0YLnELC`@pA_7q
zX*ct|_&_VL0uhLOS-s)o;c&SeIk4eI9Q;cXrF
zFGu*qg(FRJ8ePlYWSdMsR)D0SCxD7PfLesV{aq{8_L9VK
zOD2m%hKlzMl~k#f)V736KOD)wH`OZruhAgEvCvwM)=9H_chq?W8Lf8eB4?rtuP&O}
z2>t#?KlJZzfNFpS4O&o?M39;h2|03HHyV^0hLqo4(Prm-
zctO13#OeM2`!TDC{X;S-$uvPL7xM?{lSDj;S|X95nObt2oW3>Hw6iu+S&MEV*6}>w
z@}131y5dBE9s0^IT$&ZTllrm=*na##m*3I4^j~;NRX~*|XKoHU#i0CJF~$u<`sxo@
z3~@mU=`6A%!THmD6mytjLI{hAy?a$1cyw)NY=-knC?SMW%R;LDGnc*1HxNRLB2Ict
zX$O>qUB7#u=g*khAE_qo{^AxYNS`Q@aijj!s>AEf;8T2%F;=!~s*KNVI
zNZ>VV%KDxSvOCRQ+IQg4k(0^GL%VhK42(=HtZeKYZu52%r;2Q&3V-(-iHaqi0}bVqs-t
z=Wxq;9JF?zOObi!C{UrQ)ULX+d+*tI;Lwqia=Ol(yU5#qy)%B_C&n;bK;}vg3aTGc
zfvQF|=xZ2>Imz~EhmJsm<8+p;(rxz6?&JM9AO<@_r|^_%vit_l2CtX`HA<9HN~!gd
zMV=ItRMev;dKhDj^-P+>(yVOk9B#{9+9Kq7^?3%;Z_w-^$t@4h
zoX#>=o&}3po(0~mQNEsyZhQ$$NJLCR`Wl`G006)MfPpN_T3W*FDgN>VT9Ab-ERyIs
zF^Ql43dBaD##46FIBQZZy3G*g4YogOf(%Nx_B^OJci{CI?`cFt#GWR*+
z)>`YHqW$XV85o&ZSlQS)+~#f0*}Te!sF-+{1PFwNJ0_(6K;Z_OD+^7wXsxUV@(U#R
zE+m{t2YZE2lj@b3oPv^ynx=-mhC83e)LT&GeR2*0()sdy;#G4A&c|s`(wdMvS^1J2
zpeBHnQcC$nvoEjx_@QGTO%4A`jlXh;-z;`9WS0=iMV3|SW1p@LyPe)=>D)yw
z=e3iK_a;6UKMM$r;f|GPQs{`u%QRpcynLc!;$3_wn}CEY3!i|Hh?s;_P~>9^tiF`P
zlH(GWM8t>ypbIu{PX~e4a7w4H((SjmdRZl5Umxs4VF^GW!VSe*AHS7EWLc&*50200LLO1J2L%vnDQ(p#j
zeb8npd-Dqj36E5WUGBwqE2!YKXM@iJ)Qh2Fn(9lJjED)+d0=1Fo?gd}ULD{n+%(y*
zJW^0nQPULd)X_6AGO@6-v2(bE1pubgZZPh`c*}1m^$OsvabznzljL9P$ZvXI+RGYG
z32R~@0;@eJ`_#yADs*vMY!^bbNCUu#vL&cl(9IylV={ys=DX(8-S`39;}0
zxUL%_BBGnR)cj*$thy0`a3bl=7Lm@~$Hh@a_m8?uR~y?cdGj{;RRA<=3!M
zB1f)Xjl~1}KwbpKkNpd~k1f8QI1)D{A%tTII}&OG(!Bh)zEAZn!DAP6Dm4E;n3>0}
z*nHIva{%C6cng3cz%BN+h_#GpwesfmPF5C1TP!kD_}ouA!da|7o*DT`e>x*~P&?|DY&88s^Q9m~uof686YU
z8n-nBYGAd=28v#92qY!HnwT}ixJIA9K+(8!p}BcTfJ;#oQYB)^EQZssS~#)c6zjr#kT8Ky1hM(QrrUQ6Kv@f3U^PB5fh`!o!1
z$3%_}Ob{nJV_o|N0}7cwL;5a%SD0xPs*-Zs{Tf{289|6;Qsrbvs-
ze1zJ+Q%OHm3#8F`jtS?W6Hlm}6{M7FXa~qFQ_F)?l>F0m(0^gL|Eza8b?k`cYn-$=
z4+Gi6@KM!RuDgQzg-J-m=BW*4w!SMRaYJ~Hj86LA(w6oIQ21%xaa%b;Xijz%cYYy(
zpCZR;GelfEhEA=ll!qC?glD+I-&+3OU-zn+TuX_W$yoA&_bP;vV|8SO4n4Pp*y
z&7VRPM~bRHvf5^U-=K_kq;V4LClW!2Hv4x*3Dwj`V&P&2qEu3mp&J>;OBzE!Htjt|
z|12SRhakR*HEM&fVkl@2#gJ^k3^c6nt`zA^5{9p*nt-Blgw3wxOl%&P3H+*Z7*T8N
zL|2AKar-THX2&{@&>HH%8j@ov!zAopLun~fM&~g`H5l(wpDLx)pR)N;i3??p{B>Mv
z9dvoGGb9YYJU1d}HsDO5^TW#}`KI~weJK?6wIMpWp8n-*fKKg9?sl1b$Vy)gb&!z31?1Q*w5@K
zzsao+Rap#Jt&@Ew>6BT2Loab@CVfDMmWW*fvNmfpw&6S?Ex5AN!DsMTpAm{|Pz4)R
zVNM)8HfQ7$TU5yoRLKri$&OlWcC6a$M77zeYVSYe)PK%VbXq^xC}`AxbHwLp#FY`b
z-Xi%vUOs-%Ud$}N=`Ik;8TV;$SDyo;)vJrNuMl8^j5e*jMc|oOm
zg9<{Vt5Wsyq-{5XWPzR|hr9Q*eMTquCJ?fP-R_x$>IPs7a8K9M@R%k9C;&fvX6h1w
zC;$?J76UjTyoEoez7d*sq-k_}Oo^SStqWl6LhyFCYmfJVZR%9#WZTgljE$C?^b&MQ
z03ag050yjaa_7GA_!3F;g-n7i9IUPi$O-v00lGjoR0x#>2O0sOWWL^}009FkC1Wa`
z8D-ZhZGo%5jL~YhW4pJPmVZ6A2tcu3+nj`OOg9{8K#2cB2!4g6??g#-D68DMsdE*s
z5@Za;2`U`)cC=2AV9pcG1ROvKP8w-ZHF+%|Sa
zCkVA))(zzY2I8Q?+r%POA!#Xdt$cSnF;>I}
zLnh$xyqi`KjnW__%92?)p%$YvxQ(H`d8kjkPU@;FZm#VkjOb62U|eI`&kA&KYp*v)
zKPN`1hRl9#{Sw}msa7d*dsk$V%5?~*U4NDLjB!il50rVn?)VZ=Vz<2gt>cfcI9L-b
zvn13!j@7zlv~TY~t_Ql;2ZAJHl;O`JmIpMxD{EUN|mj|pMu$cyc8u8Bo@oKIzk7)tBNR_91^FBArpsY
z5eYV@?2@H4m+aA@8$rL<4VvgjW{oX^cypAiIz&zn)RP&Fi&ZWh7De0b)&zDDtE*XI
z3E*$7L}k=;2AjD}MJQo6SOsF)0Ys$xmpe{^e``av8xz*qww|eWFl4Q1vGy>&=tcss
zi44(dqqDzUmW4EWME<-V14^Whft3^8s-_=YwNcvrB{ZD)>4gX@NB8i0!nmdzhSux=
z$8fB_PPGVKCydVlMJf}R$4O`CDIR9@(Hw4CZbHl{v6Q~NKn;T|Xe_`O`>pFsq0zrI
zdB*==TwOCk+ctihhJ6;*4oe$B
zf&!R}2$qZ~dIE6aKxiv{b1b$KP&ce&u1e={pfvI8h^%U#M-
zo>hd;6Be@>CCbh?2H|n+*@N@76H9~V_Z=ONNzNR%ZyvWjhx66`-K@JH@WBXGB%roO2|LMt1+NC<{^7<<#xw_9P@a-L-Aj
z05&W(zFoe41kCPoIG!_w+$C}J65Z0~F2z4SP5eV^FD#~d9A&ZClAw-o{Pvnt!G6pq
zc4N2lNqi({@0_|`nUV#f4I)Cdnfg8tsvHKw1k^M#@|k}zZZHWJ%d-N@{QO-wl9?oi^Sb~j_MC5L@{6|042_g>sejv$fn?Cx`Crag(UXR
z+tsGV=#7a!az|+3F~cf~D43NtEtTnD(@m$&9$VUwv}lZq7)+?wFAw+COX|v|57m{`
zX7kugvgz}Eo(>r@jaeVb7d3@|+c(|sv*q)a=NEzy^np|Du}(nn;d+{us*x8umfE^UL=zdm?B&UbBBCC
zlnV|<0Hz#^gJN_c*!q4QcrgG)Bn!q^7TI(3+;84mdmW^}_jmWLCoVTvu2dtLW8&GUw2Ous^r&@{9Gpb4l1x%1^}`
zHl)GHN2sTvPJ$||9n&(m+d|s#@#iwsjXY(|gDpRyL$nOAl=FyM6cKv`Dq5}c2=t4W
zFt@GrvBi;oHc3{X
zC^2YMok%gJvjYcG;Q*g^Z?e0)NE!K)IE_goQC%6qYT0UaiQ-~eq%eFi9VQdHzMEy2
z0M;-MySE4-r16s}2vq$EH=YIYSob@er^Bc@HEKr%4PWFDGWD?uQ`XgUDB)4Gf$(H5
zWD=#m#MtbQx7QR9ozNw{;xN>gPo@Xn4^A@++zw>JU`*HdFKC3l)^$x4GgrQ8uck8mDSx7;Gb2LuhT+Ja1%Y*-$v=j`w!k0
zsQhEx$d-<)6P=#b-b|`tc*KEH$d4(_O8a}2VvrjO;4YL43f{uVYPhkx!}16U*!mW0
zf*%s_kP8RWNAQ&U60vilQZ`f`ESkijW8{BRE_7V)ms?TCIatQgcjbJ=
z`Vu(YI~l@Ml;TV5k#JPRrgnY!Y9|PZ+)@w}?U!lOmW&q0W{su1NGJdzF@qS&X*<)u
zPGrE^F-*)ZJ(CEOP9=T+faY7J##Wj#hGt&+WF-N6FD11pVs5{)!#YWE6Ym=C9~a~z
z_kC+MG>odJFr8yu5fRLM{8byY-O|IwYP(s`Z&EerO}*Zjh^o1=u<(eOfVR)nqy%*H
z{P^$)J!zvLmDC@brN*+=Y!GO!KjWDi4m!ZU2j(Hm?dFJedseZ+#0-Y)ciy)f+rHHl
z8u95!LoBrHFN`18t?6VY7D!V@90Dl{--+F$RcoSN4H|V>Yee=_CKa6`LMTj4^5o;`
z-$~I?AM@=wx%vCi_UB%d+1CV$_r(cfz!8o2lP8MBY}V@-16S^ZNq}7l%z3mkU5E%u
zO4qX7=mx}oT|M?x5Xtux(ss^Dva8@P^}G7Xx$RS)ihK3&!4?{qscQJ1U{ku$P8sY>3o2eCzd2z9tIEW`(XV
z8BM~UNn7>Ey`;5q6l&}UCDYDQ`YW*qWgLYyLpT3yGZg?+GT`wSLms)!q~
z)g6~rJA0G|U%*xYua*Kw)6_}jZUl%=^B;vTgK}1~Xc|SviAX}_#AU@zH?|&ER=asN
zJuT3Nx=4xO6e@8N0qaCZOC{F=X^-FKBe&D9DwUC)S(zdHOwAkRtrle
zYh$gDZsQMXrceBnO%O=yX+S(Pbk)}ifoysNIGywQ0`ZM-s{73~^!G-SP8r!nAWoME
z207!UYgHh3&zrVI^ekNw-$SXcX_N;Z2qe4r5z(*Y<^9P2-^jLydY_Kr>XOx
zC0GC4kXe6;^46cQEh*yKEh&^NCR0h-q7&C`Nrk!GIvRX<>ui8nb?YzK7Hw{n64fHi
zR+haW=_r4_v{4QhQJqHDS1ng<{50LNY*}9;IE=2nwnU)ukth6x1P00yTbWVzMb^x?
zx5wk5^S}NYD-CKaO9$n?Kzu~tqj&D#6U6oMoFO0Zf^=cKA23wm>@He@!?Q~&@aEHt
zdaL!Se$#0s_|l~atDCE7R_kI~4eFhayEurSi!D=-$mC=aw+uHoIE1^zEl=J<{@+z>
zIsTIFzgK>**p$h>Prm`Mo}H%lg(kbJzr0Qw$4||h55_iB@J2F})Lyx*plSqxttjye
z@nP(sov^D0g89!UrnL$aGZUH_o~kx#vD@x>jeL?(JWNL?5CC)fSWoFJtAm(7Z{EkP
zE{yJziQq+SnKC@=SIswT)`9hvXCv~9#;DDincIT$*K)vkUo>fns?L)NS+XDkRD=sz
zBRyGijMws??j9Pd&eR0SAppYZ-q4QZ8~a*g6$`H{aw_r6tTla;`CT8dPj-Dv6x{
z$z+$*m6zva;4U#6pT652>^Q0zW;T>cCoKg@r~3P@DC%tUvYxdGm#WJ&PgE7+a~Y|m
z2>-*5BZPjc%nN*j4b^6-&=H|(?8TrIMg%(bd1sfkm0AOdd&FN)5Qf*js+?ydfTm4tEuNrOXx^2ah{WTXuF7$^@321#9{DAqa_
zACu}OCIq3{c!Bhgl{Qom!AqRV$81{Vh&M2*3dOt3xst;@o#$oN+Oy)ecHuFz1k_Bb
ziY#J8e$Ler*~nYOyBjYp6@wkmha;8wayUIif+oX~>CbQEmef||?z=JFnNNFNX+osr
zdahl=>h@*E*k@0`wY%U$ySD!QWAoa{;axT0CycRuu8q2l%NykzUu|UaathvnfS`t9
zc*98iPA=oAWKlvUCKJByVZdHzPZuhg
z|5u{=BU!@WCMSr(69On&V6f07&)1%RQ(cnRr_dK)z~NXU5(s*DAVv
zN?{tzT>}vNkX-6h&sk3%0~s$wTfcqQ7Cu+Zxn6j5%fNB-y=bfHOz@j6ZhXAa
zR_8Qh=UA*W?kazC{>@3DRa(Hv{v)9R{QJw9=rGthm%{q`s6PCNuYNDUvbbpR**j6{
zb8P`pcEqqJu!mV8K5N?kun>&=y-pXD7@%@zW(~%dG(^r6TjP#f8b^2&sdm6c$|6$F
zDJG>UWz)OSs*8FHuyL1c8_y=UM3#Gg?t2xg!1%(jVG`K?;QXY|)IEraTy~PT_{(V_
zoIyA&tAOsxcs+D_f*#oWO1C@lBfKC)ZC2ay7WLS5FNAk_(J2YrZzLS2^6wpuMI$aID^x^K7>nuy74jIWq&UT)dXFcLU?%5*PzjEi9>Q
zYrBI*b%Sv{G!(a5a1NTwxUiwv9MfQ|h3@*d-)(RM4kIrl8(Rgl`DLP$o7&SOl)=OQ
zo4cx;D;a^R8%7lGNP#KmStjA2WU!=N5N6p5;+hbK6F1JJyN4R(D8CMa{}p?_dzrVs
zI&N2n7~d={F>4ZFK4Y5jj|{Ei*XjQ@5Vha;iL!%U!quVKO{JZE$D@R6zjK9wW${=o
zf|F%bil`0gWNT0Z#TuEe=d>B}MTfgOE=!w)>*1Y@YSB#YuCW?0azRGR#S4x3$~0zc
zI=LFvK&XyLH*)$5)cn!bhO?4-L5qJSDJLR#ed5&7H6v5%sgX79k357W)I<%TUY@1S
z>e0O#8~aYbW$SnPu`%tdo-B2yoKT;bQbKLD<1Ieax+A_5Yk~-MK721euFlW5bIs^Z
ziXX1~D8pd4&V``vYg_tzJ5VFv4OUP7`1iVllsszB*bje?gOk@c`Y1Y<{%+b&@j&2@
zGJLVUd0&;5ewF8&+smk4et-Fj8uR)%=ACS*Y32CZVBxhB_y1D|ZaRrwsaXMda>9b-
zcCg-1C~6AEv6n)PSWRu{AZ!197p|?mxzCt5Ne!Tyr1+yYnEf}DEB8)0<#m8R-H&+t
zaJ!RHFR+v4&()%CV$1FLTjkiB$hvd~(X%eLDx87se$WN+IuJQRbNn`7PKCY>`OA$;
ziO;or3Xhs>d=I#OaOW_f?)^j(@|X4_HwHw2$nu)rKg`&z1&%HPA$94S
zv}|#hEJ)`QF0RHY#la;B98UGx%pc;8I#LZ%rHCT}mvM0D+l!p+4E5K_&deR$A~R<|
z-}mbQuAaQS+2~jY7GY=M;UlZ|ksW`B9W}I7n5$YV%I%4`(p#2P&GZ$=jH)2JMn&^X%S{<
zIzr$@9K+bQM(ZOsmE;d|atJ&(vhxnW*TyL?@+ub)&kXzH;cL#H$UIcM6$*~5gxw-0
z`Md~C<~3S$!}PSUDIg41pm(cwsPm|X>Lc0NNeP1P&caKvO|~O6tCV937ilsjFalZ3
z0sn@I4pmZ&8#0smO;x&4y1%~&`hlO|s&Y(qn7qP6fw2E7U1J4WKrs882Dwlc6DJhQ
z#KdVGhuA+~lz8MJYc^hLDI+HLG@GEs_qrw1
zE%l>i+Oko~JyL;=oDB@suVoqYLbhgXV{aSlk5j9YsRq4BETl;BfS>-=Dkl8PRf(M9
z$M~5``3RR6SUaECzgBj&u}QYr-#;&{t-CB;-!EHiYLs1FzxHyXYqhvEZ^y_;-au)2
z{=mpc{*K%_i5;K2UJFptU18MG2Cy~v{1Q`@(H1wZ5jMyC>B9L=UUr$wKDU2MLT=2~
z7?K3|pzpf|i~>%Cl!}HcQOg}v?{xSDS}v%K2FYQFV7ffmV_4rb1)kEb8+Prb|8EoJRZ!%
zA)meSMGbN(bdYtfqY8xNTyZ?3HeWx?DvT%s8n8*BU#x!%kXk6RWMYK~k_JH{8zxcQ
zPnRObLq0wH>xiRcd<)#Z_3&P^A!F->0qSZcbkb|9T%-{))5rsF*dt
ze4!Q7HtDuLJq3f}yc{sMYd76>LzYfWp-LeGcWW;q|1!AzqpXNa?w$bVTJ9oqzG=Uw
zTSoR{e$qAGdx*%rTnWlqEW0cIfPC+d^ZJCJZrtXy)mLE3@ez&>IJ{;4vZDel|AT^g
zef$hVg#23ro`PvzI1|Hr*)(W>!h-bgL#Y?}2dl={{
zdRI=yAftrUx*g)&bTN;7
zdRQfcjGRn*r;6@j@X~we>pc?!ez6NW{K9>;e$85)Ar#=m0~7iW5FAv9h`^RX@4EJ=
zfqSbuk+WQyr2g4tXbktGHmX;XX=5aZ8$k+0JP1BtnfM0@z!-4S*LdG|S;anNXNt3Yq0KFtEP
zqG+xi0yz7>zJ#lt8o8kX``zl-mNceuGe|iBK+k5m9jJL`=5Kf%B{l)|qkZs$BnmU-
zX;$P+ZTm5qP1QjvkjQhcHOd7+bdl~6Rh4WhdDc`5xRL)JNZ84xX6vu(J?MY6`q2Dc
zkmt@hUw?8M|I@jjm&U?Cdhzhk=(d4v-3Bl-G!0}O8XO)N+ED~GGV8)pM+Qf??;v1c
z0o6kT3p+Sa1j%^IKsT%_LZjE1<^DmxDFAx#+P)xk?`MN(%|@@MGDDgZi$?`P{{f`d$PB8D*FPfu<#;lGP|!gdlHQc3!Wiili3$p
z4xh88vU~A5xG+`Fn)c=B_qLG87n6&`6;oY8}z+;6u;GAPpb>gMy#U;)Ro&=$hy(yg-0U4-fwbzPC2+
ztC3&Ud4esgQDtk0&RgQVFMRMcom5hOP+H
z+qLbH2$N$=hA1lP>p<1Fu{ws`yc_w}Ldmw}b3+O!g;4#Acw_nfoVX3l+Ja`*u
z(H5H-^gT+1jiu{~J0e7p@u3;=XcIh)rSlQfBNUlg_&#t5;F-n`=@$r{z2k&mPjVk?
z^n)?bkoNY)DX4c)rJzwIMr6W|(emdVT?)2h&-MP{yc{BcPI`?biWTvmL}d*gH1#?|
z*cTM4fm?!#pK{5`$7OFwR
zsFx)%Y7Od^;H0O_P@zf{Dqu#02vn*NVK>-jb2a@?_vAw$UlEn1fK)%yz?lKRKsSc3L45ad(p+YrZc%vrP#7(A>YF|L@BL$UI|%6tcUCMX
zG1y(JEz^#_be%)g5nVIMG0TO=JlVxpBsS*@Gsy*8NEn*G6?QY*&Y7v*s_IBcaau&H
zQbsQ3Nn{Kmg_;HLKUKNMZH)_k*GjXn|96M%X;@;V5EEx_)3cO?quEZ~B+cEA$H?ja
zPAp==+wzsWX+)Y`2Q^2&E{d2R^`^{tE(iFQ4Zh1wBlD`2Z6zFCz-Cb4WO=WvwtKdi
zq0d$Ad@g6&wzXrptK8$-IxWslFY~z6rkzP^EcG;Sg5UW#JUme{u~Q@xi|6A?rEJdF
zP8N&7a4lx^DRWF7Qr~fZ4vH%n9
zR>d^6-p>beL6MscwKB8KD%9G?tBX2##vRAQ>;HYqi~7eSrH;9^&_uU7jwhCvg*GxH
zunPTiEgOb-FAPy}gvoTX%pmNk)DKWqR0B|lk@?Aw!|9u;1Y%zZi6aluhsuS_Ofi?B
zy(kE~RDc)gWLa@(B#sPPk#LQDzf^i=Q{Qd*uZhP4jk`ouZM;*JSi=v)0Z~4+^`%BZ
zGB{Wa3#Moa{xWMT2^Mb_GuPihRf+(s=aXV;oj-5y?C1tOSk9KF$M-N#qG}z$2B}`e
z5y7&f^5@(CrqWh9ASVl>`1@p8kJ2*B*A$uYKC&_%5wgzcR0k6g_rloQBPe1BConz!
z|DP6_%t;9yazLLpzdQ0+McSKsl{sZDzCq2^5mP}YHW|rzjLgGc1^UV(9OnZU82vUaQYHTw?9m+@La^jOPoz4Ql^73-b{rMBqKHpWv-lToi
z$CN-fK?8jcjT*}9g)sT22P@-OVzrkHO@&9K?fr?1O^wp4ooi1fme!up$EHLoPh{YZ
zi}MUSMn((+dHKeHwSaL)*!@b=n#k2cRNm&>e$UTn#ChjaQ*Wkd#l4<>kAFbp49@v%
z22sh6Ohtx<>5;<7B#044Ocrtkg@vXf`J4ru3dNeqxSd$SD2`mpgyTygPstbJg7RV#
zH25(5U!^B~A?L^!Mv*5!+}(LRsh}_l>gkjp&dU|l(|$auumE+prMkVrZ%AA6Yp9&c!FnUS
za#v%rZPVqA_s1CYs^?zP<)Z>43qk=%DeUcribQOU8$j2P#wo@|bqvwA^oS>Y7S
z9i`TN3D%s0p87*}&I#6^m`o>RR!&hK?)AgRoXg&>E@0eD)vc2YfB9`Gke&&C7U(nG
zh3-DH1A{CW>PDk_hYOLI!Lz-mkpiynj`Kip
zAZ;4(&TsfhB9&hgA78^yq&^w;d-wYrjlpGlijI?BRUoKz72<20lupG--m2hqsserm
zC)pDG8*2bjFdwiG_!$S0_WxIICSgJVGTe!=
zFvYuLRV?Iv+WWm&ni5?F;@ulngzYVA6L9Bi74KfE{>YwntdTX<26fWv#V4vAyl;DI
z2sF@|g^4;9wr7HpnoIjm_dVF3CwPkG{iN4wI;Q)L{dvOW&9(_h|5C;N@r25s3~SEd
zGSguF#Mz%Gc*^B6jOqSif1Yr8wo|IVpq1Ybq4G;H`PPHWTN!*4jdgy!b`S^abK
zQ6t_H^%4^49<^d9pT_zq0>P<4MDMbr}AsT$k2r+WSEqAMY4nQxrkz+BS1Mg!U2
zVYUES(_u~knZ#Y430XU-r74}N)TkE14x>WwsQ}fY!EXG2!!;N9l{fYSN95J*&Gpsg
z#rg4J*JMfPGn44l-u>e*)&C44$e;tVFvST(CRmgNrbpI4{xJ%8s^%lTH{fY)X-|9n
zLc;D0|
zBFac-fxihH00AFJ^AR%_9``Fhjku_a01KeR+)X$!er1cGJsM3$klcA`-x(5*R}}Rl
zwP{m8Iv7SK)57fpbB|+CYaJJhXVsM;ynUjPLR`8^G4lg~yei=^8#Ph}(iVl4Kbh5j
zCZ48~F?0vrMQ4}iC&$y!cWqr{aTEp;IHRL$x2Z7sdG6+u#dc*bRG=KRHXk>mWft&L
zwW{^e04ej_*|NO|#qVWQ!Z-T5JOs#aD?6&4uR$E>E|3DaA?ll+2-&YfQE|D4g3->5
z8fQ$9u?yIvQ=9t+zF{KCX_nnk^s6}jT%%;Y(i%9Ht!7_Vpd=85i<0$Pz@xQ5v2>+v
zg`E9R=7DF+b+(lMOL89N$)4#?SF4&M7l8zFz+`7!kh2Ra^fM6>9%&b+6&Jwd$ZK#i
zm}R_Xi`JhfB7Z#I-W&q=@L(RgBD3Xej)e>DjsrLdd?_W3aJ2sMfSF|5YGdV*=eLNM176x%=7Q$;*I^IrD@EZfgL?eWV|l
zL@Ypdwp{-DKXL
z!FYJH`RD+JUt;-?AiISp+!c0KlQ3NaIBa}Hc&^{ajNxU-TM+yjD&3~tB1t^*0N|!3
zJ9=9`zdzj#>^{q62g2o{)8MR}aXCrHt}O<$4NTH((kcgfQ{$L%3{sX6sf8rT`H#nk
ztK(y(vF}D>nqq4fD}dB
zun!(?qb})G(GIyHJ)ZC0k>d=~L^NLa6Wdr+hg>>?GC)QJrDH+`0ZsvW(rLR*Y~M|w
zFkc2BrY5wmhFJhpEhG`8^Y@uOP3b0EQ{U!k6bQZm(hY4V*jQ=my(}L{!w+}@9{K=g
zAlCq5!>I_<1hXsFni?|hQGg1sh?B!Cgk#5-!J--5mYeU3%oe-GL`Uyp&5=ZTNcb@5
ziEs=5yg2w2*fyQ4tS(s$GtTU|vVWz=S!1f%*5qR%0NU&~^JwvCdYxa8Bk_5X(^HjCx}Ew@VoRJzRcVeeCUw(%>Z1+$@O%
z-xPjiP^Eso^CzHk^t
z6@d+u!-5lZXu-&svLE8
z3*Mp6{)1;Dp4rY?vjL51u#eqg2}zVgDRY-=dGsZ0O2F26?t5B&e5^1@4a@=qGCJPK
zc!0od|D{uMz>nvm#6Q_195_OJN`lWxMSzIbTB@rE`idmNTnZ(N>u~eiBrXsl%<7g%
zGW^-s-V~YdGGiDO?CGON1sl$A4i_}b!Qm`ZhS3}ZE4WIgSh#AP12$|}Yi7jwxdNL}
zBqG;Pc*s2uA=4Sok9h_ar0J!%9%WKT-KbQufnxnwSy0A#u>iAeSV@A2S#0B2%oqiu
z2HaDElI+4X0#bk=GLK|(#}IT1*>0Dgb;s1_S((N|un*4TJSmwFq79`9?8x!xp5rr#LY%Y{YTGL0urY5d^tp(&{)|(>5uR
zE9hukG=4)$G6)K$0q?3yowHW7+#(hh=)D3EY+-KlA)bE?RyoaC);#|#i5)R!CNwLK
ztUX&xcNqj11MtLo(h!3POpZLPnA$e)IpT(6Lg>kdfv=@R*dHO-ke@_a1nkP*a
zRMr=v@~BDvSdk4h&h?59?FNgvS)b+Ra#&!|CK%&NLCt4qN{c}Ch79g8Lvpel^;A)m
zHsWZp;7u|N!}L((S2vr1X`LaD$UZc(@h(qY+n6^3^HoEah|H0K{K_37Sk-h$3=1Np
zWC1~h;aJ)JV*n5!QVu7`?MP;WV{#Zo&TAx}m
z(0=2#fZ91=sI=p=TAr7B#E75(>qeH<5I^J9?d*iGZ`jL`(c4lKDpZpYlGuri
zY(hI{0>EarNSVAX$gRePF6wEz-bI(Sa|>^}6r@qkj1zC*uyXkF>
z>qm2J`9Zmbuznyg?_n@UP}WK-Nr*kLKW->V7F5k#p#fJdWl~@VXqE5|w^hoh%$Us_kP2??2rE5nj6xiN9a~F8@>z){cix)HzasF#}yFVQ5UhQ3NW*~N{
zV>82@6MfD@hwArwwo0v^t`u#*Tjk__m}sy!!LGFa^(ZmO8ag5Pqie${kllp={iY|p
z-fPE{Cs+R?bU?RR9wEPYKXF`!DBwPvxP@}4S#Xuz5}Vo+vDW~Ejj$SiEXIZF8NTu>
z_f&4W^A2~eOl@k}p(42UIX8$N$Gs}-yG4DF^^DAvGb@M^LkD6{DWRq-(xl|pLp}*$
zLb?Gs&laSL-_OEsfr0|Uw;i??1+udMIG!iuAtB~h8BJXu3HCq*T(ALJ^jj
zndKl-{AM3L_~<4wp-@b>U35(%V&)DoU5}d;ev(!)b$#6DEs|XlWNSdzC8sO6uE4qa
zuUKgOiLa3X``7S9!98Mqjfmb@;^dm9p5QBuCPV*tnDFGW?>U@pt0%@#_HQF03}six
z`F4I_Cw2p`@>UW)>l>+|l?$^pQmrC&u7RVf!xj{)db)T*msZq)kta~e*((EyTDb6Q
zJyx^|N5!gr9e`Edep6;?6nL(^iw>@VHmT&Nv#WY}O*tt3b|2h@k>d#JG2KRp+~2zq7&K2g
z#=~sX+3#r-X8M&)tCW$u+w64yMT~Cez5KKuU
zQqMtE)8J~tIZG7MAZk+Pd2hg*YrK)c6fKJ?T=T2H2aa>gL{KkRvT8;*)mZPCJ&E61
z2LZcq6^rkXkRFovkU(g+__#iF^)IMwOC_FweuhmvR?
zuX@}mJqZ+*zREO*J3d(X@6KmPlTr^$zU9iF|=@RkA62_H^A$nt;DZZx!BerGPtd=hrTU4*Y;DAtm&DoYe4qji?|5$go
zDKK`1&N6rHu6>GA;3l(3GD;$%$}FJHwCa3~*!`5QQtaQg7&3icI3ootx^$t`863MU
z8j6rg)~V1=6GdT(V933u_tIHvwn#T#cdsX~$SHl&oeCiRafpl|56DwT8uK*H{io9o
zxVfk7--IZ_?M&rhXq#>b1|q7@Y%?KN>=$?78932tJO{O6#nX$!C81OX4)GN8FAE!6
zc{R+xexsDKC}uc3W`4BcbX61Ki0o1$pzNvT{V;B|=FlJre1q1h`Aj_q2a=GJ2C6C;
zyPvt3I(I1WwpIMtt=h6wcsa$>$dN+D?66A4_-HFU!dmcnko8Jed?kraaLh#&?f5bJ
zTlz=s>i^raur)1-+IAgMoHsz>n?ZJ+rVEr2Grqf{S>xCs-0*t0n#HOlNFX>!Zl~U2
zHP_#?RHzw)d=L}11R#OU0Z_&utWovCkcG6TipCpc0%6u$Eh>E
zMNc@i7xFUVsvk&jkp^2EDpK&QDu6JOdVeb!iUmLo>R(i4B-Q;YZ2|ZKdIPOpD@28<
zCieP!vebK{Y}tseg1{8efk)l|Ta5#3;TBF2bTDDCs6*!>J?n1Sp8f+7fp3%WfR<;4Bvu##q2%LtvF^fkFRY=8
zitv>+u!&yFRU%Tt!14{f=*63QhWe$qSLs3?9|Y$nd~=zrq*w+eRkxh}?M3FjW$0`*OWJ${#Tw_sGcAdxAdK_f`>8aZ6DNS&>*
zrln+AB{q}w&3!3Go=~~>C<^zAEuUW*GIF0Dj%C#`gDzd-R5J1Ko~I9aHO62I27}r1
zg9^!Gqr=*Lj%+@b-#eIwy6R3~@7Tj+%w(*~jk&gx+qF`?l0-%uv>;D6{QE_i0pCm(
zgz3;iYivPlcKbksd%X=9O_uPnGk;F%ObiR)4AN84d`@@wmE1AbY01+T{5D!@F&H&z
z#G;ivnwsA;vcE-qP_vz&Gsrfk^u%b(%q1`kkYO*U>#-uq+s1S}9LR%CkC)jlQpNAs
z^>*QlUgu?^^7XopZ&<`bixsryLvVwnPSM`z*kE`*4AnoaM4rn{%+h0j$aCOs<~(i2
zZ{=Jwc(3fCrntO3beZVj0J?FB=67PU6H93@H56#?Y^T;_|6gC69Ue@_AU-}jJ()*#
z^g8y9zF#0p1A?Eo+YC(bmw%!4YnG#FWT%-kvd_)5a`ASNS$ZM(@UxrTV(W5mIKk+
z7zP*uDZB~E%gi~L$1)#f;6$Q)z#q~6=^rs_L;Ll|Z41mlD8RmnM}-Frc?;Z659KM+
zZXoj~vAcF}N3I5d5vsTdzcQGKeP3s4qF0*jK;dk;DuE24vt||dL401cQMFd{h;76-
zFis#9)$
z)~{Av`X$!FLjhSSRxSEcK-ArPLq-ocLt8d2q@-y0NMU}ao83998oOc@2&0i)ijv%b
z;G`~h;qB?<$y(4!u?Dl|*PCnW;s%?2*l2PD6JrhQtC*A6ZJhf_3KD)IMB=kz98~tCd-5
z6&MfD_u&erNuHLazyjZ1-)Mfg5u1q12Hk<_D|rN4A=rznh}DG5<6Bv53H*9}JGO>0
z@+E`z^#Jwa{K5I=>iETaUmK0y9dkB6p@4epyZg0=Y^Euy`%n^|b+AN|lL8nt?MPf3ttGu-D(ih5W57!zP0
zVSHwjil?WK9T{3(ZtS$Gq%l#uE@UmJY$@Sajc#jByo6g={Hf>+&}9{xi5%%_fL{|f
z1<3{-tyYgaFF(i3f`#Vgj<5@sibtyO;_DebLq$V&My7=1TUlFR
zA98RSg5fQ709Cb|@iZH{Qi_ZezAK>oKNoN~;E&`JE_NG_6s0}-mQItx0`E65)`Er*
z4H*6>P%IRmro$8@1Fvm5_HCV|p)UnzG_Wy|1AOT1RdRi&p`+C1kJj7hC!NmH+&$s=>VwoEmKPwvyyg)@pz@p51Blff8VCCPAgQ(Glf1lSv{
    jji{2dd#Gdt>_bf?y+l;9j#{EXNbls_sY0D8!des1`4T>9gd@Vi2f%K)5xcF)x{|B0N(
z40jZ4iK6Dw6LwI5000<3w(CC?JB8j+Afna8;N=V0yDLb3*_hElJ~~~4QQi}YJyFmu
z1Y@li6R&ko1C(h1uP9AVlpVKe^Ql56w1lGba*ve8O4FPmMw(0s=X<84aKLCof2FE=
zgRr}Uv1|xW4O~G&)_DWFoD{5Py2f5^kR#2ncJNtqPt0}ak&F6cb_%Hdw}~zFFKZ`o
z<&4C&RpGLMyaPP=nUs8U$J;(mN(0hMnyNG)wkI-_2xRWqy8)eM2G)7?h^sqgNnR(m
z4_E#$8K*cKjIBqGOQZKb1Hsj-u}!Sv7FADxiVD)kg`Eixp#XN=VEFf9J9eLxG{8II
z1o|Vb_qzsELiJREop~!hwZ3babLZt&xs*1#`WhNJ)bD(Lb}q3ZFq552Y0^lM++lXn
zvhvF~39B*o^yp1Xq^_^VteNV)k49B*p9i5R%XT~r1BSrI+H>UeiYaNEop)W>Dh*H(
z#hxg)!7%t30>f2YA=djmkjM5|&g-P0J>zC~%;>h+a`%azOcR0tKsNYwDMXIp!Uky`
z_rw6|eoUQn=VH#4i}9J^&3j+o7PsXnEpDqMIZ6wpU9=?$IaPO#j43(=De&ttv|khZ
zFEQuNZ0KbeV>m~
z1v8U!dC*#_QTpttW;3+R7R#4c@6LrbAa7L^Gnw*LXTC};*lt#*Lb=iTt(la`*WN)|
zGO?;KW2lkB$e-BNEzEvKk(+2z^nYY!p6Vu3P20uc}-bQ3R3UGV*B^RxDMiCmxmOtt@LjS}xdVp;)yqF?7PAQiU2-
z?vbg^Gz_a@oy|mv6&q%5xDCsvP>pW(pQssK4^;|t0ee0m
z$3hMTlsM+FjO)2B{Aj(1y!r6u$6tVIs;i-w5h6vM6$AQ)&Wxc^
zgZd|%f-jzckVpbCi9}LKWaN@5&X>VRiMw@DrJXl}krB@)OEy!mSYxbl4w~0^VN5&ZF9ycMqT9Etk6wGt~u*cm4Bu9^Rs)|
z6(%KqG0RQY-B9XB?@UszSgA5*<@V~Kk|h%UfYq?7Rp*_7Y#KCb*5r&;MrhGyl(*j7
z=N2=I+wQr;YP(%_J8p-aPMBbeLk>F-JU%$$Xb6mqkuwTL$vAPXb6U2P_3K`yI!jeG
zj+Q%l*;?h5c$7ughVj8Jg=Iw-WsgtIDLZ%V*LPv9+x1}5ue&#|rQ&2egv2ZRmQ@x$
zr@d>)(e)}!@O=s!{KO0*YFElGK5}5sq2g|CR)X(u-zZrU`NGNlv&{pv=%JNJyK$y=
Hcbh~4`W$M(

literal 0
HcmV?d00001

diff --git a/docs/fonts/lato-v14-latin-900italic.woff b/docs/fonts/lato-v14-latin-900italic.woff
new file mode 100644
index 0000000000000000000000000000000000000000..6922b8fec9812fcad266750f78533bc30c86a377
GIT binary patch
literal 28688
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
V@Ph^j4t3TZCoZy+rKwcz5&%33l|=vm

literal 0
HcmV?d00001

diff --git a/docs/fonts/lato-v14-latin-italic.woff b/docs/fonts/lato-v14-latin-italic.woff
new file mode 100644
index 0000000000000000000000000000000000000000..169e8cf544bd50855dcaa919a277a109f98d1704
GIT binary patch
literal 29600
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
    ugOD&qehL&EC_|FrgS>ntk>o2&q=k&
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

literal 0
HcmV?d00001

diff --git a/docs/fonts/lato-v14-latin-regular.woff b/docs/fonts/lato-v14-latin-regular.woff
new file mode 100644
index 0000000000000000000000000000000000000000..97ab144d9fd0b9cb0dd0fdee1b192a0f4af9a3e9
GIT binary patch
literal 28412
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
    iv6&Is
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

literal 0
HcmV?d00001

diff --git a/docs/img/cloudcannon-logo.png b/docs/img/cloudcannon-logo.png
index a3a6253ca70dc41f6dd6e391f8ca575fcd12d0cc..6cb0cb197c6c4a7976c2e64772f0bf3026027ac6 100644
GIT binary patch
literal 5039
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
P2Y|*49hC+p%ZUF0^H@KX

literal 18283
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
z
zLtUx8rMO!{oq^H#te$)sMn^^Aosx()6(|AiIT4^gyIyLt*n8z@i1RwpfbXFp0DXYO
z!t)w)`>!Sa-xlw{FHg%M)-$)@WxwCCnJ+a<0&UoWc56B!A|4!nYX;ND9&sE~MeXw1grKB
zCQ4(HZh>-rzB*64O5w!WmJskR6u^>j+157BV;;}X09;hl9%mR4Q-t%Y00Pjt8X>|G
zFvQmfXox-Eo2R4iawd`kHv?-ADvcixKDn9~H5nyVd|jV7!rq=zFXsD@tV%eNog5NL
zytH8h+;6;~^woSspX6zhC9(u;HhpO;6`TB)vS!TLo7kO5L)`0&6v@N+`jEQ*7IsRu
zFgmKLd!E9P>7eD2^vCdj?iED%(<_!BsU0O>
zH)+m5IT_K-(kC^buwi@F_~%KT0{he&SH%w{&HK?mRCn+!$(nLL5{@8vlGjHkrIDkR
z57yR*sjn_8u|_v)z9gS>n;n**YR2ug?bd!ETekze0QEy4ZyW0VzT*!fh*-I=nEek`
zN1F>3_%=}IBK%^!{m`X#pB}h!^l`TvrF3#%yRdE2lkgzCRs;>4{6qG0b8*U7C0`>d?GGbHvjiqliOq}d%A@EOJ%dtq}0n<;iq;k-byQ6!Ty$)co
zwcppH5esHOQY5C1ac!KxLPNG)B2h6v6s7TDT*<-Q=Y3JkYzEn`sZfph2XD8yrM;$d
zJ?N8v`RYzPR@AQi7Mi$|%dx?JWAN&g6>lDsNJG6Q&~NrX4SD>SZ+Rqq?-&2t1Yahl
zd7JMrXl|$548A$*pN|8$%4|i}MQ?RAZ(FzephJj<2!tj?H~W~2t+24yqa1!FnuZl0JU%2YHhx})(U6E7WabVqw#?v`6Y`Wo@;*91o
zo>F(FB~@DSt-<^kfOI!Fi*U+kE63kAJ5xT7d4z}4SRJBB!8$NR^dlXVFO;5GrKy!s
zr2SI&r#ESRBUyJg7ai^hqu}-CVSAG%k@bk7?@OoNvwCA$u~=IkiZ}=RQ4vxBq`cqE
ziNzEY2N1(v&f9Dmd-tMg2#YM)R`9^DI@1m%ZOnx{>sG|qjmUlL9-1r1jI^kh?2C5J
z^_Cm2=>K}V;Hq^;pe_^BpGfsJRt^(#Wv{U#zVFQiNF_wHJ-UsqY~cXGa^
z$~Su1W}<@Tf)XWbMskWIet&RUXPk`WsYm>5c{sRBr>IXd^CWqE>PKQVyGSI18U&$Z
z%Iq({YS(^@P8_hvU2-TpG;@t#BD=;e$wi0DK(%OGvSi7pj2yx$5~?{hoP!Ja8IX3-G^
z1j+?RP0ioJUJEBJ*w&9WLuB97
z=40hYh-sTgaTkjylTyXl(c#eQ3*HLf2DL22qJKM+3<|&O6@|1yt0qPb#pJ(TZ=lFp
znMnb=Os$JG^s*5k0_F6O)tD)YMT@*oUIW{DBIPu1h=tRu5##dT%PjO%K5p9`-`#N|
zH-p8#gm#{slgSBWxzlCTWvh(?X3B8_xtJzoeI&T|Eygiz*9&u|2X1FMUOnuZ-hE43
zdeO9#Fg4(#OqQ$rKK&YOVUSGjQ8>$F8cM4aI-(B2
zuPX|)lW2@_m%;aT&AdHBGCeO}U4GP$CAUiGod1q}Q?$>kEq)p?q+sG`V4|wnN^I;h
zGNneCy^UQmyQR+Vwam;9d)Yh(DHm0T_6R^YKwRt{g6#z=%+adufxn|&I_h`(NO-q{
z{cz}Z<0`et9|<9G+eAi3>ld9TN+xc06K9()_TF@C3$m|+fMLrJAU#yZaGU65rcAiQ*W)I6EAV_dgYI~
z$Boiww`3Nv%;=*R?{kHjyt*l9d7H7#6=RCzxZU8ad393Ox)xp6Kw+-}S;%vOXzY9dP2hhI%o98d3*1K&*6TTt6k7u!=MTG@K5X4eQ|lMT^Ey>d
zV^ZWGrbM3hy;XzvHF_sYriP*dNaW6P_|dCBK|&0Xh0|WwPnsPJFTw_6?^p+JIX(m*1aD>FrYJqz5xTUzF{H1e7Fx2Vp<4|NHc#K^4^GYu}oN
F{SV3Q*U10?

literal 25542
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
    

From c8bd59b69e7973f39b21adbdf8079ea5bc8c5305 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 23 Nov 2018 14:57:17 -0500
Subject: [PATCH 3357/4996] Update history to reflect merge of #7392 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ce1788d9059..27ccd510f8c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -80,6 +80,7 @@
   * Fix dead link and misleading prose (#7383)
   * Fix content management section (#7385)
   * Site: Better Performance (#7388)
+  * Proposed re-wording of Sass note. :) (#7392)
 
 ### Minor Enhancements
 

From fa914d2dd85f8263d599f41e5a67c109b1d8b52c Mon Sep 17 00:00:00 2001
From: XhmikosR 
Date: Sat, 24 Nov 2018 15:25:15 +0200
Subject: [PATCH 3358/4996] Switch to `gem 'wdm', '~> 0.1.1', :install_if =>
 Gem.win_platform?` (#7372)

Merge pull request 7372
---
 docs/_docs/installation/windows.md | 2 +-
 lib/jekyll/commands/new.rb         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/installation/windows.md b/docs/_docs/installation/windows.md
index d8541088071..2809f47b295 100644
--- a/docs/_docs/installation/windows.md
+++ b/docs/_docs/installation/windows.md
@@ -55,7 +55,7 @@ Jekyll uses the `listen` gem to watch for changes when the `--watch` switch is s
 Add the following to the `Gemfile` for your site if you have issues with auto-regeneration on Windows alone:
 
 ```ruby
-gem 'wdm', '~> 0.1.1' if Gem.win_platform?
+gem 'wdm', '~> 0.1.1', :install_if => Gem.win_platform?
 ```
 
 You have to use a [Ruby+Devkit](https://rubyinstaller.org/downloads/) version of the RubyInstaller.
diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index df98590c82d..c6832d7bcc3 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -91,7 +91,7 @@ def gemfile_contents
             # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
             gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
             # Performance-booster for watching directories on Windows
-            gem "wdm", "~> 0.1.0" if Gem.win_platform?
+            gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform?
 
           RUBY
         end

From d80835918606d4e4ba52fcb0f087b5577e1ae6bf Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 24 Nov 2018 08:25:16 -0500
Subject: [PATCH 3359/4996] Update history to reflect merge of #7372 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 27ccd510f8c..28dbdd3e49c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -153,6 +153,7 @@
   * CI(Appveyor): shallow clone with 5 last commits (#7312)
   * Bump RuboCop to v0.60.x (#7338)
   * Update excludes for CodeClimate Analyses (#7365)
+  * Switch to `:install_if` for wdm gem (#7372)
 
 ### Bug Fixes
 

From 48b6e743f19959d8f2281a960328009ffcc41b61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EC=A0=95=ED=99=98?=
 
Date: Mon, 26 Nov 2018 16:50:52 +0900
Subject: [PATCH 3360/4996] Apply ruby official guide documents (#7393)

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

diff --git a/docs/_docs/installation/ubuntu.md b/docs/_docs/installation/ubuntu.md
index 8962b144f0b..bf9311f92ca 100644
--- a/docs/_docs/installation/ubuntu.md
+++ b/docs/_docs/installation/ubuntu.md
@@ -6,7 +6,7 @@ Before we install Jekyll, we need to make sure we have all the required
 dependencies.
 
 ```sh
-sudo apt-get install ruby ruby-dev build-essential
+sudo apt-get install ruby-full build-essential
 ```
 
 It is best to avoid installing Ruby Gems as the root user. Therefore, we need to

From 78ea59f5a7d5346d447474e709d9ad0787f39f03 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 26 Nov 2018 02:50:53 -0500
Subject: [PATCH 3361/4996] Update history to reflect merge of #7393 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 28dbdd3e49c..9cec047c292 100644
--- a/History.markdown
+++ b/History.markdown
@@ -81,6 +81,7 @@
   * Fix content management section (#7385)
   * Site: Better Performance (#7388)
   * Proposed re-wording of Sass note. :) (#7392)
+  * Apply ruby official guide documents (#7393)
 
 ### Minor Enhancements
 

From e4677b8567a853351c119e2e11f1cc9656b80a3e Mon Sep 17 00:00:00 2001
From: Joe Shannon <35498448+joeshannon@users.noreply.github.com>
Date: Tue, 27 Nov 2018 23:37:09 +0000
Subject: [PATCH 3362/4996] docs: Fix group_by_exp filter example (#7394)

Merge pull request 7394
---
 docs/_data/jekyll_filters.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/_data/jekyll_filters.yml b/docs/_data/jekyll_filters.yml
index adc494c3c7f..27089e738f2 100644
--- a/docs/_data/jekyll_filters.yml
+++ b/docs/_data/jekyll_filters.yml
@@ -127,10 +127,10 @@
   examples:
     - input: |-
         {{ site.members | group_by_exp: "item",
-        "item.graduation_year | truncate 3, ''" }}
+        "item.graduation_year | truncate: 3, ''" }}
       output: |-
-        [{"name"=>"201...", "items"=>[...]},
-        {"name"=>"200...", "items"=>[...]}]
+        [{"name"=>"201", "items"=>[...]},
+        {"name"=>"200", "items"=>[...]}]
 
 #
 

From a0f7d800d6faab28324afa19142858cb7b991f0d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 27 Nov 2018 18:37:11 -0500
Subject: [PATCH 3363/4996] Update history to reflect merge of #7394 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9cec047c292..44a92a9536c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -82,6 +82,7 @@
   * Site: Better Performance (#7388)
   * Proposed re-wording of Sass note. :) (#7392)
   * Apply ruby official guide documents (#7393)
+  * docs: Fix group_by_exp filter example (#7394)
 
 ### Minor Enhancements
 

From 646b24d9baa755cfafb1b0b05d9f2b5a8dfc8f12 Mon Sep 17 00:00:00 2001
From: olivia 
Date: Wed, 28 Nov 2018 20:35:23 +0100
Subject: [PATCH 3364/4996] add vpsservers to sponsors

---
 docs/_data/sponsors.yml     |   6 ++++++
 docs/_includes/footer.html  |  10 +---------
 docs/img/vpsserver-logo.png | Bin 0 -> 32384 bytes
 3 files changed, 7 insertions(+), 9 deletions(-)
 create mode 100644 docs/img/vpsserver-logo.png

diff --git a/docs/_data/sponsors.yml b/docs/_data/sponsors.yml
index 72617e9f96b..55de67ad445 100644
--- a/docs/_data/sponsors.yml
+++ b/docs/_data/sponsors.yml
@@ -18,3 +18,9 @@
   width: 140
   height: 30
   url: https://icons8.com/
+- name: VPSServer
+  image: /img/vpsserver-logo.png
+  width: 140
+  height: 30
+  url: https://www.vpsserver.com
+  styles: "margin-top: 20px;"
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index e25286d9713..05870e4c0e2 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -12,14 +12,6 @@
         
       
    
     
    Y6c&w%q
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

diff --git a/docs/img/icons8-logo.png b/docs/img/icons8-logo.png
index 13d9d85afd3a83f04d3074f62ce369565a3bea25..12f65c2b39b06b6320b21653de12bf548cff8ea3 100644
GIT binary patch
literal 9593
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

literal 110994
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ℑ_sv_S~KP
zJ6#>Dr-Nvu5VLpLc!r+k=E!-nXSplzwAK=MBF`(-eJaj4yd}q!hX(eDV2>DcCwr78yK`#uP;*P
zk?M?$QJymQ#@DYAV;H=QI4DW+3xc;y6ZTqu
z=2z5lHyNKswy!pIp0}+upHjebI{z9k&!gz0L1?TfCWSmXWpSK~J8&Js^avfz!8M_LVA0{i|hS3ZX
z^$-nJr8QUI+iF8t>SiB>G$hNO*x2EfL362Ez^P-a$Fo;Oztcji*!c?lyJ6c=LFp6g
zX+$}^{SkK^w9rfM-^uEMp45dOSPiY}hY?Y~*J&({2YV8hRTWXv)7S>W(nRfR@KWI;
z#+nE0Kx&8*V6YlTb^8K3-El`q&>tgJ&B+)YS##e8WQs_liCbQ+dAI`R#i%xFu~)W%
zZ!rIj=KfEJ{K|D|3di8Oe@$!AQ-l$jZ*P)%0y5Vei(AY!h`y2GF30Dm6qrwtm!Mm_
zFR(QkVH=kDgqsW*U1QR>?AVV5Hx!p3*x&xS+9};Oa*)bS_3JP?FFFiT8a?0MjDL;@
zxUKG5k^7GQ7xNUQsV7xxSmlX{FFwUse$}SbMou^LFY*!ZT*NBFja{veMw;r&&5gly
z>VclSK4A|<4**=bpu_HtvdLB>`~5Y=w4bHCzcg_CD-W~HzN?$Z
z!(WNF-Jxx&mkVG$kLh#04$J0@g^r9}+Zs2^qG--!OHD!>g}7x&3sO4z;!(3F7queLME)PHGcm%xP-0a{wsBf|$!GbYSSk^Z
zl@pFo5~9egY&n1o6gZX_BG(feM7GJbHJ^jCw`>4+ez@hvYR^_^pT|#2B;O}BUKlP~
z*6GKyhcC81JgQ5H9ZY4t)hQeHxf#)uGC(vWG~jVnSfGjd)nnez&d*E?in4Dx!gJAO
zVcL~c---kTv3KgoC*dMys+w*8QU8`{t)0fnUI=FOOw3jAfNt*;r`T$G+LfvC8YG0_^lle2Mzd
zg0+j@n|(z%X2fE>WfPVoD3&|a1GXg}ahp{d+dmYj{dmmX`cMcmB}f?I=M;J0-guLA
z=U?*NDbU@8;5`H%zi=-0oQgOP$e3vf!d1=`PTcFnnl13Dr_yAnwY@{n7IY242da5r
zoZ&lu4mgnLe&_#;El%{>9NSG^$SJ2wzr|p#?O4NK;P^==`okvh^~--8dRH3YRDp#g
z`XrdawWE1dwI{rPusBo|deR??-YGxzQN1cBOH)RVGlqtReYsOhvr4d)LJdkAwsd2pFjIUhYXX!>@&PNUseRL?=hYf-g5??N4&KN%Y0Y
z(WP|jI)-Os7B8(9FjV*%T+i}{W;}by^lBRW^b1?mKjs`99)t*tvCU&sUNG2u5(EVl&3-!Z#q=Py*?d~
zD4tIFZn|{LR;&0a39UluhZk|@FWc1R(}IbQg7ZG(Z!ghk7*=J^zMhgU|8j__KKQqb
zDn2Il!x-!9*O~m9+<=>k1qfvJtEzAkNzxQbqYEX1h8K-n@gW&r7@=$>BVkKPZArfQ
zRZ@n!dkE#qT9gaZ_-ZjZ5poM05XICI2u!cej{rm(BWGfA&ZeJ0eCdh2-
zVR1ol7g>k||I&DGhF;HZA=El>76Ph%FIK}*i#$dfuoYoaKXbeaDo?u}7&_W6G@2fDcd1cfX@_vFku*j_TvnLZjamm0J
z{sc>_28X%XiP4va^AtAt5l)Q6;4OJn^e79>(|6G`+w&^v^o>JSiXlp_IN0?gchq>9yWdkJl_!}lKyG73}K7%4v|g%$!pZ~4%kKn^WN
z3X!v^l+H%xq}+XEqsAAhdR
zU!1aD2>urrfbv5c?Wq}ktVH^dhP3MvNMITWk|()vEj2Jcux2UtmF#N&xs9=&l(tGu
z)<+)}2F<}97Y9m2e=+Vi-UpT8(k%eNv?sYW3BN~8%5+ijw7C62I#aV=-Kz7ofLXM1Lm5r|T
zS~BgHcBF~UQrEe(naH3*UqSo&EVY*m(!lHZq)z*?&aXtN7$
z0R(&EEMFF4eq0%070;y-0I|o+`MC1@ZCRZE5S1|kW`}EAn?irq=iEZ-D4B~X
z==KHLVbJ06yC?l_DR4#FKL6CfXxwkdXnA?*1%Uah
zVB1hG!u-aQsCvZL<=?ld#0MfyG_yzty`clL@KAIK^!HJ?({14aV(RBh}T>P-9r{*OEbF8=p+V*1GkPJi2P7toS$Rmy&tb%KE##L
zB541HfcQBb(Cc}60Lf!RBy__0+GY%u4;D*Qho5&LN7bdnV=4Vpo?nBtLm4o?uC`OX
z#G0L|mE;D72vq^vG2VkB9OBVajPLn!;Qf;^Mh$7R^ii|n|C=QKKPT_$iz)@f`-!-T
zrlChgjD_e(Euha*!k=>OBf{>-fwQ}pIX}qm$M%a~9~BQ)s3~sFTBJl*hL@T%m4=j6l?MXU-|?8R&A8~$n*P)ZtxgGL~nK8Is3
zv)R^n@~JKNrllit#wfYXcGLhK3-&9DK_R*G@uE%02-+VDEZtMtr+qf}PVku8k2-Jk
zln9U8w<#Twh!eCyT1Y6f84>3|U{WCPbN;_|(R9tukaHN_jJnLxYMJ{qodovBEhEy5
zYFRrYyZ!*T$Zr1gNGgGrM%fjQ1l8MiRnAFMr)B@nqQ*w~mwnu)_iV62^*>H%Gh-Cx
zD*Cu-Q(=5by;*M2YW`RN+PFI*yIXP~A5;w41*s)XcRI{!Y9|LgfluHb?$9#bKyzTe
z;)?epsCzF^rLIv^l%18)DsB4ON47|KQ)oHKB}I<{Un=
zwJj0aQ5N3dDNxja@6!)VUOU?*!=Ztq{jd>gE8Aq5)U((tMAIT70@nNn0y3nOs-Chv
zBfo!}zO?40Rs)~r1UPLoAWjpGh|=zf1NLep7&RHICQOgvQ%Z;w6QLiY0{Zz?r~bn-
zUeFRw(u`9Ep>@1o-~K~nHL??OC61ra%zluUdXXpv>;ai5{M>sM@X#A9XM+`2+sc7e
zYPilCGi=$16D=ACfvsW{#a3D5Rw6#%NNscj*^?4YmK?U*j|OH7WK%(5aJb6d&9D6taFw=zbuC->5KmOt9kT
zv_(dVxw?8Ce)O$X5{Zf!eJ+jn+VbJ6nl(pH)vZL~VsxMM)$
zz~U%FSwgmgule)u%q^d4^m~Diu9Wuon3WI+_}#nllt+NHy%p%C
z%(SswEOm>wMqUB05*G{e0fl+K`$GH35*ODlCatW1w0aGeB_T|@VU<;#=vfo>W=aEW
zQ@3Zq@$TIgCu37!SpK^l;eqDP`z)uiS=p4OplheV2S4AA6V-DxrWnko5tKeTg@A%5
z8$b(UO8~Y6Bw;C?J*y$kl|XeaU+NK%<`?cu!5Ul(uFdZ$!7)Eur%Sn14bfYzFZJvb
z)J;rVz5D9FWxP(l?ey&YxrSVSNwCltezcD!`z%Pge<8*dM4%5!fs;yd4il#ScX9%|
z!c*sOT=TO4Tp3lsF|xcYA9<#QY4Q#W^A|JMG{+an(9lL{E*e8a+!H=dsLZ*r8Un1)nXgh)KrV
ztwWl&B0Q@p2FvclD~x5(fPVdDvOfRgwCKAlHddZ`G!$(Vfy(2izWd$tL)Z)O-5Rk;
z;P{IyC}X4oMH9COXUo71STo?ht>hO>#p6-k$1+6LxnoZeh
z8>hw{qZH2cTmOVjc4w_LFl7%*c?k6y^e;yz2*jdCyCz!eG%e|9TVt5)oBcZ+7Qavp
zI+e(zS9CILuUsL?t{iT~09#BYr1zh5+~+!GEHv-y)CA(eAoWwC|a71cZuSFLR!4sQz~jH?yS5^bHP
zm!ya6gxkh2x~Oe|=Wc>~D7||EIea7EZ~Ym}7P6(yUt*a1XbF8a#l)I<
zRW|z
z`~$&*VHe?;3tPz=E11?^-{+voX+e~)xZ?TB^MebtX6XOOI2TJ)PsquG*sFI})TIcr
z^IsQX>f21m($lS4jii690Xi_q2|d4VsP$Hccnk!xLRUJiu3%+lME#}vtqH%$E48E#
z%_97O@rXq@fQWV0LdT3B4hiItwdlz@?lq_D_iH(>iYUjE^6Gi&osZR_%l0nDcct3A
zew0Fh0NqyHnGZLIPgE9NpA)gDx=YqZO+o#r8?2v9*n{dRWfBzq$)((T|MSno`#`osHb6zI`
zX{8=aGS~W0tu)fi{Q!SCg2A|+BKkF*sI02N(KY6>9-b`2+eFhx1XJ+hrLz?0{
zdJ3Hr#n0%Ih;x=pz`ZMFNCR+6NBB_%zcfFQX7W*I!#=n>k+K?P>F_Pb0v(+RGww`xn2)7DKLk*jkL;T{
z;yxYTNE#El!lE+FYp_$tLXmDK8eo$7se9#7T|&aH(V`KD>i4|RB^*1N+T|AcrE)T6
zoF`AhRE_6pzw>ICwL8<*U#oXw8)WoYD1qAt{~J5H@vTKG*Y@kHoH*bPIlU!#Pr
zWz%O%)=oncMk0qx<$)4vVZ0y6*7ty~Tid||S2)tTXv5IpL)%RM8d!Q%v{yCdLge+u
zkpJ-l-Z__EWc{kJdh`5kwL4&lxWSmLJXHF}VjU=}ho9fIcJx^0s93OcyO@YyXXN1Z
z9^9-Rc)_~9@o;n-C3_L`-RAiTG8J52XsZp
z;W~i*`S7{eCMSdH~&
zU(<2KmDzl>fil8w9dhhQGm3k#lg4#UkTQVs`rTeLX7|g$>DIe0y~~tjSkXm)sW6oU
zGIv6JI(wy|SNFK$vO?=Lv#2e-nOg8xAyK$WYa5kqBm{Jt!i}w{4v<_%(nSG
zaF%dsdx#e9QxrMk9MtHMi5y8hCnC#ray;I>nOai{xTzgchlF=vL}4DF$}>163L-U8
z;yb&0rC?+Om345Fy9|5uc|?*SLAaBPuDPssxCNf|4SdGcN8`pZ(10^7L5E8Op(3jx
zu_}lC-Ky~JHkJ2acoksx>==*hVcp_&#o1W8x$scz5ABOfm_FMub1bh%?-;99qQ&p9
zrHEOMamopvdMD7F&wcaTz((--lNzkvO8BPz_Uotxz8$=Bx(=>A3G1itYkI0m#bXUg
zdR1PGL^G}d_xb;}a^Afg$?c8&R0_BIur_hx^CUfMrX
zt9m~9O7GH!!tNBPy&mJZDAZz1cl?0054QQT&{tqcf0NJDAhF-|3J_s-QVZ3=8Ris%
zuAnb+YeEEE-;+GO19-9qC_cF^2nT3AtIi<&%5zmZJaUmQJ4x6lQ8
zw25Jr;l$DRsr&{q0!jLQ!I$v$zR9vDgiM$jr@I1P&c*lbCCF@mCMcALeH^g)?$yF&
z{oPCbWyZ(xy2jeg!tUspOjg8Ew5V3~)6oAe
z7W$u)t-C+!eJZnrG*%?AQ!aC9lQV$F;`8{(*DqY`QS+3rI@1(-QppEq^Q#Fq>VQWW@|x<3ZYPo0w!#gIjI=3$vv
zkO^Znad0uQ4w;n<1{e_gT
z*>0~VH0BYih!2dJRZFj&`S^3dpF^DvZC%W4plFG~09_;3wreIM`dI#?6yyNE92wZ=
z#HOjlk*r_N<#c`fQ5sbD*ALp_H*}`Fw5#jWSvTmY_!Kpj4bq2JqnWaMF*Ha83@g)I
zG1`WznMV7%ZtyP>d6kM`J+&;ly;k`$KWah{2DlbyTM_}i{g~@fQG%((X5@dV82d*!
z>9>MH@YzaK%~Sj3LMDX|5uM5_`WN<^Ad4WQt0007%OvX6O3#4zfZ-b7
zb;sIyCVKkSq_NA6swPGc_2fX(eaw0Xy78-1QD@A0w(1dX^>4!SJfoCf
zpb;wj%(#8??{$L2C1`z1>#=6QDoL?N(YuA{FUhCE4#95k*vdJ}gW{JGb>1jvLxOZ!
zzLxwTK(|ktD`R0x+jebc8D43;2>=!{(}L-WD6`Q=eieUdNZxYg1P2?_CJ|QAQV{&x
z?0S^Q7O56wSpfvYTv;vpx1Qb|=PV8Pn1c<2*#}m0Jm`)S^KOT`kgJlveNA?=N`X=`
za=F;SsEMi|*&?o|`kzgnw2rs~g$!n+G23|XMC$!e;vrs5+=-wIM}M9M-l{#N0P*)#
z!wj*+Rfh6Eu7))sjA}(9U$*lNWDJUS)HAkhmSZYO)SIk9%RXzQ4F;#K`l+x20O9#}
zs<@U2jZZz0d|BBdhGN<&mNOXxD~!xLSh^Ul+L1~k|C~-{9uRFko`Vbue3AGhfKTC0
zv@xHr`nQSmb7X;BhY6Jq$}hBXNh!_4_ubVRTG0xlqe@>t3avsB0nqyIwuUXNo4r!w
z$(sc*e&8DR1ZKnk`h;=y=XyO!kwr6>Fcka?{Um68l$v}(HEe=*F6|c1xxVw~Sd%w9
zMxS_j>!&+Ccgc|qRjt#ATxj)ANraH++-buD9#!Rghzc+pKE4%;ut8MA8R7antorLD
zLbMb%Yu*>X$8sYj
z!TPa@(M%(>0~6ZI9qNQ}+k5gwQse3ay-f?|R~P{Qd(DLcI(p?)ndQ3D{1$`(Ov%DY
z#^2z|NZQDyGr;@n%>U5)QL0a
zl7~oSRE$%y6wMlD(hCHf=D{+Ww24)FKejX?WwFG3uAI7s!Mhq(myKh6F|*%IOzjDN
zgPndNIv5_vKzl+RMUaTrWZR$n$l)Y&?Bpx9SXtUcyno3WR=SWWc$ASb;mAy0^7!8MlNiRS8-j6!dfh0R8g-i_
znI%Q73aNe|`?tZxQ4$sV2{11km_Q_vzjuy{AHH;kOnlx`wf%DY1S6rWN2MmqF_a@B
zIpVRyx*gDqZ!;LW>RvO!(A<63_9MY-+5hZKZ)dVQkN_sltI%l}!36)1$z?>MtIF<_
zooDW%5Pe=U3(B(`8y9^s>wYGK_v$Kc9W-B77e&$)riT4bBd?S8U*`zg}#hm)hBRK@*ZL*F?b7Sq&F
zYQjHqackrR{-cog=YU^lwa0-lk14KD%s{ev=73YB?k8MK#GeVv9@Gszl51|e(hoK9
zAMf%OUkXWc*+>V+@AHs~M}V(iXKN4bY0aC0YfX-1jzU_=EClom~D}pPx
zMIsC&ZSp*~scHz{b_ty7Mbk20Fo-D
zsAAi?tEa}3b4X660&|ei3Ms_T@{JU10SqQ+&xrUeUhRL#j7cf6h;A%BN!dhluzfPf
zVL^P#3(a?_Om!47E7GNV5=dr0-fs_~Mf7)KXRp0<=m@_RD_uIGnRf7==qav)Wh9yg
z0-U2~!0!2p9Gw5sJiIk5EA7s!AJbhdci+dGhO(9eRZ<+os*+SYs-j4=3`~#VIz_9+
z2Z5G4eFLw8C6`{}m!*H8HM0+J8}QhHf4W|G_nl|aJwta9E?YdJ_#T-y9uGURvD|1t*;;wok&@
z(UzMXC#@Qy69s2ezf|Iv;S_|(Azc@09-^udKd8Qo~r$Or$l%V0g^rcXenOd
zb0QtJy7Zn{fs;B>6F6nwTA`@?j}|8+TzDEe&OU-;)`A`-XYv-Cx>B)NHv^-CJ^MN5
zT|CUlZINuT{JEDW!T^P8yn#El@^w@qFOjQTqv#QCd_%F}W0gJ|3N53s)6)3&2(t+(
zXL}=$v$tfRCJ=}$b+O5Mj;|dyM?nXmUjpbwk~Jc#Hy1E+_v`ua1>1yRTj^7
zL9IxEw$id9tfk3GZa9W^pb6ezKRK0}<{#NSZ4sry2)s8H7lor0$osp_yI40w6dI>N
z4BD}Z&YM;_`)-BtDHYmCc%i;yA-%||=(g?Ef0(l4W`))Hc
z$v_eM6?KiN8IGBYzNyw^vvwZs29-B;Y;FRt_9ZnXIdnRzO<{U{x*pgfln^CP9^4ZU
zV}kv6x?zans)JRlex*|C4_fFb%>dI3rZQ%-_lusZ@5ID#^~W!sTCSpgy&svJ@I
zg%5KWKRV6D#Uh6pCy#xE|0P|WpL1P%@KvFR6rymUZMhkU@aY0M$l&p=lYyB?BGZ_@>rBT0M7#JS8Aw2r}>
z`%tip(~8vANOm%Tm4!aGC;%d0XRhuNW=x;+;lO2mUSVh?b3>}k+62K)ceo4EKArN19h9w8cI
zjOruBTMWP!?b=Ry=|UbO|8paL^LziUWo;Ja6Pi0l3uYd@kQ~W2L=7{`oYg@DDE-}Lqm$`cR?Y*g2!ku6>YeA4qYX^O~Wo|U(
z90g<|MSSRhqyLjl$DX(6zwsx}!2|;l^TD!aefcybeCY|@X2idaiND<>LVHIgPs&8(
zN7W)F03Kh}#Y{Wyn(mJ7OkV=r^=wuMb6$Ua%=7R4R6W-lOS2c8oG)^r-6RjT{9P5G
z%GNWIHr90MOQo7`JHcBxOJeKZb#*`J3xa$d_kU#v@|*f>f>%AaFHoB?JDkR>YO-+s
z>s&1IJm1%3p^9F5OGA9uo%&fIAW$*3_?615!0Vs&8Ru7tH;nz2%Fjnjo!GftXx
zDbwk_?h17&ER8~czQ`<%FSVN~t6q1REt*Z50qQ+s_-W;t$5UM-)kwAkMV2B*^Ld(`
z3YeXbHHZ&0w;^GiLBg|_GQTT;=z>y-#0^o}QXfC*;cZROEblt9)uXBLVWJ^0zK@Ca
z4f+-5gYK(v^ri7qMv}bIPYi1)e15PtCwcRFG$NhfVG{$cUTSkh^Z;Q2t>jcy4v;>=
z7IbkfG5>T$w~pO2C~;TcadCiMl+4Sv^OZ6X(sdg?c(W;=J7m!5^xk46zG+v6I^hgP
z?RUCt%qD8lOFnvobZ|dXuH+JDeKCLnOdH-58ZAT1K>v?)@O&V#X+|>o)-71gRZ`PQ
z*}I9Bt02he9Y2&X33J4VQNJ>BRd8@PKK53N9yR^-FWwqb$WoPVZ$(@>0tMn3!Wrxt
zim@U-Mw*@*28(@`H?0l)r$4|2;pzJNPD$=b659@A&uPrJyCi>2&ba&xo@(>jbxTr_
zq&So_{)}i(c&i9PNe-dApx3c(7aAL%;i5o#7J@Rx7?^1@`B8T~S7etoB&(eo`Xmyq
zM=#~31|%pT;Go}R0loYtQ$N!D$dEuqhFt&Q{ybtJXss55GACt-gV|Ix^WJqM7MNnm`qYdFP
zQLCG5qFzyG)c><5bo1x^aY=kgbTg#haECI~XlS;k^R|Sd87|~1AxH)0CX;RU6R9)9
z(MI9W>6+!cE+)Ohu1Cr5KxT5ztU9&h_l=us6MkQkK_iMP7(QZb`O!0d4w$B@os72A
z`RqTRqp6-;E`K})%wF%zG^`=DU*`3CRcc|>NlK2v0KYW(v@gb&coWU-f2zq6w&b^$
z7sAjK48u~ZMc;s;ChcGGYtkKnH!+Pi;31
z@l{BQg#JlSOc#_$ZBAi=OZ~|d&E(lN`>#I-Js#zAH<8D)s~jAs%_JvAVCo}AQB*k(
zWJn?Mg#BuG4UP~`>fp~*jJKzXi0+*HVz3JET$mM>4QvEsC;K_O+qXq`L)ul!5rLZfC|*|X|GN=sXf|`cY_b(5TQ}JPltD&)
z?x+$44ww>GKPY}Pl5p6X_5$nnFNxpI5!YB-&;<|ql6Z{;1yYG+S0DOU;);6CgdUKI
zJ_A-OSyo4Jjl_d_Ddu)%aJIWvB|!WYi=0Ku!Ner-!aC@if$s}Wvxh5-@Ls~>0}f7W
z$n@m|hAV6V!z9F9#{Ih6)ky8O88`Cqn3e*7F6jV{iea&yykzycH6&qLTZoWAF0t%;
z@k4i})4jDPb<-~Xf;e7)98E5YJ%Kau5`3CrCa)c#JRt{X%f2vC0Ihy1%W#Z|<8A7C
z9Lcy<4|@Fg;Pt8-v=|#3L!X!7Ld~feTrKvdby+_yn)pWSrP@#iNd>cCcQGf4QC#m!
zo_GTw^07n7EnH2jmM+{ppkqQZpT8scB51JUuM0o1cOL@}Hf=mby~a-N-ukt>?>47z
zK+&#X#SX}-`-L)3Pm#H6_9|!Vx`Mk`NFLgt8pVe(4+31KUmD+)!`ZDXhV=UMkScLe
zG8!zJkLYKu-Rel$?q)4X&#o}t-wH`
z5ZW_!ZE<_&>vHSiJ}q!r@UD+2EZL+ElJo9Oe7|&+zI-ynQ!Ija7>=Qb{GGXMU3S
zll?QvCA4y!%RRuaOY2V)$v&VxwEYPhT*a~k>#;vzDUgno2@IMc%zpV!l6BDOB$g2mj2#tkhQF_Jb
zJa%mi20r87!DHvx-c2-_4V&>KTx9hM@R7Jfj7H^UN4uGkwyBqUGR<0X$ef*s&z`7!
z{mYZ|*VwZS9VpZ`o0Jq04wX$GeFC4J^FZNlnCIoZV8LRk?5tjV7&?sKh30LFqQO?d
zl2>6psQ~u;pT_{3G#YL8K^#OttNs1L5Q_z&dWn2M7s=O?%=0$4AbMv*0~kXDMz-z`wNUpJGqif#Yt)M8%mr?6-PW&&Ay)>g
z!d4EJ72EB49N$hrsCgx)T>i3Nn7koC*|-h)rU3jkr!LitHA%>5`eI4O!=wTT^oxNJ
zyT250VnMEsGcYNB2eZ!hmpzaI>g`&QA(lN^O^}PjcHza%mm^iv8GoCWtDZj&yqSL;
zifa~ibr%;J4TBHONF!pX93&Vx;ky^80h
zw2~o`<3O0{e7oY^oS%B^qBfKXpm2Bc-@;#)XDHW7h(+6DIKy~7qTOCW_~nu0i4u{sz-hmZi<-
zE}UCMn{W;x+rqT{)u8M1Ag@8Pv2m6EzvB!zpbB`jg$caRP~Ts5nuKjah$h*`p}V)L
zx12DaX@U4HjU9``ZX_$9Rp%t7^VFkC&Gs?TJS^U$e8w#6z`j4y?6sF9AB=BlMSe#R
z0Qat6?Br8wOR*5h(O>!$?t&B)1j?<^M_2~6SREL?f=vD9noC6QV#jy7pUyKW@|o57
za|e?xSprg*#7`LM?Fd<4)g$KBl}0ibi}ER77nr{lD*xd#>N}^-U%#ZzQxJ(#hpaKU
z3v6L+l!ylN4!xE&Y_kyGTbhbl5WR;99!hO2K?)s++}_tB)xL_-Gg*gRL(990CyzW`0Vn{!q@6
z64>)GGkSGv>!k#xd$FJUkn|?U0E78|(;tDfz8JOfdDO#v=0iq)jNbAa52#}7-jl~Y
z?n$
zso-}4x!p(Y+->mjp21Nh0u3T&!!NeBKs4q<+%B;7^%0#;p#6F_!%;T-j0|YG^xoem
zs`s>mK!{H8wO+;ZO&CI;1L;#k&H~ttATQ=wXJec$z|A{Q^U4>0tToY0;41^)H&oK^
z%bP9DfVJqqs*%oU`;$55j*I{kc;>3A`REJOM#K%wn0fB{dVLVOKFClX)cQllun%^C
zD&VGGBzKy{>BYE>;53t+jVpYKl_73GNRgi;=L1UW6c)e0>
zIq>h_>&5uI2ZtMM;<0#ws&s@=R43hobd10wdXwW~h|9JC`ZG#9Q5U=|Pk(|(=#B3{
zQ`hT{@rIy>=)9q0!sWLsy9N;H~aAB19
zi7f$zro88vrt(V;vWY-_J*deH>fP&)Yr2T=Dj{!7kbJl*)z2oPewx?GxACyc~z
zEfj9@V-(~{BAVui5S{TT8uKit&LFC2VwMaYYddtG2lI#_bHD=*Qi$_9OXtpJ2C0xa
z0f8}@zxhRo%kRYQtq@C`ywV24MQGhc4%Gao-aI$-sFCIR+KkWxE8@>34SspW8FAM~
zZwA&HlveQ{#m2dX3wOq?*|sNsqmq%MOUUoSm)P2;7Z-vW-6$8!
z5Pm#`^82GFWfJ1i6V23Gtx<>J7^h8_!M%8TAk@*iyqRAX$=#P;Doy6LhD2Iff-=9Q
z_dUg$kC&GG*pW|D6w4s|j$Xj}33Vxb1sdTxSv<}NW}OsV9gaC=n&I2bvFos2
z5<`!Bip`h1F9!A>5mEo^bxUzvHcj_3C}I1CdJcuDDIxq&d|y+rxbY$bc)40bhfys+
z+&&8l>7MODSVU^_jXUe^nkfx954AA}DMl8
zsRGn>Oo-cNO$?CbC&$g~!>8qoP}bYq^sd+v=^NWD|M4!kGIMe6WW@jJJnx|d{$3PDk@$|Bu@*PHy0q9D_|&%&QK)9^yGRL(&4Plg^Gmbuy4S5Ovl@!AW
zck{sfd0LU_0acV+6Ym4$C-K7p-PhS*y>X=XF5ikq+_j$-}Q?ML+~R-
zE_3Lcw+E9)?{6rC=VYlGkkc5Hh*7^VEQcFj%c&ea>giz>h&;C$gYWXM%1JijOm;buNNo>STTMVmVp7iU@FTr%vK~czdufq&dTY=eO`+k;bXsI
zE0P=yQ*Vq+T1;|*Kp%w!g`%*3i5K#vMaPgNe!lr@-zyU&duF}~uq~XlD24oK#Xse9
z1P}&vVI_GoHgutwBPiMJmt3V2aU)L_3p=eKAErj@^b23Uw(l09tIP+Z8;LOD_zxI7
z&Y2osZ&nSD4stMerwc~-P}-qP*hD1v8{=<_Q`7e087r_x#{6_pd&1wv_9$e4aTz_+QoaIOsUi
zfwZQBKs#OBMPu;_1@A3U)fa|$7dD6#s@aPnNna~fT5s6*$(j6jkEfntA
zQplP*2E*nShR6#Ei&4D;HKuL!mIG$^mhEdLUUCppCrb}}!cyGB8tTOVGzmm1t=d{8
zHRKu6aAsIR=Hm8p?{lA-kKdpCd>Z(IJ9%!GiIyWmmu}4{G;%Q{`0;@8(6v4h)+7j+
ztezD6^zb6gBGGo1n;+~>*5zkKv@TV*USvRjGj~ZrR}EVYw?Co>*R(tTGrquEm&F0`
zPvufG*?#xW(XexgeR=sCzUUL->X+l5m@N|K@G6e_k%EAehAeUyfj1$W6tnm8k*o49
z`;-(4g&1;(XT*rPG6vk<@Qe0PmJtW-9AeIg7p$Ix^vM;^Au2|4G^g2AH=ZCfK#2=FKF+AF8yFy&cB-u8@&!L
zob$JlrSyMa)JUX2{Zh`5ztuv%iEoqD6V;0t;|B7?YKdGV)ihkn&~rOmWi|`k4d1s!
zP7=B4u`~?!H^TDd!JHY5&yVKE!LLXOSWulgAhk{?(yGaD^6pr6T9Py;(Q6=fb52`*
z-ndqG8#GPd8#-^x8-E?n+lqgkO==WyGdklI%BYE98`i3n{9*CAESY#((2Kl<;?U_C
zrN2&Grs4aG9kr~xvZp)lN%n)xvd<3U4&rLH*t(0voBmq}F;ze&G`x4eibVYi*H}??
zIGORh*8Mm5c|LHTtaEn{PwY5W*#OQEj(xkGI!3D5)Db05i=((Cg6CbDM*7{3HW=-L
z>zH=?>X<_HyrWaaJFjfF)}m)9Iz((1Zk;h~=b?R6SQe{_7P>Yk-2HcDxje)DD41vW
ze5?EaqwX!k;#!u5Q33&ig%C6lAVGsC5L_m~o#5{7J~#wTa0~A4Ot3+QL4vyk*Wm69
zKFl|J?{l8}p7Z{{-@Wr=o~PI9)lyYmT~%FO75hFebfPec=45&}f_(0omCEirr;;h^
z**hvDst?K$?z1#;gEiH`Cr$bvv``>M+0r^FGxp=!-eSr*RI?l+SJF?2+TXz*XZv!B
ztlaxPupz^ITfnn1N!{vtyW~Ju%Y&PyBqn;qN^#xrUq6h7#l^mGUHBkF#93-P9tEuMmHaSkQl2adAAidd3b%LpN_WM{Jtjfi?um
zy~!k)6!d3=$s`Yoec`+WFQ2fP6ExPi3&qk0cwj4SRnY8}{z3UL}FtrYZTgAZ`*@Z)odV-%rVrQ9O(LuU(KAjaB2>BKemmTi@-yf;x;-L0XbGvXdBH^s&H#nAtI=
zUmMniUP4c5zMfcV_ariB;C7cniVA}q4mB|=5&F!Z@a%9uhBL-&fAuOX==d-kvsO_T
ziz+1>v{WN!JLeuAvVbwi>C_p8b3-@q@~2I2viVH%W>8qyh!wB!Pxn7U{Q-j
z4mL&k8X3v6^=W;4VSKMl3@+8XVr-&o9B{OHv~UHaK?E`=O~~6+
zTsH?4ZR{3;02|0}ELxZrXQ^qj99pz+aQT;pdV?;KQQRvONQ*PNs>N$G4SJ1Ejn5UH
zRfWV|4=a6lg)e7Liv4!JRLpt^fi!Gu1U>0qBbdhBtOJN(u@-@8xry9_2ubBJrxJ|G
z_fBh`AK8F!(x6XTs{`SzFCt?3gzi+ZeEt`neS?Z@d((3x?I`M_XBE%7Bb1rkle;I_
z?(aBmp5CiTGswTdO7DcD{(M*Snz?zFZt=Y;;kbi-F2$1+K~=f5H1$n2kI-Jc2)N^TkZa?BK4gLw{8g)Gj;3HbwRCg&DCoh0==&A$
zHv>CZRfx6$U2M*MIoC6WAFCw6g)1xH?SartqibQ`;Z
zGKvb)C4-5To?>ECeu77bgcwg8IvjbfunC~Lf41#F?<&vxO^>s)^6}66io;-OX2xl*
z?q~1AoyEsRZPumg*aF%56X{Zj`gR7U_K5CI>kx6Yt5=$?tfp(%k8A)$w^A!~rx@W+
z9EI_o;A3?09^sN-jsW9H4h_?L%60u_T^E1^9sf^r3!F|~BvPIOdE!>&R=#Ot2H36m
zyNqy##_Z64QOdV2-Gi;Gp-bXb3=A10aVLZ|#MWx4aL+ANcJurUt-;a}W2Mmhbr>{`
z-j)0?2dONtTqvCBKlZz0(N~~y{b~nC)NaqOGj&h;3
znY!TI$W*80|I&OFoZT&Iy=R6jq`V#K7H5DfD%G#mB%;DXKA|7{mNu`-fWJUhW_hPk
z-`lO$s&JFR@Q_Lroo=lbYXgdH1UGahIs;J=aj}FtfH~
zvN?vD-f_8N^>O$2Oa?lOF6rb%hyx?p@D)eEwTr0z9D5DPLI+BJDnme-f}286at(N&f2o`Cuz0+a2ZFpLLI#{luurH*!>R@czER|X$`E_hwf7ND1`gQUcnZPMXa&-E
zuhh#*%V(|aKn4o}_qvFB#vSZ|y(xGJB^utZPAKDndW2mHKOKuOUONw3Eo*^J*_Sf2
zXXVYVw4=>fj0!jwaWn+f{YQ^%3DSxFeri-w0>e!+y9F&1QlU4%nc@7{^QQ^*Z_TSx
z482uQu2%v!-0l2tSPa)n0O#?K7Yp5~YNfW?MPCfu^j2(}^ZON$$_Q4WbFN8h;>k)>
zNPmNX^~N=OUo%U1+YHY@(fs412)OfPBxEBVNNzz7Z;ms+O!Zo>r#H`Z(k&{
zx*ORL4A~%0YN!ocrahkdgq^j(Y77+Fy$>b$uJ=jDO&ffBz#*iH;(Ohf_&AZ*CjXxf
zYEFcI&>GLq8xdCWJewtLXQ6D5%R0n;sQ&UwcsXBB!Xodr*n~z;b$CB$8z*pbEwWYW
zDT3t#El$I4xCa+r<`o15jz+UAtKDhyGsVBsc*2~(JlY)LS{`Z0h1AB=o_0j~
z_2<`J9<-F5jEW}L{e1ToYBZG7NwTwtPMrv-5J
z8c~%eA1tm_?~IsJb}luk22k1Hrk>N81q_c(BpeNgd2}X*EDo#>XN(Xv2UwmB
z%tvnbS#qN;&J6+!qLF~rtcuf$-QP^e77Kd*P^qy{BNb~LNkVV;4
z;8P6A)>LRj@NFIc!c`;YS@+9lc;Q-W!hKUzeR7jD+t0-kx5Q4}@Y`@cX05oF9bsmK
zy*kaG;!a-|Bs*?HL6H7zLCF6w^{&n4c`D5GFx7mVsd<$>VYfhFLJA%A&*5`wbCMS6
zDZkqj;c0{<2Leg~GF4@W^BuR^9fLQXaAZHkEJlpMzZskWd^gZbu7C=~ScwcF({~%%
zH3e_0<-<(BZ0#>=`4ImQrzk^p7pHX#nGTHj((}`M+)xPBPSz&KHpxVDrIBzrsRgXZ
z1QvMU6Di3u)f?h*snV5DB({`5-!ZYHxaKJ+#q$dJ{Ozj7NUlJva%B2NyADHZE?
zFwPqEFj{du^^1T1OVPSp=~or*D~+dFJY8zX&%@hF@cc${_%Xsy4<2IS*EwItXR&D8
zEIJj9bW-MO16K?|n<>?9IVb0;XRV`Gr^-q16RK!R)76qw#h4bEJM3vB3lV1`-^)|51+=8SHCUxNu&hjCD`!TOCSVb*4axee6jWc{o(^h*0#A
zYeLVpDAt=JnJjL^9}){5qeBZi^*&$FUcIgmM@F*Elle&~Vo|0Zp$*y4nCJ2KOsH=>
za2)i>J4Zw}E^NhCkslUgl*AYX9f>sp|8-wIB_tUe3bkk&N1F>F^Jhc5qyg9HJYMFX%7R$UsTGUdOXT=1gzZwoP
z9F0QxXIZCxp_#5ZMFbMS#
zzs=cOeV0vrGK+)$GV63U9=E!!hmbMm&&ONWfWdp}hWKl-pqMlX>M6F{;&VSse8YxC
zscG59{pua}&u9}U5&<8J6F|(j#gYTFP~v<@~?6fQ=_ta%08`=i2mo@1_#tk?<*z){tIzLv&BJ_-A<4ANV-HGu%hC~;Pc|`rc9;H
zC~o9A?uQSYzqUd;8ZOaHFjcd%X!lI$?KMm7wdkGLRrZTKIrw#r%jW58}vn1alT_J5cTs
zaYUM3;9s-VTQS2~R(Et%tp1&5P62AhYf>Vq0>i#?riX+tqfR&s((Z|#E7;-Z*omZ#$orpa$~1{fJeKDS}=~RRoGx#{^|so
z)P(Z6jCpj1ZBPBpb??{juh!0M-1y_<_AzM64EdB>Rw;Lc_!)~uA^zIhUg=tzsiJF-phsT)3
z?(HH?51|vDSu+c0rOsm96tLQAJ;I*4Tf~_UG%t((w;=qLGw|tYMSwlky)J+tQSJGz-)Se8
zTjXO?V`|e0S^Z|Bq;iPhqrZoX4abi}4NY0TZaTwePDrNR1s35%j|p$M33~M}%Tk=^
zS3F@#FOwbH?sOKiq
z$EL0S#zsj2wEO;{E5~!GA#=ae!Ndh@t0h+&PEF0-Ga9ii{X(DVEqB!NkJ_B$;(83_Qqk|w%_sJPD@Ld)Xz;JVqd
zlUGXH1uk#|+|GNr6V1=&AT~$QG^%XOe3=oWv3`Zui>o(%%SD=qpDB&H(q3pEUdA9J
za8SXXwOzP_2#UJgrjIRSYapcza}mI!;3<-sJr7RnSVcNzd;$5b(E_N0IqII|QTX6$
zk^D;U95|HP*aK^0WE=_<>28!T!mHaJ;t*MsGdP+N|1T~eI=6ZkKIA_$NbLTcy@&dV
zt0$VUmQuq(%+>;9eqO=(KBeL
zgdxq_QaJsgw11_WQ7ZZU1*P;ELsm+?j+>s(t%u>_hxDzB)m!~We_TWT#EJTLz;Le;`pBqj6nO)c;_z)Z
zMP53Rj?%?-3+!z^Yd-d$EiWwB&OxyYabGoNvC2*PIR56x9Wd|4yTUmBi`obOI@3hN*@X7Z**m;67C`+R);XW=v--k>JGC;7Tz)OWVN
z*_fteVCH$0&Ud`!ouIKb!SVi0V!6{RV>Oc3ntLRP?jmIj<&f`z6avRX4|WJ?nyQV&
zw<%<5)7f3IwUGk|JYUq^pZOhxujPukwSQ?{+M4zS5_TMI+YbjVcjT@kyknHTeDySH
zGcr3p%W6lO#si6tN*<_!&%)3?Tw)6nf|DrBR3^^?W0b(9vg8=k0gd`u|I*h(vZi}##_!A7e{b=)
z6uiYK@PmZeqeGhBv@;5PI}z2v1sJ09;4c2MdVBDclXZ>czit6Oe@3qE3KeDB=_~vg
z$jvo_yl_RH{o2YVSHkRTmmMxs%;tWC6eQq}CJ>ZakWS5i>8K$HdgNa%zL~`bR7^V+aUGA~~E{-^4;V*8S87xSWpVu9k
z=Qy*fQCKbH-tVG{yt*$>%R(pdRd2VygQ-c4tG?;Ll?w-lgjD4CC8)-%4OhM|c;?N;
zX0&XiZG}EBU`1hNdKna^GM}SX{Q?jcO|Nl|t{Lg58R_hETV#7%c@XYM;5WJakj@=Q
z&owI7dhC}3#cE}0GRi(&dB3anMcHU6DoffH1SbHTK4^NbG6tlsKHMUrdjOBZo0%M$
z@r^i9=0*dph6ZSh&mI?&VhlS!QMg?D2Os<-xcaW35fMHuY-gV8Hy#~fu6dtnPI2Nf
zOFo0^jCgt4(wXxFWZbfAnr;8go??c?%|7=@vdJP_)PEc#ELG02vBNcbZI(-GKAbT7
z?+uOhKGk{RhIF=&|CS~2T>rC!=s9r>rSG|w3ffWL`5Y*f6`~PjtM%c+<0XU}+a>pX
zU8y}mgY78Sc!=lkKMGvz8pFxdw~>h>?U!p(_cHMyzccMe<2~xv7|4Tm(zZ)^ud0@7
zVW(pK+O!pRh;tDv6P4>@|+9fZN=*?Su0Iu0I-c~2?79{d>t$Urp>9^`3aUVi;g6!^Z=
zL_Og?x0}ORSf(|1D8%R-sr?f3nVvHNJ6KP$&n&~BLgJ#MGHpaU{nx>A)W*(@ltTXb
z-D{%m8dgeQlfuvmT-%z@h7>`OxG!xY&ws5iD()v?(S5}icH7qA?<6|3pa5O`30ihj
z0Mlz>P%_PrxFL;Qb4(`wf@Y9PBVDnqTx%DVltil7ly?&rC6sioZ@4Hf~-leLV~Avc~~TI-#waLv$8sv+%)n
z7&gXk(6*xZxEJyN;d+rl>{t|ZXHy{hd;&Y|RE7ZslSInd-iS5bO>s^Ld3ZQH9P=hg
zqLeZ41K!iDHIz8iwJu`v@8OPr`s&!Yq#roa0@^AccPV(t=++#Thrx{*G;bOp^?Q1@kvL?mod{Ya
z>n8JOCML*ttH;mmu=TYaLD8r_#s}
zf;B;wSA}bj5@7yjU#!O7LieT+kxmB)nqrLs>G#c@iVV*XWRU58XUP7vd*j!c$B#w1
ze?TgEZxvL9N*ZVJ-r^}&pnUpSH*H-oq<3gS*L^dd7mGlDbgrvGL2DS
zJNuP8k~XdifbE4dcV%j?e&fo?e-iTKKg=3Vb$NQB6ctQ@p806iB0MZ@A~8Hnu>s*5
z!p}z}YQ_v$d>L6fT8tLc=F_|BXXq`rnQuJ%?uzJr^CKGG@2wKL1F=kuD
zp?i!z+f{SM0u%A`4w*p$#Zt!lXe~7IFl21^un$m6N-v5S)CF;5Yh#cM
zYju-KRz4LjgN?`6+mDl6nkD0Gp?({_cPvsY{9pKbJK7L?vCwxqjWBmH1rf+ABXYkf
z-LZe0?Nbb5Kto;oNyiOCJnp&P{SJt_rw&*TY*o%WnyEh#_TcBM#lN=k
zfuwAR{x$j=3c49T%!GLo75>kVtTYZt0xzFFW7oVlbl}D
zV3ETh=NT~1AK~&ciZ5+p5|7to@Q;Z3;F6}28?dZok;UA1Bl#xxw8ey7vi-2?DI`aX
zU}$5pZY3IOlEsD0ut6dMT2yc$3u7LL>chJAGe;AWzS^sSuWgP&=27OHx&{3UAMlMw30_UU^nnduw89@Y@qH-uO+*DGzyjeT4>bz>{{ezS>y
z8SiWV>+vd|2@%!nYt@E|u|3z8`%Fu~!E(v$iN5X8o_K-UT6MJO0?xUE6HE{ML#7Hs
zhx_dK4w-;MrEv;zGZ?7IJwigBrjvI2W^+G@k~+jZsf`{_)9fgaPyCRXGZcg#gEV8--~{Kih_djr}R}}c;XHbOzDbItkOq9KQ4tgxW~z&e!G+i&zq~U$2r0MMEnFI16Vi3VE6(q
zoxKcD?p#&&^VdRpxgEOOUA=IyWFiaf0ICm%
zS#Qb51#D*~*l2#NX#XhXorT8OW(zzdi^1FcTzS;9J#(MBuH16pl3IO-dYaK@cG8sA
zuac##6qQcqF3n>_-EX78SsVXNwlXeyg{`B(eWrFf*8#@fSitAAsAxAROdG*q0icFX
z16yo+B&1N;YUt-w%jn3!%11lOK(d357yZYlH3MTA54W`PtzpnOLq?D$e8G0H
z+HA3S0ccj>x=_wGz_YcWwztR(y`REwt7;;}=vQr+b%Jj??y4U@8rSW&s6ABi`UT{z
zI6$kRZolPW7e)|>H29~4cB#LK+Xk_S9a;RH~j7<+r6Nx(r{?;K}apY
z$0%{fA`Q$v!K-nQF{LWlIgNJ=*M-*V-EGgxdb7=1_$r4;BPjtTCf(p}>~V*fF{~|@
zk4b-(+4dZ;4MS977C{n-86z5ho6-v3U5^JOS8yeQf8YC*fpN$cvRP#{D21SzzY5J$
z6s6lLC&cyKwY<1HIr%^E@(*yPTYac-;O3xD;z@r~1}3ebrddg8UFdyJ^~`>nUlPnh
zoo%Wr+^C!2*kicCk3tgA&Qj(`f}k`F+UzOUDAFS5I%vo)yH+5kTdsCoAXgYyxazOW
zE~C;A+{vqi$te3wtz4_reim@^^DJ%ZJMsq8S9qH-It1@R65Q!Q*Q)M~-o!jG_iIq$
z*@C-?<_D)Zlcp>FXwk^rdEKRHMuj1@E{X`2G@i-Tp*bI8(Iaw7m3EPwUX=!ud>t6~
zfmbQWtX!Y^TjHQTpi)Cd^x^YbJ1I^hn|PQy43h-3uP}-NBbqwQ+_5!m#Qb4X;!?$*_r(=c(w5
z{P&vQV_D&zSIr!+L@gAA2YAe+Nt=4uJx7T7lPa}5T>9v(K2jE_Wa|5u@c=nUi%22o
z@11Ue4*|KFiB}2(3kqjdE|)&%W1
zAM3;?U$sB@`nRUD)-a<~KL56&wv_I`;&5iFJKecPHTG-nf=mdu%pGTKf`Fac{rHm7|UlEN|6~PSiIzrM*U?RqO?}Te%hw0hafN%Jd?W+5H
znY0&06{t7+-pv^+E6REk%I#Mz$G#fU@RKqntLJp4htT(*3zDR#%YW85=k2L`CxQZ|
zUB65jT<^08#F_&jnCOWRQKx3TPJM%Eme8j&;hkUEys&X3-v)9>>o~~;Cg{o)e1+)a
zJX<(lV_w>K-KTbxPL?z1A#KRvuH-FmL?U&1xnidyY%IJdR+CrGF5OOSGOX{!QV{M>
zOg=T%TizbF@_XkVy1#e5Th`ZRdPx!BAmi;1`T~&d#A&{wv-kE@coi0GvES`~<|!6p
zJ76wH65O}X@cph}KTmQ0Te2SBK>2LN(pEGXXYn_t6qdR*_=~-;XR7WR>S?0ADyqB^
zxB&)L21CFkhp%yVj9Gh)wDUk*D*F=b#PXcbO_47`jFmr?m5JMcR>-HrO#BHRFA9m_Ll70ZF5ffuSO83
z?NBMp6vN_%tg(Yzm=crcGxpd#J@Vih#~@B~i@}VvEvB!R^s#=fvXie8HCp#GCa@!}
zD%&P*C=qxvcobFOxL&k18yfe0W1gi+OQq@NcNTjOIJ#W(zxP%ZX(vPv)VD6Qx#~tL@&3~@u
zC6U=N6=>&}onuQRu7q}sb<9kg7Gq}SgY{d5I}TZcDjw~RntfYGHMWzUMnsyKH*5Z)!zz01RExPa!N#?0+SqYR_vi29M43Ed
zy+YLW*9PTnQrq{b+a>NG_%a-~Bzu?vdP;s{8OPBC7h^fUD-f|KiR5X%khp5t5)Qr#
zY>QLI=X_4!xOn)7dD=N^g@(pr5QGF7(|5KOl1waCX#V^3h`xtSw<4*jhEzV9jIKw$
zfx-4>S2B|IDty}UD|T&7lH`XkE=gSe3=zEIT6%%@8dZ`P``h0qWW|QSY(qdZFU@2a
z9fwc|XUOM0^H(PYA6)C~JfUOqHWu5lSynF7J(1q=n9oNHAEVpTWW41kS?J*EGN2!q
zoY5y9_$VFA4pNgP^zg7k!<5VWfYWJeh^#is>kvo3^{Qs=nYbwz{G;5TWJJl!T}&xC
zmrcLSe2G=Cqc;s!V=DI&7Zay7X=EIZVS)}7Nz$ge^J%d`U+bgw7uNg03Sjd=p!`Ud
zUY0?14~;4Wci*S1x*b8eIzs5}4(y4E^b8h?|V-r;5FJ%!n5%MK#%pf`VH7+Ki9N*z?8v-c8hGQ(Z*ki6G&a~mEipuP536y
z4K9Qoe=w~GZ&V94rN8y8z|}c@5lnMkV}D%!rRa3M0cJU&ww
zaCqW(F6cS=fwxi|6)8!4_0h7>?*Ea(euAkg{dw$D0op>vv{ao2+4AwHbNLNSCAowW
zwxe>fo?yENRuqcWpr8KWk?bCb%XOh0hibuU{qNwqEA=&i&4UEO_v}^G-O0Hb)tkCu
zF7qNY7o6kcP$pa<5yM6D6{ut5L54Oo(fTS`zfq7kU*M$t@$pSoc>G=8ZTlg$r}!Og1~HI`_4@iiIa!7?#k@$59ml%jJ#~|hQUO>ey3I?ncgas-`aJe;Gj_4JBo9zDqkDKM
zdy^4qU}&yw`!%=h?PT9!H+Xkw0q{8?T?PIcOJ*Ro*nw-tF==Kx3d1#vuEq+s18%JTgKOUl@%D4$#+MKL(C+-==hA(A+V;`U
zV7jtzGenjkZHl;=0)MV?+zeI`Za2@F@_=5ZV}PsLcsw}+O#?n-pCu4Ds*pi5
z)jM6-a<3-bEzeurAlHth*t^d`rgi?%<-W;=K}=`$h?HaVIEWnkMaP98qj}sCaloWA
z(^GVOW|dVnkfBG*fbq=Orz*{!{>if|S?&x9ndiT=Ixzdp>
zmHQ!=VoFX)$ILukT;=8=f9aQw9WRQ2U-emcpN^bGu^8=)Wy}eF=pC^>glL
zPo`Jz+b`z$%sUBVn%Cv&UNes(*V3n#mNZZP0>xL_cLjgxYybRG#s5~`{w{oF`e$?g
zyO8>ig!ljA3p`nr*PMxZ?DHaz6ztj$-%6*UDlD%N20zT$2ae`uWzYQ(Jj36VaQ_+j
zcE}4XK6zO9?#BrM4~Mf8;B4EN=Ly8GTD?3LG88pn)%w-oNBN}*fc?3PjD^4zboXAT
z;s(FzXw?w^?-rauG~%ewe@~T@7BF~Jrc5)0ml5ywn7U?B6iH8^{axh`*<0~n%3q`x
zlIj`u(hJdLh8kj%Jm#-;6@)EGDvdiANGhw0*j$Hp;Ev5+YiZZQ*V&vW5HIC>^25}r
z!QrYrBQ};Q`x=dCuK>7%0rN$h<%(Ras0trL!>=c>{3Vx2C^Es3!AF=dzHqECKc5AZ
zEJdV+6KAG2uE&|8vW!2cZ&&5Zb}*lX*ccaeKT()r*93yUGCq6JU1pZvUV48f+wmX#
zh>3j<>Do^4PC$xwIx4!83O#RRBA!exbH!V@q+lkRy|uLneh^<78nb}+HrvHz)fnLv
z@GBt_9`kM@A(ks_x?46@#Jq#R=KT?u*^!|p+DvnSmc&Z-i$4j&Y>hO!gFd%ut+RY7
zc;|H_b}|k;jXDEcY1g7$m7yBW1&2h9gBEidB*5jMQoeUUfCJj
z%pr{V`O4ws>pW7-yjL?~6|KtPNZmYj2d_g3UTp@zFQ^qZyGNqAhQ(29P7czM<-XS6
zKZkgJ;A3)I_rcQcqQ}J~g>i*l60aDfNf{i0=jh4dhsTiPXvJ-rCi!*}Tqw6!^R{ek
z{2!csi++J6^;y#yT}9P-{qRSj#+{Zs@2!64R;Me+7AH&P?>Tz|D~ATdg*kiXgPll{
zTJ(x4g1b834cJD|(&oxDh|_R|V{)L~a`map7YR
zUKxk(_(J3ce|yw3TB}bI_hc~r!vj$|@@U0>8CNijI=l;$8Dqha_Bz_|Q2IXgEKlnl
zHcoM9)m8ZDNKxN{El&0cw?-{Z`)bf-5lFmzIgbN>(6_`cNi(vi6Jcq7Rc2Cy@U59T
z(MdCpcBnHhq8xZJz;$hsN9IY=3I#Wf8|ZrebagG8U9!#|#<+!JZ}TJv_?5w2yowF1
ze((+{o;4e^pM}@z3n78Ld?jz=MuA7M86thXE-|22lgP1iVc`?z33Yi
zGGgIc0j+hizXdorGzfYD0G8%Je>agyA)6!(nl0l3yOb1i$cU2HcFtbTk}jK|MEo_m
z*NW}OnA3{y)9j)W-oi`q_4L*qyZ?i-IzLSouWN{;6+(dd{xB9$(inSy@0)?g1%S`P
zRJi4+=ZvF}QIUO`CSh1HhcGV%1}%HpNgC+B#n2k$Au_AGCvty=xFZG9n;V`{KkC%E
zy6#EO_?#Rn-ryTP+M>y<5mWoXCd&X&M^MdT>)4=OSCDs&^u^qrW92p)ue~=_b;As4
zw#K++z_o1vP%ME;7g4@FSaLk}s`@(nu?%|JXL!qkY-X$dE*hsq#Aj8}wWPtMs7m)I
ze81l2)_9(`@rT>njubIAzr`2gnI;sDCJniirC3#W6`Bpnm9BlC0T|n6_
zDIzDuzzW2{Y94$@?{bi?xtO>hWUJm{t(mrJ2V&E+IjjfVGp^p;^J*Nq1{dd8`))Zx
zYmFs}Fr(fo)}GUr0xwrj?-;p9B6{|*3lma%<0xFU
zdH@)SgYG~#-2;qIjC_>Qj<~&9D6)jLaf#Uv5`%~CHscM8T$*76oh*jecys3|t`%jW#(H(vuxC5lXuV=3TvicqxEFlZCS^1mbnkfYzqd@3KmC9072%eO
z1f|5g68q@?)TBjNO){w^l|Yvuh_cpv%#>z_Kvf7So1
zFUWtO@V!3%@5vh^fD1>Hfr}zLLn*$R#Z!{b$%QtVqDbZF>FpcSs=6WdSp2
zzOal(PT~AhSBm8AODAa(5|VeQ{}VW71T;^+75?7)^7MZJSEgdV@YxjhB@OH^xgQ0k
zBVOYB)7LMbXO{fWA=E~_{HFutztPLL|4*U#XBMTC^itM;je_NG>F@7P{yzl&|EtLV
z|99tnZ;nN-+R~JNke0^p5IvFlb-s=&@efIK2nQoc@l9ghgjs3GBFkU`%^&Hxl_QmZ
z3A;;N|21=DRhC$tkuYt&Y&Bu044o`tzuLBhNS(ED@3XCdwV@w1q+2+Mx3oj$Pvl1a
z=_2MWatVC(y_^lOJ%n4(hDn3l2`96u`dTz_jx>_Zlhd?;C=Dh#pO?U-*WPf}Ax=4H
z(`u(QlseYja9cZ>$zbzJkkxYO9|}K2`>Qb_57^z@J^L8_mi6o7*{8Op!Z8Y;IJGMr
zK!zZ7$tou;sHd$dmtd~5E>)jFC1}aTBax|23skOnuM8T{`2hTfL2Va)#`+pu^Lv@X
zXEj&}gZBQdVzo}XQM77>|B?+i8Bt>3qW^Tcd_(yxPSj$a187znl!eLb5ZhB4y>fri
z{?YfoL8juvN9&6}XBK-#ut?j-U89&r%8bbG7t6>2jHZ64c(!3OHjDwXQE3FS;aiq6JM
zB%zOc-vT=6_PA2A8#;6CT3Yw};Dbe~BIoW*FBpFF&A-$CSkoV({UeXQ
ztV;R2ILFK(4D)If|FJbmBF*vW5WF;f#pkd?oxFI~Hu}#1hb!mW}JMu-j^J07@{jHEDK+}?XguF3I|8InR
z<$sIZjijAYQr_16VY?p3I*w##vk3@_zuUC&3xeHDF^8}=r5~?2&*qy{38bHNLqCdG
zD}4`HgqhG@<#WjDr0+@`sdA9?RgsE0v8eIr+4zhHL6Yg%ZmfvcgwPt#`3!gdMel!;
zXw#71N}P|>@sLYaoGt%y8DMN+H;yV)2Cb*BCOrz6vLu`mn!G8OkmIx$BAKTv0t(pY
zX)w`co$~n*2`!aqE;rCisARkS3|s&33X+}lSwRNJ1vG7QZ0r@Mrc+6XMBo){b!!6kG1Ko7ttkKb>E=WNGL{e*~S85izRzBwS4vP({6N+u~xTzL5zw*I)epz!$R
zHHc$a?R1wNhaifycQXcQE^@&GDa-Jv!i)171HG9{F}jpHlKY<-y{8j<
zJw;sDj2xv+H#yAhch*~tZARLTiz}yzC#sc6ydzx+Ly9u~IeOP}EryeRq_A)vWKdXR_b(ZN$A@uH<8mQQ^X%L#}eF
zHf;Tql$rZTlumQu@UW`~w*q)~lF1ctQXAQDuoRpy`mTB@eKul9r8+yKh2h8wnWeyu
z`|sIwJp4_9vHn*c?i(3xvN#FJ0ms+1Kkw|iFqV@;KkFV3CFI1reLjy&ph`SYmbuPw
zTQU7UmD!b|+%DFBFbQ6NYU{^&H!ghJY54ni^_IL!t_6_-a9kUt=B{j
z*%Gik|EA}yR^3M@{BEyxoyVk#-;Zg!+YhP%F_GvJ-Wb4tEWc{I0_`tExSh>bYk6L6
zG#}Y>6Jywix+psz47er$QhV*EBT4B1N!}CNbCEuT(7E3PSd!Tfe?aA)mlc<32or6N
z`})dL}|u^Mk71RZJ%fis-Zao84z3
zfxy*z+eJN-VF84gf8V~4v&jZp6{y
zU75&YnZdN#N0#`QJnHtdMepTiP3eS{^Z1e}NE-`BkWiGj^4@T5IjJD^1L=H0@=k&Z
zN3y+FDUx7(EjY4epnNAUtUdBcukBd|8{z9?dkU+k3JHach;0t*gIEXVOIfeeaGjz&
zCpgYblNZx{gwm#0>u6}QkJV6D(59SAR`Nls9Db2{a%{2fO2j6Tu7SX=(?(!c#jkVG
ze;d$T#gNRvY3;yJz;|)@awZ4yJqZ##yoEPFp1@0Q`)+8`tlR}hLd;;B-L`*9E%Uv;
z({28e60>5V$h*dGL?^=l#=WQ^QX;WCnXrRx-X+wnBcqU}!|qOJD8KlarO4eaX
zRt2gdh$OO_kMofMj~VScIS*xqqk7qWA1cBM!-mPpuT1(!F!40wMT&v@J?H}|Tjf=6
z>M>O~va4Y0LSvi|NN))5^CYCX)%OHb9?l8sJuKDms!Z~6FrPU6(tTh=
z-pFv$RL`o}U~^zRKo#NsTe~N>HS2NI%idBG=^CS(z(X9&EBbFPLMx7HQK}>^H+lS<
z!n#$fLBLqX88#kdhLhky*RZvsmig6Q)&??_+-iDup)}~8v&rhpi`k+KZCU
z@SS3@gB-YQ!tAoGQartKdJ7*OPPdidu9B6kTBQP2n=UURd&5mUmTm1*IUQ6;m@qmB
z_m?516J)a<*gDdw+ExaUH8lgxz-4@|pdi9)z9#2;8%QqW>eu|n_bJRWHHN+H}I#xq!8(3^FvoMYnIpRLm%^jMbJ@8CdyMj}zRckcPlbh2;
z{Id?E+v2KSEjI-?ZqX8|qy^T_?&eZev-TTg-%g$i%uW+5fC>NRKz|%QeSg~ezL@N)
zkPG0Z;cPx^EmN|7Vyo=T*}$YJEN|oWP)FGlKCgPV7D-<9DSdX+rXg!N+f0|CN^T*J
z6`hvq`RPI}-K}B$X2ym%xKXR3NT;fn-#^QGI{8Q|v)(YJ
z5}em4Qx?
zB1%g54)G`0|uA!f{oF=HJn4Ot??*oW-QSi&GwzR#(1Ua#-p@cHHWZJyWr
ze%{M{-Pd)^{oZ;$jj1K22T}SG-^(y-%6iZ>07OfYR6Xtm_R%?1-HRH{vz^)u-uad(
z)m*)ap$07pR!K0<0V0kvE0rOxJVHPEg$jy;s9*5>2kdqpR6KmD8DYAX_HD~Qob&1H
zY?d8ua2Xu7@M0#kX;hvN{JJRUh#G>te*x`%Md>W5tyh!jZhP4|-%&heR!Uil5b~a`
zLJN^S_}FR3w2v3FGuu=omFONlH~GMFuLaw>Z-Q8#o4ISjqAYZQ`gsp6=g!g9&`=J@
zzR8(G8byH0{onTMxhNc^lPcBUqKK27jI1vnj8rIX;6h+j$(h(jMBH7{I=t
zYd^Jl7Y?S{2t0!5wqE{6|La-3HUV2_cEhfriM<6
zTh*Q19{lq%9z-}2rPtCPIndYw3*0+-ulgz&Ul$uulZFVN~
z++jTX>-HWcpe=5o(>=bfDLOaqZ*??Z1H`)>2
zU5@*`^Pqo;GsBT$R~L+27Vp?dn0|B#XT|=I!;7psk}^bfjg_30d-z$w
zYeu2UlM-yc43cy9gHCNepTu`a$qHHJ2ItcLs_PPB9V!L&7JFWf?(p*SVQ8TgZVPMw
z02beKYFG+n%;Bk*DQMvyao^0hC&bK?cGSGghDLnB0SmEP4)o}`m=x5r36FKS{t%_J
zl4G--p+0gDmS(zgNZpEHD5dtKySUCI`X?v
zZ~JXm-agRL>hA&mCkT*>Iw$iWXzNh)nTli0DHrvJ+m|0szU561S#Ip_zJEwLJo_pa
z`ZQrIr3&jq7WJd#zgrn`>9or*+?VN8Vg``O#9}WsWwRGYU%J_VWaJ)ydG1-`L@{kg
zZy3FU*OI)i7QVzF=u6GF^!qc`dJ!+yclY_R)_FTeu1|y|jR@*|I#4-n@$9fDy=1p0
zpq)Ltvbfv8s0^v;0A7BJd^kdz>A#A2XNRTe$<6zx4bUYFHVcvAb#auF*xv9fYday!
z4W21T_tKD~AWbq(C~K1)f(5zF^`Gt-7#?D`WPQ0i_G&AV*>LF}#q5+CPyyalEmhgx
z&!RcX+4z>4JTWh#;Sq!SfZ^tC{@Ih9Z3T|vI-k(5Ov$OjwlnMuwHHlRbKP}Qh-CX(
zprb?P)&hLex>Q@7*tWx4%-a3Cyh-T4z!bYa@>1j6a7vXAl-X%8GBnw>)v(Er;Hd3=
zsQ)IaG;y_&y6s7kmd~DN>Eb~t$>!iAG~5-RocCq4uhaZS5C8lK9Y>MJb|5Mv(n{yo
zXa%7+AUr6&@-HfM^o_RgjO@ZOY5C%$(PN16m?6W^CH`dlYx(GbCU40fv)Ku;+<(W#
z1mio`!T$7Y8yD8sANE_slezl>N$1|tlwjZzcNK0Ls&|^JagIRTb@$$>OE2d>f)_oA
zFiVAjT~mVHhnLF>7hdh0LeJnmMi|5#dC~8yX4}RFD{$xl!Ga|vI;Whw6}H^zNt(J+k`5Ba^3`wDD=)aT
zmDg3d;Ch<+B8(P&DFF&o45PU@Cmt(Eu6x79$dftf>%e;wd;vdAe%-N*t#wO|a(8e2_Z*Z4&Ouefqx%F`0l1D7CfiDVgVYuvC`rlhk9287L|kJBAUt@kFq1bCvZYVO+ArnqES
zLRE1MZwi%qR%wAW=@sohHF9|JbJ7S&dZbjkn^=KZVHKVb&Zf?JHv^*#v~K@}XVER$
z{CoyZvD;mQTEzqZ;Pz&RK)SOR7lN4x=&0DK54%4W#P0p2#XBQp)xu24=0a~-O4*+W
zuB%xMJC3$57ZW>F>%9WWFA%CrK9y_#@#8p@b>AWlJWuYwAjl(PQeiW=F|Y2d;31-{
zDki7w#?YHV`LM0}nEWdNChh}pe8KDkIG7O<3_G-`ymVFMJhd1ZN$pR(UrZN!E=_(J
zSzv(8)E~aLcCwFDUNd~lmaU)a1}o#}ryAJwcc(oP!hS;u$QBZzExyl*j0PI!!*T_i9?0trFmm4H
zfk*sfxv_!j9Vp5l4@|^Wh>K@
z4J-RTBtj|K8}O_?L9_9m6&()seZoEJHa8h=h1!^5Oh-BY2?OmOV9)ZRw&x&}LRz0^|?fSyU&y||I2xGK|K!C(!P%1w?^V0w*r)0pRU*n|R;EIM_
z*LaHHsdabOkQ58D3r)pj^&MPe4|XkMk5|WY6FD+g^?>Xv3duw>!?dV!Rkn!}D;|$V
z7E}E6FOL>u9d%CH&oPI*S*I3!;IUPF_PJaC7Ja4wrL^4Ht3-?+h~7J;T4c?7FpnTm
z+ZQW|z9!g?(Dy~qR0G{oUk4d61Ibl*5(zgGf0e9p0q*!TtWlHZEA>k?84qF@oJI}U
z#2V}N+@2T|)ooe!*qp@iSfJApmh2*u^w|whAB{`Z0e4=%D+`RcdY!R@6DBYun;D?f
z^=ar3)>KA}9|7ZA+*of8`TRpkcdF5J=YUTP9y);4|G&>=q
zYJ$Cq$P0^9fcQtu+50_eY?A%&h`=+{ig}e{KAg-f0jYOJ!q_t;Y1`pwzQm&~m4zj<
z9VBM^E^-dP6Vf%+EgTOmzia8M;AZ<1n}#R>&(!e$_`W7z
zosB=VzlO>CLZD9m`YCyGNRcx*v_gB#^WAZhAOkZlf0lgZPOwEF^nHePgnz{3NIb%W
zx%9x_EWrpW(Zf07WW3O0C-2X@#%Lv>p*O0e`t>21UN}n>8yVQqB$`<_zV)`+x!~DY
z@G1J6*Mcc8aH!;8_+qiyvV5LR{$1Yd@?do#tL{ErAh(EnOY$j}7`~lJi4S{rL1GA;VJlW)#dHqfbW~M~jA9b2jaC4%HIFK70{n1(cG{C`Nps6D-L@27s4_XP{weMSkz2
z?X9Ho=MlKZMN5)BT?(d;iUCC-&*zVaOodiT52#T3aXn)5A>~i!SvjTB`MqIJ!mV{0
z)PqkVDqZNF{%Rcb`Fb>5MCQm+jSUU3X$Y3X=u24%AirQ
zW$2kU%P-X-5Vr1uW;zHza*dndTlzVcB~K
zp~&-nRcw>F0XY>2v)z)hL_QrEX%Gv6f`Qbtc>FG$a!38r>|y5J%-!%
zlb@D2L&=SnBe7!%bP{8sii|RDhqf8o^nd-P_RaM5??1M?q5?o=R7|)i$`as&R+{mo
zUUAXrb%h0@XG$M6=|vj{!g-6NS-Gl%8Md9JGPVvG*h>wEQfj{`69D%k3o)rfaZd{t?pS;|}eA^7>d7h}P(R#N_ii@A*=viDgxn;r_N=0?q)Q
zb?Q{IpO^(TU;DF(IX-o$Vvc5Su~+@AjZq4C;8oEZ
zu61gAVSrwO{^?8?kJ_acc(}cyh)GR{W-1x}ppSM&-IYUct&&H!!Q%^Y)-5ni4pR35bu
ziKuYqvtnhKSM3CzhQhM6h#n$>j&#jmwvewusE4CMFPIZ8k7#ypDoe?kgOlBaGJS8+
zB*iwA`7RA(qLR)M1}fyP^z1UIS<=WA3Q;Qy)8DeBm4$5&2I*3=P>4#ZEAxe9&e+V3O3HSn0}$#ox2h8hbQ7zFGngN`c3g@p>*vOn
zgvSSei(YUj*zNMETXBt+L>J9~5$a8IW_xvOkGQ}!MSI;McuHf(U(Ie>ZR<|=dAnnM
zH)LP&T(i-}WoT<;o8fwgBs?|-cWD`9XWc5S#!;yxizA~sOiOv
zRj9tP1hYnah-6dk6{_1&HH;qid4XZVK%kwdtz7QM`uf-TO%9)*rN~7IZU{X2i{@eL
zw*G|@8-dbE7qxBp$Q9<<(i^ZLPPv)R&el9(dVc(C|62chL
zIqbRZ<#O#r3aZi>xM3>~cHA_AusQba
z?NoFpy2vR}mk#HuZQ~)n%4Ve#;d&Vnm=!ZfQPv|Nh-qjt9*Ri7v}B7mR|9Pv$ARD6
zbct_^c6~C>q7m}xXRv%GSC_+;!@yllN|{PBSV1{
z>pr&`sToFF8V$1>_)pjx>!Y
z%kW~TMmMAT@2+n^#oUrq-Re;rU4h)zQmfQO7kDg?*wGXi2J&8pzGmD?F%`#B5pF=3W$_rWoL#1AO+u>Mst{xVU
zTQ=YvzW#@>XKB^r$@1O^FoTUBB*rr@mwHs-}Xb%1ZHy-1P3SkQC{vbYk*x1IKmQ{Wt+Q>H@xCY8
zB<=I7)1nGkd=SBqf4>E(m?eQ@-s=BpV;Yyjq
zlq+B{VXB|uz8!aDkN~%eY5E+5>otr_RbJQ^y`EXMebG<~R}}sUM@gdwf=Mumfm#i|4vAE
YBurM7@43IY`ki=&SlC^lnqRy3e_E9fk^lez

diff --git a/docs/img/siteleaf-logo.png b/docs/img/siteleaf-logo.png
index 3a305376bfb7433ada16bbffb397f8392f68cf4a..02ad3995fe7196ac123071401a5bfecfd3deb0fb 100644
GIT binary patch
literal 6735
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

literal 10885
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
b2L=8gYl}_n9dpr`00000NkvXXu0mjfLSn^Y

diff --git a/docs/img/tidelift-logo.png b/docs/img/tidelift-logo.png
index bb1993832e3e18741e4e7b3ff5435cafd2278af2..0b225dfe36bc710023524af8f9974c9992e07403 100644
GIT binary patch
literal 4009
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
GHu*nLKVhu^

literal 9318
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


From cd200d380f08e4aa99da6a4e4323041eccd34013 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 20 Nov 2018 10:35:34 -0500
Subject: [PATCH 3355/4996] Update history to reflect merge of #7388 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1cc53d0a3ff..ce1788d9059 100644
--- a/History.markdown
+++ b/History.markdown
@@ -79,6 +79,7 @@
   * Remove installation instructions with Homebrew (#7381)
   * Fix dead link and misleading prose (#7383)
   * Fix content management section (#7385)
+  * Site: Better Performance (#7388)
 
 ### Minor Enhancements
 

From 62448192df6ad2fdbdd6e9ff3aedfecd83e4bbcc Mon Sep 17 00:00:00 2001
From: jpasholk <28698431+jpasholk@users.noreply.github.com>
Date: Fri, 23 Nov 2018 11:57:15 -0800
Subject: [PATCH 3356/4996] Proposed re-wording of Sass note. :) (#7392)

Merge pull request 7392
---
 docs/_docs/assets.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/assets.md b/docs/_docs/assets.md
index ca407f4dcaa..618b54aab0c 100644
--- a/docs/_docs/assets.md
+++ b/docs/_docs/assets.md
@@ -61,8 +61,8 @@ The Sass converter will default the `sass_dir` configuration option to
 
     Note that the sass_dir becomes the load path for Sass imports,
     nothing more. This means that Jekyll does not know about these files
-    directly, so any files here should not contain the front matter as
-    described above nor will they be transformed as described above. This
+    directly. Any files here should not contain the empty front matter as
+    described above. If they do, they'll not be transformed as described above. This
     folder should only contain imports.
 
   
    
-    
    
-      
    
-        Get professional Jekyll support and more with
-        
-          Tidelift
-        
-      
    
-    
    
     
    
       
    
         
@@ -27,7 +19,7 @@
         
         {% for sponsor in site.data.sponsors %}
           
-            {{ sponsor.name }}
+            {{ sponsor.name }}
           
         {% endfor %}
       
    
diff --git a/docs/img/vpsserver-logo.png b/docs/img/vpsserver-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..0be084acba12d9988106d285a35b24d5a977a552
GIT binary patch
literal 32384
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�{@~)q>Bub2=jZ|NDDMXCSWwxO0AWU_b@j
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
F{2wOBD!Kpw

literal 0
HcmV?d00001


From 6285f59ce37590d25d2598d787fd6f66ce4b95da Mon Sep 17 00:00:00 2001
From: olivia hugger 
Date: Wed, 28 Nov 2018 20:37:49 +0100
Subject: [PATCH 3365/4996] adjust team page listings (#7395)

Merge pull request 7395
---
 docs/pages/team.md | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/pages/team.md b/docs/pages/team.md
index 4ca91b14dc3..1e8ab0ba237 100644
--- a/docs/pages/team.md
+++ b/docs/pages/team.md
@@ -9,10 +9,10 @@ permalink: /team/
 *The Jekyll Core Team's responsibility is to ensure the development and
 community around the Jekyll ecosystem thrive.*
 
-1. Olivia (@oe, Project Lead)
-2. Frank (@DirtyF, Documentation)
-3. Pat (@pathawks)
-4. Matt (@mattr-)
+- Frank (@DirtyF, Documentation)
+- Matt (@mattr-)
+- Olivia (@oe)
+- Pat (@pathawks)
 
 ## Plugin Core
 
@@ -20,10 +20,10 @@ community around the Jekyll ecosystem thrive.*
 community around the core plugins thrive. They also provide guidance in
 conversations about extensibility of Core Jekyll.*
 
-1. Ashwin (@ashmaroli)
-2. Florian (@Crunch09)
-3. Mert (@mertkahyaoglu, jekyll-admin)
-4. Alfred Xing (@alfredxing)
+- Alfred Xing (@alfredxing)
+- Ashwin (@ashmaroli)
+- Florian (@Crunch09)
+- Mert (@mertkahyaoglu, jekyll-admin)
 
 ## Affinity Team Captains
 
@@ -31,18 +31,18 @@ conversations about extensibility of Core Jekyll.*
 Teams](https://teams.jekyllrb.com/). Each team is tasked with maintaining
 and addressing issues for a specific aspect of Jekyll.*
 
-1. [Build](https://github.com/orgs/jekyll/teams/build): @mattr-
-2. [Documentation](https://github.com/orgs/jekyll/teams/documentation): @DirtyF, @mattr-
-3. [Ecosystem](https://github.com/orgs/jekyll/teams/ecosystem): @pathawks
-4. [Performance](https://github.com/orgs/jekyll/teams/performance): @mattr-, @parkr
-5. [Stability](https://github.com/orgs/jekyll/teams/stability): @oe, @parkr
-6. [Windows](https://github.com/orgs/jekyll/teams/windows): @XhmikosR
+- [Build](https://github.com/orgs/jekyll/teams/build): @mattr-
+- [Documentation](https://github.com/orgs/jekyll/teams/documentation): @DirtyF, @mattr-
+- [Ecosystem](https://github.com/orgs/jekyll/teams/ecosystem): @pathawks
+- [Performance](https://github.com/orgs/jekyll/teams/performance): @mattr-, @parkr
+- [Stability](https://github.com/orgs/jekyll/teams/stability): @oe, @parkr
+- [Windows](https://github.com/orgs/jekyll/teams/windows): @XhmikosR
 
 ## Emeritus Core Team Members
 
 *Emeritus Core Team Members were once members of Jekyll's Core Team.*
 
-1. Parker (@parkr)
-2. Tom (@mojombo)
-3. Nick (@qrush)
-4. Alfred (@alfredxing)
+- Alfred (@alfredxing)
+- Nick (@qrush)
+- Parker (@parkr)
+- Tom (@mojombo)

From 24fa1045677399e8759e95fa4644fece63ecac26 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 28 Nov 2018 14:37:51 -0500
Subject: [PATCH 3366/4996] Update history to reflect merge of #7395 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 44a92a9536c..b7bfc80ec4b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -83,6 +83,7 @@
   * Proposed re-wording of Sass note. :) (#7392)
   * Apply ruby official guide documents (#7393)
   * docs: Fix group_by_exp filter example (#7394)
+  * adjust team page listings (#7395)
 
 ### Minor Enhancements
 

From 970c1dde5c0a5c9a661827f421ad6378fa9995e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mertcan=20Y=C3=BCcel?= 
Date: Fri, 30 Nov 2018 10:46:13 +0100
Subject: [PATCH 3367/4996] Update resources.md (#7396)

Merge pull request 7396
---
 docs/pages/resources.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pages/resources.md b/docs/pages/resources.md
index ecbfc1d86b4..70049ab48b9 100644
--- a/docs/pages/resources.md
+++ b/docs/pages/resources.md
@@ -53,7 +53,7 @@ Use a SaaS service as a backend for functionality on your Jekyll site
   - [Snipcart](https://snipcart.com/blog/static-site-e-commerce-part-2-integrating-snipcart-with-jekyll): Add a shopping cart to a Jekyll site
 
 ### Forms
-
+  - [Getform](https://getform.io)
   - [99Inbound](https://www.99inbound.com)
   - [Formester](http://www.formester.com)
   - [Formingo](https://www.formingo.co/guides/jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=Jekyll%20Documentation)

From 2f36fd7fffb6b89d85d0e354306c82c83577bed1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 30 Nov 2018 04:46:15 -0500
Subject: [PATCH 3368/4996] Update history to reflect merge of #7396 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b7bfc80ec4b..5e366c2c57c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -84,6 +84,7 @@
   * Apply ruby official guide documents (#7393)
   * docs: Fix group_by_exp filter example (#7394)
   * adjust team page listings (#7395)
+  * Update resources.md (#7396)
 
 ### Minor Enhancements
 

From c704d36b391ba4973146767d4e9b92ff73ff8078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mertcan=20Y=C3=BCcel?= 
Date: Fri, 30 Nov 2018 13:41:16 +0100
Subject: [PATCH 3369/4996] Update resources.md (#7397)

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

diff --git a/docs/_docs/resources.md b/docs/_docs/resources.md
index 982a8bae46d..019911ed5b1 100644
--- a/docs/_docs/resources.md
+++ b/docs/_docs/resources.md
@@ -26,7 +26,7 @@ Jekyll's growing use is producing a wide variety of tutorials, frameworks, exten
 ## Integrations
 
 - Use a SaaS service as a backend for forms (contact forms, hiring forms, etc.)
-
+  - [Getform](https://getform.io?utm_source=github)
   - [Formspree (open source)](https://formspree.io/)
   - [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/)

From cfa022db1dfea4f843ca85bcac51b734786a5062 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 30 Nov 2018 07:41:18 -0500
Subject: [PATCH 3370/4996] Update history to reflect merge of #7397 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5e366c2c57c..20f63d39d71 100644
--- a/History.markdown
+++ b/History.markdown
@@ -85,6 +85,7 @@
   * docs: Fix group_by_exp filter example (#7394)
   * adjust team page listings (#7395)
   * Update resources.md (#7396)
+  * Update resources.md (#7397)
 
 ### Minor Enhancements
 

From 9ae8c09c1b8f923da5b8b11fd4c4a1199ec7383d Mon Sep 17 00:00:00 2001
From: olivia hugger 
Date: Sat, 1 Dec 2018 18:17:19 +0100
Subject: [PATCH 3371/4996] add @ashmaroli to core team listing (#7398)

Merge pull request 7398
---
 docs/pages/team.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/pages/team.md b/docs/pages/team.md
index 1e8ab0ba237..58ab781f17d 100644
--- a/docs/pages/team.md
+++ b/docs/pages/team.md
@@ -9,6 +9,7 @@ permalink: /team/
 *The Jekyll Core Team's responsibility is to ensure the development and
 community around the Jekyll ecosystem thrive.*
 
+- Ashwin (@ashmaroli)
 - Frank (@DirtyF, Documentation)
 - Matt (@mattr-)
 - Olivia (@oe)

From 5b3eb43e08e038e80b5de29297ced9ae06423c98 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 1 Dec 2018 12:17:20 -0500
Subject: [PATCH 3372/4996] Update history to reflect merge of #7398 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 20f63d39d71..985987117c7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -181,6 +181,7 @@
   * Add Release Post for v3.6.3, v3.7.4 and v3.8.4 (#7259)
   * Fix link to Tidelift in site's footer (#7377)
   * :sparkles: Add a link to OpenCollective backing (#7378)
+  * Add @ashmaroli to Core Team listing (#7398)
 
 ## 3.8.5 / 2018-11-04
 

From eda9e2e4efffdf3534e25210fa9df0ae3d6fef8c Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 5 Dec 2018 21:51:48 +0530
Subject: [PATCH 3373/4996] Bump RuboCop to v0.61.x (#7401)

Merge pull request 7401
---
 Gemfile                            |  2 +-
 test/test_configuration.rb         |  4 ++--
 test/test_document.rb              |  8 ++++----
 test/test_front_matter_defaults.rb | 18 +++++++++---------
 test/test_static_file.rb           |  6 +++---
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Gemfile b/Gemfile
index a8a1d80811b..c9d12380616 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.60.0"
+  gem "rubocop", "~> 0.61.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/test/test_configuration.rb b/test/test_configuration.rb
index 0b245c162ea..c49a48e53cd 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -29,7 +29,7 @@ class TestConfiguration < JekyllUnitTest
       expected = { "posts" => {
         "output"    => true,
         "permalink" => "/:categories/:year/:month/:day/:title:output_ext",
-      }, }
+      } }
       assert_equal expected, result["collections"]
     end
 
@@ -76,7 +76,7 @@ class TestConfiguration < JekyllUnitTest
       expected = { "posts" => {
         "output"    => true,
         "permalink" => "/:categories/:year/:month/:day/:title/",
-      }, }
+      } }
       assert_equal expected, result["collections"]
 
       result = Configuration[{ "permalink" => nil, "collections" => {} }]
diff --git a/test/test_document.rb b/test/test_document.rb
index 7f449c754e1..a4a7e1ed98b 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -143,7 +143,7 @@ def setup_document_with_dates(filename)
               "key" => "myval",
             },
           },
-        },]
+        }]
       )
       @site.process
       @document = @site.collections["slides"].docs.select { |d| d.is_a?(Document) }.first
@@ -174,7 +174,7 @@ def setup_document_with_dates(filename)
               "test2" => "default1",
             },
           },
-        },]
+        }]
       )
       @site.process
       @document = @site.collections["slides"].docs[1]
@@ -201,7 +201,7 @@ def setup_document_with_dates(filename)
               "key" => "value123",
             },
           },
-        },]
+        }]
       )
       @site.process
       @document = @site.collections["slides"].docs.first
@@ -225,7 +225,7 @@ def setup_document_with_dates(filename)
               "key" => "myval",
             },
           },
-        },]
+        }]
       )
       @site.process
       @document = @site.collections["slides"].docs.first
diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb
index ee12f205598..5319124b47a 100644
--- a/test/test_front_matter_defaults.rb
+++ b/test/test_front_matter_defaults.rb
@@ -14,7 +14,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
           "values" => {
             "key" => "val",
           },
-        },]
+        }]
       )
       @output = capture_output { @site.process }
       @affected = @site.pages.find { |page| page.relative_path == "contacts/bar.html" }
@@ -42,7 +42,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
           "values" => {
             "key" => "val",
           },
-        },]
+        }]
       )
       @output = capture_output { @site.process }
       @affected = @site.pages.find { |page| page.relative_path == "contacts/bar.html" }
@@ -69,7 +69,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
           "values" => {
             "key" => "val",
           },
-        },]
+        }]
       )
 
       @site.process
@@ -93,7 +93,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
           "values" => {
             "key" => "val",
           },
-        },]
+        }]
       )
 
       @site.process
@@ -117,7 +117,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
           "values" => {
             "key" => "val",
           },
-        },]
+        }]
       )
 
       @site.process
@@ -142,7 +142,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
           "values" => {
             "key" => "val",
           },
-        },]
+        }]
       )
       @site.process
       @affected = @site.pages
@@ -165,7 +165,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
           "values" => {
             "key" => "val",
           },
-        },]
+        }]
       )
       @site.process
       @affected = @site.pages
@@ -185,7 +185,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
           "values" => {
             "key" => "val",
           },
-        },]
+        }]
       )
       @site.process
       @affected = @site.pages
@@ -207,7 +207,7 @@ class TestFrontMatterDefaults < JekyllUnitTest
                            "values" => {
                              "date" => "2015-01-01 00:00:01",
                            },
-                         },]
+                         }]
                        ))
     end
 
diff --git a/test/test_static_file.rb b/test/test_static_file.rb
index 96663bacd69..0c981fc39a3 100644
--- a/test/test_static_file.rb
+++ b/test/test_static_file.rb
@@ -99,7 +99,7 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
       defaults = [{
         "scope"  => { "path" => "private" },
         "values" => { "published" => false },
-      },]
+      }]
       static_file = setup_static_file_with_defaults(
         "root",
         "private/dir/subdir",
@@ -115,7 +115,7 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
       defaults = [{
         "scope"  => { "path" => "" },
         "values" => { "front-matter" => "default" },
-      },]
+      }]
 
       static_file = setup_static_file_with_defaults "", "", "file.pdf", defaults
       assert_equal "default", static_file.data["front-matter"]
@@ -125,7 +125,7 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
       defaults = [{
         "scope"  => { "path" => "" },
         "values" => { "front-matter" => "default" },
-      },]
+      }]
 
       static_file = setup_static_file_with_defaults "", "", "file.pdf", defaults
       hash = static_file.to_liquid

From d257398333ec0d1b6ff1088184b2bcceb50a9555 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 5 Dec 2018 11:21:50 -0500
Subject: [PATCH 3374/4996] Update history to reflect merge of #7401 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 985987117c7..ed1b177e248 100644
--- a/History.markdown
+++ b/History.markdown
@@ -159,6 +159,7 @@
   * Bump RuboCop to v0.60.x (#7338)
   * Update excludes for CodeClimate Analyses (#7365)
   * Switch to `:install_if` for wdm gem (#7372)
+  * Bump RuboCop to v0.61.x (#7401)
 
 ### Bug Fixes
 

From 0f9467c61bab4f2fd53cc627185ab92cad11a838 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Wed, 5 Dec 2018 20:43:36 +0100
Subject: [PATCH 3375/4996] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 4 ++++
 .github/ISSUE_TEMPLATE/documentation.md   | 4 ++++
 .github/ISSUE_TEMPLATE/feature_request.md | 4 ++++
 .github/ISSUE_TEMPLATE/question.md        | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index d7147b39ceb..8eb0be2aea5 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,10 @@
 ---
 name: Bug Report
 about: Is something not working as expected?
+title: ''
+labels: ''
+assignees: ''
+
 ---
 
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index ec8b6ff5755..87af252457a 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,6 +1,10 @@
 ---
 name: Feature Request
 about: Want us to add any features to Jekyll?
+title: 'feat: '
+labels: feature
+assignees: ''
+
 ---
 
 
 
 ## Summary
@@ -33,11 +33,13 @@
 
 
 
-## Semver Changes
+  You can use keywords to automatically close the related issue.
+  For example, (all of) the following will close issue #4567 when your PR is merged.
 
-

From 06c49c7af6c966b40517c85714ae8724ad95099f Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 15 Feb 2019 19:17:00 +0530
Subject: [PATCH 3463/4996] Configure cache_dir (#7232)

Merge pull request 7232
---
 features/cache.feature | 28 ++++++++++++++++++++++++++++
 lib/jekyll/cache.rb    |  6 +++++-
 lib/jekyll/site.rb     |  1 +
 test/test_site.rb      | 10 +++++++---
 4 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 features/cache.feature

diff --git a/features/cache.feature b/features/cache.feature
new file mode 100644
index 00000000000..99aee2457e8
--- /dev/null
+++ b/features/cache.feature
@@ -0,0 +1,28 @@
+Feature: Cache
+  As a developer who likes to create plugins
+  I want to be able to cache certain aspects across multiple builds
+  And retrieve the cached aspects when needed
+
+  Scenario: Default Cache directory
+    Given I have an "index.md" page that contains "{{ site.title }}"
+    And I have a configuration file with "title" set to "Hello World"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the .jekyll-cache directory should exist
+    And the .jekyll-cache/Jekyll/Cache/Jekyll--Cache directory should exist
+    And the _site directory should exist
+    And I should see "
    Hello World
    " in "_site/index.html"
+
+  Scenario: Custom Cache directory
+    Given I have an "index.md" page that contains "{{ site.title }}"
+    And I have a configuration file with:
+      | key       | value       |
+      | title     | Hello World |
+      | cache_dir | .foo-cache  |
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the .foo-cache directory should exist
+    And the .foo-cache/Jekyll/Cache/Jekyll--Cache directory should exist
+    But the .jekyll-cache directory should not exist
+    And the _site directory should exist
+    And I should see "
    Hello World
    " in "_site/index.html"
diff --git a/lib/jekyll/cache.rb b/lib/jekyll/cache.rb
index 66f1d18efbe..fd4bde17ae4 100644
--- a/lib/jekyll/cache.rb
+++ b/lib/jekyll/cache.rb
@@ -14,11 +14,15 @@ class Cache
     #
     # Returns nothing.
     def initialize(name)
-      @@base_dir ||= File.expand_path(".jekyll-cache/Jekyll/Cache")
       @cache = @@caches[name] ||= {}
       @name = name.gsub(%r![^\w\s-]!, "-")
     end
 
+    # Set class-wide base_dir
+    def self.base_dir=(dir_path)
+      @@base_dir = dir_path
+    end
+
     # Disable Marshaling cached items to disk
     def self.disable_disk_cache!
       @@disk_cache_enabled = false
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 0f1e01f8796..233ff413a68 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -451,6 +451,7 @@ def site_cleaner
 
     # Disable Marshaling cache to disk in Safe Mode
     def configure_cache
+      Jekyll::Cache.base_dir = in_source_dir(config["cache_dir"], "Jekyll/Cache")
       Jekyll::Cache.disable_disk_cache! if safe
     end
 
diff --git a/test/test_site.rb b/test/test_site.rb
index 95955f88763..0463823a309 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -76,13 +76,17 @@ def read_posts
       allow(File).to receive(:directory?).with(theme_dir("_sass")).and_return(true)
       allow(File).to receive(:directory?).with(theme_dir("_layouts")).and_return(true)
       allow(File).to receive(:directory?).with(theme_dir("_includes")).and_return(false)
-      allow(File).to receive(:directory?).with(
-        File.expand_path(".jekyll-cache/Jekyll/Cache/Jekyll--Cache")
-      ).and_return(true)
       site = fixture_site("theme" => "test-theme")
       assert_equal [source_dir("_includes")], site.includes_load_paths
     end
+
+    should "configure cache_dir" do
+      fixture_site.process
+      assert File.directory?(source_dir(".jekyll-cache", "Jekyll", "Cache"))
+      assert File.directory?(source_dir(".jekyll-cache", "Jekyll", "Cache", "Jekyll--Cache"))
+    end
   end
+
   context "creating sites" do
     setup do
       @site = Site.new(site_configuration)

From 55f0980716a2f3a032bdb1c578518d5f21230e4a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Feb 2019 08:47:03 -0500
Subject: [PATCH 3464/4996] Update history to reflect merge of #7232 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3ca863457b5..34172602880 100644
--- a/History.markdown
+++ b/History.markdown
@@ -129,6 +129,7 @@
   * Remind user to include gem in the Gemfile on error (#7476)
   * Search Front matter defaults for Page objects with relative_path (#7261)
   * Support for binary operators in where_exp filter (#6998)
+  * Configure cache_dir (#7232)
 
 ### Major Enhancements
 

From f1777adae986bbb52b97257406f6bd7ae45c6743 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Steinstr=C3=A4ter?= 
Date: Fri, 15 Feb 2019 15:20:12 +0100
Subject: [PATCH 3465/4996] Check if var exists before include tag (#7530)

Merge pull request 7530
---
 docs/_docs/includes.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/includes.md b/docs/_docs/includes.md
index 35dbf3e4a38..d92da1de9d1 100644
--- a/docs/_docs/includes.md
+++ b/docs/_docs/includes.md
@@ -48,7 +48,9 @@ You could then reference that variable in your include:
 
 {% raw %}
 ```liquid
-{% include {{ page.my_variable }} %}
+{% if page.my_variable %}
+  {% include {{ page.my_variable }} %}
+{% endif %}
 ```
 {% endraw %}
 

From 925aa33ddc328ffeca46bf9eea115e44bf1c62ff Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Feb 2019 09:20:15 -0500
Subject: [PATCH 3466/4996] Update history to reflect merge of #7530 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 34172602880..4858fd55b73 100644
--- a/History.markdown
+++ b/History.markdown
@@ -101,6 +101,7 @@
   * Hosting with AWS Amplify (#7510)
   * Fix typo in tutorial for converting existing site (#7524)
   * Add CloudSh to resource page. (#7497)
+  * Docs: check if var exists before include tag (#7530)
 
 ### Minor Enhancements
 

From cc409d33f7af89f70bf683e110a37f51edefdb39 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Fri, 15 Feb 2019 20:53:51 +0100
Subject: [PATCH 3467/4996] docs: add feed for releases [skip-ci]

---
 docs/_config.yml                                         | 9 +++++++++
 docs/_includes/top.html                                  | 1 +
 docs/_posts/2013-05-06-jekyll-1-0-0-released.markdown    | 2 +-
 docs/_posts/2013-05-08-jekyll-1-0-1-released.markdown    | 2 +-
 docs/_posts/2013-05-12-jekyll-1-0-2-released.markdown    | 2 +-
 docs/_posts/2013-06-07-jekyll-1-0-3-released.markdown    | 2 +-
 docs/_posts/2013-07-14-jekyll-1-1-0-released.markdown    | 2 +-
 docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown    | 2 +-
 docs/_posts/2013-07-25-jekyll-1-0-4-released.markdown    | 2 +-
 docs/_posts/2013-07-25-jekyll-1-1-2-released.markdown    | 2 +-
 docs/_posts/2013-09-06-jekyll-1-2-0-released.markdown    | 2 +-
 docs/_posts/2013-09-14-jekyll-1-2-1-released.markdown    | 2 +-
 .../_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown | 2 +-
 docs/_posts/2013-11-04-jekyll-1-3-0-released.markdown    | 2 +-
 docs/_posts/2013-11-26-jekyll-1-3-1-released.markdown    | 2 +-
 docs/_posts/2013-12-07-jekyll-1-4-0-released.markdown    | 2 +-
 docs/_posts/2013-12-09-jekyll-1-4-1-released.markdown    | 2 +-
 docs/_posts/2013-12-16-jekyll-1-4-2-released.markdown    | 2 +-
 docs/_posts/2014-01-13-jekyll-1-4-3-released.markdown    | 2 +-
 docs/_posts/2014-03-24-jekyll-1-5-0-released.markdown    | 2 +-
 docs/_posts/2014-03-27-jekyll-1-5-1-released.markdown    | 2 +-
 docs/_posts/2014-05-06-jekyll-turns-2-0-0.markdown       | 2 +-
 docs/_posts/2014-05-08-jekyll-2-0-3-released.markdown    | 2 +-
 .../2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown     | 2 +-
 docs/_posts/2014-07-01-jekyll-2-1-1-released.markdown    | 2 +-
 docs/_posts/2014-07-29-jekyll-2-2-0-released.markdown    | 2 +-
 docs/_posts/2014-08-10-jekyll-2-3-0-released.markdown    | 2 +-
 docs/_posts/2014-09-09-jekyll-2-4-0-released.markdown    | 2 +-
 ...06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown | 2 +-
 docs/_posts/2014-11-08-jekyll-2-5-1-released.markdown    | 2 +-
 docs/_posts/2014-11-12-jekyll-2-5-2-released.markdown    | 2 +-
 docs/_posts/2014-12-22-jekyll-2-5-3-released.markdown    | 2 +-
 .../2015-01-24-jekyll-3-0-0-beta1-released.markdown      | 2 +-
 docs/_posts/2015-10-26-jekyll-3-0-released.markdown      | 2 +-
 docs/_posts/2015-11-17-jekyll-3-0-1-released.markdown    | 2 +-
 docs/_posts/2016-01-20-jekyll-3-0-2-released.markdown    | 2 +-
 docs/_posts/2016-01-24-jekyll-3-1-0-released.markdown    | 2 +-
 docs/_posts/2016-01-28-jekyll-3-1-1-released.markdown    | 2 +-
 docs/_posts/2016-02-08-jekyll-3-0-3-released.markdown    | 2 +-
 docs/_posts/2016-02-19-jekyll-3-1-2-released.markdown    | 2 +-
 docs/_posts/2016-04-19-jekyll-3-0-4-released.markdown    | 2 +-
 docs/_posts/2016-04-19-jekyll-3-1-3-released.markdown    | 2 +-
 docs/_posts/2016-04-26-jekyll-3-0-5-released.markdown    | 2 +-
 docs/_posts/2016-05-18-jekyll-3-1-4-released.markdown    | 2 +-
 docs/_posts/2016-05-18-jekyll-3-1-5-released.markdown    | 2 +-
 docs/_posts/2016-05-19-jekyll-3-1-6-released.markdown    | 2 +-
 docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown    | 2 +-
 docs/_posts/2016-08-02-jekyll-3-2-1-released.markdown    | 2 +-
 docs/_posts/2016-10-06-jekyll-3-3-is-here.md             | 2 +-
 docs/_posts/2016-11-14-jekyll-3-3-1-released.markdown    | 2 +-
 docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown    | 2 +-
 docs/_posts/2017-03-02-jekyll-3-4-1-released.markdown    | 2 +-
 docs/_posts/2017-03-09-jekyll-3-4-2-released.markdown    | 2 +-
 docs/_posts/2017-03-21-jekyll-3-4-3-released.markdown    | 2 +-
 docs/_posts/2017-06-14-jekyll-3-5-0-released.markdown    | 2 +-
 docs/_posts/2017-07-17-jekyll-3-5-1-released.markdown    | 2 +-
 docs/_posts/2017-08-12-jekyll-3-5-2-released.markdown    | 2 +-
 docs/_posts/2017-09-21-jekyll-3-6-0-released.markdown    | 2 +-
 docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown    | 2 +-
 docs/_posts/2018-01-02-jekyll-3-7-0-released.md          | 2 +-
 docs/_posts/2018-01-25-jekyll-3-7-2-released.md          | 2 +-
 docs/_posts/2018-02-25-jekyll-3-7-3-released.markdown    | 2 +-
 docs/_posts/2018-03-15-jekyll-3-8-0-released.markdown    | 2 +-
 docs/_posts/2018-05-01-jekyll-3-8-1-released.markdown    | 2 +-
 docs/_posts/2018-05-18-jekyll-3-8-2-released.markdown    | 2 +-
 docs/_posts/2018-06-04-jekyll-3-8-3-released.markdown    | 2 +-
 .../2018-09-19-security-fixes-for-3-6-3-7-3-8.markdown   | 2 +-
 docs/_posts/2018-11-04-jekyll-3-8-5-released.markdown    | 4 ++--
 68 files changed, 77 insertions(+), 67 deletions(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index e0e7e366d5d..f89e2eac52d 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -10,6 +10,7 @@ twitter:
 logo: "/img/logo-2x.png"
 google_analytics_id: UA-50755011-1
 google_site_verification: onQcXpAvtHBrUI5LlroHNE_FP0b2qvFyPq7VZw36iEY
+
 collections:
   docs:
     permalink: "/:collection/:path/"
@@ -19,6 +20,7 @@ collections:
     output: true
   tutorials:
     output: true
+
 defaults:
 - scope:
     path: _docs
@@ -31,6 +33,7 @@ defaults:
   values:
     layout: news_item
     image: "/img/twitter-card.png"
+
 plugins:
 - jekyll-avatar
 - jekyll-feed
@@ -39,8 +42,14 @@ plugins:
 - jekyll-seo-tag
 - jekyll-sitemap
 - jemoji
+
+feed:
+  categories:
+    - release
+
 sass:
   style: compressed
+
 exclude:
 - .gitignore
 - .jekyll-cache
diff --git a/docs/_includes/top.html b/docs/_includes/top.html
index 2e23895e54a..a76e22a3a4d 100644
--- a/docs/_includes/top.html
+++ b/docs/_includes/top.html
@@ -5,6 +5,7 @@
   
   
   {% feed_meta %}
+  
   
   
   
diff --git a/docs/_posts/2013-05-06-jekyll-1-0-0-released.markdown b/docs/_posts/2013-05-06-jekyll-1-0-0-released.markdown
index ae5d3f9cf32..0b03b43e407 100644
--- a/docs/_posts/2013-05-06-jekyll-1-0-0-released.markdown
+++ b/docs/_posts/2013-05-06-jekyll-1-0-0-released.markdown
@@ -3,7 +3,7 @@ title: "Jekyll 1.0.0 Released"
 date: "2013-05-06 02:12:52 +0200"
 author: parkr
 version: 1.0.0
-categories: [release]
+category: release
 ---
 
 Hey! After many months of hard work by Jekyll's contributors, we're excited
diff --git a/docs/_posts/2013-05-08-jekyll-1-0-1-released.markdown b/docs/_posts/2013-05-08-jekyll-1-0-1-released.markdown
index 5b7a2c353cc..a1f1c7e85c9 100644
--- a/docs/_posts/2013-05-08-jekyll-1-0-1-released.markdown
+++ b/docs/_posts/2013-05-08-jekyll-1-0-1-released.markdown
@@ -3,7 +3,7 @@ title: "Jekyll 1.0.1 Released"
 date: "2013-05-08 23:46:11 +0200"
 author: parkr
 version: 1.0.1
-categories: [release]
+category: release
 ---
 
 Hot on the trails of v1.0, v1.0.1 is out! Here are the highlights:
diff --git a/docs/_posts/2013-05-12-jekyll-1-0-2-released.markdown b/docs/_posts/2013-05-12-jekyll-1-0-2-released.markdown
index e54663622a5..0ce02f6a1cf 100644
--- a/docs/_posts/2013-05-12-jekyll-1-0-2-released.markdown
+++ b/docs/_posts/2013-05-12-jekyll-1-0-2-released.markdown
@@ -3,7 +3,7 @@ title: "Jekyll 1.0.2 Released"
 date: "2013-05-12 14:45:00 +0200"
 author: parkr
 version: 1.0.2
-categories: [release]
+category: release
 ---
 
 v1.0.2 has some key bugfixes that optionally restore some behaviour from pre-1.0
diff --git a/docs/_posts/2013-06-07-jekyll-1-0-3-released.markdown b/docs/_posts/2013-06-07-jekyll-1-0-3-released.markdown
index 88f8ad41283..c81f1ced145 100644
--- a/docs/_posts/2013-06-07-jekyll-1-0-3-released.markdown
+++ b/docs/_posts/2013-06-07-jekyll-1-0-3-released.markdown
@@ -3,7 +3,7 @@ title: "Jekyll 1.0.3 Released"
 date: "2013-06-07 21:02:13 +0200"
 author: parkr
 version: 1.0.3
-categories: [release]
+category: release
 ---
 
 v1.0.3 contains some key enhancements and bug fixes:
diff --git a/docs/_posts/2013-07-14-jekyll-1-1-0-released.markdown b/docs/_posts/2013-07-14-jekyll-1-1-0-released.markdown
index 8d00b98bc8a..8d8361a547c 100644
--- a/docs/_posts/2013-07-14-jekyll-1-1-0-released.markdown
+++ b/docs/_posts/2013-07-14-jekyll-1-1-0-released.markdown
@@ -3,7 +3,7 @@ title: "Jekyll 1.1.0 Released"
 date: "2013-07-14 19:38:02 +0200"
 author: parkr
 version: 1.1.0
-categories: [release]
+category: release
 ---
 
 After a month of hard work, the Jekyll core team is excited to announce the release of
diff --git a/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown b/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown
index acbd58ad06e..7256e08ec4f 100644
--- a/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown
+++ b/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown
@@ -3,7 +3,7 @@ title: "Jekyll 1.1.1 Released"
 date: "2013-07-24 22:24:14 +0200"
 author: parkr
 version: 1.1.1
-categories: [release]
+category: release
 ---
 
 Coming just 10 days after the release of v1.1.0, v1.1.1 is out with a patch for
diff --git a/docs/_posts/2013-07-25-jekyll-1-0-4-released.markdown b/docs/_posts/2013-07-25-jekyll-1-0-4-released.markdown
index 2e234c0ed5f..7823468a33b 100644
--- a/docs/_posts/2013-07-25-jekyll-1-0-4-released.markdown
+++ b/docs/_posts/2013-07-25-jekyll-1-0-4-released.markdown
@@ -3,7 +3,7 @@ title: "Jekyll 1.0.4 Released"
 date: "2013-07-25 09:08:38 +0200"
 author: mattr-
 version: 1.0.4
-categories: [release]
+category: release
 ---
 
 Version 1.0.4 fixes a minor, but nonetheless important security vulnerability affecting several third-party Jekyll plugins. If your Jekyll site does not use plugins, you may, but are not required to upgrade at this time.
diff --git a/docs/_posts/2013-07-25-jekyll-1-1-2-released.markdown b/docs/_posts/2013-07-25-jekyll-1-1-2-released.markdown
index f308ca12544..26c034537fe 100644
--- a/docs/_posts/2013-07-25-jekyll-1-1-2-released.markdown
+++ b/docs/_posts/2013-07-25-jekyll-1-1-2-released.markdown
@@ -3,7 +3,7 @@ title: "Jekyll 1.1.2 Released"
 date: "2013-07-25 09:08:38 +0200"
 author: parkr
 version: 1.1.2
-categories: [release]
+category: release
 ---
 
 Version 1.1.2 fixes a minor, but nonetheless important security vulnerability affecting several third-party Jekyll plugins. If your Jekyll site does not use plugins, you may, but are not required to upgrade at this time.
diff --git a/docs/_posts/2013-09-06-jekyll-1-2-0-released.markdown b/docs/_posts/2013-09-06-jekyll-1-2-0-released.markdown
index 76090527c93..a227b4e18fd 100644
--- a/docs/_posts/2013-09-06-jekyll-1-2-0-released.markdown
+++ b/docs/_posts/2013-09-06-jekyll-1-2-0-released.markdown
@@ -3,7 +3,7 @@ title: "Jekyll 1.2.0 Released"
 date: "2013-09-06 22:02:41 -0400"
 author: parkr
 version: 1.2.0
-categories: [release]
+category: release
 ---
 
 After nearly a month and a half of hard work, the Jekyll team is happy to
diff --git a/docs/_posts/2013-09-14-jekyll-1-2-1-released.markdown b/docs/_posts/2013-09-14-jekyll-1-2-1-released.markdown
index 5f759e20525..da2c74ab84f 100644
--- a/docs/_posts/2013-09-14-jekyll-1-2-1-released.markdown
+++ b/docs/_posts/2013-09-14-jekyll-1-2-1-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 1.2.1 Released'
 date: 2013-09-14 20:46:50 -0400
 author: parkr
 version: 1.2.1
-categories: [release]
+category: release
 ---
 
 Quick turnover, anyone? A [recent incompatibility with Liquid
diff --git a/docs/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown b/docs/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
index 65e98700bd6..c85769948f1 100644
--- a/docs/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
+++ b/docs/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 1.3.0.rc1 Released'
 date: 2013-10-28 20:14:39 -0500
 author: mattr-
 version: 1.3.0.rc1
-categories: [release]
+category: release
 ---
 
 Jekyll 1.3.0 is going to be a big release! In order to make sure we
diff --git a/docs/_posts/2013-11-04-jekyll-1-3-0-released.markdown b/docs/_posts/2013-11-04-jekyll-1-3-0-released.markdown
index f70408cd88a..14d1f089f7d 100644
--- a/docs/_posts/2013-11-04-jekyll-1-3-0-released.markdown
+++ b/docs/_posts/2013-11-04-jekyll-1-3-0-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 1.3.0 Released'
 date: 2013-11-04 21:46:02 -0600
 author: mattr-
 version: 1.3.0
-categories: [release]
+category: release
 ---
 
 It's been about six weeks since v1.2.0 and the Jekyll team is happy to
diff --git a/docs/_posts/2013-11-26-jekyll-1-3-1-released.markdown b/docs/_posts/2013-11-26-jekyll-1-3-1-released.markdown
index baf8dea098f..305a3b75077 100644
--- a/docs/_posts/2013-11-26-jekyll-1-3-1-released.markdown
+++ b/docs/_posts/2013-11-26-jekyll-1-3-1-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 1.3.1 Released'
 date: 2013-11-26 19:52:20 -0600
 author: mattr-
 version: 1.3.1
-categories: [release]
+category: release
 ---
 
 Just in time for the US holiday Thanksgiving, we're releasing version
diff --git a/docs/_posts/2013-12-07-jekyll-1-4-0-released.markdown b/docs/_posts/2013-12-07-jekyll-1-4-0-released.markdown
index 1b9d4b7a0e9..07aa71970a0 100644
--- a/docs/_posts/2013-12-07-jekyll-1-4-0-released.markdown
+++ b/docs/_posts/2013-12-07-jekyll-1-4-0-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 1.4.0 Released'
 date: 2013-12-07 13:55:28 -0600
 author: mattr-
 version: 1.4.0
-categories: [release]
+category: release
 ---
 
 About a month after the release of Jekyll v1.3.0, we are releasing
diff --git a/docs/_posts/2013-12-09-jekyll-1-4-1-released.markdown b/docs/_posts/2013-12-09-jekyll-1-4-1-released.markdown
index 9d754857d98..73a20a0f21b 100644
--- a/docs/_posts/2013-12-09-jekyll-1-4-1-released.markdown
+++ b/docs/_posts/2013-12-09-jekyll-1-4-1-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 1.4.1 Released'
 date: 2013-12-09 20:44:13 -0600
 author: mattr-
 version: 1.4.1
-categories: [release]
+category: release
 ---
 
 Another quick turnover, anyone? A [critical
diff --git a/docs/_posts/2013-12-16-jekyll-1-4-2-released.markdown b/docs/_posts/2013-12-16-jekyll-1-4-2-released.markdown
index e4329adc3f2..3ca96a5b602 100644
--- a/docs/_posts/2013-12-16-jekyll-1-4-2-released.markdown
+++ b/docs/_posts/2013-12-16-jekyll-1-4-2-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 1.4.2 Released'
 date: 2013-12-16 19:48:13 -0500
 author: parkr
 version: 1.4.2
-categories: [release]
+category: release
 ---
 
 This release fixes [a regression][] where Maruku fenced code blocks were turned
diff --git a/docs/_posts/2014-01-13-jekyll-1-4-3-released.markdown b/docs/_posts/2014-01-13-jekyll-1-4-3-released.markdown
index 8338ffb6c13..446c5134de9 100644
--- a/docs/_posts/2014-01-13-jekyll-1-4-3-released.markdown
+++ b/docs/_posts/2014-01-13-jekyll-1-4-3-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 1.4.3 Released'
 date: 2014-01-13 17:43:32 -0800
 author: benbalter
 version: 1.4.3
-categories: [release]
+category: release
 ---
 
 Jekyll 1.4.3 contains two **critical** security fixes. If you run Jekyll locally
diff --git a/docs/_posts/2014-03-24-jekyll-1-5-0-released.markdown b/docs/_posts/2014-03-24-jekyll-1-5-0-released.markdown
index 717424ab7f3..7192d8b3022 100644
--- a/docs/_posts/2014-03-24-jekyll-1-5-0-released.markdown
+++ b/docs/_posts/2014-03-24-jekyll-1-5-0-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 1.5.0 Released'
 date: 2014-03-24 20:37:59 -0400
 author: parkr
 version: 1.5.0
-categories: [release]
+category: release
 ---
 
 As work continues on Jekyll 2.0.0, we felt it was important to address two key
diff --git a/docs/_posts/2014-03-27-jekyll-1-5-1-released.markdown b/docs/_posts/2014-03-27-jekyll-1-5-1-released.markdown
index 2105ad4dfe2..71afc80d5c7 100644
--- a/docs/_posts/2014-03-27-jekyll-1-5-1-released.markdown
+++ b/docs/_posts/2014-03-27-jekyll-1-5-1-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 1.5.1 Released'
 date: 2014-03-27 22:43:48 -0400
 author: parkr
 version: 1.5.1
-categories: [release]
+category: release
 ---
 
 The hawk-eyed [@gregose](https://github.com/gregose) spotted a bug in our
diff --git a/docs/_posts/2014-05-06-jekyll-turns-2-0-0.markdown b/docs/_posts/2014-05-06-jekyll-turns-2-0-0.markdown
index ca2326c99c8..f2064d7547e 100644
--- a/docs/_posts/2014-05-06-jekyll-turns-2-0-0.markdown
+++ b/docs/_posts/2014-05-06-jekyll-turns-2-0-0.markdown
@@ -2,7 +2,7 @@
 title: 'Jekyll turns 2.0.0'
 author: parkr
 version: 2.0.0
-categories: [release]
+category: release
 ---
 
 A year ago to the day, [we released Jekyll 1.0.0][jekyll-1]. One year later, we present to you the next major version: Jekyll 2.0.0.
diff --git a/docs/_posts/2014-05-08-jekyll-2-0-3-released.markdown b/docs/_posts/2014-05-08-jekyll-2-0-3-released.markdown
index e98e32c8f36..d693c51d2e1 100644
--- a/docs/_posts/2014-05-08-jekyll-2-0-3-released.markdown
+++ b/docs/_posts/2014-05-08-jekyll-2-0-3-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 2.0.3 Released'
 date: 2014-05-08 22:43:17 -0400
 author: parkr
 version: 2.0.3
-categories: [release]
+category: release
 ---
 
 Hey again! Just wanted to let you know we've released another version of Jekyll, jam-packed with bug fixes.
diff --git a/docs/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown b/docs/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown
index c3fd4bb6a28..2701a4fbfc1 100644
--- a/docs/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown
+++ b/docs/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll Turns 21! Err... I mean 2.1.0.'
 date: 2014-06-28 17:26:59 -0400
 author: parkr
 version: 2.1.0
-categories: [release]
+category: release
 ---
 
 Jekyll's finally [legal to drink in the States](https://en.wikipedia.org/wiki/Legal_drinking_age).
diff --git a/docs/_posts/2014-07-01-jekyll-2-1-1-released.markdown b/docs/_posts/2014-07-01-jekyll-2-1-1-released.markdown
index c73a055dfce..c1a05015d66 100644
--- a/docs/_posts/2014-07-01-jekyll-2-1-1-released.markdown
+++ b/docs/_posts/2014-07-01-jekyll-2-1-1-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 2.1.1 Released'
 date: 2014-07-01 20:16:43 -0400
 author: parkr
 version: 2.1.1
-categories: [release]
+category: release
 ---
 
 This is a minor release for Jekyll 2.1.0. It fixes a couple bugs and
diff --git a/docs/_posts/2014-07-29-jekyll-2-2-0-released.markdown b/docs/_posts/2014-07-29-jekyll-2-2-0-released.markdown
index 6b726f17f15..ce8e672b222 100644
--- a/docs/_posts/2014-07-29-jekyll-2-2-0-released.markdown
+++ b/docs/_posts/2014-07-29-jekyll-2-2-0-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 2.2.0 Released'
 date: 2014-07-29 18:59:13 -0400
 author: parkr
 version: 2.2.0
-categories: [release]
+category: release
 ---
 
 Jekyll 2.2.0 contains a few key updates:
diff --git a/docs/_posts/2014-08-10-jekyll-2-3-0-released.markdown b/docs/_posts/2014-08-10-jekyll-2-3-0-released.markdown
index 40d8922c6b7..c40f850775a 100644
--- a/docs/_posts/2014-08-10-jekyll-2-3-0-released.markdown
+++ b/docs/_posts/2014-08-10-jekyll-2-3-0-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 2.3.0 Released'
 date: 2014-08-10 20:38:34 -0400
 author: parkr
 version: 2.3.0
-categories: [release]
+category: release
 ---
 
 This latest release of Jekyll includes a slew of enhancements and bug
diff --git a/docs/_posts/2014-09-09-jekyll-2-4-0-released.markdown b/docs/_posts/2014-09-09-jekyll-2-4-0-released.markdown
index 11cb738ec74..4bcb3a770e6 100644
--- a/docs/_posts/2014-09-09-jekyll-2-4-0-released.markdown
+++ b/docs/_posts/2014-09-09-jekyll-2-4-0-released.markdown
@@ -3,7 +3,7 @@ title: 'A Wild Jekyll 2.4.0 Appeared!'
 date: 2014-09-09 21:10:33 -0700
 author: parkr
 version: 2.4.0
-categories: [release]
+category: release
 ---
 
 Well, lookie here! A new release of Jekyll! v2.4.0 contains lots of goodies, including some brilliant new additions:
diff --git a/docs/_posts/2014-11-06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown b/docs/_posts/2014-11-06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown
index cd9921f1e0e..45056f906d1 100644
--- a/docs/_posts/2014-11-06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown
+++ b/docs/_posts/2014-11-06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown
@@ -3,7 +3,7 @@ title: "Jekyll's Mid-Life Crisis (Or, Jekyll turns 2.5.0)"
 date: 2014-11-05 10:48:22 -0800
 author: parkr
 version: 2.5.0
-categories: [release]
+category: release
 ---
 
 A new day, a new release! Jekyll just turned 2.5.0 and has gained a lot of
diff --git a/docs/_posts/2014-11-08-jekyll-2-5-1-released.markdown b/docs/_posts/2014-11-08-jekyll-2-5-1-released.markdown
index 2f6e3b51467..6d0814288c0 100644
--- a/docs/_posts/2014-11-08-jekyll-2-5-1-released.markdown
+++ b/docs/_posts/2014-11-08-jekyll-2-5-1-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 2.5.1 Released'
 date: 2014-11-09 09:47:52 -0800
 author: parkr
 version: 2.5.1
-categories: [release]
+category: release
 ---
 
 Hot on the heels of v2.5.0, this release brings relief to our Windows
diff --git a/docs/_posts/2014-11-12-jekyll-2-5-2-released.markdown b/docs/_posts/2014-11-12-jekyll-2-5-2-released.markdown
index cff18248e62..bd3d5eea2be 100644
--- a/docs/_posts/2014-11-12-jekyll-2-5-2-released.markdown
+++ b/docs/_posts/2014-11-12-jekyll-2-5-2-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 2.5.2 Released'
 date: 2014-11-12 18:49:08 -0800
 author: parkr
 version: 2.5.2
-categories: [release]
+category: release
 ---
 
 A very minor release, 2.5.2 fixes a bug with path sanitation that 2.5.1
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 d2c9b13d3a6..00ddca6de1e 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
@@ -3,7 +3,7 @@ title: 'Jekyll Release for the Holidays! v2.5.3 Out'
 date: 2014-12-22 09:03:30 -0500
 author: parkr
 version: 2.5.3
-categories: [release]
+category: release
 ---
 
 Happy Holidays, everyone.
diff --git a/docs/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown b/docs/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown
index c63f184b3e3..76128767b61 100644
--- a/docs/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown
+++ b/docs/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.0.0.beta1 Released'
 date: 2015-01-24 00:42:31 -0800
 author: parkr
 version: 3.0.0.beta1
-categories: [release]
+category: release
 ---
 
 Hey!
diff --git a/docs/_posts/2015-10-26-jekyll-3-0-released.markdown b/docs/_posts/2015-10-26-jekyll-3-0-released.markdown
index 37d075c4d56..36bf46a670b 100644
--- a/docs/_posts/2015-10-26-jekyll-3-0-released.markdown
+++ b/docs/_posts/2015-10-26-jekyll-3-0-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.0 Released'
 date: 2015-10-26 15:37:30 -0700
 author: parkr
 version: 3.0
-categories: [release]
+category: release
 ---
 
 The much-anticipated Jekyll 3.0 has been released! Key changes:
diff --git a/docs/_posts/2015-11-17-jekyll-3-0-1-released.markdown b/docs/_posts/2015-11-17-jekyll-3-0-1-released.markdown
index 3eb3cb718ce..be08952d8b7 100644
--- a/docs/_posts/2015-11-17-jekyll-3-0-1-released.markdown
+++ b/docs/_posts/2015-11-17-jekyll-3-0-1-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.0.1 Released'
 date: 2015-11-17 22:04:39 -0800
 author: parkr
 version: 3.0.1
-categories: [release]
+category: release
 ---
 
 Hey, folks! Bunch of bug fixes here. Notables:
diff --git a/docs/_posts/2016-01-20-jekyll-3-0-2-released.markdown b/docs/_posts/2016-01-20-jekyll-3-0-2-released.markdown
index c12cde34a11..34c3affbaa2 100644
--- a/docs/_posts/2016-01-20-jekyll-3-0-2-released.markdown
+++ b/docs/_posts/2016-01-20-jekyll-3-0-2-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.0.2 Released'
 date: 2016-01-20 14:08:18 -0800
 author: parkr
 version: 3.0.2
-categories: [release]
+category: release
 ---
 
 A crucial bug was found in v3.0.1 which caused invalid post dates to go
diff --git a/docs/_posts/2016-01-24-jekyll-3-1-0-released.markdown b/docs/_posts/2016-01-24-jekyll-3-1-0-released.markdown
index ee8d6150c88..216a4f2a092 100644
--- a/docs/_posts/2016-01-24-jekyll-3-1-0-released.markdown
+++ b/docs/_posts/2016-01-24-jekyll-3-1-0-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.1.0 Released'
 date: 2016-01-24 13:16:12 -0800
 author: parkr
 version: 3.1.0
-categories: [release]
+category: release
 ---
 
 Happy weekend! To make your weekend all the better, we have just released
diff --git a/docs/_posts/2016-01-28-jekyll-3-1-1-released.markdown b/docs/_posts/2016-01-28-jekyll-3-1-1-released.markdown
index cddfbf2602d..925c9ff64d1 100644
--- a/docs/_posts/2016-01-28-jekyll-3-1-1-released.markdown
+++ b/docs/_posts/2016-01-28-jekyll-3-1-1-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.1.1 Released'
 date: 2016-01-28 17:21:50 -0800
 author: parkr
 version: 3.1.1
-categories: [release]
+category: release
 ---
 
 This release squashes a few bugs :bug: :bug: :bug: noticed by a few
diff --git a/docs/_posts/2016-02-08-jekyll-3-0-3-released.markdown b/docs/_posts/2016-02-08-jekyll-3-0-3-released.markdown
index 442dfeb9c5c..05c9cc220e0 100644
--- a/docs/_posts/2016-02-08-jekyll-3-0-3-released.markdown
+++ b/docs/_posts/2016-02-08-jekyll-3-0-3-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.0.3 Released'
 date: 2016-02-08 10:39:08 -0800
 author: parkr
 version: 3.0.3
-categories: [release]
+category: release
 ---
 
 [GitHub Pages upgraded to Jekyll 3.0.2][1] last week. With a testbed of
diff --git a/docs/_posts/2016-02-19-jekyll-3-1-2-released.markdown b/docs/_posts/2016-02-19-jekyll-3-1-2-released.markdown
index 807621f6a9c..df8bfd3ec6e 100644
--- a/docs/_posts/2016-02-19-jekyll-3-1-2-released.markdown
+++ b/docs/_posts/2016-02-19-jekyll-3-1-2-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.1.2 Released!'
 date: 2016-02-19 15:24:00 -0800
 author: parkr
 version: 3.1.2
-categories: [release]
+category: release
 ---
 
 Happy Friday from sunny California! Today, we're excited to announce the release of Jekyll v3.1.2, which comes with some crucial bug fixes:
diff --git a/docs/_posts/2016-04-19-jekyll-3-0-4-released.markdown b/docs/_posts/2016-04-19-jekyll-3-0-4-released.markdown
index 9aa9b822f82..218ec072620 100644
--- a/docs/_posts/2016-04-19-jekyll-3-0-4-released.markdown
+++ b/docs/_posts/2016-04-19-jekyll-3-0-4-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.0.4 Released'
 date: 2016-04-19 10:26:12 -0700
 author: parkr
 version: 3.0.4
-categories: [release]
+category: release
 ---
 
 v3.0.4 is a patch release which fixes the follow two issues:
diff --git a/docs/_posts/2016-04-19-jekyll-3-1-3-released.markdown b/docs/_posts/2016-04-19-jekyll-3-1-3-released.markdown
index 6b0892aca49..1735f59036d 100644
--- a/docs/_posts/2016-04-19-jekyll-3-1-3-released.markdown
+++ b/docs/_posts/2016-04-19-jekyll-3-1-3-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.1.3 Released'
 date: 2016-04-19 10:26:16 -0700
 author: parkr
 version: 3.1.3
-categories: [release]
+category: release
 ---
 
 v3.1.3 is a patch release which fixes the follow two issues:
diff --git a/docs/_posts/2016-04-26-jekyll-3-0-5-released.markdown b/docs/_posts/2016-04-26-jekyll-3-0-5-released.markdown
index 5ac2154598d..8dc23be4dde 100644
--- a/docs/_posts/2016-04-26-jekyll-3-0-5-released.markdown
+++ b/docs/_posts/2016-04-26-jekyll-3-0-5-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.0.5 Released'
 date: 2016-04-26 17:40:44 -0700
 author: parkr
 version: 3.0.5
-categories: [release]
+category: release
 ---
 
 This version fixes a bug affecting only v3.0.4 where autoregeneration was
diff --git a/docs/_posts/2016-05-18-jekyll-3-1-4-released.markdown b/docs/_posts/2016-05-18-jekyll-3-1-4-released.markdown
index 738fc12e514..6d607d8266a 100644
--- a/docs/_posts/2016-05-18-jekyll-3-1-4-released.markdown
+++ b/docs/_posts/2016-05-18-jekyll-3-1-4-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.1.4 "Stability Sam" Released'
 date: 2016-05-18 16:50:37 -0700
 author: parkr
 version: 3.1.4
-categories: [release]
+category: release
 ---
 
 Hey Jekyllites!
diff --git a/docs/_posts/2016-05-18-jekyll-3-1-5-released.markdown b/docs/_posts/2016-05-18-jekyll-3-1-5-released.markdown
index 0ca981a623d..0dbdd5219f2 100644
--- a/docs/_posts/2016-05-18-jekyll-3-1-5-released.markdown
+++ b/docs/_posts/2016-05-18-jekyll-3-1-5-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.1.5 Released'
 date: 2016-05-18 21:35:27 -0700
 author: parkr
 version: 3.1.5
-categories: [release]
+category: release
 ---
 
 There's always at least one bug, right? :)
diff --git a/docs/_posts/2016-05-19-jekyll-3-1-6-released.markdown b/docs/_posts/2016-05-19-jekyll-3-1-6-released.markdown
index e31951ebd41..a12c14e1a0a 100644
--- a/docs/_posts/2016-05-19-jekyll-3-1-6-released.markdown
+++ b/docs/_posts/2016-05-19-jekyll-3-1-6-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.1.6 Released'
 date: 2016-05-19 12:48:14 -0700
 author: parkr
 version: 3.1.6
-categories: [release]
+category: release
 ---
 
 Upon releasing 3.1.5 and kicking the tires, we noticed a glaring bug: our
diff --git a/docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown b/docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown
index c17b8ce5648..86440020666 100644
--- a/docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown
+++ b/docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll turns 3.2'
 date: 2016-07-26 15:06:49 -0700
 author: parkr
 version: 3.2.0
-categories: [release]
+category: release
 ---
 
 Happy Day! Jekyll v3.2.0 is out, and packed full of goodies.
diff --git a/docs/_posts/2016-08-02-jekyll-3-2-1-released.markdown b/docs/_posts/2016-08-02-jekyll-3-2-1-released.markdown
index f2bdaec87b9..d5af2a45ee9 100644
--- a/docs/_posts/2016-08-02-jekyll-3-2-1-released.markdown
+++ b/docs/_posts/2016-08-02-jekyll-3-2-1-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.2.1 Released with Fix for Windows'
 date: 2016-08-02 13:20:11 -0700
 author: parkr
 version: 3.2.1
-categories: [release]
+category: release
 ---
 
 Well, 3.2.0 has been a success, but with one fatal flaw: it doesn't work on
diff --git a/docs/_posts/2016-10-06-jekyll-3-3-is-here.md b/docs/_posts/2016-10-06-jekyll-3-3-is-here.md
index e267c412b1b..0d8d7c5caf3 100644
--- a/docs/_posts/2016-10-06-jekyll-3-3-is-here.md
+++ b/docs/_posts/2016-10-06-jekyll-3-3-is-here.md
@@ -3,7 +3,7 @@ title: 'Jekyll 3.3 is here with better theme support, new URL filters, and tons
 date: 2016-10-06 11:10:38 -0700
 author: parkr
 version: 3.3.0
-categories: [release]
+category: release
 ---
 
 There are tons of great new quality-of-life features you can use in 3.3.
diff --git a/docs/_posts/2016-11-14-jekyll-3-3-1-released.markdown b/docs/_posts/2016-11-14-jekyll-3-3-1-released.markdown
index 0a357ea23da..6c286ff614a 100644
--- a/docs/_posts/2016-11-14-jekyll-3-3-1-released.markdown
+++ b/docs/_posts/2016-11-14-jekyll-3-3-1-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.3.1 Released'
 date: 2016-11-14 14:29:59 -0800
 author: parkr
 version: 3.3.1
-categories: [release]
+category: release
 ---
 
 Hello! We have a bugfix release of Jekyll hot off the presses for you. Key
diff --git a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
index 7222869830e..bf1db93ff30 100644
--- a/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
+++ b/docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll turns 3.4.0'
 date: 2017-01-18 14:19:13 -0500
 author: parkr
 version: 3.4.0
-categories: [release]
+category: release
 ---
 
 Hey there! We have a quick update of Jekyll for you to enjoy this January.
diff --git a/docs/_posts/2017-03-02-jekyll-3-4-1-released.markdown b/docs/_posts/2017-03-02-jekyll-3-4-1-released.markdown
index c90e7cfb1b9..213e57a0a38 100644
--- a/docs/_posts/2017-03-02-jekyll-3-4-1-released.markdown
+++ b/docs/_posts/2017-03-02-jekyll-3-4-1-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.4.1, or "Unintended Consequences"'
 date: 2017-03-02 14:20:26 -0500
 author: parkr
 version: 3.4.1
-categories: [release]
+category: release
 ---
 
 Conformity is a confounding thing.
diff --git a/docs/_posts/2017-03-09-jekyll-3-4-2-released.markdown b/docs/_posts/2017-03-09-jekyll-3-4-2-released.markdown
index 6297721f9a7..775be8c0388 100644
--- a/docs/_posts/2017-03-09-jekyll-3-4-2-released.markdown
+++ b/docs/_posts/2017-03-09-jekyll-3-4-2-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.4.2 Released'
 date: 2017-03-09 15:41:57 -0500
 author: parkr
 version: 3.4.2
-categories: [release]
+category: release
 ---
 
 Another one-PR patch update, though without the same [lessons as for the
diff --git a/docs/_posts/2017-03-21-jekyll-3-4-3-released.markdown b/docs/_posts/2017-03-21-jekyll-3-4-3-released.markdown
index a51fdf498c0..7373961e2a0 100644
--- a/docs/_posts/2017-03-21-jekyll-3-4-3-released.markdown
+++ b/docs/_posts/2017-03-21-jekyll-3-4-3-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.4.3 Released'
 date: 2017-03-21 08:52:53 -0500
 author: pathawks
 version: 3.4.3
-categories: [release]
+category: release
 ---
 
 Another one-PR patch update as we continue our quest to destroy all bugs. A
diff --git a/docs/_posts/2017-06-14-jekyll-3-5-0-released.markdown b/docs/_posts/2017-06-14-jekyll-3-5-0-released.markdown
index 28d21a4e869..7bb2a82c409 100644
--- a/docs/_posts/2017-06-14-jekyll-3-5-0-released.markdown
+++ b/docs/_posts/2017-06-14-jekyll-3-5-0-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll turns 3.5, oh my!'
 date: 2017-06-15 17:32:32 -0400
 author: parkr
 version: 3.5.0
-categories: [release]
+category: release
 ---
 
 Good news! Nearly 400 commits later, Jekyll 3.5.0 has been released into
diff --git a/docs/_posts/2017-07-17-jekyll-3-5-1-released.markdown b/docs/_posts/2017-07-17-jekyll-3-5-1-released.markdown
index c7fef1bbfcb..96b76edcb34 100644
--- a/docs/_posts/2017-07-17-jekyll-3-5-1-released.markdown
+++ b/docs/_posts/2017-07-17-jekyll-3-5-1-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.5.1 Released'
 date: 2017-07-17 12:40:37 -0400
 author: parkr
 version: 3.5.1
-categories: [release]
+category: release
 ---
 
 We've released a few bugfixes in the form of v3.5.1 today:
diff --git a/docs/_posts/2017-08-12-jekyll-3-5-2-released.markdown b/docs/_posts/2017-08-12-jekyll-3-5-2-released.markdown
index 0534e49eb92..84deb6f5b40 100644
--- a/docs/_posts/2017-08-12-jekyll-3-5-2-released.markdown
+++ b/docs/_posts/2017-08-12-jekyll-3-5-2-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.5.2 Released'
 date: 2017-08-12 16:31:40 -0400
 author: parkr
 version: 3.5.2
-categories: [release]
+category: release
 ---
 
 3.5.2 is out with 6 great bug fixes, most notably one which should dramatically speed up generation of your site! In testing #6266, jekyllrb.com generation when from 18 seconds down to 8! Here is the full line-up of fixes:
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
index 0a468673694..3a36efbccf2 100644
--- a/docs/_posts/2017-09-21-jekyll-3-6-0-released.markdown
+++ b/docs/_posts/2017-09-21-jekyll-3-6-0-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll turns 3.6!'
 date: 2017-09-21 16:38:20 -0400
 author: parkr
 version: 3.6.0
-categories: [release]
+category: 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.
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 31af0812b66..ad6d37a008f 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
@@ -3,7 +3,7 @@ title: 'Jekyll 3.6.2 Released'
 date: 2017-10-21 21:31:40 +0200
 author: dirtyf
 version: 3.6.2
-categories: [release]
+category: release
 ---
 
 3.6.2 is out, it's a tiny patch release and we invite you to run `bundle update`
diff --git a/docs/_posts/2018-01-02-jekyll-3-7-0-released.md b/docs/_posts/2018-01-02-jekyll-3-7-0-released.md
index 0730782ec8a..d1bbd0d34ba 100644
--- a/docs/_posts/2018-01-02-jekyll-3-7-0-released.md
+++ b/docs/_posts/2018-01-02-jekyll-3-7-0-released.md
@@ -4,7 +4,7 @@ description: "Jekyll 3.7.0 brings LiveReload, a directory for your collections a
 date: 2018-01-02 11:21:40 +0100
 author: DirtyF
 version: 3.7.0
-categories: [release]
+category: release
 ---
 
 We're happy to release a new minor for the new year.
diff --git a/docs/_posts/2018-01-25-jekyll-3-7-2-released.md b/docs/_posts/2018-01-25-jekyll-3-7-2-released.md
index 43eaa7d0bad..e7c6efa566f 100644
--- a/docs/_posts/2018-01-25-jekyll-3-7-2-released.md
+++ b/docs/_posts/2018-01-25-jekyll-3-7-2-released.md
@@ -3,7 +3,7 @@ title: "Jekyll 3.7.2 Released"
 date: 2018-01-25 22:22:22 +0530
 author: ashmaroli
 version: 3.7.2
-categories: [release]
+category: release
 ---
 
 Close on the heels of shipping 3.7.0, we were informed of a couple of
diff --git a/docs/_posts/2018-02-25-jekyll-3-7-3-released.markdown b/docs/_posts/2018-02-25-jekyll-3-7-3-released.markdown
index b378ee14a47..d66afd634cf 100644
--- a/docs/_posts/2018-02-25-jekyll-3-7-3-released.markdown
+++ b/docs/_posts/2018-02-25-jekyll-3-7-3-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.7.3 Released'
 date: 2018-02-25 13:02:08 +0530
 author: ashmaroli
 version: 3.7.3
-categories: [release]
+category: release
 ---
 
 Hello Jekyllers!! :wave:
diff --git a/docs/_posts/2018-03-15-jekyll-3-8-0-released.markdown b/docs/_posts/2018-03-15-jekyll-3-8-0-released.markdown
index a7bad956a6b..14e2d61a283 100644
--- a/docs/_posts/2018-03-15-jekyll-3-8-0-released.markdown
+++ b/docs/_posts/2018-03-15-jekyll-3-8-0-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.8.0 Released'
 date: 2018-04-19 19:45:15 +0530
 author: ashmaroli
 version: 3.8.0
-categories: [release]
+category: release
 ---
 
 Aloha Jekyllers!! :wave:
diff --git a/docs/_posts/2018-05-01-jekyll-3-8-1-released.markdown b/docs/_posts/2018-05-01-jekyll-3-8-1-released.markdown
index b750c39d805..cb8c7a5b971 100644
--- a/docs/_posts/2018-05-01-jekyll-3-8-1-released.markdown
+++ b/docs/_posts/2018-05-01-jekyll-3-8-1-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.8.1 Released'
 date: 2018-05-01 11:56:01 -0500
 author: pathawks
 version: 3.8.1
-categories: [release]
+category: release
 ---
 
 Happy May Day :tada:
diff --git a/docs/_posts/2018-05-18-jekyll-3-8-2-released.markdown b/docs/_posts/2018-05-18-jekyll-3-8-2-released.markdown
index 7d964e8602a..d54a9820824 100644
--- a/docs/_posts/2018-05-18-jekyll-3-8-2-released.markdown
+++ b/docs/_posts/2018-05-18-jekyll-3-8-2-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.8.2 Released'
 date: 2018-05-19 10:30:00 -0500
 author: pathawks
 version: 3.8.2
-categories: [release]
+category: release
 ---
 
 Hello Jekyllers!!
diff --git a/docs/_posts/2018-06-04-jekyll-3-8-3-released.markdown b/docs/_posts/2018-06-04-jekyll-3-8-3-released.markdown
index 5678b0ad8b3..a2a7056ced1 100644
--- a/docs/_posts/2018-06-04-jekyll-3-8-3-released.markdown
+++ b/docs/_posts/2018-06-04-jekyll-3-8-3-released.markdown
@@ -3,7 +3,7 @@ title: 'Jekyll 3.8.3 Released'
 date: 2018-06-05 09:00:00 -0500
 author: pathawks
 version: 3.8.3
-categories: [release]
+category: release
 ---
 
 This release fixes a regression in 3.8 where collections with `published: false`
diff --git a/docs/_posts/2018-09-19-security-fixes-for-3-6-3-7-3-8.markdown b/docs/_posts/2018-09-19-security-fixes-for-3-6-3-7-3-8.markdown
index 70a8d6a509b..9f92e803f86 100644
--- a/docs/_posts/2018-09-19-security-fixes-for-3-6-3-7-3-8.markdown
+++ b/docs/_posts/2018-09-19-security-fixes-for-3-6-3-7-3-8.markdown
@@ -2,7 +2,7 @@
 title: "Security Fixes for series 3.6, 3.7 and 3.8"
 date: 2018-09-19 18:00:00 +0530
 author: ashmaroli
-categories: [release]
+category: release
 version: 3.8.4
 ---
 
diff --git a/docs/_posts/2018-11-04-jekyll-3-8-5-released.markdown b/docs/_posts/2018-11-04-jekyll-3-8-5-released.markdown
index 8b5a0fce1ec..c854051e2e0 100644
--- a/docs/_posts/2018-11-04-jekyll-3-8-5-released.markdown
+++ b/docs/_posts/2018-11-04-jekyll-3-8-5-released.markdown
@@ -3,10 +3,10 @@ title: 'Jekyll 3.8.5 Released'
 date: 2018-11-04 20:58:20 +0100
 author: oe
 version: 3.8.5
-categories: [release]
+category: release
 ---
 
-This release fixes a bug where multiple Liquid tags were not supported in 
+This release fixes a bug where multiple Liquid tags were not supported in
 excerpts.
 
 Thanks to @ashmaroli for fixing this issue in [#7250].

From 8d7ef662bc19be40351685c04d712190f22888b6 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Fri, 15 Feb 2019 20:55:11 +0100
Subject: [PATCH 3468/4996] add missing Forestry logo [skip-ci]

---
 .../2018-08-01-jekyll-sponsoring.markdown     | 88 +++++++++++--------
 docs/img/forestry-logo.svg                    | 19 ++++
 2 files changed, 68 insertions(+), 39 deletions(-)
 create mode 100644 docs/img/forestry-logo.svg

diff --git a/docs/_posts/2018-08-01-jekyll-sponsoring.markdown b/docs/_posts/2018-08-01-jekyll-sponsoring.markdown
index 22124dfe6e3..1f223df61e4 100644
--- a/docs/_posts/2018-08-01-jekyll-sponsoring.markdown
+++ b/docs/_posts/2018-08-01-jekyll-sponsoring.markdown
@@ -9,60 +9,70 @@ _(TL;DR: We're open for sponsorships on our [OpenCollective page](https://openco
 
 Hi Jekyllers,
 
-As you may know, Jekyll is a completely free and open source project. We offer our
-software and its related plugins and documentation at no cost because we believe
-that good software should not cost anything. We're not planning on changing that,
-but today I want to talk about a different monetary aspect of open source.
+As you may know, Jekyll is a completely free and open source project. We offer
+our software and its related plugins and documentation at no cost because we
+believe that good software should not cost anything. We're not planning on
+changing that, but today I want to talk about a different monetary aspect of
+open source.
 
-Open source developers being paid for the work they do is a rare sight. Most open source
-software is effectively the result of hundreds and thousands of hours of free labor provided
-by individuals who are passionate enough to work outside of their day job to create
-software that, ironically, is being used by almost every company that offers
-digital services. It's a problem that has gotten more attention in recent years, with
-the open source community becoming more diverse and more and more companies actively
-investing in providing monetary support for open source developers.
+Open source developers being paid for the work they do is a rare sight. Most
+open source software is effectively the result of hundreds and thousands of
+hours of free labor provided by individuals who are passionate enough to work
+outside of their day job to create software that, ironically, is being used by
+almost every company that offers digital services. It's a problem that has
+gotten more attention in recent years, with the open source community becoming
+more diverse and more and more companies actively investing in providing
+monetary support for open source developers.
 
-Jekyll has always been a product of volunteers. Rarely has someone been paid to implement
-a certain plugin or feature. Today, we're excited to announce that we will finally
-be able to fund our contributors! __We are opening an OpenCollective to receive
-individual and corporate sponsorships__. This is not unheard of, [Hugo](http://gohugo.io)
-is also funded by sponsorships, as are many other similar projects, such as
-[webpack](https://opencollective.com/webpack), [Babel](https://opencollective.com/babel) or
+Jekyll has always been a product of volunteers. Rarely has someone been paid to
+implement a certain plugin or feature. Today, we're excited to announce that we
+will finally be able to fund our contributors! __We are opening an
+OpenCollective to receive individual and corporate sponsorships__.
+This is not unheard of, [Hugo](http://gohugo.io) is also funded by sponsorships,
+as are many other similar projects, such as
+[webpack](https://opencollective.com/webpack),
+[Babel](https://opencollective.com/babel) or
 [RuboCop](https://opencollective.com/rubocop).
 
-OpenCollective is a service that makes it easy for open source projects to receive funding
-from individuals and companies alike. It's specifically designed for open source and
-many other projects already use it for funding.
+OpenCollective is a service that makes it easy for open source projects to
+receive funding from individuals and companies alike. It's specifically designed
+for open source and many other projects already use it for funding.
 
-Sponsoring is, for us, a method to finally realize some of the more ambitious goals we've had
-with the project for years. The closest thing we want to realize is to __release Jekyll 4.0, and
-to make it as polished as we can__. In the future, we would also like to work on other things that
-will improve the Jekyll ecosystem. Here's a couple of ideas:
+Sponsoring is, for us, a method to finally realize some of the more ambitious
+goals we've had with the project for years. The closest thing we want to realize
+is to __release Jekyll 4.0, and to make it as polished as we can__. In the
+future, we would also like to work on other things that will improve the Jekyll
+ecosystem. Here's a couple of ideas:
 
 - Create a comprehensive official plugin and theme directory site
 - Improve tooling built around measuring and improving Jekyll's performance
 - Improve maintenance for official plugins
 - Including the community into official decisions; making Jekyll more friendly to folks in the community
 
-Again, these are just some ideas, but with the help of sponsoring, they are now one step closer
-to being realized :heart:
+Again, these are just some ideas, but with the help of sponsoring, they are now
+one step closer to being realized :heart:
 
-
    
-  Forestry
+
    
+  Forestry
 
    
 
-With that, we would like to announce our very first sponsor: [__Forestry.io__](https://forestry.io)! Forestry is
-a CMS that integrates with your Jekyll sites and lets you update content using a beautiful
-interface, and then automatically commits it back to your GitHub repository. We're excited to have
-them on board on a new, exciting step of our journey.
+With that, we would like to announce our very first sponsor:
+[__Forestry.io__](https://forestry.io)!
+Forestry is a CMS that integrates with your Jekyll sites and lets you update
+content using a beautiful interface, and then automatically commits it back to
+your GitHub repository. We're excited to have them on board on a new, exciting
+step of our journey.
 
-Will anything change for Jekyll users? The answer is no - this step does not impact the Jekyll software
-in any aspect. In fact, you might see positive changes, such as more features and better
-performance. Surprisingly, that's what happens when you properly fund people for their work!
+Will anything change for Jekyll users? The answer is no - this step does not
+impact the Jekyll software in any aspect. In fact, you might see positive
+changes, such as more features and better performance. Surprisingly, that's what
+happens when you properly fund people for their work!
 
-If you have been a long time user for Jekyll and would like to give something back to the project,
-you can consider a small monthly donation to our [OpenCollective page](http://opencollective.com/jekyll).
-If your company heavily relies on Jekyll, do consider sponsoring us! Contact me at
-`olivia at jekyllrb dot com` and we'll figure something out together.
+If you have been a long time user for Jekyll and would like to give something
+back to the project, you can consider a small monthly donation to our
+[OpenCollective page](http://opencollective.com/jekyll). If your company heavily
+relies on Jekyll, do consider sponsoring us!
+
+Contact [matt@jekyllrb.com](mailto:matt@jekyllrb.com) and we'll figure something out together.
 
 Thanks for sticking with us, and happy Jekylling! :tada:
diff --git a/docs/img/forestry-logo.svg b/docs/img/forestry-logo.svg
new file mode 100644
index 00000000000..4b4beda3ff4
--- /dev/null
+++ b/docs/img/forestry-logo.svg
@@ -0,0 +1,19 @@
+

From 403f5262754043536ac14a51c835930a5e0c9031 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Fri, 15 Feb 2019 21:03:53 +0100
Subject: [PATCH 3469/4996] make it compatible with category feed [skip-ci]

---
 rake/site.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rake/site.rake b/rake/site.rake
index 87299a3a5ef..990d5195db9 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -109,7 +109,7 @@ namespace :site do
         post.puts("date: #{Time.new.strftime("%Y-%m-%d %H:%M:%S %z")}")
         post.puts("author: ")
         post.puts("version: #{release}")
-        post.puts("categories: [release]")
+        post.puts("category: release")
         post.puts("---")
         post.puts
         post.puts

From 9ee96562dd17508a5937a8751db6333c4d53ff72 Mon Sep 17 00:00:00 2001
From: Josue Caraballo 
Date: Sat, 16 Feb 2019 10:08:26 -0600
Subject: [PATCH 3470/4996] changed future post loglevel to warn to help user
 narrow down issues (#7527)

Merge pull request 7527
---
 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 94e095bdbe5..bdbe6f5c269 100644
--- a/lib/jekyll/readers/post_reader.rb
+++ b/lib/jekyll/readers/post_reader.rb
@@ -76,7 +76,7 @@ def processable?(doc)
     def publishable?(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"
+          Jekyll.logger.warn "Skipping:", "#{doc.relative_path} has a future date"
         end
       end
     end

From f6527cd7ef7b16ee59ec3c98911b03492185f0f9 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 16 Feb 2019 11:08:28 -0500
Subject: [PATCH 3471/4996] Update history to reflect merge of #7527 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4858fd55b73..b14c8b8a5b9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -206,6 +206,7 @@
   * Fix Interpreter warning from Jekyll::Renderer (#7448)
   * Dont write static files from unrendered collection (#7410)
   * Excerpt handling of custom and intermediate tags (#7382)
+  * changed future post loglevel to warn to help user narrow down issues (#7527)
 
 ### feature
 

From 07bf5be7b4635b1c9aac7ca87226b44bdc4ae740 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sat, 16 Feb 2019 21:49:03 +0530
Subject: [PATCH 3472/4996] Allow custom sorting of collection documents
 (#7427)

Merge pull request 7427
---
 docs/_docs/collections.md                     |  52 ++++++
 features/collections.feature                  | 146 +++++++++++++++++
 features/collections_dir.feature              | 150 ++++++++++++++++++
 features/step_definitions.rb                  |   8 +-
 lib/jekyll/collection.rb                      |  74 ++++++++-
 .../_tutorials/dive-in-and-publish-already.md |   9 ++
 .../_tutorials/extending-with-plugins.md      |   9 ++
 test/source/_tutorials/getting-started.md     |   7 +
 test/source/_tutorials/graduation-day.md      |  10 ++
 test/source/_tutorials/lets-roll.md           |  16 ++
 test/source/_tutorials/tip-of-the-iceberg.md  |   6 +
 test/test_collections.rb                      |  90 +++++++++++
 12 files changed, 573 insertions(+), 4 deletions(-)
 create mode 100644 test/source/_tutorials/dive-in-and-publish-already.md
 create mode 100644 test/source/_tutorials/extending-with-plugins.md
 create mode 100644 test/source/_tutorials/getting-started.md
 create mode 100644 test/source/_tutorials/graduation-day.md
 create mode 100644 test/source/_tutorials/lets-roll.md
 create mode 100644 test/source/_tutorials/tip-of-the-iceberg.md

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index 5f6a3650696..3b01d28c69c 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -111,6 +111,58 @@ You can link to the generated page using the `url` attribute:
 There are special [permalink variables for collections](/docs/permalinks/) to
 help you control the output url for the entire collection.
 
+{% if site.version == '4.0.0' %}{% comment %} Remove this encapsulation when v4.0 ships {% endcomment %}
+
+## Custom Sorting of Documents
+
+By default, documents in a collection are sorted by their paths. But you can control this sorting via the collection's metadata.
+
+### Sort By Front Matter Key
+
+Documents can be sorted based on a front matter key by setting a `sort_by` metadata to the front matter key string. For example,
+to sort a collection of tutorials based on key `lesson`, the configuration would be:
+
+```yaml
+collections:
+  tutorials:
+    sort_by: lesson
+```
+
+The documents are arranged in the increasing order of the key's value. If a document does not have the front matter key defined
+then that document is placed immediately after sorted documents. When multiple documents do not have the front matter key defined,
+those documents are sorted by their dates or paths and then placed immediately after the sorted documents.
+
+### Manually Ordering Documents
+
+You can also manually order the documents by setting an `order` metadata with **the filenames listed** in the desired order.
+For example, a collection of tutorials would be configured as:
+
+```yaml
+collections:
+  tutorials:
+    order:
+      - hello-world.md
+      - introduction.md
+      - basic-concepts.md
+      - advanced-concepts.md
+```
+
+Any documents with filenames that do not match the list entry simply gets placed after the rearranged documents. If a document is
+nested under subdirectories, include them in entries as well:
+
+```yaml
+collections:
+  tutorials:
+    order:
+      - hello-world.md
+      - introduction.md
+      - concepts/basics.md
+      - concepts/advanced.md
+```
+
+If both metadata keys have been defined properly, `order` list takes precedence.
+{% endif %}
+
 ## Liquid Attributes
 
 ### Collections
diff --git a/features/collections.feature b/features/collections.feature
index c409c733805..8ee1b41f4a5 100644
--- a/features/collections.feature
+++ b/features/collections.feature
@@ -434,6 +434,152 @@ Feature: Collections
     And I should see "Collections: this is a test!, Collection#entries, Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, Site#generate, YAML with Dots" in "_site/index.html" unless Windows
     And I should see "Collections: this is a test!, Collection#entries, Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, YAML with Dots" in "_site/index.html" if on Windows
 
+  Scenario: Sort all entries by a Front Matter key defined in all entries
+    Given I have an "index.html" page that contains "Collections: {{ site.tutorials | map: 'title' | join: ', ' }}"
+    And I have fixture collections
+    And I have a _layouts directory
+    And I have a "_layouts/tutorial.html" file with content:
+    """
+    {% if page.previous %}Previous: {{ page.previous.title }}{% endif %}
+
+    {% if page.next %}Next: {{ page.next.title }}{% endif %}
+    """
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      tutorials:
+        output: true
+        sort_by: lesson
+
+    defaults:
+      - scope:
+          path: ""
+          type: tutorials
+        values:
+          layout: tutorial
+
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    Then the _site directory should exist
+    And I should see "Collections: Getting Started, Let's Roll!, Dive-In and Publish Already!, Tip of the Iceberg, Extending with Plugins, Graduation Day" in "_site/index.html"
+    And I should not see "Previous: Graduation Day" in "_site/tutorials/lets-roll.html"
+    And I should not see "Next: Tip of the Iceberg" in "_site/tutorials/lets-roll.html"
+    But I should see "Previous: Getting Started" in "_site/tutorials/lets-roll.html"
+    And I should see "Next: Dive-In and Publish Already!" in "_site/tutorials/lets-roll.html"
+
+  Scenario: Sort all entries by a Front Matter key defined in only some entries
+    Given I have an "index.html" page that contains "Collections: {{ site.tutorials | map: 'title' | join: ', ' }}"
+    And I have fixture collections
+    And I have a _layouts directory
+    And I have a "_layouts/tutorial.html" file with content:
+    """
+    {% if page.previous %}Previous: {{ page.previous.title }}{% endif %}
+
+    {% if page.next %}Next: {{ page.next.title }}{% endif %}
+    """
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      tutorials:
+        output: true
+        sort_by: approx_time
+
+    defaults:
+    - scope:
+        path: ""
+        type: tutorials
+      values:
+        layout: tutorial
+
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    Then the _site directory should exist
+    And I should see "'approx_time' not defined" in the build output
+    And I should see "Collections: Extending with Plugins, Let's Roll!, Getting Started, Graduation Day, Dive-In and Publish Already!, Tip of the Iceberg" in "_site/index.html"
+    And I should see "Previous: Getting Started" in "_site/tutorials/graduation-day.html"
+    And I should see "Next: Dive-In and Publish Already!" in "_site/tutorials/graduation-day.html"
+
+  Scenario: Manually sort entries
+    Given I have an "index.html" page that contains "Collections: {{ site.tutorials | map: 'title' | join: ', ' }}"
+    And I have fixture collections
+    And I have a _layouts directory
+    And I have a "_layouts/tutorial.html" file with content:
+    """
+    {% if page.previous %}Previous: {{ page.previous.title }}{% endif %}
+
+    {% if page.next %}Next: {{ page.next.title }}{% endif %}
+    """
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      tutorials:
+        output: true
+        order:
+          - getting-started.md
+          - tip-of-the-iceberg.md
+          - lets-roll.md
+          - dive-in-and-publish-already.md
+          - graduation-day.md
+          - random-plugins.md
+
+    defaults:
+      - scope:
+          path: ""
+          type: tutorials
+        values:
+          layout: tutorial
+
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    Then the _site directory should exist
+    And I should see "Collections: Getting Started, Tip of the Iceberg, Let's Roll!, Dive-In and Publish Already!, Graduation Day, Extending with Plugins" in "_site/index.html"
+    And I should not see "Previous: Graduation Day" in "_site/tutorials/lets-roll.html"
+    And I should not see "Next: Tip of the Iceberg" in "_site/tutorials/lets-roll.html"
+    But I should see "Previous: Tip of the Iceberg" in "_site/tutorials/lets-roll.html"
+    And I should see "Next: Dive-In and Publish Already!" in "_site/tutorials/lets-roll.html"
+
+  Scenario: Manually sort some entries
+    Given I have an "index.html" page that contains "Collections: {{ site.tutorials | map: 'title' | join: ', ' }}"
+    And I have fixture collections
+    And I have a _layouts directory
+    And I have a "_layouts/tutorial.html" file with content:
+    """
+    {% if page.previous %}Previous: {{ page.previous.title }}{% endif %}
+
+    {% if page.next %}Next: {{ page.next.title }}{% endif %}
+    """
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      tutorials:
+        output: true
+        order:
+          - getting-started.md
+          - lets-roll.md
+          - dive-in-and-publish-already.md
+          - graduation-day.md
+
+    defaults:
+      - scope:
+          path: ""
+          type: tutorials
+        values:
+          layout: tutorial
+
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    Then the _site directory should exist
+    And I should see "Collections: Getting Started, Let's Roll!, Dive-In and Publish Already!, Graduation Day, Extending with Plugins, Tip of the Iceberg" in "_site/index.html"
+    And I should not see "Previous: Graduation Day" in "_site/tutorials/lets-roll.html"
+    And I should not see "Previous: Tip of the Iceberg" in "_site/tutorials/lets-roll.html"
+    And I should not see "Next: Tip of the Iceberg" in "_site/tutorials/lets-roll.html"
+    But I should see "Previous: Getting Started" in "_site/tutorials/lets-roll.html"
+    And I should see "Next: Dive-In and Publish Already!" in "_site/tutorials/lets-roll.html"
+
   Scenario: Rendered collection with date/dateless filename
     Given I have an "index.html" page that contains "Collections: {% for method in site.thanksgiving %}{{ method.title }} {% endfor %}"
     And I have fixture collections
diff --git a/features/collections_dir.feature b/features/collections_dir.feature
index 64c6f44ee6b..712b21175c8 100644
--- a/features/collections_dir.feature
+++ b/features/collections_dir.feature
@@ -283,3 +283,153 @@ Feature: Collections Directory
     And I should see "
    Loki: Manager: false
    " in "_site/index.html"
     And I should see "
    Loki: Recruit: false
    " in "_site/index.html"
     And I should see "
    Loki: Villain: false
    " in "_site/index.html"
+
+  Scenario: Sort all entries by a Front Matter key defined in all entries
+    Given I have an "index.html" page that contains "Collections: {{ site.tutorials | map: 'title' | join: ', ' }}"
+    And I have fixture collections in "gathering" directory
+    And I have a _layouts directory
+    And I have a "_layouts/tutorial.html" file with content:
+    """
+    {% if page.previous %}Previous: {{ page.previous.title }}{% endif %}
+
+    {% if page.next %}Next: {{ page.next.title }}{% endif %}
+    """
+    And I have a "_config.yml" file with content:
+    """
+    collections_dir: gathering
+    collections:
+      tutorials:
+        output: true
+        sort_by: lesson
+
+    defaults:
+      - scope:
+          path: ""
+          type: tutorials
+        values:
+          layout: tutorial
+
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    Then the _site directory should exist
+    And I should see "Collections: Getting Started, Let's Roll!, Dive-In and Publish Already!, Tip of the Iceberg, Extending with Plugins, Graduation Day" in "_site/index.html"
+    And I should not see "Previous: Graduation Day" in "_site/tutorials/lets-roll.html"
+    And I should not see "Next: Tip of the Iceberg" in "_site/tutorials/lets-roll.html"
+    But I should see "Previous: Getting Started" in "_site/tutorials/lets-roll.html"
+    And I should see "Next: Dive-In and Publish Already!" in "_site/tutorials/lets-roll.html"
+
+  Scenario: Sort all entries by a Front Matter key defined in only some entries
+    Given I have an "index.html" page that contains "Collections: {{ site.tutorials | map: 'title' | join: ', ' }}"
+    And I have fixture collections in "gathering" directory
+    And I have a _layouts directory
+    And I have a "_layouts/tutorial.html" file with content:
+    """
+    {% if page.previous %}Previous: {{ page.previous.title }}{% endif %}
+
+    {% if page.next %}Next: {{ page.next.title }}{% endif %}
+    """
+    And I have a "_config.yml" file with content:
+    """
+    collections_dir: gathering
+    collections:
+      tutorials:
+        output: true
+        sort_by: approx_time
+
+    defaults:
+    - scope:
+        path: ""
+        type: tutorials
+      values:
+        layout: tutorial
+
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    Then the _site directory should exist
+    And I should see "'approx_time' not defined" in the build output
+    And I should see "Collections: Extending with Plugins, Let's Roll!, Getting Started, Graduation Day, Dive-In and Publish Already!, Tip of the Iceberg" in "_site/index.html"
+    And I should see "Previous: Getting Started" in "_site/tutorials/graduation-day.html"
+    And I should see "Next: Dive-In and Publish Already!" in "_site/tutorials/graduation-day.html"
+
+  Scenario: Manually sort entries
+    Given I have an "index.html" page that contains "Collections: {{ site.tutorials | map: 'title' | join: ', ' }}"
+    And I have fixture collections in "gathering" directory
+    And I have a _layouts directory
+    And I have a "_layouts/tutorial.html" file with content:
+    """
+    {% if page.previous %}Previous: {{ page.previous.title }}{% endif %}
+
+    {% if page.next %}Next: {{ page.next.title }}{% endif %}
+    """
+    And I have a "_config.yml" file with content:
+    """
+    collections_dir: gathering
+    collections:
+      tutorials:
+        output: true
+        order:
+          - getting-started.md
+          - tip-of-the-iceberg.md
+          - lets-roll.md
+          - dive-in-and-publish-already.md
+          - graduation-day.md
+          - random-plugins.md
+
+    defaults:
+      - scope:
+          path: ""
+          type: tutorials
+        values:
+          layout: tutorial
+
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    Then the _site directory should exist
+    And I should see "Collections: Getting Started, Tip of the Iceberg, Let's Roll!, Dive-In and Publish Already!, Graduation Day, Extending with Plugins" in "_site/index.html"
+    And I should not see "Previous: Graduation Day" in "_site/tutorials/lets-roll.html"
+    And I should not see "Next: Tip of the Iceberg" in "_site/tutorials/lets-roll.html"
+    But I should see "Previous: Tip of the Iceberg" in "_site/tutorials/lets-roll.html"
+    And I should see "Next: Dive-In and Publish Already!" in "_site/tutorials/lets-roll.html"
+
+  Scenario: Manually sort some entries
+    Given I have an "index.html" page that contains "Collections: {{ site.tutorials | map: 'title' | join: ', ' }}"
+    And I have fixture collections in "gathering" directory
+    And I have a _layouts directory
+    And I have a "_layouts/tutorial.html" file with content:
+    """
+    {% if page.previous %}Previous: {{ page.previous.title }}{% endif %}
+
+    {% if page.next %}Next: {{ page.next.title }}{% endif %}
+    """
+    And I have a "_config.yml" file with content:
+    """
+    collections_dir: gathering
+    collections:
+      tutorials:
+        output: true
+        order:
+          - getting-started.md
+          - lets-roll.md
+          - dive-in-and-publish-already.md
+          - graduation-day.md
+
+    defaults:
+      - scope:
+          path: ""
+          type: tutorials
+        values:
+          layout: tutorial
+
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    Then the _site directory should exist
+    And I should see "Collections: Getting Started, Let's Roll!, Dive-In and Publish Already!, Graduation Day, Extending with Plugins, Tip of the Iceberg" in "_site/index.html"
+    And I should not see "Previous: Graduation Day" in "_site/tutorials/lets-roll.html"
+    And I should not see "Previous: Tip of the Iceberg" in "_site/tutorials/lets-roll.html"
+    And I should not see "Next: Tip of the Iceberg" in "_site/tutorials/lets-roll.html"
+    But I should see "Previous: Getting Started" in "_site/tutorials/lets-roll.html"
+    And I should see "Next: Dive-In and Publish Already!" in "_site/tutorials/lets-roll.html"
diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index fd05c68f406..fe5ade94387 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -178,9 +178,11 @@
 
 #
 
-Given(%r!^I have fixture collections$!) do
-  FileUtils.cp_r Paths.source_dir.join("test", "source", "_methods"), source_dir
-  FileUtils.cp_r Paths.source_dir.join("test", "source", "_thanksgiving"), source_dir
+Given(%r!^I have fixture collections(?: in "(.*)" directory)?$!) do |directory|
+  collections_dir = File.join(source_dir, directory.to_s)
+  FileUtils.cp_r Paths.source_dir.join("test", "source", "_methods"), collections_dir
+  FileUtils.cp_r Paths.source_dir.join("test", "source", "_thanksgiving"), collections_dir
+  FileUtils.cp_r Paths.source_dir.join("test", "source", "_tutorials"), collections_dir
 end
 
 #
diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index 88076f61a4d..41bbb70e97f 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -65,7 +65,7 @@ def read
           read_static_file(file_path, full_path)
         end
       end
-      docs.sort!
+      sort_docs!
     end
 
     # All the entries in this collection.
@@ -217,6 +217,78 @@ def read_document(full_path)
       docs << doc if site.unpublished || doc.published?
     end
 
+    def sort_docs!
+      if metadata["order"].is_a?(Array)
+        rearrange_docs!
+      elsif metadata["sort_by"].is_a?(String)
+        sort_docs_by_key!
+      else
+        docs.sort!
+      end
+    end
+
+    # A custom sort function based on Schwartzian transform
+    # Refer https://byparker.com/blog/2017/schwartzian-transform-faster-sorting/ for details
+    def sort_docs_by_key!
+      meta_key = metadata["sort_by"]
+      # Modify `docs` array to cache document's property along with the Document instance
+      docs.map! { |doc| [doc.data[meta_key], doc] }.sort! do |apples, olives|
+        order = determine_sort_order(meta_key, apples, olives)
+
+        # Fall back to `Document#<=>` if the properties were equal or were non-sortable
+        # Otherwise continue with current sort-order
+        if order.zero? || order.nil?
+          apples[-1] <=> olives[-1]
+        else
+          order
+        end
+
+        # Finally restore the `docs` array with just the Document objects themselves
+      end.map!(&:last)
+    end
+
+    def determine_sort_order(sort_key, apples, olives)
+      apple_property, apple_document = apples
+      olive_property, olive_document = olives
+
+      if apple_property.nil? && !olive_property.nil?
+        order_with_warning(sort_key, apple_document, 1)
+      elsif !apple_property.nil? && olive_property.nil?
+        order_with_warning(sort_key, olive_document, -1)
+      else
+        apple_property <=> olive_property
+      end
+    end
+
+    def order_with_warning(sort_key, document, order)
+      Jekyll.logger.warn "Sort warning:", "'#{sort_key}' not defined in #{document.relative_path}"
+      order
+    end
+
+    # Rearrange documents within the `docs` array as listed in the `metadata["order"]` array.
+    #
+    # Involves converting the two arrays into hashes based on relative_paths as keys first, then
+    # merging them to remove duplicates and finally retrieving the Document instances from the
+    # merged array.
+    def rearrange_docs!
+      docs_table   = {}
+      custom_order = {}
+
+      # pre-sort to normalize default array across platforms and then proceed to create a Hash
+      # from that sorted array.
+      docs.sort.each do |doc|
+        docs_table[doc.relative_path] = doc
+      end
+
+      metadata["order"].each do |entry|
+        custom_order[File.join(relative_directory, entry)] = nil
+      end
+
+      result = Jekyll::Utils.deep_merge_hashes(custom_order, docs_table).values
+      result.compact!
+      self.docs = result
+    end
+
     def read_static_file(file_path, full_path)
       relative_dir = Jekyll.sanitized_path(
         relative_directory,
diff --git a/test/source/_tutorials/dive-in-and-publish-already.md b/test/source/_tutorials/dive-in-and-publish-already.md
new file mode 100644
index 00000000000..d6a7397a517
--- /dev/null
+++ b/test/source/_tutorials/dive-in-and-publish-already.md
@@ -0,0 +1,9 @@
+---
+title: "Dive-In and Publish Already!"
+lesson: 3
+approx_time: 30 mins
+---
+
+Jekyll converts Markdown documents to HTML by default. Don't know what's Markdown?
+Read this [documentation](http://daringfireball.net/projects/markdown/)
+While you're at it, might as well learn about [Kramdown](https://kramdown.gettalong.org/)
diff --git a/test/source/_tutorials/extending-with-plugins.md b/test/source/_tutorials/extending-with-plugins.md
new file mode 100644
index 00000000000..03d2ea280c7
--- /dev/null
+++ b/test/source/_tutorials/extending-with-plugins.md
@@ -0,0 +1,9 @@
+---
+title: "Extending with Plugins"
+lesson: 5
+approx_time: 1 min
+---
+
+A lot can be accomplished by using Jekyll out-of-the-box. But a lot more can be achieved by using plugins that extend Jekyll's functionality. There are numerous plugins supported by the official team and many other third-party plugins provided by the Jekyll Community.
+
+Check this [documentation page](https://jekyllrb.com/docs/plugins/) dedicated to working with plugins.
diff --git a/test/source/_tutorials/getting-started.md b/test/source/_tutorials/getting-started.md
new file mode 100644
index 00000000000..cd9bbf85c01
--- /dev/null
+++ b/test/source/_tutorials/getting-started.md
@@ -0,0 +1,7 @@
+---
+title: "Getting Started"
+lesson: 1
+approx_time: 10 mins
+---
+
+The first thing you need is a working installation of Ruby. Install from [the official website](https://www.ruby-lang.org/en/documentation/installation/).
diff --git a/test/source/_tutorials/graduation-day.md b/test/source/_tutorials/graduation-day.md
new file mode 100644
index 00000000000..bfb8b28ebe8
--- /dev/null
+++ b/test/source/_tutorials/graduation-day.md
@@ -0,0 +1,10 @@
+---
+title: "Graduation Day"
+lesson: 6
+approx_time: 10 mins
+---
+
+Congratualtions! You now know enough to start Jekylling!
+
+Want to report a bug you found? Or give something back to the community?
+Head over to the [Jekyll Repo](https://github.com/jekyll/jekyll) at GitHub
diff --git a/test/source/_tutorials/lets-roll.md b/test/source/_tutorials/lets-roll.md
new file mode 100644
index 00000000000..0cfcfe8aa08
--- /dev/null
+++ b/test/source/_tutorials/lets-roll.md
@@ -0,0 +1,16 @@
+---
+title: "Let's Roll!"
+lesson: 2
+approx_time: 1 min
+---
+
+Now that you have installed Ruby, Jekyll and Bundler, lets get Jekylling!
+Enter the following in your terminal:
+
+    $ jekyll new my blog
+
+Then preview your new project in your browser right away by entering the following and pointing your browser to `http://localhost:4000` :
+
+    $ bundle exec jekyll serve
+
+Go ahead. Try it.
diff --git a/test/source/_tutorials/tip-of-the-iceberg.md b/test/source/_tutorials/tip-of-the-iceberg.md
new file mode 100644
index 00000000000..4dab1cf1e10
--- /dev/null
+++ b/test/source/_tutorials/tip-of-the-iceberg.md
@@ -0,0 +1,6 @@
+---
+title: "Tip of the Iceberg"
+lesson: 4
+---
+
+Now that you know some of the basics, learn more about working with [Jekyll](https://jekyllrb.com).
diff --git a/test/test_collections.rb b/test/test_collections.rb
index eb1eb0f6371..872cb5f33e6 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -179,6 +179,96 @@ class TestCollections < JekyllUnitTest
     end
   end
 
+  context "with a collection with metadata to sort items by attribute" do
+    setup do
+      @site = fixture_site(
+        "collections" => {
+          "methods"   => {
+            "output" => true,
+          },
+          "tutorials" => {
+            "output"  => true,
+            "sort_by" => "lesson",
+          },
+        }
+      )
+      @site.process
+      @tutorials_collection = @site.collections["tutorials"]
+
+      @actual_array = @tutorials_collection.docs.map(&:relative_path)
+    end
+
+    should "sort documents in a collection with 'sort_by' metadata set to a " \
+           "FrontMatter key 'lesson'" do
+      default_tutorials_array = %w(
+        _tutorials/dive-in-and-publish-already.md
+        _tutorials/extending-with-plugins.md
+        _tutorials/getting-started.md
+        _tutorials/graduation-day.md
+        _tutorials/lets-roll.md
+        _tutorials/tip-of-the-iceberg.md
+      )
+      tutorials_sorted_by_lesson_array = %w(
+        _tutorials/getting-started.md
+        _tutorials/lets-roll.md
+        _tutorials/dive-in-and-publish-already.md
+        _tutorials/tip-of-the-iceberg.md
+        _tutorials/extending-with-plugins.md
+        _tutorials/graduation-day.md
+      )
+      refute_equal default_tutorials_array, @actual_array
+      assert_equal tutorials_sorted_by_lesson_array, @actual_array
+    end
+  end
+
+  context "with a collection with metadata to rearrange items" do
+    setup do
+      @site = fixture_site(
+        "collections" => {
+          "methods"   => {
+            "output" => true,
+          },
+          "tutorials" => {
+            "output" => true,
+            "order"  => [
+              "getting-started.md",
+              "lets-roll.md",
+              "dive-in-and-publish-already.md",
+              "tip-of-the-iceberg.md",
+              "graduation-day.md",
+              "extending-with-plugins.md",
+            ],
+          },
+        }
+      )
+      @site.process
+      @tutorials_collection = @site.collections["tutorials"]
+
+      @actual_array = @tutorials_collection.docs.map(&:relative_path)
+    end
+
+    should "sort documents in a collection in the order outlined in the config file" do
+      default_tutorials_array = %w(
+        _tutorials/dive-in-and-publish-already.md
+        _tutorials/extending-with-plugins.md
+        _tutorials/getting-started.md
+        _tutorials/graduation-day.md
+        _tutorials/lets-roll.md
+        _tutorials/tip-of-the-iceberg.md
+      )
+      tutorials_rearranged_in_config_array = %w(
+        _tutorials/getting-started.md
+        _tutorials/lets-roll.md
+        _tutorials/dive-in-and-publish-already.md
+        _tutorials/tip-of-the-iceberg.md
+        _tutorials/graduation-day.md
+        _tutorials/extending-with-plugins.md
+      )
+      refute_equal default_tutorials_array, @actual_array
+      assert_equal tutorials_rearranged_in_config_array, @actual_array
+    end
+  end
+
   context "in safe mode" do
     setup do
       @site = fixture_site(

From 996431ba60dd743deeec6ff2a27fa8de1359ad90 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 16 Feb 2019 11:19:04 -0500
Subject: [PATCH 3473/4996] Update history to reflect merge of #7427 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b14c8b8a5b9..9b52d4d201a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -150,6 +150,7 @@
   * Ignore cache directory (#7184)
   * Incorporate `relative_url` filter in `link` tag (#6727)
   * Only read layouts from source_dir or theme_dir (#6788)
+  * Allow custom sorting of collection documents (#7427)
 
 ### Development Fixes
 

From dedfb0748f0059e98491901f6a86eedfb6eaafc0 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sat, 16 Feb 2019 22:01:14 +0530
Subject: [PATCH 3474/4996] Handle files with trailing dots in their basename
 (#7315)

Merge pull request 7315
---
 features/collections.feature                  | 22 +++++-----
 lib/jekyll/document.rb                        | 12 +++++-
 lib/jekyll/page.rb                            |  3 +-
 lib/jekyll/static_file.rb                     | 41 +++++++++++++++----
 test/source/_methods/trailing-dots...md       |  3 ++
 .../2018-10-12-trailing-dots...markdown       |  3 ++
 test/source/trailing-dots...md                |  3 ++
 test/test_collections.rb                      |  1 +
 test/test_document.rb                         | 19 +++++++++
 test/test_filters.rb                          |  4 +-
 test/test_page.rb                             |  5 +++
 test/test_site.rb                             |  1 +
 12 files changed, 93 insertions(+), 24 deletions(-)
 create mode 100644 test/source/_methods/trailing-dots...md
 create mode 100644 test/source/_posts/2018-10-12-trailing-dots...markdown
 create mode 100644 test/source/trailing-dots...md

diff --git a/features/collections.feature b/features/collections.feature
index 8ee1b41f4a5..387e6acd2cb 100644
--- a/features/collections.feature
+++ b/features/collections.feature
@@ -82,8 +82,8 @@ Feature: Collections
     When I run jekyll build
     Then I should get a zero exit status
     Then the _site directory should exist
-    And I should see "Collections: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" unless Windows
-    And I should see "Collections: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/yaml_with_dots.md" in "_site/index.html" if on Windows
+    And I should see "Collections: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/trailing-dots...md _methods/um_hi.md" in "_site/index.html" unless Windows
+    And I should see "Collections: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/trailing-dots...md _methods/yaml_with_dots.md" in "_site/index.html" if on Windows
 
   Scenario: Collections specified as an hash
     Given I have an "index.html" page that contains "Collections: {% for method in site.methods %}{{ method.relative_path }} {% endfor %}"
@@ -96,8 +96,8 @@ Feature: Collections
     When I run jekyll build
     Then I should get a zero exit status
     Then the _site directory should exist
-    And I should see "Collections: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" unless Windows
-    And I should see "Collections: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/yaml_with_dots.md" in "_site/index.html" if on Windows
+    And I should see "Collections: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/trailing-dots...md _methods/um_hi.md" in "_site/index.html" unless Windows
+    And I should see "Collections: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/trailing-dots...md _methods/yaml_with_dots.md" in "_site/index.html" if on Windows
 
   Scenario: Rendered collection with document with future date
     Given I have a _puppies directory
@@ -377,8 +377,8 @@ Feature: Collections
     When I run jekyll build
     Then I should get a zero exit status
     Then the _site directory should exist
-    And I should see "All documents: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" unless Windows
-    And I should see "All documents: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/yaml_with_dots.md" in "_site/index.html" if on Windows
+    And I should see "All documents: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/trailing-dots...md _methods/um_hi.md" in "_site/index.html" unless Windows
+    And I should see "All documents: _methods/3940394-21-9393050-fifif1323-test.md _methods/collection/entries _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/trailing-dots...md _methods/yaml_with_dots.md" in "_site/index.html" if on Windows
 
   Scenario: Documents have an output attribute, which is the converted HTML
     Given I have an "index.html" page that contains "Second document's output: {{ site.documents[2].output }}"
@@ -407,7 +407,7 @@ Feature: Collections
     And I should see "Item count: 2" in "_site/index.html"
 
   Scenario: Sort by title
-    Given I have an "index.html" page that contains "{% assign items = site.methods | sort: 'title' %}2. of {{ items.size }}: {{ items[1].output }}"
+    Given I have an "index.html" page that contains "{% assign items = site.methods | sort: 'title' %}2. of {{ items.size }}: {{ items[2].output }}"
     And I have fixture collections
     And I have a "_config.yml" file with content:
     """
@@ -417,8 +417,8 @@ Feature: Collections
     When I run jekyll build
     Then I should get a zero exit status
     And the _site directory should exist
-    And I should see "2. of 9: 
    Page without title.
    " in "_site/index.html" unless Windows
-    And I should see "2. of 8: 
    Page without title.
    " in "_site/index.html" if on Windows
+    And I should see "2. of 10: 
    Page without title.
    " in "_site/index.html" unless Windows
+    And I should see "2. of 9: 
    Page without title.
    " in "_site/index.html" if on Windows
 
   Scenario: Sort by relative_path
     Given I have an "index.html" page that contains "Collections: {% assign methods = site.methods | sort: 'relative_path' %}{{ methods | map:"title" | join: ", " }}"
@@ -431,8 +431,8 @@ Feature: Collections
     When I run jekyll build
     Then I should get a zero exit status
     Then the _site directory should exist
-    And I should see "Collections: this is a test!, Collection#entries, Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, Site#generate, YAML with Dots" in "_site/index.html" unless Windows
-    And I should see "Collections: this is a test!, Collection#entries, Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, YAML with Dots" in "_site/index.html" if on Windows
+    And I should see "Collections: this is a test!, Collection#entries, Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, Ellipsis Path, Site#generate, YAML with Dots" in "_site/index.html" unless Windows
+    And I should see "Collections: this is a test!, Collection#entries, Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, Ellipsis Path, YAML with Dots" in "_site/index.html" if on Windows
 
   Scenario: Sort all entries by a Front Matter key defined in all entries
     Given I have an "index.html" page that contains "Collections: {{ site.tutorials | map: 'title' | join: ', ' }}"
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 30cecee256b..48124f50584 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -119,15 +119,19 @@ def basename
     #   and with the collection's directory removed as well.
     # This method is useful when building the URL of the document.
     #
+    # NOTE: `String#gsub` removes all trailing periods (in comparison to `String#chomp`)
+    #
     # Examples:
-    #   When relative_path is "_methods/site/generate.md":
+    #   When relative_path is "_methods/site/generate...md":
     #     cleaned_relative_path
     #     # => "/site/generate"
     #
     # Returns the cleaned relative path of the document.
     def cleaned_relative_path
       @cleaned_relative_path ||=
-        relative_path[0..-extname.length - 1].sub(collection.relative_directory, "")
+        relative_path[0..-extname.length - 1]
+          .sub(collection.relative_directory, "")
+          .gsub(%r!\.*\z!, "")
     end
 
     # Determine whether the document is a YAML file.
@@ -483,6 +487,10 @@ def populate_title
         slug, ext = Regexp.last_match.captures
       end
 
+      # slugs shouldn't end with a period
+      # `String#gsub!` removes all trailing periods (in comparison to `String#chomp!`)
+      slug.gsub!(%r!\.*\z!, "")
+
       # Try to ensure the user gets a title.
       data["title"] ||= Utils.titleize_slug(slug)
       # Only overwrite slug & ext if they aren't specified.
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 8e516255b9c..c777044cd39 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -116,10 +116,11 @@ def url_placeholders
     #
     # name - The String filename of the page file.
     #
+    # NOTE: `String#gsub` removes all trailing periods (in comparison to `String#chomp`)
     # Returns nothing.
     def process(name)
       self.ext = File.extname(name)
-      self.basename = name[0..-ext.length - 1]
+      self.basename = name[0..-ext.length - 1].gsub(%r!\.*\z!, "")
     end
 
     # Add any necessary layouts to this post
diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index 80d992c19da..0dce964049e 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -54,7 +54,8 @@ def path
     #
     # Returns destination file path.
     def destination(dest)
-      @site.in_dest_dir(*[dest, destination_rel_dir, @name].compact)
+      dest = @site.in_dest_dir(dest)
+      @site.in_dest_dir(dest, Jekyll::URL.unescape_path(url))
     end
 
     def destination_rel_dir
@@ -99,7 +100,6 @@ def write?
     # Returns false if the file was not modified since last time (no-op).
     def write(dest)
       dest_path = destination(dest)
-
       return false if File.exist?(dest_path) && !modified?
 
       self.class.mtimes[path] = mtime
@@ -115,33 +115,58 @@ def to_liquid
       @to_liquid ||= Drops::StaticFileDrop.new(self)
     end
 
+    # Generate "basename without extension" and strip away any trailing periods.
+    # NOTE: `String#gsub` removes all trailing periods (in comparison to `String#chomp`)
     def basename
-      File.basename(name, extname)
+      @basename ||= File.basename(name, extname).gsub(%r!\.*\z!, "")
     end
 
     def placeholders
       {
         :collection => @collection.label,
-        :path       => relative_path[
-          @collection.relative_directory.size..relative_path.size],
+        :path       => cleaned_relative_path,
         :output_ext => "",
         :name       => "",
         :title      => "",
       }
     end
 
+    # Similar to Jekyll::Document#cleaned_relative_path.
+    # Generates a relative path with the collection's directory removed when applicable
+    #   and additionally removes any multiple periods in the string.
+    #
+    # NOTE: `String#gsub!` removes all trailing periods (in comparison to `String#chomp!`)
+    #
+    # Examples:
+    #   When `relative_path` is "_methods/site/my-cool-avatar...png":
+    #     cleaned_relative_path
+    #     # => "/site/my-cool-avatar"
+    #
+    # Returns the cleaned relative path of the static file.
+    def cleaned_relative_path
+      @cleaned_relative_path ||= begin
+        cleaned = relative_path[0..-extname.length - 1]
+        cleaned.gsub!(%r!\.*\z!, "")
+        cleaned.sub!(@collection.relative_directory, "") if @collection
+        cleaned
+      end
+    end
+
     # Applies a similar URL-building technique as Jekyll::Document that takes
     # the collection's URL template into account. The default URL template can
     # be overriden in the collection's configuration in _config.yml.
     def url
-      @url ||= if @collection.nil?
-                 relative_path
+      @url ||= begin
+        base = if @collection.nil?
+                 cleaned_relative_path
                else
-                 ::Jekyll::URL.new(
+                 Jekyll::URL.new(
                    :template     => @collection.url_template,
                    :placeholders => placeholders
                  )
                end.to_s.chomp("/")
+        base << extname
+      end
     end
 
     # Returns the type of the collection if present, nil otherwise.
diff --git a/test/source/_methods/trailing-dots...md b/test/source/_methods/trailing-dots...md
new file mode 100644
index 00000000000..2ec72a7f4a0
--- /dev/null
+++ b/test/source/_methods/trailing-dots...md
@@ -0,0 +1,3 @@
+---
+title: Ellipsis Path
+---
diff --git a/test/source/_posts/2018-10-12-trailing-dots...markdown b/test/source/_posts/2018-10-12-trailing-dots...markdown
new file mode 100644
index 00000000000..2ec72a7f4a0
--- /dev/null
+++ b/test/source/_posts/2018-10-12-trailing-dots...markdown
@@ -0,0 +1,3 @@
+---
+title: Ellipsis Path
+---
diff --git a/test/source/trailing-dots...md b/test/source/trailing-dots...md
new file mode 100644
index 00000000000..2ec72a7f4a0
--- /dev/null
+++ b/test/source/trailing-dots...md
@@ -0,0 +1,3 @@
+---
+title: Ellipsis Path
+---
diff --git a/test/test_collections.rb b/test/test_collections.rb
index 872cb5f33e6..65f8b9640b0 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -140,6 +140,7 @@ class TestCollections < JekyllUnitTest
           _methods/escape-+\ #%20[].md
           _methods/yaml_with_dots.md
           _methods/3940394-21-9393050-fifif1323-test.md
+          _methods/trailing-dots...md
         ), doc.relative_path
       end
     end
diff --git a/test/test_document.rb b/test/test_document.rb
index d9757a10bb1..1e1354183d5 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -114,6 +114,25 @@ def setup_document_with_dates(filename)
       assert_nil next_next_doc["previous"]["output"]
     end
 
+    context "with the basename (without extension) ending with dot(s)" do
+      setup do
+        @site = fixture_site("collections" => ["methods"])
+        @site.process
+        @document = @site.collections["methods"].docs.detect do |d|
+          d.relative_path == "_methods/trailing-dots...md"
+        end
+      end
+
+      should "render into the proper url" do
+        assert_equal "/methods/trailing-dots.html", @document.url
+
+        trailing_dots_doc = @site.posts.docs.detect do |d|
+          d.relative_path == "_posts/2018-10-12-trailing-dots...markdown"
+        end
+        assert_equal "/2018/10/12/trailing-dots.html", trailing_dots_doc.url
+      end
+    end
+
     context "with YAML ending in three dots" do
       setup do
         @site = fixture_site("collections" => ["methods"])
diff --git a/test/test_filters.rb b/test/test_filters.rb
index c007dc868a4..fcdc02085e7 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -811,7 +811,7 @@ def to_liquid
               "The list of grouped items for '' is not an Array."
             )
             # adjust array.size to ignore symlinked page in Windows
-            qty = Utils::Platforms.really_windows? ? 14 : 15
+            qty = Utils::Platforms.really_windows? ? 15 : 16
             assert_equal qty, g["items"].size
           end
         end
@@ -1031,7 +1031,7 @@ def to_liquid
               "The list of grouped items for '' is not an Array."
             )
             # adjust array.size to ignore symlinked page in Windows
-            qty = Utils::Platforms.really_windows? ? 14 : 15
+            qty = Utils::Platforms.really_windows? ? 15 : 16
             assert_equal qty, g["items"].size
           end
         end
diff --git a/test/test_page.rb b/test/test_page.rb
index a34a5694530..16aa3ff90f3 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -35,6 +35,11 @@ def do_render(page)
         assert_equal "/contacts.html", @page.url
       end
 
+      should "create proper URL from filename" do
+        @page = setup_page("trailing-dots...md")
+        assert_equal "/trailing-dots.html", @page.url
+      end
+
       should "not published when published yaml is false" do
         @page = setup_page("unpublished.html")
         assert_equal false, @page.published?
diff --git a/test/test_site.rb b/test/test_site.rb
index 0463823a309..f18c9a96801 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -239,6 +239,7 @@ def generate(site)
         properties.html
         sitemap.xml
         static_files.html
+        trailing-dots...md
       )
       unless Utils::Platforms.really_windows?
         # files in symlinked directories may appear twice

From d2adfb3cbbdcd28f4b972901042bea9b052bb493 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 16 Feb 2019 11:31:16 -0500
Subject: [PATCH 3475/4996] Update history to reflect merge of #7315 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9b52d4d201a..7e5f9ddd563 100644
--- a/History.markdown
+++ b/History.markdown
@@ -208,6 +208,7 @@
   * Dont write static files from unrendered collection (#7410)
   * Excerpt handling of custom and intermediate tags (#7382)
   * changed future post loglevel to warn to help user narrow down issues (#7527)
+  * Handle files with trailing dots in their basename (#7315)
 
 ### feature
 

From 9f46819606823f74249cd2468abbd7133a0e947f Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 17 Feb 2019 12:49:46 +0530
Subject: [PATCH 3476/4996] There are 59 test posts now

---
 test/test_generated_site.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index c9b3595cdcb..3b469f82ab6 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -16,7 +16,7 @@ class TestGeneratedSite < JekyllUnitTest
     end
 
     should "ensure post count is as expected" do
-      assert_equal 58, @site.posts.size
+      assert_equal 59, @site.posts.size
     end
 
     should "insert site.posts into the index" do

From 33a55d7f65915f9197dc26d8953ac690943f27db Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 17 Feb 2019 13:57:54 +0530
Subject: [PATCH 3477/4996] Add dummy content to appease classifier-reborn

Removes the following noise from test logs:

```
Input: '' is entirely stopwords or words with 2 or fewer characters.
Classifier-Reborn cannot handle this document properly.
```
---
 test/source/_posts/2018-10-12-trailing-dots...markdown | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/source/_posts/2018-10-12-trailing-dots...markdown b/test/source/_posts/2018-10-12-trailing-dots...markdown
index 2ec72a7f4a0..ceaaa3303e1 100644
--- a/test/source/_posts/2018-10-12-trailing-dots...markdown
+++ b/test/source/_posts/2018-10-12-trailing-dots...markdown
@@ -1,3 +1,5 @@
 ---
 title: Ellipsis Path
 ---
+
+Lorem ipsum dolor sit amet

From 98dc27b0ab0a55a21b6fc0db6fc7ac601d1855a7 Mon Sep 17 00:00:00 2001
From: Ananthakumar 
Date: Mon, 18 Feb 2019 19:56:02 +0530
Subject: [PATCH 3478/4996] Added formX to form-backend resources (#7536)

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

diff --git a/docs/pages/resources.md b/docs/pages/resources.md
index d17776c1ac5..5afe12e00dc 100644
--- a/docs/pages/resources.md
+++ b/docs/pages/resources.md
@@ -60,6 +60,7 @@ Use a SaaS service as a backend for functionality on your Jekyll site
   - [Formingo](https://www.formingo.co/guides/jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=Jekyll%20Documentation)
   - [FormKeep](https://formkeep.com/guides/contact-form-jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=contact-form-jekyll)
   - [Formspree (open source)](https://formspree.io/)
+  - [formX](https://formx.stream)
   - [Simple Form](https://getsimpleform.com/)
 
 ### Search

From 8319501415936b4ab106f943d1a8847daa0b6130 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 18 Feb 2019 09:26:05 -0500
Subject: [PATCH 3479/4996] Update history to reflect merge of #7536 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7e5f9ddd563..c0aa5e94c0c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -102,6 +102,7 @@
   * Fix typo in tutorial for converting existing site (#7524)
   * Add CloudSh to resource page. (#7497)
   * Docs: check if var exists before include tag (#7530)
+  * Added formX to form-backend resources (#7536)
 
 ### Minor Enhancements
 

From 6df8808cbcbed6232f52b1257f7528813250b4da Mon Sep 17 00:00:00 2001
From: Paul Kim 
Date: Tue, 19 Feb 2019 00:46:09 -0800
Subject: [PATCH 3480/4996] Clarify docs on collections regarding the need for
 front matter (#7538)

Merge pull request 7538
---
 docs/_docs/collections.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index 3b01d28c69c..f951564ea5f 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -44,7 +44,10 @@ collections:
 Create a corresponding folder (e.g. `/_staff_members`) and add
 documents. Front matter is processed if the front matter exists, and everything
 after the front matter is pushed into the document's `content` attribute. If no front
-matter is provided, Jekyll will not generate the file in your collection.
+matter is provided, Jekyll will consider it to be a [static file](/docs/static-files/)
+and copy it to the destination (e.g. `_site`) without processing. If front matter
+is provided, Jekyll will process the file in your collection but will not write to disk
+unless `output: true` is set in the collection's metadata.
 
 For example here's how you would add a staff member to the collection set above.
 The filename is `./_staff_members/jane.md` with the following content:

From fac57981d3365cd1d5367abe7c1a7cc6326bb8ad Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 19 Feb 2019 03:46:12 -0500
Subject: [PATCH 3481/4996] Update history to reflect merge of #7538 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c0aa5e94c0c..33a4a759ac7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -103,6 +103,7 @@
   * Add CloudSh to resource page. (#7497)
   * Docs: check if var exists before include tag (#7530)
   * Added formX to form-backend resources (#7536)
+  * Clarify docs on collections regarding the need for front matter (#7538)
 
 ### Minor Enhancements
 

From 091b5bd6976ae549ffc34eff3216d824f8c0fe87 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Tue, 19 Feb 2019 22:24:18 +0530
Subject: [PATCH 3482/4996] Always exclude certain paths from being processed
 (#7188)

Merge pull request 7188
---
 docs/_docs/upgrading/3-to-4.md      | 45 +++++++++++++-
 features/site_configuration.feature | 93 ++++++++++++++++++++++++-----
 lib/jekyll/configuration.rb         | 22 +++++--
 lib/jekyll/entry_filter.rb          |  2 +-
 lib/jekyll/reader.rb                | 22 +++++++
 lib/site_template/_config.yml       | 14 ++++-
 test/test_configuration.rb          | 29 +++++++--
 7 files changed, 198 insertions(+), 29 deletions(-)

diff --git a/docs/_docs/upgrading/3-to-4.md b/docs/_docs/upgrading/3-to-4.md
index 9ccb776d6e4..de4418f92a2 100644
--- a/docs/_docs/upgrading/3-to-4.md
+++ b/docs/_docs/upgrading/3-to-4.md
@@ -19,6 +19,7 @@ If you're using Ruby >= 2.3.0, go ahead and fetch the latest version of Jekyll:
 gem update jekyll
 ```
 
+---
 
 ### Template rendering
 
@@ -40,7 +41,6 @@ You'll therefore have to ensure that *`payload`* is not memoized or cached in yo
 * If its a requirement that `template` you get from the above step *be different* at all times,
 you can invoke *`Liquid::Template`* directly:
 
-
   ```diff
   - template = site.liquid_renderer.file(path).parse(content)
   + template = Liquid::Template.parse(content)
@@ -48,4 +48,47 @@ you can invoke *`Liquid::Template`* directly:
 
 ---
 
+### Exclusion changes
+
+We've enhanced our default exclusion array. It now looks like the following:
+
+```yaml
+# default excludes
+exclude:
+- .sass-cache/
+- .jekyll-cache/
+- gemfiles/
+- Gemfile
+- Gemfile.lock
+- node_modules/
+- vendor/bundle/
+- vendor/cache/
+- vendor/gems/
+- vendor/ruby/
+```
+
+What's new is that this array **does not get overridden by the `exclude` array
+in the user's config file anymore**. The user's exclude entries simply get
+**added** to the above default array (if the entry isn't already excluded).
+
+To forcibly "process" directories or files that have been excluded, list them
+in the `include` array instead:
+
+```yaml
+# overrides your excluded items configuration and the default include array ([".htaccess"])
+include:
+  - .htaccess
+  - node_modules/uglifier/index.js
+```
+
+The above configuration directs Jekyll to handle only `node_modules/uglifier/index.js`
+while ignoring every other file in the `node_modules` directory since that directory is
+"excluded" by default.
+
+Note that the default `include` array still gets overridden by the `include` array in your
+config file. So, be sure to add `.htaccess` to the list if you need that file to be
+present in the generated site.
+
+---
+
 *Did we miss something? Please click "Improve this page" above and add a section. Thanks!*
diff --git a/features/site_configuration.feature b/features/site_configuration.feature
index b2f88440f91..0778c676199 100644
--- a/features/site_configuration.feature
+++ b/features/site_configuration.feature
@@ -48,7 +48,7 @@ Feature: Site configuration
     And I have a configuration file with "exclude" set to "['Rakefile', 'README']"
     When I run jekyll build
     Then I should see "I want to be included" in "_site/index.html"
-    And the "_site/Gemfile" file should exist
+    And the "_site/Gemfile" file should not exist
     And the "_site/Rakefile" file should not exist
     And the "_site/README" file should not exist
 
@@ -56,6 +56,7 @@ Feature: Site configuration
     Given I have an "Rakefile" file that contains "I want to be excluded"
     And I have an "README" file that contains "I want to be excluded"
     And I have an "index.html" file that contains "I want to be included"
+    And I have a "Gemfile" file that contains "gem 'include-me'"
     And I have a configuration file with "exclude" set to:
       | value    |
       | README   |
@@ -64,6 +65,83 @@ Feature: Site configuration
     Then I should see "I want to be included" in "_site/index.html"
     And the "_site/Rakefile" file should not exist
     And the "_site/README" file should not exist
+    And the "_site/Gemfile" file should not exist
+
+  Scenario: Copy over excluded files when their directory is explicitly included
+    Given I have a ".gitignore" file that contains ".DS_Store"
+    And I have an ".htaccess" file that contains "SomeDirective"
+    And I have a "Gemfile" file that contains "gem 'include-me'"
+    And I have a node_modules directory
+    And I have a "node_modules/bazinga.js" file that contains "var c = 'Bazinga!';"
+    And I have a "node_modules/warning.js" file that contains "var w = 'Winter is coming!';"
+    And I have a configuration file with "include" set to:
+      | value        |
+      | .gitignore   |
+      | .foo         |
+      | Gemfile      |
+      | node_modules |
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And the "_site/.htaccess" file should not exist
+    But I should see ".DS_Store" in "_site/.gitignore"
+    And I should see "gem 'include-me'" in "_site/Gemfile"
+    And I should see "var c = 'Bazinga!';" in "_site/node_modules/bazinga.js"
+    And I should see "var w = 'Winter is coming!';" in "_site/node_modules/warning.js"
+
+  Scenario: Copy over excluded files only when they are explicitly included
+    Given I have a ".gitignore" file that contains ".DS_Store"
+    And I have an ".htaccess" file that contains "SomeDirective"
+    And I have a node_modules directory
+    And I have a "node_modules/bazinga.js" file that contains "var c = 'Bazinga!';"
+    And I have a "node_modules/warning.js" file that contains "var w = 'Winter is coming!';"
+    And I have a configuration file with "include" set to:
+      | value                   |
+      | .gitignore              |
+      | .foo                    |
+      | node_modules/bazinga.js |
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And the "_site/.htaccess" file should not exist
+    But I should see ".DS_Store" in "_site/.gitignore"
+    And I should see "var c = 'Bazinga!';" in "_site/node_modules/bazinga.js"
+    But the "_site/node_modules/warning.js" file should not exist
+
+  Scenario: Copy over excluded wild-card files only when they are explicitly included
+    Given I have a ".gitignore" file that contains ".DS_Store"
+    And I have an ".htaccess" file that contains "SomeDirective"
+    And I have an "foo.txt" file that contains "Lorem Ipsum"
+    And I have an "index.md" page that contains "{{ site.title }}"
+    And I have an "about.md" page that contains "{{ site.author }}"
+    And I have a configuration file with:
+      | key      | value        |
+      | title    | Barren Site  |
+      | author   | John Doe     |
+      | exclude  | ["**"]       |
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And the "_site/.gitignore" file should not exist
+    And the "_site/foo.txt" file should not exist
+    And the "_site/index.html" file should not exist
+    And the "_site/about.html" file should not exist
+    But the "_site/.htaccess" file should exist
+    Given I have a configuration file with:
+      | key      | value        |
+      | title    | Barren Site  |
+      | author   | John Doe     |
+      | exclude  | ["**"]       |
+      | include  | ["about.md"] |
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And the "_site/.gitignore" file should not exist
+    And the "_site/foo.txt" file should not exist
+    And the "_site/index.html" file should not exist
+    And the "_site/.htaccess" file should not exist
+    But the "_site/about.html" file should exist
+    And I should see "John Doe" in "_site/about.html"
 
   Scenario: Use Kramdown for markup
     Given I have an "index.markdown" page that contains "[Google](https://www.google.com)"
@@ -196,19 +274,6 @@ Feature: Site configuration
     And the "_site/2009/04/01/oranges.html" file should exist
     And the "_site/2009/03/27/apples.html" file should not exist
 
-  Scenario: Copy over normally excluded files when they are explicitly included
-    Given I have a ".gitignore" file that contains ".DS_Store"
-    And I have an ".htaccess" file that contains "SomeDirective"
-    And I have a configuration file with "include" set to:
-      | value      |
-      | .gitignore |
-      | .foo       |
-    When I run jekyll build
-    Then I should get a zero exit status
-    And the _site directory should exist
-    And I should see ".DS_Store" in "_site/.gitignore"
-    And the "_site/.htaccess" file should not exist
-
   Scenario: Using a different layouts directory
     Given I have a _theme directory
     And I have a page theme that contains "Page Layout: {{ site.posts.size }} on {{ site.time | date: "%Y-%m-%d" }}"
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index bd63bb91090..759ddae9a93 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -19,10 +19,7 @@ class Configuration < Hash
       # Handling Reading
       "safe"                => false,
       "include"             => [".htaccess"],
-      "exclude"             => %w(
-        Gemfile Gemfile.lock node_modules vendor/bundle/ vendor/cache/ vendor/gems/
-        vendor/ruby/
-      ),
+      "exclude"             => [],
       "keep_files"          => [".git", ".svn"],
       "encoding"            => "utf-8",
       "markdown_ext"        => "markdown,mkdown,mkdn,mkd,md",
@@ -92,7 +89,7 @@ class << self
       # problems and backwards-compatibility.
       def from(user_config)
         Utils.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys)
-          .add_default_collections
+          .add_default_collections.add_default_excludes
       end
     end
 
@@ -270,6 +267,21 @@ def add_default_collections
       config
     end
 
+    DEFAULT_EXCLUDES = %w(
+      .sass-cache .jekyll-cache
+      gemfiles Gemfile Gemfile.lock
+      node_modules
+      vendor/bundle/ vendor/cache/ vendor/gems/ vendor/ruby/
+    ).freeze
+
+    def add_default_excludes
+      config = clone
+      return config if config["exclude"].nil?
+
+      config["exclude"].concat(DEFAULT_EXCLUDES).uniq!
+      config
+    end
+
     def renamed_key(old, new, config, _ = nil)
       if config.key?(old)
         Jekyll::Deprecator.deprecation_message "The '#{old}' configuration" \
diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb
index 95f95c2a7c0..5f34cf82c21 100644
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -56,7 +56,7 @@ def backup?(entry)
     end
 
     def excluded?(entry)
-      glob_include?(site.exclude, relative_to_source(entry)).tap do |excluded|
+      glob_include?(site.exclude - site.include, relative_to_source(entry)).tap do |excluded|
         if excluded
           Jekyll.logger.debug(
             "EntryFilter:",
diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index c50ad78a762..18730ab3800 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -14,6 +14,7 @@ def initialize(site)
     def read
       @site.layouts = LayoutReader.new(site).read
       read_directories
+      read_included_excludes
       sort_files!
       @site.data = DataReader.new(site).read(site.config["data_dir"])
       CollectionReader.new(site).read
@@ -158,5 +159,26 @@ def outside_configured_directory?(dir)
     def post_reader
       @post_reader ||= PostReader.new(site)
     end
+
+    def read_included_excludes
+      site.include.each do |entry|
+        next if entry == ".htaccess"
+
+        entry_path = site.in_source_dir(entry)
+        next if File.directory?(entry_path)
+
+        read_included_file(entry_path) if File.file?(entry_path)
+      end
+    end
+
+    def read_included_file(entry_path)
+      dir  = File.dirname(entry_path).sub(site.source, "")
+      file = Array(File.basename(entry_path))
+      if Utils.has_yaml_header?(entry_path)
+        site.pages.concat(PageReader.new(site, dir).read(file))
+      else
+        site.static_files.concat(StaticFileReader.new(site, dir).read(file))
+      end
+    end
   end
 end
diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
index 876310ac0c8..60e14aa7734 100644
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -35,12 +35,20 @@ plugins:
   - jekyll-feed
 
 # Exclude from processing.
-# The following items will not be processed, by default. Create a custom list
-# to override the default setting.
+# The following items will not be processed, by default.
+# Any item listed under the `exclude:` key here will be automatically added to
+# the internal "default list".
+#
+# Excluded items can be processed by explicitly listing the directories or
+# their entries' file path in the `include:` list.
+#
 # exclude:
+#   - .sass-cache/
+#   - .jekyll-cache/
+#   - gemfiles/
 #   - Gemfile
 #   - Gemfile.lock
-#   - node_modules
+#   - node_modules/
 #   - vendor/bundle/
 #   - vendor/cache/
 #   - vendor/gems/
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index c49a48e53cd..f09c4a093e4 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -41,20 +41,39 @@ class TestConfiguration < JekyllUnitTest
     end
   end
 
-  context "the defaults" do
-    should "exclude node_modules" do
-      assert_includes Configuration.from({})["exclude"], "node_modules"
+  context "the effective site configuration" do
+    setup do
+      @config = Configuration.from(
+        "exclude" => %w(
+          README.md Licence
+        )
+      )
+    end
+
+    should "always exclude node_modules" do
+      assert_includes @config["exclude"], "node_modules"
     end
 
-    should "exclude ruby vendor directories" do
-      exclude = Configuration.from({})["exclude"]
+    should "always exclude Gemfile and related paths" do
+      exclude = @config["exclude"]
       assert_includes exclude, "Gemfile"
       assert_includes exclude, "Gemfile.lock"
+      assert_includes exclude, "gemfiles"
+    end
+
+    should "always exclude ruby vendor directories" do
+      exclude = @config["exclude"]
       assert_includes exclude, "vendor/bundle/"
       assert_includes exclude, "vendor/cache/"
       assert_includes exclude, "vendor/gems/"
       assert_includes exclude, "vendor/ruby/"
     end
+
+    should "always exclude default cache directories" do
+      exclude = @config["exclude"]
+      assert_includes exclude, ".sass-cache"
+      assert_includes exclude, ".jekyll-cache"
+    end
   end
 
   context "#add_default_collections" do

From bbc2e1469e17b2b5ab7b6e249114ff06ef4e1b8f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 19 Feb 2019 11:54:20 -0500
Subject: [PATCH 3483/4996] Update history to reflect merge of #7188 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 33a4a759ac7..16011a78308 100644
--- a/History.markdown
+++ b/History.markdown
@@ -153,6 +153,7 @@
   * Incorporate `relative_url` filter in `link` tag (#6727)
   * Only read layouts from source_dir or theme_dir (#6788)
   * Allow custom sorting of collection documents (#7427)
+  * Always exclude certain paths from being processed (#7188)
 
 ### Development Fixes
 

From c36f2485567778af7a8444938cd0870916d4b291 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 19 Feb 2019 22:15:30 +0100
Subject: [PATCH 3484/4996] bump Rubocop

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index d4ef7a66621..a5e73b39955 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.64.0"
+  gem "rubocop", "~> 0.65.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__)
   gem "test-theme-symlink", :path => File.expand_path("test/fixtures/test-theme-symlink", __dir__)

From 0fef05e161bd5b911d95cfaeb29198c3d60da7dd Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 20 Feb 2019 13:04:38 +0530
Subject: [PATCH 3485/4996] Lock RuboCop on Windows to v0.64.x temporarily

---
 Gemfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index a5e73b39955..6fbbfd4310a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,9 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.65.0"
+  # Temporary lock on RuboCop version for Windows since Pysch-3.1.0 is not available
+  # for use on Ruby 2.6-mingw32 platforms
+  gem "rubocop", "~> 0.64.0" if Gem.win_platform?
   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__)
   gem "test-theme-symlink", :path => File.expand_path("test/fixtures/test-theme-symlink", __dir__)

From 2786d67be5bb1289f8e68e1290803fbeeaa81137 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 20 Feb 2019 13:15:54 +0530
Subject: [PATCH 3486/4996] Use rubocop-0.65.x on all platforms except Windows

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 6fbbfd4310a..6c1fb650778 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,7 @@ group :test do
   gem "rspec-mocks"
   # Temporary lock on RuboCop version for Windows since Pysch-3.1.0 is not available
   # for use on Ruby 2.6-mingw32 platforms
-  gem "rubocop", "~> 0.64.0" if Gem.win_platform?
+  gem "rubocop", Gem.win_platform? ? "~> 0.64.0" : "~> 0.65.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__)
   gem "test-theme-symlink", :path => File.expand_path("test/fixtures/test-theme-symlink", __dir__)

From 51d13669024822f431a13c2dcf0ad0b7e1ab2007 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 20 Feb 2019 13:49:34 +0530
Subject: [PATCH 3487/4996] Add a script to profile docs with CI (#7540)

Merge pull request 7540
---
 .travis.yml         |  5 ++++-
 appveyor.yml        |  4 +++-
 script/profile-docs | 10 ++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100755 script/profile-docs

diff --git a/.travis.yml b/.travis.yml
index cfb0c8a0076..1613d3b384f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-bundler_args: --without benchmark:site:development
+bundler_args: --without benchmark:development
 script: script/cibuild
 cache: bundler
 language: ruby
@@ -18,6 +18,9 @@ matrix:
     - rvm: *ruby1
       env: TEST_SUITE=default-site
       name: "🏠️ Default Site"
+    - rvm: *ruby1
+      env: TEST_SUITE=profile-docs
+      name: "Profile Docs"
   exclude:
     - rvm: *jruby
       env: TEST_SUITE=cucumber
diff --git a/appveyor.yml b/appveyor.yml
index b1f03c31661..796884441b2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,7 +11,7 @@ branches:
 build: off
 
 environment:
-  BUNDLE_WITHOUT: "benchmark:site:development"
+  BUNDLE_WITHOUT: "benchmark:development"
   matrix:
     - RUBY_FOLDER_VER: "26"
       TEST_SUITE: "test"
@@ -19,6 +19,8 @@ environment:
       TEST_SUITE: "cucumber"
     - RUBY_FOLDER_VER: "26"
       TEST_SUITE: "default-site"
+    - RUBY_FOLDER_VER: "26"
+      TEST_SUITE: "profile-docs"
     - RUBY_FOLDER_VER: "25"
       TEST_SUITE: "test"
     - RUBY_FOLDER_VER: "24"
diff --git a/script/profile-docs b/script/profile-docs
new file mode 100755
index 00000000000..234782677e1
--- /dev/null
+++ b/script/profile-docs
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+#
+# Build Jekyll's Documentation site in 'debug' mode and outputs the site's profile stats.
+# Helps detecting *hard* breaking-changes (`jekyll build` aborts) and optimizations
+# in the `build` process.
+#
+# Usage: bash script/profile-docs
+
+SOURCE_DIR=$PWD/docs
+bundle exec jekyll build -s $SOURCE_DIR -d $SOURCE_DIR/_site --profile --trace --verbose

From 2f94540f89a3162def0baaadfc7e19e9bf6c2689 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 20 Feb 2019 03:19:36 -0500
Subject: [PATCH 3488/4996] Update history to reflect merge of #7540 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 16011a78308..3ca5725957d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -194,6 +194,7 @@
   * Update rubocop to ~> 0.63.1 (#7489)
   * dev: update gemspec (#7425)
   * Test with Ruby 2.6 on AppVeyor [skip travis] (#7518)
+  * Add a script to profile docs with CI (#7540)
 
 ### Bug Fixes
 

From b975608cbbe556327c66684e6739bbce8a9cb08a Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 20 Feb 2019 13:51:37 +0530
Subject: [PATCH 3489/4996] Fix incorrect Windows path in themes.md [skip ci]
 (#7525)

Merge pull request 7525
---
 docs/_docs/themes.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index 174579a8b07..cb7563344b5 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -50,8 +50,16 @@ To locate a theme's files on your computer:
    ```sh
    # On MacOS
    open $(bundle show minima)
+
    # On Windows
-   explorer /usr/local/lib/ruby/gems/2.3.0/gems/minima-2.1.0
+   # First get the gem's installation path:
+   #
+   #   bundle show minima
+   #   => C:/Ruby24-x64/lib/ruby/gems/2.4.0/gems/minima-2.1.0
+   #
+   # then invoke explorer with above path, substituting `/` with `\`
+   explorer C:\Ruby24-x64\lib\ruby\gems\2.4.0\gems\minima-2.1.0
+
    # On Linux
    xdg-open $(bundle show minima)
    ```

From 25ad9375972d2a2a844ad22daf6e96f025961360 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 20 Feb 2019 03:21:39 -0500
Subject: [PATCH 3490/4996] Update history to reflect merge of #7525 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3ca5725957d..9972bfcd0f7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -104,6 +104,7 @@
   * Docs: check if var exists before include tag (#7530)
   * Added formX to form-backend resources (#7536)
   * Clarify docs on collections regarding the need for front matter (#7538)
+  * Fix incorrect Windows path in themes.md (#7525)
 
 ### Minor Enhancements
 

From 63b3739062bd18b0ee45e22a6a0620a725b85cef Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 20 Feb 2019 21:17:20 +0530
Subject: [PATCH 3491/4996] Add `Site#in_cache_dir` helper method (#7160)

Merge pull request 7160
---
 lib/jekyll/site.rb | 16 +++++++++++++++-
 test/test_site.rb  | 23 +++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 233ff413a68..7904a3932c5 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -2,7 +2,7 @@
 
 module Jekyll
   class Site
-    attr_reader   :source, :dest, :config
+    attr_reader   :source, :dest, :cache_dir, :config
     attr_accessor :layouts, :pages, :static_files, :drafts,
                   :exclude, :include, :lsi, :highlighter, :permalink_style,
                   :time, :future, :unpublished, :safe, :plugins, :limit_posts,
@@ -22,6 +22,8 @@ def initialize(config)
 
       self.config = config
 
+      @cache_dir       = in_source_dir(config["cache_dir"])
+
       @reader          = Reader.new(self)
       @regenerator     = Regenerator.new(self)
       @liquid_renderer = LiquidRenderer.new(self)
@@ -401,6 +403,18 @@ def in_dest_dir(*paths)
       end
     end
 
+    # Public: Prefix a given path with the cache directory.
+    #
+    # paths - (optional) path elements to a file or directory within the
+    #         cache directory
+    #
+    # Returns a path which is prefixed with the cache directory.
+    def in_cache_dir(*paths)
+      paths.reduce(cache_dir) do |base, path|
+        Jekyll.sanitized_path(base, path)
+      end
+    end
+
     # Public: The full path to the directory that houses all the collections registered
     # with the current site.
     #
diff --git a/test/test_site.rb b/test/test_site.rb
index f18c9a96801..15cebaf3ce6 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -85,6 +85,11 @@ def read_posts
       assert File.directory?(source_dir(".jekyll-cache", "Jekyll", "Cache"))
       assert File.directory?(source_dir(".jekyll-cache", "Jekyll", "Cache", "Jekyll--Cache"))
     end
+
+    should "use .jekyll-cache directory at source as cache_dir by default" do
+      site = Site.new(default_configuration)
+      assert_equal File.join(site.source, ".jekyll-cache"), site.cache_dir
+    end
   end
 
   context "creating sites" do
@@ -678,5 +683,23 @@ def convert(*_args)
         refute_equal mtime1, mtime2 # must be regenerated
       end
     end
+
+    context "#in_cache_dir method" do
+      setup do
+        @site = Site.new(
+          site_configuration(
+            "cache_dir" => "../../custom-cache-dir"
+          )
+        )
+      end
+
+      should "create sanitized paths within the cache directory" do
+        assert_equal File.join(@site.source, "custom-cache-dir"), @site.cache_dir
+        assert_equal(
+          File.join(@site.source, "custom-cache-dir", "foo.md.metadata"),
+          @site.in_cache_dir("../../foo.md.metadata")
+        )
+      end
+    end
   end
 end

From 4e24a460ae994beda96d09f85c554ad79a5f5032 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 20 Feb 2019 10:47:22 -0500
Subject: [PATCH 3492/4996] Update history to reflect merge of #7160 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9972bfcd0f7..2ac08caf8d3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -155,6 +155,7 @@
   * Only read layouts from source_dir or theme_dir (#6788)
   * Allow custom sorting of collection documents (#7427)
   * Always exclude certain paths from being processed (#7188)
+  * Add `Site#in_cache_dir` helper method (#7160)
 
 ### Development Fixes
 

From 13cbef42219fc3821f0a0a63d46923c9ce4b25cf Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 21 Feb 2019 02:23:13 +0530
Subject: [PATCH 3493/4996] Upgrade WinTZ utility to use TZInfo-2.0 (#7521)

Merge pull request 7521
---
 Gemfile                        |  8 ++++++--
 docs/_docs/upgrading/3-to-4.md | 15 +++++++++++++++
 lib/jekyll/commands/new.rb     | 10 ++++++++--
 lib/jekyll/utils/win_tz.rb     | 12 ++++++++----
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6c1fb650778..88d57beb2a6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -80,8 +80,12 @@ group :jekyll_optional_dependencies do
     gem "yajl-ruby", "~> 1.4"
   end
 
-  # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-  gem "tzinfo-data", :platforms => [:mingw, :mswin, :x64_mingw, :jruby]
+  # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
+  # and associated library
+  install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
+    gem "tzinfo", "~> 2.0"
+    gem "tzinfo-data"
+  end
 end
 
 #
diff --git a/docs/_docs/upgrading/3-to-4.md b/docs/_docs/upgrading/3-to-4.md
index de4418f92a2..cf4b7a167b6 100644
--- a/docs/_docs/upgrading/3-to-4.md
+++ b/docs/_docs/upgrading/3-to-4.md
@@ -46,6 +46,21 @@ you can invoke *`Liquid::Template`* directly:
   + template = Liquid::Template.parse(content)
   ```
 
+
+### Timezone in Windows
+
+Timezone handling for Jekyll on Windows now requires `tzinfo-2.0` and above.
+Simply add / update the gem listing in your `Gemfile`:
+
+```ruby
+# Gemfile
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+# and associated library.
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem "tzinfo", "~> 2.0"
+```
+
 ---
 
 ### Exclusion changes
diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index c6832d7bcc3..acf5c99d0f1 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -88,8 +88,14 @@ def gemfile_contents
             group :jekyll_plugins do
               gem "jekyll-feed", "~> 0.6"
             end
-            # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-            gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+            # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
+            # and associated library.
+            install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
+              gem "tzinfo", "~> 2.0"
+              gem "tzinfo-data"
+            end
+
             # Performance-booster for watching directories on Windows
             gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform?
 
diff --git a/lib/jekyll/utils/win_tz.rb b/lib/jekyll/utils/win_tz.rb
index 965cbc95be3..235b69b56b5 100644
--- a/lib/jekyll/utils/win_tz.rb
+++ b/lib/jekyll/utils/win_tz.rb
@@ -13,16 +13,20 @@ module WinTZ
       # Returns a string that ultimately re-defines ENV["TZ"] in Windows
       def calculate(timezone)
         External.require_with_graceful_fail("tzinfo") unless defined?(TZInfo)
-        tz = TZInfo::Timezone.get(timezone)
-        difference = Time.now.to_i - tz.now.to_i
+        difference = TZInfo::Timezone.get(timezone).now.utc_offset
         #
         # POSIX style definition reverses the offset sign.
         #   e.g. Eastern Standard Time (EST) that is 5Hrs. to the 'west' of Prime Meridian
         #   is denoted as:
         #     EST+5 (or) EST+05:00
         # Reference: http://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html
-        sign = difference.negative? ? "-" : "+"
-        offset = sign == "-" ? "+" : "-" unless difference.zero?
+        if difference.negative?
+          offset = "-"
+          sign   = "+"
+        else
+          offset = "+"
+          sign   = "-"
+        end
         #
         # convert the difference (in seconds) to hours, as a rational number, and perform
         # a modulo operation on it.

From 7ee2e26d6c9eb9523195521e8bece7908cf83eac Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 20 Feb 2019 15:53:15 -0500
Subject: [PATCH 3494/4996] Update history to reflect merge of #7521 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2ac08caf8d3..d1a6e3611e2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -134,6 +134,7 @@
   * Search Front matter defaults for Page objects with relative_path (#7261)
   * Support for binary operators in where_exp filter (#6998)
   * Configure cache_dir (#7232)
+  * Upgrade WinTZ utility to use TZInfo-2.0 (#7521)
 
 ### Major Enhancements
 

From d8c745ca30c91c3d8678c694b724bd6eac288cad Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 21 Feb 2019 17:06:35 +0530
Subject: [PATCH 3495/4996] Add missing divider in upgrading-guide [skip ci]

---
 docs/_docs/upgrading/3-to-4.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_docs/upgrading/3-to-4.md b/docs/_docs/upgrading/3-to-4.md
index cf4b7a167b6..0d9c3fea490 100644
--- a/docs/_docs/upgrading/3-to-4.md
+++ b/docs/_docs/upgrading/3-to-4.md
@@ -46,6 +46,7 @@ you can invoke *`Liquid::Template`* directly:
   + template = Liquid::Template.parse(content)
   ```
 
+---
 
 ### Timezone in Windows
 

From 9f7078d582ca399f94c6da27429a774841b53e0c Mon Sep 17 00:00:00 2001
From: Ben Otte 
Date: Tue, 26 Feb 2019 12:25:27 -0500
Subject: [PATCH 3496/4996] Fix Wiki link in README.markdown (#7549)

Updated sites link
---
 README.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index dedbcbe0882..d0f0c0c6be9 100644
--- a/README.markdown
+++ b/README.markdown
@@ -28,7 +28,7 @@ See: https://jekyllrb.com/philosophy
 
 * [Install](https://jekyllrb.com/docs/installation/) the gem
 * Read up about its [Usage](https://jekyllrb.com/docs/usage/) and [Configuration](https://jekyllrb.com/docs/configuration/)
-* Take a gander at some existing [Sites](https://wiki.github.com/jekyll/jekyll/sites)
+* Take a gander at some existing [Sites](https://github.com/jekyll/jekyll/wiki/sites)
 * [Fork](https://github.com/jekyll/jekyll/fork) and [Contribute](https://jekyllrb.com/docs/contributing/) your own modifications
 * Have questions? Check out our official forum community [Jekyll Talk](https://talk.jekyllrb.com/) or [`#jekyll` on irc.freenode.net](https://botbot.me/freenode/jekyll/)
 

From 5e7dc7b4d3267991b7926b1d5b5afd44dd5754f9 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 6 Mar 2019 13:15:56 +0530
Subject: [PATCH 3497/4996] Use jruby-openssl-0.10.1 in JRuby builds

---
 Gemfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 88d57beb2a6..5993c886fa9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,8 @@ group :test do
   gem "test-theme", :path => File.expand_path("test/fixtures/test-theme", __dir__)
   gem "test-theme-symlink", :path => File.expand_path("test/fixtures/test-theme-symlink", __dir__)
 
-  gem "jruby-openssl" if RUBY_ENGINE == "jruby"
+  # Temporarily lock to jruby-openssl-0.10.1 since JRuby 9.1 can't seem to load jruby-openssl-0.10.2
+  gem "jruby-openssl", "0.10.1" if RUBY_ENGINE == "jruby"
 end
 
 #

From 68e633a56ec712acde4b2527b6f00125b419997a Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 6 Mar 2019 16:30:24 +0530
Subject: [PATCH 3498/4996] Remove deprecated `sudo: false` in .travis.yml

https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1613d3b384f..96e8ede11c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ bundler_args: --without benchmark:development
 script: script/cibuild
 cache: bundler
 language: ruby
-sudo: false
 
 rvm:
   - &ruby1 2.6.0

From 633a2922d6165b9ab4c7894a5f1a44c202558fd9 Mon Sep 17 00:00:00 2001
From: Denis McDonald 
Date: Sat, 9 Mar 2019 17:03:58 +1100
Subject: [PATCH 3499/4996] Minor typographical suggestions

---
 docs/_docs/installation/macos.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md
index 658b4b61a8c..33f855630e1 100644
--- a/docs/_docs/installation/macos.md
+++ b/docs/_docs/installation/macos.md
@@ -25,11 +25,11 @@ export GEM_HOME=$HOME/gems
 export PATH=$HOME/gems/bin:$PATH
 ```
 
-Relaunch your terminal and run `gem env` to check that default gem paths point to you home directory by default.
+Relaunch your terminal and run `gem env` to check that default gem paths point to your home directory by default.
 
 ## Set up Ruby included with the OS
 
-Jekyll requires Ruby > 2.2.5 — we recommend that you run Ruby > 2.3 though, as more and more dependencies ask for that requirement. You're good to go on macOS Mojave 10.14:
+Jekyll requires Ruby > 2.2.5. We recommend that you run Ruby > 2.3 though, as more and more dependencies ask for that requirement. You're good to go on macOS Mojave 10.14:
 
 ```sh
 sw_vers -productVersion
@@ -47,7 +47,7 @@ gem install bundler jekyll
 
 ### Install latest stable Ruby with Homebrew {#brew}
 
-To run latest Ruby version you need to install it through [Homebrew](https://brew.sh).
+To run the latest Ruby version you need to install it through [Homebrew](https://brew.sh).
 
 ```sh
 # Install Homebrew

From 9c11c9a8a72d19d6636c539b0415908c8fb93430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ros=C3=A1rio=20Pereira=20Fernandes?=
 
Date: Sun, 10 Mar 2019 02:18:34 +0200
Subject: [PATCH 3500/4996] Update circleci.md

- correct minor typo
---
 docs/_docs/continuous-integration/circleci.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/continuous-integration/circleci.md b/docs/_docs/continuous-integration/circleci.md
index 8d18c08c71c..dbf70b88909 100644
--- a/docs/_docs/continuous-integration/circleci.md
+++ b/docs/_docs/continuous-integration/circleci.md
@@ -34,7 +34,7 @@ gem 'jekyll'
 gem 'html-proofer'
 ```
 
-CircleCI detects when `Gemfile` is present is will automatically run `bundle install` for you in the `dependencies` phase.
+CircleCI detects when `Gemfile` is present and will automatically run `bundle install` for you in the `dependencies` phase.
 
 ## 3. Testing
 

From 5fa93015a6f195e6ca436de470270693e93529af Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 10 Mar 2019 17:20:48 +0530
Subject: [PATCH 3501/4996] Revert Utils::WinTZ upgrade and lock to TZInfo-1.x
 (#7562)

Revert "Add missing divider in upgrading-guide"
This reverts commit d8c745ca30c91c3d8678c694b724bd6eac288cad.

Revert "Update history to reflect merge of #7521"
This reverts commit 7ee2e26d6c9eb9523195521e8bece7908cf83eac.

Revert "Upgrade WinTZ utility to use TZInfo-2.0"
This reverts commit 13cbef42219fc3821f0a0a63d46923c9ce4b25cf.

Lock use of `tzinfo` gem to v1.x
---
 Gemfile                        |  2 +-
 History.markdown               |  1 -
 docs/_docs/upgrading/3-to-4.md | 16 ----------------
 lib/jekyll/commands/new.rb     |  2 +-
 lib/jekyll/utils/win_tz.rb     | 12 ++++--------
 5 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5993c886fa9..4b238c00ab1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -84,7 +84,7 @@ group :jekyll_optional_dependencies do
   # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
   # and associated library
   install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
-    gem "tzinfo", "~> 2.0"
+    gem "tzinfo", "~> 1.2"
     gem "tzinfo-data"
   end
 end
diff --git a/History.markdown b/History.markdown
index d1a6e3611e2..2ac08caf8d3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -134,7 +134,6 @@
   * Search Front matter defaults for Page objects with relative_path (#7261)
   * Support for binary operators in where_exp filter (#6998)
   * Configure cache_dir (#7232)
-  * Upgrade WinTZ utility to use TZInfo-2.0 (#7521)
 
 ### Major Enhancements
 
diff --git a/docs/_docs/upgrading/3-to-4.md b/docs/_docs/upgrading/3-to-4.md
index 0d9c3fea490..de4418f92a2 100644
--- a/docs/_docs/upgrading/3-to-4.md
+++ b/docs/_docs/upgrading/3-to-4.md
@@ -48,22 +48,6 @@ you can invoke *`Liquid::Template`* directly:
 
 ---
 
-### Timezone in Windows
-
-Timezone handling for Jekyll on Windows now requires `tzinfo-2.0` and above.
-Simply add / update the gem listing in your `Gemfile`:
-
-```ruby
-# Gemfile
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-# and associated library.
-gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-gem "tzinfo", "~> 2.0"
-```
-
----
-
 ### Exclusion changes
 
 We've enhanced our default exclusion array. It now looks like the following:
diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index acf5c99d0f1..833447df021 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -92,7 +92,7 @@ def gemfile_contents
             # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
             # and associated library.
             install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
-              gem "tzinfo", "~> 2.0"
+              gem "tzinfo", "~> 1.2"
               gem "tzinfo-data"
             end
 
diff --git a/lib/jekyll/utils/win_tz.rb b/lib/jekyll/utils/win_tz.rb
index 235b69b56b5..965cbc95be3 100644
--- a/lib/jekyll/utils/win_tz.rb
+++ b/lib/jekyll/utils/win_tz.rb
@@ -13,20 +13,16 @@ module WinTZ
       # Returns a string that ultimately re-defines ENV["TZ"] in Windows
       def calculate(timezone)
         External.require_with_graceful_fail("tzinfo") unless defined?(TZInfo)
-        difference = TZInfo::Timezone.get(timezone).now.utc_offset
+        tz = TZInfo::Timezone.get(timezone)
+        difference = Time.now.to_i - tz.now.to_i
         #
         # POSIX style definition reverses the offset sign.
         #   e.g. Eastern Standard Time (EST) that is 5Hrs. to the 'west' of Prime Meridian
         #   is denoted as:
         #     EST+5 (or) EST+05:00
         # Reference: http://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html
-        if difference.negative?
-          offset = "-"
-          sign   = "+"
-        else
-          offset = "+"
-          sign   = "-"
-        end
+        sign = difference.negative? ? "-" : "+"
+        offset = sign == "-" ? "+" : "-" unless difference.zero?
         #
         # convert the difference (in seconds) to hours, as a rational number, and perform
         # a modulo operation on it.

From 12e7a35ea7634e227ec4221defd046fd27dbad05 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 10 Mar 2019 17:24:32 +0530
Subject: [PATCH 3502/4996] Update history to reflect merge of #7562 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2ac08caf8d3..8ff5fa4efb7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -134,6 +134,7 @@
   * Search Front matter defaults for Page objects with relative_path (#7261)
   * Support for binary operators in where_exp filter (#6998)
   * Configure cache_dir (#7232)
+  * Lock use of `tzinfo` gem to v1.x (#7521, #7562)
 
 ### Major Enhancements
 

From 37f5e5f459cdc75ff452aeeb57f3358bb46b4b72 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 11 Mar 2019 15:40:55 +0530
Subject: [PATCH 3503/4996] Improve handling sites without layouts (#7564)

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

diff --git a/docs/_docs/layouts.md b/docs/_docs/layouts.md
index 31b10875a65..053da0e561a 100644
--- a/docs/_docs/layouts.md
+++ b/docs/_docs/layouts.md
@@ -11,6 +11,20 @@ Layouts live in the `_layouts` directory. The convention is to have a base
 template called `default.html` and have other layouts [inherit](#inheritance)
 from this as needed.
 
+
    
+  
    Layouts Directory
    
+  
    
+    Jekyll looks for the _layouts directory either at the root of
+    your site's source or at the root of your theme.
+  
    
+  
    
+    While you can configure the directory name in which your layouts can reside by
+    setting the layouts_dir key in your config file, the directory
+    itself should be located at the root of your site's source directory.
+  
    
+
    
+
+
 ## Usage
 
 The first step is to put the template source code in `default.html`. `content`

From 7889d7d215eb24fc40e3502dad820ae6e199eddb Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 11 Mar 2019 06:10:57 -0400
Subject: [PATCH 3504/4996] Update history to reflect merge of #7564 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8ff5fa4efb7..5ad74a1191d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -105,6 +105,7 @@
   * Added formX to form-backend resources (#7536)
   * Clarify docs on collections regarding the need for front matter (#7538)
   * Fix incorrect Windows path in themes.md (#7525)
+  * Improve handling sites without layouts (#7564)
 
 ### Minor Enhancements
 

From bdbf35136ebd7b9f193568bd2728721ef5d020d2 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 11 Mar 2019 15:45:56 +0530
Subject: [PATCH 3505/4996] Correct entry in History.markdown [skip ci]

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

diff --git a/History.markdown b/History.markdown
index 5ad74a1191d..b0acf21f4de 100644
--- a/History.markdown
+++ b/History.markdown
@@ -105,7 +105,7 @@
   * Added formX to form-backend resources (#7536)
   * Clarify docs on collections regarding the need for front matter (#7538)
   * Fix incorrect Windows path in themes.md (#7525)
-  * Improve handling sites without layouts (#7564)
+  * Document where Jekyll looks for layouts in a site (#7564)
 
 ### Minor Enhancements
 

From b668eb015035209d81d5a73cbafd60c10e22a53a Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 15 Mar 2019 07:10:45 +0530
Subject: [PATCH 3506/4996] Fix unnecessary allocations via StaticFileReader
 (#7572)

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

diff --git a/lib/jekyll/readers/static_file_reader.rb b/lib/jekyll/readers/static_file_reader.rb
index 6bf07f5a0c3..3dcc175d78c 100644
--- a/lib/jekyll/readers/static_file_reader.rb
+++ b/lib/jekyll/readers/static_file_reader.rb
@@ -16,7 +16,7 @@ def initialize(site, dir)
     #
     # Returns an array of static files.
     def read(files)
-      files.map do |file|
+      files.each do |file|
         @unfiltered_content << StaticFile.new(@site, @site.source, @dir, file)
       end
       @unfiltered_content

From 475983537dda5326f4a16146321329912baeeb68 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 14 Mar 2019 21:40:47 -0400
Subject: [PATCH 3507/4996] Update history to reflect merge of #7572 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b0acf21f4de..febd603bf8a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -217,6 +217,7 @@
   * Excerpt handling of custom and intermediate tags (#7382)
   * changed future post loglevel to warn to help user narrow down issues (#7527)
   * Handle files with trailing dots in their basename (#7315)
+  * Fix unnecessary allocations via StaticFileReader (#7572)
 
 ### feature
 

From aea502745a567df3449cfe99c83ac02b2e5acc11 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 15 Mar 2019 21:40:48 +0530
Subject: [PATCH 3508/4996] Utilize absolute paths of user-provided file paths
 (#7450)

Merge pull request 7450
---
 lib/jekyll/commands/build.rb | 4 ++--
 lib/jekyll/configuration.rb  | 1 +
 test/test_configuration.rb   | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb
index 64ae6e05e4f..f0397678dd0 100644
--- a/lib/jekyll/commands/build.rb
+++ b/lib/jekyll/commands/build.rb
@@ -54,8 +54,8 @@ def process(options)
         # Returns nothing.
         def build(site, options)
           t = Time.now
-          source      = options["source"]
-          destination = options["destination"]
+          source      = File.expand_path(options["source"])
+          destination = File.expand_path(options["destination"])
           incremental = options["incremental"]
           Jekyll.logger.info "Source:", source
           Jekyll.logger.info "Destination:", destination
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 759ddae9a93..61c00017036 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -166,6 +166,7 @@ def config_files(override)
     #
     # Returns this configuration, overridden by the values in the file
     def read_config_file(file)
+      file = File.expand_path(file)
       next_config = safe_load_file(file)
       check_config_is_hash!(next_config, file)
       Jekyll.logger.info "Configuration file:", file
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index f09c4a093e4..4f20cd0fa52 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -190,7 +190,7 @@ class TestConfiguration < JekyllUnitTest
     end
 
     should "not raise an error on empty files" do
-      allow(SafeYAML).to receive(:load_file).with("empty.yml").and_return(false)
+      allow(SafeYAML).to receive(:load_file).with(File.expand_path("empty.yml")).and_return(false)
       Jekyll.logger.log_level = :warn
       @config.read_config_file("empty.yml")
       Jekyll.logger.log_level = :info
@@ -203,10 +203,10 @@ class TestConfiguration < JekyllUnitTest
     end
 
     should "continue to read config files if one is empty" do
-      allow(SafeYAML).to receive(:load_file).with("empty.yml").and_return(false)
+      allow(SafeYAML).to receive(:load_file).with(File.expand_path("empty.yml")).and_return(false)
       allow(SafeYAML)
         .to receive(:load_file)
-        .with("not_empty.yml")
+        .with(File.expand_path("not_empty.yml"))
         .and_return("foo" => "bar", "include" => "", "exclude" => "")
       Jekyll.logger.log_level = :warn
       read_config = @config.read_config_files(["empty.yml", "not_empty.yml"])

From d807deb64745885cd4b35727d171b75a0ddfb3d3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 12:10:50 -0400
Subject: [PATCH 3509/4996] Update history to reflect merge of #7450 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index febd603bf8a..28337b4109a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -136,6 +136,7 @@
   * Support for binary operators in where_exp filter (#6998)
   * Configure cache_dir (#7232)
   * Lock use of `tzinfo` gem to v1.x (#7521, #7562)
+  * Utilize absolute paths of user-provided file paths (#7450)
 
 ### Major Enhancements
 

From 36404b9a433fe5c4880cc487dbc0afa8ee12e7ca Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 15 Mar 2019 22:18:21 +0530
Subject: [PATCH 3510/4996] Refactor `highlight` tag to behave like the `raw`
 tag (#6821)

Merge pull request 6821
---
 features/highlighting.feature | 44 +++++++++++++++++++++++++++++++++++
 jekyll.gemspec                |  7 ++++++
 lib/jekyll/tags/highlight.rb  |  8 +++++--
 test/test_tags.rb             | 24 +++++++++++++++++++
 4 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/features/highlighting.feature b/features/highlighting.feature
index c9f2b00acec..09d7af57c14 100644
--- a/features/highlighting.feature
+++ b/features/highlighting.feature
@@ -31,3 +31,47 @@ Feature: Syntax Highlighting
     When I run jekyll build
     Then I should get a zero exit-status
     And I should see "RewriteCond" in "_site/index.html"
+
+  Scenario: highlighting an Liquid example
+    Given I have an "inspect.md" file with content:
+    """
+    ---
+    title: Inspect Filter
+    ---
+    You can inspect a page's attributes with the `inspect` filter. You may enclose the
+    entire introspection within `
    ` tags to preserve the formatting:
+    {% highlight html %}
+    
    +      {{ page | inspect }}
+    
    
+    {% endhighlight %}
+    """
+    When I run jekyll build
+    Then I should get a zero exit-status
+    And I should see "" in "_site/inspect.html"
+    And I should see "{{ page | inspect }}" in "_site/inspect.html"
+
+  Scenario: highlighting an included snippet
+    Given I have an _includes directory
+    And I have an "_includes/inspector.html" file with content:
+    """
+    
    +      {{ page | inspect }}
+    
    
+    """
+    And I have an "inspect.md" file with content:
+    """
+    ---
+    title: Inspect Filter
+    ---
+    You can inspect a page's attributes with the `inspect` filter. You may enclose the
+    entire introspection within `
    ` tags to preserve the formatting:
+    {% highlight html %}
+      {% include inspector.html %}
+    {% endhighlight %}
+    """
+    When I run jekyll build
+    Then I should get a zero exit-status
+    And I should see "" in "_site/inspect.html"
+    But I should not see "{{ page | inspect }}" in "_site/inspect.html"
+    But I should see "{% include inspector.html %}" in "_site/inspect.html"
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 65ae9667bf9..5ac0828b47b 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -52,6 +52,13 @@ Gem::Specification.new do |s|
       * Our `link` tag now comes with the `relative_url` filter incorporated into it.
         You should no longer prepend `{{ site.baseurl }}` to `{% link foo.md %}`
         For further details: https://github.com/jekyll/jekyll/pull/6727
+
+      * Our `highlight` tag no longer parses Liquid and Liquid-like constructs in the
+        tag's content body. While this means you no longer need to enclose the content
+        within a `{% raw %}{% endraw %}` block, it also means that you can no longer
+        do the following as well:
+        `{% highlight html %}{% include snippet.html %}{% endhighlight %}`
+        For further details: https://github.com/jekyll/jekyll/pull/6821
     ----------------------------------------------------------------------------------
   MSG
 end
diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index 51ebe470e11..a9310b3265b 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -2,7 +2,7 @@
 
 module Jekyll
   module Tags
-    class HighlightBlock < Liquid::Block
+    class HighlightBlock < Liquid::Raw
       include Liquid::StandardFilters
 
       # The regular expression syntax checker. Start with the language specifier.
@@ -28,10 +28,12 @@ def initialize(tag_name, markup, tokens)
         end
       end
 
+      LEADING_OR_TRAILING_LINE_TERMINATORS = %r!\A(\n|\r)+|(\n|\r)+\z!.freeze
+
       def render(context)
         prefix = context["highlighter_prefix"] || ""
         suffix = context["highlighter_suffix"] || ""
-        code = super.to_s.gsub(%r!\A(\n|\r)+|(\n|\r)+\z!, "")
+        code   = @body.gsub(LEADING_OR_TRAILING_LINE_TERMINATORS, "")
 
         output =
           case context.registers[:site].highlighter
@@ -101,6 +103,8 @@ def add_code_tag(code)
         "
    "\
         "#{code.chomp}
    "
       end
+
+      def ensure_valid_markup(tag_name, markup, parse_context); end
     end
   end
 end
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 59cd190d94e..3c54a7f0b6a 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -69,6 +69,30 @@ def highlight_block_with_opts(options_string)
     end
   end
 
+  context "highlight tag" do
+    setup do
+      create_post <<~CONTENT
+        ---
+        title: This is a test
+        ---
+
+        This is not yet highlighted
+
+        {% highlight html %}
+        
    {% unregistered_tag %}
    
+        {{ page | inspect }}
+        {% endhighlight %}
+
+        This should not be highlighted, right?
+      CONTENT
+    end
+
+    should "not parse Liquid constructs in the tag markup" do
+      assert_match "{% unregistered_tag %}", @result
+      assert_match "{{ page | inspect }}", @result
+    end
+  end
+
   context "highlight tag in unsafe mode" do
     should "set the no options with just a language name" do
       tag = highlight_block_with_opts("ruby ")

From 46be718ef60430b8d941dc227d8b8b1a9d686366 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 12:48:25 -0400
Subject: [PATCH 3511/4996] Update history to reflect merge of #6821 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 28337b4109a..9a87a60ea90 100644
--- a/History.markdown
+++ b/History.markdown
@@ -159,6 +159,7 @@
   * Allow custom sorting of collection documents (#7427)
   * Always exclude certain paths from being processed (#7188)
   * Add `Site#in_cache_dir` helper method (#7160)
+  * Refactor `highlight` tag to behave like the `raw` tag (#6821)
 
 ### Development Fixes
 

From b4dcdd42f8b0d97438457066154a1920cab46d68 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 15 Mar 2019 22:19:00 +0530
Subject: [PATCH 3512/4996] Cache globbed paths in front matter defaults
 (#7345)

Merge pull request 7345
---
 lib/jekyll/frontmatter_defaults.rb | 34 ++++++++++++++++++++----------
 lib/jekyll/site.rb                 |  4 ++++
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb
index 43b89451022..ef7d8339472 100644
--- a/lib/jekyll/frontmatter_defaults.rb
+++ b/lib/jekyll/frontmatter_defaults.rb
@@ -10,6 +10,11 @@ class FrontmatterDefaults
     # Initializes a new instance.
     def initialize(site)
       @site = site
+      reset
+    end
+
+    def reset
+      @glob_cache = {}
     end
 
     def update_deprecated_types(set)
@@ -98,28 +103,35 @@ def applies?(scope, path, type)
       applies_type?(scope, type) && applies_path?(scope, path)
     end
 
-    # rubocop:disable Metrics/AbcSize
     def applies_path?(scope, path)
       return true if !scope.key?("path") || scope["path"].empty?
 
       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)
 
       if scope["path"].to_s.include?("*")
-        Dir.glob(abs_scope_path).each do |scope_path|
-          scope_path = Pathname.new(scope_path).relative_path_from(site_path)
-          scope_path = strip_collections_dir(scope_path)
-          Jekyll.logger.debug "Globbed Scope Path:", scope_path
-          return true if path_is_subpath?(sanitized_path, scope_path)
-        end
-        false
+        glob_scope(sanitized_path, rel_scope_path)
       else
         path_is_subpath?(sanitized_path, strip_collections_dir(rel_scope_path))
       end
     end
-    # rubocop:enable Metrics/AbcSize
+
+    def glob_scope(sanitized_path, rel_scope_path)
+      site_source    = Pathname.new(@site.source)
+      abs_scope_path = site_source.join(rel_scope_path).to_s
+
+      glob_cache(abs_scope_path).each do |scope_path|
+        scope_path = Pathname.new(scope_path).relative_path_from(site_source)
+        scope_path = strip_collections_dir(scope_path)
+        Jekyll.logger.debug "Globbed Scope Path:", scope_path
+        return true if path_is_subpath?(sanitized_path, scope_path)
+      end
+      false
+    end
+
+    def glob_cache(path)
+      @glob_cache[path] ||= Dir.glob(path)
+    end
 
     def path_is_subpath?(path, parent_path)
       path.ascend do |ascended_path|
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 7904a3932c5..4eb88d07d3e 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -83,6 +83,8 @@ def print_stats
       Jekyll.logger.info @liquid_renderer.stats_table
     end
 
+    # rubocop:disable Metrics/MethodLength
+    #
     # Reset Site details.
     #
     # Returns nothing
@@ -104,12 +106,14 @@ def reset
       @regenerator.clear_cache
       @liquid_renderer.reset
       @site_cleaner = nil
+      frontmatter_defaults.reset
 
       raise ArgumentError, "limit_posts must be a non-negative number" if limit_posts.negative?
 
       Jekyll::Cache.clear_if_config_changed config
       Jekyll::Hooks.trigger :site, :after_reset, self
     end
+    # rubocop:enable Metrics/MethodLength
 
     # Load necessary libraries, plugins, converters, and generators.
     #

From d4b576000209439aaee20725fd65af2ab0028190 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 12:49:01 -0400
Subject: [PATCH 3513/4996] Update history to reflect merge of #7345 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9a87a60ea90..c988fa28e94 100644
--- a/History.markdown
+++ b/History.markdown
@@ -137,6 +137,7 @@
   * Configure cache_dir (#7232)
   * Lock use of `tzinfo` gem to v1.x (#7521, #7562)
   * Utilize absolute paths of user-provided file paths (#7450)
+  * Cache globbed paths in front matter defaults (#7345)
 
 ### Major Enhancements
 

From 3b4151b7735b29795d77b9e4bb01a9257813204c Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 15 Mar 2019 22:22:30 +0530
Subject: [PATCH 3514/4996] Cache computed item property (#7301)

Merge pull request 7301
---
 lib/jekyll/filters.rb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 23ad0cde30e..01fd0372a59 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -324,14 +324,18 @@ def sort_input(input, property, order)
     end
 
     def item_property(item, property)
-      if item.respond_to?(:to_liquid)
-        property.to_s.split(".").reduce(item.to_liquid) do |subvalue, attribute|
-          parse_sort_input(subvalue[attribute])
+      @item_property_cache ||= {}
+      @item_property_cache[property] ||= {}
+      @item_property_cache[property][item] ||= begin
+        if item.respond_to?(:to_liquid)
+          property.to_s.split(".").reduce(item.to_liquid) do |subvalue, attribute|
+            parse_sort_input(subvalue[attribute])
+          end
+        elsif item.respond_to?(:data)
+          parse_sort_input(item.data[property.to_s])
+        else
+          parse_sort_input(item[property.to_s])
         end
-      elsif item.respond_to?(:data)
-        parse_sort_input(item.data[property.to_s])
-      else
-        parse_sort_input(item[property.to_s])
       end
     end
 

From 3c231a41d2d3cd9a178986252b261132f6e95ac1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 12:52:32 -0400
Subject: [PATCH 3515/4996] Update history to reflect merge of #7301 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c988fa28e94..81a3323c7f7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -138,6 +138,7 @@
   * Lock use of `tzinfo` gem to v1.x (#7521, #7562)
   * Utilize absolute paths of user-provided file paths (#7450)
   * Cache globbed paths in front matter defaults (#7345)
+  * Cache computed item property (#7301)
 
 ### Major Enhancements
 

From 7ddaa9ffa1378af6b7909df580819142e5dea544 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 15 Mar 2019 22:23:40 +0530
Subject: [PATCH 3516/4996] Don't check if site URL is absolute if it is nil
 (#7498)

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

diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb
index 1cfc5f23360..d81ecefff81 100644
--- a/lib/jekyll/commands/doctor.rb
+++ b/lib/jekyll/commands/doctor.rb
@@ -161,7 +161,7 @@ def url_valid?(url)
         end
 
         def url_absolute(url)
-          return true if Addressable::URI.parse(url).absolute?
+          return true if url.is_a?(String) && Addressable::URI.parse(url).absolute?
 
           Jekyll.logger.warn "Warning:", "Your site URL does not seem to be absolute, "\
               "check the value of `url` in your config file."

From 67107f0ec5cda1798e32964b11ac8090706b16bb Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 12:53:42 -0400
Subject: [PATCH 3517/4996] Update history to reflect merge of #7498 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 81a3323c7f7..90545985950 100644
--- a/History.markdown
+++ b/History.markdown
@@ -222,6 +222,7 @@
   * changed future post loglevel to warn to help user narrow down issues (#7527)
   * Handle files with trailing dots in their basename (#7315)
   * Fix unnecessary allocations via StaticFileReader (#7572)
+  * Don't check if site URL is absolute if it is nil (#7498)
 
 ### feature
 

From 8ccb013f85cf995b328bd9e641d3d43a813d8941 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 15 Mar 2019 22:24:24 +0530
Subject: [PATCH 3518/4996] Use communicative method parameters (#7566)

Merge pull request 7566
---
 .rubocop.yml                         | 3 ---
 lib/jekyll/configuration.rb          | 2 +-
 lib/jekyll/converters/smartypants.rb | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 745a1232ba3..9f090dc471f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -92,9 +92,6 @@ Naming/MemoizedInstanceVariableName:
     - lib/jekyll/drops/site_drop.rb
     - lib/jekyll/drops/unified_payload_drop.rb
     - lib/jekyll/page_without_a_file.rb
-Naming/UncommunicativeMethodParamName:
-  AllowedNames:
-    - _
 Security/MarshalLoad:
   Exclude:
     - !ruby/regexp /test\/.*.rb$/
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 61c00017036..5cd3e284738 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -283,7 +283,7 @@ def add_default_excludes
       config
     end
 
-    def renamed_key(old, new, config, _ = nil)
+    def renamed_key(old, new, config)
       if config.key?(old)
         Jekyll::Deprecator.deprecation_message "The '#{old}' configuration" \
           " option has been renamed to '#{new}'. Please update your config" \
diff --git a/lib/jekyll/converters/smartypants.rb b/lib/jekyll/converters/smartypants.rb
index 59428dfc5ac..606afdc803b 100644
--- a/lib/jekyll/converters/smartypants.rb
+++ b/lib/jekyll/converters/smartypants.rb
@@ -37,7 +37,7 @@ def initialize(config)
       # ext - The String extension to check.
       #
       # Returns true if it matches, false otherwise.
-      def matches(_)
+      def matches(_ext)
         false
       end
 
@@ -46,7 +46,7 @@ def matches(_)
       # ext - The String extension or original file.
       #
       # Returns The String output file extension.
-      def output_ext(_)
+      def output_ext(_ext)
         nil
       end
 

From 9b3e5f9fc06598682b8a375828aaa1396db21830 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 12:54:26 -0400
Subject: [PATCH 3519/4996] Update history to reflect merge of #7566 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 90545985950..86310bc8b3b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -223,6 +223,7 @@
   * Handle files with trailing dots in their basename (#7315)
   * Fix unnecessary allocations via StaticFileReader (#7572)
   * Don't check if site URL is absolute if it is nil (#7498)
+  * Use communicative method parameters (#7566)
 
 ### feature
 

From da313bf883d2f285ae444066e55c2520c5c3bb93 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 15 Mar 2019 22:41:46 +0530
Subject: [PATCH 3520/4996] Avoid unnecessary duplication of pages array
 (#7272)

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

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 4eb88d07d3e..fbc03a4a119 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -512,7 +512,7 @@ def render_docs(payload)
     end
 
     def render_pages(payload)
-      pages.flatten.each do |page|
+      pages.each do |page|
         render_regenerated(page, payload)
       end
     end

From e451acca6ae042fec703c66bd4417c24028c525f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 13:11:48 -0400
Subject: [PATCH 3521/4996] Update history to reflect merge of #7272 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 86310bc8b3b..e9b3ffcec3c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -224,6 +224,7 @@
   * Fix unnecessary allocations via StaticFileReader (#7572)
   * Don't check if site URL is absolute if it is nil (#7498)
   * Use communicative method parameters (#7566)
+  * Avoid unnecessary duplication of pages array (#7272)
 
 ### feature
 

From 907477b9ca013d3770b5f906789885c116591346 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 15 Mar 2019 22:44:57 +0530
Subject: [PATCH 3522/4996] Escape valid special chars in a site's path name
 (#7568)

Merge pull request 7568
---
 features/rendering.feature    | 13 +++++++++++++
 lib/jekyll/liquid_renderer.rb |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/features/rendering.feature b/features/rendering.feature
index 4c4e28f6cf5..0b42d44ba27 100644
--- a/features/rendering.feature
+++ b/features/rendering.feature
@@ -5,6 +5,19 @@ Feature: Rendering
   But I want to make it as simply as possible
   So render with Liquid and place in Layouts
 
+  Scenario: Rendering a site with parentheses in its path name
+    Given I have a blank site in "omega(beta)"
+    And   I have an "omega(beta)/test.md" page with layout "simple" that contains "Hello World"
+    And   I have an omega(beta)/_includes directory
+    And   I have an "omega(beta)/_includes/head.html" file that contains "Snippet"
+    And   I have a configuration file with "source" set to "omega(beta)"
+    And   I have an omega(beta)/_layouts directory
+    And   I have an "omega(beta)/_layouts/simple.html" file that contains "{% include head.html %}: {{ content }}"
+    When  I run jekyll build --profile
+    Then  I should get a zero exit status
+    And   I should see "Snippet: 
    Hello World
    " in "_site/test.html"
+    And   I should see "_layouts/simple.html" in the build output
+
   Scenario: When receiving bad Liquid
     Given I have a "index.html" page with layout "simple" that contains "{% include invalid.html %}"
     And   I have a simple layout that contains "{{ content }}"
diff --git a/lib/jekyll/liquid_renderer.rb b/lib/jekyll/liquid_renderer.rb
index 986b7c5e65d..33df9d3c351 100644
--- a/lib/jekyll/liquid_renderer.rb
+++ b/lib/jekyll/liquid_renderer.rb
@@ -65,7 +65,9 @@ def cache
     private
 
     def filename_regex
-      @filename_regex ||= %r!\A(#{source_dir}/|#{theme_dir}/|/*)(.*)!i
+      @filename_regex ||= begin
+        %r!\A(#{Regexp.escape(source_dir)}/|#{Regexp.escape(theme_dir.to_s)}/|/*)(.*)!i
+      end
     end
 
     def new_profile_hash

From 4279bafff388ec415ef747f984776cca41eeeb3e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 13:14:59 -0400
Subject: [PATCH 3523/4996] Update history to reflect merge of #7568 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e9b3ffcec3c..5a9c97cbdaa 100644
--- a/History.markdown
+++ b/History.markdown
@@ -225,6 +225,7 @@
   * Don't check if site URL is absolute if it is nil (#7498)
   * Use communicative method parameters (#7566)
   * Avoid unnecessary duplication of pages array (#7272)
+  * Escape valid special chars in a site's path name (#7568)
 
 ### feature
 

From 5942ee46ae9e1bd1c5da968f318963030547f5f1 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 15 Mar 2019 22:50:15 +0530
Subject: [PATCH 3524/4996] Memoize Document#excerpt_separator (#7569)

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

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 48124f50584..3c2499dadd2 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -337,7 +337,7 @@ def write?
     #
     # Returns the document excerpt_separator
     def excerpt_separator
-      (data["excerpt_separator"] || site.config["excerpt_separator"]).to_s
+      @excerpt_separator ||= (data["excerpt_separator"] || site.config["excerpt_separator"]).to_s
     end
 
     # Whether to generate an excerpt

From 9ba6c7dd77d5f3bd0fdced9eefcaf3fda25926a3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 13:20:19 -0400
Subject: [PATCH 3525/4996] Update history to reflect merge of #7569 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5a9c97cbdaa..3eca675d468 100644
--- a/History.markdown
+++ b/History.markdown
@@ -139,6 +139,7 @@
   * Utilize absolute paths of user-provided file paths (#7450)
   * Cache globbed paths in front matter defaults (#7345)
   * Cache computed item property (#7301)
+  * Memoize Document#excerpt_separator (#7569)
 
 ### Major Enhancements
 

From 575f4b66de0326386f6185fa9e7f089c1d2e22e4 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 15 Mar 2019 22:57:41 +0530
Subject: [PATCH 3526/4996] Upgrade kramdown dependency to v2.x (#7492)

Merge pull request 7492
---
 Gemfile                                       |  3 +-
 docs/_docs/upgrading/3-to-4.md                | 47 +++++++++++++++++++
 features/collections.feature                  | 15 ++++++
 jekyll.gemspec                                |  3 +-
 lib/jekyll/configuration.rb                   |  1 +
 .../converters/markdown/kramdown_parser.rb    | 16 +++++++
 6 files changed, 82 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4b238c00ab1..aa611ad30d8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -63,14 +63,13 @@ end
 #
 
 group :jekyll_optional_dependencies do
-  gem "coderay", "~> 1.1.0"
   gem "jekyll-coffeescript"
   gem "jekyll-docs", :path => "../docs" if Dir.exist?("../docs") && ENV["JEKYLL_VERSION"]
   gem "jekyll-feed", "~> 0.9"
   gem "jekyll-gist"
   gem "jekyll-paginate"
   gem "jekyll-redirect-from"
-  gem "kramdown", "~> 1.14"
+  gem "kramdown-syntax-coderay"
   gem "mime-types", "~> 3.0"
   gem "rdoc", "~> 6.0"
   gem "tomlrb", "~> 1.2"
diff --git a/docs/_docs/upgrading/3-to-4.md b/docs/_docs/upgrading/3-to-4.md
index de4418f92a2..41c44fce5ca 100644
--- a/docs/_docs/upgrading/3-to-4.md
+++ b/docs/_docs/upgrading/3-to-4.md
@@ -91,4 +91,51 @@ present in the generated site.
 
 ---
 
+### kramdown v2
+
+Jekyll has dropped support for `kramdown-1.x` entirely.
+
+From [`v2.0` onwards](https://kramdown.gettalong.org/news.html#kramdown-200-released) kramdown requires
+specific extensions to be additionally installed to use certain features are desired outside of kramdown's
+core functionality.
+
+Out of all the extensions listed in the report linked above, gem `kramdown-parser-gfm` is automatically
+installed along with Jekyll 4.0. The remaining extensions will have to be manually installed by the user
+depending on desired funtionality, by listing the extension's gem-name in their `Gemfile`.
+
+Notes:
+  * `kramdown-converter-pdf` will be ignored by Jekyll Core. To have Jekyll convert Markdown to PDF
+    you'll have to depend on a plugin that subclasses `Jekyll::Converter` with the
+    [required methods]({% link _docs/plugins/converters.md %}).
+
+    For example:
+
+    ```ruby
+    module Jekyll
+      External.require_with_graceful_fail "kramdown-converter-pdf"
+
+      class Markdown2PDF < Converter
+        safe true
+        priority :low
+
+        def matches(ext)
+          # match only files that have an extension exactly ".markdown"
+          ext =~ /^\.markdown$/
+        end
+
+        def convert(content)
+          Kramdown::Document.new(content).to_pdf
+        end
+
+        def output_ext
+          ".pdf"
+        end
+      end
+    end
+    ```
+  * Vendors that provide a versioned Jekyll Environment Image (e.g. Docker Image, GitHub Pages, etc)
+    will have to manually whitelist kramdown's extension gems in their distributions for Jekyll 4.0.
+
+---
+
 *Did we miss something? Please click "Improve this page" above and add a section. Thanks!*
diff --git a/features/collections.feature b/features/collections.feature
index 387e6acd2cb..84677831d58 100644
--- a/features/collections.feature
+++ b/features/collections.feature
@@ -393,6 +393,21 @@ Feature: Collections
     Then the _site directory should exist
     And I should see "Second document's output: 
    Use Jekyll.configuration to build a full configuration for use w/Jekyll.
    \n\n
    Whatever: foo.bar
    " in "_site/index.html"
 
+  Scenario: Documents have an output attribute, which is the converted HTML based on site.config
+    Given I have an "index.html" page that contains "Second document's output: {{ site.documents[2].output }}"
+    And I have fixture collections
+    And I have a "_config.yml" file with content:
+    """
+    kramdown:
+      guess_lang: false
+    collections:
+    - methods
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    Then the _site directory should exist
+    And I should see "Second document's output: 
    Use Jekyll.configuration to build a full configuration for use w/Jekyll.
    \n\n
    Whatever: foo.bar
    " in "_site/index.html"
+
   Scenario: Filter documents by where
     Given I have an "index.html" page that contains "{% assign items = site.methods | where: 'whatever','foo.bar' %}Item count: {{ items.size }}"
     And I have fixture collections
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 5ac0828b47b..eb002038fb3 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -39,7 +39,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("i18n",                  ">= 0.9.5", "< 2")
   s.add_runtime_dependency("jekyll-sass-converter", "~> 1.0")
   s.add_runtime_dependency("jekyll-watch",          "~> 2.0")
-  s.add_runtime_dependency("kramdown",              "~> 1.14")
+  s.add_runtime_dependency("kramdown",              "~> 2.1")
+  s.add_runtime_dependency("kramdown-parser-gfm",   "~> 1.0")
   s.add_runtime_dependency("liquid",                "~> 4.0")
   s.add_runtime_dependency("mercenary",             "~> 0.3.3")
   s.add_runtime_dependency("pathutil",              "~> 0.9")
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 5cd3e284738..08d09fc8c4c 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -71,6 +71,7 @@ class Configuration < Hash
         "smart_quotes"  => "lsquo,rsquo,ldquo,rdquo",
         "input"         => "GFM",
         "hard_wrap"     => false,
+        "guess_lang"    => true,
         "footnote_nr"   => 1,
         "show_warnings" => false,
       },
diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index cdae8664a3f..6b78a5b99f4 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -18,6 +18,7 @@ def initialize(config)
           @config = config["kramdown"] || {}
           @highlighter = nil
           setup
+          load_dependencies
         end
 
         # Setup and normalize the configuration:
@@ -30,6 +31,7 @@ def initialize(config)
         def setup
           @config["syntax_highlighter"] ||= highlighter
           @config["syntax_highlighter_opts"] ||= {}
+          @config["syntax_highlighter_opts"]["guess_lang"] = @config["guess_lang"]
           @config["coderay"] ||= {} # XXX: Legacy.
           modernize_coderay_config
           make_accessible
@@ -48,6 +50,20 @@ def convert(content)
 
         private
 
+        def load_dependencies
+          require "kramdown-parser-gfm" if @config["input"] == "GFM"
+
+          if highlighter == "coderay"
+            Jekyll::External.require_with_graceful_fail("kramdown-syntax-coderay")
+          end
+
+          # `mathjax` emgine is bundled within kramdown-2.x and will be handled by
+          # kramdown itself.
+          if (math_engine = @config["math_engine"]) && math_engine != "mathjax"
+            Jekyll::External.require_with_graceful_fail("kramdown-math-#{math_engine}")
+          end
+        end
+
         def make_accessible(hash = @config)
           hash.keys.each do |key|
             hash[key.to_sym] = hash[key]

From 7f2412c145fba1937d7d5ab8ac683a157786c0c5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 13:27:43 -0400
Subject: [PATCH 3527/4996] Update history to reflect merge of #7492 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3eca675d468..b122b5b0ce6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -163,6 +163,7 @@
   * Always exclude certain paths from being processed (#7188)
   * Add `Site#in_cache_dir` helper method (#7160)
   * Refactor `highlight` tag to behave like the `raw` tag (#6821)
+  * Upgrade kramdown dependency to v2.x (#7492)
 
 ### Development Fixes
 

From 18f7a28168244354789a82dd44244a822ff9f60f Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 15 Mar 2019 23:00:39 +0530
Subject: [PATCH 3528/4996] Cleanup Markdown converter (#7519)

Merge pull request 7519
---
 lib/jekyll/converters/markdown.rb | 57 ++++++++++++++-----------------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb
index 284318cb227..da1f1ce605f 100644
--- a/lib/jekyll/converters/markdown.rb
+++ b/lib/jekyll/converters/markdown.rb
@@ -13,21 +13,22 @@ def setup
         return if @setup ||= false
 
         unless (@parser = get_processor)
-          Jekyll.logger.error "Invalid Markdown processor given:", @config["markdown"]
-          Jekyll.logger.info "", "Custom processors are not loaded in safe mode" if @config["safe"]
-          Jekyll.logger.error(
-            "",
-            "Available processors are: #{valid_processors.join(", ")}"
-          )
-          raise Errors::FatalException, "Bailing out; invalid Markdown processor."
+          if @config["safe"]
+            Jekyll.logger.warn "Build Warning:", "Custom processors are not loaded in safe mode"
+          end
+
+          Jekyll.logger.error "Markdown processor:",
+                              "#{@config["markdown"].inspect} is not a valid Markdown processor."
+          Jekyll.logger.error "", "Available processors are: #{valid_processors.join(", ")}"
+          Jekyll.logger.error ""
+          raise Errors::FatalException, "Invalid Markdown processor given: #{@config["markdown"]}"
         end
 
         @cache = Jekyll::Cache.new("Jekyll::Converters::Markdown")
-
         @setup = true
       end
 
-      # Rubocop does not allow reader methods to have names starting with `get_`
+      # 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 Naming/AccessorMethodName
@@ -40,29 +41,19 @@ def get_processor
       end
       # 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
-      # are not in safe mode.)
-
+      # Public: Provides you with a list of processors comprised of the ones we support internally
+      # and the ones that you have provided to us (if they're whitelisted for use in safe mode).
+      #
+      # Returns an array of symbols.
       def valid_processors
-        %w(kramdown) + third_party_processors
+        [:kramdown] + third_party_processors
       end
 
       # Public: A list of processors that you provide via plugins.
-      # This is really only available if you are not in safe mode, if you are
-      # in safe mode (re: GitHub) then there will be none.
-
+      #
+      # Returns an array of symbols
       def third_party_processors
-        self.class.constants - \
-          %w(KramdownParser PRIORITIES).map(
-            &:to_sym
-          )
-      end
-
-      def extname_list
-        @extname_list ||= @config["markdown_ext"].split(",").map do |e|
-          ".#{e.downcase}"
-        end
+        self.class.constants - [:KramdownParser, :PRIORITIES]
       end
 
       # Does the given extension match this converter's list of acceptable extensions?
@@ -96,6 +87,10 @@ def convert(content)
         end
       end
 
+      def extname_list
+        @extname_list ||= @config["markdown_ext"].split(",").map! { |e| ".#{e.downcase}" }
+      end
+
       private
 
       def custom_processor
@@ -108,12 +103,10 @@ def custom_processor
       #
       # parser_name - the name of the parser class
       #
-      # Returns true if the parser name contains only alphanumeric
-      # characters and is defined within Jekyll::Converters::Markdown
+      # Returns true if the parser name contains only alphanumeric characters and is defined
+      # within Jekyll::Converters::Markdown
       def custom_class_allowed?(parser_name)
-        parser_name !~ %r![^A-Za-z0-9_]! && self.class.constants.include?(
-          parser_name.to_sym
-        )
+        parser_name !~ %r![^A-Za-z0-9_]! && self.class.constants.include?(parser_name.to_sym)
       end
     end
   end

From 5b86a636b5ae3db5d8e2ac2138159ef56e976355 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 13:30:42 -0400
Subject: [PATCH 3529/4996] Update history to reflect merge of #7519 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b122b5b0ce6..bbcf4763966 100644
--- a/History.markdown
+++ b/History.markdown
@@ -140,6 +140,7 @@
   * Cache globbed paths in front matter defaults (#7345)
   * Cache computed item property (#7301)
   * Memoize Document#excerpt_separator (#7569)
+  * Cleanup Markdown converter (#7519)
 
 ### Major Enhancements
 

From 57a29800b6d4d3ed9e843a4bd51fd9e0daa0ae55 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Fri, 15 Mar 2019 18:31:54 +0100
Subject: [PATCH 3530/4996] Feat: drop ruby 2.3 (#7454)

Merge pull request 7454
---
 .travis.yml                 | 5 ++---
 appveyor.yml                | 4 ----
 jekyll.gemspec              | 2 +-
 test/test_commands_serve.rb | 7 +++----
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 96e8ede11c6..aa6e2289c9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,8 @@ language: ruby
 
 rvm:
   - &ruby1 2.6.0
-  - &ruby2 2.5.3
-  - &ruby3 2.3.8
-  - &jruby jruby-9.1.16.0
+  - &ruby2 2.4.5
+  - &jruby jruby-9.2.6.0
 
 matrix:
   include:
diff --git a/appveyor.yml b/appveyor.yml
index 796884441b2..d43f8a5f352 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,12 +21,8 @@ environment:
       TEST_SUITE: "default-site"
     - RUBY_FOLDER_VER: "26"
       TEST_SUITE: "profile-docs"
-    - RUBY_FOLDER_VER: "25"
-      TEST_SUITE: "test"
     - RUBY_FOLDER_VER: "24"
       TEST_SUITE: "test"
-    - RUBY_FOLDER_VER: "23"
-      TEST_SUITE: "test"
 
 install:
   - SET PATH=C:\Ruby%RUBY_FOLDER_VER%-x64\bin;%PATH%
diff --git a/jekyll.gemspec b/jekyll.gemspec
index eb002038fb3..66bcd7e0094 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.rdoc_options     = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w(README.markdown LICENSE)
 
-  s.required_ruby_version     = ">= 2.3.0"
+  s.required_ruby_version     = ">= 2.4.0"
   s.required_rubygems_version = ">= 2.7.0"
 
   s.add_runtime_dependency("addressable",           "~> 2.4")
diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb
index 2970efb614f..455eb703673 100644
--- a/test/test_commands_serve.rb
+++ b/test/test_commands_serve.rb
@@ -43,6 +43,9 @@ def serve(opts)
 
   context "using LiveReload" do
     setup do
+      skip_if_windows "EventMachine support on Windows is limited"
+      skip("Refinements are not fully supported in JRuby") if jruby?
+
       @temp_dir = Dir.mktmpdir("jekyll_livereload_test")
       @destination = File.join(@temp_dir, "_site")
       Dir.mkdir(@destination) || flunk("Could not make directory #{@destination}")
@@ -93,7 +96,6 @@ def serve(opts)
     end
 
     should "serve livereload.js over HTTP on the default LiveReload port" do
-      skip_if_windows "EventMachine support on Windows is limited"
       opts = serve(@standard_options)
       content = @client.get_content(
         "http://#{opts["host"]}:#{opts["livereload_port"]}/livereload.js"
@@ -102,7 +104,6 @@ def serve(opts)
     end
 
     should "serve nothing else over HTTP on the default LiveReload port" do
-      skip_if_windows "EventMachine support on Windows is limited"
       opts = serve(@standard_options)
       res = @client.get("http://#{opts["host"]}:#{opts["livereload_port"]}/")
       assert_equal(400, res.status_code)
@@ -110,7 +111,6 @@ def serve(opts)
     end
 
     should "insert the LiveReload script tags" do
-      skip_if_windows "EventMachine support on Windows is limited"
       opts = serve(@standard_options)
       content = @client.get_content(
         "http://#{opts["host"]}:#{opts["port"]}/#{opts["baseurl"]}/hello.html"
@@ -123,7 +123,6 @@ def serve(opts)
     end
 
     should "apply the max and min delay options" do
-      skip_if_windows "EventMachine support on Windows is limited"
       opts = serve(@standard_options.merge(
                      "livereload_max_delay" => "1066",
                      "livereload_min_delay" => "3"

From ec730657a785205be4102a596d55752e40f183e6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 13:31:57 -0400
Subject: [PATCH 3531/4996] Update history to reflect merge of #7454 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index bbcf4763966..bd77b06c13a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -165,6 +165,7 @@
   * Add `Site#in_cache_dir` helper method (#7160)
   * Refactor `highlight` tag to behave like the `raw` tag (#6821)
   * Upgrade kramdown dependency to v2.x (#7492)
+  * Feat: drop ruby 2.3 (#7454)
 
 ### Development Fixes
 

From 555722887d8c7c4af13b0cd6bd77d7ddd39b117d Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 15 Mar 2019 23:03:13 +0530
Subject: [PATCH 3532/4996] Replace `name` in Page#inspect with relative_path
 (#7434)

Merge pull request 7434
---
 lib/jekyll/page.rb               | 2 +-
 test/test_page_without_a_file.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index c777044cd39..e6d691c25dc 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -162,7 +162,7 @@ def destination(dest)
 
     # Returns the object as a debug String.
     def inspect
-      "#<#{self.class} @name=#{name.inspect}>"
+      "#<#{self.class} @relative_path=#{relative_path.inspect}>"
     end
 
     # Returns the Boolean of whether this Page is HTML or not.
diff --git a/test/test_page_without_a_file.rb b/test/test_page_without_a_file.rb
index 586103075d4..f06706962c2 100644
--- a/test/test_page_without_a_file.rb
+++ b/test/test_page_without_a_file.rb
@@ -34,7 +34,7 @@ def render_and_write
       end
 
       should "identify itself properly" do
-        assert_equal "#", @page.inspect
+        assert_equal '#', @page.inspect
       end
 
       should "not have page-content and page-data defined within it" do

From 226fa226521acc6dc45c09d71bfd835b4329d138 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 13:33:14 -0400
Subject: [PATCH 3533/4996] Update history to reflect merge of #7434 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index bd77b06c13a..4e7f97e8999 100644
--- a/History.markdown
+++ b/History.markdown
@@ -230,6 +230,7 @@
   * Use communicative method parameters (#7566)
   * Avoid unnecessary duplication of pages array (#7272)
   * Escape valid special chars in a site's path name (#7568)
+  * Replace `name` in Page#inspect with relative_path (#7434)
 
 ### feature
 

From 5fa01141cc367569184b7cb96a8033b8d67df35d Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Fri, 15 Mar 2019 18:33:54 +0100
Subject: [PATCH 3534/4996] docs: mention CommonMark plugins (#7418)

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

diff --git a/docs/_docs/configuration/markdown.md b/docs/_docs/configuration/markdown.md
index 304715260c4..16090618124 100644
--- a/docs/_docs/configuration/markdown.md
+++ b/docs/_docs/configuration/markdown.md
@@ -53,6 +53,12 @@ currently supported options:
 
 For more details about these options have a look at the [Kramdown configuration documentation](https://kramdown.gettalong.org/options.html). 
 
+### CommonMark
+
+[CommonMark](https://commonmark.org/) is a rationalized version of Markdown syntax, implemented in C and thus faster than default Kramdown implemented in Ruby. It [slightly differs](https://github.com/commonmark/CommonMark#differences-from-original-markdown) from original Markdown and does not support all the syntax elements implemented in Kramdown, like [Block Inline Attribute Lists](https://kramdown.gettalong.org/syntax.html#block-ials).
+
+It comes in two flavors: basic CommonMark with [jekyll-commonmark](https://github.com/jekyll/jekyll-commonmark) plugin and [GitHub Flavored Markdown supported by GitHub Pages](https://github.com/github/jekyll-commonmark-ghpages).
+
 ### Redcarpet
 
 Redcarpet can be configured by providing an `extensions` sub-setting, whose

From 757f47b21c2a8e2b1ee1fac68c8cab456fd54d6d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 13:33:56 -0400
Subject: [PATCH 3535/4996] Update history to reflect merge of #7418 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4e7f97e8999..33f7b1b0279 100644
--- a/History.markdown
+++ b/History.markdown
@@ -106,6 +106,7 @@
   * Clarify docs on collections regarding the need for front matter (#7538)
   * Fix incorrect Windows path in themes.md (#7525)
   * Document where Jekyll looks for layouts in a site (#7564)
+  * docs: mention CommonMark plugins (#7418)
 
 ### Minor Enhancements
 

From 2bdf1a53c40dc2eea8a939a61a411b723f909ed4 Mon Sep 17 00:00:00 2001
From: mo khan 
Date: Fri, 15 Mar 2019 11:35:01 -0600
Subject: [PATCH 3536/4996] Log a warning when the slug is empty (#7357)

Merge pull request 7357
---
 lib/jekyll/utils.rb | 1 +
 test/test_utils.rb  | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 1444058b99a..dc5eea2f619 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -222,6 +222,7 @@ def slugify(string, mode: nil, cased: false)
       slug.gsub!(%r!^\-|\-$!i, "")
 
       slug.downcase! unless cased
+      Jekyll.logger.warn("Warning:", "Empty `slug` generated for '#{string}'.") if slug.empty?
       slug
     end
 
diff --git a/test/test_utils.rb b/test/test_utils.rb
index 509f92e861d..8089f00675a 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -282,6 +282,11 @@ class TestUtils < JekyllUnitTest
         Utils.slugify("The _config.yml file?", :mode => "none", :cased => true)
       )
     end
+
+    should "records a warning in the log if the returned slug is empty" do
+      expect(Jekyll.logger).to receive(:warn)
+      assert_equal "", Utils.slugify("💎")
+    end
   end
 
   context "The \`Utils.titleize_slug\` method" do

From b71dffc3051844a0b28830fea9ce54e5811c548a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 13:35:04 -0400
Subject: [PATCH 3537/4996] Update history to reflect merge of #7357 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 33f7b1b0279..ae192fb49e5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -232,6 +232,7 @@
   * Avoid unnecessary duplication of pages array (#7272)
   * Escape valid special chars in a site's path name (#7568)
   * Replace `name` in Page#inspect with relative_path (#7434)
+  * Log a warning when the slug is empty (#7357)
 
 ### feature
 

From 238f1c5eaf65f09bfa79033f022a2a1fb89454b2 Mon Sep 17 00:00:00 2001
From: Michael Hiiva 
Date: Fri, 15 Mar 2019 10:36:48 -0700
Subject: [PATCH 3538/4996] Addresses bundle not found. (#7351)

Merge pull request 7351
---
 docs/_docs/deployment/automated.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/_docs/deployment/automated.md b/docs/_docs/deployment/automated.md
index d3efa6103ee..5f6300c11ab 100644
--- a/docs/_docs/deployment/automated.md
+++ b/docs/_docs/deployment/automated.md
@@ -36,6 +36,12 @@ Next, add the following lines to hooks/post-receive and be sure Jekyll is
 installed on the server:
 
 ```bash
+#!/bin/bash -l
+
+# Install Ruby Gems to ~/gems
+export GEM_HOME=$HOME/gems
+export PATH=$GEM_HOME/bin:$PATH
+
 GIT_REPO=$HOME/myrepo.git
 TMP_GIT_CLONE=$HOME/tmp/myrepo
 GEMFILE=$TMP_GIT_CLONE/Gemfile

From 5bc0ddd6d2f63ec25e7b5c0a8cdc353f1fdfe9d7 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 13:36:49 -0400
Subject: [PATCH 3539/4996] Update history to reflect merge of #7351 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ae192fb49e5..126396ace5a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -107,6 +107,7 @@
   * Fix incorrect Windows path in themes.md (#7525)
   * Document where Jekyll looks for layouts in a site (#7564)
   * docs: mention CommonMark plugins (#7418)
+  * Addresses bundle not found. (#7351)
 
 ### Minor Enhancements
 

From cc7978f3bc9645d5759e2481f73ac1886ea1e470 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 15 Mar 2019 23:08:12 +0530
Subject: [PATCH 3540/4996] Optimize Document::DATE_FILENAME_MATCHER to match
 valid filenames (#7292)

Merge pull request 7292
---
 lib/jekyll/document.rb                                    | 2 +-
 test/source/_posts/2013-03-19-not-a-post/dubious.markdown | 6 ++++++
 test/test_site.rb                                         | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 test/source/_posts/2013-03-19-not-a-post/dubious.markdown

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 3c2499dadd2..a8fda1e8fdf 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -12,7 +12,7 @@ class Document
 
     YAML_FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m.freeze
     DATELESS_FILENAME_MATCHER = %r!^(?:.+/)*(.*)(\.[^.]+)$!.freeze
-    DATE_FILENAME_MATCHER = %r!^(?:.+/)*(\d{2,4}-\d{1,2}-\d{1,2})-(.*)(\.[^.]+)$!.freeze
+    DATE_FILENAME_MATCHER = %r!^(?>.+/)*?(\d{2,4}-\d{1,2}-\d{1,2})-([^/]*)(\.[^.]+)$!.freeze
 
     # Create a new Document.
     #
diff --git a/test/source/_posts/2013-03-19-not-a-post/dubious.markdown b/test/source/_posts/2013-03-19-not-a-post/dubious.markdown
new file mode 100644
index 00000000000..cd2990d7e16
--- /dev/null
+++ b/test/source/_posts/2013-03-19-not-a-post/dubious.markdown
@@ -0,0 +1,6 @@
+---
+title: What Am I?
+---
+
+I am not a post.
+Am I a document then..?
diff --git a/test/test_site.rb b/test/test_site.rb
index 15cebaf3ce6..c8166fed700 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -95,7 +95,7 @@ def read_posts
   context "creating sites" do
     setup do
       @site = Site.new(site_configuration)
-      @num_invalid_posts = 5
+      @num_invalid_posts = 6
     end
 
     teardown do

From 1e970b598d441017eab504888d310de489b3b0da Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 13:38:14 -0400
Subject: [PATCH 3541/4996] Update history to reflect merge of #7292 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 126396ace5a..ef4c7cae931 100644
--- a/History.markdown
+++ b/History.markdown
@@ -143,6 +143,7 @@
   * Cache computed item property (#7301)
   * Memoize Document#excerpt_separator (#7569)
   * Cleanup Markdown converter (#7519)
+  * Optimize Document::DATE_FILENAME_MATCHER to match valid filenames (#7292)
 
 ### Major Enhancements
 

From 7eefadb1354d95e9b53e47e034aaaca60d97045c Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sat, 16 Mar 2019 00:42:09 +0530
Subject: [PATCH 3542/4996] Scan `assert_equal` methods and rectify any
 offenses with a custom Rubocop cop (#7130)

Merge pull request 7130
---
 rubocop/jekyll/assert_equal_literal_actual.rb | 149 ++++++++++++++++++
 1 file changed, 149 insertions(+)
 create mode 100644 rubocop/jekyll/assert_equal_literal_actual.rb

diff --git a/rubocop/jekyll/assert_equal_literal_actual.rb b/rubocop/jekyll/assert_equal_literal_actual.rb
new file mode 100644
index 00000000000..5b66569275b
--- /dev/null
+++ b/rubocop/jekyll/assert_equal_literal_actual.rb
@@ -0,0 +1,149 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Jekyll
+      # Checks for `assert_equal(exp, act, msg = nil)` calls containing literal values as
+      # second argument. The second argument should ideally be a method called on the tested
+      # instance.
+      #
+      # @example
+      #   # bad
+      #   assert_equal @foo.bar, "foobar"
+      #   assert_equal @alpha.beta, { "foo" => "bar", "lorem" => "ipsum" }
+      #   assert_equal @alpha.omega, ["foobar", "lipsum"]
+      #
+      #   # good
+      #   assert_equal "foobar", @foo.bar
+      #
+      #   assert_equal(
+      #     { "foo" => "bar", "lorem" => "ipsum" },
+      #     @alpha.beta
+      #   )
+      #
+      #   assert_equal(
+      #     ["foobar", "lipsum"],
+      #     @alpha.omega
+      #   )
+      #
+      class AssertEqualLiteralActual < Cop
+        MSG = "Provide the 'expected value' as the first argument to `assert_equal`.".freeze
+
+        SIMPLE_LITERALS = %i(
+          true
+          false
+          nil
+          int
+          float
+          str
+          sym
+          complex
+          rational
+          regopt
+        ).freeze
+
+        COMPLEX_LITERALS = %i(
+          array
+          hash
+          pair
+          irange
+          erange
+          regexp
+        ).freeze
+
+        def_node_matcher :literal_actual?, <<-PATTERN
+          (send nil? :assert_equal $(send ...) $#literal?)
+        PATTERN
+
+        def_node_matcher :literal_actual_with_msg?, <<-PATTERN
+          (send nil? :assert_equal $(send ...) $#literal? $#opt_msg?)
+        PATTERN
+
+        def on_send(node)
+          return unless literal_actual?(node) || literal_actual_with_msg?(node)
+          add_offense(node, location: :expression)
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            corrector.replace(node.loc.expression, replacement(node))
+          end
+        end
+
+        private
+
+        def opt_msg?(node)
+          node&.source
+        end
+
+        # This is not implement using a NodePattern because it seems
+        # to not be able to match against an explicit (nil) sexp
+        def literal?(node)
+          node && (simple_literal?(node) || complex_literal?(node))
+        end
+
+        def simple_literal?(node)
+          SIMPLE_LITERALS.include?(node.type)
+        end
+
+        def complex_literal?(node)
+          COMPLEX_LITERALS.include?(node.type) &&
+            node.each_child_node.all?(&method(:literal?))
+        end
+
+        def replacement(node)
+          _, _, first_param, second_param, optional_param = *node
+
+          replaced_text = \
+            if second_param.type == :hash
+              replace_hash_with_variable(first_param.source, second_param.source)
+            elsif second_param.type == :array && second_param.source != "[]"
+              replace_array_with_variable(first_param.source, second_param.source)
+            else
+              replace_based_on_line_length(first_param.source, second_param.source)
+            end
+
+          return "#{replaced_text}, #{optional_param.source}" if optional_param
+          replaced_text
+        end
+
+        def replace_based_on_line_length(first_expression, second_expression)
+          result = "assert_equal #{second_expression}, #{first_expression}"
+          return result if result.length < 80
+
+          # fold long lines independent of Rubocop configuration for better readability
+          <<~TEXT
+            assert_equal(
+              #{second_expression},
+              #{first_expression}
+            )
+          TEXT
+        end
+
+        def replace_hash_with_variable(first_expression, second_expression)
+          expect_expression = if second_expression.start_with?("{")
+                                second_expression
+                              else
+                                "{#{second_expression}}"
+                              end
+          <<~TEXT
+            expected = #{expect_expression}
+            assert_equal expected, #{first_expression}
+          TEXT
+        end
+
+        def replace_array_with_variable(first_expression, second_expression)
+          expect_expression = if second_expression.start_with?("%")
+                                second_expression
+                              else
+                                Array(second_expression)
+                              end
+          <<~TEXT
+            expected = #{expect_expression}
+            assert_equal expected, #{first_expression}
+          TEXT
+        end
+      end
+    end
+  end
+end

From 9d0c73fce829fd119aed3a0c029b858610da78b3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 15 Mar 2019 15:12:11 -0400
Subject: [PATCH 3543/4996] Update history to reflect merge of #7130 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ef4c7cae931..0018e303a4f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -210,6 +210,7 @@
   * dev: update gemspec (#7425)
   * Test with Ruby 2.6 on AppVeyor [skip travis] (#7518)
   * Add a script to profile docs with CI (#7540)
+  * Scan `assert_equal` methods and rectify any offenses with a custom Rubocop cop (#7130)
 
 ### Bug Fixes
 

From 26b7d6a94d8dab358ae25c59ec20615a4d6f4592 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 17 Mar 2019 16:29:16 +0530
Subject: [PATCH 3544/4996] Allow builds on JRuby to fail uneventfully

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index aa6e2289c9f..b126fa4cbff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,8 @@ matrix:
   exclude:
     - rvm: *jruby
       env: TEST_SUITE=cucumber
+  allow_failures:
+    - rvm: *jruby
 
 env:
   matrix:

From e522f54e539c1c40c7ad93503d4b95113cf516c7 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 17 Mar 2019 16:38:50 +0530
Subject: [PATCH 3545/4996] Simplify Cucumber helper

---
 features/support/helpers.rb | 54 +++++++++++++++----------------------
 1 file changed, 22 insertions(+), 32 deletions(-)

diff --git a/features/support/helpers.rb b/features/support/helpers.rb
index 36a726b4f00..db36141d331 100644
--- a/features/support/helpers.rb
+++ b/features/support/helpers.rb
@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require "fileutils"
 require "jekyll"
-require "time"
-require "safe_yaml/load"
 
 class Paths
   SOURCE_DIR = Pathname.new(File.expand_path("../..", __dir__))
+
   def self.test_dir; source_dir.join("tmp", "jekyll"); end
 
   def self.theme_gem_dir; source_dir.join("tmp", "jekyll", "my-cool-theme"); end
@@ -24,24 +22,19 @@ def self.source_dir; SOURCE_DIR; end
 
 def file_content_from_hash(input_hash)
   matter_hash = input_hash.reject { |k, _v| k == "content" }
-  matter = matter_hash.map do |k, v|
-    "#{k}: #{v}\n"
-  end
-
-  matter = matter.join.chomp
-  content = \
-    if !input_hash["input"] || !input_hash["filter"]
-      then input_hash["content"]
-    else "{{ #{input_hash["input"]} | " \
-        "#{input_hash["filter"]} }}"
-    end
-
-  Jekyll::Utils.strip_heredoc(<<-EOF)
+  matter = matter_hash.map { |k, v| "#{k}: #{v}\n" }.join
+  matter.chomp!
+  content = if input_hash["input"] && input_hash["filter"]
+              "{{ #{input_hash["input"]} | #{input_hash["filter"]} }}"
+            else
+              input_hash["content"]
+            end
+
+  <<~EOF
     ---
-    #{matter.gsub(
-      %r!\n!, "\n    "
-    )}
+    #{matter}
     ---
+
     #{content}
   EOF
 end
@@ -49,7 +42,7 @@ def file_content_from_hash(input_hash)
 #
 
 def source_dir(*files)
-  return Paths.test_dir(*files)
+  Paths.test_dir(*files)
 end
 
 #
@@ -70,17 +63,13 @@ def all_steps_to_path(path)
 #
 
 def jekyll_run_output
-  if Paths.output_file.file?
-    then return Paths.output_file.read
-  end
+  Paths.output_file.read if Paths.output_file.file?
 end
 
 #
 
 def jekyll_run_status
-  if Paths.status_file.file?
-    then return Paths.status_file.read
-  end
+  Paths.status_file.read if Paths.status_file.file?
 end
 
 #
@@ -104,6 +93,7 @@ def run_jekyll(args)
 end
 
 #
+
 def run_in_shell(*args)
   p, output = Jekyll::Utils::Exec.run(*args)
 
@@ -121,9 +111,10 @@ def run_in_shell(*args)
 #
 
 def slug(title = nil)
-  if !title
-    then Time.now.strftime("%s%9N") # nanoseconds since the Epoch
-  else title.downcase.gsub(%r![^\w]!, " ").strip.gsub(%r!\s+!, "-")
+  if title
+    title.downcase.gsub(%r![^\w]!, " ").strip.gsub(%r!\s+!, "-")
+  else
+    Time.now.strftime("%s%9N") # nanoseconds since the Epoch
   end
 end
 
@@ -142,7 +133,7 @@ def location(folder, direction)
 #
 
 def file_contents(path)
-  return Pathname.new(path).read
+  Pathname.new(path).read
 end
 
 #
@@ -155,8 +146,7 @@ def seconds_agnostic_datetime(datetime = Time.now)
     Regexp.escape(date),
     "#{time}:\\d{2}",
     Regexp.escape(zone),
-  ] \
-    .join("\\ ")
+  ].join("\\ ")
 end
 
 #

From 8552471712c378e78101c468ecb2b8022cef893a Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 18 Mar 2019 15:14:05 +0530
Subject: [PATCH 3546/4996] Update Jekyll on Windows documentation [skip ci]

---
 docs/_docs/installation/windows.md | 153 ++++++++++++++++-------------
 1 file changed, 84 insertions(+), 69 deletions(-)

diff --git a/docs/_docs/installation/windows.md b/docs/_docs/installation/windows.md
index a4926e9cab6..4623b40541e 100644
--- a/docs/_docs/installation/windows.md
+++ b/docs/_docs/installation/windows.md
@@ -5,78 +5,36 @@ redirect_from:
   - /docs/windows/
 ---
 
-While Windows is not an officially-supported platform, it can be used to run Jekyll with the proper tweaks. This page aims to collect some of the general knowledge and lessons that have been unearthed by Windows users.
+While Windows is not an officially-supported platform, it can be used to run Jekyll with the proper tweaks. This page aims to
+collect some of the general knowledge and lessons that have been unearthed by Windows users.
 
 
 ## Installing Jekyll
-The easiest way to run Jekyll is by using the [RubyInstaller](https://rubyinstaller.org/) for Windows.
 
 ### Installation via RubyInstaller
 
-[RubyInstaller](https://rubyinstaller.org/) is a self-contained Windows-based installer that includes the Ruby language, an execution environment, important documentation, and more.
-We only cover RubyInstaller-2.4 and newer here, older versions need to [install the Devkit](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit) manually.
+The easiest way to run Jekyll is by using the [RubyInstaller](https://rubyinstaller.org/) for Windows.
+
+RubyInstaller is a self-contained Windows-based installer that includes the Ruby language, an execution environment,
+important documentation, and more.
+We only cover RubyInstaller-2.4 and newer here, older versions need to
+[install the Devkit](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit) manually.
 
 1. Download and Install a **Ruby+Devkit** version from [RubyInstaller Downloads](https://rubyinstaller.org/downloads/).
    Use default options for installation.
-2. Open a new command prompt window from the start menu, so that changes to the `PATH` environment variable becomes effective.
+2. Run the `ridk install` step on the last stage of the installation wizard. This is needed for installing gems with native
+   extensions. You can find addtional information regarding this in the
+   [RubyInstaller Documentation](https://github.com/oneclick/rubyinstaller2#using-the-installer-on-a-target-system)
+3. Open a new command prompt window from the start menu, so that changes to the `PATH` environment variable becomes effective.
    Install Jekyll and Bundler via: `gem install jekyll bundler`
-3. Check if Jekyll installed properly: `jekyll -v`
+4. Check if Jekyll installed properly: `jekyll -v`
 
 That's it, you're ready to use Jekyll!
 
-### Encoding
-
-If you use UTF-8 encoding, make sure that no `BOM` header characters exist in your files or very, very bad things will happen to
-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
-```
-
-### 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.
-
-Jekyll now uses a rubygem to internally configure Timezone based on established [IANA Timezone Database](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
-While 'new' blogs created with Jekyll v3.4 and greater, will have the following added to their `Gemfile` by default, existing sites *will* have to update their `Gemfile` (and installed) to enable development on Windows:
-
-```ruby
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-```
-
-
    
-  
    TZInfo 2.0 incompatibility
    
-  
    
-    v2.0 of the TZInfo library has introduced a change in how timezone offsets are calculated.
-    This will result in incorrect date and time for your posts when the site is built with Jekyll 3.x on Windows.
-  
    
-  
    
-    We therefore recommend that you lock the Timezone library to v1.2 and above by listing
-    gem 'tzinfo', '~> 1.2' in your Gemfile.
-  
    
-
    
-
-### Auto Regeneration
-
-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:
-
-```ruby
-gem 'wdm', '~> 0.1.1', :install_if => Gem.win_platform?
-```
-
-You have to use a [Ruby+Devkit](https://rubyinstaller.org/downloads/) version of the RubyInstaller.
-
-
-## Installation via Bash on Windows 10
-
-If you are using Windows 10 version 1607 or later, another option to run Jekyll is by [installing](https://msdn.microsoft.com/en-us/commandline/wsl/install_guide) the Windows Subsystem for Linux.
+### Installation via Bash on Windows 10
 
+If you are using Windows 10 version 1607 or later, another option to run Jekyll is by
+[installing](https://msdn.microsoft.com/en-us/commandline/wsl/install_guide) the Windows Subsystem for Linux.
 
 *Note:* You must have [Windows Subsystem for Linux](https://msdn.microsoft.com/en-us/commandline/wsl/about) enabled.
 
@@ -90,7 +48,8 @@ Your Command Prompt instance should now be a Bash instance. Now we must update o
 ```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.
+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
@@ -101,34 +60,90 @@ sudo apt-get install ruby2.5 ruby2.5-dev build-essential dh-autoreconf
 Next let's update our Ruby gems:
 
 ```sh
-sudo gem update
+gem update
 ```
 
 Now all that is left to do is install Jekyll.
 
 ```sh
-sudo gem install jekyll bundler
+gem install jekyll bundler
 ```
 
+(*Note: no `sudo` here.*)
+
 Check if Jekyll installed properly by running:
 
 ```sh
 jekyll -v
 ```
 
-Configure the bundler/gem path so bundle doesn't prompt for sudo
-
-```sh
-bundle config path vendor/bundle
-```
-
 **And that's it!**
 
-You can make sure time management is working properly by inspecting your `_posts` folder. You should see a markdown file with the current date in the filename.
+You can make sure time management is working properly by inspecting your `_posts` folder. You should see a markdown file
+with the current date in the filename.
 
 
    
   
    Non-superuser account issues
    
-  
    If the `jekyll new` command prints the error "Your user account isn't allowed to install to the system RubyGems", see the "Running Jekyll as Non-Superuser" instructions in Troubleshooting.
    
+  
    If the `jekyll new` command prints the error "Your user account isn't allowed to install to the system RubyGems", see
+  the "Running Jekyll as Non-Superuser" instructions in Troubleshooting.
    
 
    
 
 **Note:** Bash on Ubuntu on Windows is still under development, so you may run into issues.
+
+
+## Encoding
+
+If you use UTF-8 encoding, make sure that no `BOM` header characters exist in your files or very, very bad things will happen to
+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
+```
+
+## 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.
+
+Jekyll now uses a rubygem to internally configure Timezone based on established
+[IANA Timezone Database](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
+While 'new' blogs created with Jekyll v3.4 and greater, will have the following added to their `Gemfile` by default, existing
+sites *will* have to update their `Gemfile` (and installed) to enable development on Windows:
+
+```ruby
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+```
+
+
    
+  
    TZInfo 2.0 incompatibility
    
+  
    
+    v2.0 of the TZInfo library has introduced a change in how timezone offsets are calculated.
+    This will result in incorrect date and time for your posts when the site is built with Jekyll 3.x on Windows.
+  
    
+  
    
+    We therefore recommend that you lock the Timezone library to v1.2 and above by listing
+    gem 'tzinfo', '~> 1.2' in your Gemfile.
+  
    
+
    
+
+## Auto Regeneration
+
+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:
+
+```ruby
+gem 'wdm', '~> 0.1.1', :install_if => Gem.win_platform?
+```
+
+You have to use a [Ruby+Devkit](https://rubyinstaller.org/downloads/) version of the RubyInstaller and install
+the MSYS2 build tools to successfully install the `wdm` gem.

From 3e2c8fd4c81b84a825c698e5d80b6a6e11ac2aaa Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 18 Mar 2019 15:35:53 +0530
Subject: [PATCH 3547/4996] Bump RuboCop to v0.66.x

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index aa611ad30d8..fb023728ef6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,7 @@ group :test do
   gem "rspec-mocks"
   # Temporary lock on RuboCop version for Windows since Pysch-3.1.0 is not available
   # for use on Ruby 2.6-mingw32 platforms
-  gem "rubocop", Gem.win_platform? ? "~> 0.64.0" : "~> 0.65.0"
+  gem "rubocop", Gem.win_platform? ? "~> 0.64.0" : "~> 0.66.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__)
   gem "test-theme-symlink", :path => File.expand_path("test/fixtures/test-theme-symlink", __dir__)

From 9e137bae29774a872b823d62e88d633b0c88a6bd Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Tue, 19 Mar 2019 03:09:08 +0530
Subject: [PATCH 3548/4996] Push Markdown link refs to excerpt only as required
 (#7577)

Merge pull request 7577
---
 features/post_excerpts.feature | 24 ++++++++++++++++
 lib/jekyll/excerpt.rb          | 51 +++++++++++++++++++++-------------
 2 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/features/post_excerpts.feature b/features/post_excerpts.feature
index 38de73528c6..5337be25ad4 100644
--- a/features/post_excerpts.feature
+++ b/features/post_excerpts.feature
@@ -88,3 +88,27 @@ Feature: Post excerpts
     And I should see "Liquid is not rendered at {{ page.url }}" in "_site/2017/07/06/unrendered-post.html"
     But I should see "
    Liquid is rendered at /2017/07/06/rendered-post.html
    " in "_site/2017/07/06/rendered-post.html"
     And I should see "
    Liquid is not rendered at {{ page.url }}
    \n
    Liquid is rendered at /2017/07/06/rendered-post.html
    " in "_site/index.html"
+
+  Scenario: Excerpts from posts with reference-style Markdown links
+    Given I have a configuration file with:
+      | key       | value                   |
+      | permalink | "/:title:output_ext"    |
+      | kramdown  | { show_warnings: true } |
+    And I have an "index.html" page that contains "{% for post in site.posts %}{{ post.excerpt }}{% endfor %}"
+    And I have a _layouts directory
+    And I have a post layout that contains "{{ page.excerpt }}"
+    And I have a _posts directory
+    And I have the following posts:
+      | title                        | layout | date       | content                                                   |
+      | Just Text Excerpt            | post   | 2019-03-06 | Install Jekyll\n\nNext Para [^1]\n\n[^1]: Lorem ipsum     |
+      | Text and Footnote            | post   | 2019-03-07 | Alpha [^1]\n\nNext Para\n\n[^1]: Omega sigma              |
+      | Text and Reference Link      | post   | 2019-03-08 | Read [docs][link]\n\nNext Para\n\n[link]: docs.jekyll.com |
+      | Text and Self-refencing Link | post   | 2019-03-09 | Check out [jekyll]\n\nNext Para\n\n[jekyll]: jekyllrb.com |
+    When I run jekyll build
+    Then I should get a zero exit status
+    And I should not see "Kramdown warning" in the build output
+    But I should see exactly "
    Install Jekyll
    " in "_site/just-text-excerpt.html"
+    And I should see "
    Alpha 1
    " in "_site/text-and-footnote.html"
+    And I should see "
    Omega sigma ↩
    " in "_site/text-and-footnote.html"
+    And I should see "
    Read docs
    " in "_site/text-and-reference-link.html"
+    And I should see "
    Check out jekyll
    " in "_site/text-and-self-refencing-link.html"
diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb
index ddadfcff0ff..69b107f57ec 100644
--- a/lib/jekyll/excerpt.rb
+++ b/lib/jekyll/excerpt.rb
@@ -132,34 +132,47 @@ def render_with_liquid?
     # Returns excerpt String
 
     LIQUID_TAG_REGEX = %r!{%-?\s*(\w+)\s*.*?-?%}!m.freeze
-    MKDWN_LINK_REF_REGEX = %r!^ {0,3}\[[^\]]+\]:.+$!.freeze
+    MKDWN_LINK_REF_REGEX = %r!^ {0,3}(?:(\[[^\]]+\])(:.+))$!.freeze
 
     def extract_excerpt(doc_content)
       head, _, tail = doc_content.to_s.partition(doc.excerpt_separator)
-
-      # append appropriate closing tag(s) (for each Liquid block), to the `head` if the
-      # partitioning resulted in leaving the closing tag somewhere in the `tail` partition.
-      if head.include?("{%")
-        modified  = false
-        tag_names = head.scan(LIQUID_TAG_REGEX)
-        tag_names.flatten!
-        tag_names.reverse_each do |tag_name|
-          next unless liquid_block?(tag_name)
-          next if head =~ endtag_regex_stash(tag_name)
-
-          modified = true
-          head << "\n{% end#{tag_name} %}"
-        end
-        print_build_warning if modified
-      end
-
       return head if tail.empty?
 
-      head << "\n\n" << tail.scan(MKDWN_LINK_REF_REGEX).join("\n")
+      head = sanctify_liquid_tags(head) if head.include?("{%")
+      definitions = extract_markdown_link_reference_defintions(head, tail)
+      return head if definitions.empty?
+
+      head << "\n\n" << definitions.join("\n")
     end
 
     private
 
+    # append appropriate closing tag(s) (for each Liquid block), to the `head` if the
+    # partitioning resulted in leaving the closing tag somewhere in the `tail` partition.
+    def sanctify_liquid_tags(head)
+      modified  = false
+      tag_names = head.scan(LIQUID_TAG_REGEX)
+      tag_names.flatten!
+      tag_names.reverse_each do |tag_name|
+        next unless liquid_block?(tag_name)
+        next if head =~ endtag_regex_stash(tag_name)
+
+        modified = true
+        head << "\n{% end#{tag_name} %}"
+      end
+
+      print_build_warning if modified
+      head
+    end
+
+    def extract_markdown_link_reference_defintions(head, tail)
+      [].tap do |definitions|
+        tail.scan(MKDWN_LINK_REF_REGEX).each do |segments|
+          definitions << segments.join if head.include?(segments[0])
+        end
+      end
+    end
+
     def endtag_regex_stash(tag_name)
       @endtag_regex_stash ||= {}
       @endtag_regex_stash[tag_name] ||= %r!{%-?\s*end#{tag_name}.*?\s*-?%}!m

From f3cb41b65ad70371e4cc750719c0789590e0bdfc Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 18 Mar 2019 17:39:10 -0400
Subject: [PATCH 3549/4996] Update history to reflect merge of #7577 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0018e303a4f..e4838c73957 100644
--- a/History.markdown
+++ b/History.markdown
@@ -236,6 +236,7 @@
   * Escape valid special chars in a site's path name (#7568)
   * Replace `name` in Page#inspect with relative_path (#7434)
   * Log a warning when the slug is empty (#7357)
+  * Push Markdown link refs to excerpt only as required (#7577)
 
 ### feature
 

From 378147d7615b5bc1e95591c9af8fbb12186f3295 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 19 Mar 2019 08:03:57 +0100
Subject: [PATCH 3550/4996] Release v4.0.0.pre.alpha1 (#7574)

Merge pull request 7574
---
 History.markdown                              | 323 +++++++++---------
 docs/_config.yml                              |   1 +
 docs/_docs/history.md                         |   4 +-
 docs/_docs/installation.md                    |   2 +-
 docs/_docs/installation/macos.md              |  63 ++--
 docs/_docs/liquid/tags.md                     |  19 +-
 docs/_docs/troubleshooting.md                 |   6 +-
 docs/_docs/upgrading.md                       |   1 +
 docs/_docs/upgrading/3-to-4.md                |  70 ++--
 ...-jekyll-4-0-0-pre-alpha1-released.markdown |  42 +++
 docs/_tutorials/cache_api.md                  |   1 -
 jekyll.gemspec                                |   4 +-
 lib/jekyll/version.rb                         |   2 +-
 13 files changed, 281 insertions(+), 257 deletions(-)
 create mode 100644 docs/_posts/2019-03-18-jekyll-4-0-0-pre-alpha1-released.markdown

diff --git a/History.markdown b/History.markdown
index e4838c73957..a0abb7444fb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,13 +1,139 @@
 ## HEAD
 
+### Major Enhancements
+
+  * Drop ruby 2.3 (#7454)
+  * Drop support for Ruby 2.1 and 2.2 (#6560)
+  * Drop support for older versions of Rouge (#6978)
+  * Drop support for pygments as syntax-highlighter (#7118)
+  * Drop support for Redcarpet (#6987)
+  * Drop support for rdiscount (#6988)
+  * Drop support for `jekyll-watch-1.4.0` and older (#7287)
+  * Incorporate `relative_url` filter in `link` tag (#6727)
+  * Refactor `highlight` tag to behave like the `raw` tag (#6821)
+  * Upgrade kramdown dependency to v2.x (#7492)
+  * Upgrade i18n to v1.x (#6931)
+  * Add `Jekyll::Cache` class to handle caching on disk (#7169)
+  * Cache converted markdown (#7159)
+  * Cache: Do not dump undumpable objects (#7190)
+  * Cache matched defaults sets for given parameters (#6888)
+  * Ignore cache directory (#7184)
+  * Add `Site#in_cache_dir` helper method (#7160)
+  * Remove 'cache_dir' during `jekyll clean` (#7158)
+  * Cache parsed Liquid templates in memory (#7136)
+  * Only read layouts from source_dir or theme_dir (#6788)
+  * Allow custom sorting of collection documents (#7427)
+  * Always exclude certain paths from being processed (#7188)
+
+  ### Bug Fixes
+
+  * Security: fix `include` bypass of `EntryFilter#filter` symlink check (#7226)
+  * Theme gems: ensure directories aren't symlinks (#7419)
+  * Add call to unused method `validate_options` in `commands/serve.rb` (#7122)
+  * Check if scope applies to type before given path (#7263)
+  * Document two methods, simplify one of the methods (#7270)
+  * Check key in collections only if it isn't "posts" (#7277)
+  * Interpolate Jekyll::Page subclass on inspection (#7203)
+  * Measure the no. of times a template gets rendered (#7316)
+  * Reduce array traversal in Jekyll::Reader (#7157)
+  * Re-implement handling Liquid blocks in excerpts (#7250)
+  * Documents should be able to render their date (#7404)
+  * Fix Interpreter warning from Jekyll::Renderer (#7448)
+  * Loggers should accept both numbers and symbols (#6967)
+  * Replace regex arg to :gsub with a string arg (#7189)
+  * Dont write static files from unrendered collection (#7410)
+  * Excerpt handling of custom and intermediate tags (#7382)
+  * Change future post loglevel to warn to help user narrow down issues (#7527)
+  * Handle files with trailing dots in their basename (#7315)
+  * Fix unnecessary allocations via StaticFileReader (#7572)
+  * Don't check if site URL is absolute if it is nil (#7498)
+  * Avoid unnecessary duplication of pages array (#7272)
+  * Memoize Site#post_attr_hash (#7276)
+  * Memoize Document#excerpt_separator (#7569)
+  * Optimize Document::DATE_FILENAME_MATCHER to match valid filenames (#7292)
+  * Escape valid special chars in a site's path name (#7568)
+  * Replace `name` in Page#inspect with relative_path (#7434)
+  * Log a warning when the slug is empty (#7357)
+
+### Minor Enhancements
+
+  * Enhance `--blank` scaffolding (#7310)
+  * Fix custom 404 page for GitHub pages (#7132)
+  * Load config file from within current theme-gem (#7304)
+  * Use `jekyll-compose` if installed (#6932)
+  * Suggest re-running command with `--trace` on fail (#6551)
+  * Support for binary operators in where_exp filter (#6998)
+  * Automatically load `_config.toml` (#7299)
+  * Add vendor folder to a newly installed site's .gitignore (#6968)
+  * Output Jekyll Version while debugging (#7173)
+  * Memoize computing excerpt's relative_path (#6951)
+  * Skip processing posts that can not be read (#7302)
+  * Memoize the return value of Site#documents (#7273)
+  * Cache globbed paths in front matter defaults (#7345)
+  * Cache computed item property (#7301)
+  * Cleanup Markdown converter (#7519)
+  * Disable Liquid via front matter (#6824)
+  * Do not process Liquid in post excerpt when disabled in front matter (#7146)
+  * Liquefied link tag (#6269)
+  * Update item_property to return numbers as numbers instead of strings (#6608)
+  * Use `.markdown` extension for page templates (#7126)
+  * Add support for `*.xhtml` files (#6854)
+  * Allow i18n v0.9.5 and higher (#7044)
+  * Ignore permission error of /proc/version (#7267)
+  * Strip extra slashes via `Jekyll.sanitized_path` (#7182)
+  * Site template: remove default config for markdown (#7285)
+  * Add a custom inspect string for StaticFile objects (#7422)
+  * Remind user to include gem in the Gemfile on error (#7476)
+  * Search Front matter defaults for Page objects with relative_path (#7261)
+  * Configure cache_dir (#7232)
+  * Lock use of `tzinfo` gem to v1.x (#7521, #7562)
+  * Utilize absolute paths of user-provided file paths (#7450)
+
+### Development Fixes
+
+  * Use communicative method parameters (#7566)
+  * Scan `assert_equal` methods and rectify any offenses with a custom RuboCop cop (#7130)
+  * Add a script to profile docs with CI (#7540)
+  * Test with Ruby 2.6 on AppVeyor (#7518)
+  * Update gemspec (#7425)
+  * Upgrade liquid-c to v4.0 (#7375)
+  * Bump RuboCop to v0.63.x (#7489)
+  * Bump RuboCop to v0.62.x (#7449)
+  * Bump RuboCop to v0.61.x (#7401)
+  * Bump RuboCop to v0.60.x (#7338)
+  * Bump RuboCop to v0.59.0 (#7237)
+  * Bump RuboCop to v0.57.x (#7078)
+  * Relax version constraint on classifier-reborn gem (#7471)
+  * Test with Ruby v2.6 (#7438)
+  * Create symlink only if target is accessible (#7429)
+  * Test with oldest and latest Ruby only (#7412)
+  * Switch to `:install_if` for wdm gem (#7372)
+  * Update excludes for CodeClimate Analyses (#7365)
+  * CI(Appveyor): shallow clone with 5 last commits (#7312)
+  * update yajl-ruby (#7278)
+  * Add cucumber feature to test include_relative tag (#7213)
+  * Small benchmark refactoring (#7211)
+  * Lock Travis to Bundler-1.16.2 (#7144)
+  * Fix incorrectly passed arguments to assert_equal (#7134)
+  * fix up refute_equal call (#7133)
+  * Fix RuboCop offences in test files (#7128)
+  * Use assert_include (#7093)
+  * Remember to release docs gem (#7066)
+  * Update RuboCop's config (#7050)
+  * Useless privates removed (#6768)
+  * Load Rouge for TestKramdown (#7007)
+  * yajl-ruby update to v1.4.0 (#6976)
+  * Update instructions for releasing docs Gem (#6975)
+  * We are not using Ruby 2.2 anymore (#6977)
+  * Remove unnecessary Jekyll::Page constant (#6770)
+  * Remove unused error class (#6511)
+
 ### Documentation
 
-  * Release post for v3.8.0 (#6849)
   * Add Installation Instructions for Ubuntu (#6925)
   * add liquid tag jekyll-flickr (#6946)
-  * Add 4.0 development post (#6934)
   * Updated copy - fixed casing of SaaS on resources page. (#6949)
-  * WIP: Do not advise users to install Jekyll outside of Bundler (#6927)
+  * Do not advise users to install Jekyll outside of Bundler (#6927)
   * Don't prompt for sudo when installing with Ubuntu WSL (#6781)
   * Fix typo (#6969)
   * Add version number for group_by_exp doc (#6956)
@@ -16,8 +142,8 @@
   * Updated nginx configuration for custom-404-page documentation (#6994)
   * List all static files variables (#7002)
   * Document that _drafts need to be contained within the custom collection directory (#6985)
-  * proposed change for passive voice. (#7005)
-  * added the CAT plugin to the plugin list (#7011)
+  * Change for passive voice. (#7005)
+  * Added the CAT plugin to the plugin list (#7011)
   * Updated to supported version (#7031)
   * Clarify definition of 'draft' (#7037)
   * Listed the jekyll-target-blank plugin in plugins list. (#7046)
@@ -29,7 +155,7 @@
   * GitHub enables you to use themes from other repos (#7112)
   * Updates to CODE OF CONDUCT  (v1.4.0) (#7105)
   * Instructions to view theme’s files under Linux (#7095)
-  * add jekyll-xml-source (#7114)
+  * Add jekyll-xml-source (#7114)
   * Add the jekyll-firstimage filter plugin (#7127)
   * Use a real theme in the example (#7125)
   * Update docs about post creation (#7138)
@@ -41,215 +167,84 @@
   * Corrected sample usage of postfiles (#7181)
   * Add missing html end tag for code example in section 'For loops' (#7199)
   * Resolve "Unable to locate package ruby2.4" error (#7196)
-  * installation instructions for Fedora (#7198)
+  * Installation instructions for Fedora (#7198)
   * New docs (#7205)
+  * List all standard liquid filters (#7333)
   * Correct stylesheet url in tutorial step 7 (#7210)
   * Add some minor improvements to image loading in Showcase page (#7214)
   * Fix minor grammatical error (#7215)
   * Add developer.spotify.com to the Jekyll Showcase (#7217)
-  * removes quotes from markdown for assets (#7223)
-  * clarified front matter requirement (#7234)
+  * Removes quotes from markdown for assets (#7223)
+  * Clarified front matter requirement (#7234)
   * Minor whitespace fixes (#7238)
-  * explicit location of where to create blog.html (#7241)
+  * Explicit location of where to create blog.html (#7241)
   * Fix a small grammar error/typo in the docs (#7260)
-  * environments.md: reference the build command options that allows multiple config files (#7266)
+  * Reference the build command options that allows multiple config files (#7266)
   * Update 10-deployment.md (#7268)
   * Add more issue template(s) and pull request template (#7269)
   * Suggest sites use OpenSSL instead of GnuTLS for their site's CI (#7010)
   * Fix broken Contributors link in README.markdown (#7200)
-  * Docs: Add title tag to item in RSS template (#7282)
-  * Docs: more inclusive writing (#7283)
+  * Add title tag to item in RSS template (#7282)
+  * More inclusive writing (#7283)
   * Document converter methods (#7289)
-  * Docs: Add link tag to item in RSS template (#7291)
+  * Add link tag to item in RSS template (#7291)
   * Add Isomer to showcase (#7300)
   * Added missing semicolon (#7306)
   * "This restricts you..." to "This restricts your" (#7307)
   * Add a link to Giraffe Academy's tutorial (#7325)
-  * grammar correction (#7327)
-  * docs: list all standard liquid filters (#7333)
+  * Grammar correction (#7327)
   * Document Jekyll Filters with YAML data (#7335)
   * Remove redundant instruction comment (#7342)
-  * docs: minimize rendering count (#7343)
+  * Minimize rendering count (#7343)
   * Update posts.md (#7360)
   * Add info how to deploy using pre-push git hook (#7179)
   * Textile is only supported through a converter plugin (#7003)
   * Add documentation for custom tag blocks (#7359)
   * Added 99inbound's Jekyll post to form resources (#7348)
-  * docs: document page.dir and page.name (#7373)
+  * Document page.dir and page.name (#7373)
   * Remove installation instructions with Homebrew (#7381)
   * Fix dead link and misleading prose (#7383)
   * Fix content management section (#7385)
-  * Site: Better Performance (#7388)
   * Proposed re-wording of Sass note. :) (#7392)
   * Apply ruby official guide documents (#7393)
-  * docs: Fix group_by_exp filter example (#7394)
-  * adjust team page listings (#7395)
+  * Fix group_by_exp filter example (#7394)
+  * Adjust team page listings (#7395)
   * Update resources.md (#7396)
   * Update resources.md (#7397)
   * Remove alt attribute from a tags (#7407)
   * Fix grammatical error in permalinks.md (#7409)
-  * [Docs] Fix BASH code-block in ubuntu.md (#7420)
+  * Fix BASH code-block in ubuntu.md (#7420)
   * zlib is missing (#7428)
   * Include docs for `{{ page.collection }}` (#7430)
   * Permalink docs typo fixes (#7459)
   * Fixed unnecessary aticles and pronouns (#7466)
   * Grammatical correction (#7464)
   * Update resources.md (#7472)
-  * Docs: store SSL key and cert in site source (#7473)
+  * Store SSL key and cert in site source (#7473)
   * Minor doc fixes (#7495)
   * Changed order of steps (#7503)
   * Hosting with AWS Amplify (#7510)
   * Fix typo in tutorial for converting existing site (#7524)
   * Add CloudSh to resource page. (#7497)
-  * Docs: check if var exists before include tag (#7530)
+  * Check if var exists before include tag (#7530)
   * Added formX to form-backend resources (#7536)
   * Clarify docs on collections regarding the need for front matter (#7538)
   * Fix incorrect Windows path in themes.md (#7525)
   * Document where Jekyll looks for layouts in a site (#7564)
-  * docs: mention CommonMark plugins (#7418)
+  * Mention CommonMark plugins (#7418)
   * Addresses bundle not found. (#7351)
-
-### Minor Enhancements
-
-  * use jekyll-compose if installed (#6932)
-  * Memoize computing excerpt's relative_path (#6951)
-  * Liquefied link tag (#6269)
-  * Suggest re-running command with --trace on fail (#6551)
-  * Update item_property to return numbers as numbers instead of strings (#6608)
-  * Use .markdown for page templates (#7126)
-  * Fix custom 404 page for GitHub pages (#7132)
-  * Add support for `*.xhtml` files (#6854)
-  * Cache matched defaults sets for given parameters (#6888)
-  * Ignore permission error of /proc/version (#7267)
-  * Strip extra slashes via `Jekyll.sanitized_path` (#7182)
-  * Site template: remove default config for markdown (#7285)
-  * Cache: Do not dump undumpable objects (#7190)
-  * Optimize rendering Liquid templates (#7136)
-  * Automatically load _config.toml (#7299)
-  * feat: enhance --blank scaffolding (#7310)
-  * Skip processing posts that can not be read (#7302)
-  * Memoize Site#post_attr_hash (#7276)
-  * Load config file from within current theme-gem (#7304)
-  * Memoize the return value of Site#documents (#7273)
-  * Upgrade liquid-c to v4.0 (#7375)
-  * Add a custom inspect string for StaticFile objects (#7422)
-  * Remind user to include gem in the Gemfile on error (#7476)
-  * Search Front matter defaults for Page objects with relative_path (#7261)
-  * Support for binary operators in where_exp filter (#6998)
-  * Configure cache_dir (#7232)
-  * Lock use of `tzinfo` gem to v1.x (#7521, #7562)
-  * Utilize absolute paths of user-provided file paths (#7450)
-  * Cache globbed paths in front matter defaults (#7345)
-  * Cache computed item property (#7301)
-  * Memoize Document#excerpt_separator (#7569)
-  * Cleanup Markdown converter (#7519)
-  * Optimize Document::DATE_FILENAME_MATCHER to match valid filenames (#7292)
-
-### Major Enhancements
-
-  * Remove unused error class (#6511)
-  * Drop support for Ruby 2.1 and 2.2 (#6560)
-  * Add vendor folder to a newly installed site's .gitignore (#6968)
-  * bump i18n (#6931)
-  * We are not using Ruby 2.2 anymore (#6977)
-  * Drop support for older versions of Rouge (#6978)
-  * Remove support for Redcarpet (#6987)
-  * Remove support for rdiscount (#6988)
-  * Remove 'cache_dir' during `jekyll clean` (#7158)
-  * Output Jekyll Version while debugging (#7173)
-  * Drop support for pygments as syntax-highlighter (#7118)
-  * Add Cache class (#7169)
-  * Cache converted markdown (#7159)
-  * Ignore cache directory (#7184)
-  * Incorporate `relative_url` filter in `link` tag (#6727)
-  * Only read layouts from source_dir or theme_dir (#6788)
-  * Allow custom sorting of collection documents (#7427)
-  * Always exclude certain paths from being processed (#7188)
-  * Add `Site#in_cache_dir` helper method (#7160)
-  * Refactor `highlight` tag to behave like the `raw` tag (#6821)
-  * Upgrade kramdown dependency to v2.x (#7492)
-  * Feat: drop ruby 2.3 (#7454)
-
-### Development Fixes
-
-  * Remove unnecessary Jekyll::Page constant (#6770)
-  * Loggers should accept both numbers and symbols (#6967)
-  * Update instructions for releasing docs Gem (#6975)
-  * yajl-ruby update to v1.4.0 (#6976)
-  * Load Rouge for TestKramdown (#7007)
-  * Useless privates removed (#6768)
-  * Allow i18n v0.9.5 and higher (#7044)
-  * Update Rubocop's config (#7050)
-  * Remember to release docs gem (#7066)
-  * Use assert_include (#7093)
-  * Update rubocop version to 0.57.x ### -docs (#7078)
   * Example of CircleCI deployment through CircleCI v2 (#7024)
-  * Fix Rubocop offences in test files (#7128)
-  * fix up refute_equal call (#7133)
-  * Fix incorrectly passed arguments to assert_equal (#7134)
-  * Lock Travis to Bundler-1.16.2 (#7144)
-  * Replace regex arg to :gsub with a string arg (#7189)
-  * Interpolate Jekyll::Page subclass on inspection (#7203)
-  * Small benchmark refactoring (#7211)
-  * Add cucumber feature to test include_relative tag (#7213)
-  * Bump Rubocop to v0.59.0 (#7237)
-  * update yajl-ruby (#7278)
-  * Drop support for `jekyll-watch-1.4.0` and older (#7287)
-  * CI(Appveyor): shallow clone with 5 last commits (#7312)
-  * Bump RuboCop to v0.60.x (#7338)
-  * Update excludes for CodeClimate Analyses (#7365)
-  * Switch to `:install_if` for wdm gem (#7372)
-  * Bump RuboCop to v0.61.x (#7401)
-  * dev: test oldest and latest Ruby only (#7412)
-  * Reduce array traversal in Jekyll::Reader (#7157)
-  * Create symlink only if target is accessible (#7429)
-  * Test with the new Ruby v2.6 (#7438)
-  * Bump RuboCop to v0.62.x (#7449)
-  * Relax version constraint on classifier-reborn gem (#7471)
-  * Update rubocop to ~> 0.63.1 (#7489)
-  * dev: update gemspec (#7425)
-  * Test with Ruby 2.6 on AppVeyor [skip travis] (#7518)
-  * Add a script to profile docs with CI (#7540)
-  * Scan `assert_equal` methods and rectify any offenses with a custom Rubocop cop (#7130)
-
-### Bug Fixes
-
-  * Add call to unused method `validate_options` in `commands/serve.rb` (#7122)
-  * Security: fix `include` bypass of `EntryFilter#filter` symlink check (#7226)
-  * Check if scope applies to type before given path (#7263)
-  * Document two methods, simplify one of the methods (#7270)
-  * Check key in collections only if it isn't "posts" (#7277)
-  * Revert "Cache converter in renderer" (#7326)
-  * Measure the no. of times a template gets rendered (#7316)
-  * Re-implement handling Liquid blocks in excerpts (#7250)
-  * Theme gems: ensure directories aren't symlinks (#7419)
-  * Documents should be able to render their date (#7404)
-  * Fix Interpreter warning from Jekyll::Renderer (#7448)
-  * Dont write static files from unrendered collection (#7410)
-  * Excerpt handling of custom and intermediate tags (#7382)
-  * changed future post loglevel to warn to help user narrow down issues (#7527)
-  * Handle files with trailing dots in their basename (#7315)
-  * Fix unnecessary allocations via StaticFileReader (#7572)
-  * Don't check if site URL is absolute if it is nil (#7498)
-  * Use communicative method parameters (#7566)
-  * Avoid unnecessary duplication of pages array (#7272)
-  * Escape valid special chars in a site's path name (#7568)
-  * Replace `name` in Page#inspect with relative_path (#7434)
-  * Log a warning when the slug is empty (#7357)
-  * Push Markdown link refs to excerpt only as required (#7577)
-
-### feature
-
-  * Disable Liquid via front matter (#6824)
-  * Do not process Liquid in post excerpt when disabled in front matter (#7146)
+  * v4.0 development post (#6934)
+  * Release post for v3.8.0 (#6849)
+  * Release Post for v3.6.3, v3.7.4 and v3.8.4 (#7259)
 
 ### Site Enhancements
 
-  * Add Release Post for v3.6.3, v3.7.4 and v3.8.4 (#7259)
-  * Fix link to Tidelift in site's footer (#7377)
-  * :sparkles: Add a link to OpenCollective backing (#7378)
   * Add @ashmaroli to Core Team listing (#7398)
-  * link site to sponsor listing in readme (#7405)
+  * Lnk to Tidelift in site's footer (#7377)
+  * Link to OpenCollective backing (#7378
+  * Link to sponsor listing in README (#7405)
+  * Better Performance (#7388)
 
 ## 3.8.5 / 2018-11-04
 
@@ -306,10 +301,10 @@
   * Minimize array allocations in the `where` filter (#6860)
   * Bump JRuby (#6878)
   * Assert existence of <collection>.files (#6907)
-  * Bump Rubocop to 0.54.x (#6915)
+  * Bump RuboCop to 0.54.x (#6915)
   * Regenerate unconditionally unless its an incremental build (#6917)
   * Centralize require statements (#6910)
-  * Bump to Rubocop 0.55 (#6929)
+  * Bump to RuboCop 0.55 (#6929)
   * Refactor private method `HighlightBlock#parse_options` (#6822)
 
 ### Minor Enhancements
diff --git a/docs/_config.yml b/docs/_config.yml
index f89e2eac52d..61fb8b8a503 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,5 +1,6 @@
 ---
 version: 3.8.5
+min_ruby_version: 2.4.0
 name: Jekyll • Simple, blog-aware, static sites
 description: Transform your plain text into static websites and blogs
 url: https://jekyllrb.com
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index e1b5c42fd0a..8d646bfe3fd 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -77,10 +77,10 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Minimize array allocations in the `where` filter ([#6860]({{ site.repository }}/issues/6860))
 - Bump JRuby ([#6878]({{ site.repository }}/issues/6878))
 - Assert existence of <collection>.files ([#6907]({{ site.repository }}/issues/6907))
-- Bump Rubocop to 0.54.x ([#6915]({{ site.repository }}/issues/6915))
+- Bump RuboCop to 0.54.x ([#6915]({{ site.repository }}/issues/6915))
 - Regenerate unconditionally unless its an incremental build ([#6917]({{ site.repository }}/issues/6917))
 - Centralize require statements ([#6910]({{ site.repository }}/issues/6910))
-- Bump to Rubocop 0.55 ([#6929]({{ site.repository }}/issues/6929))
+- Bump to RuboCop 0.55 ([#6929]({{ site.repository }}/issues/6929))
 - Refactor private method `HighlightBlock#parse_options` ([#6822]({{ site.repository }}/issues/6822))
 
 ### Minor Enhancements
diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index aa0c3f92c99..e40cebd7f7b 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -8,7 +8,7 @@ Jekyll is a [Ruby Gem](/docs/ruby-101/#gems) that can be installed on most syste
 
 ## Requirements
 
-* [Ruby](https://www.ruby-lang.org/en/downloads/) version 2.2.5 or above, including all development headers (ruby version can be checked by running `ruby -v`)
+* [Ruby](https://www.ruby-lang.org/en/downloads/) version {{ site.min_ruby_version }} or above, including all development headers (ruby version can be checked by running `ruby -v`)
 * [RubyGems](https://rubygems.org/pages/download) (which you can check by running `gem -v`)
 * [GCC](https://gcc.gnu.org/install/) and [Make](https://www.gnu.org/software/make/) (in case your system doesn't have them installed, which you can check by running `gcc -v`,`g++ -v`  and `make -v` in your system's command line interface)
 
diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md
index 33f855630e1..9401f56cf24 100644
--- a/docs/_docs/installation/macos.md
+++ b/docs/_docs/installation/macos.md
@@ -9,41 +9,10 @@ First, you need to install the command-line tools to be able to compile native e
 xcode-select --install
 ```
 
-{: .note }
-We strongly recommend that you install Ruby gems in your home directory to avoid file permissions problems and using `sudo`.
-
-You can do this with the `--user-install` option, for instance by running:
-
-```sh
-gem install --user-install bundler jekyll
-```
-
-Or you can change the default gem path, by adding those lines to your shell config file, .e.g. `~/.bash_profile` or `~/.bashrc` if your shell is bash:
-
-```
-export GEM_HOME=$HOME/gems
-export PATH=$HOME/gems/bin:$PATH
-```
-
-Relaunch your terminal and run `gem env` to check that default gem paths point to your home directory by default.
-
-## Set up Ruby included with the OS
-
-Jekyll requires Ruby > 2.2.5. We recommend that you run Ruby > 2.3 though, as more and more dependencies ask for that requirement. You're good to go on macOS Mojave 10.14:
-
-```sh
-sw_vers -productVersion
-10.14
-
-ruby -v
-ruby 2.3.7p456 (2018-03-28 revision 63024) [universal.x86_64-darwin18]
-```
-
-Install [Bundler](/docs/ruby-101/#bundler) and Jekyll by running:
+## Set up Ruby
 
-```sh
-gem install bundler jekyll
-```
+Jekyll requires Ruby > {{ site.min_ruby_version }}.
+As macOS Mojave 10.14 comes only with ruby 2.3.x, you'll have to install Ruby through Homebrew.
 
 ### Install latest stable Ruby with Homebrew {#brew}
 
@@ -69,7 +38,7 @@ which ruby
 /usr/local/opt/ruby/bin/ruby
 
 ruby -v
-ruby 2.6.1p33 (2019-01-30 revision 66950) [x86_64-darwin18]
+ruby 2.6.2p47 (2019-03-13 revision 67232) [x86_64-darwin18]
 ```
 
 Yay, we are now running current stable Ruby!
@@ -82,6 +51,24 @@ gem install bundler jekyll
 
 That's it, you're ready to roll!
 
+{: .note }
+We strongly recommend that you install Ruby gems in your home directory to avoid file permissions problems and using `sudo`.
+
+You can do this with the `--user-install` option, for instance by running:
+
+```sh
+gem install --user-install bundler jekyll
+```
+
+Or you can change the default gem path, by adding those lines to your shell config file, .e.g. `~/.bash_profile` or `~/.bashrc` if your shell is bash:
+
+```
+export GEM_HOME=$HOME/gems
+export PATH=$HOME/gems/bin:$PATH
+```
+
+Relaunch your terminal and run `gem env` to check that default gem paths point to your home directory by default.
+
 ### Manage multiple Ruby environments with rbenv {#rbenv}
 
 People often use [rbenv](https://github.com/rbenv/rbenv) to manage multiple
@@ -105,10 +92,10 @@ Restart your terminal for changes to take effect.
 Now you can install the Ruby version of our choice, let's go with current latest stable Ruby:
 
 ```sh
-rbenv install 2.5.3
-rbenv global 2.5.3
+rbenv install 2.6.2
+rbenv global 2.6.2
 ruby -v
-ruby 2.5.3p105 (2018-10-18 revision 65156) [x86_64-darwin18]
+ruby 2.6.2p47 (2019-03-13 revision 67232) [x86_64-darwin18]
 ```
 
 That's it! Head over [rbenv command references](https://github.com/rbenv/rbenv#command-reference) to learn how to use different versions of Ruby in your projects.
diff --git a/docs/_docs/liquid/tags.md b/docs/_docs/liquid/tags.md
index 90b654b83da..d402a8558c2 100644
--- a/docs/_docs/liquid/tags.md
+++ b/docs/_docs/liquid/tags.md
@@ -90,10 +90,10 @@ You must include the file's original extension when using the `link` tag. Here a
 
 {% 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 %}
+{% link _collection/name-of-document.md %}
+{% link _posts/2016-07-26-name-of-post.md %}
+{% link news/index.html %}
+{% link /assets/files/doc.pdf %}
 ```
 {% endraw %}
 
@@ -101,14 +101,15 @@ You can also use the `link` tag to create a link in Markdown as follows:
 
 {% 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 %})
+[Link to a document]({% link _collection/name-of-document.md %})
+[Link to a post]({% link _posts/2016-07-26-name-of-post.md %})
+[Link to a page]({% link news/index.html %})
+[Link to a file]({% link /assets/files/doc.pdf %})
 ```
 {% endraw %}
 
-(Including `{% raw %}{{ site.baseurl }}{% endraw %}` is optional — it depends on whether you want to preface the page URL with the `baseurl` value.)
+{: .note }
+Since {% include docs_version_badge.html version="v4.0"%} you don't need to prepend `link` tags with `site.baseurl`
 
 The path to the post, page, or collection is defined as the path relative to the root directory (where your config file is) to the file, not the path from your existing page to the other page.
 
diff --git a/docs/_docs/troubleshooting.md b/docs/_docs/troubleshooting.md
index cff5a07b4f7..31103e5154b 100644
--- a/docs/_docs/troubleshooting.md
+++ b/docs/_docs/troubleshooting.md
@@ -21,7 +21,7 @@ the header files for compiling extension modules for Ruby 2.x This
 can be done on Ubuntu or Debian by running:
 
 ```sh
-sudo apt-get install ruby2.3-dev
+sudo apt-get install ruby2.6-dev
 ```
 
 On Red Hat, CentOS, and Fedora systems you can do this by running:
@@ -138,10 +138,10 @@ jekyll new test
 
 Running bundle install in /home/user/test...
 
-Your user account isn't allowed to install to the system RubyGems.
+Your user account is not allowed to install to the system RubyGems.
 You can cancel this installation and run:
 
-      bundle install --path vendor/bundle
+    bundle install --path vendor/bundle
 
 to install the gems into ./vendor/bundle/, or you can enter your password
 and install the bundled gems to RubyGems using sudo.
diff --git a/docs/_docs/upgrading.md b/docs/_docs/upgrading.md
index 3029c0724e9..37138000069 100644
--- a/docs/_docs/upgrading.md
+++ b/docs/_docs/upgrading.md
@@ -10,6 +10,7 @@ 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/)
+- [From 3.x to 4.x](/docs/upgrading/3-to-4/)
 
 ## Minor updates
 
diff --git a/docs/_docs/upgrading/3-to-4.md b/docs/_docs/upgrading/3-to-4.md
index 41c44fce5ca..f483e64aa1d 100644
--- a/docs/_docs/upgrading/3-to-4.md
+++ b/docs/_docs/upgrading/3-to-4.md
@@ -3,34 +3,36 @@ title: Upgrading from 3.x to 4.x
 permalink: /docs/upgrading/3-to-4/
 ---
 
-Upgrading from an older version of Jekyll? A few things have changed in Jekyll 4
-that you'll want to know about.
+A few things have changed in Jekyll 4.
 
-Before we dive in, you need to have at least Ruby 2.3.0 installed. Run the following
-in your terminal to check
+Before we dive in, you need to have at least Ruby {{ site.min_ruby_version }}
+installed.
+
+Run the following in your terminal to check
 
 ```sh
 ruby -v
+ruby 2.6.2p47 (2019-03-13 revision 67232) [x86_64-darwin18]
 ```
 
-If you're using Ruby >= 2.3.0, go ahead and fetch the latest version of Jekyll:
+If you're using a supported Ruby version > {{ site.min_ruby_version }}, go ahead
+and fetch the latest version of Jekyll:
 
 ```sh
 gem update jekyll
 ```
 
----
-
-### Template rendering
+## Template rendering
 
-We've slightly altered the way Jekyll parses and renders your various templates to improve
-the overall build times. Jekyll now parses a template once, caches it internally and then
-renders the parsed template multiple times as required by your pages and documents.
+We've slightly altered the way Jekyll parses and renders your various templates
+to improve the overall build times. Jekyll now parses a template once, caches it
+internally and then renders the parsed template multiple times as required by
+your pages and documents.
 
-The downside to this is that some of the community-authored plugins may not work as they
-previously used to.
+The downside to this is that some of the community-authored plugins may not work
+as they previously used to.
 
-#### For Plugin-authors
+## For plugin authors
 
 * If your plugin depends on the following code: `site.liquid_renderer.file(path).parse(content)`,
 note that the return value (`template`, an instance of *`Liquid::Template`*), from that line will
@@ -46,11 +48,10 @@ you can invoke *`Liquid::Template`* directly:
   + template = Liquid::Template.parse(content)
   ```
 
----
-
-### Exclusion changes
+## Exclusion changes
 
-We've enhanced our default exclusion array. It now looks like the following:
+We've enhanced our default exclusion array.
+It now looks like the following:
 
 ```yaml
 # default excludes
@@ -81,27 +82,26 @@ include:
   - node_modules/uglifier/index.js
 ```
 
-The above configuration directs Jekyll to handle only `node_modules/uglifier/index.js`
-while ignoring every other file in the `node_modules` directory since that directory is
-"excluded" by default.
+The above configuration directs Jekyll to handle only
+`node_modules/uglifier/index.js` while ignoring every other file in the
+`node_modules` directory since that directory is "excluded" by default.
 
-Note that the default `include` array still gets overridden by the `include` array in your
-config file. So, be sure to add `.htaccess` to the list if you need that file to be
-present in the generated site.
+Note that the default `include` array still gets overridden by the `include`
+array in your config file. So, be sure to add `.htaccess` to the list if you
+need that file to be present in the generated site.
 
----
-
-### kramdown v2
+## Kramdown v2
 
 Jekyll has dropped support for `kramdown-1.x` entirely.
 
-From [`v2.0` onwards](https://kramdown.gettalong.org/news.html#kramdown-200-released) kramdown requires
-specific extensions to be additionally installed to use certain features are desired outside of kramdown's
-core functionality.
+From [`v2.0` onwards](https://kramdown.gettalong.org/news.html#kramdown-200-released)
+kramdown requires specific extensions to be additionally installed to use
+certain features are desired outside of kramdown's core functionality.
 
-Out of all the extensions listed in the report linked above, gem `kramdown-parser-gfm` is automatically
-installed along with Jekyll 4.0. The remaining extensions will have to be manually installed by the user
-depending on desired funtionality, by listing the extension's gem-name in their `Gemfile`.
+Out of all the extensions listed in the report linked above, gem
+`kramdown-parser-gfm` is automatically installed along with Jekyll 4.0. The
+remaining extensions will have to be manually installed by the user depending on
+desired funtionality, by listing the extension's gem-name in their `Gemfile`.
 
 Notes:
   * `kramdown-converter-pdf` will be ignored by Jekyll Core. To have Jekyll convert Markdown to PDF
@@ -135,7 +135,3 @@ Notes:
     ```
   * Vendors that provide a versioned Jekyll Environment Image (e.g. Docker Image, GitHub Pages, etc)
     will have to manually whitelist kramdown's extension gems in their distributions for Jekyll 4.0.
-
----
-
-*Did we miss something? Please click "Improve this page" above and add a section. Thanks!*
diff --git a/docs/_posts/2019-03-18-jekyll-4-0-0-pre-alpha1-released.markdown b/docs/_posts/2019-03-18-jekyll-4-0-0-pre-alpha1-released.markdown
new file mode 100644
index 00000000000..d4a2470997f
--- /dev/null
+++ b/docs/_posts/2019-03-18-jekyll-4-0-0-pre-alpha1-released.markdown
@@ -0,0 +1,42 @@
+---
+title: Jekyll 4.0.0.pre.alpha1 Released
+date: 2019-03-18 18:17:31 +0100
+author: dirtyf
+version: 4.0.0.pre.alpha1
+category: release
+---
+
+Dear Jekyllers,
+
+Time has come to release a first alpha for Jekyll 4!
+
+This pre version fixes many bugs, and should improve your build times. Some of you already shared [really](https://forestry.io/blog/how-i-reduced-my-jekyll-build-time-by-61/) [good](https://boris.schapira.dev/2018/11/jekyll-build-optimization/) results. We hope your Jekyll sites will also benefit from these optimizations.
+
+If you're a plugin developer, we definitely need your feedback, especially if your plugin does not work with v4.
+
+Jekyll now exposes a [caching API](/tutorials/cache-api/), that some plugins could benefit from.
+
+Also be aware that it's a new *major* version, and it comes with a few breaking changes, notably :
+
+1. We dropped support for [Ruby 2.3 who goes EOL at the end of the month](https://www.ruby-lang.org/en/downloads/).
+   GitHub Pages runs Ruby 2.5.x, services lile Netlify or Forestry already upgraded to latest Ruby 2.6.x.
+2. `link` tag now include `relative_url` filter, hurray [no more need to prepend `{% raw %}{{ site.baseurl }}{% endraw %}` ](https://github.com/jekyll/jekyll/pull/6727).
+3. [`{% raw %}{% highlight %}{% endraw %}` now behaves like `{% raw %}{% raw %}{% endraw %}`](https://github.com/jekyll/jekyll/pull/6821), so you can no longer use `include` tags within.
+4. We dropped support for Pygments, RedCarpet and rdiscount.
+5. We bumped kramdown to v2.
+
+Checkout the complete [changelog](https://github.com/jekyll/jekyll/blob/master/History.markdown#minor-enhancements) for more details.
+
+To test this pre version run:
+
+```sh
+gem install jekyll --pre
+```
+
+Please test this version thoroughly and file bugs as you encounter them.
+
+Thanks to our dear contributors for helping making Jekyll better:
+
+Aidan Fitzgerald, Akshat Kedia, Alex Wood, Alexey Kopytko, Alexey Pelykh, Ali Thompson, Ana María Martínez Gómez, Ananthakumar, Andreas Möller, Andrew Lyndem, Andy Alt, Anne Gentle, Anny, Arjun Thakur, Arthur Attwell, Ashwin Maroli, Behrang, Belhassen Chelbi, Ben Keith, Ben Otte, Bilawal Hameed, Boris Schapira, Boris van Hoytema, Brett C, Chris Finazzo, Christian Oliff, Damien Solodow, Dan Allen, Dan Friedman, Daniel Höpfl, David J. Malan, Denis McDonald, Derek Smart, Derpy, Dusty Candland, ExE Boss, Frank Taillandier, Gareth Cooper, Grzegorz Kaczorek, Isaac Goodman, Jacob Byers, Jakob Krigovsky, Jan Pobořil, Joe Shannon, Jordan Morgan, Jorie Tappa, Josue Caraballo, Justin Vallelonga, Jörg Steinsträter, Karel Bílek, Keith Mifsud, Kelly-Ann Green, Ken Salomon, Kevin Plattret, Kyle Barbour, Lars Kanis, Leandro Facchinetti, Luis Enrique Perez Alvarez, Luis Guillermo Yáñez, Ma HongJun, Manu Mathew, Mario, Martin Scharm, Matt Massicotte, Matthew Rathbone, Maxwell Gerber, Mertcan Yücel, Michael Hiiva, Mike Kasberg, Mike Neumegen, Monica Powell, Nicolas Hoizey, Nikhil Swaminathan, Nikita Skalkin, Olivia Hugger, Parker Moore, Pat Hawks, Patrick Favre-Bulle, Paul Kim, Philip Belesky, Preston Lim, Ralph, Robert Riemann, Rosário Pereira Fernandes, Samuel Gruetter, Scott Killen, Sri Pravan Paturi, Stephan Fischer, Stephen Weiss, Steven Westmoreland, Sundaram Kalyan Vedala, Thanos Kolovos, Timo Schuhmacher, Tobias, Tom Harvey, Tushar Prajapati, Victor Afanasev, Vitor Oliveira, Wouter Schoot, XhmikosR, Zhang Xiangze, _94gsc, argv-minus-one, chrisfinazzo, ikeji, jess, jpasholk, makmm, mo khan, ninevra, penguinpet, 김정환, 104fps
+
+Happy Jekylling everyone!
diff --git a/docs/_tutorials/cache_api.md b/docs/_tutorials/cache_api.md
index 6e2692e463c..2690dc1639a 100644
--- a/docs/_tutorials/cache_api.md
+++ b/docs/_tutorials/cache_api.md
@@ -2,7 +2,6 @@
 layout: tutorials
 permalink: /tutorials/cache-api/
 title: Cache API
-published: false
 ---
 
 Jekyll includes a caching API, which is used both internally as well as exposed
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 66bcd7e0094..801d764e8ee 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -49,7 +49,9 @@ Gem::Specification.new do |s|
 
   s.post_install_message = <<~MSG
     ----------------------------------------------------------------------------------
-    This version of Jekyll comes with some major changes. Most notably:
+    This version of Jekyll comes with some major changes.
+
+    Most notably:
       * Our `link` tag now comes with the `relative_url` filter incorporated into it.
         You should no longer prepend `{{ site.baseurl }}` to `{% link foo.md %}`
         For further details: https://github.com/jekyll/jekyll/pull/6727
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index b24d27d851c..226550da3b1 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "3.8.5"
+  VERSION = "4.0.0.pre.alpha1"
 end

From 6dcce995a6559659cb5e2f7501bd22665c5a01dc Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 19 Mar 2019 03:03:59 -0400
Subject: [PATCH 3551/4996] Update history to reflect merge of #7574 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a0abb7444fb..71f776bd493 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,7 +25,7 @@
   * Allow custom sorting of collection documents (#7427)
   * Always exclude certain paths from being processed (#7188)
 
-  ### Bug Fixes
+### Bug Fixes
 
   * Security: fix `include` bypass of `EntryFilter#filter` symlink check (#7226)
   * Theme gems: ensure directories aren't symlinks (#7419)
@@ -246,6 +246,10 @@
   * Link to sponsor listing in README (#7405)
   * Better Performance (#7388)
 
+### release
+
+  * Release v4.0.0.pre.alpha1 (#7574)
+
 ## 3.8.5 / 2018-11-04
 
 ### Bug Fixes

From 1041f7672f3683062c3ff16667f957477ce73ced Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 19 Mar 2019 08:05:07 +0100
Subject: [PATCH 3552/4996] Release :gem: 4.0.0.pre.alpha1


From 09b110d45389bb725afda57503418d505269c2ed Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 19 Mar 2019 08:11:05 +0100
Subject: [PATCH 3553/4996] link to GitHub pre-release

---
 .../_posts/2019-03-18-jekyll-4-0-0-pre-alpha1-released.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_posts/2019-03-18-jekyll-4-0-0-pre-alpha1-released.markdown b/docs/_posts/2019-03-18-jekyll-4-0-0-pre-alpha1-released.markdown
index d4a2470997f..40907fbf073 100644
--- a/docs/_posts/2019-03-18-jekyll-4-0-0-pre-alpha1-released.markdown
+++ b/docs/_posts/2019-03-18-jekyll-4-0-0-pre-alpha1-released.markdown
@@ -25,7 +25,7 @@ Also be aware that it's a new *major* version, and it comes with a few breaking
 4. We dropped support for Pygments, RedCarpet and rdiscount.
 5. We bumped kramdown to v2.
 
-Checkout the complete [changelog](https://github.com/jekyll/jekyll/blob/master/History.markdown#minor-enhancements) for more details.
+Checkout the complete [changelog](https://github.com/jekyll/jekyll/releases/tag/v4.0.0.pre.alpha1) for more details.
 
 To test this pre version run:
 

From 6905c80470d403cb53a40d3e62798b72491903d3 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Tue, 19 Mar 2019 13:19:39 +0530
Subject: [PATCH 3554/4996] Re-insert deleted History entry [skip ci]

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

diff --git a/History.markdown b/History.markdown
index 71f776bd493..af0573c6db7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -54,6 +54,7 @@
   * Escape valid special chars in a site's path name (#7568)
   * Replace `name` in Page#inspect with relative_path (#7434)
   * Log a warning when the slug is empty (#7357)
+  * Push Markdown link refs to excerpt only as required (#7577)
 
 ### Minor Enhancements
 

From 0da5389cbbf620eaec383f2346ea9c94b85ed180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20P=C3=A4per?= 
Date: Fri, 22 Mar 2019 01:42:36 +0100
Subject: [PATCH 3555/4996] ISO week date drops (#5981)

Merge pull request 5981
---
 docs/_docs/permalinks.md     | 102 ++++++++++++++++++++++++++++-------
 lib/jekyll/configuration.rb  |   2 +
 lib/jekyll/drops/url_drop.rb |  43 +++++++++++++++
 3 files changed, 128 insertions(+), 19 deletions(-)

diff --git a/docs/_docs/permalinks.md b/docs/_docs/permalinks.md
index 8aa9b05406d..e67d850abcd 100644
--- a/docs/_docs/permalinks.md
+++ b/docs/_docs/permalinks.md
@@ -61,8 +61,19 @@ Here's the full list of placeholders available:
       
       
         
    
-          Year from the post's filename. May be overridden via the document’s
-          date front matter
+          Year from the post’s filename with four digits.
+          May be overridden via the document’s date front matter.
+        
    
+      
+    
+    
+      
+        
    short_year
    
+      
+      
+        
    
+          Year from the post’s filename without the century. (00..99)
+          May be overridden via the document’s date front matter.
         
    
       
     
@@ -72,8 +83,8 @@ Here's the full list of placeholders available:
       
       
         
    
-          Month from the post's filename. May be overridden via the document’s
-          date front matter
+          Month from the post’s filename. (01..12)
+          May be overridden via the document’s date front matter.
         
    
       
     
@@ -83,19 +94,35 @@ Here's the full list of placeholders available:
       
       
         
    
-          Month without leading zeros from the post's filename. May be
-          overridden via the document’s date front matter
+          Month without leading zeros from the post’s filename. May be
+          overridden via the document’s date front matter.
         
    
       
     
+    
+      
+        
    short_month
    
+      
+      
+        
    Three-letter month abbreviation, e.g. “Jan”.
    
+      
+    
+    
+      
+        
    long_month
    
+      
+      
+        
    Full month name, e.g. “January”.
    
+      
+    
     
       
         
    day
    
       
       
         
    
-          Day from the post's filename. May be overridden via the document’s
-          date front matter
+          Day of the month from the post’s filename. (01..31)
+          May be overridden via the document’s date front matter.
         
    
       
     
@@ -105,8 +132,8 @@ Here's the full list of placeholders available:
       
       
         
    
-          Day without leading zeros from the post's filename. May be overridden
-          via the document’s date front matter
+          Day of the month without leading zeros from the post’s filename.
+          May be overridden via the document’s date front matter.
         
    
       
     
@@ -115,18 +142,47 @@ Here's the full list of placeholders available:
         
    y_day
    
       
       
-        
    Day of the year from the post's filename, with leading zeros.
    
+        
    Ordinal day of the year from the post’s filename, with leading zeros. (001..366)
    
       
     
     
       
-        
    short_year
    
+        
    w_year
    
       
       
-        
    
-          Year without the century from the post's filename. May be overridden
-          via the document’s date front matter
-        
    
+        
    Week year which may differ from the month year for up to three days at the start of January and end of December
    
+      
+    
+    
+      
+        
    week
    
+      
+      
+        
    Week number of the current year, starting with the first week having a majority of its days in January. (01..53)
    
+      
+    
+    
+      
+        
    w_day
    
+      
+      
+        
    Day of the week, starting with Monday. (1..7)
    
+      
+    
+    
+      
+        
    short_day
    
+      
+      
+        
    Three-letter weekday abbreviation, e.g. “Sun”.
    
+      
+    
+    
+      
+        
    long_day
    
+      
+      
+        
    Weekday name, e.g. “Sunday”.
    
       
     
     
@@ -135,7 +191,7 @@ Here's the full list of placeholders available:
       
       
         
    
-          Hour of the day, 24-hour clock, zero-padded from the post's
+          Hour of the day, 24-hour clock, zero-padded from the post’s
           date front matter. (00..23)
         
    
       
@@ -146,7 +202,7 @@ Here's the full list of placeholders available:
       
       
         
    
-          Minute of the hour from the post's date front matter. (00..59)
+          Minute of the hour from the post’s date front matter. (00..59)
         
    
       
     
@@ -156,7 +212,7 @@ Here's the full list of placeholders available:
       
       
         
    
-          Second of the minute from the post's date front matter. (00..59)
+          Second of the minute from the post’s date front matter. (00..59)
         
    
       
     
@@ -237,6 +293,14 @@ For posts, Jekyll also provides the following built-in styles for convenience:
         
    /:categories/:year/:y_day/:title:output_ext
    
       
     
+    
+      
+        
    weekdate
    
+      
+      
+        
    /:categories/:year/W:week/:short_day/:title.html
    
+      
+    
     
       
         
    none
    
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 08d09fc8c4c..d7e00d32f1b 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -305,6 +305,8 @@ def style_to_permalink(permalink_style)
         "/:categories/:year/:month/:day/:title:output_ext"
       when :ordinal
         "/:categories/:year/:y_day/:title:output_ext"
+      when :weekdate
+        "/:categories/:year/W:week/:short_day/:title:output_ext"
       else
         permalink_style.to_s
       end
diff --git a/lib/jekyll/drops/url_drop.rb b/lib/jekyll/drops/url_drop.rb
index f0641e23cd5..6edb7d64d72 100644
--- a/lib/jekyll/drops/url_drop.rb
+++ b/lib/jekyll/drops/url_drop.rb
@@ -35,46 +35,89 @@ def categories
         category_set.to_a.join("/")
       end
 
+      # CCYY
       def year
         @obj.date.strftime("%Y")
       end
 
+      # MM: 01..12
       def month
         @obj.date.strftime("%m")
       end
 
+      # DD: 01..31
       def day
         @obj.date.strftime("%d")
       end
 
+      # hh: 00..23
       def hour
         @obj.date.strftime("%H")
       end
 
+      # mm: 00..59
       def minute
         @obj.date.strftime("%M")
       end
 
+      # ss: 00..59
       def second
         @obj.date.strftime("%S")
       end
 
+      # D: 1..31
       def i_day
         @obj.date.strftime("%-d")
       end
 
+      # M: 1..12
       def i_month
         @obj.date.strftime("%-m")
       end
 
+      # MMM: Jan..Dec
       def short_month
         @obj.date.strftime("%b")
       end
 
+      # MMMM: January..December
+      def long_month
+        @obj.date.strftime("%B")
+      end
+
+      # YY: 00..99
       def short_year
         @obj.date.strftime("%y")
       end
 
+      # CCYYw, ISO week year
+      # may differ from CCYY for the first days of January and last days of December
+      def w_year
+        @obj.date.strftime("%G")
+      end
+
+      # WW: 01..53
+      # %W and %U do not comply with ISO 8601-1
+      def week
+        @obj.date.strftime("%V")
+      end
+
+      # d: 1..7 (Monday..Sunday)
+      def w_day
+        @obj.date.strftime("%u")
+      end
+
+      # dd: Mon..Sun
+      def short_day
+        @obj.date.strftime("%a")
+      end
+
+      # ddd: Monday..Sunday
+      def long_day
+        @obj.date.strftime("%A")
+      end
+
+      # DDD: 001..366
       def y_day
         @obj.date.strftime("%j")
       end

From 16c24d91258a9a30788a59fde2ee2aaea4ff2721 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 21 Mar 2019 20:42:38 -0400
Subject: [PATCH 3556/4996] Update history to reflect merge of #5981 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index af0573c6db7..aed14249266 100644
--- a/History.markdown
+++ b/History.markdown
@@ -89,6 +89,7 @@
   * Configure cache_dir (#7232)
   * Lock use of `tzinfo` gem to v1.x (#7521, #7562)
   * Utilize absolute paths of user-provided file paths (#7450)
+  * ISO week date drops (#5981)
 
 ### Development Fixes
 

From 9240addcf05d6e92cb661d6d51fc3b8c436298b7 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 22 Mar 2019 20:23:34 +0530
Subject: [PATCH 3557/4996] Detect `nil` and empty values in objects with
 `where` filter (#7580)

Merge pull request 7580
---
 docs/_docs/liquid/filters.md   | 15 ++++++++++
 features/embed_filters.feature | 52 ++++++++++++++++++++++++++++++++++
 features/step_definitions.rb   | 11 +++++++
 lib/jekyll/filters.rb          | 30 ++++++++++++++++----
 test/test_filters.rb           | 35 +++++++++++++++++++++++
 5 files changed, 137 insertions(+), 6 deletions(-)

diff --git a/docs/_docs/liquid/filters.md b/docs/_docs/liquid/filters.md
index 84aad19e9b0..bd33c07c2d7 100644
--- a/docs/_docs/liquid/filters.md
+++ b/docs/_docs/liquid/filters.md
@@ -104,6 +104,21 @@ The default is `default`. They are as follows (with what they filter):
 - `ascii`: spaces, non-alphanumeric, and non-ASCII characters
 - `latin`: like `default`, except Latin characters are first transliterated (e.g. `àèïòü` to `aeiou`) {%- include docs_version_badge.html version="3.7.0" -%}.
 
+### Detecting `nil` values with `where` filter {%- include docs_version_badge.html version="4.0.0" -%}
+
+You can use the `where` filter to detect documents and pages with properties that are `nil` or `""`. For example,
+
+```liquid
+// Using `nil` to select posts that either do not have `my_prop` defined or `my_prop` has been set to `nil` explicitly.
+{% raw %}{% assign filtered_posts = site.posts | where: 'my_prop', nil %}{% endraw %}
+```
+
+```liquid
+// Using Liquid's special literal `empty` or `blank` to select posts that have `my_prop` set to an empty value.
+{% raw %}{% assign filtered_posts = site.posts | where: 'my_prop', empty %}{% endraw %}
+```
+
+
 ### Standard Liquid Filters
 
 For your convenience, here is the list of all [Liquid filters]({{ page.shopify_filter_url }}) with links to examples in the official Liquid documentation.
diff --git a/features/embed_filters.feature b/features/embed_filters.feature
index e3802fe55da..32f0fe7e7c7 100644
--- a/features/embed_filters.feature
+++ b/features/embed_filters.feature
@@ -107,3 +107,55 @@ Feature: Embed filters
     Then I should get a zero exit status
     And the _site directory should exist
     And I should see exactly "The rule of 3: Fly, Run, Jump," in "_site/bird.html"
+
+  Scenario: Filter posts by given property and value
+    Given I have a _posts directory
+    And I have the following posts:
+      | title    | date       | content   | property                  |
+      | Bird     | 2019-03-13 | Chirp     | [nature, sounds]          |
+      | Cat      | 2019-03-14 | Meow      | [sounds]                  |
+      | Dog      | 2019-03-15 | Bark      |                           |
+      | Elephant | 2019-03-16 | Asiatic   | wildlife                  |
+      | Goat     | 2019-03-17 | Mountains | ""                        |
+      | Horse    | 2019-03-18 | Mustang   | []                        |
+      | Iguana   | 2019-03-19 | Reptile   | {}                        |
+      | Jaguar   | 2019-03-20 | Reptile   | {foo: lorem, bar: nature} |
+    And I have a "string-value.md" page with content:
+      """
+      {% assign pool = site.posts | reverse | where: 'property', 'wildlife' %}
+      {{ pool | map: 'title' | join: ', ' }}
+      """
+    And I have a "string-value-array.md" page with content:
+      """
+      {% assign pool = site.posts | reverse | where: 'property', 'sounds' %}
+      {{ pool | map: 'title' | join: ', ' }}
+      """
+    And I have a "string-value-hash.md" page with content:
+      """
+      {% assign pool = site.posts | reverse | where: 'property', 'nature' %}
+      {{ pool | map: 'title' | join: ', ' }}
+      """
+    And I have a "nil-value.md" page with content:
+      """
+      {% assign pool = site.posts | reverse | where: 'property', nil %}
+      {{ pool | map: 'title' | join: ', ' }}
+      """
+    And I have an "empty-liquid-literal.md" page with content:
+      """
+      {% assign pool = site.posts | reverse | where: 'property', empty %}
+      {{ pool | map: 'title' | join: ', ' }}
+      """
+    And I have a "blank-liquid-literal.md" page with content:
+      """
+      {% assign pool = site.posts | reverse | where: 'property', blank %}
+      {{ pool | map: 'title' | join: ', ' }}
+      """
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see exactly "
    Elephant
    " in "_site/string-value.html"
+    And I should see exactly "
    Bird, Cat
    " in "_site/string-value-array.html"
+    And I should see exactly "
    Bird
    " in "_site/string-value-hash.html"
+    And I should see exactly "
    Dog
    " in "_site/nil-value.html"
+    And I should see exactly "
    Dog, Goat, Horse, Iguana
    " in "_site/empty-liquid-literal.html"
+    And I should see exactly "
    Dog, Goat, Horse, Iguana
    " in "_site/blank-liquid-literal.html"
diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index fe5ade94387..fb2b75bb48a 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -67,6 +67,17 @@
 
 #
 
+Given(%r!^I have an? "(.*)" page with content:$!) do |file, text|
+  File.write(file, <<~DATA)
+    ---
+    ---
+
+    #{text}
+  DATA
+end
+
+#
+
 Given(%r!^I have an? (.*) directory$!) do |dir|
   unless File.directory?(dir)
     then FileUtils.mkdir_p(dir)
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 01fd0372a59..055a3e5ee0a 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -161,13 +161,15 @@ def jsonify(input)
 
     # Filter an array of objects
     #
-    # input - the object array
-    # property - property within each object to filter by
-    # value - desired value
+    # input    - the object array.
+    # property - the property within each object to filter by.
+    # value    - the desired value.
+    #            Cannot be an instance of Array nor Hash since calling #to_s on them returns
+    #            their `#inspect` string object.
     #
     # Returns the filtered array of objects
     def where(input, property, value)
-      return input if property.nil? || value.nil?
+      return input if !property || value.is_a?(Array) || value.is_a?(Hash)
       return input unless input.respond_to?(:select)
 
       input    = input.values if input.is_a?(Hash)
@@ -182,8 +184,8 @@ def where(input, property, value)
       # stash or retrive results to return
       @where_filter_cache[input_id][property][value] ||= begin
         input.select do |object|
-          Array(item_property(object, property)).map!(&:to_s).include?(value.to_s)
-        end || []
+          compare_property_vs_target(item_property(object, property), value)
+        end.to_a
       end
     end
 
@@ -323,6 +325,22 @@ def sort_input(input, property, order)
         .map!(&:last)
     end
 
+    # `where` filter helper
+    def compare_property_vs_target(property, target)
+      case target
+      when NilClass
+        return true if property.nil?
+      when Liquid::Expression::MethodLiteral # `empty` or `blank`
+        return true if Array(property).join == target.to_s
+      else
+        Array(property).each do |prop|
+          return true if prop.to_s == target.to_s
+        end
+      end
+
+      false
+    end
+
     def item_property(item, property)
       @item_property_cache ||= {}
       @item_property_cache[property] ||= {}
diff --git a/test/test_filters.rb b/test/test_filters.rb
index fcdc02085e7..39ec85653eb 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -844,6 +844,11 @@ def to_liquid
         assert_equal 2, @filter.where(@array_of_objects, "color", "red").length
       end
 
+      should "filter objects with null properties appropriately" do
+        array = [{}, { "color" => nil }, { "color" => "" }, { "color" => "text" }]
+        assert_equal 2, @filter.where(array, "color", nil).length
+      end
+
       should "filter array properties appropriately" do
         hash = {
           "a" => { "tags"=>%w(x y) },
@@ -862,6 +867,36 @@ def to_liquid
         assert_equal 2, @filter.where(hash, "tags", "x").length
       end
 
+      should "filter hash properties with null and empty values" do
+        hash = {
+          "a" => { "tags" => {} },
+          "b" => { "tags" => "" },
+          "c" => { "tags" => nil },
+          "d" => { "tags" => ["x", nil] },
+          "e" => { "tags" => [] },
+          "f" => { "tags" => "xtra" },
+        }
+
+        assert_equal [{ "tags" => nil }], @filter.where(hash, "tags", nil)
+
+        assert_equal(
+          [{ "tags" => "" }, { "tags" => ["x", nil] }],
+          @filter.where(hash, "tags", "")
+        )
+
+        # `{{ hash | where: 'tags', empty }}`
+        assert_equal(
+          [{ "tags" => {} }, { "tags" => "" }, { "tags" => nil }, { "tags" => [] }],
+          @filter.where(hash, "tags", Liquid::Expression::LITERALS["empty"])
+        )
+
+        # `{{ `hash | where: 'tags', blank }}`
+        assert_equal(
+          [{ "tags" => {} }, { "tags" => "" }, { "tags" => nil }, { "tags" => [] }],
+          @filter.where(hash, "tags", Liquid::Expression::LITERALS["blank"])
+        )
+      end
+
       should "not match substrings" do
         hash = {
           "a" => { "category"=>"bear" },

From dea6bdbfafe1bd9cf3f65214885dbd28f3f26f28 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 22 Mar 2019 10:53:37 -0400
Subject: [PATCH 3558/4996] Update history to reflect merge of #7580 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index aed14249266..65974d17b39 100644
--- a/History.markdown
+++ b/History.markdown
@@ -90,6 +90,7 @@
   * Lock use of `tzinfo` gem to v1.x (#7521, #7562)
   * Utilize absolute paths of user-provided file paths (#7450)
   * ISO week date drops (#5981)
+  * Detect `nil` and empty values in objects with `where` filter (#7580)
 
 ### Development Fixes
 

From 2090989fb331f9ed0437af8edf2f4695f2c08c51 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 22 Mar 2019 21:48:58 +0530
Subject: [PATCH 3559/4996] Favor Ruby 2.3 squiggly-heredoc operator (#7584)

Merge pull request 7584
---
 features/step_definitions.rb         |  2 +-
 lib/jekyll/commands/serve/servlet.rb | 19 +++++++++----------
 lib/jekyll/utils.rb                  |  7 -------
 test/test_kramdown.rb                |  6 +++---
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index fb2b75bb48a..91bcd8a8b1f 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -34,7 +34,7 @@
 #
 
 Given(%r!^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$!) do |file, key, value, text|
-  File.write(file, Jekyll::Utils.strip_heredoc(<<-DATA))
+  File.write(file, <<~DATA)
     ---
     #{key || "layout"}: #{value || "none"}
     ---
diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb
index 9391c97e118..0ed57112f18 100644
--- a/lib/jekyll/commands/serve/servlet.rb
+++ b/lib/jekyll/commands/serve/servlet.rb
@@ -98,17 +98,16 @@ def template
           # Complicated JavaScript to ensure that livereload.js is loaded from the
           # same origin as the page.  Mostly useful for dealing with the browser's
           # distinction between 'localhost' and 127.0.0.1
-          template = <<-TEMPLATE
-          
+          @template ||= ERB.new(<<~TEMPLATE)
+            
           TEMPLATE
-          ERB.new(Jekyll::Utils.strip_heredoc(template))
         end
 
         def livereload_args
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index dc5eea2f619..2defd372997 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -17,14 +17,7 @@ module Utils
     SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze
     SLUGIFY_ASCII_REGEXP = Regexp.new("[^[A-Za-z0-9]]+").freeze
 
-    # Takes an indented string and removes the preceding spaces on each line
-
-    def strip_heredoc(str)
-      str.gsub(%r!^[ \t]{#{(str.scan(%r!^[ \t]*(?=\S)!).min || "").size}}!, "")
-    end
-
     # Takes a slug and turns it into a simple title.
-
     def titleize_slug(slug)
       slug.split("-").map!(&:capitalize).join(" ")
     end
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index b55180b6fcb..fa333c957de 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -88,7 +88,7 @@ class TestKramdown < JekyllUnitTest
     end
 
     should "render fenced code blocks with syntax highlighting" do
-      result = nokogiri_fragment(@markdown.convert(Utils.strip_heredoc(<<-MARKDOWN)))
+      result = nokogiri_fragment(@markdown.convert(<<~MARKDOWN))
         ~~~ruby
         puts "Hello World"
         ~~~
@@ -109,7 +109,7 @@ class TestKramdown < JekyllUnitTest
         }
 
         markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, override))
-        result = nokogiri_fragment(markdown.convert(Utils.strip_heredoc(<<-MARKDOWN)))
+        result = nokogiri_fragment(markdown.convert(<<~MARKDOWN))
           ~~~ruby
           puts "Hello World"
           ~~~
@@ -130,7 +130,7 @@ class TestKramdown < JekyllUnitTest
         @config.delete("highlighter")
         @config["kramdown"].delete("syntax_highlighter")
         markdown = Converters::Markdown.new(Utils.deep_merge_hashes(@config, override))
-        result = nokogiri_fragment(markdown.convert(Utils.strip_heredoc(<<-MARKDOWN)))
+        result = nokogiri_fragment(markdown.convert(<<~MARKDOWN))
           ~~~ruby
           puts "Hello World"
           ~~~

From 9e42fad62fed89c1aa3662cac9a01f4488695d58 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 22 Mar 2019 12:19:00 -0400
Subject: [PATCH 3560/4996] Update history to reflect merge of #7584 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 65974d17b39..c0915f9ea9f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -24,6 +24,7 @@
   * Only read layouts from source_dir or theme_dir (#6788)
   * Allow custom sorting of collection documents (#7427)
   * Always exclude certain paths from being processed (#7188)
+  * Remove Jekyll::Utils#strip_heredoc in favor of a Ruby > 2.3 built in (#7584)
 
 ### Bug Fixes
 

From e3b284b75707c887aefa62e309bed3f8a26ec87a Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 27 Mar 2019 02:51:47 +0530
Subject: [PATCH 3561/4996] Add a Cucumber feature for post_url tag (#7586)

Merge pull request 7586
---
 features/post_url_tag.feature | 134 ++++++++++++++++++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 features/post_url_tag.feature

diff --git a/features/post_url_tag.feature b/features/post_url_tag.feature
new file mode 100644
index 00000000000..0a764295fd0
--- /dev/null
+++ b/features/post_url_tag.feature
@@ -0,0 +1,134 @@
+Feature: PostUrl Tag
+  As a blogger who likes to write a variety of content
+  I want to be able to link to posts easily
+  And render them without much hassle
+
+  Scenario: A site that is using the defaults for permalink
+    Given I have a _posts directory
+    And I have the following post:
+      | title       | date       | content           |
+      | Hello World | 2019-02-04 | Lorem ipsum dolor |
+    And I have an "index.md" page that contains "[Welcome]({% post_url 2019-02-04-hello-world %})"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
    Welcome
    " in "_site/index.html"
+
+  Scenario: Site with site-wide custom permalink setting
+    Given I have a _posts directory
+    And I have the following posts:
+      | title         | date       | content           |
+      | Hello World   | 2019-02-04 | Lorem ipsum dolor |
+      | We Meet Again | 2019-02-05 | Alpha beta gamma  |
+    And I have a configuration file with "permalink" set to "/:title:output_ext"
+    And I have an "index.md" page that contains "[Welcome]({% post_url 2019-02-04-hello-world %})"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
    Welcome
    " in "_site/index.html"
+
+  Scenario: Site with custom permalink settings on each post
+    Given I have a _posts directory
+    And I have the following posts:
+      | title         | date       | permalink               | content           |
+      | Hello World   | 2019-02-04 | "/2019/hello-world/"    | Lorem ipsum dolor |
+      | We Meet Again | 2019-02-05 | "/2019/second-meeting/" | Alpha beta gamma  |
+    And I have a configuration file with "permalink" set to "/:title:output_ext"
+    And I have an "index.md" page that contains "[Welcome]({% post_url 2019-02-04-hello-world %})"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
    Welcome
    " in "_site/index.html"
+
+  Scenario: Site with no posts
+    Given I have an "index.md" page that contains "[Welcome]({% post_url 2019-02-04-hello-world %})"
+    When I run jekyll build
+    Then I should get a non-zero exit status
+    And the _site directory should not exist
+    But I should see "Could not find post \"2019-02-04-hello-world\" in tag 'post_url'." in the build output
+
+  Scenario: Site with a future-dated post
+    Given I have a _posts directory
+    And I have the following posts:
+      | title         | date       | content           |
+      | Hello World   | 2019-02-04 | Lorem ipsum dolor |
+      | We Meet Again | 2119-02-04 | Alpha beta gamma  |
+    And I have a configuration file with "permalink" set to "/:title:output_ext"
+    And I have an "index.md" page that contains "[Welcome Again]({% post_url 2119-02-04-we-meet-again %})"
+    When I run jekyll build --future
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
    Welcome Again
    " in "_site/index.html"
+
+  Scenario: Site with configured baseurl
+    Given I have a _posts directory
+    And I have the following posts:
+      | title         | date       | content           |
+      | Hello World   | 2019-02-04 | Lorem ipsum dolor |
+      | We Meet Again | 2019-02-05 | Alpha beta gamma  |
+    And I have a configuration file with "baseurl" set to "blog"
+    And I have an "index.md" page that contains "[Welcome]({% post_url 2019-02-04-hello-world %})"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
    Welcome
    " in "_site/index.html"
+
+  Scenario: Posts with categories
+    Given I have a _posts directory
+    And I have the following post:
+      | title        | date       | content           |
+      | Hello World  | 2019-02-04 | Lorem ipsum dolor |
+    And I have a movies/_posts directory
+    And I have the following post in "movies":
+      | title        | date       | content           |
+      | Hello Movies | 2019-02-05 | Lorem ipsum dolor |
+    And I have the following post in "movies":
+      | title        | date       | category | content                |
+      | Star Wars    | 2019-02-06 | film     | Luke, I am your father |
+    And I have an "index.md" page with content:
+      """
+      [Welcome]({% post_url 2019-02-04-hello-world %})
+
+      [Movies]({% post_url movies/2019-02-05-hello-movies %})
+
+      [Film]({% post_url movies/2019-02-06-star-wars %})
+      """
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
    Welcome
    " in "_site/index.html"
+    And I should see "
    Movies
    " in "_site/index.html"
+    And I should see "
    Film
    " in "_site/index.html"
+
+  Scenario: Duplicate posts with categories
+    Given I have a _posts directory
+    And I have the following post:
+      | title       | date       | content           |
+      | Hello World | 2019-02-04 | Lorem ipsum dolor |
+    And I have a movies/_posts directory
+    And I have the following post in "movies":
+      | title       | date       | content           |
+      | Hello World | 2019-02-04 | Lorem ipsum dolor |
+    And I have an "index.md" page with content:
+      """
+      [Welcome]({% post_url 2019-02-04-hello-world %})
+
+      [Movies]({% post_url movies/2019-02-04-hello-world %})
+      """
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "
    Welcome
    " in "_site/index.html"
+    And I should see "
    Movies
    " in "_site/index.html"
+
+  Scenario: Deprecated usage to link nested post
+    Given I have a movies/_posts directory
+    And I have the following post in "movies":
+      | title       | date       | content           |
+      | Hello World | 2019-02-04 | Lorem ipsum dolor |
+    And I have an "index.md" page that contains "[Movies]({% post_url 2019-02-04-hello-world %})"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And I should see "Deprecation: A call to '{% post_url 2019-02-04-hello-world %}' did not match a post" in the build output
+    But the _site directory should exist
+    And I should see "
    Movies
    " in "_site/index.html"

From c985dc5899684484b2908261212b351f4ea11dc1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 26 Mar 2019 17:21:48 -0400
Subject: [PATCH 3562/4996] Update history to reflect merge of #7586 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c0915f9ea9f..32575ad7dfe 100644
--- a/History.markdown
+++ b/History.markdown
@@ -131,6 +131,7 @@
   * We are not using Ruby 2.2 anymore (#6977)
   * Remove unnecessary Jekyll::Page constant (#6770)
   * Remove unused error class (#6511)
+  * Add a Cucumber feature for post_url tag (#7586)
 
 ### Documentation
 

From 2591f33aa861ebe0294cc2b5d7b718f3cea5e21c Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 29 Mar 2019 12:24:45 +0530
Subject: [PATCH 3563/4996] Incorporate `relative_url` within `post_url` tag
 (#7589)

Merge pull request 7589
---
 docs/_docs/upgrading/3-to-4.md | 19 +++++++++++++++++++
 docs/_sass/_style.scss         |  9 +++++++++
 features/post_url_tag.feature  |  2 +-
 jekyll.gemspec                 |  4 ++++
 lib/jekyll/tags/post_url.rb    | 13 ++++++++-----
 5 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/docs/_docs/upgrading/3-to-4.md b/docs/_docs/upgrading/3-to-4.md
index f483e64aa1d..fe3f40b5435 100644
--- a/docs/_docs/upgrading/3-to-4.md
+++ b/docs/_docs/upgrading/3-to-4.md
@@ -22,6 +22,25 @@ and fetch the latest version of Jekyll:
 gem update jekyll
 ```
 
+
    
+  
    post_url Tag and Baseurl
    
+  
     
    
+  
    
+    The post_url tag now incorporates the relative_url filter within itself
+    and therefore automatically prepends your site's baseurl to the post's url
+    value.
+  
    
+  
    
+    Please ensure that you change all instances of the post_url usage as following:
+  
    
+
+{% highlight diff %}
+- {{ site.baseurl }}/{% post_url 2018-03-20-hello-world.markdown %}
++ {% post_url 2018-03-20-hello-world.markdown %}
+{% endhighlight %}
+
    
+
+
 ## Template rendering
 
 We've slightly altered the way Jekyll parses and renders your various templates
diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss
index 4b58e33ff4c..deafe505f50 100644
--- a/docs/_sass/_style.scss
+++ b/docs/_sass/_style.scss
@@ -708,6 +708,15 @@ h5 > code,
     0 -1px 0 rgba(0,0,0,.5));
 }
 
+.note .highlight {
+  width: 94%;
+  pre code {
+    font-size: 0.9em;
+    background-color: transparent;
+    box-shadow: none;
+  }
+}
+
 .note code {
   background-color: #333;
   background-color: rgba(0,0,0,0.2);
diff --git a/features/post_url_tag.feature b/features/post_url_tag.feature
index 0a764295fd0..172f914db15 100644
--- a/features/post_url_tag.feature
+++ b/features/post_url_tag.feature
@@ -71,7 +71,7 @@ Feature: PostUrl Tag
     When I run jekyll build
     Then I should get a zero exit status
     And the _site directory should exist
-    And I should see "
    Welcome
    " in "_site/index.html"
+    And I should see "
    Welcome
    " in "_site/index.html"
 
   Scenario: Posts with categories
     Given I have a _posts directory
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 801d764e8ee..2db9b7b836c 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -56,6 +56,10 @@ Gem::Specification.new do |s|
         You should no longer prepend `{{ site.baseurl }}` to `{% link foo.md %}`
         For further details: https://github.com/jekyll/jekyll/pull/6727
 
+      * Our `post_url` tag now comes with the `relative_url` filter incorporated into it.
+        You shouldn't prepend `{{ site.baseurl }}` to `{% post_url 2019-03-27-hello %}`
+        For further details: https://github.com/jekyll/jekyll/pull/7589
+
       * Our `highlight` tag no longer parses Liquid and Liquid-like constructs in the
         tag's content body. While this means you no longer need to enclose the content
         within a `{% raw %}{% endraw %}` block, it also means that you can no longer
diff --git a/lib/jekyll/tags/post_url.rb b/lib/jekyll/tags/post_url.rb
index 388124700e8..e6feb928e56 100644
--- a/lib/jekyll/tags/post_url.rb
+++ b/lib/jekyll/tags/post_url.rb
@@ -57,6 +57,8 @@ def post_slug(other)
     end
 
     class PostUrl < Liquid::Tag
+      include Jekyll::Filters::URLFilters
+
       def initialize(tag_name, post, tokens)
         super
         @orig_post = post.strip
@@ -72,24 +74,25 @@ def initialize(tag_name, post, tokens)
       end
 
       def render(context)
+        @context = context
         site = context.registers[:site]
 
-        site.posts.docs.each do |p|
-          return p.url if @post == p
+        site.posts.docs.each do |document|
+          return relative_url(document) if @post == document
         end
 
         # New matching method did not match, fall back to old method
         # with deprecation warning if this matches
 
-        site.posts.docs.each do |p|
-          next unless @post.deprecated_equality p
+        site.posts.docs.each do |document|
+          next unless @post.deprecated_equality document
 
           Jekyll::Deprecator.deprecation_message "A call to "\
             "'{% post_url #{@post.name} %}' did not match " \
             "a post using the new matching method of checking name " \
             "(path-date-slug) equality. Please make sure that you " \
             "change this tag to match the post's name exactly."
-          return p.url
+          return relative_url(document)
         end
 
         raise Jekyll::Errors::PostURLError, <<~MSG

From b09248ce2e69f7a76692991c28ccef476273cc32 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 29 Mar 2019 02:54:47 -0400
Subject: [PATCH 3564/4996] Update history to reflect merge of #7589 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 32575ad7dfe..e506710f7d8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Allow custom sorting of collection documents (#7427)
   * Always exclude certain paths from being processed (#7188)
   * Remove Jekyll::Utils#strip_heredoc in favor of a Ruby > 2.3 built in (#7584)
+  * Incorporate `relative_url` within `post_url` tag (#7589)
 
 ### Bug Fixes
 

From 31529906da88ce0a7d25a37ab88ad8384f579b63 Mon Sep 17 00:00:00 2001
From: Elvio Vicosa 
Date: Fri, 29 Mar 2019 14:55:20 +0100
Subject: [PATCH 3565/4996] Adds Statictastic to the list of resources (#7593)

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

diff --git a/docs/pages/resources.md b/docs/pages/resources.md
index 5afe12e00dc..8eaea365123 100644
--- a/docs/pages/resources.md
+++ b/docs/pages/resources.md
@@ -50,6 +50,7 @@ Use a SaaS service as a backend for functionality on your Jekyll site
   - [Forestry.io](https://forestry.io/): A static CMS that commits
   - [Netlify CMS](https://www.netlifycms.org/): Open source content management for your Git workflow
   - [Siteleaf](https://www.siteleaf.com/): Built for developers, Loved by everyone
+  - [Statictastic](https://www.statictastic.com/): Static site hosting, publishing and content management for teams
 
 ### E-commerce
   - [Snipcart](https://snipcart.com/blog/static-site-e-commerce-part-2-integrating-snipcart-with-jekyll): Add a shopping cart to a Jekyll site

From 41583c94059a6944c1ef95f7d4449e12f568f1ee Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 29 Mar 2019 09:55:21 -0400
Subject: [PATCH 3566/4996] Update history to reflect merge of #7593 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e506710f7d8..801b41e9cf3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -243,6 +243,7 @@
   * v4.0 development post (#6934)
   * Release post for v3.8.0 (#6849)
   * Release Post for v3.6.3, v3.7.4 and v3.8.4 (#7259)
+  * Adds Statictastic to the list of resources (#7593)
 
 ### Site Enhancements
 

From 0ff03dba6cb3902ab5e76494e3b4a08c6a592927 Mon Sep 17 00:00:00 2001
From: Haris Bjelic 
Date: Wed, 3 Apr 2019 13:06:32 +0200
Subject: [PATCH 3567/4996] Update 07-assets.md (#7599)

Merge pull request 7599
---
 docs/_docs/step-by-step/07-assets.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/step-by-step/07-assets.md b/docs/_docs/step-by-step/07-assets.md
index a218cf9434c..aa4903ce8a1 100644
--- a/docs/_docs/step-by-step/07-assets.md
+++ b/docs/_docs/step-by-step/07-assets.md
@@ -36,8 +36,7 @@ You could use a standard CSS file for styling, we're going to take it a step
 further by using [Sass](https://sass-lang.com/). Sass is a fantastic extension
 to CSS baked right into Jekyll.
 
-First create a Sass file at `/assets/css/styles.scss` with the following
-content:
+First create a Sass file at `/assets/css/styles.scss` with the following content:
 
 {% raw %}
 ```css
@@ -54,7 +53,7 @@ directory (`_sass/` by default).
 At this stage you'll just have a main css file. For larger projects, this is a
 great way to keep your CSS organized.
 
-Create `_sass/main.scss` with the following content:
+Create a Sass file at `/_sass/main.scss` with the following content:
 
 ```sass
 .current {

From 4f8e1f3d3fbb53a844ce5647390cf9c6fa709271 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 3 Apr 2019 07:06:33 -0400
Subject: [PATCH 3568/4996] Update history to reflect merge of #7599 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 801b41e9cf3..ccced3c4049 100644
--- a/History.markdown
+++ b/History.markdown
@@ -244,6 +244,7 @@
   * Release post for v3.8.0 (#6849)
   * Release Post for v3.6.3, v3.7.4 and v3.8.4 (#7259)
   * Adds Statictastic to the list of resources (#7593)
+  * Update 07-assets.md (#7599)
 
 ### Site Enhancements
 

From 744005036795f9301a42cb3a356f40722af1a562 Mon Sep 17 00:00:00 2001
From: Hodong Kim <43208265+cogniti@users.noreply.github.com>
Date: Thu, 4 Apr 2019 06:55:10 +0900
Subject: [PATCH 3569/4996] Fix link space (#7600)

Merge pull request 7600
---
 docs/_docs/pagination.md | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/docs/_docs/pagination.md b/docs/_docs/pagination.md
index e29ca3178c5..b0bb13ddad3 100644
--- a/docs/_docs/pagination.md
+++ b/docs/_docs/pagination.md
@@ -145,9 +145,7 @@ page with links to all but the current page.
 {% if paginator.total_pages > 1 %}
 
 
diff --git a/features/highlighting.feature b/features/highlighting.feature
index 09d7af57c14..c9f2b00acec 100644
--- a/features/highlighting.feature
+++ b/features/highlighting.feature
@@ -31,47 +31,3 @@ Feature: Syntax Highlighting
     When I run jekyll build
     Then I should get a zero exit-status
     And I should see "RewriteCond" in "_site/index.html"
-
-  Scenario: highlighting an Liquid example
-    Given I have an "inspect.md" file with content:
-    """
-    ---
-    title: Inspect Filter
-    ---
-    You can inspect a page's attributes with the `inspect` filter. You may enclose the
-    entire introspection within `
    ` tags to preserve the formatting:
-    {% highlight html %}
-    
    -      {{ page | inspect }}
-    
    
-    {% endhighlight %}
-    """
-    When I run jekyll build
-    Then I should get a zero exit-status
-    And I should see "" in "_site/inspect.html"
-    And I should see "{{ page | inspect }}" in "_site/inspect.html"
-
-  Scenario: highlighting an included snippet
-    Given I have an _includes directory
-    And I have an "_includes/inspector.html" file with content:
-    """
-    
    -      {{ page | inspect }}
-    
    
-    """
-    And I have an "inspect.md" file with content:
-    """
-    ---
-    title: Inspect Filter
-    ---
-    You can inspect a page's attributes with the `inspect` filter. You may enclose the
-    entire introspection within `
    ` tags to preserve the formatting:
-    {% highlight html %}
-      {% include inspector.html %}
-    {% endhighlight %}
-    """
-    When I run jekyll build
-    Then I should get a zero exit-status
-    And I should see "" in "_site/inspect.html"
-    But I should not see "{{ page | inspect }}" in "_site/inspect.html"
-    But I should see "{% include inspector.html %}" in "_site/inspect.html"
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 2db9b7b836c..cdcb16ea137 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -59,13 +59,6 @@ Gem::Specification.new do |s|
       * Our `post_url` tag now comes with the `relative_url` filter incorporated into it.
         You shouldn't prepend `{{ site.baseurl }}` to `{% post_url 2019-03-27-hello %}`
         For further details: https://github.com/jekyll/jekyll/pull/7589
-
-      * Our `highlight` tag no longer parses Liquid and Liquid-like constructs in the
-        tag's content body. While this means you no longer need to enclose the content
-        within a `{% raw %}{% endraw %}` block, it also means that you can no longer
-        do the following as well:
-        `{% highlight html %}{% include snippet.html %}{% endhighlight %}`
-        For further details: https://github.com/jekyll/jekyll/pull/6821
     ----------------------------------------------------------------------------------
   MSG
 end
diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index a9310b3265b..72a2e6ba834 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -2,7 +2,7 @@
 
 module Jekyll
   module Tags
-    class HighlightBlock < Liquid::Raw
+    class HighlightBlock < Liquid::Block
       include Liquid::StandardFilters
 
       # The regular expression syntax checker. Start with the language specifier.
@@ -33,7 +33,7 @@ def initialize(tag_name, markup, tokens)
       def render(context)
         prefix = context["highlighter_prefix"] || ""
         suffix = context["highlighter_suffix"] || ""
-        code   = @body.gsub(LEADING_OR_TRAILING_LINE_TERMINATORS, "")
+        code = super.to_s.gsub(LEADING_OR_TRAILING_LINE_TERMINATORS, "")
 
         output =
           case context.registers[:site].highlighter
@@ -103,8 +103,6 @@ def add_code_tag(code)
         "
    "\
         "#{code.chomp}
    "
       end
-
-      def ensure_valid_markup(tag_name, markup, parse_context); end
     end
   end
 end
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 3c54a7f0b6a..59cd190d94e 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -69,30 +69,6 @@ def highlight_block_with_opts(options_string)
     end
   end
 
-  context "highlight tag" do
-    setup do
-      create_post <<~CONTENT
-        ---
-        title: This is a test
-        ---
-
-        This is not yet highlighted
-
-        {% highlight html %}
-        
    {% unregistered_tag %}
    
-        {{ page | inspect }}
-        {% endhighlight %}
-
-        This should not be highlighted, right?
-      CONTENT
-    end
-
-    should "not parse Liquid constructs in the tag markup" do
-      assert_match "{% unregistered_tag %}", @result
-      assert_match "{{ page | inspect }}", @result
-    end
-  end
-
   context "highlight tag in unsafe mode" do
     should "set the no options with just a language name" do
       tag = highlight_block_with_opts("ruby ")

From c8fe609f8f7be7594dc80155dc0cfd345678f274 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 19 Apr 2019 20:00:17 +0530
Subject: [PATCH 3586/4996] Target Ruby 2.4 syntax in RuboCop scans (#7583)

Merge pull request 7583
---
 .rubocop.yml                            | 2 +-
 lib/jekyll/commands/serve/servlet.rb    | 8 ++++----
 lib/jekyll/commands/serve/websockets.rb | 2 +-
 lib/jekyll/tags/include.rb              | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 9f090dc471f..e3a80caaaae 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -8,7 +8,7 @@ Jekyll/NoPutsAllowed:
     - rake/*.rake
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   Include:
     - lib/**/*.rb
     - test/**/*.rb
diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb
index 0ed57112f18..2544616adf3 100644
--- a/lib/jekyll/commands/serve/servlet.rb
+++ b/lib/jekyll/commands/serve/servlet.rb
@@ -29,15 +29,15 @@ def chunked?
         end
 
         def inline?
-          @response["Content-Disposition"] =~ %r!^inline!
+          @response["Content-Disposition"].to_s.start_with?("inline")
         end
 
         def bad_browser?
-          BAD_USER_AGENTS.any? { |pattern| @request["User-Agent"] =~ pattern }
+          BAD_USER_AGENTS.any? { |pattern| pattern.match?(@request["User-Agent"]) }
         end
 
         def html?
-          @response["Content-Type"] =~ %r!text/html!
+          @response["Content-Type"].to_s.include?("text/html")
         end
       end
 
@@ -185,7 +185,7 @@ def validate_and_ensure_charset(_req, res)
           key = res.header.keys.grep(%r!content-type!i).first
           typ = res.header[key]
 
-          unless typ =~ %r!;\s*charset=!
+          unless %r!;\s*charset=!.match?(typ)
             res.header[key] = "#{typ}; charset=#{@jekyll_opts["encoding"]}"
           end
         end
diff --git a/lib/jekyll/commands/serve/websockets.rb b/lib/jekyll/commands/serve/websockets.rb
index 8b49bd65cd8..6aa522cc96b 100644
--- a/lib/jekyll/commands/serve/websockets.rb
+++ b/lib/jekyll/commands/serve/websockets.rb
@@ -46,7 +46,7 @@ def dispatch(data)
           # WebSockets requests will have a Connection: Upgrade header
           if parser.http_method != "GET" || parser.upgrade?
             super
-          elsif parser.request_url =~ %r!^\/livereload.js!
+          elsif parser.request_url.start_with?("/livereload.js")
             headers = [
               "HTTP/1.1 200 OK",
               "Content-Type: application/javascript",
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index 3e636787639..510bd0d0c7a 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -69,7 +69,7 @@ def validate_file_name(file)
       end
 
       def validate_params
-        unless @params =~ FULL_VALID_SYNTAX
+        unless FULL_VALID_SYNTAX.match?(@params)
           raise ArgumentError, <<~MSG
             Invalid syntax for include tag:
 

From ced4404a5e2f320b89c722fa1208dfaa48c2f30e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 19 Apr 2019 10:30:19 -0400
Subject: [PATCH 3587/4996] Update history to reflect merge of #7583 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f27715d7435..1b5853f6c57 100644
--- a/History.markdown
+++ b/History.markdown
@@ -134,6 +134,7 @@
   * Add a Cucumber feature for post_url tag (#7586)
   * Bump tested version of JRuby to 9.2.7.0 (#7612)
   * Generate a "TOTAL" row for build-profile table (#7614)
+  * Target Ruby 2.4 syntax in RuboCop scans (#7583)
 
 ### Documentation
 

From a5cac267664afae53f8f6e51865b718d50990fd8 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Tue, 30 Apr 2019 18:14:08 +0530
Subject: [PATCH 3588/4996] Bump RuboCop to v0.68.x (#7637)

Merge pull request 7637
---
 .rubocop.yml                | 5 +++--
 Gemfile                     | 5 ++---
 lib/jekyll/configuration.rb | 4 ++--
 test/helper.rb              | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index e3a80caaaae..38652ca8e4d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,6 +1,7 @@
 ---
 
 require:
+  - rubocop-performance
   - ./rubocop/jekyll
 
 Jekyll/NoPutsAllowed:
@@ -23,9 +24,9 @@ Layout/AlignHash:
   EnforcedHashRocketStyle: table
 Layout/IndentationWidth:
   Severity: error
-Layout/IndentArray:
+Layout/IndentFirstArrayElement:
   EnforcedStyle: consistent
-Layout/IndentHash:
+Layout/IndentFirstHashElement:
   EnforcedStyle: consistent
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
diff --git a/Gemfile b/Gemfile
index e2c935fabf1..522bbb0a807 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,9 +26,8 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  # Temporary lock on RuboCop version for Windows since Pysch-3.1.0 is not available
-  # for use on Ruby 2.6-mingw32 platforms
-  gem "rubocop", Gem.win_platform? ? "~> 0.64.0" : "~> 0.66.0"
+  gem "rubocop", "~> 0.68.0"
+  gem "rubocop-performance"
   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__)
   gem "test-theme-symlink", :path => File.expand_path("test/fixtures/test-theme-symlink", __dir__)
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index d7e00d32f1b..7b2cb4301a7 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -199,10 +199,10 @@ def read_config_files(files)
           new_config = read_config_file(config_file)
           configuration = Utils.deep_merge_hashes(configuration, new_config)
         end
-      rescue ArgumentError => err
+      rescue ArgumentError => e
         Jekyll.logger.warn "WARNING:", "Error reading configuration. " \
                      "Using defaults (and options)."
-        warn err
+        warn e
       end
 
       configuration.backwards_compatibilize.add_default_collections
diff --git a/test/helper.rb b/test/helper.rb
index ffd9434a2f3..c4bf5b1d619 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -196,8 +196,8 @@ def symlink_if_allowed(target, sym_file)
   rescue Errno::EACCES
     skip "Permission denied for creating a symlink to #{target.inspect} " \
          "on this machine".magenta
-  rescue NotImplementedError => error
-    skip error.to_s.magenta
+  rescue NotImplementedError => e
+    skip e.to_s.magenta
   end
 end
 

From 1b2efb67c3057b3edfcd3c2847ed87e21f2a5839 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 30 Apr 2019 08:44:10 -0400
Subject: [PATCH 3589/4996] Update history to reflect merge of #7637 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1b5853f6c57..e5e5bb22884 100644
--- a/History.markdown
+++ b/History.markdown
@@ -135,6 +135,7 @@
   * Bump tested version of JRuby to 9.2.7.0 (#7612)
   * Generate a "TOTAL" row for build-profile table (#7614)
   * Target Ruby 2.4 syntax in RuboCop scans (#7583)
+  * Bump RuboCop to v0.68.x (#7637)
 
 ### Documentation
 

From 14e5d00555eb7567bb8ff1827288979c000d725a Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Tue, 30 Apr 2019 18:33:48 +0530
Subject: [PATCH 3590/4996] Fix broken include_relative usage in excerpt
 (#7633)

Merge pull request 7633
---
 features/include_relative_tag.feature | 19 +++++++++++++++++++
 lib/jekyll/tags/include.rb            |  1 +
 2 files changed, 20 insertions(+)

diff --git a/features/include_relative_tag.feature b/features/include_relative_tag.feature
index 80c0ef593f9..9cbdcf122e7 100644
--- a/features/include_relative_tag.feature
+++ b/features/include_relative_tag.feature
@@ -29,6 +29,25 @@ Feature: include_relative Tag
     And the _site directory should exist
     And I should see "Welcome back Dear Reader!" in "_site/2018/09/02/star-wars.html"
 
+  Scenario: Include a nested file relative to a post as an excerpt
+    Given I have a _posts directory
+    And I have a _posts/snippets directory
+    And I have a _posts/snippets/welcome_para directory
+    And I have a "_posts/2018-09-02-star-wars.md" file with content:
+      """
+      {% include_relative snippets/welcome_para.md %}
+
+      Hello World
+      """
+    And I have an "_posts/snippets/welcome_para.md" file that contains "{% include_relative snippets/welcome_para/greeting.md %} Dear Reader!"
+    And I have an "_posts/snippets/welcome_para/greeting.md" file that contains "Welcome back"
+    And I have an "index.md" page that contains "{% for post in site.posts %}{{ post.excerpt }}{% endfor %}"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Welcome back Dear Reader!" in "_site/2018/09/02/star-wars.html"
+    And I should see "Welcome back Dear Reader!" in "_site/index.html"
+
   Scenario: Include a nested file relative to a page at root
     Given I have a snippets directory
     And I have a snippets/welcome_para directory
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index 510bd0d0c7a..d81dd8dee16 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -209,6 +209,7 @@ def page_path(context)
             else
               File.join(site.config["collections_dir"], page_payload["path"])
             end
+          resource_path.sub!(%r!/#excerpt\z!, "")
           site.in_source_dir File.dirname(resource_path)
         end
       end

From 17a5f815b5184c5ad9e64033c79a477f974281e5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 30 Apr 2019 09:03:50 -0400
Subject: [PATCH 3591/4996] Update history to reflect merge of #7633 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e5e5bb22884..3ba370ba403 100644
--- a/History.markdown
+++ b/History.markdown
@@ -56,6 +56,7 @@
   * Replace `name` in Page#inspect with relative_path (#7434)
   * Log a warning when the slug is empty (#7357)
   * Push Markdown link refs to excerpt only as required (#7577)
+  * Fix broken include_relative usage in excerpt (#7633)
 
 ### Minor Enhancements
 

From 3e8c37b6416a8a68c6f4d5dd4c2c921d3572d561 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 2 May 2019 00:13:20 +0530
Subject: [PATCH 3592/4996] Refactor Jekyll::Cache (#7532)

Merge pull request 7532
---
 features/cache.feature |   9 +++
 lib/jekyll/cache.rb    | 135 ++++++++++++++++++++++-------------------
 lib/jekyll/site.rb     |   2 +-
 3 files changed, 81 insertions(+), 65 deletions(-)

diff --git a/features/cache.feature b/features/cache.feature
index 99aee2457e8..f6f62af11dd 100644
--- a/features/cache.feature
+++ b/features/cache.feature
@@ -26,3 +26,12 @@ Feature: Cache
     But the .jekyll-cache directory should not exist
     And the _site directory should exist
     And I should see "
    Hello World
    " in "_site/index.html"
+
+  Scenario: Disk usage in safe mode
+    Given I have an "index.md" page that contains "{{ site.title }}"
+    And I have a configuration file with "title" set to "Hello World"
+    When I run jekyll build --safe
+    Then I should get a zero exit status
+    But the .jekyll-cache directory should not exist
+    And the _site directory should exist
+    And I should see "
    Hello World
    " in "_site/index.html"
diff --git a/lib/jekyll/cache.rb b/lib/jekyll/cache.rb
index fd4bde17ae4..be9a1893ef0 100644
--- a/lib/jekyll/cache.rb
+++ b/lib/jekyll/cache.rb
@@ -4,9 +4,59 @@
 
 module Jekyll
   class Cache
-    # rubocop:disable Style/ClassVars
-    @@caches = {}
-    @@disk_cache_enabled = true
+    # class-wide base cache
+    @base_cache = {}
+
+    # class-wide directive to write cache to disk is enabled by default
+    @disk_cache_enabled = true
+
+    class << self
+      # class-wide cache location
+      attr_accessor :cache_dir
+
+      # class-wide directive to write cache to disk
+      attr_reader :disk_cache_enabled
+
+      # class-wide base cache reader
+      attr_reader :base_cache
+
+      # Disable Marshaling cached items to disk
+      def disable_disk_cache!
+        @disk_cache_enabled = false
+      end
+
+      # Clear all caches
+      def clear
+        delete_cache_files
+        base_cache.each_value(&:clear)
+      end
+
+      # Compare the current config to the cached config
+      # If they are different, clear all caches
+      #
+      # Returns nothing.
+      def clear_if_config_changed(config)
+        config = config.inspect
+        cache = Jekyll::Cache.new "Jekyll::Cache"
+        return if cache.key?("config") && cache["config"] == config
+
+        clear
+        cache = Jekyll::Cache.new "Jekyll::Cache"
+        cache["config"] = config
+        nil
+      end
+
+      private
+
+      # Delete all cached items from all caches
+      #
+      # Returns nothing.
+      def delete_cache_files
+        FileUtils.rm_rf(@cache_dir) if disk_cache_enabled
+      end
+    end
+
+    #
 
     # Get an existing named cache, or create a new one if none exists
     #
@@ -14,27 +64,10 @@ class Cache
     #
     # Returns nothing.
     def initialize(name)
-      @cache = @@caches[name] ||= {}
+      @cache = Jekyll::Cache.base_cache[name] ||= {}
       @name = name.gsub(%r![^\w\s-]!, "-")
     end
 
-    # Set class-wide base_dir
-    def self.base_dir=(dir_path)
-      @@base_dir = dir_path
-    end
-
-    # Disable Marshaling cached items to disk
-    def self.disable_disk_cache!
-      @@disk_cache_enabled = false
-    end
-    # rubocop:enable Style/ClassVars
-
-    # Clear all caches
-    def self.clear
-      delete_cache_files
-      @@caches.each_value(&:clear)
-    end
-
     # Clear this particular cache
     def clear
       delete_cache_files
@@ -49,7 +82,7 @@ def [](key)
       return @cache[key] if @cache.key?(key)
 
       path = path_to(hash(key))
-      if @@disk_cache_enabled && File.file?(path) && File.readable?(path)
+      if disk_cache_enabled? && File.file?(path) && File.readable?(path)
         @cache[key] = load(path)
       else
         raise
@@ -61,7 +94,7 @@ def [](key)
     # Returns nothing.
     def []=(key, value)
       @cache[key] = value
-      return unless @@disk_cache_enabled
+      return unless disk_cache_enabled?
 
       path = path_to(hash(key))
       value = new Hash(value) if value.is_a?(Hash) && !value.default.nil?
@@ -70,9 +103,8 @@ def []=(key, value)
       Jekyll.logger.debug "Cache:", "Cannot dump object #{key}"
     end
 
-    # If an item already exists in the cache, retrieve it
-    # Else execute code block, and add the result to the cache, and return that
-    #   result
+    # If an item already exists in the cache, retrieve it.
+    # Else execute code block, and add the result to the cache, and return that result.
     def getset(key)
       self[key]
     rescue StandardError
@@ -86,10 +118,7 @@ def getset(key)
     # Returns nothing.
     def delete(key)
       @cache.delete(key)
-      return unless @@disk_cache_enabled
-
-      path = path_to(hash(key))
-      File.delete(path)
+      File.delete(path_to(hash(key))) if disk_cache_enabled?
     end
 
     # Check if `key` already exists in this cache
@@ -100,40 +129,27 @@ def key?(key)
       return true if @cache.key?(key)
       # Otherwise, it might be cached on disk
       # but we should not consider the disk cache if it is disabled
-      return false unless @@disk_cache_enabled
+      return false unless disk_cache_enabled?
 
       path = path_to(hash(key))
       File.file?(path) && File.readable?(path)
     end
 
-    # Compare the current config to the cached config
-    # If they are different, clear all caches
-    #
-    # Returns nothing.
-    def self.clear_if_config_changed(config)
-      config = config.inspect
-      cache = Jekyll::Cache.new "Jekyll::Cache"
-      return if cache.key?("config") && cache["config"] == config
-
-      clear
-      cache = Jekyll::Cache.new "Jekyll::Cache"
-      cache["config"] = config
-      nil
+    def disk_cache_enabled?
+      !!Jekyll::Cache.disk_cache_enabled
     end
 
     private
 
-    # Given a hashed key, return the path to where this item would be saved on
-    # disk
+    # Given a hashed key, return the path to where this item would be saved on disk.
     def path_to(hash = nil)
-      @base_dir ||= File.join(@@base_dir, @name)
+      @base_dir ||= File.join(Jekyll::Cache.cache_dir, @name)
       return @base_dir if hash.nil?
 
       File.join(@base_dir, hash[0..1], hash[2..-1]).freeze
     end
 
-    # Given a key, return a SHA2 hash that can be used for caching this item to
-    # disk
+    # Given a key, return a SHA2 hash that can be used for caching this item to disk.
     def hash(key)
       Digest::SHA2.hexdigest(key).freeze
     end
@@ -142,22 +158,14 @@ def hash(key)
     #
     # Returns nothing.
     def delete_cache_files
-      FileUtils.rm_rf(path_to) if @@disk_cache_enabled
-    end
-
-    # Delete all cached items from all caches
-    #
-    # Returns nothing.
-    def self.delete_cache_files
-      FileUtils.rm_rf(@@base_dir) if @@disk_cache_enabled
+      FileUtils.rm_rf(path_to) if disk_cache_enabled?
     end
-    private_class_method :delete_cache_files
 
-    # Load `path` from disk and return the result
+    # Load `path` from disk and return the result.
     # This MUST NEVER be called in Safe Mode
     # rubocop:disable Security/MarshalLoad
     def load(path)
-      raise unless @@disk_cache_enabled
+      raise unless disk_cache_enabled?
 
       cached_file = File.open(path, "rb")
       value = Marshal.load(cached_file)
@@ -166,15 +174,14 @@ def load(path)
     end
     # rubocop:enable Security/MarshalLoad
 
-    # Given a path and a value, save value to disk at path
+    # Given a path and a value, save value to disk at path.
     # This should NEVER be called in Safe Mode
     #
     # Returns nothing.
     def dump(path, value)
-      return unless @@disk_cache_enabled
+      return unless disk_cache_enabled?
 
-      dir = File.dirname(path)
-      FileUtils.mkdir_p(dir)
+      FileUtils.mkdir_p(File.dirname(path))
       File.open(path, "wb") do |cached_file|
         Marshal.dump(value, cached_file)
       end
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index fbc03a4a119..43a652cc9b5 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -469,7 +469,7 @@ def site_cleaner
 
     # Disable Marshaling cache to disk in Safe Mode
     def configure_cache
-      Jekyll::Cache.base_dir = in_source_dir(config["cache_dir"], "Jekyll/Cache")
+      Jekyll::Cache.cache_dir = in_source_dir(config["cache_dir"], "Jekyll/Cache")
       Jekyll::Cache.disable_disk_cache! if safe
     end
 

From 568e50b37a262160f37025388b72c4d6ddb38b91 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 1 May 2019 14:43:22 -0400
Subject: [PATCH 3593/4996] Update history to reflect merge of #7532 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3ba370ba403..7c7df1cb14f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -137,6 +137,7 @@
   * Generate a "TOTAL" row for build-profile table (#7614)
   * Target Ruby 2.4 syntax in RuboCop scans (#7583)
   * Bump RuboCop to v0.68.x (#7637)
+  * Refactor Jekyll::Cache (#7532)
 
 ### Documentation
 

From b04e3d3de760e8674ad50512f4705042e4b322c8 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 2 May 2019 00:24:18 +0530
Subject: [PATCH 3594/4996] Store list of expected extnames in a constant
 (#7638)

Merge pull request 7638
---
 lib/jekyll/convertible.rb | 2 +-
 lib/jekyll/document.rb    | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 863fa4ebbe5..35f6b0f4863 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -146,7 +146,7 @@ def asset_file?
     #
     # Returns true if extname == .sass or .scss, false otherwise.
     def sass_file?
-      %w(.sass .scss).include?(ext)
+      Jekyll::Document::SASS_FILE_EXTS.include?(ext)
     end
 
     # Determine whether the document is a CoffeeScript file.
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index a8fda1e8fdf..7e9e42cad4f 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -14,6 +14,9 @@ class Document
     DATELESS_FILENAME_MATCHER = %r!^(?:.+/)*(.*)(\.[^.]+)$!.freeze
     DATE_FILENAME_MATCHER = %r!^(?>.+/)*?(\d{2,4}-\d{1,2}-\d{1,2})-([^/]*)(\.[^.]+)$!.freeze
 
+    SASS_FILE_EXTS = %w(.sass .scss).freeze
+    YAML_FILE_EXTS = %w(.yaml .yml).freeze
+
     # Create a new Document.
     #
     # path - the path to the file
@@ -138,7 +141,7 @@ def cleaned_relative_path
     #
     # Returns true if the extname is either .yml or .yaml, false otherwise.
     def yaml_file?
-      %w(.yaml .yml).include?(extname)
+      YAML_FILE_EXTS.include?(extname)
     end
 
     # Determine whether the document is an asset file.
@@ -154,7 +157,7 @@ def asset_file?
     #
     # Returns true if extname == .sass or .scss, false otherwise.
     def sass_file?
-      %w(.sass .scss).include?(extname)
+      SASS_FILE_EXTS.include?(extname)
     end
 
     # Determine whether the document is a CoffeeScript file.

From 1bba76b4f58e5cae7e576c649a6620ea837cb536 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 1 May 2019 14:54:22 -0400
Subject: [PATCH 3595/4996] Update history to reflect merge of #7638 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7c7df1cb14f..ef0fc19dab2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -138,6 +138,7 @@
   * Target Ruby 2.4 syntax in RuboCop scans (#7583)
   * Bump RuboCop to v0.68.x (#7637)
   * Refactor Jekyll::Cache (#7532)
+  * Store list of expected extnames in a constant (#7638)
 
 ### Documentation
 

From 1b4340034b38fa5704e569e9ad030e9380f26121 Mon Sep 17 00:00:00 2001
From: David Zhang 
Date: Thu, 2 May 2019 12:38:25 +0800
Subject: [PATCH 3596/4996] Doc: Data file section adds TSV (#7640)

Merge pull request 7640
---
 docs/_docs/datafiles.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/datafiles.md b/docs/_docs/datafiles.md
index 9d7cc6864a9..81c70edccf8 100644
--- a/docs/_docs/datafiles.md
+++ b/docs/_docs/datafiles.md
@@ -7,9 +7,8 @@ In addition to the [built-in variables](../variables/) available from Jekyll,
 you can specify your own custom data that can be accessed via the [Liquid
 templating system](https://wiki.github.com/shopify/liquid/liquid-for-designers).
 
-Jekyll supports loading data from [YAML](http://yaml.org/), [JSON](http://www.json.org/),
-and [CSV](https://en.wikipedia.org/wiki/Comma-separated_values) files located in the `_data` directory.
-Note that CSV files *must* contain a header row.
+Jekyll supports loading data from [YAML](http://yaml.org/), [JSON](http://www.json.org/), [CSV](https://en.wikipedia.org/wiki/Comma-separated_values), and [TSV](https://en.wikipedia.org/wiki/Tab-separated_values) files located in the `_data` directory.
+Note that CSV and TSV files *must* contain a header row.
 
 This powerful feature allows you to avoid repetition in your templates and to
 set site specific options without changing `_config.yml`.

From 8673cdc4cf161fe21a693e26f608242372832a3c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 2 May 2019 00:38:26 -0400
Subject: [PATCH 3597/4996] Update history to reflect merge of #7640 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ef0fc19dab2..b772f910279 100644
--- a/History.markdown
+++ b/History.markdown
@@ -257,6 +257,7 @@
   * Avoid generating empty classnames (#7610)
   * Install Docs that Work on MacOS 10.14 (#7561)
   * Update the contribution docs for draft pull requests (#7619)
+  * Doc: Data file section adds TSV (#7640)
 
 ### Site Enhancements
 

From 85bddfda216ad5556558cb8af67b541f498f1da7 Mon Sep 17 00:00:00 2001
From: Anuj Bhatnagar 
Date: Sat, 4 May 2019 20:30:43 +0530
Subject: [PATCH 3598/4996] Update 07-assets.md (#7644)

Merge pull request 7644
---
 docs/_docs/step-by-step/07-assets.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/step-by-step/07-assets.md b/docs/_docs/step-by-step/07-assets.md
index aa4903ce8a1..894dd969da0 100644
--- a/docs/_docs/step-by-step/07-assets.md
+++ b/docs/_docs/step-by-step/07-assets.md
@@ -48,7 +48,7 @@ First create a Sass file at `/assets/css/styles.scss` with the following content
 
 The empty front matter at the top tells Jekyll it needs to process the file. The
 `@import "main"` tells Sass to look for a file called `main.scss` in the sass
-directory (`_sass/` by default).
+directory (`_sass/` by default which is directly under root folder of your website).
 
 At this stage you'll just have a main css file. For larger projects, this is a
 great way to keep your CSS organized.

From fd74fe3e93a1fb506fa6621a2e271d7b9c5c3e3b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 4 May 2019 11:00:44 -0400
Subject: [PATCH 3599/4996] Update history to reflect merge of #7644 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b772f910279..0a159c9c81f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -258,6 +258,7 @@
   * Install Docs that Work on MacOS 10.14 (#7561)
   * Update the contribution docs for draft pull requests (#7619)
   * Doc: Data file section adds TSV (#7640)
+  * Indicate where the _sass folder is by default (#7644)
 
 ### Site Enhancements
 

From 72c712ef9e2453c0483ce5142e520ee03079125e Mon Sep 17 00:00:00 2001
From: Niklas Eicker 
Date: Mon, 6 May 2019 09:03:56 +0200
Subject: [PATCH 3600/4996] add version tags to new placeholders (#5981) for
 permalinks (#7647)

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

diff --git a/docs/_docs/permalinks.md b/docs/_docs/permalinks.md
index e67d850abcd..13697c55d82 100644
--- a/docs/_docs/permalinks.md
+++ b/docs/_docs/permalinks.md
@@ -110,6 +110,7 @@ Here's the full list of placeholders available:
     
       
         
    long_month
    
+        {% include docs_version_badge.html version="4.0.0" %}
       
       
         
    Full month name, e.g. “January”.
    
@@ -148,6 +149,7 @@ Here's the full list of placeholders available:
     
       
         
    w_year
    
+        {% include docs_version_badge.html version="4.0.0" %}
       
       
         
    Week year which may differ from the month year for up to three days at the start of January and end of December
    
@@ -156,6 +158,7 @@ Here's the full list of placeholders available:
     
       
         
    week
    
+        {% include docs_version_badge.html version="4.0.0" %}
       
       
         
    Week number of the current year, starting with the first week having a majority of its days in January. (01..53)
    
@@ -164,6 +167,7 @@ Here's the full list of placeholders available:
     
       
         
    w_day
    
+        {% include docs_version_badge.html version="4.0.0" %}
       
       
         
    Day of the week, starting with Monday. (1..7)
    
@@ -172,6 +176,7 @@ Here's the full list of placeholders available:
     
       
         
    short_day
    
+        {% include docs_version_badge.html version="4.0.0" %}
       
       
         
    Three-letter weekday abbreviation, e.g. “Sun”.
    
@@ -180,6 +185,7 @@ Here's the full list of placeholders available:
     
       
         
    long_day
    
+        {% include docs_version_badge.html version="4.0.0" %}
       
       
         
    Weekday name, e.g. “Sunday”.
    
@@ -296,9 +302,10 @@ For posts, Jekyll also provides the following built-in styles for convenience:
     
       
         
    weekdate
    
+        {% include docs_version_badge.html version="4.0.0" %}
       
       
-        
    /:categories/:year/W:week/:short_day/:title.html
    
+        
    /:categories/:year/W:week/:short_day/:title:output_ext
    
       
     
     

From aa87361848f71b4cccd572c2d4d84f2eb082798f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 6 May 2019 03:03:58 -0400
Subject: [PATCH 3601/4996] Update history to reflect merge of #7647 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0a159c9c81f..224e80bc974 100644
--- a/History.markdown
+++ b/History.markdown
@@ -259,6 +259,7 @@
   * Update the contribution docs for draft pull requests (#7619)
   * Doc: Data file section adds TSV (#7640)
   * Indicate where the _sass folder is by default (#7644)
+  * Docs: add version tags to new placeholders (#5981) for permalinks (#7647)
 
 ### Site Enhancements
 

From 98c5f474019c1ad7a1f58e1e5204640d66cc7751 Mon Sep 17 00:00:00 2001
From: jingze_lu 
Date: Tue, 7 May 2019 11:31:13 +0800
Subject: [PATCH 3602/4996] Solve "GitHub Page build failure" in
 10-deployment.md (#7648)

Merge pull request 7648
---
 docs/_docs/step-by-step/10-deployment.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/_docs/step-by-step/10-deployment.md b/docs/_docs/step-by-step/10-deployment.md
index bdedb7c17cd..c8a0511a315 100644
--- a/docs/_docs/step-by-step/10-deployment.md
+++ b/docs/_docs/step-by-step/10-deployment.md
@@ -63,6 +63,15 @@ group :jekyll_plugins do
 end
 ```
 
+Then add those lines to your `_config.yml`:
+
+```
+plugins:
+  - jekyll-feed
+  - jekyll-sitemap
+  - jekyll-seo-tag
+```
+
 Now install them by running a `bundle update`.
 
 `jekyll-sitemap` doesn't need any setup, it will create your sitemap on build.

From 4dff839dbf4d288a805fdbe831b0ce82aa067b81 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 6 May 2019 23:31:15 -0400
Subject: [PATCH 3603/4996] Update history to reflect merge of #7648 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 224e80bc974..0f5dabc8cca 100644
--- a/History.markdown
+++ b/History.markdown
@@ -260,6 +260,7 @@
   * Doc: Data file section adds TSV (#7640)
   * Indicate where the _sass folder is by default (#7644)
   * Docs: add version tags to new placeholders (#5981) for permalinks (#7647)
+  * Solve "GitHub Page build failure" in 10-deployment.md (#7648)
 
 ### Site Enhancements
 

From a62ed455880581ce2249f5e994446e908a6d5002 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 7 May 2019 11:01:28 +0200
Subject: [PATCH 3604/4996] New open graph image

---
 docs/_config.yml       |   2 +-
 docs/img/jekyll-og.png | Bin 0 -> 68048 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 docs/img/jekyll-og.png

diff --git a/docs/_config.yml b/docs/_config.yml
index 61fb8b8a503..7d2ac2f74fa 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -33,7 +33,7 @@ defaults:
     type: posts
   values:
     layout: news_item
-    image: "/img/twitter-card.png"
+    image: "/img/jekyll-og.png"
 
 plugins:
 - jekyll-avatar
diff --git a/docs/img/jekyll-og.png b/docs/img/jekyll-og.png
new file mode 100644
index 0000000000000000000000000000000000000000..508c42a28e4f89e18fe1ba4f5564487261fdda4d
GIT binary patch
literal 68048
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
QU{)XsvZ^xGQYHca2Zo}%W&i*H

literal 0
HcmV?d00001


From dc265abf9f6ec8b1fccdf890dcc796d91bd54972 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 7 May 2019 11:12:24 +0200
Subject: [PATCH 3605/4996] typo

---
 docs/_docs/step-by-step/10-deployment.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/step-by-step/10-deployment.md b/docs/_docs/step-by-step/10-deployment.md
index c8a0511a315..3fc03530cfa 100644
--- a/docs/_docs/step-by-step/10-deployment.md
+++ b/docs/_docs/step-by-step/10-deployment.md
@@ -63,7 +63,7 @@ group :jekyll_plugins do
 end
 ```
 
-Then add those lines to your `_config.yml`:
+Then add these lines to your `_config.yml`:
 
 ```
 plugins:

From 551014eb05f0c3eed3c8196b6d1e04e7ae433679 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Wed, 8 May 2019 13:04:04 +0200
Subject: [PATCH 3606/4996] Docs: Invite to use bundler

Fix #7651
---
 docs/_docs/step-by-step/01-setup.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/_docs/step-by-step/01-setup.md b/docs/_docs/step-by-step/01-setup.md
index 520bc608fc9..e6a7dae118a 100644
--- a/docs/_docs/step-by-step/01-setup.md
+++ b/docs/_docs/step-by-step/01-setup.md
@@ -22,6 +22,23 @@ terminal:
 gem install jekyll bundler
 ```
 
+To create a new `Gemfile` to list your project's dependencies run:
+
+```
+bundle init
+```
+
+Now edit the `Gemfile`and add jekyll as a dependency:
+
+```
+gem "jekyll"
+```
+
+Finally run `bundle` to install jekyll for your project.
+
+You can now prefix all jekyll commands listed in this tutorial with `bundle exec` 
+to make sure you use the jekyll version defined in your `Gemfile`.
+
 ## Create a site
 
 It's time to create a site! Create a new directory for your site, you can name

From bc540473157fbe823746d2e4a022b852a027cbf6 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 12 May 2019 12:57:51 +0200
Subject: [PATCH 3607/4996] add open graph image by default

---
 docs/_config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/_config.yml b/docs/_config.yml
index 7d2ac2f74fa..9abf560087e 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -33,6 +33,9 @@ defaults:
     type: posts
   values:
     layout: news_item
+- scope:
+    path: ""
+  values:
     image: "/img/jekyll-og.png"
 
 plugins:

From 6a604daa5ac492817ab55be1f7bfe8bc3971e093 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 12 May 2019 13:31:33 +0200
Subject: [PATCH 3608/4996] update teams

---
 docs/pages/team.md | 46 ++++++++++------------------------------------
 1 file changed, 10 insertions(+), 36 deletions(-)

diff --git a/docs/pages/team.md b/docs/pages/team.md
index 58ab781f17d..60a3b857680 100644
--- a/docs/pages/team.md
+++ b/docs/pages/team.md
@@ -6,44 +6,18 @@ permalink: /team/
 
 ## Core Team
 
-*The Jekyll Core Team's responsibility is to ensure the development and
-community around the Jekyll ecosystem thrive.*
+_The Jekyll Core Team's responsibility is to ensure the development and
+community around the Jekyll ecosystem thrive._
 
-- Ashwin (@ashmaroli)
-- Frank (@DirtyF, Documentation)
-- Matt (@mattr-)
-- Olivia (@oe)
-- Pat (@pathawks)
-
-## Plugin Core
-
-*The Jekyll Plugin Core Team's responsibility is to ensure the development and
-community around the core plugins thrive. They also provide guidance in
-conversations about extensibility of Core Jekyll.*
-
-- Alfred Xing (@alfredxing)
-- Ashwin (@ashmaroli)
-- Florian (@Crunch09)
-- Mert (@mertkahyaoglu, jekyll-admin)
-
-## Affinity Team Captains
-
-*The Affinity Team Captains lead [Jekyll's Affinity
-Teams](https://teams.jekyllrb.com/). Each team is tasked with maintaining
-and addressing issues for a specific aspect of Jekyll.*
-
-- [Build](https://github.com/orgs/jekyll/teams/build): @mattr-
-- [Documentation](https://github.com/orgs/jekyll/teams/documentation): @DirtyF, @mattr-
-- [Ecosystem](https://github.com/orgs/jekyll/teams/ecosystem): @pathawks
-- [Performance](https://github.com/orgs/jekyll/teams/performance): @mattr-, @parkr
-- [Stability](https://github.com/orgs/jekyll/teams/stability): @oe, @parkr
-- [Windows](https://github.com/orgs/jekyll/teams/windows): @XhmikosR
+* Ashwin (@ashmaroli)
+* Frank (@DirtyF)
+* Matt (@mattr-)
 
 ## Emeritus Core Team Members
 
-*Emeritus Core Team Members were once members of Jekyll's Core Team.*
+_Emeritus Core Team Members were once members of Jekyll's Core Team._
 
-- Alfred (@alfredxing)
-- Nick (@qrush)
-- Parker (@parkr)
-- Tom (@mojombo)
+* Alfred (@alfredxing)
+* Nick (@qrush)
+* Parker (@parkr)
+* Tom (@mojombo)

From 965aef60e6915521afc6ecf9b7c65c5e56398754 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 15 May 2019 21:13:13 +0530
Subject: [PATCH 3609/4996] Initialize mutations for Drops only if necessary
 (#7657)

Merge pull request 7657
---
 lib/jekyll/drops/drop.rb | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index 315817fea92..90c6cfaf025 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -30,7 +30,6 @@ def self.mutable?
       # Returns nothing
       def initialize(obj)
         @obj = obj
-        @mutations = {} # only if mutable: true
       end
 
       # Access a method in the Drop or a field in the underlying hash data.
@@ -42,8 +41,8 @@ def initialize(obj)
       #
       # Returns the value for the given key, or nil if none exists
       def [](key)
-        if self.class.mutable? && @mutations.key?(key)
-          @mutations[key]
+        if self.class.mutable? && mutations.key?(key)
+          mutations[key]
         elsif self.class.invokable? key
           public_send key
         else
@@ -70,7 +69,7 @@ def []=(key, val)
           public_send("#{key}=", val)
         elsif respond_to?(key.to_s)
           if self.class.mutable?
-            @mutations[key] = val
+            mutations[key] = val
           else
             raise Errors::DropMutationException, "Key #{key} cannot be set in the drop."
           end
@@ -100,7 +99,7 @@ def content_methods
       # Returns true if the given key is present
       def key?(key)
         return false if key.nil?
-        return true if self.class.mutable? && @mutations.key?(key)
+        return true if self.class.mutable? && mutations.key?(key)
 
         respond_to?(key) || fallback_data.key?(key)
       end
@@ -113,7 +112,7 @@ def key?(key)
       # Returns an Array of unique keys for content for the Drop.
       def keys
         (content_methods |
-          @mutations.keys |
+          mutations.keys |
           fallback_data.keys).flatten
       end
 
@@ -204,6 +203,12 @@ def fetch(key, default = nil, &block)
         return yield(key) unless block.nil?
         return default unless default.nil?
       end
+
+      private
+
+      def mutations
+        @mutations ||= {}
+      end
     end
   end
 end

From 12c074303e8aae3762cd5f1beea035b1e1198a37 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 15 May 2019 11:43:16 -0400
Subject: [PATCH 3610/4996] Update history to reflect merge of #7657 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0f5dabc8cca..6d681502395 100644
--- a/History.markdown
+++ b/History.markdown
@@ -93,6 +93,7 @@
   * Utilize absolute paths of user-provided file paths (#7450)
   * ISO week date drops (#5981)
   * Detect `nil` and empty values in objects with `where` filter (#7580)
+  * Initialize mutations for Drops only if necessary (#7657)
 
 ### Development Fixes
 

From c763460943aeabd401c46e8bded24b056837744e Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 15 May 2019 21:15:54 +0530
Subject: [PATCH 3611/4996] Bump RuboCop to v0.69.x (#7656)

Merge pull request 7656
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 522bbb0a807..b82c29ffb55 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.68.0"
+  gem "rubocop", "~> 0.69.0"
   gem "rubocop-performance"
   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__)

From f99f910e296a2fdcb6c7635045f0d0265f42b481 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 15 May 2019 11:45:56 -0400
Subject: [PATCH 3612/4996] Update history to reflect merge of #7656 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6d681502395..210d15a914f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -140,6 +140,7 @@
   * Bump RuboCop to v0.68.x (#7637)
   * Refactor Jekyll::Cache (#7532)
   * Store list of expected extnames in a constant (#7638)
+  * Bump RuboCop to v0.69.x (#7656)
 
 ### Documentation
 

From ec347597da03185aeb978f7f89ba54a847fc84e5 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 15 May 2019 21:18:12 +0530
Subject: [PATCH 3613/4996] Reduce Array allocations via Jekyll::Cleaner
 (#7659)

Merge pull request 7659
---
 lib/jekyll/cleaner.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb
index 3c419c83dc0..f891c0af778 100644
--- a/lib/jekyll/cleaner.rb
+++ b/lib/jekyll/cleaner.rb
@@ -66,7 +66,7 @@ def new_files
     #
     # Returns a Set with the directory paths
     def new_dirs
-      @new_dirs ||= new_files.map { |file| parent_dirs(file) }.flatten.to_set
+      @new_dirs ||= new_files.flat_map { |file| parent_dirs(file) }.to_set
     end
 
     # Private: The list of parent directories of a given file
@@ -77,7 +77,7 @@ def parent_dirs(file)
       if parent_dir == site.dest
         []
       else
-        [parent_dir] + parent_dirs(parent_dir)
+        parent_dirs(parent_dir).unshift(parent_dir)
       end
     end
 
@@ -94,7 +94,7 @@ def replaced_files
     #
     # Returns a Set with the directory paths
     def keep_dirs
-      site.keep_files.map { |file| parent_dirs(site.in_dest_dir(file)) }.flatten.to_set
+      site.keep_files.flat_map { |file| parent_dirs(site.in_dest_dir(file)) }.to_set
     end
 
     # Private: Creates a regular expression from the config's keep_files array

From d6a756ba27b2932b3601ca49499587a89967cfb1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 15 May 2019 11:48:18 -0400
Subject: [PATCH 3614/4996] Update history to reflect merge of #7659 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 210d15a914f..10cd972d034 100644
--- a/History.markdown
+++ b/History.markdown
@@ -94,6 +94,7 @@
   * ISO week date drops (#5981)
   * Detect `nil` and empty values in objects with `where` filter (#7580)
   * Initialize mutations for Drops only if necessary (#7657)
+  * Reduce Array allocations via Jekyll::Cleaner (#7659)
 
 ### Development Fixes
 

From c47611cb6e9524e5b1feb898d7063938e23d4a9b Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 15 May 2019 21:19:05 +0530
Subject: [PATCH 3615/4996] Initialize and reset glob_cache only as necessary
 (#7658)

Merge pull request 7658
---
 lib/jekyll/frontmatter_defaults.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb
index ef7d8339472..c3b73ef9bba 100644
--- a/lib/jekyll/frontmatter_defaults.rb
+++ b/lib/jekyll/frontmatter_defaults.rb
@@ -10,11 +10,10 @@ class FrontmatterDefaults
     # Initializes a new instance.
     def initialize(site)
       @site = site
-      reset
     end
 
     def reset
-      @glob_cache = {}
+      @glob_cache = {} if @glob_cache
     end
 
     def update_deprecated_types(set)
@@ -130,6 +129,7 @@ def glob_scope(sanitized_path, rel_scope_path)
     end
 
     def glob_cache(path)
+      @glob_cache ||= {}
       @glob_cache[path] ||= Dir.glob(path)
     end
 

From 8c5ee7366114ddf4a0db86b11dbb9ed9927645fc Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 15 May 2019 11:49:07 -0400
Subject: [PATCH 3616/4996] Update history to reflect merge of #7658 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 10cd972d034..0c94ca5fa2f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -57,6 +57,7 @@
   * Log a warning when the slug is empty (#7357)
   * Push Markdown link refs to excerpt only as required (#7577)
   * Fix broken include_relative usage in excerpt (#7633)
+  * Initialize and reset glob_cache only as necessary (#7658)
 
 ### Minor Enhancements
 

From 20c9d0957a9e03ef0a7c9f770ebdcb33dd6e6723 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 15 May 2019 21:44:08 +0530
Subject: [PATCH 3617/4996] Encode and unencode urls only as required (#7654)

Merge pull request 7654
---
 lib/jekyll/url.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index a32ec898396..6b812a2e87f 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -129,6 +129,8 @@ def sanitize_url(str)
     #
     # Returns the escaped path.
     def self.escape_path(path)
+      return path if path.empty? || %r!^[a-zA-Z0-9./-]+$!.match?(path)
+
       # Because URI.escape doesn't escape "?", "[" and "]" by default,
       # specify unsafe string (except unreserved, sub-delims, ":", "@" and "/").
       #
@@ -139,8 +141,7 @@ def self.escape_path(path)
       #   pct-encoded   = "%" HEXDIG HEXDIG
       #   sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
       #                 / "*" / "+" / "," / ";" / "="
-      path = Addressable::URI.encode(path)
-      path.encode("utf-8").sub("#", "%23")
+      Addressable::URI.encode(path).encode("utf-8").sub("#", "%23")
     end
 
     # Unescapes a URL path segment
@@ -154,7 +155,10 @@ def self.escape_path(path)
     #
     # Returns the unescaped path.
     def self.unescape_path(path)
-      Addressable::URI.unencode(path.encode("utf-8"))
+      path = path.encode("utf-8")
+      return path unless path.include?("%")
+
+      Addressable::URI.unencode(path)
     end
   end
 end

From a430c2200730de9c52a92a034feae6ecadcd84f3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 15 May 2019 12:14:10 -0400
Subject: [PATCH 3618/4996] Update history to reflect merge of #7654 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0c94ca5fa2f..f41aa924bd7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -96,6 +96,7 @@
   * Detect `nil` and empty values in objects with `where` filter (#7580)
   * Initialize mutations for Drops only if necessary (#7657)
   * Reduce Array allocations via Jekyll::Cleaner (#7659)
+  * Encode and unencode urls only as required (#7654)
 
 ### Development Fixes
 

From af055b917c24a534e912c04f01975fe3354d2568 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 16 May 2019 00:17:25 +0530
Subject: [PATCH 3619/4996] Profile allocations from a build session (#7646)

Merge pull request 7646
---
 .travis.yml       |  4 ++++
 Gemfile           |  1 +
 appveyor.yml      | 10 +++++----
 rake/profile.rake | 57 +++++++++++++++++++++++++++++++++++++++++++++++
 script/memprof    |  5 +++++
 5 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100644 rake/profile.rake
 create mode 100755 script/memprof

diff --git a/.travis.yml b/.travis.yml
index 2db94410041..f528cf55de3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,9 @@ matrix:
     - rvm: *ruby1
       env: TEST_SUITE=profile-docs
       name: "Profile Docs"
+    - rvm: *ruby1
+      env: TEST_SUITE=memprof
+      name: "Profile Memory Allocation"
   exclude:
     - rvm: *jruby
       env: TEST_SUITE=cucumber
@@ -42,6 +45,7 @@ after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 
 notifications:
+  email: false
   slack:
     secure: "\
       dNdKk6nahNURIUbO3ULhA09/vTEQjK0fNbgjVjeYPEvROHgQBP1cIP3AJy8aWs8rl5Yyow4Y\
diff --git a/Gemfile b/Gemfile
index b82c29ffb55..37fd916f383 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,6 +23,7 @@ group :test do
   gem "httpclient"
   gem "jekyll_test_plugin"
   gem "jekyll_test_plugin_malicious"
+  gem "memory_profiler"
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
diff --git a/appveyor.yml b/appveyor.yml
index d43f8a5f352..409662b00c1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,16 +13,18 @@ build: off
 environment:
   BUNDLE_WITHOUT: "benchmark:development"
   matrix:
-    - RUBY_FOLDER_VER: "26"
+    - RUBY_FOLDER_VER: "24"
       TEST_SUITE: "test"
     - RUBY_FOLDER_VER: "26"
-      TEST_SUITE: "cucumber"
+      TEST_SUITE: "test"
     - RUBY_FOLDER_VER: "26"
       TEST_SUITE: "default-site"
     - RUBY_FOLDER_VER: "26"
       TEST_SUITE: "profile-docs"
-    - RUBY_FOLDER_VER: "24"
-      TEST_SUITE: "test"
+    - RUBY_FOLDER_VER: "26"
+      TEST_SUITE: "memprof"
+    - RUBY_FOLDER_VER: "26"
+      TEST_SUITE: "cucumber"
 
 install:
   - SET PATH=C:\Ruby%RUBY_FOLDER_VER%-x64\bin;%PATH%
diff --git a/rake/profile.rake b/rake/profile.rake
new file mode 100644
index 00000000000..9c562d5ad99
--- /dev/null
+++ b/rake/profile.rake
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "jekyll"
+
+namespace :profile do
+  desc "Profile allocations from a build session"
+  task :memory, [:file, :mode] do |_t, args|
+    args.with_defaults(file: "memprof.txt", mode: "lite")
+
+    build_phases = [:reset, :read, :generate, :render, :cleanup, :write]
+    safe_mode    = false
+
+    if args.mode == "lite"
+      build_phases -= [:render, :generate]
+      safe_mode     = true
+    end
+
+    require "memory_profiler"
+
+    report = MemoryProfiler.report do
+      site = Jekyll::Site.new(
+        Jekyll.configuration(
+          "source"      => File.expand_path("../docs", __dir__),
+          "destination" => File.expand_path("../docs/_site", __dir__),
+          "safe"        => safe_mode
+        )
+      )
+
+      Jekyll.logger.info "Source:", site.source
+      Jekyll.logger.info "Destination:", site.dest
+      Jekyll.logger.info "Plugins and Cache:", site.safe ? "disabled" : "enabled"
+      Jekyll.logger.info "Profiling phases:", build_phases.join(", ").cyan
+      Jekyll.logger.info "Profiling..."
+
+      build_phases.each { |phase| site.send phase }
+
+      Jekyll.logger.info "", "and done. Generating results.."
+      Jekyll.logger.info ""
+    end
+
+    if ENV["CI"]
+      report.pretty_print(scale_bytes: true, color_output: true)
+    else
+      FileUtils.mkdir_p("tmp")
+      report_file = File.join("tmp", args.file)
+
+      total_allocated_output = report.scale_bytes(report.total_allocated_memsize)
+      total_retained_output  = report.scale_bytes(report.total_retained_memsize)
+
+      Jekyll.logger.info "Total allocated: #{total_allocated_output} (#{report.total_allocated} objects)".cyan
+      Jekyll.logger.info "Total retained:  #{total_retained_output} (#{report.total_retained} objects)".cyan
+
+      report.pretty_print(to_file: report_file, scale_bytes: true)
+      Jekyll.logger.info "\nDetailed Report saved into:", report_file.cyan
+    end
+  end
+end
diff --git a/script/memprof b/script/memprof
new file mode 100755
index 00000000000..df645ea14c3
--- /dev/null
+++ b/script/memprof
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+file="memprof.txt"
+mode="core"
+bundle exec rake profile:memory[$file,$mode]

From 1658a1596eecd94e716dfd4e059807a95b6e784f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 15 May 2019 14:47:28 -0400
Subject: [PATCH 3620/4996] Update history to reflect merge of #7646 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f41aa924bd7..3ce960a1a41 100644
--- a/History.markdown
+++ b/History.markdown
@@ -144,6 +144,7 @@
   * Refactor Jekyll::Cache (#7532)
   * Store list of expected extnames in a constant (#7638)
   * Bump RuboCop to v0.69.x (#7656)
+  * Profile allocations from a build session (#7646)
 
 ### Documentation
 

From cbfdeaefcd79821dbc266ccfd01e7e2cabd9082c Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 16 May 2019 19:34:37 +0530
Subject: [PATCH 3621/4996] Reduce string allocations with better alternatives
 (#7643)

Merge pull request 7643
---
 lib/jekyll/collection.rb           |  6 ++++--
 lib/jekyll/drops/drop.rb           |  5 +++--
 lib/jekyll/entry_filter.rb         | 10 ++++++++--
 lib/jekyll/frontmatter_defaults.rb |  6 +++---
 lib/jekyll/utils/platforms.rb      |  2 +-
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index 41bbb70e97f..874d26f2215 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -75,11 +75,13 @@ def read
     def entries
       return [] unless exists?
 
-      @entries ||=
+      @entries ||= begin
+        collection_dir_slash = "#{collection_dir}/"
         Utils.safe_glob(collection_dir, ["**", "*"], File::FNM_DOTMATCH).map do |entry|
-          entry["#{collection_dir}/"] = ""
+          entry[collection_dir_slash] = ""
           entry
         end
+      end
     end
 
     # Filtered version of the entries in this collection.
diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index 90c6cfaf025..c883bc0cdba 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -65,8 +65,9 @@ def [](key)
       # and the key matches a method in which case it raises a
       # DropMutationException.
       def []=(key, val)
-        if respond_to?("#{key}=")
-          public_send("#{key}=", val)
+        setter = "#{key}="
+        if respond_to?(setter)
+          public_send(setter, val)
         elsif respond_to?(key.to_s)
           if self.class.mutable?
             mutations[key] = val
diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb
index 5f34cf82c21..fab08cbc7ce 100644
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -91,7 +91,7 @@ def symlink_outside_site_source?(entry)
     # Returns true if path matches against any glob pattern.
     # --
     def glob_include?(enum, entry)
-      entry_path = Pathutil.new(site.in_source_dir).join(entry)
+      entry_path = source_path.join(entry)
       enum.any? do |exp|
         # Users who send a Regexp knows what they want to
         # exclude, so let them send a Regexp to exclude files,
@@ -102,7 +102,7 @@ def glob_include?(enum, entry)
           entry_path =~ exp
 
         else
-          item = Pathutil.new(site.in_source_dir).join(exp)
+          item = source_path.join(exp)
 
           # If it's a directory they want to exclude, AKA
           # ends with a "/" then we will go on to check and
@@ -123,5 +123,11 @@ def glob_include?(enum, entry)
         end
       end
     end
+
+    private
+
+    def source_path
+      @source_path ||= Pathutil.new(site.in_source_dir)
+    end
   end
 end
diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb
index c3b73ef9bba..c099731f4e3 100644
--- a/lib/jekyll/frontmatter_defaults.rb
+++ b/lib/jekyll/frontmatter_defaults.rb
@@ -111,7 +111,7 @@ def applies_path?(scope, path)
       if scope["path"].to_s.include?("*")
         glob_scope(sanitized_path, rel_scope_path)
       else
-        path_is_subpath?(sanitized_path, strip_collections_dir(rel_scope_path))
+        path_is_subpath?(sanitized_path, strip_collections_dir(scope["path"]))
       end
     end
 
@@ -120,7 +120,7 @@ def glob_scope(sanitized_path, rel_scope_path)
       abs_scope_path = site_source.join(rel_scope_path).to_s
 
       glob_cache(abs_scope_path).each do |scope_path|
-        scope_path = Pathname.new(scope_path).relative_path_from(site_source)
+        scope_path = Pathname.new(scope_path).relative_path_from(site_source).to_s
         scope_path = strip_collections_dir(scope_path)
         Jekyll.logger.debug "Globbed Scope Path:", scope_path
         return true if path_is_subpath?(sanitized_path, scope_path)
@@ -143,7 +143,7 @@ def path_is_subpath?(path, parent_path)
 
     def strip_collections_dir(path)
       collections_dir  = @site.config["collections_dir"]
-      slashed_coll_dir = "#{collections_dir}/"
+      slashed_coll_dir = collections_dir.empty? ? "/" : "#{collections_dir}/"
       return path if collections_dir.empty? || !path.to_s.start_with?(slashed_coll_dir)
 
       path.sub(slashed_coll_dir, "")
diff --git a/lib/jekyll/utils/platforms.rb b/lib/jekyll/utils/platforms.rb
index 5265e4b2499..cd0730be9a8 100644
--- a/lib/jekyll/utils/platforms.rb
+++ b/lib/jekyll/utils/platforms.rb
@@ -72,7 +72,7 @@ def linux?
       def proc_version
         @proc_version ||=
           begin
-            Pathutil.new("/proc/version").read
+            File.read("/proc/version")
           rescue Errno::ENOENT, Errno::EACCES
             nil
           end

From 7cdbbaafa74b1bca344f74e0cd9e0e5b018a781a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 16 May 2019 10:04:40 -0400
Subject: [PATCH 3622/4996] Update history to reflect merge of #7643 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3ce960a1a41..4cb7d980724 100644
--- a/History.markdown
+++ b/History.markdown
@@ -97,6 +97,7 @@
   * Initialize mutations for Drops only if necessary (#7657)
   * Reduce Array allocations via Jekyll::Cleaner (#7659)
   * Encode and unencode urls only as required (#7654)
+  * Reduce string allocations with better alternatives (#7643)
 
 ### Development Fixes
 

From 754813294449f04abd44bb38d7a8a113d26e18a6 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 16 May 2019 20:25:59 +0530
Subject: [PATCH 3623/4996] Reduce allocations from Jekyll::Document instances
 (#7625)

Merge pull request 7625
---
 lib/jekyll/document.rb | 43 ++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 7e9e42cad4f..38867b02172 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -17,6 +17,20 @@ class Document
     SASS_FILE_EXTS = %w(.sass .scss).freeze
     YAML_FILE_EXTS = %w(.yaml .yml).freeze
 
+    #
+
+    # Class-wide cache to stash and retrieve regexp to detect "super-directories"
+    # of a particular Jekyll::Document object.
+    #
+    # dirname - The *special directory* for the Document.
+    #           e.g. "_posts" or "_drafts" for Documents from the `site.posts` collection.
+    def self.superdirs_regex(dirname)
+      @superdirs_regex ||= {}
+      @superdirs_regex[dirname] ||= %r!#{dirname}.*!
+    end
+
+    #
+
     # Create a new Document.
     #
     # path - the path to the file
@@ -404,28 +418,29 @@ def respond_to_missing?(method, *)
     #
     # Returns nothing.
     def categories_from_path(special_dir)
-      superdirs = relative_path.sub(%r!#{special_dir}(.*)!, "")
-        .split(File::SEPARATOR)
-        .reject do |c|
-        c.empty? || c == special_dir || c == basename
-      end
+      superdirs = relative_path.sub(Document.superdirs_regex(special_dir), "")
+      superdirs = superdirs.split(File::SEPARATOR)
+      superdirs.reject! { |c| c.empty? || c == special_dir || c == basename }
+
       merge_data!({ "categories" => superdirs }, :source => "file path")
     end
 
     def populate_categories
-      merge_data!(
-        "categories" => (
-          Array(data["categories"]) + Utils.pluralized_array_from_hash(
-            data, "category", "categories"
-          )
-        ).map(&:to_s).flatten.uniq
+      categories = Array(data["categories"]) + Utils.pluralized_array_from_hash(
+        data, "category", "categories"
       )
+      categories.map!(&:to_s)
+      categories.flatten!
+      categories.uniq!
+
+      merge_data!("categories" => categories)
     end
 
     def populate_tags
-      merge_data!(
-        "tags" => Utils.pluralized_array_from_hash(data, "tag", "tags").flatten
-      )
+      tags = Utils.pluralized_array_from_hash(data, "tag", "tags")
+      tags.flatten!
+
+      merge_data!("tags" => tags)
     end
 
     private

From db2de73a0d6ff93bec3acc53e93ed1270b647e0e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 16 May 2019 10:56:01 -0400
Subject: [PATCH 3624/4996] Update history to reflect merge of #7625 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4cb7d980724..92f81dc89d6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -98,6 +98,7 @@
   * Reduce Array allocations via Jekyll::Cleaner (#7659)
   * Encode and unencode urls only as required (#7654)
   * Reduce string allocations with better alternatives (#7643)
+  * Reduce allocations from Jekyll::Document instances (#7625)
 
 ### Development Fixes
 

From 49ffbbd4c761a67fc930acd257ae932111464b28 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 16 May 2019 21:14:39 +0530
Subject: [PATCH 3625/4996] Add `type` attribute to Document instances (#7406)

Merge pull request 7406
---
 lib/jekyll/document.rb | 11 +++++------
 lib/jekyll/excerpt.rb  |  2 +-
 test/test_document.rb  |  4 ++++
 test/test_excerpt.rb   |  9 +++++++++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 38867b02172..a9eb8ed2b87 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -5,7 +5,7 @@ class Document
     include Comparable
     extend Forwardable
 
-    attr_reader :path, :site, :extname, :collection
+    attr_reader :path, :site, :extname, :collection, :type
     attr_accessor :content, :output
 
     def_delegator :self, :read_post_data, :post_read
@@ -44,6 +44,8 @@ def initialize(path, relations = {})
       @path = path
       @extname = File.extname(path)
       @collection = relations[:collection]
+      @type = @collection.label.to_sym
+
       @has_yaml_header = nil
 
       if draft?
@@ -53,7 +55,7 @@ def initialize(path, relations = {})
       end
 
       data.default_proc = proc do |_, key|
-        site.frontmatter_defaults.find(relative_path, collection.label, key)
+        site.frontmatter_defaults.find(relative_path, type, key)
       end
 
       trigger_hooks(:post_init)
@@ -462,10 +464,7 @@ def merge_date!(source)
     end
 
     def merge_defaults
-      defaults = @site.frontmatter_defaults.all(
-        relative_path,
-        collection.label.to_sym
-      )
+      defaults = @site.frontmatter_defaults.all(relative_path, type)
       merge_data!(defaults, :source => "front matter defaults") unless defaults.empty?
     end
 
diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb
index 69b107f57ec..dee4613fbbc 100644
--- a/lib/jekyll/excerpt.rb
+++ b/lib/jekyll/excerpt.rb
@@ -10,7 +10,7 @@ class Excerpt
 
     def_delegators :@doc,
                    :site, :name, :ext, :extname,
-                   :collection, :related_posts,
+                   :collection, :related_posts, :type,
                    :coffeescript_file?, :yaml_file?,
                    :url, :next_doc, :previous_doc
 
diff --git a/test/test_document.rb b/test/test_document.rb
index 1e1354183d5..041328d51fb 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -58,6 +58,10 @@ def setup_document_with_dates(filename)
       assert_equal "configuration", @document.basename_without_ext
     end
 
+    should "know its type" do
+      assert_equal :methods, @document.type
+    end
+
     should "know whether it's a YAML file" do
       assert_equal false, @document.yaml_file?
     end
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index fbe6f63d29b..c57def0b9be 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -56,6 +56,15 @@ def do_render(document)
       end
     end
 
+    context "#type" do
+      should "return the post's type" do
+        assert_equal @excerpt.type, @post.type
+      end
+      should "return a symbol" do
+        assert_same @excerpt.type.class, Symbol
+      end
+    end
+
     context "#to_s" do
       should "return rendered output" do
         assert_equal @excerpt.output, @excerpt.to_s

From 2d3c030facd8c64a3ef75a187fa1ee375edfdfa8 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 16 May 2019 11:44:44 -0400
Subject: [PATCH 3626/4996] Update history to reflect merge of #7406 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 92f81dc89d6..b2a923c38ff 100644
--- a/History.markdown
+++ b/History.markdown
@@ -99,6 +99,7 @@
   * Encode and unencode urls only as required (#7654)
   * Reduce string allocations with better alternatives (#7643)
   * Reduce allocations from Jekyll::Document instances (#7625)
+  * Add `type` attribute to Document instances (#7406)
 
 ### Development Fixes
 

From ed385ba264e82008fa37b4fad2eac9c353826213 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 16 May 2019 22:08:53 +0530
Subject: [PATCH 3627/4996] Reduce allocations from where-filter (#7653)

Merge pull request 7653
---
 lib/jekyll/filters.rb | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 055a3e5ee0a..cec65ba3943 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -326,20 +326,31 @@ def sort_input(input, property, order)
     end
 
     # `where` filter helper
+    #
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def compare_property_vs_target(property, target)
       case target
       when NilClass
         return true if property.nil?
       when Liquid::Expression::MethodLiteral # `empty` or `blank`
-        return true if Array(property).join == target.to_s
+        target = target.to_s
+        return true if property == target || Array(property).join == target
       else
-        Array(property).each do |prop|
-          return true if prop.to_s == target.to_s
+        target = target.to_s
+        if property.is_a? String
+          return true if property == target
+        else
+          Array(property).each do |prop|
+            return true if prop.to_s == target
+          end
         end
       end
 
       false
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     def item_property(item, property)
       @item_property_cache ||= {}

From 9957e21be7f45e791725a9e0a963b329f79c2615 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 16 May 2019 12:38:55 -0400
Subject: [PATCH 3628/4996] Update history to reflect merge of #7653 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b2a923c38ff..c97df14faed 100644
--- a/History.markdown
+++ b/History.markdown
@@ -100,6 +100,7 @@
   * Reduce string allocations with better alternatives (#7643)
   * Reduce allocations from Jekyll::Document instances (#7625)
   * Add `type` attribute to Document instances (#7406)
+  * Reduce allocations from where-filter (#7653)
 
 ### Development Fixes
 

From 079b7231d9d021565e533b62b23ad9e26b2b7c1d Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 17 May 2019 12:23:43 +0530
Subject: [PATCH 3629/4996] Simplify assigning classname to docs' aside-links
 (#7609)

Merge pull request 7609
---
 docs/_includes/docs_contents.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docs/_includes/docs_contents.html b/docs/_includes/docs_contents.html
index c5dd014e582..d99e822365f 100644
--- a/docs/_includes/docs_contents.html
+++ b/docs/_includes/docs_contents.html
@@ -5,11 +5,7 @@ 
    {{ section.title }}
    
       
      
         {% for item in section.docs %}
           {% assign p = site.documents | where: "url", item.link | first %}
-          
    • 
+          
    • 
             
               {{ p.menu_name | default: p.title }}
             

From 617dc6987909951829b4bc440ce6a6ce655b4a8f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 17 May 2019 02:53:45 -0400
Subject: [PATCH 3630/4996] Update history to reflect merge of #7609 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c97df14faed..cd6958e34bf 100644
--- a/History.markdown
+++ b/History.markdown
@@ -279,6 +279,7 @@
   * Link to OpenCollective backing (#7378
   * Link to sponsor listing in README (#7405)
   * Better Performance (#7388)
+  * Simplify assigning classname to docs' aside-links (#7609)
 
 ### release
 

From 98ae88f3fdb7774b24cb534e0301ba684df40197 Mon Sep 17 00:00:00 2001
From: krissy 
Date: Fri, 17 May 2019 14:53:26 -0700
Subject: [PATCH 3631/4996] Update small typo in contributing.md (#7671)

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

diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index 7bba3156029..e709fcaeab7 100644
--- a/docs/_docs/contributing.md
+++ b/docs/_docs/contributing.md
@@ -93,7 +93,7 @@ If you want to add your plugin to the [list of plugins](https://jekyllrb.com/doc
 
 ## Code Contributions
 
-Interesting in submitting a pull request? Awesome. Read on. There's a few common gotchas that we'd love to help you avoid.
+Interested in submitting a pull request? Awesome. Read on. There's a few common gotchas that we'd love to help you avoid.
 
 ### Tests and documentation
 

From b3770fd45d361c39a55e5079ac8fdecd14b08c14 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 17 May 2019 17:53:27 -0400
Subject: [PATCH 3632/4996] Update history to reflect merge of #7671 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index cd6958e34bf..e4d31345472 100644
--- a/History.markdown
+++ b/History.markdown
@@ -149,6 +149,7 @@
   * Store list of expected extnames in a constant (#7638)
   * Bump RuboCop to v0.69.x (#7656)
   * Profile allocations from a build session (#7646)
+  * Update small typo in contributing.md (#7671)
 
 ### Documentation
 

From 818441c8d9403e2ad8080975ab98965564906a38 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 24 May 2019 13:20:45 +0530
Subject: [PATCH 3633/4996] Bump RuboCop to v0.70.x (#7678)

Merge pull request 7678
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 37fd916f383..33faafb0b14 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.69.0"
+  gem "rubocop", "~> 0.70.0"
   gem "rubocop-performance"
   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__)

From 08b04aa337cfe3134d3791fd6f63134ba37a7dba Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 24 May 2019 03:50:47 -0400
Subject: [PATCH 3634/4996] Update history to reflect merge of #7678 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e4d31345472..9364f0b49a9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -150,6 +150,7 @@
   * Bump RuboCop to v0.69.x (#7656)
   * Profile allocations from a build session (#7646)
   * Update small typo in contributing.md (#7671)
+  * Bump RuboCop to v0.70.x (#7678)
 
 ### Documentation
 

From c6566b24107714609ec99d0c08191ed2273f0502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=20Mu=C3=B1oz?= 
Date: Fri, 24 May 2019 14:53:49 +0200
Subject: [PATCH 3635/4996] Added documentation for Live Reload feature

This was added in 3.7.0 (see https://jekyllrb.com/news/2018/01/02/jekyll-3-7-0-released/) but it's not mentioned anywhere in the docs
---
 docs/_docs/configuration/options.md | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/configuration/options.md b/docs/_docs/configuration/options.md
index f2c6fdf35e2..45c921481ee 100644
--- a/docs/_docs/configuration/options.md
+++ b/docs/_docs/configuration/options.md
@@ -352,17 +352,26 @@ before your site is served.
     
       
         
      Base URL
      
-        
      Serve the website from the given base URL
      
+        
      Serve the website from the given base URL.
      
       
       
         
      baseurl: URL
      
         
      --baseurl URL
      
       
     
+    
+      
+        
      Live Reload
      
+        
      Reload the site automatically on the browser when content is edited.
      
+      
+      
+        
      --livereload
      
+      
+    
     
       
         
      Detach
      
-        
      Detach the server from the terminal
      
+        
      Detach the server from the terminal.
      
       
       
         
      detach: BOOL
      
@@ -371,7 +380,7 @@ before your site is served.
     
     
       
-        
      Skips the initial site build.
      
+        
      Skips the initial site build
      
         
      Skips the initial site build which occurs before the server is started.
      
       
       

From ac02b11fd2565b7ce8b692cbc888fdc813981aed Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 26 May 2019 13:30:44 +0200
Subject: [PATCH 3636/4996] Link to sponsorship

Co-authored-by: Ashwin Maroli 
Co-authored-by: Matt Rogers 
---
 .github/FUNDING.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000000..608fab25c51
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,5 @@
+# These are supported funding model platforms
+
+github: ashmaroli, DirtyF, mattr
+open_collective: jekyll
+tidelift: rubygems/jekyll

From 03ce3f8a458ad39f871a3b3f1be80da934b5128b Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 26 May 2019 13:59:42 +0200
Subject: [PATCH 3637/4996] Update FUNDING.yml

---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 608fab25c51..837c1db7aa2 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,5 +1,5 @@
 # These are supported funding model platforms
 
-github: ashmaroli, DirtyF, mattr
+github: [ashmaroli, DirtyF, mattr]
 open_collective: jekyll
 tidelift: rubygems/jekyll

From c004281d8625bc35838d66e9d1ef56408dfa03dc Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 26 May 2019 18:11:40 +0200
Subject: [PATCH 3638/4996] Update FUNDING.yml

---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 837c1db7aa2..c8f7215e6cd 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,5 +1,5 @@
 # These are supported funding model platforms
 
-github: [ashmaroli, DirtyF, mattr]
+github: [ashmaroli, DirtyF, mattr-]
 open_collective: jekyll
 tidelift: rubygems/jekyll

From 390973683fa25c5efc987eb0bdf1e33964f6775b Mon Sep 17 00:00:00 2001
From: Fons van der Plas 
Date: Mon, 27 May 2019 14:10:25 +0200
Subject: [PATCH 3639/4996] docs: `jekyll serve` restart after changing config

These steps were missing in the Step-by-Step instructions on [jekyllrb.com/docs](https://jekyllrb.com/docs/step-by-step/01-setup/).
---
 docs/_docs/step-by-step/09-collections.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/_docs/step-by-step/09-collections.md b/docs/_docs/step-by-step/09-collections.md
index c6fd893ac40..994a7b2b29e 100644
--- a/docs/_docs/step-by-step/09-collections.md
+++ b/docs/_docs/step-by-step/09-collections.md
@@ -21,6 +21,8 @@ collections:
   authors:
 ```
 
+To (re)load the configuration, restart the jekyll server. Press `Ctrl`+`C` in your terminal to stop the server, and then `jekyll serve` to restart it.
+
 ## Add authors
 
 Documents (the items in a collection) live in a folder in the root of the site

From 641eb4e9e74412e240421ae4e342851c0b9feb47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=20Mu=C3=B1oz?= 
Date: Tue, 28 May 2019 15:11:50 +0200
Subject: [PATCH 3640/4996] Update docs/_docs/configuration/options.md

Co-Authored-By: Frank Taillandier 
---
 docs/_docs/configuration/options.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_docs/configuration/options.md b/docs/_docs/configuration/options.md
index 45c921481ee..9c25b761936 100644
--- a/docs/_docs/configuration/options.md
+++ b/docs/_docs/configuration/options.md
@@ -365,6 +365,7 @@ before your site is served.
         
      Reload the site automatically on the browser when content is edited.
      
       
       
+        
      livereload: true
      
         
      --livereload
      
       
     

From 276e71fb80191c7327b4f31df212ab7c4ea0d31c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=20Mu=C3=B1oz?= 
Date: Tue, 28 May 2019 15:13:02 +0200
Subject: [PATCH 3641/4996] Update options.md

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

diff --git a/docs/_docs/configuration/options.md b/docs/_docs/configuration/options.md
index 9c25b761936..1f716dc2a51 100644
--- a/docs/_docs/configuration/options.md
+++ b/docs/_docs/configuration/options.md
@@ -362,7 +362,7 @@ before your site is served.
     
       
         
      Live Reload
      
-        
      Reload the site automatically on the browser when content is edited.
      
+        
      Reload a page automatically on the browser when its content is edited.
      
       
       
         
      livereload: true
      

From 263d41f0f7a946425dcf3d59f7a1544ed782b8af Mon Sep 17 00:00:00 2001
From: Christian Oliff 
Date: Thu, 30 May 2019 21:39:44 +0900
Subject: [PATCH 3642/4996] HTTPS link to yaml.org (#7686)

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

diff --git a/docs/_docs/front-matter.md b/docs/_docs/front-matter.md
index bbda3546bd0..084235133f7 100644
--- a/docs/_docs/front-matter.md
+++ b/docs/_docs/front-matter.md
@@ -4,7 +4,7 @@ permalink: /docs/front-matter/
 redirect_from: /docs/frontmatter/index.html
 ---
 
-Any file that contains a [YAML](http://yaml.org/) front matter block will be
+Any file that contains a [YAML](https://yaml.org/) front matter block will be
 processed by Jekyll as a special file. The front matter must be the first thing
 in the file and must take the form of valid YAML set between triple-dashed
 lines. Here is a basic example:

From 554e07d4a51d51a8b65461b98015ca9e7422cc1c Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 31 May 2019 06:58:03 +0530
Subject: [PATCH 3643/4996] Revert memoizing Site#docs_to_write and #documents
 (#7684)

Merge pull request 7684
---
 lib/jekyll/site.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 43a652cc9b5..50653e9042f 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -326,15 +326,15 @@ def relative_permalinks_are_deprecated
     #
     # Returns an Array of Documents which should be written
     def docs_to_write
-      @docs_to_write ||= documents.select(&:write?)
+      documents.select(&:write?)
     end
 
     # Get all the documents
     #
     # Returns an Array of all Documents
     def documents
-      @documents ||= collections.reduce(Set.new) do |docs, (_, collection)|
-        docs + collection.docs + collection.files
+      collections.each_with_object(Set.new) do |(_, collection), set|
+        set.merge(collection.docs).merge(collection.files)
       end.to_a
     end
 

From db3570e5827366cbc1d766e3f6e302619f4d91ca Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 30 May 2019 21:28:05 -0400
Subject: [PATCH 3644/4996] Update history to reflect merge of #7684 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9364f0b49a9..f849457ed47 100644
--- a/History.markdown
+++ b/History.markdown
@@ -58,6 +58,7 @@
   * Push Markdown link refs to excerpt only as required (#7577)
   * Fix broken include_relative usage in excerpt (#7633)
   * Initialize and reset glob_cache only as necessary (#7658)
+  * Revert memoizing Site#docs_to_write and #documents (#7684)
 
 ### Minor Enhancements
 

From 2f791484ab98c88c40b9ae0a378e2dd6b1931be8 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 31 May 2019 11:31:49 -0400
Subject: [PATCH 3645/4996] Update history to reflect merge of #7689 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f849457ed47..61fb8584a8d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -59,6 +59,7 @@
   * Fix broken include_relative usage in excerpt (#7633)
   * Initialize and reset glob_cache only as necessary (#7658)
   * Revert memoizing Site#docs_to_write and #documents (#7684)
+  * Backport #7684 for v3.8.x: Revert memoizing Site#docs_to_write and refactor #documents (#7689)
 
 ### Minor Enhancements
 

From 56c39e76d2b60939bc49a77eb67dfda5c3e5970e Mon Sep 17 00:00:00 2001
From: SADIK KUZU 
Date: Mon, 3 Jun 2019 11:59:56 +0300
Subject: [PATCH 3646/4996] Fix typo from 'Github' to 'GitHub' (#7691)

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

diff --git a/docs/_docs/ruby-101.md b/docs/_docs/ruby-101.md
index 85c1cc11e34..f3ec778b043 100644
--- a/docs/_docs/ruby-101.md
+++ b/docs/_docs/ruby-101.md
@@ -12,7 +12,7 @@ A gem is code you can include in Ruby projects. It allows you to package up func
 
 * Converting a Ruby object to JSON
 * Pagination
-* Interacting with APIs such as Github
+* Interacting with APIs such as GitHub
 * Jekyll itself is a gem as well as many Jekyll plugins including
 [jekyll-feed](https://github.com/jekyll/jekyll-feed),
 [jekyll-seo-tag](https://github.com/jekyll/jekyll-seo-tag) and

From 86fd200a688a4058955e3974e8ddf8221a8c77ce Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 3 Jun 2019 04:59:58 -0400
Subject: [PATCH 3647/4996] Update history to reflect merge of #7691 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 61fb8584a8d..3c11f15325e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -275,6 +275,7 @@
   * Indicate where the _sass folder is by default (#7644)
   * Docs: add version tags to new placeholders (#5981) for permalinks (#7647)
   * Solve "GitHub Page build failure" in 10-deployment.md (#7648)
+  * Fix typo from 'Github' to 'GitHub' (#7691)
 
 ### Site Enhancements
 

From c914e8628beb7a3ec9fb563238905f27943298ae Mon Sep 17 00:00:00 2001
From: SADIK KUZU 
Date: Wed, 5 Jun 2019 09:11:46 +0300
Subject: [PATCH 3648/4996] Typo fix in Jekyll 4.0 pre-release post (#7694)

---
 .../_posts/2019-03-18-jekyll-4-0-0-pre-alpha1-released.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_posts/2019-03-18-jekyll-4-0-0-pre-alpha1-released.markdown b/docs/_posts/2019-03-18-jekyll-4-0-0-pre-alpha1-released.markdown
index 40907fbf073..ffa900aa74c 100644
--- a/docs/_posts/2019-03-18-jekyll-4-0-0-pre-alpha1-released.markdown
+++ b/docs/_posts/2019-03-18-jekyll-4-0-0-pre-alpha1-released.markdown
@@ -19,7 +19,7 @@ Jekyll now exposes a [caching API](/tutorials/cache-api/), that some plugins cou
 Also be aware that it's a new *major* version, and it comes with a few breaking changes, notably :
 
 1. We dropped support for [Ruby 2.3 who goes EOL at the end of the month](https://www.ruby-lang.org/en/downloads/).
-   GitHub Pages runs Ruby 2.5.x, services lile Netlify or Forestry already upgraded to latest Ruby 2.6.x.
+   GitHub Pages runs Ruby 2.5.x, services like Netlify or Forestry already upgraded to latest Ruby 2.6.x.
 2. `link` tag now include `relative_url` filter, hurray [no more need to prepend `{% raw %}{{ site.baseurl }}{% endraw %}` ](https://github.com/jekyll/jekyll/pull/6727).
 3. [`{% raw %}{% highlight %}{% endraw %}` now behaves like `{% raw %}{% raw %}{% endraw %}`](https://github.com/jekyll/jekyll/pull/6821), so you can no longer use `include` tags within.
 4. We dropped support for Pygments, RedCarpet and rdiscount.

From 04ba0c3b109d54aa607a2d5ebd46e8bd494b5118 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 5 Jun 2019 08:46:00 -0400
Subject: [PATCH 3649/4996] Update history to reflect merge of #7690 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3c11f15325e..d807a3c5a1d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -60,6 +60,7 @@
   * Initialize and reset glob_cache only as necessary (#7658)
   * Revert memoizing Site#docs_to_write and #documents (#7684)
   * Backport #7684 for v3.8.x: Revert memoizing Site#docs_to_write and refactor #documents (#7689)
+  * Backport #7213 and #7633 for v3.8.x: Fix broken include_relative usage in excerpt (#7690)
 
 ### Minor Enhancements
 

From e05745929f9fbe6ea79e5eaf0ff774fab04852f3 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 5 Jun 2019 21:40:37 +0530
Subject: [PATCH 3650/4996] Remove override to Jekyll::Document#respond_to?
 (#7695)

Merge pull request 7695
---
 lib/jekyll/document.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index a9eb8ed2b87..847b2b9b0bc 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -392,12 +392,6 @@ def related_posts
       @related_posts ||= Jekyll::RelatedPosts.new(self).build
     end
 
-    # Override of normal respond_to? to match method_missing's logic for
-    # looking in @data.
-    def respond_to?(method, include_private = false)
-      data.key?(method.to_s) || super
-    end
-
     # Override of method_missing to check in @data for the key.
     def method_missing(method, *args, &blck)
       if data.key?(method.to_s)

From 13d31c4c8be13ab1536a0139a48952b142e81682 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 5 Jun 2019 12:10:40 -0400
Subject: [PATCH 3651/4996] Update history to reflect merge of #7695 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d807a3c5a1d..661656fe3ed 100644
--- a/History.markdown
+++ b/History.markdown
@@ -154,6 +154,7 @@
   * Profile allocations from a build session (#7646)
   * Update small typo in contributing.md (#7671)
   * Bump RuboCop to v0.70.x (#7678)
+  * Remove override to Jekyll::Document#respond_to? (#7695)
 
 ### Documentation
 

From 49e5b33fb027848efb1c4beb2b9b4095e1af9b3b Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 9 Jun 2019 11:42:34 +0530
Subject: [PATCH 3652/4996] Reject entries that are just dots in a directory

---
 lib/jekyll/entry_filter.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb
index fab08cbc7ce..ab03d2de800 100644
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -31,6 +31,9 @@ def relative_to_source(entry)
 
     def filter(entries)
       entries.reject do |e|
+        # Reject this entry if it is just a "dot" representation.
+        #   e.g.: '.', '..', '_movies/.', 'music/..', etc
+        next true if e.end_with?(".")
         # Reject this entry if it is a symlink.
         next true if symlink?(e)
         # Do not reject this entry if it is included.

From 3002aa58f5fc0e642f6b580971704beb606dd29b Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 9 Jun 2019 15:35:39 +0530
Subject: [PATCH 3653/4996] Refactor `EntryFilter#glob_include?`

---
 lib/jekyll/entry_filter.rb | 54 +++++++++++---------------------------
 test/test_entry_filter.rb  |  6 +++++
 2 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb
index fab08cbc7ce..7536312f725 100644
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -86,48 +86,24 @@ def symlink_outside_site_source?(entry)
       )
     end
 
-    # --
-    # Check if an entry matches a specific pattern and return true,false.
-    # Returns true if path matches against any glob pattern.
-    # --
-    def glob_include?(enum, entry)
-      entry_path = source_path.join(entry)
-      enum.any? do |exp|
-        # Users who send a Regexp knows what they want to
-        # exclude, so let them send a Regexp to exclude files,
-        # we will not bother caring if it works or not, it's
-        # on them at this point.
-
-        if exp.is_a?(Regexp)
-          entry_path =~ exp
-
+    # Check if an entry matches a specific pattern.
+    # Returns true if path matches against any glob pattern, else false.
+    def glob_include?(enumerator, entry)
+      entry_with_source = site.in_source_dir(entry)
+
+      enumerator.any? do |pattern|
+        case pattern
+        when String
+          pattern_with_source = site.in_source_dir(pattern)
+
+          File.fnmatch?(pattern_with_source, entry_with_source) ||
+            entry_with_source.start_with?(pattern_with_source)
+        when Regexp
+          pattern.match?(entry_with_source)
         else
-          item = source_path.join(exp)
-
-          # If it's a directory they want to exclude, AKA
-          # ends with a "/" then we will go on to check and
-          # see if the entry falls within that path and
-          # exclude it if that's the case.
-
-          if entry.end_with?("/")
-            entry_path.in_path?(
-              item
-            )
-
-          else
-            File.fnmatch?(item, entry_path) ||
-              entry_path.to_path.start_with?(
-                item
-              )
-          end
+          false
         end
       end
     end
-
-    private
-
-    def source_path
-      @source_path ||= Pathutil.new(site.in_source_dir)
-    end
   end
 end
diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb
index 85396d316b9..95ac8cd4560 100644
--- a/test/test_entry_filter.rb
+++ b/test/test_entry_filter.rb
@@ -147,5 +147,11 @@ class TestEntryFilter < JekyllUnitTest
       assert @filter.glob_include?(data, "/vendor/bundle")
       assert @filter.glob_include?(data, "vendor/bundle")
     end
+
+    should "match even if there is no trailing slash" do
+      data = ["/vendor/bundle/", "vendor/ruby"]
+      assert @filter.glob_include?(data, "vendor/bundle/jekyll/lib/page.rb")
+      assert @filter.glob_include?(data, "/vendor/ruby/lib/set.rb")
+    end
   end
 end

From 38bc4d2818d8199f8f3f609ef6b013c30fd386cf Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 9 Jun 2019 16:36:48 +0530
Subject: [PATCH 3654/4996] Do not install docs on updating gems on Travis
 (#7706)

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

diff --git a/.travis.yml b/.travis.yml
index f528cf55de3..177239f77cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,5 +54,5 @@ notifications:
     "
 
 before_install:
-  - gem update --system
-  - gem install bundler
+  - gem update --system --no-document
+  - gem install bundler --no-document

From 58bc6898298767c8c8bc1127d33252b638e30384 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 9 Jun 2019 07:06:50 -0400
Subject: [PATCH 3655/4996] Update history to reflect merge of #7706 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 661656fe3ed..a799817982a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -155,6 +155,7 @@
   * Update small typo in contributing.md (#7671)
   * Bump RuboCop to v0.70.x (#7678)
   * Remove override to Jekyll::Document#respond_to? (#7695)
+  * Do not install docs on updating gems on Travis (#7706)
 
 ### Documentation
 

From 119e0047e880cbad382ef5063905452cb9c5e2f2 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 9 Jun 2019 16:38:19 +0530
Subject: [PATCH 3656/4996] Don't sanitize pattern or entry string

---
 lib/jekyll/entry_filter.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb
index 7536312f725..717d849e73b 100644
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -89,12 +89,12 @@ def symlink_outside_site_source?(entry)
     # Check if an entry matches a specific pattern.
     # Returns true if path matches against any glob pattern, else false.
     def glob_include?(enumerator, entry)
-      entry_with_source = site.in_source_dir(entry)
+      entry_with_source = File.join(site.source, entry)
 
       enumerator.any? do |pattern|
         case pattern
         when String
-          pattern_with_source = site.in_source_dir(pattern)
+          pattern_with_source = File.join(site.source, pattern)
 
           File.fnmatch?(pattern_with_source, entry_with_source) ||
             entry_with_source.start_with?(pattern_with_source)

From f56b7d59e6684805d9ccf2e19a07e9b8fbe615b4 Mon Sep 17 00:00:00 2001
From: James Rhea 
Date: Wed, 12 Jun 2019 18:39:14 -0400
Subject: [PATCH 3657/4996] fix link to Site Source config (#7708)

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

diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index 5c4c3408275..1bd73977543 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -122,7 +122,7 @@ to see more detailed examples.
   
      Source files must be in the root directory
      
   
      
     GitHub Pages overrides
-    the “Site Source”
     configuration value, so if you locate your files anywhere other than the
     root directory, your site may not build correctly.
   
      

From 2df56abf85ab0fa2c14aab1a4e1c4c8eb347ed3d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 12 Jun 2019 18:39:16 -0400
Subject: [PATCH 3658/4996] Update history to reflect merge of #7708 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a799817982a..8032dd0014a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -279,6 +279,7 @@
   * Docs: add version tags to new placeholders (#5981) for permalinks (#7647)
   * Solve "GitHub Page build failure" in 10-deployment.md (#7648)
   * Fix typo from 'Github' to 'GitHub' (#7691)
+  * fix link to Site Source config (#7708)
 
 ### Site Enhancements
 

From 1480c4121398403cd4f32c698dd40ac5ba12a89b Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Thu, 13 Jun 2019 11:52:29 +0200
Subject: [PATCH 3659/4996] fix: LocalJump error: unexpected return
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

➜ rake site:latest_version
rake aborted!
LocalJumpError: unexpected return
/jekyll/rake/site.rake:89:in `block (2 levels) in '
Tasks: TOP => site:latest_version
(See full trace by running task with --trace)
---
 rake/site.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rake/site.rake b/rake/site.rake
index 990d5195db9..8f93d08b4ee 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -86,7 +86,7 @@ namespace :site do
 
   desc "Write the latest Jekyll version"
   task :latest_version do
-    return if version =~ %r!(beta|rc|alpha)!i
+    next if version =~ %r!(beta|rc|alpha)!i
     require "safe_yaml/load"
     config_file = File.join(docs_folder, "_config.yml")
     config = SafeYAML.load_file(config_file)

From 70bc82bacc5edd77896fb722f754932762247f62 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 13 Jun 2019 17:31:22 +0530
Subject: [PATCH 3660/4996] Update TestTags in sync with Rouge v3.4 (#7709)

Merge pull request 7709
---
 test/test_tags.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_tags.rb b/test/test_tags.rb
index 59cd190d94e..d0eae0d030f 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -152,7 +152,7 @@ def highlight_block_with_opts(options_string)
           %() +
             %() +
-            %() +
+            %() +
             %(
      ) +
             %(
      1\n
      test
      test\n
      ),
           @result
         )
@@ -275,7 +275,7 @@ def highlight_block_with_opts(options_string)
         expected = <<~EOS
           
      This is not yet highlighted
      \n
           
      1
-          
      test
      \n
+          
    test\n
    \n
           
    This should not be highlighted, right?
    
         EOS
         assert_match(expected, @result)

From a4f24f54ad41cda23d3355b2bd3784f53bb81c95 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 13 Jun 2019 08:01:25 -0400
Subject: [PATCH 3661/4996] Update history to reflect merge of #7709 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8032dd0014a..7b7ded33005 100644
--- a/History.markdown
+++ b/History.markdown
@@ -156,6 +156,7 @@
   * Bump RuboCop to v0.70.x (#7678)
   * Remove override to Jekyll::Document#respond_to? (#7695)
   * Do not install docs on updating gems on Travis (#7706)
+  * Update TestTags in sync with Rouge v3.4 (#7709)
 
 ### Documentation
 

From 478e3ab30137f68fe92b381e081800048fea1ca3 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 14 Jun 2019 05:59:57 +0530
Subject: [PATCH 3662/4996] Bump RuboCop to v0.71.0 (#7687)

Merge pull request 7687
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 33faafb0b14..acbbcd6ea67 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.70.0"
+  gem "rubocop", "~> 0.71.0"
   gem "rubocop-performance"
   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__)

From f0b7c9b7834d0404c4f2c28c3a6ef859df1979e6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 13 Jun 2019 20:29:59 -0400
Subject: [PATCH 3663/4996] Update history to reflect merge of #7687 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7b7ded33005..48e2e5b1af7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -157,6 +157,7 @@
   * Remove override to Jekyll::Document#respond_to? (#7695)
   * Do not install docs on updating gems on Travis (#7706)
   * Update TestTags in sync with Rouge v3.4 (#7709)
+  * Bump RuboCop to v0.71.0 (#7687)
 
 ### Documentation
 

From 25898f8d9dd5954bdf7089d2f4d86294877fc07c Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 14 Jun 2019 15:46:09 +0530
Subject: [PATCH 3664/4996] Reword code-comment to reflect the implementation

---
 lib/jekyll/readers/static_file_reader.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/readers/static_file_reader.rb b/lib/jekyll/readers/static_file_reader.rb
index 3dcc175d78c..97df05afce5 100644
--- a/lib/jekyll/readers/static_file_reader.rb
+++ b/lib/jekyll/readers/static_file_reader.rb
@@ -9,10 +9,9 @@ def initialize(site, dir)
       @unfiltered_content = []
     end
 
-    # Read all the files in // for Yaml header and create a new Page
-    # object for each file.
+    # Create a new StaticFile object for every entry in a given list of basenames.
     #
-    # dir - The String relative path of the directory to read.
+    # files - an array of file basenames.
     #
     # Returns an array of static files.
     def read(files)

From 52ae35a58982f6b015b61554a8feb98c0f022d84 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 21 Jun 2019 15:00:45 +0530
Subject: [PATCH 3665/4996] Disable color output from profile:memory task

So that it is easier to parse the plaintext build logs
---
 rake/profile.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rake/profile.rake b/rake/profile.rake
index 9c562d5ad99..d58c470ba23 100644
--- a/rake/profile.rake
+++ b/rake/profile.rake
@@ -39,7 +39,7 @@ namespace :profile do
     end
 
     if ENV["CI"]
-      report.pretty_print(scale_bytes: true, color_output: true)
+      report.pretty_print(scale_bytes: true, color_output: false)
     else
       FileUtils.mkdir_p("tmp")
       report_file = File.join("tmp", args.file)

From e37ee47219c5f486e9a55b6bcbf6c70e0701c06f Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 21 Jun 2019 15:27:18 +0530
Subject: [PATCH 3666/4996] Fix offenses detected by rubocop-performance-1.4.0

---
 test/test_entry_filter.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb
index 95ac8cd4560..b3d820e0693 100644
--- a/test/test_entry_filter.rb
+++ b/test/test_entry_filter.rb
@@ -82,7 +82,6 @@ class TestEntryFilter < JekyllUnitTest
       assert_equal %w(), entries
     end
 
-    # rubocop:disable Performance/FixedSize
     should "include only safe symlinks in safe mode" do
       # no support for symlinks on Windows
       skip_if_windows "Jekyll does not currently support symlinks on Windows."
@@ -93,7 +92,6 @@ class TestEntryFilter < JekyllUnitTest
       assert_equal %w(main.scss symlinked-file).length, site.pages.length
       refute_equal [], site.static_files
     end
-    # rubocop:enable Performance/FixedSize
 
     should "include symlinks in unsafe mode" do
       # no support for symlinks on Windows
@@ -111,10 +109,8 @@ class TestEntryFilter < JekyllUnitTest
       site = fixture_site("safe" => true, "include" => ["symlinked-file-outside-source"])
       site.reader.read_directories("symlink-test")
 
-      # rubocop:disable Performance/FixedSize
       assert_equal %w(main.scss symlinked-file).length, site.pages.length
       refute_includes site.static_files.map(&:name), "symlinked-file-outside-source"
-      # rubocop:enable Performance/FixedSize
     end
   end
 

From 06eafadcbbda82510c7b4f89fa168733145dbf76 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 24 Jun 2019 01:53:09 +0530
Subject: [PATCH 3667/4996] Use regexp to filter special entries (#7702)

Merge pull request 7702
---
 lib/jekyll/entry_filter.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb
index 8035877c3cf..4a238036ec9 100644
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -3,9 +3,7 @@
 module Jekyll
   class EntryFilter
     attr_reader :site
-    SPECIAL_LEADING_CHARACTERS = [
-      ".", "_", "#", "~",
-    ].freeze
+    SPECIAL_LEADING_CHAR_REGEX = %r!\A#{Regexp.union([".", "_", "#", "~"])}!o.freeze
 
     def initialize(site, base_directory = nil)
       @site = site
@@ -50,8 +48,8 @@ def included?(entry)
     end
 
     def special?(entry)
-      SPECIAL_LEADING_CHARACTERS.include?(entry[0..0]) ||
-        SPECIAL_LEADING_CHARACTERS.include?(File.basename(entry)[0..0])
+      SPECIAL_LEADING_CHAR_REGEX.match?(entry) ||
+        SPECIAL_LEADING_CHAR_REGEX.match?(File.basename(entry))
     end
 
     def backup?(entry)

From 9ccdae161b09e492a12353d23a5ad33fc64c3f65 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 23 Jun 2019 16:23:10 -0400
Subject: [PATCH 3668/4996] Update history to reflect merge of #7702 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 48e2e5b1af7..3e48771659f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -158,6 +158,7 @@
   * Do not install docs on updating gems on Travis (#7706)
   * Update TestTags in sync with Rouge v3.4 (#7709)
   * Bump RuboCop to v0.71.0 (#7687)
+  * Use regexp to filter special entries (#7702)
 
 ### Documentation
 

From 68a31c8eb29671184d3dd34a6d936e7057ff1f5f Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 24 Jun 2019 03:45:25 +0530
Subject: [PATCH 3669/4996] Don't read symlinks in site.include in safe mode
 (#7711)

Merge pull request 7711
---
 lib/jekyll/reader.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 18730ab3800..797e4291a1b 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -161,11 +161,14 @@ def post_reader
     end
 
     def read_included_excludes
+      entry_filter = EntryFilter.new(site)
+
       site.include.each do |entry|
         next if entry == ".htaccess"
 
         entry_path = site.in_source_dir(entry)
         next if File.directory?(entry_path)
+        next if entry_filter.symlink?(entry_path)
 
         read_included_file(entry_path) if File.file?(entry_path)
       end

From 25b274621b38696f7e66ca7e6f44fce57a6f0379 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 23 Jun 2019 18:15:27 -0400
Subject: [PATCH 3670/4996] Update history to reflect merge of #7711 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3e48771659f..a506445a2d5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -61,6 +61,7 @@
   * Revert memoizing Site#docs_to_write and #documents (#7684)
   * Backport #7684 for v3.8.x: Revert memoizing Site#docs_to_write and refactor #documents (#7689)
   * Backport #7213 and #7633 for v3.8.x: Fix broken include_relative usage in excerpt (#7690)
+  * Don't read symlinks in site.include in safe mode (#7711)
 
 ### Minor Enhancements
 

From e10a90987a382bbf94a4ed22f660457a0277ef4a Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 24 Jun 2019 23:16:28 +0530
Subject: [PATCH 3671/4996] Replace `String#=~` with `String#match?` (#7718)

Merge pull request 7718
---
 lib/jekyll/tags/include.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index d81dd8dee16..b43fe4532f2 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -54,7 +54,7 @@ def parse_params(context)
       end
 
       def validate_file_name(file)
-        if file =~ INVALID_SEQUENCES || file !~ VALID_FILENAME_CHARS
+        if file.match?(INVALID_SEQUENCES) || !file.match?(VALID_FILENAME_CHARS)
           raise ArgumentError, <<~MSG
             Invalid syntax for include tag. File contains invalid characters or sequences:
 
@@ -90,7 +90,7 @@ def file_read_opts(context)
 
       # Render the variable if required
       def render_variable(context)
-        Liquid::Template.parse(@file).render(context) if @file =~ VARIABLE_SYNTAX
+        Liquid::Template.parse(@file).render(context) if @file.match?(VARIABLE_SYNTAX)
       end
 
       def tag_includes_dirs(context)

From 7d340d933ac335bf4e25d95260873d0a89b99e1d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 24 Jun 2019 13:46:31 -0400
Subject: [PATCH 3672/4996] Update history to reflect merge of #7718 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a506445a2d5..209b96e7039 100644
--- a/History.markdown
+++ b/History.markdown
@@ -160,6 +160,7 @@
   * Update TestTags in sync with Rouge v3.4 (#7709)
   * Bump RuboCop to v0.71.0 (#7687)
   * Use regexp to filter special entries (#7702)
+  * Replace `String#=~` with `String#match?` (#7718)
 
 ### Documentation
 

From 27aa53cf823cdc3696f50eb4d469a7734a7a82f0 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 26 Jun 2019 02:32:04 +0530
Subject: [PATCH 3673/4996] Memoize SiteDrop#documents to reduce allocations
 (#7697)

Merge pull request 7697
---
 lib/jekyll/drops/site_drop.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb
index acebb98816f..a13f87f291c 100644
--- a/lib/jekyll/drops/site_drop.rb
+++ b/lib/jekyll/drops/site_drop.rb
@@ -8,7 +8,7 @@ class SiteDrop < Drop
       mutable false
 
       def_delegator  :@obj, :site_data, :data
-      def_delegators :@obj, :time, :pages, :static_files, :documents, :tags, :categories
+      def_delegators :@obj, :time, :pages, :static_files, :tags, :categories
 
       private def_delegator :@obj, :config, :fallback_data
 
@@ -38,6 +38,16 @@ def collections
         @site_collections ||= @obj.collections.values.sort_by(&:label).map(&:to_liquid)
       end
 
+      # `Site#documents` cannot be memoized so that `Site#docs_to_write` can access the
+      # latest state of the attribute.
+      #
+      # Since this method will be called after `Site#pre_render` hook, the `Site#documents`
+      # array shouldn't thereafter change and can therefore be safely memoized to prevent
+      # additional computation of `Site#documents`.
+      def documents
+        @documents ||= @obj.documents
+      end
+
       # `{{ site.related_posts }}` is how posts can get posts related to
       # them, either through LSI if it's enabled, or through the most
       # recent posts.

From 52374cf8be512f47a5d166db35439b1621121cc3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 25 Jun 2019 17:02:07 -0400
Subject: [PATCH 3674/4996] Update history to reflect merge of #7697 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 209b96e7039..50b4845bbf4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -105,6 +105,7 @@
   * Reduce allocations from Jekyll::Document instances (#7625)
   * Add `type` attribute to Document instances (#7406)
   * Reduce allocations from where-filter (#7653)
+  * Memoize SiteDrop#documents to reduce allocations (#7697)
 
 ### Development Fixes
 

From 62959527dd870691107739724c23b51ba03828f3 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 26 Jun 2019 11:33:47 +0530
Subject: [PATCH 3675/4996] Bump RuboCop to v0.72.x

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index acbbcd6ea67..1b93ae31332 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.71.0"
+  gem "rubocop", "~> 0.72.0"
   gem "rubocop-performance"
   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__)

From 45307215754b07279498e4f67b3e248ea632e153 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 27 Jun 2019 22:46:27 +0530
Subject: [PATCH 3676/4996] Replace `String#=~` with `String#match?` (#7723)

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

diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 2defd372997..71dc9de59fa 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -135,7 +135,7 @@ def parse_date(input, msg = "Input could not be parsed.")
     # Returns true if the YAML front matter is present.
     # rubocop: disable PredicateName
     def has_yaml_header?(file)
-      !!(File.open(file, "rb", &:readline) =~ %r!\A---\s*\r?\n!)
+      File.open(file, "rb", &:readline).match? %r!\A---\s*\r?\n!
     rescue EOFError
       false
     end

From c76996cd8efde8d624d09869be7b074f5bb2e5e3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 27 Jun 2019 13:16:29 -0400
Subject: [PATCH 3677/4996] Update history to reflect merge of #7723 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 50b4845bbf4..93a5ec6661f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -62,6 +62,7 @@
   * Backport #7684 for v3.8.x: Revert memoizing Site#docs_to_write and refactor #documents (#7689)
   * Backport #7213 and #7633 for v3.8.x: Fix broken include_relative usage in excerpt (#7690)
   * Don't read symlinks in site.include in safe mode (#7711)
+  * Replace `String#=~` with `String#match?` (#7723)
 
 ### Minor Enhancements
 

From c87f5fa7fae28f8dba90ee67336f73ca56ec99e6 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 28 Jun 2019 09:01:06 +0530
Subject: [PATCH 3678/4996] Normalize paths in reports from `memory_profiler`

---
 rake/profile.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rake/profile.rake b/rake/profile.rake
index d58c470ba23..d8c0f4ef023 100644
--- a/rake/profile.rake
+++ b/rake/profile.rake
@@ -39,7 +39,7 @@ namespace :profile do
     end
 
     if ENV["CI"]
-      report.pretty_print(scale_bytes: true, color_output: false)
+      report.pretty_print(scale_bytes: true, color_output: false, normalize_paths: true)
     else
       FileUtils.mkdir_p("tmp")
       report_file = File.join("tmp", args.file)
@@ -50,7 +50,7 @@ namespace :profile do
       Jekyll.logger.info "Total allocated: #{total_allocated_output} (#{report.total_allocated} objects)".cyan
       Jekyll.logger.info "Total retained:  #{total_retained_output} (#{report.total_retained} objects)".cyan
 
-      report.pretty_print(to_file: report_file, scale_bytes: true)
+      report.pretty_print(to_file: report_file, scale_bytes: true, normalize_paths: true)
       Jekyll.logger.info "\nDetailed Report saved into:", report_file.cyan
     end
   end

From 3e8e6d22d7b9d2ce0c0fe06f79e87b774382969c Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 28 Jun 2019 16:08:02 +0530
Subject: [PATCH 3679/4996] Remove patch to modify config for kramdown (#7699)

Merge pull request 7699
---
 .../converters/markdown/kramdown_parser.rb    |  8 -------
 test/test_kramdown.rb                         | 23 ++++---------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index 6b78a5b99f4..64bb1d1c8d2 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -34,7 +34,6 @@ def setup
           @config["syntax_highlighter_opts"]["guess_lang"] = @config["guess_lang"]
           @config["coderay"] ||= {} # XXX: Legacy.
           modernize_coderay_config
-          make_accessible
         end
 
         def convert(content)
@@ -64,13 +63,6 @@ def load_dependencies
           end
         end
 
-        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
-
         # config[kramdown][syntax_higlighter] >
         #   config[kramdown][enable_coderay] >
         #   config[highlighter]
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index fa333c957de..b4fc3b04505 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -22,6 +22,7 @@ class TestKramdown < JekyllUnitTest
             "css"        => :class,
             "css_class"  => "highlight",
             "formatter"  => ::Rouge::Formatters::HTMLLegacy,
+            "foobar"     => "lipsum",
           },
         },
       }
@@ -35,24 +36,10 @@ class TestKramdown < JekyllUnitTest
       Jekyll::Cache.clear
     end
 
-    should "fill symbolized keys into config for compatibility with kramdown" do
-      kramdown_config = @markdown.instance_variable_get(:@parser)
-        .instance_variable_get(:@config)
-
-      @kramdown_config_keys.each do |key|
-        assert kramdown_config.key?(key.to_sym),
-               "Expected #{kramdown_config} to include key #{key.to_sym.inspect}"
-      end
-
-      @syntax_highlighter_opts_config_keys.each do |key|
-        assert kramdown_config["syntax_highlighter_opts"].key?(key.to_sym),
-               "Expected #{kramdown_config["syntax_highlighter_opts"]} to include " \
-               "key #{key.to_sym.inspect}"
-      end
-
-      assert_equal kramdown_config["smart_quotes"], kramdown_config[:smart_quotes]
-      assert_equal kramdown_config["syntax_highlighter_opts"]["css"],
-                   kramdown_config[:syntax_highlighter_opts][:css]
+    should "not break kramdown" do
+      kramdown_doc = Kramdown::Document.new("# Some Header #", @config["kramdown"])
+      assert_equal :class, kramdown_doc.options[:syntax_highlighter_opts][:css]
+      assert_equal "lipsum", kramdown_doc.options[:syntax_highlighter_opts][:foobar]
     end
 
     should "run Kramdown" do

From 7dbe470dce3393b95d9da8f6c17ed2cee385f741 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 28 Jun 2019 06:38:04 -0400
Subject: [PATCH 3680/4996] Update history to reflect merge of #7699 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 93a5ec6661f..18218979854 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Always exclude certain paths from being processed (#7188)
   * Remove Jekyll::Utils#strip_heredoc in favor of a Ruby > 2.3 built in (#7584)
   * Incorporate `relative_url` within `post_url` tag (#7589)
+  * Remove patch to modify config for kramdown (#7699)
 
 ### Bug Fixes
 

From 8abd4950a20af17bb27c6f2013eee8dccd03aee9 Mon Sep 17 00:00:00 2001
From: Yi Feng Xie 
Date: Fri, 28 Jun 2019 18:45:09 +0800
Subject: [PATCH 3681/4996] Update resources.md (#7598)

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

diff --git a/docs/pages/resources.md b/docs/pages/resources.md
index 39f3aca86e7..2626970bf35 100644
--- a/docs/pages/resources.md
+++ b/docs/pages/resources.md
@@ -85,3 +85,4 @@ Use a SaaS service as a backend for functionality on your Jekyll site
 
 - A way to [extend Jekyll](https://github.com/rfelix/jekyll_ext) without forking and modifying the Jekyll gem codebase and some [portable Jekyll extensions](https://wiki.github.com/rfelix/jekyll_ext/extensions) that can be reused and shared.
 - [Using your Rails layouts in Jekyll](http://numbers.brighterplanet.com/2010/08/09/sharing-rails-views-with-jekyll)
+- [Jekpack](https://github.com/yfxie/jekpack/) an integration of Jekyll and Webpack to make them work together.

From 2265e82181a1d96da9910cad233b479fda2d5967 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 28 Jun 2019 06:45:11 -0400
Subject: [PATCH 3682/4996] Update history to reflect merge of #7598 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 18218979854..9938d532c4e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -288,6 +288,7 @@
   * Solve "GitHub Page build failure" in 10-deployment.md (#7648)
   * Fix typo from 'Github' to 'GitHub' (#7691)
   * fix link to Site Source config (#7708)
+  * Add Jekpack to resources page (#7598)
 
 ### Site Enhancements
 

From 24f1978412093332bebe24522aa5b6102bad6eae Mon Sep 17 00:00:00 2001
From: David Kennell 
Date: Fri, 28 Jun 2019 11:27:59 -0500
Subject: [PATCH 3683/4996] Introduce frontmatter in step 2 (#7704)

Merge pull request 7704
---
 docs/_docs/step-by-step/02-liquid.md | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/_docs/step-by-step/02-liquid.md b/docs/_docs/step-by-step/02-liquid.md
index 1c3ad02c614..5de70a2861c 100644
--- a/docs/_docs/step-by-step/02-liquid.md
+++ b/docs/_docs/step-by-step/02-liquid.md
@@ -66,9 +66,19 @@ Now it's your turn, change the Hello World! on your page to output as lowercase:
 ```  
 {% endraw %}
 
+To get our changes processed by Jekyll we need to add [front matter](03-front-matter/) to the top of the page:
+
+```markdown
+---
+# front matter tells Jekyll to process Liquid
+---
+```
+
+Our "Hello World!" will now be downcased on render.
+
 It may not seem like it now, but much of Jekyll's power comes from combining
-Liquid with other features. 
+Liquid with other features.
 
-In order to see the changes from `downcase` Liquid filter, we will need to add front matter. 
+In order to see the changes from `downcase` Liquid filter, we will need to add front matter.
 
 That's next. Let's keep going.

From 6435bd616763738e9961abcd9dae41cf8106388e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 28 Jun 2019 12:28:02 -0400
Subject: [PATCH 3684/4996] Update history to reflect merge of #7704 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9938d532c4e..092ce44decb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -289,6 +289,7 @@
   * Fix typo from 'Github' to 'GitHub' (#7691)
   * fix link to Site Source config (#7708)
   * Add Jekpack to resources page (#7598)
+  * Introduce frontmatter in step 2 (#7704)
 
 ### Site Enhancements
 

From ebe62e8a282c57b4408c29cf5081f709ac61a321 Mon Sep 17 00:00:00 2001
From: Edgar Tinajero 
Date: Mon, 1 Jul 2019 11:56:38 -0600
Subject: [PATCH 3685/4996] Update log output for an invalid theme directory
 (#7679)

Merge pull request 7679
---
 Gemfile                                           |  1 +
 features/theme.feature                            | 11 +++++++++++
 lib/jekyll/theme.rb                               | 15 +++++++++++++--
 .../test-theme-skinny/_layouts/default.html       | 11 +++++++++++
 .../fixtures/test-theme-skinny/_layouts/home.html |  5 +++++
 .../test-theme-skinny/test-theme-skinny.gemspec   | 11 +++++++++++
 6 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/test-theme-skinny/_layouts/default.html
 create mode 100644 test/fixtures/test-theme-skinny/_layouts/home.html
 create mode 100644 test/fixtures/test-theme-skinny/test-theme-skinny.gemspec

diff --git a/Gemfile b/Gemfile
index 1b93ae31332..df6d2f2718d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,6 +31,7 @@ group :test do
   gem "rubocop-performance"
   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__)
+  gem "test-theme-skinny", :path => File.expand_path("test/fixtures/test-theme-skinny", __dir__)
   gem "test-theme-symlink", :path => File.expand_path("test/fixtures/test-theme-symlink", __dir__)
 
   gem "jruby-openssl" if RUBY_ENGINE == "jruby"
diff --git a/features/theme.feature b/features/theme.feature
index 650c167577e..3941abc8d86 100644
--- a/features/theme.feature
+++ b/features/theme.feature
@@ -57,6 +57,17 @@ Feature: Writing themes
     And I should see "From your site." in "_site/assets/application.coffee"
     And I should see "From your site." in "_site/assets/base.js"
 
+  Scenario: A theme with *just* layouts
+    Given I have a configuration file with "theme" set to "test-theme-skinny"
+    And I have an "index.html" page with layout "home" that contains "The quick brown fox."
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Message: The quick brown fox." in "_site/index.html"
+    But I should not see "_includes" in the build output
+    And I should not see "_sass" in the build output
+    And I should not see "assets" in the build output
+
   Scenario: Requiring dependencies of a theme
     Given I have a configuration file with "theme" set to "test-dependency-theme"
     When I run jekyll build
diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb
index 3eb44157763..ac0330201ea 100644
--- a/lib/jekyll/theme.rb
+++ b/lib/jekyll/theme.rb
@@ -62,11 +62,22 @@ def realpath_for(folder)
       # escape the theme root.
       # However, symlinks are allowed to point to other directories within the theme.
       Jekyll.sanitized_path(root, File.realpath(Jekyll.sanitized_path(root, folder.to_s)))
-    rescue Errno::ENOENT, Errno::EACCES, Errno::ELOOP
-      Jekyll.logger.warn "Invalid theme folder:", folder
+    rescue Errno::ENOENT, Errno::EACCES, Errno::ELOOP => e
+      log_realpath_exception(e, folder)
       nil
     end
 
+    def log_realpath_exception(err, folder)
+      return if err.is_a?(Errno::ENOENT)
+
+      case err
+      when Errno::EACCES
+        Jekyll.logger.error "Theme error:", "Directory '#{folder}' is not accessible."
+      when Errno::ELOOP
+        Jekyll.logger.error "Theme error:", "Directory '#{folder}' includes a symbolic link loop."
+      end
+    end
+
     def gemspec
       @gemspec ||= Gem::Specification.find_by_name(name)
     rescue Gem::LoadError
diff --git a/test/fixtures/test-theme-skinny/_layouts/default.html b/test/fixtures/test-theme-skinny/_layouts/default.html
new file mode 100644
index 00000000000..837a4dc7696
--- /dev/null
+++ b/test/fixtures/test-theme-skinny/_layouts/default.html
@@ -0,0 +1,11 @@
+
+
+
+  
+  Skinny
+
+
+  
    Hello World
    
+  {{ content }}
+
+
diff --git a/test/fixtures/test-theme-skinny/_layouts/home.html b/test/fixtures/test-theme-skinny/_layouts/home.html
new file mode 100644
index 00000000000..6d9ce5c7ef1
--- /dev/null
+++ b/test/fixtures/test-theme-skinny/_layouts/home.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+Message: {{ content }}
diff --git a/test/fixtures/test-theme-skinny/test-theme-skinny.gemspec b/test/fixtures/test-theme-skinny/test-theme-skinny.gemspec
new file mode 100644
index 00000000000..84f59b9d709
--- /dev/null
+++ b/test/fixtures/test-theme-skinny/test-theme-skinny.gemspec
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+Gem::Specification.new do |s|
+  s.name     = "test-theme-skinny"
+  s.version  = "0.1.0"
+  s.licenses = ["MIT"]
+  s.summary  = "This is a theme with just layouts used to test Jekyll"
+  s.authors  = ["Jekyll"]
+  s.files    = ["lib/example.rb"]
+  s.homepage = "https://github.com/jekyll/jekyll"
+end

From ed8681b1e735fe8983709ce482798eb4d6ea3e9d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 1 Jul 2019 13:56:41 -0400
Subject: [PATCH 3686/4996] Update history to reflect merge of #7679 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 092ce44decb..7b16dfa75f3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -64,6 +64,7 @@
   * Backport #7213 and #7633 for v3.8.x: Fix broken include_relative usage in excerpt (#7690)
   * Don't read symlinks in site.include in safe mode (#7711)
   * Replace `String#=~` with `String#match?` (#7723)
+  * Update log output for an invalid theme directory (#7679)
 
 ### Minor Enhancements
 

From 03b500b7b7aebfe41afda7f51384758c61a94f74 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Tue, 2 Jul 2019 23:54:02 +0530
Subject: [PATCH 3687/4996] Move updates from generated file to source file

#7464 and #7671 erroneously made changes to the auto-generated document
`docs/_docs/contributing.md` instead of the source file
`.github/CONTRIBUTING.markdown`
---
 .github/CONTRIBUTING.markdown | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/CONTRIBUTING.markdown b/.github/CONTRIBUTING.markdown
index 7283ca881e6..fc1b9852a81 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](https://jekyllrb.com/docs/support/)
+See the [support guidelines](https://jekyllrb.com/docs/support/)
 
 ## Ways to contribute
 
@@ -12,9 +12,9 @@ Whether you're a developer, a designer, or just a Jekyll devotee, there are lots
 
 * [Install Jekyll on your computer](https://jekyllrb.com/docs/installation/) and kick the tires. Does it work? Does it do what you'd expect? If not, [open an issue](https://github.com/jekyll/jekyll/issues/new) and let us know.
 * Comment on some of the project's [open issues](https://github.com/jekyll/jekyll/issues). Have you experienced the same problem? Know a work around? Do you have a suggestion for how the feature could be better?
-* Read through [the documentation](https://jekyllrb.com/docs/home/), and click the "improve this page" button, any time you see something confusing, or have a suggestion for something that could be improved.
-* Browse through [the Jekyll discussion forum](https://talk.jekyllrb.com/), and lend a hand answering questions. There's a good chance you've already experienced what another user is experiencing.
-* Find [an open issue](https://github.com/jekyll/jekyll/issues) (especially [those labeled `help-wanted`](https://github.com/jekyll/jekyll/issues?q=is%3Aopen+is%3Aissue+label%3Ahelp-wanted)), and submit a proposed fix. If it's your first pull request, we promise we won't bite, and are glad to answer any questions.
+* Read through the [documentation](https://jekyllrb.com/docs/home/), and click the "improve this page" button, any time you see something confusing, or have a suggestion for something that could be improved.
+* Browse through the [Jekyll discussion forum](https://talk.jekyllrb.com/), and lend a hand answering questions. There's a good chance you've already experienced what another user is experiencing.
+* Find an [open issue](https://github.com/jekyll/jekyll/issues) (especially [those labeled `help-wanted`](https://github.com/jekyll/jekyll/issues?q=is%3Aopen+is%3Aissue+label%3Ahelp-wanted)), and submit a proposed fix. If it's your first pull request, we promise we won't bite, and are glad to answer any questions.
 * Help evaluate [open pull requests](https://github.com/jekyll/jekyll/pulls), by testing the changes locally and reviewing what's proposed.
 
 ## Submitting a pull request
@@ -49,7 +49,7 @@ That's it! You'll be automatically subscribed to receive updates as others revie
 2. Clone the repository locally `git clone https://github.com//jekyll`.
 3. Create a new, descriptively named branch to contain your change ( `git checkout -b my-awesome-feature` ).
 4. Hack away, add tests. Not necessarily in that order.
-5. Make sure everything still passes by running `script/cibuild` (see [the tests section](#running-tests-locally) below)
+5. Make sure everything still passes by running `script/cibuild` (see the [tests section](#running-tests-locally) below)
 6. Push the branch up ( `git push origin my-awesome-feature` ).
 7. Create a pull request by visiting `https://github.com//jekyll` and following the instructions at the top of the screen.
 
@@ -89,7 +89,7 @@ If you want to add your plugin to the [list of plugins](https://jekyllrb.com/doc
 
 ## Code Contributions
 
-Interesting in submitting a pull request? Awesome. Read on. There's a few common gotchas that we'd love to help you avoid.
+Interested in submitting a pull request? Awesome. Read on. There's a few common gotchas that we'd love to help you avoid.
 
 ### Tests and documentation
 

From 5b195ffe749e3620ba00e6e4d811c5c05432ae54 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 3 Jul 2019 00:14:23 +0530
Subject: [PATCH 3688/4996] Generate a new site to reflect unreleased changes

---
 docs/_docs/contributing.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index e709fcaeab7..93f1674cd45 100644
--- a/docs/_docs/contributing.md
+++ b/docs/_docs/contributing.md
@@ -119,6 +119,8 @@ If your contribution changes any Jekyll behavior, make sure to update the docume
 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)
 
+* Previously, we've used the WIP Probot app to help contributors determine whether their pull request is ready for review. Please use a [draft pull request](https://help.github.com/en/articles/about-pull-requests#draft-pull-requests) instead. When you're ready, [mark the pull request as ready for review](https://help.github.com/en/articles/changing-the-stage-of-a-pull-request)
+
 ## Running tests locally
 
 ### Test Dependencies

From e318d1c836024a94234241cc910b5eb78e2fed23 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 2 Jul 2019 11:27:02 -0400
Subject: [PATCH 3689/4996] Create 3.8.6 release notes

---
 History.markdown                              |  2 +-
 docs/_docs/history.md                         | 19 +++++++++++++++++++
 .../2019-07-02-jekyll-3-8-6-released.markdown | 19 +++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 docs/_posts/2019-07-02-jekyll-3-8-6-released.markdown

diff --git a/History.markdown b/History.markdown
index 7b16dfa75f3..603cc7e8b1c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,4 +1,4 @@
-## HEAD
+## 3.8.6 / 2018-07-03
 
 ### Major Enhancements
 
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 8d646bfe3fd..062505718c3 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,25 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.8.6 / 2018-07-03
+{: #v3-8-6}
+
+### Bug Fixes
+{: #bug-fixes-v3-8-6}
+
+- Update log output for an invalid theme directory ([#7734]({{ site.repository }}/issues/7734))
+- Memoize `SiteDrop#documents` to reduce allocations ([#7722]({{ site.repository }}/issues/7722))
+- Excerpt handling of custom and intermediate tags ([#7467]({{ site.repository }}/issues/7467))
+- Escape valid special chars in a site's path name ([#7573]({{ site.repository }}/issues/7573))
+- Revert memoizing `Site#docs_to_write` and refactor `#documents` ([#7689]({{ site.repository }}/issues/7689))
+- Fix broken `include_relative` usage in excerpt ([#7690]({{ site.repository }}/issues/7690))
+
+### Security Fixes
+{: #security-fixes-v3-8-6}
+
+- Theme gems: ensure directories aren't symlinks ([#7424]({{ site.repository }}/issues/7424))
+
+
 ## 3.8.5 / 2018-11-04
 {: #v3-8-5}
 
diff --git a/docs/_posts/2019-07-02-jekyll-3-8-6-released.markdown b/docs/_posts/2019-07-02-jekyll-3-8-6-released.markdown
new file mode 100644
index 00000000000..f05cd7cd981
--- /dev/null
+++ b/docs/_posts/2019-07-02-jekyll-3-8-6-released.markdown
@@ -0,0 +1,19 @@
+---
+title: 'Jekyll 3.8.6 Released'
+date: 2019-07-02 11:21:02 -0400
+author: parkr
+version: 3.8.6
+categories: [release]
+---
+
+We have another patch release in the 3.8 series! This time, we have one security patch
+and a handful of bug patches, including:
+
+- Filter symlinks from theme gems
+- Fix excerpt handling of some Liquid tags
+- Handle case where a theme directory doesn't exist
+- A few internal optimizations to reduce memory overhead
+
+... and a few more! You can check out the patches and see all the details in [the release notes](/docs/history/#v3-8-6)
+
+Happy Jekylling!

From fcb8a1ecd3130beb870769291f8d0f4adab3c9d9 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 2 Jul 2019 12:06:27 -0400
Subject: [PATCH 3690/4996] Update contributing documentation on the website

---
 docs/_docs/contributing.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index 93f1674cd45..91fb42cc1de 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](https://jekyllrb.com/docs/support/)
+See [the support guidelines](https://jekyllrb.com/docs/support/)
 
 ## Ways to contribute
 
@@ -16,9 +16,9 @@ Whether you're a developer, a designer, or just a Jekyll devotee, there are lots
 
 * [Install Jekyll on your computer](https://jekyllrb.com/docs/installation/) and kick the tires. Does it work? Does it do what you'd expect? If not, [open an issue](https://github.com/jekyll/jekyll/issues/new) and let us know.
 * Comment on some of the project's [open issues](https://github.com/jekyll/jekyll/issues). Have you experienced the same problem? Know a work around? Do you have a suggestion for how the feature could be better?
-* Read through the [documentation](https://jekyllrb.com/docs/home/), and click the "improve this page" button, any time you see something confusing, or have a suggestion for something that could be improved.
-* Browse through the [Jekyll discussion forum](https://talk.jekyllrb.com/), and lend a hand answering questions. There's a good chance you've already experienced what another user is experiencing.
-* Find an [open issue](https://github.com/jekyll/jekyll/issues) (especially [those labeled `help-wanted`](https://github.com/jekyll/jekyll/issues?q=is%3Aopen+is%3Aissue+label%3Ahelp-wanted)), and submit a proposed fix. If it's your first pull request, we promise we won't bite, and are glad to answer any questions.
+* Read through [the documentation](https://jekyllrb.com/docs/home/), and click the "improve this page" button, any time you see something confusing, or have a suggestion for something that could be improved.
+* Browse through [the Jekyll discussion forum](https://talk.jekyllrb.com/), and lend a hand answering questions. There's a good chance you've already experienced what another user is experiencing.
+* Find [an open issue](https://github.com/jekyll/jekyll/issues) (especially [those labeled `help-wanted`](https://github.com/jekyll/jekyll/issues?q=is%3Aopen+is%3Aissue+label%3Ahelp-wanted)), and submit a proposed fix. If it's your first pull request, we promise we won't bite, and are glad to answer any questions.
 * Help evaluate [open pull requests](https://github.com/jekyll/jekyll/pulls), by testing the changes locally and reviewing what's proposed.
 
 ## Submitting a pull request
@@ -53,7 +53,7 @@ That's it! You'll be automatically subscribed to receive updates as others revie
 2. Clone the repository locally `git clone https://github.com//jekyll`.
 3. Create a new, descriptively named branch to contain your change ( `git checkout -b my-awesome-feature` ).
 4. Hack away, add tests. Not necessarily in that order.
-5. Make sure everything still passes by running `script/cibuild` (see the [tests section](#running-tests-locally) below)
+5. Make sure everything still passes by running `script/cibuild` (see [the tests section](#running-tests-locally) below)
 6. Push the branch up ( `git push origin my-awesome-feature` ).
 7. Create a pull request by visiting `https://github.com//jekyll` and following the instructions at the top of the screen.
 
@@ -93,7 +93,7 @@ If you want to add your plugin to the [list of plugins](https://jekyllrb.com/doc
 
 ## Code Contributions
 
-Interested in submitting a pull request? Awesome. Read on. There's a few common gotchas that we'd love to help you avoid.
+Interesting in submitting a pull request? Awesome. Read on. There's a few common gotchas that we'd love to help you avoid.
 
 ### Tests and documentation
 

From b7e3f10a08d5701cd0d9f16eef38137bcaea809d Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 2 Jul 2019 12:06:59 -0400
Subject: [PATCH 3691/4996] Move 3.8.6 documentation to the correct location in
 the History.markdown

---
 History.markdown | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/History.markdown b/History.markdown
index 603cc7e8b1c..f0e5badc9ee 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,4 +1,4 @@
-## 3.8.6 / 2018-07-03
+## HEAD
 
 ### Major Enhancements
 
@@ -305,6 +305,21 @@
 
   * Release v4.0.0.pre.alpha1 (#7574)
 
+## 3.8.6 / 2018-07-03
+
+### Bug Fixes
+
+  * Update log output for an invalid theme directory (#7734)
+  * Memoize `SiteDrop#documents` to reduce allocations (#7722)
+  * Excerpt handling of custom and intermediate tags (#7467)
+  * Escape valid special chars in a site's path name (#7573)
+  * Revert memoizing `Site#docs_to_write` and refactor `#documents` (#7689)
+  * Fix broken `include_relative` usage in excerpt (#7690)
+
+### Security Fixes
+
+  * Theme gems: ensure directories aren't symlinks (#7424)
+
 ## 3.8.5 / 2018-11-04
 
 ### Bug Fixes

From 7c34db39912bc9d7abb0f0c2e9a0dd0048dd6b88 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 2 Jul 2019 18:17:17 +0200
Subject: [PATCH 3692/4996] Fix date

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

diff --git a/History.markdown b/History.markdown
index f0e5badc9ee..143be635584 100644
--- a/History.markdown
+++ b/History.markdown
@@ -305,7 +305,7 @@
 
   * Release v4.0.0.pre.alpha1 (#7574)
 
-## 3.8.6 / 2018-07-03
+## 3.8.6 / 2019-07-02
 
 ### Bug Fixes
 

From f42e0e7169ad7f485b47d05c790e5c4a5991feef Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 2 Jul 2019 13:54:15 -0400
Subject: [PATCH 3693/4996] Regenerate the History file bassed on our new date

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

diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 062505718c3..de6a93bb8a4 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,7 +4,7 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
-## 3.8.6 / 2018-07-03
+## 3.8.6 / 2019-07-02
 {: #v3-8-6}
 
 ### Bug Fixes

From 5bc21d82f6c4aec5f0c4aaefbb5fb0d2cf258890 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 2 Jul 2019 21:29:07 +0200
Subject: [PATCH 3694/4996] Regenerate Contributing

---
 docs/_docs/contributing.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index 91fb42cc1de..93f1674cd45 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](https://jekyllrb.com/docs/support/)
+See the [support guidelines](https://jekyllrb.com/docs/support/)
 
 ## Ways to contribute
 
@@ -16,9 +16,9 @@ Whether you're a developer, a designer, or just a Jekyll devotee, there are lots
 
 * [Install Jekyll on your computer](https://jekyllrb.com/docs/installation/) and kick the tires. Does it work? Does it do what you'd expect? If not, [open an issue](https://github.com/jekyll/jekyll/issues/new) and let us know.
 * Comment on some of the project's [open issues](https://github.com/jekyll/jekyll/issues). Have you experienced the same problem? Know a work around? Do you have a suggestion for how the feature could be better?
-* Read through [the documentation](https://jekyllrb.com/docs/home/), and click the "improve this page" button, any time you see something confusing, or have a suggestion for something that could be improved.
-* Browse through [the Jekyll discussion forum](https://talk.jekyllrb.com/), and lend a hand answering questions. There's a good chance you've already experienced what another user is experiencing.
-* Find [an open issue](https://github.com/jekyll/jekyll/issues) (especially [those labeled `help-wanted`](https://github.com/jekyll/jekyll/issues?q=is%3Aopen+is%3Aissue+label%3Ahelp-wanted)), and submit a proposed fix. If it's your first pull request, we promise we won't bite, and are glad to answer any questions.
+* Read through the [documentation](https://jekyllrb.com/docs/home/), and click the "improve this page" button, any time you see something confusing, or have a suggestion for something that could be improved.
+* Browse through the [Jekyll discussion forum](https://talk.jekyllrb.com/), and lend a hand answering questions. There's a good chance you've already experienced what another user is experiencing.
+* Find an [open issue](https://github.com/jekyll/jekyll/issues) (especially [those labeled `help-wanted`](https://github.com/jekyll/jekyll/issues?q=is%3Aopen+is%3Aissue+label%3Ahelp-wanted)), and submit a proposed fix. If it's your first pull request, we promise we won't bite, and are glad to answer any questions.
 * Help evaluate [open pull requests](https://github.com/jekyll/jekyll/pulls), by testing the changes locally and reviewing what's proposed.
 
 ## Submitting a pull request
@@ -53,7 +53,7 @@ That's it! You'll be automatically subscribed to receive updates as others revie
 2. Clone the repository locally `git clone https://github.com//jekyll`.
 3. Create a new, descriptively named branch to contain your change ( `git checkout -b my-awesome-feature` ).
 4. Hack away, add tests. Not necessarily in that order.
-5. Make sure everything still passes by running `script/cibuild` (see [the tests section](#running-tests-locally) below)
+5. Make sure everything still passes by running `script/cibuild` (see the [tests section](#running-tests-locally) below)
 6. Push the branch up ( `git push origin my-awesome-feature` ).
 7. Create a pull request by visiting `https://github.com//jekyll` and following the instructions at the top of the screen.
 
@@ -93,7 +93,7 @@ If you want to add your plugin to the [list of plugins](https://jekyllrb.com/doc
 
 ## Code Contributions
 
-Interesting in submitting a pull request? Awesome. Read on. There's a few common gotchas that we'd love to help you avoid.
+Interested in submitting a pull request? Awesome. Read on. There's a few common gotchas that we'd love to help you avoid.
 
 ### Tests and documentation
 

From fea0b69d398f6934ad67bbbac84281ddadfab4d7 Mon Sep 17 00:00:00 2001
From: Parker Moore 
Date: Tue, 2 Jul 2019 16:51:40 -0400
Subject: [PATCH 3695/4996] 3.8.6: add release note for 3c06609406

---
 History.markdown      | 1 +
 docs/_docs/history.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/History.markdown b/History.markdown
index 143be635584..f9f337c5e60 100644
--- a/History.markdown
+++ b/History.markdown
@@ -315,6 +315,7 @@
   * Escape valid special chars in a site's path name (#7573)
   * Revert memoizing `Site#docs_to_write` and refactor `#documents` (#7689)
   * Fix broken `include_relative` usage in excerpt (#7690)
+  * Install platform-specific gems as required (3c06609406)
 
 ### Security Fixes
 
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index de6a93bb8a4..5756d65f560 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -16,6 +16,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Escape valid special chars in a site's path name ([#7573]({{ site.repository }}/issues/7573))
 - Revert memoizing `Site#docs_to_write` and refactor `#documents` ([#7689]({{ site.repository }}/issues/7689))
 - Fix broken `include_relative` usage in excerpt ([#7690]({{ site.repository }}/issues/7690))
+- Install platform-specific gems as required (3c06609406)
 
 ### Security Fixes
 {: #security-fixes-v3-8-6}

From 77b6033f2fa15b0d89af40ac7b21059ba3f350b8 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 10 Jul 2019 16:15:59 +0530
Subject: [PATCH 3696/4996] Update Jekyll version in docs header

---
 docs/_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index 9abf560087e..0c7a2b1b6d7 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,5 +1,5 @@
 ---
-version: 3.8.5
+version: 3.8.6
 min_ruby_version: 2.4.0
 name: Jekyll • Simple, blog-aware, static sites
 description: Transform your plain text into static websites and blogs

From 135ebe26604e697fa8766deec8fb672e592e405b Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 12 Jul 2019 20:14:45 +0530
Subject: [PATCH 3697/4996] Reduce Array objects generated from utility method
 (#7749)

Merge pull request 7749
---
 lib/jekyll/utils.rb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 71dc9de59fa..8aea4ac258b 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -68,11 +68,14 @@ def duplicable?(obj)
     #
     # Returns an array
     def pluralized_array_from_hash(hash, singular_key, plural_key)
-      [].tap do |array|
-        value = value_from_singular_key(hash, singular_key)
-        value ||= value_from_plural_key(hash, plural_key)
-        array << value
-      end.flatten.compact
+      array = []
+      value = value_from_singular_key(hash, singular_key)
+      value ||= value_from_plural_key(hash, plural_key)
+
+      array << value
+      array.flatten!
+      array.compact!
+      array
     end
 
     def value_from_singular_key(hash, key)

From 4c9cbad6775749ccf4f16be8dab5eb054d182c55 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 12 Jul 2019 10:44:47 -0400
Subject: [PATCH 3698/4996] Update history to reflect merge of #7749 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f9f337c5e60..98b50b76da8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -165,6 +165,7 @@
   * Bump RuboCop to v0.71.0 (#7687)
   * Use regexp to filter special entries (#7702)
   * Replace `String#=~` with `String#match?` (#7718)
+  * Reduce Array objects generated from utility method (#7749)
 
 ### Documentation
 

From ffe8d168f250ed52f27657f4001e4500227b7c1f Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 14 Jul 2019 12:33:46 +0530
Subject: [PATCH 3699/4996] Prefer Regexp#match? over String#match?

This commit fixes a minor regression introduced in the commit e10a909

Prefer using `Regexp#match` because `@file` or `file` in these lines
could be `nil` if the `tag_markup` is just whitespace. In that scenario,
Jekyll should proceed to the validation logic and bail instead of raising
a `NoMethodError` exception.
---
 History.markdown           | 1 -
 lib/jekyll/tags/include.rb | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/History.markdown b/History.markdown
index 98b50b76da8..d7af2ccc7cc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -164,7 +164,6 @@
   * Update TestTags in sync with Rouge v3.4 (#7709)
   * Bump RuboCop to v0.71.0 (#7687)
   * Use regexp to filter special entries (#7702)
-  * Replace `String#=~` with `String#match?` (#7718)
   * Reduce Array objects generated from utility method (#7749)
 
 ### Documentation
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index b43fe4532f2..20a41bb779c 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -54,7 +54,7 @@ def parse_params(context)
       end
 
       def validate_file_name(file)
-        if file.match?(INVALID_SEQUENCES) || !file.match?(VALID_FILENAME_CHARS)
+        if INVALID_SEQUENCES.match?(file) || !VALID_FILENAME_CHARS.match?(file)
           raise ArgumentError, <<~MSG
             Invalid syntax for include tag. File contains invalid characters or sequences:
 
@@ -90,7 +90,7 @@ def file_read_opts(context)
 
       # Render the variable if required
       def render_variable(context)
-        Liquid::Template.parse(@file).render(context) if @file.match?(VARIABLE_SYNTAX)
+        Liquid::Template.parse(@file).render(context) if VARIABLE_SYNTAX.match?(@file)
       end
 
       def tag_includes_dirs(context)

From 854e83230ec94384e876f3c5c6be104b45c92274 Mon Sep 17 00:00:00 2001
From: Chris Oliver 
Date: Mon, 15 Jul 2019 10:38:53 -0500
Subject: [PATCH 3700/4996] Add recursive navigation tutorial (#7720)

Merge pull request 7720
---
 docs/_tutorials/navigation.md | 62 +++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/docs/_tutorials/navigation.md b/docs/_tutorials/navigation.md
index 87368b0fee3..bcb9fe152a5 100644
--- a/docs/_tutorials/navigation.md
+++ b/docs/_tutorials/navigation.md
@@ -605,3 +605,65 @@ The `for item in items` loop looks through each `item` and gets the `title` and
 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.
+
+## Scenario 9: Nested tree navigation with recursion
+
+Suppose you want a nested tree navigation of any depth. We can achieve this by recursively looping through our tree of navigation links.
+
+**YAML**
+
+```yaml
+nav:
+  - title: Deployment
+    url: deployment.html
+    subnav:
+      - title: Heroku
+        url: heroku.html
+        subnav:
+          - title: Jekyll on Heroku
+            url: jekyll-on-heroku.html
+  - title: Help
+    url: help.html
+```
+
+**Liquid**
+
+First, we'll create an include that we can use for rendering the navigation tree. This file would be `_includes/nav.html`
+
+{% raw %}
+```liquid
+
      
+  {% for item in include.nav %}
+    
    • {{ item.title }}
      • 
+
+    {% if item.subnav %}
+      {% include nav.html nav=item.subnav %}
+    {% endif %}
+  {% endfor %}
+
    
+```
+{% endraw %}
+
+To render this in your layout or pages, you would simply include the template and pass in the `nav` parameter. In this case, we'll use the `page.nav` to grab it from the yaml frontmatter.
+
+{% raw %}
+```liquid
+{% include nav.html nav=page.nav %}
+```
+{% endraw %}
+
+Our include will use this first, then look through each item for a `subnav` property to recursively render the nested lists.
+
+**Result**
+
    
+   
+
    

From 7096885e98a72a3ed8cbe4c2c666d0f490211ea9 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 15 Jul 2019 11:38:55 -0400
Subject: [PATCH 3701/4996] Update history to reflect merge of #7720 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d7af2ccc7cc..158b7d23a37 100644
--- a/History.markdown
+++ b/History.markdown
@@ -291,6 +291,7 @@
   * fix link to Site Source config (#7708)
   * Add Jekpack to resources page (#7598)
   * Introduce frontmatter in step 2 (#7704)
+  * Add recursive navigation tutorial (#7720)
 
 ### Site Enhancements
 

From 8d5b5fa4dc839519ed0b5c2203e6b7925a6b0caa Mon Sep 17 00:00:00 2001
From: strangehill 
Date: Thu, 18 Jul 2019 17:13:59 +0800
Subject: [PATCH 3702/4996] Update .gitignore snippet in tutorial (#7748)

---
 docs/_tutorials/using-jekyll-with-bundler.md | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/_tutorials/using-jekyll-with-bundler.md b/docs/_tutorials/using-jekyll-with-bundler.md
index 3aa34bbb0c6..0acbad289fe 100644
--- a/docs/_tutorials/using-jekyll-with-bundler.md
+++ b/docs/_tutorials/using-jekyll-with-bundler.md
@@ -95,12 +95,14 @@ in. You can use this `.gitignore` to get started, if you want.
 **.gitignore**
 
 ```
-# Ignore folders generated by Bundler
-vendor
-.bundle
+# Ignore metadata generated by Jekyll
+_site/
+.sass-cache/
+.jekyll-cache/
+.jekyll-metadata
 
-# Ignore folders generated by Jekyll
-.sass-cache
-_site
+# Ignore folders generated by Bundler
+.bundle/
+vendor/
 ```
 

From 5157bdc753d7f761e77ce15fe3cf626305639626 Mon Sep 17 00:00:00 2001
From: Andrew Marcuse 
Date: Sat, 20 Jul 2019 11:36:32 -0400
Subject: [PATCH 3703/4996] Update mime.types (#7756)

Merge pull request 7756
---
 lib/jekyll/mime.types | 64 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 53 insertions(+), 11 deletions(-)

diff --git a/lib/jekyll/mime.types b/lib/jekyll/mime.types
index af68d359e11..3fb0529680e 100644
--- a/lib/jekyll/mime.types
+++ b/lib/jekyll/mime.types
@@ -19,18 +19,17 @@ application/davmount+xml                                                  davmou
 application/docbook+xml                                                   dbk
 application/dssc+der                                                      dssc
 application/dssc+xml                                                      xdssc
-application/ecmascript                                                    ecma
+application/ecmascript                                                    ecma es
 application/emma+xml                                                      emma
 application/epub+zip                                                      epub
 application/exi                                                           exi
 application/font-tdpfr                                                    pfr
-application/font-woff                                                     woff
-application/font-woff2                                                    woff2
 application/geo+json                                                      geojson
 application/gml+xml                                                       gml
 application/gpx+xml                                                       gpx
 application/gxf                                                           gxf
 application/gzip                                                          gz
+application/hjson                                                         hjson
 application/hyperstudio                                                   stk
 application/inkml+xml                                                     ink inkml
 application/ipfix                                                         ipfix
@@ -61,6 +60,8 @@ application/mp21                                                          m21 mp
 application/mp4                                                           mp4s m4p
 application/msword                                                        doc dot
 application/mxf                                                           mxf
+application/n-quads                                                       nq
+application/n-triples                                                     nt
 application/octet-stream                                                  bin dms lrf mar so dist distz pkg bpk dump elc deploy exe dll deb dmg iso img msi msp msm buffer
 application/oda                                                           oda
 application/oebps-package+xml                                             opf
@@ -86,7 +87,8 @@ application/pls+xml                                                       pls
 application/postscript                                                    ai eps ps
 application/prs.cww                                                       cww
 application/pskc+xml                                                      pskcxml
-application/rdf+xml                                                       rdf
+application/raml+yaml                                                     raml
+application/rdf+xml                                                       rdf owl
 application/reginfo+xml                                                   rif
 application/relax-ng-compact-syntax                                       rnc
 application/resource-lists+xml                                            rl
@@ -107,6 +109,7 @@ application/sdp                                                           sdp
 application/set-payment-initiation                                        setpay
 application/set-registration-initiation                                   setreg
 application/shf+xml                                                       shf
+application/sieve                                                         siv sieve
 application/smil+xml                                                      smi smil
 application/sparql-query                                                  rq
 application/sparql-results+xml                                            srx
@@ -143,7 +146,10 @@ application/vnd.anser-web-certificate-issue-initiation                    cii
 application/vnd.anser-web-funds-transfer-initiation                       fti
 application/vnd.antix.game-component                                      atx
 application/vnd.apple.installer+xml                                       mpkg
+application/vnd.apple.keynote                                             keynote
 application/vnd.apple.mpegurl                                             m3u8
+application/vnd.apple.numbers                                             numbers
+application/vnd.apple.pages                                               pages
 application/vnd.apple.pkpass                                              pkpass
 application/vnd.aristanetworks.swi                                        swi
 application/vnd.astraea-software.iota                                     iota
@@ -154,6 +160,7 @@ application/vnd.businessobjects                                           rep
 application/vnd.chemdraw+xml                                              cdxml
 application/vnd.chipnuts.karaoke-mmd                                      mmd
 application/vnd.cinderella                                                cdy
+application/vnd.citationstyles.style+xml                                  csl
 application/vnd.claymore                                                  cla
 application/vnd.cloanto.rp9                                               rp9
 application/vnd.clonk.c4group                                             c4g c4d c4f c4p c4u
@@ -482,6 +489,7 @@ application/vnd.yellowriver-custom-menu                                   cmp
 application/vnd.zul                                                       zir zirz
 application/vnd.zzazz.deck+xml                                            zaz
 application/voicexml+xml                                                  vxml
+application/wasm                                                          wasm
 application/widget                                                        wgt
 application/winhlp                                                        hlp
 application/wsdl+xml                                                      wsdl
@@ -521,10 +529,8 @@ application/x-eva                                                         eva
 application/x-font-bdf                                                    bdf
 application/x-font-ghostscript                                            gsf
 application/x-font-linux-psf                                              psf
-application/x-font-otf                                                    otf
 application/x-font-pcf                                                    pcf
 application/x-font-snf                                                    snf
-application/x-font-ttf                                                    ttf ttc
 application/x-font-type1                                                  pfa pfb pfm afm
 application/x-freearc                                                     arc
 application/x-futuresplash                                                spl
@@ -661,20 +667,41 @@ chemical/x-cmdf                                                           cmdf
 chemical/x-cml                                                            cml
 chemical/x-csml                                                           csml
 chemical/x-xyz                                                            xyz
+font/collection                                                           ttc
+font/otf                                                                  otf
+font/ttf                                                                  ttf
+font/woff                                                                 woff
+font/woff2                                                                woff2
+image/aces                                                                exr
 image/apng                                                                apng
 image/bmp                                                                 bmp
 image/cgm                                                                 cgm
+image/dicom-rle                                                           drle
+image/fits                                                                fits
 image/g3fax                                                               g3
 image/gif                                                                 gif
+image/heic                                                                heic
+image/heic-sequence                                                       heics
+image/heif                                                                heif
+image/heif-sequence                                                       heifs
 image/ief                                                                 ief
+image/jls                                                                 jls
+image/jp2                                                                 jp2 jpg2
 image/jpeg                                                                jpeg jpg jpe
+image/jpm                                                                 jpm
+image/jpx                                                                 jpx jpf
+image/jxr                                                                 jxr
 image/ktx                                                                 ktx
 image/png                                                                 png
 image/prs.btif                                                            btif
+image/prs.pti                                                             pti
 image/sgi                                                                 sgi
 image/svg+xml                                                             svg svgz
-image/tiff                                                                tiff tif
+image/t38                                                                 t38
+image/tiff                                                                tif tiff
+image/tiff-fx                                                             tfx
 image/vnd.adobe.photoshop                                                 psd
+image/vnd.airzip.accelerator.azv                                          azv
 image/vnd.dece.graphic                                                    uvi uvvi uvg uvvg
 image/vnd.djvu                                                            djvu djv
 image/vnd.dvb.subtitle                                                    sub
@@ -685,20 +712,22 @@ image/vnd.fpx                                                             fpx
 image/vnd.fst                                                             fst
 image/vnd.fujixerox.edmics-mmr                                            mmr
 image/vnd.fujixerox.edmics-rlc                                            rlc
+image/vnd.microsoft.icon                                                  ico
 image/vnd.ms-modi                                                         mdi
 image/vnd.ms-photo                                                        wdp
 image/vnd.net-fpx                                                         npx
+image/vnd.tencent.tap                                                     tap
+image/vnd.valve.source.texture                                            vtf
 image/vnd.wap.wbmp                                                        wbmp
 image/vnd.xiff                                                            xif
+image/vnd.zbrush.pcx                                                      pcx
 image/webp                                                                webp
 image/x-3ds                                                               3ds
 image/x-cmu-raster                                                        ras
 image/x-cmx                                                               cmx
 image/x-freehand                                                          fh fhc fh4 fh5 fh7
-image/x-icon                                                              ico
 image/x-jng                                                               jng
 image/x-mrsid-image                                                       sid
-image/x-pcx                                                               pcx
 image/x-pict                                                              pic pct
 image/x-portable-anymap                                                   pnm
 image/x-portable-bitmap                                                   pbm
@@ -709,7 +738,14 @@ image/x-tga                                                               tga
 image/x-xbitmap                                                           xbm
 image/x-xpixmap                                                           xpm
 image/x-xwindowdump                                                       xwd
+message/disposition-notification                                          disposition-notification
+message/global                                                            u8msg
+message/global-delivery-status                                            u8dsn
+message/global-disposition-notification                                   u8mdn
+message/global-headers                                                    u8hdr
 message/rfc822                                                            eml mime
+message/vnd.wfa.wsc                                                       wsc
+model/3mf                                                                 3mf
 model/gltf+json                                                           gltf
 model/gltf-binary                                                         glb
 model/iges                                                                igs iges
@@ -719,6 +755,11 @@ model/vnd.dwf                                                             dwf
 model/vnd.gdl                                                             gdl
 model/vnd.gtw                                                             gtw
 model/vnd.mts                                                             mts
+model/vnd.opengex                                                         ogex
+model/vnd.parasolid.transmit.binary                                       x_b
+model/vnd.parasolid.transmit.text                                         x_t
+model/vnd.usdz+zip                                                        usdz
+model/vnd.valve.source.compiled-map                                       bsp
 model/vnd.vtu                                                             vtu
 model/vrml                                                                wrl vrml
 model/x3d+binary                                                          x3db x3dbz
@@ -729,18 +770,19 @@ text/calendar                                                             ics if
 text/coffeescript                                                         coffee litcoffee
 text/css                                                                  css
 text/csv                                                                  csv
-text/hjson                                                                hjson
 text/html                                                                 html htm shtml
 text/jade                                                                 jade
 text/jsx                                                                  jsx
 text/less                                                                 less
 text/markdown                                                             markdown md
 text/mathml                                                               mml
+text/mdx                                                                  mdx
 text/n3                                                                   n3
 text/plain                                                                txt text conf def list log in ini
 text/prs.lines.tag                                                        dsc
 text/richtext                                                             rtx
 text/sgml                                                                 sgml sgm
+text/shex                                                                 shex
 text/slim                                                                 slim slm
 text/stylus                                                               stylus styl
 text/tab-separated-values                                                 tsv
@@ -788,7 +830,7 @@ video/h261                                                                h261
 video/h263                                                                h263
 video/h264                                                                h264
 video/jpeg                                                                jpgv
-video/jpm                                                                 jpm jpgm
+video/jpm                                                                 jpgm
 video/mj2                                                                 mj2 mjp2
 video/mp2t                                                                ts
 video/mp4                                                                 mp4 mp4v mpg4

From 384a8748054cd0a4bd4ee748afd0a3ec121d06c8 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 20 Jul 2019 11:36:34 -0400
Subject: [PATCH 3704/4996] Update history to reflect merge of #7756 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 158b7d23a37..6328aee1f9e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -165,6 +165,7 @@
   * Bump RuboCop to v0.71.0 (#7687)
   * Use regexp to filter special entries (#7702)
   * Reduce Array objects generated from utility method (#7749)
+  * Update mime.types (#7756)
 
 ### Documentation
 

From 882279c3075f4b9d036ab0fda00a5ea294968739 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Wed, 24 Jul 2019 15:15:27 +0200
Subject: [PATCH 3705/4996] Add default Sass dir

---
 docs/_docs/configuration/default.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/_docs/configuration/default.md b/docs/_docs/configuration/default.md
index 8908578da0a..68ab49fc9bd 100644
--- a/docs/_docs/configuration/default.md
+++ b/docs/_docs/configuration/default.md
@@ -16,6 +16,8 @@ plugins_dir         : _plugins
 layouts_dir         : _layouts
 data_dir            : _data
 includes_dir        : _includes
+sass:
+  sass_dir: _sass
 collections:
   posts:
     output          : true

From 179599645810f289cbd6cd6eee4e519b7857f478 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 25 Jul 2019 22:05:30 +0530
Subject: [PATCH 3706/4996] Replace redundant Array#map with Array#each (#7761)

Merge pull request 7761
---
 lib/jekyll/readers/page_reader.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/readers/page_reader.rb b/lib/jekyll/readers/page_reader.rb
index 62d7419efec..af4b879db39 100644
--- a/lib/jekyll/readers/page_reader.rb
+++ b/lib/jekyll/readers/page_reader.rb
@@ -9,14 +9,13 @@ def initialize(site, dir)
       @unfiltered_content = []
     end
 
-    # Read all the files in // for Yaml header and create a new Page
-    # object for each file.
+    # Create a new `Jekyll::Page` object for each entry in a given array.
     #
-    # dir - The String relative path of the directory to read.
+    # files - An array of file names inside `@dir`
     #
-    # Returns an array of static pages.
+    # Returns an array of publishable `Jekyll::Page` objects.
     def read(files)
-      files.map do |page|
+      files.each do |page|
         @unfiltered_content << Page.new(@site, @site.source, @dir, page)
       end
       @unfiltered_content.select { |page| site.publisher.publish?(page) }

From 0f4b7be88ddd39593c226486f056f7402e75299c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 25 Jul 2019 12:35:32 -0400
Subject: [PATCH 3707/4996] Update history to reflect merge of #7761 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6328aee1f9e..fecb45a63c2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -166,6 +166,7 @@
   * Use regexp to filter special entries (#7702)
   * Reduce Array objects generated from utility method (#7749)
   * Update mime.types (#7756)
+  * Replace redundant Array#map with Array#each (#7761)
 
 ### Documentation
 

From f3a03a14cd26ff716809f1bb01dde95f56d7890a Mon Sep 17 00:00:00 2001
From: Matt Kraai 
Date: Wed, 31 Jul 2019 05:49:38 -0700
Subject: [PATCH 3708/4996] Fix misspelling (#7764)

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

diff --git a/docs/_docs/installation/windows.md b/docs/_docs/installation/windows.md
index 4623b40541e..ceda22b01ce 100644
--- a/docs/_docs/installation/windows.md
+++ b/docs/_docs/installation/windows.md
@@ -23,7 +23,7 @@ We only cover RubyInstaller-2.4 and newer here, older versions need to
 1. Download and Install a **Ruby+Devkit** version from [RubyInstaller Downloads](https://rubyinstaller.org/downloads/).
    Use default options for installation.
 2. Run the `ridk install` step on the last stage of the installation wizard. This is needed for installing gems with native
-   extensions. You can find addtional information regarding this in the
+   extensions. You can find additional information regarding this in the
    [RubyInstaller Documentation](https://github.com/oneclick/rubyinstaller2#using-the-installer-on-a-target-system)
 3. Open a new command prompt window from the start menu, so that changes to the `PATH` environment variable becomes effective.
    Install Jekyll and Bundler via: `gem install jekyll bundler`

From 4eec5a55c350200b6b82832731ce4d8ac98d5d6b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 31 Jul 2019 08:49:40 -0400
Subject: [PATCH 3709/4996] Update history to reflect merge of #7764 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fecb45a63c2..75f674975f6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -294,6 +294,7 @@
   * Add Jekpack to resources page (#7598)
   * Introduce frontmatter in step 2 (#7704)
   * Add recursive navigation tutorial (#7720)
+  * Fix misspelling of "additional" (#7764)
 
 ### Site Enhancements
 

From b55927e8f71b5d3cd6258f7f0d08962dd759cf7d Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 2 Aug 2019 01:51:00 +0530
Subject: [PATCH 3710/4996] Add PathManager class to cache interim paths
 (#7732)

Merge pull request 7732
---
 lib/jekyll.rb              |  1 +
 lib/jekyll/entry_filter.rb |  4 ++--
 lib/jekyll/page.rb         |  2 +-
 lib/jekyll/path_manager.rb | 31 +++++++++++++++++++++++++++++++
 lib/jekyll/reader.rb       |  2 +-
 lib/jekyll/tags/include.rb |  2 +-
 6 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 lib/jekyll/path_manager.rb

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 2b0e63826bd..07304057049 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -65,6 +65,7 @@ module Jekyll
   autoload :LogAdapter,          "jekyll/log_adapter"
   autoload :Page,                "jekyll/page"
   autoload :PageWithoutAFile,    "jekyll/page_without_a_file"
+  autoload :PathManager,         "jekyll/path_manager"
   autoload :PluginManager,       "jekyll/plugin_manager"
   autoload :Publisher,           "jekyll/publisher"
   autoload :Reader,              "jekyll/reader"
diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb
index 4a238036ec9..b8f4e044238 100644
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -90,12 +90,12 @@ def symlink_outside_site_source?(entry)
     # Check if an entry matches a specific pattern.
     # Returns true if path matches against any glob pattern, else false.
     def glob_include?(enumerator, entry)
-      entry_with_source = File.join(site.source, entry)
+      entry_with_source = PathManager.join(site.source, entry)
 
       enumerator.any? do |pattern|
         case pattern
         when String
-          pattern_with_source = File.join(site.source, pattern)
+          pattern_with_source = PathManager.join(site.source, pattern)
 
           File.fnmatch?(pattern_with_source, entry_with_source) ||
             entry_with_source.start_with?(pattern_with_source)
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index e6d691c25dc..f353252d825 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -47,7 +47,7 @@ def initialize(site, base, dir, name)
               end
 
       process(name)
-      read_yaml(File.join(base, dir), name)
+      read_yaml(PathManager.join(base, dir), name)
 
       data.default_proc = proc do |_, key|
         site.frontmatter_defaults.find(relative_path, type, key)
diff --git a/lib/jekyll/path_manager.rb b/lib/jekyll/path_manager.rb
new file mode 100644
index 00000000000..eeed1f95890
--- /dev/null
+++ b/lib/jekyll/path_manager.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Jekyll
+  # A singleton class that caches frozen instances of path strings returned from its methods.
+  #
+  # NOTE:
+  #   This class exists because `File.join` allocates an Array and returns a new String on every
+  #   call using **the same arguments**. Caching the result means reduced memory usage.
+  #   However, the caches are never flushed so that they can be used even when a site is
+  #   regenerating. The results are frozen to deter mutation of the cached string.
+  #
+  #   Therefore, employ this class only for situations where caching the result is necessary
+  #   for performance reasons.
+  #
+  class PathManager
+    # This class cannot be initialized from outside
+    private_class_method :new
+
+    # Wraps `File.join` to cache the frozen result.
+    # Reassigns `nil`, empty strings and empty arrays to a frozen empty string beforehand.
+    #
+    # Returns a frozen string.
+    def self.join(base, item)
+      base = "" if base.nil? || base.empty?
+      item = "" if item.nil? || item.empty?
+      @join ||= {}
+      @join[base] ||= {}
+      @join[base][item] ||= File.join(base, item).freeze
+    end
+  end
+end
diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 797e4291a1b..381d9d3165f 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -85,7 +85,7 @@ def retrieve_posts(dir)
     def retrieve_dirs(_base, dir, dot_dirs)
       dot_dirs.each do |file|
         dir_path = site.in_source_dir(dir, file)
-        rel_path = File.join(dir, file)
+        rel_path = PathManager.join(dir, file)
         @site.reader.read_directories(rel_path) unless @site.dest.chomp("/") == dir_path
       end
     end
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index 20a41bb779c..7fabe25fea9 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -100,7 +100,7 @@ def tag_includes_dirs(context)
       def locate_include_file(context, file, safe)
         includes_dirs = tag_includes_dirs(context)
         includes_dirs.each do |dir|
-          path = File.join(dir.to_s, file.to_s)
+          path = PathManager.join(dir, file)
           return path if valid_include_file?(path, dir.to_s, safe)
         end
         raise IOError, could_not_locate_message(file, includes_dirs, safe)

From 532c499751f564512d4f7ae84721afb3a2523ba1 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 1 Aug 2019 16:21:04 -0400
Subject: [PATCH 3711/4996] Update history to reflect merge of #7732 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 75f674975f6..13089508aea 100644
--- a/History.markdown
+++ b/History.markdown
@@ -109,6 +109,7 @@
   * Add `type` attribute to Document instances (#7406)
   * Reduce allocations from where-filter (#7653)
   * Memoize SiteDrop#documents to reduce allocations (#7697)
+  * Add PathManager class to cache interim paths (#7732)
 
 ### Development Fixes
 

From 07270c7cfd94aa1b5cfbbd8b9d2e5aedfe203a0b Mon Sep 17 00:00:00 2001
From: Michael Bishop 
Date: Fri, 2 Aug 2019 23:32:07 -0400
Subject: [PATCH 3712/4996] docs: improve how to include rouge stylesheets
 (#7752)

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

diff --git a/docs/_docs/liquid/tags.md b/docs/_docs/liquid/tags.md
index d402a8558c2..d5ee9d6373f 100644
--- a/docs/_docs/liquid/tags.md
+++ b/docs/_docs/liquid/tags.md
@@ -78,7 +78,17 @@ end
 
 In order for the highlighting to show up, you’ll need to include a highlighting
 stylesheet. For Pygments or Rouge you can use a stylesheet for Pygments, you
-can find an example gallery [here](http://help.farbox.com/pygments.html).
+can find an example gallery 
+[here](https://jwarby.github.io/jekyll-pygments-themes/languages/ruby.html) 
+or from [its repository](https://github.com/jwarby/jekyll-pygments-themes).
+
+Copy the CSS file (`native.css` for example) into your css directory and import
+the syntax highlighter styles into your `main.css`:
+
+```css
+@import "native.css";
+```
+
 
 ## Links
 

From a87ca206dad4e2c026a3141612a02c6bffc72519 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 2 Aug 2019 23:32:09 -0400
Subject: [PATCH 3713/4996] Update history to reflect merge of #7752 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 13089508aea..79c861500fc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -296,6 +296,7 @@
   * Introduce frontmatter in step 2 (#7704)
   * Add recursive navigation tutorial (#7720)
   * Fix misspelling of "additional" (#7764)
+  * docs: improve how to include rouge stylesheets (#7752)
 
 ### Site Enhancements
 

From 6a4f8bdbeccee063c4bb823aba3df16bafc88615 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 4 Aug 2019 08:49:34 +0200
Subject: [PATCH 3714/4996] Fix: rubocop offenses (#7769)

Merge pull request 7769
---
 lib/jekyll/excerpt.rb             | 2 +-
 lib/jekyll/filters.rb             | 2 ++
 lib/jekyll/readers/post_reader.rb | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb
index dee4613fbbc..c7048e6e1cd 100644
--- a/lib/jekyll/excerpt.rb
+++ b/lib/jekyll/excerpt.rb
@@ -155,7 +155,7 @@ def sanctify_liquid_tags(head)
       tag_names.flatten!
       tag_names.reverse_each do |tag_name|
         next unless liquid_block?(tag_name)
-        next if head =~ endtag_regex_stash(tag_name)
+        next if endtag_regex_stash(tag_name).match?(head)
 
         modified = true
         head << "\n{% end#{tag_name} %}"
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index cec65ba3943..0353e857eec 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -368,6 +368,7 @@ def item_property(item, property)
       end
     end
 
+    # rubocop:disable Performance/RegexpMatch
     # return numeric values as numbers for proper sorting
     def parse_sort_input(property)
       number_like = %r!\A\s*-?(?:\d+\.?\d*|\.\d+)\s*\Z!
@@ -375,6 +376,7 @@ def parse_sort_input(property)
 
       property
     end
+    # rubocop:enable Performance/RegexpMatch
 
     def as_liquid(item)
       case item
diff --git a/lib/jekyll/readers/post_reader.rb b/lib/jekyll/readers/post_reader.rb
index bdbe6f5c269..17b12321ae4 100644
--- a/lib/jekyll/readers/post_reader.rb
+++ b/lib/jekyll/readers/post_reader.rb
@@ -50,7 +50,7 @@ def read_publishable(dir, magic_dir, matcher)
     # Returns klass type of content files
     def read_content(dir, magic_dir, matcher)
       @site.reader.get_entries(dir, magic_dir).map do |entry|
-        next unless entry =~ matcher
+        next unless matcher.match?(entry)
 
         path = @site.in_source_dir(File.join(dir, magic_dir, entry))
         Document.new(path,

From 9a10ff9b5abc1949083becb2d265abace2ec5215 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 4 Aug 2019 02:49:36 -0400
Subject: [PATCH 3715/4996] Update history to reflect merge of #7769 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 79c861500fc..10518295ff3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -168,6 +168,7 @@
   * Reduce Array objects generated from utility method (#7749)
   * Update mime.types (#7756)
   * Replace redundant Array#map with Array#each (#7761)
+  * Fix: rubocop offenses (#7769)
 
 ### Documentation
 

From 0f5e15811fe8f9a33a6cd1e3c05859b627f12e93 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 4 Aug 2019 18:07:45 +0530
Subject: [PATCH 3716/4996] Remove warnings and fixes for deprecated config
 (#7440)

Merge pull request 7440
---
 docs/_docs/upgrading/3-to-4.md |  10 +++
 features/markdown.feature      |   2 +-
 features/pagination.feature    |   6 +-
 features/plugins.feature       |   6 +-
 features/rendering.feature     |   4 +-
 jekyll.gemspec                 |   8 +-
 lib/jekyll/configuration.rb    | 151 +++++++--------------------------
 test/test_configuration.rb     | 108 ++++++++++++-----------
 8 files changed, 107 insertions(+), 188 deletions(-)

diff --git a/docs/_docs/upgrading/3-to-4.md b/docs/_docs/upgrading/3-to-4.md
index 8bd02757e8f..09a46b99b60 100644
--- a/docs/_docs/upgrading/3-to-4.md
+++ b/docs/_docs/upgrading/3-to-4.md
@@ -156,3 +156,13 @@ Notes:
     ```
   * Vendors that provide a versioned Jekyll Environment Image (e.g. Docker Image, GitHub Pages, etc)
     will have to manually whitelist kramdown's extension gems in their distributions for Jekyll 4.0.
+
+## Deprecated Configuration Options
+
+Jekyll 4.0 has dropped support for all legacy configuration options that were deprecated over multiple
+releases in the previous series.
+
+To that end, we shall no longer output a deprecation warning when we encounter a legacy config key nor
+shall we gracefully assign their values to the newer counterparts. Depending on the key, it shall either
+be ignored or raise an `InvalidConfigurationError` error if the key is still valid but the associated
+value is not of the valid type.
diff --git a/features/markdown.feature b/features/markdown.feature
index 3649a6d1013..71b13ad969f 100644
--- a/features/markdown.feature
+++ b/features/markdown.feature
@@ -21,7 +21,7 @@ Feature: Markdown
     Given I have a configuration file with:
       | key      | value             |
       | paginate | 5                 |
-      | gems     | [jekyll-paginate] |
+      | plugins  | [jekyll-paginate] |
     And I have an "index.html" page that contains "Index - {% for post in paginator.posts %} {{ post.content }} {% endfor %}"
     And I have a _posts directory
     And I have the following post:
diff --git a/features/pagination.feature b/features/pagination.feature
index b8b89ed09cc..e818985066c 100644
--- a/features/pagination.feature
+++ b/features/pagination.feature
@@ -7,7 +7,7 @@ Feature: Site pagination
     Given I have a configuration file with:
       | key      | value             |
       | paginate |              |
-      | gems     | [jekyll-paginate] |
+      | plugins  | [jekyll-paginate] |
     And I have a _layouts directory
     And I have an "index.html" page that contains "{{ paginator.posts.size }}"
     And I have a _posts directory
@@ -35,7 +35,7 @@ Feature: Site pagination
       | paginate      | 1                              |
       | paginate_path | /blog/page-:num                |
       | permalink     | /blog/:year/:month/:day/:title |
-      | gems          | [jekyll-paginate]              |
+      | plugins       | [jekyll-paginate]              |
     And I have a blog directory
     And I have an "blog/index.html" page that contains "{{ paginator.posts.size }}"
     And I have a _posts directory
@@ -63,7 +63,7 @@ Feature: Site pagination
       | paginate      | 1                              |
       | paginate_path | /blog/page/:num                |
       | permalink     | /blog/:year/:month/:day/:title |
-      | gems          | [jekyll-paginate]              |
+      | plugins       | [jekyll-paginate]              |
     And I have a blog directory
     And I have an "blog/index.html" page that contains "{{ paginator.posts.size }}"
     And I have an "index.html" page that contains "Don't pick me!"
diff --git a/features/plugins.feature b/features/plugins.feature
index be01a4a918e..e903783b18d 100644
--- a/features/plugins.feature
+++ b/features/plugins.feature
@@ -4,7 +4,7 @@ Feature: Configuring and using plugins
 
   Scenario: Add a gem-based plugin
     Given I have an "index.html" file that contains "Whatever"
-    And I have a configuration file with "gems" set to "[jekyll_test_plugin]"
+    And I have a configuration file with "plugins" set to "[jekyll_test_plugin]"
     When I run jekyll build
     Then I should get a zero exit status
     And the _site directory should exist
@@ -15,7 +15,7 @@ Feature: Configuring and using plugins
     Given I have an "index.html" file that contains "Whatever"
     And I have a configuration file with:
       | key       | value                |
-      | gems      | [jekyll_test_plugin] |
+      | plugins   | [jekyll_test_plugin] |
       | whitelist | []                   |
     When I run jekyll build --safe
     Then I should get a zero exit status
@@ -27,7 +27,7 @@ Feature: Configuring and using plugins
     Given I have an "index.html" file that contains "Whatever"
     And I have a configuration file with:
       | key       | value                                              |
-      | gems      | [jekyll_test_plugin, jekyll_test_plugin_malicious] |
+      | plugins   | [jekyll_test_plugin, jekyll_test_plugin_malicious] |
       | whitelist | [jekyll_test_plugin]                               |
     When I run jekyll build --safe
     Then I should get a zero exit status
diff --git a/features/rendering.feature b/features/rendering.feature
index 0b42d44ba27..654facd5f95 100644
--- a/features/rendering.feature
+++ b/features/rendering.feature
@@ -98,7 +98,7 @@ Feature: Rendering
   Scenario: Don't place asset files in layout
     Given I have an "index.scss" page with layout "simple" that contains ".foo-bar { color:black; }"
     And I have an "index.coffee" page with layout "simple" that contains "whatever()"
-    And I have a configuration file with "gems" set to "[jekyll-coffeescript]"
+    And I have a configuration file with "plugins" set to "[jekyll-coffeescript]"
     And I have a simple layout that contains "{{ content }}Ahoy, indeed!"
     When I run jekyll build
     Then I should get a zero exit status
@@ -165,7 +165,7 @@ Feature: Rendering
 
   Scenario: Render liquid in CoffeeScript with jekyll-coffeescript enabled
     Given I have an "index.coffee" page with animal "cicada" that contains "hey='for {{page.animal}}'"
-    And I have a configuration file with "gems" set to "[jekyll-coffeescript]"
+    And I have a configuration file with "plugins" set to "[jekyll-coffeescript]"
     When I run jekyll build
     Then I should get a zero exit status
     And the _site directory should exist
diff --git a/jekyll.gemspec b/jekyll.gemspec
index cdcb16ea137..acbb41ebdf7 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("safe_yaml",             "~> 1.0")
 
   s.post_install_message = <<~MSG
-    ----------------------------------------------------------------------------------
+    -------------------------------------------------------------------------------------
     This version of Jekyll comes with some major changes.
 
     Most notably:
@@ -59,6 +59,10 @@ Gem::Specification.new do |s|
       * Our `post_url` tag now comes with the `relative_url` filter incorporated into it.
         You shouldn't prepend `{{ site.baseurl }}` to `{% post_url 2019-03-27-hello %}`
         For further details: https://github.com/jekyll/jekyll/pull/7589
-    ----------------------------------------------------------------------------------
+
+      * Support for deprecated configuration options has been removed. We will no longer
+        output a warning and gracefully assign their values to the newer counterparts
+        internally.
+    -------------------------------------------------------------------------------------
   MSG
 end
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 7b2cb4301a7..2e4d609dd6b 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -79,15 +79,11 @@ class Configuration < Hash
 
     class << self
       # Static: Produce a Configuration ready for use in a Site.
-      # It takes the input, fills in the defaults where values do not
-      # exist, and patches common issues including migrating options for
-      # backwards compatiblity. Except where a key or value is being fixed,
-      # the user configuration will override the defaults.
+      # It takes the input, fills in the defaults where values do not exist.
       #
       # user_config - a Hash or Configuration of overrides.
       #
-      # Returns a Configuration filled with defaults and fixed for common
-      # problems and backwards-compatibility.
+      # Returns a Configuration filled with defaults.
       def from(user_config)
         Utils.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys)
           .add_default_collections.add_default_excludes
@@ -132,8 +128,8 @@ def safe_load_file(filename)
       when %r!\.ya?ml!i
         SafeYAML.load_file(filename) || {}
       else
-        raise ArgumentError, "No parser for '#{filename}' is available.
-          Use a .y(a)ml or .toml file instead."
+        raise ArgumentError,
+              "No parser for '#{filename}' is available. Use a .y(a)ml or .toml file instead."
       end
     end
 
@@ -169,7 +165,11 @@ def config_files(override)
     def read_config_file(file)
       file = File.expand_path(file)
       next_config = safe_load_file(file)
-      check_config_is_hash!(next_config, file)
+
+      unless next_config.is_a?(Hash)
+        raise ArgumentError, "Configuration file: (INVALID) #{file}".yellow
+      end
+
       Jekyll.logger.info "Configuration file:", file
       next_config
     rescue SystemCallError
@@ -177,8 +177,7 @@ def read_config_file(file)
         Jekyll.logger.warn "Configuration file:", "none"
         {}
       else
-        Jekyll.logger.error "Fatal:", "The configuration file '#{file}'
-          could not be found."
+        Jekyll.logger.error "Fatal:", "The configuration file '#{file}' could not be found."
         raise LoadError, "The Configuration file '#{file}' could not be found."
       end
     end
@@ -200,12 +199,11 @@ def read_config_files(files)
           configuration = Utils.deep_merge_hashes(configuration, new_config)
         end
       rescue ArgumentError => e
-        Jekyll.logger.warn "WARNING:", "Error reading configuration. " \
-                     "Using defaults (and options)."
+        Jekyll.logger.warn "WARNING:", "Error reading configuration. Using defaults (and options)."
         warn e
       end
 
-      configuration.backwards_compatibilize.add_default_collections
+      configuration.validate.add_default_collections
     end
 
     # Public: Split a CSV string into an array containing its values
@@ -217,35 +215,18 @@ def csv_to_array(csv)
       csv.split(",").map(&:strip)
     end
 
-    # Public: Ensure the proper options are set in the configuration to allow for
-    # backwards-compatibility with Jekyll pre-1.0
+    # Public: Ensure the proper options are set in the configuration
     #
-    # Returns the backwards-compatible configuration
-    def backwards_compatibilize
+    # Returns the configuration Hash
+    def validate
       config = clone
-      # Provide backwards-compatibility
-      check_auto(config)
-      check_server(config)
-      check_plugins(config)
 
-      renamed_key "server_port", "port", config
-      renamed_key "gems", "plugins", config
-      renamed_key "layouts", "layouts_dir", config
-      renamed_key "data_source", "data_dir", config
-
-      check_pygments(config)
+      check_plugins(config)
       check_include_exclude(config)
-      check_coderay(config)
-      check_maruku(config)
 
       config
     end
 
-    # DEPRECATED.
-    def fix_common_issues
-      self
-    end
-
     def add_default_collections
       config = clone
 
@@ -284,15 +265,6 @@ def add_default_excludes
       config
     end
 
-    def renamed_key(old, new, config)
-      if config.key?(old)
-        Jekyll::Deprecator.deprecation_message "The '#{old}' configuration" \
-          " option has been renamed to '#{new}'. Please update your config" \
-          " file accordingly."
-        config[new] = config.delete(old)
-      end
-    end
-
     private
 
     def style_to_permalink(permalink_style)
@@ -312,77 +284,13 @@ def style_to_permalink(permalink_style)
       end
     end
 
-    # Private: Checks if a given config is a hash
-    #
-    # extracted_config - the value to check
-    # file - the file from which the config was extracted
-    #
-    # Raises an ArgumentError if given config is not a hash
-    def check_config_is_hash!(extracted_config, file)
-      unless extracted_config.is_a?(Hash)
-        raise ArgumentError, "Configuration file: (INVALID) #{file}".yellow
-      end
-    end
-
-    def check_auto(config)
-      if config.key?("auto") || config.key?("watch")
-        Jekyll::Deprecator.deprecation_message "Auto-regeneration can no longer" \
-                            " be set from your configuration file(s). Use the" \
-                            " --[no-]watch/-w command-line option instead."
-        config.delete("auto")
-        config.delete("watch")
-      end
-    end
-
-    def check_server(config)
-      if config.key?("server")
-        Jekyll::Deprecator.deprecation_message "The 'server' configuration option" \
-                            " is no longer accepted. Use the 'jekyll serve'" \
-                            " subcommand to serve your site with WEBrick."
-        config.delete("server")
-      end
-    end
-
-    def check_pygments(config)
-      if config.key?("pygments")
-        Jekyll::Deprecator.deprecation_message "The 'pygments' configuration option" \
-                            " has been renamed to 'highlighter'. Please update your" \
-                            " config file accordingly. The allowed values are 'rouge', " \
-                            "'pygments' or null."
-
-        config["highlighter"] = "pygments" if config["pygments"]
-        config.delete("pygments")
-      end
-    end
-
     def check_include_exclude(config)
       %w(include exclude).each do |option|
-        if config[option].is_a?(String)
-          Jekyll::Deprecator.deprecation_message "The '#{option}' configuration option" \
-            " must now be specified as an array, but you specified" \
-            " a string. For now, we've treated the string you provided" \
-            " as a list of comma-separated values."
-          config[option] = csv_to_array(config[option])
-        end
-        config[option]&.map!(&:to_s)
-      end
-    end
+        next unless config.key?(option)
+        next if config[option].is_a?(Array)
 
-    def check_coderay(config)
-      if (config["kramdown"] || {}).key?("use_coderay")
-        Jekyll::Deprecator.deprecation_message "Please change 'use_coderay'" \
-          " to 'enable_coderay' in your configuration file."
-        config["kramdown"]["use_coderay"] = config["kramdown"].delete("enable_coderay")
-      end
-    end
-
-    def check_maruku(config)
-      if config.fetch("markdown", "kramdown").to_s.casecmp("maruku").zero?
-        Jekyll.logger.abort_with "Error:", "You're using the 'maruku' " \
-          "Markdown processor, which has been removed as of 3.0.0. " \
-          "We recommend you switch to Kramdown. To do this, replace " \
-          "`markdown: maruku` with `markdown: kramdown` in your " \
-          "`_config.yml` file."
+        raise Jekyll::Errors::InvalidConfigurationError,
+              "'#{option}' should be set as an array, but was: #{config[option].inspect}."
       end
     end
 
@@ -391,17 +299,16 @@ def check_maruku(config)
     # config - the config hash
     #
     # Raises a Jekyll::Errors::InvalidConfigurationError if the config `plugins`
-    # is a string
+    # is not an Array.
     def check_plugins(config)
-      if config.key?("plugins") && config["plugins"].is_a?(String)
-        Jekyll.logger.error "Configuration Error:", "You specified the" \
-          " `plugins` config in your configuration file as a string, please" \
-          " use an array instead. If you wanted to set the directory of your" \
-          " plugins, use the config key `plugins_dir` instead."
-        raise Jekyll::Errors::InvalidConfigurationError,
-              "'plugins' should not be a string, but was: " \
-              "#{config["plugins"].inspect}. Use 'plugins_dir' instead."
-      end
+      return unless config.key?("plugins")
+      return if config["plugins"].is_a?(Array)
+
+      Jekyll.logger.error "'plugins' should be set as an array of gem-names, but was: " \
+        "#{config["plugins"].inspect}. Use 'plugins_dir' instead to set the directory " \
+        "for your non-gemified Ruby plugins."
+      raise Jekyll::Errors::InvalidConfigurationError,
+            "'plugins' should be set as an array, but was: #{config["plugins"].inspect}."
     end
   end
 end
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 4f20cd0fa52..75e42e25d9e 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -21,7 +21,7 @@ class TestConfiguration < JekyllUnitTest
     end
 
     should "return a valid Configuration instance" do
-      assert_instance_of Configuration, Configuration.from({}).fix_common_issues
+      assert_instance_of Configuration, Configuration.from({})
     end
 
     should "add default collections" do
@@ -92,15 +92,19 @@ class TestConfiguration < JekyllUnitTest
     should "only assign collections.posts.permalink if a permalink is specified" do
       result = Configuration[{ "permalink" => "pretty", "collections" => {} }]
         .add_default_collections
-      expected = { "posts" => {
-        "output"    => true,
-        "permalink" => "/:categories/:year/:month/:day/:title/",
-      } }
+
+      expected = {
+        "posts" => {
+          "output"    => true,
+          "permalink" => "/:categories/:year/:month/:day/:title/",
+        },
+      }
+
       assert_equal expected, result["collections"]
 
-      result = Configuration[{ "permalink" => nil, "collections" => {} }]
-        .add_default_collections
+      result   = Configuration[{ "permalink" => nil, "collections" => {} }].add_default_collections
       expected = { "posts" => { "output" => true } }
+
       assert_equal expected, result["collections"]
     end
 
@@ -120,6 +124,7 @@ class TestConfiguration < JekyllUnitTest
         :include   => [".htaccess"],
         :source    => "./",
       }]
+
       @string_keys = Configuration[{
         "markdown"  => "kramdown",
         "permalink" => "date",
@@ -128,13 +133,16 @@ class TestConfiguration < JekyllUnitTest
         "source"    => "./",
       }]
     end
+
     should "stringify symbol keys" do
       assert_equal @string_keys, @mixed_keys.stringify_keys
     end
+
     should "not mess with keys already strings" do
       assert_equal @string_keys, @string_keys.stringify_keys
     end
   end
+
   context "#config_files" do
     setup do
       @config = Configuration[{ "source" => source_dir }]
@@ -150,32 +158,39 @@ class TestConfiguration < JekyllUnitTest
       assert @config.config_files(@one_config_file).is_a?(Array)
       assert @config.config_files(@multiple_files).is_a?(Array)
     end
+
     should "return the default config path if no config files are specified" do
       assert_equal [source_dir("_config.yml")], @config.config_files(@no_override)
     end
+
     should "return .yaml if it exists but .yml does not" do
       allow(File).to receive(:exist?).with(source_dir("_config.yml")).and_return(false)
       allow(File).to receive(:exist?).with(source_dir("_config.yaml")).and_return(true)
       assert_equal [source_dir("_config.yaml")], @config.config_files(@no_override)
     end
+
     should "return .yml if both .yml and .yaml exist" do
       allow(File).to receive(:exist?).with(source_dir("_config.yml")).and_return(true)
       assert_equal [source_dir("_config.yml")], @config.config_files(@no_override)
     end
+
     should "return .toml if that exists" do
       allow(File).to receive(:exist?).with(source_dir("_config.yml")).and_return(false)
       allow(File).to receive(:exist?).with(source_dir("_config.yaml")).and_return(false)
       allow(File).to receive(:exist?).with(source_dir("_config.toml")).and_return(true)
       assert_equal [source_dir("_config.toml")], @config.config_files(@no_override)
     end
+
     should "return .yml if both .yml and .toml exist" do
       allow(File).to receive(:exist?).with(source_dir("_config.yml")).and_return(true)
       allow(File).to receive(:exist?).with(source_dir("_config.toml")).and_return(true)
       assert_equal [source_dir("_config.yml")], @config.config_files(@no_override)
     end
+
     should "return the config if given one config file" do
       assert_equal %w(config.yml), @config.config_files(@one_config_file)
     end
+
     should "return an array of the config files if given many config files" do
       assert_equal(
         %w(config/site.yml config/deploy.toml configuration.yml),
@@ -204,77 +219,59 @@ class TestConfiguration < JekyllUnitTest
 
     should "continue to read config files if one is empty" do
       allow(SafeYAML).to receive(:load_file).with(File.expand_path("empty.yml")).and_return(false)
-      allow(SafeYAML)
-        .to receive(:load_file)
-        .with(File.expand_path("not_empty.yml"))
-        .and_return("foo" => "bar", "include" => "", "exclude" => "")
+      allow(SafeYAML).to receive(:load_file).with(File.expand_path("not_empty.yml")).and_return(
+        "foo" => "bar"
+      )
       Jekyll.logger.log_level = :warn
-      read_config = @config.read_config_files(["empty.yml", "not_empty.yml"])
+      read_config = @config.read_config_files(%w(empty.yml not_empty.yml))
       Jekyll.logger.log_level = :info
       assert_equal "bar", read_config["foo"]
     end
   end
-  context "#backwards_compatibilize" do
+
+  context "#validate" do
     setup do
       @config = Configuration[{
         "auto"        => true,
         "watch"       => true,
         "server"      => true,
-        "exclude"     => "READ-ME.md, Gemfile,CONTRIBUTING.hello.markdown",
-        "include"     => "STOP_THE_PRESSES.txt,.heloses, .git",
         "pygments"    => true,
         "layouts"     => true,
         "data_source" => true,
         "gems"        => [],
       }]
     end
-    should "unset 'auto' and 'watch'" do
-      assert @config.key?("auto")
-      assert @config.key?("watch")
-      assert !@config.backwards_compatibilize.key?("auto")
-      assert !@config.backwards_compatibilize.key?("watch")
-    end
-    should "unset 'server'" do
-      assert @config.key?("server")
-      assert !@config.backwards_compatibilize.key?("server")
-    end
-    should "transform string exclude into an array" do
-      assert @config.key?("exclude")
-      assert @config.backwards_compatibilize.key?("exclude")
-      expected = %w(READ-ME.md Gemfile CONTRIBUTING.hello.markdown)
-      assert_equal expected, @config.backwards_compatibilize["exclude"]
-    end
-    should "transform string include into an array" do
-      assert @config.key?("include")
-      assert @config.backwards_compatibilize.key?("include")
-      expected = %w(STOP_THE_PRESSES.txt .heloses .git)
-      assert_equal expected, @config.backwards_compatibilize["include"]
-    end
-    should "set highlighter to pygments" do
-      assert @config.key?("pygments")
-      assert !@config.backwards_compatibilize.key?("pygments")
-      assert_equal "pygments", @config.backwards_compatibilize["highlighter"]
-    end
-    should "adjust directory names" do
-      assert @config.key?("layouts")
-      assert !@config.backwards_compatibilize.key?("layouts")
-      assert @config.backwards_compatibilize["layouts_dir"]
-      assert @config.key?("data_source")
-      assert !@config.backwards_compatibilize.key?("data_source")
-      assert @config.backwards_compatibilize["data_dir"]
+
+    should "raise an error if `exclude` key is a string" do
+      config = Configuration[{ "exclude" => "READ-ME.md, Gemfile,CONTRIBUTING.hello.markdown" }]
+      assert_raises(Jekyll::Errors::InvalidConfigurationError) { config.validate }
+    end
+
+    should "raise an error if `include` key is a string" do
+      config = Configuration[{ "include" => "STOP_THE_PRESSES.txt,.heloses, .git" }]
+      assert_raises(Jekyll::Errors::InvalidConfigurationError) { config.validate }
     end
+
     should "raise an error if `plugins` key is a string" do
       config = Configuration[{ "plugins" => "_plugin" }]
-      assert_raises Jekyll::Errors::InvalidConfigurationError do
-        config.backwards_compatibilize
-      end
+      assert_raises(Jekyll::Errors::InvalidConfigurationError) { config.validate }
     end
-    should "set the `gems` config to `plugins`" do
+
+    should "not rename configuration keys" do
+      assert @config.key?("layouts")
+      assert @config.validate.key?("layouts")
+      refute @config.validate.key?("layouts_dir")
+
+      assert @config.key?("data_source")
+      assert @config.validate.key?("data_source")
+      refute @config.validate.key?("data_dir")
+
       assert @config.key?("gems")
-      assert !@config.backwards_compatibilize["gems"]
-      assert @config.backwards_compatibilize["plugins"]
+      assert @config.validate.key?("gems")
+      refute @config.validate.key?("plugins")
     end
   end
+
   context "loading configuration" do
     setup do
       @path = source_dir("_config.yml")
@@ -331,6 +328,7 @@ class TestConfiguration < JekyllUnitTest
       # as opposed to: assert_equal ':foo', SafeYAML.load(':foo')
     end
   end
+
   context "loading config from external file" do
     setup do
       @paths = {

From 0e591f08dafe284d7326b7d951411b67d5b3eb42 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 4 Aug 2019 08:37:47 -0400
Subject: [PATCH 3717/4996] Update history to reflect merge of #7440 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 10518295ff3..c99f4f95ed1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -110,6 +110,7 @@
   * Reduce allocations from where-filter (#7653)
   * Memoize SiteDrop#documents to reduce allocations (#7697)
   * Add PathManager class to cache interim paths (#7732)
+  * Remove warnings and fixes for deprecated config (#7440)
 
 ### Development Fixes
 

From 6511342e159db9d54d247000767cf19c1880d5a9 Mon Sep 17 00:00:00 2001
From: Matt Rogers 
Date: Sun, 4 Aug 2019 13:20:11 -0500
Subject: [PATCH 3718/4996] Prepare Jekyll 4.0.0 beta1 (#7716)

Merge pull request 7716
---
 ...0-jekyll-4-0-0-pre-beta1-released.markdown | 40 +++++++++++++++++++
 lib/jekyll/version.rb                         |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 docs/_posts/2019-07-20-jekyll-4-0-0-pre-beta1-released.markdown

diff --git a/docs/_posts/2019-07-20-jekyll-4-0-0-pre-beta1-released.markdown b/docs/_posts/2019-07-20-jekyll-4-0-0-pre-beta1-released.markdown
new file mode 100644
index 00000000000..24936f38fc7
--- /dev/null
+++ b/docs/_posts/2019-07-20-jekyll-4-0-0-pre-beta1-released.markdown
@@ -0,0 +1,40 @@
+---
+title: Jekyll 4.0.0.pre.beta1 Released
+date: 2019-07-20 10:43:31 -0500
+author: mattr-
+version: 4.0.0.pre.beta1
+categories: [release]
+---
+
+Dear Jekyllers,
+
+It's time for another pre-release of Jekyll 4! 🎉
+
+This pre-release moves us further down the path of releasing Jekyll 4.0.0. All the same goodies [from the last pre-release](/news/2019/03/18/jekyll-4-0-0-pre-alpha1-released/) are here, along with a few more things I want to highlight:
+
+Jekyll 4.0 is a new *major* version and it comes with a few breaking changes, notably :
+
+1. We dropped support for [Ruby 2.3 which EOL at the end of March 2019](https://www.ruby-lang.org/en/downloads/).
+   GitHub Pages runs Ruby 2.5.x, services like Netlify or Forestry already upgraded to latest Ruby 2.6.x.
+2. `link` tag now include `relative_url` filter, hurray [no more need to prepend `{% raw %}{{ site.baseurl }}{% endraw %}` ](https://github.com/jekyll/jekyll/pull/6727).
+3. [`{% raw %}{% highlight %}{% endraw %}` now behaves like `{% raw %}{% raw %}{% endraw %}`](https://github.com/jekyll/jekyll/pull/6821), so you can no longer use `include` tags within.
+4. We dropped support for Pygments, RedCarpet and rdiscount.
+5. We bumped kramdown to v2.
+
+If you're a plugin developer, we still need your feedback! Your plugin may not work with version 4 and we'd like to fix those issues before we release.
+
+Checkout the complete [changelog](https://github.com/jekyll/jekyll/releases/tag/v4.0.0.pre.beta1) for more details.
+
+To test this pre version run:
+
+```sh
+gem install jekyll --pre
+```
+
+Please test this version thoroughly and file bugs as you encounter them.
+
+Thanks to our dear contributors for helping making Jekyll better:
+
+Aidan Fitzgerald, Akshat Kedia, Alex Wood, Alexey Kopytko, Alexey Pelykh, Ali Thompson, Ana María Martínez Gómez, Ananthakumar, Andreas Möller, Andrew Lyndem, Andy Alt, Anne Gentle, Anny, Arjun Thakur, Arthur Attwell, Ashwin Maroli, Behrang, Belhassen Chelbi, Ben Keith, Ben Otte, Bilawal Hameed, Boris Schapira, Boris van Hoytema, Brett C, Chris Finazzo, Christian Oliff, Damien Solodow, Dan Allen, Dan Friedman, Daniel Höpfl, David J. Malan, Denis McDonald, Derek Smart, Derpy, Dusty Candland, ExE Boss, Frank Taillandier, Gareth Cooper, Grzegorz Kaczorek, Isaac Goodman, Jacob Byers, Jakob Krigovsky, Jan Pobořil, Joe Shannon, Jordan Morgan, Jorie Tappa, Josue Caraballo, Justin Vallelonga, Jörg Steinsträter, Karel Bílek, Keith Mifsud, Kelly-Ann Green, Ken Salomon, Kevin Plattret, Kyle Barbour, Lars Kanis, Leandro Facchinetti, Luis Enrique Perez Alvarez, Luis Guillermo Yáñez, Ma HongJun, Manu Mathew, Mario, Martin Scharm, Matt Massicotte, Matthew Rathbone, Maxwell Gerber, Mertcan Yücel, Michael Hiiva, Mike Kasberg, Mike Neumegen, Monica Powell, Nicolas Hoizey, Nikhil Swaminathan, Nikita Skalkin, Olivia Hugger, Parker Moore, Pat Hawks, Patrick Favre-Bulle, Paul Kim, Philip Belesky, Preston Lim, Ralph, Robert Riemann, Rosário Pereira Fernandes, Samuel Gruetter, Scott Killen, Sri Pravan Paturi, Stephan Fischer, Stephen Weiss, Steven Westmoreland, Sundaram Kalyan Vedala, Thanos Kolovos, Timo Schuhmacher, Tobias, Tom Harvey, Tushar Prajapati, Victor Afanasev, Vitor Oliveira, Wouter Schoot, XhmikosR, Zhang Xiangze, _94gsc, argv-minus-one, chrisfinazzo, ikeji, jess, jpasholk, makmm, mo khan, ninevra, penguinpet, 김정환, 104fps
+
+Happy Jekylling everyone!
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 226550da3b1..15b8763be9d 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "4.0.0.pre.alpha1"
+  VERSION = "4.0.0.pre.beta1"
 end

From 21202589dea5aa4ca4fe7c5618f2f5269470e285 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 4 Aug 2019 14:20:13 -0400
Subject: [PATCH 3719/4996] Update history to reflect merge of #7716 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index c99f4f95ed1..6f02194e7b2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -312,6 +312,7 @@
 ### release
 
   * Release v4.0.0.pre.alpha1 (#7574)
+  * Prepare Jekyll 4.0.0 beta1 (#7716)
 
 ## 3.8.6 / 2019-07-02
 

From 8e52cdbb6b952230d9468d377e7fa43fcdfca56d Mon Sep 17 00:00:00 2001
From: Matt Rogers 
Date: Sun, 4 Aug 2019 13:21:33 -0500
Subject: [PATCH 3720/4996] Release :gem: 4.0.0.pre.beta1


From 91f82907a3dc9c6453a11a74fd637ffd03d9c180 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 4 Aug 2019 21:34:17 +0200
Subject: [PATCH 3721/4996] update date

---
 ...down => 2019-08-04-jekyll-4-0-0-pre-beta1-released.markdown} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename docs/_posts/{2019-07-20-jekyll-4-0-0-pre-beta1-released.markdown => 2019-08-04-jekyll-4-0-0-pre-beta1-released.markdown} (99%)

diff --git a/docs/_posts/2019-07-20-jekyll-4-0-0-pre-beta1-released.markdown b/docs/_posts/2019-08-04-jekyll-4-0-0-pre-beta1-released.markdown
similarity index 99%
rename from docs/_posts/2019-07-20-jekyll-4-0-0-pre-beta1-released.markdown
rename to docs/_posts/2019-08-04-jekyll-4-0-0-pre-beta1-released.markdown
index 24936f38fc7..cf470f2987e 100644
--- a/docs/_posts/2019-07-20-jekyll-4-0-0-pre-beta1-released.markdown
+++ b/docs/_posts/2019-08-04-jekyll-4-0-0-pre-beta1-released.markdown
@@ -1,6 +1,6 @@
 ---
 title: Jekyll 4.0.0.pre.beta1 Released
-date: 2019-07-20 10:43:31 -0500
+date: 2019-08-04 10:43:31 -0500
 author: mattr-
 version: 4.0.0.pre.beta1
 categories: [release]

From f446aebf07a7c06369c99d98410fc0339fd9040b Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 5 Aug 2019 01:33:56 +0530
Subject: [PATCH 3722/4996] Delegate --profile tabulation to `terminal-table`
 (#7627)

Merge pull request 7627
---
 jekyll.gemspec                      |  1 +
 lib/jekyll/liquid_renderer/table.rb | 77 +++++++----------------------
 test/test_liquid_renderer.rb        |  6 +--
 3 files changed, 21 insertions(+), 63 deletions(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index acbb41ebdf7..68d79fc68af 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("pathutil",              "~> 0.9")
   s.add_runtime_dependency("rouge",                 "~> 3.0")
   s.add_runtime_dependency("safe_yaml",             "~> 1.0")
+  s.add_runtime_dependency("terminal-table",        "~> 1.8")
 
   s.post_install_message = <<~MSG
     -------------------------------------------------------------------------------------
diff --git a/lib/jekyll/liquid_renderer/table.rb b/lib/jekyll/liquid_renderer/table.rb
index 1f83529a0bf..a55bb8c9201 100644
--- a/lib/jekyll/liquid_renderer/table.rb
+++ b/lib/jekyll/liquid_renderer/table.rb
@@ -10,72 +10,29 @@ def initialize(stats)
       end
 
       def to_s(num_of_rows = 50)
-        data = data_for_table(num_of_rows)
-        widths = table_widths(data)
-        generate_table(data, widths)
+        tabulate(data_for_table(num_of_rows))
       end
 
       private
 
-      def generate_table(data, widths)
-        str = +"\n"
-
-        table_head = data.shift
-        table_foot = data.pop
-
-        str << generate_row(table_head, widths)
-        str << generate_table_head_border(table_head, widths)
-
-        data.each do |row_data|
-          str << generate_row(row_data, widths)
-        end
-
-        str << generate_table_head_border(table_foot, widths)
-        str << generate_row(table_foot, widths).rstrip
-
-        str << "\n"
-        str
-      end
-
-      def generate_table_head_border(row_data, widths)
-        str = +""
-
-        row_data.each_index do |cell_index|
-          str << "-" * widths[cell_index]
-          str << "-+-" unless cell_index == row_data.length - 1
-        end
-
-        str << "\n"
-        str
-      end
-
-      def generate_row(row_data, widths)
-        str = +""
-
-        row_data.each_with_index do |cell_data, cell_index|
-          str << if cell_index.zero?
-                   cell_data.ljust(widths[cell_index], " ")
-                 else
-                   cell_data.rjust(widths[cell_index], " ")
-                 end
-
-          str << " | " unless cell_index == row_data.length - 1
-        end
-
-        str << "\n"
-        str
-      end
-
-      def table_widths(data)
-        widths = []
-
-        data.each do |row|
-          row.each_with_index do |cell, index|
-            widths[index] = [cell.length, widths[index]].compact.max
-          end
+      def tabulate(data)
+        require "terminal-table"
+
+        header = data.shift
+        footer = data.pop
+        output = +"\n"
+
+        table = Terminal::Table.new do |t|
+          t << header
+          t << :separator
+          data.each { |row| t << row }
+          t << :separator
+          t << footer
+          t.style = { :alignment => :right, :border_top => false, :border_bottom => false }
+          t.align_column(0, :left)
         end
 
-        widths
+        output << table.to_s << "\n"
       end
 
       # rubocop:disable Metrics/AbcSize
diff --git a/test/test_liquid_renderer.rb b/test/test_liquid_renderer.rb
index 32e980b8af9..13e6867295b 100644
--- a/test/test_liquid_renderer.rb
+++ b/test/test_liquid_renderer.rb
@@ -16,9 +16,9 @@ class TestLiquidRenderer < JekyllUnitTest
 
       # rubocop:disable Metrics/LineLength
       expected = [
-        %r!^Filename\s+|\s+Count\s+|\s+Bytes\s+|\s+Time$!,
-        %r!^-+\++-+\++-+\++-+$!,
-        %r!^_posts/2010-01-09-date-override\.markdown\s+|\s+\d+\s+|\s+\d+\.\d{2}K\s+|\s+\d+\.\d{3}$!,
+        %r!^\| Filename\s+|\s+Count\s+|\s+Bytes\s+|\s+Time$!,
+        %r!^\+(?:-+\+){4}$!,
+        %r!^\|_posts/2010-01-09-date-override\.markdown\s+|\s+\d+\s+|\s+\d+\.\d{2}K\s+|\s+\d+\.\d{3}$!,
       ]
       # rubocop:enable Metrics/LineLength
 

From f8c66f02e11f10a0797e299ed918cd5833902175 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 4 Aug 2019 16:03:58 -0400
Subject: [PATCH 3723/4996] Update history to reflect merge of #7627 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 6f02194e7b2..5cb511678a3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -111,6 +111,7 @@
   * Memoize SiteDrop#documents to reduce allocations (#7697)
   * Add PathManager class to cache interim paths (#7732)
   * Remove warnings and fixes for deprecated config (#7440)
+  * Delegate --profile tabulation to `terminal-table` (#7627)
 
 ### Development Fixes
 

From 764201dc8edc24969d52ccad5d18db9672afe78c Mon Sep 17 00:00:00 2001
From: Michelle Greer 
Date: Sun, 4 Aug 2019 15:06:00 -0500
Subject: [PATCH 3724/4996] Added Bonsai Search (#7543)

Merge pull request 7543
---
 docs/pages/resources.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/pages/resources.md b/docs/pages/resources.md
index 2626970bf35..30a2d1895d6 100644
--- a/docs/pages/resources.md
+++ b/docs/pages/resources.md
@@ -67,6 +67,7 @@ Use a SaaS service as a backend for functionality on your Jekyll site
 
 ### Search
   - [Algolia](https://blog.algolia.com/instant-search-blog-documentation-jekyll-plugin/): Add a powerful instant search to your Jekyll site
+  - [Bonsai Search](https://docs.bonsai.io/article/217-jekyll): The easiest way to use Elasticsearch for your Jekyll site
   - [CloudSh](https://cloudsh.com/generators/How-to-setup-search-on-Jekyll/): Website search with a few lines of JavaScript
 
 ## Other commentary

From 2c7cbddeba7f547834fe37273fc513fdee648f61 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 4 Aug 2019 16:06:02 -0400
Subject: [PATCH 3725/4996] Update history to reflect merge of #7543 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 5cb511678a3..01c1d5f9dab 100644
--- a/History.markdown
+++ b/History.markdown
@@ -300,6 +300,7 @@
   * Add recursive navigation tutorial (#7720)
   * Fix misspelling of "additional" (#7764)
   * docs: improve how to include rouge stylesheets (#7752)
+  * Added Bonsai Search (#7543)
 
 ### Site Enhancements
 

From 65f88311685c0df5aa3a0ee0970d41b879fd3de8 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 5 Aug 2019 01:38:54 +0530
Subject: [PATCH 3726/4996] Reduce allocations by using #each_with_object
 (#7758)

Merge pull request 7758
---
 lib/jekyll/configuration.rb | 10 ++++++----
 lib/jekyll/convertible.rb   |  7 ++++---
 lib/jekyll/site.rb          |  6 +++---
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 2e4d609dd6b..298a90fa932 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -4,7 +4,7 @@ module Jekyll
   class Configuration < Hash
     # Default options. Overridden by values in _config.yml.
     # Strings rather than symbols are used for compatibility with YAML.
-    DEFAULTS = Configuration[{
+    DEFAULTS = {
       # Where things are
       "source"              => Dir.pwd,
       "destination"         => File.join(Dir.pwd, "_site"),
@@ -75,7 +75,7 @@ class Configuration < Hash
         "footnote_nr"   => 1,
         "show_warnings" => false,
       },
-    }.map { |k, v| [k, v.freeze] }].freeze
+    }.each_with_object(Configuration.new) { |(k, v), hsh| hsh[k] = v.freeze }.freeze
 
     class << self
       # Static: Produce a Configuration ready for use in a Site.
@@ -94,7 +94,7 @@ def from(user_config)
     #
     # Return a copy of the hash where all its keys are strings
     def stringify_keys
-      reduce({}) { |hsh, (k, v)| hsh.merge(k.to_s => v) }
+      each_with_object({}) { |(k, v), hsh| hsh[k.to_s] = v }
     end
 
     def get_config_value_with_override(config_key, override)
@@ -235,7 +235,9 @@ def add_default_collections
 
       # Ensure we have a hash.
       if config["collections"].is_a?(Array)
-        config["collections"] = Hash[config["collections"].map { |c| [c, {}] }]
+        config["collections"] = config["collections"].each_with_object({}) do |collection, hash|
+          hash[collection] = {}
+        end
       end
 
       config["collections"] = Utils.deep_merge_hashes(
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 35f6b0f4863..3847831f888 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -112,9 +112,10 @@ def render_liquid(content, payload, info, path)
     #
     # Returns the Hash representation of this Convertible.
     def to_liquid(attrs = nil)
-      further_data = Hash[(attrs || self.class::ATTRIBUTES_FOR_LIQUID).map do |attribute|
-        [attribute, send(attribute)]
-      end]
+      further_data = \
+        (attrs || self.class::ATTRIBUTES_FOR_LIQUID).each_with_object({}) do |attribute, hsh|
+          hsh[attribute] = send(attribute)
+        end
 
       defaults = site.frontmatter_defaults.all(relative_path, type)
       Utils.deep_merge_hashes defaults, Utils.deep_merge_hashes(data, further_data)
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 50653e9042f..8aca2d655a0 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -145,9 +145,9 @@ def ensure_not_in_dest
     #
     # Returns a Hash containing collection name-to-instance pairs.
     def collections
-      @collections ||= Hash[collection_names.map do |coll|
-        [coll, Jekyll::Collection.new(self, coll)]
-      end]
+      @collections ||= collection_names.each_with_object({}) do |name, hsh|
+        hsh[name] = Jekyll::Collection.new(self, name)
+      end
     end
 
     # The list of collection names.

From 93794d9239fefb8e496645bc214df00b82dc4b33 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 4 Aug 2019 16:08:55 -0400
Subject: [PATCH 3727/4996] Update history to reflect merge of #7758 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 01c1d5f9dab..463bcde76d5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -171,6 +171,7 @@
   * Update mime.types (#7756)
   * Replace redundant Array#map with Array#each (#7761)
   * Fix: rubocop offenses (#7769)
+  * Reduce allocations by using #each_with_object (#7758)
 
 ### Documentation
 

From a0c3a6bced74661c2810e291e0ab85c3626d2913 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 5 Aug 2019 01:39:27 +0530
Subject: [PATCH 3728/4996] Memoize fallback_data for Drop (#7728)

Merge pull request 7728
---
 lib/jekyll/drops/url_drop.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/drops/url_drop.rb b/lib/jekyll/drops/url_drop.rb
index 6edb7d64d72..98a03f4a305 100644
--- a/lib/jekyll/drops/url_drop.rb
+++ b/lib/jekyll/drops/url_drop.rb
@@ -125,7 +125,7 @@ def y_day
       private
 
       def fallback_data
-        {}
+        @fallback_data ||= {}
       end
     end
   end

From 2736589ba19ab8390168be58480df4f359745464 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 4 Aug 2019 16:09:29 -0400
Subject: [PATCH 3729/4996] Update history to reflect merge of #7728 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 463bcde76d5..a1dd6eba518 100644
--- a/History.markdown
+++ b/History.markdown
@@ -172,6 +172,7 @@
   * Replace redundant Array#map with Array#each (#7761)
   * Fix: rubocop offenses (#7769)
   * Reduce allocations by using #each_with_object (#7758)
+  * Memoize fallback_data for Drop (#7728)
 
 ### Documentation
 

From 8035a3e153cee4ee48af3dda46f3472c8b524d2f Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 5 Aug 2019 01:41:12 +0530
Subject: [PATCH 3730/4996] Use String#end_with? to check if entry is a backup
 (#7701)

Merge pull request 7701
---
 lib/jekyll/entry_filter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/entry_filter.rb b/lib/jekyll/entry_filter.rb
index b8f4e044238..4f527eddf57 100644
--- a/lib/jekyll/entry_filter.rb
+++ b/lib/jekyll/entry_filter.rb
@@ -53,7 +53,7 @@ def special?(entry)
     end
 
     def backup?(entry)
-      entry[-1..-1] == "~"
+      entry.end_with?("~")
     end
 
     def excluded?(entry)

From 272360a80b75a79333491ed4876ad7cb668ccee8 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 4 Aug 2019 16:11:13 -0400
Subject: [PATCH 3731/4996] Update history to reflect merge of #7701 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index a1dd6eba518..e32abe94383 100644
--- a/History.markdown
+++ b/History.markdown
@@ -173,6 +173,7 @@
   * Fix: rubocop offenses (#7769)
   * Reduce allocations by using #each_with_object (#7758)
   * Memoize fallback_data for Drop (#7728)
+  * Use String#end_with? to check if entry is a backup (#7701)
 
 ### Documentation
 

From 0490d71661c1383a815ae9ef85863566acf93087 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 4 Aug 2019 22:25:14 +0200
Subject: [PATCH 3732/4996] Fix 404

---
 docs/_posts/2019-08-04-jekyll-4-0-0-pre-beta1-released.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/_posts/2019-08-04-jekyll-4-0-0-pre-beta1-released.markdown b/docs/_posts/2019-08-04-jekyll-4-0-0-pre-beta1-released.markdown
index cf470f2987e..64f16975b13 100644
--- a/docs/_posts/2019-08-04-jekyll-4-0-0-pre-beta1-released.markdown
+++ b/docs/_posts/2019-08-04-jekyll-4-0-0-pre-beta1-released.markdown
@@ -4,6 +4,7 @@ date: 2019-08-04 10:43:31 -0500
 author: mattr-
 version: 4.0.0.pre.beta1
 categories: [release]
+redirect_from: /news/2019/07/20/jekyll-4-0-0-pre-beta1-released/
 ---
 
 Dear Jekyllers,

From de60632309bdd3a1cc16d2b2bdc6137ca2217d2d Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 14 Aug 2019 23:06:11 +0530
Subject: [PATCH 3733/4996] Remove configuration of theme sass files from Core
 (#7290)

Merge pull request 7290
---
 Gemfile                                    |  4 ++++
 features/rendering.feature                 |  2 +-
 features/theme.feature                     | 13 ++++++++++---
 jekyll.gemspec                             |  2 +-
 lib/jekyll/theme.rb                        |  8 --------
 test/fixtures/test-theme/assets/style.scss |  2 +-
 test/test_filters.rb                       | 14 +++++++++-----
 test/test_sass.rb                          |  7 ++++++-
 test/test_site.rb                          |  5 +++--
 test/test_theme.rb                         |  6 ------
 test/test_theme_assets_reader.rb           |  2 +-
 11 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/Gemfile b/Gemfile
index df6d2f2718d..3828ee7a503 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,10 @@ gemspec :name => "jekyll"
 # refinements introduced in i18n-1.3.0
 gem "i18n", "~> 1.2.0" if RUBY_ENGINE == "jruby"
 
+# Point to the sass-converter's repository to ensure Windows builds render as expected.
+# Remove once "jekyll-sass-converter-2.0.0" ships.
+gem "jekyll-sass-converter", :github => "jekyll/jekyll-sass-converter"
+
 gem "rake", "~> 12.0"
 
 group :development do
diff --git a/features/rendering.feature b/features/rendering.feature
index 654facd5f95..2ecd86dc37b 100644
--- a/features/rendering.feature
+++ b/features/rendering.feature
@@ -154,7 +154,7 @@ Feature: Rendering
     When I run jekyll build
     Then I should get a zero exit status
     And the _site directory should exist
-    And I should see ".foo-bar {\n  color: red; }" in "_site/index.css"
+    And I should see ".foo-bar { color: red; }\n\n\/\*# sourceMappingURL=index.css.map \*\/" in "_site/index.css"
 
   Scenario: Not render liquid in CoffeeScript without explicitly including jekyll-coffeescript
     Given I have an "index.coffee" page with animal "cicada" that contains "hey='for {{page.animal}}'"
diff --git a/features/theme.feature b/features/theme.feature
index 3941abc8d86..5f78a233152 100644
--- a/features/theme.feature
+++ b/features/theme.feature
@@ -16,12 +16,19 @@ Feature: Writing themes
 
   Scenario: A theme with SCSS
     Given I have a configuration file with "theme" set to "test-theme"
-    And I have a css directory
-    And I have a "css/main.scss" page that contains "@import 'test-theme-black';"
     When I run jekyll build
     Then I should get a zero exit status
     And the _site directory should exist
-    And I should see ".sample {\n  color: black; }" in "_site/css/main.css"
+    And I should see ".sample { color: red; }\n\n\/\*# sourceMappingURL=style.css.map \*\/" in "_site/assets/style.css"
+
+  Scenario: Overriding a theme with SCSS
+    Given I have a configuration file with "theme" set to "test-theme"
+    And I have an assets directory
+    And I have an "assets/style.scss" page that contains "@import 'test-theme-black';"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see ".sample { color: black; }\n\n\/\*# sourceMappingURL=style.css.map \*\/" in "_site/assets/style.css"
 
   Scenario: A theme with an include
     Given I have a configuration file with "theme" set to "test-theme"
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 68d79fc68af..a3ac65bd2b8 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("colorator",             "~> 1.0")
   s.add_runtime_dependency("em-websocket",          "~> 0.5")
   s.add_runtime_dependency("i18n",                  ">= 0.9.5", "< 2")
-  s.add_runtime_dependency("jekyll-sass-converter", "~> 1.0")
+  s.add_runtime_dependency("jekyll-sass-converter", "= 2.0.0.pre.beta")
   s.add_runtime_dependency("jekyll-watch",          "~> 2.0")
   s.add_runtime_dependency("kramdown",              "~> 2.1")
   s.add_runtime_dependency("kramdown-parser-gfm",   "~> 1.0")
diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb
index ac0330201ea..5ef4d044504 100644
--- a/lib/jekyll/theme.rb
+++ b/lib/jekyll/theme.rb
@@ -10,7 +10,6 @@ def initialize(name)
       @name = name.downcase.strip
       Jekyll.logger.debug "Theme:", name
       Jekyll.logger.debug "Theme source:", root
-      configure_sass
     end
 
     def root
@@ -38,13 +37,6 @@ def assets_path
       @assets_path ||= path_for "assets"
     end
 
-    def configure_sass
-      return unless sass_path
-
-      External.require_with_graceful_fail("sass") unless defined?(Sass)
-      Sass.load_paths << sass_path
-    end
-
     def runtime_dependencies
       gemspec.runtime_dependencies
     end
diff --git a/test/fixtures/test-theme/assets/style.scss b/test/fixtures/test-theme/assets/style.scss
index 47c4a2f1375..00096523507 100644
--- a/test/fixtures/test-theme/assets/style.scss
+++ b/test/fixtures/test-theme/assets/style.scss
@@ -1,3 +1,3 @@
 ---
 ---
-@import "test-theme-{{ site.theme-color | default: "red" }}";
+@import "test-theme-{{ site.theme-color | default: 'red' }}";
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 39ec85653eb..19f841eed25 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -138,14 +138,18 @@ def select; end
 
     should "sassify with simple string" do
       assert_equal(
-        "p {\n  color: #123456; }\n",
-        @filter.sassify("$blue:#123456\np\n  color: $blue")
+        "p { color: #123456; }\n",
+        @filter.sassify(<<~SASS)
+          $blue: #123456
+          p
+            color: $blue
+        SASS
       )
     end
 
     should "scssify with simple string" do
       assert_equal(
-        "p {\n  color: #123456; }\n",
+        "p { color: #123456; }\n",
         @filter.scssify("$blue:#123456; p{color: $blue}")
       )
     end
@@ -811,7 +815,7 @@ def to_liquid
               "The list of grouped items for '' is not an Array."
             )
             # adjust array.size to ignore symlinked page in Windows
-            qty = Utils::Platforms.really_windows? ? 15 : 16
+            qty = Utils::Platforms.really_windows? ? 16 : 18
             assert_equal qty, g["items"].size
           end
         end
@@ -1066,7 +1070,7 @@ def to_liquid
               "The list of grouped items for '' is not an Array."
             )
             # adjust array.size to ignore symlinked page in Windows
-            qty = Utils::Platforms.really_windows? ? 15 : 16
+            qty = Utils::Platforms.really_windows? ? 16 : 18
             assert_equal qty, g["items"].size
           end
         end
diff --git a/test/test_sass.rb b/test/test_sass.rb
index 686631d6020..d4708ef40f0 100644
--- a/test/test_sass.rb
+++ b/test/test_sass.rb
@@ -14,7 +14,12 @@ class TestSass < JekyllUnitTest
     end
 
     should "import SCSS partial" do
-      assert_equal ".half {\n  width: 50%; }\n", File.read(@test_css_file)
+      result = <<~CSS
+        .half { width: 50%; }
+
+        /*# sourceMappingURL=main.css.map */
+      CSS
+      assert_equal result.rstrip, File.read(@test_css_file)
     end
 
     should "register the SCSS converter" do
diff --git a/test/test_site.rb b/test/test_site.rb
index c8166fed700..70614fdef2e 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -240,6 +240,7 @@ def generate(site)
         index.html
         index.html
         info.md
+        main.css.map
         main.scss
         properties.html
         sitemap.xml
@@ -248,9 +249,9 @@ def generate(site)
       )
       unless Utils::Platforms.really_windows?
         # files in symlinked directories may appear twice
-        sorted_pages.push("main.scss", "symlinked-file").sort!
+        sorted_pages.push("main.css.map", "main.scss", "symlinked-file").sort!
       end
-      assert_equal sorted_pages, @site.pages.map(&:name)
+      assert_equal sorted_pages, @site.pages.map(&:name).sort!
     end
 
     should "read posts" do
diff --git a/test/test_theme.rb b/test/test_theme.rb
index bc1f8de6821..4c6fee2750c 100644
--- a/test/test_theme.rb
+++ b/test/test_theme.rb
@@ -26,12 +26,6 @@ def setup
         Theme.new("foo").version
       end
     end
-
-    should "add itself to sass's load path" do
-      @theme.configure_sass
-      message = "Sass load paths should include the theme sass dir"
-      assert Sass.load_paths.include?(@theme.sass_path), message
-    end
   end
 
   context "path generation" do
diff --git a/test/test_theme_assets_reader.rb b/test/test_theme_assets_reader.rb
index 983f63b7a80..02ce004fad6 100644
--- a/test/test_theme_assets_reader.rb
+++ b/test/test_theme_assets_reader.rb
@@ -39,7 +39,7 @@ def refute_file_with_relative_path(haystack, relative_path)
       file = @site.pages.find { |f| f.relative_path == "assets/style.scss" }
       refute_nil file
       assert_equal @site.in_dest_dir("assets/style.css"), file.destination(@site.dest)
-      assert_includes file.output, ".sample {\n  color: black; }"
+      assert_includes file.output, ".sample { color: black; }"
     end
 
     should "not overwrite site content with the same relative path" do

From 65773e19a8aed4d7e7fd6ad7f8cbb33f2fcec6ff Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 14 Aug 2019 13:36:15 -0400
Subject: [PATCH 3734/4996] Update history to reflect merge of #7290 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index e32abe94383..a232a2a1ac3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -65,6 +65,7 @@
   * Don't read symlinks in site.include in safe mode (#7711)
   * Replace `String#=~` with `String#match?` (#7723)
   * Update log output for an invalid theme directory (#7679)
+  * Remove configuration of theme sass files from Core (#7290)
 
 ### Minor Enhancements
 

From 4e37fb64200e08d2ea532be1d269064aaedd7ab5 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 14 Aug 2019 23:54:55 +0530
Subject: [PATCH 3735/4996] Use jekyll-sass-converter-2.0 by default (#7778)

Merge pull request 7778
---
 Gemfile        | 4 ----
 jekyll.gemspec | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3828ee7a503..df6d2f2718d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,10 +7,6 @@ gemspec :name => "jekyll"
 # refinements introduced in i18n-1.3.0
 gem "i18n", "~> 1.2.0" if RUBY_ENGINE == "jruby"
 
-# Point to the sass-converter's repository to ensure Windows builds render as expected.
-# Remove once "jekyll-sass-converter-2.0.0" ships.
-gem "jekyll-sass-converter", :github => "jekyll/jekyll-sass-converter"
-
 gem "rake", "~> 12.0"
 
 group :development do
diff --git a/jekyll.gemspec b/jekyll.gemspec
index a3ac65bd2b8..cec995b90d6 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("colorator",             "~> 1.0")
   s.add_runtime_dependency("em-websocket",          "~> 0.5")
   s.add_runtime_dependency("i18n",                  ">= 0.9.5", "< 2")
-  s.add_runtime_dependency("jekyll-sass-converter", "= 2.0.0.pre.beta")
+  s.add_runtime_dependency("jekyll-sass-converter", "~> 2.0")
   s.add_runtime_dependency("jekyll-watch",          "~> 2.0")
   s.add_runtime_dependency("kramdown",              "~> 2.1")
   s.add_runtime_dependency("kramdown-parser-gfm",   "~> 1.0")

From fd476206d7d3690bec8df0f5d0a2407120b9e65d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 14 Aug 2019 14:24:57 -0400
Subject: [PATCH 3736/4996] Update history to reflect merge of #7778 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index a232a2a1ac3..885eb807617 100644
--- a/History.markdown
+++ b/History.markdown
@@ -175,6 +175,7 @@
   * Reduce allocations by using #each_with_object (#7758)
   * Memoize fallback_data for Drop (#7728)
   * Use String#end_with? to check if entry is a backup (#7701)
+  * Use jekyll-sass-converter-2.0 by default (#7778)
 
 ### Documentation
 

From 326ab2dfb70f18c3f0e5d9bfafd4f48232ec68f5 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 15 Aug 2019 00:12:34 +0530
Subject: [PATCH 3737/4996] Using jekyll-sass-converter 2.0 is a major change

---
 History.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/History.markdown b/History.markdown
index 885eb807617..ca40aba78a5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -26,6 +26,7 @@
   * Remove Jekyll::Utils#strip_heredoc in favor of a Ruby > 2.3 built in (#7584)
   * Incorporate `relative_url` within `post_url` tag (#7589)
   * Remove patch to modify config for kramdown (#7699)
+  * Use jekyll-sass-converter-2.0 by default (#7778)
 
 ### Bug Fixes
 
@@ -175,7 +176,6 @@
   * Reduce allocations by using #each_with_object (#7758)
   * Memoize fallback_data for Drop (#7728)
   * Use String#end_with? to check if entry is a backup (#7701)
-  * Use jekyll-sass-converter-2.0 by default (#7778)
 
 ### Documentation
 

From 26914126c77712637d3e7a53ce52b841e9afe229 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Wed, 14 Aug 2019 21:18:32 +0200
Subject: [PATCH 3738/4996] Cleanup History

---
 History.markdown | 198 +++++++++++++++++++----------------------------
 1 file changed, 81 insertions(+), 117 deletions(-)

diff --git a/History.markdown b/History.markdown
index ca40aba78a5..23a3805b17a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
   * Drop support for `jekyll-watch-1.4.0` and older (#7287)
   * Incorporate `relative_url` filter in `link` tag (#6727)
   * Upgrade kramdown dependency to v2.x (#7492)
+  * Upgrade jekyll-sass-converter to v2.x - Sassc + sourcemaps (#7778)
   * Upgrade i18n to v1.x (#6931)
   * Add `Jekyll::Cache` class to handle caching on disk (#7169)
   * Cache converted markdown (#7159)
@@ -26,7 +27,6 @@
   * Remove Jekyll::Utils#strip_heredoc in favor of a Ruby > 2.3 built in (#7584)
   * Incorporate `relative_url` within `post_url` tag (#7589)
   * Remove patch to modify config for kramdown (#7699)
-  * Use jekyll-sass-converter-2.0 by default (#7778)
 
 ### Bug Fixes
 
@@ -71,9 +71,12 @@
 ### Minor Enhancements
 
   * Enhance `--blank` scaffolding (#7310)
+  * Use `jekyll-compose` if installed (#6932)
+  * Disable Liquid via front matter (#6824)
+  * Configure cache_dir (#7232)
+  * ISO week date drops (#5981)
   * Fix custom 404 page for GitHub pages (#7132)
   * Load config file from within current theme-gem (#7304)
-  * Use `jekyll-compose` if installed (#6932)
   * Suggest re-running command with `--trace` on fail (#6551)
   * Support for binary operators in where_exp filter (#6998)
   * Automatically load `_config.toml` (#7299)
@@ -85,7 +88,6 @@
   * Cache globbed paths in front matter defaults (#7345)
   * Cache computed item property (#7301)
   * Cleanup Markdown converter (#7519)
-  * Disable Liquid via front matter (#6824)
   * Do not process Liquid in post excerpt when disabled in front matter (#7146)
   * Liquefied link tag (#6269)
   * Update item_property to return numbers as numbers instead of strings (#6608)
@@ -98,10 +100,8 @@
   * Add a custom inspect string for StaticFile objects (#7422)
   * Remind user to include gem in the Gemfile on error (#7476)
   * Search Front matter defaults for Page objects with relative_path (#7261)
-  * Configure cache_dir (#7232)
   * Lock use of `tzinfo` gem to v1.x (#7521, #7562)
   * Utilize absolute paths of user-provided file paths (#7450)
-  * ISO week date drops (#5981)
   * Detect `nil` and empty values in objects with `where` filter (#7580)
   * Initialize mutations for Drops only if necessary (#7657)
   * Reduce Array allocations via Jekyll::Cleaner (#7659)
@@ -117,209 +117,173 @@
 
 ### Development Fixes
 
+  * Upgrade liquid-c to v4.0 (#7375)
+  * Bump RuboCop to v0.71.0 (#7687)
+  * Target Ruby 2.4 syntax (#7583)
+  * Fix: RuboCop offenses (#7769)
   * Use communicative method parameters (#7566)
   * Scan `assert_equal` methods and rectify any offenses with a custom RuboCop cop (#7130)
-  * Add a script to profile docs with CI (#7540)
-  * Test with Ruby 2.6 on AppVeyor (#7518)
+  * CI: Test with Ruby 2.6 (#7438)
+  * CI: Test with Ruby 2.6 on AppVeyor (#7518)
+  * CI: Update RuboCop config (#7050)
+  * CI: Add a script to profile docs (#7540)
+  * CI(Appveyor): shallow clone with 5 last commits (#7312)
+  * CI: Test with oldest and latest Ruby only (#7412)
+  * CI: Update excludes for CodeClimate Analyses (#7365)
+  * CI: Lock Travis to Bundler-1.16.2 (#7144)
+  * CI: Bump tested version of JRuby to 9.2.7.0 (#7612)
+  * CI: Do not install docs on updating gems on Travis (#7706)
   * Update gemspec (#7425)
-  * Upgrade liquid-c to v4.0 (#7375)
-  * Bump RuboCop to v0.63.x (#7489)
-  * Bump RuboCop to v0.62.x (#7449)
-  * Bump RuboCop to v0.61.x (#7401)
-  * Bump RuboCop to v0.60.x (#7338)
-  * Bump RuboCop to v0.59.0 (#7237)
-  * Bump RuboCop to v0.57.x (#7078)
-  * Relax version constraint on classifier-reborn gem (#7471)
-  * Test with Ruby v2.6 (#7438)
+  * deps: relax version constraint on classifier-reborn gem (#7471)
+  * deps: update yajl-ruby (#7278)
+  * deps: bump yajl-ruby to v1.4.0 (#6976)
   * Create symlink only if target is accessible (#7429)
-  * Test with oldest and latest Ruby only (#7412)
   * Switch to `:install_if` for wdm gem (#7372)
-  * Update excludes for CodeClimate Analyses (#7365)
-  * CI(Appveyor): shallow clone with 5 last commits (#7312)
-  * update yajl-ruby (#7278)
   * Add cucumber feature to test include_relative tag (#7213)
   * Small benchmark refactoring (#7211)
-  * Lock Travis to Bundler-1.16.2 (#7144)
   * Fix incorrectly passed arguments to assert_equal (#7134)
   * fix up refute_equal call (#7133)
   * Fix RuboCop offences in test files (#7128)
   * Use assert_include (#7093)
   * Remember to release docs gem (#7066)
-  * Update RuboCop's config (#7050)
   * Useless privates removed (#6768)
   * Load Rouge for TestKramdown (#7007)
-  * yajl-ruby update to v1.4.0 (#6976)
   * Update instructions for releasing docs Gem (#6975)
   * We are not using Ruby 2.2 anymore (#6977)
   * Remove unnecessary Jekyll::Page constant (#6770)
   * Remove unused error class (#6511)
   * Add a Cucumber feature for post_url tag (#7586)
-  * Bump tested version of JRuby to 9.2.7.0 (#7612)
   * Generate a "TOTAL" row for build-profile table (#7614)
-  * Target Ruby 2.4 syntax in RuboCop scans (#7583)
-  * Bump RuboCop to v0.68.x (#7637)
   * Refactor Jekyll::Cache (#7532)
   * Store list of expected extnames in a constant (#7638)
-  * Bump RuboCop to v0.69.x (#7656)
   * Profile allocations from a build session (#7646)
   * Update small typo in contributing.md (#7671)
-  * Bump RuboCop to v0.70.x (#7678)
   * Remove override to Jekyll::Document#respond_to? (#7695)
-  * Do not install docs on updating gems on Travis (#7706)
   * Update TestTags in sync with Rouge v3.4 (#7709)
-  * Bump RuboCop to v0.71.0 (#7687)
   * Use regexp to filter special entries (#7702)
   * Reduce Array objects generated from utility method (#7749)
   * Update mime.types (#7756)
   * Replace redundant Array#map with Array#each (#7761)
-  * Fix: rubocop offenses (#7769)
   * Reduce allocations by using #each_with_object (#7758)
   * Memoize fallback_data for Drop (#7728)
   * Use String#end_with? to check if entry is a backup (#7701)
 
 ### Documentation
 
-  * Add Installation Instructions for Ubuntu (#6925)
-  * add liquid tag jekyll-flickr (#6946)
-  * Updated copy - fixed casing of SaaS on resources page. (#6949)
+  * Refactor docs (#7205)
+  * Add a link to Giraffe Academy's tutorial (#7325)
   * Do not advise users to install Jekyll outside of Bundler (#6927)
+  * Remove documentation for using Redcarpet (#6990)
+  * Install Docs that Work on MacOS 10.14 (#7561)
+  * Add Installation Instructions for Ubuntu (#6925)
   * Don't prompt for sudo when installing with Ubuntu WSL (#6781)
-  * Fix typo (#6969)
+  * Installation instructions for Fedora (#7198)
+  * Update Windows install docs (#6926)  
+  * List all standard liquid filters (#7333)
+  * List all static files variables (#7002)
+  * Improve how to include Rouge stylesheets (#7752)
+  * Mention CommonMark plugins (#7418)
+  * Add TSV to list of supported _data files. (#7168)
+  * How to deploy using pre-push git hook (#7179)
+  * Hosting with AWS Amplify (#7510)
+  * CircleCI deployment through CircleCI v2 (#7024)
+  * GitHub Pages: use themes from other repos (#7112)
+  * Document page.dir and page.name (#7373)
+  * Document custom tag blocks (#7359)
+  * Document converter methods (#7289)
+  * Document `{{ page.collection }}` (#7430)
+  * Document Jekyll Filters with YAML data (#7335)
+  * Document where Jekyll looks for layouts in a site (#7564)
+  * plugin: liquid tag jekyll-flickr (#6946)
+  * plugin: jekyll-target-blank (#7046)
+  * plugin: json-get. (#7086)
+  * plugin: `jekyll-info` (#7091)
+  * plugin: jekyll-xml-source (#7114)
+  * plugin: jekyll-firstimage filter (#7127)
+  * plugin: CAT (#7011)
+  * Resources: Statictastic (#7593)
+  * Resources: Bonsai Search (#7543)
+  * Resources: Formspark (#7601)
+  * Resources: Jekpack(#7598)
+  * Resources: formX (#7536)
+  * Resources: 99inbound's Jekyll post (#7348)
+  * Resources: CloudSh (#7497)
+  * Community:  DEV Community's Jekyll tag (#7139)
+  * Showcase: developer.spotify.com (#7217)
+  * Showcase: Isomer (#7300)
   * Add version number for group_by_exp doc (#6956)
-  * Update Windows install docs (#6926)
-  * Remove documentation for using Redcarpet (#6990)
   * Updated nginx configuration for custom-404-page documentation (#6994)
-  * List all static files variables (#7002)
-  * Document that _drafts need to be contained within the custom collection directory (#6985)
-  * Change for passive voice. (#7005)
-  * Added the CAT plugin to the plugin list (#7011)
-  * Updated to supported version (#7031)
   * Clarify definition of 'draft' (#7037)
-  * Listed the jekyll-target-blank plugin in plugins list. (#7046)
-  * Typo (#7058)
+  * _drafts need to be contained within the custom collection directory (#6985)
+  * Updated to supported version (#7031)
   * Add Hints for some Improved Travis Config in Doc (#7049)
-  * Added plugin json-get. (#7086)
   * Update travis-ci.md to point out "this is an example Gemfile" (#7089)
-  * Adding `jekyll-info` plugin (#7091)
-  * GitHub enables you to use themes from other repos (#7112)
-  * Updates to CODE OF CONDUCT  (v1.4.0) (#7105)
   * Instructions to view theme’s files under Linux (#7095)
-  * Add jekyll-xml-source (#7114)
-  * Add the jekyll-firstimage filter plugin (#7127)
   * Use a real theme in the example (#7125)
   * Update docs about post creation (#7138)
-  * Add DEV Community's Jekyll tag to community page (#7139)
   * Initialize upgrading doc for v4.0 (#7140)
   * Add version badge for date filters with ordinal (#7162)
-  * Add closing tags for <a> (#7163)
-  * Add TSV to list of supported _data files. (#7168)
   * Corrected sample usage of postfiles (#7181)
-  * Add missing html end tag for code example in section 'For loops' (#7199)
   * Resolve "Unable to locate package ruby2.4" error (#7196)
-  * Installation instructions for Fedora (#7198)
-  * New docs (#7205)
-  * List all standard liquid filters (#7333)
   * Correct stylesheet url in tutorial step 7 (#7210)
-  * Add some minor improvements to image loading in Showcase page (#7214)
-  * Fix minor grammatical error (#7215)
-  * Add developer.spotify.com to the Jekyll Showcase (#7217)
   * Removes quotes from markdown for assets (#7223)
   * Clarified front matter requirement (#7234)
-  * Minor whitespace fixes (#7238)
   * Explicit location of where to create blog.html (#7241)
-  * Fix a small grammar error/typo in the docs (#7260)
   * Reference the build command options that allows multiple config files (#7266)
-  * Update 10-deployment.md (#7268)
   * Add more issue template(s) and pull request template (#7269)
   * Suggest sites use OpenSSL instead of GnuTLS for their site's CI (#7010)
   * Fix broken Contributors link in README.markdown (#7200)
   * Add title tag to item in RSS template (#7282)
-  * More inclusive writing (#7283)
-  * Document converter methods (#7289)
   * Add link tag to item in RSS template (#7291)
-  * Add Isomer to showcase (#7300)
-  * Added missing semicolon (#7306)
-  * "This restricts you..." to "This restricts your" (#7307)
-  * Add a link to Giraffe Academy's tutorial (#7325)
-  * Grammar correction (#7327)
-  * Document Jekyll Filters with YAML data (#7335)
   * Remove redundant instruction comment (#7342)
-  * Minimize rendering count (#7343)
-  * Update posts.md (#7360)
-  * Add info how to deploy using pre-push git hook (#7179)
   * Textile is only supported through a converter plugin (#7003)
-  * Add documentation for custom tag blocks (#7359)
-  * Added 99inbound's Jekyll post to form resources (#7348)
-  * Document page.dir and page.name (#7373)
+  * Add recursive navigation tutorial (#7720)
   * Remove installation instructions with Homebrew (#7381)
   * Fix dead link and misleading prose (#7383)
   * Fix content management section (#7385)
-  * Proposed re-wording of Sass note. :) (#7392)
   * Apply ruby official guide documents (#7393)
   * Fix group_by_exp filter example (#7394)
-  * Adjust team page listings (#7395)
-  * Update resources.md (#7396)
-  * Update resources.md (#7397)
   * Remove alt attribute from a tags (#7407)
-  * Fix grammatical error in permalinks.md (#7409)
   * Fix BASH code-block in ubuntu.md (#7420)
   * zlib is missing (#7428)
-  * Include docs for `{{ page.collection }}` (#7430)
-  * Permalink docs typo fixes (#7459)
   * Fixed unnecessary aticles and pronouns (#7466)
-  * Grammatical correction (#7464)
-  * Update resources.md (#7472)
   * Store SSL key and cert in site source (#7473)
-  * Minor doc fixes (#7495)
-  * Changed order of steps (#7503)
-  * Hosting with AWS Amplify (#7510)
   * Fix typo in tutorial for converting existing site (#7524)
-  * Add CloudSh to resource page. (#7497)
   * Check if var exists before include tag (#7530)
-  * Added formX to form-backend resources (#7536)
   * Clarify docs on collections regarding the need for front matter (#7538)
   * Fix incorrect Windows path in themes.md (#7525)
-  * Document where Jekyll looks for layouts in a site (#7564)
-  * Mention CommonMark plugins (#7418)
   * Addresses bundle not found. (#7351)
-  * Example of CircleCI deployment through CircleCI v2 (#7024)
-  * v4.0 development post (#6934)
-  * Release post for v3.8.0 (#6849)
-  * Release Post for v3.6.3, v3.7.4 and v3.8.4 (#7259)
-  * Adds Statictastic to the list of resources (#7593)
-  * Update 07-assets.md (#7599)
-  * Fix link space (#7600)
-  * Added Formspark to form resources (#7601)
-  * Simplify couple of includes in the docs site (#7607)
-  * Avoid generating empty classnames (#7610)
-  * Install Docs that Work on MacOS 10.14 (#7561)
   * Update the contribution docs for draft pull requests (#7619)
-  * Doc: Data file section adds TSV (#7640)
+  * Data file section adds TSV (#7640)
   * Indicate where the _sass folder is by default (#7644)
   * Docs: add version tags to new placeholders (#5981) for permalinks (#7647)
   * Solve "GitHub Page build failure" in 10-deployment.md (#7648)
-  * Fix typo from 'Github' to 'GitHub' (#7691)
   * fix link to Site Source config (#7708)
-  * Add Jekpack to resources page (#7598)
   * Introduce frontmatter in step 2 (#7704)
-  * Add recursive navigation tutorial (#7720)
-  * Fix misspelling of "additional" (#7764)
-  * docs: improve how to include rouge stylesheets (#7752)
-  * Added Bonsai Search (#7543)
-
-### Site Enhancements
-
   * Add @ashmaroli to Core Team listing (#7398)
   * Lnk to Tidelift in site's footer (#7377)
   * Link to OpenCollective backing (#7378
   * Link to sponsor listing in README (#7405)
+  * Adjust team page listings (#7395)
+  * Updates to CODE OF CONDUCT (v1.4.0) (#7105)
+  * More inclusive writing (#7283)
+
+### Site Enhancements
+
   * Better Performance (#7388)
+  * Add some minor improvements to image loading in Showcase page (#7214)
   * Simplify assigning classname to docs' aside-links (#7609)
+  * Simplify couple of includes in the docs site (#7607)
+  * Avoid generating empty classnames (#7610)
+  * Minimize rendering count (#7343)
 
-### release
+### Release
 
-  * Release v4.0.0.pre.alpha1 (#7574)
-  * Prepare Jekyll 4.0.0 beta1 (#7716)
+  * Release post for v4.0.0 beta1 (#7716)
+  * Release post for v4.0.0.pre.alpha1 (#7574)
+  * Release post for v3.8.0 (#6849)
+  * Release post for v3.6.3, v3.7.4 and v3.8.4 (#7259)
+  * Post: v4.0 development (#6934)
 
 ## 3.8.6 / 2019-07-02
 

From 759315bfa394191d961e6363b4b527af6cb942c9 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 17 Aug 2019 14:02:14 +0200
Subject: [PATCH 3739/4996] Upgrade documentation for Jekyll v4.0

---
 .travis.yml                              |  4 +--
 docs/_config.yml                         |  3 +-
 docs/_data/ruby.yml                      |  3 ++
 docs/_docs/collections.md                |  3 --
 docs/_docs/front-matter.md               |  6 ++--
 docs/_docs/installation.md               |  2 +-
 docs/_docs/installation/macos.md         | 14 ++++-----
 docs/_docs/liquid/filters.md             |  2 +-
 docs/_docs/liquid/tags.md                | 40 ++++++++++--------------
 docs/_docs/permalinks.md                 | 14 ++++-----
 docs/_docs/ruby-101.md                   |  8 ++---
 docs/_docs/themes.md                     | 28 +++++++----------
 docs/_docs/upgrading/3-to-4.md           |  6 ++--
 docs/_docs/usage.md                      |  4 +--
 docs/_includes/news_contents_mobile.html |  2 +-
 docs/latest_version.txt                  |  2 +-
 jekyll.gemspec                           |  3 +-
 lib/jekyll/commands/new.rb               |  4 +--
 18 files changed, 68 insertions(+), 80 deletions(-)
 create mode 100644 docs/_data/ruby.yml

diff --git a/.travis.yml b/.travis.yml
index 177239f77cb..6e84755212b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,8 @@ cache: bundler
 language: ruby
 
 rvm:
-  - &ruby1 2.6.0
-  - &ruby2 2.4.5
+  - &ruby1 2.6.3
+  - &ruby2 2.4.6
   - &jruby jruby-9.2.7.0
 
 matrix:
diff --git a/docs/_config.yml b/docs/_config.yml
index 0c7a2b1b6d7..e7aebd56fb3 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,6 +1,5 @@
 ---
 version: 3.8.6
-min_ruby_version: 2.4.0
 name: Jekyll • Simple, blog-aware, static sites
 description: Transform your plain text into static websites and blogs
 url: https://jekyllrb.com
@@ -54,6 +53,8 @@ feed:
 sass:
   style: compressed
 
+strict_front_matter: true
+
 exclude:
 - .gitignore
 - .jekyll-cache
diff --git a/docs/_data/ruby.yml b/docs/_data/ruby.yml
new file mode 100644
index 00000000000..be3cdb28a14
--- /dev/null
+++ b/docs/_data/ruby.yml
@@ -0,0 +1,3 @@
+min_version: 2.4.0
+current_version: 2.6.3
+current_version_output: ruby 2.6.3p62 (2019-04-16 revision 67580)
diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index f951564ea5f..e2e6ac6883f 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -114,8 +114,6 @@ You can link to the generated page using the `url` attribute:
 There are special [permalink variables for collections](/docs/permalinks/) to
 help you control the output url for the entire collection.
 
-{% if site.version == '4.0.0' %}{% comment %} Remove this encapsulation when v4.0 ships {% endcomment %}
-
 ## Custom Sorting of Documents
 
 By default, documents in a collection are sorted by their paths. But you can control this sorting via the collection's metadata.
@@ -164,7 +162,6 @@ collections:
 ```
 
 If both metadata keys have been defined properly, `order` list takes precedence.
-{% endif %}
 
 ## Liquid Attributes
 
diff --git a/docs/_docs/front-matter.md b/docs/_docs/front-matter.md
index 084235133f7..a3deb697193 100644
--- a/docs/_docs/front-matter.md
+++ b/docs/_docs/front-matter.md
@@ -33,7 +33,7 @@ relies on.
 
    
 
 
    
-  
    ProTip™: Front Matter Variables Are Optional
    
+  
    Front Matter Variables Are Optional
    
   
    
     If you want to use Liquid tags and variables
     but don’t need anything in your front matter, just leave it empty! The set
@@ -114,7 +114,7 @@ front matter of a page or post.
 
    
 
 
    
-  
    ProTip™: Render Posts Marked As Unpublished
    
+  
    Render Posts Marked As Unpublished
    
   
    
     To preview unpublished pages, run `jekyll serve` or `jekyll build`
     with the `--unpublished` switch. Jekyll also has a handy drafts
@@ -201,7 +201,7 @@ These are available out-of-the-box to be used in the front matter for a post.
 
    
 
 
    
-  
    ProTip™: Don't repeat yourself
    
+  
    Don't repeat yourself
    
   
    
     If you don't want to repeat your frequently used front matter variables
     over and over, define defaults
diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index e40cebd7f7b..22c60276a2a 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -8,7 +8,7 @@ Jekyll is a [Ruby Gem](/docs/ruby-101/#gems) that can be installed on most syste
 
 ## Requirements
 
-* [Ruby](https://www.ruby-lang.org/en/downloads/) version {{ site.min_ruby_version }} or above, including all development headers (ruby version can be checked by running `ruby -v`)
+* [Ruby](https://www.ruby-lang.org/en/downloads/) version **{{ site.data.ruby.min_version }}** or above, including all development headers (ruby version can be checked by running `ruby -v`)
 * [RubyGems](https://rubygems.org/pages/download) (which you can check by running `gem -v`)
 * [GCC](https://gcc.gnu.org/install/) and [Make](https://www.gnu.org/software/make/) (in case your system doesn't have them installed, which you can check by running `gcc -v`,`g++ -v`  and `make -v` in your system's command line interface)
 
diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md
index 1a9970917ce..56b1b2ffda1 100644
--- a/docs/_docs/installation/macos.md
+++ b/docs/_docs/installation/macos.md
@@ -12,7 +12,7 @@ xcode-select --install
 
 ## Install Ruby
 
-Jekyll requires Ruby > {{ site.min_ruby_version }}.
+Jekyll requires **Ruby > {{ site.data.ruby.min_version }}**.
 As macOS Mojave 10.14 comes only with ruby 2.3.x, you'll have to install a newer version of Ruby.
 
 ### With Homebrew {#brew}
@@ -25,7 +25,7 @@ To run the latest Ruby version you need to install it through [Homebrew](https:/
 brew install ruby
 ```
 
-Don't forget to add the brew ruby path to your shell config :
+Add the brew ruby path to your shell config :
 
 ```
 export PATH=/usr/local/opt/ruby/bin:$PATH
@@ -38,7 +38,7 @@ which ruby
 # /usr/local/opt/ruby/bin/ruby
 
 ruby -v
-# ruby 2.6.2p47 (2019-03-13 revision 67232) [x86_64-darwin18]
+{{ site.data.ruby.current_version_output }}
 ```
 
 Yay, we are now running current stable Ruby!
@@ -66,10 +66,10 @@ Restart your terminal for changes to take effect.
 Now you can install the Ruby version of our choice, let's go with current latest stable Ruby:
 
 ```sh
-rbenv install 2.6.2
-rbenv global 2.6.2
+rbenv install {{ site.data.ruby.current_version }}
+rbenv global {{ site.data.ruby.current_version }}
 ruby -v
-# ruby 2.6.2p47 (2019-03-13 revision 67232) [x86_64-darwin18]
+{{ site.data.ruby.current_version_output }}
 ```
 
 That's it! Head over [rbenv command references](https://github.com/rbenv/rbenv#command-reference) to learn how to use different versions of Ruby in your projects.
@@ -88,7 +88,7 @@ and then get your Ruby version using
 
 ```sh
 ruby -v
-# ruby 2.6.1p33 (2019-01-30 revision 66950) [x86_64-darwin18]
+{{ site.data.ruby.current_version_output }}
 ```
 
 Then append your path file with the following, replacing the `X.X` with the first two digits of your Ruby version.
diff --git a/docs/_docs/liquid/filters.md b/docs/_docs/liquid/filters.md
index bd33c07c2d7..fafcd250313 100644
--- a/docs/_docs/liquid/filters.md
+++ b/docs/_docs/liquid/filters.md
@@ -104,7 +104,7 @@ The default is `default`. They are as follows (with what they filter):
 - `ascii`: spaces, non-alphanumeric, and non-ASCII characters
 - `latin`: like `default`, except Latin characters are first transliterated (e.g. `àèïòü` to `aeiou`) {%- include docs_version_badge.html version="3.7.0" -%}.
 
-### Detecting `nil` values with `where` filter {%- include docs_version_badge.html version="4.0.0" -%}
+### Detecting `nil` values with `where` filter {%- include docs_version_badge.html version="4.0" -%}
 
 You can use the `where` filter to detect documents and pages with properties that are `nil` or `""`. For example,
 
diff --git a/docs/_docs/liquid/tags.md b/docs/_docs/liquid/tags.md
index d5ee9d6373f..cc181593422 100644
--- a/docs/_docs/liquid/tags.md
+++ b/docs/_docs/liquid/tags.md
@@ -16,19 +16,12 @@ If you have page snippets that you use repeatedly across your site, an
 
 Jekyll has built in support for syntax highlighting of over 100 languages
 thanks to [Rouge](http://rouge.jneen.net). Rouge is the default highlighter
-in Jekyll 3 and above. To use it in Jekyll 2, set `highlighter` to `rouge`
-and ensure the `rouge` gem is installed properly.
-
-Alternatively, you can use [Pygments](http://pygments.org) to highlight your
-code snippets in Jekyll 3.x and below. To use Pygments, you must have Python
-installed on your system, have the `pygments.rb` gem installed and set
-`highlighter` to `pygments` in your site's configuration file. Pygments
-supports [over 100 languages](http://pygments.org/languages/)
-
-
    
-  
    Using Pygments has been deprecated and will not be officially supported in
-  Jekyll 4, meaning that the configuration setting highlighter: pygments
-  will automatically fall back to using Rouge which is written in Ruby
+in Jekyll 3 and above.
+
+
    
+  
    Using Pygments has been deprecated and is not supported in
+  Jekyll 4, the configuration setting highlighter: pygments
+  now automatically falls back to using Rouge which is written in Ruby
   and 100% compatible with stylesheets for Pygments.
    
 
    
 
@@ -47,14 +40,14 @@ end
 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
 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/).
+wiki](https://github.com/jayferd/rouge/wiki/List-of-supported-languages-and-lexers).
 
-
    
+
    
   
    Jekyll processes all Liquid filters in code blocks
    
   
    If you are using a language that contains curly braces, you
     will likely need to place {% raw %} and
-    {% endraw %} tags around your code.
    
+    {% endraw %} tags around your code.
+    Since {% include docs_version_badge.html version="4.0" %} you can add render_with_liquid: false in your front matter to disable Liquid entirely for a particular document.
    
 
    
 
 ### Line numbers
@@ -89,9 +82,11 @@ the syntax highlighter styles into your `main.css`:
 @import "native.css";
 ```
 
-
 ## Links
 
+{: .note }
+Since Jekyll {% include docs_version_badge.html version="v4.0"%} you don't need to prepend `link` and `post_url` tags with `site.baseurl`
+
 ### Linking to pages {#link}
 
 To link to a post, a page, collection item, or file, the `link` tag will generate the correct permalink URL for the path you specify. For example, if you use the `link` tag to link to `mypage.html`, even if you change your permalink style to include the file extension or omit it, the URL formed by the `link` tag will always be valid.
@@ -118,9 +113,6 @@ You can also use the `link` tag to create a link in Markdown as follows:
 ```
 {% endraw %}
 
-{: .note }
-Since {% include docs_version_badge.html version="v4.0"%} you don't need to prepend `link` tags with `site.baseurl`
-
 The path to the post, page, or collection is defined as the path relative to the root directory (where your config file is) to the file, not the path from your existing page to the other page.
 
 For example, suppose you're creating a link in `page_a.md` (stored in `pages/folder1/folder2`) to `page_b.md` (stored in  `pages/folder1`). Your path in the link would not be `../page_b.html`. Instead, it would be `/pages/folder1/page_b.md`.
@@ -137,7 +129,7 @@ If you want to include a link to a post on your site, the `post_url` tag will ge
 
 {% raw %}
 ```liquid
-{{ site.baseurl }}{% post_url 2010-07-21-name-of-post %}
+{% post_url 2010-07-21-name-of-post %}
 ```
 {% endraw %}
 
@@ -145,7 +137,7 @@ If you organize your posts in subdirectories, you need to include subdirectory p
 
 {% raw %}
 ```liquid
-{{ site.baseurl }}{% post_url /subdir/2010-07-21-name-of-post %}
+{% post_url /subdir/2010-07-21-name-of-post %}
 ```
 {% endraw %}
 
@@ -155,6 +147,6 @@ You can also use this tag to create a link to a post in Markdown as follows:
 
 {% raw %}
 ```liquid
-[Name of Link]({{ site.baseurl }}{% post_url 2010-07-21-name-of-post %})
+[Name of Link]({% post_url 2010-07-21-name-of-post %})
 ```
 {% endraw %}
diff --git a/docs/_docs/permalinks.md b/docs/_docs/permalinks.md
index 13697c55d82..ccf3ede2b85 100644
--- a/docs/_docs/permalinks.md
+++ b/docs/_docs/permalinks.md
@@ -110,7 +110,7 @@ Here's the full list of placeholders available:
     
       
         
    long_month
    
-        {% include docs_version_badge.html version="4.0.0" %}
+        {% include docs_version_badge.html version="4.0" %}
       
       
         
    Full month name, e.g. “January”.
    
@@ -149,7 +149,7 @@ Here's the full list of placeholders available:
     
       
         
    w_year
    
-        {% include docs_version_badge.html version="4.0.0" %}
+        {% include docs_version_badge.html version="4.0" %}
       
       
         
    Week year which may differ from the month year for up to three days at the start of January and end of December
    
@@ -158,7 +158,7 @@ Here's the full list of placeholders available:
     
       
         
    week
    
-        {% include docs_version_badge.html version="4.0.0" %}
+        {% include docs_version_badge.html version="4.0" %}
       
       
         
    Week number of the current year, starting with the first week having a majority of its days in January. (01..53)
    
@@ -167,7 +167,7 @@ Here's the full list of placeholders available:
     
       
         
    w_day
    
-        {% include docs_version_badge.html version="4.0.0" %}
+        {% include docs_version_badge.html version="4.0" %}
       
       
         
    Day of the week, starting with Monday. (1..7)
    
@@ -176,7 +176,7 @@ Here's the full list of placeholders available:
     
       
         
    short_day
    
-        {% include docs_version_badge.html version="4.0.0" %}
+        {% include docs_version_badge.html version="4.0" %}
       
       
         
    Three-letter weekday abbreviation, e.g. “Sun”.
    
@@ -185,7 +185,7 @@ Here's the full list of placeholders available:
     
       
         
    long_day
    
-        {% include docs_version_badge.html version="4.0.0" %}
+        {% include docs_version_badge.html version="4.0" %}
       
       
         
    Weekday name, e.g. “Sunday”.
    
@@ -302,7 +302,7 @@ For posts, Jekyll also provides the following built-in styles for convenience:
     
       
         
    weekdate
    
-        {% include docs_version_badge.html version="4.0.0" %}
+        {% include docs_version_badge.html version="4.0" %}
       
       
         
    /:categories/:year/W:week/:short_day/:title:output_ext
    
diff --git a/docs/_docs/ruby-101.md b/docs/_docs/ruby-101.md
index f3ec778b043..0b6f32c4cc9 100644
--- a/docs/_docs/ruby-101.md
+++ b/docs/_docs/ruby-101.md
@@ -24,13 +24,13 @@ A gem is code you can include in Ruby projects. It allows you to package up func
 A `Gemfile` is a list of gems required for your site. For a simple Jekyll site it might look something like this:
 
 ```ruby
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'jekyll'
+gem "jekyll"
 
 group :jekyll_plugins do
-  gem 'jekyll-feed'
-  gem 'jekyll-seo-tag'
+  gem "jekyll-feed"
+  gem "jekyll-seo-tag"
 end
 ```
 
diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index cb7563344b5..0a09e84898a 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -43,7 +43,7 @@ To locate a theme's files on your computer:
 
 1. Run `bundle show` followed by the name of the theme's gem, e.g., `bundle show minima` for Jekyll's default theme.
 
-   This returns the location of the gem-based theme files. For example, the Minima theme's files might be located in `/usr/local/lib/ruby/gems/2.3.0/gems/minima-2.1.0` on macOS.
+   This returns the location of the gem-based theme files. For example, the Minima theme's files might be located in `/usr/local/lib/ruby/gems/2.6.0/gems/minima-2.5.1` on macOS.
 
 2. Open the theme's directory in Finder or Explorer:
 
@@ -55,10 +55,10 @@ To locate a theme's files on your computer:
    # First get the gem's installation path:
    #
    #   bundle show minima
-   #   => C:/Ruby24-x64/lib/ruby/gems/2.4.0/gems/minima-2.1.0
+   #   => C:/Ruby26-x64/lib/ruby/gems/{{ site.data.ruby.current_version }}/gems/minima-2.5.1
    #
    # then invoke explorer with above path, substituting `/` with `\`
-   explorer C:\Ruby24-x64\lib\ruby\gems\2.4.0\gems\minima-2.1.0
+   explorer C:\Ruby26-x64\lib\ruby\gems\{{ site.data.ruby.current_version}}\gems\minima-2.5.1
 
    # On Linux
    xdg-open $(bundle show minima)
@@ -121,8 +121,8 @@ To do this, copy the files from the theme gem's directory into your Jekyll site
 Then you must tell Jekyll about the plugins that were referenced by the theme. You can find these plugins in the theme's gemspec file as runtime dependencies. If you were converting the Minima theme, for example, you might see:
 
 ```
-spec.add_runtime_dependency "jekyll-feed", "~> 0.9"
-spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.1"
+spec.add_runtime_dependency "jekyll-feed", "~> 0.12"
+spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.6"
 ```
 
 You should include these references in the `Gemfile` in one of two ways.
@@ -132,8 +132,8 @@ You could list them individually in both `Gemfile` and `_config.yml`.
 ```ruby
 # ./Gemfile
 
-gem "jekyll-feed", "~> 0.9"
-gem "jekyll-seo-tag", "~> 2.1"
+gem "jekyll-feed", "~> 0.12"
+gem "jekyll-seo-tag", "~> 2.6"
 ```
 
 ```yaml
@@ -150,8 +150,8 @@ Or you could list them explicitly as Jekyll plugins in your Gemfile, and not upd
 # ./Gemfile
 
 group :jekyll_plugins do
-  gem "jekyll-feed", "~> 0.9"
-  gem "jekyll-seo-tag", "~> 2.1"
+  gem "jekyll-feed", "~> 0.12"
+  gem "jekyll-seo-tag", "~> 2.6"
 end
 ```
 
@@ -161,7 +161,7 @@ If you're publishing on GitHub Pages you should update only your `_config.yml` a
 
 Finally, remove references to the theme gem in `Gemfile` and configuration. For example, to remove `minima`:
 
-- Open `Gemfile` and remove `gem "minima", "~> 2.0"`.
+- Open `Gemfile` and remove `gem "minima", "~> 2.5"`.
 - Open `_config.yml` and remove `theme: minima`.
 
 Now `bundle update` will no longer get updates for the theme gem.
@@ -187,7 +187,7 @@ To install a gem-based theme:
    ```diff
    # ./Gemfile
 
-   - gem "minima", "~> 2.0"
+   - gem "minima", "~> 2.5"
    + gem "jekyll-theme-minimal"
    ```
 
@@ -282,10 +282,7 @@ Jekyll will automatically require all whitelisted `runtime_dependencies` of your
 
 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.
 
-{% if site.version == '4.0.0' %}
-{% comment %} Remove this encapsulation when `v4.0` ships {% endcomment %}
-
-### Pre-configuring Theme-gems {%- include docs_version_badge.html version="4.0.0" -%}
+### Pre-configuring Theme-gems {%- include docs_version_badge.html version="4.0" -%}
 
 Jekyll will read-in a `_config.yml` at the root of the theme-gem and merge its data into the site's existing configuration data.
 
@@ -298,7 +295,6 @@ But unlike other entities loaded from within the theme, loading the config file
 While this feature is to enable easier adoption of a theme, the restrictions ensure that a theme-config cannot affect the build in a concerning manner. Any plugins required by the theme will have to be listed manually by the user or provided by the theme's `gemspec` file.
 
 This feature will let the theme-gem to work with *theme-specific config variables* out-of-the-box.
-{% endif %}
 
 ### Documenting your theme
 
diff --git a/docs/_docs/upgrading/3-to-4.md b/docs/_docs/upgrading/3-to-4.md
index 09a46b99b60..40e73320be0 100644
--- a/docs/_docs/upgrading/3-to-4.md
+++ b/docs/_docs/upgrading/3-to-4.md
@@ -5,17 +5,17 @@ permalink: /docs/upgrading/3-to-4/
 
 A few things have changed in Jekyll 4.
 
-Before we dive in, you need to have at least Ruby {{ site.min_ruby_version }}
+Before we dive in, you need to have at least Ruby {{ site.data.ruby.min_version }}
 installed.
 
 Run the following in your terminal to check
 
 ```sh
 ruby -v
-ruby 2.6.2p47 (2019-03-13 revision 67232) [x86_64-darwin18]
+{{ site.data.ruby.current_version_output }}
 ```
 
-If you're using a supported Ruby version > {{ site.min_ruby_version }}, go ahead
+If you're using a supported Ruby version > {{ site.data.ruby.min_version }}, go ahead
 and fetch the latest version of Jekyll:
 
 ```sh
diff --git a/docs/_docs/usage.md b/docs/_docs/usage.md
index 76d2bd96ae0..9aac2e4d3d3 100644
--- a/docs/_docs/usage.md
+++ b/docs/_docs/usage.md
@@ -12,9 +12,9 @@ You can use this command in a number of ways:
 * `jekyll build` or `jekyll b` - Performs a one off build your site to `./_site` (by default)
 * `jekyll serve` or `jekyll s` - Builds your site any time a source file changes and serves it locally
 * `jekyll doctor` - Outputs any deprecation or configuration issues
-* `jekyll new-theme` - Creates a new Jekyll theme scaffold
-* `jekyll clean` - Removes the generated site and metadata file
+* `jekyll clean` - Removes all generated files: destination folder, metadata file, Sass and Jekyll caches.
 * `jekyll help` - Shows help, optionally for a given subcommand, e.g. `jekyll help build`
+* `jekyll new-theme` - Creates a new Jekyll theme scaffold
 
 Typically you'll use `jekyll serve` while developing locally and `jekyll build` when you need to generate the site for production.
 
diff --git a/docs/_includes/news_contents_mobile.html b/docs/_includes/news_contents_mobile.html
index e8fb55e7228..8f8ba563947 100644
--- a/docs/_includes/news_contents_mobile.html
+++ b/docs/_includes/news_contents_mobile.html
@@ -2,7 +2,7 @@
   
     
-    {% for section in site.data.docs_nav %}
+    {% for section in site.data.docs_nav -%}
     
-      {% for item in section.docs %}
-        {% assign p = site.documents | where: "url", item.link | first %}
-        
-      {% endfor %}
+    {%- for item in section.docs -%}
+      {% assign p = site.documents | where: "url", item.link | first %}
+      
+    {%- endfor %}
     
-    {% endfor %}
+    {% endfor -%}
   
 
    
diff --git a/docs/_includes/docs_variables_table.html b/docs/_includes/docs_variables_table.html
index df5e9b17a29..feafa7106c3 100644
--- a/docs/_includes/docs_variables_table.html
+++ b/docs/_includes/docs_variables_table.html
@@ -7,12 +7,12 @@
     
   
   
-  {% for var in include.scope %}
+  {% for var in include.scope -%}
     
       
    {{ var.name }}
    
       
    {{- var.description -}}
    
     
-  {% endfor %}
+  {% endfor -%}
   
 
 
    
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index 418e04d5746..b38a89ec25f 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -9,23 +9,19 @@ 
    
       
    
     
    
     
     
    
-      {% include search/input.html %}
+      {% include search/input.html -%}
     
    
     
    
       
     
    
   
    
   
 
diff --git a/docs/_includes/mobile-nav-items.html b/docs/_includes/mobile-nav-items.html
index fc8f10ef9b6..6b9b0062a55 100644
--- a/docs/_includes/mobile-nav-items.html
+++ b/docs/_includes/mobile-nav-items.html
@@ -1,18 +1,14 @@
 
      
-  {% for p in site.data.primary_nav %}
-    {%- if p.show_on_mobile %}
+  {% for p in site.data.primary_nav -%}
+    {% if p.show_on_mobile -%}
     
    • 
-      {{ p.title }}
-    
      • 
-    {%- endif %}
-  {% endfor %}
-  
    • 
-    GitHub
-  
      • 
+        {%- if page.url == '/' %} class="current" {% endif -%}
+      {% else -%}
+        {%- if page.url contains p.link %} class="current" {% endif -%}
+      {% endif -%}
+    >{{ p.title }}
+    {% endif -%}
+  {% endfor -%}
+  
    • GitHub
      • 
 
    
diff --git a/docs/_includes/news_contents.html b/docs/_includes/news_contents.html
index 737a2114e55..d717b20dd12 100644
--- a/docs/_includes/news_contents.html
+++ b/docs/_includes/news_contents.html
@@ -10,24 +10,24 @@
     
     
    Recent Releases
    
     
     
    Other News
    
     
      
-      {% for post in site.posts %}
-        {% unless post.categories contains 'release' %}
-        
    • 
-          {{ post.title }}
-        
      • 
-        {% endunless %}
-      {% endfor %}
+    {% for post in site.posts -%}
+      {% unless post.categories contains 'release' -%}
+      
    • 
+        {{ post.title }}
+      
      • 
+      {% endunless -%}
+    {% endfor -%}
     
    
   
 
    
diff --git a/docs/_includes/news_item.html b/docs/_includes/news_item.html
index db490c8ed5a..e7a7dbc2def 100644
--- a/docs/_includes/news_item.html
+++ b/docs/_includes/news_item.html
@@ -1,25 +1,25 @@
 
diff --git a/docs/_includes/primary-nav-items.html b/docs/_includes/primary-nav-items.html
index b27cceb6618..eb30a699693 100644
--- a/docs/_includes/primary-nav-items.html
+++ b/docs/_includes/primary-nav-items.html
@@ -1,13 +1,11 @@
 
      
-  {% for p in site.data.primary_nav %}
+  {% for p in site.data.primary_nav -%}
   
    • 
-    {{ p.title }}
-  
      • 
-  {% endfor %}
+      {% if page.url == p.link %} class="current" {%- endif -%}
+    {% else -%}
+      {% if page.url contains p.link %} class="current" {%- endif -%}
+    {% endif -%}
+  >{{ p.title }}
+  {% endfor -%}
 
    
diff --git a/docs/_includes/section_nav_tutorials.html b/docs/_includes/section_nav_tutorials.html
index 30812bbafe4..8d665f5139b 100644
--- a/docs/_includes/section_nav_tutorials.html
+++ b/docs/_includes/section_nav_tutorials.html
@@ -1,39 +1,39 @@
-{% comment %}
+{%- comment -%}
 Map grabs the tutorials sections, giving us an array of arrays. Join, flattens all
 the items to a comma delimited string. Split turns it into an array again.
-{% endcomment %}
-{% assign tutorials = site.data.tutorials | map: 'tutorials' | join: ',' | split: ',' %}
+{%- endcomment -%}
+{%- assign tutorials = site.data.tutorials | map: 'tutorials' | join: ',' | split: ',' -%}
 
-{% comment %}
+{%- comment -%}
 Because this is built for every page, lets find where we are in the ordered
 document list by comparing url strings. Then if there's something previous or
 next, lets build a link to it.
-{% endcomment %}
+{%- endcomment -%}
 
-{% for tutorial in tutorials %}
-  {% assign tutorial_url = tutorial | prepend:"/tutorials/" | append:"/" %}
-  {% if tutorial_url == page.url %}
-    
    
-      
    
-          {% if forloop.first %}
-            Back
-          {% else %}
-            {% assign previous = forloop.index0 | minus: 1 %}
-            {% assign previous_page = tutorials[previous] | prepend:"/tutorials/" | append:"/" %}
-            
-          {% endif %}
-      
    
-      
    
-          {% if forloop.last %}
-            Next
-          {% else %}
-            {% assign next = forloop.index0 | plus: 1 %}
-            {% assign next_page = tutorials[next] | prepend:"/tutorials/" | append:"/" %}
-            
-          {% endif %}
-      
    
+{% for tutorial in tutorials -%}
+  {% assign tutorial_url = tutorial | prepend:"/tutorials/" | append:"/" -%}
+  {% if tutorial_url == page.url -%}
+  
    
+    
    
+        {% if forloop.first -%}
+          Back
+        {% else -%}
+          {% assign previous = forloop.index0 | minus: 1 -%}
+          {% assign previous_page = tutorials[previous] | prepend:"/tutorials/" | append:"/" -%}
+          
+        {% endif -%}
     
    
-    
    
-    {% break %}
-  {% endif %}
-{% endfor %}
\ No newline at end of file
+    
    
+        {% if forloop.last -%}
+          Next
+        {% else -%}
+          {% assign next = forloop.index0 | plus: 1 -%}
+          {% assign next_page = tutorials[next] | prepend:"/tutorials/" | append:"/" -%}
+          
+        {% endif -%}
+    
    
+  
    
+  
    
+  {% break -%}
+  {% endif -%}
+{% endfor -%}
diff --git a/docs/_includes/step-index.html b/docs/_includes/step-index.html
index eb03b551e93..798fb7c5531 100644
--- a/docs/_includes/step-index.html
+++ b/docs/_includes/step-index.html
@@ -1,65 +1,34 @@
-{% assign docs = site.docs | where_exp: "doc", "doc.url contains '/step-by-step/'" %}
+{% assign docs = site.docs | where_exp: "doc", "doc.url contains '/step-by-step/'" -%}
 
-{% for tutorial in tutorials %}
-  {% assign tutorial_url = tutorial | prepend:"/tutorials/" | append:"/" %}
-  {% if tutorial_url == page.url %}
+{% for doc in docs -%}
+  {% if doc.url == page.url -%}
     
    
       
    
-          {% if forloop.first %}
-            Back
-          {% else %}
-            {% assign previous = forloop.index0 | minus: 1 %}
-            {% assign previous_page = tutorials[previous] | prepend:"/tutorials/" | append:"/" %}
-            
-          {% endif %}
+        {% if forloop.first -%}
+          Back
+        {% else -%}
+          {% assign previous = forloop.index0 | minus: 1 -%}
+          
+        {% endif -%}
       
    
       
    
-          {% if forloop.last %}
-            Next
-          {% else %}
-            {% assign next = forloop.index0 | plus: 1 %}
-            {% assign next_page = tutorials[next] | prepend:"/tutorials/" | append:"/" %}
-            
-          {% endif %}
+      {% if forloop.last -%}
+        Next
+      {% else -%}
+        {% assign next = forloop.index0 | plus: 1 -%}
+        
+      {% endif -%}
       
    
     
    
     
    
-    {% break %}
-  {% endif %}
-{% endfor %}
-
-
-{% for doc in docs %}
-  {% if doc.url == page.url %}
-    
    
-      
    
-          {% if forloop.first %}
-            Back
-          {% else %}
-            {% assign previous = forloop.index0 | minus: 1 %}
-            
-          {% endif %}
-      
    
-      
    
-          {% if forloop.last %}
-            Next
-          {% else %}
-            {% assign next = forloop.index0 | plus: 1 %}
-            
-          {% endif %}
-      
    
-    
    
-    
    
-    {% break %}
-  {% endif %}
-{% endfor %}
+    {% break -%}
+  {% endif -%}
+{% endfor -%}
 
 
      
-  {% for step in docs %}
-    
    1. 
-      
-        {{ step.title }}
-      
-    
      2. 
-  {% endfor %}
+  {% for step in docs -%}
+  
    2. 
+    {{- step.title -}}
+  
      3. 
+  {% endfor -%}
 
    
diff --git a/docs/_includes/tutorials_contents.html b/docs/_includes/tutorials_contents.html
index 5c9cdc8ee7f..75fe9fc5063 100644
--- a/docs/_includes/tutorials_contents.html
+++ b/docs/_includes/tutorials_contents.html
@@ -1,10 +1,16 @@
 
    
   
 
    
diff --git a/docs/_includes/tutorials_contents_mobile.html b/docs/_includes/tutorials_contents_mobile.html
index 901fdf5c435..217bc326752 100644
--- a/docs/_includes/tutorials_contents_mobile.html
+++ b/docs/_includes/tutorials_contents_mobile.html
@@ -1,10 +1,14 @@
 
    
   
 
    
diff --git a/docs/_includes/tutorials_option.html b/docs/_includes/tutorials_option.html
deleted file mode 100644
index 482c2143337..00000000000
--- a/docs/_includes/tutorials_option.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% for item in include.items %}
-  {% assign item_url = item | prepend:"/tutorials/" | append:"/" %}
-  {% assign tutorial = site.tutorials | where: "url", item_url | first %}
-  
-{% endfor %}
diff --git a/docs/_includes/tutorials_ul.html b/docs/_includes/tutorials_ul.html
deleted file mode 100644
index a2b613262cd..00000000000
--- a/docs/_includes/tutorials_ul.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
      
-{% for item in include.items %}
-  {% assign item_url = item | prepend:"/tutorials/" | append:"/" %}
-  {% assign p = site.tutorials | where:"url", item_url | first %}
-  
    • {{ p.title }}
      • 
-{% endfor %}
-
    
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 8e9574adc63..9234c13c754 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -1,13 +1,13 @@
-{% include top.html %}
+{%- include top.html -%}
 
 
-  {% include header.html %}
+  {%- include header.html -%}
 
-  {{ content }}
+  {{- content -}}
 
-  {% include footer.html %}
-  {% include anchor_links.html %}
-  {% include analytics.html %}
-  {% include search/script.html %}
+  {%- include footer.html -%}
+  {%- include anchor_links.html -%}
+  {%- include analytics.html -%}
+  {%- include search/script.html -%}
 
 
diff --git a/docs/_layouts/docs.html b/docs/_layouts/docs.html
index ab179e50462..f52e7831cbf 100644
--- a/docs/_layouts/docs.html
+++ b/docs/_layouts/docs.html
@@ -2,24 +2,20 @@
 layout: default
 ---
 
-  
    
-    
    
-
-      {% include docs_contents_mobile.html %}
-
-      
    
-        
-      
    
-
-      {% include docs_contents.html %}
-
-      
    
-
+
    
+  
    
+    {% include docs_contents_mobile.html -%}
+    
    
+      
     
    
-  
    
+    {% include docs_contents.html -%}
+    
    
+  
    
+
    
diff --git a/docs/_layouts/news.html b/docs/_layouts/news.html
index 8f7945f345a..7b776bc7446 100644
--- a/docs/_layouts/news.html
+++ b/docs/_layouts/news.html
@@ -2,18 +2,13 @@
 layout: default
 ---
 
-  
    
-    
    
-
-      {% include news_contents_mobile.html %}
-
-      
    
-        {{ content }}
-      
    
-
-      {% include news_contents.html %}
-
-      
    
-
+
    
+  
    
+    {% include news_contents_mobile.html -%}
+    
    
+      {{- content -}}
     
    
-  
    
+    {% include news_contents.html -%}
+    
    
+  
    
+
    
diff --git a/docs/_layouts/news_item.html b/docs/_layouts/news_item.html
index e9fa2aec859..74d5d91b010 100644
--- a/docs/_layouts/news_item.html
+++ b/docs/_layouts/news_item.html
@@ -12,17 +12,17 @@ 
    
   
    
   
     
-      {{ page.categories | array_to_sentence_string }}
+      {{- page.categories | array_to_sentence_string -}}
     
   
   
    
     
-      {{ page.date | date_to_string }}
+      {{- page.date | date_to_string -}}
     
-    {% assign author = page.author %}
+    {% assign author = page.author -%}
     
-      {% avatar user=author size=24 %}
-      {{ author }}
+      {% avatar user=author size=24 -%}
+      {{- author -}}
     
   
    
   
    
diff --git a/docs/_layouts/page.html b/docs/_layouts/page.html
index bae31bb365c..28364e7dbde 100644
--- a/docs/_layouts/page.html
+++ b/docs/_layouts/page.html
@@ -4,15 +4,12 @@
 
 
    
   
    
-
     
    
       
    
         
    {{ page.title }}
    
         {{ content }}
       
    
     
    
-
     
    
-
   
    
 
    
diff --git a/docs/_layouts/step.html b/docs/_layouts/step.html
index 7a3a593f9cf..3bf1101cc8e 100644
--- a/docs/_layouts/step.html
+++ b/docs/_layouts/step.html
@@ -1,26 +1,21 @@
 ---
 layout: default
 ---
-  
    
-    
    
-
-      {% include docs_contents_mobile.html %}
-
-      
    
-        
    
-          
    
-              Improve this page
-          
    
-          
    Step by Step Tutorial
    
-          
    {{ page.position }}. {{ page.title }}
    
-          {{ content }}
-          {% include step-index.html %}
-        
    
-      
    
-
-      {% include docs_contents.html %}
-
-      
    
-
+
    
+  
    
+    {% include docs_contents_mobile.html -%}
+    
    
+      
    
+        
    
+            Improve this page
+        
    
+        
    Step by Step Tutorial
    
+        
    {{ page.position }}. {{ page.title }}
    
+        {{ content }}
+        {% include step-index.html -%}
+      
    
     
    
-  
    
+    {% include docs_contents.html -%}
+    
    
+  
    
+
    
diff --git a/docs/_layouts/tutorials.html b/docs/_layouts/tutorials.html
index 3850971c336..26d1aed00a9 100644
--- a/docs/_layouts/tutorials.html
+++ b/docs/_layouts/tutorials.html
@@ -2,26 +2,21 @@
 layout: default
 ---
 
-  
    
-    
    
-
-      {% include tutorials_contents_mobile.html %}
-
-      
    
-        
    
-          
    
-              Improve this page
-          
    
-          
    {{ page.title }}
    
-          {{ content }}
-          {% include section_nav_tutorials.html %}
-        
    
-      
    
-
-      {% include tutorials_contents.html %}
-
-      
    
-
+
    
+  
    
+    {%- include tutorials_contents_mobile.html -%}
+    
    
+      
    
+        
    
+            Improve this page
+        
    
+        
    {{ page.title }}
    
+        {{- content -}}
+        {%- include section_nav_tutorials.html -%}
+      
    
     
    
-  
    
+    {%- include tutorials_contents.html -%}
+    
    
+  
    
+
    
diff --git a/docs/pages/404.html b/docs/pages/404.html
index 9edc873bf92..dc4d97355f6 100644
--- a/docs/pages/404.html
+++ b/docs/pages/404.html
@@ -18,18 +18,10 @@
       
    The resource you requested was not found. Here are some links to help you find your way:
    
       
     
    
diff --git a/docs/pages/news.html b/docs/pages/news.html
index 94139fc00db..b806b0e5f5c 100644
--- a/docs/pages/news.html
+++ b/docs/pages/news.html
@@ -5,6 +5,6 @@
 author: all
 ---
 
-{% for post in site.posts %}
-  {% include news_item.html %}
-{% endfor %}
+{% for post in site.posts -%}
+  {% include news_item.html -%}
+{% endfor -%}
diff --git a/docs/pages/releases.html b/docs/pages/releases.html
index 153d022c133..9736fbd8afe 100644
--- a/docs/pages/releases.html
+++ b/docs/pages/releases.html
@@ -5,6 +5,6 @@
 author: all
 ---
 
-{% for post in site.categories.release %}
-  {% include news_item.html %}
-{% endfor %}
+{% for post in site.categories.release -%}
+  {% include news_item.html -%}
+{% endfor -%}
diff --git a/docs/pages/showcase.html b/docs/pages/showcase.html
index 58d52c0a912..98cd89174b6 100644
--- a/docs/pages/showcase.html
+++ b/docs/pages/showcase.html
@@ -9,18 +9,18 @@
 
    Jekyll is used for all kinds of usecases. Here's some of our favorites:
    
 
 
 

From 4d131eb069b8de4a982e5b976352175aa882db27 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 24 Feb 2020 18:44:13 -0500
Subject: [PATCH 3899/4996] Update history to reflect merge of #8020 [ci skip]

---
 History.markdown | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/History.markdown b/History.markdown
index 0a0bcb9a18c..fd1ffe3616a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -76,6 +76,10 @@
   * Add Visual Studio Code Development Container (#8016)
   * Configure kramdown toc_levels as array by default (#8015)
 
+### Site Enhancements
+
+  * Optimize rendering of the documentation site (#8020)
+
 ## 4.0.0 / 2019-08-19
 
 ### Major Enhancements

From 39e2a8b5f5eceda74712cbfae9494d4cfdc1ea16 Mon Sep 17 00:00:00 2001
From: Dmitry Egorov <40038420+dmiedev@users.noreply.github.com>
Date: Wed, 26 Feb 2020 09:28:36 +0300
Subject: [PATCH 3900/4996] [Docs] Fix asset link ref in step-by-step tutorial
 (#8026)

Merge pull request 8026
---
 docs/_docs/step-by-step/07-assets.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/step-by-step/07-assets.md b/docs/_docs/step-by-step/07-assets.md
index eb1534b7da9..5d8b1b8a92d 100644
--- a/docs/_docs/step-by-step/07-assets.md
+++ b/docs/_docs/step-by-step/07-assets.md
@@ -70,7 +70,7 @@ Open `_layouts/default.html` and add the stylesheet to the ``:
   
     
     {{ page.title }}
-    
+    
   
   
     {% include navigation.html %}

From b1573b62921c51d123bf433e64cf6ee2197473c7 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 26 Feb 2020 01:28:38 -0500
Subject: [PATCH 3901/4996] Update history to reflect merge of #8026 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index fd1ffe3616a..bac495b8d9f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -56,6 +56,7 @@
   * Fix file references in Step by Step Tutorial's Assets step (#8007)
   * docs: improve highlighting of code blocks (#8017)
   * remove leading slash from Sass file location (#8021)
+  * [Docs] Fix asset link ref in step-by-step tutorial (#8026)
 
 ### Development Fixes
 

From 3d045d277e439d846f9c417ed00e34ba8abbea64 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 26 Feb 2020 22:06:19 +0530
Subject: [PATCH 3902/4996] Optimize markdown parsing with Kramdown by reusing
 the options and parser objects (#8013)

Merge pull request 8013
---
 .../converters/markdown/kramdown_parser.rb    | 60 ++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index 64bb1d1c8d2..aebd6ee7fef 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -1,5 +1,63 @@
 # Frozen-string-literal: true
 
+module Kramdown
+  # A Kramdown::Document subclass meant to optimize memory usage from initializing
+  # a kramdown document for parsing.
+  #
+  # The optimization is by using the same options Hash (and its derivatives) for
+  # converting all Markdown documents in a Jekyll site.
+  class JekyllDocument < Document
+    class << self
+      attr_reader :options, :parser
+
+      # The implementation is basically the core logic in +Kramdown::Document#initialize+
+      #
+      # rubocop:disable Naming/MemoizedInstanceVariableName
+      def setup(options)
+        @cache ||= {}
+
+        # reset variables on a subsequent set up with a different options Hash
+        unless @cache[:id] == options.hash
+          @options = @parser = nil
+          @cache[:id] = options.hash
+        end
+
+        @options ||= Options.merge(options).freeze
+        @parser  ||= begin
+          parser_name = (@options[:input] || "kramdown").to_s
+          parser_name = parser_name[0..0].upcase + parser_name[1..-1]
+          try_require("parser", parser_name)
+
+          if Parser.const_defined?(parser_name)
+            Parser.const_get(parser_name)
+          else
+            raise Kramdown::Error, "kramdown has no parser to handle the specified " \
+                                   "input format: #{@options[:input]}"
+          end
+        end
+      end
+      # rubocop:enable Naming/MemoizedInstanceVariableName
+
+      private
+
+      def try_require(type, name)
+        require "kramdown/#{type}/#{Utils.snake_case(name)}"
+      rescue LoadError
+        false
+      end
+    end
+
+    def initialize(source, options = {})
+      JekyllDocument.setup(options)
+
+      @options = JekyllDocument.options
+      @root, @warnings = JekyllDocument.parser.parse(source, @options)
+    end
+  end
+end
+
+#
+
 module Jekyll
   module Converters
     class Markdown
@@ -37,7 +95,7 @@ def setup
         end
 
         def convert(content)
-          document = Kramdown::Document.new(content, @config)
+          document = Kramdown::JekyllDocument.new(content, @config)
           html_output = document.to_html
           if @config["show_warnings"]
             document.warnings.each do |warning|

From aef8f11f6c5bc894f65a6b21aca495ff607b5e7c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 26 Feb 2020 11:36:22 -0500
Subject: [PATCH 3903/4996] Update history to reflect merge of #8013 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index bac495b8d9f..af2b690d154 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Update item_property to recognize integers (#7878)
   * Include _config.yml in a new theme's gemspec (#7865)
   * Add an option to easily disable disk-cache (#7928)
+  * Optimize markdown parsing with Kramdown by reusing the options and parser objects (#8013)
 
 ### Documentation
 

From a9fb26fc33a9d1a92f56215645b9a9b8ba053ff0 Mon Sep 17 00:00:00 2001
From: Matt Penna 
Date: Wed, 26 Feb 2020 19:46:25 -0500
Subject: [PATCH 3904/4996] Corrected command to modify PATH (#8029)

Merge pull request 8029
---
 docs/_docs/installation/macos.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md
index 6bda62648dd..98c656ea389 100644
--- a/docs/_docs/installation/macos.md
+++ b/docs/_docs/installation/macos.md
@@ -29,7 +29,7 @@ brew install ruby
 Add the brew ruby path to your shell config:
 
 ```bash
-export PATH=/usr/local/opt/ruby/bin:$PATH
+echo 'export PATH="/usr/local/opt/ruby/bin:$PATH"' >> ~/.bash_profile
 ```
 
 Then relaunch your terminal and check your updated Ruby setup:

From 4a6f91810c2ee14ab13de9687275275f10f9a56a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 26 Feb 2020 19:46:28 -0500
Subject: [PATCH 3905/4996] Update history to reflect merge of #8029 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index af2b690d154..fcdf84d7050 100644
--- a/History.markdown
+++ b/History.markdown
@@ -58,6 +58,7 @@
   * docs: improve highlighting of code blocks (#8017)
   * remove leading slash from Sass file location (#8021)
   * [Docs] Fix asset link ref in step-by-step tutorial (#8026)
+  * Corrected command to modify PATH (#8029)
 
 ### Development Fixes
 

From 0378c3628c3e5b2684724c71157fee538dee504e Mon Sep 17 00:00:00 2001
From: Matt Penna 
Date: Thu, 27 Feb 2020 00:22:03 -0500
Subject: [PATCH 3906/4996] Corrected command to modify PATH (#8030)

Merge pull request 8030
---
 docs/_docs/installation/macos.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md
index 98c656ea389..04d3c77984c 100644
--- a/docs/_docs/installation/macos.md
+++ b/docs/_docs/installation/macos.md
@@ -95,7 +95,7 @@ ruby -v
 Then append your path file with the following, replacing the `X.X` with the first two digits of your Ruby version.
 
 ```bash
-export PATH=$HOME/.gem/ruby/X.X.0/bin:$PATH
+echo 'export PATH="$HOME/.gem/ruby/X.X.0/bin:$PATH"' >> ~/.bash_profile
 ```
 
 To check that your gem paths point to your home directory run:

From 70fc6b377d3f44197ae3f4b7c146e849f49f54b5 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 27 Feb 2020 00:22:06 -0500
Subject: [PATCH 3907/4996] Update history to reflect merge of #8030 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index fcdf84d7050..67ea362d279 100644
--- a/History.markdown
+++ b/History.markdown
@@ -59,6 +59,7 @@
   * remove leading slash from Sass file location (#8021)
   * [Docs] Fix asset link ref in step-by-step tutorial (#8026)
   * Corrected command to modify PATH (#8029)
+  * Corrected command to modify PATH (#8030)
 
 ### Development Fixes
 

From 7ba99f0010b207d540f1dc8944cfb4d23589dc22 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 27 Feb 2020 18:44:16 +0530
Subject: [PATCH 3908/4996] Docs: Render full contents of just the latest post
 (#8032)

Merge pull request 8032
---
 docs/_includes/news_item.html         |  2 +-
 docs/_includes/news_item_archive.html | 26 ++++++++++++++++++++++
 docs/_layouts/news_item.html          |  2 +-
 docs/_sass/_style.scss                | 31 ++++++++++++++++++++++++---
 docs/pages/news.html                  |  6 +++++-
 docs/pages/releases.html              |  6 +++++-
 6 files changed, 66 insertions(+), 7 deletions(-)
 create mode 100644 docs/_includes/news_item_archive.html

diff --git a/docs/_includes/news_item.html b/docs/_includes/news_item.html
index e7a7dbc2def..6070d051f83 100644
--- a/docs/_includes/news_item.html
+++ b/docs/_includes/news_item.html
@@ -16,7 +16,7 @@ 
    
     {% assign author = post.author -%}
     
       {% avatar user=author size=24 -%}
-      {{ author }}
+      {{ author }}
     
   
    
   
    
diff --git a/docs/_includes/news_item_archive.html b/docs/_includes/news_item_archive.html
new file mode 100644
index 00000000000..553439f1ef3
--- /dev/null
+++ b/docs/_includes/news_item_archive.html
@@ -0,0 +1,26 @@
+
diff --git a/docs/_layouts/news_item.html b/docs/_layouts/news_item.html
index 74d5d91b010..494b86caf85 100644
--- a/docs/_layouts/news_item.html
+++ b/docs/_layouts/news_item.html
@@ -22,7 +22,7 @@ 
    
     {% assign author = page.author -%}
     
       {% avatar user=author size=24 -%}
-      {{- author -}}
+      {{ author }}
     
   
    
   
    
diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss
index deafe505f50..4a17e410b82 100644
--- a/docs/_sass/_style.scss
+++ b/docs/_sass/_style.scss
@@ -664,13 +664,38 @@ article h2:first-child { margin-top: 0; }
 }
 
 .post-date,
-.post-author { margin-left: 10px; }
+.post-author { margin-left: 15px; }
+.post-author .author-name { margin-left: 8px }
 
 .news article + article {
-  margin-top: -10px;
-  @include border-radius(0 0 10px 10px);
+  margin-top: -6px;
+  padding: 15px 40px;
   border-top: 1px solid #555;
+  border-radius: 0;
   @include box-shadow(0 -1px 0 #2f2f2f);
+
+  h2.post-title {
+    margin-bottom: 0.45em;
+  }
+  .post-category {
+    margin-right: 20px;
+    padding-left: 0;
+    width: 150px;
+    box-sizing: border-box;
+    .label {
+      float: right;
+    }
+  }
+  .cell-left, .cell-right {
+    display: inline-block;
+  }
+  .cell-left {
+    max-width: 180px;
+  }
+  .cell-right {
+    width: calc(100% - 130px);
+  }
+  .post-date { margin-left: 0 }
 }
 
 /* Code Highlighting */
diff --git a/docs/pages/news.html b/docs/pages/news.html
index b806b0e5f5c..c010d2d3a0e 100644
--- a/docs/pages/news.html
+++ b/docs/pages/news.html
@@ -6,5 +6,9 @@
 ---
 
 {% for post in site.posts -%}
-  {% include news_item.html -%}
+  {% if forloop.index == 1 -%}
+    {% include news_item.html -%}
+  {% else -%}
+    {% include news_item_archive.html -%}
+  {% endif -%}
 {% endfor -%}
diff --git a/docs/pages/releases.html b/docs/pages/releases.html
index 9736fbd8afe..f8416c07e11 100644
--- a/docs/pages/releases.html
+++ b/docs/pages/releases.html
@@ -6,5 +6,9 @@
 ---
 
 {% for post in site.categories.release -%}
-  {% include news_item.html -%}
+  {% if forloop.index == 1 -%}
+    {% include news_item.html -%}
+  {% else -%}
+    {% include news_item_archive.html -%}
+  {% endif -%}
 {% endfor -%}

From 53bb8bd7d38b13b41b7db4340054d0d544aedebe Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 27 Feb 2020 08:14:17 -0500
Subject: [PATCH 3909/4996] Update history to reflect merge of #8032 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 67ea362d279..38814144263 100644
--- a/History.markdown
+++ b/History.markdown
@@ -60,6 +60,7 @@
   * [Docs] Fix asset link ref in step-by-step tutorial (#8026)
   * Corrected command to modify PATH (#8029)
   * Corrected command to modify PATH (#8030)
+  * Docs: Render full contents of just the latest post (#8032)
 
 ### Development Fixes
 

From b05e6ee8aef4b04a83bd4082b9d7a81d77cc4737 Mon Sep 17 00:00:00 2001
From: Eric Knibbe 
Date: Fri, 28 Feb 2020 14:29:47 -0500
Subject: [PATCH 3910/4996] docs: improvements for note boxes (#8037)

Merge pull request 8037
---
 docs/_docs/collections.md                     |  8 +++---
 docs/_docs/configuration/environments.md      | 10 +++----
 docs/_docs/installation/macos.md              |  4 +--
 docs/_docs/installation/windows.md            | 10 ++++---
 docs/_docs/liquid/tags.md                     | 17 ++++++------
 .../maintaining/affinity-team-captain.md      |  2 +-
 docs/_docs/maintaining/avoiding-burnout.md    |  2 +-
 .../maintaining/becoming-a-maintainer.md      |  2 +-
 docs/_docs/maintaining/index.md               |  2 +-
 .../maintaining/merging-a-pull-request.md     |  2 +-
 .../maintaining/releasing-a-new-version.md    |  2 +-
 .../maintaining/reviewing-a-pull-request.md   |  2 +-
 docs/_docs/maintaining/special-labels.md      |  2 +-
 docs/_docs/maintaining/triaging-an-issue.md   |  2 +-
 docs/_docs/pages.md                           | 14 +++++-----
 docs/_docs/plugins/commands.md                |  2 +-
 docs/_docs/plugins/installation.md            | 13 ++++------
 docs/_docs/plugins/tags.md                    | 11 ++++----
 docs/_docs/posts.md                           |  2 +-
 docs/_docs/step-by-step/07-assets.md          |  6 ++---
 docs/_docs/structure.md                       | 26 +++++++++----------
 docs/_docs/themes.md                          |  6 ++---
 docs/_docs/upgrading/2-to-3.md                |  4 +--
 docs/_sass/_style.scss                        | 10 +++++++
 .../convert-existing-site-to-jekyll.md        |  2 +-
 docs/_tutorials/index.md                      |  4 +--
 docs/_tutorials/navigation.md                 |  4 +--
 27 files changed, 90 insertions(+), 81 deletions(-)

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index 00e41181b68..4e591d3b587 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -25,9 +25,11 @@ collections:
     people: true
 ```
 
-
    
-  
    When defining a collection as a sequence, its pages will not be rendered by default. To enable this, output: true must be specified on the collection, which requires defining the collection as a mapping. For more information, see the section Output
    
-
    
+{: .note .info}
+When defining a collection as a sequence, its pages will not be rendered by
+default. To enable this, output: true must be specified on the
+collection, which requires defining the collection as a mapping. For more
+information, see the section Output.
 
 
    
   
    Gather your collections {%- include docs_version_badge.html version="3.7.0" -%}
    
diff --git a/docs/_docs/configuration/environments.md b/docs/_docs/configuration/environments.md
index be8d376fc45..95250cc854a 100644
--- a/docs/_docs/configuration/environments.md
+++ b/docs/_docs/configuration/environments.md
@@ -42,8 +42,8 @@ environment but not include it in production environments.
 By specifying the option in the build command, you avoid having to change
 values in your configuration files when moving from one environment to another.
 
-
    
-  
    
-    To switch part of your config settings depending on the environment, use the build command option, for example --config _config.yml,_config_development.yml. Settings in later files override settings in earlier files.
-  
    
-
    
+{: .note}
+To switch part of your config settings depending on the environment, use the
+build command option,
+for example --config _config.yml,_config_development.yml. Settings
+in later files override settings in earlier files.
diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md
index 04d3c77984c..836c8e77772 100644
--- a/docs/_docs/installation/macos.md
+++ b/docs/_docs/installation/macos.md
@@ -104,9 +104,9 @@ To check that your gem paths point to your home directory run:
 gem env
 ```
 
-And check that `GEM PATHS:` points to a path in your home directory
+And check that `GEM PATHS:` points to a path in your home directory.
 
-{: .note }
+{: .note .info}
 Every time you update Ruby to a version with a different first two digits, you will need to update your path to match.
 
 ### Global Install
diff --git a/docs/_docs/installation/windows.md b/docs/_docs/installation/windows.md
index 73020ba81c0..e564edde35f 100644
--- a/docs/_docs/installation/windows.md
+++ b/docs/_docs/installation/windows.md
@@ -35,7 +35,8 @@ That's it, you're ready to use Jekyll!
 If you are using Windows 10 version 1607 or later, another option to run Jekyll is by
 [installing](https://msdn.microsoft.com/en-us/commandline/wsl/install_guide) the Windows Subsystem for Linux.
 
-*Note:* You must have [Windows Subsystem for Linux](https://msdn.microsoft.com/en-us/commandline/wsl/about) enabled.
+{: .note .info}
+You must have [Windows Subsystem for Linux](https://msdn.microsoft.com/en-us/commandline/wsl/about) enabled.
 
 First let's make sure all our packages / repositories are up to date. Open a new Command Prompt instance, and type the following:
 
@@ -89,7 +90,8 @@ with the current date in the filename.
   the "Running Jekyll as Non-Superuser" instructions in Troubleshooting.
    
 
    
 
-**Note:** Bash on Ubuntu on Windows is still under development, so you may run into issues.
+{: .note .info}
+Bash on Ubuntu on Windows is still under development, so you may run into issues.
 
 ## Encoding
 
@@ -125,11 +127,11 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
    
   
    TZInfo 2.0 incompatibility
    
   
    
-    v2.0 of the TZInfo library has introduced a change in how timezone offsets are calculated.
+    Version 2.0 of the TZInfo library has introduced a change in how timezone offsets are calculated.
     This will result in incorrect date and time for your posts when the site is built with Jekyll 3.x on Windows.
   
    
   
    
-    We therefore recommend that you lock the Timezone library to v1.2 and above by listing
+    We therefore recommend that you lock the Timezone library to version 1.2 and above by listing
     gem 'tzinfo', '~> 1.2' in your Gemfile.
   
    
 
    
diff --git a/docs/_docs/liquid/tags.md b/docs/_docs/liquid/tags.md
index 508684527ba..a813cd9c5d4 100644
--- a/docs/_docs/liquid/tags.md
+++ b/docs/_docs/liquid/tags.md
@@ -18,12 +18,11 @@ Jekyll has built in support for syntax highlighting of over 100 languages
 thanks to [Rouge](http://rouge.jneen.net). Rouge is the default highlighter
 in Jekyll 3 and above.
 
-
    
-  
    Using Pygments has been deprecated and is not supported in
-  Jekyll 4, the configuration setting highlighter: pygments
-  now automatically falls back to using Rouge which is written in Ruby
-  and 100% compatible with stylesheets for Pygments.
    
-
    
+{: .note .warning}
+Using Pygments has been deprecated and is not supported in
+Jekyll 4; the configuration setting highlighter: pygments
+now automatically falls back to using Rouge which is written in Ruby
+and 100% compatible with stylesheets for Pygments.
 
 To render a code block with syntax highlighting, surround your code as follows:
 
@@ -47,7 +46,7 @@ wiki](https://github.com/jayferd/rouge/wiki/List-of-supported-languages-and-lexe
   
    If you are using a language that contains curly braces, you
     will likely need to place {% raw %} and
     {% endraw %} tags around your code.
-    Since {% include docs_version_badge.html version="4.0" %} you can add render_with_liquid: false in your front matter to disable Liquid entirely for a particular document.
    
+    Since Jekyll {% include docs_version_badge.html version="4.0" %}, you can add render_with_liquid: false in your front matter to disable Liquid entirely for a particular document.
    
 
    
 
 ### Line numbers
@@ -84,8 +83,8 @@ the syntax highlighter styles into your `main.css`:
 
 ## Links
 
-{: .note }
-Since Jekyll {% include docs_version_badge.html version="v4.0"%} you don't need to prepend `link` and `post_url` tags with `site.baseurl`
+{: .note}
+Since Jekyll {% include docs_version_badge.html version="4.0"%}, you don't need to prepend `link` and `post_url` tags with `site.baseurl`.
 
 ### Linking to pages {#link}
 
diff --git a/docs/_docs/maintaining/affinity-team-captain.md b/docs/_docs/maintaining/affinity-team-captain.md
index 70d0e10da16..a1d982f9e85 100644
--- a/docs/_docs/maintaining/affinity-team-captain.md
+++ b/docs/_docs/maintaining/affinity-team-captain.md
@@ -3,7 +3,7 @@ title: Affinity Team Captains
 ---
 
 **This guide is for affinity team captains.** These special people are **team maintainers** of one of our [affinity teams][] and help triage and evaluate the issues and contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
-{: .note .info }
+{: .note .info}
 
 ## Affinity teams & their captains
 
diff --git a/docs/_docs/maintaining/avoiding-burnout.md b/docs/_docs/maintaining/avoiding-burnout.md
index ea9f88a2c84..42f4b7d3207 100644
--- a/docs/_docs/maintaining/avoiding-burnout.md
+++ b/docs/_docs/maintaining/avoiding-burnout.md
@@ -3,7 +3,7 @@ title: "Avoiding Burnout"
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
-{: .note .info }
+{: .note .info}
 
 # 1. Use Jekyll
 
diff --git a/docs/_docs/maintaining/becoming-a-maintainer.md b/docs/_docs/maintaining/becoming-a-maintainer.md
index 00abef54bd8..21474b0e1e5 100644
--- a/docs/_docs/maintaining/becoming-a-maintainer.md
+++ b/docs/_docs/maintaining/becoming-a-maintainer.md
@@ -3,7 +3,7 @@ title: "Becoming a Maintainer"
 ---
 
 **This guide is for contributors.** These special people have contributed to one or more of Jekyll's repositories, but do not yet have write access to any. You may find what is written here interesting, but it’s definitely not for everyone.
-{: .note .info }
+{: .note .info}
 
 So you want to become a maintainer of a Jekyll project? We'd love to have you! Here are some things we like to see from community members before we promote them to maintainers.
 
diff --git a/docs/_docs/maintaining/index.md b/docs/_docs/maintaining/index.md
index 645030e28c9..1d517ce47cd 100644
--- a/docs/_docs/maintaining/index.md
+++ b/docs/_docs/maintaining/index.md
@@ -4,7 +4,7 @@ permalink: /docs/maintaining/
 ---
 
 **This guide is for Jekyll contributors and maintainers.** These special people contribute to one or more of Jekyll's repositories or help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
-{: .note .info }
+{: .note .info}
 
 Hello! This is where we document various processes for maintaining Jekyll. Being a maintainer for any Jekyll project is a big responsibility, so we put together some helpful documentation for various tasks you might do as a maintainer.
 
diff --git a/docs/_docs/maintaining/merging-a-pull-request.md b/docs/_docs/maintaining/merging-a-pull-request.md
index 34fa1fec3c6..d24a298c895 100644
--- a/docs/_docs/maintaining/merging-a-pull-request.md
+++ b/docs/_docs/maintaining/merging-a-pull-request.md
@@ -3,7 +3,7 @@ title: "Merging a Pull Request"
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
-{: .note .info }
+{: .note .info}
 
 ## Code Review
 
diff --git a/docs/_docs/maintaining/releasing-a-new-version.md b/docs/_docs/maintaining/releasing-a-new-version.md
index f85f499e408..5e1cbc3f0db 100644
--- a/docs/_docs/maintaining/releasing-a-new-version.md
+++ b/docs/_docs/maintaining/releasing-a-new-version.md
@@ -3,7 +3,7 @@ title: "Releasing a new version"
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
-{: .note .info }
+{: .note .info}
 
 The most important thing to understand before making a release is that there's no need to feel nervous. Most things are revertable, and even if you do publish an incomplete gem version, we can always skip that one. Don't hestitate to contact the other maintainers if you feel unsure or don't know what to do next.
 
diff --git a/docs/_docs/maintaining/reviewing-a-pull-request.md b/docs/_docs/maintaining/reviewing-a-pull-request.md
index a0a6e353de5..cff0efd3874 100644
--- a/docs/_docs/maintaining/reviewing-a-pull-request.md
+++ b/docs/_docs/maintaining/reviewing-a-pull-request.md
@@ -3,7 +3,7 @@ title: "Reviewing a Pull Request"
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
-{: .note .info }
+{: .note .info}
 
 ## Respond Kindly
 
diff --git a/docs/_docs/maintaining/special-labels.md b/docs/_docs/maintaining/special-labels.md
index 964ff0e2e07..4d89841f6cf 100644
--- a/docs/_docs/maintaining/special-labels.md
+++ b/docs/_docs/maintaining/special-labels.md
@@ -3,7 +3,7 @@ title: "Special Labels"
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
-{: .note .info }
+{: .note .info}
 
 We use a series of "special labels" on GitHub.com to automate handling of some parts of the pull request and issue process. @jekyllbot may automatically apply or remove certain labels based on actions taken by users or maintainers. Below are the labels and how they work:
 
diff --git a/docs/_docs/maintaining/triaging-an-issue.md b/docs/_docs/maintaining/triaging-an-issue.md
index 36bfdcc95a9..ac0833b1f08 100644
--- a/docs/_docs/maintaining/triaging-an-issue.md
+++ b/docs/_docs/maintaining/triaging-an-issue.md
@@ -3,7 +3,7 @@ title: "Triaging an Issue"
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
-{: .note .info }
+{: .note .info}
 
 Before evaluating an issue, it is important to identify if it is a feature
 request or a bug. For the Jekyll project the following definitions are used
diff --git a/docs/_docs/pages.md b/docs/_docs/pages.md
index 98b21b7d098..d707d0f44da 100644
--- a/docs/_docs/pages.md
+++ b/docs/_docs/pages.md
@@ -15,8 +15,8 @@ and associated URLs might look like:
 
 ```
 .
-|-- about.md    # => http://example.com/about.html
-|-- index.html    # => http://example.com/
+├── about.md    # => http://example.com/about.html
+├── index.html    # => http://example.com/
 └── contact.html  # => http://example.com/contact.html
 ```
 
@@ -24,11 +24,11 @@ If you have a lot of pages, you can organize them into subfolders. The same subf
 
 ```
 .
-|-- about.md          # => http://example.com/about.html
-|-- documentation     # folder containing pages
-    └── doc1.md       # => http://example.com/documentation/doc1.html
-|-- design            # folder containing pages
-    └── draft.md      # => http://example.com/design/draft.html
+├── about.md          # => http://example.com/about.html
+├── documentation     # folder containing pages
+│   └── doc1.md       # => http://example.com/documentation/doc1.html
+├── design            # folder containing pages
+│   └── draft.md      # => http://example.com/design/draft.html
 ```
 
 ## Changing the output URL
diff --git a/docs/_docs/plugins/commands.md b/docs/_docs/plugins/commands.md
index cd704346ea8..0666c779a5f 100644
--- a/docs/_docs/plugins/commands.md
+++ b/docs/_docs/plugins/commands.md
@@ -2,7 +2,7 @@
 title: Commands
 permalink: /docs/plugins/commands/
 ---
-As of version 2.5.0, Jekyll can be extended with plugins which provide
+As of version {% include docs_version_badge.html version="2.5.0"%}, Jekyll can be extended with plugins which provide
 subcommands for the `jekyll` executable. This is possible by including the
 relevant plugins in a `Gemfile` group called `:jekyll_plugins`:
 
diff --git a/docs/_docs/plugins/installation.md b/docs/_docs/plugins/installation.md
index 02e7b628b53..2e4fad122d2 100644
--- a/docs/_docs/plugins/installation.md
+++ b/docs/_docs/plugins/installation.md
@@ -52,7 +52,7 @@ You have 3 options for installing plugins:
   
    
 
    
 
-
    
+
    
   
    
     _plugins, _config.yml and Gemfile
     can be used simultaneously
@@ -73,10 +73,7 @@ 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.
 
-
    
-  
    
-    Gems included in the :jekyll-plugins group are activated
-    regardless of the --safe mode setting. Be aware of what
-    gems are included under this group!
-  
    
-
    
+{: .note .warning}
+Gems included in the :jekyll-plugins group are activated
+regardless of the --safe mode setting. Be aware of which
+gems are included under this group!
diff --git a/docs/_docs/plugins/tags.md b/docs/_docs/plugins/tags.md
index fff0a45fd3a..3695a94c712 100644
--- a/docs/_docs/plugins/tags.md
+++ b/docs/_docs/plugins/tags.md
@@ -107,9 +107,8 @@ And we would still get the same output as above on the page:
 
    page rendered at: Tue June 22 23:38:47 –0500 2010
    
 ```
 
-
    
-  
    In the above example, the tag block and the tag are both registered with
-  the name render_time but to register a tag and a tag block using
-  the same name in the same project is not recommended as this may lead to
-  conflicts.
    
-
    
+{: .note .info}
+In the above example, the tag block and the tag are both registered with
+the name render_time, but to register a tag and a tag block using
+the same name in the same project is not recommended as this may lead to
+conflicts.
diff --git a/docs/_docs/posts.md b/docs/_docs/posts.md
index 6fff5a08f56..34e21f5c717 100644
--- a/docs/_docs/posts.md
+++ b/docs/_docs/posts.md
@@ -200,7 +200,7 @@ create a `_drafts` folder in your site's root and create your first draft:
 ```
 .
 ├── _drafts
-|   └── a-draft-post.md
+│   └── a-draft-post.md
 ...
 ```
 
diff --git a/docs/_docs/step-by-step/07-assets.md b/docs/_docs/step-by-step/07-assets.md
index 5d8b1b8a92d..8399f15bfb4 100644
--- a/docs/_docs/step-by-step/07-assets.md
+++ b/docs/_docs/step-by-step/07-assets.md
@@ -11,9 +11,9 @@ Jekyll sites often use this structure to keep assets organized:
 ```
 .
 ├── assets
-|   ├── css
-|   ├── images
-|   └── js
+│   ├── css
+│   ├── images
+│   └── js
 ...
 ```
 
diff --git a/docs/_docs/structure.md b/docs/_docs/structure.md
index 33a74aa710d..1843bc0e4d6 100644
--- a/docs/_docs/structure.md
+++ b/docs/_docs/structure.md
@@ -8,31 +8,31 @@ A basic Jekyll site usually looks something like this:
 .
 ├── _config.yml
 ├── _data
-|   └── members.yml
+│   └── members.yml
 ├── _drafts
-|   ├── begin-with-the-crazy-ideas.md
-|   └── on-simplicity-in-technology.md
+│   ├── begin-with-the-crazy-ideas.md
+│   └── on-simplicity-in-technology.md
 ├── _includes
-|   ├── footer.html
-|   └── header.html
+│   ├── footer.html
+│   └── header.html
 ├── _layouts
-|   ├── default.html
-|   └── post.html
+│   ├── default.html
+│   └── post.html
 ├── _posts
-|   ├── 2007-10-29-why-every-programmer-should-play-nethack.md
-|   └── 2009-04-26-barcamp-boston-4-roundup.md
+│   ├── 2007-10-29-why-every-programmer-should-play-nethack.md
+│   └── 2009-04-26-barcamp-boston-4-roundup.md
 ├── _sass
-|   ├── _base.scss
-|   └── _layout.scss
+│   ├── _base.scss
+│   └── _layout.scss
 ├── _site
 ├── .jekyll-metadata
 └── index.html # can also be an 'index.md' with valid front matter
 ```
 
-
    
+
    
   
    Directory structure of Jekyll sites using gem-based themes
    
   
    
-    Starting Jekyll 3.2, a new Jekyll project bootstrapped with jekyll new uses gem-based themes to define the look of the site. This results in a lighter default directory structure : _layouts, _includes and _sass are stored in the theme-gem, by default.
+    Since version {% include docs_version_badge.html version="3.2"%}, a new Jekyll project bootstrapped with jekyll new uses gem-based themes to define the look of the site. This results in a lighter default directory structure: _layouts, _includes and _sass are stored in the theme-gem, by default.
   
    
   
    
   
    
diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
index a518ee2b0b8..99ab3cbf2db 100644
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -120,8 +120,8 @@ Jekyll will look first to your site's content before looking to the theme's defa
 
 Note that making copies of theme files will prevent you from receiving any theme updates on those files. An alternative, to continue getting theme updates on all stylesheets, is to use higher specificity CSS selectors in your own additional, originally named CSS files.
 
-Refer to your selected theme's documentation and source repository for more information on what files you can override.
 {: .note .info}
+Refer to your selected theme's documentation and source repository for more information on which files you can override.
 
 ## Converting gem-based themes to regular themes
 
@@ -221,8 +221,8 @@ To install a gem-based theme:
    bundle exec jekyll serve
    ```
 
+{: .note .info}
 You can have multiple themes listed in your site's `Gemfile`, but only one theme can be selected in your site's `_config.yml`.
-{: .note .info }
 
 If you're publishing your Jekyll site on [GitHub Pages](https://pages.github.com/), note that GitHub Pages supports only [some gem-based themes](https://pages.github.com/themes/). GitHub Pages also supports [using any theme hosted on GitHub](https://help.github.com/articles/adding-a-jekyll-theme-to-your-github-pages-site/#adding-a-jekyll-theme-in-your-sites-_configyml-file) using the `remote_theme` configuration as if it were a gem-based theme.
 
@@ -320,8 +320,8 @@ Themes are visual. Show users what your theme looks like by including a screensh
 
 To preview your theme as you're authoring it, it may be helpful to add dummy content in, for example, `/index.html` and `/page.html` files. This will allow you to use the `jekyll build` and `jekyll serve` commands to preview your theme, just as you'd preview a Jekyll site.
 
+{: .note .info}
 If you do preview your theme locally, be sure to add `/_site` to your theme's `.gitignore` file to prevent the compiled site from also being included when you distribute your theme.
-{: .info .note}
 
 ### Publishing your theme
 
diff --git a/docs/_docs/upgrading/2-to-3.md b/docs/_docs/upgrading/2-to-3.md
index 0c45fe0224e..f034d492c39 100644
--- a/docs/_docs/upgrading/2-to-3.md
+++ b/docs/_docs/upgrading/2-to-3.md
@@ -12,8 +12,8 @@ Before we dive in, go ahead and fetch the latest version of Jekyll:
 gem update jekyll
 ```
 
-Since v3.2 Jekyll requires Ruby version >= 2.1
-{: .note .warning }
+{: .note .warning}
+Since version {% include docs_version_badge.html version="3.2"%}, Jekyll requires Ruby version >= 2.1.
 
 
    
   
    Diving in
    
diff --git a/docs/_sass/_style.scss b/docs/_sass/_style.scss
index 4a17e410b82..324609fe3c5 100644
--- a/docs/_sass/_style.scss
+++ b/docs/_sass/_style.scss
@@ -991,6 +991,16 @@ code.output {
   }
 }
 
+p.note {
+  color: #fff;
+  font-weight: 400;
+  font-size: .75em;
+
+  &:after {
+    line-height: 1.21;
+  }
+}
+
 .info {
   background-color: #0389aa;
   background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAzODlhYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDYxN2YiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
diff --git a/docs/_tutorials/convert-existing-site-to-jekyll.md b/docs/_tutorials/convert-existing-site-to-jekyll.md
index cbfd859373c..bdac10306b5 100644
--- a/docs/_tutorials/convert-existing-site-to-jekyll.md
+++ b/docs/_tutorials/convert-existing-site-to-jekyll.md
@@ -83,8 +83,8 @@ cd my_jekyll_site
 jekyll serve
 ```
 
-If you have a Gemfile, [use Bundler](/docs/ruby-101/#bundler) by typing `bundle exec jekyll serve` instead.
 {: .note .info}
+If you have a Gemfile, [use Bundler](/docs/ruby-101/#bundler) by typing `bundle exec jekyll serve` instead.
 
 When you serve the site, you get a preview URL such as `http://127.0.0.1:4000/` (which is the same as `http://localhost:4000/`). The site's files are built into the `_site` folder by default.
 
diff --git a/docs/_tutorials/index.md b/docs/_tutorials/index.md
index ec537203ba9..4deb89bcf98 100644
--- a/docs/_tutorials/index.md
+++ b/docs/_tutorials/index.md
@@ -15,8 +15,8 @@ In contrast to [Docs](/docs/home/), Tutorials provide more detailed, narrative i
 
 In short, tutorials aren't the core reference information in docs. They walk users through processes from beginning to end.
 
-{: .info .note}
-**Note:** The Tutorials section is new, so there aren't many tutorials yet. You can add a tutorial here to help populate this section.
+{: .note .info}
+The Tutorials section is new, so there aren't many tutorials yet. You can add a tutorial here to help populate this section.
 
 Some of these techniques might even guide you through a supporting tool, script, service, or other hack used with your Jekyll site. Feel free to include tutorials involving external services with Jekyll as well. However, note that Jekyll in no way endorses any third-party tools mentioned in tutorials.
 
diff --git a/docs/_tutorials/navigation.md b/docs/_tutorials/navigation.md
index 7ba036ef8b8..c1c86a259b8 100644
--- a/docs/_tutorials/navigation.md
+++ b/docs/_tutorials/navigation.md
@@ -69,8 +69,8 @@ docs:
    
 
    
 
-{: .note .info }
-For the results in these fictitious samples, `#` is manually substituted for the actual link value to avoid 404 errors.)
+{: .note .info}
+For the results in these fictitious samples, `#` is manually substituted for the actual link value (to avoid 404 errors.)
 
 When you use a `for` loop, you choose how you want to refer to the items you're looping through. The variable you choose (in this case, `item`) becomes how you access the properties of each item in the list. Dot notation is used to get a property of the item (for example, `item.url`).
 

From e6d082488cf4805096b4dd5399a40b761771bfdf Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 28 Feb 2020 14:29:49 -0500
Subject: [PATCH 3911/4996] Update history to reflect merge of #8037 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 38814144263..c402d3b83af 100644
--- a/History.markdown
+++ b/History.markdown
@@ -61,6 +61,7 @@
   * Corrected command to modify PATH (#8029)
   * Corrected command to modify PATH (#8030)
   * Docs: Render full contents of just the latest post (#8032)
+  * docs: improvements for note boxes (#8037)
 
 ### Development Fixes
 

From 028c306c11fa86eaa7e540617af36b47a7fffaa8 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 2 Mar 2020 16:21:28 +0100
Subject: [PATCH 3912/4996] chore: redirect questions to the forum

---
 .github/ISSUE_TEMPLATE/config.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000000..ef9a6e1abae
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Jekyll Community Forum
+    url: https://talk.jekyllrb.com/
+    about: Please ask and answer questions here.

From 6ae640755fc1608358c45afd9b06e2aa1ec6e56e Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 2 Mar 2020 16:22:42 +0100
Subject: [PATCH 3913/4996] chore: remove question template

---
 .github/ISSUE_TEMPLATE/question.md | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/question.md

diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index abde4c60018..00000000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: Question
-about: Have any questions about how Jekyll works?
-title: ''
-labels: ''
-assignees: ''
-
----
-
-

From ea57ef78da1c358f578ddb2ae7b222476fa0b118 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 4 Mar 2020 20:44:53 +0530
Subject: [PATCH 3914/4996] Simplify Jekyll::Hooks.trigger logic (#8044)

Merge pull request 8044
---
 lib/jekyll/hooks.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/hooks.rb b/lib/jekyll/hooks.rb
index a6fbc74370f..47cdae4c613 100644
--- a/lib/jekyll/hooks.rb
+++ b/lib/jekyll/hooks.rb
@@ -91,11 +91,8 @@ def self.insert_hook(owner, event, priority, &block)
     # interface for Jekyll core components to trigger hooks
     def self.trigger(owner, event, *args)
       # proceed only if there are hooks to call
-      return unless @registry[owner]
-      return unless @registry[owner][event]
-
-      # hooks to call for this owner and event
-      hooks = @registry[owner][event]
+      hooks = @registry.dig(owner, event)
+      return if hooks.nil? || hooks.empty?
 
       # sort and call hooks according to priority and load order
       hooks.sort_by { |h| @hook_priority[h] }.each do |hook|

From ab6ef0b257e4c7aafec0518d93bea3e9c4b75b75 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Wed, 4 Mar 2020 10:14:55 -0500
Subject: [PATCH 3915/4996] Update history to reflect merge of #8044 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index c402d3b83af..9e3d417f677 100644
--- a/History.markdown
+++ b/History.markdown
@@ -81,6 +81,7 @@
   * Update unit tests for Kramdown-based converter (#8014)
   * Add Visual Studio Code Development Container (#8016)
   * Configure kramdown toc_levels as array by default (#8015)
+  * Simplify Jekyll::Hooks.trigger logic (#8044)
 
 ### Site Enhancements
 

From 0f4c8d22482fdc65c4d91ce657d9fceb07e16319 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Fri, 6 Mar 2020 21:38:56 +0530
Subject: [PATCH 3916/4996] Allow multiple binary operator in where_exp filter
 (#8047)

Merge pull request 8047
---
 lib/jekyll/filters.rb | 10 +++++++---
 test/test_filters.rb  | 17 +++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 31b24d7a9b3..fcfe6477903 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -432,10 +432,14 @@ def parse_condition(exp)
     #
     # Returns an instance of Liquid::Condition
     def parse_binary_comparison(parser)
-      parse_comparison(parser).tap do |condition|
-        binary_operator = parser.id?("and") || parser.id?("or")
-        condition.send(binary_operator, parse_comparison(parser)) if binary_operator
+      condition = parse_comparison(parser)
+      first_condition = condition
+      while (binary_operator = parser.id?("and") || parser.id?("or"))
+        child_condition = parse_comparison(parser)
+        condition.send(binary_operator, child_condition)
+        condition = child_condition
       end
+      first_condition
     end
 
     # Generates a Liquid::Condition object from a Liquid::Parser object based on whether the parsed
diff --git a/test/test_filters.rb b/test/test_filters.rb
index c9358a610a1..89a586cca4e 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -997,6 +997,23 @@ def to_liquid
         )
       end
 
+      should "filter objects across multiple conditions" do
+        sample = [
+          { "color" => "teal", "size" => "large", "type" => "variable" },
+          { "color" => "red",  "size" => "large", "type" => "fixed" },
+          { "color" => "red",  "size" => "medium", "type" => "variable" },
+          { "color" => "blue", "size" => "medium", "type" => "fixed" },
+        ]
+        assert_equal(
+          [
+            { "color" => "red", "size" => "large", "type" => "fixed" },
+          ],
+          @filter.where_exp(
+            sample, "item", "item.type == 'fixed' and item.color == 'red' or item.color == 'teal'"
+          )
+        )
+      end
+
       should "stringify during comparison for compatibility with liquid parsing" do
         hash = {
           "The Words" => { "rating" => 1.2, "featured" => false },

From 27ca06326a00a6c783270027a35b4b59844cb45c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 6 Mar 2020 11:08:59 -0500
Subject: [PATCH 3917/4996] Update history to reflect merge of #8047 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 9e3d417f677..0bdab578b54 100644
--- a/History.markdown
+++ b/History.markdown
@@ -9,6 +9,7 @@
   * Memoize absolute_url and relative_url filters (#7793)
   * Fix documentation comment for Jekyll::Converters::Identity (#7883)
   * Optimize Jekyll::Filters#item_property (#7696)
+  * Allow multiple binary operators in where_exp filter (#8047)
 
 ### Minor Enhancements
 

From c8d673c98415cd91e0b35e13b6341310969de006 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 7 Mar 2020 09:57:14 +0100
Subject: [PATCH 3918/4996] docs: external links

Third-party services, deployment services
---
 docs/_tutorials/convert-existing-site-to-jekyll.md | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/docs/_tutorials/convert-existing-site-to-jekyll.md b/docs/_tutorials/convert-existing-site-to-jekyll.md
index bdac10306b5..650006744ce 100644
--- a/docs/_tutorials/convert-existing-site-to-jekyll.md
+++ b/docs/_tutorials/convert-existing-site-to-jekyll.md
@@ -515,14 +515,7 @@ You can also auto-generate your sitemap by adding a gem called [`jekyll-sitemap`
 
 ## 12. Add external services
 
-For other services you might need (such as contact forms, search, comments, and more), look for third-party services. For example, you might use the following:
-
-  * For comments: [Disqus](https://disqus.com/)
-  * For a newsletter: [Tinyletter](https://tinyletter.com/)
-  * For contact forms: [Wufoo](https://www.wufoo.com/)
-  * For search: [Algolia Docsearch](https://community.algolia.com/docsearch/)
-
-For more details on services for static sites, see the [Third Parties](https://learn.cloudcannon.com/jekyll-third-parties/) list and tutorials from CloudCannon.
+For other services you might need (such as contact forms, search, comments, and more), [look for third-party services](https://serverless.css-tricks.com/services/). We listed some [integrations on our resources page](/resources/#integrations) but in todays's world of SaaS and APis the list is endless.
 
 Your Jekyll pages consist of HTML, CSS, and JavaScript, so pretty much any code you need to embed will work without a problem.
 
@@ -540,7 +533,7 @@ layout: null
 
 Although websites can implement more sophisticated features and functionality, we've covered the basics in this tutorial. You now have a fully functional Jekyll site.
 
-To deploy your site, consider using [GitHub Pages](https://pages.github.com/), [Netlify](https://www.netlify.com/), [Amazon AWS S3](https://aws.amazon.com/s3/) using the [s3_website plugin](https://github.com/laurilehmijoki/s3_website), or just FTP your files to your web server.
+To deploy your site, consider using [GitHub Pages](https://pages.github.com/), [Netlify](https://www.netlify.com/), [ZEIT](https://zeit.co), [Render](https://render.com), [Amazon AWS S3](https://aws.amazon.com/s3/) using the [s3_website plugin](https://github.com/laurilehmijoki/s3_website), or just FTP your files to your web server.
 
 You can also package your layouts, includes and assets into a Ruby `gem` and [make it a Jekyll theme](/docs/themes/).
 

From 422470dc6ee53c1b6af3052bc288678d4cfa4b29 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sat, 7 Mar 2020 10:36:49 +0100
Subject: [PATCH 3919/4996] docs: ZEIT and Render

---
 docs/_docs/deployment/third-party.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/deployment/third-party.md b/docs/_docs/deployment/third-party.md
index 7c25c5746dc..7882e48368a 100644
--- a/docs/_docs/deployment/third-party.md
+++ b/docs/_docs/deployment/third-party.md
@@ -35,10 +35,18 @@ Install the Kickster gem and you are good to go. More documentation can here fou
 
 ## Netlify
 
-Netlify provides Global CDN, Continuous Deployment, one click HTTPS and [much more](https://www.netlify.com/features/), providing developers the most robust toolset available for modern web projects, without added complexity. Netlify supports custom plugins for Jekyll and has a free plan for open source projects.
+Netlify provides Global CDN, Continuous Deployment, one click HTTPS and [much more](https://www.netlify.com/features/), providing developers a robust toolset for modern web projects, without added complexity. Netlify supports custom plugins for Jekyll and has a free plan for open source projects.
 
 Read this [Jekyll step-by-step guide](https://www.netlify.com/blog/2015/10/28/a-step-by-step-guide-jekyll-3.0-on-netlify/) to setup your Jekyll site on Netlify.
 
+## Render
+
+[Render](https://render.com) provides zero config continuous deployment for static sites. The service is free under 100GB monthly bandwith.
+
 ## Static Publisher
 
 [Static Publisher](https://github.com/static-publisher/static-publisher) is another automated deployment option with a server listening for webhook posts, though it's not tied to GitHub specifically. It has a one-click deploy to Heroku, it can watch multiple projects from one server, it has an easy to user admin interface and can publish to either S3 or to a git repository (e.g. gh-pages).
+
+## ZEIT
+
+[ZEIT](https://zeit.co/) provides zero config continuous deployment, HTTPS Custom domains, high performance smart CDN, you get instant static deploy for free.

From 3e182ef25e707748528d25a7f8a385b96524e4e5 Mon Sep 17 00:00:00 2001
From: Riccardo Porreca 
Date: Sat, 7 Mar 2020 17:40:24 +0100
Subject: [PATCH 3920/4996] Non-deprecated `vendor/bundle` path configuration
 (#8048)

Merge pull request 8048
---
 docs/_tutorials/using-jekyll-with-bundler.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_tutorials/using-jekyll-with-bundler.md b/docs/_tutorials/using-jekyll-with-bundler.md
index 069602e2061..73e77679469 100644
--- a/docs/_tutorials/using-jekyll-with-bundler.md
+++ b/docs/_tutorials/using-jekyll-with-bundler.md
@@ -41,7 +41,7 @@ other gems on your system. If you skip this step, Bundler will install your
 dependencies globally on your system.
 
 ```sh
-bundle install --path vendor/bundle
+bundle config set path 'vendor/bundle'
 ```
 
 
    

From a1c18b6e8712dfce12cece11d4f68245e8f18c62 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sat, 7 Mar 2020 11:40:26 -0500
Subject: [PATCH 3921/4996] Update history to reflect merge of #8048 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 0bdab578b54..89468543248 100644
--- a/History.markdown
+++ b/History.markdown
@@ -63,6 +63,7 @@
   * Corrected command to modify PATH (#8030)
   * Docs: Render full contents of just the latest post (#8032)
   * docs: improvements for note boxes (#8037)
+  * Non-deprecated `vendor/bundle` path configuration (#8048)
 
 ### Development Fixes
 

From 256b0875cb944512da5daa4e5cecf3b3c9aaee9f Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 10 Mar 2020 01:20:31 +0100
Subject: [PATCH 3922/4996] site: make resources editable

---
 docs/_layouts/page.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/_layouts/page.html b/docs/_layouts/page.html
index 28364e7dbde..caa618649fd 100644
--- a/docs/_layouts/page.html
+++ b/docs/_layouts/page.html
@@ -6,6 +6,11 @@
   
    
     
    
       
    
+        {%- if page.permalink contains "resources" %}
+        
    
+            Improve this page
+        
    
+        {% endif -%}
         
    {{ page.title }}
    
         {{ content }}
       
    

From 325e6bb3f8b5026618df7d8940a251229b1d1476 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 10 Mar 2020 01:21:06 +0100
Subject: [PATCH 3923/4996] docs: add page layout to philosophy

---
 docs/pages/philosophy.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/pages/philosophy.md b/docs/pages/philosophy.md
index e6c08397934..93021fbe163 100644
--- a/docs/pages/philosophy.md
+++ b/docs/pages/philosophy.md
@@ -1,4 +1,5 @@
 ---
+layout: page
 title: Philosophy
 permalink: /philosophy/
 ---

From 1115eebe15316b992870f6ba4d41971b11af97b2 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 10 Mar 2020 01:24:32 +0100
Subject: [PATCH 3924/4996] docs: add typeform

---
 docs/pages/resources.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/pages/resources.md b/docs/pages/resources.md
index f15684e608d..dd57de83acf 100644
--- a/docs/pages/resources.md
+++ b/docs/pages/resources.md
@@ -69,6 +69,7 @@ Use a SaaS service as a backend for functionality on your Jekyll site
   - [formX](https://formx.stream)
   - [Simple Form](https://getsimpleform.com/)
   - [SmartForms](https://smartforms.dev/)
+  - [Typeform](https://www.typeform.com/templates/c/forms/)
 
 ### Search
   - [Algolia](https://blog.algolia.com/instant-search-blog-documentation-jekyll-plugin/): Add a powerful instant search to your Jekyll site

From f826b8b5eab9bdce08868c5e09de87a02dd536a4 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 12 Mar 2020 20:28:17 +0530
Subject: [PATCH 3925/4996] Fix documents custom-ordering logic (#8028)

Merge pull request 8028
---
 lib/jekyll/collection.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index 874d26f2215..318642151a1 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -239,7 +239,7 @@ def sort_docs_by_key!
 
         # Fall back to `Document#<=>` if the properties were equal or were non-sortable
         # Otherwise continue with current sort-order
-        if order.zero? || order.nil?
+        if order.nil? || order.zero?
           apples[-1] <=> olives[-1]
         else
           order

From 88360bd17d5824a5cff01321722a3f0e7418a620 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 12 Mar 2020 10:58:20 -0400
Subject: [PATCH 3926/4996] Update history to reflect merge of #8028 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 89468543248..259f50d56cc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -10,6 +10,7 @@
   * Fix documentation comment for Jekyll::Converters::Identity (#7883)
   * Optimize Jekyll::Filters#item_property (#7696)
   * Allow multiple binary operators in where_exp filter (#8047)
+  * Fix documents custom-ordering logic (#8028)
 
 ### Minor Enhancements
 

From a4b1ca2c757fcbd96e14f8701702dbba41070977 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 15 Mar 2020 23:49:54 +0100
Subject: [PATCH 3927/4996] chore: simplify require for Jekyll::VERSION (#8057)

Merge pull request 8057
---
 jekyll.gemspec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 370084ab4d6..6ebe33dbe85 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "jekyll/version"
+require_relative "lib/jekyll/version"
 
 Gem::Specification.new do |s|
   s.name          = "jekyll"

From 190a35dc9a5d3ff5f2cea1837f55c2f38f272ee6 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 15 Mar 2020 18:49:57 -0400
Subject: [PATCH 3928/4996] Update history to reflect merge of #8057 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 259f50d56cc..da80fcffc37 100644
--- a/History.markdown
+++ b/History.markdown
@@ -85,6 +85,7 @@
   * Add Visual Studio Code Development Container (#8016)
   * Configure kramdown toc_levels as array by default (#8015)
   * Simplify Jekyll::Hooks.trigger logic (#8044)
+  * chore: simplify require for Jekyll::VERSION (#8057)
 
 ### Site Enhancements
 

From ee5d0cffd6dc2934d665259a4799bc4e74fcc3d7 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 16 Mar 2020 12:36:30 +0530
Subject: [PATCH 3929/4996] Remove version-constraint relaxation for i18n gem
 (#8055)

Merge pull request 8055
---
 jekyll.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 6ebe33dbe85..1c7682adf4f 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("addressable",           "~> 2.4")
   s.add_runtime_dependency("colorator",             "~> 1.0")
   s.add_runtime_dependency("em-websocket",          "~> 0.5")
-  s.add_runtime_dependency("i18n",                  ">= 0.9.5", "< 2")
+  s.add_runtime_dependency("i18n",                  "~> 1.0")
   s.add_runtime_dependency("jekyll-sass-converter", "~> 2.0")
   s.add_runtime_dependency("jekyll-watch",          "~> 2.0")
   s.add_runtime_dependency("kramdown",              "~> 2.1")

From e9174dfd3bd3c8470606bd5e17702e926c8c3625 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 16 Mar 2020 03:06:32 -0400
Subject: [PATCH 3930/4996] Update history to reflect merge of #8055 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index da80fcffc37..73da178e041 100644
--- a/History.markdown
+++ b/History.markdown
@@ -86,6 +86,7 @@
   * Configure kramdown toc_levels as array by default (#8015)
   * Simplify Jekyll::Hooks.trigger logic (#8044)
   * chore: simplify require for Jekyll::VERSION (#8057)
+  * Remove version-constraint relaxation for i18n gem (#8055)
 
 ### Site Enhancements
 

From 7948578cd3eecae4ffc78522b17160da2f99ca48 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 16 Mar 2020 13:54:45 +0530
Subject: [PATCH 3931/4996] Mirror `spec.homepage` as
 `metadata["homepage_uri"]` (#8056)

Merge pull request 8056
---
 jekyll.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 1c7682adf4f..e02bb29a184 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.metadata      = {
+    "source_code_uri" => "https://github.com/jekyll/jekyll",
     "bug_tracker_uri" => "https://github.com/jekyll/jekyll/issues",
     "changelog_uri"   => "https://github.com/jekyll/jekyll/releases",
-    "homepage_uri"    => "https://jekyllrb.com",
-    "source_code_uri" => "https://github.com/jekyll/jekyll",
+    "homepage_uri"    => s.homepage,
   }
 
   s.rdoc_options     = ["--charset=UTF-8"]

From c193677dc52166f551a72ab4c1ec05890c46577f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 16 Mar 2020 04:24:46 -0400
Subject: [PATCH 3932/4996] Update history to reflect merge of #8056 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 73da178e041..228663c976a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -87,6 +87,7 @@
   * Simplify Jekyll::Hooks.trigger logic (#8044)
   * chore: simplify require for Jekyll::VERSION (#8057)
   * Remove version-constraint relaxation for i18n gem (#8055)
+  * Mirror `spec.homepage` as `metadata["homepage_uri"]` (#8056)
 
 ### Site Enhancements
 

From dc5e1d7056949415358993749a69d96ad25dd06f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Kl=C3=BCpfel?= 
Date: Thu, 19 Mar 2020 11:10:25 +0100
Subject: [PATCH 3933/4996] Update 09-collections.md (#8060)

Merge pull request 8060
---
 docs/_docs/step-by-step/09-collections.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/_docs/step-by-step/09-collections.md b/docs/_docs/step-by-step/09-collections.md
index b41003292cf..d7a33b15910 100644
--- a/docs/_docs/step-by-step/09-collections.md
+++ b/docs/_docs/step-by-step/09-collections.md
@@ -112,6 +112,8 @@ collections:
     output: true
 ```
 
+Restart the jekyll server once more for the configuration changes to take effect. 
+
 You can link to the output page using `author.url`.
 
 Add the link to the `staff.html` page:

From 0683ab143ea5e6a0ee8bc9fc1d8694666da43d6b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 19 Mar 2020 06:10:27 -0400
Subject: [PATCH 3934/4996] Update history to reflect merge of #8060 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 228663c976a..3a59d1fa48b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -65,6 +65,7 @@
   * Docs: Render full contents of just the latest post (#8032)
   * docs: improvements for note boxes (#8037)
   * Non-deprecated `vendor/bundle` path configuration (#8048)
+  * Update 09-collections.md (#8060)
 
 ### Development Fixes
 

From 1fe5bd0cf5bc03b376bd9ca446192f7285233298 Mon Sep 17 00:00:00 2001
From: Kieran Barker <29986418+kieranbarker@users.noreply.github.com>
Date: Fri, 20 Mar 2020 10:40:17 +0000
Subject: [PATCH 3935/4996] Remove extra paragraph tags (#8063)

Merge pull request 8063
---
 docs/_docs/step-by-step/08-blogging.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/step-by-step/08-blogging.md b/docs/_docs/step-by-step/08-blogging.md
index 07c6ae32317..249d2c35f10 100644
--- a/docs/_docs/step-by-step/08-blogging.md
+++ b/docs/_docs/step-by-step/08-blogging.md
@@ -76,7 +76,7 @@ title: Blog
   {% for post in site.posts %}
     
  • 
       
    {{ post.title }}
    
-      
    {{ post.excerpt }}
    
+      {{ post.excerpt }}
     
    • 
   {% endfor %}
 

From 83decb42f6998b047c3310245b5a3fe59bfc7b91 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 20 Mar 2020 06:40:19 -0400
Subject: [PATCH 3936/4996] Update history to reflect merge of #8063 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 3a59d1fa48b..993dea2f544 100644
--- a/History.markdown
+++ b/History.markdown
@@ -66,6 +66,7 @@
   * docs: improvements for note boxes (#8037)
   * Non-deprecated `vendor/bundle` path configuration (#8048)
   * Update 09-collections.md (#8060)
+  * Remove extra paragraph tags (#8063)
 
 ### Development Fixes
 

From a1401c6fe9d4cfc5c00de4e926cc14dd107be008 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 22 Mar 2020 21:34:33 +0530
Subject: [PATCH 3937/4996] Use `layout.path` when rendering the Liquid layout
 (#8069)

Merge pull request 8069
---
 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 dff212ef961..7ecd1cb3d33 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -197,7 +197,7 @@ def render_layout(output, layout, info)
         layout.content,
         payload,
         info,
-        layout.relative_path
+        layout.path
       )
     end
 

From a011579fe42ca76fbd531670ed4bc03286b49157 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 22 Mar 2020 12:04:36 -0400
Subject: [PATCH 3938/4996] Update history to reflect merge of #8069 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 993dea2f544..f4ba8338098 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
   * Optimize Jekyll::Filters#item_property (#7696)
   * Allow multiple binary operators in where_exp filter (#8047)
   * Fix documents custom-ordering logic (#8028)
+  * Use `layout.path` when rendering the Liquid layout (#8069)
 
 ### Minor Enhancements
 

From b84ba5acccd0d3c33144ce5013851969d86ca196 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 26 Mar 2020 19:09:47 +0530
Subject: [PATCH 3939/4996] Add PageDrop to provide Liquid templates with data
 (#7992)

Merge pull request 7992
---
 docs/_docs/pages.md              | 35 +++++++++++++++++++++++++++++++
 lib/jekyll/drops/page_drop.rb    | 14 +++++++++++++
 lib/jekyll/page.rb               | 32 ++++++++++++++++++++++++++++
 test/test_page.rb                | 36 ++++++++++++++++++++++++++++++++
 test/test_page_without_a_file.rb |  6 ++++++
 5 files changed, 123 insertions(+)
 create mode 100644 lib/jekyll/drops/page_drop.rb

diff --git a/docs/_docs/pages.md b/docs/_docs/pages.md
index d707d0f44da..6b29267fc69 100644
--- a/docs/_docs/pages.md
+++ b/docs/_docs/pages.md
@@ -34,3 +34,38 @@ If you have a lot of pages, you can organize them into subfolders. The same subf
 ## Changing the output URL
 
 You might want to have a particular folder structure for your source files that changes for the built site. With [permalinks](/docs/permalinks) you have full control of the output URL.
+
+## Liquid Representation
+
+From Jekyll 4.1 onwards, there is a minor change in how instances of `Jekyll::Page` are exposed to layouts and other Liquid
+templates. `Jekyll::Page` instances now use a `Liquid::Drop` instead of a `Hash`. This change results in greater performance
+for a site with numerous *standlone pages not within a collection*.
+
+### For plugin developers
+
+While end-users do not need to take any extra action due to this change, plugin authors depending on the existing behavior *may*
+need to make minor changes to their plugins.
+
+If a `Jekyll::Page` subclass' `to_liquid` method calls `super`, it will have to be slightly modified.
+```ruby
+class Foo::BarPage < Jekyll::Page
+  def to_liquid(*)
+    payload = super        # This needs to be changed to `super.to_h`
+                           # to obtain a Hash as in v4.0.0.
+
+    do_something(payload)  # Logic specific to `Foo::BarPage` objects
+  end
+end
+```
+
+`Jekyll::Page` subclasses won't inherit the optimization automatically until the next major version. However, plugin authors
+can opt-in to the optimization in their subclasses by wrapping the temporary `liquid_drop` method if the subclass doesn't
+override the superclass method:
+```ruby
+class Foo::BarPage < Jekyll::Page
+  def to_liquid(*)
+    liquid_drop    # Returns an instance of `Jekyll::Drops::PageDrop`.
+                   # Will be removed in Jekyll 5.0.
+  end
+end
+```
diff --git a/lib/jekyll/drops/page_drop.rb b/lib/jekyll/drops/page_drop.rb
new file mode 100644
index 00000000000..3a6e961367b
--- /dev/null
+++ b/lib/jekyll/drops/page_drop.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Drops
+    class PageDrop < Drop
+      extend Forwardable
+
+      mutable false
+
+      def_delegators :@obj, :content, :dir, :name, :path, :url
+      private def_delegator :@obj, :data, :fallback_data
+    end
+  end
+end
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index f353252d825..2e346fc5f25 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -70,6 +70,38 @@ def dir
       end
     end
 
+    # For backwards-compatibility in subclasses that do not redefine
+    # the `:to_liquid` method, stash existing definition under a new name
+    #
+    # TODO: Remove in Jekyll 5.0
+    alias_method :legacy_to_liquid, :to_liquid
+    private :legacy_to_liquid
+
+    # Private
+    # Subclasses can choose to optimize their `:to_liquid` method by wrapping
+    # it around this definition.
+    #
+    # TODO: Remove in Jekyll 5.0
+    def liquid_drop
+      @liquid_drop ||= begin
+        defaults = site.frontmatter_defaults.all(relative_path, type)
+        unless defaults.empty?
+          Utils.deep_merge_hashes!(data, Utils.deep_merge_hashes!(defaults, data))
+        end
+        Drops::PageDrop.new(self)
+      end
+    end
+    private :liquid_drop
+
+    # Public
+    #
+    # Liquid representation of current page
+    #
+    # TODO: Remove optional parameter in Jekyll 5.0
+    def to_liquid(attrs = nil)
+      self.class == Jekyll::Page ? liquid_drop : legacy_to_liquid(attrs)
+    end
+
     # The full path and filename of the post. Defined in the YAML of the post
     # body.
     #
diff --git a/test/test_page.rb b/test/test_page.rb
index 16aa3ff90f3..023560c90e6 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -50,6 +50,42 @@ def do_render(page)
         assert_equal "/+/%25%23%20+.html", @page.url
       end
 
+      should "be exposed to Liquid as a Liquid::Drop subclass" do
+        page = setup_page("properties.html")
+        liquid_rep = page.to_liquid
+        refute_equal Hash, liquid_rep.class
+        assert_equal true, liquid_rep.is_a?(Liquid::Drop)
+        assert_equal Jekyll::Drops::PageDrop, liquid_rep.class
+      end
+
+      should "make attributes accessible for use in Liquid templates" do
+        page = setup_page("/contacts", "index.html")
+        template = Liquid::Template.parse(<<~TEXT)
+          Name: {{ page.name }}
+          Path: {{ page.path }}
+          URL:  {{ page.url }}
+        TEXT
+        expected = <<~TEXT
+          Name: index.html
+          Path: contacts/index.html
+          URL:  /contacts/
+        TEXT
+        assert_equal(expected, template.render!("page" => page.to_liquid))
+      end
+
+      should "make front matter data accessible for use in Liquid templates" do
+        page = setup_page("properties.html")
+        template = Liquid::Template.parse(<<~TEXT)
+          TITLE: {{ page.title }}
+          FOO:   {{ page.foo }}
+        TEXT
+        expected = <<~TEXT
+          TITLE: Properties Page
+          FOO:   bar
+        TEXT
+        assert_equal expected, template.render!("page" => page.to_liquid)
+      end
+
       context "in a directory hierarchy" do
         should "create URL based on filename" do
           @page = setup_page("/contacts", "bar.html")
diff --git a/test/test_page_without_a_file.rb b/test/test_page_without_a_file.rb
index f06706962c2..6deca7b537c 100644
--- a/test/test_page_without_a_file.rb
+++ b/test/test_page_without_a_file.rb
@@ -76,6 +76,12 @@ def render_and_write
           end
         end
       end
+
+      should "be exposed to Liquid as a Hash" do
+        liquid_rep = @page.to_liquid
+        refute_equal Jekyll::Drops::PageDrop, liquid_rep.class
+        assert_equal Hash, liquid_rep.class
+      end
     end
 
     context "with site-wide permalink configuration" do

From ef6b382a480294185df652445529ea9b5ad96a4a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 26 Mar 2020 09:39:49 -0400
Subject: [PATCH 3940/4996] Update history to reflect merge of #7992 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index f4ba8338098..0d4708cf633 100644
--- a/History.markdown
+++ b/History.markdown
@@ -20,6 +20,7 @@
   * Include _config.yml in a new theme's gemspec (#7865)
   * Add an option to easily disable disk-cache (#7928)
   * Optimize markdown parsing with Kramdown by reusing the options and parser objects (#8013)
+  * Add PageDrop to provide Liquid templates with data (#7992)
 
 ### Documentation
 

From 237d08a76cc1bf36351e2aedd97fd3246b4c1fb2 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Thu, 26 Mar 2020 19:41:33 +0530
Subject: [PATCH 3941/4996] Optimize `Kramdown::JekyllDocument#to_html` calls
 (#8041)

Merge pull request 8041
---
 lib/jekyll/converters/markdown/kramdown_parser.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index aebd6ee7fef..8a5543c5ddd 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -53,6 +53,16 @@ def initialize(source, options = {})
       @options = JekyllDocument.options
       @root, @warnings = JekyllDocument.parser.parse(source, @options)
     end
+
+    # Use Kramdown::Converter::Html class to convert this document into HTML.
+    #
+    # The implementation is basically an optimized version of core logic in
+    # +Kramdown::Document#method_missing+ from kramdown-2.1.0.
+    def to_html
+      output, warnings = Kramdown::Converter::Html.convert(@root, @options)
+      @warnings.concat(warnings)
+      output
+    end
   end
 end
 

From 7860d1bac0dcf313371a4b25ae7edf5b5a928777 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 26 Mar 2020 10:11:35 -0400
Subject: [PATCH 3942/4996] Update history to reflect merge of #8041 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 0d4708cf633..76afe05ef17 100644
--- a/History.markdown
+++ b/History.markdown
@@ -21,6 +21,7 @@
   * Add an option to easily disable disk-cache (#7928)
   * Optimize markdown parsing with Kramdown by reusing the options and parser objects (#8013)
   * Add PageDrop to provide Liquid templates with data (#7992)
+  * Optimize `Kramdown::JekyllDocument#to_html` calls (#8041)
 
 ### Documentation
 

From e972065325bc96bcd2bcd9a651cd0f61d4b2b8d7 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Sun, 29 Mar 2020 22:10:28 +0530
Subject: [PATCH 3943/4996] Reduce Pathname objects from front matter defaults
 (#8067)

Merge pull request 8067
---
 lib/jekyll/frontmatter_defaults.rb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb
index 21e3cc6faf1..a7d7975cf84 100644
--- a/lib/jekyll/frontmatter_defaults.rb
+++ b/lib/jekyll/frontmatter_defaults.rb
@@ -103,15 +103,15 @@ def applies?(scope, path, type)
     end
 
     def applies_path?(scope, path)
-      return true if !scope.key?("path") || scope["path"].empty?
+      rel_scope_path = scope["path"]
+      return true if !rel_scope_path.is_a?(String) || rel_scope_path.empty?
 
-      sanitized_path = Pathname.new(sanitize_path(path))
-      rel_scope_path = Pathname.new(scope["path"])
+      sanitized_path = sanitize_path(path)
 
-      if scope["path"].to_s.include?("*")
+      if rel_scope_path.include?("*")
         glob_scope(sanitized_path, rel_scope_path)
       else
-        path_is_subpath?(sanitized_path, strip_collections_dir(scope["path"]))
+        path_is_subpath?(sanitized_path, strip_collections_dir(rel_scope_path))
       end
     end
 
@@ -134,11 +134,7 @@ def glob_cache(path)
     end
 
     def path_is_subpath?(path, parent_path)
-      path.ascend do |ascended_path|
-        return true if ascended_path.to_s == parent_path.to_s
-      end
-
-      false
+      path.start_with?(parent_path)
     end
 
     def strip_collections_dir(path)

From 8d3c2f6a96d4324fb7d61218a225a3bc35ed6113 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 29 Mar 2020 12:40:30 -0400
Subject: [PATCH 3944/4996] Update history to reflect merge of #8067 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 76afe05ef17..a8f35498f2f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -93,6 +93,7 @@
   * chore: simplify require for Jekyll::VERSION (#8057)
   * Remove version-constraint relaxation for i18n gem (#8055)
   * Mirror `spec.homepage` as `metadata["homepage_uri"]` (#8056)
+  * Reduce Pathname objects from front matter defaults (#8067)
 
 ### Site Enhancements
 

From 09c448449e1b2e3edf5ad4b852877a952148c63d Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 30 Mar 2020 01:41:17 +0530
Subject: [PATCH 3945/4996] Add default front matter for tutorials collection
 (#8081)

Merge pull request 8081
---
 docs/_config.yml                                            | 6 ++++++
 docs/_tutorials/{cache_api.md => cache-api.md}              | 2 --
 ...existing-site-to-jekyll.md => convert-site-to-jekyll.md} | 2 --
 docs/_tutorials/custom-404-page.md                          | 2 --
 docs/_tutorials/index.md                                    | 1 -
 docs/_tutorials/navigation.md                               | 2 --
 docs/_tutorials/orderofinterpretation.md                    | 2 --
 docs/_tutorials/using-jekyll-with-bundler.md                | 2 --
 docs/_tutorials/video-walkthroughs.md                       | 2 --
 9 files changed, 6 insertions(+), 15 deletions(-)
 rename docs/_tutorials/{cache_api.md => cache-api.md} (98%)
 rename docs/_tutorials/{convert-existing-site-to-jekyll.md => convert-site-to-jekyll.md} (99%)

diff --git a/docs/_config.yml b/docs/_config.yml
index bec8b14f035..80e58d301b5 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -18,6 +18,7 @@ collections:
     permalink: "/news/:year/:month/:day/:title/"
     output: true
   tutorials:
+    permalink: "/:collection/:path/"
     output: true
 defaults:
 - scope:
@@ -30,6 +31,11 @@ defaults:
     type: posts
   values:
     layout: news_item
+- scope:
+    path: _tutorials
+    type: tutorials
+  values:
+    layout: tutorials
 - scope:
     path: ''
   values:
diff --git a/docs/_tutorials/cache_api.md b/docs/_tutorials/cache-api.md
similarity index 98%
rename from docs/_tutorials/cache_api.md
rename to docs/_tutorials/cache-api.md
index 84a7d047d6e..491572df704 100644
--- a/docs/_tutorials/cache_api.md
+++ b/docs/_tutorials/cache-api.md
@@ -1,6 +1,4 @@
 ---
-layout: tutorials
-permalink: /tutorials/cache-api/
 title: Cache API
 ---
 
diff --git a/docs/_tutorials/convert-existing-site-to-jekyll.md b/docs/_tutorials/convert-site-to-jekyll.md
similarity index 99%
rename from docs/_tutorials/convert-existing-site-to-jekyll.md
rename to docs/_tutorials/convert-site-to-jekyll.md
index 650006744ce..f90b3bdf534 100644
--- a/docs/_tutorials/convert-existing-site-to-jekyll.md
+++ b/docs/_tutorials/convert-site-to-jekyll.md
@@ -1,6 +1,4 @@
 ---
-layout: tutorials
-permalink: /tutorials/convert-site-to-jekyll/
 title: Convert an HTML site to Jekyll
 ---
 
diff --git a/docs/_tutorials/custom-404-page.md b/docs/_tutorials/custom-404-page.md
index d739735d190..29e93420007 100644
--- a/docs/_tutorials/custom-404-page.md
+++ b/docs/_tutorials/custom-404-page.md
@@ -1,6 +1,4 @@
 ---
-layout: tutorials
-permalink: /tutorials/custom-404-page/
 title: Custom 404 Page
 ---
 
diff --git a/docs/_tutorials/index.md b/docs/_tutorials/index.md
index 4deb89bcf98..8f5e8211817 100644
--- a/docs/_tutorials/index.md
+++ b/docs/_tutorials/index.md
@@ -1,5 +1,4 @@
 ---
-layout: tutorials
 title: Tutorials
 permalink: /tutorials/home/
 redirect_from: /tutorials/index.html
diff --git a/docs/_tutorials/navigation.md b/docs/_tutorials/navigation.md
index c1c86a259b8..2ba30ab0ba0 100644
--- a/docs/_tutorials/navigation.md
+++ b/docs/_tutorials/navigation.md
@@ -1,6 +1,4 @@
 ---
-layout: tutorials
-permalink: /tutorials/navigation/
 title: Navigation
 ---
 
diff --git a/docs/_tutorials/orderofinterpretation.md b/docs/_tutorials/orderofinterpretation.md
index e5aa4ea6f0b..d938564e89c 100644
--- a/docs/_tutorials/orderofinterpretation.md
+++ b/docs/_tutorials/orderofinterpretation.md
@@ -1,6 +1,4 @@
 ---
-layout: tutorials
-permalink: /tutorials/orderofinterpretation/
 title: Order of interpretation
 ---
 
diff --git a/docs/_tutorials/using-jekyll-with-bundler.md b/docs/_tutorials/using-jekyll-with-bundler.md
index 73e77679469..bfc6c6a7fc6 100644
--- a/docs/_tutorials/using-jekyll-with-bundler.md
+++ b/docs/_tutorials/using-jekyll-with-bundler.md
@@ -1,6 +1,4 @@
 ---
-layout: tutorials
-permalink: /tutorials/using-jekyll-with-bundler/
 title: Using Jekyll with Bundler
 ---
 
diff --git a/docs/_tutorials/video-walkthroughs.md b/docs/_tutorials/video-walkthroughs.md
index 635b883fa6d..55cfe99fab8 100644
--- a/docs/_tutorials/video-walkthroughs.md
+++ b/docs/_tutorials/video-walkthroughs.md
@@ -1,6 +1,4 @@
 ---
-layout: tutorials
-permalink: /tutorials/video-walkthroughs/
 title: Video Walkthroughs
 ---
 

From f7bff1c5c4c3f9300c6e434b7ad6919dcd5a0372 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 29 Mar 2020 16:11:19 -0400
Subject: [PATCH 3946/4996] Update history to reflect merge of #8081 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index a8f35498f2f..f5bb90945ec 100644
--- a/History.markdown
+++ b/History.markdown
@@ -70,6 +70,7 @@
   * Non-deprecated `vendor/bundle` path configuration (#8048)
   * Update 09-collections.md (#8060)
   * Remove extra paragraph tags (#8063)
+  * Add default front matter for tutorials collection (#8081)
 
 ### Development Fixes
 

From 6bc27f9fdf290544e7e12083a9321ae0666bfd93 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 30 Mar 2020 20:06:37 +0530
Subject: [PATCH 3947/4996] Quicker categories for documents without superdirs
 (#7987)

Merge pull request 7987
---
 lib/jekyll/document.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 0c7b2f67b51..6622d2a3c24 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -414,9 +414,13 @@ def respond_to_missing?(method, *)
     #
     # Returns nothing.
     def categories_from_path(special_dir)
-      superdirs = relative_path.sub(Document.superdirs_regex(special_dir), "")
-      superdirs = superdirs.split(File::SEPARATOR)
-      superdirs.reject! { |c| c.empty? || c == special_dir || c == basename }
+      if relative_path.start_with?(special_dir)
+        superdirs = []
+      else
+        superdirs = relative_path.sub(Document.superdirs_regex(special_dir), "")
+        superdirs = superdirs.split(File::SEPARATOR)
+        superdirs.reject! { |c| c.empty? || c == special_dir || c == basename }
+      end
 
       merge_data!({ "categories" => superdirs }, :source => "file path")
     end

From 539e712c414f93f1c12e10fb75511d51cb22760a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 30 Mar 2020 10:36:40 -0400
Subject: [PATCH 3948/4996] Update history to reflect merge of #7987 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index f5bb90945ec..73789d2dcb7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -95,6 +95,7 @@
   * Remove version-constraint relaxation for i18n gem (#8055)
   * Mirror `spec.homepage` as `metadata["homepage_uri"]` (#8056)
   * Reduce Pathname objects from front matter defaults (#8067)
+  * Quicker categories for documents without superdirs (#7987)
 
 ### Site Enhancements
 

From f0ab09968ed666069c701febe9d87ce92110c2ee Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Mon, 30 Mar 2020 20:14:04 +0530
Subject: [PATCH 3949/4996] Reduce array allocations from `StaticFile#path`
 (#8083)

Merge pull request 8083
---
 lib/jekyll/static_file.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index 9f988a7b0bd..d3a9b8591cd 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -40,11 +40,13 @@ def initialize(site, base, dir, name, collection = nil)
 
     # Returns source file path.
     def path
-      # Static file is from a collection inside custom collections directory
-      if !@collection.nil? && !@site.config["collections_dir"].empty?
-        File.join(*[@base, @site.config["collections_dir"], @dir, @name].compact)
-      else
-        File.join(*[@base, @dir, @name].compact)
+      @path ||= begin
+        # Static file is from a collection inside custom collections directory
+        if !@collection.nil? && !@site.config["collections_dir"].empty?
+          File.join(*[@base, @site.config["collections_dir"], @dir, @name].compact)
+        else
+          File.join(*[@base, @dir, @name].compact)
+        end
       end
     end
 

From 9614cb67d427bb89443ad0ada890a98702311411 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 30 Mar 2020 10:44:07 -0400
Subject: [PATCH 3950/4996] Update history to reflect merge of #8083 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 73789d2dcb7..6bc4f22a359 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,7 @@
   * Allow multiple binary operators in where_exp filter (#8047)
   * Fix documents custom-ordering logic (#8028)
   * Use `layout.path` when rendering the Liquid layout (#8069)
+  * Reduce array allocations from `StaticFile#path` (#8083)
 
 ### Minor Enhancements
 

From 1412928dde0f24731489acbfa03eb1f717bce9b9 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 1 Apr 2020 14:21:24 +0530
Subject: [PATCH 3951/4996] Bump RuboCop to v0.81.x

---
 .rubocop.yml | 4 ++++
 Gemfile      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index b49da571bf6..07ce3243190 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -40,6 +40,10 @@ Layout/EmptyComment:
   Enabled: false
 Layout/EndAlignment:
   Severity: error
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
 Lint/UnreachableCode:
   Severity: error
 Lint/Void:
diff --git a/Gemfile b/Gemfile
index 3026f996e58..4203dcae640 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.80.0"
+  gem "rubocop", "~> 0.81.0"
   gem "rubocop-performance"
   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__)

From bc9774561b5d2a634619758aec9e8f0e7d3709db Mon Sep 17 00:00:00 2001
From: Ashwin Maroli 
Date: Wed, 1 Apr 2020 18:11:30 +0530
Subject: [PATCH 3952/4996] Utilize relative_url filter in documentation site
 (#8089)

Merge pull request 8089
---
 docs/_docs/assets.md                             |  2 +-
 docs/_docs/collections.md                        |  4 ++--
 docs/_docs/community/community.md                | 12 ++++++------
 docs/_docs/configuration.md                      | 16 ++++++++--------
 docs/_docs/configuration/environments.md         |  2 +-
 .../_docs/configuration/front-matter-defaults.md |  8 +++++---
 docs/_docs/configuration/options.md              |  7 ++++---
 docs/_docs/contributing.md                       |  2 +-
 docs/_docs/datafiles.md                          |  4 ++--
 docs/_docs/deployment.md                         |  6 +++---
 docs/_docs/deployment/automated.md               |  6 +++---
 docs/_docs/front-matter.md                       | 11 ++++++-----
 docs/_docs/github-pages.md                       |  8 ++++----
 docs/_docs/index.md                              | 10 +++++-----
 docs/_docs/installation.md                       |  8 ++++----
 docs/_docs/installation/macos.md                 |  4 ++--
 docs/_docs/installation/windows.md               |  3 ++-
 docs/_docs/liquid.md                             |  4 ++--
 docs/_docs/liquid/tags.md                        |  4 ++--
 docs/_docs/plugins.md                            | 16 ++++++++--------
 docs/_includes/docs_contents.html                |  2 +-
 docs/_includes/docs_contents_mobile.html         |  2 +-
 docs/_includes/footer.html                       |  4 ++--
 docs/_includes/header.html                       |  4 ++--
 docs/_includes/mobile-nav-items.html             |  2 +-
 docs/_includes/news_contents.html                | 10 +++++-----
 docs/_includes/news_contents_mobile.html         |  4 ++--
 docs/_includes/news_item.html                    |  2 +-
 docs/_includes/news_item_archive.html            |  2 +-
 docs/_includes/primary-nav-items.html            |  2 +-
 docs/_includes/section_nav_tutorials.html        |  4 ++--
 docs/_includes/top.html                          | 12 ++++++------
 docs/_includes/tutorials_contents.html           |  2 +-
 docs/_includes/tutorials_contents_mobile.html    |  2 +-
 docs/_layouts/news_item.html                     |  2 +-
 docs/_tutorials/index.md                         |  2 +-
 docs/pages/404.html                              |  8 ++++----
 docs/pages/index.html                            |  6 +++---
 docs/pages/resources.md                          |  4 ++--
 docs/pages/showcase.html                         |  4 ++--
 40 files changed, 111 insertions(+), 106 deletions(-)

diff --git a/docs/_docs/assets.md b/docs/_docs/assets.md
index ee4e698b39b..2090414867d 100644
--- a/docs/_docs/assets.md
+++ b/docs/_docs/assets.md
@@ -28,7 +28,7 @@ will process it and put it in your site's destination folder under
   
    Jekyll processes all Liquid filters and tags in asset files
    
   
    If you are using Mustache
      or another JavaScript templating language that conflicts with
-     the Liquid template syntax, you
+     the Liquid template syntax, you
      will need to place {% raw %} and
      {% endraw %} tags around your code.
    
 
    
diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
index 4e591d3b587..9e4ea99569e 100644
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -51,7 +51,7 @@ information, see the section Output.
 Create a corresponding folder (e.g. `/_staff_members`) and add
 documents. Front matter is processed if the front matter exists, and everything
 after the front matter is pushed into the document's `content` attribute. If no front
-matter is provided, Jekyll will consider it to be a [static file](/docs/static-files/)
+matter is provided, Jekyll will consider it to be a [static file]({{ '/docs/static-files/' | relative_url }})
 and the contents will not undergo further processing. If front matter is provided,
 Jekyll will process the file contents into the expected output.
 
@@ -126,7 +126,7 @@ You can link to the generated page using the `url` attribute:
 
 ## Permalinks
 
-There are special [permalink variables for collections](/docs/permalinks/) to
+There are special [permalink variables for collections]({{ '/docs/permalinks/' | relative_url }}) to
 help you control the output url for the entire collection.
 
 ## Custom Sorting of Documents
diff --git a/docs/_docs/community/community.md b/docs/_docs/community/community.md
index 7176dfe5b77..273bff7c48d 100644
--- a/docs/_docs/community/community.md
+++ b/docs/_docs/community/community.md
@@ -8,13 +8,13 @@ redirect_from: "/help/index.html"
 
 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.
 
-Read the full [code of conduct](/docs/conduct/)
+Read the full [code of conduct]({{ '/docs/conduct/' | relative_url }})
 
 ## Where to get support
 
 If you're looking for support for Jekyll, there are a lot of options:
 
-* Read the [Jekyll Documentation](https://jekyllrb.com/docs/)
+* Read the [Jekyll Documentation]({{ '/docs/' | relative_url }})
 * If you have a question about using Jekyll, start a discussion on the [Jekyll Forum](https://talk.jekyllrb.com/) or [StackOverflow](https://stackoverflow.com/questions/tagged/jekyll)
 * Chat with Jekyllers — Join our [Gitter channel](https://gitter.im/jekyll/jekyll) or our [IRC channel on Freenode](irc:irc.freenode.net/jekyll)
 
@@ -24,13 +24,13 @@ There are a bunch of helpful community members on these services that should be
 
 ## Ways to contribute
 
-* [How to Contribute](/docs/contributing/)
-* [How to file a bug](/docs/community/bug/)
-* [Guide for maintaining Jekyll](/docs/maintaining/)
+* [How to Contribute]({{ '/docs/contributing/' | relative_url }})
+* [How to file a bug]({{ '/docs/community/bug/' | relative_url }})
+* [Guide for maintaining Jekyll]({{ '/docs/maintaining/' | relative_url }})
 
 ## Jekyllconf
 
-[Watch videos](/jekyllconf/) from members of the Jekyll community speak about interesting use cases, tricks they’ve learned or meta Jekyll topics.
+[Watch videos]({{ '/jekyllconf/' | relative_url }}) from members of the Jekyll community speak about interesting use cases, tricks they’ve learned or meta Jekyll topics.
 
 ## Jekyll on Twitter
 
diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
index 1f7660cbf17..b542bd97de9 100644
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -8,11 +8,11 @@ options can either be specified in a `_config.yml` or `_config.toml` file placed
 in your site’s root directory, or can be specified as flags for the `jekyll`
 executable in the terminal.
 
-* [Configuration Options](/docs/configuration/options/)
-* [Default Configuration](/docs/configuration/default/)
-* [Front Matter Defaults](/docs/configuration/front-matter-defaults/)
-* [Environments](/docs/configuration/environments/)
-* [Markdown Options](/docs/configuration/markdown/)
-* [Liquid Options](/docs/configuration/liquid/)
-* [Webrick Options](/docs/configuration/webrick/)
-* [Incremental Regeneration](/docs/configuration/incremental-regeneration/)
+* [Configuration Options]({{ '/docs/configuration/options/' | relative_url }})
+* [Default Configuration]({{ '/docs/configuration/default/' | relative_url }})
+* [Front Matter Defaults]({{ '/docs/configuration/front-matter-defaults/' | relative_url }})
+* [Environments]({{ '/docs/configuration/environments/' | relative_url }})
+* [Markdown Options]({{ '/docs/configuration/markdown/' | relative_url }})
+* [Liquid Options]({{ '/docs/configuration/liquid/' | relative_url }})
+* [Webrick Options]({{ '/docs/configuration/webrick/' | relative_url }})
+* [Incremental Regeneration]({{ '/docs/configuration/incremental-regeneration/' | relative_url }})
diff --git a/docs/_docs/configuration/environments.md b/docs/_docs/configuration/environments.md
index 95250cc854a..6b06c84c75f 100644
--- a/docs/_docs/configuration/environments.md
+++ b/docs/_docs/configuration/environments.md
@@ -44,6 +44,6 @@ values in your configuration files when moving from one environment to another.
 
 {: .note}
 To switch part of your config settings depending on the environment, use the
-build command option,
+build command option,
 for example --config _config.yml,_config_development.yml. Settings
 in later files override settings in earlier files.
diff --git a/docs/_docs/configuration/front-matter-defaults.md b/docs/_docs/configuration/front-matter-defaults.md
index 2f19954efdb..5f7355e1327 100644
--- a/docs/_docs/configuration/front-matter-defaults.md
+++ b/docs/_docs/configuration/front-matter-defaults.md
@@ -30,7 +30,7 @@ defaults:
     during automatic regeneration are not loaded until the next execution.
   
    
   
    
-    Note Data Files are included and reloaded during automatic regeneration.
+    Note Data Files are included and reloaded during automatic regeneration.
   
    
 
    
 
@@ -68,7 +68,9 @@ defaults:
       author: "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](/docs/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]({{ '/docs/variables/' | relative_url }}) set to `Mr. Hyde`.
 
 ```yaml
 collections:
@@ -85,7 +87,7 @@ defaults:
 ```
 
 In this example, the `layout` is set to `default` inside the
-[collection](/docs/collections/) with the name `my_collection`.
+[collection]({{ '/docs/collections/' | relative_url }}) with the name `my_collection`.
 
 ### Glob patterns in Front Matter defaults
 
diff --git a/docs/_docs/configuration/options.md b/docs/_docs/configuration/options.md
index 1a5e96f01b5..90bfaff1478 100644
--- a/docs/_docs/configuration/options.md
+++ b/docs/_docs/configuration/options.md
@@ -150,12 +150,12 @@ class="flag">flags     (specified on the command-line) that control them.
       
         
    Defaults
    
         
    
-            Set defaults for front matter
+            Set defaults for front matter
             variables.
         
    
       
       
-        
    see below
    
+        
    see below
    
       
     
   
@@ -247,7 +247,8 @@ class="flag">flags     (specified on the command-line) that control them.
     
       
         
    LSI
    
-        
    Produce an index for related posts. Requires the classifier-reborn plugin.
    
+        
    Produce an index for related posts. Requires the
+          classifier-reborn plugin.
    
       
       
         
    lsi: BOOL
    
diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index d22dc861e3c..b1a5b7d241d 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](https://jekyllrb.com/docs/support/)
+See the [support guidelines]({{ '/docs/support/' | relative_url }})
 
 ## Ways to contribute
 
diff --git a/docs/_docs/datafiles.md b/docs/_docs/datafiles.md
index 9a9961c75f2..7050512c6ab 100644
--- a/docs/_docs/datafiles.md
+++ b/docs/_docs/datafiles.md
@@ -3,7 +3,7 @@ title: Data Files
 permalink: /docs/datafiles/
 ---
 
-In addition to the [built-in variables](../variables/) available from Jekyll,
+In addition to the [built-in variables]({{'/docs/variables/' | relative_url }}) available from Jekyll,
 you can specify your own custom data that can be accessed via the [Liquid
 templating system](https://github.com/Shopify/liquid/wiki/Liquid-for-Designers).
 
@@ -147,4 +147,4 @@ author: dave
 ```
 {% 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).
+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/' | relative_url }}).
diff --git a/docs/_docs/deployment.md b/docs/_docs/deployment.md
index d6e841c0ae9..45722e4e93c 100644
--- a/docs/_docs/deployment.md
+++ b/docs/_docs/deployment.md
@@ -6,6 +6,6 @@ redirect_from: "/docs/deployment-methods/index.html"
 
 Sites built using Jekyll can be deployed in a large number of ways due to the static nature of the generated output. Here's some of the most common ways:
 
-* [Manually](/docs/deployment/manual/)
-* [Automated](/docs/deployment/automated/)
-* [Third Party](/docs/deployment/third-party/)
+* [Manually]({{ '/docs/deployment/manual/' | relative_url }})
+* [Automated]({{ '/docs/deployment/automated/' | relative_url }})
+* [Third Party]({{ '/docs/deployment/third-party/' | relative_url }})
diff --git a/docs/_docs/deployment/automated.md b/docs/_docs/deployment/automated.md
index 0e68e90f17e..ac6ac49bae4 100644
--- a/docs/_docs/deployment/automated.md
+++ b/docs/_docs/deployment/automated.md
@@ -15,9 +15,9 @@ service of your choice.
 
 We have guides for the following providers:
 
-* [Travis CI](/docs/continuous-integration/travis-ci/)
-* [CircleCI](/docs/continuous-integration/circleci/)
-* [Buddy](/docs/continuous-integration/buddyworks/)
+* [Travis CI]({{ '/docs/continuous-integration/travis-ci/' | relative_url }})
+* [CircleCI]({{ '/docs/continuous-integration/circleci/' | relative_url }})
+* [Buddy]({{ '/docs/continuous-integration/buddyworks/' | relative_url }})
 
 ## Git post-receive hook
 
diff --git a/docs/_docs/front-matter.md b/docs/_docs/front-matter.md
index a3deb697193..f7700bb8d83 100644
--- a/docs/_docs/front-matter.md
+++ b/docs/_docs/front-matter.md
@@ -28,14 +28,14 @@ relies on.
     If you use UTF-8 encoding, make sure that no BOM header
     characters exist in your files or very, very bad things will happen to
     Jekyll. This is especially relevant if you’re running
-    Jekyll on Windows.
+    Jekyll on Windows.
   
    
 
    
 
 
    
   
    Front Matter Variables Are Optional
    
   
    
-    If you want to use Liquid tags and variables
+    If you want to use Liquid tags and variables
     but don’t need anything in your front matter, just leave it empty! The set
     of triple-dashed lines with nothing in between will still get Jekyll to
     process your file. (This is useful for things like CSS and RSS feeds!)
@@ -72,7 +72,7 @@ front matter of a page or post.
           
  • 
             Using null will produce a file without using a layout
             file. This is overridden if the file is a post/document and has a
-            layout defined in the 
+            layout defined in the 
             front matter defaults.
           
    • 
           
  • 
@@ -117,7 +117,7 @@ front matter of a page or post.
   
    Render Posts Marked As Unpublished
    
   
    
     To preview unpublished pages, run `jekyll serve` or `jekyll build`
-    with the `--unpublished` switch. Jekyll also has a handy drafts
+    with the `--unpublished` switch. Jekyll also has a handy drafts
     feature tailored specifically for blog posts.
   
    
 
    • 
@@ -204,7 +204,8 @@ These are available out-of-the-box to be used in the front matter for a post.
   
    Don't repeat yourself
    
   
    
     If you don't want to repeat your frequently used front matter variables
-    over and over, define defaults
+    over and over, define
+    defaults
     for them and only override them where necessary (or not at all). This works
     both for predefined and custom variables.
   
    
diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
index 3aed957ddf4..5f51e9da02a 100644
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -58,12 +58,12 @@ Be sure to run `bundle update` often.
 Sometimes it's nice to preview your Jekyll site before you push your `gh-pages`
 branch to GitHub. 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](/docs/liquid/filters/):
+site builds properly, use the handy [URL filters]({{ '/docs/liquid/filters/' | relative_url }}):
 
 {% raw %}
 ```liquid
 
-
+
 
 [{{ page.title }}]("{{ page.url | relative_url }}")
 ```
@@ -122,7 +122,7 @@ to see more detailed examples.
   
    Source files must be in the root directory
    
   
    
     GitHub Pages overrides
-    the “Site Source”
+    the “Site Source”
     configuration value, so if you locate your files anywhere other than the
     root directory, your site may not build correctly.
   
    
@@ -135,6 +135,6 @@ to see more detailed examples.
     While Windows is not officially supported, it is possible
     to install the github-pages gem on Windows.
     Special instructions can be found on our
-    Windows-specific docs page.
+    Windows-specific docs page.
   
    
 
    
diff --git a/docs/_docs/index.md b/docs/_docs/index.md
index e46da606454..ab373c916d8 100644
--- a/docs/_docs/index.md
+++ b/docs/_docs/index.md
@@ -13,12 +13,12 @@ site, and more.
 
 ## Prerequisites
 
-See [requirements](/docs/installation/#requirements).
+See [requirements]({{ '/docs/installation/#requirements' | relative_url }}).
 
 ## Instructions
 
-1. Install a full [Ruby development environment](/docs/installation/).
-2. Install Jekyll and [bundler](/docs/ruby-101/#bundler) [gems](/docs/ruby-101/#gems).
+1. Install a full [Ruby development environment]({{ '/docs/installation/' | relative_url }}).
+2. Install Jekyll and [bundler]({{ '/docs/ruby-101/#bundler' | relative_url }}) [gems]({{ '/docs/ruby-101/#gems' | relative_url }}).
 ```
 gem install jekyll bundler
 ```
@@ -37,6 +37,6 @@ bundle exec jekyll serve
 6. Browse to [http://localhost:4000](http://localhost:4000){:target="_blank"}
 
 If you encounter any errors during this process, see the
-[troubleshooting](/docs/troubleshooting/#configuration-problems) page. Also,
+[troubleshooting]({{ '/docs/troubleshooting/#configuration-problems' | relative_url }}) page. Also,
 make sure you've installed the development headers and other prerequisites as
-mentioned on the [requirements](/docs/installation/#requirements) page.
+mentioned on the [requirements]({{ '/docs/installation/#requirements' | relative_url }}) page.
diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index 70c251746a9..76cf42888fe 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -16,7 +16,7 @@ Jekyll is a [Ruby Gem](/docs/ruby-101/#gems) that can be installed on most syste
 
 For detailed install instructions have a look at the guide for your operating system.
 
-* [macOS](/docs/installation/macos/)
-* [Ubuntu Linux](/docs/installation/ubuntu/)
-* [Other Linux distros](/docs/installation/other-linux)
-* [Windows](/docs/installation/windows/)
\ No newline at end of file
+* [macOS]({{ '/docs/installation/macos/' | relative_url }})
+* [Ubuntu Linux]({{ '/docs/installation/ubuntu/' | relative_url }})
+* [Other Linux distros]({{ '/docs/installation/other-linux/' | relative_url }})
+* [Windows]({{ '/docs/installation/windows/' | relative_url }})
\ No newline at end of file
diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md
index 836c8e77772..162c6f09c56 100644
--- a/docs/_docs/installation/macos.md
+++ b/docs/_docs/installation/macos.md
@@ -77,7 +77,7 @@ That's it! Head over [rbenv command references](https://github.com/rbenv/rbenv#c
 
 ## Install Jekyll
 
-Now all that is left is installing [Bundler](/docs/ruby-101/#bundler) and Jekyll.
+Now all that is left is installing [Bundler]({{ '/docs/ruby-101/#bundler' | relative_url }}) and Jekyll.
 
 ### Local Install
 
@@ -133,4 +133,4 @@ sudo gem install bundler jekyll
 
 ## Problems?
 
-Check out the [troubleshooting](/docs/troubleshooting/) page or [ask for help on our forum](https://talk.jekyllrb.com).
+Check out the [troubleshooting]({{ '/docs/troubleshooting/' | relative_url }}) page or [ask for help on our forum](https://talk.jekyllrb.com).
diff --git a/docs/_docs/installation/windows.md b/docs/_docs/installation/windows.md
index e564edde35f..f3a5160b0d3 100644
--- a/docs/_docs/installation/windows.md
+++ b/docs/_docs/installation/windows.md
@@ -87,7 +87,8 @@ with the current date in the filename.
 
    
   
    Non-superuser account issues
    
   
    If the `jekyll new` command prints the error "Your user account isn't allowed to install to the system RubyGems", see
-  the "Running Jekyll as Non-Superuser" instructions in Troubleshooting.
    
+  the "Running Jekyll as Non-Superuser" instructions in
+  Troubleshooting.
    
 
    
 
 {: .note .info}
diff --git a/docs/_docs/liquid.md b/docs/_docs/liquid.md
index d09ba99b535..9dead2b8b7c 100644
--- a/docs/_docs/liquid.md
+++ b/docs/_docs/liquid.md
@@ -15,5 +15,5 @@ out the [official Liquid Documentation](https://shopify.github.io/liquid/).
 
 Jekyll provides a number of useful Liquid additions to help you build your site:
 
-* [Filters](/docs/liquid/filters/)
-* [Tags](/docs/liquid/tags/)
+* [Filters]({{ '/docs/liquid/filters/' | relative_url }})
+* [Tags]({{ '/docs/liquid/tags/' | relative_url }})
diff --git a/docs/_docs/liquid/tags.md b/docs/_docs/liquid/tags.md
index a813cd9c5d4..c21f7a01090 100644
--- a/docs/_docs/liquid/tags.md
+++ b/docs/_docs/liquid/tags.md
@@ -5,12 +5,12 @@ permalink: "/docs/liquid/tags/"
 All of the standard Liquid
 [tags](https://shopify.github.io/liquid/tags/control-flow/) are supported.
 Jekyll has a few built in tags to help you build your site. You can also create
-your own tags using [plugins](/docs/plugins/).
+your own tags using [plugins]({{ '/docs/plugins/' | relative_url }}).
 
 ## Includes
 
 If you have page snippets that you use repeatedly across your site, an
-[include](/docs/includes/) is the perfect way to make this more maintainable.
+[include]({{ '/docs/includes/' | relative_url }}) is the perfect way to make this more maintainable.
 
 ## Code snippet highlighting
 
diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
index b53ed8d65e0..79a30d3c01d 100644
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -7,11 +7,11 @@ Jekyll has a plugin system with hooks that allow you to create custom generated
 content specific to your site. You can run custom code for your site without
 having to modify the Jekyll source itself.
 
-* [Installation](/docs/plugins/installation/) - How to install plugins
-* [Your first plugin](/docs/plugins/your-first-plugin/) - How to write plugins
-* [Generators](/docs/plugins/generators/) - Create additional content on your site
-* [Converters](/docs/plugins/converters/) - Change a markup language into another format
-* [Commands](/docs/plugins/commands/) - Extend the `jekyll` executable with subcommands
-* [Tags](/docs/plugins/tags) - Create custom Liquid tags
-* [Filters](/docs/plugins/filters/) - Create custom Liquid filters
-* [Hooks](/docs/plugins/hooks/) - Fine-grained control to extend the build process
+* [Installation]({{ '/docs/plugins/installation/' | relative_url }}) - How to install plugins
+* [Your first plugin]({{ '/docs/plugins/your-first-plugin/' | relative_url }}) - How to write plugins
+* [Generators]({{ '/docs/plugins/generators/' | relative_url }}) - Create additional content on your site
+* [Converters]({{ '/docs/plugins/converters/' | relative_url }}) - Change a markup language into another format
+* [Commands]({{ '/docs/plugins/commands/' | relative_url }}) - Extend the `jekyll` executable with subcommands
+* [Tags]({{ '/docs/plugins/tags/' | relative_url }}) - Create custom Liquid tags
+* [Filters]({{ '/docs/plugins/filters/' | relative_url }}) - Create custom Liquid filters
+* [Hooks]({{ '/docs/plugins/hooks/' | relative_url }}) - Fine-grained control to extend the build process
diff --git a/docs/_includes/docs_contents.html b/docs/_includes/docs_contents.html
index 4c004fe278e..f46df08f960 100644
--- a/docs/_includes/docs_contents.html
+++ b/docs/_includes/docs_contents.html
@@ -5,7 +5,7 @@ 
    {{ section.title }}
    
       
      
       {%- for item in section.docs -%}
         {%- assign p = site.documents | where: "url", item.link | first %}
-        
    • 
+        
    • 
           {{- p.menu_name | default: p.title -}}
         
      • 
       {%- endfor %}
diff --git a/docs/_includes/docs_contents_mobile.html b/docs/_includes/docs_contents_mobile.html
index 5df8039fec4..b259744d2c4 100644
--- a/docs/_includes/docs_contents_mobile.html
+++ b/docs/_includes/docs_contents_mobile.html
@@ -5,7 +5,7 @@
     
     {%- for item in section.docs -%}
       {% assign p = site.documents | where: "url", item.link | first %}
-      
     {%- endfor %}
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 7e28b8edde6..6c2a8b49f90 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -1,14 +1,14 @@
 
      
   
      
     
      
-      
      Jekyll is lovingly maintained by the core team of volunteers. 
      
+      
      Jekyll is lovingly maintained by the core team of volunteers. 
      
       
      The contents of this website are 
      © {{ site.time | date: '%Y' }} under the terms of the MIT License.
      
     
      
     
      
       
      
         Proudly hosted by
         
-          GitHub • Social coding
+          GitHub • Social coding
         
       
      
     
      
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index b38a89ec25f..b03a850dc6a 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -2,9 +2,9 @@
   
      
     
      
       
      
-        
       
      
     
      
diff --git a/docs/_includes/mobile-nav-items.html b/docs/_includes/mobile-nav-items.html
index 6b9b0062a55..5dd9b86d206 100644
--- a/docs/_includes/mobile-nav-items.html
+++ b/docs/_includes/mobile-nav-items.html
@@ -7,7 +7,7 @@
       {% else -%}
         {%- if page.url contains p.link %} class="current" {% endif -%}
       {% endif -%}
-    >{{ p.title }}
+    >{{ p.title }}
     {% endif -%}
   {% endfor -%}
   
    • GitHub
      • 
diff --git a/docs/_includes/news_contents.html b/docs/_includes/news_contents.html
index d717b20dd12..ea0a558e401 100644
--- a/docs/_includes/news_contents.html
+++ b/docs/_includes/news_contents.html
@@ -2,21 +2,21 @@
   
    
diff --git a/docs/_includes/section_nav_tutorials.html b/docs/_includes/section_nav_tutorials.html
index 8d665f5139b..7a684b644b7 100644
--- a/docs/_includes/section_nav_tutorials.html
+++ b/docs/_includes/section_nav_tutorials.html
@@ -20,7 +20,7 @@
         {% else -%}
           {% assign previous = forloop.index0 | minus: 1 -%}
           {% assign previous_page = tutorials[previous] | prepend:"/tutorials/" | append:"/" -%}
-          
+          
         {% endif -%}
     
    
     
    
@@ -29,7 +29,7 @@
         {% else -%}
           {% assign next = forloop.index0 | plus: 1 -%}
           {% assign next_page = tutorials[next] | prepend:"/tutorials/" | append:"/" -%}
-          
+          
         {% endif -%}
     
    
   
    
diff --git a/docs/_includes/top.html b/docs/_includes/top.html
index 0cce753ff94..c0e203c33f4 100644
--- a/docs/_includes/top.html
+++ b/docs/_includes/top.html
@@ -4,13 +4,13 @@
   
   
   {% feed_meta %}
-  
+  
   
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
   {% seo %}
   
 
 
+
 
  
+
    If you see a bunch of garbage
+
+If it relates to a ...
+
    well-formed pattern
+
+See if there's a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it.
+
+If not, try writing one and adding it to the `patterns.txt` file.
+
+Patterns are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
+
+Note that patterns can't match multiline strings.
+
    
+
    binary-ish string
+
+Please add a file path to the `excludes.txt` file instead of just accepting the garbage.
+
+File paths are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
+
+`^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
+../tree/HEAD/README.md) (on whichever branch you're using).
+
    
+
+
    
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt
new file mode 100644
index 00000000000..0d035882ec3
--- /dev/null
+++ b/.github/actions/spelling/excludes.txt
@@ -0,0 +1,31 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes
+(?:^|/)(?i)COPYRIGHT
+(?:^|/)(?i)LICEN[CS]E
+(?:^|/)package(?:-lock|)\.json$
+(?:^|/)vendor/
+/fonts/
+ignore$
+\.avi$
+\.eot$
+\.ico$
+\.jpe?g$
+\.lock$
+\.map$
+\.min\.
+\.mod$
+\.mp[34]$
+\.png$
+\.svg$
+\.ttf$
+\.wav$
+\.woff$
+\.woff2$
+^docs/pages/redirects/github\.html$
+^lib/jekyll/mime\.types$
+^lib/theme_template/example/index\.html$
+^lib/theme_template/example/_post\.md$
+^test/fixtures/empty_permalink\.erb$
+^test/fixtures/webrick/bar/baz\.html$
+^test/fixtures/webrick/bar/foo\.xhtml$
+^test/source/_posts/2009-06-22-no-yaml\.markdown$
+^\.github/
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
new file mode 100644
index 00000000000..7fd61c7195a
--- /dev/null
+++ b/.github/actions/spelling/expect.txt
@@ -0,0 +1,684 @@
+acl
+activesupport
+adaoraul
+addons
+aeiou
+AFile
+afterall
+alfredxing
+algolia
+allowfullscreen
+apps
+appveyor
+arengu
+args
+ariejan
+arounds
+asciinema
+asdf
+ashmaroli
+attr
+Autobuild
+autocompletion
+autogenerated
+Autolink
+autoload
+autoreconf
+autosave
+aws
+awscli
+backend
+backlink
+backport
+backtick
+barcamp
+baseurl
+bashrc
+baz
+bbatsov
+bdimcheff
+binstubs
+bip
+bitbucket
+blog
+Blogger
+blogging
+bonafide
+breadcrumbs
+briandoll
+bridgetown
+bridgetownrb
+brightbox
+brighterplanet
+buddyworks
+Bugfix
+Burela
+byparker
+cachegrind
+calavera
+callgraphs
+cartera
+cavalle
+CDNs
+cgi
+changefreq
+changelog
+chango
+charset
+chcp
+chdir
+Cheatsheet
+chmod
+chown
+Chrononaut
+chruby
+cibuild
+circleci
+CJK
+classname
+cloudcannon
+Cloudinary
+cloudsh
+CLT
+codebase
+codeclimate
+CODEOWNERS
+coderay
+codeslinger
+coffeescript
+colorator
+commandline
+commonmark
+compat
+compatibilize
+concat
+config
+configyml
+contentblocks
+CORS
+Cov
+CRLFs
+cron
+crontab
+cruft
+css
+csv
+Currin
+CWD
+cygwin
+daringfireball
+datafiles
+datetime
+DCEU
+Debian
+debuggability
+defunkt
+delegators
+deployer
+deps
+dest
+Devkit
+devops
+digitalocean
+dirs
+disqus
+ditaa
+dnf
+doclist
+doctype
+doeorg
+dommmel
+dotfile
+downcase
+downcased
+duckduckgo
+duritong
+dysinger
+ecf
+editorconfig
+eduardoboucas
+Elasticsearch
+elsif
+Emacs
+emails
+emoji
+endcapture
+endfor
+endhighlight
+endif
+endraw
+endrender
+endtablerow
+Enumerables
+EOL'd
+erb
+errordocument
+eugenebolshakov
+evaled
+exe
+execjs
+extensionpack
+extname
+exts
+favicon
+Fengyun
+ffi
+figcaption
+filesystem
+firstimage
+FIXME
+flakey
+flickr
+fnmatch
+fontello
+forloop
+formcake
+formester
+formingo
+formkeep
+formspark
+formspree
+formx
+Forwardable
+frameborder
+freenode
+frontmatter
+fsnotify
+ftp
+fullstory
+gcc
+gcnovus
+gemfile
+gemset
+gemspec
+getform
+getset
+getsimpleform
+gettalong
+gfm
+ghp
+ghpages
+giraffeacademy
+github
+githubusercontent
+gitignore
+gitlab
+gjtorikian
+globbed
+globbing
+google
+gotcha
+gridism
+GSo
+gsub
+gsubbing
+Hakiri
+hardcode
+hashbang
+hashmap
+helaili
+henrik
+heredoc
+heroku
+highlighter
+hilighting
+homepage
+hostman
+hostname
+href
+htaccess
+htm
+html
+htmlproofer
+http
+httpd
+httpdocs
+hyperlinks
+Iaa
+ial
+ico
+icomoon
+iconset
+ified
+iframe
+img
+Impl
+Inlining
+invokables
+irc
+ivey
+ize
+jalali
+jameshamann
+jamstackthemes
+javascript
+Jax
+jayferd
+jcon
+jdoe
+jeffreytse
+jeffrydegrande
+Jekpack
+jekyllbot
+jekyllconf
+Jekyllers
+Jekyllin
+jekyllized
+jekylllayoutconcept
+jekyllrb
+jekyllthemes
+jemoji
+jmcglone
+jneen
+johnreilly
+jpg
+jqr
+jruby
+json
+jsonify
+juretta
+jwarby
+kbd
+Kentico
+keycdn
+kickster
+kiwifruit
+konklone
+kontent
+kramdown
+Lamprecht
+laquo
+lastmod
+launchctl
+launchy
+laurilehmijoki
+ldquo
+learnxinyminutes
+lexer
+LGTM
+libcurl
+libffi
+lifecycle
+lightgray
+limjh
+linenos
+linkify
+linux
+liufengyun
+livereload
+localhost
+localtime
+loglevel
+Losslessly
+lovin
+lsi
+lsquo
+lstrip
+lyche
+macos
+macromates
+mademistakes
+mailto
+markdownify
+maruku
+mathjax
+mathml
+mattr
+mchung
+mdash
+memberspace
+Memoize
+memoized
+memoizing
+mergable
+metadata
+microdata
+microsoft
+mimetype
+mingw
+minibundle
+minifier
+minitest
+mixin
+mkasberg
+mkd
+mkdir
+mkdn
+mkdown
+modernizr
+mojombo
+moz
+mreid
+msdn
+mswin
+MSYS
+mtime
+multiline
+munging
+Mvvm
+myblog
+mycontent
+mydata
+mydoc
+myimage
+mypage
+myposts
+myrepo
+mysite
+myvalue
+myvar
+myvariable
+namespace
+namespaced
+navbar
+nbsp
+nearlyfreespeech
+nethack
+netlify
+netlifycms
+Neue
+nginx
+ngx
+nielsenramon
+nodejs
+noifniof
+nokogiri
+notextile
+onclick
+onebox
+oneclick
+onschedule
+opensource
+openssl
+Optim
+orderofinterpretation
+orgs
+OSVDB
+osx
+packagecontrol
+pacman
+paginator
+pandoc
+pantulis
+params
+parkr
+parseable
+paspagon
+passthrough
+pathawks
+Pathutil
+paywall
+pdf
+permalink
+PHP
+pinboard
+Piwigo
+pjhyett
+pkill
+pkpass
+placeholders
+planetjekyll
+plantuml
+plugin
+png
+podcasts
+popen
+Posterous
+postfiles
+postlayout
+postmodern
+prepends
+Prioritise
+Probot
+projectlist
+pubstorm
+pufuwozu
+pwa
+pwd
+pygments
+qrush
+Quaid
+quickstart
+rackup
+Rakefile
+raquo
+razorops
+rbenv
+rdiscount
+rdoc
+rdquo
+readme
+realz
+rebund
+redcarpet
+redcloth
+redgreen
+redhat
+refactor
+refactoring
+Refheap
+regen
+regex
+regexp
+remi
+reqs
+Responsify
+revertable
+rfc
+rfelix
+RHEL
+ridk
+roadmap
+rowspan
+rspec
+rsquo
+rss
+rstrip
+rsync
+rtomayko
+Rubo
+rubocop
+rubygem
+rubyinstaller
+rubyprof
+rvm
+ryanflorence
+saas
+samplelist
+samrayner
+sandboxed
+Sassc
+sassify
+schemastore
+Schwartzian
+scp
+screenshot
+scrollbar
+scroller
+scss
+scssify
+sectore
+semver
+seo
+serverless
+setenv
+SFTP
+shopify
+shortlog
+shoulda
+sieversii
+sigpipe
+simplecov
+siteleaf
+sitemap
+SITENAME
+Slicehost
+slugified
+slugify
+smartforms
+smartify
+snipcart
+socio
+somedir
+sonnym
+Sonomy
+sourced
+sourcemaps
+spam
+spotify
+src
+ssg
+ssh
+SSL
+stackoverflow
+standalone
+staticfiles
+staticman
+statictastic
+STDERR
+stdout
+Stickyposts
+strftime
+stringified
+Stringify
+styleguide
+stylesheet
+subdir
+subdomain
+subfolder
+subfolderitems
+subnav
+subpages
+subpath
+subpiece
+subsubfolderitems
+subthing
+subvalues
+subwidget
+sudo
+superdirectories
+superdirs
+SUSE
+sverrirs
+svg
+svn
+swfobject
+swupd
+symlink
+symlinking
+tablerow
+tada
+talkyard
+tbody
+technicalpickles
+templating
+templatize
+Termux
+textilize
+textpattern
+thead
+therubyracer
+Thornquest
+thoughtbot
+throughs
+Tidelift
+timeago
+timezone
+titleize
+TLS
+tmm
+tmp
+toc
+tok
+tomjoht
+toml
+tomo
+toolset
+toshimaru
+triaged
+triaging
+truncatewords
+tsv
+ttf
+Tudou
+Tumblr
+Tweetsert
+txtpen
+tzinfo
+ubuntu
+uby
+ujh
+ultron
+undumpable
+unencode
+Unescape
+unescaping
+unicode
+uniq
+upcase
+uppercasing
+uri
+url
+urlset
+username
+usr
+utf
+utils
+utime
+utm
+vanpelt
+vendored
+vercel
+versioned
+versioning
+vertycal
+Veyor
+vilcans
+visualstudio
+vnd
+vps
+vscode
+vwochnik
+Walkthroughs
+wdm
+We'd
+webfont
+webhook
+webhosting
+webmentions
+webrick
+website
+weekdate
+whitelist
+whitelisting
+wiki
+wikipedia
+willcodeforfoo
+woff
+wordpress
+Workaround
+workflow
+wsl
+www
+xcode
+xdg
+xhtml
+XMinutes
+xml
+xmlns
+xmlschema
+yajl
+yaml
+Yarp
+yml
+Youku
+youtube
+yunbox
+zeropadding
+zlib
+zoneinfo
+zpinter
+Zsh
+zshrc
+zypper
+zzot
diff --git a/.github/actions/spelling/only.txt b/.github/actions/spelling/only.txt
new file mode 100644
index 00000000000..af5f5b1cceb
--- /dev/null
+++ b/.github/actions/spelling/only.txt
@@ -0,0 +1 @@
+^docs/.*\.md$
diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt
new file mode 100644
index 00000000000..b4c2bffcfe6
--- /dev/null
+++ b/.github/actions/spelling/patterns.txt
@@ -0,0 +1,61 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
+
+# data urls
+(['"])data:.*?\g{-1}
+data:[-a-zA-Z=;:/0-9+]*,\S*
+
+# YouTube
+https?://(?:(?:www\.|)youtube\.com|youtu.be)/(?:channel/|embed/|playlist\?list=|watch\?v=|v/|)[-a-zA-Z0-9?&=_]*
+<\s*youtube\s+id=['"][-a-zA-Z0-9?_]*['"]
+\bimg\.youtube\.com/vi/[-a-zA-Z0-9?&=_]*
+youtube_id:\s*[-a-zA-Z0-9?&=_]*
+# Google Analytics
+\bgoogle-analytics\.com/collect.[-0-9a-zA-Z?%=&_.~]*
+# Google APIs
+\bgoogleapis\.com/[a-z]+/v\d+/[a-z]+/[@./?=\w]+
+\b[-a-zA-Z0-9.]*\bstorage\d*\.googleapis\.com(?:/\S*|)
+# Google Calendar
+\bcalendar\.google\.com/calendar(?:/u/\d+|)/embed\?src=[@./?=\w&%]+
+\w+\@group\.calendar\.google\.com\b
+# Google DataStudio
+\bdatastudio\.google\.com/(?:(?:c/|)u/\d+/|)(?:embed/|)(?:open|reporting|datasources|s)/[-0-9a-zA-Z]+(?:/page/[-0-9a-zA-Z]+|)
+# The leading `/` here is as opposed to the `\b` above
+# ... a short way to match `https://` or `http://` since most urls have one of those prefixes
+# Google Docs
+/docs\.google\.com/[a-z]+/d/(?:e/|)[0-9a-zA-Z_-]+/?
+# Google Groups
+https://groups\.google\.com/d/topic/[^/]+/[a-zA-Z0-9]+/discussion
+https://groups\.google\.com/d/msg/[^/]+/[a-zA-Z0-9]+/[a-zA-Z0-9]+
+# Google themes
+themes\.googleusercontent\.com/static/fonts/[^/]+/v\d+/[^.]+.
+# Google CDN
+\bclients2\.google(?:usercontent|)\.com[-0-9a-zA-Z/.]*
+# Goo.gl
+/goo\.gl/[a-zA-Z0-9]+
+# Google Chrome Store
+\bchrome\.google\.com/webstore/detail/\w*(?:/\w*|)
+# google_site_verification:
+google_site_verification: [-a-zA-Z=;:/0-9+]*
+
+# Contributors
+alphabetical order.*:.*
+twitter_handle: .*
+
+# apiKey
+apiKey: '[a-f0-9]+'
+
+# FontAwesome
+/(?:(?i)FontAwesome\.\w+\?\w+)
+
+# Lorem
+(?:\w|\s|[,.])*\b(?i)(?:amet|consectetur|cursus|dolor|eros|ipsum|lacus|libero|ligula|lorem|magna|neque|nulla|suscipit|tempus|ultrices)\b(?:\w|\s|[,.])*
+
+# URL escaped characters
+\%[0-9A-F]{2}
+# c99 hex digits (not the full format, just one I've seen)
+
+# hex digits including css/html color classes:
+(?:[\\0][xX]|\\u|[uU]\+|#x?|\%23)[0-9a-fA-FgGrR_]{2,}(?:[uU]?[lL]{0,2}|u\d+)\b
+
+# ignore long runs of a single character:
+\b([A-Za-z])\g{-1}{3,}\b
diff --git a/.github/actions/spelling/reject.txt b/.github/actions/spelling/reject.txt
new file mode 100644
index 00000000000..a5ba6f6390e
--- /dev/null
+++ b/.github/actions/spelling/reject.txt
@@ -0,0 +1,7 @@
+^attache$
+benefitting
+occurence
+Sorce
+^[Ss]pae
+^untill
+^wether
diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
new file mode 100644
index 00000000000..cbc72ae28ea
--- /dev/null
+++ b/.github/workflows/spelling.yml
@@ -0,0 +1,19 @@
+name: Spell checking
+on:
+  pull_request_target:
+  push:
+
+jobs:
+  build:
+    name: Spell checking
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout-merge
+      if: "contains(github.event_name, 'pull_request')"
+      uses: actions/checkout@v2.0.0
+      with:
+        ref: refs/pull/${{github.event.pull_request.number}}/merge
+    - name: checkout
+      if: "!contains(github.event_name, 'pull_request')"
+      uses: actions/checkout@v2.0.0
+    - uses: check-spelling/check-spelling@v0.0.18
diff --git a/docs/_docs/continuous-integration/razorops.md b/docs/_docs/continuous-integration/razorops.md
index f34ad082d9c..fc92d339596 100644
--- a/docs/_docs/continuous-integration/razorops.md
+++ b/docs/_docs/continuous-integration/razorops.md
@@ -25,7 +25,7 @@ With [Razorops][razorops-homepage] you can set up your Jekyll websites project's
 1. Log in at [https://razorops.com/][razorops-homepage] with your GitHub/Bitbucket or Gitlab account
 2. Create a pipeline, choose your Git provider and select your Jekyll Project
 3. Add .razorops.yaml file in your root directory of your project
-4. Add envirommant var and your deployment is ready
+4. Add environment var and your deployment is ready
 5. Add build and deployment steps as shown in this post [How to Deploy a Static Website to AWS S3 with Razorops CI/CD][deploy-s3]
 
 ## 2. How it works

From 02b12e5dfc63f41aeaebfdbacee6593f87394299 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 16 May 2021 08:14:48 -0400
Subject: [PATCH 4440/4996] Update history to reflect merge of #8675 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 44d5f8fe80a..9344c8e5c28 100644
--- a/History.markdown
+++ b/History.markdown
@@ -36,6 +36,7 @@
   * Cross Version Testing Locally and Faster CI (#8610)
   * style: run rubocop -a (#8654)
   * Use official Ruby setup GH action (#8614)
+  * Spell check action for markdown documentation (#8675)
 
 ### Minor Enhancements
 

From 92633c699617123eeef22f5a63bd9253500b58a2 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Sun, 16 May 2021 15:58:44 -0400
Subject: [PATCH 4441/4996] Update expect to cover docs/_posts (#8677)

Merge pull request 8677
---
 .github/actions/spelling/expect.txt | 68 ++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index 7fd61c7195a..ceceb3fdf80 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -5,9 +5,14 @@ addons
 aeiou
 AFile
 afterall
+Alexey
 alfredxing
 algolia
 allowfullscreen
+Anatoliy
+andreyvit
+Ankit
+Anning
 apps
 appveyor
 arengu
@@ -25,6 +30,7 @@ Autolink
 autoload
 autoreconf
 autosave
+awood
 aws
 awscli
 backend
@@ -37,6 +43,9 @@ bashrc
 baz
 bbatsov
 bdimcheff
+bellvat
+benbalter
+Beney
 binstubs
 bip
 bitbucket
@@ -44,6 +53,7 @@ blog
 Blogger
 blogging
 bonafide
+Bou
 breadcrumbs
 briandoll
 bridgetown
@@ -65,9 +75,11 @@ changefreq
 changelog
 chango
 charset
+Chayoung
 chcp
 chdir
 Cheatsheet
+Checkoway
 chmod
 chown
 Chrononaut
@@ -107,6 +119,7 @@ Currin
 CWD
 cygwin
 daringfireball
+Dassonville
 datafiles
 datetime
 DCEU
@@ -129,10 +142,12 @@ doctype
 doeorg
 dommmel
 dotfile
+Dousse
 downcase
 downcased
 duckduckgo
 duritong
+Dusseau
 dysinger
 ecf
 editorconfig
@@ -150,9 +165,11 @@ endraw
 endrender
 endtablerow
 Enumerables
-EOL'd
+EOL
+eol
 erb
 errordocument
+Espinaco
 eugenebolshakov
 evaled
 exe
@@ -165,6 +182,7 @@ Fengyun
 ffi
 figcaption
 filesystem
+Finazzo
 firstimage
 FIXME
 flakey
@@ -186,6 +204,7 @@ frontmatter
 fsnotify
 ftp
 fullstory
+Gaudino
 gcc
 gcnovus
 gemfile
@@ -200,6 +219,7 @@ ghp
 ghpages
 giraffeacademy
 github
+githubcom
 githubusercontent
 gitignore
 gitlab
@@ -208,6 +228,7 @@ globbed
 globbing
 google
 gotcha
+Goulven
 gridism
 GSo
 gsub
@@ -222,6 +243,7 @@ heredoc
 heroku
 highlighter
 hilighting
+Hoizey
 homepage
 hostman
 hostname
@@ -251,6 +273,7 @@ ize
 jalali
 jameshamann
 jamstackthemes
+jan
 javascript
 Jax
 jayferd
@@ -263,6 +286,7 @@ jekyllbot
 jekyllconf
 Jekyllers
 Jekyllin
+Jekylling
 jekyllized
 jekylllayoutconcept
 jekyllrb
@@ -278,14 +302,22 @@ json
 jsonify
 juretta
 jwarby
+Kacper
+Kasberg
 kbd
 Kentico
+Kewin
 keycdn
 kickster
+Kinnula
 kiwifruit
+Kolesky
 konklone
 kontent
+Kotvinsky
 kramdown
+Kulig
+Kwokfu
 Lamprecht
 laquo
 lastmod
@@ -306,8 +338,10 @@ linkify
 linux
 liufengyun
 livereload
+localheinz
 localhost
 localtime
+Locher
 loglevel
 Losslessly
 lovin
@@ -319,18 +353,25 @@ macos
 macromates
 mademistakes
 mailto
+Manmeet
 markdownify
+Maroli
+Marsceill
 maruku
 mathjax
 mathml
 mattr
+Maximiliano
 mchung
 mdash
 memberspace
 Memoize
 memoized
 memoizing
+mentoring
 mergable
+Mertcan
+mertkahyaoglu
 metadata
 microdata
 microsoft
@@ -339,12 +380,14 @@ mingw
 minibundle
 minifier
 minitest
+Mittal
 mixin
 mkasberg
 mkd
 mkdir
 mkdn
 mkdown
+mmistakes
 modernizr
 mojombo
 moz
@@ -363,11 +406,14 @@ mydoc
 myimage
 mypage
 myposts
+myproject
 myrepo
 mysite
 myvalue
 myvar
 myvariable
+Nadjib
+nakanishi
 namespace
 namespaced
 navbar
@@ -380,6 +426,7 @@ Neue
 nginx
 ngx
 nielsenramon
+nior
 nodejs
 noifniof
 nokogiri
@@ -409,6 +456,7 @@ pathawks
 Pathutil
 paywall
 pdf
+Pelykh
 permalink
 PHP
 pinboard
@@ -423,6 +471,7 @@ plugin
 png
 podcasts
 popen
+Porcel
 Posterous
 postfiles
 postlayout
@@ -481,6 +530,8 @@ rubocop
 rubygem
 rubyinstaller
 rubyprof
+Ruparelia
+Rusiczki
 rvm
 ryanflorence
 saas
@@ -490,6 +541,7 @@ sandboxed
 Sassc
 sassify
 schemastore
+Schroers
 Schwartzian
 scp
 screenshot
@@ -503,12 +555,14 @@ seo
 serverless
 setenv
 SFTP
+shingo
 shopify
 shortlog
 shoulda
 sieversii
 sigpipe
 simplecov
+Singhaniya
 siteleaf
 sitemap
 SITENAME
@@ -568,6 +622,7 @@ symlink
 symlinking
 tablerow
 tada
+Taillandier
 talkyard
 tbody
 technicalpickles
@@ -578,6 +633,7 @@ textilize
 textpattern
 thead
 therubyracer
+Theunissen
 Thornquest
 thoughtbot
 throughs
@@ -604,6 +660,7 @@ Tudou
 Tumblr
 Tweetsert
 txtpen
+Tyborska
 tzinfo
 ubuntu
 uby
@@ -627,6 +684,7 @@ utils
 utime
 utm
 vanpelt
+Vasovi
 vendored
 vercel
 versioned
@@ -634,8 +692,10 @@ versioning
 vertycal
 Veyor
 vilcans
+Vishesh
 visualstudio
 vnd
+vohedge
 vps
 vscode
 vwochnik
@@ -653,6 +713,7 @@ whitelist
 whitelisting
 wiki
 wikipedia
+wildcards
 willcodeforfoo
 woff
 wordpress
@@ -662,7 +723,9 @@ wsl
 www
 xcode
 xdg
+Xhmikos
 xhtml
+Xiaoiver
 XMinutes
 xml
 xmlns
@@ -670,11 +733,14 @@ xmlschema
 yajl
 yaml
 Yarp
+Yashu
+Yastreb
 yml
 Youku
 youtube
 yunbox
 zeropadding
+Zlatan
 zlib
 zoneinfo
 zpinter

From 0274943bcd561639c69b2e24cc8463e48380dedc Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 16 May 2021 15:58:45 -0400
Subject: [PATCH 4442/4996] Update history to reflect merge of #8677 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 9344c8e5c28..8a28be948a7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -37,6 +37,7 @@
   * style: run rubocop -a (#8654)
   * Use official Ruby setup GH action (#8614)
   * Spell check action for markdown documentation (#8675)
+  * Update expect to cover docs/_posts (#8677)
 
 ### Minor Enhancements
 

From 7e350ac031303a650b6dba70a868a33c187eaffb Mon Sep 17 00:00:00 2001
From: "Kelvin M. Klann" 
Date: Sun, 16 May 2021 20:00:53 +0000
Subject: [PATCH 4443/4996] Revert "style: run rubocop -a" (#8676)

Merge pull request 8676
---
 lib/jekyll/cache.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/jekyll/cache.rb b/lib/jekyll/cache.rb
index e688c2ed0b7..be9a1893ef0 100644
--- a/lib/jekyll/cache.rb
+++ b/lib/jekyll/cache.rb
@@ -163,6 +163,7 @@ def delete_cache_files
 
     # Load `path` from disk and return the result.
     # This MUST NEVER be called in Safe Mode
+    # rubocop:disable Security/MarshalLoad
     def load(path)
       raise unless disk_cache_enabled?
 
@@ -171,6 +172,7 @@ def load(path)
       cached_file.close
       value
     end
+    # rubocop:enable Security/MarshalLoad
 
     # Given a path and a value, save value to disk at path.
     # This should NEVER be called in Safe Mode

From 6a6d735db27cf9cb3975ad58edad62b1e82e7b2e Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 16 May 2021 16:00:55 -0400
Subject: [PATCH 4444/4996] Update history to reflect merge of #8676 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 8a28be948a7..57dd053949e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
 
   * Add webrick as a dependency (#8524)
   * fix: pin rubocop to 1.12 due to error with ruby 2.4 (#8651)
+  * Revert "style: run rubocop -a" (#8676)
 
 ### Development Fixes
 

From 93ef9389bae191daf3bb396257810224b0dfa21c Mon Sep 17 00:00:00 2001
From: Liam Bigelow <40188355+bglw@users.noreply.github.com>
Date: Mon, 17 May 2021 08:06:05 +1200
Subject: [PATCH 4445/4996] Load Jekyll plugins from BUNDLE_GEMFILE location
 (#8585)

Merge pull request 8585
---
 lib/jekyll/plugin_manager.rb |  9 ++++++++-
 test/test_plugin_manager.rb  | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb
index d7785338c40..fe2e43f9904 100644
--- a/lib/jekyll/plugin_manager.rb
+++ b/lib/jekyll/plugin_manager.rb
@@ -46,7 +46,7 @@ def require_theme_deps
     end
 
     def self.require_from_bundler
-      if !ENV["JEKYLL_NO_BUNDLER_REQUIRE"] && File.file?("Gemfile")
+      if !ENV["JEKYLL_NO_BUNDLER_REQUIRE"] && gemfile_exists?
         require "bundler"
 
         Bundler.setup
@@ -61,6 +61,13 @@ def self.require_from_bundler
       end
     end
 
+    # Check for the existence of a Gemfile.
+    #
+    # Returns true if a Gemfile exists in the places bundler will look
+    def self.gemfile_exists?
+      File.file?("Gemfile") || (ENV["BUNDLE_GEMFILE"] && File.file?(ENV["BUNDLE_GEMFILE"]))
+    end
+
     # Check whether a gem plugin is allowed to be used during this build.
     #
     # plugin_name - the name of the plugin
diff --git a/test/test_plugin_manager.rb b/test/test_plugin_manager.rb
index dfcb4dfec32..a7b9359e225 100644
--- a/test/test_plugin_manager.rb
+++ b/test/test_plugin_manager.rb
@@ -10,6 +10,13 @@ def with_no_gemfile
     FileUtils.mv "Gemfile.old", "Gemfile"
   end
 
+  def with_bundle_gemfile
+    FileUtils.mv "Gemfile", "AlternateGemfile"
+    yield
+  ensure
+    FileUtils.mv "AlternateGemfile", "Gemfile"
+  end
+
   context "JEKYLL_NO_BUNDLER_REQUIRE set to `nil`" do
     should "require from bundler" do
       with_env("JEKYLL_NO_BUNDLER_REQUIRE", nil) do
@@ -20,6 +27,18 @@ def with_no_gemfile
     end
   end
 
+  context "BUNDLE_GEMFILE set to `AlternateGemfile`" do
+    should "require from bundler" do
+      with_env("BUNDLE_GEMFILE", "AlternateGemfile") do
+        with_bundle_gemfile do
+          assert Jekyll::PluginManager.require_from_bundler,
+                 "require_from_bundler should return true"
+          assert ENV["JEKYLL_NO_BUNDLER_REQUIRE"], "Gemfile plugins were not required."
+        end
+      end
+    end
+  end
+
   context "JEKYLL_NO_BUNDLER_REQUIRE set to `true`" do
     should "not require from bundler" do
       with_env("JEKYLL_NO_BUNDLER_REQUIRE", "true") do

From 30b397c0467ec6b73bca9c1ddf1a5220b1e8ca4a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 16 May 2021 16:06:06 -0400
Subject: [PATCH 4446/4996] Update history to reflect merge of #8585 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 57dd053949e..53c214aeeb6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -26,6 +26,7 @@
   * Add webrick as a dependency (#8524)
   * fix: pin rubocop to 1.12 due to error with ruby 2.4 (#8651)
   * Revert "style: run rubocop -a" (#8676)
+  * Load Jekyll plugins from BUNDLE_GEMFILE location (#8585)
 
 ### Development Fixes
 

From 49a00ebbec06e383aafa648f7c8bdb027a2fc3af Mon Sep 17 00:00:00 2001
From: nusu 
Date: Sun, 16 May 2021 23:09:23 +0300
Subject: [PATCH 4447/4996] Add formcarry to forms section (#8471)

Merge pull request 8471
---
 docs/pages/resources.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/pages/resources.md b/docs/pages/resources.md
index 2df8c872b14..86dc798d690 100644
--- a/docs/pages/resources.md
+++ b/docs/pages/resources.md
@@ -56,6 +56,7 @@ Use a SaaS service as a backend for functionality on your Jekyll site
   - [Getform](https://getform.io)
   - [99Inbound](https://www.99inbound.com)
   - [Formcake](https://formcake.com)
+  - [Formcarry](https://formcarry.com)
   - [Formingo](https://www.formingo.co/guides/jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=Jekyll%20Documentation)
   - [FormKeep](https://formkeep.com/guides/contact-form-jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=contact-form-jekyll)
   - [Formspark](https://formspark.io/)

From f267dafc0c32c38b0eec4c5e5bd99a67b09a0321 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 16 May 2021 16:09:24 -0400
Subject: [PATCH 4448/4996] Update history to reflect merge of #8471 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 53c214aeeb6..72bcd440617 100644
--- a/History.markdown
+++ b/History.markdown
@@ -20,6 +20,7 @@
   * Specify default port and host for serve commands in docs (#8624)
   * Update third-party.md (#8652)
   * Add documentation for Sass configuration options (#8587)
+  * Add formcarry to forms section (#8471)
 
 ### Bug Fixes
 

From 1ffda285d6f797b64bd291ab7c2c6acba7360015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edson=20Jim=C3=A9nez?=
 <51224220+Edsonytic@users.noreply.github.com>
Date: Sun, 16 May 2021 15:10:45 -0500
Subject: [PATCH 4449/4996] Add step to set SDKROOT (#8478)

Merge pull request 8478
---
 docs/_docs/installation/macos.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md
index 5d885705051..431421c9c20 100644
--- a/docs/_docs/installation/macos.md
+++ b/docs/_docs/installation/macos.md
@@ -10,6 +10,13 @@ To install the command line tools to compile native extensions, open a terminal
 xcode-select --install
 ```
 
+### set SDKROOT (only macOS Catalina or later)
+Starting on macOS Catalina (10.15) the headers used for Ruby have been moved from their previous location which results in some gems, including Jekyll to fail installation. This can be solved by setting SDKROOT in your shell configuration to the value provided by xcrun.
+
+```ssh
+export SDKROOT=$(xcrun --show-sdk-path)
+```
+
 ## Install Ruby
 
 Jekyll requires **Ruby v{{ site.data.ruby.min_version }}** or higher.

From e724b587e30598cb72f5618b481f22a9b8fd924b Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Sun, 16 May 2021 16:10:46 -0400
Subject: [PATCH 4450/4996] Update history to reflect merge of #8478 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 72bcd440617..7e5fd5ba143 100644
--- a/History.markdown
+++ b/History.markdown
@@ -21,6 +21,7 @@
   * Update third-party.md (#8652)
   * Add documentation for Sass configuration options (#8587)
   * Add formcarry to forms section (#8471)
+  * Add step to set SDKROOT (#8478)
 
 ### Bug Fixes
 

From 7605b0a474f2906e36f394a174171e9ba2cefed1 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 16 May 2021 22:12:49 +0200
Subject: [PATCH 4451/4996] Update History.markdown

---
 History.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/History.markdown b/History.markdown
index 7e5fd5ba143..2d8ad444ac6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1573,7 +1573,7 @@
 
 ### Minor Enhancements
 
-  * Stop testing with Ruby 2.0.x, which is EOL'd. (#4381)
+  * Stop testing with Ruby 2.0.x EOL (#4381)
   * Allow collections to have documents that have no file extension (#4545)
   * Add size property to `group_by` result (#4557)
   * Site Template: Removed unnecessary nesting from `_base.scss` (#4637)

From 889fe4130bdda65b288c34ea8ebbba4dd0105f54 Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Sun, 16 May 2021 22:13:21 +0200
Subject: [PATCH 4452/4996] Update expect.txt

---
 .github/actions/spelling/expect.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index ceceb3fdf80..d6a6a589e86 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -191,6 +191,7 @@ fnmatch
 fontello
 forloop
 formcake
+formcarry
 formester
 formingo
 formkeep

From e5dd8897500ac0426545ba8f9304660cbeaff44d Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Mon, 17 May 2021 23:55:11 +0200
Subject: [PATCH 4453/4996] Update expect.txt

---
 .github/actions/spelling/expect.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index d6a6a589e86..de551310ddf 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -550,6 +550,8 @@ scrollbar
 scroller
 scss
 scssify
+sdk
+SDKROOT
 sectore
 semver
 seo
@@ -723,6 +725,7 @@ workflow
 wsl
 www
 xcode
+xcrun
 xdg
 Xhmikos
 xhtml

From 42dacc1091536deababcb54591568249f7b0a7fc Mon Sep 17 00:00:00 2001
From: Frank Taillandier 
Date: Tue, 18 May 2021 08:31:34 +0200
Subject: [PATCH 4454/4996] fix(security):  CVE-2021-28834 (#8680)

Merge pull request 8680
---
 jekyll.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 169d41cf5a4..9bb5376657f 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("i18n",                  "~> 1.0")
   s.add_runtime_dependency("jekyll-sass-converter", "~> 2.0")
   s.add_runtime_dependency("jekyll-watch",          "~> 2.0")
-  s.add_runtime_dependency("kramdown",              "~> 2.3")
+  s.add_runtime_dependency("kramdown",              "~> 2.3", ">= 2.3.1")
   s.add_runtime_dependency("kramdown-parser-gfm",   "~> 1.0")
   s.add_runtime_dependency("liquid",                "~> 4.0")
   s.add_runtime_dependency("mercenary",             ">= 0.3.6", "< 0.5")

From 6ff7d680e046e12a35300297a63206e115dc1d16 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 18 May 2021 02:31:36 -0400
Subject: [PATCH 4455/4996] Update history to reflect merge of #8680 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 2d8ad444ac6..e1c55180671 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * fix: pin rubocop to 1.12 due to error with ruby 2.4 (#8651)
   * Revert "style: run rubocop -a" (#8676)
   * Load Jekyll plugins from BUNDLE_GEMFILE location (#8585)
+  * fix(security):  CVE-2021-28834 (#8680)
 
 ### Development Fixes
 

From b5e910acfbf0ea542ddb91e035847cdae168aebf Mon Sep 17 00:00:00 2001
From: Mike Kasberg 
Date: Tue, 18 May 2021 01:34:13 -0600
Subject: [PATCH 4456/4996] Improve the "Markdown Options" Docs (#8681)

Merge pull request 8681
---
 .github/actions/spelling/expect.txt  |  3 +-
 docs/_docs/configuration/markdown.md | 96 ++++++++++++++--------------
 2 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index de551310ddf..b2cfe92c50f 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -34,7 +34,6 @@ awood
 aws
 awscli
 backend
-backlink
 backport
 backtick
 barcamp
@@ -165,7 +164,6 @@ endraw
 endrender
 endtablerow
 Enumerables
-EOL
 eol
 erb
 errordocument
@@ -528,6 +526,7 @@ rsync
 rtomayko
 Rubo
 rubocop
+rubychan
 rubygem
 rubyinstaller
 rubyprof
diff --git a/docs/_docs/configuration/markdown.md b/docs/_docs/configuration/markdown.md
index d06743d876b..38904d7a2dd 100644
--- a/docs/_docs/configuration/markdown.md
+++ b/docs/_docs/configuration/markdown.md
@@ -5,61 +5,63 @@ permalink: "/docs/configuration/markdown/"
 The various Markdown renderers supported by Jekyll sometimes have extra options
 available.
 
-### Kramdown
-
-Kramdown is the default Markdown renderer for Jekyll. Below is a list of the
-currently supported options:
-
-* **auto_id_prefix** - Prefix used for automatically generated header IDs
-* **auto_id_stripping** - Strip all formatting from header text for automatic ID generation
-* **auto_ids** - Use automatic header ID generation
-* **coderay_bold_every** - Defines how often a line number should be made bold
-* **coderay_css** - Defines how the highlighted code gets styled
-* **coderay_default_lang** - Sets the default language for highlighting code blocks
-* **coderay_line_number_start** - The start value for the line numbers
-* **coderay_line_numbers** - Defines how and if line numbers should be shown
-* **coderay_tab_width** - The tab width used in highlighted code
-* **coderay_wrap** - Defines how the highlighted code should be wrapped
-* **enable_coderay** - Use coderay for syntax highlighting
-* **entity_output** - Defines how entities are output
-* **footnote_backlink** - Defines the text that should be used for the footnote backlinks
-* **footnote_backlink_inline** - Specifies whether the footnote backlink should always be inline
-* **footnote_nr** - The number of the first footnote
-* **gfm_quirks** - Enables a set of GFM specific quirks
-* **hard_wrap** - Interprets line breaks literally
-* **header_offset** - Sets the output offset for headers
-* **html_to_native** - Convert HTML elements to native elements
-* **line_width** - Defines the line width to be used when outputting a document
-* **link_defs** - Pre-defines link definitions
-* **math_engine** - Set the math engine
-* **math_engine_opts** - Set the math engine options
-* **parse_block_html** - Process kramdown syntax in block HTML tags
-* **parse_span_html** - Process kramdown syntax in span HTML tags
-* **smart_quotes** - Defines the HTML entity names or code points for smart quote output
-* **syntax_highlighter** - Set the syntax highlighter
-* **syntax_highlighter_opts** - Set the syntax highlighter options
-* **toc_levels** - Defines the levels that are used for the table of contents
-* **transliterated_header_ids** - Transliterate the header text before generating the ID
-* **typographic_symbols** - Defines a mapping from typographical symbol to output characters
-
-### Example Usage
+## Kramdown
+
+Kramdown is the default Markdown renderer for Jekyll, and often works well with no additional configuration. However, it does support many configuration options.
+
+### GitHub Flavored Markdown
+
+Kramdown supports GitHub Flavored Markdown (GFM). To use GFM with Kramdown in Jekyll, add the following to your configuration.
+
+```yaml
+kramdown:
+  input: GFM
+```
+
+GFM supports additional Kramdown options, documented at [kramdown-parser-gfm](https://github.com/kramdown/parser-gfm). These options can be used directly in your Kramdown Jekyll config, like this:
+
+```yaml
+kramdown:
+  input: GFM
+  gfm_quirks: [paragraph_end]
+```
+
+### Syntax Highlighting (CodeRay)
+
+To use the [CodeRay](http://coderay.rubychan.de/) syntax highlighter with Kramdown, you  need to add a dependency on the `kramdown-syntax-coderay` gem. For example, `bundle add kramdown-syntax-coderay`. Then, you'll be able to specify CodeRay in your `syntax_highlighter` config:
+
+```yaml
+kramdown:
+  syntax_highlighter: coderay
+```
+
+CodeRay supports several of its own configuration options, documented in the [kramdown-syntax-coderay docs](https://github.com/kramdown/syntax-coderay) which can be passed as `syntax_highlighter_opts` like this:
+
+```yaml
+kramdown:
+  syntax_highlighter: coderay
+  syntax_highlighter_opts:
+    line_numbers: table
+    bold_every: 5
+```
+
+### Advanced Kramdown Options
+
+Kramdown supports a variety of other relatively advanced options such as `header_offset` and `smart_quotes`. These are documented in the [Kramdown configuration documentation](https://kramdown.gettalong.org/options.html) and can be added to your Kramdown config like this:
+
 ```yaml
 kramdown:
-  html_to_native: true
+  header_offset: 2
 ```
-  
+
 
    
-  
    There are two unsupported kramdown options
    
+  
    There are several unsupported kramdown options
    
   
    
-    Please note that both remove_block_html_tags and
-    remove_span_html_tags are currently unsupported in Jekyll due
-    to the fact that they are not included within the kramdown HTML converter.
+    Please note that Jekyll uses Kramdown's HTML converter. Kramdown options used only by other converters, such as remove_block_html_tags (used by the RemoveHtmlTags converter), will not work.
   
    
 
    
 
-For more details about these options have a look at the [Kramdown configuration documentation](https://kramdown.gettalong.org/options.html).
-
-### CommonMark
+## CommonMark
 
 [CommonMark](https://commonmark.org/) is a rationalized version of Markdown syntax, implemented in C and thus faster than default Kramdown implemented in Ruby. It [slightly differs](https://github.com/commonmark/CommonMark#differences-from-original-markdown) from original Markdown and does not support all the syntax elements implemented in Kramdown, like [Block Inline Attribute Lists](https://kramdown.gettalong.org/syntax.html#block-ials).
 

From 76517175e700d80706c9139989053f1c53d9b956 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 18 May 2021 03:34:15 -0400
Subject: [PATCH 4457/4996] Update history to reflect merge of #8681 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index e1c55180671..1a19375d712 100644
--- a/History.markdown
+++ b/History.markdown
@@ -22,6 +22,7 @@
   * Add documentation for Sass configuration options (#8587)
   * Add formcarry to forms section (#8471)
   * Add step to set SDKROOT (#8478)
+  * Improve the "Markdown Options" Docs (#8681)
 
 ### Bug Fixes
 

From 0dee66260f2bde77d9edbf279e083de862b21b5c Mon Sep 17 00:00:00 2001
From: fauno 
Date: Thu, 22 Jul 2021 14:43:47 -0300
Subject: [PATCH 4458/4996] Optimize `Jekyll::Utils.parse_date` (#8425)

Merge pull request 8425
---
 benchmark/parse-date | 25 +++++++++++++++++++++++++
 lib/jekyll/utils.rb  |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100755 benchmark/parse-date

diff --git a/benchmark/parse-date b/benchmark/parse-date
new file mode 100755
index 00000000000..9d1d1ed632d
--- /dev/null
+++ b/benchmark/parse-date
@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+require_relative '../lib/jekyll'
+require 'benchmark/ips'
+
+date = "2014-08-02 14:43:06 PDT".freeze
+time = Time.parse(date)
+
+Benchmark.ips do |x|
+  x.report('Time.parse') do
+    Time.parse(date)
+  end
+
+  x.report('localtime') do
+    Time.parse(date).localtime
+  end
+
+  x.report('localtime parsed') do
+    time.localtime
+  end
+
+  x.report('Utils.parse_date') do
+    Jekyll::Utils.parse_date(date)
+  end
+end
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 5039c07adf9..49d67f4b24f 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -128,7 +128,8 @@ def stringify_hash_keys(hash)
     # Returns the parsed date if successful, throws a FatalException
     # if not
     def parse_date(input, msg = "Input could not be parsed.")
-      Time.parse(input).localtime
+      @parse_date_cache ||= {}
+      @parse_date_cache[input] ||= Time.parse(input).localtime
     rescue ArgumentError
       raise Errors::InvalidDateError, "Invalid date '#{input}': #{msg}"
     end

From ea535a9ab73b34b5655c3afa25c140ecbba3305f Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 22 Jul 2021 13:43:49 -0400
Subject: [PATCH 4459/4996] Update history to reflect merge of #8425 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 1a19375d712..b3eb9d827a9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -49,6 +49,7 @@
 
   * Regenerate supported mime types (#8542)
   * Update include tag to be more permissive (#8618)
+  * Optimize `Jekyll::Utils.parse_date` (#8425)
 
 ### Site Enhancements
 

From bcaf878b65d6349da9e53ad9243796e72797c0db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Brand=C3=A3o?= 
Date: Thu, 22 Jul 2021 18:46:12 +0100
Subject: [PATCH 4460/4996] Add 'webrick' warning note to "Quickstart" Docs
 (#8727)

Merge pull request 8727
---
 docs/_docs/index.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/_docs/index.md b/docs/_docs/index.md
index 07dfeb1126a..af97b79c0d7 100644
--- a/docs/_docs/index.md
+++ b/docs/_docs/index.md
@@ -41,6 +41,9 @@ bundle exec jekyll serve
 ```
 6. Browse to [http://localhost:4000](http://localhost:4000){:target="_blank"}
 
+{: .note .warning}
+If you are using Ruby version 3.0.0 or higher, step 5 [may fail](https://github.com/github/pages-gem/issues/752). You may fix it by adding `webrick` to your dependencies: `bundle add webrick`
+
 {: .note .info}
 Pass the `--livereload` option to `serve` to automatically refresh the page with each change you make to the source files: `bundle exec jekyll serve --livereload`
 

From 915248ff1831ec811fe6c7c7e8637accceeed33a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 22 Jul 2021 13:46:13 -0400
Subject: [PATCH 4461/4996] Update history to reflect merge of #8727 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index b3eb9d827a9..36fefa52251 100644
--- a/History.markdown
+++ b/History.markdown
@@ -23,6 +23,7 @@
   * Add formcarry to forms section (#8471)
   * Add step to set SDKROOT (#8478)
   * Improve the "Markdown Options" Docs (#8681)
+  * Add 'webrick' warning note to "Quickstart" Docs (#8727)
 
 ### Bug Fixes
 

From 8a6dd9e494f94a4100ee915903750f18abd2ffb9 Mon Sep 17 00:00:00 2001
From: Parikshit87 <75501801+Parikshit87@users.noreply.github.com>
Date: Thu, 22 Jul 2021 23:19:55 +0530
Subject: [PATCH 4462/4996] Update windows.md (#8701)

Merge pull request 8701
---
 docs/_docs/installation/windows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/installation/windows.md b/docs/_docs/installation/windows.md
index a2e948b3ada..eacd92c6942 100644
--- a/docs/_docs/installation/windows.md
+++ b/docs/_docs/installation/windows.md
@@ -29,7 +29,7 @@ We only cover RubyInstaller-2.4 and newer here. Older versions need to
 4. Check if Jekyll has been installed properly: `jekyll -v`
 
 {: .note .info}
-You may receive an error when checking if Jekyll has been installed properly. Reboot your system and run `jekyll -v` again.
+You may receive an error when checking if Jekyll has not been installed properly. Reboot your system and run `jekyll -v` again.
 If the error persists, please open a [RubyInstaller issue](https://github.com/oneclick/rubyinstaller2/issues/new).
 
 That's it, you're ready to use Jekyll!

From 8926ae1aace71babba70b95053f76b6b7dc682be Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 22 Jul 2021 13:49:56 -0400
Subject: [PATCH 4463/4996] Update history to reflect merge of #8701 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 36fefa52251..316efc58dd6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -24,6 +24,7 @@
   * Add step to set SDKROOT (#8478)
   * Improve the "Markdown Options" Docs (#8681)
   * Add 'webrick' warning note to "Quickstart" Docs (#8727)
+  * Update windows.md (#8701)
 
 ### Bug Fixes
 

From 37612632c54a36cabce4b071c3e79e98bbf3df73 Mon Sep 17 00:00:00 2001
From: "jaybe@jekyll" 
Date: Thu, 22 Jul 2021 12:52:24 -0500
Subject: [PATCH 4464/4996] IRC networks - Libera, Freenode (#8706)

Merge pull request 8706
---
 docs/_docs/community/community.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_docs/community/community.md b/docs/_docs/community/community.md
index bb8e45c1397..d8e98a057e9 100644
--- a/docs/_docs/community/community.md
+++ b/docs/_docs/community/community.md
@@ -16,7 +16,7 @@ If you're looking for support for Jekyll, there are a lot of options:
 
 * Read the [Jekyll Documentation]({{ '/docs/' | relative_url }})
 * If you have a question about using Jekyll, start a discussion on the [Jekyll Forum](https://talk.jekyllrb.com/) or [StackOverflow](https://stackoverflow.com/questions/tagged/jekyll)
-* Chat with Jekyllers — Join our [Gitter channel](https://gitter.im/jekyll/jekyll) or our [IRC channel #jekyll on Freenode](irc://irc.freenode.net/#jekyll)
+* Chat with Jekyllers — Join our [Gitter channel](https://gitter.im/jekyll/jekyll) or our IRC channels #jekyll on [Libera](irc://irc.libera.chat/#jekyll) or [Freenode](irc://irc.freenode.net/#jekyll).
 
 There are a bunch of helpful community members on these services who are willing to point you in the right direction.
 

From a0ed9550cd58411295a1e6718cd61ba46f65c941 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 22 Jul 2021 13:52:25 -0400
Subject: [PATCH 4465/4996] Update history to reflect merge of #8706 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 316efc58dd6..71b85aad5d2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Improve the "Markdown Options" Docs (#8681)
   * Add 'webrick' warning note to "Quickstart" Docs (#8727)
   * Update windows.md (#8701)
+  * IRC networks - Libera, Freenode (#8706)
 
 ### Bug Fixes
 

From b31f933cd1ee769640364d8305204824b86eb632 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jul 2021 13:53:15 -0400
Subject: [PATCH 4466/4996] Bump check-spelling/check-spelling from 0.0.18 to
 0.0.19 (#8740)

Merge pull request 8740
---
 .github/workflows/spelling.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
index cbc72ae28ea..e3825f33a18 100644
--- a/.github/workflows/spelling.yml
+++ b/.github/workflows/spelling.yml
@@ -16,4 +16,4 @@ jobs:
     - name: checkout
       if: "!contains(github.event_name, 'pull_request')"
       uses: actions/checkout@v2.0.0
-    - uses: check-spelling/check-spelling@v0.0.18
+    - uses: check-spelling/check-spelling@v0.0.19

From 5a441c24e2c5827373b39f039cbc7a8b3d95caa3 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 22 Jul 2021 13:53:16 -0400
Subject: [PATCH 4467/4996] Update history to reflect merge of #8740 [ci skip]

---
 History.markdown | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/History.markdown b/History.markdown
index 71b85aad5d2..483166e89b3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,5 +1,7 @@
 ## HEAD
 
+  * Bump check-spelling/check-spelling from 0.0.18 to 0.0.19 (#8740)
+
 ### Documentation
 
   * typo - do instead of don't (#8518)

From 0eb9239151323b11ddcd91bf2e61edefe990443f Mon Sep 17 00:00:00 2001
From: Mike Kasberg 
Date: Thu, 22 Jul 2021 11:57:51 -0600
Subject: [PATCH 4468/4996] Improve GitHub Flavored Markdown Docs (#8684)

Merge pull request 8684
---
 docs/_docs/configuration/markdown.md      | 13 +++++++------
 docs/_tutorials/convert-site-to-jekyll.md | 14 ++++----------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/docs/_docs/configuration/markdown.md b/docs/_docs/configuration/markdown.md
index 38904d7a2dd..9cd65a3381d 100644
--- a/docs/_docs/configuration/markdown.md
+++ b/docs/_docs/configuration/markdown.md
@@ -9,23 +9,24 @@ available.
 
 Kramdown is the default Markdown renderer for Jekyll, and often works well with no additional configuration. However, it does support many configuration options.
 
-### GitHub Flavored Markdown
+### Kramdown Processor
 
-Kramdown supports GitHub Flavored Markdown (GFM). To use GFM with Kramdown in Jekyll, add the following to your configuration.
+By default, Jekyll uses the [GitHub Flavored Markdown (GFM) processor](https://github.com/kramdown/parser-gfm) for Kramdown. (Specifying `input: GFM` is fine, but redundant.) GFM supports a couple additional Kramdown options, documented by [kramdown-parser-gfm](https://github.com/kramdown/parser-gfm). These options can be used directly in your Kramdown Jekyll config, like this:
 
 ```yaml
 kramdown:
-  input: GFM
+  gfm_quirks: [paragraph_end]
 ```
 
-GFM supports additional Kramdown options, documented at [kramdown-parser-gfm](https://github.com/kramdown/parser-gfm). These options can be used directly in your Kramdown Jekyll config, like this:
+You can also change the processor used by Kramdown (as specified for the `input` key in the [Kramdown RDoc](https://kramdown.gettalong.org/rdoc/Kramdown/Document.html#method-c-new)). For example, to use the non-GFM Kramdown processor in Jekyll, add the following to your configuration.
 
 ```yaml
 kramdown:
-  input: GFM
-  gfm_quirks: [paragraph_end]
+  input: Kramdown
 ```
 
+Documentation for Kramdown parsers is available in the [Kramdown docs](https://kramdown.gettalong.org/parser/kramdown.html). If you use a Kramdown parser other than Kramdown or GFM, you'll need to add the gem for it.
+
 ### Syntax Highlighting (CodeRay)
 
 To use the [CodeRay](http://coderay.rubychan.de/) syntax highlighter with Kramdown, you  need to add a dependency on the `kramdown-syntax-coderay` gem. For example, `bundle add kramdown-syntax-coderay`. Then, you'll be able to specify CodeRay in your `syntax_highlighter` config:
diff --git a/docs/_tutorials/convert-site-to-jekyll.md b/docs/_tutorials/convert-site-to-jekyll.md
index 22b31c659b2..e31c0a1f94f 100644
--- a/docs/_tutorials/convert-site-to-jekyll.md
+++ b/docs/_tutorials/convert-site-to-jekyll.md
@@ -181,22 +181,16 @@ If you don't specify a layout in your pages, Jekyll will simply render that page
 
 ## 4. Add a configuration file
 
-Add a `_config.yml` file in your root directory. In `_config.yml`, you can optionally specify the markdown filter you want. By default, [kramdown](https://kramdown.gettalong.org/) is used (without the need to specify it). If no other filter is specified, your config file will automatically apply the following as a default setting:
+Add a `_config.yml` file in your root directory. In `_config.yml`, you can optionally specify the markdown filter you want. By default, the [GitHub Flavored Markdown (GFM) processor](https://github.com/kramdown/parser-gfm) for [kramdown](https://kramdown.gettalong.org/) is used. If no other filter is specified, your config file will automatically apply the following as a [default](/docs/configuration/default/) setting:
 
 ```yaml
 markdown: kramdown
-```
-
-You can also specify [some options](https://kramdown.gettalong.org/converter/html.html) for kramdown to make it behave more like [GitHub Flavored Markdown (GFM)](https://github.github.com/gfm/):
-
-```yaml
 kramdown:
- input: GFM
- auto_ids: true
- hard_wrap: false
- syntax_highlighter: rouge
+  input: GFM
 ```
 
+You can find additional [Markdown Options](/docs/configuration/markdown/) in the Jekyll docs, though it's unlikely that you'll need them.
+
 ## 5. Test your pages
 
 Now run `jekyll serve` and toggle between your `index.html` and `about.html` pages. The default layout should load for both pages.

From beca094841e4e1468bc6d90f0911f0da2ccf642d Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 22 Jul 2021 13:57:52 -0400
Subject: [PATCH 4469/4996] Update history to reflect merge of #8684 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 483166e89b3..acec20bd92a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * Add 'webrick' warning note to "Quickstart" Docs (#8727)
   * Update windows.md (#8701)
   * IRC networks - Libera, Freenode (#8706)
+  * Improve GitHub Flavored Markdown Docs (#8684)
 
 ### Bug Fixes
 

From 3f46f02108048f2151724220d0037cbce09f483e Mon Sep 17 00:00:00 2001
From: Andrew Davis 
Date: Fri, 23 Jul 2021 01:58:40 +0800
Subject: [PATCH 4470/4996] Update rubocop from 1.12 to 1.18 and min ruby from
 2.4 to 2.5 (#8741)

Merge pull request 8741
---
 .github/workflows/ci.yml                      |  2 +-
 .rubocop.yml                                  |  2 +-
 Gemfile                                       |  2 +-
 docs/_data/ruby.yml                           |  2 +-
 jekyll.gemspec                                |  2 +-
 .../converters/markdown/kramdown_parser.rb    |  2 +-
 lib/jekyll/external.rb                        | 38 +++++++++----------
 lib/jekyll/page.rb                            |  2 +-
 lib/jekyll/renderer.rb                        | 16 ++++----
 lib/jekyll/tags/include.rb                    |  2 +-
 test/test_utils.rb                            |  8 ++--
 11 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6769f529ec3..f43133339fc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-        - 2.4 # Minimum required Ruby version in gemspec
+        - 2.5 # Minimum required Ruby version in gemspec
     steps:
       - uses: actions/checkout@v2
       - name: Download released earth
diff --git a/.rubocop.yml b/.rubocop.yml
index 49c69dcc8e6..6d5256a8f16 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -13,7 +13,7 @@ Jekyll/NoPutsAllowed:
     - rake/*.rake
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   Include:
     - lib/**/*.rb
     - test/**/*.rb
diff --git a/Gemfile b/Gemfile
index 615fc9de015..e521f771d37 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 1.12.0"
+  gem "rubocop", "~> 1.18.3"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rake"
diff --git a/docs/_data/ruby.yml b/docs/_data/ruby.yml
index 640c5e0bf8b..10b6bfeadfb 100644
--- a/docs/_data/ruby.yml
+++ b/docs/_data/ruby.yml
@@ -1,3 +1,3 @@
-min_version: 2.4.0
+min_version: 2.5.0
 current_version: 3.0.0
 current_version_output: ruby 3.0.0p0 (2020-12-25 revision 95aff21468)
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 9bb5376657f..f835fea1981 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.rdoc_options     = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w(README.markdown LICENSE)
 
-  s.required_ruby_version     = ">= 2.4.0"
+  s.required_ruby_version     = ">= 2.5.0"
   s.required_rubygems_version = ">= 2.7.0"
 
   s.add_runtime_dependency("addressable",           "~> 2.4")
diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index a93184b8849..6751480739e 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -160,7 +160,7 @@ def highlighter
 
         def strip_coderay_prefix(hash)
           hash.each_with_object({}) do |(key, val), hsh|
-            cleaned_key = key.to_s.gsub(%r!\Acoderay_!, "")
+            cleaned_key = key.to_s.delete_prefix("coderay_")
 
             if key != cleaned_key
               Jekyll::Deprecator.deprecation_message(
diff --git a/lib/jekyll/external.rb b/lib/jekyll/external.rb
index d42762ee018..b484160c8eb 100644
--- a/lib/jekyll/external.rb
+++ b/lib/jekyll/external.rb
@@ -22,13 +22,11 @@ def blessed_gems
       #
       def require_if_present(names)
         Array(names).each do |name|
-          begin
-            require name
-          rescue LoadError
-            Jekyll.logger.debug "Couldn't load #{name}. Skipping."
-            yield(name, version_constraint(name)) if block_given?
-            false
-          end
+          require name
+        rescue LoadError
+          Jekyll.logger.debug "Couldn't load #{name}. Skipping."
+          yield(name, version_constraint(name)) if block_given?
+          false
         end
       end
 
@@ -55,23 +53,21 @@ def version_constraint(gem_name)
       #
       def require_with_graceful_fail(names)
         Array(names).each do |name|
-          begin
-            Jekyll.logger.debug "Requiring:", name.to_s
-            require name
-          rescue LoadError => e
-            Jekyll.logger.error "Dependency Error:", <<~MSG
-              Yikes! It looks like you don't have #{name} or one of its dependencies installed.
-              In order to use Jekyll as currently configured, you'll need to install this gem.
+          Jekyll.logger.debug "Requiring:", name.to_s
+          require name
+        rescue LoadError => e
+          Jekyll.logger.error "Dependency Error:", <<~MSG
+            Yikes! It looks like you don't have #{name} or one of its dependencies installed.
+            In order to use Jekyll as currently configured, you'll need to install this gem.
 
-              If you've run Jekyll with `bundle exec`, ensure that you have included the #{name}
-              gem in your Gemfile as well.
+            If you've run Jekyll with `bundle exec`, ensure that you have included the #{name}
+            gem in your Gemfile as well.
 
-              The full error message from Ruby is: '#{e.message}'
+            The full error message from Ruby is: '#{e.message}'
 
-              If you run into trouble, you can find helpful resources at https://jekyllrb.com/help/!
-            MSG
-            raise Jekyll::Errors::MissingDependencyException, name
-          end
+            If you run into trouble, you can find helpful resources at https://jekyllrb.com/help/!
+          MSG
+          raise Jekyll::Errors::MissingDependencyException, name
         end
       end
     end
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 8b3245fb5e0..3797f880969 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -144,7 +144,7 @@ def path
 
     # The path to the page source file, relative to the site source
     def relative_path
-      @relative_path ||= PathManager.join(@dir, @name).sub(%r!\A/!, "")
+      @relative_path ||= PathManager.join(@dir, @name).delete_prefix("/")
     end
 
     # Obtain destination path.
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index 6a08a12b0e6..ddf078fdfc0 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -102,15 +102,13 @@ def render_document
     # Returns String the converted content.
     def convert(content)
       converters.reduce(content) do |output, converter|
-        begin
-          converter.convert output
-        rescue StandardError => e
-          Jekyll.logger.error "Conversion error:",
-                              "#{converter.class} encountered an error while "\
-                              "converting '#{document.relative_path}':"
-          Jekyll.logger.error("", e.to_s)
-          raise e
-        end
+        converter.convert output
+      rescue StandardError => e
+        Jekyll.logger.error "Conversion error:",
+                            "#{converter.class} encountered an error while "\
+                            "converting '#{document.relative_path}':"
+        Jekyll.logger.error("", e.to_s)
+        raise e
       end
     end
 
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index e6fe059afb7..a3ea8ff63be 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -260,7 +260,7 @@ def page_path(context)
       def resource_path(page, site)
         path = page["path"]
         path = File.join(site.config["collections_dir"], path) if page["collection"]
-        path.sub(%r!/#excerpt\z!, "")
+        path.delete_suffix("/#excerpt")
       end
     end
   end
diff --git a/test/test_utils.rb b/test/test_utils.rb
index 1b3534e4f27..40549aa80ff 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -130,11 +130,9 @@ class TestUtils < JekyllUnitTest
 
   context "The \`Utils.slugify\` method" do
     should "return nil if passed nil" do
-      begin
-        assert Utils.slugify(nil).nil?
-      rescue NoMethodError
-        assert false, "Threw NoMethodError"
-      end
+      assert Utils.slugify(nil).nil?
+    rescue NoMethodError
+      assert false, "Threw NoMethodError"
     end
 
     should "replace whitespace with hyphens" do

From 0ce9a7c179602a61b87a47516f3da4ed46bea81c Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Thu, 22 Jul 2021 13:58:42 -0400
Subject: [PATCH 4471/4996] Update history to reflect merge of #8741 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index acec20bd92a..52c773bf4a3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -56,6 +56,7 @@
   * Regenerate supported mime types (#8542)
   * Update include tag to be more permissive (#8618)
   * Optimize `Jekyll::Utils.parse_date` (#8425)
+  * Update rubocop from 1.12 to 1.18 and min ruby from 2.4 to 2.5 (#8741)
 
 ### Site Enhancements
 

From 9bb98edb2955b41d6221838070d940b6377af95e Mon Sep 17 00:00:00 2001
From: Aram Akhavan 
Date: Fri, 23 Jul 2021 07:42:15 -0700
Subject: [PATCH 4472/4996] use location.protocol to inject the livereload
 script instead of forcing http (#8718)

Merge pull request 8718
---
 lib/jekyll/commands/serve/servlet.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/commands/serve/servlet.rb b/lib/jekyll/commands/serve/servlet.rb
index 2544616adf3..cee9c663a8a 100644
--- a/lib/jekyll/commands/serve/servlet.rb
+++ b/lib/jekyll/commands/serve/servlet.rb
@@ -101,7 +101,7 @@ def template
           @template ||= ERB.new(<<~TEMPLATE)
             
diff --git a/docs/_includes/docs_contents.html b/docs/_includes/docs_contents.html
index 931500a90b2..8b7b19dacab 100644
--- a/docs/_includes/docs_contents.html
+++ b/docs/_includes/docs_contents.html
@@ -1,14 +1,17 @@
 
    
   
diff --git a/docs/_includes/docs_contents_mobile.html b/docs/_includes/docs_contents_mobile.html
index 6574b6a940b..a8c2b3b6d6a 100644
--- a/docs/_includes/docs_contents_mobile.html
+++ b/docs/_includes/docs_contents_mobile.html
@@ -1,15 +1,15 @@
 
    
-  
     
-    {% for section in site.data.docs_nav -%}
-    
-    {%- for item in section.docs -%}
-      {% assign p = site.docs | where: "url", item.link | first %}
-      
-    {%- endfor %}
-    
-    {% endfor -%}
+    {% for section in site.data.docs_nav %}
+      
+        {%- for item in section.docs -%}
+          {% assign page = site.docs | where: "url", item.link | first %}
+          
+        {%- endfor %}
+      
+    {% endfor %}
   
-
    
+
    
\ No newline at end of file
diff --git a/docs/_includes/mobile-nav-items.html b/docs/_includes/mobile-nav-items.html
index 5dd9b86d206..ca337ba378d 100644
--- a/docs/_includes/mobile-nav-items.html
+++ b/docs/_includes/mobile-nav-items.html
@@ -3,12 +3,12 @@
     {% if p.show_on_mobile -%}
     
  • {{ p.title }}
    • 
     {% endif -%}
   {% endfor -%}
-  
  • GitHub
    • 
-
+  
  • GitHub
    • 
+
\ No newline at end of file
diff --git a/docs/_includes/news_contents_mobile.html b/docs/_includes/news_contents_mobile.html
index 84972788ac5..6f6a98e4734 100644
--- a/docs/_includes/news_contents_mobile.html
+++ b/docs/_includes/news_contents_mobile.html
@@ -1,5 +1,5 @@
 
    
-  
     
     
     
@@ -8,4 +8,4 @@
       {% endfor -%}
     
   
-
    
+
    
\ No newline at end of file
diff --git a/docs/_includes/news_item.html b/docs/_includes/news_item.html
index 51bc9cdff1f..6529a5f7a6a 100644
--- a/docs/_includes/news_item.html
+++ b/docs/_includes/news_item.html
@@ -1,5 +1,5 @@
-
    
-  
    
+
diff --git a/docs/_includes/news_item_archive.html b/docs/_includes/news_item_archive.html
index bccf6523d84..c5e865455ff 100644
--- a/docs/_includes/news_item_archive.html
+++ b/docs/_includes/news_item_archive.html
@@ -1,4 +1,4 @@
-
    
+
    
   
    
     
       
@@ -8,18 +8,18 @@
   
    
   
    
     
    
-      
    
-        
+      
    
+        
       
    
-      
+      
       {% assign author = post.author -%}
-      
+      
     
    
   
    
diff --git a/docs/_includes/search/input.html b/docs/_includes/search/input.html
index 729f5cabdfd..65015ee406c 100644
--- a/docs/_includes/search/input.html
+++ b/docs/_includes/search/input.html
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/docs/_includes/search/script.html b/docs/_includes/search/script.html
index dca756d7709..7ddd1280fed 100644
--- a/docs/_includes/search/script.html
+++ b/docs/_includes/search/script.html
@@ -1,9 +1,9 @@
-
+
 
diff --git a/docs/_includes/top.html b/docs/_includes/top.html
index c0e203c33f4..0868d0cf43d 100644
--- a/docs/_includes/top.html
+++ b/docs/_includes/top.html
@@ -1,5 +1,5 @@
-
-
+
+
 
   
   
diff --git a/docs/_includes/tutorials_contents_mobile.html b/docs/_includes/tutorials_contents_mobile.html
index 080788d5fe4..4a8a9478382 100644
--- a/docs/_includes/tutorials_contents_mobile.html
+++ b/docs/_includes/tutorials_contents_mobile.html
@@ -1,14 +1,14 @@
 
    
-  
     
     {% for section in site.data.tutorials -%}
-    
-      {% for item in section.tutorials -%}
-        {% assign item_url = item | prepend:"/tutorials/" | append:"/" -%}
-        {% assign tutorial = site.tutorials | where: "url", item_url | first -%}
-        
-      {% endfor -%}
-    
+      
+        {% for item in section.tutorials -%}
+          {% assign item_url = item | prepend:"/tutorials/" | append:"/" -%}
+          {% assign tutorial = site.tutorials | where: "url", item_url | first -%}
+          
+        {% endfor -%}
+      
     {% endfor -%}
   
-
    
+
    
\ No newline at end of file
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 9234c13c754..fb30f981d0a 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -9,5 +9,16 @@
   {%- include anchor_links.html -%}
   {%- include analytics.html -%}
   {%- include search/script.html -%}
+  
+  
 
 
diff --git a/docs/_layouts/news_item.html b/docs/_layouts/news_item.html
index 5b0960e97b6..7be7bf76bc9 100644
--- a/docs/_layouts/news_item.html
+++ b/docs/_layouts/news_item.html
@@ -2,8 +2,8 @@
 layout: news
 ---
 
-
    
-  
    
+

From 839007fa158ccd8d78fc956f9f265c249865a91a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 12 Jan 2024 08:57:17 -0800
Subject: [PATCH 4835/4996] Update history to reflect merge of #9338 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index d103140156e..ec304e9bc3d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -37,6 +37,7 @@
   * Fix broken links for several Jekyll integrations (#9496)
   * Add release post for v4.3.3 (#9511)
   * Add docs version badge to page_excerpts feature (#9520)
+  * Improve accessibility of the docs (#9338)
 
 ### Development Fixes
 

From 01da87c5f9c466205a4ebbc4747e390616585c3c Mon Sep 17 00:00:00 2001
From: Akira Taguchi 
Date: Fri, 12 Jan 2024 19:05:00 +0200
Subject: [PATCH 4836/4996] Fix gem quote consistency on docs (#9517)

Merge pull request 9517
---
 docs/_docs/continuous-integration/circleci.md         | 4 ++--
 docs/_docs/continuous-integration/github-actions.md   | 4 ++--
 docs/_docs/installation/windows.md                    | 2 +-
 docs/_docs/step-by-step/10-deployment.md              | 8 ++++----
 docs/_docs/upgrading/2-to-3.md                        | 2 +-
 docs/_posts/2019-08-19-jekyll-4-0-0-released.markdown | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/_docs/continuous-integration/circleci.md b/docs/_docs/continuous-integration/circleci.md
index fb1275a5c8f..d2e317df181 100644
--- a/docs/_docs/continuous-integration/circleci.md
+++ b/docs/_docs/continuous-integration/circleci.md
@@ -30,8 +30,8 @@ source 'https://rubygems.org'
 
 ruby '2.7.4'
 
-gem 'jekyll'
-gem 'html-proofer'
+gem "jekyll"
+gem "html-proofer"
 ```
 
 ```yaml
diff --git a/docs/_docs/continuous-integration/github-actions.md b/docs/_docs/continuous-integration/github-actions.md
index 932f7ebbb72..caba322f9ff 100644
--- a/docs/_docs/continuous-integration/github-actions.md
+++ b/docs/_docs/continuous-integration/github-actions.md
@@ -61,10 +61,10 @@ Welcome to My Home Page
 
 source 'https://rubygems.org'
 
-gem 'jekyll', '~> 4.2'
+gem "jekyll", "~> 4.2"
 
 group :jekyll_plugins do
-  gem 'jekyll-timeago', '~> 0.13.1'
+  gem "jekyll-timeago", "~> 0.13.1"
 end
 ```
 
diff --git a/docs/_docs/installation/windows.md b/docs/_docs/installation/windows.md
index 6e3e5b1a0c0..1a4920f382e 100644
--- a/docs/_docs/installation/windows.md
+++ b/docs/_docs/installation/windows.md
@@ -138,7 +138,7 @@ While `listen` has built-in support for UNIX systems, it may require an extra ge
 Add the following to the `Gemfile` for your site if you have issues with auto-regeneration on Windows alone:
 
 ```ruby
-gem 'wdm', '~> 0.1.1', :install_if => Gem.win_platform?
+gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform?
 ```
 
 You have to use a [Ruby+Devkit](https://rubyinstaller.org/downloads/) version of the RubyInstaller and install
diff --git a/docs/_docs/step-by-step/10-deployment.md b/docs/_docs/step-by-step/10-deployment.md
index 7fd0d08fe37..6c41f4e0831 100644
--- a/docs/_docs/step-by-step/10-deployment.md
+++ b/docs/_docs/step-by-step/10-deployment.md
@@ -68,12 +68,12 @@ in a `jekyll_plugins` group they'll automatically be required into Jekyll:
 ```ruby
 source 'https://rubygems.org'
 
-gem 'jekyll'
+gem "jekyll"
 
 group :jekyll_plugins do
-  gem 'jekyll-sitemap'
-  gem 'jekyll-feed'
-  gem 'jekyll-seo-tag'
+  gem "jekyll-sitemap"
+  gem "jekyll-feed"
+  gem "jekyll-seo-tag"
 end
 ```
 
diff --git a/docs/_docs/upgrading/2-to-3.md b/docs/_docs/upgrading/2-to-3.md
index 5c5d5ded8ce..2426a5762f2 100644
--- a/docs/_docs/upgrading/2-to-3.md
+++ b/docs/_docs/upgrading/2-to-3.md
@@ -93,7 +93,7 @@ it's now [Rouge](https://github.com/rouge-ruby/rouge). If you were using the `hi
 options, such as `hl_lines`, they may not be available when using Rouge. To
 go back to using Pygments, set `highlighter: pygments` in your
 `_config.yml` file and run `gem install pygments.rb` or add
-`gem 'pygments.rb'` to your project's `Gemfile`.
+`gem "pygments.rb"` to your project's `Gemfile`.
 
 ### Relative Permalink support removed
 
diff --git a/docs/_posts/2019-08-19-jekyll-4-0-0-released.markdown b/docs/_posts/2019-08-19-jekyll-4-0-0-released.markdown
index dec7401e18d..fe3a84ee012 100644
--- a/docs/_posts/2019-08-19-jekyll-4-0-0-released.markdown
+++ b/docs/_posts/2019-08-19-jekyll-4-0-0-released.markdown
@@ -82,7 +82,7 @@ First, read the [upgrade guide](/docs/upgrading/3-to-4/)!
 Next, Edit your project's `Gemfile` to test Jekyll v4.x:
 
 ```ruby
-gem "jekyll", "~> 4.0"
+gem 'jekyll', '~> 4.0'
 ```
 
 Then run `bundle update` to update all dependencies. Unless you're using

From 42dd477f8a449b16cacb94e4d966000106718430 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 12 Jan 2024 09:05:01 -0800
Subject: [PATCH 4837/4996] Update history to reflect merge of #9517 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index ec304e9bc3d..df7e316ba8e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -38,6 +38,7 @@
   * Add release post for v4.3.3 (#9511)
   * Add docs version badge to page_excerpts feature (#9520)
   * Improve accessibility of the docs (#9338)
+  * Fix gem quote consistency on docs (#9517)
 
 ### Development Fixes
 

From db3437a34fb9a050a758ed7b6eda90ab302c264d Mon Sep 17 00:00:00 2001
From: Matt Rogers 
Date: Fri, 12 Jan 2024 20:48:56 -0600
Subject: [PATCH 4838/4996] chore: Bump the required ruby version to 2.7
 (#9525)

Merge pull request 9525
---
 jekyll.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 9c5e9dfd206..bd60d43068a 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.rdoc_options     = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w(README.markdown LICENSE)
 
-  s.required_ruby_version     = ">= 2.5.0"
+  s.required_ruby_version     = ">= 2.7.0"
   s.required_rubygems_version = ">= 2.7.0"
 
   s.add_dependency("csv",                           "~> 3.0")

From b38b7a14798d7231db8ef77d29db1eedeed51f47 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Fri, 12 Jan 2024 18:48:58 -0800
Subject: [PATCH 4839/4996] Update history to reflect merge of #9525 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index df7e316ba8e..699a60c5097 100644
--- a/History.markdown
+++ b/History.markdown
@@ -76,6 +76,7 @@
   * Handle TypeError from `where` filter gracefully (#9292)
   * Add support for upcoming logger 1.4.3 (#9392)
   * Fix typo in devcontainer.json (#9364)
+  * Bump the minimum ruby version to 2.7 (#9525)
 
 ## 4.3.3 / 2023-12-27
 

From 8f2b53172f233507cc624313a0d2a34d77c96a15 Mon Sep 17 00:00:00 2001
From: Matt Rogers 
Date: Wed, 17 Jan 2024 00:58:28 -0600
Subject: [PATCH 4840/4996] fix: make search work again (#9530)

Merge pull request 9530
---
 docs/_includes/search/script.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_includes/search/script.html b/docs/_includes/search/script.html
index 7ddd1280fed..dca756d7709 100644
--- a/docs/_includes/search/script.html
+++ b/docs/_includes/search/script.html
@@ -1,9 +1,9 @@
-
+
 

From 860d730ff33d31a4e922da0e08b46f25434ba59a Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 16 Jan 2024 22:58:30 -0800
Subject: [PATCH 4841/4996] Update history to reflect merge of #9530 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 699a60c5097..f709c1e843b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -39,6 +39,7 @@
   * Add docs version badge to page_excerpts feature (#9520)
   * Improve accessibility of the docs (#9338)
   * Fix gem quote consistency on docs (#9517)
+  * Make site search work again (#9530)
 
 ### Development Fixes
 

From 84a29bd1429819416bc6454b1374be67b7043bdb Mon Sep 17 00:00:00 2001
From: Parker Moore <237985+parkr@users.noreply.github.com>
Date: Tue, 23 Jan 2024 10:53:21 -0800
Subject: [PATCH 4842/4996] Add a few more emeritus team members (#9535)

Merge pull request 9535
---
 docs/pages/team.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/pages/team.md b/docs/pages/team.md
index 901eb729f46..279df20a485 100644
--- a/docs/pages/team.md
+++ b/docs/pages/team.md
@@ -26,7 +26,10 @@ patch security vulnerabilities reported to them._
 _Emeritus Core Team Members were once members of Jekyll's Core Team._
 
 * Alfred (@alfredxing)
+* Ben (@benbalter)
 * Frank (@DirtyF)
 * Nick (@qrush)
+* Olivia
 * Parker (@parkr)
+* Pat (@pathawks)
 * Tom (@mojombo)

From 12ab35011f6e86d49c7781514f9dd1d92e43ea11 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Tue, 23 Jan 2024 10:53:22 -0800
Subject: [PATCH 4843/4996] Update history to reflect merge of #9535 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index f709c1e843b..77e56558303 100644
--- a/History.markdown
+++ b/History.markdown
@@ -66,6 +66,7 @@
   * Update rubocop gem (#9476)
   * Fix Performance/StringIdentifierArgument violation in site.rb and allow activesupport 6 for windows tests (#9512)
   * Add csv to runtime dependency list (#9522)
+  * Add a few more emeritus team members (#9535)
 
 ### Bug Fixes
 

From 22c756a2e06d63d71ccda2e389fbfda915df6c25 Mon Sep 17 00:00:00 2001
From: velle 
Date: Tue, 13 Feb 2024 04:01:16 +0100
Subject: [PATCH 4844/4996] Jekyll docs template typo - All pages show
 "Deployment" (#9548)

Merge pull request 9548
---
 docs/_includes/docs_contents.html        | 8 ++++----
 docs/_includes/docs_contents_mobile.html | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/_includes/docs_contents.html b/docs/_includes/docs_contents.html
index 8b7b19dacab..0bbdb1dc059 100644
--- a/docs/_includes/docs_contents.html
+++ b/docs/_includes/docs_contents.html
@@ -4,13 +4,13 @@
       
    {{ section.title }}
    
       
     {% endfor -%}
diff --git a/docs/_includes/docs_contents_mobile.html b/docs/_includes/docs_contents_mobile.html
index a8c2b3b6d6a..a639c53b2d0 100644
--- a/docs/_includes/docs_contents_mobile.html
+++ b/docs/_includes/docs_contents_mobile.html
@@ -4,12 +4,12 @@
     {% for section in site.data.docs_nav %}
       
         {%- for item in section.docs -%}
-          {% assign page = site.docs | where: "url", item.link | first %}
-          
         {%- endfor %}
       
     {% endfor %}
   
-
    
\ No newline at end of file
+
    

From c7e9061da3f0c60ead24ee887ae10db56c47c3df Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 12 Feb 2024 19:01:18 -0800
Subject: [PATCH 4845/4996] Update history to reflect merge of #9548 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 77e56558303..edf9d4eef35 100644
--- a/History.markdown
+++ b/History.markdown
@@ -40,6 +40,7 @@
   * Improve accessibility of the docs (#9338)
   * Fix gem quote consistency on docs (#9517)
   * Make site search work again (#9530)
+  * Jekyll docs template typo - All pages show "Deployment" (#9548)
 
 ### Development Fixes
 

From dbbfc5d48c81cf424f29c7b0eebf10886bc99904 Mon Sep 17 00:00:00 2001
From: jekyllbot 
Date: Mon, 12 Feb 2024 20:19:22 -0800
Subject: [PATCH 4846/4996] Update history to reflect merge of #9550 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index edf9d4eef35..0ca20bb2d05 100644
--- a/History.markdown
+++ b/History.markdown
@@ -3,6 +3,7 @@
 ### Minor Enhancements
 
   * Allow marking specific highlighted lines via Liquid (#9138)
+  * 3.9-stable: allow Pages to be Excerpted (#9550)
 
 ### Documentation
 

From c85bd153407a238df4ac79fedfa19f340dc5a4e4 Mon Sep 17 00:00:00 2001
From: a story 
Date: Wed, 24 Apr 2024 02:58:59 +0800
Subject: [PATCH 4847/4996] Fixed: Wrong navigation style on the right side of
 news and docs pages (#9586)

Merge pull request 9586
---
 docs/_includes/docs_contents.html | 2 +-
 docs/_includes/news_contents.html | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/_includes/docs_contents.html b/docs/_includes/docs_contents.html
index 0bbdb1dc059..04cb94f0a0a 100644
--- a/docs/_includes/docs_contents.html
+++ b/docs/_includes/docs_contents.html
@@ -10,7 +10,7 @@ 
    {{ section.title }}
    
               {{ item_page.menu_name | default: item_page.title }}
             
           {% endcapture %}
-          {{ item_html }}
+          {{ item_html }}
         {% endfor %}
       
     {% endfor -%}
diff --git a/docs/_includes/news_contents.html b/docs/_includes/news_contents.html
index ea0a558e401..e8f7ed17f2a 100644
--- a/docs/_includes/news_contents.html
+++ b/docs/_includes/news_contents.html
@@ -1,10 +1,10 @@