URL#generate_url_from_drop: optimizations to reduce object creation & speed things up

Hash#reduce vs Hash#each_with_object :thinking_face:
2026-04-28 03:01:03 -04:00 · 2017-08-02 20:18:11 -04:00 · 2017-08-02 17:58:34 -04:00
256 changed files with 1253 additions and 6318 deletions
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -3,7 +3,6 @@ engines:
    enabled: false
  rubocop:
    enabled: true
-    channel: rubocop-0-49

 exclude_paths:
  - .codeclimate.yml
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,86 +0,0 @@
-# The Jekyll project has 6 affinity teams, shown here: https://teams.jekyllrb.com/
-# They are as follows:
-#
-#   1. @jekyll/build
-#   2. @jekyll/documentation
-#   3. @jekyll/ecosystem
-#   4. @jekyll/performance
-#   5. @jekyll/stability
-#   6. @jekyll/windows
-#
-# Each of these teams has a mission. Wherever possible, GitHub should
-# automatically require review from these teams on the pieces of the
-# repository they maintain.
-
-# @jekyll/documentation
-/docs/                               @jekyll/documentation
-
-# @jekyll/build
-/exe/                                @jekyll/build
-/lib/jekyll.rb                       @jekyll/build
-/lib/jekyll/cleaner.rb               @jekyll/build
-/lib/jekyll/collection.rb            @jekyll/build
-/lib/jekyll/command.rb               @jekyll/build
-/lib/jekyll/commands/                @jekyll/build
-/lib/jekyll/converter.rb             @jekyll/build
-/lib/jekyll/converters/              @jekyll/build
-/lib/jekyll/convertible.rb           @jekyll/build
-/lib/jekyll/document.rb              @jekyll/build
-/lib/jekyll/drops/                   @jekyll/build
-/lib/jekyll/entry_filter.rb          @jekyll/build
-/lib/jekyll/errors.rb                @jekyll/build
-/lib/jekyll/excerpt.rb               @jekyll/build
-/lib/jekyll/filters/                 @jekyll/build
-/lib/jekyll/filters.rb               @jekyll/build
-/lib/jekyll/layout.rb                @jekyll/build
-/lib/jekyll/liquid_extensions.rb     @jekyll/build
-/lib/jekyll/liquid_renderer/         @jekyll/build
-/lib/jekyll/liquid_renderer.rb       @jekyll/build
-/lib/jekyll/log_adapter.rb           @jekyll/build
-/lib/jekyll/mime.types               @jekyll/build
-/lib/jekyll/page.rb                  @jekyll/build
-/lib/jekyll/publisher.rb             @jekyll/build
-/lib/jekyll/reader.rb                @jekyll/build
-/lib/jekyll/readers/                 @jekyll/build
-/lib/jekyll/regenerator.rb           @jekyll/build
-/lib/jekyll/related_posts.rb         @jekyll/build
-/lib/jekyll/renderer.rb              @jekyll/build
-/lib/jekyll/site.rb                  @jekyll/build
-/lib/jekyll/static_file.rb           @jekyll/build
-/lib/jekyll/stevenson.rb             @jekyll/build
-/lib/jekyll/tags/                    @jekyll/build
-/lib/jekyll/url.rb                   @jekyll/build
-/lib/jekyll/utils/                   @jekyll/build
-/lib/jekyll/utils.rb                 @jekyll/build
-
-# @jekyll/ecosystem
-/lib/jekyll/external.rb              @jekyll/ecosystem
-/lib/jekyll/generator.rb             @jekyll/ecosystem
-/lib/jekyll/hooks.rb                 @jekyll/ecosystem
-/lib/jekyll/plugin.rb                @jekyll/ecosystem
-/lib/jekyll/plugin_manager.rb        @jekyll/ecosystem
-/lib/jekyll/theme.rb                 @jekyll/ecosystem
-/lib/jekyll/theme_builder.rb         @jekyll/ecosystem
-
-# @jekyll/stability
-Gemfile                              @jekyll/stability
-*.gemspec                            @jekyll/stability
-.travis.yml                          @jekyll/stability
-appveyor.yml                         @jekyll/stability
-/lib/jekyll/configuration.rb         @jekyll/stability
-/lib/jekyll/deprecator.rb            @jekyll/stability
-/lib/jekyll/frontmatter_defaults.rb  @jekyll/stability
-/lib/site_template                   @jekyll/stability
-/lib/theme_template                  @jekyll/stability
-/features/                           @jekyll/stability
-/test/                               @jekyll/stability
-
-# Special cases
-.github/                             @jekyll/affinity-team-captains
-CODE_OF_CONDUCT.markdown             @jekyll/affinity-team-captains
-History.markdown                     @jekyll/affinity-team-captains
-LICENSE                              @jekyll/affinity-team-captains   # This file should never change.
-README.markdown                      @jekyll/affinity-team-captains
-/lib/jekyll/version.rb               @jekyll/affinity-team-captains
-/rake/                               @jekyll/affinity-team-captains
-/script/                             @jekyll/affinity-team-captains
--- a/.github/CONTRIBUTING.markdown
+++ b/.github/CONTRIBUTING.markdown
@@ -4,7 +4,10 @@ Hi there! Interested in contributing to Jekyll? We'd love your help. Jekyll is a

 ## Where to get help or report a problem

-See [the support guidelines](https://jekyllrb.com/docs/support/)
+* If you have a question about using Jekyll, start a discussion on [Jekyll Talk](https://talk.jekyllrb.com).
+* If you think you've found a bug within a Jekyll plugin, open an issue in that plugin's repository.
+* If you think you've found a bug within Jekyll itself, [open an issue](https://github.com/jekyll/jekyll/issues/new).
+* More resources are listed on our [Help page](https://jekyllrb.com/help/).

 ## Ways to contribute

@@ -111,37 +114,25 @@ If your contribution changes any Jekyll behavior, make sure to update the docume

 * Don't bump the Gem version in your pull request (if you don't know what that means, you probably didn't).

-* You can use the command `script/console` to start a REPL to explore the result of
-Jekyll's methods. It also provides you with helpful methods to quickly create a
-site or configuration. [Feel free to check it out!](https://github.com/jekyll/jekyll/blob/master/script/console)
-
 ## Running tests locally

 ### Test Dependencies

 To run the test suite and build the gem you'll need to install Jekyll's dependencies by running the following command:

-```sh
-script/bootstrap
-```
+<pre class="highlight"><code>$ script/bootstrap</code></pre>

 Before you make any changes, run the tests and make sure that they pass (to confirm your environment is configured properly):

-```sh
-script/cibuild
-```
+<pre class="highlight"><code>$ script/cibuild</code></pre>

 If you are only updating a file in `test/`, you can use the command:

-```sh
-script/test test/blah_test.rb
-```
+<pre class="highlight"><code>$ script/test test/blah_test.rb</code></pre>

 If you are only updating a `.feature` file, you can use the command:

-```sh
-script/cucumber features/blah.feature
-```
+<pre class="highlight"><code>$ script/cucumber features/blah.feature</code></pre>

 Both `script/test` and `script/cucumber` can be run without arguments to
 run its entire respective suite.
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -10,6 +10,9 @@
  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!
 -->

@@ -76,3 +79,5 @@
  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)
--- a/.github/SUPPORT.markdown
+++ b/.github/SUPPORT.markdown
@@ -1,20 +0,0 @@
-# Jekyll Support
-
-## Getting Help
-
-**Jekyll's issue tracker is not a support forum.**
-
-If you're looking for support for Jekyll, there are a lot of options:
-
-* Read [Jekyll Documentation](https://jekyllrb.com/docs/home/)
-* If you have a question about using Jekyll, start a discussion on [Jekyll Forum](https://talk.jekyllrb.com/) or [StackOverflow](https://stackoverflow.com/questions/tagged/jekyll)
-* Chat with Jekyllers &mdash; Join [our Gitter channel](https://gitter.im/jekyll/jekyll) or [our IRC channel on Freenode](irc:irc.freenode.net/jekyll)
-
-There are a bunch of helpful community members on these services that should be willing to point you in the right direction.
-
-## Report a bug
-
-* If you think you've found a bug within a Jekyll plugin, open an issue in that plugin's repository &mdash; First [look for the plugin on rubygems](https://rubygems.org/) then click on the `Homepage` link to access the plugin repository.
-* If you think you've found a bug within Jekyll itself, [open an issue](https://github.com/jekyll/jekyll/issues/new).
-
-Happy Jekyllin'!
--- a/.github/first-timers-issue-template.md
+++ b/.github/first-timers-issue-template.md
@@ -1,44 +0,0 @@
-### 🆕🐥☝ First Timers Only.
-
-This issue is reserved for people who never contributed to Open Source before. We know that the process of creating a pull request is the biggest barrier for new contributors. This issue is for you 💝
-
-[About First Timers Only](http://www.firsttimersonly.com/).
-
-### 🤔 What you will need to know.
-
-Nothing. This issue is meant to welcome you to Open Source :) We are happy to walk you through the process.
-
-### 📋 Step by Step
-
- [ ] 👌 **Join the team**: Add yourself to a Jekyll affinity team.
-
-  Go to [teams.jekyllrb.com](https://teams.jekyllrb.com/) and join a team that best fits your interests. Once you click the link to join a team, you will soon recieve an email inviting you to join the Jekyll organization.
-
- [ ] 🙋 **Claim this issue**: Comment below.
-
-  Leave a comment that you have claimed this issue.
-
- [ ] 📝 **Update** the file [$FILENAME]($BRANCH_URL) in the `$REPO` repository (press the little pen Icon) and edit the line as shown below.
-
-
-```diff
-$DIFF
-```
-
-
- [ ] 💾 **Commit** your changes
-
- [ ] 🔀 **Start a Pull Request**. There are two ways how you can start a pull request:
-
-  1. If you are familiar with the terminal or would like to learn it, [here is a great tutorial](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github) on how to send a pull request using the terminal.
-
-  2. You can [edit files directly in your browser](https://help.github.com/articles/editing-files-in-your-repository/)
-
- [ ] 🏁 **Done** Ask in comments for a review :)
-
-### 🤔❓ Questions
-
-Leave a comment below!
-
-
-This issue was created by [First-Timers-Bot](https://github.com/hoodiehq/first-timers-bot).
--- a/.github/first-timers.yml
+++ b/.github/first-timers.yml
@@ -1,6 +0,0 @@
-repository: jekyll
-labels:
-  - good first issue
-  - help-wanted
-  - first-time-only
-template: .github/first-timers-issue-template.md
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,14 +1,6 @@
 ---
-
-require:
-  - ./rubocop/jekyll
-
-Jekyll/NoPutsAllowed:
-  Exclude:
-    - rake/*.rake
-
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.0
  Include:
    - lib/**/*.rb
  Exclude:
@@ -17,7 +9,6 @@ AllCops:
    - benchmark/**/*
    - script/**/*
    - vendor/**/*
-    - tmp/**/*
 Layout/AlignArray:
  Enabled: false
 Layout/AlignHash:
@@ -29,7 +20,7 @@ Layout/EmptyLinesAroundAccessModifier:
 Layout/EmptyLinesAroundModuleBody:
  Enabled: false
 Layout/EndOfLine:
-  EnforcedStyle: native
+  EnforcedStyle: lf
 Layout/ExtraSpacing:
  AllowForAlignment: true
 Layout/FirstParameterIndentation:
@@ -46,6 +37,8 @@ Layout/MultilineMethodCallIndentation:
  EnforcedStyle: indented
 Layout/MultilineOperationIndentation:
  EnforcedStyle: indented
+Layout/SpaceAroundOperators:
+  Enabled: true
 Layout/SpaceInsideBrackets:
  Enabled: false
 Lint/EndAlignment:
@@ -54,8 +47,6 @@ Lint/UnreachableCode:
  Severity: error
 Lint/UselessAccessModifier:
  Enabled: false
-Lint/Void:
-  Enabled: false
 Metrics/AbcSize:
  Max: 21
 Metrics/BlockLength:
@@ -90,10 +81,6 @@ Metrics/ParameterLists:
  Max: 4
 Metrics/PerceivedComplexity:
  Max: 8
-Naming/FileName:
-  Enabled: false
-Naming/HeredocDelimiterNaming:
-  Enabled: false
 Security/MarshalLoad:
  Exclude:
    - !ruby/regexp /test\/.*.rb$/
@@ -106,18 +93,20 @@ Style/Alias:
  Enabled: false
 Style/AndOr:
  Severity: error
+Style/Attr:
+  Enabled: false
 Style/BracesAroundHashParameters:
  Enabled: false
 Style/ClassAndModuleChildren:
  Enabled: false
-Style/FrozenStringLiteralComment:
-  EnforcedStyle: always
 Style/Documentation:
  Enabled: false
  Exclude:
    - !ruby/regexp /features\/.*.rb$/
 Style/DoubleNegation:
  Enabled: false
+Style/FileName:
+  Enabled: false
 Style/GuardClause:
  Enabled: false
 Style/HashSyntax:
@@ -160,3 +149,5 @@ Style/SymbolArray:
  Enabled: false
 Style/TrailingCommaInLiteral:
  EnforcedStyleForMultiline: consistent_comma
+Style/UnneededCapitalW:
+  Enabled: false
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,11 @@ language: ruby
 sudo: false

 rvm:
-  - &ruby1 2.5.0
-  - &ruby2 2.4.3
-  - &ruby3 2.3.6
-  - &ruby4 2.2.9
-  - &jruby jruby-9.1.15.0
+  - &ruby1 2.4.1
+  - &ruby2 2.3.4
+  - &ruby3 2.2.7
+  - &ruby4 2.1.10
+  - &jruby jruby-9.1.7.0

 matrix:
  include:
--- a/CODE_OF_CONDUCT.markdown
+++ b/CODE_OF_CONDUCT.markdown
--- a/23
+++ b/23
@@ -1,12 +1,8 @@
-# frozen_string_literal: true
-
 source "https://rubygems.org"
 gemspec :name => "jekyll"

 gem "rake", "~> 12.0"

-gem "rouge", ENV["ROUGE"] if ENV["ROUGE"]
-
 # Dependency of jekyll-mentions. RubyGems in Ruby 2.1 doesn't shield us from this.
 gem "activesupport", "~> 4.2", :groups => [:test_legacy, :site] if RUBY_VERSION < "2.2.2"

@@ -23,15 +19,14 @@ end

 group :test do
  gem "codeclimate-test-reporter", "~> 1.0.5"
-  gem "cucumber", RUBY_VERSION >= "2.2" ? "~> 3.0" : "3.0.1"
-  gem "httpclient"
+  gem "cucumber", "~> 2.1"
  gem "jekyll_test_plugin"
  gem "jekyll_test_plugin_malicious"
  # nokogiri v1.8 does not work with ruby 2.1 and below
  gem "nokogiri", RUBY_VERSION >= "2.2" ? "~> 1.7" : "~> 1.7.0"
  gem "rspec"
  gem "rspec-mocks"
-  gem "rubocop", "~> 0.51.0"
+  gem "rubocop", "~> 0.49.1"
  gem "test-dependency-theme", :path => File.expand_path("test/fixtures/test-dependency-theme", __dir__)
  gem "test-theme", :path => File.expand_path("test/fixtures/test-theme", __dir__)

@@ -48,6 +43,7 @@ group :test_legacy do
  gem "minitest"
  gem "minitest-profile"
  gem "minitest-reporters"
+  gem "redgreen"
  gem "shoulda"
  gem "simplecov"
 end
@@ -57,6 +53,7 @@ end
 group :benchmark do
  if ENV["BENCHMARK"]
    gem "benchmark-ips"
+    gem "benchmark-memory"
    gem "rbtrace"
    gem "ruby-prof"
    gem "stackprof"
@@ -73,18 +70,18 @@ group :jekyll_optional_dependencies do
  gem "jekyll-gist"
  gem "jekyll-paginate"
  gem "jekyll-redirect-from"
-  gem "kramdown", "~> 1.14"
+  gem "kramdown", "~> 1.9"
  gem "mime-types", "~> 3.0"
-  gem "rdoc", RUBY_VERSION >= "2.2.2" ? "~> 6.0" : "~> 5.1"
-  gem "tomlrb", "~> 1.2"
+  gem "rdoc", "~> 5.0"
+  gem "toml", "~> 0.1.0"

  platform :ruby, :mswin, :mingw, :x64_mingw do
-    gem "classifier-reborn", "~> 2.2.0"
+    gem "classifier-reborn", "~> 2.1.0"
    gem "liquid-c", "~> 3.0"
-    gem "pygments.rb", "~> 1.0"
+    gem "pygments.rb", "~> 0.6.0"
    gem "rdiscount", "~> 2.0"
    gem "redcarpet", "~> 3.2", ">= 3.2.3"
-    gem "yajl-ruby", "~> 1.3.1"
+    gem "yajl-ruby", "~> 1.2"
  end

  # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
--- a/History.markdown
+++ b/History.markdown
@@ -1,190 +1,12 @@
-## 3.7.2 / 2018-01-25
+## HEAD

 ### Development Fixes

-  * CI: Test against Ruby 2.5.0 (#6664)
-  * Bump rdoc to 6.0 (#6600)
-  * Lint file and bump theme dependencies (#6698)
-  * Write a Rubocop Cop to ensure no `#p` or `#puts` calls get committed to master. (#6615)
-  * Remove redgreen gem (#6720)
-
-### Site Enhancements
-
-  * Display latest version in header (#6676)
-  * Update version in `config.yml` via YAML load / dump (#6677)
-
-### Documentation
-
-  * Fix: Add note about posts in context of collections_dir (#6680)
-  * Update deploy-script in documentation (#6666)
-  * Add note about naming of collections_dir (#6703)
-  * Update installation.md (#6694)
-  * Add `jekyll-html` to plugins. (#6654)
-  * Update plugins.md (#6716)
-  * Release v3.7.1 (#6695)
-
-### Bug Fixes
-
-  * inform that symlinks are not allowed in safe mode (#6670)
-  * Glob scope path only if configured with a pattern (#6692)
-  * Add gem &#34;wdm&#34; to all newly generated Gemfiles (#6711)
-  * Fix timezone incosistencies between different ruby version (#6697)
-  * Refactor collections_dir feature for consistency (#6685)
-
-### Minor Enhancements
-
-  * Require external library only if necessary (#6596)
-
-## 3.7.0 / 2018-01-02
-
-### Minor Enhancements
-
-  * Add LiveReload functionality to Jekyll. (#5142)
-  * Add Utils::Internet.connected? to determine whether host machine has internet connection. (#5870)
-  * Disable default layouts for Pages with a `layout: none` declaration (#6182)
-  * Scope path glob (#6268)
-  * Allow the user to set collections_dir to put all collections under one subdirectory (#6331)
-  * Upgrade to Rouge 3 (#6381)
-  * Allow URL filters to work directly with documents (#6478)
-  * filter relative_url should keep absolute urls with scheme/authority (#6490)
-  * `.sass-cache` doesn&#39;t *always* land in `options[&#39;source&#39;]` (#6500)
-  * Allow plugins to modify the obsolete files. (#6502)
-  * Add latin mode to `slugify` (#6509)
-  * Log Kramdown warnings if log level is WARN (#6522)
-  * Add an option to configure kramdown warning output (#6554)
-  * Add `json` extension to list of directory indices (#6550)
-  * Dependency: Bump jekyll-watch to 2.0 (#6589)
-  * Remove paginate check (#6606)
-  * update classifier-reborn to 2.2.0 (#6631)
-  * Switch to an actively-maintained TOML parser. (#6652)
-  * Do not coerce layout paths in theme-gem to the source directory (#6603)
-
-### Bug Fixes
-
-  * Raise when theme root directory is not available (#6455)
-  * Avoid block parser warning in SmartyPants (#6565)
-  * Fail gracefully if &#34;sass&#34; gem cannot be loaded (#6573)
-  * return correct file in dir if dir has same name as file (#6569)
-  * Register reload hooks in Server#process (#6605)
-  * Memoize path to metadata file (#6602)
-  * Use `require_relative` to load Jekyll classes (#6609)
-
-### Development Fixes
-
-  * Added direct collection access to future collection item feature test(#6151)
-  * add failing test for non-utf8 encoding (#6339)
-  * Upgrade to Cucumber 3.0 (#6395)
-  * Provide a better default hash for tracking liquid stats (#6417)
-  * Add configuration for first-timers bot (#6431)
-  * Do not linkify escaped characters as PRs in History (#6468)
-  * Rely on jekyll-mentions for linking usernames (#6469)
-  * Update first-timers-issue-template.md (#6472)
-  * Enable `Lint/RescueWithoutErrorClass` Cop (#6482)
-  * Clean up Rubocop config (#6495)
-  * Use Gem to discover the location of bundler (#6499)
-  * Remove unnecessary encoding comment (#6513)
-  * Suggest using Rubocop to automatically fix errors (#6514)
-  * Assert raising Psych::SyntaxError when`&#34;strict_front_matter&#34;=&gt;true` (#6520)
-  * Use Kernel#Array instead of explicit Array check (#6525)
-  * RuboCop: Enable `Style/UnneededCapitalW` cop (#6526)
-  * Refactor method to reduce ABC Metric size (#6529)
-  * Remove parentheses around arguments to raise (#6532)
-  * Use double-quotes around gem name (#6535)
-  * Dependencies: upgrade to toml 0.2.0 (#6541)
-  * Lock to cucumber 3.0.1 on Ruby 2.1 (#6546)
-  * Bump JRuby version in Travis config (#6561)
-  * Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML(#5828)
-  * Drop forwarding to private methods by exposing those methods as public(#6577)
-  * Upgrade pygments to v1.x (#5937)
-  * Bump yajl-ruby (#6582)
-  * Cleanup test_redcarpet.rb (#6584)
-  * Add PageWithoutAFile class from jekyll plugins (#6556)
-  * Cleanup LiveReloadReactor (#6607)
-
-### Documentation
-
-  * Add formester to the list of saas form backend (#6059)
-  * GitHub Pages instructions (#6384)
-  * Improve documentation for theme-gem installation (#6387)
-  * Fix diff syntax-highlighting (#6388)
-  * Update instructions (#6396)
-  * Fix code-block highlighting in docs (#6398)
-  * Filtering Posts with categories, tags, or other variables (#6399)
-  * Fixes formatting on pre-formatted text. (#6405)
-  * Added new tutorial to tutorials section on docs (#6406)
-  * Updates (#6407)
-  * Fix `collections_dir` example (#6408)
-  * Renaming duplicate of &#34;Scenario 6&#34; to &#34;Scenario 7&#34; (#6411)
-  * Mark `collection_dir` as unreleased (#6412)
-  * Fix link to SUPPORT (#6415)
-  * Fix list appearance by adding missing `ol` tag (#6421)
-  * Explain how to override output collection index page (#6424)
-  * Added github-cards to the list of plugins (#6425)
-  * CoC violation correspondants (#6429)
-  * Add a note about Liquid and syntax highlighting (#6466)
-  * Remove `sudo` from macOS troubleshooting instructions (#6486)
-  * Add a note on `:jekyll_plugins` group in the docs (#6488)
-  * Updated custom-404-page.md (#6489)
-  * Fix a few minor issues in the docs (#6494)
-  * Add jekyll-pwa-plugin (#6533)
-  * Remove Jekyll-Smartify from plugins directory (#6548)
-  * Updated Jekyll-Pug listing to include official website (#6555)
-  * Remove link to severly outdated asset plugin (#6613)
-  * Default time zone depends upon server (#6617)
-  * Add `disqus-for-jekyll` to plugins. (#6618)
-  * Update &#34;Requirements&#34; for Ruby version (#6623)
-  * Fix: Update link to i18n_filter plugin (#6638)
-  * Correct WordPress capitalization (#6645)
-  * Add Tweetsert, Stickyposts, Paginate::Content (#6651)
-  * Post: Jekyll 3.7.0 released (#6634)
-
-### Site Enhancements
-
-  * Add special styling for code-blocks run in shell (#6389)
-  * Add post about diversity (#6447)
-  * Update list of files excluded from Docs site (#6457)
-  * Update site History (#6460)
-  * Add default twitter card image (#6476)
-  * Update normalize.css to v7.0.0 (#6491)
-  * Optimize images (#6519)
-  * Back to original main navigation (#6544)
-  * Styles: mobile-docs select element (#6545)
-  * Search with DocSearch by @Algolia (#6557)
-  * Site header redesign (#6567)
-  * Move logo above site navigation on small screens (#6570)
-  * Docs: Include version badge for latest features (#6574)
-  * Use version-badge on an existing feature intro (#6575)
-  * Add jekyll-category-pages plugin (#6632)
-  * Improve docs styling for code to be run in shell (#6641)
-  * Fix permalink icon markup in news-item layout (#6639)
-
-## 3.6.2 / 2017-10-21
-
-### Development Fixes
-
-  * Update Rubocop to 0.51.0 (#6444)
-  * Add test for layout as string (#6445)
-
-### Bug Fixes
-
-  * Problematic UTF+bom files (#6322)
-  * Always treat `data.layout` as a string (#6442)
-
-## 3.6.1 / 2017-10-20
-
-### Documentation
-
-  * Doc y_day in docs/permalinks (#6244)
-  * Update frontmatter.md (#6371)
-  * Elaborate on excluding items from processing (#6136)
-  * Style lists in tables (#6379)
-  * Remove duplicate &#34;available&#34; (#6380)
-
-### Development Fixes
-
-  * Bump rubocop to use `v0.50.x` (#6368)
-
-## 3.6.0 / 2017-09-21
+  * Strip unnecessary leading whitespace in template (#6228)
+  * Users should be installing patch versions. (#6198)
+  * fix tests (#6240)
+  * Define path with __dir__ (#6087)
+  * exit site.process sooner (#6239)

 ### Minor Enhancements

@@ -192,82 +14,22 @@
  * Add URL checks to Doctor (#5760)
  * Fix serving files that clash with directories (#6222) (#6231)
  * Bump supported Ruby version to `>= 2.1.0` (#6220)
-  * set `LiquidError#template_name` for errors in included file (#6206)
-  * Access custom config array throughout session (#6200)
-  * Add support for Rouge 2, in addition to Rouge 1 (#5919)
-  * Allow `yield` to logger methods &amp; bail early on no-op messages (#6315)
-  * Update mime-types. (#6336)
-  * Use a Schwartzian transform with custom sorting (#6342)
-  * Alias `Drop#invoke_drop` to `Drop#[]` (#6338)

 ### Bug Fixes

  * `Deprecator`: fix typo for `--serve` command (#6229)
  * `Reader#read_directories`: guard against an entry not being a directory (#6226)
  * kramdown: symbolize keys in-place (#6247)
-  * Call `to_s` on site.url before attempting to concatenate strings (#6253)
-  * Enforce Style/FrozenStringLiteralComment (#6265)
-  * Update theme-template README to note &#39;assets&#39; directory (#6257)
-  * Memoize the return value of `Document#url` (#6266)
-  * delegate `StaticFile#to_json` to `StaticFile#to_liquid` (#6273)
-  * Fix `Drop#key?` so it can handle a nil argument (#6281)
-  * Guard against type error in absolute url (#6280)
-  * Mutable drops should fallback to their own methods when a mutation isn&#39;t present (#6350)
-  * Skip adding binary files as posts (#6344)
-  * Don&#39;t break if bundler is not installed (#6377)
+  * Call to_s on site.url before attempting to concatenate strings (#6253)

 ### Documentation

  * Fix a typo in `custom-404-page.md` (#6218)
  * Docs: fix links to issues in History.markdown (#6255)
-  * Update deprecated gems key to plugins. (#6262)
-  * Fixes minor typo in post text (#6283)
-  * Execute build command using bundle. (#6274)
-  * name unification - buddy details (#6317)
-  * name unification - application index (#6318)
-  * trim and relocate plugin info across docs (#6311)
-  * update Jekyll&#39;s README (#6321)
-  * add SUPPORT file for GitHub (#6324)
-  * Rename CODE_OF_CONDUCT to show in banner (#6325)
-  * Docs : illustrate page.id for a collection&#39;s document (#6329)
-  * Docs: post&#39;s date can be overriden in YAML front matter (#6334)
-  * Docs: `site.url` behavior on development and production environments (#6270)
-  * Fix typo in site.url section of variables.md :-[ (#6337)
-  * Docs: updates (#6343)
-  * Fix precedence docs (#6346)
-  * add note to contributing docs about `script/console` (#6349)
-  * Docs: Fix permalink example (#6375)

 ### Site Enhancements

  * Adding DevKit helpers (#6225)
-  * Customizing url in collection elements clarified (#6264)
-  * Plugins is the new gems (#6326)
-
-### Development Fixes
-
-  * Strip unnecessary leading whitespace in template (#6228)
-  * Users should be installing patch versions. (#6198)
-  * Fix tests (#6240)
-  * Define path with `__dir__` (#6087)
-  * exit site.process sooner (#6239)
-  * make flakey test more robust (#6277)
-  * Add a quick test for DataReader (#6284)
-  * script/backport-pr: commit message no longer includes the `#` (#6289)
-  * Add Add CODEOWNERS file to help automate reviews. (#6320)
-  * Fix builds on codeclimate (#6333)
-  * Bump rubies on Travis (#6366)
-
-## 3.5.2 / 2017-08-12
-
-### Bug Fixes
-
-  * Backport #6281 for v3.5.x: Fix `Drop#key?` so it can handle a nil argument (#6288)
-  * Backport #6280 for v3.5.x: Guard against type error in `absolute_url` (#6287)
-  * Backport #6266 for v3.5.x: Memoize the return value of `Document#url` (#6301)
-  * Backport #6273 for v3.5.x: delegate `StaticFile#to_json` to `StaticFile#to_liquid` (#6302)
-  * Backport #6226 for v3.5.x: `Reader#read_directories`: guard against an entry not being a directory (#6304)
-  * Backport #6247 for v3.5.x: kramdown: symbolize keys in-place (#6303)

 ## 3.5.1 / 2017-07-17

@@ -288,7 +50,7 @@
  * added BibSonomy plugin (#6143)
  * add plugins for multiple page pagination (#6055)
  * Update minimum Ruby version in installation.md (#6164)
-  * Add information about finding a collection in `site.collections` (#6165)
+  * [docs] Add information about finding a collection in `site.collections` (#6165)
  * Add `{% raw %}` to Liquid example on site (#6179)
  * Added improved Pug plugin - removed 404 Jade plugin (#6174)
  * Linking the link (#6210)
@@ -393,7 +155,7 @@

 ### Development Fixes

-  * Rubocop: add missing comma (#5835)
+  * [Rubocop] add missing comma (#5835)
  * Appease classifier-reborn (#5934)
  * Allow releases & development on `*-stable` branches (#5926)
  * Add script/backport-pr (#5925)
@@ -430,7 +192,7 @@
 ### Bug Fixes

  * Exclude Gemfile by default (#5860)
-  * Convertible#validate_permalink!: ensure the return value of `data["permalink"]` is a string before asking if it is empty (#5878)
+  * Convertible#validate_permalink!: ensure the return value of data["permalink"] is a string before asking if it is empty (#5878)
  * Allow abbreviated post dates (#5920)
  * Remove dependency on include from default about.md (#5903)
  * Allow colons in `uri_escape` filter (#5957)
@@ -491,7 +253,7 @@
  * Switch to `https` when possible. (#5611)
  * Update `_font-awesome.scss` to move .woff file before .ttf (#5614)
  * Update documentation on updating FontAwesome Iconset (#5655)
-  * Use defaults for docs and news-items (#5744)
+  * [site] Use defaults for docs and news-items (#5744)
  * Sort gems in `docs/_config.yml` (#5746)
  * Add missing class (#5791)
  * Improve template docs (#5694)
@@ -552,7 +314,7 @@
  * Update quickstart.md (#5758)
  * Correct minor typo (#5764)
  * Fix a markdown link to look properly on the web (#5769)
-  * Info about the help command usage (#5312)
+  * [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)
@@ -684,10 +446,10 @@
  * Site: exclude README.md and .gitignore (#5304)
  * Add link to Staticman (#5224)
  * Update url for OpenShift (#5320)
-  * Add help for missing static_file e.g. on heroku (#5334)
+  * [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)
-  * .md as default extension in examples (#5316)
+  * [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)
@@ -696,7 +458,7 @@
  * Add documentation for `relative_url` and `absolute_url` (#5405)
  * Bugfix on logo in JSON-LD (#5421)
  * Fix Travis.ci documentation (#5413)
-  * Update documentation regarding `bundle install` after `jekyll new` (#5428)
+  * [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)
@@ -1000,7 +762,7 @@
  * Fix broken links to the Code of Conduct (#4436)
  * Upgrade notes: mention trailing slash in permalink; fixes #4440 (#4455)
  * Add hooks to the plugin categories toc (#4463)
-  * Jekyll 3 requires newer version of Ruby. (#4461)
+  * [add note] Jekyll 3 requires newer version of Ruby. (#4461)
  * Fix typo in upgrading docs (#4473)
  * Add note about upgrading documentation on jekyllrb.com/help/ (#4484)
  * Update Rake link (#4496)
@@ -1068,7 +830,7 @@
  * Fix deep_merge_hashes! handling of drops and hashes (#4359)
  * Page should respect output extension of its permalink (#4373)
  * Disable auto-regeneration when running server detached (#4376)
-  * Drop#: only use public_send for keys in the content_methods array (#4388)
+  * Drop#[]: only use public_send for keys in the content_methods array (#4388)
  * Extract title from filename successfully when no date. (#4195)

 ### Development Fixes
@@ -1470,7 +1232,7 @@

 ### Site Enhancements

-  * Add @alfredxing to the @jekyll/core team. :tada: (#3218)
+  * Add `@alfredxing` to the `@jekyll/core` team. :tada: (#3218)
  * Document the `-q` option for the `build` and `serve` commands (#3149)
  * Fix some minor typos/flow fixes in documentation website content (#3165)
  * Add `keep_files` to configuration documentation (#3162)
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2008-2018 Tom Preston-Werner and Jekyll contributors
+Copyright (c) 2008-2017 Tom Preston-Werner and Jekyll contributors

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.markdown
+++ b/README.markdown
@@ -22,9 +22,7 @@ Jekyll is a simple, blog-aware, static site generator perfect for personal, proj

 Jekyll does what you tell it to do — no more, no less. It doesn't try to outsmart users by making bold assumptions, nor does it burden them with needless complexity and configuration. Put simply, Jekyll gets out of your way and allows you to concentrate on what truly matters: your content.

-See: https://jekyllrb.com/philosophy
-
-## Having trouble?
+## Having trouble with OS X/macOS?

 See: https://jekyllrb.com/docs/troubleshooting/

@@ -39,13 +37,13 @@ See: https://jekyllrb.com/docs/troubleshooting/
 ## Code of Conduct

 In order to have a more open and welcoming community, Jekyll adheres to a
-[code of conduct](CODE_OF_CONDUCT.markdown) adapted from the Ruby on Rails code of
+[code of conduct](CONDUCT.markdown) adapted from the Ruby on Rails code of
 conduct.

 Please adhere to this code of conduct in any interactions you have in the
 Jekyll community. It is strictly enforced on all official Jekyll
 repositories, websites, and resources. If you encounter someone violating
-these terms, please let one of our core team members [Olivia](mailto:olivia@jekyllrb.com?subject=Jekyll%20CoC%20Violation), [Pat](mailto:pat@jekyllrb.com?subject=Jekyll%20CoC%20Violation), [Matt](mailto:matt@jekyllrb.com?subject=Jekyll%20CoC%20Violation) or [Parker](mailto:parker@jekyllrb.com?subject=Jekyll%20CoC%20Violation) know and we will address it as soon as possible.
+these terms, please let 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.

 ## Diving In

--- a/18
+++ b/18
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "rubygems"
 require "rake"
 require "rdoc"
@@ -46,13 +44,19 @@ def normalize_bullets(markdown)
 end

 def linkify_prs(markdown)
-  markdown.gsub(%r!(?<\!&)#(\d+)!) do |word|
+  markdown.gsub(%r!#(\d+)!) do |word|
    "[#{word}]({{ site.repository }}/issues/#{word.delete("#")})"
  end
 end

+def linkify_users(markdown)
+  markdown.gsub(%r!(@\w+)!) do |username|
+    "[#{username}](https://github.com/#{username.delete("@")})"
+  end
+end
+
 def linkify(markdown)
-  linkify_prs(markdown)
+  linkify_users(linkify_prs(markdown))
 end

 def liquid_escape(markdown)
@@ -66,11 +70,11 @@ def custom_release_header_anchors(markdown)
    _, major, minor, patch = *release_notes.match(header_regexp)
    release_notes
      .gsub(header_regexp, "\\0\n{: #v\\1-\\2-\\3}")
-      .gsub(section_regexp) { |section| "#{section}\n{: ##{slugify(section)}-v#{major}-#{minor}-#{patch}}" }
+      .gsub(section_regexp) { |section| "#{section}\n{: ##{sluffigy(section)}-v#{major}-#{minor}-#{patch}}" }
  end.join("\n## ")
 end

-def slugify(header)
+def sluffigy(header)
  header.delete("#").strip.downcase.gsub(%r!\s+!, "-")
 end

@@ -95,7 +99,7 @@ def siteify_file(file, overrides_front_matter = {})
  abort "You seem to have misplaced your #{file} file. I can haz?" unless File.exist?(file)
  title = begin
            File.read(file).match(%r!\A# (.*)$!)[1]
-          rescue NoMethodError
+          rescue
            File.basename(file, ".*").downcase.capitalize
          end
  slug  = File.basename(file, ".markdown").downcase
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,6 +28,8 @@ environment:
      TEST_SUITE: "test"
    - RUBY_FOLDER_VER: "22"
      TEST_SUITE: "test"
+    - RUBY_FOLDER_VER: "21"
+      TEST_SUITE: "test"

 test_script:
  - ruby --version
--- a/benchmark/reduce-vs-each-with-object
+++ b/benchmark/reduce-vs-each-with-object
@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "benchmark/ips"
+require "benchmark/memory"
+
+GC.disable
+
+PERIOD = "."
+PROPERTY_AS_HASH = ["hello", "there_oh", "friends"]
+property = "hello.there_oh.friends"
+item = Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
+
+def candidate(property, item)
+  property.to_s.split(".".freeze).each_with_object(item) do |attribute, memo|
+    memo = memo[attribute]
+  end
+end
+
+def control(property, item)
+  property.to_s.split(".").reduce(item) do |subvalue, attribute|
+    subvalue[attribute]
+  end
+end
+
+Benchmark.ips do |x|
+  x.report("candidate") { candidate(property, item) }
+  x.report("control")   { control(property, item) }
+  x.compare!
+end
+
+Benchmark.memory do |x|
+  x.report("candidate") { candidate(property, item) }
+  x.report("control")   { control(property, item) }
+  x.compare!
+end
--- a/benchmark/schwartzian_transform.rb
+++ b/benchmark/schwartzian_transform.rb
@@ -1,115 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# The Ruby documentation for #sort_by describes what's called a Schwartzian transform:
-#
-#  > A more efficient technique is to cache the sort keys (modification times in this case)
-#  > before the sort. Perl users often call this approach a Schwartzian transform, after
-#  > Randal Schwartz. We construct a temporary array, where each element is an array
-#  > containing our sort key along with the filename. We sort this array, and then extract
-#  > the filename from the result.
-#  > This is exactly what sort_by does internally.
-#
-# The well-documented efficiency of sort_by is a good reason to use it. However, when a property
-# does not exist on an item being sorted, it can cause issues (no nil's allowed!)
-# In Jekyll::Filters#sort_input, we extract the property in each iteration of #sort,
-# which is quite inefficient! How inefficient? This benchmark will tell you just how, and how much
-# it can be improved by using the Schwartzian transform. Thanks, Randall!
-
-require 'benchmark/ips'
-require 'minitest'
-require File.expand_path("../lib/jekyll", __dir__)
-
-def site
-  @site ||= Jekyll::Site.new(
-    Jekyll.configuration("source" => File.expand_path("../docs", __dir__))
-  ).tap(&:reset).tap(&:read)
-end
-
-def site_docs
-  site.collections["docs"].docs.dup
-end
-
-def sort_by_property_directly(docs, meta_key)
-  docs.sort! do |apple, orange|
-    apple_property = apple[meta_key]
-    orange_property = orange[meta_key]
-
-    if !apple_property.nil? && !orange_property.nil?
-      apple_property <=> orange_property
-    elsif !apple_property.nil? && orange_property.nil?
-      -1
-    elsif apple_property.nil? && !orange_property.nil?
-      1
-    else
-      apple <=> orange
-    end
-  end
-end
-
-def schwartzian_transform(docs, meta_key)
-  docs.collect! { |d|
-    [d[meta_key], d]
-  }.sort! { |apple, orange|
-    if !apple[0].nil? && !orange[0].nil?
-      apple.first <=> orange.first
-    elsif !apple[0].nil? && orange[0].nil?
-      -1
-    elsif apple[0].nil? && !orange[0].nil?
-      1
-    else
-      apple[-1] <=> orange[-1]
-    end
-  }.collect! { |d| d[-1] }
-end
-
-# Before we test efficiency, do they produce the same output?
-class Correctness
-  include Minitest::Assertions
-
-  require "pp"
-  define_method :mu_pp, &:pretty_inspect
-
-  attr_accessor :assertions
-
-  def initialize(docs, property)
-    @assertions = 0
-    @docs = docs
-    @property = property
-  end
-
-  def assert!
-    assert sort_by_property_directly(@docs, @property).is_a?(Array), "sort_by_property_directly must return an array"
-    assert schwartzian_transform(@docs, @property).is_a?(Array), "schwartzian_transform must return an array"
-    assert_equal sort_by_property_directly(@docs, @property),
-      schwartzian_transform(@docs, @property)
-    puts "Yeah, ok, correctness all checks out for property #{@property.inspect}"
-  end
-end
-
-Correctness.new(site_docs, "redirect_from".freeze).assert!
-Correctness.new(site_docs, "title".freeze).assert!
-
-# First, test with a property only a handful of documents have.
-Benchmark.ips do |x|
-  x.config(time: 10, warmup: 5)
-  x.report('sort_by_property_directly with sparse property') do
-    sort_by_property_directly(site_docs, "redirect_from".freeze)
-  end
-  x.report('schwartzian_transform with sparse property') do
-    schwartzian_transform(site_docs, "redirect_from".freeze)
-  end
-  x.compare!
-end
-
-# Next, test with a property they all have.
-Benchmark.ips do |x|
-  x.config(time: 10, warmup: 5)
-  x.report('sort_by_property_directly with non-sparse property') do
-    sort_by_property_directly(site_docs, "title".freeze)
-  end
-  x.report('schwartzian_transform with non-sparse property') do
-    schwartzian_transform(site_docs, "title".freeze)
-  end
-  x.compare!
-end
--- a/docs/404.html
+++ b/docs/404.html
@@ -27,6 +27,9 @@ sitemap: false
          <li>
            <a href="/news/">News</a>
          </li>
+          <li>
+            <a href="/community/">Community</a>
+          </li>
          <li>
            <a href="/help/">Help</a>
          </li>
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,49 +1,60 @@
---
-version: 3.7.2
-name: Jekyll • Simple, blog-aware, static sites
-description: Transform your plain text into static websites and blogs
-url: https://jekyllrb.com
-repository: https://github.com/jekyll/jekyll
-timezone: America/Los_Angeles
-twitter:
-  username: jekyllrb
-logo: "/img/logo-2x.png"
+markdown: kramdown
+highlighter: rouge
+sass:
+  style: compressed
+
 gauges_id: 503c5af6613f5d0f19000027
 google_analytics_id: UA-50755011-1
 google_site_verification: onQcXpAvtHBrUI5LlroHNE_FP0b2qvFyPq7VZw36iEY
+
+repository: https://github.com/jekyll/jekyll
+help_url: https://github.com/jekyll/jekyll-help
+
+timezone: America/Los_Angeles
+
+defaults:
+  -
+    scope:
+      path: "_docs"
+      type: "docs"
+    values:
+      layout: "docs"
+  -
+    scope:
+      path: "_posts"
+      type: "posts"
+    values:
+      layout: "news_item"
+
+
 collections:
  docs:
-    permalink: "/:collection/:path/"
+    permalink: /:collection/:path/
    output: true
  posts:
-    permalink: "/news/:year/:month/:day/:title/"
+    permalink: /news/:year/:month/:day/:title/
    output: true
  tutorials:
    output: true
-defaults:
- scope:
-    path: _docs
-    type: docs
-  values:
-    layout: docs
- scope:
-    path: _posts
-    type: posts
-  values:
-    layout: news_item
-    image: "/img/twitter-card.png"
-plugins:
- jekyll-avatar
- jekyll-feed
- jekyll-mentions
- jekyll-redirect-from
- jekyll-seo-tag
- jekyll-sitemap
- jemoji
-sass:
-  style: compressed
+
+name: Jekyll • Simple, blog-aware, static sites
+description: Transform your plain text into static websites and blogs
+url: https://jekyllrb.com
+
+twitter:
+  username: jekyllrb
+
+logo: /img/logo-2x.png
+
+gems:
+  - jekyll-avatar
+  - jekyll-feed
+  - jekyll-mentions
+  - jekyll-redirect-from
+  - jekyll-seo-tag
+  - jekyll-sitemap
+  - jemoji
+
 exclude:
- ".gitignore"
- CNAME
- icomoon-selection.json
- readme.md
+  - .gitignore
+  - README.md
--- a/docs/_data/tutorials.yml
+++ b/docs/_data/tutorials.yml
@@ -1,7 +1,6 @@
 - title: Tutorials
  tutorials:
  - home
-  - video-walkthroughs
  - navigation
  - orderofinterpretation
  - custom-404-page
--- a/docs/_docs/code_of_conduct.md
+++ b/docs/_docs/code_of_conduct.md
@@ -1,55 +0,0 @@
---
-title: Code of Conduct
-permalink: "/docs/code_of_conduct/"
-note: This file is autogenerated. Edit /CODE_OF_CONDUCT.markdown instead.
-redirect_from: "/conduct/index.html"
-editable: false
---
-
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information, such as physical or electronic
-  addresses, without explicit permission
-* Other unethical or unprofessional conduct
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-By adopting this Code of Conduct, project maintainers commit themselves to
-fairly and consistently applying these principles to every aspect of managing
-this project. Project maintainers who do not follow or enforce the Code of
-Conduct may be permanently removed from the project team.
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by opening an issue or contacting a project maintainer. All complaints
-will be reviewed and investigated and will result in a response that is deemed
-necessary and appropriate to the circumstances. Maintainers are obligated to
-maintain confidentiality with regard to the reporter of an incident.
-
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.3.0, available at
-[http://contributor-covenant.org/version/1/3/0/][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/
--- a/docs/_docs/collections.md
+++ b/docs/_docs/collections.md
@@ -46,21 +46,6 @@ defaults:
      layout: page
 ```

-<div class="note">
-  <h5>Gather your collections {%- include docs_version_badge.html version="3.7.0" -%}</h5>
-
-  <p>You can optionally specify a directory to store all your collections in the same place with <code>collections_dir: my_collections</code>.</p>
-
-  <p>Then Jekyll will look in <code>my_collections/_books</code> for the <code>books</code> collection, and
-  in <code>my_collections/_recipes</code> for the <code>recipes</code> collection.</p>
-</div>
-
-<div class="note warning">
-  <h5>Be sure to move posts into custom collections directory</h5>
-
-  <p>If you specify a directory to store all your collections in the same place with <code>collections_dir: my_collections</code>, then you will need to move your <code>_posts</code> directory to <code>my_collections/_posts</code>. Note that, the name of your collections directory cannot start with an underscore (`_`).</p>
-</div>
-
 ### Step 2: Add your content {#step2}

 Create a corresponding folder (e.g. `<source>/_my_collection`) and add
@@ -93,20 +78,6 @@ For example, if you have `_my_collection/some_subdir/some_doc.md`,
 it will be rendered using Liquid and the Markdown converter of your
 choice and written out to `<dest>/my_collection/some_subdir/some_doc.html`.

-If you wish a specific page to be shown when accessing `/my_collection/`,
-simply add `permalink: /my_collection/index.html` to a page.
-To list items from the collection, on that page or any other, you can use:
-
-{% raw %}
-```liquid
-{% for item in site.my_collection %}
-  <h2>{{ item.title }}</h2>
-  <p>{{ item.description }}</p>
-  <p><a href="{{ item.url }}">{{ item.title }}</a></p>
-{% endfor %}
-```
-{% endraw %}
-
 <div class="note info">
  <h5>Don't forget to add YAML for processing</h5>
  <p>
@@ -140,7 +111,7 @@ _my_collection/

 each of the following `permalink` configurations will produce the document structure shown below it.

-* **Default**
+* **Default**  
  Same as `permalink: /:collection/:path`.

  ```
@@ -150,7 +121,7 @@ each of the following `permalink` configurations will produce the document struc
  │       └── some_doc.html
  ...
  ```
-* `permalink: pretty`
+* `permalink: pretty`  
  Same as `permalink: /:collection/:path/`.

  ```
@@ -227,13 +198,7 @@ each of the following `permalink` configurations will produce the document struc
        <p><code>:title</code></p>
      </td>
      <td>
-        <p>
-          The <code>:title</code> template variable will take the
-          <code>slug</code> <a href="/docs/frontmatter/">front matter</a>
-          variable value if any is present in the document; if none is
-          defined then <code>:title</code> will be equivalent to
-          <code>:name</code>, aka the slug generated from the filename.
-        </p>
+        <p>The document's lowercase title (as defined in its <a href="/docs/frontmatter/">front matter</a>), with every sequence of spaces and non-alphanumeric characters replaced by a hyphen. If the document does not define a title in its <a href="/docs/frontmatter/">front matter</a>, this is equivalent to <code>name</code>.</p>
      </td>
    </tr>
    <tr>
@@ -254,7 +219,7 @@ each of the following `permalink` configurations will produce the document struc

 Each collection is accessible as a field on the `site` variable. For example, if
 you want to access the `albums` collection found in `_albums`, you'd use
-`site.albums`.
+`site.albums`. 

 Each collection is itself an array of documents (e.g., `site.albums` is an array of documents, much like `site.pages` and
 `site.posts`). See the table below for how to access attributes of those documents.
@@ -339,10 +304,10 @@ you specified in your `_config.yml` (if present) and the following information:

 <div class="note info">
  <h5>A Hard-Coded Collection</h5>
-  <p>In addition to any collections you create yourself, the
-  <code>posts</code> collection is hard-coded into Jekyll. It exists whether
-  you have a <code>_posts</code> directory or not. This is something to note
-  when iterating through <code>site.collections</code> as you may need to
+  <p>In addition to any collections you create yourself, the 
+  <code>posts</code> collection is hard-coded into Jekyll. It exists whether 
+  you have a <code>_posts</code> directory or not. This is something to note 
+  when iterating through <code>site.collections</code> as you may need to 
  filter it out.</p>
  <p>You may wish to use filters to find your collection:
  <code>{% raw %}{{ site.collections | where: "label", "myCollection" | first }}{% endraw %}</code></p>
@@ -472,7 +437,7 @@ works:

 Every album in the collection could be listed on a single page with a template:

-```liquid
+```html
 {% raw %}
 {% for album in site.albums %}
  <h2>{{ album.title }}</h2>
--- a/docs/_docs/configuration.md
+++ b/docs/_docs/configuration.md
@@ -108,7 +108,7 @@ class="flag">flags</code> (specified on the command-line) that control them.
            <a href="https://en.wikipedia.org/wiki/Tz_database">IANA Time Zone
            Database</a> is valid, e.g. <code>America/New_York</code>. A list of all
            available values can be found <a href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones">
-            here</a>. When serving on a local machine, the default time zone is set by your operating system. But when served on a remote host/server, the default time zone depends on the server's setting or location.
+            here</a>. The default is the local time zone, as set by your operating system.
        </p>
      </td>
      <td class="align-center">
@@ -518,7 +518,7 @@ defaults:
  -
    scope:
      path: ""
-      type: "pages"
+      type: "posts"
    values:
      layout: "my-site"
  -
@@ -530,7 +530,7 @@ defaults:
      author: "Mr. Hyde"
 ```

-With these defaults, all pages would use the `my-site` layout. Any html files that exist in the `projects/` folder will use the `project` layout, if it exists. Those files will also have the `page.author` [liquid variable](../variables/) set to `Mr. Hyde`.
+With these defaults, all posts would use the `my-site` layout. Any html files that exist in the `projects/` folder will use the `project` layout, if it exists. Those files will also have the `page.author` [liquid variable](../variables/) set to `Mr. Hyde`.

 ```yaml
 collections:
@@ -549,39 +549,11 @@ defaults:
 In this example, the `layout` is set to `default` inside the
 [collection](../collections/) with the name `my_collection`.

-### Glob patterns in Front Matter defaults
-
-It is also possible to use glob patterns (currently limited to patterns that contain `*`) when matching defaults. For example, it is possible to set specific layout for each `special-page.html` in any subfolder of `section` folder. {%- include docs_version_badge.html version="3.7.0" -%}
-
-```yaml
-collections:
-  my_collection:
-    output: true
-
-defaults:
-  -
-    scope:
-      path: "section/*/special-page.html"
-    values:
-      layout: "specific-layout"
-```
-
-<div class="note warning">
-  <h5>Globbing and Performance</h5>
-  <p>
-    Please note that globbing a path is known to have a negative effect on
-    performance and is currently not optimized, especially on Windows.
-    Globbing a path will increase your build times in proportion to the size
-    of the associated collection directory.
-  </p>
-</div>
-
-
 ### Precedence

 Jekyll will apply all of the configuration settings you specify in the `defaults` section of your `_config.yml` file. However, you can choose to override settings from other scope/values pair by specifying a more specific path for the scope.

-You can see that in the second to last example above. First, we set the default page layout to `my-site`. Then, using a more specific path, we set the default layout for pages in the `projects/` path to `project`. This can be done with any value that you would set in the page or post front matter.
+You can see that in the second to last example above. First, we set the default layout to `my-site`. Then, using a more specific path, we set the default layout for files in the `projects/` path to `project`. This can be done with any value that you would set in the page or post front matter.

 Finally, if you set defaults in the site configuration by adding a `defaults` section to your `_config.yml` file, you can override those settings in a post or page file. All you need to do is specify the settings in the post or page front matter. For example:

@@ -630,13 +602,12 @@ file or on the command-line.

 ```yaml
 # Where things are
-source:          .
-destination:     ./_site
-collections_dir: .
-plugins_dir:     _plugins
-layouts_dir:     _layouts
-data_dir:        _data
-includes_dir:    _includes
+source:       .
+destination:  ./_site
+plugins_dir:  _plugins
+layouts_dir:  _layouts
+data_dir:     _data
+includes_dir: _includes
 collections:
  posts:
    output:   true
@@ -701,7 +672,6 @@ kramdown:
  input:          GFM
  hard_wrap:      false
  footnote_nr:    1
-  show_warnings:  false
 ```

 ## Liquid Options
--- a/docs/_docs/continuous-integration/buddyworks.md
+++ b/docs/_docs/continuous-integration/buddyworks.md
@@ -1,10 +1,10 @@
 ---
-title: "Buddy"
+title: "BuddyWorks"
 ---

-[Buddy][buddy-homepage] is a [Docker][docker-homepage]-based CI server that you can set up in 15-20 minutes to build, test, and deploy your Jekyll websites. It supports [GitHub][github-homepage], [Bitbucket][bitbucket-homepage], and [GitLab][gitlab-homepage] repositories, and can be installed on-premises or used in cloud. The following guide will show you how to set up a free environment to build and test your Jekyll project.
+[BuddyWorks][buddyworks-homepage] is a [Docker][docker-homepage]-based CI server that you can set up in 15-20 minutes to build, test, and deploy your Jekyll websites. It supports [GitHub][github-homepage], [Bitbucket][bitbucket-homepage], and [GitLab][gitlab-homepage] repositories, and can be installed on-premises or used in cloud. The following guide will show you how to set up a free environment to build and test your Jekyll project.

-[buddy-homepage]: https://buddy.works
+[buddyworks-homepage]: https://buddy.works
 [docker-homepage]: https://www.docker.com/
 [github-homepage]: https://github.com
 [bitbucket-homepage]: https://bitbucket.org/
@@ -12,7 +12,7 @@ title: "Buddy"

 ## 1. Getting started

-1. Log in at [https://buddy.works][buddy-homepage] with your GitHub/Bitbucket account or email
+1. Log in at [https://buddy.works](https://buddy.works) with your GitHub/Bitbucket account or email
 2. Choose your Git provider and select or push your Jekyll Project
 3. Create a new pipeline and set the trigger mode to 'On every push'
 4. Add and configure the Jekyll action and save the pipeline
@@ -29,7 +29,7 @@ Whenever you make a push to the selected branch, the Jekyll action runs `jekyll

 If you prefer configuration as code over GUI, you can generate a `buddy.yml` that will create a pipeline with the Jekyll action once you push it to the target branch:

-```yaml
+```ruby
 - pipeline: "Build and Deploy Jekyll site"
  trigger_mode: "ON_EVERY_PUSH"
  ref_name: "master"
@@ -45,7 +45,7 @@ If you prefer configuration as code over GUI, you can generate a `buddy.yml` tha

 ## 4. Setting up on-premises server

-The self-hosted version of Buddy can be installed on any type of server supporting Docker, including [Linux][bw-linux], [Mac][bw-mac], [AWS EC2][bw-aws-ec2], [DigitalOcean][bw-digitalocean], and [Microsoft Azure][bw-azure].
+The self-hosted version of BuddyWorks can be installed on any type of server supporting Docker, including [Linux][bw-linux], [Mac][bw-mac], [AWS EC2][bw-aws-ec2], [DigitalOcean][bw-digitalocean], and [Microsoft Azure][bw-azure].

 [bw-linux]: https://buddy.works/knowledge/standalone/installation-linux
 [bw-mac]: https://buddy.works/knowledge/standalone/installation-mac-osx
@@ -55,8 +55,8 @@ The self-hosted version of Buddy can be installed on any type of server supporti

 ## 5. Questions?

-This entire guide is open-source. Go ahead and [edit it][jekyll-docs-ci-buddy] if you want to expand it or have a fix or [ask for help][jekyll-help] if you run into trouble and need assistance. Buddy also has an [online community][buddy-forum] for help.
+This entire guide is open-source. Go ahead and [edit it][jekyll-docs-ci-buddyworks] if you want to expand it or have a fix or [ask for help][jekyll-help] if you run into trouble and need assistance. BuddyWorks also has an [online community][buddyworks-forum] for help.

-[jekyll-docs-ci-buddy]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration/buddyworks.md
+[jekyll-docs-ci-buddyworks]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration/buddyworks.md
 [jekyll-help]: https://jekyllrb.com/help/
-[buddy-forum]: http://forum.buddy.works/
+[buddyworks-forum]: http://forum.buddy.works/
--- a/docs/_docs/continuous-integration/circleci.md
+++ b/docs/_docs/continuous-integration/circleci.md
@@ -25,7 +25,7 @@ The easiest way to manage dependencies for a Jekyll project (with or without Cir

 [4]: http://bundler.io/gemfile.html

-```ruby
+```yaml
 source 'https://rubygems.org'

 ruby '2.4.0'
@@ -40,7 +40,7 @@ CircleCI detects when `Gemfile` is present is will automatically run `bundle ins

 The most basic test that can be run is simply seeing if `jekyll build` actually works. This is a blocker, a dependency if you will,  for other tests you might run on the generate site. So we'll run Jekyll, via Bundler, in the `dependencies` phase.

-```yaml
+```
 dependencies:
  post:
    - bundle exec jekyll build
@@ -63,7 +63,7 @@ test:

 When you put it all together, here's an example of what that `circle.yml` file could look like:

-```yaml
+```
 machine:
  environment:
    NOKOGIRI_USE_SYSTEM_LIBRARIES: true # speeds up installation of html-proofer
--- a/docs/_docs/continuous-integration/index.md
+++ b/docs/_docs/continuous-integration/index.md
@@ -7,4 +7,4 @@ Continuous Integration (CI) enables you to publish your Jekyll generated website

 * [Travis CI](travis-ci)
 * [CircleCI](circleci)
-* [Buddy](buddyworks)
+* [BuddyWorks](buddyworks)
--- a/docs/_docs/continuous-integration/travis-ci.md
+++ b/docs/_docs/continuous-integration/travis-ci.md
@@ -49,7 +49,7 @@ Some options can be specified via command-line switches. Check out the
 For example to avoid testing external sites, use this command:

 ```sh
-bundle exec htmlproofer ./_site --disable-external
+$ bundle exec htmlproofer ./_site --disable-external
 ```

 ### The HTML Proofer Library
--- a/docs/_docs/contributing.md
+++ b/docs/_docs/contributing.md
@@ -8,7 +8,10 @@ Hi there! Interested in contributing to Jekyll? We'd love your help. Jekyll is a

 ## Where to get help or report a problem

-See [the support guidelines](https://jekyllrb.com/docs/support/)
+* If you have a question about using Jekyll, start a discussion on [Jekyll Talk](https://talk.jekyllrb.com).
+* If you think you've found a bug within a Jekyll plugin, open an issue in that plugin's repository.
+* If you think you've found a bug within Jekyll itself, [open an issue](https://github.com/jekyll/jekyll/issues/new).
+* More resources are listed on our [Help page](https://jekyllrb.com/help/).

 ## Ways to contribute

@@ -115,37 +118,25 @@ If your contribution changes any Jekyll behavior, make sure to update the docume

 * Don't bump the Gem version in your pull request (if you don't know what that means, you probably didn't).

-* You can use the command `script/console` to start a REPL to explore the result of
-Jekyll's methods. It also provides you with helpful methods to quickly create a
-site or configuration. [Feel free to check it out!](https://github.com/jekyll/jekyll/blob/master/script/console)
-
 ## Running tests locally

 ### Test Dependencies

 To run the test suite and build the gem you'll need to install Jekyll's dependencies by running the following command:

-```sh
-script/bootstrap
-```
+<pre class="highlight"><code>$ script/bootstrap</code></pre>

 Before you make any changes, run the tests and make sure that they pass (to confirm your environment is configured properly):

-```sh
-script/cibuild
-```
+<pre class="highlight"><code>$ script/cibuild</code></pre>

 If you are only updating a file in `test/`, you can use the command:

-```sh
-script/test test/blah_test.rb
-```
+<pre class="highlight"><code>$ script/test test/blah_test.rb</code></pre>

 If you are only updating a `.feature` file, you can use the command:

-```sh
-script/cucumber features/blah.feature
-```
+<pre class="highlight"><code>$ script/cucumber features/blah.feature</code></pre>

 Both `script/test` and `script/cucumber` can be run without arguments to
 run its entire respective suite.
--- a/docs/_docs/datafiles.md
+++ b/docs/_docs/datafiles.md
@@ -56,8 +56,8 @@ determines the variable name).

 You can now render the list of members in a template:

+```html
 {% raw %}
-```liquid
 <ul>
 {% for member in site.data.members %}
  <li>
@@ -67,8 +67,8 @@ You can now render the list of members in a template:
  </li>
 {% endfor %}
 </ul>
-```
 {% endraw %}
+```

 {: .note .info }
 If your Jekyll site has a lot of pages, such as with documentation websites, see the detailed examples in [how to build robust navigation for your site]({% link _tutorials/navigation.md %}).
@@ -106,8 +106,8 @@ members:
 The organizations can then be accessed via `site.data.orgs`, followed by the
 file name:

+```html
 {% raw %}
-```liquid
 <ul>
 {% for org_hash in site.data.orgs %}
 {% assign org = org_hash[1] %}
@@ -119,8 +119,8 @@ file name:
  </li>
 {% endfor %}
 </ul>
-```
 {% endraw %}
+```

 ## Example: Accessing a specific author

@@ -136,8 +136,8 @@ dave:

 The author can then be specified as a page variable in a post's frontmatter:

+```html
 {% raw %}
-```liquid
 ---
 title: sample post
 author: dave
@@ -149,7 +149,8 @@ author: dave
  title="{{ author.name }}">
    {{ author.name }}
 </a>
-```
+
 {% endraw %}
+```

 For information on how to build robust navigation for your site (especially if you have a documentation website or another type of Jekyll site with a lot of pages to organize), see [Navigation](/tutorials/navigation).
--- a/docs/_docs/deployment-methods.md
+++ b/docs/_docs/deployment-methods.md
@@ -5,31 +5,6 @@ permalink: /docs/deployment-methods/

 Sites built using Jekyll can be deployed in a large number of ways due to the static nature of the generated output. A few of the most common deployment techniques are described below.

-<div class="note">
-  <h5>ProTip™: Use GitHub Pages for zero-hassle Jekyll hosting</h5>
-  <p>GitHub Pages are powered by Jekyll behind the scenes, so if you’re looking for a zero-hassle, zero-cost solution, GitHub Pages are a great way to <a href="../github-pages/">host your Jekyll-powered website for free</a>.</p>
-</div>
-
-## Netlify
-
-Netlify provides Global CDN, Continuous Deployment, one click HTTPS and [much more](https://www.netlify.com/features/), providing developers the most robust toolset available for modern web projects, without added complexity. Netlify supports custom plugins for Jekyll and has a free plan for open source projects.
-
-Read this [Jekyll step-by-step guide](https://www.netlify.com/blog/2015/10/28/a-step-by-step-guide-jekyll-3.0-on-netlify/) to setup your Jekyll site on Netlify.
-
-## Aerobatic
-
-[Aerobatic](https://www.aerobatic.com) has custom domains, global CDN distribution, basic auth, CORS proxying, and a growing list of plugins all included.
-
-Automating the deployment of a Jekyll site is simple. See their [Jekyll docs](https://www.aerobatic.com/docs/static-site-generators/#jekyll) for more details. Your built `_site` folder is deployed to their highly-available, globally distributed hosting service.
-
-## Kickster
-
-Use [Kickster](http://kickster.nielsenramon.com/) for easy (automated) deploys to GitHub Pages when using unsupported plugins on GitHub Pages.
-
-Kickster provides a basic Jekyll project setup packed with web best practises and useful optimization tools increasing your overall project quality. Kickster ships with automated and worry-free deployment scripts for GitHub Pages.
-
-Setting up Kickster is very easy, just install the gem and you are good to go. More documentation can here found [here](https://github.com/nielsenramon/kickster#kickster). If you do not want to use the gem or start a new project you can just copy paste the deployment scripts for [Travis CI](https://github.com/nielsenramon/kickster/tree/master/snippets/travis) or [Circle CI](https://github.com/nielsenramon/kickster#automated-deployment-with-circle-ci).
-
 ## Web hosting providers (FTP)

 Just about any traditional web hosting provider will let you upload files to their servers over FTP. To upload a Jekyll site to a web host using FTP, simply run the `jekyll build` command and copy the contents of the generated `_site` folder to the root folder of your hosting account. This is most likely to be the `httpdocs` or `public_html` folder on most hosting providers.
@@ -66,15 +41,13 @@ server$ mkdir /var/www/myrepo
 Next, add the following lines to hooks/post-receive and be sure Jekyll is
 installed on the server:

-```bash
+```sh
 GIT_REPO=$HOME/myrepo.git
 TMP_GIT_CLONE=$HOME/tmp/myrepo
-GEMFILE=$TMP_GIT_CLONE/Gemfile
 PUBLIC_WWW=/var/www/myrepo

 git clone $GIT_REPO $TMP_GIT_CLONE
-BUNDLE_GEMFILE=$GEMFILE bundle install
-BUNDLE_GEMFILE=$GEMFILE bundle exec jekyll build -s $TMP_GIT_CLONE -d $PUBLIC_WWW
+jekyll build -s $TMP_GIT_CLONE -d $PUBLIC_WWW
 rm -Rf $TMP_GIT_CLONE
 exit
 ```
@@ -214,3 +187,22 @@ low-volume blogs as you only pay for what you use.

 If you'd like to deploy your site to an OpenShift gear, there's [a cartridge
 for that](https://github.com/openshift-quickstart/jekyll-openshift).
+
+<div class="note">
+  <h5>ProTip™: Use GitHub Pages for zero-hassle Jekyll hosting</h5>
+  <p>GitHub Pages are powered by Jekyll behind the scenes, so if you’re looking for a zero-hassle, zero-cost solution, GitHub Pages are a great way to <a href="../github-pages/">host your Jekyll-powered website for free</a>.</p>
+</div>
+
+## Kickster
+
+Use [Kickster](http://kickster.nielsenramon.com/) for easy (automated) deploys to GitHub Pages when using unsupported plugins on GitHub Pages.
+
+Kickster provides a basic Jekyll project setup packed with web best practises and useful optimization tools increasing your overall project quality. Kickster ships with automated and worry-free deployment scripts for GitHub Pages.
+
+Setting up Kickster is very easy, just install the gem and you are good to go. More documentation can here found [here](https://github.com/nielsenramon/kickster#kickster). If you do not want to use the gem or start a new project you can just copy paste the deployment scripts for [Travis CI](https://github.com/nielsenramon/kickster/tree/master/snippets/travis) or [Circle CI](https://github.com/nielsenramon/kickster#automated-deployment-with-circle-ci).
+
+## Aerobatic
+
+[Aerobatic](https://www.aerobatic.com) has custom domains, global CDN distribution, basic auth, CORS proxying, and a growing list of plugins all included.
+
+Automating the deployment of a Jekyll site is simple. See our [Jekyll docs](https://www.aerobatic.com/docs/static-site-generators/#jekyll) for more details. Your built `_site` folder is deployed to our highly-available, globally distributed hosting service.
--- a/docs/_docs/frontmatter.md
+++ b/docs/_docs/frontmatter.md
@@ -68,20 +68,6 @@ front matter of a page or post.
          <code>_layouts</code> directory.

        </p>
-        <ul>
-          <li>
-            Using <code>null</code> will produce a file without using a layout
-            file. However this is overridden if the file is a post/document and has a
-            layout defined in the <a href="../configuration/#front-matter-defaults">
-            frontmatter defaults</a>.
-          </li>
-          <li>
-            Starting from version 3.5.0, using <code>none</code> in a post/document will
-            produce a file without using a layout file regardless of frontmatter defaults.
-            Using <code>none</code> in a page, however, will cause Jekyll to attempt to
-            use a layout named "none".
-          </li>
-        </ul>
      </td>
    </tr>
    <tr>
@@ -129,14 +115,14 @@ data that is sent to the Liquid templating engine during the conversion. For
 instance, if you set a title, you can use that in your layout to set the page
 title:

-```liquid
+```html
 <!DOCTYPE HTML>
 <html>
  <head>
    <title>{% raw %}{{ page.title }}{% endraw %}</title>
  </head>
  <body>
-    …
+    ...
 ```

 ## Predefined Variables for Posts
@@ -167,7 +153,7 @@ These are available out-of-the-box to be used in the front matter for a post.
    </tr>
    <tr>
      <td>
-        <p><code>category</code></p>
+        <p style="margin-bottom: 5px;"><code>category</code></p>
        <p><code>categories</code></p>
      </td>
      <td>
--- a/docs/_docs/github-pages.md
+++ b/docs/_docs/github-pages.md
@@ -4,82 +4,103 @@ permalink: /docs/github-pages/
 ---

 [GitHub Pages](https://pages.github.com) are public web pages for users,
-organizations, and repositories, that are freely hosted on GitHub's `github.io`
-domain or on a custom domain name of your choice. GitHub Pages are powered by
-Jekyll behind the scenes, so they're a great way to host your Jekyll-powered
-website for free.
-
-Your site is automatically generated by GitHub Pages when you push your source
-files. Note that GitHub Pages works equally well for regular HTML content,
-simply because Jekyll treats files without YAML front matter as static assets.
-So if you only need to push generated HTML, you're good to go without any
-further setup.
+organizations, and repositories, that are freely hosted on GitHub's
+`github.io` domain or on a custom domain name of your choice. GitHub Pages are
+powered by Jekyll behind the scenes, so in addition to supporting regular HTML
+content, they’re also a great way to host your Jekyll-powered website for free.

 Never built a website with GitHub Pages before? [See this marvelous guide by
-Jonathan McGlone](http://jmcglone.com/guides/github-pages/) to get you up and
-running. This guide will teach you what you need to know about Git, GitHub, and
-Jekyll to create your very own website on GitHub Pages.
-
-##  The github-pages gem
-
-Our friends at GitHub have provided the
-[github-pages](https://github.com/github/pages-gem) gem which is used to manage
-[Jekyll and its dependencies on GitHub Pages](https://pages.github.com/versions/).
-Using it in your projects means that when you deploy your site to GitHub Pages,
-you will not be caught by unexpected differences between various versions of the
-gems.
-
-Note that GitHub Pages runs in `safe` mode and only allows [a set of whitelisted
-plugins](https://help.github.com/articles/configuring-jekyll-plugins/#default-plugins).
-
-To use the currently-deployed version of the gem in your project, add the
-following to your `Gemfile`:
-
-```ruby
-source "https://rubygems.org"
-
-gem "github-pages", group: :jekyll_plugins
-```
-
-Be sure to run `bundle update` often.
-
-<div class="note">
-  <h5>GitHub Pages Documentation, Help, and Support</h5>
-  <p>
-    For more information about what you can do with GitHub Pages, as well as for
-    troubleshooting guides, you should check out
-    <a href="https://help.github.com/categories/github-pages-basics/">GitHub’s Pages Help section</a>.
-    If all else fails, you should contact <a href="https://github.com/contact">GitHub Support</a>.
-  </p>
-</div>
+Jonathan McGlone to get you up and running](http://jmcglone.com/guides/github-pages/).
+This guide will teach you what you need to know about Git, GitHub, and Jekyll to create your very own website on GitHub Pages.

 ### Project Page URL Structure

 Sometimes it's nice to preview your Jekyll site before you push your `gh-pages`
 branch to GitHub. However, the subdirectory-like URL structure GitHub uses for
-Project Pages complicates the proper resolution of URLs. In order to assure your
-site builds properly, use the handy [URL filters](../templates/#filters):
+Project Pages complicates the proper resolution of URLs. In order to assure your site builds properly, use `site.github.url` in your URLs.

+```html
 {% raw %}
-```liquid
-<!-- For styles with static names... -->
-<link href="{{ "/assets/css/style.css" | relative_url }}" rel="stylesheet">
-<!-- For documents/pages whose URLs can change... -->
-[{{ page.title }}]("{{ page.url | relative_url }}")
-```
+<!-- Useful for styles with static names... -->
+<link href="{{ site.github.url }}/path/to/css.css" rel="stylesheet">
+<!-- and for documents/pages whose URLs can change... -->
+[{{ page.title }}]("{{ page.url | prepend: site.github.url }}")
 {% endraw %}
+```

 This way you can preview your site locally from the site root on localhost,
-but when GitHub generates your pages from the `gh-pages` branch all the URLs
+but when GitHub generates your pages from the gh-pages branch all the URLs
 will resolve properly.

 ## Deploying Jekyll to GitHub Pages

 GitHub Pages work by looking at certain branches of repositories on GitHub.
-There are two basic types available: [user/organization and project pages](https://help.github.com/articles/user-organization-and-project-pages/).
+There are two basic types available: user/organization pages and project pages.
 The way to deploy these two types of sites are nearly identical, except for a
 few minor details.

+<div class="note protip" markdown="1">
+<div markdown="1">
+</div>
+
+##### Use the `github-pages` gem
+
+Our friends at GitHub have provided the
+[github-pages](https://github.com/github/pages-gem)
+gem which is used to manage Jekyll and its dependencies on
+GitHub Pages. Using it in your projects means that when you deploy
+your site to GitHub Pages, you will not be caught by unexpected
+differences between various versions of the gems. To use the
+currently-deployed version of the gem in your project, add the
+following to your `Gemfile`:
+
+<div class="code-block" markdown="1">
+<div markdown="1">
+</div>
+
+```ruby
+source 'https://rubygems.org'
+
+require 'json'
+require 'open-uri'
+versions = JSON.parse(open('https://pages.github.com/versions.json').read)
+
+gem 'github-pages', versions['github-pages']
+```
+</div>
+
+This will ensure that when you run `bundle install`, you
+have the correct version of the `github-pages` gem.
+
+If that fails, simplify it:
+
+<div class="code-block" markdown="1">
+<div markdown="1">
+</div>
+
+```ruby
+source 'https://rubygems.org'
+
+gem 'github-pages'
+```
+</div>
+
+And be sure to run `bundle update` often.
+
+If you like to install `pages-gem` on Windows you can find instructions by Jens Willmer on
+[how to install github-pages gem on Windows (x64)](https://jwillmer.de/blog/tutorial/how-to-install-jekyll-and-pages-gem-on-windows-10-x46#github-pages-and-plugins).
+</div>
+
+<div class="note info">
+  <h5>Installing <code>github-pages</code> gem on Windows</h5>
+  <p>
+    While Windows is not officially supported, it is possible
+    to install <code>github-pages</code> gem on Windows.
+    Special instructions can be found on our
+    <a href="../windows/#installation">Windows-specific docs page</a>.
+  </p>
+</div>
+
 ### User and Organization Pages

 User and organization pages live in a special GitHub repository dedicated to
@@ -119,7 +140,7 @@ Please refer to GitHub official documentation on
 to see more detailed examples.

 <div class="note warning">
-  <h5>Source files must be in the root directory</h5>
+  <h5>Source Files Must be in the Root Directory</h5>
  <p>
    GitHub Pages <a href="https://help.github.com/articles/troubleshooting-github-pages-build-failures#source-setting">overrides</a>
    the <a href="/docs/configuration/#global-configuration">“Site Source”</a>
@@ -128,13 +149,12 @@ to see more detailed examples.
  </p>
 </div>

-<div class="note info">
-  <h5>Installing the <code>github-pages</code> gem on Windows</h5>
-
+<div class="note">
+  <h5>GitHub Pages Documentation, Help, and Support</h5>
  <p>
-    While Windows is not officially supported, it is possible
-    to install the <code>github-pages</code> gem on Windows.
-    Special instructions can be found on our
-    <a href="../windows/#installation">Windows-specific docs page</a>.
+    For more information about what you can do with GitHub Pages, as well as for
+    troubleshooting guides, you should check out
+    <a href="https://help.github.com/categories/github-pages-basics/">GitHub’s Pages Help section</a>.
+    If all else fails, you should contact <a href="https://github.com/contact">GitHub Support</a>.
  </p>
 </div>
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,305 +4,6 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---

-## 3.7.2 / 2018-01-25
-{: #v3-7-2}
-
-### Development Fixes
-{: #development-fixes-v3-7-2}
-
- CI: Test against Ruby 2.5.0 ([#6664]({{ site.repository }}/issues/6664))
- Bump rdoc to 6.0 ([#6600]({{ site.repository }}/issues/6600))
- Lint file and bump theme dependencies ([#6698]({{ site.repository }}/issues/6698))
- Write a Rubocop Cop to ensure no `#p` or `#puts` calls get committed to master. ([#6615]({{ site.repository }}/issues/6615))
- Remove redgreen gem ([#6720]({{ site.repository }}/issues/6720))
-
-### Site Enhancements
-{: #site-enhancements-v3-7-2}
-
- Display latest version in header ([#6676]({{ site.repository }}/issues/6676))
- Update version in `config.yml` via YAML load / dump ([#6677]({{ site.repository }}/issues/6677))
-
-### Documentation
-
- Fix: Add note about posts in context of collections_dir ([#6680]({{ site.repository }}/issues/6680))
- Update deploy-script in documentation ([#6666]({{ site.repository }}/issues/6666))
- Add note about naming of collections_dir ([#6703]({{ site.repository }}/issues/6703))
- Update installation.md ([#6694]({{ site.repository }}/issues/6694))
- Add `jekyll-html` to plugins. ([#6654]({{ site.repository }}/issues/6654))
- Update plugins.md ([#6716]({{ site.repository }}/issues/6716))
- Release v3.7.1 ([#6695]({{ site.repository }}/issues/6695))
-
-### Bug Fixes
-{: #bug-fixes-v3-7-2}
-
- inform that symlinks are not allowed in safe mode ([#6670]({{ site.repository }}/issues/6670))
- Glob scope path only if configured with a pattern ([#6692]({{ site.repository }}/issues/6692))
- Add gem &#34;wdm&#34; to all newly generated Gemfiles ([#6711]({{ site.repository }}/issues/6711))
- Fix timezone incosistencies between different ruby version ([#6697]({{ site.repository }}/issues/6697))
- Refactor collections_dir feature for consistency ([#6685]({{ site.repository }}/issues/6685))
-
-### Minor Enhancements
-{: #minor-enhancements-v3-7-2}
-
- Require external library only if necessary ([#6596]({{ site.repository }}/issues/6596))
-
-
-## 3.7.0 / 2018-01-02
-{: #v3-7-0}
-
-### Minor Enhancements
-{: #minor-enhancements-v3-7-0}
-
- Add LiveReload functionality to Jekyll. ([#5142]({{ site.repository }}/issues/5142))
- Add Utils::Internet.connected? to determine whether host machine has internet connection. ([#5870]({{ site.repository }}/issues/5870))
- Disable default layouts for Pages with a `layout: none` declaration ([#6182]({{ site.repository }}/issues/6182))
- Scope path glob ([#6268]({{ site.repository }}/issues/6268))
- Allow the user to set collections_dir to put all collections under one subdirectory ([#6331]({{ site.repository }}/issues/6331))
- Upgrade to Rouge 3 ([#6381]({{ site.repository }}/issues/6381))
- Allow URL filters to work directly with documents ([#6478]({{ site.repository }}/issues/6478))
- filter relative_url should keep absolute urls with scheme/authority ([#6490]({{ site.repository }}/issues/6490))
- `.sass-cache` doesn&#39;t *always* land in `options[&#39;source&#39;]` ([#6500]({{ site.repository }}/issues/6500))
- Allow plugins to modify the obsolete files. ([#6502]({{ site.repository }}/issues/6502))
- Add latin mode to `slugify` ([#6509]({{ site.repository }}/issues/6509))
- Log Kramdown warnings if log level is WARN ([#6522]({{ site.repository }}/issues/6522))
- Add an option to configure kramdown warning output ([#6554]({{ site.repository }}/issues/6554))
- Add `json` extension to list of directory indices ([#6550]({{ site.repository }}/issues/6550))
- Dependency: Bump jekyll-watch to 2.0 ([#6589]({{ site.repository }}/issues/6589))
- Remove paginate check ([#6606]({{ site.repository }}/issues/6606))
- update classifier-reborn to 2.2.0 ([#6631]({{ site.repository }}/issues/6631))
- Switch to an actively-maintained TOML parser. ([#6652]({{ site.repository }}/issues/6652))
- Do not coerce layout paths in theme-gem to the source directory ([#6603]({{ site.repository }}/issues/6603))
-
-### Bug Fixes
-{: #bug-fixes-v3-7-0}
-
- Raise when theme root directory is not available ([#6455]({{ site.repository }}/issues/6455))
- Avoid block parser warning in SmartyPants ([#6565]({{ site.repository }}/issues/6565))
- Fail gracefully if &#34;sass&#34; gem cannot be loaded ([#6573]({{ site.repository }}/issues/6573))
- return correct file in dir if dir has same name as file ([#6569]({{ site.repository }}/issues/6569))
- Register reload hooks in Server#process ([#6605]({{ site.repository }}/issues/6605))
- Memoize path to metadata file ([#6602]({{ site.repository }}/issues/6602))
- Use `require_relative` to load Jekyll classes ([#6609]({{ site.repository }}/issues/6609))
-
-### Development Fixes
-{: #development-fixes-v3-7-0}
-
- Added direct collection access to future collection item feature test([#6151]({{ site.repository }}/issues/6151))
- add failing test for non-utf8 encoding ([#6339]({{ site.repository }}/issues/6339))
- Upgrade to Cucumber 3.0 ([#6395]({{ site.repository }}/issues/6395))
- Provide a better default hash for tracking liquid stats ([#6417]({{ site.repository }}/issues/6417))
- Add configuration for first-timers bot ([#6431]({{ site.repository }}/issues/6431))
- Do not linkify escaped characters as PRs in History ([#6468]({{ site.repository }}/issues/6468))
- Rely on jekyll-mentions for linking usernames ([#6469]({{ site.repository }}/issues/6469))
- Update first-timers-issue-template.md ([#6472]({{ site.repository }}/issues/6472))
- Enable `Lint/RescueWithoutErrorClass` Cop ([#6482]({{ site.repository }}/issues/6482))
- Clean up Rubocop config ([#6495]({{ site.repository }}/issues/6495))
- Use Gem to discover the location of bundler ([#6499]({{ site.repository }}/issues/6499))
- Remove unnecessary encoding comment ([#6513]({{ site.repository }}/issues/6513))
- Suggest using Rubocop to automatically fix errors ([#6514]({{ site.repository }}/issues/6514))
- Assert raising Psych::SyntaxError when`&#34;strict_front_matter&#34;=&gt;true` ([#6520]({{ site.repository }}/issues/6520))
- Use Kernel#Array instead of explicit Array check ([#6525]({{ site.repository }}/issues/6525))
- RuboCop: Enable `Style/UnneededCapitalW` cop ([#6526]({{ site.repository }}/issues/6526))
- Refactor method to reduce ABC Metric size ([#6529]({{ site.repository }}/issues/6529))
- Remove parentheses around arguments to raise ([#6532]({{ site.repository }}/issues/6532))
- Use double-quotes around gem name ([#6535]({{ site.repository }}/issues/6535))
- Dependencies: upgrade to toml 0.2.0 ([#6541]({{ site.repository }}/issues/6541))
- Lock to cucumber 3.0.1 on Ruby 2.1 ([#6546]({{ site.repository }}/issues/6546))
- Bump JRuby version in Travis config ([#6561]({{ site.repository }}/issues/6561))
- Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML([#5828]({{ site.repository }}/issues/5828))
- Drop forwarding to private methods by exposing those methods as public([#6577]({{ site.repository }}/issues/6577))
- Upgrade pygments to v1.x ([#5937]({{ site.repository }}/issues/5937))
- Bump yajl-ruby ([#6582]({{ site.repository }}/issues/6582))
- Cleanup test_redcarpet.rb ([#6584]({{ site.repository }}/issues/6584))
- Add PageWithoutAFile class from jekyll plugins ([#6556]({{ site.repository }}/issues/6556))
- Cleanup LiveReloadReactor ([#6607]({{ site.repository }}/issues/6607))
-
-### Documentation
-
- Add formester to the list of saas form backend ([#6059]({{ site.repository }}/issues/6059))
- GitHub Pages instructions ([#6384]({{ site.repository }}/issues/6384))
- Improve documentation for theme-gem installation ([#6387]({{ site.repository }}/issues/6387))
- Fix diff syntax-highlighting ([#6388]({{ site.repository }}/issues/6388))
- Update instructions ([#6396]({{ site.repository }}/issues/6396))
- Fix code-block highlighting in docs ([#6398]({{ site.repository }}/issues/6398))
- Filtering Posts with categories, tags, or other variables ([#6399]({{ site.repository }}/issues/6399))
- Fixes formatting on pre-formatted text. ([#6405]({{ site.repository }}/issues/6405))
- Added new tutorial to tutorials section on docs ([#6406]({{ site.repository }}/issues/6406))
- Updates ([#6407]({{ site.repository }}/issues/6407))
- Fix `collections_dir` example ([#6408]({{ site.repository }}/issues/6408))
- Renaming duplicate of &#34;Scenario 6&#34; to &#34;Scenario 7&#34; ([#6411]({{ site.repository }}/issues/6411))
- Mark `collection_dir` as unreleased ([#6412]({{ site.repository }}/issues/6412))
- Fix link to SUPPORT ([#6415]({{ site.repository }}/issues/6415))
- Fix list appearance by adding missing `ol` tag ([#6421]({{ site.repository }}/issues/6421))
- Explain how to override output collection index page ([#6424]({{ site.repository }}/issues/6424))
- Added github-cards to the list of plugins ([#6425]({{ site.repository }}/issues/6425))
- CoC violation correspondants ([#6429]({{ site.repository }}/issues/6429))
- Add a note about Liquid and syntax highlighting ([#6466]({{ site.repository }}/issues/6466))
- Remove `sudo` from macOS troubleshooting instructions ([#6486]({{ site.repository }}/issues/6486))
- Add a note on `:jekyll_plugins` group in the docs ([#6488]({{ site.repository }}/issues/6488))
- Updated custom-404-page.md ([#6489]({{ site.repository }}/issues/6489))
- Fix a few minor issues in the docs ([#6494]({{ site.repository }}/issues/6494))
- Add jekyll-pwa-plugin ([#6533]({{ site.repository }}/issues/6533))
- Remove Jekyll-Smartify from plugins directory ([#6548]({{ site.repository }}/issues/6548))
- Updated Jekyll-Pug listing to include official website ([#6555]({{ site.repository }}/issues/6555))
- Remove link to severly outdated asset plugin ([#6613]({{ site.repository }}/issues/6613))
- Default time zone depends upon server ([#6617]({{ site.repository }}/issues/6617))
- Add `disqus-for-jekyll` to plugins. ([#6618]({{ site.repository }}/issues/6618))
- Update &#34;Requirements&#34; for Ruby version ([#6623]({{ site.repository }}/issues/6623))
- Fix: Update link to i18n_filter plugin ([#6638]({{ site.repository }}/issues/6638))
- Correct WordPress capitalization ([#6645]({{ site.repository }}/issues/6645))
- Add Tweetsert, Stickyposts, Paginate::Content ([#6651]({{ site.repository }}/issues/6651))
- Post: Jekyll 3.7.0 released ([#6634]({{ site.repository }}/issues/6634))
-
-### Site Enhancements
-{: #site-enhancements-v3-7-0}
-
- Add special styling for code-blocks run in shell ([#6389]({{ site.repository }}/issues/6389))
- Add post about diversity ([#6447]({{ site.repository }}/issues/6447))
- Update list of files excluded from Docs site ([#6457]({{ site.repository }}/issues/6457))
- Update site History ([#6460]({{ site.repository }}/issues/6460))
- Add default twitter card image ([#6476]({{ site.repository }}/issues/6476))
- Update normalize.css to v7.0.0 ([#6491]({{ site.repository }}/issues/6491))
- Optimize images ([#6519]({{ site.repository }}/issues/6519))
- Back to original main navigation ([#6544]({{ site.repository }}/issues/6544))
- Styles: mobile-docs select element ([#6545]({{ site.repository }}/issues/6545))
- Search with DocSearch by @Algolia ([#6557]({{ site.repository }}/issues/6557))
- Site header redesign ([#6567]({{ site.repository }}/issues/6567))
- Move logo above site navigation on small screens ([#6570]({{ site.repository }}/issues/6570))
- Docs: Include version badge for latest features ([#6574]({{ site.repository }}/issues/6574))
- Use version-badge on an existing feature intro ([#6575]({{ site.repository }}/issues/6575))
- Add jekyll-category-pages plugin ([#6632]({{ site.repository }}/issues/6632))
- Improve docs styling for code to be run in shell ([#6641]({{ site.repository }}/issues/6641))
- Fix permalink icon markup in news-item layout ([#6639]({{ site.repository }}/issues/6639))
-
-
-## 3.6.2 / 2017-10-21
-{: #v3-6-2}
-
-### Development Fixes
-{: #development-fixes-v3-6-2}
-
- Update Rubocop to 0.51.0 ([#6444]({{ site.repository }}/issues/6444))
- Add test for layout as string ([#6445]({{ site.repository }}/issues/6445))
-
-### Bug Fixes
-{: #bug-fixes-v3-6-2}
-
- Problematic UTF+bom files ([#6322]({{ site.repository }}/issues/6322))
- Always treat `data.layout` as a string ([#6442]({{ site.repository }}/issues/6442))
-
-
-## 3.6.1 / 2017-10-20
-{: #v3-6-1}
-
-### Documentation
-
- Doc y_day in docs/permalinks ([#6244]({{ site.repository }}/issues/6244))
- Update frontmatter.md ([#6371]({{ site.repository }}/issues/6371))
- Elaborate on excluding items from processing ([#6136]({{ site.repository }}/issues/6136))
- Style lists in tables ([#6379]({{ site.repository }}/issues/6379))
- Remove duplicate &#34;available&#34; ([#6380]({{ site.repository }}/issues/6380))
-
-### Development Fixes
-{: #development-fixes-v3-6-1}
-
- Bump rubocop to use `v0.50.x` ([#6368]({{ site.repository }}/issues/6368))
-
-
-## 3.6.0 / 2017-09-21
-{: #v3-6-0}
-
-### Minor Enhancements
-{: #minor-enhancements-v3-6-0}
-
- Ignore final newline in folded YAML string ([#6054]({{ site.repository }}/issues/6054))
- Add URL checks to Doctor ([#5760]({{ site.repository }}/issues/5760))
- Fix serving files that clash with directories ([#6222]({{ site.repository }}/issues/6222)) ([#6231]({{ site.repository }}/issues/6231))
- Bump supported Ruby version to `>= 2.1.0` ([#6220]({{ site.repository }}/issues/6220))
- set `LiquidError#template_name` for errors in included file ([#6206]({{ site.repository }}/issues/6206))
- Access custom config array throughout session ([#6200]({{ site.repository }}/issues/6200))
- Add support for Rouge 2, in addition to Rouge 1 ([#5919]({{ site.repository }}/issues/5919))
- Allow `yield` to logger methods &amp; bail early on no-op messages ([#6315]({{ site.repository }}/issues/6315))
- Update mime-types. ([#6336]({{ site.repository }}/issues/6336))
- Use a Schwartzian transform with custom sorting ([#6342]({{ site.repository }}/issues/6342))
- Alias `Drop#invoke_drop` to `Drop#[]` ([#6338]({{ site.repository }}/issues/6338))
-
-### Bug Fixes
-{: #bug-fixes-v3-6-0}
-
- `Deprecator`: fix typo for `--serve` command ([#6229]({{ site.repository }}/issues/6229))
- `Reader#read_directories`: guard against an entry not being a directory ([#6226]({{ site.repository }}/issues/6226))
- kramdown: symbolize keys in-place ([#6247]({{ site.repository }}/issues/6247))
- Call `to_s` on site.url before attempting to concatenate strings ([#6253]({{ site.repository }}/issues/6253))
- Enforce Style/FrozenStringLiteralComment ([#6265]({{ site.repository }}/issues/6265))
- Update theme-template README to note &#39;assets&#39; directory ([#6257]({{ site.repository }}/issues/6257))
- Memoize the return value of `Document#url` ([#6266]({{ site.repository }}/issues/6266))
- delegate `StaticFile#to_json` to `StaticFile#to_liquid` ([#6273]({{ site.repository }}/issues/6273))
- Fix `Drop#key?` so it can handle a nil argument ([#6281]({{ site.repository }}/issues/6281))
- Guard against type error in absolute url ([#6280]({{ site.repository }}/issues/6280))
- Mutable drops should fallback to their own methods when a mutation isn&#39;t present ([#6350]({{ site.repository }}/issues/6350))
- Skip adding binary files as posts ([#6344]({{ site.repository }}/issues/6344))
- Don&#39;t break if bundler is not installed ([#6377]({{ site.repository }}/issues/6377))
-
-### Documentation
-
- Fix a typo in `custom-404-page.md` ([#6218]({{ site.repository }}/issues/6218))
- Docs: fix links to issues in History.markdown ([#6255]({{ site.repository }}/issues/6255))
- Update deprecated gems key to plugins. ([#6262]({{ site.repository }}/issues/6262))
- Fixes minor typo in post text ([#6283]({{ site.repository }}/issues/6283))
- Execute build command using bundle. ([#6274]({{ site.repository }}/issues/6274))
- name unification - buddy details ([#6317]({{ site.repository }}/issues/6317))
- name unification - application index ([#6318]({{ site.repository }}/issues/6318))
- trim and relocate plugin info across docs ([#6311]({{ site.repository }}/issues/6311))
- update Jekyll&#39;s README ([#6321]({{ site.repository }}/issues/6321))
- add SUPPORT file for GitHub ([#6324]({{ site.repository }}/issues/6324))
- Rename CODE_OF_CONDUCT to show in banner ([#6325]({{ site.repository }}/issues/6325))
- Docs : illustrate page.id for a collection&#39;s document ([#6329]({{ site.repository }}/issues/6329))
- Docs: post&#39;s date can be overriden in YAML front matter ([#6334]({{ site.repository }}/issues/6334))
- Docs: `site.url` behavior on development and production environments ([#6270]({{ site.repository }}/issues/6270))
- Fix typo in site.url section of variables.md :-[ ([#6337]({{ site.repository }}/issues/6337))
- Docs: updates ([#6343]({{ site.repository }}/issues/6343))
- Fix precedence docs ([#6346]({{ site.repository }}/issues/6346))
- add note to contributing docs about `script/console` ([#6349]({{ site.repository }}/issues/6349))
- Docs: Fix permalink example ([#6375]({{ site.repository }}/issues/6375))
-
-### Site Enhancements
-{: #site-enhancements-v3-6-0}
-
- Adding DevKit helpers ([#6225]({{ site.repository }}/issues/6225))
- Customizing url in collection elements clarified ([#6264]({{ site.repository }}/issues/6264))
- Plugins is the new gems ([#6326]({{ site.repository }}/issues/6326))
-
-### Development Fixes
-{: #development-fixes-v3-6-0}
-
- Strip unnecessary leading whitespace in template ([#6228]({{ site.repository }}/issues/6228))
- Users should be installing patch versions. ([#6198]({{ site.repository }}/issues/6198))
- Fix tests ([#6240]({{ site.repository }}/issues/6240))
- Define path with `__dir__` ([#6087]({{ site.repository }}/issues/6087))
- exit site.process sooner ([#6239]({{ site.repository }}/issues/6239))
- make flakey test more robust ([#6277]({{ site.repository }}/issues/6277))
- Add a quick test for DataReader ([#6284]({{ site.repository }}/issues/6284))
- script/backport-pr: commit message no longer includes the `#` ([#6289]({{ site.repository }}/issues/6289))
- Add Add CODEOWNERS file to help automate reviews. ([#6320]({{ site.repository }}/issues/6320))
- Fix builds on codeclimate ([#6333]({{ site.repository }}/issues/6333))
- Bump rubies on Travis ([#6366]({{ site.repository }}/issues/6366))
-
-
-## 3.5.2 / 2017-08-12
-{: #v3-5-2}
-
-### Bug Fixes
-{: #bug-fixes-v3-5-2}
-
- Backport [#6281]({{ site.repository }}/issues/6281) for v3.5.x: Fix `Drop#key?` so it can handle a nil argument ([#6288]({{ site.repository }}/issues/6288))
- Backport [#6280]({{ site.repository }}/issues/6280) for v3.5.x: Guard against type error in `absolute_url` ([#6287]({{ site.repository }}/issues/6287))
- Backport [#6266]({{ site.repository }}/issues/6266) for v3.5.x: Memoize the return value of `Document#url` ([#6301]({{ site.repository }}/issues/6301))
- Backport [#6273]({{ site.repository }}/issues/6273) for v3.5.x: delegate `StaticFile#to_json` to `StaticFile#to_liquid` ([#6302]({{ site.repository }}/issues/6302))
- Backport [#6226]({{ site.repository }}/issues/6226) for v3.5.x: `Reader#read_directories`: guard against an entry not being a directory ([#6304]({{ site.repository }}/issues/6304))
- Backport [#6247]({{ site.repository }}/issues/6247) for v3.5.x: kramdown: symbolize keys in-place ([#6303]({{ site.repository }}/issues/6303))
-
-
 ## 3.5.1 / 2017-07-17
 {: #v3-5-1}

@@ -325,8 +26,8 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - added BibSonomy plugin ([#6143]({{ site.repository }}/issues/6143))
 - add plugins for multiple page pagination ([#6055]({{ site.repository }}/issues/6055))
 - Update minimum Ruby version in installation.md ([#6164]({{ site.repository }}/issues/6164))
- Add information about finding a collection in `site.collections` ([#6165]({{ site.repository }}/issues/6165))
- Add {% raw %}`{% raw %}`{% endraw %} to Liquid example on site ([#6179]({{ site.repository }}/issues/6179))
+- [docs] Add information about finding a collection in `site.collections` ([#6165]({{ site.repository }}/issues/6165))
+- Add {%raw%} to Liquid example on site ([#6179]({{ site.repository }}/issues/6179))
 - Added improved Pug plugin - removed 404 Jade plugin ([#6174]({{ site.repository }}/issues/6174))
 - Linking the link ([#6210]({{ site.repository }}/issues/6210))
 - Small correction in documentation for includes ([#6193]({{ site.repository }}/issues/6193))
@@ -427,7 +128,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Be more specific on what to upload ([#6119]({{ site.repository }}/issues/6119))
 - Remove Blank Newlines from "Jekyll on Windows" Page ([#6126]({{ site.repository }}/issues/6126))
 - Link the troubleshooting page in the quickstart page ([#6134]({{ site.repository }}/issues/6134))
- add documentation about the &#34;pinned&#34; label ([#6147]({{ site.repository }}/issues/6147))
+- add documentation about the &[#34]({{ site.repository }}/issues/34);pinned&[#34]({{ site.repository }}/issues/34); label ([#6147]({{ site.repository }}/issues/6147))
 - docs(JekyllOnWindows): Add a new Installation way ([#6141]({{ site.repository }}/issues/6141))
 - corrected windows.md ([#6149]({{ site.repository }}/issues/6149))
 - Refine documentation for Windows ([#6153]({{ site.repository }}/issues/6153))
@@ -435,7 +136,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Development Fixes
 {: #development-fixes-v3-5-0}

- Rubocop: add missing comma ([#5835]({{ site.repository }}/issues/5835))
+- [Rubocop] add missing comma ([#5835]({{ site.repository }}/issues/5835))
 - Appease classifier-reborn ([#5934]({{ site.repository }}/issues/5934))
 - Allow releases & development on `*-stable` branches ([#5926]({{ site.repository }}/issues/5926))
 - Add script/backport-pr ([#5925]({{ site.repository }}/issues/5925))
@@ -474,7 +175,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 {: #bug-fixes-v3-5-0}

 - Exclude Gemfile by default ([#5860]({{ site.repository }}/issues/5860))
- Convertible#validate_permalink!: ensure the return value of `data["permalink"]` is a string before asking if it is empty ([#5878]({{ site.repository }}/issues/5878))
+- Convertible#validate_permalink!: ensure the return value of data["permalink"] is a string before asking if it is empty ([#5878]({{ site.repository }}/issues/5878))
 - Allow abbreviated post dates ([#5920]({{ site.repository }}/issues/5920))
 - Remove dependency on include from default about.md ([#5903]({{ site.repository }}/issues/5903))
 - Allow colons in `uri_escape` filter ([#5957]({{ site.repository }}/issues/5957))
@@ -550,7 +251,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Switch to `https` when possible. ([#5611]({{ site.repository }}/issues/5611))
 - Update `_font-awesome.scss` to move .woff file before .ttf ([#5614]({{ site.repository }}/issues/5614))
 - Update documentation on updating FontAwesome Iconset ([#5655]({{ site.repository }}/issues/5655))
- Use defaults for docs and news-items ([#5744]({{ site.repository }}/issues/5744))
+- [site] Use defaults for docs and news-items ([#5744]({{ site.repository }}/issues/5744))
 - Sort gems in `docs/_config.yml` ([#5746]({{ site.repository }}/issues/5746))
 - Add missing class ([#5791]({{ site.repository }}/issues/5791))
 - Improve template docs ([#5694]({{ site.repository }}/issues/5694))
@@ -612,7 +313,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Update quickstart.md ([#5758]({{ site.repository }}/issues/5758))
 - Correct minor typo ([#5764]({{ site.repository }}/issues/5764))
 - Fix a markdown link to look properly on the web ([#5769]({{ site.repository }}/issues/5769))
- Info about the help command usage ([#5312]({{ site.repository }}/issues/5312))
+- [docs] Info about the help command usage ([#5312]({{ site.repository }}/issues/5312))
 - Add missing merge labels for jekyllbot ([#5753]({{ site.repository }}/issues/5753))
 - Fix broken links in documentation ([#5736]({{ site.repository }}/issues/5736))
 - Docs: add `match_regex` and `replace_regex` filters ([#5799]({{ site.repository }}/issues/5799))
@@ -755,10 +456,10 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Site: exclude README.md and .gitignore ([#5304]({{ site.repository }}/issues/5304))
 - Add link to Staticman ([#5224]({{ site.repository }}/issues/5224))
 - Update url for OpenShift ([#5320]({{ site.repository }}/issues/5320))
- Add help for missing static_file e.g. on heroku ([#5334]({{ site.repository }}/issues/5334))
+- [docs] add help for missing static_file e.g. on heroku ([#5334]({{ site.repository }}/issues/5334))
 - Add a line about updating theme-gems in the docs ([#5318]({{ site.repository }}/issues/5318))
 - Explain how to copy a theme's files ([#5335]({{ site.repository }}/issues/5335))
- .md as default extension in examples ([#5316]({{ site.repository }}/issues/5316))
+- [docs] .md as default extension in examples ([#5316]({{ site.repository }}/issues/5316))
 - Fix small typo in docs ([#5347]({{ site.repository }}/issues/5347))
 - Add missing period to sentence in first paragraph. ([#5372]({{ site.repository }}/issues/5372))
 - added jekyll-spotify plugin ([#5369]({{ site.repository }}/issues/5369))
@@ -767,7 +468,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Add documentation for `relative_url` and `absolute_url` ([#5405]({{ site.repository }}/issues/5405))
 - Bugfix on logo in JSON-LD ([#5421]({{ site.repository }}/issues/5421))
 - Fix Travis.ci documentation ([#5413]({{ site.repository }}/issues/5413))
- Update documentation regarding `bundle install` after `jekyll new` ([#5428]({{ site.repository }}/issues/5428))
+- [docs] Update documentation regarding `bundle install` after `jekyll new` ([#5428]({{ site.repository }}/issues/5428))
 - Replace classic box-sizing reset with inheritance reset ([#5411]({{ site.repository }}/issues/5411))
 - Update Wikipedia YAML list link ([#5452]({{ site.repository }}/issues/5452))
 - Add Jekyll 3.3 release post ([#5442]({{ site.repository }}/issues/5442))
@@ -1083,7 +784,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Bug Fixes
 {: #bug-fixes-v3-1-2}

- Fix syntax highlighting in kramdown by making `@config` accessible in the Markdown converter. ([#4428]({{ site.repository }}/issues/4428))
+- Fix syntax highlighting in kramdown by making `[@config](https://github.com/config)` accessible in the Markdown converter. ([#4428]({{ site.repository }}/issues/4428))
 - `Jekyll.sanitized_path`: sanitizing a questionable path should handle tildes ([#4492]({{ site.repository }}/issues/4492))
 - Fix `titleize` so already capitalized words are not dropped ([#4525]({{ site.repository }}/issues/4525))
 - Permalinks which end in a slash should always output HTML ([#4546]({{ site.repository }}/issues/4546))
@@ -1101,7 +802,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Fix broken links to the Code of Conduct ([#4436]({{ site.repository }}/issues/4436))
 - Upgrade notes: mention trailing slash in permalink; fixes [#4440]({{ site.repository }}/issues/4440) ([#4455]({{ site.repository }}/issues/4455))
 - Add hooks to the plugin categories toc ([#4463]({{ site.repository }}/issues/4463))
- Jekyll 3 requires newer version of Ruby. ([#4461]({{ site.repository }}/issues/4461))
+- [add note] Jekyll 3 requires newer version of Ruby. ([#4461]({{ site.repository }}/issues/4461))
 - Fix typo in upgrading docs ([#4473]({{ site.repository }}/issues/4473))
 - Add note about upgrading documentation on jekyllrb.com/help/ ([#4484]({{ site.repository }}/issues/4484))
 - Update Rake link ([#4496]({{ site.repository }}/issues/4496))
@@ -1166,7 +867,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Convertible should make layout data accessible via `layout` instead of `page` ([#4205]({{ site.repository }}/issues/4205))
 - Avoid using `Dir.glob` with absolute path to allow special characters in the path ([#4150]({{ site.repository }}/issues/4150))
 - Handle empty config files ([#4052]({{ site.repository }}/issues/4052))
- Rename `@options` so that it does not impact Liquid. ([#4173]({{ site.repository }}/issues/4173))
+- Rename `[@options](https://github.com/options)` so that it does not impact Liquid. ([#4173]({{ site.repository }}/issues/4173))
 - utils/drops: update Drop to support `Utils.deep_merge_hashes` ([#4289]({{ site.repository }}/issues/4289))
 - Make sure jekyll/drops/drop is loaded first. ([#4292]({{ site.repository }}/issues/4292))
 - Convertible/Page/Renderer: use payload hash accessor & setter syntax for backwards-compatibility ([#4311]({{ site.repository }}/issues/4311))
@@ -1177,7 +878,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Fix deep_merge_hashes! handling of drops and hashes ([#4359]({{ site.repository }}/issues/4359))
 - Page should respect output extension of its permalink ([#4373]({{ site.repository }}/issues/4373))
 - Disable auto-regeneration when running server detached ([#4376]({{ site.repository }}/issues/4376))
- Drop#: only use public_send for keys in the content_methods array ([#4388]({{ site.repository }}/issues/4388))
+- Drop#[]: only use public_send for keys in the content_methods array ([#4388]({{ site.repository }}/issues/4388))
 - Extract title from filename successfully when no date. ([#4195]({{ site.repository }}/issues/4195))

 ### Development Fixes
@@ -1227,7 +928,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Add documentation for smartify Liquid filter ([#4333]({{ site.repository }}/issues/4333))
 - Fixed broken link to blog on using mathjax with jekyll ([#4344]({{ site.repository }}/issues/4344))
 - Documentation: correct reference in Precedence section of Configuration docs ([#4355]({{ site.repository }}/issues/4355))
- Add @jmcglone's guide to github-pages doc page ([#4364]({{ site.repository }}/issues/4364))
+- Add [@jmcglone](https://github.com/jmcglone)'s guide to github-pages doc page ([#4364]({{ site.repository }}/issues/4364))
 - Added the Wordpress2Jekyll Wordpress plugin ([#4377]({{ site.repository }}/issues/4377))
 - Add Contentful Extension to list of third-party plugins ([#4390]({{ site.repository }}/issues/4390))
 - Correct Minor spelling error ([#4394]({{ site.repository }}/issues/4394))
@@ -1608,7 +1309,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Site Enhancements
 {: #site-enhancements-v2-5-3}

- Add @alfredxing to the @jekyll/core team. :tada: ([#3218]({{ site.repository }}/issues/3218))
+- Add `[@alfredxing](https://github.com/alfredxing)` to the `[@jekyll](https://github.com/jekyll)/core` team. :tada: ([#3218]({{ site.repository }}/issues/3218))
 - Document the `-q` option for the `build` and `serve` commands ([#3149]({{ site.repository }}/issues/3149))
 - Fix some minor typos/flow fixes in documentation website content ([#3165]({{ site.repository }}/issues/3165))
 - Add `keep_files` to configuration documentation ([#3162]({{ site.repository }}/issues/3162))
@@ -2205,7 +1906,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Fixed typo in datafiles doc page ([#1854]({{ site.repository }}/issues/1854))
 - Clarify how to access `site` in docs ([#1864]({{ site.repository }}/issues/1864))
 - Add closing `<code>` tag to `context.registers[:site]` note ([#1867]({{ site.repository }}/issues/1867))
- Fix link to @mojombo's site source ([#1897]({{ site.repository }}/issues/1897))
+- Fix link to [@mojombo](https://github.com/mojombo)'s site source ([#1897]({{ site.repository }}/issues/1897))
 - Add `paginate: nil` to default configuration in docs ([#1896]({{ site.repository }}/issues/1896))
 - Add link to our License in the site footer ([#1889]({{ site.repository }}/issues/1889))
 - Add a charset note in "Writing Posts" doc page ([#1902]({{ site.repository }}/issues/1902))
@@ -2672,7 +2373,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Add documentation about `paginate_path` to "Templates" page in docs ([#1129]({{ site.repository }}/issues/1129))
 - Give the quick-start guide its own page ([#1191]({{ site.repository }}/issues/1191))
 - Update ProTip on Installation page in docs to point to all the info about Pygments and the 'highlight' tag. ([#1196]({{ site.repository }}/issues/1196))
- Run `site/img` through ImageOptim (thanks @qrush!) ([#1208]({{ site.repository }}/issues/1208))
+- Run `site/img` through ImageOptim (thanks [@qrush](https://github.com/qrush)!) ([#1208]({{ site.repository }}/issues/1208))
 - Added Jade Converter to `site/docs/plugins` ([#1210]({{ site.repository }}/issues/1210))
 - Fix location of docs pages in Contributing pages ([#1214]({{ site.repository }}/issues/1214))
 - Add ReadInXMinutes plugin to the plugin list ([#1222]({{ site.repository }}/issues/1222))
@@ -3154,25 +2855,25 @@ note: This file is autogenerated. Edit /History.markdown instead.
 {: #v0-5-3}

 - Bug Fixes
- Solving the permalink bug where non-html files wouldn't work (@jeffrydegrande)
+- Solving the permalink bug where non-html files wouldn't work ([@jeffrydegrande](https://github.com/jeffrydegrande))


 ## 0.5.2 / 2009-06-24
 {: #v0-5-2}

 - Enhancements
- Added --paginate option to the executable along with a paginator object for the payload (@calavera)
+- Added --paginate option to the executable along with a paginator object for the payload ([@calavera](https://github.com/calavera))
 - Upgraded RedCloth to 4.2.1, which makes `<notextile>` tags work once again.
- Configuration options set in config.yml are now available through the site payload (@vilcans)
+- Configuration options set in config.yml are now available through the site payload ([@vilcans](https://github.com/vilcans))
 - Posts can now have an empty YAML front matter or none at all (@ bahuvrihi)
 - Bug Fixes
- Fixing Ruby 1.9 issue that requires `#to_s` on the err object (@Chrononaut)
- Fixes for pagination and ordering posts on the same day (@ujh)
- Made pages respect permalinks style and permalinks in yml front matter (@eugenebolshakov)
- Index.html file should always have index.html permalink (@eugenebolshakov)
- Added trailing slash to pretty permalink style so Apache is happy (@eugenebolshakov)
+- Fixing Ruby 1.9 issue that requires `#to_s` on the err object ([@Chrononaut](https://github.com/Chrononaut))
+- Fixes for pagination and ordering posts on the same day ([@ujh](https://github.com/ujh))
+- Made pages respect permalinks style and permalinks in yml front matter ([@eugenebolshakov](https://github.com/eugenebolshakov))
+- Index.html file should always have index.html permalink ([@eugenebolshakov](https://github.com/eugenebolshakov))
+- Added trailing slash to pretty permalink style so Apache is happy ([@eugenebolshakov](https://github.com/eugenebolshakov))
 - Bad markdown processor in config fails sooner and with better message (@ gcnovus)
- Allow CRLFs in yaml front matter (@juretta)
+- Allow CRLFs in yaml front matter ([@juretta](https://github.com/juretta))
 - Added Date#xmlschema for Ruby versions < 1.9


@@ -3182,15 +2883,15 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Major Enhancements
 {: #major-enhancements-v0-5-1}

- Next/previous posts in site payload (@pantulis, @tomo)
+- Next/previous posts in site payload ([@pantulis](https://github.com/pantulis), [@tomo](https://github.com/tomo))
 - Permalink templating system
 - Moved most of the README out to the GitHub wiki
- Exclude option in configuration so specified files won't be brought over with generated site (@duritong)
+- Exclude option in configuration so specified files won't be brought over with generated site ([@duritong](https://github.com/duritong))
 - Bug Fixes
 - Making sure config.yaml references are all gone, using only config.yml
- Fixed syntax highlighting breaking for UTF-8 code (@henrik)
- Worked around RDiscount bug that prevents Markdown from getting parsed after highlight (@henrik)
- CGI escaped post titles (@Chrononaut)
+- Fixed syntax highlighting breaking for UTF-8 code ([@henrik](https://github.com/henrik))
+- Worked around RDiscount bug that prevents Markdown from getting parsed after highlight ([@henrik](https://github.com/henrik))
+- CGI escaped post titles ([@Chrononaut](https://github.com/Chrononaut))


 ## 0.5.0 / 2009-04-07
@@ -3199,21 +2900,21 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Minor Enhancements
 {: #minor-enhancements-v0-5-0}

- Ability to set post categories via YAML (@qrush)
- Ability to set prevent a post from publishing via YAML (@qrush)
- Add textilize filter (@willcodeforfoo)
- Add 'pretty' permalink style for wordpress-like urls (@dysinger)
- Made it possible to enter categories from YAML as an array (@Chrononaut)
- Ignore Emacs autosave files (@Chrononaut)
+- Ability to set post categories via YAML ([@qrush](https://github.com/qrush))
+- Ability to set prevent a post from publishing via YAML ([@qrush](https://github.com/qrush))
+- Add textilize filter ([@willcodeforfoo](https://github.com/willcodeforfoo))
+- Add 'pretty' permalink style for wordpress-like urls ([@dysinger](https://github.com/dysinger))
+- Made it possible to enter categories from YAML as an array ([@Chrononaut](https://github.com/Chrononaut))
+- Ignore Emacs autosave files ([@Chrononaut](https://github.com/Chrononaut))
 - Bug Fixes
- Use block syntax of popen4 to ensure that subprocesses are properly disposed (@jqr)
- Close open4 streams to prevent zombies (@rtomayko)
- Only query required fields from the WP Database (@ariejan)
- Prevent `_posts` from being copied to the destination directory (@bdimcheff)
+- Use block syntax of popen4 to ensure that subprocesses are properly disposed ([@jqr](https://github.com/jqr))
+- Close open4 streams to prevent zombies ([@rtomayko](https://github.com/rtomayko))
+- Only query required fields from the WP Database ([@ariejan](https://github.com/ariejan))
+- Prevent `_posts` from being copied to the destination directory ([@bdimcheff](https://github.com/bdimcheff))
 - Refactors
- Factored the filtering code into a method (@Chrononaut)
- Fix tests and convert to Shoulda (@qrush, @technicalpickles)
- Add Cucumber acceptance test suite (@qrush, @technicalpickles)
+- Factored the filtering code into a method ([@Chrononaut](https://github.com/Chrononaut))
+- Fix tests and convert to Shoulda ([@qrush](https://github.com/qrush), [@technicalpickles](https://github.com/technicalpickles))
+- Add Cucumber acceptance test suite ([@qrush](https://github.com/qrush), [@technicalpickles](https://github.com/technicalpickles))


 ## 0.4.1
@@ -3221,9 +2922,9 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Minor Enhancements
 {: #minor-enhancements-v--}

- Changed date format on wordpress converter (zeropadding) (@dysinger)
+- Changed date format on wordpress converter (zeropadding) ([@dysinger](https://github.com/dysinger))
 - Bug Fixes
- Add Jekyll binary as executable to gemspec (@dysinger)
+- Add Jekyll binary as executable to gemspec ([@dysinger](https://github.com/dysinger))


 ## 0.4.0 / 2009-02-03
@@ -3237,20 +2938,20 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Minor Enhancements
 {: #minor-enhancements-v0-4-0}

- Type importer (@codeslinger)
- `site.topics` accessor (@baz)
- Add `array_to_sentence_string` filter (@mchung)
- Add a converter for textpattern (@PerfectlyNormal)
- Add a working Mephisto / MySQL converter (@ivey)
- Allowing .htaccess files to be copied over into the generated site (@briandoll)
- Add option to not put file date in permalink URL (@mreid)
- Add line number capabilities to highlight blocks (@jcon)
+- Type importer ([@codeslinger](https://github.com/codeslinger))
+- `site.topics` accessor ([@baz](https://github.com/baz))
+- Add `array_to_sentence_string` filter ([@mchung](https://github.com/mchung))
+- Add a converter for textpattern ([@PerfectlyNormal](https://github.com/PerfectlyNormal))
+- Add a working Mephisto / MySQL converter ([@ivey](https://github.com/ivey))
+- Allowing .htaccess files to be copied over into the generated site ([@briandoll](https://github.com/briandoll))
+- Add option to not put file date in permalink URL ([@mreid](https://github.com/mreid))
+- Add line number capabilities to highlight blocks ([@jcon](https://github.com/jcon))
 - Bug Fixes
- Fix permalink behavior (@cavalle)
- Fixed an issue with pygments, markdown, and newlines (@zpinter)
- Ampersands need to be escaped (@pufuwozu, @ap)
- Test and fix the site.categories hash (@zzot)
- Fix site payload available to files (@matrix9180)
+- Fix permalink behavior ([@cavalle](https://github.com/cavalle))
+- Fixed an issue with pygments, markdown, and newlines ([@zpinter](https://github.com/zpinter))
+- Ampersands need to be escaped ([@pufuwozu](https://github.com/pufuwozu), [@ap](https://github.com/ap))
+- Test and fix the site.categories hash ([@zzot](https://github.com/zzot))
+- Fix site payload available to files ([@matrix9180](https://github.com/matrix9180))


 ## 0.3.0 / 2008-12-24
@@ -3259,19 +2960,19 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Major Enhancements
 {: #major-enhancements-v0-3-0}

- Added `--server` option to start a simple WEBrick server on destination directory (@johnreilly and @mchung)
+- Added `--server` option to start a simple WEBrick server on destination directory ([@johnreilly](https://github.com/johnreilly) and [@mchung](https://github.com/mchung))

 ### Minor Enhancements
 {: #minor-enhancements-v0-3-0}

- Added post categories based on directories containing `_posts` (@mreid)
+- Added post categories based on directories containing `_posts` ([@mreid](https://github.com/mreid))
 - Added post topics based on directories underneath `_posts`
- Added new date filter that shows the full month name (@mreid)
- Merge Post's YAML front matter into its to_liquid payload (@remi)
+- Added new date filter that shows the full month name ([@mreid](https://github.com/mreid))
+- Merge Post's YAML front matter into its to_liquid payload ([@remi](https://github.com/remi))
 - Restrict includes to regular files underneath `_includes`
 - Bug Fixes
- Change YAML delimiter matcher so as to not chew up 2nd level markdown headers (@mreid)
- Fix bug that meant page data (such as the date) was not available in templates (@mreid)
+- Change YAML delimiter matcher so as to not chew up 2nd level markdown headers ([@mreid](https://github.com/mreid))
+- Fix bug that meant page data (such as the date) was not available in templates ([@mreid](https://github.com/mreid))
 - Properly reject directories in `_layouts`


@@ -3279,13 +2980,13 @@ note: This file is autogenerated. Edit /History.markdown instead.
 {: #v0-2-1}

 - Major Changes
- Use Maruku (pure Ruby) for Markdown by default (@mreid)
+- Use Maruku (pure Ruby) for Markdown by default ([@mreid](https://github.com/mreid))
 - Allow use of RDiscount with `--rdiscount` flag

 ### Minor Enhancements
 {: #minor-enhancements-v0-2-1}

- Don't load directory_watcher unless it's needed (@pjhyett)
+- Don't load directory_watcher unless it's needed ([@pjhyett](https://github.com/pjhyett))


 ## 0.2.0 / 2008-12-14
@@ -3314,10 +3015,10 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Minor Enhancements
 {: #minor-enhancements-v0-1-5}

- Output informative message if RDiscount is not available (@JackDanger)
+- Output informative message if RDiscount is not available ([@JackDanger](https://github.com/JackDanger))
 - Bug Fixes
- Prevent Jekyll from picking up the output directory as a source (@JackDanger)
- Skip `related_posts` when there is only one post (@JackDanger)
+- Prevent Jekyll from picking up the output directory as a source ([@JackDanger](https://github.com/JackDanger))
+- Skip `related_posts` when there is only one post ([@JackDanger](https://github.com/JackDanger))


 ## 0.1.4 / 2008-12-08
@@ -3331,12 +3032,12 @@ note: This file is autogenerated. Edit /History.markdown instead.
 {: #v0-1-3}

 - Major Features
- Markdown support (@vanpelt)
- Mephisto and CSV converters (@vanpelt)
- Code hilighting (@vanpelt)
+- Markdown support ([@vanpelt](https://github.com/vanpelt))
+- Mephisto and CSV converters ([@vanpelt](https://github.com/vanpelt))
+- Code hilighting ([@vanpelt](https://github.com/vanpelt))
 - Autobuild
 - Bug Fixes
- Accept both `\r\n` and `\n` in YAML header (@vanpelt)
+- Accept both `\r\n` and `\n` in YAML header ([@vanpelt](https://github.com/vanpelt))


 ## 0.1.2 / 2008-11-22
--- a/docs/_docs/includes.md
+++ b/docs/_docs/includes.md
@@ -5,11 +5,9 @@ permalink: /docs/includes/

 The `include` tag allows you to include the content from another file stored in the `_includes` folder:

-{% raw %}
 ```liquid
-{% include footer.html %}
+{% raw %}{% include footer.html %}{% endraw %}
 ```
-{% 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.

@@ -17,11 +15,9 @@ Jekyll will look for the referenced file (in this case, `footer.html`) in the `_

 You can choose to include file fragments relative to the current file by using the `include_relative` tag:

-{% raw %}
 ```liquid
-{% include_relative somedir/footer.html %}
+{% raw %}{% include_relative somedir/footer.html %}{% endraw %}
 ```
-{% 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,
@@ -46,11 +42,9 @@ my_variable: footer_company_a.html

 You could then reference that variable in your include:

-{% raw %}
 ```liquid
-{% include {{ page.my_variable }} %}
+{% raw %}{% include {{ page.my_variable }} %}{% endraw %}
 ```
-{% endraw %}

 In this example, the include would insert the file `footer_company_a.html` from the `_includes/footer_company_a.html` directory.

@@ -58,22 +52,18 @@ In this example, the include would insert the file `footer_company_a.html` from

 You can also pass parameters to an include. For example, suppose you have a file called `note.html` in your `_includes` folder that contains this formatting:

-{% raw %}
 ```liquid
-<div markdown="span" class="alert alert-info" role="alert">
+{% raw %}<div markdown="span" class="alert alert-info" role="alert">
 <i class="fa fa-info-circle"></i> <b>Note:</b>
 {{ include.content }}
-</div>
+</div>{% endraw %}
 ```
-{% endraw %}

 The `{% raw %}{{ include.content }}{% endraw %}` is a parameter that gets populated when you call the include and specify a value for that parameter, like this:

-{% raw %}
 ```liquid
-{% include note.html content="This is my sample note." %}
+{% raw %}{% include note.html content="This is my sample note." %} {% endraw %}
 ```
-{% endraw %}

 The value of `content` (which is `This is my sample note`) will be inserted into the {% raw %}`{{ include.content }}`{% endraw %} parameter.

@@ -92,16 +82,14 @@ For example, suppose you have a special image syntax with complex formatting, an

 You could templatize this content in your include and make each value available as a parameter, like this:

-{% raw %}
 ```liquid
-<figure>
+{% raw %}<figure>
   <a href="{{ include.url }}">
   <img src="{{ include.file }}" style="max-width: {{ include.max-width }};"
      alt="{{ include.alt }}"/>
   <figcaption>{{ include.caption }}</figcaption>
-</figure>
+</figure>{% endraw %}
 ```
-{% endraw %}

 This include contains 5 parameters:

@@ -113,17 +101,15 @@ This include contains 5 parameters:

 Here's an example that passes all the parameters to this include (the include file is named `image.html`):

-{% raw %}
 ```liquid
-{% include image.html url="http://jekyllrb.com"
+{% raw %}{% include image.html url="http://jekyllrb.com"
 max-width="200px" file="logo.png" alt="Jekyll logo"
-caption="This is the Jekyll logo." %}
+caption="This is the Jekyll logo." %} {% endraw %}
 ```
-{% 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://shopify.github.io/liquid/filters/default/).
+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.)

@@ -135,21 +121,16 @@ The string you pass to your include parameter can't contain curly braces. For ex

 If you want to include this variable in your parameter that you pass to an include, you need to store the entire parameter as a variable before passing it to the include. You can use `capture` tags to create the variable:

-{% raw %}
 ```liquid
-{% capture download_note %}
-The latest version of {{ site.product_name }} is now available.
-{% endcapture %}
+{% raw %}{% capture download_note %}The latest version of
+{{ site.product_name }} is now available.{% endcapture %}{% endraw %}
 ```
-{% endraw %}

 Then pass this captured variable into the parameter for the include. Omit the quotation marks around the parameter content because it's no longer a string (it's a variable):

-{% raw %}
 ```liquid
-{% include note.html content=download_note %}
+{% raw %}{% include note.html content=download_note %}{% endraw %}
 ```
-{% endraw %}

 ### Passing references to YAML files as parameter values

@@ -169,22 +150,18 @@ Here's an example. In the `_data` folder, suppose you have a YAML file called `p

 In the `_includes` folder, assume you have a file called `spotlight.html` with this code:

-{% raw %}
 ```liquid
-{% for person in include.participants %}
+{% raw %}{% for person in include.participants %}
 {% if person.login_age == "new" %}
 {{ person.name }}
 {% endif %}
-{% endfor %}
+{% endfor %}{% endraw %}
 ```
-{% endraw %}

 Now when you insert the `spotlight.html` include file, you can submit the YAML file as a parameter:

-{% raw %}
-```liquid
-{% include spotlight.html participants=site.data.profiles %}
 ```
-{% endraw %}
+{% 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`.
--- a/docs/_docs/index.md
+++ b/docs/_docs/index.md
@@ -15,7 +15,7 @@ development of Jekyll itself.
 Jekyll is a simple, blog-aware, static site generator. It takes a template
 directory containing raw text files in various formats, runs it through
 a converter (like [Markdown](https://daringfireball.net/projects/markdown/))
-and our [Liquid](https://shopify.github.io/liquid/) renderer, and
+and our [Liquid](https://github.com/Shopify/liquid/wiki) renderer, and
 spits out a complete, ready-to-publish static website suitable
 for serving with your favorite web server. Jekyll also happens to be the engine
 behind [GitHub Pages](https://pages.github.com), which means you can use Jekyll
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -14,10 +14,15 @@ Installing Jekyll should be straight-forward if all requirements are met.
 Before you start, make sure your system has the following:

 - GNU/Linux, Unix, or macOS
- [Ruby](https://www.ruby-lang.org/en/downloads/) version 2.2.5 or above, including all development
-  headers (ruby installation can be checked by running `ruby -v`, development headers can be checked on Ubuntu by running `apt list --installed  ruby-dev`)
- [RubyGems](https://rubygems.org/pages/download) (which you can check by running `gem -v`)
- [GCC](https://gcc.gnu.org/install/) and [Make](https://www.gnu.org/software/make/) (in case your system doesn't have them installed, which you can check by running `gcc -v`,`g++ -v`  and `make -v` in your system's command line interface)
+- [Ruby](https://www.ruby-lang.org/en/downloads/) version 2.1 or above, including all development
+  headers
+- [RubyGems](https://rubygems.org/pages/download)
+- [GCC](https://gcc.gnu.org/install/) and [Make](https://www.gnu.org/software/make/) (in case your system doesn't have them installed, which you can check by running `gcc -v` and `make -v` in your system's command line interface)
+
+#### Only required for Jekyll 2 and earlier
+
+- [NodeJS](https://nodejs.org/), or another JavaScript runtime (for CoffeeScript support).
+- [Python 2.7](https://www.python.org/downloads/)

 <div class="note info">
  <h5>Problems installing Jekyll?</h5>
@@ -44,7 +49,7 @@ The best way to install Jekyll is via
 simply run the following command to install Jekyll:

 ```sh
-gem install jekyll
+$ gem install jekyll
 ```

 All of Jekyll’s gem dependencies are automatically installed by the above
@@ -81,11 +86,11 @@ more involved. This gives you the advantage of having the latest and greatest,
 but may be unstable.

 ```sh
-git clone git://github.com/jekyll/jekyll.git
-cd jekyll
-script/bootstrap
-bundle exec rake build
-ls pkg/*.gem | head -n 1 | xargs gem install -l
+$ git clone git://github.com/jekyll/jekyll.git
+$ cd jekyll
+$ script/bootstrap
+$ bundle exec rake build
+$ ls pkg/*.gem | head -n 1 | xargs gem install -l
 ```

 ## Optional Extras
@@ -111,29 +116,20 @@ Check out [the extras page](../extras/) for more information.
 Before you start developing with Jekyll, you may want to check that you're up to date with the latest version. To find your version of Jekyll, run one of these commands:

 ```sh
-jekyll --version
-gem list jekyll
+$ jekyll --version
+$ gem list jekyll
 ```

 You can also use [RubyGems](https://rubygems.org/gems/jekyll) to find the current versioning of any gem. But you can also use the `gem` command line tool:

 ```sh
-gem search jekyll --remote
+$ gem search jekyll --remote
 ```

 and you'll search for just the name `jekyll`, and in brackets will be latest version. Another way to check if you have the latest version is to run the command `gem outdated`. This will provide a list of all the gems on your system that need to be updated. If you aren't running the latest version, run this command:

 ```sh
-bundle update jekyll
+$ gem update jekyll
 ```

-Alternatively, if you don't have Bundler installed run:
-
-```sh
-gem update jekyll
-```
-
-Please refer to our [upgrading section](../upgrading/) for major updates
-detailed instructions.
-
 Now that you’ve got everything up-to-date and installed, let’s get to work!
--- a/docs/_docs/pages.md
+++ b/docs/_docs/pages.md
@@ -60,7 +60,7 @@ If you have a lot of pages, you can organize those pages into subfolders. The sa

 If you have pages organized into subfolders in your source folder and want to flatten them in the root folder on build, you must add the [permalink]({% link _docs/permalinks.md %}) property directly in your page's front matter like this:

-```yaml
+```
 ---
 title: My page
 permalink: mypageurl.html
--- a/docs/_docs/pagination.md
+++ b/docs/_docs/pagination.md
@@ -9,7 +9,7 @@ multiple pages. Jekyll offers a pagination plugin, so you can automatically
 generate the appropriate files and folders you need for paginated listings.

 For Jekyll 3, include the `jekyll-paginate` plugin in your Gemfile and in
-your `_config.yml` under `plugins`. For Jekyll 2, this is standard.
+your `_config.yml` under `gems`. For Jekyll 2, this is standard.

 <div class="note info">
  <h5>Pagination only works within HTML files</h5>
@@ -24,7 +24,7 @@ your `_config.yml` under `plugins`. For Jekyll 2, this is standard.

 ## Enable pagination

-To enable pagination for posts on your blog, add a line to the `_config.yml` file that
+To enable pagination for your blog, add a line to the `_config.yml` file that
 specifies how many items should be displayed per page:

 ```yaml
@@ -55,14 +55,6 @@ directory.
  </p>
 </div>

-<div class="note info">
-  <h5>Pagination for categories, tags and collections</h5>
-  <p>
-    The more recent <a href="https://github.com/sverrirs/jekyll-paginate-v2">jekyll-paginate-v2</a> plugin supports more features. See the <a href="https://github.com/sverrirs/jekyll-paginate-v2/tree/master/examples">pagination examples</a> in the repository.
-    <strong>This plugin is not supported by GitHub Pages</strong>.
-  </p>
-</div>
-
 ## Liquid Attributes Available

 The pagination plugin exposes the `paginator` liquid object with the following
@@ -153,8 +145,8 @@ the `paginator` variable that will now be available to you. You’ll probably
 want to do this in one of the main pages of your site. Here’s one example of a
 simple way of rendering paginated Posts in a HTML file:

+```html
 {% raw %}
-```liquid
 ---
 layout: default
 title: My Blog
@@ -185,8 +177,8 @@ title: My Blog
    <span class="next ">Next</span>
  {% endif %}
 </div>
-```
 {% endraw %}
+```

 <div class="note warning">
  <h5>Beware the page one edge-case</h5>
@@ -200,8 +192,8 @@ title: My Blog
 The following HTML snippet should handle page one, and render a list of each
 page with links to all but the current page.

+```html
 {% raw %}
-```liquid
 {% if paginator.total_pages > 1 %}
 <div class="pagination">
  {% if paginator.previous_page %}
@@ -227,5 +219,5 @@ page with links to all but the current page.
  {% endif %}
 </div>
 {% endif %}
-```
 {% endraw %}
+```
--- a/docs/_docs/permalinks.md
+++ b/docs/_docs/permalinks.md
@@ -66,10 +66,7 @@ The following table lists the template variables available for permalinks. You c
        <p><code>year</code></p>
      </td>
      <td>
-        <p>
-          Year from the post's filename. May be overridden via the document’s
-          <code>date</code> YAML front matter
-        </p>
+        <p>Year from the post's filename</p>
      </td>
    </tr>
    <tr>
@@ -77,10 +74,7 @@ The following table lists the template variables available for permalinks. You c
        <p><code>month</code></p>
      </td>
      <td>
-        <p>
-          Month from the post's filename. May be overridden via the document’s
-          <code>date</code> YAML front matter
-        </p>
+        <p>Month from the post's filename</p>
      </td>
    </tr>
    <tr>
@@ -88,10 +82,7 @@ The following table lists the template variables available for permalinks. You c
        <p><code>i_month</code></p>
      </td>
      <td>
-        <p>
-          Month without leading zeros from the post's filename. May be
-          overridden via the document’s <code>date</code> YAML front matter
-        </p>
+        <p>Month from the post's filename without leading zeros.</p>
      </td>
    </tr>
    <tr>
@@ -99,10 +90,7 @@ The following table lists the template variables available for permalinks. You c
        <p><code>day</code></p>
      </td>
      <td>
-        <p>
-          Day from the post's filename. May be overridden via the document’s
-          <code>date</code> YAML front matter
-        </p>
+        <p>Day from the post's filename</p>
      </td>
    </tr>
    <tr>
@@ -110,18 +98,7 @@ The following table lists the template variables available for permalinks. You c
        <p><code>i_day</code></p>
      </td>
      <td>
-        <p>
-          Day without leading zeros from the post's filename. May be overridden
-          via the document’s <code>date</code> YAML front matter
-        </p>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <p><code>y_day</code></p>
-      </td>_
-      <td>
-        <p>Day of the year from the post's filename, with leading zeros.</p>
+        <p>Day from the post's filename without leading zeros.</p>
      </td>
    </tr>
    <tr>
@@ -129,10 +106,7 @@ The following table lists the template variables available for permalinks. You c
        <p><code>short_year</code></p>
      </td>
      <td>
-        <p>
-          Year without the century from the post's filename. May be overridden
-          via the document’s <code>date</code> YAML front matter
-        </p>
+        <p>Year from the post's filename without the century.</p>
      </td>
    </tr>
    <tr>
@@ -141,8 +115,7 @@ The following table lists the template variables available for permalinks. You c
      </td>
      <td>
        <p>
-          Hour of the day, 24-hour clock, zero-padded from the post's
-          <code>date</code> front matter. (00..23)
+          Hour of the day, 24-hour clock, zero-padded from the post's <code>date</code> front matter. (00..23)
        </p>
      </td>
    </tr>
@@ -330,7 +303,7 @@ The permalink setting in your configuration file specifies the permalink style u

 For example:

-* A permalink style of `/:categories/:year/:month/:day/:title.:output_ext` for posts becomes `/:title.html` for pages and collections.
+* A permalink style of `/: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.

@@ -354,13 +327,13 @@ As with posts, if you use a permalink style that omits the `.html` file extensio

 By default, collections follow a similar structure in the `_site` folder as pages, except that the path is prefaced by the collection name. For example: `collectionname/mypage.html`. For permalink settings that omit the file extension, the path would be `collection_name/mypage/index.html`.

-Collections have their own way of setting permalinks. Additionally, collections have unique template variables available (such as `path` and `output_ext`). See the [Configuring permalinks for collections](../collections/#permalinks) in Collections for more information.
+Collections have their own way of setting permalinks. Additionally, collections have unique template variables available available (such as `path` and `output_ext`). See the [Configuring permalinks for collections](../collections/#permalinks) in Collections for more information.

 ## Flattening pages in \_site on build

 If you want to flatten your pages (pull them out of subfolders) in the `_site` directory when your site builds (similar to posts), add the `permalink` property to the front matter of each page, with no path specified:

-```yaml
+```
 ---
 title: My page
 permalink: mypageurl.html
--- a/docs/_docs/plugins.md
+++ b/docs/_docs/plugins.md
@@ -25,36 +25,27 @@ having to modify the Jekyll source itself.
 You have 3 options for installing plugins:

 1. In your site source root, make a `_plugins` directory. Place your plugins
-   here. Any file ending in `*.rb` inside this directory will be loaded before
-   Jekyll generates your site.
+here. Any file ending in `*.rb` inside this directory will be loaded before
+Jekyll generates your site.
+2. In your `_config.yml` file, add a new array with the key `plugins` and the
+values of the gem names of the plugins you'd like to use. An example:

-2. In your `_config.yml` file, add a new array with the key `plugins` (or `gems` for Jekyll < `3.5.0`) and the
-   values of the gem names of the plugins you'd like to use. An example:

-   ```yaml
-   # This will require each of these plugins automatically.
-   plugins:
-     - jekyll-gist
-     - jekyll-coffeescript
-     - jekyll-assets
-     - another-jekyll-plugin
-   ```
+        plugins: [jekyll-coffeescript, jekyll-watch, jekyll-assets]
+        # This will require each of these plugins automatically.

-   Then install your plugins using `gem install jekyll-gist jekyll-coffeescript jekyll-assets another-jekyll-plugin`
+    Then install your plugins using `gem install jekyll-coffeescript jekyll-watch jekyll-assets`

 3. Add the relevant plugins to a Bundler group in your `Gemfile`. An
-   example:
+    example:

-   ```ruby
-    group :jekyll_plugins do
-      gem "jekyll-gist"
-      gem "jekyll-coffeescript"
-      gem "jekyll-assets"
-      gem "another-jekyll-plugin"
-    end
-   ```
+        group :jekyll_plugins do
+          gem "my-jekyll-plugin"
+          gem "another-jekyll-plugin"
+        end
+
+    Now you need to install all plugins from your Bundler group by running single command `bundle install`

-   Now you need to install all plugins from your Bundler group by running single command `bundle install`.

 <div class="note info">
  <h5>
@@ -68,25 +59,7 @@ You have 3 options for installing plugins:
  </p>
 </div>

-### The jekyll_plugins group
-
-Jekyll gives this particular group of gems in your `Gemfile` a different
-treatment. Any gem included in this group is loaded before Jekyll starts
-processing the rest of your source directory.
-
-A gem included here will be activated even if its not explicitly listed under
-the `plugins:` key in your site's config file.
-
-<div class="note warning">
-  <p>
-    Gems included in the <code>:jekyll-plugins</code> group are activated
-    regardless of the <code>--safe</code> mode setting. Be aware of what
-    gems are included under this group!
-  </p>
-</div>
-
-
-In general, plugins you make will fall broadly into one of five categories:
+In general, plugins you make will fall into one of five categories:

 1. [Generators](#generators)
 2. [Converters](#converters)
@@ -94,8 +67,6 @@ In general, plugins you make will fall broadly into one of five categories:
 4. [Tags](#tags)
 5. [Hooks](#hooks)

-See the bottom of the page for a [list of available plugins](#available-plugins)
-
 ## Generators

 You can create a generator when you need Jekyll to create additional content
@@ -139,6 +110,7 @@ This is a more complex generator that generates new pages:

 ```ruby
 module Jekyll
+
  class CategoryPage < Page
    def initialize(site, base, dir, category)
      @site = site
@@ -167,6 +139,7 @@ module Jekyll
      end
    end
  end
+
 end
 ```

@@ -405,11 +378,11 @@ Liquid::Template.register_tag('render_time', Jekyll::RenderTimeTag)
 In the example above, we can place the following tag anywhere in one of our
 pages:

-{% raw %}
 ```ruby
+{% raw %}
 <p>{% render_time page rendered at: %}</p>
-```
 {% endraw %}
+```

 And we would get something like this on the page:

@@ -782,14 +755,10 @@ LESS.js files during generation.
 - [Jekyll Art Gallery plugin](https://github.com/alexivkin/Jekyll-Art-Gallery-Plugin): An advanced art/photo gallery generation plugin for creating galleries from a set of image folders. Supports image tagging, thumbnails, sorting, image rotation, post-processing (remove EXIF, add watermark), multiple collections and much more.
 - [jekyll-ga](https://github.com/developmentseed/jekyll-ga): A Jekyll plugin that downloads Google Analytics data and adds it to posts. Useful for making a site that lists "most popular" content. [Read the introduction](https://developmentseed.org/blog/google-analytics-jekyll-plugin/) post on the developmentSEED blog.
 - [jekyll-multi-paginate](https://github.com/fadhilnapis/jekyll-multi-paginate): Simple Jekyll paginator for multiple page. Ease you to make pagination on multiple page especially like multiple language.
- [jekyll-category-pages](https://github.com/field-theory/jekyll-category-pages): Easy-to-use category index pages with and without pagination. Supports non-URL-safe category keywords and has extensive documentation and test coverage.
- [Tweetsert](https://github.com/ibrado/jekyll-tweetsert): Imports tweets (Twitter statuses) as new posts. Features multiple timeline support, hashtag import, filtering, automatic category and/or tags, optional retweets and replies.
- [Stickyposts](https://github.com/ibrado/jekyll-stickyposts): Moves or copies (pins) posts marked `sticky: true` to the top of the list. Perfect for keeping important announcements on the home page, or giving collections a descriptive entry. Paginator friendly.
- [Jekyll::Paginate::Content](https://github.com/ibrado/jekyll-paginate-content): Content paginator in the style of jekyll-paginator-v2 that splits pages, posts, and collection entries into several pages. Specify a separator or use HTML &lt;h1&gt; etc. headers. Automatic splitting, single-page view, pager/trail, self-adjusting links, multipage TOC, SEO support.

 #### Converters

- [Pug plugin by Doug Beney](http://jekyll-pug.dougie.io): Use the popular Pug (previously Jade) templating language in Jekyll. Complete with caching, includes support, and much more.
+- [Pug plugin by Doug Beney](https://github.com/DougBeney/jekyll-pug): Pug (previously Jade) converter for Jekyll.
 - [Textile converter](https://github.com/jekyll/jekyll-textile-converter): Convert `.textile` files into HTML. Also includes the `textilize` Liquid filter.
 - [Slim plugin](https://github.com/slim-template/jekyll-slim): Slim converter and includes for Jekyll with support for Liquid tags.
 - [HAML plugin by Sam Z](https://gist.github.com/517556): HAML converter for Jekyll.
@@ -816,6 +785,7 @@ LESS.js files during generation.
 - [Truncate HTML](https://github.com/MattHall/truncatehtml) by [Matt Hall](https://codebeef.com/): A Jekyll filter that truncates HTML while preserving markup structure.
 - [Domain Name Filter by Lawrence Woodman](https://github.com/LawrenceWoodman/domain_name-liquid_filter): Filters the input text so that just the domain name is left.
 - [Summarize Filter by Mathieu Arnold](https://gist.github.com/731597): Remove markup after a `<div id="extended">` tag.
+- [i18n_filter](https://github.com/gacha/gacha.id.lv/blob/master/_plugins/i18n_filter.rb): Liquid filter to use I18n localization.
 - [Smilify](https://github.com/SaswatPadhi/jekyll_smilify) by [SaswatPadhi](https://github.com/SaswatPadhi): Convert text emoticons in your content to themeable smiley pics.
 - [Read in X Minutes](https://gist.github.com/zachleat/5792681) by [zachleat](https://github.com/zachleat): Estimates the reading time of a string (for blog post content).
 - [Jekyll-timeago](https://github.com/markets/jekyll-timeago): Converts a time value to the time ago in words.
@@ -828,6 +798,7 @@ LESS.js files during generation.
 - [Deprecated articles keeper](https://github.com/kzykbys/JekyllPlugins) by [Kazuya Kobayashi](http://blog.kazuya.co/): A simple Jekyll filter which monitor how old an article is.
 - [Jekyll-jalali](https://github.com/mehdisadeghi/jekyll-jalali) by [Mehdi Sadeghi](http://mehdix.ir): A simple Gregorian to Jalali date converter filter.
 - [Jekyll Thumbnail Filter](https://github.com/matallo/jekyll-thumbnail-filter): Related posts thumbnail filter.
+- [Jekyll-Smartify](https://github.com/pathawks/jekyll-smartify): SmartyPants filter. Make &quot;quotes&quot; &ldquo;curly&rdquo;
 - [liquid-md5](https://github.com/pathawks/liquid-md5): Returns an MD5 hash. Helpful for generating Gravatars in templates.
 - [jekyll-roman](https://github.com/paulrobertlloyd/jekyll-roman): A liquid filter for Jekyll that converts numbers into Roman numerals.
 - [jekyll-typogrify](https://github.com/myles/jekyll-typogrify): A Jekyll plugin that brings the functions of [typogruby](http://avdgaag.github.io/typogruby/).
@@ -839,9 +810,6 @@ LESS.js files during generation.

 #### Tags

-You can find a few useful plugins at the following locations:
-
- [Jekyll-gist](https://github.com/jekyll/jekyll-gist): Use the `gist` tag to easily embed a GitHub Gist onto your site. This works with public or secret gists.
 - [Asset Path Tag](https://github.com/samrayner/jekyll-asset-path-plugin) by [Sam Rayner](http://www.samrayner.com/): Allows organisation of assets into subdirectories by outputting a path for a given file relative to the current post or page.
 - [Delicious Plugin by Christian Hellsten](https://github.com/christianhellsten/jekyll-plugins): Fetches and renders bookmarks from delicious.com.
 - [Ultraviolet Plugin by Steve Alex](https://gist.github.com/480380): Jekyll tag for the [Ultraviolet](https://github.com/grosser/ultraviolet) code highligher.
@@ -907,9 +875,6 @@ You can find a few useful plugins at the following locations:
 - [Jekyll If File Exists](https://github.com/k-funk/jekyll-if-file-exists): A Jekyll Plugin that checks if a file exists with an if/else block.
 - [BibSonomy](https://github.com/rjoberon/bibsonomy-jekyll): Jekyll
  plugin to generate publication lists from [BibSonomy](https://www.bibsonomy.org/).
- [github-cards](https://github.com/edward-shen/github-cards): Creates styleable Github cards for your Github projects.
- [disqus-for-jekyll](https://github.com/kacperduras/disqus-for-jekyll): A Jekyll plugin to view the comments powered by Disqus.
- [jekyll-html](https://github.com/kacperduras/jekyll-html): A Jekyll plugin to use HTML tags in Jekyll pages, posts and collections. 


 #### Collections
@@ -920,7 +885,7 @@ You can find a few useful plugins at the following locations:

 #### Other

- [Analytics for Jekyll](https://github.com/hendrikschneider/jekyll-analytics) by Hendrik Schneider: An effortless way to add various trackers like Google Analytics, Matomo (formerly Piwik), mPulse, etc. to your site.
+- [Analytics for Jekyll](https://github.com/hendrikschneider/jekyll-analytics) by Hendrik Schneider: An effortless way to add  various trackers like Google Analytics, Piwik, etc. to your site
 - [ditaa-ditaa](https://github.com/tmthrgd/ditaa-ditaa) by Tom Thorogood: a drastic revision of jekyll-ditaa that renders diagrams drawn using ASCII art into PNG images.
 - [Pygments Cache Path by Raimonds Simanovskis](https://github.com/rsim/blog.rayapps.com/blob/master/_plugins/pygments_cache_patch.rb): Plugin to cache syntax-highlighted code from Pygments.
 - [Draft/Publish Plugin by Michael Ivey](https://gist.github.com/49630): Save posts as drafts.
@@ -934,6 +899,7 @@ You can find a few useful plugins at the following locations:
 - [Jekyll-pagination](https://github.com/blackwinter/jekyll-pagination): Jekyll plugin to extend the pagination generator.
 - [Jekyll-tagging](https://github.com/pattex/jekyll-tagging): Jekyll plugin to automatically generate a tag cloud and tag pages.
 - [Jekyll-scholar](https://github.com/inukshuk/jekyll-scholar): Jekyll extensions for the blogging scholar.
+- [Jekyll-asset_bundler](https://github.com/moshen/jekyll-asset_bundler): Bundles and minifies JavaScript and CSS.
 - [Jekyll-assets](http://jekyll.github.io/jekyll-assets/) by [ixti](https://github.com/ixti): Rails-alike assets pipeline (write assets in CoffeeScript, Sass, LESS etc; specify dependencies for automatic bundling using simple declarative comments in assets; minify and compress; use JST templates; cache bust; and many-many more).
 - [JAPR](https://github.com/kitsched/japr): Jekyll Asset Pipeline Reborn - Powerful asset pipeline for Jekyll that collects, converts and compresses JavaScript and CSS assets.
 - [File compressor](https://gist.github.com/2758691) by [mytharcher](https://github.com/mytharcher): Compress HTML and JavaScript files on site build.
@@ -963,7 +929,14 @@ You can find a few useful plugins at the following locations:
 - [Jekyll-Post](https://github.com/robcrocombe/jekyll-post): A CLI tool to easily draft, edit, and publish Jekyll posts.
 - [jekyll-numbered-headings](https://github.com/muratayusuke/jekyll-numbered-headings): Adds ordered number to headings.
 - [jekyll-pre-commit](https://github.com/mpchadwick/jekyll-pre-commit): A framework for running checks against your posts using a git pre-commit hook before you publish them.
- [jekyll-pwa-plugin](https://github.com/lavas-project/jekyll-pwa): A plugin provides PWA support for Jekyll. It generates a service worker in Jekyll build process and makes precache and runtime cache available in the runtime with Google Workbox.
+
+#### Editors
+
+- [sublime-jekyll](https://github.com/23maverick23/sublime-jekyll): A Sublime Text package for Jekyll static sites. This package should help creating Jekyll sites and posts easier by providing access to key template tags and filters, as well as common completions and a current date/datetime command (for dating posts). You can install this package manually via GitHub, or via [Package Control](https://packagecontrol.io/packages/Jekyll).
+- [vim-jekyll](https://github.com/parkr/vim-jekyll): A vim plugin to generate
+  new posts and run `jekyll build` all without leaving vim.
+- [markdown-writer](https://atom.io/packages/markdown-writer): An Atom package for Jekyll. It can create new posts/drafts, manage tags/categories, insert link/images and add many useful key mappings.
+- [Wordpress2Jekyll](https://wordpress.org/plugins/wp2jekyll/): A Wordpress plugin that allows you to use Wordpress as your editor and (automatically) export content in to Jekyll. WordPress2Jekyll attempts to marry these two systems together in order to make a site that can be easily managed from all devices.

 <div class="note info">
  <h5>Jekyll Plugins Wanted</h5>
--- a/docs/_docs/posts.md
+++ b/docs/_docs/posts.md
@@ -26,7 +26,7 @@ To create a new post, all you need to do is create a file in the `_posts`
 directory. How you name files in this folder is important. Jekyll requires blog
 post files to be named according to the following format:

-```
+```sh
 YEAR-MONTH-DAY-title.MARKUP
 ```

@@ -34,7 +34,7 @@ Where `YEAR` is a four-digit number, `MONTH` and `DAY` are both two-digit
 numbers, and `MARKUP` is the file extension representing the format used in the
 file. For example, the following are examples of valid post filenames:

-```
+```sh
 2011-12-31-new-years-eve-is-awesome.md
 2012-09-12-how-to-write-a-blog.md
 ```
@@ -78,54 +78,55 @@ digital assets along with your text content. While the syntax for linking to
 these resources differs between Markdown and Textile, the problem of working
 out where to store these files in your site is something everyone will face.

-There are a number of ways to include digital assets in Jekyll.
+There are a number of ways to include digital assets in Jekyll. 
 One common solution is to create a folder in the root of the project directory
-called something like `assets`, into which any images, files
+called something like `assets` or `downloads`, into which any images, downloads
 or other resources are placed. Then, from within any post, they can be linked
 to using the site’s root as the path for the asset to include. Again, this will
 depend on the way your site’s (sub)domain and path are configured, but here are
-some examples in Markdown of how you could do this using the `absolute_url`
-filter in a post.
+some examples (in Markdown) of how you could do this using the `site.url`
+variable in a post.

 Including an image asset in a post:

-{% raw %}
-```markdown
+```text
 ... which is shown in the screenshot below:
-![My helpful screenshot]({{ "/assets/screenshot.jpg" | absolute_url }})
+![My helpful screenshot]({% raw %}{{ site.url }}{% endraw %}/assets/screenshot.jpg)
 ```
-{% endraw %}

 Linking to a PDF for readers to download:

-{% raw %}
-```markdown
-... you can [get the PDF]({{ "/assets/mydoc.pdf" | absolute_url }}) directly.
+```text
+... you can [get the PDF]({% raw %}{{ site.url }}{% endraw %}/assets/mydoc.pdf) directly.
 ```
-{% endraw %}
-
-<div class="info">

+<div class="note">
+  <h5>ProTip™: Link using just the site root URL</h5>
+  <p>
+    You can skip the <code>{% raw %}{{ site.url }}{% endraw %}</code> variable
+    if you <strong>know</strong> your site will only ever be displayed at the
+    root URL of your domain. In this case you can reference assets directly with
+    just <code>/path/file.jpg</code>.
+  </p>
 </div>

 ## A typical post

 Jekyll can handle many different iterations of the idea you might associate with a "post," however a standard blog style post, including a Title, Layout, Publishing Date, and Categories might look like this:

-```markdown
+```
 ---
 layout: post
 title:  "Welcome to Jekyll!"
 date:   2015-11-17 16:16:01 -0600
 categories: jekyll update
 ---
-
 You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `bundle exec jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.

 To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works.
-```

-Everything in between the first and second `---` are part of the YAML Front Matter, and everything after the second `---` will be rendered with Markdown and show up as "Content".
+```
+Everything in between the first and second `---` are part of the YAML Front Matter, and everything after the second `---` will be rendered with Markdown and show up as "Content."

 ## Displaying an index of posts

@@ -135,17 +136,15 @@ you have a list of posts somewhere. Creating an index of posts on another page
 language](https://docs.shopify.com/themes/liquid/basics) and its tags. Here’s a
 basic example of how to create a list of links to your blog posts:

-{% raw %}
 ```html
 <ul>
-  {% for post in site.posts %}
+  {% raw %}{% for post in site.posts %}{% endraw %}
    <li>
-      <a href="{{ post.url }}">{{ post.title }}</a>
+      <a href="{% raw %}{{ post.url }}{% endraw %}">{% raw %}{{ post.title }}{% endraw %}</a>
    </li>
-  {% endfor %}
+  {% raw %}{% endfor %}{% endraw %}
 </ul>
 ```
-{% endraw %}

 Of course, you have full control over how (and where) you display your posts,
 and how you structure your site. You should read more about [how templates
@@ -156,54 +155,6 @@ you wish to access the currently-rendering page/posts's variables (the
 variables of the post/page that has the `for` loop in it), use the `page`
 variable instead.

-## Displaying post categories or tags
-
-Hey, that's pretty neat, but what about showing just some of your posts that are
-related to each other? For that you can use any of the [variables definable in
-Front Matter](https://jekyllrb.com/docs/frontmatter/). In the "typical post"
-section you can see how to define categories. Simply add the categories to your
-Front Matter as a [yaml
-list](https://en.wikipedia.org/wiki/YAML#Basic_components).
-
-Now that your posts have a category or multiple categories, you can make a page
-or a template displaying just the posts in those categories you specify. Here's
-a basic example of how to create a list of posts from a specific category.
-
-First, in the `_layouts` directory create a new file called `category.html` - in
-that file put (at least) the following:
-
-{% raw %}
-```liquid
---
-layout: page
---
-
-{% for post in site.categories[page.category] %}
-    <a href="{{ post.url | absolute_url }}">
-      {{ post.title }}
-    </a>
-{% endfor %}
-```
-{% endraw %}
-
-Next, in the root directory of your Jekyll install, create a new directory
-called `category` and then create a file for each category you want to list. For
-example, if you have a category `blog` then create a file in the new directory
-called `blog.html` with at least
-
-```yaml
---
-layout: category
-title: Blog
-category: blog
---
-```
-
-In this case, the listing pages will be accessible at `{baseurl}/category/blog.html`
-
-While this example is done with categories, you can easily extend your lists to
-filter by tags or any other variable created with extensions.
-
 ## Post excerpts

 Each post automatically takes the first block of text, from the beginning of
@@ -212,35 +163,31 @@ Take the above example of an index of posts. Perhaps you want to include
 a little hint about the post's content by adding the first paragraph of each of
 your posts:

-{% raw %}
-```liquid
+```html
 <ul>
-  {% for post in site.posts %}
+  {% raw %}{% for post in site.posts %}{% endraw %}
    <li>
-      <a href="{{ post.url }}">{{ post.title }}</a>
-      {{ post.excerpt }}
+      <a href="{% raw %}{{ post.url }}{% endraw %}">{% raw %}{{ post.title }}{% endraw %}</a>
+      {% raw %}{{ post.excerpt }}{% endraw %}
    </li>
-  {% endfor %}
+  {% raw %}{% endfor %}{% endraw %}
 </ul>
 ```
-{% endraw %}

 Because Jekyll grabs the first paragraph you will not need to wrap the excerpt
 in `p` tags, which is already done for you. These tags can be removed with the
 following if you'd prefer:

-{% raw %}
-```liquid
-{{ post.excerpt | remove: '<p>' | remove: '</p>' }}
+```html
+{% raw %}{{ post.excerpt | remove: '<p>' | remove: '</p>' }}{% endraw %}
 ```
-{% endraw %}

 If you don't like the automatically-generated post excerpt, it can be
 explicitly overridden by adding an `excerpt` value to your post's YAML
 Front Matter. Alternatively, you can choose to define a custom
 `excerpt_separator` in the post's YAML front matter:

-```yaml
+```text
 ---
 excerpt_separator: <!--more-->
 ---
@@ -267,9 +214,8 @@ Jekyll also has built-in support for syntax highlighting of code snippets using
 either Pygments or Rouge, and including a code snippet in any post is easy.
 Just use the dedicated Liquid tag as follows:

-{% raw %}
-```liquid
-{% highlight ruby %}
+```text
+{% raw %}{% highlight ruby %}{% endraw %}
 def show
  @widget = Widget(params[:id])
  respond_to do |format|
@@ -277,9 +223,8 @@ def show
    format.json { render json: @widget }
  end
 end
-{% endhighlight %}
+{% raw %}{% endhighlight %}{% endraw %}
 ```
-{% endraw %}

 And the output will look like this:

--- a/docs/_docs/quickstart.md
+++ b/docs/_docs/quickstart.md
@@ -8,16 +8,16 @@ If you already have a full [Ruby](https://www.ruby-lang.org/en/downloads/) devel

 ```sh
 # Install Jekyll and Bundler gems through RubyGems
-gem install jekyll bundler
+~ $ gem install jekyll bundler

 # Create a new Jekyll site at ./myblog
-jekyll new myblog
+~ $ jekyll new myblog

 # Change into your new directory
-cd myblog
+~ $ cd myblog

 # Build the site on the preview server
-bundle exec jekyll serve
+~/myblog $ bundle exec jekyll serve

 # Now browse to http://localhost:4000
 ```
--- a/docs/_docs/resources.md
+++ b/docs/_docs/resources.md
@@ -3,57 +3,41 @@ title: Resources
 permalink: /docs/resources/
 ---

-Jekyll's growing use is producing a wide variety of tutorials, frameworks, extensions, examples, and other resources that can be very helpful. Below is a collection of links to some of the most popular Jekyll resources.
+Jekyll’s growing use is producing a wide variety of tutorials, frameworks, extensions, examples, and other resources that can be very helpful. Below is a collection of links to some of the most popular Jekyll resources.

-## Editors
-
- [jekyll-atom](https://atom.io/packages/jekyll): A collection of snippets and tools for Jekyll in Atom
- [markdown-writer](https://atom.io/packages/markdown-writer): An Atom package for Jekyll. It can create new posts/drafts, manage tags/categories, insert link/images and add many useful key mappings.
- [sublime-jekyll](https://github.com/23maverick23/sublime-jekyll): A Sublime Text package for Jekyll static sites. This package should help creating Jekyll sites and posts easier by providing access to key template tags and filters, as well as common completions and a current date/datetime command (for dating posts). You can install this package manually via GitHub, or via [Package Control](https://packagecontrol.io/packages/Jekyll).
- [vim-jekyll](https://github.com/parkr/vim-jekyll): A vim plugin to generate new posts and run `jekyll build` all without leaving vim.
- [WordPress2Jekyll](https://wordpress.org/plugins/wp2jekyll/): A WordPress plugin that allows you to use WordPress as your editor and (automatically) export content in to Jekyll. WordPress2Jekyll attempts to marry these two systems together in order to make a site that can be easily managed from all devices.
-
-## Useful Guides
+### Useful Guides

 - [Jekyll Tips](http://jekyll.tips) is a set of resources created by [CloudCannon](https://cloudcannon.com) to help folks get up and running with Jekyll. They cover all skill levels, and even include some great video tutorials.
 - [Jekyll Cheatsheet](http://jekyll.tips/jekyll-cheat-sheet/) is a single-page resource for Jekyll filters, variables, and the like.
- ["Creating and Hosting a Personal Site on GitHub"](http://jmcglone.com/guides/github-pages/)
- ['Build A Blog With Jekyll And GitHub Pages' on Smashing Magazine](https://www.smashingmagazine.com/2014/08/01/build-blog-jekyll-github-pages/)
+- [“Creating and Hosting a Personal Site on GitHub”](http://jmcglone.com/guides/github-pages/)
+- [‘Build A Blog With Jekyll And GitHub Pages’ on Smashing Magazine](https://www.smashingmagazine.com/2014/08/01/build-blog-jekyll-github-pages/)
 - Publishing to GitHub Pages? [Check out our documentation page for just that purpose](/docs/github-pages/).
 - [Blogging with Git, Emacs and Jekyll](https://metajack.im/2009/01/23/blogging-with-git-emacs-and-jekyll/)
 - [Tips for working with GitHub Pages Integration](https://gist.github.com/jedschneider/2890453)

-## Integrations
+### Integrations

 - Use a saas service as a backend for forms (contact forms, hiring forms, etc.)
-
-  - [Formspree (open source)](https://formspree.io/)
+  - [Formspree (also open source)](https://formspree.io/)
  - [FormKeep](https://formkeep.com/guides/contact-form-jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=contact-form-jekyll)
  - [Simple Form](https://getsimpleform.com/)
  - [Formingo](https://www.formingo.co/guides/jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=Jekyll%20Documentation)
-  - [Formester](http://www.formester.com)
-  - [Staticman](https://staticman.net): Add user-generated content to a Jekyll site (free and open source)
-  - [Snipcart](https://snipcart.com/blog/static-site-e-commerce-part-2-integrating-snipcart-with-jekyll): Add a shopping cart to a Jekyll site
-  - [Contentful](https://www.contentful.com/ecosystem/jekyll/): use Jekyll together with the API-driven Contentful CMS.
-  - [Algolia](https://blog.algolia.com/instant-search-blog-documentation-jekyll-plugin/): Add a powerful instant search to your Jekyll site
+- [Jekyll Bootstrap](http://jekyllbootstrap.com), 0 to Blog in 3 minutes. Provides detailed explanations, examples, and helper-code to make getting started with Jekyll easier.
+- [Integrating Twitter with Jekyll](http://www.justkez.com/integrating-twitter-with-jekyll/)
+  > “Having migrated Justkez.com to be based on Jekyll, I was pondering how I might include my recent twitterings on the front page of the site. In the WordPress world, this would have been done via a plugin which may or may not have hung the loading of the page, might have employed caching, but would certainly have had some overheads. … Not in Jekyll.”
+- [Staticman](https://staticman.net): Add user-generated content to a Jekyll site (free and open source)

-## Other commentary
+### Other commentary

- [How I'm using Jekyll in 2016](https://mademistakes.com/articles/using-jekyll-2016/)
+- [‘My Jekyll Fork’, by Mike West](https://mikewest.org/2009/11/my-jekyll-fork)

- [Static Comments with Jekyll & Staticman](https://mademistakes.com/articles/improving-jekyll-static-comments/)
+  > “Jekyll is a well-architected throwback to a time before WordPress, when men were men, and HTML was static. I like the ideas it espouses, and have made a few improvements to it’s core. Here, I’ll point out some highlights of my fork in the hopes that they see usage beyond this site.”

- [Adding Ajax pagination to Jekyll](https://eduardoboucas.com/blog/2014/11/05/adding-ajax-pagination-to-jekyll.html)
+- [‘About this Website’, by Carter Allen](http://cartera.me/2010/08/12/about-this-website/)

- ['My Jekyll Fork', by Mike West](https://mikewest.org/2009/11/my-jekyll-fork)
-
-  > "Jekyll is a well-architected throwback to a time before WordPress, when men were men, and HTML was static. I like the ideas it espouses, and have made a few improvements to it's core. Here, I'll point out some highlights of my fork in the hopes that they see usage beyond this site."
-
- ['About this Website', by Carter Allen](http://cartera.me/2010/08/12/about-this-website/)
-
-  > "Jekyll is everything that I ever wanted in a blogging engine. Really. It isn't perfect, but what's excellent about it is that if there's something wrong, I know exactly how it works and how to fix it. It runs on the your machine only, and is essentially an added"build" step between you and the browser. I coded this entire site in TextMate using standard HTML5 and CSS3, and then at the end I added just a few little variables to the markup. Presto-chango, my site is built and I am at peace with the world."
+  > “Jekyll is everything that I ever wanted in a blogging engine. Really. It isn’t perfect, but what’s excellent about it is that if there’s something wrong, I know exactly how it works and how to fix it. It runs on the your machine only, and is essentially an added”build" step between you and the browser. I coded this entire site in TextMate using standard HTML5 and CSS3, and then at the end I added just a few little variables to the markup. Presto-chango, my site is built and I am at peace with the world.”

 - [Generating a Tag Cloud in Jekyll](http://www.justkez.com/generating-a-tag-cloud-in-jekyll/) – A guide to implementing a tag cloud and per-tag content pages using Jekyll.
-
 - A way to [extend Jekyll](https://github.com/rfelix/jekyll_ext) without forking and modifying the Jekyll gem codebase and some [portable Jekyll extensions](https://wiki.github.com/rfelix/jekyll_ext/extensions) that can be reused and shared.
 - [Using your Rails layouts in Jekyll](http://numbers.brighterplanet.com/2010/08/09/sharing-rails-views-with-jekyll)
+- [Adding Ajax pagination to Jekyll](https://eduardoboucas.com/blog/2014/11/05/adding-ajax-pagination-to-jekyll.html)
--- a/docs/_docs/static_files.md
+++ b/docs/_docs/static_files.md
@@ -66,13 +66,13 @@ following metadata:
 </table>
 </div>

-Note that in the above table, `file` can be anything. It's simply an arbitrarily set variable used in your own logic (such as in a for loop). It isn't a global site or page variable.
+Note that in the above table, `file` can be anything. It's simply an arbitrarily set variable used in your own logic (such as in a for loop). It isn't a global site or page variable. 

 ## Add front matter to static files

-Although you can't directly add front matter values to static files, you can set front matter values through the [defaults property](../configuration/#front-matter-defaults) in your configuration file. When Jekyll builds the site, it will use the front matter values you set.
+Although you can't directly add front matter values to static files, you can set front matter values through the [defaults property](../configuration/#front-matter-defaults) in your configuration file. When Jekyll builds the site, it will use the front matter values you set. 

-Here's an example:
+Here's an example: 

 In your `_config.yml` file, add the following values to the `defaults` property:

@@ -88,13 +88,11 @@ This assumes that your Jekyll site has a folder path of `assets/img` where  you

 Suppose you want to list all your image assets as contained in `assets/img`. You could use this for loop to look in the `static_files` object and get all static files that have this front matter property:

-{% raw %}
 ```liquid
-{% assign image_files = site.static_files | where: "image", true %}
+{% raw %}{% assign image_files = site.static_files | where: "image", true %}
 {% for myimage in image_files %}
  {{ myimage.path }}
-{% endfor %}
+{% endfor %}{% endraw %}
 ```
-{% endraw %}

 When you build your site, the output will list the path to each file that meets this front matter condition.
--- a/docs/_docs/support.md
+++ b/docs/_docs/support.md
@@ -1,24 +0,0 @@
---
-title: Support
-permalink: "/docs/support/"
-note: This file is autogenerated. Edit /.github/SUPPORT.markdown instead.
---
-
-## Getting Help
-
-**Jekyll's issue tracker is not a support forum.**
-
-If you're looking for support for Jekyll, there are a lot of options:
-
-* Read [Jekyll Documentation](https://jekyllrb.com/docs/home/)
-* If you have a question about using Jekyll, start a discussion on [Jekyll Forum](https://talk.jekyllrb.com/) or [StackOverflow](https://stackoverflow.com/questions/tagged/jekyll)
-* Chat with Jekyllers &mdash; Join [our Gitter channel](https://gitter.im/jekyll/jekyll) or [our IRC channel on Freenode](irc:irc.freenode.net/jekyll)
-
-There are a bunch of helpful community members on these services that should be willing to point you in the right direction.
-
-## Report a bug
-
-* If you think you've found a bug within a Jekyll plugin, open an issue in that plugin's repository &mdash; First [look for the plugin on rubygems](https://rubygems.org/) then click on the `Homepage` link to access the plugin repository.
-* If you think you've found a bug within Jekyll itself, [open an issue](https://github.com/jekyll/jekyll/issues/new).
-
-Happy Jekyllin'!
--- a/docs/_docs/templates.md
+++ b/docs/_docs/templates.md
@@ -6,9 +6,8 @@ permalink: /docs/templates/
 Jekyll uses the [Liquid](https://shopify.github.io/liquid/) templating language to
 process templates. All of the standard Liquid [tags](https://shopify.github.io/liquid/tags/control-flow/) and
 [filters](https://shopify.github.io/liquid/filters/abs/) are
-supported. To make common tasks easier, Jekyll even adds a few handy filters
-and tags of its own, all of which you can find on this page. Jekyll even lets
-you come up with your own tags via plugins.
+supported. Jekyll even adds a few handy filters and tags of its own to make
+common tasks easier.

 ## Filters

@@ -293,18 +292,6 @@ you come up with your own tags via plugins.
        <p>
          <code class="output">the-_config.yml-file</code>
        </p>
-        <p>
-         <code class="filter">{% raw %}{{ "The _cönfig.yml file" | slugify: 'ascii' }}{% endraw %}</code>
-        </p>
-        <p>
-          <code class="output">the-c-nfig-yml-file</code>
-        </p>
-        <p>
-         <code class="filter">{% raw %}{{ "The cönfig.yml file" | slugify: 'latin' }}{% endraw %}</code>
-        </p>
-        <p>
-          <code class="output">the-config-yml-file</code>
-        </p>
      </td>
    </tr>
    <tr>
@@ -428,25 +415,16 @@ The default is `default`. They are as follows (with what they filter):
 - `raw`: spaces
 - `default`: spaces and non-alphanumeric characters
 - `pretty`: spaces and non-alphanumeric characters except for `._~!$&'()+,;=@`
- `ascii`: spaces, non-alphanumeric, and non-ASCII characters
- `latin`: like `default`, except Latin characters are first transliterated (e.g. `àèïòü` to `aeiou`) {%- include docs_version_badge.html version="3.7.0" -%}

 ## Tags

-* [Includes](#includes)
-* [Code snippet highlighting](#code-snippet-highlighting)
-* [Linking to pages, collections and posts (the new and improved way)](#links)
-* [Linking to posts (the old way)](#linking-to-posts)
-
 ### Includes

 If you have small page snippets that you want to include in multiple places on your site, save the snippets as *include files* and insert them where required, by using the `include` tag:

-{% raw %}
 ```liquid
-{% include footer.html %}
+{% raw %}{% include footer.html %}{% endraw %}
 ```
-{% endraw %}

 Jekyll expects all *include files* to be placed in an `_includes` directory at the root of your source directory. In the above example, this will embed the contents of `_includes/footer.html` into the calling file.

@@ -467,15 +445,15 @@ languages](http://pygments.org/languages/)

 To render a code block with syntax highlighting, surround your code as follows:

-{% raw %}
 ```liquid
+{% raw %}
 {% highlight ruby %}
 def foo
  puts 'foo'
 end
 {% endhighlight %}
-```
 {% endraw %}
+```

 The argument to the `highlight` tag (`ruby` in the example above) is the
 language identifier. To find the appropriate identifier to use for the language
@@ -483,13 +461,6 @@ you want to highlight, look for the “short name” on the [Rouge
 wiki](https://github.com/jayferd/rouge/wiki/List-of-supported-languages-and-lexers)
 or the [Pygments' Lexers page](http://pygments.org/docs/lexers/).

-<div class="note info">
-  <h5>Jekyll processes all Liquid filters in code blocks</h5>
-  <p>If you are using a language that contains curly braces, you
-    will likely need to place <code>{&#37; raw &#37;}</code> and
-    <code>{&#37; endraw &#37;}</code> tags around your code.</p>
-</div>
-
 #### Line numbers

 There is a second argument to `highlight` called `linenos` that is optional.
@@ -497,15 +468,15 @@ Including the `linenos` argument will force the highlighted code to include line
 numbers. For instance, the following code block would include line numbers next
 to each line:

-{% raw %}
 ```liquid
+{% raw %}
 {% highlight ruby linenos %}
 def foo
  puts 'foo'
 end
 {% endhighlight %}
-```
 {% endraw %}
+```

 #### Stylesheets for syntax highlighting

@@ -517,6 +488,27 @@ site. If you use `linenos`, you might want to include an additional CSS class
 definition for the `.lineno` class in `syntax.css` to distinguish the line
 numbers from the highlighted code.

+### Gist
+
+Use the `gist` tag to easily embed a GitHub Gist onto your site. This works
+with public or secret gists:
+
+```liquid
+{% raw %}
+{% gist parkr/931c1c8d465a04042403 %}
+{% endraw %}
+```
+
+You may also optionally specify the filename in the gist to display:
+
+```liquid
+{% raw %}
+{% gist parkr/931c1c8d465a04042403 jekyll-private-gist.markdown %}
+{% endraw %}
+```
+
+To use the `gist` tag, you'll need to add the
+[jekyll-gist](https://github.com/jekyll/jekyll-gist) gem to your project.

 ## Links

@@ -526,25 +518,25 @@ To link to a post, a page, collection item, or file, the `link` tag will generat

 You must include the file's original extension when using the `link` tag. Here are some examples:

-{% raw %}
 ```liquid
+{% raw %}
 {{ site.baseurl }}{% link _collection/name-of-document.md %}
 {{ site.baseurl }}{% link _posts/2016-07-26-name-of-post.md %}
 {{ site.baseurl }}{% link news/index.html %}
 {{ site.baseurl }}{% link /assets/files/doc.pdf %}
-```
 {% endraw %}
+```

 You can also use the `link` tag to create a link in Markdown as follows:

-{% raw %}
 ```liquid
+{% raw %}
 [Link to a document]({{ site.baseurl }}{% link _collection/name-of-document.md %})
 [Link to a post]({{ site.baseurl }}{% link _posts/2016-07-26-name-of-post.md %})
 [Link to a page]({{ site.baseurl }}{% link news/index.html %})
 [Link to a file]({{ site.baseurl }}{% link /assets/files/doc.pdf %})
-```
 {% endraw %}
+```

 (Including `{% raw %}{{ site.baseurl }}{% endraw %}` is optional &mdash; it depends on whether you want to preface the page URL with the `baseurl` value.)

@@ -554,7 +546,7 @@ For example, suppose you're creating a link in `page_a.md` (stored in `pages/fol

 If you're unsure of the path, add `{% raw %}{{ page.path }}{% endraw %}` to the page and it will display the path.

-One major benefit of using the `link` or `post_url` tag is link validation. If the link doesn't exist, Jekyll won't build your site. This is a good thing, as it will alert you to a broken link so you can fix it (rather than allowing you to build and deploy a site with broken links).
+One major benefit of using the `link` tag is link validation. If the link doesn't exist, Jekyll won't build your site. This is a good thing, as it will alert you to a broken link so you can fix it (rather than allowing you to build and deploy a site with broken links).

 Note you cannot add filters to `link` tags. For example, you cannot append a string using Liquid filters, such as `{% raw %}{% link mypage.html | append: "#section1" %} {% endraw %}`. To link to sections on a page, you will need to use regular HTML or Markdown linking techniques.

@@ -562,26 +554,26 @@ Note you cannot add filters to `link` tags. For example, you cannot append a str

 If you want to include a link to a post on your site, the `post_url` tag will generate the correct permalink URL for the post you specify.

-{% raw %}
 ```liquid
+{% raw %}
 {{ site.baseurl }}{% post_url 2010-07-21-name-of-post %}
-```
 {% endraw %}
+```

 If you organize your posts in subdirectories, you need to include subdirectory path to the post:

-{% raw %}
 ```liquid
+{% raw %}
 {{ site.baseurl }}{% post_url /subdir/2010-07-21-name-of-post %}
-```
 {% endraw %}
+```

 There is no need to include the file extension when using the `post_url` tag.

 You can also use this tag to create a link to a post in Markdown as follows:

-{% raw %}
 ```liquid
+{% raw %}
 [Name of Link]({{ site.baseurl }}{% post_url 2010-07-21-name-of-post %})
-```
 {% endraw %}
+```
--- a/docs/_docs/themes.md
+++ b/docs/_docs/themes.md
@@ -47,7 +47,7 @@ To locate a theme's files on your computer:

 2. Open the theme's directory in Finder or Explorer:

-   ```sh
+   ```shell
   # On MacOS
   open $(bundle show minima)
   # On Windows
@@ -88,7 +88,7 @@ With a clear understanding of the theme's files, you can now override any theme

 Let's say, for a second example, you want to override Minima's footer. In your Jekyll site, create an `_includes` folder and add a file in it called `footer.html`. Jekyll will now use your site's `footer.html` file instead of the `footer.html` file from the Minima theme gem.

-To modify any stylesheet you must take the extra step of also copying the main sass file (`_sass/minima.scss` in the Minima theme) into the `_sass` directory in your site's source.
+To modify any stylesheet you must take the extra step of also copying the main sass file (`_sass/minima.scss` in the Minima theme) into the `_sass` directory in your site's source. 

 Jekyll will look first to your site's content before looking to the theme's defaults for any requested file in the following folders:

@@ -125,19 +125,9 @@ To install a gem-based theme:

 1. Add the theme to your site's `Gemfile`:

-   ```ruby
-   # ./Gemfile
-
+   ```sh
   gem "jekyll-theme-awesome"
   ```
-  Or if you've started with the `jekyll new` command, replace `gem "minima", "~> 2.0"` with your theme-gem:
-
-   ```diff
-   # ./Gemfile
-
-   - gem "minima", "~> 2.0"
-   + gem "jekyll-theme-awesome"
-   ```

 2. Install the theme:

@@ -147,7 +137,7 @@ To install a gem-based theme:

 3. Add the following to your site's `_config.yml` to activate the theme:

-   ```yaml
+   ```sh
   theme: jekyll-theme-awesome
   ```

@@ -218,15 +208,13 @@ _sass

 Your theme's styles can be included in the user's stylesheet using the `@import` directive.

-{% raw %}
 ```css
-@import "{{ site.theme }}";
+{% raw %}@import "{{ site.theme }}";{% endraw %}
 ```
-{% endraw %}

-### Theme-gem dependencies {%- include docs_version_badge.html version="3.5.0" -%}
+### Theme-gem dependencies

-Jekyll will automatically require all whitelisted `runtime_dependencies` of your theme-gem even if they're not explicitly included under the `plugins` array in the site's config file. (Note: whitelisting is only required when building or serving with the `--safe` option.)
+From `v3.5`, Jekyll will automatically require all whitelisted `runtime_dependencies` of your theme-gem even if they're not explicitly included under the `gems` array in the site's config file. (NOTE: whitelisting is only required when building or serving with the `--safe` option.)

 With this, the end-user need not keep track of the plugins required to be included in their config file for their theme-gem to work as intended.

--- a/docs/_docs/troubleshooting.md
+++ b/docs/_docs/troubleshooting.md
@@ -65,7 +65,7 @@ sudo emerge -av dev-ruby/rubygems
 On Windows, you may need to install [RubyInstaller
 DevKit](https://wiki.github.com/oneclick/rubyinstaller/development-kit).

-On Android (with Termux) you can install all requirements by running:
+On Android (with Termux) you can install all requirements by running: 

 ```sh
 apt update && apt install libffi-dev clang ruby-dev make
@@ -74,7 +74,7 @@ apt update && apt install libffi-dev clang ruby-dev make
 On macOS, you may need to update RubyGems (using `sudo` only if necessary):

 ```sh
-gem update --system
+sudo gem update --system
 ```

 If you still have issues, you can download and install new Command Line
@@ -84,11 +84,11 @@ Tools (such as `gcc`) using the following command:
 xcode-select --install
 ```

-which may allow you to install native gems using this command (again, using
+which may allow you to install native gems using this command (again using
 `sudo` only if necessary):

 ```sh
-gem install jekyll
+sudo gem install jekyll
 ```

 Note that upgrading macOS does not automatically upgrade Xcode itself
@@ -103,10 +103,10 @@ With the introduction of System Integrity Protection, several directories
 that were previously writable are now considered system locations and are no
 longer available. Given these changes, there are a couple of simple ways to get
 up and running. One option is to change the location where the gem will be
-installed (again, using `sudo` only if necessary):
+installed (again using `sudo` only if necessary):

 ```sh
-gem install -n /usr/local/bin jekyll
+sudo gem install -n /usr/local/bin jekyll
 ```

 Alternatively, Homebrew can be installed and used to set up Ruby. This can be
@@ -195,37 +195,10 @@ That is: defaults are overridden by options specified in `_config.yml`,
 and flags specified at the command-line will override all other settings
 specified elsewhere.

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

 ## Markup Problems

@@ -261,7 +234,7 @@ The issue is caused by trying to copy a non-existing symlink.
 <div class="note">
  <h5>Please report issues you encounter!</h5>
  <p>
-  If you come across a bug, please <a href="{{ site.repository }}/issues/new">create an issue</a>
+  If you come across a bug, please <a href="{{ site.help_url }}/issues/new">create an issue</a>
  on GitHub describing the problem and any work-arounds you find so we can
  document it here for others.
  </p>
--- a/docs/_docs/upgrading.md
+++ b/docs/_docs/upgrading.md
@@ -4,26 +4,10 @@ title: Upgrading
 permalink: /docs/upgrading/
 ---

-Upgrading from an older version of Jekyll? Upgrading to a new major version of
-Jekyll (e.g. from v2.x to v3.x) may cause some headaches. Take the following
-guides to aid your upgrade:
+Upgrading from an older version of Jekyll? Upgrading to a new major version of Jekyll (e.g. from v2.x to v3.x) may cause some headaches. Take the following guides to aid your upgrade:

 - [From 0.x to 1.x and 2.x](/docs/upgrading/0-to-2/)
 - [From 2.x to 3.x](/docs/upgrading/2-to-3/)

-## Minor updates
-
-<div class="note">
-  <h5>Stay Up to Date</h5>
-  <p>We recommend you update Jekyll as often as possible to benefit from
-  the latest bug fixes.
-  </p>
-</div>
-
-If you followed our setup recommendations and installed [Bundler](http://bundler.io/), run `bundle update jekyll` or simply `bundle update` and all your gems will
-update to the latest versions.
-
-If you don't have Bundler installed, run `gem update jekyll`.
-
-The procedure is similar [if you use the `github-pages`
-gem](https://help.github.com/articles/setting-up-your-github-pages-site-locally-with-jekyll/#keeping-your-site-up-to-date-with-the-github-pages-gem).
+If you are making a minor update (for example from 3.3.1 to the latest version at the time 3.3.2) run 'bundle update jekyll' when in your site directory. 
+If you would like to update all your gems, run 'bundle update' when in your site directory.
--- a/docs/_docs/upgrading/0-to-2.md
+++ b/docs/_docs/upgrading/0-to-2.md
@@ -9,7 +9,7 @@ and 2.0 that you'll want to know about.
 Before we dive in, go ahead and fetch the latest version of Jekyll:

 ```sh
-gem update jekyll
+$ gem update jekyll
 ```

 <div class="note feature">
--- a/docs/_docs/upgrading/2-to-3.md
+++ b/docs/_docs/upgrading/2-to-3.md
@@ -3,21 +3,20 @@ title: Upgrading from 2.x to 3.x
 permalink: /docs/upgrading/2-to-3/
 ---

-Upgrading from an older version of Jekyll? A few things have changed in Jekyll 3
+Upgrading from an older version of Jekyll? A few things have changed in 3.0
 that you'll want to know about.

 Before we dive in, go ahead and fetch the latest version of Jekyll:

 ```sh
-gem update jekyll
+$ gem update jekyll
 ```

-Since v3.2 Jekyll requires Ruby version >= 2.1
-{: .note .warning }
+Please note: Jekyll 3.2 requires Ruby version >= 2.1

 <div class="note feature">
-  <h5>Diving in</h5>
-  <p>Want to get a new Jekyll site up and running quickly? Simply
+  <h5 markdown="1">Diving in</h5>
+  <p markdown="1">Want to get a new Jekyll site up and running quickly? Simply
   run <code>jekyll new SITENAME</code> to create a new folder with a bare bones
   Jekyll site.</p>
 </div>
@@ -69,7 +68,7 @@ generate when running `jekyll build` or `jekyll serve`.
  <h5>Future Posts on GitHub Pages</h5>
  <p>
    An exception to the above rule are GitHub Pages sites, where the <code>--future</code> flag remains <em>enabled</em>
-    by default to maintain historical consistency for those sites.
+    by default to maintain historical consistency for those sites. 
  </p>
 </div>

--- a/docs/_docs/usage.md
+++ b/docs/_docs/usage.md
@@ -7,31 +7,22 @@ The Jekyll gem makes a `jekyll` executable available to you in your Terminal
 window. You can use this command in a number of ways:

 ```sh
-jekyll build
+$ jekyll build
 # => The current folder will be generated into ./_site

-jekyll build --destination <destination>
+$ jekyll build --destination <destination>
 # => The current folder will be generated into <destination>

-jekyll build --source <source> --destination <destination>
+$ jekyll build --source <source> --destination <destination>
 # => The <source> folder will be generated into <destination>

-jekyll build --watch
+$ jekyll build --watch
 # => The current folder will be generated into ./_site,
 #    watched for changes, and regenerated automatically.
 ```

-## Override default development settings
-
-Default URL is set to `http://localhost:4000` in development environment. {% include docs_version_badge.html version="3.3.0" %}
-
-If you want to build for your production environment:
-
-  - Set your production URL in `_config.yml` e.g. `url: https://example.com`.
-  - Run `JEKYLL_ENV=production bundle exec jekyll build`.
-
 <div class="note info">
-  <h5>Changes to <code>_config.yml</code> are not included during automatic regeneration.</h5>
+  <h5>Changes to _config.yml are not included during automatic regeneration.</h5>
  <p>
    The <code>_config.yml</code> master configuration file contains global configurations
    and variable definitions that are read once at execution time. Changes made to <code>_config.yml</code>
@@ -61,24 +52,25 @@ Jekyll also comes with a built-in development server that will allow you to
 preview what the generated site will look like in your browser locally.

 ```sh
-jekyll serve
+$ jekyll serve
 # => A development server will run at http://localhost:4000/
 # Auto-regeneration: enabled. Use `--no-watch` to disable.

-jekyll serve --livereload
-# LiveReload refreshes your browser after a change.
-
-jekyll serve --incremental
-# Incremental will perform a partial build in order to reduce regeneration time.
-
-jekyll serve --detach
+$ jekyll serve --detach
 # => Same as `jekyll serve` but will detach from the current terminal.
 #    If you need to kill the server, you can `kill -9 1234` where "1234" is the PID.
 #    If you cannot find the PID, then do, `ps aux | grep jekyll` and kill the instance.
 ```

+<div class="note info">
+  <h5>Be aware of default behavior</h5>
+  <p>
+    As of version 2.4, the <code>serve</code> command will watch for changes automatically. To disable this, you can use <code>jekyll serve --no-watch</code>, which preserves the old behavior.
+  </p>
+</div>
+
 ```sh
-jekyll serve --no-watch
+$ jekyll serve --no-watch
 # => Same as `jekyll serve` but will not watch for changes.
 ```

@@ -97,8 +89,8 @@ destination: _deploy
 Then the following two commands will be equivalent:

 ```sh
-jekyll build
-jekyll build --source _source --destination _deploy
+$ jekyll build
+$ jekyll build --source _source --destination _deploy
 ```

 For more about the possible configuration options, see the
--- a/docs/_docs/variables.md
+++ b/docs/_docs/variables.md
@@ -185,32 +185,17 @@ following is a reference of the available data.

      </p></td>
    </tr>
-    <tr>
-      <td><p><code>site.url</code></p></td>
-      <td><p>
-
-        Contains the url of your site as it is configured in the <code>_config.yml</code>.
-        For example, if you have <code>url: http://mysite.com</code>
-        in your configuration file, then it will be accessible in Liquid as
-        <code>site.url</code>. For the development environment there is
-        <a href="/news/#3-siteurl-is-set-by-the-development-server">an exception</a>,
-        if you are running <code>jekyll serve</code> in a development environment
-        <code>site.url</code> will be set to the value of <code>host</code>,
-        <code>port</code>, and SSL-related options. This defaults to
-        <code>url: http://localhost:4000</code>.
-
-      </p></td>
-    </tr>
    <tr>
      <td><p><code>site.[CONFIGURATION_DATA]</code></p></td>
      <td><p>

        All the variables set via the command line and your
        <code>_config.yml</code> are available through the <code>site</code>
-        variable. For example, if you have <code>foo: bar</code>
-        in your configuration file, then it will be accessible in Liquid as <code>site.foo</code>.
-        Jekyll does not parse changes to <code>_config.yml</code> in
-        <code>watch</code> mode, you must restart Jekyll to see changes to variables.
+        variable. For example, if you have <code>url: http://mysite.com</code>
+        in your configuration file, then in your Posts and Pages it will be
+        stored in <code>site.url</code>. Jekyll does not parse changes to
+        <code>_config.yml</code> in <code>watch</code> mode, you must restart
+        Jekyll to see changes to variables.

      </p></td>
    </tr>
@@ -280,9 +265,8 @@ following is a reference of the available data.
      <td><p><code>page.id</code></p></td>
      <td><p>

-        An identifier unique to a document in a Collection or a Post (useful in RSS feeds). e.g.
+        An identifier unique to the Post (useful in RSS feeds). e.g.
        <code>/2008/12/14/my-post</code>
-        <code>/my-collection/my-document</code>

      </p></td>
    </tr>
--- a/docs/_docs/windows.md
+++ b/docs/_docs/windows.md
@@ -17,17 +17,17 @@ If you are using Windows 10 Anniversary Update, the easiest way to run Jekyll is

 First let's make sure all our packages / repositories are up to date. Open a new Command Prompt instance, and type the following:

-```sh
+```
 bash
 ```
 Your Command Prompt instance should now be a Bash instance. Now we must update our repo lists and packages.

-```sh
+```
 sudo apt-get update -y && sudo apt-get upgrade -y
 ```
 Now we can install Ruby. To do this we will use a repository from [BrightBox](https://www.brightbox.com/docs/ruby/ubuntu/), which hosts optimized versions of Ruby for Ubuntu.

-```sh
+```
 sudo apt-add-repository ppa:brightbox/ruby-ng
 sudo apt-get update
 sudo apt-get install ruby2.3 ruby2.3-dev build-essential
@@ -35,19 +35,19 @@ sudo apt-get install ruby2.3 ruby2.3-dev build-essential

 Next let's update our Ruby gems:

-```sh
+```
 sudo gem update
 ```

 Now all that is left to do is install Jekyll.

-```sh
+```
 sudo gem install jekyll bundler
 ```

 Check if Jekyll installed properly by running:

-```sh
+```
 jekyll -v
 ```

@@ -55,7 +55,7 @@ jekyll -v

 To start a new project named `my_blog`, just run:

-```sh
+```
 jekyll new my_blog
 ```

@@ -122,14 +122,14 @@ This gem is also needed in the github-pages and to get it running on Windows x64

 **Note:** In the current [pre release][nokogiriFails] it works out of the box with Windows x64 but this version is not referenced in the github-pages.

-```sh
-choco install libxml2 -Source "https://www.nuget.org/api/v2/"
+`choco install libxml2 -Source "https://www.nuget.org/api/v2/"`{:.language-ruby}

-choco install libxslt -Source "https://www.nuget.org/api/v2/"
+`choco install libxslt -Source "https://www.nuget.org/api/v2/"`{:.language-ruby}

-choco install libiconv -Source "https://www.nuget.org/api/v2/
+`choco install libiconv -Source "https://www.nuget.org/api/v2/"`{:.language-ruby}

-gem install nokogiri --^
+```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^
@@ -138,7 +138,7 @@ gem install nokogiri --^
   --with-xslt-lib=C:\Chocolatey\lib\libxslt.redist.1.1.28.0\build\native\bin\v110\x64\Release\dynamic
 ```

-#### Install github-pages
+#### Install github-pages 

  * Open command prompt and install [Bundler][]: `gem install bundler`
  * Create a file called `Gemfile` without any extension in your root directory of your blog
@@ -165,10 +165,14 @@ In the future the installation process of the github-pages should be as simple a
 [Bundler]: http://bundler.io/ "Ruby Dependencie Manager"
 [nokogiriReleases]: https://github.com/sparklemotion/nokogiri/releases "Nokogiri Releases"

+---
+
 For a more conventional way of installing Jekyll you can follow this [complete guide to install Jekyll 3 on Windows by Sverrir Sigmundarson][windows-installjekyll3].

 Optionally you can use [Autoinstall Jekyll for Windows][fastjekyll-autoinstall].

+---
+
 [windows-installjekyll3]: https://labs.sverrirs.com/jekyll/
 [fastjekyll-autoinstall]: https://github.com/KeJunMao/fastjekyll#autoinstall-jekyll-for-windows

@@ -181,11 +185,11 @@ Jekyll. This is especially relevant when you're running Jekyll on Windows.
 Additionally, you might need to change the code page of the console window to UTF-8 in case you get a "Liquid Exception: Incompatible character encoding" error during the site generation process. It can be done with the following command:

 ```sh
-chcp 65001
+$ chcp 65001
 ```


-## Time-Zone Management
+## Time-Zone Management 

 Since Windows doesn't have a native source of zoneinfo data, the Ruby Interpreter would not understand IANA Timezones and hence using them had the `TZ` environment variable default to UTC/GMT 00:00.
 Though Windows users could alternatively define their blog's timezone by setting the key to use POSIX format of defining timezones, it wasn't as user-friendly when it came to having the clock altered to changing DST-rules.
@@ -201,9 +205,9 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 [IANA-database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones


-## Auto Regeneration
+## Auto Regeneration 

-Jekyll uses the `listen` gem to watch for changes when the `--watch` switch is specified during a build or serve. While `listen` has built-in support for UNIX systems, it may require an extra gem for compatibility with Windows.
+As of v1.3.0, Jekyll uses the `listen` gem to watch for changes when the `--watch` switch is specified during a build or serve. While `listen` has built-in support for UNIX systems, it may require an extra gem for compatibility with Windows.

 Add the following to the Gemfile for your site if you have issues with auto-regeneration on Windows alone:

--- a/docs/_includes/docs_version_badge.html
+++ b/docs/_includes/docs_version_badge.html
@@ -1 +0,0 @@
-<span class="version-badge" title="This feature is available starting version {{ include.version }}">{{ include.version }}</span>
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -1,31 +1,18 @@
 <header>
-  <div class="flexbox">
-    <div class="center-on-mobiles">
+  <nav class="mobile-nav show-on-mobiles">
+    {% include primary-nav-items.html %}
+  </nav>
+  <div class="grid">
+    <div class="unit one-third center-on-mobiles">
      <h1>
-        <a href="/" class="logo">
+        <a href="/">
          <span class="sr-only">Jekyll</span>
-          <img src="/img/logo-2x.png" width="140" height="65" alt="Jekyll Logo">
+          <img src="/img/logo-2x.png" width="249" height="115" alt="Jekyll Logo">
        </a>
      </h1>
    </div>
-    <nav class="main-nav hide-on-mobiles">
+    <nav class="main-nav unit two-thirds hide-on-mobiles">
      {% include primary-nav-items.html %}
    </nav>
-    <div class="search hide-on-mobiles">
-      {% include search/input.html %}
-    </div>
-    <div class="meta hide-on-mobiles">
-      <ul>
-        <li>
-          <a href="{{ site.repository }}/releases/tag/v{{ site.version }}">v{{ site.version }}</a>
-        </li>
-        <li>
-          <a href="{{ site.repository }}">GitHub</a>
-        </li>
-      </ul>
-    </div>
  </div>
-  <nav class="mobile-nav show-on-mobiles">
-    {% include mobile-nav-items.html %}
-  </nav>
 </header>
--- a/docs/_includes/mobile-nav-items.html
+++ b/docs/_includes/mobile-nav-items.html
@@ -1,17 +0,0 @@
-<ul>
-  <li class="{% if page.overview %}current{% endif %}">
-    <a href="/">Home</a>
-  </li>
-  <li class="{% if page.url contains '/docs/' %}current{% endif %}">
-    <a href="/docs/home/">Docs</a>
-  </li>
-  <li class="{% if page.author %}current{% endif %}">
-    <a href="/news/">News</a>
-  </li>
-  <li class="{% if page.url contains '/help/' %}current{% endif %}">
-    <a href="/help/">Help</a>
-  </li>
-  <li>
-    <a href="{{ site.repository }}">GitHub</a>
-  </li>
-</ul>
--- a/docs/_includes/primary-nav-items.html
+++ b/docs/_includes/primary-nav-items.html
@@ -8,7 +8,13 @@
  <li class="{% if page.author %}current{% endif %}">
    <a href="/news/">News</a>
  </li>
+  <li class="{% if page.url contains '/community/' %}current{% endif %}">
+    <a href="/community/">Community</a>
+  </li>
  <li class="{% if page.url contains '/help/' %}current{% endif %}">
    <a href="/help/">Help</a>
  </li>
+  <li>
+    <a href="{{ site.repository }}">GitHub</a>
+  </li>
 </ul>
--- a/docs/_includes/search/input.html
+++ b/docs/_includes/search/input.html
@@ -1 +0,0 @@
-<input type="text" id="docsearch-input" placeholder="Search the docs…">
--- a/docs/_includes/search/script.html
+++ b/docs/_includes/search/script.html
@@ -1,9 +0,0 @@
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js"></script>
-<script type="text/javascript"> docsearch({
-apiKey: '50fe39c839958dfad797000f33e2ec17',
-indexName: 'jekyllrb',
-inputSelector: '#docsearch-input',
-enhancedSearchInput: true,
-debug: false // Set debug to true if you want to inspect the dropdown
-});
-</script>
--- a/docs/_includes/top.html
+++ b/docs/_includes/top.html
@@ -7,7 +7,6 @@
  {% feed_meta %}
  <link rel="alternate" type="application/atom+xml" title="Recent commits to Jekyll’s master branch" href="{{ site.repository }}/commits/master.atom">
  <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:300,300italic,400,400italic,700,700italic,900">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />
  <link rel="stylesheet" href="/css/screen.css">
  <link rel="icon" type="image/x-icon" href="/favicon.ico">
  {% seo %}
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -8,6 +8,6 @@
  {% include footer.html %}
  {% include anchor_links.html %}
  {% include analytics.html %}
-  {% include search/script.html %}
+
 </body>
 </html>
--- a/docs/_layouts/news_item.html
+++ b/docs/_layouts/news_item.html
@@ -5,10 +5,7 @@ layout: news
 <article>
  <h2>
    {{ page.title }}
-    <a href="{{ page.url }}" class="header-link" title="Permalink">
-      <span class="sr-only">Permalink</span>
-      <i class="fa fa-link"></i>
-    </a>
+    <a href="{{ page.url }}" class="permalink" title="Permalink">∞</a>
  </h2>
  <span class="post-category">
    <span class="label">
--- a/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown
+++ b/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown
@@ -6,18 +6,25 @@ version: 1.1.1
 categories: [release]
 ---

-Coming just 10 days after the release of v1.1.0, v1.1.1 is out with a patch for
-the nasty excerpt inception bug ([#1339]({{ site.repository }}/issues/1339)) and
-non-zero exit codes for invalid commands ([#1338]({{ site.repository
-}}/issues/1338)).

-To all those affected by the [strange excerpt bug in v1.1.0]({{ site.repository
-}}/issues/1321), I'm sorry. I think we have it all patched up and it should be
-deployed to [GitHub Pages](https://pages.github.com/) in the next couple weeks.
-Thank you for your patience!
+Coming just 10 days after the release of v1.1.0, v1.1.1 is out with a patch for the nasty
+excerpt inception bug ([#1339][]) and non-zero exit codes for invalid commands
+([#1338][]).

-If you're checking out v1.1.x for the first time, definitely check out [what
-shipped with v1.1.0!]({{ site.repository }}/releases/tag/v1.1.0)
+To all those affected by the [strange excerpt bug in v1.1.0][#1321], I'm sorry. I think we
+have it all patched up and it should be deployed to [GitHub Pages][gh_pages] in the next
+couple weeks. Thank you for your patience!

-See the [GitHub Release]({{ site.repository }}/releases/tag/v1.1.1) page for
-more a more detailed changelog for this release.
+If you're checking out v1.1.x for the first time, definitely check out [what shipped with
+v1.1.0!][v1_1_0]
+
+See the [GitHub Release][] page for more a more detailed changelog for this release.
+
+{% assign issue_numbers = "1339|1338|1321" | split: "|" %}
+{% for issue in issue_numbers %}
+[#{{ issue }}]: {{ site.repository }}/issues/{{ issue }}
+{% endfor %}
+
+[GitHub Release]: {{ site.repository }}/releases/tag/v1.1.1
+[gh_pages]: https://pages.github.com/
+[v1_1_0]: {{ site.repository }}/releases/tag/v1.1.0
--- a/docs/_posts/2014-06-04-jekyll-stickers-1-dollar-stickermule.markdown
+++ b/docs/_posts/2014-06-04-jekyll-stickers-1-dollar-stickermule.markdown
@@ -5,7 +5,7 @@ author: parkr
 categories: [partners]
 ---

-![Jekyll Sticker](/img/jekyll-sticker.png)
+![Jekyll Sticker](/img/jekyll-sticker.jpg)

 You may have heard that [@cobyism](https://github.com/cobyism)'s excellent
 Jekyll logo has been made into a sticker. You may have sat idly by, wishing
--- a/docs/_posts/2014-12-22-jekyll-2-5-3-released.markdown
+++ b/docs/_posts/2014-12-22-jekyll-2-5-3-released.markdown
@@ -10,7 +10,7 @@ Happy Holidays, everyone.

 Jekyll v2.5.3 is a quick patch release, containing some minor fixes. See the
 [full history](/docs/history/) for more info. If you notice any problems,
-please [let us know]({{ site.repository }}).
+please [let us know]({{ site.help_url }}).

 This release also marks the start of Jekyll 3 development. I wrote about it
 over on my personal blog: [Jekyll 3 &mdash; The Road Ahead](https://byparker.com/blog/2014/jekyll-3-the-road-ahead/).
--- a/docs/_posts/2017-06-14-jekyll-3-5-0-released.markdown
+++ b/docs/_posts/2017-06-14-jekyll-3-5-0-released.markdown
@@ -9,7 +9,7 @@ categories: [release]
 Good news! Nearly 400 commits later, Jekyll 3.5.0 has been released into
 the wild. Some new shiny things you might want to test out:

- Jekyll now uses Liquid 4, the latest! It comes with whitespace control, new filters `concat` and `compact`, loop performance improvements and [many fixes](https://github.com/Shopify/liquid/blob/master/History.md#400--2016-12-14--branch-4-0-stable)
+- Jekyll now uses Liquid 4, the latest! It comes with whitespace control, new filters `concat` annd `compact`, loop performance improvements and [many fixes](https://github.com/Shopify/liquid/blob/master/History.md#400--2016-12-14--branch-4-0-stable)
 - Themes can specify runtime dependencies (in their gemspecs) and we'll require those. This makes it easier for theme writers to use plugins.
 - Speaking of themes, we'll properly handle the discrepancy between a convertible file in the local site and a static file in the theme. Overriding a file locally now doesn't matter if it's convertible or static.
 - Pages, posts, and other documents can now access layout variables via `{% raw %}{{ layout }}{% endraw %}`.
--- a/docs/_posts/2017-08-12-jekyll-3-5-2-released.markdown
+++ b/docs/_posts/2017-08-12-jekyll-3-5-2-released.markdown
@@ -1,23 +0,0 @@
---
-title: 'Jekyll 3.5.2 Released'
-date: 2017-08-12 16:31:40 -0400
-author: parkr
-version: 3.5.2
-categories: [release]
---
-
-3.5.2 is out with 6 great bug fixes, most notably one which should dramatically speed up generation of your site! In testing #6266, jekyllrb.com generation when from 18 seconds down to 8! Here is the full line-up of fixes:
-
-  * Backport #6266 for v3.5.x: Memoize the return value of `Document#url` (#6301)
-  * Backport #6247 for v3.5.x: kramdown: symbolize keys in-place (#6303)
-  * Backport #6281 for v3.5.x: Fix `Drop#key?` so it can handle a nil argument (#6288)
-  * Backport #6280 for v3.5.x: Guard against type error in `absolute_url` (#6287)
-  * Backport #6273 for v3.5.x: delegate `StaticFile#to_json` to `StaticFile#to_liquid` (#6302)
-  * Backport #6226 for v3.5.x: `Reader#read_directories`: guard against an entry not being a directory (#6304
-
-A [full history](/docs/history/#v3-5-2) is available for your perusal. As always, please file bugs if you encounter them! Opening a pull request with a failing test for your expected behaviour is the easiest way for us to address the issue since we have a reproducible example to test again. Short of that, please fill out our issue template to the best of your ability and we'll try to get to it quickly!
-
-Many thanks to our contributors without whom this release could not be
-possible: Ben Balter & Kyle Zhao.
-
-Happy Jekylling!
--- a/docs/_posts/2017-09-21-jekyll-3-6-0-released.markdown
+++ b/docs/_posts/2017-09-21-jekyll-3-6-0-released.markdown
@@ -1,17 +0,0 @@
---
-title: 'Jekyll turns 3.6!'
-date: 2017-09-21 16:38:20 -0400
-author: parkr
-version: 3.6.0
-categories: [release]
---
-
-Another much-anticipated release of Jekyll. This release comes with it Rouge 2 support, but note you can continue to use Rouge 1 if you'd prefer. We also now require Ruby 2.1.0 as 2.0.x is no longer supported by the Ruby team.
-
-Otherwise, it's a massive bug-fix release! A few bugs were found and squashed with our `Drop` implementation. We're using the Schwartzian transform to speed up our custom sorting (thanks, Perl community!). We now protect against images that are named like posts and we generally worked on guarding our code to enforce requirements, instead of assuming the input was as expected.
-
-Please let us know if you find any bugs! You can see [the full history here](/docs/history/#v3-6-0).
-
-Many thanks to our contributors who helped make this release possible: Aleksander Kuś, André Jaenisch, Antonio Argote, ashmaroli, Ben Balter, Bogdan, Bradley Meck, David Zhang, Florian Thomas, Frank Taillandier, Jordon Bedwell, Joshua Byrd, Kyle Zhao, lymaconsulting, Maciej Bembenista, Matt Sturgeon, Natanael Arndt, Ohad Schneider, Pat Hawks, Pedro Lamas, and Sid Verma.
-
-As always, Happy Jekylling!
--- a/docs/_posts/2017-10-19-diversity-open-source.markdown
+++ b/docs/_posts/2017-10-19-diversity-open-source.markdown
@@ -1,44 +0,0 @@
---
-title: "Diversity in Open Source, and Jekyll's role in it"
-date: 2017-10-19 21:33:00 +0200
-author: pup
-categories: [community]
---
-
-Open Source has a problem with diversity. GitHub recently conducted a [survey](http://opensourcesurvey.org/2017) which revealed that 95% of the respondents were identifying as male. This is even worse than in the tech industry overall, where the percentage is only about 76%. Every other week, there seems to be another case of a maintainer engaging in targeted harassment against minorities. People somehow deem it completely okay to let these things slide, though.
-
-Fortunately, there's a couple of things we can do to make it easier and more comfortable for people that have never contributed to any open source project before, to contribute to our projects.
-
-## Add a Code of Conduct, and enforce it
-
-This might seem like one of the easiest steps to do, but it actually requires a lot of dedication to pull through with. Basically, a Code of Conduct is a document detailing what is and what isn't acceptable behavior in your project. A good Code of Conduct also details enforcement procedures, that means how the person violating the Code of Conduct gets dealt with. This is the point at which I've seen a looooot of projects fail. It's easy enough to copy-paste a Code of Conduct into your project, but it's more important to be clear on how to enforce it. Inconsistent —or worse, nonexistent— enforcement is just going to scare off newcomers even more!
-
-The most widely adopted Code of Conduct is the [Contributor Covenant](https://www.contributor-covenant.org/). It's a very good catch-all document, but it is a bit light in the enforcement section, so I'd recommend to flesh it out by yourself, be it by means of adding contact information or expanding the enforcement rules.
-
-No matter which Code of Conduct you pick, the most important thing is to actually _read it for yourself_. The worst thing in open source is a maintainer that doesn't know when they've violated their own Code of Conduct.
-
-## Document your contributing workflow
-
-The problem that puts people off the most is incomplete or missing documentation, as revealed through GitHub's [open source survey](http://opensourcesurvey.org/2017). A very popular myth in programming is that good code explains itself, which might be true, but only for the person writing it. It's important, especially once you put your project out there for the world to see, to document not only your code, but also the process by which you maintain it. Otherwise, it's going to be extremely hard for newcomers to even figure out where to begin contributing to your project.
-
-Jekyll has [an entire section of its docs](/docs/contributing) dedicated to information on how to contribute for this very reason. Every documentation page has a link to directly edit and improve it on GitHub. It's also important to realize that not all contributions are code. It can be documentation, it can be reviewing pull requests, but it can also just be weighing into issues, and all of this should be recognized in the same way. At Jekyll, out of 397 total merged pull requests in the last year, __204__ were documentation pull requests!
-
-## Create newcomer-friendly issues
-
-For most people new to open source, the biggest hurdle is creating their first pull request. That's why initiatives such as [YourFirstPR](https://twitter.com/yourfirstpr) and [First Timers Only](http://www.firsttimersonly.com/) were started. Recently, [a GitHub bot that automatically creates first-timer friendly issues](https://github.com/hoodiehq/first-timers-bot) was launched, which makes it very easy for maintainers to convert otherwise small or trivial changes into viable pull requests that can be taken on by newcomers! So we decided to give it a shot, and we've created a couple of very easy `first timers only` issues:
-
- [Issue #6437](https://github.com/jekyll/jekyll/issues/6437)
- [Issue #6438](https://github.com/jekyll/jekyll/issues/6438)
- [Issue #6439](https://github.com/jekyll/jekyll/issues/6439)
-
-(There's also an up-to-date listing of all of our `first timers only` issues [here](https://github.com/jekyll/jekyll/issues?q=is%3Aissue+is%3Aopen+label%3Afirst-time-only))
-
-These issues are designed to be taken on only by someone who has had little to no exposure to contributing to open source before, and additionally, project maintainers offer support in case a question arises.
-
-Jekyll is a very big and popular open source project, and we hope that with these special issues, we can help people who haven't contributed to open source before to catch a footing in these unsteady waters.
-
-## Be nice
-
-I know this is a cliche and a overused phrase, but really, it works if you pull through with it. Come to terms with the fact that some people aren't as fast or reliable as you might want to think. Don't get angry when a contributor takes a day longer than you might like them to. Treat new contributors to your project with respect, but also with hospitality. Think twice before you send that comment with slurs in it.
-
-I've been contributing to open source for about 4 years now, and I've had my fair share of horrible, horrible experiences. But Jekyll has historically been a project that has always valued the people contributing to it over the code itself, and I hope we can keep it that way. I also hope that other project maintainers read this and take inspiration from this post. Every project should be more diverse.
--- a/docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown
+++ b/docs/_posts/2017-10-21-jekyll-3-6-2-released.markdown
@@ -1,42 +0,0 @@
---
-title: 'Jekyll 3.6.2 Released'
-date: 2017-10-21 21:31:40 +0200
-author: dirtyf
-version: 3.6.2
-categories: [release]
---
-
-3.6.2 is out, it's a tiny patch release and we invite you to run `bundle update`
-if you want to avoid possible build problems with:
-
-* some UTF-8 and UTF-16 encoded files,
-* fully numeric layout names (we convert those to string for you now).
-
-Other changes include updates to our documentation, like this [complete
-video series by Giraffe Academy](../tutorials/video-walkthroughs/) aimed at
-complete beginners. A big thanks to Mike for this.
-
-And if you're wondering what happened to version 3.6.1, it was just our new
-release maintainer getting familiar with the release process. 😄
-
-We try to release patch releases as quickly as possible and we're already
-working on the next minor version 3.7.0 that will allow you to store all your
-collections in a single directory. Stay tuned.
-
-Theme developers are invited to test the brand new
-[`jekyll-remote-theme`](https://github.com/benbalter/jekyll-remote-theme) plugin
-and give their feedback to @benbalter. This plugin allows you to use any
-GitHub hosted theme as a remote theme!
-
-Once again, many thanks to our contributors who helped make this release possible:
-ashmaroli, bellvat, Frank Taillandier, i-give-up, Jan Piotrowski, Maximiliano
-Kotvinsky, Oliver Steele and Pat Hawks. For some it was their [first
-contribution to open-source]({% link
-_posts/2017-10-19-diversity-open-source.markdown %}) 👏
-
-As it's been nine years this week that Tom Preston-Werner started this project,
-I also wanna seize this opportunity to thank [all of the 732 contributors](https://github.com/jekyll/jekyll/graphs/contributors) who
-helped make it possible for Jekyll to power millions of websites around the world
-today.
-
-Happy Birthday Jekyll! 🎂
--- a/docs/_posts/2018-01-02-jekyll-3-7-0-released.md
+++ b/docs/_posts/2018-01-02-jekyll-3-7-0-released.md
@@ -1,37 +0,0 @@
---
-title: "Jekyll 3.7.0 Released"
-description: "Jekyll 3.7.0 brings LiveReload, a directory for your collections and much more…"
-date: 2018-01-02 11:21:40 +0100
-author: DirtyF
-version: 3.7.0
-categories: [release]
---
-
-We're happy to release a new minor for the new year.
-Here are a few of the latest additions from our contributors:
-
- * LiveReload is available as an option during development: with `jekyll serve --livereload` no more manual page refresh. A big thanks to @awood for this feature and to @andreyvit, LiveReload author.
- * New `collections_dir` configuration option allows you to store all your [collections](/docs/collections) in a single folder. Your source root folder should now look cleaner :sparkles: .
- * If you're using a [gem-based theme](/docs/themes/) in coordination with the `--incremental` option, you should notice some significant speed during the regeneration process, we did see build time went down **from 12s to 2s** with @mmistakes [minimal-mistakes theme](https://github.com/mmistakes/minimal-mistakes) during our tests.
- * Jekyll will now check to determine whether host machine has internet connection.
- * A new `latin` option is available to better [handle URLs slugs](/docs/templates/#options-for-the-slugify-filter).
- * And of course many bug fixes and updates to our documentation — which you can now search thanks to our friends @Algolia.
- * [Full history is here](/docs/history/#v3-7-0).
-
-This release wouldn't have been possible without all the following people:
-
-Aaron Borden, Alex Tsui, Alex Wood, Alexey Pelykh, Andrew Dassonville, Angelika Tyborska, Ankit Singhaniya, Ashwin Maroli, bellvat, Brandon Dusseau, Chris Finazzo, Doug Beney, Dr. Wolfram Schroers, Edward Shen, Florian Thomas, Frank Taillandier, Gert-jan Theunissen, Goulven Champenois, János Rusiczki, Jed Fox, Johannes Müller, Jon Anning, Jonathan Hooper, Jordon Bedwell, Junko Suzuki, Kacper Duras, Kenton Hansen, Kewin Dousse, Matt Rogers, Maximiliano Kotvinsky, mrHoliday, Olivia, Parker Moore, Pat Hawks, Sebastian Kulig, Vishesh Ruparelia, Xiaoiver and Yashu Mittal.
-
-A big thanks to everyone!
-
-Oh, one last thing…
-
-### :pray: upgrade your Ruby
-
-Prepare for the next major update, as next major version Jekyll 4.0 will drop support for Ruby 2.1 and 2.2.
-
-> Ruby 2.2 is now under the state of the security maintenance phase, until the end of the March of 2018. After the date, maintenance of Ruby 2.2 will be ended. We recommend you start planning migration to newer versions of Ruby, such as 2.4 or 2.3. — [Ruby Core Team](https://www.ruby-lang.org/en/news/2017/12/14/ruby-2-2-9-released/)
-
-We strongly encourage you to upgrade to at least Ruby 2.4.x [like our friends at GitHub Pages](https://pages.github.com/versions/) or even go with [Ruby 2.5](https://www.ruby-lang.org/en/news/2017/12/25/ruby-2-5-0-released/).
-
-Happy new year to all from the Jekyll team!
--- a/docs/_posts/2018-01-25-jekyll-3-7-1-released.md
+++ b/docs/_posts/2018-01-25-jekyll-3-7-1-released.md
@@ -1,66 +0,0 @@
---
-title: "Jekyll 3.7.1 Released"
-date: 2018-01-25 22:22:22 +0530
-author: ashmaroli
-version: 3.7.1
-categories: [release]
---
-
-Close on the heels of shipping 3.7.0, we were informed of a couple of
-regressions due to the changes made in that release. In due time, Team Jekyll
-set out to address those issues as early as possible.
-
-Days later here we're, announcing 3.7.1 that fixes numerous issues! :tada:
-The highlights being:
-
-  * A major regression in 3.7.0 was that when a Front Matter Default was
-    configured with a `scope["path"]` set to a directory, Jekyll would scan
-    that directory for any subfolders and files, for each document in that
-    `path`.
-    Though this is intended, it increases build times in proportion to the size
-    of the directory.
-
-    We addressed this by having Jekyll scan the directory path only if the user
-    explicitly configures the `scope["path"]` using wildcards.
-
-    Read our [documentation](/docs/configuration/#glob-patterns-in-front-matter-defaults)
-    for more details.
-
-    A huge shout-out to @mmistakes for bringing this to our notice and
-    additionally providing us with a test repository to aid in resolving the issue.
-
-  * Another regression reported was related to our "Custom collections
-    directory" feature introduced in 3.7.0.
-
-    Users setting `collection_dir` to a certain directory would have *altered*
-    paths to their posts still at the root of their site's source. This
-    roughly translated to 404 errors on URLs to their posts.
-
-    Props to @localheinz for bringing this regression to our notice.
-
-    We decided to resolve this by having Jekyll ignore posts and drafts at the
-    root of the site's source directory if the user customizes the
-    `collection_dir` setting.
-
-    Ergo, if you set a custom location for your collections, please ensure you
-    move all of your collections into that directory. **This includes posts and
-    drafts as well**. Your links generated by
-    `{% raw %}{% post_url %}{% endraw %}` or `{% raw %}{% link %}{% endraw %}`
-    will adapt automatically.
-
-  * We also found out that `gem "wdm"` boosts performance while directories are
-    being watched on Windows. So we recommend having it included in your Gemfile
-    for a better development experience on Windows. (Newly generated Gemfiles
-    will hereafter have that gem listed automatically :wink:)
-
-In addition to the above, numerous other minor fixes and documentation updates
-have been made that should improve your Jekyll experience. All of which, would
-not have been possible without our wonderful contributors:
-
-Alexandr, Andreas Möller, Ashwin Maroli, Chayoung You, Florian Thomas,
-Frank Taillandier, Hendrik Schneider, Kacper Duras, Olivia, Parker Moore and
-Paul Robert Lloyd.
-
-As always, you can see our full changelog on [the History page](/docs/history/).
-
-Happy Jekylling! :sparkles:
--- a/docs/_sass/_docsearch.scss
+++ b/docs/_sass/_docsearch.scss
@@ -1,60 +0,0 @@
-.searchbox {
-  padding-top: 1px;
-  .searchbox__input {
-    padding: 6px 5px 5px 29px;
-    font-size: 0.75em;
-    border: none;
-    border-radius: 5px;
-    color: #555;
-    background-color: #333 !important;
-    box-shadow: 0 0 1px 0 #555;
-
-    &::-webkit-input-placeholder {
-      color: #aaa;
-    }
-    &:-ms-input-placeholder {
-      color: #aaa;
-    }
-    &::placeholder {
-      color: #aaa;
-    }
-
-    &:focus, &:active {
-      color: #eaeaea;
-      background-color: #252525 !important;
-    }
-  }
-}
-
-.searchbox__submit svg { fill: #fc0 }
-.searchbox__reset svg { fill: #999 }
-
-.algolia-autocomplete {
-  .ds-dropdown-menu {
-    font-size: 1rem;
-    text-shadow: none;
-
-    .ds-suggestion.ds-cursor .algolia-docsearch-suggestion:not(.suggestion-layout-simple) .algolia-docsearch-suggestion--content {
-      background-color: rgba(221, 221, 221, 0.5);
-    }
-  }
-
-  .algolia-docsearch-suggestion--category-header {
-    background-color: #444;
-    color: #ddd;
-    padding: 0.35em;
-  }
-
-  .algolia-docsearch-suggestion--subcategory-column {
-    color: #444;
-  }
-
-  .algolia-docsearch-suggestion--highlight {
-    background-color: #fc0;
-    color: #222;
-  }
-
-  .algolia-docsearch-suggestion--text .algolia-docsearch-suggestion--highlight {
-    box-shadow: inset 0 -2px 0 0 #fc0;
-  }
-}
--- a/docs/_sass/_normalize.scss
+++ b/docs/_sass/_normalize.scss
@@ -1,4 +1,4 @@
-/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */
+/*! normalize.css v6.0.0 | MIT License | github.com/necolas/normalize.css */

 /* Document
   ========================================================================== */
@@ -18,14 +18,6 @@ html {
 /* Sections
   ========================================================================== */

-/**
- * Remove the margin in all browsers (opinionated).
- */
-
-body {
-  margin: 0;
-}
-
 /**
 * Add the correct display in IE 9-.
 */
@@ -233,8 +225,7 @@ svg:not(:root) {
   ========================================================================== */

 /**
- * 1. Change the font styles in all browsers (opinionated).
- * 2. Remove the margin in Firefox and Safari.
+ * Remove the margin in Firefox and Safari.
 */

 button,
@@ -242,10 +233,7 @@ input,
 optgroup,
 select,
 textarea {
-  font-family: sans-serif; /* 1 */
-  font-size: 100%; /* 1 */
-  line-height: 1.15; /* 1 */
-  margin: 0; /* 2 */
+  margin: 0;
 }

 /**
@@ -304,14 +292,6 @@ button:-moz-focusring,
  outline: 1px dotted ButtonText;
 }

-/**
- * Correct the padding in Firefox.
- */
-
-fieldset {
-  padding: 0.35em 0.75em 0.625em;
-}
-
 /**
 * 1. Correct the text wrapping in Edge and IE.
 * 2. Correct the color inheritance from `fieldset` elements in IE.
--- a/docs/_sass/_pygments.scss
+++ b/docs/_sass/_pygments.scss
@@ -1,6 +1,6 @@
 .highlight {
  .hll { background-color: #ffffcc }
-  .c { color: #999; font-style: italic } /* Comment */
+  .c { color: #87ceeb} /* Comment */
  .err { color: #ffffff} /* Error */
  .g { color: #ffffff} /* Generic */
  .k { color: #f0e68c} /* Keyword */
@@ -8,16 +8,16 @@
  .n { color: #ffffff} /* Name */
  .o { color: #ffffff} /* Operator */
  .x { color: #ffffff} /* Other */
-  .p { color: #98b9ef} /* Punctuation */
+  .p { color: #ffffff} /* Punctuation */
  .cm { color: #87ceeb} /* Comment.Multiline */
  .cp { color: #cd5c5c} /* Comment.Preproc */
  .c1 { color: #87ceeb} /* Comment.Single */
  .cs { color: #87ceeb} /* Comment.Special */
-  .gd { color: #ce342c} /* Generic.Deleted */
+  .gd { color: #0000c0; font-weight: bold; background-color: #008080 } /* Generic.Deleted */
  .ge { color: #c000c0; text-decoration: underline} /* Generic.Emph */
  .gr { color: #c0c0c0; font-weight: bold; background-color: #c00000 } /* Generic.Error */
  .gh { color: #cd5c5c} /* Generic.Heading */
-  .gi { color: #27b42c} /* Generic.Inserted */
+  .gi { color: #ffffff; background-color: #0000c0 } /* Generic.Inserted */
  span.go { color: #add8e6; font-weight: bold; background-color: #4d4d4d } /* Generic.Output, qualified with span to prevent applying this style to the Go language, see #1153. */
  .gp { color: #ffffff} /* Generic.Prompt */
  .gs { color: #ffffff} /* Generic.Strong */
@@ -45,7 +45,7 @@
  .nx { color: #ffffff} /* Name.Other */
  .py { color: #ffffff} /* Name.Property */
  .nt { color: #f0e68c} /* Name.Tag */
-  .nv { color: #88d472} /* Name.Variable */
+  .nv { color: #98fb98} /* Name.Variable */
  .ow { color: #ffffff} /* Operator.Word */
  .w { color: #ffffff} /* Text.Whitespace */
  .mf { color: #ffffff} /* Literal.Number.Float */
@@ -69,6 +69,10 @@
  .vi { color: #98fb98} /* Name.Variable.Instance */
  .il { color: #ffffff} /* Literal.Number.Integer.Long */
  .bash .nv {
-    user-select: none;
+    -webkit-user-select: none;
+       -moz-user-select: none;
+        -ms-user-select: none;
+         -o-user-select: none;
+            user-select: none;
  }
-}
+}
--- a/docs/_sass/_style.scss
+++ b/docs/_sass/_style.scss
@@ -14,6 +14,7 @@ body {
  font: 300 21px Lato, 'Helvetica Neue', Helvetica, Arial, sans-serif;
  color: #ddd;
  background-color: #333;
+  border-top: 5px solid #fc0;
  @include box-shadow(inset 0 3px 30px rgba(0,0,0,.3));
  text-shadow: 0 1px 3px rgba(0,0,0,.5);
  -webkit-font-feature-settings: "kern" 1;
@@ -49,53 +50,33 @@ footer {
 /* Header */

 header {
-  padding: 15px;
-  background: darken(#333, 3%);

  h1,
  nav { display: inline-block; }

-  .flexbox {
-    display: flex;
-    height: 50px;
-
-    & > * { margin: auto }
-  }
-
-  .logo {
-    display: block;
-    img { margin-top: -7px }
-  }
-
-  .search .svg-icons { display: none }
 }

-nav, .meta {
+nav {

  ul {
    padding: 0;
    margin: 0;
    white-space: nowrap;
-    display: inline-block;
  }

  li { display: inline-block; }
 }

-.meta ul {
-  margin-left: 10px;
-
-  li { vertical-align: middle; }
-}
-
-.main-nav, .meta {
+.main-nav {
+  margin-top: 52px;

  li {
+    margin-right: 10px;

    a {
      @include border-radius(5px);
      font-weight: 900;
-      font-size: 0.75em;
+      font-size: 14px;
      padding: 0.5em 1em;
      text-shadow: none;
      text-transform: uppercase;
@@ -119,6 +100,7 @@ nav, .meta {
    }
  }
 }
+
 .mobile-nav {
  padding: 0 5px;

@@ -135,9 +117,9 @@ nav, .meta {
    color: #fc0;
    text-align: center;
    text-transform: uppercase;
-    font-size: 0.625em;
+    font-size: 14px;
    font-weight: 900;
-    padding: 10px 5px;
+    padding: 5px;
    @include border-radius(5px);
  }

@@ -177,17 +159,10 @@ h6:hover .header-link {
  opacity: 1;
 }

-@media (max-width: 580px) {
-  header {
-    .flexbox { height: auto }
-    .logo img { margin-top: 0 }
-  }
-}
-@media (max-width: 699px) {
-  .searchbox { display: none }
-}
@media (max-width: 768px) {
-  .main-nav ul { text-align: right }
+  .main-nav ul {
+    text-align: right;
+  }
 }
@media (max-width: 830px) {
  .main-nav {
@@ -195,9 +170,6 @@ h6:hover .header-link {
    .hide-on-mobiles { display: none; }
  }
 }
-@media (max-width: 890px) {
-  .meta { display: none; }
-}

 /* Footer */

@@ -575,22 +547,8 @@ aside {
 }

 .docs-nav-mobile select {
-  padding: 5px;
-  width: 100%;
-  font-size: 0.85em;
  color: #000;
-  background: #ddd;
-  border-color: transparent;
-  @include border-radius(5px);
-
-  &:focus {
-    outline: none;
-  }
-
-  option {
-    font-size: 0.9em;
-    padding: 3px;
-  }
+  width: 100%;
 }

 /* News */
@@ -724,15 +682,15 @@ h5 > code,

 .highlight {
  margin: 1em 0;
+  padding: 10px 0;
  width: 100%;
  overflow: auto;
 }

-pre.highlight { padding: 10px 0.5em; }
-
 .highlighter-rouge .highlight {
  @extend .highlight;
  margin: 0;
+  padding: 10px 0.5em;
 }

 /* HTML Elements */
@@ -855,12 +813,7 @@ tbody td {
  background-image: linear-gradient(to bottom, rgba(255,255,255,0.1) 0%,rgba(255,255,255,0) 100%);
  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1affffff', endColorstr='#00ffffff',GradientType=0 );

-  ul {
-    padding-left: 1em;
-  }
-
-  p,
-  ul {
+  p {
    font-size: 16px;

    code { font-size: 14px; }
@@ -1030,30 +983,6 @@ code.output {
  text-shadow: 0 1px 0 rgba(255,255,255,.25);
 }

-/* Version badge */
-
-.version-badge {
-  margin-left: .25em;
-  padding: 0.2em;
-  font-size: .75em;
-  font-weight: 400;
-  background-color: #fc0;
-  color: #222;
-  text-shadow: none;
-  vertical-align: middle;
-  border-radius: 3.75px;
-}
-
-.note {
-  .version-badge {
-    font-size: 0.9rem;
-    padding: 0.1em 0.2em;
-    background-color: rgba(0,0,0,0.2);
-    color: #fff;
-    box-shadow: inset 0 1px 10px rgba(0,0,0,0.3),0 1px 0 rgba(255,255,255,0.1),0 -1px 0 rgba(0,0,0,0.5);
-  }
-}
-
 /* Responsive tables */

@media (max-width: 768px) {
@@ -1124,35 +1053,3 @@ code.output {
    background: #454545;
  }
 }
-
-.language-sh {
-  position: relative;
-  &:before {
-    display: table;
-    padding: 8px;
-    width: 100%;
-    padding: 5px 0;
-    font: 400 16px/24px 'Helvetica Neue', Helvetica, Arial, sans-serif;
-    color: #444;
-    text-shadow: 0 1px 0 rgba(255,255,255,.5);
-    background-color: #f7f7f7;
-    background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y3ZjdmNyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjclIiBzdG9wLWNvbG9yPSIjY2ZjZmNmIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2FhYWFhYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=);
-    background-image: -webkit-gradient(linear, left top, left bottom, from(#f7f7f7), color-stop(7%, #cfcfcf), to(#aaaaaa));
-    background-image: -webkit-linear-gradient(top, #f7f7f7 0%, #cfcfcf 7%, #aaaaaa 100%);
-    background-image: -moz-linear-gradient(top, #f7f7f7 0%, #cfcfcf 7%, #aaaaaa 100%);
-    background-image: -o-linear-gradient(top, #f7f7f7 0%, #cfcfcf 7%, #aaaaaa 100%);
-    background-image: linear-gradient(top, #f7f7f7 0%,#cfcfcf 7%,#aaaaaa 100%);
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7f7f7', endColorstr='#aaaaaa',GradientType=0 );
-    border-bottom: 1px solid #111;
-    text-align: center;
-    content: "terminal";
-    @include border-radius(5px 5px 0 0);
-    @include box-shadow(0 3px 10px rgba(0,0,0,.5));
-  }
-  .highlight {
-    @include border-radius(0 0 5px 5px);
-  }
-  pre.highlight {
-    background: #1c1c1c;
-  }
-}
--- a/docs/_tutorials/convert-existing-site-to-jekyll.md
+++ b/docs/_tutorials/convert-existing-site-to-jekyll.md
@@ -306,7 +306,7 @@ At minimum, a layout should contain `{% raw %}{{ content }}{% endraw %}`, which

 ### For loops

-By the way, let's pause here to look at the `for` loop logic a little more closely. [For loops in Liquid](https://shopify.github.io/liquid/tags/iteration/) are one of the most commonly used Liquid tags. *For loops* let you iterate through content in your Jekyll site and build out a result. The `for` loop also has [certain properties available](https://help.shopify.com/themes/liquid/objects/for-loops) (like first or last iteration) based on the loop's position in the loop as well.
+By the way, let's pause here to look at the `for` loop logic a little more closely. [For loops in Liquid](https://help.shopify.com/themes/liquid/tags/iteration-tags#for) are one of the most commonly used Liquid tags. *For loops* let you iterate through content in your Jekyll site and build out a result. The `for` loop also has [certain properties available](https://help.shopify.com/themes/liquid/objects/for-loops) (like first or last iteration) based on the loop's position in the loop as well.

 We've only scratched the surface of what you can do with `for` loops in retrieving posts. For example, if you wanted to display posts from a specific category, you could do so by adding a `categories` property to your post's front matter and then look in those categories. Further, you could limit the number of results by adding a `limit` property. Here's an example:

--- a/docs/_tutorials/custom-404-page.md
+++ b/docs/_tutorials/custom-404-page.md
@@ -15,7 +15,7 @@ Simply add a `404.md` or `404.html` at the root of your site's source directory

 If you plan to organize your files under subdirectories, the error page should have the following Front Matter Data, set: `permalink: /404.html`. This is to ensure that the compiled `404.html` resides at the root of your processed site, where it'll be picked by the server.

-```markdown
+```
 ---
 # example 404.md

@@ -34,19 +34,19 @@ Apache Web Servers load a configuration file named [`.htaccess`](http://www.htac

 Simply add the following to your `.htaccess` file.

-```apache
+```
 ErrorDocument 404 /404.html
 ```

 With an `.htaccess` file, you have the freedom to place your error page within a subdirectory.

-```apache
+```
 ErrorDocument 404 /error_pages/404.html
 ```

 Where the path is relative to your site's domain.

-More info on configuring Apache Error Pages can found in [official documentation](https://httpd.apache.org/docs/current/mod/core.html#errordocument).
+More info on configuring Apache Error Pages can found in [official documentation](https://httpd.apache.org/docs/current/mod/core.html#errordocument). 


 ## Hosting on Nginx server
@@ -55,13 +55,12 @@ The procedure is just as simple as configuring Apache servers, but slightly diff

 Add the following to the nginx configuration file, `nginx.conf`, which is usually located inside `/etc/nginx/` or `/etc/nginx/conf/`:

-```nginx
+```
 server {
  error_page 404 /404.html;
-  location = /404.html {
+  location  /404.html {
    internal;
  }
 }
 ```
-
 The `location` directive prevents users from directly browsing the 404.html page.
--- a/docs/_tutorials/navigation.md
+++ b/docs/_tutorials/navigation.md
@@ -91,36 +91,28 @@ Suppose you wanted to sort the list by the `title`. To do this, convert the refe

 **Liquid**

-{% raw %}
 ```liquid
-{% assign doclist = site.data.samplelist.docs | sort: 'title'  %}
-<ol>
+{% raw %}{% assign doclist = site.data.samplelist.docs | sort: 'title'  %}
 {% for item in doclist %}
    <li><a href="{{ item.url }}" alt="{{ item.title }}">{{ item.title }}</a></li>
-{% endfor %}
-</ol>
+{% endfor %}{% endraw %}
 ```
-{% endraw %}

 **Result**

 <div class="highlight result">
-   <ol>
-      <li><a href="#" alt="Configuration">Configuration</a></li>
-      <li><a href="#" alt="Deployment">Deployment</a></li>
-      <li><a href="#" alt="Introduction">Introduction</a></li>
-   </ol>
+   <li><a href="#" alt="Configuration">Configuration</a></li>
+   <li><a href="#" alt="Deployment">Deployment</a></li>
+   <li><a href="#" alt="Introduction">Introduction</a></li>
 </div>

 The items now appear in alphabetical order. The `sort` property in the Liquid filter applies to the `title`, which is an actual property in the list. If `title` weren't a property, we would need to sort by another property.

 See the [Liquid array filter](https://help.shopify.com/themes/liquid/filters/array-filters) for more filter options. Note that you can't simply use this syntax:

-{% raw %}
 ```liquid
-{% for item in site.data.samplelist.docs | sort: "title" %}{% endfor %}
+{% raw %}{% for item in site.data.samplelist.docs | sort: "title" %}{% endfor %}{% endraw %}
 ```
-{% endraw %}

 You have to convert `site.data.samplelist.docs` to a variable first using either `assign` or `capture` tags.

@@ -160,18 +152,16 @@ toc:

 **Liquid**

-{% raw %}
 ```liquid
-{% for item in site.data.samplelist.toc %}
+{% raw %}{% for item in site.data.samplelist.toc %}
    <h3>{{ item.title }}</h3>
      <ul>
        {% for entry in item.subfolderitems %}
          <li><a href="{{ entry.url }}">{{ entry.page }}</a></li>
        {% endfor %}
      </ul>
-  {% endfor %}
+  {% endfor %}{% endraw %}
 ```
-{% endraw %}

 **Result**
 <div class="highlight result">
@@ -252,9 +242,8 @@ toc2:

 **Liquid**

-{% raw %}
 ```liquid
-<div>
+{% raw %}<div>
 {% if site.data.samplelist.toc2[0] %}
  {% for item in site.data.samplelist.toc2 %}
    <h3>{{ item.title }}</h3>
@@ -274,9 +263,8 @@ toc2:
      {% endif %}
    {% endfor %}
 {% endif %}
-</div>
+</div>{% endraw %}
 ```
-{% endraw %}

 **Result**

@@ -339,16 +327,13 @@ sidebar: toc

 **Liquid**

-{% raw %}
 ```liquid
-<ul>
+{% raw %}<ul>
    {% for item in site.data.samplelist[page.sidebar] %}
      <li><a href="{{ item.url }}">{{ item.title }}</a></li>
    {% endfor %}
-</ul>
+</ul>{% endraw %}
 ```
-{% endraw %}
-
 **Result**

 <div class="highlight result">
@@ -376,15 +361,13 @@ In addition to inserting items from the YAML data file into your list, you also
 ```
 **Liquid**

-{% raw %}
 ```liquid
-{% for item in site.data.samplelist.docs %}
+{% raw %}{% for item in site.data.samplelist.docs %}
    <li class="{% if item.url == page.url %}active{% endif %}">
      <a href="{{ item.url }}">{{ item.title }}</a>
    </li>
-{% endfor %}
+{% endfor %}{% endraw %}
 ```
-{% endraw %}

 **Result**

@@ -405,7 +388,7 @@ In this case, assume `Deployment` is the current page.

 To make sure the `item.url` (stored in the YAML file) matches the `page.url`, it can be helpful to print the `{% raw %}{{ page.url }}{% endraw %}` to the page.

-## Scenario 7: Including items conditionally
+## Scenario 6: Including items conditionally

 You might want to include items conditionally in your list. For example, maybe you have multiple site outputs and only want to include the sidebar item for certain outputs. You can add properties in each list item and then use those properties to conditionally include the content.

@@ -429,17 +412,15 @@ docs2:

 **Liquid**

-{% raw %}
 ```liquid
-  <ul>
+{% raw %}<ul>
    {% for item in site.data.samplelist.docs2 %}
      {% if item.version == 1 %}
        <li><a href="{{ item.url }}">{{ item.title }}</a></li>
      {% endif %}
    {% endfor %}
-</ul>
+</ul>{% endraw %}
 ```
-{% endraw %}

 **Result**

@@ -452,7 +433,7 @@ docs2:

 The `Deployment` page is excluded because its `version` is `2`.

-## Scenario 8: Retrieving items based on front matter properties
+## Scenario 7: Retrieving items based on front matter properties

 If you don't want to store your navigation items in a YAML file in your `_data` folder, you can use `for` loops to look through the YAML front matter of each page or collection and get the content based on properties in the front matter.

@@ -510,18 +491,16 @@ Note that even though `category` is used in the doc front matter, `category` is

 If you wanted to simply get all docs in the collection for a specific category, you could use a `for` loop with an `if` condition to check for a specific category:

-{% raw %}
 ```liquid
-<h3>Getting Started</h3>
+{% raw %}<h3>Getting Started</h3>
 <ul>
    {% for doc in site.docs %}
      {% if doc.category == "getting-started" %}
        <li><a href="{{ doc.url }}">{{ doc.title }}</a></li>
      {% endif %}
    {% endfor %}
-</ul>
+</ul>{% endraw %}
 ```
-{% endraw %}

 The result would be as follows:

@@ -544,9 +523,8 @@ Here's the code for getting lists of pages grouped under their corresponding cat

 **Liquid**

-{% raw %}
 ```liquid
-{% assign mydocs = site.docs | group_by: 'category' %}
+{% raw %}{% assign mydocs = site.docs | group_by: 'category' %}
 {% for cat in mydocs %}
 <h2>{{ cat.name | capitalize }}</h2>
    <ul>
@@ -555,9 +533,8 @@ Here's the code for getting lists of pages grouped under their corresponding cat
        <li><a href="{{ item.url }}">{{ item.title }}</a></li>
      {% endfor %}
    </ul>
-{% endfor %}
+{% endfor %}{% endraw %}
 ```
-{% endraw %}

 **Result**

@@ -597,6 +574,6 @@ After getting the category name, we assign the variable `items` for the docs and

 The `for item in items` loop looks through each `item` and gets the `title` and `url` to form the list item link.

-For more details on the `group_by` filter, see [Jekyll's Templates documentation](https://jekyllrb.com/docs/templates/) as well as [this Siteleaf tutorial](https://www.siteleaf.com/blog/advanced-liquid-group-by/). For more details on the `sort` filter, see [sort](https://shopify.github.io/liquid/filters/sort/) in Liquid's documentation.
+For more details on the `group_by` filter, see [Jekyll's Templates documentation](https://jekyllrb.com/docs/templates/) as well as [this Siteleaf tutorial](https://www.siteleaf.com/blog/advanced-liquid-group-by/). For more details on the `sort` filter, see [sort](https://help.shopify.com/themes/liquid/filters/array-filters#sort) in Liquid's documentation.

 Whether you use properties in your doc's front matter to retrieve your pages or a YAML data file, in both cases you can programmatically build a more robust navigation for your site.
--- a/docs/_tutorials/orderofinterpretation.md
+++ b/docs/_tutorials/orderofinterpretation.md
@@ -37,19 +37,15 @@ The following scenarios highlight potential problems you might encounter. These

 In your layout file (`_layouts/default.html`), suppose you have a variable assigned:

-{% raw %}
-```liquid
-{% assign myvar = "joe" %}
 ```
-{% endraw %}
+{% raw %}{% assign myvar = "joe" %}{% endraw %}
+```

 On a page that uses the layout, you reference that variable:

-{% raw %}
-```liquid
-{{ myvar }}
 ```
-{% endraw %}
+{% raw %}{{ myvar }}{% endraw %}
+```

 The variable won't render because the page's order of interpretation is to render Liquid first and later process the Layout. When the Liquid rendering happens, the variable assignment isn't available.

@@ -67,11 +63,9 @@ This is a list:

 You include the file into an HTML file as follows:

-{% raw %}
 ```liquid
-{% include mycontent.md %}
+{% raw %}{% include mycontent.md %}{% endraw %}
 ```
-{% endraw %}

 The Markdown is not processed because first the Liquid (`include` tag) gets processed, inserting `mycontent.md` into the HTML file. *Then* the Markdown would get processed.

@@ -81,13 +75,11 @@ To make the code work, use HTML formatting in includes that are inserted into HT

 Note that `highlight` tags don't require Markdown to process. Suppose your include contains the following:

-{% raw %}
 ```liquid
-{% highlight javascript %}
+{% raw %}{% highlight javascript %}
 console.log('alert');
-{% endhighlight %}
+{% endhighlight %}{% endraw %}
 ```
-{% endraw %}

 The `highlight` tag *is* Liquid. (Liquid passes the content to Rouge or Pygments for syntax highlighting.) As a result, this code will actually convert to HTML with syntax highlighting. Jekyll does not need the Markdown filter to process `highlight` tags.

@@ -95,9 +87,8 @@ The `highlight` tag *is* Liquid. (Liquid passes the content to Rouge or Pygments

 Suppose you try to mix Liquid's `assign` tag with JavaScript, like this:

-{% raw %}
 ```javascript
-<button onclick="someFunction()">Click me</button>
+{% raw %}<button onclick="someFunction()">Click me</button>

 <p id="intro"></p>

@@ -106,17 +97,15 @@ Suppose you try to mix Liquid's `assign` tag with JavaScript, like this:
 function someFunction() {
    document.getElementById("intro").innerHTML = someContent;
 }
-</script>
+</script>{% endraw %}
 ```
-{% endraw %}

 This won't work because the `assign` tag is only available during the Liquid rendering phase of the site. In this JavaScript example, the script executes when a user clicks a button ("Click me") on the HTML page. At that time, the Liquid logic is no longer available, so the `assign` tag wouldn't return anything.

 However, you can use Jekyll's site variables or Liquid to *populate* a script that is executed at a later time. For example, suppose you have the following property in your front matter: `someContent: "This is some content"`. You could do this:

-{% raw %}
 ```js
-<button onclick="someFunction()">Click me</button>
+{% raw %}<button onclick="someFunction()">Click me</button>

 <p id="intro"></p>

@@ -125,9 +114,8 @@ However, you can use Jekyll's site variables or Liquid to *populate* a script th
 function someFunction() {
    document.getElementById("intro").innerHTML = "{{ page.someContent }}";
 }
-</script>
+</script>{% endraw %}
 ```
-{% endraw %}

 When Jekyll builds the site, this `someContent` property populates the script's values, converting `{% raw %}{{ page.someContent }}{% endraw %}` to `"This is some content"`.

@@ -139,21 +127,17 @@ There's one more detail to remember: Liquid does not render when embedded in YAM

 For example, suppose you have a `highlight` tag in your `_data/mydata.yml` file:

-{% raw %}
-```liquid
-myvalue: >
+```
+{% raw %}myvalue: >
  {% highlight javascript %}
  console.log('alert');
-  {% endhighlight %}
+  {% endhighlight %}{% endraw %}
 ```
-{% endraw %}

 On a page, you try to insert the value:

-{% raw %}
-```liquid
-{{ site.data.mydata.myvalue }}
 ```
-{% endraw %}
+{% raw %}{{ site.data.mydata.myvalue }}{% endraw %}
+```

 This would render only as a string rather than a code sample with syntax highlighting. To make the code render, consider using an include instead.
--- a/docs/_tutorials/video-walkthroughs.md
+++ b/docs/_tutorials/video-walkthroughs.md
@@ -1,35 +0,0 @@
---
-layout: tutorials
-permalink: /tutorials/video-walkthroughs/
-title: Video Walkthroughs
---
-
-[Giraffe Academy](https://www.youtube.com/c/GiraffeAcademy) has a series of videos that will walk you through the basics of using Jekyll. In this series you'll learn everything from installing Jekyll on your computer and setting up your first site, to using more complex features like variables, layouts and conditionals.
-
-<div class="videoWrapper" >
-     <iframe src="https://www.youtube.com/embed/T1itpPvFWHI?rel=0" frameborder="0" allowfullscreen></iframe>
-</div>
-
-## List of Lessons
-
-1. [Introduction to Jekyll (see above)](https://www.youtube.com/watch?v=T1itpPvFWHI&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=1)
-2. [Mac Installation](https://www.youtube.com/watch?v=WhrU9m82Wm8&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=2)
-3. [Windows Installation](https://www.youtube.com/watch?v=LfP7Y9Ja6Qc&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=3)
-4. [Creating a Site](https://www.youtube.com/watch?v=pxua_1vyFck&index=4&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
-5. [Front Matter](https://www.youtube.com/watch?v=ZtEbGztktvc&index=5&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
-6. [Writing Posts](https://www.youtube.com/watch?v=gsYqPL9EFwQ&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=6)
-7. [Working With Drafts](https://www.youtube.com/watch?v=X8jXkW3k2Jg&index=7&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
-8. [Creating Pages](https://www.youtube.com/watch?v=1na-IWfv08M&index=8&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
-9. [Permalinks](https://www.youtube.com/watch?v=938jDG_YPdc&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=9)
-10. [Front Matter Defaults](https://www.youtube.com/watch?v=CLCaJJ1zUHU&index=10&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
-11. [Themes](https://www.youtube.com/watch?v=NoRS2D-cyko&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=11)
-12. [Layouts](https://www.youtube.com/watch?v=bDQsGdCWv4I&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=12)
-13. [Variables](https://www.youtube.com/watch?v=nLJBF2KiOZw&index=13&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
-14. [Includes](https://www.youtube.com/watch?v=HfcJeRby2a8&index=14&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
-15. [Looping Through Posts](https://www.youtube.com/watch?v=6N1X5XffuUA&index=15&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
-16. [Conditionals](https://www.youtube.com/watch?v=iNZBEki_x6o&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=16)
-17. [Data Files](https://www.youtube.com/watch?v=M6b0KmLB-pM&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=17)
-18. [Static Files](https://www.youtube.com/watch?v=knWjmVlVpso&index=18&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB)
-19. [Hosting on Github Pages](https://www.youtube.com/watch?v=fqFjuX4VZmU&list=PLLAZ4kZ9dFpOPV5C5Ay0pHaa0RJFhcmcB&index=19)
-
-
--- a/docs/community/index.md
+++ b/docs/community/index.md
@@ -1,14 +1,12 @@
 ---
 layout: page
-title: JekyllConf
-redirect_from: /community/index.html
-permalink: /jekyllconf/
+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] %}

--- a/docs/css/screen.scss
+++ b/docs/css/screen.scss
@@ -7,4 +7,3 @@
@import "pygments";
@import "font-awesome";
@import "style";
-@import "docsearch";
--- a/docs/help/index.md
+++ b/docs/help/index.md
@@ -5,15 +5,31 @@ title: Getting Help

 Need help with Jekyll? Try these resources.

+### [Upgrading](/docs/upgrading/)
+
+Did you recently upgrade from Jekyll 1 to 2 or from Jekyll 2 to 3?
+Known breaking changes are listed in the upgrading docs.
+
 ### [Documentation](/docs/home/)

-Start with our official guide to Jekyll covering installation, writing, customization, deployment, and more.
+Our guide to Jekyll covering installation, writing, customization, deployment, and more.
+
+### [Tutorials](/tutorials/home)
+
+Similar to documentation, but more detailed scenario-based walk-throughs covering a variety of topics.
+
+### [View source](https://github.com/jekyll/jekyll/wiki/sites)
+
+Learn from the source of others' Jekyll-powered sites.
+
+### [Google](https://www.google.com/?q=jekyll)
+
+Add **jekyll** to almost any query, and you'll find just what you need.

 ### [Jekyll Talk](https://talk.jekyllrb.com/)

-Our official Discourse forum. Here, users and contributors
+Jekyll Talk is our official Discourse forum. Here, users and contributors
 can ask questions and discuss all aspects of Jekyll.
-Also the place to [showcase your jekyll sites](https://talk.jekyllrb.com/t/jekyll-showcase-share-your-sites-built-with-jekyll/44/80) and [share your jekyll themes](https://talk.jekyllrb.com/t/jekyll-theme-showcase-share-your-jekyll-themes/1382/2).

 ### [Jekyll on StackOverflow](https://stackoverflow.com/questions/tagged/jekyll)

@@ -26,27 +42,6 @@ question!
 Get live support at **#jekyll** on **irc.freenode.net**, the official
 Jekyll IRC channel.

-### View source
-
-Learn from the source of others, you'll find plenty of [jekyll sites](https://github.com/topics/jekyll-site) and [jekyll themes](https://github.com/topics/jekyll-themes) carefully handcrafted on GitHub.
-
-### [Tutorials](/tutorials/home)
-
-Similar to documentation, but more detailed scenario-based walk-throughs covering a variety of topics.
-
-### [Upgrading](/docs/upgrading/)
-
-Did you recently upgrade from Jekyll 1 to 2 or from Jekyll 2 to 3?
-Known breaking changes are listed in the upgrading docs.
-
-### [Jekyllconf](/jekyllconf/)
-
-Watch videos from members of the Jekyll community speak about interesting use cases, tricks they've learned or meta Jekyll topics.
-
-### [Google](https://www.google.com/?q=jekyll)
-
-Add **jekyll** to almost any query, and you'll find just what you need.
-
 ### [jekyll/jekyll](https://github.com/jekyll/jekyll/issues)

 Search through the issues on the main Jekyll development. Think you've
--- a/docs/img/jekyll-sticker.jpg
+++ b/docs/img/jekyll-sticker.jpg
--- a/docs/img/jekyll-sticker.png
+++ b/docs/img/jekyll-sticker.png
--- a/docs/img/jekylllayoutconcept.png
+++ b/docs/img/jekylllayoutconcept.png
--- a/docs/img/twitter-card.png
+++ b/docs/img/twitter-card.png
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.7.2
+3.5.1
--- a/exe/jekyll
+++ b/exe/jekyll
@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
-
 STDOUT.sync = true

 $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
--- a/features/collections_dir.feature
+++ b/features/collections_dir.feature
@@ -1,161 +0,0 @@
-Feature: Collections Directory
-  As a hacker who likes to structure content without clutter
-  I want to be able to organize my collections under a single directory
-  And render them from there
-
-  Scenario: Custom collections_dir containing only posts
-    And I have a collections/_posts directory
-    And I have the following post within the "collections" directory:
-      | title         | date       | content         |
-      | Gathered Post | 2009-03-27 | Random Content. |
-    And I have a "_config.yml" file with content:
-    """
-    collections_dir: collections
-    """
-    When I run jekyll build
-    Then I should get a zero exit status
-    And the _site directory should exist
-    And I should see "Random Content." in "_site/2009/03/27/gathered-post.html"
-
-  Scenario: Rendered collection in custom collections_dir also containing posts
-    Given I have a collections/_puppies directory
-    And I have the following document under the "puppies" collection within the "collections" directory:
-      | title  | date       | content            |
-      | Rover  | 2007-12-31 | content for Rover. |
-    And I have a collections/_posts directory
-    And I have the following post within the "collections" directory:
-      | title         | date       | content         |
-      | Gathered Post | 2009-03-27 | Random Content. |
-    And I have a "_config.yml" file with content:
-    """
-    collections:
-      puppies:
-        output: true
-
-    collections_dir: collections
-    """
-    When I run jekyll build
-    Then I should get a zero exit status
-    And the _site directory should exist
-    And the "_site/puppies/rover.html" file should exist
-    And I should see "Random Content." in "_site/2009/03/27/gathered-post.html"
-
-  Scenario: Rendered collection in custom collections_dir with posts at the site root
-    Given I have a collections/_puppies directory
-    And I have the following document under the "puppies" collection within the "collections" directory:
-      | title  | date       | content            |
-      | Rover  | 2007-12-31 | content for Rover. |
-    And I have a _posts directory
-    And I have the following post:
-      | title        | date       | content         |
-      | Post At Root | 2009-03-27 | Random Content. |
-    And I have a "_config.yml" file with content:
-    """
-    collections:
-      puppies:
-        output: true
-
-    collections_dir: collections
-    """
-    When I run jekyll build
-    Then I should get a zero exit status
-    And the _site directory should exist
-    And the "_site/puppies/rover.html" file should exist
-    And the "_site/2009/03/27/post-at-root.html" file should not exist
-    And the _site/_posts directory should not exist
-
-  Scenario: Rendered collection in custom collections_dir also containing drafts
-    Given I have a collections/_puppies directory
-    And I have the following document under the "puppies" collection within the "collections" directory:
-      | title  | date       | content            |
-      | Rover  | 2007-12-31 | content for Rover. |
-    And I have a collections/_drafts directory
-    And I have the following draft within the "collections" directory:
-      | title          | date       | content         |
-      | Gathered Draft | 2009-03-27 | Random Content. |
-    And I have a "_config.yml" file with content:
-    """
-    collections:
-      puppies:
-        output: true
-
-    collections_dir: collections
-    """
-    When I run jekyll build --drafts
-    Then I should get a zero exit status
-    And the _site directory should exist
-    And the "_site/puppies/rover.html" file should exist
-    And I should see "Random Content." in "_site/2009/03/27/gathered-draft.html"
-    And the _site/collections directory should not exist
-
-  Scenario: Rendered collection in custom collections_dir with drafts at the site root
-    Given I have a collections/_puppies directory
-    And I have the following document under the "puppies" collection within the "collections" directory:
-      | title  | date       | content            |
-      | Rover  | 2007-12-31 | content for Rover. |
-    And I have a _drafts directory
-    And I have the following draft:
-      | title         | date       | content         |
-      | Draft At Root | 2009-03-27 | Random Content. |
-    And I have a "_config.yml" file with content:
-    """
-    collections:
-      puppies:
-        output: true
-
-    collections_dir: collections
-    """
-    When I run jekyll build --drafts
-    Then I should get a zero exit status
-    And the _site directory should exist
-    And the "_site/puppies/rover.html" file should exist
-    And the "_site/2009/03/27/draft-at-root.html" file should not exist
-
-  Scenario: A complex site with collections posts and drafts at various locations
-    Given I have a gathering/_puppies directory
-    And I have a gathering/_posts directory
-    And I have a gathering/_drafts directory
-    And I have a _puppies directory
-    And I have a _posts directory
-    And I have a _drafts directory
-    And I have the following document under the "puppies" collection within the "gathering" directory:
-      | title               | date       | content            |
-      | Rover in Gathering  | 2007-12-31 | content for Rover. |
-    And I have the following document under the puppies collection:
-      | title               | date       | content            |
-      | Rover At Root       | 2007-12-31 | content for Rover. |
-    And I have the following post within the "gathering" directory:
-      | title               | date       | content            |
-      | Post in Gathering   | 2009-03-27 | Totally nothing.   |
-    And I have the following post:
-      | title               | date       | content            |
-      | Post At Root        | 2009-03-27 | Totally nothing.   |
-    And I have the following draft within the "gathering" directory:
-      | title               | date       | content            |
-      | Draft In Gathering  | 2009-03-27 | This is a draft.   |
-    And I have the following draft:
-      | title               | date       | content            |
-      | Draft At Root       | 2009-03-27 | This is a draft.   |
-    And I have a "_config.yml" file with content:
-    """
-    collections:
-      puppies:
-        output: true
-
-    collections_dir: gathering
-    """
-    And I have a "gathering/_puppies/static_file.txt" file that contains "Static content."
-    And I have a gathering/_puppies/nested directory
-    And I have a "gathering/_puppies/nested/static_file.txt" file that contains "Nested Static content."
-    When I run jekyll build --drafts
-    Then I should get a zero exit status
-    And the _site directory should exist
-    And the "_site/puppies/rover-in-gathering.html" file should exist
-    And the "_site/2009/03/27/post-in-gathering.html" file should exist
-    And the "_site/2009/03/27/draft-in-gathering.html" file should exist
-    And the "_site/2009/03/27/draft-at-root.html" file should not exist
-    And the "_site/puppies/rover-at-root.html" file should not exist
-    And I should see exactly "Static content." in "_site/puppies/static_file.txt"
-    And I should see exactly "Nested Static content." in "_site/puppies/nested/static_file.txt"
-    And the _site/gathering directory should not exist
-    And the _site/_posts directory should not exist
--- a/features/incremental_rebuild.feature
+++ b/features/incremental_rebuild.feature
@@ -66,20 +66,3 @@ Feature: Incremental rebuild
    Then I should get a zero exit status
    And the _site directory should exist
    And I should see "Basic Site with include tag: Regenerated by Jekyll" in "_site/index.html"
-
-  Scenario: A themed-site and incremental regeneration
-    Given I have a configuration file with "theme" set to "test-theme"
-    And I have an "index.md" page that contains "Themed site"
-    When I run jekyll build --incremental --verbose
-    Then I should get a zero exit status
-    And the _site directory should exist
-    And I should see "Rendering: index.md" in the build output
-    And I should see "Themed site" in "_site/index.html"
-    When I wait 1 second
-    And I have an "about.md" page that contains "About Themed site"
-    When I run jekyll build --incremental --verbose
-    Then I should get a zero exit status
-    And the _site directory should exist
-    And I should not see "Rendering: index.md" in the build output
-    But I should see "Themed site" in "_site/index.html"
-    And I should see "About Themed site" in "_site/about.html"
--- a/features/layout_data.feature
+++ b/features/layout_data.feature
@@ -3,26 +3,6 @@ Feature: Layout data
  I want to be able to embed data into my layouts
  In order to make the layouts slightly dynamic

-  Scenario: Use custom layout data
-    Given I have a _layouts directory
-    And I have a "_layouts/999.html" file with content:
-      """
-      ---
-      ---
-      {{ content }} layout content
-      """
-    And I have an "index.html" page with layout "custom" that contains "page content"
-    And I have an "index.html" file with content:
-      """
-      ---
-      layout: 999
-      ---
-      page content
-      """
-    When I run jekyll build
-    Then the "_site/index.html" file should exist
-    And I should see "page content layout content" in "_site/index.html"
-
  Scenario: Use custom layout data
    Given I have a _layouts directory
    And I have a "_layouts/custom.html" file with content:
--- a/features/permalinks.feature
+++ b/features/permalinks.feature
@@ -71,14 +71,14 @@ Feature: Fancy permalinks
    And I should see "Totally custom." in "_site/03-27-2009/custom-permalink-schema.html"

  Scenario: Use custom permalink schema with date and time
-    Given I have a configuration file with:
-    | key         | value              |
-    | permalink   | "/:year:month:day:hour:minute:second.html" |
-    | timezone    | UTC                |
-    And I have a _posts directory
+    Given I have a _posts directory
    And I have the following post:
      | title                   | category | date                | content         |
      | Custom Permalink Schema | stuff    | 2009-03-27 22:31:07 | Totally custom. |
+    And I have a configuration file with:
+      | key         | value              |
+      | permalink   | "/:year:month:day:hour:minute:second.html" |
+      | timezone    | UTC                |
    When I run jekyll build
    Then I should get a zero exit status
    And the _site directory should exist
--- a/features/rendering.feature
+++ b/features/rendering.feature
@@ -12,23 +12,14 @@ Feature: Rendering
    Then  I should get a non-zero exit-status
    And   I should see "Liquid Exception" in the build output

-  Scenario: When receiving a liquid syntax error in included file
+  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: Liquid syntax error \(.+/invalid\.html line 1\): Unknown tag 'INVALID' included in index\.html" in the build output
-
-  Scenario: When receiving a generic liquid error in included file
-    Given I have a _includes directory
-    And   I have a "_includes/invalid.html" file that contains "{{ site.title | prepend 'Prepended Text' }}"
-    And   I have a "index.html" page with layout "simple" that contains "{% include invalid.html %}"
-    And   I have a simple layout that contains "{{ content }}"
-    When  I run jekyll build
-    Then  I should get a non-zero exit-status
-    And   I should see "Liquid Exception: Liquid error \(.+/_includes/invalid\.html line 1\): wrong number of arguments (\(given 1, expected 2\)|\(1 for 2\)) included in index\.html" in the build output
+    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 }}!"
@@ -49,7 +40,7 @@ Feature: Rendering
    And I should not see "Ahoy, indeed!" in "_site/index.css"
    And I should not see "Ahoy, indeed!" in "_site/index.js"

-  Scenario: Ignore defaults and don't place pages and documents with layout set to 'none'
+  Scenario: Ignore defaults and don't place documents with layout set to 'none'
    Given I have a "index.md" page with layout "none" that contains "Hi there, {{ site.author }}!"
    And I have a _trials directory
    And I have a "_trials/no-layout.md" page with layout "none" that contains "Hi there, {{ site.author }}!"
@@ -67,11 +58,9 @@ Feature: Rendering
    And I should not see "Welcome!" in "_site/trials/no-layout.html"
    And I should not see "Check this out!" in "_site/trials/no-layout.html"
    But I should see "Check this out!" in "_site/trials/test.html"
-    And I should see "Hi there, John Doe!" in "_site/index.html"
-    And I should not see "Welcome!" in "_site/index.html"
-    And I should not see "Build Warning:" in the build output
+    And I should see "Welcome!" in "_site/index.html"

-  Scenario: Don't place pages and documents with layout set to 'none'
+  Scenario: Don't place documents with layout set to 'none'
    Given I have a "index.md" page with layout "none" that contains "Hi there, {{ site.author }}!"
    And I have a _trials directory
    And I have a "_trials/no-layout.md" page with layout "none" that contains "Hi there, {{ site.author }}!"
@@ -86,10 +75,8 @@ Feature: Rendering
    Then I should get a zero exit status
    And the _site directory should exist
    And I should not see "Welcome!" in "_site/trials/no-layout.html"
-    And I should not see "Welcome!" in "_site/index.html"
    But I should see "Check this out!" in "_site/trials/test.html"
-    And I should see "Hi there, John Doe!" in "_site/index.html"
-    And I should not see "Build Warning:" in the build output
+    And I should see "Welcome!" in "_site/index.html"

  Scenario: Render liquid in Sass
    Given I have an "index.scss" page that contains ".foo-bar { color:{{site.color}}; }"
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -1,10 +1,7 @@
-# frozen_string_literal: true
-
 Before do
  FileUtils.rm_rf(Paths.test_dir) if Paths.test_dir.exist?
  FileUtils.mkdir_p(Paths.test_dir) unless Paths.test_dir.directory?
  Dir.chdir(Paths.test_dir)
-  @timezone_before_scenario = ENV["TZ"]
 end

 #
@@ -14,7 +11,6 @@ After do
  Paths.output_file.delete if Paths.output_file.exist?
  Paths.status_file.delete if Paths.status_file.exist?
  Dir.chdir(Paths.test_dir.parent)
-  ENV["TZ"] = @timezone_before_scenario
 end

 #
@@ -87,7 +83,6 @@ Given(%r!^I have the following (draft|page|post)s?(?: (in|under) "([^"]+)")?:$!)

    if status == "post"
      parsed_date = Time.xmlschema(input_hash["date"]) rescue Time.parse(input_hash["date"])
-      input_hash["date"] = parsed_date
      filename = "#{parsed_date.strftime("%Y-%m-%d")}-#{title}.#{ext}"
    end

@@ -98,20 +93,6 @@ end

 #

-Given(%r!^I have the following (draft|post)s? within the "(.*)" directory:$!) do |type, folder, table|
-  table.hashes.each do |input_hash|
-    title = slug(input_hash["title"])
-    parsed_date = Time.xmlschema(input_hash["date"]) rescue Time.parse(input_hash["date"])
-
-    filename = type == "draft" ? "#{title}.markdown" : "#{parsed_date.strftime("%Y-%m-%d")}-#{title}.markdown"
-
-    path = File.join(folder, "_#{type}s", filename)
-    File.write(path, file_content_from_hash(input_hash))
-  end
-end
-
-#
-
 Given(%r!^I have the following documents? under the (.*) collection:$!) do |folder, table|
  table.hashes.each do |input_hash|
    title = slug(input_hash["title"])
@@ -125,16 +106,6 @@ end

 #

-Given(%r!^I have the following documents? under the "(.*)" collection within the "(.*)" directory:$!) do |label, dir, table|
-  table.hashes.each do |input_hash|
-    title = slug(input_hash["title"])
-    path = File.join(dir, "_#{label}", "#{title}.md")
-    File.write(path, file_content_from_hash(input_hash))
-  end
-end
-
-#
-
 Given(%r!^I have a configuration file with "(.*)" set to "(.*)"$!) do |key, value|
  config = \
    if source_dir.join("_config.yml").exist?
@@ -143,7 +114,6 @@ Given(%r!^I have a configuration file with "(.*)" set to "(.*)"$!) do |key, valu
      {}
    end
  config[key] = YAML.load(value)
-  Jekyll.set_timezone(value) if key == "timezone"
  File.write("_config.yml", YAML.dump(config))
 end

@@ -184,7 +154,7 @@ end
 When(%r!^I run jekyll(.*)$!) do |args|
  run_jekyll(args)
  if args.include?("--verbose") || ENV["DEBUG"]
-    warn "\n#{jekyll_run_output}\n"
+    $stderr.puts "\n#{jekyll_run_output}\n"
  end
 end

@@ -193,7 +163,7 @@ end
 When(%r!^I run bundle(.*)$!) do |args|
  run_bundle(args)
  if args.include?("--verbose") || ENV["DEBUG"]
-    warn "\n#{jekyll_run_output}\n"
+    $stderr.puts "\n#{jekyll_run_output}\n"
  end
 end

@@ -202,7 +172,7 @@ end
 When(%r!^I run gem(.*)$!) do |args|
  run_rubygem(args)
  if args.include?("--verbose") || ENV["DEBUG"]
-    warn "\n#{jekyll_run_output}\n"
+    $stderr.puts "\n#{jekyll_run_output}\n"
  end
 end

--- a/features/support/formatter.rb
+++ b/features/support/formatter.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "fileutils"
 require "colorator"
 require "cucumber/formatter/console"
@@ -59,7 +57,7 @@ module Jekyll
      #

      def feature_element_timing_key(feature_element)
-        "\"#{feature_element.name}\" (#{feature_element.location})"
+        "\"#{feature_element.name.to_s.sub("Scenario: ", "")}\" (#{feature_element.location})"
      end

      #
@@ -173,8 +171,16 @@ module Jekyll

      #

-      def print_feature_element_name(feature_element)
-        @io.print "\n#{feature_element.location}  Scenario: #{feature_element.name} "
+      private
+      def print_feature_element_name(keyword, name, source_line, _indent)
+        @io.puts
+
+        names = name.empty? ? [name] : name.each_line.to_a
+        line  = "  #{keyword}: #{names[0]}"
+
+        @io.print(source_line) if @options[:source]
+        @io.print(line)
+        @io.print " "
        @io.flush
      end

@@ -206,20 +212,3 @@ module Jekyll
    end
  end
 end
-
-AfterConfiguration do |config|
-  f = Jekyll::Cucumber::Formatter.new(nil, $stdout, {})
-
-  config.on_event :test_case_started do |event|
-    f.print_feature_element_name(event.test_case)
-    f.before_feature_element(event.test_case)
-  end
-
-  config.on_event :test_case_finished do |event|
-    f.after_feature_element(event.test_case)
-  end
-
-  config.on_event :test_run_finished do
-    f.print_worst_offenders
-  end
-end
--- a/features/support/helpers.rb
+++ b/features/support/helpers.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "fileutils"
 require "jekyll"
 require "time"
@@ -109,8 +107,7 @@ def run_in_shell(*args)

  File.write(Paths.status_file, p.exitstatus)
  File.open(Paths.output_file, "wb") do |f|
-    f.print "$ "
-    f.puts args.join(" ")
+    f.puts "$ " << args.join(" ")
    f.puts output
    f.puts "EXIT STATUS: #{p.exitstatus}"
  end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Parker Moore	ed2d30dc88	URL#generate_url_from_drop: optimizations to reduce object creation & speed things up	2017-08-02 20:18:11 -04:00
Parker Moore	3088032128	Hash#reduce vs Hash#each_with_object :thinking_face:	2017-08-02 17:58:34 -04:00
				`@@ -1 +0,0 @@`
				`<span class="version-badge" title="This feature is available starting version {{ include.version }}">{{ include.version }}</span>`
				`@@ -1 +0,0 @@`
				`<input type="text" id="docsearch-input" placeholder="Search the docs…">`
@@ -1 +1 @@
 .7.2
 .5.1