Linkify properly.

.codeclimate.yml

@@ -1,33 +1,29 @@
 engines:
-  fixme:
-    enabled: false
-  rubocop:
-    enabled: true
-
+  rubocop: { enabled: true  }
+  fixme:   { enabled: false }
 exclude_paths:
-  - .codeclimate.yml
-  - .gitignore
-  - .rspec
-  - .rubocop.yml
-  - .travis.yml
+- .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
-
-  - features/**/*
-  - script/**/*
-  - docs/**/*
-  - spec/**/*
-  - test/**/*
-  - vendor/**/*
+- 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/**/*
+- script/**/*
+- spec/**/*
 ratings:
   paths:
-    - lib/**/*.rb
+  - lib/**/*.rb

.editorconfig

@@ -1,14 +0,0 @@
-# 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

.github/CONTRIBUTING.markdown

@@ -49,7 +49,7 @@ That's it! You'll be automatically subscribed to receive updates as others revie
 ### Submitting a pull request via Git command line
 
 1. Fork the project by clicking "Fork" in the top right corner of [`jekyll/jekyll`](https://github.com/jekyll/jekyll).
-2. Clone the repository locally `git clone https://github.com/<you-username>/jekyll`.
+2. Clone the repository lcoally `git clone https://github.com/<you-username>/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)
@@ -62,33 +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 [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.
+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.
 
 One gotcha, all pull requests should be directed at the `master` branch (the default branch).
 
-### Updating FontAwesome iconset for jekyllrb.com
-
-We use a custom version of FontAwesome which contains just the icons we use.
-
-If you ever need to update our documentation with an icon that is not already available in our custom iconset, you'll have to regenerate the iconset using Icomoon's Generator:
-
-1. Go to <https://icomoon.io/app/>.
-2. Click `Import Icons` on the top-horizontal-bar and upload the existing `<jekyll>/docs/icomoon-selection.json`.
-3. Click `Add Icons from Library..` further down on the page, and add 'Font Awesome'.
-4. Select the required icon(s) from the Library (make sure its the 'FontAwesome' library instead of 'IcoMoon-Free' library).
-5. Click `Generate Font` on the bottom-horizontal-bar.
-6. Inspect the included icons and proceed by clicking `Download`.
-7. Extract the font files and adapt the CSS to the paths we use in Jekyll:
-  - Copy the entire `fonts` directory over and overwrite existing ones at `<jekyll>/docs/`.
-  - Copy the contents of `selection.json` and overwrite existing content inside `<jekyll>/docs/icomoon-selection.json`.
-  - Copy the entire `@font-face {}` declaration and only the **new-icon(s)' css declarations** further below, to update the
-  `<jekyll>/docs/_sass/_font-awesome.scss` sass partial.
-  - Fix paths in the `@font-face {}` declaration by adding `../` before `fonts/FontAwesome.*` like so:
-  `('../fonts/Fontawesome.woff?9h6hxj')`.
-
 ### 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/docs/_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](site/_docs/plugins.md) by adding a link to your plugin under the proper subheading depending upon its type.
 
 ## Code Contributions
 
@@ -100,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 `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.
+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.
 
 #### Tests
 
@@ -110,7 +90,7 @@ If your contribution changes any Jekyll behavior, make sure to update the docume
 
 ### Code contributions generally
 
-* Jekyll uses the [Rubocop](https://github.com/bbatsov/rubocop) static analyzer to ensure that contributions follow the [GitHub Ruby Styleguide](https://github.com/styleguide/ruby). Please check your code using `script/fmt` and resolve any errors before pushing your branch.
+* Jekyll follows the [GitHub Ruby Styleguide](https://github.com/styleguide/ruby).
 
 * Don't bump the Gem version in your pull request (if you don't know what that means, you probably didn't).
 

.github/ISSUE_TEMPLATE.md

@@ -1,82 +1,20 @@
-<!--
-  Hi! Thanks for considering to file a bug with Jekyll. Please take the time to
-  answer the basic questions. You can convert `[ ]` into `[x]` to check boxes (or submit
-  and check.) If there is no need for certain fields like output and redirection, please delete
-  those headers before submitting. We know not all tickets require those steps.
-  Otherwise, please try to be as detailed as possible.
+###### What version of Jekyll are you using (`jekyll -v`)?
 
-  If you are unsure this is a bug in Jekyll, or this is a bug caused
-  by a plugin that isn't directly related to Jekyll, or if this is just
-  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!
--->
+###### What operating system are you using?
 
-- [ ] 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/
-- [ ] This is a feature request.
 
----
 
-- [ ] 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
-- [ ] I am on (or have tested on) ***Other*** GNU/Linux
-- [ ] I am on (or have tested on) ***Windows*** 10+
+###### What did you do?
+(Please include the content causing the issue, any relevant configuration settings, and the command you ran)
 
-<!--
-  Other GNU/Linux includes Scientific GNU/Linux, CentOS GNU/Linux, and others.
-  If you are on a minor sub-distro (such as ElementaryOS which does not diverge from
-  Ubuntu much, please check the parent distro. Kubuntu, Edubuntu, Lubuntu should
-  also be flagged as Ubuntu as their packages come from upstream Ubuntu.
--->
 
----
 
-- [ ] I was trying to install.
-- [ ] There is a broken Plugin API.
-- [ ] 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.
-- [ ] It was another bug.
+###### What did you expect to see?
 
-## My Reproduction Steps
 
-<!--
-  If this error occured on GitHub Pages, please try to provide us with logs,
-  and look at them yourself, to determine if this is an actual Jekyll bug. In
-  the event you are unsure, file a ticket, however, when you do please provide
-  the logs (strip them of personal information.)
 
-  If you have trouble finding your logs, please email support@github.com and
-  they will happily help you. If you cannot find logs, please try your best to
-  replicate it locally because we cannot fix a problem if we do not know
-  exactly what caused it, or within a relatively close distance.
--->
+###### What did you see instead?
 
-<!--
-  Insert the steps you took to for this problem to exist. Such as the
-  directories you created and, the full command you ran, and include any
-  plugins you have installed, this is very important.
 
-  If your steps are complicated, you can also submit a GitHub
-  repository (please no zips, they will be removed and rejected by maintainers,)
-  and just supply a command for us to reproduce it ourselves.
--->
-
-## The Output I Wanted
-
-<!--
-  Insert the output from the command. Alter it as little as you can.
-  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)

.gitignore

@@ -13,7 +13,6 @@
 /vendor
 Gemfile.lock
 _site/
-bin/
 bbin/
 coverage
 gh-pages/

.rubocop.yml

@@ -1,145 +1,80 @@
----
+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
+  - lib/**/*.rb
+
   Exclude:
-    - lib/jekyll/renderer.rb
-    - bin/**/*
-    - exe/**/*
-    - benchmark/**/*
-    - script/**/*
-    - vendor/**/*
-Lint/EndAlignment:
-  Severity: error
-Lint/UnreachableCode:
-  Severity: error
-Lint/UselessAccessModifier:
-  Enabled: false
-Metrics/AbcSize:
-  Max: 21
-Metrics/BlockLength:
-  Exclude:
-    - test/**/*.rb
-    - lib/jekyll/configuration.rb
-    - rake/*.rake
-    - jekyll.gemspec
-Metrics/ClassLength:
-  Exclude:
-    - !ruby/regexp /features\/.*.rb$/
-    - !ruby/regexp /test\/.*.rb$/
-  Max: 300
-Metrics/CyclomaticComplexity:
-  Max: 9
-Metrics/LineLength:
-  Exclude:
-    - !ruby/regexp /features\/.*.rb/
-    - Rakefile
-    - rake/*.rake
-  Max: 90
-  Severity: warning
-Metrics/MethodLength:
-  CountComments: false
-  Max: 20
-  Severity: error
-Metrics/ModuleLength:
-  Max: 240
-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:
-  Enabled: false
-Style/AlignHash:
-  EnforcedHashRocketStyle: table
-Style/AlignParameters:
-  Enabled: false
-  EnforcedStyle: with_fixed_indentation
-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: percent_r
-Style/RescueModifier:
-  Enabled: false
-Style/SignalException:
-  EnforcedStyle: only_raise
-Style/SingleLineMethods:
-  Enabled: false
-Style/SpaceAroundOperators:
-  Enabled: false
-Style/SpaceInsideBrackets:
-  Enabled: false
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-Style/StringLiteralsInInterpolation:
-  EnforcedStyle: double_quotes
-Style/TrailingCommaInLiteral:
-  EnforcedStyleForMultiline: consistent_comma
-Style/UnneededCapitalW:
-  Enabled: false
+  - .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/**/*
+  - script/**/*
+  - spec/**/*

.travis.yml

@@ -1,3 +1,4 @@
+before_script: bundle update
 bundler_args: --without benchmark:site:development
 script: script/cibuild
 cache: bundler
@@ -5,31 +6,35 @@ language: ruby
 sudo: false
 
 rvm:
-  - &ruby1 2.3.3
-  - &ruby2 2.2.6
-  - &ruby3 2.1.9
-  - &jruby jruby-9.1.7.0
+  - &ruby1 2.3.0
+  - &ruby2 2.2.4
+  - &ruby3 2.1.8
+  - &jruby jruby-9.0.4.0
+  - &rhead ruby-head
 
 matrix:
-  include:
-    - rvm: *ruby1
-      env: TEST_SUITE=fmt
-    - rvm: *ruby1
-      env: TEST_SUITE=default-site
-  exclude:
+  fast_finish: true
+  allow_failures:
     - rvm: *jruby
-      env: TEST_SUITE=cucumber
-
+    - rvm: *rhead
 env:
   matrix:
     - TEST_SUITE=test
     - TEST_SUITE=cucumber
+
 branches:
   only:
     - master
-    - themes
 
 notifications:
+  irc:
+    template: "%{repository}#%{build_number} (%{branch}) %{message} %{build_url}"
+    channels: irc.freenode.org#jekyll
+
+  email:
+    recipients:
+      - jordon@envygeeks.io
+
   slack:
     secure: "\
       dNdKk6nahNURIUbO3ULhA09/vTEQjK0fNbgjVjeYPEvROHgQBP1cIP3AJy8aWs8rl5Yyow4Y\
@@ -45,6 +50,3 @@ addons:
         DA4vsRURfABU0fIhwYkQuZqEcA3d8TL36BZcGEshG6MQ2AmnYsmFiTcxqV5bmlElHEqQuT\
         5SUFXLafgZPBnL0qDwujQcHukID41sE=\
       "
-# regular test configuration
-after_success:
-  - bundle exec codeclimate-test-reporter

Gemfile

@@ -1,13 +1,10 @@
 source "https://rubygems.org"
 gemspec :name => "jekyll"
 
-gem "rake", "~> 12.0"
-
-# 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"
-
+gem "rake", "~> 11.0"
 group :development do
   gem "launchy", "~> 2.3"
+  gem "rubocop", :branch => :master, :github => "bbatsov/rubocop"
   gem "pry"
 
   unless RUBY_ENGINE == "jruby"
@@ -18,82 +15,74 @@ end
 #
 
 group :test do
-  gem "codeclimate-test-reporter", "~> 1.0.5"
   gem "cucumber", "~> 2.1"
   gem "jekyll_test_plugin"
   gem "jekyll_test_plugin_malicious"
+  gem "codeclimate-test-reporter"
+  gem "rspec-mocks"
   gem "nokogiri"
   gem "rspec"
-  gem "rspec-mocks"
-  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"
 end
 
 #
 
 group :test_legacy do
-  if RUBY_PLATFORM =~ %r!cygwin! || RUBY_VERSION.start_with?("2.2")
-    gem "test-unit"
+  if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2")
+    gem 'test-unit'
   end
 
-  gem "minitest"
-  gem "minitest-profile"
-  gem "minitest-reporters"
   gem "redgreen"
-  gem "shoulda"
   gem "simplecov"
+  gem "minitest-reporters"
+  gem "minitest-profile"
+  gem "minitest"
+  gem "shoulda"
 end
 
 #
 
 group :benchmark do
   if ENV["BENCHMARK"]
-    gem "benchmark-ips"
-    gem "rbtrace"
     gem "ruby-prof"
+    gem "benchmark-ips"
     gem "stackprof"
+    gem "rbtrace"
   end
 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"
-  gem "jekyll-gist"
-  gem "jekyll-paginate"
-  gem "jekyll-redirect-from"
-  gem "kramdown", "~> 1.9"
-  gem "mime-types", "~> 3.0"
-  gem "rdoc", "~> 5.0"
   gem "toml", "~> 0.1.0"
+  gem "coderay", "~> 1.1.0"
+  gem "jekyll-docs", :path => '../docs' if Dir.exist?('../docs') && ENV['JEKYLL_VERSION']
+  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, :x64_mingw do
-    gem "classifier-reborn", "~> 2.1.0"
-    gem "liquid-c", "~> 3.0"
-    gem "pygments.rb", "~> 0.6.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
-
-  # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-  gem "tzinfo-data", :platforms => [:mingw, :mswin, :x64_mingw, :jruby]
 end
 
 #
 
 group :site do
   if ENV["PROOF"]
-    gem "html-proofer", "~> 3.4"
+    gem "html-proofer", "~> 2.0"
   end
 
-  gem "jekyll-avatar"
-  gem "jekyll-mentions"
-  gem "jekyll-seo-tag"
+  gem "jemoji", "0.5.1"
   gem "jekyll-sitemap"
-  gem "jemoji"
+  gem "jekyll-seo-tag", "~> 1.1"
+  gem "jekyll-avatar"
 end

History.markdown

@@ -1,357 +1,35 @@
-## 3.4.0 / 2016-01-27
-
-### Minor Enhancements
-
-  * Add connector param to `array_to_sentence_string` filter (#5597)
-  * Adds `group_by_exp` filter (#5513)
-  * 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
-
-  * 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)
-  * 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
-
-  * 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)
-  * [site] Use defaults for docs and news-items (#5744)
-  * Sort gems in `docs/_config.yml` (#5746)
-  * Add missing class (#5791)
-  * Improve template docs (#5694)
-
-### Development Fixes
-
-  * clean unit-test names in `test/test_tags.rb` (#5608)
-  * Add cucumber feature to test for bonafide theme gems (#5384)
-  * Use `assert_nil` instead of `assert_equal nil` (#5652)
-  * Rubocop -a on lib/jekyll (#5666)
-  * Bump to rake 12.0 (#5670)
-  * Rubocop Gemfile (#5671)
-  * update Classifier-Reborn to 2.1.0 (#5711)
-  * Rubocop: fix Rakefile and gemspec (#5745)
-  * Use `assert_nil` (#5725)
-  * Sort gems in `jekyll.gemspec` (#5746)
-  * 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)
-  * Use latest jemoji gem (#5782)
-  * 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
-
-  * 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)
-  * Improve Permalinks documentation. (#5653)
-  * Fix typo in Variables doc page (#5657)
-  * Fix a couple of typos in the docs (#5658)
-  * Update windows.md (#5683)
-  * Improve permalinks docs (#5693)
-  * 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)
-  * Remove duplicate paragraph. (#5740)
-  * Addition of a sample "typical post" (#5473)
-  * 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)
-  * 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)
-  * 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)
-  * 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)
-  * Fixed inaccuracy in "Built-in permalink styles" docs (#5819)
-
-## 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` 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)
-  * 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)
-  * 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)
-  * Fix broken links in CONTRIBUTING (#5533)
-  * 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)
-  * 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)
-  * 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)
-
-### Development Fixes
-
-  * 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)
-  * 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)
-
-## 3.3.0 / 2016-10-06
-
-### Minor Enhancements
-
-  * 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)
-  * 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)
-  * 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)
-  * 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
-
-  * 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)
-  * 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)
-  * 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)
-  * 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
-
-  * Document `to_integer` and `inspect` filters (#5185)
-  * Fix path in the prompt (#5194)
-  * need subcommand build (#5190)
-  * Add the Jekyll Cloudinary plugin (#5183)
-  * Documentation : `new-theme` command (#5205)
-  * Document `link` Liquid tag (#5182)
-  * 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)
-  * 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)
-  * 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 (#5304)
-  * 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)
-  * 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)
-  * 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)
-  * 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)
-  * Update Wikipedia YAML list link (#5452)
-  * Add Jekyll 3.3 release post (#5442)
-
-### Development Fixes
-
-  * 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)
-  * 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)
-  * 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)
-  * 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
-
-### Bug Fixes
-
-  * Include theme directories in default gemspec (#5152)
-  * Fix for symlinked themes (#5156)
-  * Layout: set `relative_path` without using Pathname (#5164)
-
-### Development Fixes
-
-  * Add test to build the default site (#5154)
-  * script/default-site: specify `BUNDLE_GEMFILE` for new site (#5178)
-  * script/default-site: read Jekyll source from local clone (#5188)
-
-### Site Enhancements
-
-  * Enable site excerpts (#5150)
-  * Initial 404 page (#5143)
-  * Remove the "this feature is unreleased" warning from the theme docs (#5158)
-  * Future True on GitHub Pages note (#5173)
-  * Minor updates and corrections (#5177)
-  * index.html: update instructions to require bundler  (#5169)
-  * docs/quickstart: update instructions to require bundler (#5168)
-
-## 3.2.0 / 2016-07-26
+## HEAD
 
 ### Minor Enhancements
 
   * Stop testing with Ruby 2.0.x, which is EOL'd. (#4381)
   * Allow collections to have documents that have no file extension (#4545)
-  * Add size property to `group_by` result (#4557)
+  * Add size property to group_by result (#4557)
   * Site Template: Removed unnecessary nesting from `_base.scss` (#4637)
   * Adding a debug log statment for skipped future documents. (#4558)
   * Site Template: Changed main `<div>` to `<main>` and added accessibility info (#4636)
   * Add array support to `where` filter (#4555)
   * 'jekyll clean': also remove .sass-cache (#4652)
-  * Clean up `Tags::PostUrl` a bit, including better errors and date parsing (#4670)
-  * Use `String#encode` for `xml_escape` filter instead of `CGI.escapeHTML` (#4694)
-  * Add `show_dir_listing` option for serve command and fix index file names (#4533)
+  * Clean up Tags::PostUrl a bit, including better errors and date parsing (#4670)
+  * Use String#encode for xml_escape filter instead of CGI.escapeHTML (#4694)
+  * 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)
   * 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)
-  * Add a `where_exp` filter for filtering by expression (#4478)
-  * 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)
-  * 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)
-  * 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)
-  * 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)
-  * watcher: pass site instance to watch plugin (#5109)
-  * Show liquid warnings. (#5129)
-  * Add `--baseurl` to `build` subcommand (#5135)
 
 ### Bug Fixes
 
   * Site Template: Added a default lang attribute (#4633)
   * Site template: Escape title and description where it is used in HTML (#4606)
-  * `Document#date`: drafts which have no date should use source file mtime (#4611)
-  * `Filters#time`: clone an input Time so as to be non-destructive (#4590)
+  * Document#date: drafts which have no date should use source file mtime (#4611)
+  * Filters#time: clone an input Time so as to be non-destructive (#4590)
   * Doctor: fix issue where `--config` wasn't a recognized flag (#4598)
-  * Ensures `related_posts` are only set for a post (#4620)
-  * `EntryFilter#special?`: ignore filenames which begin with `~` (#4491)
+  * Ensures related_posts are only set for a post (#4620)
+  * EntryFilter#special?: ignore filenames which begin with '~' (#4491)
   * Cleaner: `keep_files` should only apply to the beginning of paths, not substrings with index > 0 (#3849)
-  * Use SSLEnable instead of EnableSSL and make URL HTTPS. (#4693)
-  * 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)
-  * `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)
-  * hooks: move `after_init` hook call at the end of `Site#initialize` (#5106)
-  * filters: raise error if no input given to date filters (#5127)
-  * `where_exp` filter should filter posts (#4860)
-
-### Forward Ports
-
-  * 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)
-  * 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
 
@@ -363,56 +41,6 @@
   * Update Rake & disable warnings when running tests (#4720)
   * 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)
-  * 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)
-  * 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)
-  * Rubocop: Stevenson (#4951)
-  * Rubocop: lib/jekyll/entry_filter.rb (#4950)
-  * Rubocop: `test/*` (#4947)
-  * Rubocop: features (#4934)
-  * Rubocop: Liquid renderer (#4933)
-  * Rubocop: converters (#4931)
-  * Rubocop: Site Drop (#4948)
-  * Rubocop: tags (#4938)
-  * Rubocop: Readers (#4932)
-  * rubocop: jekyll/lib/frontmatter_defaults.rb (#4974)
-  * 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)
-  * 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)
-  * 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)
-  * 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)
-  * 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)
-  * 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)
-  * tests: Typo fixes. (#5114)
-  * Normalize yml files. (#5116)
-  * Whitespace cleanup. (#5113)
-  * Add AppVeyor support. (#5115)
-  * appveyor.yml: drop Ruby 2.0.0. (#5119)
-  * Fix indentation in benchmark (#5124)
-  * Style fixes for Rubocop 0.42.0 - var == 0 becomes var.zero? - when defining method_missing, also define respond_to_missing? (#5137)
 
 ### Site Enhancements
 
@@ -437,78 +65,6 @@
   * Add Hawkins to the list of third-party plugins (#4755)
   * Fix a typo in pagination doc (#4763)
   * Switch second GitHub Pages link to HTTPS (#4760)
-  * Explain data file format requirements more clearly in documentation (#4781)
-  * Add jekyll-i18n_tags to list of third-party plugins (#4775)
-  * Remove Leonard Lamprecht's website from Sites page (#4771)
-  * Updates documentation for collections to include `date` property (#4769)
-  * Added an explicit rerun note to configuration.md, defaults section (#4734)
-  * Update Rack-Jekyll Heroku deployment blog post url (#4789)
-  * Added missing single quote on rsync client side command (#4813)
-  * 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)
-  * 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)
-  * Removed extra `</p>` 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)
-  * 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)
-  * 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)
-  * 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)
-  * 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)
-  * Updates html-proofer code (#5098)
-  * Jekyll Community (#5097)
-  * Typo in documentation file templates.md (#5117)
-  * Slightly, improve PNG compression. (#5112)
-  * docs: add jekyll-maps plugin reference (#5123)
-  * docs: fix link to plugins page source (#5122)
-  * Update the configuration docs to match the code (#5131)
-  * Removed confusing word repetition. (#5139)
-  * Add a note about script/fmt (#5138)
-
-## 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
-
-  * Sort the results of the `require_all` glob (affects Linux only). (#4912)
-
-## 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)
-  * Use SSLEnable instead of EnableSSL and make URL HTTPS (WEBrick) (#4693)
 
 ## 3.1.2 / 2016-02-19
 
@@ -657,15 +213,6 @@
   * Add Contentful Extension to list of third-party plugins (#4390)
   * Correct Minor spelling error (#4394)
 
-## 3.0.5 / 2016-04-26
-
-  * Remove call to `#backwards_compatibilize` in `Configuration.from` (#4846)
-
-## 3.0.4 / 2016-04-18
-
-  * Fix defaults for Documents to lookup defaults based on `relative_path` instead of `url` (#4806)
-  * Configuration: allow users to specify a `collections.posts.permalink` directly without `permalink` clobbering it (#4753)
-
 ## 3.0.3 / 2016-02-08
 
 ### Bug Fixes

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2008-2017 Tom Preston-Werner and Jekyll contributors
+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

README.markdown

@@ -1,11 +1,10 @@
 # [Jekyll](https://jekyllrb.com/)
 
 [![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]
-[![Test Coverage](https://img.shields.io/codeclimate/coverage/github/jekyll/jekyll.svg)][coverage]
-[![Code Climate](https://img.shields.io/codeclimate/github/jekyll/jekyll.svg)][codeclimate]
-[![Dependency Status](https://img.shields.io/gemnasium/jekyll/jekyll.svg)][gemnasium]
+[![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
@@ -14,7 +13,6 @@
 [coverage]: https://codeclimate.com/github/jekyll/jekyll/coverage
 [hakiri]: https://hakiri.io/github/jekyll/jekyll/master
 [travis]: https://travis-ci.org/jekyll/jekyll
-[appveyor]: https://ci.appveyor.com/project/jekyll/jekyll/branch/master
 
 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](https://pages.github.com), which you can use to host sites right from your GitHub repositories.
 
@@ -43,7 +41,8 @@ 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 maintainer ([@parkr](https://github.com/parkr), [@envygeeks](https://github.com/envygeeks), or [@mattr-](https://github.com/mattr-)) know
+and we will address it as soon as possible.
 
 ## Diving In
 

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__), "lib"))
-require "jekyll/version"
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[lib]))
+require 'jekyll/version'
 
-Dir.glob("rake/**.rake").each { |f| import f }
+Dir.glob('rake/**.rake').each { |f| import f }
 
 #############################################################################
 #
@@ -27,30 +27,26 @@ def docs_name
   "#{name}-docs"
 end
 
-def docs_folder
-  "docs"
-end
-
 def gemspec_file
   "#{name}.gemspec"
 end
 
 def gem_file
-  "#{name}-#{Gem::Version.new(version)}.gem"
+  "#{name}-#{Gem::Version.new(version).to_s}.gem"
 end
 
 def normalize_bullets(markdown)
-  markdown.gsub(%r!\n\s{2}\*{1}!, "\n-")
+  markdown.gsub(/\n\s{2}\*{1}/, "\n-")
 end
 
 def linkify_prs(markdown)
-  markdown.gsub(%r!#(\d+)!) do |word|
+  markdown.gsub(/#(\d+)/) do |word|
     "[#{word}]({{ site.repository }}/issues/#{word.delete("#")})"
   end
 end
 
 def linkify_users(markdown)
-  markdown.gsub(%r!(@\w+)!) do |username|
+  markdown.gsub(/(@\w+)/) do |username|
     "[#{username}](https://github.com/#{username.delete("@")})"
   end
 end
@@ -60,13 +56,13 @@ def linkify(markdown)
 end
 
 def liquid_escape(markdown)
-  markdown.gsub(%r!(`{[{%].+[}%]}`)!, "{% raw %}\\1{% endraw %}")
+  markdown.gsub(/(`{[{%].+[}%]}`)/, "{% raw %}\\1{% endraw %}")
 end
 
 def custom_release_header_anchors(markdown)
-  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|
+  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|
     _, major, minor, patch = *release_notes.match(header_regexp)
     release_notes
       .gsub(header_regexp, "\\0\n{: #v\\1-\\2-\\3}")
@@ -75,11 +71,11 @@ def custom_release_header_anchors(markdown)
 end
 
 def sluffigy(header)
-  header.delete("#").strip.downcase.gsub(%r!\s+!, "-")
+  header.gsub(/#/, '').strip.downcase.gsub(/\s+/, '-')
 end
 
 def remove_head_from_history(markdown)
-  index = markdown =~ %r!^##\s+\d+\.\d+\.\d+!
+  index = markdown =~ /^##\s+\d+\.\d+\.\d+/
   markdown[index..-1]
 end
 
@@ -88,28 +84,25 @@ 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.exist?(file)
+  abort "You seem to have misplaced your #{file} file. I can haz?" unless File.exists?(file)
   title = begin
-            File.read(file).match(%r!\A# (.*)$!)[1]
+            File.read(file).match(/\A# (.*)$/)[1]
           rescue
             File.basename(file, ".*").downcase.capitalize
           end
   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)
   contents = "#{front_matter.to_yaml}---\n\n#{content_for(file)}"
-  File.write("#{docs_folder}/_docs/#{slug}.md", contents)
+  File.write("site/_docs/#{slug}.md", contents)
 end
 
 def content_for(file)
@@ -118,7 +111,7 @@ def content_for(file)
   when "History.markdown"
     converted_history(contents)
   else
-    contents.gsub(%r!\A# .*\n\n?!, "")
+    contents.gsub(/\A# .*\n\n?/, "")
   end
 end
 
@@ -131,23 +124,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
@@ -155,9 +148,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
 

appveyor.yml

@@ -1,42 +0,0 @@
-version: "{build}"
-
-clone_depth: 10
-
-branches:
-  only:
-    - master
-    - themes
-
-build: off
-
-install:
-  - SET PATH=C:\Ruby%RUBY_FOLDER_VER%\bin;%PATH%
-  - bundle install --retry 5 --jobs=%NUMBER_OF_PROCESSORS% --clean --path vendor\bundle
-
-environment:
-  BUNDLE_WITHOUT: "benchmark:site:development"
-  matrix:
-    - RUBY_FOLDER_VER: "23"
-      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"
-      TEST_SUITE: "test"
-    - RUBY_FOLDER_VER: "22"
-      TEST_SUITE: "test"
-    - RUBY_FOLDER_VER: "21"
-      TEST_SUITE: "test"
-
-test_script:
-  - ruby --version
-  - gem --version
-  - bundler --version
-  - bash ./script/cibuild
-
-cache:
-  # If one of the files after the right arrow changes, cache will be skipped
-  - 'vendor\bundle -> appveyor.yml,Gemfile,jekyll.gemspec'

benchmark/capture-assign.rb

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-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

benchmark/end-with-vs-regexp

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require 'benchmark/ips'
 
 Benchmark.ips do |x|

benchmark/flat-map

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require 'benchmark/ips'
 
 enum = (0..50).to_a

benchmark/hash-fetch

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require 'benchmark/ips'
 
 h = {:bar => 'uco'}

benchmark/proc-call-vs-yield

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require 'benchmark/ips'
 
 def fast

benchmark/sequential-assignment

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require 'benchmark/ips'
 
 Benchmark.ips do |x|

benchmark/string-concat

@@ -1,7 +1,6 @@
-#!/usr/bin/env ruby
 require 'benchmark/ips'
 
-url = "https://jekyllrb.com"
+url = "http://jekyllrb.com"
 
 Benchmark.ips do |x|
   x.report('+=') { url += '/' }

benchmark/string-replacement

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require 'benchmark/ips'
 
 def str

benchmark/symbol-to-proc

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require 'benchmark/ips'
 
 Benchmark.ips do |x|

bin/jekyll

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 STDOUT.sync = true
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w( .. lib ))
 
-require "jekyll"
-require "mercenary"
+require 'jekyll'
+require 'mercenary'
 
 Jekyll::PluginManager.require_from_bundler
 
@@ -12,26 +12,22 @@ 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 <subcommand> [options]"
+  p.description 'Jekyll is a blog-aware, static site generator in Ruby'
+  p.syntax 'jekyll <subcommand> [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.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

docs/404.html

@@ -1,40 +0,0 @@
----
-layout: error
-permalink: /404.html
-sitemap: false
----
-
-<section class="intro">
-  <div class="grid">
-    <div class="unit whole align-center">
-      <p class="first">Huh. It seems that page is<br/>Hyde-ing...</p>
-    </div>
-  </div>
-</section>
-
-<section class="error">
-  <div class="grid">
-    <div class="unit whole align-center">
-      <p>The resource you requested was not found. Here are some links to help you find your way:</p>
-      <nav class="main-nav">
-        <ul>
-          <li>
-            <a href="/">Home</a>
-          </li>
-          <li>
-            <a href="/docs/home/">Documentation</a>
-          </li>
-          <li>
-            <a href="/news/">News</a>
-          </li>
-          <li>
-            <a href="/community/">Community</a>
-          </li>
-          <li>
-            <a href="/help/">Help</a>
-          </li>
-        </ul>
-      </nav>
-    </div>
-  </div>
-</section>

docs/_data/jekyllconf-talks.yml

@@ -1,167 +0,0 @@
-- 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

docs/_docs/continuous-integration/circleci.md

@@ -1,92 +0,0 @@
----
-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/
-
-## 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:
-
-1. Visit the 'Add Projects' page: <https://circleci.com/add-projects>
-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/
-
-## 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`:
-
-[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.
-
-## 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.
-
-```
-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

docs/_docs/continuous-integration/index.md

@@ -1,9 +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)

docs/_docs/includes.md

@@ -1,167 +0,0 @@
----
-title: Includes
-permalink: /docs/includes/
----
-
-The `include` tag allows you to include the content from another file stored in the `_includes` folder:
-
-```liquid
-{% raw %}{% include footer.html %}{% endraw %}
-```
-
-Jekyll will look for the referenced file (in this case, `footer.html`) in the `_includes` directory at the root of your source directory and insert its contents.
-
-### Including files relative to another file
-
-You can choose to include file fragments relative to the current file by using the `include_relative` tag:
-
-```liquid
-{% raw %}{% include_relative somedir/footer.html %}{% endraw %}
-```
-
-You won't need to place your included content within the `_includes` directory. Instead,
-the inclusion is specifically relative to the file where the tag is being used. For example,
-if `_posts/2014-09-03-my-file.markdown` uses the `include_relative` tag, the included file
-must be within the `_posts` directory or one of its subdirectories.
-
-Note that you cannot use the `../` syntax to specify an include location that refers to a higher-level directory.
-
-All the other capabilities of the `include` tag are available to the `include_relative` tag,
-such as variables.
-
-### Using variables names for the include file
-
-The name of the file you want to embed 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 include:
-
-```liquid
-{% raw %}{% include {{ page.my_variable }} %}{% endraw %}
-```
-
-In this example, the include would insert the file `footer_company_a.html` from the `_includes/footer_company_a.html` directory.
-
-### Passing parameters to includes
-
-You can also pass parameters to an include. For example, suppose you have a file called `note.html` in your `_includes` folder that contains this formatting:
-
-```liquid
-{% raw %}<div markdown="span" class="alert alert-info" role="alert">
-<i class="fa fa-info-circle"></i> <b>Note:</b>
-{{ include.content }}
-</div>{% endraw %}
-```
-
-The `{% raw %}{{ include.content }}{% endraw %}` is a parameter that gets populated when you call the include and specify a value for that parameter, like this:
-
-```liquid
-{% raw %}{% include note.html content="This is my sample note." %} {% endraw %}
-```
-
-The value of `content` (which is `This is my sample note`) will be inserted into the {% raw %}`{{ include.content }}`{% endraw %} parameter.
-
-Passing parameters to includes is especially helpful when you want to hide away complex formatting from your Markdown content.
-
-For example, suppose you have a special image syntax with complex formatting, and you don't want your authors to remember the complex formatting. As a result, you decide to simplify the formatting by using an include with parameters. Here's an example of the special image syntax you might want to populate with an include:
-
-```html
-<figure>
-   <a href="http://jekyllrb.com">
-   <img src="logo.png" style="max-width: 200px;"
-      alt="Jekyll logo" />
-   <figcaption>This is the Jekyll logo</figcaption>
-</figure>
-```
-
-You could templatize this content in your include and make each value available as a parameter, like this:
-
-```liquid
-{% raw %}<figure>
-   <a href="{{ include.url }}">
-   <img src="{{ include.file }}" style="max-width: {{ include.max-width }};"
-      alt="{{ include.alt }}"/>
-   <figcaption>{{ include.caption }}</figcaption>
-</figure>{% endraw %}
-```
-
-This include contains 5 parameters:
-
-* `url`
-* `max-width`
-* `file`
-* `alt`
-* `caption`
-
-Here's an example that passes all the parameters to this include (the include file is named `image.html`):
-
-```liquid
-{% raw %}{% include image.html url="http://jekyllrb.com"
-max-width="200px" file="logo.png" alt="Jekyll logo"
-caption="This is the Jekyll logo." %} {% endraw %}
-```
-
-The result is the original HTML code shown earlier.
-
-To safeguard situations where users don't supply a value for the parameter, you can use [Liquid's default filter](https://help.shopify.com/themes/liquid/filters/additional-filters#default).
-
-Overall, you can create includes that act as templates for a variety of uses &mdash; inserting audio or video clips, alerts, special formatting, and more. However, note that you should avoid using too many includes, as this will slow down the build time of your site. For example, don't use includes every time you insert an image. (The above technique shows a use case for special images.)
-
-### Passing parameter variables to includes
-
-Suppose the parameter you want to pass to the include is a variable rather than a string. For example, you might be using {% raw %}`{{ site.product_name }}`{% endraw %} to refer to every instance of your product rather than the actual hard-coded name. (In this case, your `_config.yml` file would have a key called `product_name` with a value of your product's name.)
-
-The string you pass to your include parameter can't contain curly braces. For example, you can't pass a parameter that contains this: {% raw %}`"The latest version of {{ site.product_name }} is now available."`{% endraw %}
-
-If you want to include this variable in your parameter that you pass to an include, you need to store the entire parameter as a variable before passing it to the include. You can use `capture` tags to create the variable:
-
-```liquid
-{% raw %}{% capture download_note %}The latest version of
-{{ site.product_name }} is now available.{% endcapture %}{% endraw %}
-```
-
-Then pass this captured variable into the parameter for the include. Omit the quotation marks around the parameter content because it's no longer a string (it's a variable):
-
-```liquid
-{% raw %}{% 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:
-
-```liquid
-{% raw %}{% 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 %}{% 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`.

docs/_docs/maintaining/affinity-team-captain.md

@@ -1,28 +0,0 @@
----
-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 }
-
-## 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/

docs/_docs/maintaining/avoiding-burnout.md

@@ -1,30 +0,0 @@
----
-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 }
-
-# 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.
-
-# 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/docs/Maintainers-Avoiding-Burnout.md) for providing a perfect base for this document.

docs/_docs/maintaining/becoming-a-maintainer.md

@@ -1,38 +0,0 @@
----
-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 }
-
-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?
-
-## 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). Every maintainer loves an issue that is resolved before they get to it. :smiley:
-
-## 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.
-
-## 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 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.
-
-## 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).
-
-## 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.
-
-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://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.

docs/_docs/maintaining/index.md

@@ -1,20 +0,0 @@
----
-title: Maintaining Jekyll
-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 }
-
-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/)
-
-Interested in becoming a maintainer? Here is some documentation for **contributors**:
-
-1. [Becoming a maintainer](becoming-a-maintainer/)

docs/_docs/maintaining/merging-a-pull-request.md

@@ -1,55 +0,0 @@
----
-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 }
-
-## 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.
-
-**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
-
-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. 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:
-
-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:

docs/_docs/maintaining/reviewing-a-pull-request.md

@@ -1,46 +0,0 @@
----
-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 }
-
-## 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](/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.
-
-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 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 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.
-
-## 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.

docs/_docs/maintaining/special-labels.md

@@ -1,20 +0,0 @@
----
-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 }
-
-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/#staleness-and-automatic-closure).

docs/_docs/maintaining/triaging-an-issue.md

@@ -1,54 +0,0 @@
----
-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 }
-
-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?
-
-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, 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.
-
-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 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.

docs/_docs/pages.md

@@ -1,74 +0,0 @@
----
-title: Creating 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.
-
-<div class="note">
-  <h5>ProTip™: Use layouts on your homepage</h5>
-  <p>
-    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.
-  </p>
-</div>
-
-## 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
-
-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
-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
-|-- 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:
-
-```
----
-title: My page
-permalink: mypageurl.html
----
-```
-
-### Named folders containing index HTML files
-
-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.
-
-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.

docs/_docs/permalinks.md

@@ -1,367 +0,0 @@
----
-title: Permalinks
-permalink: /docs/permalinks/
----
-
-Permalinks refer to the URLs (excluding the domain name or directory folder) for your pages, posts, or collections.
-Jekyll supports a flexible way to build permalinks, allowing you to leverage various template variables or choose built-in permalink styles (such as `date`) that automatically use a template-variable pattern.
-
-You construct permalinks by creating a template URL where dynamic elements are represented by colon-prefixed keywords. The default template permalink is `/:categories/:year/:month/:day/:title.html`. Each of the colon-prefixed keywords is a template variable.
-
-## Where to configure permalinks
-
-You can configure your site's permalinks through the [Configuration]({% link _docs/configuration.md %}) file or in the [Front Matter]({% link _docs/frontmatter.md %}) for each post, page, or collection.
-
-Setting permalink styles in your configuration file applies the setting globally in your project. You configure permalinks in your `_config.yml` file like this:
-
-```yaml
-permalink: /:categories/:year/:month/:day/:title.html
-```
-
-If you don't specify any permalink setting, Jekyll uses the above pattern as the default.
-
-The permalink can also be set using a built-in permalink style:
-
-```yaml
-permalink: date
-```
-
-`date` is the same as `:categories/:year/:month/:day/:title.html`, the default. See [Built-in Permalink Styles](#builtinpermalinkstyles) below for more options.
-
-Setting the permalink in your post, page, or collection's front matter overrides any global settings. Here's an example:
-
-```yaml
----
-title: My page title
-permalink: /mypageurl/
----
-```
-
-Even if your configuration file specifies the `date` style, the URL for this page would be `http://somedomain.com/mypageurl/`.
-
-When you use permalinks that omit the `.html` file extension (called "pretty URLs") Jekyll builds the file as index.html placed inside a folder with the page's name. For example:
-
-```
-├── mypageurl
-│   └── index.html
-```
-
-With a URL such as `/mypageurl/`, servers automatically load the index.html file inside the folder, so users can simply navigate to `http://somedomain.com/mypageurl/` to get to `mypageurl/index.html`.
-
-## Template variables for permalinks {#template-variables}
-
-The following table lists the template variables available for permalinks. You can use these variables in the `permalink` property in your config file.
-
-<div class="mobile-side-scroller">
-<table>
-  <thead>
-    <tr>
-      <th>Variable</th>
-      <th>Description</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>
-        <p><code>year</code></p>
-      </td>
-      <td>
-        <p>Year from the post's filename</p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>month</code></p>
-      </td>
-      <td>
-        <p>Month from the post's filename</p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>i_month</code></p>
-      </td>
-      <td>
-        <p>Month from the post's filename without leading zeros.</p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>day</code></p>
-      </td>
-      <td>
-        <p>Day from the post's filename</p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>i_day</code></p>
-      </td>
-      <td>
-        <p>Day from the post's filename without leading zeros.</p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>short_year</code></p>
-      </td>
-      <td>
-        <p>Year from the post's filename without the century.</p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>hour</code></p>
-      </td>
-      <td>
-        <p>
-          Hour of the day, 24-hour clock, zero-padded from the post's <code>date</code> front matter. (00..23)
-        </p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>minute</code></p>
-      </td>
-      <td>
-        <p>
-          Minute of the hour from the post's <code>date</code> front matter. (00..59)
-        </p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>second</code></p>
-      </td>
-      <td>
-        <p>
-          Second of the minute from the post's <code>date</code> front matter. (00..59)
-        </p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>title</code></p>
-      </td>
-      <td>
-        <p>
-            Title from the document’s filename. May be overridden via
-            the document’s <code>slug</code> YAML front matter.
-        </p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>slug</code></p>
-      </td>
-      <td>
-        <p>
-            Slugified title from the document’s filename (any character
-            except numbers and letters is replaced as hyphen). May be
-            overridden via the document’s <code>slug</code> YAML front matter.
-        </p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>categories</code></p>
-      </td>
-      <td>
-        <p>
-          The specified categories for this post. If a post has multiple
-          categories, Jekyll will create a hierarchy (e.g. <code>/category1/category2</code>).
-          Also Jekyll automatically parses out double slashes in the URLs,
-          so if no categories are present, it will ignore this.
-        </p>
-      </td>
-    </tr>
-  </tbody>
-</table>
-</div>
-
-Note that all template variables relating to time or categories are available to posts only.
-
-## Built-in permalink styles {#builtinpermalinkstyles}
-
-Although you can specify a custom permalink pattern using [template variables](#template-variables), Jekyll also provides the following built-in styles for convenience.
-
-<div class="mobile-side-scroller">
-<table>
-  <thead>
-    <tr>
-      <th>Permalink Style</th>
-      <th>URL Template</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>
-        <p><code>date</code></p>
-      </td>
-      <td>
-        <p><code>/:categories/:year/:month/:day/:title.html</code></p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>pretty</code></p>
-      </td>
-      <td>
-        <p><code>/:categories/:year/:month/:day/:title/</code></p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>ordinal</code></p>
-      </td>
-      <td>
-        <p><code>/:categories/:year/:y_day/:title.html</code></p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>none</code></p>
-      </td>
-      <td>
-        <p><code>/:categories/:title.html</code></p>
-      </td>
-    </tr>
-  </tbody>
-</table>
-</div>
-
-Rather than typing `permalink: /:categories/:year/:month/:day/:title/`, you can just type `permalink: pretty`.
-
-<div class="note info">
-<h5>Specifying permalinks through the YAML Front Matter</h5>
-<p>Built-in permalink styles are not recognized in YAML Front Matter. As a result, <code>permalink: pretty</code> will not work.</p>
-</div>
-
-## Permalink style examples with posts {#permalink-style-examples}
-
-Here are a few examples to clarify how permalink styles get applied with posts.
-
-Given a post named: `/2009-04-29-slap-chop.md`
-
-<div class="mobile-side-scroller">
-<table>
-  <thead>
-    <tr>
-      <th>URL Template</th>
-      <th>Resulting Permalink URL</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>
-        <p>None specified, or <code>permalink: date</code></p>
-      </td>
-      <td>
-        <p><code>/2009/04/29/slap-chop.html</code></p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>pretty</code></p>
-      </td>
-      <td>
-        <p><code>/2009/04/29/slap-chop/</code></p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>/:month-:day-:year/:title.html</code></p>
-      </td>
-      <td>
-        <p><code>/04-29-2009/slap-chop.html</code></p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>/blog/:year/:month/:day/:title/</code></p>
-      </td>
-      <td>
-        <p><code>/blog/2009/04/29/slap-chop/</code></p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>/:year/:month/:title</code></p>
-        <p>See <a href="#extensionless-permalinks">Extensionless permalinks with no trailing slashes</a> for details.</p>
-      </td>
-      <td>
-        <p><code>/2009/04/slap-chop</code></p>
-      </td>
-    </tr>
-  </tbody>
-</table>
-</div>
-
-## 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.html` 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 &mdash; 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 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:
-
-```
----
-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.

docs/_docs/quickstart.md

@@ -1,51 +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
-~/myblog $ bundle exec jekyll serve
-
-# 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:
-
-* `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.
-
-## Options for creating a new site with Jekyll
-
-`jekyll new <PATH>` 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 <code>help</code> command to remind you of all available options and usage, it also works with the <code>new</code>, <code>build</code> and <code>serve</code> subcommands, e.g. <code>jekyll help new</code> or <code>jekyll help build</code>.
-{: .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.

docs/_docs/themes.md

@@ -1,238 +0,0 @@
----
-title: Themes
-permalink: /docs/themes/
----
-
-Jekyll has an extensive theme system that allows you to leverage community-maintained templates and styles to customize your site's presentation. Jekyll themes package up layouts, includes, and stylesheets in a way that can be overridden by your site's content.
-
-## Understanding gem-based themes
-
-When you [create a new Jekyll site](/docs/quickstart) (by running the `jekyll new <PATH>` 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.
-
-In the case of Minima, you see only the following files in your Jekyll site directory:
-
-```
-├── Gemfile
-├── Gemfile.lock
-├── _config.yml
-├── _posts
-│   └── 2016-12-04-welcome-to-jekyll.markdown
-├── about.md
-└── index.md
-```
-
-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.
-
-Gem-based themes make it easy for theme developers to make updates available to anyone who has the theme gem. When there's an update, theme developers push the update to RubyGems.
-
-If you have the theme gem, you can (if you desire) run `bundle update` to update all gems in your project. Or you can run `bundle update <THEME>`, replacing `<THEME>` with the theme name, such as `minima`, to just update the theme gem. Any new files or updates the theme developer has made (such as to stylesheets or includes) will be pulled into your project automatically.
-
-The goal of gem-based themes is to allow you to get all the benefits of a robust, continually updated theme without having all the theme's files getting in your way and over-complicating what might be your primary focus: creating content.
-
-## Overriding theme defaults
-
-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`
-
-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:
-
-1. Run `bundle show` followed by the name of the theme's gem, e.g., `bundle show minima` for default Jekyll's 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.
-
-2. Open the theme's directory in Finder or Explorer:
-
-   ```shell
-   # On MacOS
-   open $(bundle show minima)
-   # On Windows
-   explorer /usr/local/lib/ruby/gems/2.3.0/gems/minima-2.1.0
-   ```
-
-   A Finder or Explorer window opens showing the theme's files and directories. The Minima theme gem contains these files:
-
-    ```
-    ├── LICENSE.txt
-    ├── README.md
-    ├── _includes
-    │   ├── disqus_comments.html
-    │   ├── footer.html
-    │   ├── google-analytics.html
-    │   ├── head.html
-    │   ├── header.html
-    │   ├── icon-github.html
-    │   ├── icon-github.svg
-    │   ├── icon-twitter.html
-    │   └── icon-twitter.svg
-    ├── _layouts
-    │   ├── default.html
-    │   ├── home.html
-    │   ├── page.html
-    │   └── post.html
-    ├── _sass
-    │   ├── minima
-    │   │   ├── _base.scss
-    │   │   ├── _layout.scss
-    │   │   └── _syntax-highlighting.scss
-    │   └── minima.scss
-    └── assets
-        └── 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.
-
-     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.
-
-## Converting gem-based themes to regular themes
-
-Suppose you want to get rid of the gem-based theme and convert it to a regular theme, where all files are present in your Jekyll site directory, with nothing stored in the theme gem.
-
-To do this, copy the files from the theme gem's directory into your Jekyll site directory. (For example, copy them to `/myblog` if you created your Jekyll site at `/myblog`. See the previous section for details.)
-
-Then remove references to the theme gem in `Gemfile` and configuration. For example, to remove `minima`:
-
-- Open `Gemfile` and remove `gem "minima", "~> 2.0"`.
-- Open `_config.yml` and remove `theme: minima`.
-
-Now `bundle update` will no longer get updates for the theme gem.
-
-## Installing a gem-based theme {#installing-a-theme}
-
-The `jekyll new <PATH>` command isn't the only way to create a new Jekyll site with a gem-based theme. You can also find gem-based themes online and incorporate them into your Jekyll project.
-
-For example, search for [jekyll theme on RubyGems](https://rubygems.org/search?utf8=%E2%9C%93&query=jekyll-theme) to find other gem-based themes. (Note that not all themes are using `jekyll-theme` as a convention in the theme name.)
-
-To install a gem-based theme:
-
-1. Add the theme to your site's `Gemfile`:
-
-   ```sh
-   gem "jekyll-theme-awesome"
-   ```
-
-2. Install the theme:
-
-   ```sh
-   bundle install
-   ```
-
-3. Add the following to your site's `_config.yml` to activate the theme:
-
-   ```sh
-   theme: jekyll-theme-awesome
-   ```
-
-4. Build your site:
-
-   ```sh
-   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 }
-
-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.
-
-## Creating a gem-based theme
-
-If you're a Jekyll theme developer (rather than just a consumer of themes), you can package up your theme in RubyGems and allow users to install it through Bundler.
-
-If you're unfamiliar with creating Ruby gems, don't worry. Jekyll will help you scaffold a new theme with the `new-theme` command. Run `jekyll new-theme` with the theme name as an argument.
-
-Here is an example:
-
-```sh
-jekyll new-theme jekyll-theme-awesome
-    create /path/to/jekyll-theme-awesome/_layouts
-    create /path/to/jekyll-theme-awesome/_includes
-    create /path/to/jekyll-theme-awesome/_sass
-    create /path/to/jekyll-theme-awesome/_layouts/page.html
-    create /path/to/jekyll-theme-awesome/_layouts/post.html
-    create /path/to/jekyll-theme-awesome/_layouts/default.html
-    create /path/to/jekyll-theme-awesome/Gemfile
-    create /path/to/jekyll-theme-awesome/jekyll-theme-awesome.gemspec
-    create /path/to/jekyll-theme-awesome/README.md
-    create /path/to/jekyll-theme-awesome/LICENSE.txt
-    initialize /path/to/jekyll-theme-awesome/.git
-    create /path/to/jekyll-theme-awesome/.gitignore
-Your new Jekyll theme, jekyll-theme-awesome, is ready for you in /path/to/jekyll-theme-awesome!
-For help getting started, read /path/to/jekyll-theme-awesome/README.md.
-```
-
-Add your template files in the corresponding folders. Then complete the `.gemspec` and the README files according to your needs.
-
-### Layouts and includes
-
-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.
-
-### 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.
-
-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.
-
-```
-_sass
-├── jekyll-theme-awesome.scss
-```
-
-Your theme's styles can be included in the user's stylesheet using the `@import` directive.
-
-```css
-{% raw %}@import "{{ site.theme }}";{% endraw %}
-```
-
-### 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?
-
-### Adding a screenshot
-
-Themes are visual. Show users what your theme looks like by including a screenshot as `/screenshot.png` within your theme's repository where it can be retrieved programatically. You can also include this screenshot within your theme's documentation.
-
-### Previewing your theme
-
-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}
-
-### Publishing your theme
-
-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:
-
-   ```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:
-
-   ```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.

docs/_docs/windows.md

@@ -1,133 +0,0 @@
----
-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. This page aims to collect some of the general
-knowledge and lessons that have been unearthed by Windows users.
-
-## Installation
-
-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`
- 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].
-
-[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.
-
-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
-```
-
-## 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.
-
-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
-
-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
-
-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-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}
-
-`choco install libiconv -Source "https://www.nuget.org/api/v2/"`{:.language-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^
-   --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-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:
-
-
-```ruby
-source 'https://rubygems.org'
-gem 'github-pages', group: :jekyll_plugins
-```
-
- * **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`
-
-
-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"
-[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"

docs/_includes/docs_option.html

@@ -1,5 +0,0 @@
-{% for item in include.items %}
-  {% assign item_url = item | prepend:"/docs/" | append:"/" %}
-  {% assign doc = site.docs | where: "url", item_url | first %}
-  <option value="{{ doc.url }}">{{ doc.title }}</option>
-{% endfor %}

docs/_includes/docs_ul.html

@@ -1,7 +0,0 @@
-<ul>
-{% for item in include.items %}
-  {% assign item_url = item | prepend:"/docs/" | append:"/" %}
-  {% assign p = site.docs | where:"url", item_url | first %}
-  <li class="{% if item_url == page.url %}current{% endif %}"><a href="{{ p.url }}">{{ p.title }}</a></li>
-{% endfor %}
-</ul>

docs/_layouts/error.html

@@ -1,23 +0,0 @@
-{% include top.html %}
-
-<body class="wrap">
-  <header>
-    <div class="grid">
-      <div class="unit whole align-center">
-        <h1>
-          <a href="/">
-            <span class="sr-only">Jekyll</span>
-            <img src="/img/logo-2x.png" width="249" height="115" alt="Jekyll Logo">
-          </a>
-        </h1>
-      </div>
-    </div>
-  </header>
-
-  {{ content }}
-
-  {% include anchor_links.html %}
-  {% include analytics.html %}
-
-</body>
-</html>

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

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

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

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

docs/_posts/2016-04-26-jekyll-3-0-5-released.markdown

@@ -1,24 +0,0 @@
----
-title: 'Jekyll 3.0.5 Released'
-date: 2016-04-26 17:40:44 -0700
-author: parkr
-version: 3.0.5
-categories: [release]
----
-
-This version fixes a bug affecting only v3.0.4 where autoregeneration was
-*always* disabled when running Jekyll locally. This feature is a huge
-reason why Jekyll (or any static site generator, for that matter) is a joy
-to use. Sorry for the regression!
-
-If you're using GitHub Pages, [you can follow the progress of the upgrade
-on the github/pages-gem repo](https://github.com/github/pages-gem/pull/285).
-
-As always, our [history doc](/docs/history/#v3-0-5) has links to the pull
-requests and issues associated with the release for your perusal.
-
-We're looking forward to the upcoming release of v3.2 which [has some
-excellent goodies](https://github.com/jekyll/jekyll/blob/master/History.markdown#head)
-we think you'll love.
-
-Happy Jekylling!

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

@@ -1,25 +0,0 @@
----
-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!

docs/_posts/2016-05-18-jekyll-3-1-5-released.markdown

@@ -1,16 +0,0 @@
----
-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!

docs/_posts/2016-05-19-jekyll-3-1-6-released.markdown

@@ -1,18 +0,0 @@
----
-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!

docs/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown

@@ -1,18 +0,0 @@
----
-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 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 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.
-
-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!

docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown

@@ -1,124 +0,0 @@
----
-title: 'Jekyll turns 3.2'
-date: 2016-07-26 15:06:49 -0700
-author: parkr
-version: 3.2.0
-categories: [release]
----
-
-Happy Day! Jekyll v3.2.0 is out, and packed full of goodies.
-
-Our flagship feature for this release has been **themes**. _Themes?!_, you
-say? Yes, proper, versionable, releasable, first-class themes. We're pretty
-stoked about it and we hope you like building and using them. For now, it
-only supports layouts, includes, and sass, but we have plans to include
-static assets like images and CSS/JS in a future release. [Read more about
-it in the docs.](/docs/themes/) Our site template generated by `jekyll new`
-now dogfoods this feature, using the [minima](https://github.com/jekyll/minima) theme.
-
-Some other notable changes:
-
-- Symlinks are allowed as long as they target a file in the site source
-- 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
-post or document based on its path relative to the site source
-- ... and lots more!
-
-As always, there is [a full list of changes](/docs/history/#v3-2-0) for
-your perusal.
-
-Every release is made possible by the countless hours of hard work that our
-fellow community members put into sending patches, filing thoughtful
-patches, and so on. These release took the work of over 80 people:
-
-- Aaron Sky
-- Adam Hollett
-- ajhit406
-- Aki
-- Alex Hanselka
-- Alex Hoyau
-- Alex Ivkin
-- Alex Kitchens
-- Alex Plescan
-- Alex Wood
-- Anatoliy Yastreb
-- Andrew Artajos
-- Andrew Munsell
-- AndrewCz
-- Ankush Menat
-- Anthony Smith
-- Ben Balter
-- Brian Jones
-- Brint O'Hearn
-- Chayoung You
-- Chris Wells
-- chrisfinazzo
-- Clark Winkelmann
-- Dan Allen
-- David Von Lehman
-- David Zhang
-- Derek Gottlieb
-- Enes Gönültaş
-- EricH
-- Erick Sasse
-- Eugênio Cabral
-- Florian Thomas
-- Frank Taillandier
-- Henry Goodman
-- Henry Wright
-- Hugo Duksis
-- Hugo Giraudel
-- Jack Reed
-- Jamie Bilinski
-- Jeff Kolesky
-- Jens Willmer
-- Jordon Bedwell
-- Josh Waller
-- Joshua Barnett
-- Keegan Mullaney
-- Kevin Miller
-- Krzysztof Jurewicz
-- Loren Rogers
-- Marcos Brito
-- Marcus Stollsteimer
-- Matt Rogers
-- Michaël Guitton
-- Mike Linksvayer
-- Mike Neumegen
-- Nathan Hazout
-- Nick
-- No
-- nscyclone
-- Parker Moore
-- Pat Hawks
-- Pierre Fenoll
-- Praveen Kumar
-- Rares Vernica
-- Saleem Rashid
-- Sam Dutton
-- Shengbin Meng
-- Shinn Kondo
-- Shinnosuke Kondo
-- skim
-- Sondre Nilsen
-- Spencer A. Bywater
-- Stephen Checkoway
-- Suriyaa Kudo
-- surrim
-- TheLucasMoore
-- Thomas Wood
-- Tim Wisniewski
-- Tom Fejfar
-- Tony Garnock-Jones
-- Vincent Wochnik
-- XhmikosR
-- Yanis Vieilly
-- Yordis Prieto
-- Zack Spencer
-
-We are so grateful to all of you for helping to put together a terrific
-release. Thank you!
-
-Happy Jekylling!

docs/_posts/2016-08-02-jekyll-3-2-1-released.markdown

@@ -1,23 +0,0 @@
----
-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]
----
-
-Well, 3.2.0 has been a success, but with one fatal flaw: it doesn't work on
-Windows! Sorry, Windows users. Hot on the trail of 3.2.0, this release
-should squash that :bug:. Sorry about that!
-
-This release also fixes an issue when using [gem-based themes](/docs/themes/)
-where the theme was rejected if it existed behind a symlink. This is a
-common setup for the various ruby version managers, and for Ruby installed
-via Homebrew. Props to @benbalter for fixing that up.
-
-Thanks to the contributors for this release: Adam Petrie, Ben Balter,
-Daniel Chapman, DirtyF, Gary Ewan Park, Jordon Bedwell, and Parker Moore.
-
-As always, you can see our full changelog on [the History page](/docs/history/).
-
-Happy Jekylling!

docs/_posts/2016-08-24-jekyll-admin-initial-release.markdown

@@ -1,17 +0,0 @@
----
-title: "Jekyll Admin Initial Release"
-date: "2016-08-25 09:50:00 +0300"
-author: mertkahyaoglu
-categories: [community]
----
-
-[Jekyll's Google Summer of Code Project](https://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!

docs/_posts/2016-10-06-jekyll-3-3-is-here.md

@@ -1,109 +0,0 @@
----
-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
-version: 3.3.0
-categories: [release]
----
-
-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
-
-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, 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 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.
-
-### 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 %}
-
-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:
-
-{% highlight liquid %}
-{% raw %}
-{{ "/docs/assets/" | absolute_url }} => https://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`.
-
-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.
-
-## 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:
-
-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
-bug report.
-
-Happy Jekylling!

docs/_posts/2016-11-14-jekyll-3-3-1-released.markdown

@@ -1,18 +0,0 @@
----
-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!

docs/_posts/2017-01-18-jekyll-3-4-0-released.markdown

@@ -1,42 +0,0 @@
----
-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 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/).
-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. Documentation has been improved, notably on themes, includes and permalinks.
-
-And [lots and lots more!](/docs/history/#v3-4-0)
-
-This update was made possible by the dedicated efforts of our excellent
-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,
-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
-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!

docs/_sass/_font-awesome.scss

@@ -1,24 +0,0 @@
-@font-face {
-  font-family: 'FontAwesome';
-  src: url('../fonts/FontAwesome.eot?9h6hxj');
-  src: url('../fonts/FontAwesome.eot?9h6hxj#iefix') format('embedded-opentype'),
-       url('../fonts/FontAwesome.woff?9h6hxj') format('woff'),
-       url('../fonts/FontAwesome.ttf?9h6hxj') format('truetype'),
-       url('../fonts/FontAwesome.svg?9h6hxj#FontAwesome') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-.fa {
-  display: inline-block;
-  font: normal normal normal 14px/1 FontAwesome;
-  font-size: inherit;
-  text-rendering: auto;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-.fa-link:before {
-  content: "\f0c1";
-}
-.fa-pencil:before {
-  content: "\f040";
-}

docs/_sass/_normalize.scss

@@ -1 +0,0 @@
-/*! 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}

docs/community/index.md

@@ -1,24 +0,0 @@
----
-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.
-
-## 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 }})
-<div class="videoWrapper">
-    <iframe width="420" height="315" src="https://www.youtube.com/embed/{{ featured.youtube_id }}" frameborder="0" allowfullscreen></iframe>
-</div>
-
-{% 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 %}

docs/fonts/FontAwesome.svg

@@ -1,12 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Generated by IcoMoon</metadata>
-<defs>
-<font id="FontAwesome" horiz-adv-x="1024">
-<font-face units-per-em="1024" ascent="960" descent="-64" />
-<missing-glyph horiz-adv-x="1024" />
-<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
-<glyph unicode="&#xf040;" glyph-name="pencil" horiz-adv-x="866" d="M207.429 73.143l52 52-134.286 134.286-52-52v-61.143h73.143v-73.143h61.143zM506.286 603.428c0 7.429-5.143 12.571-12.571 12.571-3.429 0-6.857-1.143-9.714-4l-309.714-309.714c-2.857-2.857-4-6.286-4-9.714 0-7.429 5.143-12.571 12.571-12.571 3.429 0 6.857 1.143 9.714 4l309.714 309.714c2.857 2.857 4 6.286 4 9.714zM475.429 713.143l237.714-237.714-475.429-475.429h-237.714v237.714zM865.714 658.286c0-19.429-8-38.286-21.143-51.429l-94.857-94.857-237.714 237.714 94.857 94.286c13.143 13.714 32 21.714 51.429 21.714s38.286-8 52-21.714l134.286-133.714c13.143-13.714 21.143-32.571 21.143-52z" />
-<glyph unicode="&#xf0c1;" glyph-name="chain, link" horiz-adv-x="951" d="M832 256c0 14.857-5.714 28.571-16 38.857l-118.857 118.857c-10.286 10.286-24.571 16-38.857 16-16.571 0-29.714-6.286-41.143-18.286 18.857-18.857 41.143-34.857 41.143-64 0-30.286-24.571-54.857-54.857-54.857-29.143 0-45.143 22.286-64 41.143-12-11.429-18.857-24.571-18.857-41.714 0-14.286 5.714-28.571 16-38.857l117.714-118.286c10.286-10.286 24.571-15.429 38.857-15.429s28.571 5.143 38.857 14.857l84 83.429c10.286 10.286 16 24 16 38.286zM430.286 658.857c0 14.286-5.714 28.571-16 38.857l-117.714 118.286c-10.286 10.286-24.571 16-38.857 16s-28.571-5.714-38.857-15.429l-84-83.429c-10.286-10.286-16-24-16-38.286 0-14.857 5.714-28.571 16-38.857l118.857-118.857c10.286-10.286 24.571-15.429 38.857-15.429 16.571 0 29.714 5.714 41.143 17.714-18.857 18.857-41.143 34.857-41.143 64 0 30.286 24.571 54.857 54.857 54.857 29.143 0 45.143-22.286 64-41.143 12 11.429 18.857 24.571 18.857 41.714zM941.714 256c0-43.429-17.714-85.714-48.571-116l-84-83.429c-30.857-30.857-72.571-47.429-116-47.429-44 0-85.714 17.143-116.571 48.571l-117.714 118.286c-30.857 30.857-47.429 72.571-47.429 116 0 45.143 18.286 88 50.286 119.429l-50.286 50.286c-31.429-32-73.714-50.286-118.857-50.286-43.429 0-85.714 17.143-116.571 48l-118.857 118.857c-31.429 31.429-48 72.571-48 116.571 0 43.429 17.714 85.714 48.571 116l84 83.429c30.857 30.857 72.571 47.429 116 47.429 44 0 85.714-17.143 116.571-48.571l117.714-118.286c30.857-30.857 47.429-72.571 47.429-116 0-45.143-18.286-88-50.286-119.429l50.286-50.286c31.429 32 73.714 50.286 118.857 50.286 43.429 0 85.714-17.143 116.571-48l118.857-118.857c31.429-31.429 48-72.571 48-116.571z" />
-</font></defs></svg>

docs/icomoon-selection.json

@@ -1,96 +0,0 @@
-{
-  "IcoMoonType": "selection",
-  "icons": [
-    {
-      "icon": {
-        "paths": [
-          "M207.429 877.714l52-52-134.286-134.286-52 52v61.143h73.143v73.143h61.143zM506.286 347.429c0-7.429-5.143-12.571-12.571-12.571-3.429 0-6.857 1.143-9.714 4l-309.714 309.714c-2.857 2.857-4 6.286-4 9.714 0 7.429 5.143 12.571 12.571 12.571 3.429 0 6.857-1.143 9.714-4l309.714-309.714c2.857-2.857 4-6.286 4-9.714zM475.429 237.714l237.714 237.714-475.429 475.429h-237.714v-237.714zM865.714 292.571c0 19.429-8 38.286-21.143 51.429l-94.857 94.857-237.714-237.714 94.857-94.286c13.143-13.714 32-21.714 51.429-21.714s38.286 8 52 21.714l134.286 133.714c13.143 13.714 21.143 32.571 21.143 52z"
-        ],
-        "width": 865.7188571428571,
-        "attrs": [],
-        "isMulticolor": false,
-        "isMulticolor2": false,
-        "tags": [
-          "pencil"
-        ],
-        "defaultCode": 61504,
-        "grid": 14
-      },
-      "attrs": [],
-      "properties": {
-        "name": "pencil",
-        "id": 64,
-        "order": 3,
-        "prevSize": 28,
-        "code": 61504
-      },
-      "setIdx": 0,
-      "setId": 0,
-      "iconIdx": 64
-    },
-    {
-      "icon": {
-        "paths": [
-          "M832 694.857c0-14.857-5.714-28.571-16-38.857l-118.857-118.857c-10.286-10.286-24.571-16-38.857-16-16.571 0-29.714 6.286-41.143 18.286 18.857 18.857 41.143 34.857 41.143 64 0 30.286-24.571 54.857-54.857 54.857-29.143 0-45.143-22.286-64-41.143-12 11.429-18.857 24.571-18.857 41.714 0 14.286 5.714 28.571 16 38.857l117.714 118.286c10.286 10.286 24.571 15.429 38.857 15.429s28.571-5.143 38.857-14.857l84-83.429c10.286-10.286 16-24 16-38.286zM430.286 292c0-14.286-5.714-28.571-16-38.857l-117.714-118.286c-10.286-10.286-24.571-16-38.857-16s-28.571 5.714-38.857 15.429l-84 83.429c-10.286 10.286-16 24-16 38.286 0 14.857 5.714 28.571 16 38.857l118.857 118.857c10.286 10.286 24.571 15.429 38.857 15.429 16.571 0 29.714-5.714 41.143-17.714-18.857-18.857-41.143-34.857-41.143-64 0-30.286 24.571-54.857 54.857-54.857 29.143 0 45.143 22.286 64 41.143 12-11.429 18.857-24.571 18.857-41.714zM941.714 694.857c0 43.429-17.714 85.714-48.571 116l-84 83.429c-30.857 30.857-72.571 47.429-116 47.429-44 0-85.714-17.143-116.571-48.571l-117.714-118.286c-30.857-30.857-47.429-72.571-47.429-116 0-45.143 18.286-88 50.286-119.429l-50.286-50.286c-31.429 32-73.714 50.286-118.857 50.286-43.429 0-85.714-17.143-116.571-48l-118.857-118.857c-31.429-31.429-48-72.571-48-116.571 0-43.429 17.714-85.714 48.571-116l84-83.429c30.857-30.857 72.571-47.429 116-47.429 44 0 85.714 17.143 116.571 48.571l117.714 118.286c30.857 30.857 47.429 72.571 47.429 116 0 45.143-18.286 88-50.286 119.429l50.286 50.286c31.429-32 73.714-50.286 118.857-50.286 43.429 0 85.714 17.143 116.571 48l118.857 118.857c31.429 31.429 48 72.571 48 116.571z"
-        ],
-        "width": 950.8571428571428,
-        "attrs": [],
-        "isMulticolor": false,
-        "isMulticolor2": false,
-        "tags": [
-          "chain",
-          "link"
-        ],
-        "defaultCode": 61633,
-        "grid": 14
-      },
-      "attrs": [],
-      "properties": {
-        "name": "chain, link",
-        "id": 170,
-        "order": 2,
-        "prevSize": 28,
-        "code": 61633
-      },
-      "setIdx": 0,
-      "setId": 0,
-      "iconIdx": 170
-    }
-  ],
-  "height": 1024,
-  "metadata": {
-    "name": "FontAwesome"
-  },
-  "preferences": {
-    "showGlyphs": true,
-    "showCodes": true,
-    "showQuickUse": true,
-    "showQuickUse2": true,
-    "showSVGs": true,
-    "fontPref": {
-      "prefix": "fa-",
-      "metadata": {
-        "fontFamily": "FontAwesome",
-        "majorVersion": 1,
-        "minorVersion": 0
-      },
-      "metrics": {
-        "emSize": 1024,
-        "baseline": 6.25,
-        "whitespace": 50
-      },
-      "embed": false,
-      "showSelector": true,
-      "selector": "class",
-      "classSelector": ".fa"
-    },
-    "imagePref": {
-      "prefix": "icon-",
-      "png": true,
-      "useClassSelector": true,
-      "color": 0,
-      "bgColor": 16777215
-    },
-    "historySize": 100
-  }
-}

docs/latest_version.txt

@@ -1 +0,0 @@
-3.4.0

features/collections.feature

@@ -77,8 +77,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: _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/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 %}"
@@ -91,8 +90,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: _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/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 %}"
@@ -105,11 +103,10 @@ 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/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 "Second document's output: {{ site.documents[2].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:
     """
@@ -145,8 +142,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 9: <p>Page without title.</p>" in "_site/index.html" unless Windows
-    And I should see "2. of 8: <p>Page without title.</p>" in "_site/index.html" if on Windows
+    And I should see "2. of 8: <p>Page without title.</p>" 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' %}{{ methods | map:"title" | join: ", " }}"
@@ -159,8 +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: 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: 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 %}"

features/frontmatter_defaults.feature

@@ -80,26 +80,6 @@ Feature: frontmatter defaults
     And I should see "main: <p>content of site/special/2013/10/14/about1.html</p>" in "_site/special/2013/10/14/about1.html"
     And I should see "main: <p>content of site/special/2013/10/14/about2.html</p>" in "_site/special/2013/10/14/about2.html"
 
-  Scenario: Use frontmatter scopes for subdirectories
-    Given I have a _layouts directory
-    And I have a main layout that contains "main: {{ content }}"
-
-    And I have a _posts/en directory
-    And I have the following post under "en":
-      | title | date       | content                               |
-      | helloworld | 2014-09-01 | {{page.lang}} is the current language |
-    And I have a _posts/de directory
-    And I have the following post under "de":
-      | title  | date       | content                                        |
-      | hallowelt | 2014-09-01 | {{page.lang}} is the current language |
-
-    And I have a configuration file with "defaults" set to "[{scope: {path: "_posts/en"}, values: {layout: "main", lang: "en"}}, {scope: {path: "_posts/de"}, values: {layout: "main", lang: "de"}}]"
-
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see "main: <p>en is the current language</p>" in "_site/2014/09/01/helloworld.html"
-    And I should see "main: <p>de is the current language</p>" in "_site/2014/09/01/hallowelt.html"
-
   Scenario: Override frontmatter defaults by type
     Given I have a _posts directory
     And I have the following post:

features/highlighting.feature

@@ -1,33 +0,0 @@
-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 "<span class="nc">RewriteCond</span>" in "_site/index.html"

features/hooks.feature

@@ -235,7 +235,7 @@ Feature: Hooks
       owner.output = "1 #{owner.output.chomp}"
     end
     Jekyll::Hooks.register :pages, :post_render, priority: :high do |owner|
-      # high runs first
+      # high runs last
       owner.output = "2 #{owner.output.chomp}"
     end
     Jekyll::Hooks.register :pages, :post_render do |owner|
@@ -243,13 +243,13 @@ Feature: Hooks
       owner.output = "3 #{owner.output.chomp}"
     end
     Jekyll::Hooks.register :pages, :post_render, priority: :low do |owner|
-      # low runs last 
+      # low runs first
       owner.output = "4 #{owner.output.chomp}"
     end
     """
     And I have a "index.html" page that contains "WRAP ME"
     When I run jekyll build
-    Then I should see "4 3 1 2 WRAP ME" in "_site/index.html"
+    Then I should see "2 3 1 4 WRAP ME" in "_site/index.html"
 
   Scenario: Alter a document right after it is initialized
     Given I have a _plugins directory
@@ -333,28 +333,3 @@ 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"

features/layout_data.feature

@@ -35,36 +35,3 @@ 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 and clear when not present
-    Given I have a _layouts directory
-    And I have a "_layouts/default.html" file with content:
-      """
-      ---
-      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 }}
-      """
-    And I have a "_layouts/page.html" file with content:
-      """
-      ---
-      layout: default
-      bar: im page
-      ---
-      {{ 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' bar: 'im special'" in "_site/index.html"
-    And I should see "page content\n foo: '' bar: 'im page'" in "_site/jekyll.html"

features/rendering.feature

@@ -12,15 +12,6 @@ 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!"

features/site_configuration.feature

@@ -64,28 +64,28 @@ Feature: Site configuration
     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)"
+    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 I should get a zero exit status
     And the _site directory should exist
-    And I should see "<a href=\"https://www.google.com\">Google</a>" in "_site/index.html"
+    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
 
   Scenario: Use Kramdown for markup
-    Given I have an "index.markdown" page that contains "[Google](https://www.google.com)"
+    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 I should get a zero exit status
     And the _site directory should exist
-    And I should see "<a href=\"https://www.google.com\">Google</a>" in "_site/index.html"
+    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
 
   Scenario: Use Redcarpet for markup
-    Given I have an "index.markdown" page that contains "[Google](https://www.google.com)"
+    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 I should get a zero exit status
     And the _site directory should exist
-    And I should see "<a href=\"https://www.google.com\">Google</a>" in "_site/index.html"
+    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
 
   Scenario: Highlight code with pygments
     Given I have an "index.html" page that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}"
@@ -172,10 +172,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: <p>content for entry1.</p>\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: <p>content for entry1.</p>\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: <p>content for entry2.</p>\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: <p>content for entry2.</p>\n built at 2013-04-10T02:14:00-05:00" in "_site/2013/04/10/entry2.html" if on Windows
+      And I should see "Post Layout: <p>content for entry1.</p>\n built at 2013-04-09T23:22:00-04:00" in "_site/2013/04/09/entry1.html"
+      And I should see "Post Layout: <p>content for entry2.</p>\n built at 2013-04-10T03:14:00-04:00" in "_site/2013/04/10/entry2.html"
 
     Scenario: Generate proper dates with explicitly set timezone (different than posts' time)
       Given I have a _layouts directory
@@ -183,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    | Pacific/Honolulu    |
       And I have a _posts directory
       And I have the following posts:
         | title     | date                   | layout  | content             |

features/step_definitions.rb

@@ -1,5 +1,4 @@
 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
@@ -7,7 +6,7 @@ end
 #
 
 After do
-  FileUtils.rm_rf(Paths.test_dir) if Paths.test_dir.exist?
+  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)
@@ -15,24 +14,24 @@ end
 
 #
 
-Given(%r!^I have a blank site in "(.*)"$!) do |path|
-  unless File.exist?(path)
+Given %r{^I have a blank site in "(.*)"$} do |path|
+  if !File.exist?(path)
     then FileUtils.mkdir_p(path)
   end
 end
 
 #
 
-Given(%r!^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(%r!^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"}
+    #{key || 'layout'}: #{value || 'nil'}
     ---
 
     #{text}
@@ -41,13 +40,13 @@ end
 
 #
 
-Given(%r!^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(%r!^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"))
@@ -57,33 +56,33 @@ end
 
 #
 
-Given(%r!^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(%r!^I have an? (.*) directory$!) do |dir|
-  unless File.directory?(dir)
+Given %r{^I have an? (.*) directory$} do |dir|
+  if !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 %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"
-    filename = "#{title}.#{ext}" if %w(draft page).include?(status)
+    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 = "_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)
@@ -93,20 +92,19 @@ end
 
 #
 
-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"))
-    else
-      {}
-    end
+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"))
+  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 %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
@@ -114,7 +112,7 @@ end
 
 #
 
-Given(%r!^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|
@@ -125,20 +123,20 @@ end
 
 #
 
-Given(%r!^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(%r!^I wait (\d+) second(s?)$!) do |time, _|
+Given %r{^I wait (\d+) second(s?)$} do |time, plural|
   sleep(time.to_f)
 end
 
 #
 
-When(%r!^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"
@@ -147,42 +145,16 @@ end
 
 #
 
-When(%r!^I run bundle(.*)$!) do |args|
+When %r{^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 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", ".", "--verbose")
-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")
-  File.new("assets/blank.scss", "w")
-end
-
-#
-
-When(%r!^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
@@ -190,13 +162,13 @@ end
 
 #
 
-When(%r!^I delete the file "(.*)"$!) do |file|
+When %r{^I delete the file "(.*)"$} do |file|
   File.delete(file)
 end
 
 #
 
-Then(%r!^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
@@ -205,8 +177,7 @@ Then(%r!^the (.*) directory should +(not )?exist$!) do |dir, negative|
 end
 
 #
-
-Then(%r!^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?
@@ -218,48 +189,20 @@ end
 
 #
 
-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|
+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 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(%r!^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
@@ -269,19 +212,19 @@ end
 
 #
 
-Then(%r!^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(%r!^I should see today's date in "(.*)"$!) do |file|
-  step %(I should see "#{Date.today}" in "#{file}")
+Then %r{^I should see today's date in "(.*)"$} do |file|
+  step %(I should see "#{Date.today.to_s}" in "#{file}")
 end
 
 #
 
-Then(%r!^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
@@ -291,33 +234,12 @@ end
 
 #
 
-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/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
+Then %r{^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 %r{^I should get a non-zero exit(?:\-| )status$} do
   step %(I should not see "EXIT STATUS: 0" in the build output)
 end

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
@@ -16,8 +16,8 @@ module Jekyll
         :pending   => "\u203D".yellow,
         :undefined => "\u2718".red,
         :passed    => "\u2714".green,
-        :skipped   => "\u203D".blue,
-      }.freeze
+        :skipped   => "\u203D".blue
+      }
 
       #
 
@@ -30,12 +30,11 @@ module Jekyll
         @options = options
         @exceptions = []
         @indent = 0
-        @timings = {}
       end
 
       #
 
-      def before_features(_features)
+      def before_features(features)
         print_profile_information
       end
 
@@ -43,49 +42,33 @@ module Jekyll
 
       def after_features(features)
         @io.puts
-        print_worst_offenders
         print_summary(features)
       end
 
       #
 
-      def before_feature(_feature)
+      def before_feature(feature)
         @exceptions = []
         @indent = 0
       end
 
       #
 
-      def feature_element_timing_key(feature_element)
-        "\"#{feature_element.name.to_s.sub("Scenario: ", "")}\" (#{feature_element.location})"
-      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 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)
+      def before_background(background)
         @scenario_indent = 2
         @in_background = true
         @indent = 2
@@ -93,15 +76,15 @@ module Jekyll
 
       #
 
-      def after_background(_background)
+      def after_background(background)
         @in_background = nil
       end
 
       #
 
-      def background_name(keyword, name, source_line, indent)
+      def background_name(keyword, name, source_line, indend)
         print_feature_element_name(
-          keyword, name, source_line, indent
+          keyword, name, source_line, indend
         )
       end
 
@@ -121,9 +104,8 @@ module Jekyll
 
       #
 
-      # rubocop:disable Metrics/ParameterLists
-      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
@@ -145,11 +127,10 @@ module Jekyll
 
       #
 
-      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
 
       #
 
@@ -172,7 +153,7 @@ module Jekyll
       #
 
       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
@@ -192,17 +173,6 @@ module Jekyll
 
       #
 
-      def print_worst_offenders
-        @io.puts
-        @io.puts "Worst offenders:"
-        @timings.sort_by { |_f, t| -t }.take(10).each do |(f, t)|
-          @io.puts "  #{t}s for #{f}"
-        end
-        @io.puts
-      end
-
-      #
-
       def print_summary(features)
         @io.puts
         print_stats(features, @options)

features/support/helpers.rb

@@ -1,43 +1,37 @@
 require "fileutils"
-require "jekyll"
+require "jekyll/utils"
+require "open3"
 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
-
   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("exe", "jekyll"); 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)
     ---
     #{matter.gsub(
-      %r!\n!, "\n    "
+      /\n/, "\n    "
     )}
     ---
     #{content}
@@ -84,35 +78,37 @@ end
 #
 
 def run_bundle(args)
-  run_in_shell("bundle", *args.strip.split(" "))
-end
-
-#
-
-def run_rubygem(args)
-  run_in_shell("gem", *args.strip.split(" "))
+  run_in_shell("bundle", *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")
-  process.exitstatus.zero?
+  process = run_in_shell(Paths.jekyll_bin.to_s, *args, "--trace")
+  process.exitstatus == 0
 end
 
 #
-def run_in_shell(*args)
-  p, output = Jekyll::Utils::Exec.run(*args)
 
-  File.write(Paths.status_file, p.exitstatus)
-  File.open(Paths.output_file, "wb") do |f|
-    f.puts "$ " << args.join(" ")
-    f.puts output
-    f.puts "EXIT STATUS: #{p.exitstatus}"
+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
 
-  p
+  File.write(Paths.status_file, p.value.exitstatus)
+  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
 
 #
@@ -120,7 +116,7 @@ end
 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+!, "-")
+    else title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
   end
 end
 
@@ -128,12 +124,12 @@ end
 
 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
 
 #
@@ -151,15 +147,15 @@ def seconds_agnostic_datetime(datetime = Time.now)
   [
     Regexp.escape(date),
     "#{time}:\\d{2}",
-    Regexp.escape(zone),
+    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

features/theme.feature

@@ -1,72 +0,0 @@
-Feature: Writing themes
-  As a hacker who likes to share my expertise
-  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: 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
-    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"
-
-  Scenario: A theme with an include
-    Given I have a configuration file with "theme" set to "test-theme"
-    And I have an _includes directory
-    And I have an "_includes/in_project.html" file that contains "I'm in the project."
-    And I have an "index.html" page that contains "{% include in_project.html %} {% include include.html %}"
-    When I run jekyll build
-    Then I should get a zero exit status
-    And the _site directory should exist
-    And I should see "I'm in the project." in "_site/index.html"
-    And I should see "<span class=\"sample\">include.html from test-theme</span>" in "_site/index.html"
-
-  Scenario: A theme with a layout
-    Given I have a configuration file with "theme" set to "test-theme"
-    And I have an _layouts directory
-    And I have an "_layouts/post.html" file that contains "post.html from the project: {{ content }}"
-    And I have an "index.html" page with layout "default" that contains "I'm content."
-    And I have a "post.html" page with layout "post" that contains "I'm more content."
-    When I run jekyll build
-    Then I should get a zero exit status
-    And the _site directory should exist
-    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: 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
-    And I have the following posts:
-      | title  | date       | layout  | content             |
-      | entry1 | 2016-04-21 | post    | I am using a local layout. {% include include.html %} |
-      | entry2 | 2016-04-21 | default | I am using a themed layout. {% include include.html %} {% include in_project.html %} |
-    And I have a _layouts directory
-    And I have a "_layouts/post.html" page with layout "default" that contains "I am a post layout! {{ content }}"
-    And I have an _includes directory
-    And I have an "_includes/in_project.html" file that contains "I am in the project, not the theme."
-    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 in the project, not the theme." in "_site/2016/04/21/entry2.html"
-    And I should see "<span class=\"sample\">include.html from test-theme</span>" in "_site/2016/04/21/entry2.html"
-    And I should see "default.html from test-theme:" in "_site/2016/04/21/entry2.html"
-    And I should see "I am using a themed layout." in "_site/2016/04/21/entry2.html"
-    And I should not see "I am a post layout!" in "_site/2016/04/21/entry2.html"
-    And I should not see "I am in the project, not the theme." in "_site/2016/04/21/entry1.html"
-    And I should see "<span class=\"sample\">include.html from test-theme</span>" in "_site/2016/04/21/entry1.html"
-    And I should see "default.html from test-theme:" in "_site/2016/04/21/entry1.html"
-    And I should see "I am using a local layout." in "_site/2016/04/21/entry1.html"
-    And I should see "I am a post layout!" in "_site/2016/04/21/entry1.html"

features/theme_gem.feature

@@ -1,31 +0,0 @@
-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 the my-cool-theme directory should exist
-    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/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
-    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 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/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
-    And the "my-cool-theme-0.1.0/my-cool-theme.gemspec" file should not exist

jekyll.gemspec

@@ -1,42 +1,39 @@
 # 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.bindir        = "exe"
-  s.require_paths = ["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']
 
-  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("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('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', '~> 0.1')
+  s.add_runtime_dependency('rouge', '~> 1.7')
+  s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0')
+  s.add_runtime_dependency('jekyll-watch', '~> 1.1')
 end

lib/jekyll.rb

@@ -6,80 +6,77 @@ $LOAD_PATH.unshift File.dirname(__FILE__) # For use/testing when no gem is insta
 #
 # Returns nothing.
 def require_all(path)
-  glob = File.join(File.dirname(__FILE__), path, "*.rb")
-  Dir[glob].sort.each do |f|
+  glob = File.join(File.dirname(__FILE__), path, '*.rb')
+  Dir[glob].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 :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 :ThemeAssetsReader,   "jekyll/readers/theme_assets_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 :Filters,             'jekyll/filters'
+  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 :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/filters"
+  require 'jekyll/plugin'
+  require 'jekyll/converter'
+  require 'jekyll/generator'
+  require 'jekyll/command'
+  require 'jekyll/liquid_extensions'
 
   class << self
     # Public: Tells you which Jekyll environment you are building in so you can skip tasks
@@ -94,22 +91,22 @@ module Jekyll
     # 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 = {})
-      config = Configuration.new
+      config = Configuration[Configuration::DEFAULTS]
       override = Configuration[override].stringify_keys
-      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 |obj|
-        set_timezone(obj["timezone"]) if obj["timezone"]
-      end
+      config = Utils.deep_merge_hashes(config, override).stringify_keys
+      set_timezone(config['timezone']) if config['timezone']
+
+      config
     end
 
     # Public: Set the TZ environment variable to use the timezone specified
@@ -117,15 +114,9 @@ module Jekyll
     # timezone - the IANA Time Zone
     #
     # Returns nothing
-    # rubocop:disable Style/AccessorMethodName
     def set_timezone(timezone)
-      ENV["TZ"] = if Utils::Platforms.really_windows?
-                    Utils::WinTZ.calculate(timezone)
-                  else
-                    timezone
-                  end
+      ENV['TZ'] = timezone
     end
-    # rubocop:enable Style/AccessorMethodName
 
     # Public: Fetch the logger instance for this Jekyll process.
     #
@@ -162,31 +153,28 @@ module Jekyll
     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\:\//, '/')
 
-      return clean_path if clean_path.eql?(base_directory)
-
-      if clean_path.start_with?(base_directory.sub(%r!\z!, "/"))
+      if clean_path.start_with?(base_directory.sub(/\A\w\:\//, '/'))
         clean_path
       else
-        clean_path.sub!(%r!\A\w:/!, "/")
         File.join(base_directory, clean_path)
       end
     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_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 'jekyll-sass-converter'

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 = %r!\/\.{1,2}$!
+    HIDDEN_FILE_REGEX = /\/\.{1,2}$/
     attr_reader :site
 
     def initialize(site)
@@ -32,8 +32,7 @@ module Jekyll
       [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
@@ -78,16 +77,15 @@ module Jekyll
       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
@@ -97,12 +95,12 @@ module Jekyll
     # 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
-      %r!\A#{Regexp.quote(site.dest)}\/(#{Regexp.union(site.keep_files).source})!
+      /\A#{Regexp.quote(site.dest)}\/(#{Regexp.union(site.keep_files).source})/
     end
   end
 end

lib/jekyll/collection.rb

@@ -25,15 +25,14 @@ module Jekyll
 
     # Override of normal respond_to? to match method_missing's logic for
     # looking in @data.
-    def respond_to_missing?(method, include_private = false)
+    def respond_to?(method, include_private = false)
       docs.respond_to?(method.to_sym, include_private) || super
     end
 
     # 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
@@ -57,9 +56,16 @@ module Jekyll
         full_path = collection_dir(file_path)
         next if File.directory?(full_path)
         if Utils.has_yaml_header? full_path
-          read_document(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
         else
-          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)
         end
       end
       docs.sort!
@@ -73,7 +79,7 @@ module Jekyll
       return [] unless exists?
       @entries ||=
         Utils.safe_glob(collection_dir, ["**", "*"]).map do |entry|
-          entry["#{collection_dir}/"] = ""
+          entry["#{collection_dir}/"] = ''
           entry
         end
     end
@@ -88,7 +94,7 @@ module Jekyll
         Dir.chdir(directory) do
           entry_filter.filter(entries).reject do |f|
             path = collection_dir(f)
-            File.directory?(path) || entry_filter.symlink?(f)
+            File.directory?(path) || (File.symlink?(f) && site.safe)
           end
         end
     end
@@ -129,7 +135,7 @@ module Jekyll
     # Returns false if the directory doesn't exist or if it's a symlink
     #   and we're in safe mode.
     def exists?
-      File.directory?(directory) && !entry_filter.symlink?(directory)
+      File.directory?(directory) && !(File.symlink?(directory) && site.safe)
     end
 
     # The entry filter for this collection.
@@ -155,7 +161,7 @@ module Jekyll
     #
     # Returns a sanitized version of the label.
     def sanitize_label(label)
-      label.gsub(%r![^a-z0-9_\-\.]!i, "")
+      label.gsub(/[^a-z0-9_\-\.]/i, '')
     end
 
     # Produce a representation of this Collection for use in Liquid.
@@ -173,14 +179,14 @@ module Jekyll
     #
     # 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
@@ -189,40 +195,11 @@ module Jekyll
     #
     # 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
     end
-
-    private
-
-    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
-      else
-        Jekyll.logger.debug "Skipped From Publishing:", doc.relative_path
-      end
-    end
-
-    private
-
-    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
-      )
-    end
   end
 end

lib/jekyll/command.rb

@@ -46,25 +46,19 @@ module Jekyll
       #
       # 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 "baseurl", "-b", "--baseurl URL",
-          "Serve the website from the given base URL"
-        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

lib/jekyll/commands/build.rb

@@ -5,8 +5,8 @@ module Jekyll
         # 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,17 +27,15 @@ module Jekyll
           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."
@@ -52,13 +50,12 @@ module Jekyll
         # 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."
@@ -70,29 +67,9 @@ module Jekyll
         # options - A Hash of options passed to the command
         #
         # Returns nothing.
-        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."
-            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
-            watch_method.call(
-              options, site
-            )
-          end
+        def watch(_site, options)
+          External.require_with_graceful_fail 'jekyll-watch'
+          Jekyll::Watcher.watch(options)
         end
       end # end of class << self
     end

lib/jekyll/commands/clean.rb

@@ -4,9 +4,8 @@ module Jekyll
       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)
 
@@ -18,13 +17,13 @@ module Jekyll
 
         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?)

lib/jekyll/commands/doctor.rb

@@ -4,12 +4,11 @@ module Jekyll
       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)
@@ -19,9 +18,7 @@ module Jekyll
 
         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."
@@ -35,12 +32,12 @@ module Jekyll
             fsnotify_buggy?(site),
             !deprecated_relative_permalinks(site),
             !conflicting_urls(site),
-            !urls_only_differ_by_case(site),
+            !urls_only_differ_by_case(site)
           ].all?
         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."
@@ -65,7 +62,7 @@ module Jekyll
         def fsnotify_buggy?(_site)
           return true unless Utils::Platforms.osx?
           if Dir.pwd != `pwd`.strip
-            Jekyll.logger.error "  " + <<-STR.strip.gsub(%r!\n\s+!, "\n  ")
+            Jekyll.logger.error "  " + <<-STR.strip.gsub(/\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
@@ -81,7 +78,7 @@ module Jekyll
         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" \
@@ -105,9 +102,10 @@ module Jekyll
         end
 
         def case_insensitive_urls(things, destination)
-          things.each_with_object({}) do |thing, memo|
+          things.inject({}) do |memo, thing|
             dest = thing.destination(destination)
             (memo[dest.downcase] ||= []) << dest
+            memo
           end
         end
       end

lib/jekyll/commands/help.rb

@@ -4,8 +4,8 @@ module Jekyll
       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,8 +22,7 @@ module Jekyll
         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

lib/jekyll/commands/new.rb

@@ -1,4 +1,4 @@
-require "erb"
+require 'erb'
 
 module Jekyll
   module Commands
@@ -6,12 +6,11 @@ module Jekyll
       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 "skip-bundle", "--skip-bundle", "Skip 'bundle install'"
+            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)
@@ -20,22 +19,29 @@ module Jekyll
         end
 
         def process(args, options = {})
-          raise ArgumentError, "You must specify a path." if args.empty?
+          raise ArgumentError.new('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_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("Gemfile", new_blog_path), "w") do |f|
+              f.write(gemfile_contents)
+            end
           end
 
-          after_install(new_blog_path, options)
+          Jekyll.logger.info "New jekyll site installed in #{new_blog_path}."
         end
 
         def create_blank_site(path)
@@ -53,16 +59,15 @@ module Jekyll
         #
         # 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
-
+        
         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:
@@ -73,42 +78,23 @@ ruby RUBY_VERSION
 # 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]
-
+# group :jekyll_plugins do
+#   gem "jekyll-github-metadata", "~> 1.0"
+# end
 RUBY
         end
 
-        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("Gemfile", new_blog_path), "w") do |f|
-            f.write(gemfile_contents)
-          end
-        end
-
         def preserve_source_location?(path, options)
           !options["force"] && !Dir["#{path}/**/*"].empty?
         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
 
@@ -119,31 +105,6 @@ RUBY
         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 = {})
-          unless options["blank"] || options["skip-bundle"]
-            bundle_install path
-          end
-
-          Jekyll.logger.info "New jekyll site installed in #{path.cyan}."
-          Jekyll.logger.info "Bundle install skipped." if options["skip-bundle"]
-        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")
-            output.to_s.each_line do |line|
-              Jekyll.logger.info("Bundler:".green, line.strip) unless line.to_s.empty?
-            end
-            raise SystemExit unless process.success?
-          end
-        end
       end
     end
   end

lib/jekyll/commands/new_theme.rb

@@ -1,38 +0,0 @@
-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)"
-
-        c.action do |args, opts|
-          Jekyll::Commands::NewTheme.process(args, opts)
-        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
-
-      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
-
-      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

lib/jekyll/commands/serve.rb

@@ -3,17 +3,18 @@ module Jekyll
     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 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.",],
+          "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",
+            "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
+            "Skips the initial site build which occurs before the server is started."]
+        }
 
         #
 
@@ -32,10 +33,7 @@ module Jekyll
             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)
             end
           end
@@ -48,7 +46,11 @@ module Jekyll
           destination = opts["destination"]
           setup(destination)
 
-          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
 
         # Do a base pre-setup of WEBRick so that everything is in place
@@ -88,27 +90,16 @@ module Jekyll
               index.rhtml
               index.cgi
               index.xml
-            ),
+            )
           }
 
-          opts[:DirectoryIndex] = [] if opts[:JekyllOptions]["show_dir_listing"]
+          opts[:DirectoryIndex] = [] if opts[:JekyllOptions]['show_dir_listing']
 
           enable_ssl(opts)
           enable_logging(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
@@ -116,43 +107,20 @@ module Jekyll
           WEBrick::Config::FileHandler.merge({
             :FancyIndexing     => true,
             :NondisclosureName => [
-              ".ht*", "~*",
-            ],
+              '.ht*', '~*'
+            ]
           })
         end
 
         #
 
         private
-        def server_address(server, options = {})
-          format_url(
-            server.config[:SSLEnable],
-            server.config[:BindAddress],
-            server.config[:Port],
-            options["baseurl"]
-          )
-        end
+        def server_address(server, opts)
+          address = server.config[:BindAddress]
+          baseurl = "#{opts["baseurl"]}/" if opts["baseurl"]
+          port = server.config[:Port]
 
-        private
-        def format_url(ssl_enabled, address, port, baseurl = nil)
-          format("%{prefix}://%{address}:%{port}%{baseurl}", {
-            :prefix  => ssl_enabled ? "https" : "http",
-            :address => address,
-            :port    => port,
-            :baseurl => baseurl ? "#{baseurl}/" : "",
-          })
-        end
-
-        #
-
-        private
-        def default_url(opts)
-          config = configuration_from_options(opts)
-          format_url(
-            config["ssl_cert"] && config["ssl_key"],
-            config["host"] == "127.0.0.1" ? "localhost" : config["host"],
-            config["port"]
-          )
+          "http://#{address}:#{port}#{baseurl}"
         end
 
         #
@@ -202,27 +170,22 @@ module Jekyll
         # 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"]
-            # rubocop:disable Style/RedundantException
             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
+          opts[:EnableSSL] = true
         end
 
         private
-
         def start_callback(detached)
           unless detached
             proc do
@@ -233,7 +196,7 @@ module Jekyll
 
         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

lib/jekyll/commands/serve/servlet.rb

@@ -6,8 +6,8 @@ module Jekyll
       class Servlet < WEBrick::HTTPServlet::FileHandler
         DEFAULTS = {
           "Cache-Control" => "private, max-age=0, proxy-revalidate, " \
-            "no-store, no-cache, must-revalidate",
-        }.freeze
+            "no-store, no-cache, must-revalidate"
+        }
 
         def initialize(server, root, callbacks)
           # So we can access them easily.
@@ -25,7 +25,8 @@ module Jekyll
           super || super(req, res, "#{basename}.html")
         end
 
-        # rubocop:disable Style/MethodName
+        #
+
         def do_GET(req, res)
           rtn = super
           validate_and_ensure_charset(req, res)
@@ -37,10 +38,10 @@ module Jekyll
 
         private
         def validate_and_ensure_charset(_req, res)
-          key = res.header.keys.grep(%r!content-type!i).first
+          key = res.header.keys.grep(/content-type/i).first
           typ = res.header[key]
 
-          unless typ =~ %r!;\s*charset=!
+          unless typ =~ /;\s*charset=/
             res.header[key] = "#{typ}; charset=#{@jekyll_opts["encoding"]}"
           end
         end

lib/jekyll/configuration.rb

@@ -6,96 +6,73 @@ module Jekyll
     # 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(
-        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'       => [],
+      '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'      => [],
 
-      "liquid"            => {
-        "error_mode" => "warn",
+      '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,
-      },
-    }.map { |k, v| [k, v.freeze] }].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.add_default_collections
-      end
-    end
+      '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
+      }
+    }]
 
     # Public: Turn all keys into string
     #
@@ -114,29 +91,28 @@ module Jekyll
     #
     # 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 %r!\.toml!i
-        Jekyll::External.require_with_graceful_fail("toml") unless defined?(TOML)
+      when /\.toml/i
+        Jekyll::External.require_with_graceful_fail('toml') unless defined?(TOML)
         TOML.load_file(filename)
-      when %r!\.ya?ml!i
+      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
 
@@ -147,15 +123,12 @@ module Jekyll
     # 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 <source>/_config.yml or <source>/<config_file>
-      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}")
@@ -180,8 +153,7 @@ module Jekyll
         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
@@ -197,14 +169,13 @@ module Jekyll
 
       begin
         files.each do |config_file|
-          next if config_file.nil? || config_file.empty?
           new_config = read_config_file(config_file)
           configuration = Utils.deep_merge_hashes(configuration, new_config)
         end
       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
@@ -226,18 +197,61 @@ module Jekyll
     def backwards_compatibilize
       config = clone
       # Provide backwards-compatibility
-      check_auto(config)
-      check_server(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
 
-      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? '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_pygments(config)
-      check_include_exclude(config)
-      check_coderay(config)
-      check_maruku(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|
+        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" \
+            " as a list of comma-separated values."
+          config[option] = csv_to_array(config[option])
+        end
+        config[option].map!(&:to_s)
+      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.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 " \
+          "`_config.yml` file."
+      end
 
       config
     end
@@ -245,12 +259,10 @@ module Jekyll
     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
@@ -259,22 +271,14 @@ module Jekyll
     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, {}] }]
-      end
-
-      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
+      if config['collections'].is_a?(Array)
+        config['collections'] = Hash[config['collections'].map { |c| [c, {}] }]
       end
+      config['collections']['posts'] ||= {}
+      config['collections']['posts']['output'] = true
+      config['collections']['posts']['permalink'] = style_to_permalink(config['permalink'])
 
       config
     end
@@ -282,13 +286,14 @@ module Jekyll
     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
 
     private
+
     def style_to_permalink(permalink_style)
       case permalink_style.to_sym
       when :pretty
@@ -310,78 +315,9 @@ module Jekyll
     # 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" \
-                            " 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").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 ArgumentError.new("Configuration file: (INVALID) #{file}".yellow)
       end
     end
   end

lib/jekyll/converters/markdown.rb

@@ -9,33 +9,23 @@ module Jekyll
         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.error(
-            "",
-            "Available processors are: #{valid_processors.join(", ")}"
-          )
+          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
 
-      # 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
-          custom_processor
+          get_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
@@ -51,13 +41,13 @@ module Jekyll
 
       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
@@ -76,7 +66,7 @@ module Jekyll
       end
 
       private
-      def custom_processor
+      def get_custom_processor
         converter_name = @config["markdown"]
         if custom_class_allowed?(converter_name)
           self.class.const_get(converter_name).new(@config)
@@ -93,7 +83,7 @@ module Jekyll
 
       private
       def custom_class_allowed?(parser_name)
-        parser_name !~ %r![^A-Za-z0-9_]! && self.class.constants.include?(
+        parser_name !~ /[^A-Za-z0-9_]/ && self.class.constants.include?(
           parser_name.to_sym
         )
       end

lib/jekyll/converters/markdown/kramdown_parser.rb

@@ -11,7 +11,7 @@ module Jekyll
           "line_numbers"      => "inline",
           "line_number_start" => 1,
           "tab_width"         => 4,
-          "wrap"              => "div",
+          "wrap"              => "div"
         }.freeze
 
         def initialize(config)
@@ -24,8 +24,7 @@ module Jekyll
 
         # 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.
 
@@ -53,9 +52,7 @@ module Jekyll
           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.
 
@@ -71,10 +68,8 @@ module Jekyll
 
           @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
@@ -86,7 +81,7 @@ module Jekyll
         private
         def strip_coderay_prefix(hash)
           hash.each_with_object({}) do |(key, val), hsh|
-            cleaned_key = key.gsub(%r!\Acoderay_!, "")
+            cleaned_key = key.gsub(/\Acoderay_/, "")
 
             if key != cleaned_key
               Jekyll::Deprecator.deprecation_message(
@@ -104,11 +99,9 @@ module Jekyll
 
         private
         def modernize_coderay_config
-          unless @config["coderay"].empty?
-            Jekyll::Deprecator.deprecation_message(
-              "You are using 'kramdown.coderay' in your configuration, " \
+          if highlighter == "coderay"
+            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(