From 3768d90278a76bc7cd405ceed9d8b029c9efc489 Mon Sep 17 00:00:00 2001
From: ChaYoung You <yousbe@gmail.com>
Date: Sat, 5 Jul 2014 18:54:26 +0900
Subject: [PATCH 001/407] Use category in downcase only for URL (Resolves
 #1739)

---
 features/post_data.feature                    |  8 ++--
 lib/jekyll/post.rb                            |  6 +--
 ...13-07-22-post-excerpt-with-layout.markdown |  1 +
 test/source/_posts/2013-12-20-properties.text |  2 +-
 ...07-05-another-mixed-case-category.markdown |  7 +++
 .../2014-07-05-mixed-case-category.markdown   |  7 +++
 test/test_excerpt.rb                          |  4 +-
 test/test_generated_site.rb                   |  2 +-
 test/test_post.rb                             | 46 ++++++++++++++++---
 test/test_site.rb                             |  2 +-
 10 files changed, 66 insertions(+), 19 deletions(-)
 create mode 100644 test/source/_posts/2014-07-05-another-mixed-case-category.markdown
 create mode 100644 test/source/_posts/2014-07-05-mixed-case-category.markdown

diff --git a/features/post_data.feature b/features/post_data.feature
index 0ecaeef6f..736fc9363 100644
--- a/features/post_data.feature
+++ b/features/post_data.feature
@@ -141,7 +141,7 @@ Feature: Post data
     And I have a simple layout that contains "Post categories: {{ page.categories | array_to_sentence_string }}"
     When I run jekyll build
     Then the _site directory should exist
-    And I should see "Post categories: scifi and movies" in "_site/scifi/movies/2009/03/27/star-wars.html"
+    And I should see "Post categories: scifi and Movies" in "_site/scifi/movies/2009/03/27/star-wars.html"
 
   Scenario: Use post.categories variable when category is in YAML
     Given I have a _posts directory
@@ -163,7 +163,7 @@ Feature: Post data
     And I have a simple layout that contains "Post category: {{ page.categories }}"
     When I run jekyll build
     Then the _site directory should exist
-    And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"
+    And I should see "Post category: Movies" in "_site/movies/2009/03/27/star-wars.html"
 
   Scenario: Use post.categories variable when categories are in YAML
     Given I have a _posts directory
@@ -197,8 +197,8 @@ Feature: Post data
     And I have a simple layout that contains "Post categories: {{ page.categories | array_to_sentence_string }}"
     When I run jekyll build
     Then the _site directory should exist
-    And I should see "Post categories: scifi and movies" in "_site/scifi/movies/2009/03/27/star-wars.html"
-    And I should see "Post categories: scifi and movies" in "_site/scifi/movies/2013/03/17/star-trek.html"
+    And I should see "Post categories: scifi and Movies" in "_site/scifi/movies/2009/03/27/star-wars.html"
+    And I should see "Post categories: SciFi and movies" in "_site/scifi/movies/2013/03/17/star-trek.html"
 
   Scenario Outline: Use page.path variable
     Given I have a <dir>/_posts directory
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index b13deff8a..b1496de30 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -52,7 +52,7 @@ module Jekyll
       @base = containing_dir(source, dir)
       @name = name
 
-      self.categories = dir.downcase.split('/').reject { |x| x.empty? }
+      self.categories = dir.split('/').reject { |x| x.empty? }
       process(name)
       read_yaml(@base, name)
 
@@ -80,7 +80,7 @@ module Jekyll
       categories_from_data = Utils.pluralized_array_from_hash(data, 'category', 'categories')
       self.categories = (
         Array(categories) + categories_from_data
-      ).map {|c| c.to_s.downcase}.flatten.uniq
+      ).map { |c| c.to_s }.flatten.uniq
     end
 
     def populate_tags
@@ -218,7 +218,7 @@ module Jekyll
         :title       => slug,
         :i_day       => date.strftime("%-d"),
         :i_month     => date.strftime("%-m"),
-        :categories  => (categories || []).map { |c| c.to_s }.join('/'),
+        :categories  => (categories || []).map { |c| c.to_s.downcase }.join('/'),
         :short_month => date.strftime("%b"),
         :short_year  => date.strftime("%y"),
         :y_day       => date.strftime("%j"),
diff --git a/test/source/_posts/2013-07-22-post-excerpt-with-layout.markdown b/test/source/_posts/2013-07-22-post-excerpt-with-layout.markdown
index 07b0e5f32..49586606a 100644
--- a/test/source/_posts/2013-07-22-post-excerpt-with-layout.markdown
+++ b/test/source/_posts/2013-07-22-post-excerpt-with-layout.markdown
@@ -5,6 +5,7 @@ categories:
 - bar
 - baz
 - z_category
+- MixedCase
 tags:
 - first
 - second
diff --git a/test/source/_posts/2013-12-20-properties.text b/test/source/_posts/2013-12-20-properties.text
index 94ded5982..c0d72ce76 100644
--- a/test/source/_posts/2013-12-20-properties.text
+++ b/test/source/_posts/2013-12-20-properties.text
@@ -1,5 +1,5 @@
 ---
-categories: foo bar baz
+categories: foo bar baz MixedCase
 foo: bar
 layout: default
 tags: ay bee cee
diff --git a/test/source/_posts/2014-07-05-another-mixed-case-category.markdown b/test/source/_posts/2014-07-05-another-mixed-case-category.markdown
new file mode 100644
index 000000000..419ddab55
--- /dev/null
+++ b/test/source/_posts/2014-07-05-another-mixed-case-category.markdown
@@ -0,0 +1,7 @@
+---
+layout: default
+title: Another Mixed Case Category in YAML
+category: Mixedcase
+---
+
+Best *post* ever
diff --git a/test/source/_posts/2014-07-05-mixed-case-category.markdown b/test/source/_posts/2014-07-05-mixed-case-category.markdown
new file mode 100644
index 000000000..92a679046
--- /dev/null
+++ b/test/source/_posts/2014-07-05-mixed-case-category.markdown
@@ -0,0 +1,7 @@
+---
+layout: default
+title: Mixed Case Category in YAML
+category: MixedCase
+---
+
+Best *post* ever
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index b6300fde5..e5523ad68 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -80,9 +80,9 @@ class TestExcerpt < Test::Unit::TestCase
     context "#to_liquid" do
       should "contain the proper page data to mimick the post liquid" do
         assert_equal "Post Excerpt with Layout", @excerpt.to_liquid["title"]
-        assert_equal "/bar/baz/z_category/2013/07/22/post-excerpt-with-layout.html", @excerpt.to_liquid["url"]
+        assert_equal "/bar/baz/z_category/mixedcase/2013/07/22/post-excerpt-with-layout.html", @excerpt.to_liquid["url"]
         assert_equal Time.parse("2013-07-22"), @excerpt.to_liquid["date"]
-        assert_equal %w[bar baz z_category], @excerpt.to_liquid["categories"]
+        assert_equal %w[bar baz z_category MixedCase], @excerpt.to_liquid["categories"]
         assert_equal %w[first second third jekyllrb.com], @excerpt.to_liquid["tags"]
         assert_equal "_posts/2013-07-22-post-excerpt-with-layout.markdown", @excerpt.to_liquid["path"]
       end
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index ca3124c50..0b157e85f 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -14,7 +14,7 @@ class TestGeneratedSite < Test::Unit::TestCase
     end
 
     should "ensure post count is as expected" do
-      assert_equal 42, @site.posts.size
+      assert_equal 44, @site.posts.size
     end
 
     should "insert site.posts into the index" do
diff --git a/test/test_post.rb b/test/test_post.rb
index 98a3ff4bf..44cc96640 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -31,13 +31,13 @@ class TestPost < Test::Unit::TestCase
       post = setup_post('2013-12-20-properties.text')
 
       attrs = {
-        categories: %w(foo bar baz),
+        categories: %w(foo bar baz MixedCase),
         content: "All the properties.\n\nPlus an excerpt.\n",
         date: Time.new(2013, 12, 20),
-        dir: "/foo/bar/baz/2013/12/20",
+        dir: "/foo/bar/baz/mixedcase/2013/12/20",
         excerpt: "All the properties.\n\n",
         foo: 'bar',
-        id: "/foo/bar/baz/2013/12/20/properties",
+        id: "/foo/bar/baz/mixedcase/2013/12/20/properties",
         layout: 'default',
         name: nil,
         path: "_posts/2013-12-20-properties.text",
@@ -45,7 +45,7 @@ class TestPost < Test::Unit::TestCase
         published: nil,
         tags: %w(ay bee cee),
         title: 'Properties Post',
-        url: "/foo/bar/baz/2013/12/20/properties.html"
+        url: "/foo/bar/baz/mixedcase/2013/12/20/properties.html"
       }
 
       attrs.each do |attr, val|
@@ -253,14 +253,26 @@ class TestPost < Test::Unit::TestCase
 
         context "with space (categories)" do
           setup do
-            @post.categories << "French cuisine"
-            @post.categories << "Belgian beer"
+            @post.categories << "french cuisine"
+            @post.categories << "belgian beer"
             @post.process(@fake_file)
           end
 
           should "process the url correctly" do
             assert_equal "/:categories/:year/:month/:day/:title.html", @post.template
-            assert_equal "/French%20cuisine/Belgian%20beer/2008/09/09/foo-bar.html", @post.url
+            assert_equal "/french%20cuisine/belgian%20beer/2008/09/09/foo-bar.html", @post.url
+          end
+        end
+
+        context "with mixed case (category)" do
+          setup do
+            @post.categories << "MixedCase"
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/:categories/:year/:month/:day/:title.html", @post.template
+            assert_equal "/mixedcase/2008/09/09/foo-bar.html", @post.url
           end
         end
 
@@ -517,6 +529,12 @@ class TestPost < Test::Unit::TestCase
         assert !post.categories.include?(2013)
       end
 
+      should "recognize mixed case category in yaml" do
+        post = setup_post("2014-07-05-mixed-case-category.markdown")
+        assert post.categories.include?('MixedCase')
+        assert !post.categories.include?('mixedcase')
+      end
+
       should "recognize tag in yaml" do
         post = setup_post("2009-05-18-tag.textile")
         assert post.tags.include?('code')
@@ -589,6 +607,20 @@ class TestPost < Test::Unit::TestCase
                                         'escape-+ %20[].html'))
         end
 
+        should "write properly when category has different letter case" do
+          %w(2014-07-05-mixed-case-category.markdown 2014-07-05-another-mixed-case-category.markdown).each do |file|
+            post = setup_post(file)
+            do_render(post)
+            post.write(dest_dir)
+          end
+
+          assert File.directory?(dest_dir)
+          assert File.exist?(File.join(dest_dir, 'mixedcase', '2014', '07', '05',
+                                        'mixed-case-category.html'))
+          assert File.exist?(File.join(dest_dir, 'mixedcase', '2014', '07', '05',
+                                        'another-mixed-case-category.html'))
+        end
+
         should "write properly without html extension" do
           post = setup_post("2008-10-18-foo-bar.textile")
           post.site.permalink_style = ":title"
diff --git a/test/test_site.rb b/test/test_site.rb
index a343b1c9e..898a02351 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -212,7 +212,7 @@ class TestSite < Test::Unit::TestCase
 
       posts = Dir[source_dir("**", "_posts", "**", "*")]
       posts.delete_if { |post| File.directory?(post) && !Post.valid?(post) }
-      categories = %w(2013 bar baz category foo z_category publish_test win).sort
+      categories = %w(2013 bar baz category foo z_category MixedCase Mixedcase publish_test win).sort
 
       assert_equal posts.size - @num_invalid_posts, @site.posts.size
       assert_equal categories, @site.categories.keys.sort

From c8d1c3d2640a88cb6fb719f78402c1a7d0eb8836 Mon Sep 17 00:00:00 2001
From: ChaYoung You <yousbe@gmail.com>
Date: Mon, 7 Jul 2014 15:00:22 +0900
Subject: [PATCH 002/407] Remove duplicated mixed case categories

---
 lib/jekyll/post.rb |  2 +-
 test/test_post.rb  | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index b1496de30..4afe82e68 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -218,7 +218,7 @@ module Jekyll
         :title       => slug,
         :i_day       => date.strftime("%-d"),
         :i_month     => date.strftime("%-m"),
-        :categories  => (categories || []).map { |c| c.to_s.downcase }.join('/'),
+        :categories  => (categories || []).map { |c| c.to_s.downcase }.uniq.join('/'),
         :short_month => date.strftime("%b"),
         :short_year  => date.strftime("%y"),
         :y_day       => date.strftime("%j"),
diff --git a/test/test_post.rb b/test/test_post.rb
index 44cc96640..0e6861ce9 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -276,6 +276,19 @@ class TestPost < Test::Unit::TestCase
           end
         end
 
+        context "with duplicated mixed case (categories)" do
+          setup do
+            @post.categories << "MixedCase"
+            @post.categories << "Mixedcase"
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/:categories/:year/:month/:day/:title.html", @post.template
+            assert_equal "/mixedcase/2008/09/09/foo-bar.html", @post.url
+          end
+        end
+
         context "with none style" do
           setup do
             @post.site.permalink_style = :none

From 3b7091aab7ef169ca7d05f45a54cfe750364d21c Mon Sep 17 00:00:00 2001
From: Kamil Dziemianowicz <kamil.dziemianowicz@amberbit.com>
Date: Wed, 20 Aug 2014 00:07:51 +0200
Subject: [PATCH 003/407] Find variables in _config.yaml by searching with
 relative file path.

---
 features/frontmatter_defaults.feature | 26 ++++++++++++++++++++++++--
 lib/jekyll/post.rb                    |  2 +-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/features/frontmatter_defaults.feature b/features/frontmatter_defaults.feature
index 7ac2d0a8e..0d0578e27 100644
--- a/features/frontmatter_defaults.feature
+++ b/features/frontmatter_defaults.feature
@@ -54,6 +54,28 @@ Feature: frontmatter defaults
     And I should see "root: Overview for the webpage" in "_site/index.html"
     And I should see "subfolder: Overview for the special section" in "_site/special/index.html"
 
+  Scenario: Use frontmatter variables by relative path
+    Given I have a _layouts directory
+    And I have a main layout that contains "main: {{ content }}"
+
+    And I have a _posts directory
+    And I have the following post:
+      | title | date       | content                               |
+      | about | 2013-10-14 | content of site/2013/10/14/about.html |
+    And I have a special/_posts directory
+    And I have the following post in "special":
+      | title  | date       | path  | content                                        |
+      | about1 | 2013-10-14 | local | content of site/special/2013/10/14/about1.html |
+      | about2 | 2013-10-14 | local | content of site/special/2013/10/14/about2.html |
+
+    And I have a configuration file with "defaults" set to "[{scope: {path: "special"}, values: {layout: "main"}}, {scope: {path: "special/_posts"}, values: {layout: "main"}}, {scope: {path: "_posts"}, values: {layout: "main"}}]"
+
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "main: <p>content of site/2013/10/14/about.html</p>" in "_site/2013/10/14/about.html"
+    And I should see "main: <p>content of site/special/2013/10/14/about1.html</p>" in "_site/special/2013/10/14/about1.html"
+    And I should see "main: <p>content of site/special/2013/10/14/about2.html</p>" in "_site/special/2013/10/14/about2.html"
+
   Scenario: Override frontmatter defaults by type
     Given I have a _posts directory
     And I have the following post:
@@ -81,7 +103,7 @@ Feature: frontmatter defaults
   Scenario: Use frontmatter defaults in collections
     Given I have a _slides directory
     And I have a "index.html" file that contains "nothing"
-    And I have a "_slides/slide1.html" file with content: 
+    And I have a "_slides/slide1.html" file with content:
     """
     ---
     ---
@@ -107,7 +129,7 @@ Feature: frontmatter defaults
   Scenario: Override frontmatter defaults inside a collection
     Given I have a _slides directory
     And I have a "index.html" file that contains "nothing"
-    And I have a "_slides/slide2.html" file with content: 
+    And I have a "_slides/slide2.html" file with content:
     """
     ---
     myval: Override
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index b13deff8a..3f6b73cdb 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -57,7 +57,7 @@ module Jekyll
       read_yaml(@base, name)
 
       data.default_proc = proc do |hash, key|
-        site.frontmatter_defaults.find(File.join(dir, name), type, key)
+        site.frontmatter_defaults.find(relative_path, type, key)
       end
 
       if data.key?('date')

From 1aa9d6255e81d8057e7d2e2f5d539bf242aab935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Matall=C3=ADn?= <matallo@cartodb.com>
Date: Wed, 20 Aug 2014 22:34:43 +0200
Subject: [PATCH 004/407] Add jekyll-thumbnail-filter to plugins list

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

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 0b62dc851..64ec283e8 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -464,6 +464,7 @@ You can find a few useful plugins at the following locations:
 - [jekyll-humanize](https://github.com/23maverick23/jekyll-humanize): This is a port of the Django app humanize which adds a "human touch" to data. Each method represents a Fluid type filter that can be used in your Jekyll site templates. Given that Jekyll produces static sites, some of the original methods do not make logical sense to port (e.g. naturaltime).
 - [Jekyll-Ordinal](https://github.com/PatrickC8t/Jekyll-Ordinal): Jekyll liquid filter to output a date ordinal such as "st", "nd", "rd", or "th".
 - [Deprecated articles keeper](https://github.com/kzykbys/JekyllPlugins) by [Kazuya Kobayashi](http://blog.kazuya.co/): A simple Jekyll filter which monitor how old an article is.
+- [Jekyll Thumbnail Filter](https://github.com/matallo/jekyll-thumbnail-filter): Related posts thumbnail filter.
 
 #### Tags
 

From 6c0e791236d97830c6580fe93322e4f888567a6c Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Wed, 10 Sep 2014 21:04:40 -0700
Subject: [PATCH 005/407] Use relative path for `path` Liquid variable in
 Documents

---
 lib/jekyll/document.rb | 3 +--
 test/test_document.rb  | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index f4761ef8c..f7eb95693 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -232,8 +232,7 @@ module Jekyll
         Utils.deep_merge_hashes data, {
           "output"        => output,
           "content"       => content,
-          "path"          => path,
-          "relative_path" => relative_path,
+          "path"          => relative_path,
           "url"           => url,
           "collection"    => collection.label
         }
diff --git a/test/test_document.rb b/test/test_document.rb
index 5e26173fd..3e927acd7 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -44,6 +44,10 @@ class TestDocument < Test::Unit::TestCase
       assert_equal @document.to_liquid['collection'], "methods"
     end
 
+    should "output its relative path as path in Liquid" do
+      assert_equal @document.to_liquid['path'], "_methods/configuration.md"
+    end
+
   end
 
   context "a document as part of a collection with frontmatter defaults" do

From c3ec158f2d162f893139445893ac6ef5099c53dc Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Thu, 11 Sep 2014 18:25:21 -0700
Subject: [PATCH 006/407] Keep backwards compatibility

Re-add `relative_path` Liquid variable too keep compatibility
---
 lib/jekyll/document.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index f7eb95693..6fe63c349 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -232,6 +232,7 @@ module Jekyll
         Utils.deep_merge_hashes data, {
           "output"        => output,
           "content"       => content,
+          "relative_path" => relative_path,
           "path"          => relative_path,
           "url"           => url,
           "collection"    => collection.label

From 46e76bde3f052dd3e9ab3cab3d1dfdc0621626d9 Mon Sep 17 00:00:00 2001
From: nitoyon <nitoyon@gmail.com>
Date: Sun, 14 Sep 2014 02:38:37 +0900
Subject: [PATCH 007/407] Add mode parameter to slugify Liquid filter

---
 lib/jekyll/filters.rb | 10 ++++----
 lib/jekyll/utils.rb   | 53 ++++++++++++++++++++++++++++++++++---------
 2 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index d6f0fa035..5cfcf7cb0 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -50,12 +50,12 @@ module Jekyll
     # Slugify a filename or title.
     #
     # input - The filename or title to slugify.
+    # mode - how string is slugified
     #
-    # Returns the given filename or title as a lowercase String, with every
-    # sequence of spaces and non-alphanumeric characters replaced with a
-    # hyphen.
-    def slugify(input)
-      Utils.slugify(input)
+    # Returns the given filename or title as a lowercase URL String.
+    # See Utils.slugify for more detail.
+    def slugify(input, mode=nil)
+      Utils.slugify(input, mode)
     end
 
     # Format a date in short format e.g. "27 Jan 2011".
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index d528f22d2..b0552168f 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -104,19 +104,50 @@ module Jekyll
 
     # Slugify a filename or title.
     #
-    # name - the filename or title to slugify
+    # string - the filename or title to slugify
+    # mode - how string is slugified
     #
-    # Returns the given filename or title in lowercase, with every
-    # sequence of spaces and non-alphanumeric characters replaced with a
-    # hyphen.
-    def slugify(string)
-      unless string.nil?
-        # Replace each non-alphanumeric character sequence with a hyphen
-        slug = string.gsub(/[^a-z0-9]+/i, '-')
-        # Remove leading/trailing hyphen
-        slug.gsub!(/^\-|\-$/i, '')
-        slug.downcase
+    # When mode is "none", return the given string in lowercase.
+    #
+    # When mode is "raw", return the given string in lowercase,
+    # with every sequence of spaces characters replaced with a hyphen.
+    #
+    # When mode is "default" or nil, non-alphabetic characters are
+    # replaced with a hyphen too.
+    #
+    # When mode is "pretty", some non-alphabetic characters (._~!$&'()+,;=@)
+    # are not replaced with hyphen.
+    #
+    # Examples:
+    #   slugify("The _config.yml file")
+    #   # => "the-config-yml-file"
+    #
+    #   slugify("The _config.yml file", "pretty")
+    #   # => "the-_config.yml-file"
+    #
+    # Returns the slugified string.
+    def slugify(string, mode=nil)
+      mode ||= 'default'
+      return nil if string.nil?
+
+      # Replace each character sequence with a hyphen
+      re = case mode
+      when 'raw'
+        Regexp.new('\\s+')
+      when 'default'
+        Regexp.new('[^a-zA-Z0-9]+')
+      when 'pretty'
+        # "._~!$&'()+,;=@" is human readable (not URI-escaped) in URL
+        # and is allowed in both extN and NTFS.
+        Regexp.new("[^a-zA-Z0-9._~!$&'()+,;=@]+")
+      else
+        return string.downcase
       end
+      slug = string.gsub(re, '-')
+
+      # Remove leading/trailing hyphen
+      slug.gsub!(/^\-|\-$/i, '')
+      slug.downcase
     end
 
   end

From 3c5e9f53346d8fbe2ed1e079f9377c603aecf93e Mon Sep 17 00:00:00 2001
From: nitoyon <nitoyon@gmail.com>
Date: Sun, 14 Sep 2014 02:43:17 +0900
Subject: [PATCH 008/407] Add tests for mode parameters of slugify Liquid
 filter

---
 test/test_filters.rb |  4 ++++
 test/test_utils.rb   | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index 35ea6f0b2..a6be08008 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -221,6 +221,10 @@ class TestFilters < Test::Unit::TestCase
       should "return a slugified string" do
         assert_equal "q-bert-says", @filter.slugify(" Q*bert says @!#?@!")
       end
+
+      should "return a slugified string with mode" do
+        assert_equal "q-bert-says-@!-@!", @filter.slugify(" Q*bert says @!#?@!", "pretty")
+      end
     end
 
     context "push filter" do
diff --git a/test/test_utils.rb b/test/test_utils.rb
index ddc8750e4..fc2d9b5d9 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -139,6 +139,26 @@ class TestUtils < Test::Unit::TestCase
       Utils.slugify(title)
       assert_equal "Quick-start guide", title
     end
+
+    should "not change behaviour if mode is default" do
+      assert_equal "the-config-yml-file", Utils.slugify("The _config.yml file?", "default")
+    end
+
+    should "not change behaviour if mode is nil" do
+      assert_equal "the-config-yml-file", Utils.slugify("The _config.yml file?", nil)
+    end
+
+    should "not replace period and underscore if mode is pretty" do
+      assert_equal "the-_config.yml-file", Utils.slugify("The _config.yml file?", "pretty")
+    end
+
+    should "only replace whitespace if mode is raw" do
+      assert_equal "the-_config.yml-file?", Utils.slugify("The _config.yml file?", "raw")
+    end
+
+    should "return the given string if mode is none" do
+      assert_equal "the _config.yml file?", Utils.slugify("The _config.yml file?", "none")
+    end
   end
 
 end

From ae57f693e450dc5d67c042db522b3b1c2fa94e66 Mon Sep 17 00:00:00 2001
From: nitoyon <nitoyon@gmail.com>
Date: Sun, 14 Sep 2014 02:43:25 +0900
Subject: [PATCH 009/407] Document the mode parameter of slugify Liquid filter

---
 site/_docs/templates.md | 20 ++++++++++++++++++--
 site/_sass/_style.scss  |  8 ++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/site/_docs/templates.md b/site/_docs/templates.md
index fbf636269..36a06e4c4 100644
--- a/site/_docs/templates.md
+++ b/site/_docs/templates.md
@@ -214,11 +214,27 @@ common tasks easier.
     <tr>
       <td>
         <p class="name"><strong>Slugify</strong></p>
-        <p>Convert a string into a lowercase URL "slug" by replacing every sequence of spaces and non-alphanumeric characters with a hyphen.</p>
+        <p>Convert a string into a lowercase URL "slug".</p>
+	<p>Optional argument mode specify what characters are replaced with a hyphen. The default value is 'default'.</p>
+	<ul>
+	  <li>'none': no characters</li>
+	  <li>'raw': spaces</li>
+	  <li>'default': spaces and non-alphanumeric characters</li>
+	  <li>'pretty': spaces and non-alphanumeric characters except for <em>._~!$&amp;'()+,;=@</em></li>
+	</ul>
       </td>
       <td class="align-center">
         <p>
-         <code class="filter">{% raw %}{{ page.title | slugify }}{% endraw %}</code>
+         <code class="filter">{% raw %}{{ "The _config.yml file" | slugify }}{% endraw %}</code>
+        </p>
+        <p>
+          <code class="output">the-config-yml-file</code>
+        </p>
+        <p>
+         <code class="filter">{% raw %}{{ "The _config.yml file" | slugify: 'pretty' }}{% endraw %}</code>
+        </p>
+        <p>
+          <code class="output">the-_config.yml-file</code>
         </p>
       </td>
     </tr>
diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss
index 16cc902fb..8f635e3fa 100644
--- a/site/_sass/_style.scss
+++ b/site/_sass/_style.scss
@@ -834,10 +834,14 @@ td {
   padding: .5em .75em;
 }
 
-td p {
+td p, td ul, article td li {
   margin: 0;
 }
 
+td ul {
+  padding: 0 0 0 1.2em;
+}
+
 th {
   text-transform: uppercase;
   font-size: 16px;
@@ -861,7 +865,7 @@ tbody td {
   filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1affffff', endColorstr='#00ffffff',GradientType=0 );
 }
 
-td p {
+td p, td ul {
   font-size: 16px;
 }
 

From f9e249ae20edb1234969092def26b62cbcbfa490 Mon Sep 17 00:00:00 2001
From: Renaud Martinet <renaud.martinet@horoquartz.fr>
Date: Fri, 31 Oct 2014 15:56:03 +0100
Subject: [PATCH 010/407] Generalize Utils#slugify for any scripts

It replaces any non alphanumeric glyphs by an hyphen.
---
 lib/jekyll/utils.rb | 2 +-
 test/test_utils.rb  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 34861593a..fbdcd27be 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -113,7 +113,7 @@ module Jekyll
       unless string.nil?
         string \
           # Replace each non-alphanumeric character sequence with a hyphen
-          .gsub(/[^a-z0-9]+/i, '-') \
+          .gsub(/[^[:alnum:]]+/i, '-') \
           # Remove leading/trailing hyphen
           .gsub(/^\-|\-$/i, '') \
           # Downcase it
diff --git a/test/test_utils.rb b/test/test_utils.rb
index ddc8750e4..6e643856b 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -120,6 +120,7 @@ class TestUtils < Test::Unit::TestCase
 
     should "drop trailing punctuation" do
       assert_equal "so-what-is-jekyll-exactly", Utils.slugify("So what is Jekyll, exactly?")
+      assert_equal "كيف-حالك", Utils.slugify("كيف حالك؟")
     end
 
     should "ignore hyphens" do
@@ -134,6 +135,10 @@ class TestUtils < Test::Unit::TestCase
       assert_equal "customizing-git-git-hooks", Utils.slugify("Customizing Git - Git Hooks")
     end
 
+    should "replace punctuation in any scripts by hyphens" do
+      assert_equal "5時-6時-三-一四", Utils.slugify("5時〜6時 三・一四")
+    end
+
     should "not modify the original string" do
       title = "Quick-start guide"
       Utils.slugify(title)

From d7e3d4df8fae5c70619eba9cfcc1ff83c4aae22e Mon Sep 17 00:00:00 2001
From: David Williamson <david@davidized.com>
Date: Thu, 20 Nov 2014 14:38:17 -0600
Subject: [PATCH 011/407] Add support for collections documents to have YAML
 front matter ending in dots.

---
 lib/jekyll/document.rb                 |  2 +-
 test/source/_methods/yaml_with_dots.md |  8 ++++++++
 test/test_collections.rb               |  1 +
 test/test_document.rb                  | 20 ++++++++++++++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 test/source/_methods/yaml_with_dots.md

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 003c04eb7..babc974a3 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -210,7 +210,7 @@ module Jekyll
             @data = defaults
           end
           @content = File.read(path, merged_file_read_opts(opts))
-          if content =~ /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
+          if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
             @content = $POSTMATCH
             data_file = SafeYAML.load($1)
             unless data_file.nil?
diff --git a/test/source/_methods/yaml_with_dots.md b/test/source/_methods/yaml_with_dots.md
new file mode 100644
index 000000000..eb0b6675b
--- /dev/null
+++ b/test/source/_methods/yaml_with_dots.md
@@ -0,0 +1,8 @@
+---
+title: "YAML with Dots"
+whatever: foo.bar
+...
+
+Use `{{ page.title }}` to build a full configuration for use w/Jekyll.
+
+Whatever: {{ page.whatever }}
diff --git a/test/test_collections.rb b/test/test_collections.rb
index 1975e402c..de4dfa070 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -138,6 +138,7 @@ class TestCollections < Test::Unit::TestCase
           _methods/site/generate.md
           _methods/site/initialize.md
           _methods/um_hi.md
+          _methods/yaml_with_dots.md
         ], doc.relative_path
       end
     end
diff --git a/test/test_document.rb b/test/test_document.rb
index 90c16b823..60a564217 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -44,6 +44,26 @@ class TestDocument < Test::Unit::TestCase
       }, @document.data)
     end
 
+    context "with YAML ending in three dots" do
+
+      setup do
+        @site = Site.new(Jekyll.configuration({
+          "collections" => ["methods"],
+          "source"      => source_dir,
+          "destination" => dest_dir
+        }))
+        @site.process
+        @document = @site.collections["methods"].docs.last
+      end
+
+      should "know its data" do
+        assert_equal({
+          "title" => "YAML with Dots",
+          "whatever" => "foo.bar"
+          }, @document.data)
+      end
+    end
+
     should "output the collection name in the #to_liquid method" do
       assert_equal @document.to_liquid['collection'], "methods"
     end

From 11917645f2159e7c94449e1103237dddee0f42de Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Sat, 15 Nov 2014 22:47:22 -0800
Subject: [PATCH 012/407] Incremental regeneration

---
 lib/jekyll.rb              |  1 +
 lib/jekyll/cleaner.rb      |  9 +++-
 lib/jekyll/command.rb      |  1 +
 lib/jekyll/convertible.rb  |  6 +++
 lib/jekyll/layout.rb       |  4 ++
 lib/jekyll/metadata.rb     | 87 ++++++++++++++++++++++++++++++++++++++
 lib/jekyll/renderer.rb     |  6 +++
 lib/jekyll/site.rb         | 21 +++++++--
 lib/jekyll/tags/include.rb |  9 +++-
 site/.gitignore            |  1 +
 10 files changed, 139 insertions(+), 6 deletions(-)
 create mode 100644 lib/jekyll/metadata.rb

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 03724100b..0a7c2b697 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -48,6 +48,7 @@ module Jekyll
   autoload :Layout,              'jekyll/layout'
   autoload :LayoutReader,        'jekyll/layout_reader'
   autoload :LogAdapter,          'jekyll/log_adapter'
+  autoload :Metadata,            'jekyll/metadata'
   autoload :Page,                'jekyll/page'
   autoload :PluginManager,       'jekyll/plugin_manager'
   autoload :Post,                'jekyll/post'
diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb
index 6dd59ea05..79f97f472 100644
--- a/lib/jekyll/cleaner.rb
+++ b/lib/jekyll/cleaner.rb
@@ -21,7 +21,14 @@ module Jekyll
       #
       # Returns an Array of the file and directory paths
       def obsolete_files
-        (existing_files - new_files - new_dirs + replaced_files).to_a
+        (existing_files - new_files - new_dirs + replaced_files + metadata_file).to_a
+      end
+
+      # Private: The metadata file storing dependency tree and build history
+      #
+      # Returns an Array with the metdata file as the only item
+      def metadata_file
+        [site.metadata.metadata_file]
       end
 
       # Private: The list of existing files, apart from those included in keep_files and hidden files.
diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index a1cc8c013..d463d235a 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -58,6 +58,7 @@ module Jekyll
         c.option 'unpublished', '--unpublished', 'Render posts that were marked as unpublished'
         c.option 'quiet',   '-q', '--quiet', 'Silence output.'
         c.option 'verbose', '-V', '--verbose', 'Print verbose output.'
+        c.option 'clean', '-c', '--clean', 'Clean the site before rebuilding.'
       end
 
     end
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 4b21a66b0..4b1f3761a 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -207,6 +207,12 @@ module Jekyll
                                          info,
                                          File.join(site.config['layouts'], layout.name))
 
+        # Add layout to dependency tree
+        site.metadata.add_dependency(
+          Jekyll.sanitized_path(site.source, path),
+          Jekyll.sanitized_path(site.source, layout.path)
+        )
+
         if layout = layouts[layout.data["layout"]]
           if used.include?(layout)
             layout = nil # avoid recursive chain
diff --git a/lib/jekyll/layout.rb b/lib/jekyll/layout.rb
index 4dde59b66..f973019f6 100644
--- a/lib/jekyll/layout.rb
+++ b/lib/jekyll/layout.rb
@@ -8,6 +8,9 @@ module Jekyll
     # Gets the name of this layout.
     attr_reader :name
 
+    # Gets the path to this layout.
+    attr_reader :path
+
     # Gets/Sets the extension of this layout.
     attr_accessor :ext
 
@@ -26,6 +29,7 @@ module Jekyll
       @site = site
       @base = base
       @name = name
+      @path = Jekyll.sanitized_path(site.source, File.join(base, name))
 
       self.data = {}
 
diff --git a/lib/jekyll/metadata.rb b/lib/jekyll/metadata.rb
new file mode 100644
index 000000000..abda35e59
--- /dev/null
+++ b/lib/jekyll/metadata.rb
@@ -0,0 +1,87 @@
+require 'set'
+
+module Jekyll
+  class Metadata
+    attr_reader :site, :metadata
+
+    def initialize(site)
+      @site = site
+
+      # Initialize metadata store by reading YAML file,
+      # or an empty hash if file does not exist
+      @metadata = (File.file?(metadata_file) && !(site.config['clean'])) ? SafeYAML.load(File.read(metadata_file)) : {}
+
+      # Initialize cache to an empty hash
+      @cache = {}
+    end
+
+    # Add a path to the metadata
+    #
+    # Returns true.
+    def add(path)
+      @metadata[path] = {
+        "mtime" => File.mtime(path),
+        "deps" => []
+      }
+      @cache[path] = true
+    end
+
+    # Force a path to regenerate
+    #
+    # Returns true.
+    def force(path)
+      @cache[path] = true
+    end
+
+    # Checks if a path should be regenerated
+    #
+    # Returns a boolean.
+    def regenerate?(path)
+      # Check for path in cache
+      if @cache.has_key? path
+        return @cache[path]
+      end
+
+      # Check path that exists in metadata
+      if (data = @metadata[path])
+        data["deps"].each do |dependency|
+          if regenerate?(dependency)
+            return @cache[dependency] = @cache[path] = true
+          end
+        end
+        if data["mtime"] == File.mtime(path)
+          return @cache[path] = false
+        else
+          return add(path)
+        end
+      end
+
+      # Path does not exist in metadata, add it
+      return add(path)
+    end
+
+    # Add a dependency of a path
+    #
+    # Returns true.
+    def add_dependency(path, dependency)
+      @metadata[path]["deps"] << dependency unless @metadata[path]["deps"].include? dependency
+      add(dependency)
+    end
+
+    # Write the metadata to disk
+    #
+    # Returns nothing.
+    def write
+      File.open(metadata_file, 'w') do |f|
+        f.write(@metadata.to_yaml)
+      end
+    end
+
+    # Produce the absolute path of the metadata file
+    #
+    # Returns the String path of the file.
+    def metadata_file
+      Jekyll.sanitized_path(site.source, '.jekyll-metadata')
+    end
+  end
+end
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index f88a41874..618393531 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -138,6 +138,12 @@ module Jekyll
           File.join(site.config['layouts'], layout.name)
         )
 
+        # Add layout to dependency tree
+        site.metadata.add_dependency(
+          Jekyll.sanitized_path(site.source, document.path),
+          Jekyll.sanitized_path(site.source, layout.path)
+        )
+
         if layout = site.layouts[layout.data["layout"]]
           if used.include?(layout)
             layout = nil # avoid recursive chain
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 115b41338..38c61661a 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -11,6 +11,7 @@ module Jekyll
                   :gems, :plugin_manager
 
     attr_accessor :converters, :generators
+    attr_accessor :metadata
 
     # Public: Initialize a new Site.
     #
@@ -27,6 +28,9 @@ module Jekyll
       @source              = File.expand_path(config['source']).freeze
       @dest                = File.expand_path(config['destination']).freeze
 
+      # Build metadata
+      @metadata = Metadata.new(self)
+
       self.plugin_manager = Jekyll::PluginManager.new(self)
       self.plugins        = plugin_manager.plugins_path
 
@@ -49,7 +53,7 @@ module Jekyll
       read
       generate
       render
-      cleanup
+      cleanup if config['clean']
       write
     end
 
@@ -289,13 +293,17 @@ module Jekyll
 
       collections.each do |label, collection|
         collection.docs.each do |document|
-          document.output = Jekyll::Renderer.new(self, document).run
+          if @metadata.regenerate?(document.path)
+            document.output = Jekyll::Renderer.new(self, document).run
+          end
         end
       end
 
       payload = site_payload
       [posts, pages].flatten.each do |page_or_post|
-        page_or_post.render(layouts, payload)
+        if @metadata.regenerate?(Jekyll.sanitized_path(source, page_or_post.relative_path))
+          page_or_post.render(layouts, payload)
+        end
       end
     rescue Errno::ENOENT => e
       # ignore missing layout dir
@@ -312,7 +320,12 @@ module Jekyll
     #
     # Returns nothing.
     def write
-      each_site_file { |item| item.write(dest) }
+      each_site_file { |item|
+        if @metadata.regenerate? Jekyll.sanitized_path(source, item.path)
+          item.write(dest)
+        end
+      }
+      @metadata.write
     end
 
     # Construct a Hash of Posts indexed by the specified Post attribute.
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index 3eb4d7c0a..8f7da2ca0 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -105,13 +105,20 @@ eos
       end
 
       def render(context)
+        site = context.registers[:site]
         dir = resolved_includes_dir(context)
 
         file = render_variable(context) || @file
         validate_file_name(file)
 
         path = File.join(dir, file)
-        validate_path(path, dir, context.registers[:site].safe)
+        validate_path(path, dir, site.safe)
+
+        # Add include to dependency tree
+        site.metadata.add_dependency(
+          Jekyll.sanitized_path(site.source, context.registers[:page]["path"]),
+          path
+        )
 
         begin
           partial = Liquid::Template.parse(source(path, context))
diff --git a/site/.gitignore b/site/.gitignore
index 79bd74f74..c1bd964cd 100644
--- a/site/.gitignore
+++ b/site/.gitignore
@@ -2,3 +2,4 @@ _site/
 *.swp
 pkg/
 test/
+.jekyll-metadata

From 842470b0c4d3a1e738d6226cd5800779ffab6870 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Sun, 16 Nov 2014 15:41:58 -0800
Subject: [PATCH 013/407] Refinements

---
 .gitignore                  | 1 +
 lib/jekyll/configuration.rb | 2 +-
 lib/jekyll/metadata.rb      | 4 ++--
 site/.gitignore             | 1 -
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index aa6c14f8e..d9effd5b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ coverage
 .ruby-version
 .sass-cache
 tmp/stackprof-*
+.jekyll-metadata
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 7f1148a65..24e968983 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -17,7 +17,7 @@ module Jekyll
       # Handling Reading
       'safe'          => false,
       'include'       => ['.htaccess'],
-      'exclude'       => [],
+      'exclude'       => ['.jekyll-metadata'],
       'keep_files'    => ['.git','.svn'],
       'encoding'      => 'utf-8',
       'markdown_ext'  => 'markdown,mkdown,mkdn,mkd,md',
diff --git a/lib/jekyll/metadata.rb b/lib/jekyll/metadata.rb
index abda35e59..72cf8d154 100644
--- a/lib/jekyll/metadata.rb
+++ b/lib/jekyll/metadata.rb
@@ -62,10 +62,10 @@ module Jekyll
 
     # Add a dependency of a path
     #
-    # Returns true.
+    # Returns nothing.
     def add_dependency(path, dependency)
       @metadata[path]["deps"] << dependency unless @metadata[path]["deps"].include? dependency
-      add(dependency)
+      regenerate? dependency
     end
 
     # Write the metadata to disk
diff --git a/site/.gitignore b/site/.gitignore
index c1bd964cd..79bd74f74 100644
--- a/site/.gitignore
+++ b/site/.gitignore
@@ -2,4 +2,3 @@ _site/
 *.swp
 pkg/
 test/
-.jekyll-metadata

From d438362971b8a8ceaaa8d5cea6207e7db398aea8 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Sun, 16 Nov 2014 16:04:11 -0800
Subject: [PATCH 014/407] Add regenerate front-matter variable

---
 lib/jekyll/site.rb | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 38c61661a..3894a2ba8 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -293,17 +293,20 @@ module Jekyll
 
       collections.each do |label, collection|
         collection.docs.each do |document|
-          if @metadata.regenerate?(document.path)
-            document.output = Jekyll::Renderer.new(self, document).run
+          document.output = Jekyll::Renderer.new(self, document).run if (
+            @metadata.regenerate?(document.path) ||
+            document.data['regenerate']
+          )
           end
         end
       end
 
       payload = site_payload
       [posts, pages].flatten.each do |page_or_post|
-        if @metadata.regenerate?(Jekyll.sanitized_path(source, page_or_post.relative_path))
-          page_or_post.render(layouts, payload)
-        end
+        page_or_post.render(layouts, payload) if (
+          @metadata.regenerate?(Jekyll.sanitized_path(source, page_or_post.relative_path)) ||
+          page_or_post.data['regenerate']
+        )
       end
     rescue Errno::ENOENT => e
       # ignore missing layout dir
@@ -321,9 +324,10 @@ module Jekyll
     # Returns nothing.
     def write
       each_site_file { |item|
-        if @metadata.regenerate? Jekyll.sanitized_path(source, item.path)
-          item.write(dest)
-        end
+        item.write(dest) if (
+          @metadata.regenerate?(Jekyll.sanitized_path(source, item.path)) ||
+          (item.respond_to?(:data) && item.data['regenerate'])
+        )
       }
       @metadata.write
     end

From fe6bfc6f1b2540dad111153d855a5ec91b2fbf33 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Fri, 21 Nov 2014 21:54:18 -0800
Subject: [PATCH 015/407] Fix failing tests

---
 lib/jekyll/cleaner.rb      |  3 ++-
 lib/jekyll/metadata.rb     | 15 ++++++++++++---
 lib/jekyll/renderer.rb     |  2 +-
 lib/jekyll/site.rb         |  5 ++---
 lib/jekyll/tags/include.rb | 10 ++++++----
 test/helper.rb             |  1 +
 test/test_document.rb      |  3 ++-
 test/test_site.rb          | 15 +++++++++++----
 8 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb
index 79f97f472..e7ee44a0c 100644
--- a/lib/jekyll/cleaner.rb
+++ b/lib/jekyll/cleaner.rb
@@ -13,6 +13,7 @@ module Jekyll
       # Cleans up the site's destination directory
       def cleanup!
         FileUtils.rm_rf(obsolete_files)
+        FileUtils.rm_rf(metadata_file) if @site.config["clean"]
       end
 
       private
@@ -21,7 +22,7 @@ module Jekyll
       #
       # Returns an Array of the file and directory paths
       def obsolete_files
-        (existing_files - new_files - new_dirs + replaced_files + metadata_file).to_a
+        (existing_files - new_files - new_dirs + replaced_files).to_a
       end
 
       # Private: The metadata file storing dependency tree and build history
diff --git a/lib/jekyll/metadata.rb b/lib/jekyll/metadata.rb
index 72cf8d154..275ee9da0 100644
--- a/lib/jekyll/metadata.rb
+++ b/lib/jekyll/metadata.rb
@@ -33,10 +33,18 @@ module Jekyll
       @cache[path] = true
     end
 
+    # Clear the metadata and cache
+    #
+    # Returns nothing
+    def clear
+      @metadata = {}
+      @cache = {}
+    end
+
     # Checks if a path should be regenerated
     #
     # Returns a boolean.
-    def regenerate?(path)
+    def regenerate?(path, add = true)
       # Check for path in cache
       if @cache.has_key? path
         return @cache[path]
@@ -52,18 +60,19 @@ module Jekyll
         if data["mtime"] == File.mtime(path)
           return @cache[path] = false
         else
-          return add(path)
+          return !add || add(path)
         end
       end
 
       # Path does not exist in metadata, add it
-      return add(path)
+      return !add || add(path)
     end
 
     # Add a dependency of a path
     #
     # Returns nothing.
     def add_dependency(path, dependency)
+      add(path) if @metadata[path].nil?
       @metadata[path]["deps"] << dependency unless @metadata[path]["deps"].include? dependency
       regenerate? dependency
     end
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index 618393531..d2dd095fd 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -142,7 +142,7 @@ module Jekyll
         site.metadata.add_dependency(
           Jekyll.sanitized_path(site.source, document.path),
           Jekyll.sanitized_path(site.source, layout.path)
-        )
+        ) if document.write?
 
         if layout = site.layouts[layout.data["layout"]]
           if used.include?(layout)
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 3894a2ba8..f00e24c9b 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -53,7 +53,7 @@ module Jekyll
       read
       generate
       render
-      cleanup if config['clean']
+      cleanup
       write
     end
 
@@ -294,10 +294,9 @@ module Jekyll
       collections.each do |label, collection|
         collection.docs.each do |document|
           document.output = Jekyll::Renderer.new(self, document).run if (
-            @metadata.regenerate?(document.path) ||
+            @metadata.regenerate?(document.path, document.write?) ||
             document.data['regenerate']
           )
-          end
         end
       end
 
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index 8f7da2ca0..49e7357e4 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -115,10 +115,12 @@ eos
         validate_path(path, dir, site.safe)
 
         # Add include to dependency tree
-        site.metadata.add_dependency(
-          Jekyll.sanitized_path(site.source, context.registers[:page]["path"]),
-          path
-        )
+        if context.registers[:page] and context.registers[:page].has_key? "path"
+          site.metadata.add_dependency(
+            Jekyll.sanitized_path(site.source, context.registers[:page]["path"]),
+            path
+          )
+        end
 
         begin
           partial = Liquid::Template.parse(source(path, context))
diff --git a/test/helper.rb b/test/helper.rb
index ea3777ed8..58d9e24a1 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -46,6 +46,7 @@ class Test::Unit::TestCase
 
   def clear_dest
     FileUtils.rm_rf(dest_dir)
+    FileUtils.rm_rf(source_dir('.jekyll-metadata'))
   end
 
   def test_dir(*subdirs)
diff --git a/test/test_document.rb b/test/test_document.rb
index 90c16b823..cf6c2cbfc 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -246,7 +246,8 @@ class TestDocument < Test::Unit::TestCase
           }
         },
         "source"      => source_dir,
-        "destination" => dest_dir
+        "destination" => dest_dir,
+        "clean"       => true
       }))
       @site.process
       @document = @site.collections["slides"].files.find { |doc| doc.relative_path == "_slides/octojekyll.png" }
diff --git a/test/test_site.rb b/test/test_site.rb
index 4b8409e7d..2fd6ad363 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -99,6 +99,7 @@ class TestSite < Test::Unit::TestCase
     should "write only modified static files" do
       clear_dest
       StaticFile.reset_cache
+      @site.metadata.clear
 
       @site.process
       some_static_file = @site.static_files[0].path
@@ -128,6 +129,7 @@ class TestSite < Test::Unit::TestCase
     should "write static files if not modified but missing in destination" do
       clear_dest
       StaticFile.reset_cache
+      @site.metadata.clear
 
       @site.process
       some_static_file = @site.static_files[0].path
@@ -241,6 +243,7 @@ class TestSite < Test::Unit::TestCase
     context 'with orphaned files in destination' do
       setup do
         clear_dest
+        @site.metadata.clear
         @site.process
         # generate some orphaned files:
         # single file
@@ -328,7 +331,7 @@ class TestSite < Test::Unit::TestCase
         end
 
         bad_processor = "Custom::Markdown"
-        s = Site.new(site_configuration('markdown' => bad_processor))
+        s = Site.new(site_configuration('markdown' => bad_processor, 'clean' => true))
         assert_raise Jekyll::Errors::FatalException do
           s.process
         end
@@ -348,7 +351,7 @@ class TestSite < Test::Unit::TestCase
 
       should 'throw FatalException at process time' do
         bad_processor = 'not a processor name'
-        s = Site.new(site_configuration('markdown' => bad_processor))
+        s = Site.new(site_configuration('markdown' => bad_processor, 'clean' => true))
         assert_raise Jekyll::Errors::FatalException do
           s.process
         end
@@ -418,7 +421,9 @@ class TestSite < Test::Unit::TestCase
 
     context "manipulating the Jekyll environment" do
       setup do
-        @site = Site.new(site_configuration)
+        @site = Site.new(site_configuration({
+          "clean" => true
+        }))
         @site.process
         @page = @site.pages.find { |p| p.name == "environment.html" }
       end
@@ -430,7 +435,9 @@ class TestSite < Test::Unit::TestCase
       context "in production" do
         setup do
           ENV["JEKYLL_ENV"] = "production"
-          @site = Site.new(site_configuration)
+          @site = Site.new(site_configuration({
+            "clean" => true
+          }))
           @site.process
           @page = @site.pages.find { |p| p.name == "environment.html" }
         end

From ac03af3229777ddd3fbfb43a646339789e32850a Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Fri, 21 Nov 2014 22:10:08 -0800
Subject: [PATCH 016/407] Implement @mattr-'s suggestions

---
 lib/jekyll/cleaner.rb       |  2 +-
 lib/jekyll/command.rb       |  2 +-
 lib/jekyll/configuration.rb |  2 +-
 lib/jekyll/metadata.rb      | 15 ++++++++++++---
 lib/jekyll/site.rb          |  8 ++++----
 test/test_document.rb       |  2 +-
 test/test_site.rb           |  8 ++++----
 7 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb
index e7ee44a0c..00191db79 100644
--- a/lib/jekyll/cleaner.rb
+++ b/lib/jekyll/cleaner.rb
@@ -13,7 +13,7 @@ module Jekyll
       # Cleans up the site's destination directory
       def cleanup!
         FileUtils.rm_rf(obsolete_files)
-        FileUtils.rm_rf(metadata_file) if @site.config["clean"]
+        FileUtils.rm_rf(metadata_file) if @site.config["full_rebuild"]
       end
 
       private
diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index d463d235a..423c32020 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -58,7 +58,7 @@ module Jekyll
         c.option 'unpublished', '--unpublished', 'Render posts that were marked as unpublished'
         c.option 'quiet',   '-q', '--quiet', 'Silence output.'
         c.option 'verbose', '-V', '--verbose', 'Print verbose output.'
-        c.option 'clean', '-c', '--clean', 'Clean the site before rebuilding.'
+        c.option 'full_rebuild', '-f', '--full-rebuild', 'Clean the site before rebuilding.'
       end
 
     end
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 24e968983..7f1148a65 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -17,7 +17,7 @@ module Jekyll
       # Handling Reading
       'safe'          => false,
       'include'       => ['.htaccess'],
-      'exclude'       => ['.jekyll-metadata'],
+      'exclude'       => [],
       'keep_files'    => ['.git','.svn'],
       'encoding'      => 'utf-8',
       'markdown_ext'  => 'markdown,mkdown,mkdn,mkd,md',
diff --git a/lib/jekyll/metadata.rb b/lib/jekyll/metadata.rb
index 275ee9da0..2012afc6f 100644
--- a/lib/jekyll/metadata.rb
+++ b/lib/jekyll/metadata.rb
@@ -7,9 +7,8 @@ module Jekyll
     def initialize(site)
       @site = site
 
-      # Initialize metadata store by reading YAML file,
-      # or an empty hash if file does not exist
-      @metadata = (File.file?(metadata_file) && !(site.config['clean'])) ? SafeYAML.load(File.read(metadata_file)) : {}
+      # Read metadata from file
+      read_metadata
 
       # Initialize cache to an empty hash
       @cache = {}
@@ -92,5 +91,15 @@ module Jekyll
     def metadata_file
       Jekyll.sanitized_path(site.source, '.jekyll-metadata')
     end
+
+    private
+
+    # Read metadata from the metadata file, if no file is found,
+    # initialize with an empty hash
+    #
+    # Returns the read metadata.
+    def read_metadata
+      @metadata = (File.file?(metadata_file) && !(site.config['full_rebuild'])) ? SafeYAML.load(File.read(metadata_file)) : {}
+    end
   end
 end
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index f00e24c9b..738cae0ef 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -294,7 +294,7 @@ module Jekyll
       collections.each do |label, collection|
         collection.docs.each do |document|
           document.output = Jekyll::Renderer.new(self, document).run if (
-            @metadata.regenerate?(document.path, document.write?) ||
+            metadata.regenerate?(document.path, document.write?) ||
             document.data['regenerate']
           )
         end
@@ -303,7 +303,7 @@ module Jekyll
       payload = site_payload
       [posts, pages].flatten.each do |page_or_post|
         page_or_post.render(layouts, payload) if (
-          @metadata.regenerate?(Jekyll.sanitized_path(source, page_or_post.relative_path)) ||
+          metadata.regenerate?(Jekyll.sanitized_path(source, page_or_post.relative_path)) ||
           page_or_post.data['regenerate']
         )
       end
@@ -324,11 +324,11 @@ module Jekyll
     def write
       each_site_file { |item|
         item.write(dest) if (
-          @metadata.regenerate?(Jekyll.sanitized_path(source, item.path)) ||
+          metadata.regenerate?(Jekyll.sanitized_path(source, item.path)) ||
           (item.respond_to?(:data) && item.data['regenerate'])
         )
       }
-      @metadata.write
+      metadata.write
     end
 
     # Construct a Hash of Posts indexed by the specified Post attribute.
diff --git a/test/test_document.rb b/test/test_document.rb
index cf6c2cbfc..2ff688ba2 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -247,7 +247,7 @@ class TestDocument < Test::Unit::TestCase
         },
         "source"      => source_dir,
         "destination" => dest_dir,
-        "clean"       => true
+        "full_rebuild"       => true
       }))
       @site.process
       @document = @site.collections["slides"].files.find { |doc| doc.relative_path == "_slides/octojekyll.png" }
diff --git a/test/test_site.rb b/test/test_site.rb
index 2fd6ad363..a6ef5af8e 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -331,7 +331,7 @@ class TestSite < Test::Unit::TestCase
         end
 
         bad_processor = "Custom::Markdown"
-        s = Site.new(site_configuration('markdown' => bad_processor, 'clean' => true))
+        s = Site.new(site_configuration('markdown' => bad_processor, 'full_rebuild' => true))
         assert_raise Jekyll::Errors::FatalException do
           s.process
         end
@@ -351,7 +351,7 @@ class TestSite < Test::Unit::TestCase
 
       should 'throw FatalException at process time' do
         bad_processor = 'not a processor name'
-        s = Site.new(site_configuration('markdown' => bad_processor, 'clean' => true))
+        s = Site.new(site_configuration('markdown' => bad_processor, 'full_rebuild' => true))
         assert_raise Jekyll::Errors::FatalException do
           s.process
         end
@@ -422,7 +422,7 @@ class TestSite < Test::Unit::TestCase
     context "manipulating the Jekyll environment" do
       setup do
         @site = Site.new(site_configuration({
-          "clean" => true
+          'full_rebuild' => true
         }))
         @site.process
         @page = @site.pages.find { |p| p.name == "environment.html" }
@@ -436,7 +436,7 @@ class TestSite < Test::Unit::TestCase
         setup do
           ENV["JEKYLL_ENV"] = "production"
           @site = Site.new(site_configuration({
-            "clean" => true
+            'full_rebuild' => true
           }))
           @site.process
           @page = @site.pages.find { |p| p.name == "environment.html" }

From 4acf343fea062e26def0cdef77c45a596a1a30ca Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Sun, 23 Nov 2014 12:51:19 -0800
Subject: [PATCH 017/407] Add clean command

---
 lib/jekyll/commands/clean.rb | 42 ++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 lib/jekyll/commands/clean.rb

diff --git a/lib/jekyll/commands/clean.rb b/lib/jekyll/commands/clean.rb
new file mode 100644
index 000000000..7d787d301
--- /dev/null
+++ b/lib/jekyll/commands/clean.rb
@@ -0,0 +1,42 @@
+module Jekyll
+  module Commands
+    class Clean < Command
+      class << self
+
+        def init_with_program(prog)
+          prog.command(:clean) do |c|
+            c.syntax 'clean [subcommand]'
+            c.description 'Clean the site (removes site output and metadata file) without building.'
+
+            c.action do |args, _|
+              Jekyll::Commands::Clean.process({})
+            end
+          end
+        end
+
+        def process(options)
+          options = configuration_from_options(options)
+          destination = options['destination']
+          metadata_file = File.join(options['source'], '.jekyll-metadata')
+
+          if File.directory? destination
+            Jekyll.logger.info "Cleaning #{destination}..."
+            FileUtils.rm_rf(destination)
+            Jekyll.logger.info "", "done."
+          else
+            Jekyll.logger.info "Nothing to do for #{destination}."
+          end
+
+          if File.file? metadata_file
+            Jekyll.logger.info "Removing #{metadata_file}..."
+            FileUtils.rm_rf(metadata_file)
+            Jekyll.logger.info "", "done."
+          else
+            Jekyll.logger.info "Nothing to do for #{metadata_file}."
+          end
+        end
+
+      end
+    end
+  end
+end

From 75c5c162979b7cd729131e682b4ac7a299ca9067 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Sun, 23 Nov 2014 14:06:29 -0800
Subject: [PATCH 018/407] Handle path overrides

---
 lib/jekyll/metadata.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/metadata.rb b/lib/jekyll/metadata.rb
index 2012afc6f..68a31a050 100644
--- a/lib/jekyll/metadata.rb
+++ b/lib/jekyll/metadata.rb
@@ -16,8 +16,10 @@ module Jekyll
 
     # Add a path to the metadata
     #
-    # Returns true.
+    # Returns true, also on failure.
     def add(path)
+      return true if not File.exist? path
+
       @metadata[path] = {
         "mtime" => File.mtime(path),
         "deps" => []
@@ -71,7 +73,8 @@ module Jekyll
     #
     # Returns nothing.
     def add_dependency(path, dependency)
-      add(path) if @metadata[path].nil?
+      return if @metadata[path].nil?
+
       @metadata[path]["deps"] << dependency unless @metadata[path]["deps"].include? dependency
       regenerate? dependency
     end

From 2a5cf11ee27c0faeda1009d6a8099882230038fc Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Sun, 23 Nov 2014 15:38:00 -0800
Subject: [PATCH 019/407] Add --no-metadata option

---
 lib/jekyll/command.rb  |  1 +
 lib/jekyll/metadata.rb | 10 ++++++++--
 lib/jekyll/site.rb     |  2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index 423c32020..658ce5975 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -59,6 +59,7 @@ module Jekyll
         c.option 'quiet',   '-q', '--quiet', 'Silence output.'
         c.option 'verbose', '-V', '--verbose', 'Print verbose output.'
         c.option 'full_rebuild', '-f', '--full-rebuild', 'Clean the site before rebuilding.'
+        c.option 'no_metadata', '--no-metadata', 'Disable incremental regeneration.'
       end
 
     end
diff --git a/lib/jekyll/metadata.rb b/lib/jekyll/metadata.rb
index 68a31a050..3e242d694 100644
--- a/lib/jekyll/metadata.rb
+++ b/lib/jekyll/metadata.rb
@@ -46,6 +46,8 @@ module Jekyll
     #
     # Returns a boolean.
     def regenerate?(path, add = true)
+      return true if site.config['no_metadata']
+
       # Check for path in cache
       if @cache.has_key? path
         return @cache[path]
@@ -73,7 +75,7 @@ module Jekyll
     #
     # Returns nothing.
     def add_dependency(path, dependency)
-      return if @metadata[path].nil?
+      return if (@metadata[path].nil? || site.config['no_metadata'])
 
       @metadata[path]["deps"] << dependency unless @metadata[path]["deps"].include? dependency
       regenerate? dependency
@@ -102,7 +104,11 @@ module Jekyll
     #
     # Returns the read metadata.
     def read_metadata
-      @metadata = (File.file?(metadata_file) && !(site.config['full_rebuild'])) ? SafeYAML.load(File.read(metadata_file)) : {}
+      @metadata = if !(site.config['full_rebuild'] || site.config['no_metadata']) && File.file?(metadata_file)
+        SafeYAML.load(File.read(metadata_file))
+      else
+        {}
+      end
     end
   end
 end
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 738cae0ef..69f11a75d 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -328,7 +328,7 @@ module Jekyll
           (item.respond_to?(:data) && item.data['regenerate'])
         )
       }
-      metadata.write
+      metadata.write unless site.config['no_metadata']
     end
 
     # Construct a Hash of Posts indexed by the specified Post attribute.

From dc30114605bd4c8f121a02e3d4b1aa5e700fde22 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Sun, 23 Nov 2014 15:45:49 -0800
Subject: [PATCH 020/407] Use site.in_source_dir

---
 lib/jekyll.rb              |  1 +
 lib/jekyll/convertible.rb  | 12 +++++++++--
 lib/jekyll/document.rb     |  8 ++++++++
 lib/jekyll/layout.rb       |  2 +-
 lib/jekyll/metadata.rb     | 42 ++++++++++++++++++++------------------
 lib/jekyll/renderer.rb     |  4 ++--
 lib/jekyll/site.rb         | 19 +++++------------
 lib/jekyll/static_file.rb  |  2 ++
 lib/jekyll/tags/include.rb |  2 +-
 test/test_document.rb      |  6 +++---
 10 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 0a7c2b697..911b3ddbf 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -21,6 +21,7 @@ require 'time'
 require 'English'
 require 'pathname'
 require 'logger'
+require 'set'
 
 # 3rd party
 require 'safe_yaml/load'
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 4b1f3761a..2c0d240ea 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -168,6 +168,14 @@ module Jekyll
       true
     end
 
+    # Determine whether to regenerate the file based on metadata.
+    #
+    # Returns true if file needs to be regenerated
+    def regenerate?
+      site.metadata.regenerate?(site.in_source_dir(relative_path)) ||
+        data['regenerate']
+    end
+
     # Determine whether the file should be placed into layouts.
     #
     # Returns false if the document is an asset file.
@@ -209,8 +217,8 @@ module Jekyll
 
         # Add layout to dependency tree
         site.metadata.add_dependency(
-          Jekyll.sanitized_path(site.source, path),
-          Jekyll.sanitized_path(site.source, layout.path)
+          site.in_source_dir(path),
+          site.in_source_dir(layout.path)
         )
 
         if layout = layouts[layout.data["layout"]]
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 003c04eb7..356ce3977 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -105,6 +105,14 @@ module Jekyll
       !(coffeescript_file? || yaml_file?)
     end
 
+    # Determine whether the document should be regenerated based on metadata.
+    #
+    # Returns true if the document needs to be regenerated.
+    def regenerate?
+      site.metadata.regenerate?(path, write?) ||
+        data['regenerate']
+    end
+
     # Determine whether the file should be placed into layouts.
     #
     # Returns false if the document is either an asset file or a yaml file,
diff --git a/lib/jekyll/layout.rb b/lib/jekyll/layout.rb
index f973019f6..c29f353fa 100644
--- a/lib/jekyll/layout.rb
+++ b/lib/jekyll/layout.rb
@@ -29,7 +29,7 @@ module Jekyll
       @site = site
       @base = base
       @name = name
-      @path = Jekyll.sanitized_path(site.source, File.join(base, name))
+      @path = site.in_source_dir(base, name)
 
       self.data = {}
 
diff --git a/lib/jekyll/metadata.rb b/lib/jekyll/metadata.rb
index 3e242d694..6a31eb258 100644
--- a/lib/jekyll/metadata.rb
+++ b/lib/jekyll/metadata.rb
@@ -1,12 +1,14 @@
-require 'set'
-
 module Jekyll
   class Metadata
-    attr_reader :site, :metadata
+    attr_reader :site, :metadata, :cache
 
     def initialize(site)
       @site = site
 
+      # Configuration options
+      @full_rebuild = site.config['full_rebuild']
+      @disabled = site.config['no_metadata']
+
       # Read metadata from file
       read_metadata
 
@@ -20,48 +22,48 @@ module Jekyll
     def add(path)
       return true if not File.exist? path
 
-      @metadata[path] = {
+      metadata[path] = {
         "mtime" => File.mtime(path),
         "deps" => []
       }
-      @cache[path] = true
+      cache[path] = true
     end
 
     # Force a path to regenerate
     #
     # Returns true.
     def force(path)
-      @cache[path] = true
+      cache[path] = true
     end
 
     # Clear the metadata and cache
     #
     # Returns nothing
     def clear
-      @metadata = {}
-      @cache = {}
+      metadata = {}
+      cache = {}
     end
 
     # Checks if a path should be regenerated
     #
     # Returns a boolean.
     def regenerate?(path, add = true)
-      return true if site.config['no_metadata']
+      return true if @disabled
 
       # Check for path in cache
-      if @cache.has_key? path
-        return @cache[path]
+      if cache.has_key? path
+        return cache[path]
       end
 
       # Check path that exists in metadata
-      if (data = @metadata[path])
+      if data = metadata[path]
         data["deps"].each do |dependency|
           if regenerate?(dependency)
-            return @cache[dependency] = @cache[path] = true
+            return cache[dependency] = cache[path] = true
           end
         end
-        if data["mtime"] == File.mtime(path)
-          return @cache[path] = false
+        if data["mtime"].eql? File.mtime(path)
+          return cache[path] = false
         else
           return !add || add(path)
         end
@@ -75,9 +77,9 @@ module Jekyll
     #
     # Returns nothing.
     def add_dependency(path, dependency)
-      return if (@metadata[path].nil? || site.config['no_metadata'])
+      return if (metadata[path].nil? || @disabled)
 
-      @metadata[path]["deps"] << dependency unless @metadata[path]["deps"].include? dependency
+      metadata[path]["deps"] << dependency unless metadata[path]["deps"].include? dependency
       regenerate? dependency
     end
 
@@ -86,7 +88,7 @@ module Jekyll
     # Returns nothing.
     def write
       File.open(metadata_file, 'w') do |f|
-        f.write(@metadata.to_yaml)
+        f.write(metadata.to_yaml)
       end
     end
 
@@ -94,7 +96,7 @@ module Jekyll
     #
     # Returns the String path of the file.
     def metadata_file
-      Jekyll.sanitized_path(site.source, '.jekyll-metadata')
+      site.in_source_dir('.jekyll-metadata')
     end
 
     private
@@ -104,7 +106,7 @@ module Jekyll
     #
     # Returns the read metadata.
     def read_metadata
-      @metadata = if !(site.config['full_rebuild'] || site.config['no_metadata']) && File.file?(metadata_file)
+      @metadata = if !(@full_rebuild || @disabled) && File.file?(metadata_file)
         SafeYAML.load(File.read(metadata_file))
       else
         {}
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index d2dd095fd..1cdf6c2aa 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -140,8 +140,8 @@ module Jekyll
 
         # Add layout to dependency tree
         site.metadata.add_dependency(
-          Jekyll.sanitized_path(site.source, document.path),
-          Jekyll.sanitized_path(site.source, layout.path)
+          site.in_source_dir(document.path),
+          site.in_source_dir(layout.path)
         ) if document.write?
 
         if layout = site.layouts[layout.data["layout"]]
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 69f11a75d..eaf4c3cd1 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -11,7 +11,7 @@ module Jekyll
                   :gems, :plugin_manager
 
     attr_accessor :converters, :generators
-    attr_accessor :metadata
+    attr_reader   :metadata
 
     # Public: Initialize a new Site.
     #
@@ -293,19 +293,13 @@ module Jekyll
 
       collections.each do |label, collection|
         collection.docs.each do |document|
-          document.output = Jekyll::Renderer.new(self, document).run if (
-            metadata.regenerate?(document.path, document.write?) ||
-            document.data['regenerate']
-          )
+          document.output = Jekyll::Renderer.new(self, document).run if document.regenerate?
         end
       end
 
       payload = site_payload
       [posts, pages].flatten.each do |page_or_post|
-        page_or_post.render(layouts, payload) if (
-          metadata.regenerate?(Jekyll.sanitized_path(source, page_or_post.relative_path)) ||
-          page_or_post.data['regenerate']
-        )
+        page_or_post.render(layouts, payload) if page_or_post.regenerate?
       end
     rescue Errno::ENOENT => e
       # ignore missing layout dir
@@ -323,12 +317,9 @@ module Jekyll
     # Returns nothing.
     def write
       each_site_file { |item|
-        item.write(dest) if (
-          metadata.regenerate?(Jekyll.sanitized_path(source, item.path)) ||
-          (item.respond_to?(:data) && item.data['regenerate'])
-        )
+        item.write(dest) if item.regenerate?
       }
-      metadata.write unless site.config['no_metadata']
+      metadata.write unless config['no_metadata']
     end
 
     # Construct a Hash of Posts indexed by the specified Post attribute.
diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index eae85b54c..8e1006562 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -67,6 +67,8 @@ module Jekyll
       true
     end
 
+    alias_method :regenerate?, :write?
+
     # Write the static file to the destination directory (if modified).
     #
     # dest - The String path to the destination dir.
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index 49e7357e4..16da6f499 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -117,7 +117,7 @@ eos
         # Add include to dependency tree
         if context.registers[:page] and context.registers[:page].has_key? "path"
           site.metadata.add_dependency(
-            Jekyll.sanitized_path(site.source, context.registers[:page]["path"]),
+            site.in_source_dir(context.registers[:page]["path"]),
             path
           )
         end
diff --git a/test/test_document.rb b/test/test_document.rb
index 2ff688ba2..57c14c223 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -245,9 +245,9 @@ class TestDocument < Test::Unit::TestCase
             "output" => true
           }
         },
-        "source"      => source_dir,
-        "destination" => dest_dir,
-        "full_rebuild"       => true
+        "source"       => source_dir,
+        "destination"  => dest_dir,
+        "full_rebuild" => true
       }))
       @site.process
       @document = @site.collections["slides"].files.find { |doc| doc.relative_path == "_slides/octojekyll.png" }

From 8a257aca6b40adc73e22909ffff0ee6e1a4818d0 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Wed, 26 Nov 2014 20:15:02 -0800
Subject: [PATCH 021/407] Implement more suggestions

---
 lib/jekyll/command.rb  |  3 +--
 lib/jekyll/metadata.rb | 19 ++++++++++++-------
 lib/jekyll/site.rb     |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index 658ce5975..12fd66e66 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -58,8 +58,7 @@ module Jekyll
         c.option 'unpublished', '--unpublished', 'Render posts that were marked as unpublished'
         c.option 'quiet',   '-q', '--quiet', 'Silence output.'
         c.option 'verbose', '-V', '--verbose', 'Print verbose output.'
-        c.option 'full_rebuild', '-f', '--full-rebuild', 'Clean the site before rebuilding.'
-        c.option 'no_metadata', '--no-metadata', 'Disable incremental regeneration.'
+        c.option 'full_rebuild', '-f', '--full-rebuild', 'Disable incremental rebuild.'
       end
 
     end
diff --git a/lib/jekyll/metadata.rb b/lib/jekyll/metadata.rb
index 6a31eb258..de9731d46 100644
--- a/lib/jekyll/metadata.rb
+++ b/lib/jekyll/metadata.rb
@@ -5,10 +5,6 @@ module Jekyll
     def initialize(site)
       @site = site
 
-      # Configuration options
-      @full_rebuild = site.config['full_rebuild']
-      @disabled = site.config['no_metadata']
-
       # Read metadata from file
       read_metadata
 
@@ -48,7 +44,7 @@ module Jekyll
     #
     # Returns a boolean.
     def regenerate?(path, add = true)
-      return true if @disabled
+      return true if disabled?
 
       # Check for path in cache
       if cache.has_key? path
@@ -56,7 +52,8 @@ module Jekyll
       end
 
       # Check path that exists in metadata
-      if data = metadata[path]
+      data = metadata[path]
+      if data
         data["deps"].each do |dependency|
           if regenerate?(dependency)
             return cache[dependency] = cache[path] = true
@@ -99,6 +96,14 @@ module Jekyll
       site.in_source_dir('.jekyll-metadata')
     end
 
+    # Check if metadata has been disabled
+    #
+    # Returns a Boolean (true for disabled, false for enabled).
+    def disabled?
+      @disabled = site.config['full_rebuild'] if @disabled.nil?
+      @disabled
+    end
+
     private
 
     # Read metadata from the metadata file, if no file is found,
@@ -106,7 +111,7 @@ module Jekyll
     #
     # Returns the read metadata.
     def read_metadata
-      @metadata = if !(@full_rebuild || @disabled) && File.file?(metadata_file)
+      @metadata = if !disabled? && File.file?(metadata_file)
         SafeYAML.load(File.read(metadata_file))
       else
         {}
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index eaf4c3cd1..4b8518c2b 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -319,7 +319,7 @@ module Jekyll
       each_site_file { |item|
         item.write(dest) if item.regenerate?
       }
-      metadata.write unless config['no_metadata']
+      metadata.write unless config['full_rebuild']
     end
 
     # Construct a Hash of Posts indexed by the specified Post attribute.

From 02f281eef3ead61af68f38b439eec1f859a2f2ad Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Wed, 26 Nov 2014 21:15:53 -0800
Subject: [PATCH 022/407] Add unit and cucumber tests

---
 features/incremental_rebuild.feature      | 60 +++++++++++++++++++++++
 features/step_definitions/jekyll_steps.rb |  4 ++
 lib/jekyll/metadata.rb                    |  4 +-
 test/test_metadata.rb                     | 38 ++++++++++++++
 4 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 features/incremental_rebuild.feature
 create mode 100644 test/test_metadata.rb

diff --git a/features/incremental_rebuild.feature b/features/incremental_rebuild.feature
new file mode 100644
index 000000000..08739d3ef
--- /dev/null
+++ b/features/incremental_rebuild.feature
@@ -0,0 +1,60 @@
+Feature: Incremental rebuild
+  As an impatient hacker who likes to blog
+  I want to be able to make a static site
+  Without waiting too long for it to build
+
+  Scenario: Produce correct output site
+    Given I have a _layouts directory
+    And I have a _posts directory
+    And I have the following posts:
+      | title    | date       | layout  | content                               |
+      | Wargames | 2009-03-27 | default | The only winning move is not to play. |
+    And I have a default layout that contains "Post Layout: {{ content }}"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Post Layout: <p>The only winning move is not to play.</p>" in "_site/2009/03/27/wargames.html"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Post Layout: <p>The only winning move is not to play.</p>" in "_site/2009/03/27/wargames.html"
+
+  Scenario: Generate a metadata file
+    Given I have an "index.html" file that contains "Basic Site"
+    When I run jekyll build
+    Then the ".jekyll-metadata" file should exist
+
+  Scenario: Rebuild when content is changed
+    Given I have an "index.html" file that contains "Basic Site"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Basic Site" in "_site/index.html"
+    When I wait 1 second
+    Then I have an "index.html" file that contains "Bacon Site"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Bacon Site" in "_site/index.html"
+
+  Scenario: Rebuild when layout is changed
+    Given I have a _layouts directory
+    And I have an "index.html" page with layout "default" that contains "Basic Site with Layout"
+    And I have a default layout that contains "Page Layout: {{ content }}"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Page Layout: Basic Site with Layout" in "_site/index.html"
+    When I wait 1 second
+    Then I have a default layout that contains "Page Layout Changed: {{ content }}"
+    When I run jekyll build --full-rebuild
+    Then the _site directory should exist
+    And I should see "Page Layout Changed: Basic Site with Layout" in "_site/index.html"
+
+  Scenario: Rebuild when an include is changed
+    Given I have a _includes directory
+    And I have an "index.html" page that contains "Basic Site with include tag: {% include about.textile %}"
+    And I have an "_includes/about.textile" file that contains "Generated by Jekyll"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"
+    When I wait 1 second
+    Then I have an "_includes/about.textile" file that contains "Regenerated by Jekyll"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Basic Site with include tag: Regenerated by Jekyll" in "_site/index.html"
diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index b75379f51..069f93b0f 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -133,6 +133,10 @@ Given /^I have fixture collections$/ do
   FileUtils.cp_r File.join(JEKYLL_SOURCE_DIR, "test", "source", "_methods"), source_dir
 end
 
+Given /^I wait (\d+) second(s?)$/ do |time, plural|
+  sleep(time.to_f)
+end
+
 ##################
 #
 # Changing stuff
diff --git a/lib/jekyll/metadata.rb b/lib/jekyll/metadata.rb
index de9731d46..97fc0bf55 100644
--- a/lib/jekyll/metadata.rb
+++ b/lib/jekyll/metadata.rb
@@ -36,8 +36,8 @@ module Jekyll
     #
     # Returns nothing
     def clear
-      metadata = {}
-      cache = {}
+      @metadata = {}
+      @cache = {}
     end
 
     # Checks if a path should be regenerated
diff --git a/test/test_metadata.rb b/test/test_metadata.rb
new file mode 100644
index 000000000..dcc3a6011
--- /dev/null
+++ b/test/test_metadata.rb
@@ -0,0 +1,38 @@
+require 'helper'
+
+class TestMetadata < Test::Unit::TestCase
+  context "The site metadata" do
+    setup do
+      FileUtils.rm_rf(source_dir(".jekyll-metadata"))
+
+      @site = Site.new(Jekyll.configuration({
+        "source" => source_dir,
+        "destination" => dest_dir
+      }))
+
+      @site.process
+      @path = @site.in_source_dir(@site.pages.first.path)
+      @metadata = @site.metadata
+    end
+
+    should "store modification times" do
+      assert_equal @metadata.metadata[@path]["mtime"], File.mtime(@path)
+    end
+
+    should "cache processed entries" do
+      assert @metadata.cache[@path]
+    end
+
+    should "write to the metadata file" do
+      @metadata.clear
+      @metadata.add(@path)
+      @metadata.write
+      assert File.file?(source_dir(".jekyll-metadata"))
+    end
+
+    should "read from the metadata file" do
+      @metadata = Metadata.new(@site)
+      assert_equal @metadata.metadata[@path]["mtime"], File.mtime(@path)
+    end
+  end
+end

From 229303bbc8cea179737403fc8465db3c21100879 Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Thu, 27 Nov 2014 04:01:25 -0600
Subject: [PATCH 023/407] compare resulting data in jsonify test

---
 test/test_filters.rb | 66 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 61 insertions(+), 5 deletions(-)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index d46d93520..a9fc951db 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -160,14 +160,70 @@ class TestFilters < Test::Unit::TestCase
       end
 
       should "call #to_liquid " do
-        expected = "[{\"name\":\"Jeremiah\",\"v\":1,\"thing\":[{\"kay\":\"jewelers\"}],\"stuff\":true},{\"name\":\"Smathers\",\"v\":1,\"thing\":[{\"kay\":\"jewelers\"}],\"stuff\":true}]"
-        assert_equal expected, @filter.jsonify([T.new("Jeremiah"), T.new("Smathers")])
+        expected = [
+          {
+            "name"  => "Jeremiah",
+            "v"     => 1,
+            "thing" => [
+              {
+                "kay" => "jewelers"
+              }
+            ],
+            "stuff" => true
+          },
+          {
+            "name"  => "Smathers",
+            "v"     => 1,
+            "thing" => [
+              {
+                "kay" => "jewelers"
+              }
+            ],
+            "stuff" => true
+          }
+        ]
+        result = @filter.jsonify([T.new("Jeremiah"), T.new("Smathers")])
+        assert_equal expected, JSON.parse(result)
       end
 
       should "handle hashes with all sorts of weird keys and values" do
-        my_hash = { "posts" => Array.new(5) { |i| T.new(i) } }
-        expected = "{\"posts\":[{\"name\":0,\"v\":1,\"thing\":[{\"kay\":\"jewelers\"}],\"stuff\":true},{\"name\":1,\"v\":1,\"thing\":[{\"kay\":\"jewelers\"}],\"stuff\":true},{\"name\":2,\"v\":1,\"thing\":[{\"kay\":\"jewelers\"}],\"stuff\":true},{\"name\":3,\"v\":1,\"thing\":[{\"kay\":\"jewelers\"}],\"stuff\":true},{\"name\":4,\"v\":1,\"thing\":[{\"kay\":\"jewelers\"}],\"stuff\":true}]}"
-        assert_equal expected, @filter.jsonify(my_hash)
+        my_hash = { "posts" => Array.new(3) { |i| T.new(i) } }
+        expected = {
+          "posts" => [
+            {
+              "name"  => 0,
+              "v"     => 1,
+              "thing" => [
+                {
+                  "kay" => "jewelers"
+                }
+              ],
+              "stuff" => true
+            },
+            {
+              "name"  => 1,
+              "v"     => 1,
+              "thing" => [
+                {
+                  "kay" => "jewelers"
+                }
+              ],
+              "stuff" => true
+            },
+            {
+              "name"  => 2,
+              "v"     => 1,
+              "thing" => [
+                {
+                  "kay" => "jewelers"
+                }
+              ],
+              "stuff" => true
+            }
+          ]
+        }
+        result = @filter.jsonify(my_hash)
+        assert_equal expected, JSON.parse(result)
       end
     end
 

From 87d08ec827f035f5d57cb86818a0280962b22846 Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Thu, 27 Nov 2014 04:16:29 -0600
Subject: [PATCH 024/407] refactor #as_liquid

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

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 2e4a11748..fc0907a96 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -328,14 +328,23 @@ module Jekyll
 
     def as_liquid(item)
       case item
-      when String, Numeric, true, false, nil
-        item.to_liquid
       when Hash
-        Hash[item.map { |k, v| [as_liquid(k), as_liquid(v)] }]
+        pairs = item.map { |k, v| as_liquid([k, v]) }
+        Hash[pairs]
       when Array
         item.map{ |i| as_liquid(i) }
-      else
-        item.respond_to?(:to_liquid) ? as_liquid(item.to_liquid) : item
+      else # simple type
+        if item.respond_to?(:to_liquid)
+          liquidated = item.to_liquid
+          # prevent infinite recursion
+          if liquidated == item
+            item
+          else
+            as_liquid(liquidated)
+          end
+        else
+          item
+        end
       end
     end
   end

From 4776b27ff363fe2e7406be77f5f2f061ee8ecb8f Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Thu, 27 Nov 2014 04:20:05 -0600
Subject: [PATCH 025/407] reduce nesting of #as_liquid

---
 lib/jekyll/filters.rb | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index fc0907a96..e147c93e7 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -327,24 +327,21 @@ module Jekyll
     end
 
     def as_liquid(item)
-      case item
-      when Hash
+      if item.class == Hash
         pairs = item.map { |k, v| as_liquid([k, v]) }
         Hash[pairs]
-      when Array
+      elsif item.class == Array
         item.map{ |i| as_liquid(i) }
-      else # simple type
-        if item.respond_to?(:to_liquid)
-          liquidated = item.to_liquid
-          # prevent infinite recursion
-          if liquidated == item
-            item
-          else
-            as_liquid(liquidated)
-          end
-        else
+      elsif item.respond_to?(:to_liquid)
+        liquidated = item.to_liquid
+        # prevent infinite recursion for simple types (which return `self`)
+        if liquidated == item
           item
+        else
+          as_liquid(liquidated)
         end
+      else
+        item
       end
     end
   end

From b6d81c58df04991fc4b1f8eeaa46a23cb3af6be5 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Thu, 27 Nov 2014 10:00:29 -0800
Subject: [PATCH 026/407] Perform less expensive operation first

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

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 2c0d240ea..d6ddfde65 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -172,8 +172,7 @@ module Jekyll
     #
     # Returns true if file needs to be regenerated
     def regenerate?
-      site.metadata.regenerate?(site.in_source_dir(relative_path)) ||
-        data['regenerate']
+      data['regenerate'] || site.metadata.regenerate?(site.in_source_dir(relative_path))
     end
 
     # Determine whether the file should be placed into layouts.
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 356ce3977..5b1b79ab6 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -109,8 +109,7 @@ module Jekyll
     #
     # Returns true if the document needs to be regenerated.
     def regenerate?
-      site.metadata.regenerate?(path, write?) ||
-        data['regenerate']
+      data['regenerate'] || site.metadata.regenerate?(path, write?)
     end
 
     # Determine whether the file should be placed into layouts.

From a701e59c070338677a27a5801cfa3d4feb12977c Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Thu, 27 Nov 2014 10:40:31 -0800
Subject: [PATCH 027/407] Add lots more unit tests

---
 test/test_metadata.rb | 106 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 104 insertions(+), 2 deletions(-)

diff --git a/test/test_metadata.rb b/test/test_metadata.rb
index dcc3a6011..858b166ac 100644
--- a/test/test_metadata.rb
+++ b/test/test_metadata.rb
@@ -16,7 +16,7 @@ class TestMetadata < Test::Unit::TestCase
     end
 
     should "store modification times" do
-      assert_equal @metadata.metadata[@path]["mtime"], File.mtime(@path)
+      assert_equal File.mtime(@path), @metadata.metadata[@path]["mtime"]
     end
 
     should "cache processed entries" do
@@ -32,7 +32,109 @@ class TestMetadata < Test::Unit::TestCase
 
     should "read from the metadata file" do
       @metadata = Metadata.new(@site)
-      assert_equal @metadata.metadata[@path]["mtime"], File.mtime(@path)
+      assert_equal File.mtime(@path), @metadata.metadata[@path]["mtime"]
+    end
+
+    # Methods
+
+    should "be able to add a path to the metadata" do
+      @metadata.clear
+      @metadata.add(@path)
+      assert_equal File.mtime(@path), @metadata.metadata[@path]["mtime"]
+      assert_equal [], @metadata.metadata[@path]["deps"]
+      assert @metadata.cache[@path]
+    end
+
+    should "return true on nonexistent path" do
+      @metadata.clear
+      assert @metadata.add("/bogus/path.md")
+      assert @metadata.regenerate?("/bogus/path.md")
+    end
+
+    should "be able to force a path to regenerate" do
+      @metadata.clear
+      @metadata.force(@path)
+      assert @metadata.cache[@path]
+      assert @metadata.regenerate?(@path)
+    end
+
+    should "be able to clear metadata and cache" do
+      @metadata.clear
+      @metadata.add(@path)
+      assert_equal 1, @metadata.metadata.length
+      assert_equal 1, @metadata.cache.length
+      @metadata.clear
+      assert_equal 0, @metadata.metadata.length
+      assert_equal 0, @metadata.cache.length
+    end
+
+    should "not regenerate a path if it is not modified" do
+      @metadata.clear
+      @metadata.add(@path)
+      @metadata.write
+      @metadata = Metadata.new(@site)
+
+      assert !@metadata.regenerate?(@path)
+    end
+
+    should "not regenerate if path in cache is false" do
+      @metadata.clear
+      @metadata.add(@path)
+      @metadata.write
+      @metadata = Metadata.new(@site)
+
+      assert !@metadata.regenerate?(@path)
+      assert !@metadata.cache[@path]
+      assert !@metadata.regenerate?(@path)
+    end
+
+    should "regenerate if path in not in metadata" do
+      @metadata.clear
+      @metadata.add(@path)
+
+      assert @metadata.regenerate?(@path)
+    end
+
+    should "regenerate if path in cache is true" do
+      @metadata.clear
+      @metadata.add(@path)
+
+      assert @metadata.regenerate?(@path)
+      assert @metadata.cache[@path]
+      assert @metadata.regenerate?(@path)
+    end
+
+    should "regenerate if file is modified" do
+      @metadata.clear
+      @metadata.add(@path)
+      @metadata.metadata[@path]["mtime"] = Time.at(0)
+      @metadata.write
+      @metadata = Metadata.new(@site)
+
+      assert_not_same File.mtime(@path), @metadata.metadata[@path]["mtime"]
+      assert @metadata.regenerate?(@path)
+    end
+
+    should "regenerate if dependency is modified" do
+      @metadata.clear
+      @metadata.add(@path)
+      @metadata.write
+      @metadata = Metadata.new(@site)
+
+      @metadata.add_dependency(@path, "new.dependency")
+      assert_equal ["new.dependency"], @metadata.metadata[@path]["deps"]
+      assert @metadata.regenerate?("new.dependency")
+      assert @metadata.regenerate?(@path)
+    end
+
+    should "regenerate everything if metadata is disabled" do
+      @site.config["full_rebuild"] = true
+      @metadata.clear
+      @metadata.add(@path)
+      @metadata.write
+      @metadata = Metadata.new(@site)
+
+      assert @metadata.regenerate?(@path)
     end
   end
 end

From d0e12d69bc73346c156039e569b3d54d2e6ed806 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Fri, 28 Nov 2014 14:05:40 -0800
Subject: [PATCH 028/407] Last few revisions

---
 lib/jekyll/cleaner.rb       | 2 +-
 lib/jekyll/configuration.rb | 1 +
 lib/jekyll/metadata.rb      | 4 ++--
 lib/jekyll/site.rb          | 9 ++++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb
index 00191db79..bc5bd155f 100644
--- a/lib/jekyll/cleaner.rb
+++ b/lib/jekyll/cleaner.rb
@@ -13,7 +13,7 @@ module Jekyll
       # Cleans up the site's destination directory
       def cleanup!
         FileUtils.rm_rf(obsolete_files)
-        FileUtils.rm_rf(metadata_file) if @site.config["full_rebuild"]
+        FileUtils.rm_rf(metadata_file) if @site.full_rebuild?
       end
 
       private
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 7f1148a65..c64f3a898 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -22,6 +22,7 @@ module Jekyll
       'encoding'      => 'utf-8',
       'markdown_ext'  => 'markdown,mkdown,mkdn,mkd,md',
       'textile_ext'   => 'textile',
+      'full_rebuild'  => false,
 
       # Filtering Content
       'show_drafts'   => nil,
diff --git a/lib/jekyll/metadata.rb b/lib/jekyll/metadata.rb
index 97fc0bf55..953dd7c0d 100644
--- a/lib/jekyll/metadata.rb
+++ b/lib/jekyll/metadata.rb
@@ -16,7 +16,7 @@ module Jekyll
     #
     # Returns true, also on failure.
     def add(path)
-      return true if not File.exist? path
+      return true unless File.exist?(path)
 
       metadata[path] = {
         "mtime" => File.mtime(path),
@@ -100,7 +100,7 @@ module Jekyll
     #
     # Returns a Boolean (true for disabled, false for enabled).
     def disabled?
-      @disabled = site.config['full_rebuild'] if @disabled.nil?
+      @disabled = site.full_rebuild? if @disabled.nil?
       @disabled
     end
 
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 4b8518c2b..7b8a4a00a 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -319,7 +319,7 @@ module Jekyll
       each_site_file { |item|
         item.write(dest) if item.regenerate?
       }
-      metadata.write unless config['full_rebuild']
+      metadata.write unless full_rebuild?
     end
 
     # Construct a Hash of Posts indexed by the specified Post attribute.
@@ -490,6 +490,13 @@ module Jekyll
       @frontmatter_defaults ||= FrontmatterDefaults.new(self)
     end
 
+    # Whether to perform a full rebuild without metadata
+    #
+    # Returns a Boolean: true for a full rebuild, false for normal build
+    def full_rebuild?(override = {})
+      override['full_rebuild'] || config['full_rebuild']
+    end
+
     private
 
     def has_relative_page?

From f8af94431d30fabb3d5df95434f329da85d1eb78 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Tue, 2 Dec 2014 20:50:39 -0600
Subject: [PATCH 029/407] Fix coverage reporting for built-in bundles

---
 test/helper.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/helper.rb b/test/helper.rb
index ea3777ed8..4b1fa7f8f 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,6 +1,9 @@
 require 'simplecov'
 require 'simplecov-gem-adapter'
-SimpleCov.start('gem')
+SimpleCov.start('gem') do
+  add_filter "/vendor/bundle"
+  add_filter "/vendor/gem"
+end
 
 require 'rubygems'
 require 'test/unit'

From 52f0b36558e97712f5f0107fbc3b9fe6ac475c32 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Thu, 4 Dec 2014 20:09:49 -0800
Subject: [PATCH 030/407] Add incremental rebuild info to build command output

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

diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb
index de2343287..11f1f75e4 100644
--- a/lib/jekyll/commands/build.rb
+++ b/lib/jekyll/commands/build.rb
@@ -50,8 +50,10 @@ module Jekyll
         def build(site, options)
           source      = options['source']
           destination = options['destination']
+          full_build  = options['full_rebuild']
           Jekyll.logger.info "Source:", source
           Jekyll.logger.info "Destination:", destination
+          Jekyll.logger.info "Incremental build:", (full_build ? "disabled" : "enabled")
           Jekyll.logger.info "Generating..."
           process_site(site)
           Jekyll.logger.info "", "done."

From f80dc07f82fcf5d17eeed32430d523912c462a75 Mon Sep 17 00:00:00 2001
From: Jordan Thornquest <me@jordanthornquest.com>
Date: Thu, 4 Dec 2014 21:54:02 -0700
Subject: [PATCH 031/407] add link to tutorial on building dynamic navbars

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

diff --git a/site/_docs/resources.md b/site/_docs/resources.md
index cc95d0664..d4ca29a01 100644
--- a/site/_docs/resources.md
+++ b/site/_docs/resources.md
@@ -44,3 +44,4 @@ 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)
+- [Using Jekyll’s Data Files to build a dynamic navbar](http://www.jordanthornque.st/blog/building-dynamic-navbars-with-jekyll/)

From 9b6eeba81ec990ff145b30811b144875bd83e532 Mon Sep 17 00:00:00 2001
From: robschia <robschia@gmail.com>
Date: Sat, 6 Dec 2014 00:32:05 +0100
Subject: [PATCH 032/407] Added basic microdata

---
 lib/site_template/_layouts/post.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/site_template/_layouts/post.html b/lib/site_template/_layouts/post.html
index a2b4e52fe..deeeb1f0a 100644
--- a/lib/site_template/_layouts/post.html
+++ b/lib/site_template/_layouts/post.html
@@ -1,14 +1,14 @@
 ---
 layout: default
 ---
-<div class="post">
+<div class="post"  itemscope itemtype="http://schema.org/BlogPosting">>
 
   <header class="post-header">
-    <h1 class="post-title">{{ page.title }}</h1>
-    <p class="post-meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
+    <h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>
+    <p class="post-meta"><time datetime="{{ page.date | %Y-%m-%d }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time>{% if page.author %} • <span itemprop="author name" itemscope itemtype="http://schema.org/Person">{{ page.author }}</span>{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
   </header>
 
-  <article class="post-content">
+  <article class="post-content" itemprop="articleBody">
     {{ content }}
   </article>
 

From ed9cc80ff94889b9ee2ee461c1df647d06a719d7 Mon Sep 17 00:00:00 2001
From: robschia <robschia@gmail.com>
Date: Sat, 6 Dec 2014 00:49:04 +0100
Subject: [PATCH 033/407] Update post.html

---
 lib/site_template/_layouts/post.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/site_template/_layouts/post.html b/lib/site_template/_layouts/post.html
index deeeb1f0a..ed4a98b16 100644
--- a/lib/site_template/_layouts/post.html
+++ b/lib/site_template/_layouts/post.html
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-<div class="post"  itemscope itemtype="http://schema.org/BlogPosting">>
+<div class="post"  itemscope itemtype="http://schema.org/BlogPosting">
 
   <header class="post-header">
     <h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>

From 5d9662f80f2aba39158cd26ea00216f4877e79a8 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Fri, 5 Dec 2014 19:07:18 -0800
Subject: [PATCH 034/407] Always regenerate asset files

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

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index d6ddfde65..ada0fb8e6 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -172,7 +172,9 @@ module Jekyll
     #
     # Returns true if file needs to be regenerated
     def regenerate?
-      data['regenerate'] || site.metadata.regenerate?(site.in_source_dir(relative_path))
+      asset_file? ||
+      data['regenerate'] ||
+      site.metadata.regenerate?(site.in_source_dir(relative_path))
     end
 
     # Determine whether the file should be placed into layouts.

From 43a28aed967b66de87e2a539ca92c5cb93ce9b66 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Fri, 5 Dec 2014 19:38:43 -0800
Subject: [PATCH 035/407] Fix indentation

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

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index ada0fb8e6..eb96dd35c 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -173,8 +173,8 @@ module Jekyll
     # Returns true if file needs to be regenerated
     def regenerate?
       asset_file? ||
-      data['regenerate'] ||
-      site.metadata.regenerate?(site.in_source_dir(relative_path))
+        data['regenerate'] ||
+        site.metadata.regenerate?(site.in_source_dir(relative_path))
     end
 
     # Determine whether the file should be placed into layouts.

From 6deed4c66bc24fce350e1b0717e1055c6146437b Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 7 Dec 2014 15:38:45 -0800
Subject: [PATCH 036/407] Update history to reflect merge of #3180 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 225e60004..6210a20a5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -13,6 +13,8 @@
 
 ### Development Fixes
 
+  * Exclude built-in bundles from being added to coverage report (#3180)
+
 ### Site Enhancements
 
   * Document the `-q` option for the `build` and `serve` commands (#3149)

From 032139bd2f428e87f48ebe6c67f263144224343d Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 7 Dec 2014 16:08:16 -0800
Subject: [PATCH 037/407] Ensure only one converter is found for .Rmd in the
 tests. Ref: #3147.

---
 test/test_post.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/test_post.rb b/test/test_post.rb
index 65eaaf92c..2592b9185 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -680,8 +680,9 @@ class TestPost < Test::Unit::TestCase
     should "process .Rmd under text if it is not in the markdown config" do
       @site.config['markdown_ext'] = 'markdown,mkd,md,text'
       post = setup_post '2014-11-24-Rmd-extension.Rmd'
+      assert_equal 1, post.converters.size
       conv = post.converters.first
-      assert conv.kind_of? Jekyll::Converters::Identity
+      assert conv.kind_of?(Jekyll::Converters::Identity), "The converter for .Rmd should be the Identity converter."
     end
 
     should "process .text as textile under alternate configuration" do

From e80469b7b01ed55144f9762fe4db52d2f35217c1 Mon Sep 17 00:00:00 2001
From: Joel Glovier <jglovier@github.com>
Date: Mon, 8 Dec 2014 10:08:13 -0500
Subject: [PATCH 038/407] add in page nav to troubleshooting file

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

diff --git a/site/_docs/troubleshooting.md b/site/_docs/troubleshooting.md
index 14023094c..4bb12be83 100644
--- a/site/_docs/troubleshooting.md
+++ b/site/_docs/troubleshooting.md
@@ -11,6 +11,12 @@ that might be of help. If the problem you’re experiencing isn’t covered belo
 please [report an issue]({{site.help_url}}/issues/new) so the
 Jekyll community can make everyone’s experience better.
 
+- [Installation Problems](#installation-problems)
+- [Problems running Jekyll](#problems-running-jekyll)
+- [Base-URL Problems](#base-url-problems)
+- [Configuration problems](#configuration-problems)
+- [Markup Problems](#markup-problems)
+
 ## Installation Problems
 
 If you encounter errors during gem installation, you may need to install

From 1694f8609c98ee2810316726ef13b13888dad820 Mon Sep 17 00:00:00 2001
From: Joel Glovier <jglovier@github.com>
Date: Mon, 8 Dec 2014 10:08:54 -0500
Subject: [PATCH 039/407] update site dir readme

Add some helpful info to the readme.
---
 site/README    |  1 -
 site/README.md | 11 +++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 delete mode 100644 site/README
 create mode 100644 site/README.md

diff --git a/site/README b/site/README
deleted file mode 100644
index 60b411cb6..000000000
--- a/site/README
+++ /dev/null
@@ -1 +0,0 @@
-Jekyll's awesome website.
diff --git a/site/README.md b/site/README.md
new file mode 100644
index 000000000..4e195caba
--- /dev/null
+++ b/site/README.md
@@ -0,0 +1,11 @@
+# Jekyll docs site
+
+This directory contains the code for the Jekyll docs site, [jekyllrb.com](http://jekyllrb.com/).
+
+## Contributing
+
+For information about contributing, see the [Contributing page](http://jekyllrb.com/docs/contributing/).
+
+## Running locally
+
+You can preview your contributions before opening a pull request by running `jekyll serve` from within the directory. It's just a jekyll site, afterall! :wink:
\ No newline at end of file

From 12651c19e558b795f5b6fd3349f4987f471bb375 Mon Sep 17 00:00:00 2001
From: Joel Glovier <jglovier@github.com>
Date: Mon, 8 Dec 2014 10:15:25 -0500
Subject: [PATCH 040/407] further clarify local dev steps

---
 site/README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/site/README.md b/site/README.md
index 4e195caba..df643719b 100644
--- a/site/README.md
+++ b/site/README.md
@@ -8,4 +8,8 @@ For information about contributing, see the [Contributing page](http://jekyllrb.
 
 ## Running locally
 
-You can preview your contributions before opening a pull request by running `jekyll serve` from within the directory. It's just a jekyll site, afterall! :wink:
\ No newline at end of file
+You can preview your contributions before opening a pull request by running from within the directory:
+1. `bundle install`
+2. `jekyll serve`
+
+It's just a jekyll site, afterall! :wink:
\ No newline at end of file

From 59acdaab9a5270d8e97deaefb38ee185c8a19f4a Mon Sep 17 00:00:00 2001
From: robschia <robschia@gmail.com>
Date: Mon, 8 Dec 2014 19:46:49 +0100
Subject: [PATCH 041/407] Fixed itemprop="author name"

You are right, I tried to oversimplify it. Also, {{ page.date | %Y-%m-%d }} doesn't output what I expected. I think it's fixed now, I tried the code with a couple of validators and everything seems fine.
---
 lib/site_template/_layouts/post.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/site_template/_layouts/post.html b/lib/site_template/_layouts/post.html
index ed4a98b16..5a072b3ef 100644
--- a/lib/site_template/_layouts/post.html
+++ b/lib/site_template/_layouts/post.html
@@ -5,7 +5,7 @@ layout: default
 
   <header class="post-header">
     <h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>
-    <p class="post-meta"><time datetime="{{ page.date | %Y-%m-%d }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time>{% if page.author %} • <span itemprop="author name" itemscope itemtype="http://schema.org/Person">{{ page.author }}</span>{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
+    <p class="post-meta"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time>{% if page.author %} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
   </header>
 
   <article class="post-content" itemprop="articleBody">

From b735170ceb0a7b4b748f57f9af07bb0c826e7ed7 Mon Sep 17 00:00:00 2001
From: Mehdi Sadeghi <sadeghi@mehdix.org>
Date: Tue, 9 Dec 2014 12:44:50 +0100
Subject: [PATCH 042/407] Jekyll-jalali plugin added to the plugins list.

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

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index a684bca54..c760fcfa9 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -533,6 +533,7 @@ You can find a few useful plugins at the following locations:
 - [jekyll-humanize](https://github.com/23maverick23/jekyll-humanize): This is a port of the Django app humanize which adds a "human touch" to data. Each method represents a Fluid type filter that can be used in your Jekyll site templates. Given that Jekyll produces static sites, some of the original methods do not make logical sense to port (e.g. naturaltime).
 - [Jekyll-Ordinal](https://github.com/PatrickC8t/Jekyll-Ordinal): Jekyll liquid filter to output a date ordinal such as "st", "nd", "rd", or "th".
 - [Deprecated articles keeper](https://github.com/kzykbys/JekyllPlugins) by [Kazuya Kobayashi](http://blog.kazuya.co/): A simple Jekyll filter which monitor how old an article is.
+- [Jekyll-jalali](https://github.com/mehdisadeghi/jekyll-jalali) by [Mehdi Sadeghi](http://mehdix.ir): A simple Gregorian to Jalali date converter filter.
 
 #### Tags
 

From 383a0d0aa79405605ffb4638e85249778f6232a7 Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gmail.com>
Date: Tue, 9 Dec 2014 07:42:00 -0500
Subject: [PATCH 043/407] modify as_liquid to use case statement

---
 lib/jekyll/filters.rb | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index e147c93e7..f92c02b11 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -327,21 +327,24 @@ module Jekyll
     end
 
     def as_liquid(item)
-      if item.class == Hash
+      case item
+      when Hash
         pairs = item.map { |k, v| as_liquid([k, v]) }
         Hash[pairs]
-      elsif item.class == Array
+      when Array
         item.map{ |i| as_liquid(i) }
-      elsif item.respond_to?(:to_liquid)
-        liquidated = item.to_liquid
-        # prevent infinite recursion for simple types (which return `self`)
-        if liquidated == item
-          item
-        else
-          as_liquid(liquidated)
-        end
       else
-        item
+        if item.respond_to?(:to_liquid)
+          liquidated = item.to_liquid
+          # prevent infinite recursion for simple types (which return `self`)
+          if liquidated == item
+            item
+          else
+            as_liquid(liquidated)
+          end
+        else
+          item
+        end
       end
     end
   end

From 360412364ebe8ded02e3133598cc27c2d89d7921 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 9 Dec 2014 10:51:11 -0800
Subject: [PATCH 044/407] Update history to reflect merge of #3158 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6210a20a5..172a2358d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -10,6 +10,7 @@
   * Fix `jsonify` Liquid filter handling of boolean values (#3154)
   * Add comma to value of `viewport` meta tag (#3170)
   * Set the link type for the RSS feed to `application/rss+xml` (#3176)
+  * Refactor `#as_liquid` (#3158)
 
 ### Development Fixes
 

From 7656b9d2958492875fed92af62f1d08c82c9a09e Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 9 Dec 2014 10:55:08 -0800
Subject: [PATCH 045/407] Update history to reflect merge of #3198 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 172a2358d..a06c9b8a4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -24,6 +24,7 @@
   * Repeat warning about cleaning of the `destination` directory (#3161)
   * Add jekyll-500px-embed to list of third-party plugins (#3163)
   * Simplified platform detection in Gemfile example for Windows (#3177)
+  * Add the `jekyll-jalali` plugin added to the list of third-party plugins. (#3198)
 
 ## 2.5.2 / 2014-11-17
 

From f7891685220877be5e1073e35475319047d788b0 Mon Sep 17 00:00:00 2001
From: Joel Glovier <jglovier@github.com>
Date: Tue, 9 Dec 2014 20:45:01 -0500
Subject: [PATCH 046/407] use rake instructions instead

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

diff --git a/site/README.md b/site/README.md
index df643719b..d98f6db7d 100644
--- a/site/README.md
+++ b/site/README.md
@@ -10,6 +10,6 @@ For information about contributing, see the [Contributing page](http://jekyllrb.
 
 You can preview your contributions before opening a pull request by running from within the directory:
 1. `bundle install`
-2. `jekyll serve`
+2. `bundle exec rake site:preview`
 
 It's just a jekyll site, afterall! :wink:
\ No newline at end of file

From 5343fc3b544c5a0dfa785228888fcb8c15fb0de6 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 9 Dec 2014 18:10:02 -0800
Subject: [PATCH 047/407] Update history to reflect merge of #3196 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a06c9b8a4..e06a3c15b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Add jekyll-500px-embed to list of third-party plugins (#3163)
   * Simplified platform detection in Gemfile example for Windows (#3177)
   * Add the `jekyll-jalali` plugin added to the list of third-party plugins. (#3198)
+  * Add Table of Contents to Troubleshooting page (#3196)
 
 ## 2.5.2 / 2014-11-17
 

From a069ad77c0b56bab861666d3e1c2811e1eac137b Mon Sep 17 00:00:00 2001
From: Benjamin Esham <benjamin@bdesham.info>
Date: Sun, 14 Dec 2014 15:36:59 -0500
Subject: [PATCH 048/407] Add link to inline_highlight plugin

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

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 95f57fb9c..33319bc9f 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -582,6 +582,7 @@ You can find a few useful plugins at the following locations:
 - [mathml.rb](https://github.com/tmthrgd/jekyll-plugins) by [Tom Thorogood](http://tomthorogood.co.uk/): A plugin to convert TeX mathematics into MathML for display.
 - [webmention_io.rb](https://github.com/aarongustafson/jekyll-webmention_io) by [Aaron Gustafson](http://aaron-gustafson.com/): A plugin to enable [webmention](http://indiewebcamp.com/webmention) integration using [Webmention.io](http://webmention.io). Includes an optional JavaScript for updating webmentions automatically between publishes and, if available, in realtime using WebSockets.
 - [Jekyll 500px Embed](https://github.com/lkorth/jekyll-500px-embed) by [Luke Korth](https://lukekorth.com/). A Liquid tag plugin that embeds [500px](https://500px.com/) photos.
+- [inline\_highlight](https://github.com/bdesham/inline_highlight): A tag for inline syntax highlighting.
 
 #### Collections
 

From 63ed3354639d65a7ea128dcb7b37f48a46c5c664 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 17 Dec 2014 19:00:57 -0800
Subject: [PATCH 049/407] Update history to reflect merge of #3212 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e06a3c15b..98ae4fe46 100644
--- a/History.markdown
+++ b/History.markdown
@@ -26,6 +26,7 @@
   * Simplified platform detection in Gemfile example for Windows (#3177)
   * Add the `jekyll-jalali` plugin added to the list of third-party plugins. (#3198)
   * Add Table of Contents to Troubleshooting page (#3196)
+  * Add `inline_highlight` plugin to list of third-party plugins (#3212)
 
 ## 2.5.2 / 2014-11-17
 

From 68a7ebf2eeae5248853cb9ef0256cc5c6d794272 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 17 Dec 2014 11:27:20 -0800
Subject: [PATCH 050/407] Add @alfredxing to the @jekyll/core team.

---
 ...12-17-alfredxing-welcome-to-jekyll-core.md | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 site/_posts/2014-12-17-alfredxing-welcome-to-jekyll-core.md

diff --git a/site/_posts/2014-12-17-alfredxing-welcome-to-jekyll-core.md b/site/_posts/2014-12-17-alfredxing-welcome-to-jekyll-core.md
new file mode 100644
index 000000000..6d62c655e
--- /dev/null
+++ b/site/_posts/2014-12-17-alfredxing-welcome-to-jekyll-core.md
@@ -0,0 +1,27 @@
+---
+layout: news_item
+title: 'Alfred Xing has joined the Jekyll core team'
+date: 2014-12-17 11:16:21 -0800
+author: parkr
+version: alfredxing
+categories: [team]
+---
+
+We're excited to announce that [@alfredxing][] has joined the @jekyll/core
+team!
+
+He hails from Vancouver, BC, Canada, where he is studying Economics and
+Computer Science at the [University of British Columbia][]. Alfred popped up in
+the issues a few months ago with terrific insights, focus, and humility.
+Performance buffs may be pleased to hear incremental regeneration will be
+released in a future version of Jekyll -- a significant piece of the
+feature written by Alfred.
+
+Please join me in welcoming Alfred to the Jekyll core team. We're excited
+he's agreed to lend his talents to this project. The future is an exciting
+place!
+
+Happy Jekylling!
+
+[@alfredxing]: https://github.com/alfredxing
+[University of British Columbia]: http://ubc.ca

From dc12bd3023b2b466ae9ca84433ec976c4761cdbc Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 18 Dec 2014 23:03:27 -0800
Subject: [PATCH 051/407] Update history to reflect merge of #3218 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 98ae4fe46..827289bfd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -18,6 +18,7 @@
 
 ### Site Enhancements
 
+  * Add `@alfredxing` to the `@jekyll/core` team. :tada: (#3218)
   * Document the `-q` option for the `build` and `serve` commands (#3149)
   * Fix some minor typos/flow fixes in documentation website content (#3165)
   * Add `keep_files` to configuration documentation (#3162)

From d05df326b91af4a4f0b2a22576dd34b1a49b31d8 Mon Sep 17 00:00:00 2001
From: Jason Bellamy <j@sonbellamy.com>
Date: Fri, 19 Dec 2014 22:55:40 -0500
Subject: [PATCH 052/407] Add jekyll-mermaid to the list of plugins.

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

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 33319bc9f..bd4396b3a 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -583,6 +583,7 @@ You can find a few useful plugins at the following locations:
 - [webmention_io.rb](https://github.com/aarongustafson/jekyll-webmention_io) by [Aaron Gustafson](http://aaron-gustafson.com/): A plugin to enable [webmention](http://indiewebcamp.com/webmention) integration using [Webmention.io](http://webmention.io). Includes an optional JavaScript for updating webmentions automatically between publishes and, if available, in realtime using WebSockets.
 - [Jekyll 500px Embed](https://github.com/lkorth/jekyll-500px-embed) by [Luke Korth](https://lukekorth.com/). A Liquid tag plugin that embeds [500px](https://500px.com/) photos.
 - [inline\_highlight](https://github.com/bdesham/inline_highlight): A tag for inline syntax highlighting.
+- [jekyll-mermaid](https://github.com/jasonbellamy/jekyll-mermaid): Simplify the creation of mermaid diagrams and flowcharts in your posts and pages.
 
 #### Collections
 

From c3e47437a3106162773f8532508a2bade29016b0 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 20 Dec 2014 10:45:15 -0800
Subject: [PATCH 053/407] Update history to reflect merge of #3222 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 827289bfd..82fe10e8e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * Add the `jekyll-jalali` plugin added to the list of third-party plugins. (#3198)
   * Add Table of Contents to Troubleshooting page (#3196)
   * Add `inline_highlight` plugin to list of third-party plugins (#3212)
+  * Add `jekyll-mermaid` plugin to list of third-party plugins (#3222)
 
 ## 2.5.2 / 2014-11-17
 

From aaf6f28fded9ec43e45ae023622fecf87640ac9c Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 22 Dec 2014 08:58:29 -0500
Subject: [PATCH 054/407] Update history to reflect merge of #3116 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 82fe10e8e..b51edd636 100644
--- a/History.markdown
+++ b/History.markdown
@@ -2,6 +2,8 @@
 
 ### Major Enhancements
 
+  * Incremental regeneration (#3116)
+
 ### Minor Enhancements
 
 ### Bug Fixes

From 8284714d8a424aa583d53571d33861d50208d30a Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 22 Dec 2014 09:15:57 -0500
Subject: [PATCH 055/407] Release :gem: 2.5.3

---
 History.markdown                              |  8 +++
 jekyll.gemspec                                | 64 +++++++++----------
 lib/jekyll/version.rb                         |  2 +-
 site/_docs/history.md                         | 33 ++++++++++
 .../2014-12-22-jekyll-2-5-3-released.markdown | 20 ++++++
 site/latest_version.txt                       |  2 +-
 6 files changed, 95 insertions(+), 34 deletions(-)
 create mode 100644 site/_posts/2014-12-22-jekyll-2-5-3-released.markdown

diff --git a/History.markdown b/History.markdown
index 82fe10e8e..b526d5dc3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,14 @@
 
 ### Minor Enhancements
 
+### Bug Fixes
+
+### Development Fixes
+
+### Site Enhancements
+
+## 2.5.3 / 2014-12-22
+
 ### Bug Fixes
 
   * When checking a Markdown extname, include position of the `.` (#3147)
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 012ad01a7..b66243ce4 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -5,60 +5,60 @@ require 'jekyll/version'
 
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.rubygems_version = '2.2.2'
   s.required_ruby_version = '>= 1.9.3'
 
-  s.name              = 'jekyll'
-  s.version           = Jekyll::VERSION
-  s.license           = 'MIT'
+  s.name          = 'jekyll'
+  s.version       = Jekyll::VERSION
+  s.license       = 'MIT'
 
-  s.summary     = "A simple, blog aware, static site generator."
-  s.description = "Jekyll is a simple, blog aware, static site generator."
+  s.summary       = 'A simple, blog aware, static site generator.'
+  s.description   = 'Jekyll is a simple, blog aware, static site generator.'
 
-  s.authors  = ["Tom Preston-Werner"]
-  s.email    = 'tom@mojombo.com'
-  s.homepage = 'https://github.com/jekyll/jekyll'
+  s.authors       = ['Tom Preston-Werner']
+  s.email         = 'tom@mojombo.com'
+  s.homepage      = 'https://github.com/jekyll/jekyll'
 
   all_files       = `git ls-files -z`.split("\x0")
   s.files         = all_files.grep(%r{^(bin|lib)/})
   s.executables   = all_files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = %w[README.markdown LICENSE]
 
-  s.add_runtime_dependency('liquid',    "~> 2.6.1")
-  s.add_runtime_dependency('kramdown',  "~> 1.3")
-  s.add_runtime_dependency('mercenary', "~> 0.3.3")
-  s.add_runtime_dependency('safe_yaml', "~> 1.0")
-  s.add_runtime_dependency('colorator', "~> 0.1")
+  s.add_runtime_dependency('liquid',    '~> 2.6.1')
+  s.add_runtime_dependency('kramdown',  '~> 1.3')
+  s.add_runtime_dependency('mercenary', '~> 0.3.3')
+  s.add_runtime_dependency('safe_yaml', '~> 1.0')
+  s.add_runtime_dependency('colorator', '~> 0.1')
 
   # Before 3.0 drops, phase the following gems out as dev dependencies
   # and gracefully handle their absence.
-  s.add_runtime_dependency('pygments.rb', "~> 0.6.0")
-  s.add_runtime_dependency('redcarpet', "~> 3.1")
+  s.add_runtime_dependency('pygments.rb', '~> 0.6.0')
+  s.add_runtime_dependency('redcarpet', '~> 3.1')
   s.add_runtime_dependency('toml', '~> 0.1.0')
   s.add_runtime_dependency('jekyll-paginate', '~> 1.0')
   s.add_runtime_dependency('jekyll-gist', '~> 1.0')
   s.add_runtime_dependency('jekyll-coffeescript', '~> 1.0')
   s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0')
   s.add_runtime_dependency('jekyll-watch', '~> 1.1')
-  s.add_runtime_dependency('classifier-reborn', "~> 2.0")
+  s.add_runtime_dependency('classifier-reborn', '~> 2.0')
 
-  s.add_development_dependency('rake', "~> 10.1")
-  s.add_development_dependency('rdoc', "~> 3.11")
-  s.add_development_dependency('redgreen', "~> 1.2")
-  s.add_development_dependency('shoulda', "~> 3.5")
-  s.add_development_dependency('rr', "~> 1.1")
-  s.add_development_dependency('cucumber', "1.3.11")
-  s.add_development_dependency('RedCloth', "~> 4.2")
-  s.add_development_dependency('maruku', "~> 0.7.0")
-  s.add_development_dependency('rdiscount', "~> 1.6")
-  s.add_development_dependency('launchy', "~> 2.3")
-  s.add_development_dependency('simplecov', "~> 0.9")
-  s.add_development_dependency('simplecov-gem-adapter', "~> 1.0.1")
-  s.add_development_dependency('mime-types', "~> 1.5")
+  s.add_development_dependency('rake', '~> 10.1')
+  s.add_development_dependency('rdoc', '~> 3.11')
+  s.add_development_dependency('redgreen', '~> 1.2')
+  s.add_development_dependency('shoulda', '~> 3.5')
+  s.add_development_dependency('rr', '~> 1.1')
+  s.add_development_dependency('cucumber', '1.3.11')
+  s.add_development_dependency('RedCloth', '~> 4.2')
+  s.add_development_dependency('maruku', '~> 0.7.0')
+  s.add_development_dependency('rdiscount', '~> 1.6')
+  s.add_development_dependency('launchy', '~> 2.3')
+  s.add_development_dependency('simplecov', '~> 0.9')
+  s.add_development_dependency('simplecov-gem-adapter', '~> 1.0.1')
+  s.add_development_dependency('mime-types', '~> 1.5')
   s.add_development_dependency('activesupport', '~> 3.2.13')
   s.add_development_dependency('jekyll_test_plugin')
   s.add_development_dependency('jekyll_test_plugin_malicious')
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 4df111605..91ff7408f 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '2.5.2'
+  VERSION = '2.5.3'
 end
diff --git a/site/_docs/history.md b/site/_docs/history.md
index 036a4c999..6485dadae 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -5,6 +5,39 @@ permalink: "/docs/history/"
 prev_section: contributing
 ---
 
+## 2.5.3 / 2014-12-22
+{: #v2-5-3}
+
+### Bug Fixes
+{: #bug-fixes-v2-5-3}
+
+- When checking a Markdown extname, include position of the `.` ([#3147]({{ site.repository }}/issues/3147))
+- Fix `jsonify` Liquid filter handling of boolean values ([#3154]({{ site.repository }}/issues/3154))
+- Add comma to value of `viewport` meta tag ([#3170]({{ site.repository }}/issues/3170))
+- Set the link type for the RSS feed to `application/rss+xml` ([#3176]({{ site.repository }}/issues/3176))
+- Refactor `#as_liquid` ([#3158]({{ site.repository }}/issues/3158))
+
+### Development Fixes
+{: #development-fixes-v2-5-3}
+
+- Exclude built-in bundles from being added to coverage report ([#3180]({{ site.repository }}/issues/3180))
+
+### Site Enhancements
+{: #site-enhancements-v2-5-3}
+
+- Add `[@alfredxing](https://github.com/alfredxing)` to the `[@jekyll](https://github.com/jekyll)/core` team. :tada: ([#3218]({{ site.repository }}/issues/3218))
+- 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))
+- Repeat warning about cleaning of the `destination` directory ([#3161]({{ site.repository }}/issues/3161))
+- Add jekyll-500px-embed to list of third-party plugins ([#3163]({{ site.repository }}/issues/3163))
+- Simplified platform detection in Gemfile example for Windows ([#3177]({{ site.repository }}/issues/3177))
+- Add the `jekyll-jalali` plugin added to the list of third-party plugins. ([#3198]({{ site.repository }}/issues/3198))
+- Add Table of Contents to Troubleshooting page ([#3196]({{ site.repository }}/issues/3196))
+- Add `inline_highlight` plugin to list of third-party plugins ([#3212]({{ site.repository }}/issues/3212))
+- Add `jekyll-mermaid` plugin to list of third-party plugins ([#3222]({{ site.repository }}/issues/3222))
+
+
 ## 2.5.2 / 2014-11-17
 {: #v2-5-2}
 
diff --git a/site/_posts/2014-12-22-jekyll-2-5-3-released.markdown b/site/_posts/2014-12-22-jekyll-2-5-3-released.markdown
new file mode 100644
index 000000000..7743fd8ed
--- /dev/null
+++ b/site/_posts/2014-12-22-jekyll-2-5-3-released.markdown
@@ -0,0 +1,20 @@
+---
+layout: news_item
+title: 'Jekyll Release for the Holidays! v2.5.3 Out'
+date: 2014-12-22 09:03:30 -0500
+author: parkr
+version: 2.5.3
+categories: [release]
+---
+
+Happy Holidays, everyone.
+
+Jekyll v2.5.3 is a quick patch release, containing some minor fixes. See the
+[full history](/docs/history/) for more info. If you notice any problems,
+please [let us know]({{ site.help_url }}).
+
+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/).
+Feel free to chime in over on GitHub.
+
+Happy Jekylling!
diff --git a/site/latest_version.txt b/site/latest_version.txt
index 21b159dc8..a4db534a2 100644
--- a/site/latest_version.txt
+++ b/site/latest_version.txt
@@ -1 +1 @@
-2.5.2
\ No newline at end of file
+2.5.3
\ No newline at end of file

From 922ba5d0ea3b3539a7c01eff248160fe14f4d399 Mon Sep 17 00:00:00 2001
From: Fonso <fonsopp@gmail.com>
Date: Tue, 23 Dec 2014 13:26:08 +0100
Subject: [PATCH 056/407] Fixing the default host on docs

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

diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index e1d176fac..e4d555245 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -497,7 +497,7 @@ excerpt_separator: "\n\n"
 # Serving
 detach:  false
 port:    4000
-host:    0.0.0.0
+host:    127.0.0.1
 baseurl: "" # does not include hostname
 
 # Backwards-compatibility

From f3a274377a54257bc1868f867c8ad32903105238 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 23 Dec 2014 16:49:43 -0500
Subject: [PATCH 057/407] Update history to reflect merge of #3229 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f6a7bd146..3cd9d6373 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,8 @@
 
 ### Site Enhancements
 
+  * Fixing the default host on docs (#3229)
+
 ## 2.5.3 / 2014-12-22
 
 ### Bug Fixes

From 52085d2e34d2f5a7b6797462def6370726de357c Mon Sep 17 00:00:00 2001
From: Jesse Pinho <jesse@jessepinho.com>
Date: Wed, 24 Dec 2014 16:14:08 -0600
Subject: [PATCH 058/407] Fix a few punctuation errors

---
 site/_docs/pages.md     | 2 +-
 site/_docs/plugins.md   | 8 ++++----
 site/_docs/templates.md | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/site/_docs/pages.md b/site/_docs/pages.md
index e7b837fab..ea59649e9 100644
--- a/site/_docs/pages.md
+++ b/site/_docs/pages.md
@@ -60,7 +60,7 @@ and associated URLs might look like:
 
 ### Named folders containing index HTML files
 
-There is nothing wrong with the above method, however some people like to keep
+There is nothing wrong with the above method. However, some people like to keep
 their URLs free from things like filename extensions. To achieve clean URLs for
 pages using Jekyll, you simply need to create a folder for each top-level page
 you want, and then place an `index.html` file in each page’s folder. This way
diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index bd4396b3a..9b68e17b6 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -13,8 +13,8 @@ having to modify the Jekyll source itself.
 <div class="note info">
   <h5>Plugins on GitHub Pages</h5>
   <p>
-    <a href="http://pages.github.com/">GitHub Pages</a> is powered by Jekyll,
-    however all Pages sites are generated using the <code>--safe</code> option
+    <a href="http://pages.github.com/">GitHub Pages</a> is powered by Jekyll.
+    However, all Pages sites are generated using the <code>--safe</code> option
     to disable custom plugins for security reasons. Unfortunately, this means
     your plugins won’t work if you’re deploying to GitHub Pages.<br><br>
     You can still use GitHub Pages to publish your site, but you’ll need to
@@ -68,8 +68,8 @@ A generator is a subclass of `Jekyll::Generator` that defines a `generate`
 method, which receives an instance of
 [`Jekyll::Site`]({{ site.repository }}/blob/master/lib/jekyll/site.rb).
 
-Generation is triggered for its side-effects, the return value of `generate` is
-ignored. Jekyll does not assume any particular side-effect to happen, it just
+Because generation is triggered for its side effects, the return value of `generate` is
+ignored. Jekyll does not assume any particular side effect to happen---it just
 runs the method.
 
 Generators run after Jekyll has made an inventory of the existing content, and
diff --git a/site/_docs/templates.md b/site/_docs/templates.md
index 2cd7461d7..c0825702f 100644
--- a/site/_docs/templates.md
+++ b/site/_docs/templates.md
@@ -303,7 +303,7 @@ You can also choose to include file fragments relative to the current file:
 You won't need to place your included content within the `_includes` directory. Instead,
 the inclusion is specifically relative to the file where the tag is being used. For example,
 if `_posts/2014-09-03-my-file.markdown` uses the `include_relative` tag, the included file
-must be within the `_posts` directory, or one of it's subdirectories. You cannot include
+must be within the `_posts` directory, or one of its subdirectories. You cannot include
 files in other locations.
 
 All the other capabilities of the `include` tag are available to the `include_relative` tag,

From d6995d347a46af1e15508bc623572edb553eddf4 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 25 Dec 2014 16:00:59 -0500
Subject: [PATCH 059/407] Drop support for Ruby 1.9.3.

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

diff --git a/.travis.yml b/.travis.yml
index 90e08adff..72f0752d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,6 @@ sudo: false
 rvm:
 - 2.1
 - 2.0
-- 1.9.3
 env:
   matrix:
   - TEST_SUITE=test

From 6e4e290ab0569a7a84c1d88f558c58340ce4661a Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 25 Dec 2014 16:11:14 -0500
Subject: [PATCH 060/407] Requires >= 2.0.0

---
 jekyll.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index b66243ce4..4913951ef 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.rubygems_version = '2.2.2'
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.0.0'
 
   s.name          = 'jekyll'
   s.version       = Jekyll::VERSION

From 4070143d5b06965a764fc655c7787013c80d040b Mon Sep 17 00:00:00 2001
From: Jesse Pinho <jesse@jessepinho.com>
Date: Thu, 25 Dec 2014 15:17:21 -0600
Subject: [PATCH 061/407] Tweak sentence structure

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

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 9b68e17b6..605cbf684 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -68,9 +68,9 @@ A generator is a subclass of `Jekyll::Generator` that defines a `generate`
 method, which receives an instance of
 [`Jekyll::Site`]({{ site.repository }}/blob/master/lib/jekyll/site.rb).
 
-Because generation is triggered for its side effects, the return value of `generate` is
-ignored. Jekyll does not assume any particular side effect to happen---it just
-runs the method.
+The return value of `generate` is ignored, since generation is triggered for
+its side effects. Jekyll does not expect any particular side effect to
+happen---it just runs the method.
 
 Generators run after Jekyll has made an inventory of the existing content, and
 before the site is generated. Pages with YAML Front Matters are stored as

From b1a517ccb65833ff9250b3ae9fa13794c86f9951 Mon Sep 17 00:00:00 2001
From: Jesse Pinho <jesse@jessepinho.com>
Date: Thu, 25 Dec 2014 18:29:50 -0600
Subject: [PATCH 062/407] Remove unnecessary 'where'

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

diff --git a/site/_docs/pagination.md b/site/_docs/pagination.md
index 3bb7d1398..245ba36f3 100644
--- a/site/_docs/pagination.md
+++ b/site/_docs/pagination.md
@@ -32,7 +32,7 @@ paginate: 5
 The number should be the maximum number of Posts you’d like to be displayed per-
 page in the generated site.
 
-You may also specify where the destination of the pagination pages:
+You may also specify the destination of the pagination pages:
 
 {% highlight yaml %}
 paginate_path: "blog/page:num/"

From 0aa61f66a83fe4aafef65f7abcd103e0a8088886 Mon Sep 17 00:00:00 2001
From: Tanguy Krotoff <tkrotoff@gmail.com>
Date: Fri, 26 Dec 2014 12:10:03 +0100
Subject: [PATCH 063/407] Remove unneeded end tag

---
 lib/site_template/_includes/head.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/site_template/_includes/head.html b/lib/site_template/_includes/head.html
index 47057b504..41340ae57 100644
--- a/lib/site_template/_includes/head.html
+++ b/lib/site_template/_includes/head.html
@@ -8,5 +8,5 @@
 
   <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
   <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
-  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
+  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
 </head>

From 82b1ad0552202a50e9f9a35a392236adc469502d Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 26 Dec 2014 16:35:56 -0500
Subject: [PATCH 064/407] Update history to reflect merge of #3236 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3cd9d6373..2dca27a5c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,8 @@
 
 ### Bug Fixes
 
+  * Remove unneeded end tag for `link` in site template (#3236)
+
 ### Development Fixes
 
 ### Site Enhancements

From 323404151001de486bacccc7e11c91676144ad26 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 26 Dec 2014 16:46:57 -0500
Subject: [PATCH 065/407] Update history to reflect merge of #3235 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2dca27a5c..892800991 100644
--- a/History.markdown
+++ b/History.markdown
@@ -3,6 +3,7 @@
 ### Major Enhancements
 
   * Incremental regeneration (#3116)
+  * Drop support for Ruby 1.9.3. (#3235)
 
 ### Minor Enhancements
 

From 5bf15964140c767b5011f1ee65d5a4f8e7a05231 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 14 Oct 2014 12:04:09 -0700
Subject: [PATCH 066/407] Refactor Highlight tag tests to use a helper method
 to create the tag.

---
 Gemfile           |  1 +
 jekyll.gemspec    |  2 +-
 test/test_tags.rb | 40 +++++++++++++++++++++++++++++-----------
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 25b40ed2e..d680ef693 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 gemspec
+gem "liquid", github: 'Shopify/liquid'
 
 if ENV['BENCHMARK']
   gem 'rbtrace'
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 4913951ef..c9876c47e 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = %w[README.markdown LICENSE]
 
-  s.add_runtime_dependency('liquid',    '~> 2.6.1')
+  #s.add_runtime_dependency('liquid',    '')
   s.add_runtime_dependency('kramdown',  '~> 1.3')
   s.add_runtime_dependency('mercenary', '~> 0.3.3')
   s.add_runtime_dependency('safe_yaml', '~> 1.0')
diff --git a/test/test_tags.rb b/test/test_tags.rb
index a47ca897d..bc4b48cd7 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -43,6 +43,10 @@ CONTENT
     create_post(content, override)
   end
 
+  def highlight_block_with_opts(options_string)
+    Jekyll::Tags::HighlightBlock.parse('highlight', options_string, ["test", "{% endhighlight %}", "\n"], {})
+  end
+
   context "language name" do
     should "match only the required set of chars" do
       r = Jekyll::Tags::HighlightBlock::SYNTAX
@@ -59,37 +63,51 @@ CONTENT
     end
   end
 
-  context "initialized tag" do
-    should "set the correct options" do
-      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby ', ["test", "{% endhighlight %}", "\n"])
+  context "highlight tag in unsafe mode" do
+    should "set the no options with just a language name" do
+      tag = highlight_block_with_opts('ruby ')
       assert_equal({}, tag.instance_variable_get(:@options))
+    end
 
-      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos ', ["test", "{% endhighlight %}", "\n"])
+    should "set the linenos option as 'inline' if no linenos value" do
+      tag = highlight_block_with_opts('ruby linenos ')
       assert_equal({ :linenos => 'inline' }, tag.instance_variable_get(:@options))
+    end
 
-      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table ', ["test", "{% endhighlight %}", "\n"])
+    should "set the linenos option to 'table' if the linenos key is given the table value" do
+      tag = highlight_block_with_opts('ruby linenos=table ')
       assert_equal({ :linenos => 'table' }, tag.instance_variable_get(:@options))
+    end
 
-      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table nowrap', ["test", "{% endhighlight %}", "\n"])
+    should "recognize nowrap option with linenos set" do
+      tag = highlight_block_with_opts('ruby linenos=table nowrap ')
       assert_equal({ :linenos => 'table', :nowrap => true }, tag.instance_variable_get(:@options))
+    end
 
-      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl', ["test", "{% endhighlight %}", "\n"])
+    should "recognize the cssclass option" do
+      tag = highlight_block_with_opts('ruby linenos=table cssclass=hl ')
       assert_equal({ :cssclass => 'hl', :linenos => 'table' }, tag.instance_variable_get(:@options))
+    end
 
-      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl hl_linenos=3', ["test", "{% endhighlight %}", "\n"])
+    should "recognize the hl_linenos option and its value" do
+      tag = highlight_block_with_opts('ruby linenos=table cssclass=hl hl_linenos=3 ')
       assert_equal({ :cssclass => 'hl', :linenos => 'table', :hl_linenos => '3' }, tag.instance_variable_get(:@options))
+    end
 
-      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl hl_linenos="3 5 6"', ["test", "{% endhighlight %}", "\n"])
+    should "recognize multiple values of hl_linenos" do
+      tag = highlight_block_with_opts('ruby linenos=table cssclass=hl hl_linenos="3 5 6" ')
       assert_equal({ :cssclass => 'hl', :linenos => 'table', :hl_linenos => ['3', '5', '6'] }, tag.instance_variable_get(:@options))
+    end
 
-      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'Ruby ', ["test", "{% endhighlight %}", "\n"])
+    should "treat language name as case insensitive" do
+      tag = highlight_block_with_opts('Ruby ')
       assert_equal "ruby", tag.instance_variable_get(:@lang), "lexers should be case insensitive"
     end
   end
 
   context "in safe mode" do
     setup do
-      @tag = Jekyll::Tags::HighlightBlock.new('highlight', 'text ', ["test", "{% endhighlight %}", "\n"])
+      @tag = highlight_block_with_opts('text ')
     end
 
     should "allow linenos" do

From 70a331d8547e79454cdbc2e27da392cea30c499b Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 29 Oct 2014 15:04:35 -0700
Subject: [PATCH 067/407] Set the error mode to :strict

---
 Gemfile       | 2 +-
 lib/jekyll.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index d680ef693..7c91f2620 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 gemspec
-gem "liquid", github: 'Shopify/liquid'
+gem "liquid", github: 'Shopify/liquid', branch: '3-0-0-rc1'
 
 if ENV['BENCHMARK']
   gem 'rbtrace'
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 911b3ddbf..45c9a4d56 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -30,6 +30,7 @@ require 'kramdown'
 require 'colorator'
 
 SafeYAML::OPTIONS[:suppress_warnings] = true
+Liquid::Template.error_mode = :strict
 
 module Jekyll
 

From 3940e1e9df2573a8ad26727360213c94edd6ca04 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 12 Nov 2014 16:00:26 -0800
Subject: [PATCH 068/407] Bump to Liquid 3.0

---
 Gemfile        | 1 -
 jekyll.gemspec | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7c91f2620..25b40ed2e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 gemspec
-gem "liquid", github: 'Shopify/liquid', branch: '3-0-0-rc1'
 
 if ENV['BENCHMARK']
   gem 'rbtrace'
diff --git a/jekyll.gemspec b/jekyll.gemspec
index c9876c47e..a7bd0d5bf 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = %w[README.markdown LICENSE]
 
-  #s.add_runtime_dependency('liquid',    '')
+  s.add_runtime_dependency('liquid',    '~> 3.0')
   s.add_runtime_dependency('kramdown',  '~> 1.3')
   s.add_runtime_dependency('mercenary', '~> 0.3.3')
   s.add_runtime_dependency('safe_yaml', '~> 1.0')

From b68dd3a5cb8366507c80c37c3ac1f13c71a498c1 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 15 Dec 2014 16:27:24 -0800
Subject: [PATCH 069/407] Add liquid c if it's available.

---
 jekyll.gemspec | 1 +
 lib/jekyll.rb  | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index a7bd0d5bf..9631b3488 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -63,6 +63,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('jekyll_test_plugin')
   s.add_development_dependency('jekyll_test_plugin_malicious')
   s.add_development_dependency('rouge', '~> 1.7')
+  s.add_development_dependency('liquid-c', '~> 0.0.2')
   s.add_development_dependency('minitest') if RUBY_PLATFORM =~ /cygwin/
   s.add_development_dependency('test-unit') if RUBY_PLATFORM =~ /cygwin/
 end
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 45c9a4d56..bde115815 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -29,6 +29,12 @@ require 'liquid'
 require 'kramdown'
 require 'colorator'
 
+# Conditional optimizations
+begin
+  require 'liquid-c'
+rescue LoadError
+end
+
 SafeYAML::OPTIONS[:suppress_warnings] = true
 Liquid::Template.error_mode = :strict
 

From 8bfc696569057955dbeeb4fe6e0652d0189c163c Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 25 Dec 2014 14:42:15 -0500
Subject: [PATCH 070/407] liquid-c 0.0.3

---
 jekyll.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 9631b3488..7d0a97fc5 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -63,7 +63,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('jekyll_test_plugin')
   s.add_development_dependency('jekyll_test_plugin_malicious')
   s.add_development_dependency('rouge', '~> 1.7')
-  s.add_development_dependency('liquid-c', '~> 0.0.2')
+  s.add_development_dependency('liquid-c', '~> 0.0.3')
   s.add_development_dependency('minitest') if RUBY_PLATFORM =~ /cygwin/
   s.add_development_dependency('test-unit') if RUBY_PLATFORM =~ /cygwin/
 end

From 3957efac15551d3916e7e9dc63a17c5fd3c0717a Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 26 Dec 2014 22:00:45 -0500
Subject: [PATCH 071/407] Update history to reflect merge of #3002 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 892800991..57b63380a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,7 @@
 
   * Incremental regeneration (#3116)
   * Drop support for Ruby 1.9.3. (#3235)
+  * Upgrade to Liquid 3.0.0 (#3002)
 
 ### Minor Enhancements
 

From a103898980dd40d32b1516c34f12f52c9d0b4e9f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 26 Dec 2014 22:16:33 -0500
Subject: [PATCH 072/407] Set 'use_coderay' to 'enable_coderay'

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

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index c64f3a898..377e799b4 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -75,12 +75,12 @@ module Jekyll
       },
 
       'kramdown' => {
-        'auto_ids'      => true,
-        'footnote_nr'   => 1,
-        'entity_output' => 'as_char',
-        'toc_levels'    => '1..6',
-        'smart_quotes'  => 'lsquo,rsquo,ldquo,rdquo',
-        'use_coderay'   => false,
+        'auto_ids'       => true,
+        'footnote_nr'    => 1,
+        'entity_output'  => 'as_char',
+        'toc_levels'     => '1..6',
+        'smart_quotes'   => 'lsquo,rsquo,ldquo,rdquo',
+        'enable_coderay' => false,
 
         'coderay' => {
           'coderay_wrap'              => 'div',

From f6bff6fb614d9ad04119fd99ad8dd55c14bee0c3 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 26 Dec 2014 22:16:47 -0500
Subject: [PATCH 073/407] Have a deprecation fallback for 'use_coderay'

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

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 377e799b4..7ba9359b2 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -254,6 +254,12 @@ module Jekyll
         config[option].map!(&:to_s)
       end
 
+      if (config['kramdown'] || {}).key?('use_coderay')
+        Jekyll::Deprecator.deprecation_message "Please change 'use_coderay'" +
+          " to 'enable_coderay' in your configuration file."
+        config['kramdown']['use_coderay'] = config['kramdown'].delete('enable_coderay')
+      end
+
       if config.fetch('markdown', 'kramdown').to_s.downcase.eql?("maruku")
         Jekyll::Deprecator.deprecation_message "You're using the 'maruku' " +
           "Markdown processor. Maruku support has been deprecated and will " +

From d35af9c1f36c9189bb4c6970c7c75d102fbf7a21 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 26 Dec 2014 22:16:57 -0500
Subject: [PATCH 074/407] Read 'enable_coderay' in the Kramdown parser

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

diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index 097c9212a..a9dbec96f 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -13,14 +13,14 @@ module Jekyll
 
         def convert(content)
           # Check for use of coderay
-          if @config['kramdown']['use_coderay']
+          if @config['kramdown']['enable_coderay']
             %w[wrap line_numbers line_numbers_start tab_width bold_every css default_lang].each do |opt|
               key = "coderay_#{opt}"
               @config['kramdown'][key] = @config['kramdown']['coderay'][key] unless @config['kramdown'].key?(key)
             end
           end
 
-          Kramdown::Document.new(content, Utils.symbolize_hash_keys(@config["kramdown"])).to_html
+          Kramdown::Document.new(content, Utils.symbolize_hash_keys(@config['kramdown'])).to_html
         end
 
       end

From 039c521e8c85d8f774fe0ab4498c9c258c7e599d Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 26 Dec 2014 22:17:07 -0500
Subject: [PATCH 075/407] Update the documentation.

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

diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index e4d555245..c9ddd915f 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -527,12 +527,12 @@ redcarpet:
   extensions: []
 
 kramdown:
-  auto_ids:      true
-  footnote_nr:   1
-  entity_output: as_char
-  toc_levels:    1..6
-  smart_quotes:  lsquo,rsquo,ldquo,rdquo
-  use_coderay:   false
+  auto_ids:       true
+  footnote_nr:    1
+  entity_output:  as_char
+  toc_levels:     1..6
+  smart_quotes:   lsquo,rsquo,ldquo,rdquo
+  enable_coderay: false
 
   coderay:
     coderay_wrap:              div

From c24c6b7f3d2607cb6b7e138c66e504d43e73da63 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 26 Dec 2014 22:17:33 -0500
Subject: [PATCH 076/407] Use 'enable_coderay' in the tests.

---
 test/test_kramdown.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index f2bd8a0b7..3998e9d3f 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -14,7 +14,7 @@ class TestKramdown < Test::Unit::TestCase
           'toc_levels'    => '1..6',
           'smart_quotes'  => 'lsquo,rsquo,ldquo,rdquo',
 
-          'use_coderay'   => true,
+          'enable_coderay'   => true,
           'coderay_bold_every'=> 12,
           'coderay' => {
             'coderay_css'        => :style,

From e120c255ff8c8c5e29c79d9e908781b076306ce3 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 26 Dec 2014 22:22:36 -0500
Subject: [PATCH 077/407] Update history to reflect merge of #3237 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 57b63380a..eea85f4af 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
 ### Bug Fixes
 
   * Remove unneeded end tag for `link` in site template (#3236)
+  * Kramdown: Use `enable_coderay` key instead of `use_coderay` (#3237)
 
 ### Development Fixes
 

From 0eb2796a66ba1d7fab243c34e55f285b9fbec766 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 11 Dec 2014 12:48:57 -0800
Subject: [PATCH 078/407] Sort static files just once.

Ref: #2075.
---
 lib/jekyll/site.rb        | 3 ++-
 lib/jekyll/static_file.rb | 8 +++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 7b8a4a00a..3ddda4749 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -187,6 +187,7 @@ module Jekyll
       end
 
       pages.sort_by!(&:name)
+      static_files.sort_by!(&:relative_path)
     end
 
     # Read all the files in <source>/<dir>/_posts and create a new Post
@@ -384,7 +385,7 @@ module Jekyll
             "time"         => time,
             "posts"        => posts.sort { |a, b| b <=> a },
             "pages"        => pages,
-            "static_files" => static_files.sort { |a, b| a.relative_path <=> b.relative_path },
+            "static_files" => static_files,
             "html_pages"   => pages.select { |page| page.html? || page.url.end_with?("/") },
             "categories"   => post_attr_hash('categories'),
             "tags"         => post_attr_hash('tags'),
diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index 8e1006562..02500b1d5 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -3,6 +3,8 @@ module Jekyll
     # The cache of last modification times [path] -> mtime.
     @@mtimes = Hash.new
 
+    attr_reader :relative_path
+
     # Initialize a new StaticFile.
     #
     # site - The Site.
@@ -15,6 +17,7 @@ module Jekyll
       @dir  = dir
       @name = name
       @collection = collection
+      @relative_path = File.join(*[@dir, @name].compact)
     end
 
     # Returns source file path.
@@ -22,11 +25,6 @@ module Jekyll
       File.join(*[@base, @dir, @name].compact)
     end
 
-    # Returns the source file path relative to the site source
-    def relative_path
-      @relative_path ||= File.join(*[@dir, @name].compact)
-    end
-
     def extname
       File.extname(path)
     end

From 2f8248a6f17f0dffb3b504aff165e25c9039666e Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 18 Dec 2014 00:10:20 -0800
Subject: [PATCH 079/407] Only call #site_payload once for all collection work.

---
 lib/jekyll/renderer.rb  | 7 ++++---
 lib/jekyll/site.rb      | 3 ++-
 test/test_deprecator.rb | 6 ++++++
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 test/test_deprecator.rb

diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index 1cdf6c2aa..3e66bce6d 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -3,11 +3,12 @@
 module Jekyll
   class Renderer
 
-    attr_reader :document, :site
+    attr_reader :document, :site, :payload
 
-    def initialize(site, document)
+    def initialize(site, document, payload = nil)
       @site     = site
       @document = document
+      @payload  = payload
     end
 
     # Determine which converters to use based on this document's
@@ -32,7 +33,7 @@ module Jekyll
     def run
       payload = Utils.deep_merge_hashes({
         "page" => document.to_liquid
-      }, site.site_payload)
+      }, payload || site.site_payload)
 
       info = {
         filters:   [Jekyll::Filters],
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 3ddda4749..85c479bf6 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -292,9 +292,10 @@ module Jekyll
     def render
       relative_permalinks_deprecation_method
 
+      payload = site_payload
       collections.each do |label, collection|
         collection.docs.each do |document|
-          document.output = Jekyll::Renderer.new(self, document).run if document.regenerate?
+          document.output = Jekyll::Renderer.new(self, document, payload).run if document.regenerate?
         end
       end
 
diff --git a/test/test_deprecator.rb b/test/test_deprecator.rb
new file mode 100644
index 000000000..7be838d24
--- /dev/null
+++ b/test/test_deprecator.rb
@@ -0,0 +1,6 @@
+require 'helper'
+
+class TestDeprecator < Test::Unit::TestCase
+  def test_no_subcommand
+  end
+end

From a8ec9cd5075b79a64a91ecdc6379564023d80d31 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 26 Dec 2014 22:37:56 -0500
Subject: [PATCH 080/407] Put the development dependencies in the Gemfile
 directly.

---
 Gemfile        | 21 +++++++++++++++++++++
 jekyll.gemspec | 21 ---------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Gemfile b/Gemfile
index 25b40ed2e..c79afe7ce 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,27 @@
 source 'https://rubygems.org'
 gemspec
 
+gem 'rake', '~> 10.1'
+gem 'rdoc', '~> 3.11'
+gem 'redgreen', '~> 1.2'
+gem 'shoulda', '~> 3.5'
+gem 'rr', '~> 1.1'
+gem 'cucumber', '1.3.11'
+gem 'RedCloth', '~> 4.2'
+gem 'maruku', '~> 0.7.0'
+gem 'rdiscount', '~> 1.6'
+gem 'launchy', '~> 2.3'
+gem 'simplecov', '~> 0.9'
+gem 'simplecov-gem-adapter', '~> 1.0.1'
+gem 'mime-types', '~> 1.5'
+gem 'activesupport', '~> 3.2.13'
+gem 'jekyll_test_plugin'
+gem 'jekyll_test_plugin_malicious'
+gem 'rouge', '~> 1.7'
+gem 'liquid-c', '~> 0.0.3'
+gem 'minitest' if RUBY_PLATFORM =~ /cygwin/
+gem 'test-unit' if RUBY_PLATFORM =~ /cygwin/
+
 if ENV['BENCHMARK']
   gem 'rbtrace'
   gem 'stackprof'
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 7d0a97fc5..8a7e19fec 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -45,25 +45,4 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0')
   s.add_runtime_dependency('jekyll-watch', '~> 1.1')
   s.add_runtime_dependency('classifier-reborn', '~> 2.0')
-
-  s.add_development_dependency('rake', '~> 10.1')
-  s.add_development_dependency('rdoc', '~> 3.11')
-  s.add_development_dependency('redgreen', '~> 1.2')
-  s.add_development_dependency('shoulda', '~> 3.5')
-  s.add_development_dependency('rr', '~> 1.1')
-  s.add_development_dependency('cucumber', '1.3.11')
-  s.add_development_dependency('RedCloth', '~> 4.2')
-  s.add_development_dependency('maruku', '~> 0.7.0')
-  s.add_development_dependency('rdiscount', '~> 1.6')
-  s.add_development_dependency('launchy', '~> 2.3')
-  s.add_development_dependency('simplecov', '~> 0.9')
-  s.add_development_dependency('simplecov-gem-adapter', '~> 1.0.1')
-  s.add_development_dependency('mime-types', '~> 1.5')
-  s.add_development_dependency('activesupport', '~> 3.2.13')
-  s.add_development_dependency('jekyll_test_plugin')
-  s.add_development_dependency('jekyll_test_plugin_malicious')
-  s.add_development_dependency('rouge', '~> 1.7')
-  s.add_development_dependency('liquid-c', '~> 0.0.3')
-  s.add_development_dependency('minitest') if RUBY_PLATFORM =~ /cygwin/
-  s.add_development_dependency('test-unit') if RUBY_PLATFORM =~ /cygwin/
 end

From b6641be8ef2f96e42c0a17dd5bb68cbaf4dc0b6f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 18 Dec 2014 00:11:44 -0800
Subject: [PATCH 081/407] Call it site_payload instead of payload.

---
 lib/jekyll/renderer.rb  | 12 ++++++------
 test/test_deprecator.rb |  6 ------
 2 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 test/test_deprecator.rb

diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index 3e66bce6d..e0701fd5f 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -3,12 +3,12 @@
 module Jekyll
   class Renderer
 
-    attr_reader :document, :site, :payload
+    attr_reader :document, :site, :site_payload
 
-    def initialize(site, document, payload = nil)
-      @site     = site
-      @document = document
-      @payload  = payload
+    def initialize(site, document, site_payload = nil)
+      @site         = site
+      @document     = document
+      @site_payload = site_payload
     end
 
     # Determine which converters to use based on this document's
@@ -33,7 +33,7 @@ module Jekyll
     def run
       payload = Utils.deep_merge_hashes({
         "page" => document.to_liquid
-      }, payload || site.site_payload)
+      }, site_payload || site.site_payload)
 
       info = {
         filters:   [Jekyll::Filters],
diff --git a/test/test_deprecator.rb b/test/test_deprecator.rb
deleted file mode 100644
index 7be838d24..000000000
--- a/test/test_deprecator.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'helper'
-
-class TestDeprecator < Test::Unit::TestCase
-  def test_no_subcommand
-  end
-end

From 657b16519ef13cce2772aa45df96287aa5df27ef Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 26 Dec 2014 23:10:21 -0500
Subject: [PATCH 082/407] Update history to reflect merge of #3204 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index eea85f4af..eb3780764 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,8 @@
 
 ### Minor Enhancements
 
+  * Sort static files just once, and call `site_payload` once for all collections (#3204)
+
 ### Bug Fixes
 
   * Remove unneeded end tag for `link` in site template (#3236)

From 0c0aea3ad7d2605325d420a23d21729c5cf7cf88 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 28 Dec 2014 14:12:09 -0500
Subject: [PATCH 083/407] Improve Site#getConverterImpl and call it
 Site#find_converter_instance

---
 lib/jekyll/filters.rb | 8 ++++----
 lib/jekyll/site.rb    | 9 ++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index f92c02b11..17a4142b4 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -10,7 +10,7 @@ module Jekyll
     # Returns the HTML formatted String.
     def textilize(input)
       site = @context.registers[:site]
-      converter = site.getConverterImpl(Jekyll::Converters::Textile)
+      converter = site.find_converter_instance(Jekyll::Converters::Textile)
       converter.convert(input)
     end
 
@@ -21,7 +21,7 @@ module Jekyll
     # Returns the HTML formatted String.
     def markdownify(input)
       site = @context.registers[:site]
-      converter = site.getConverterImpl(Jekyll::Converters::Markdown)
+      converter = site.find_converter_instance(Jekyll::Converters::Markdown)
       converter.convert(input)
     end
 
@@ -32,7 +32,7 @@ module Jekyll
     # Returns the CSS formatted String.
     def sassify(input)
       site = @context.registers[:site]
-      converter = site.getConverterImpl(Jekyll::Converters::Sass)
+      converter = site.find_converter_instance(Jekyll::Converters::Sass)
       converter.convert(input)
     end
 
@@ -43,7 +43,7 @@ module Jekyll
     # Returns the CSS formatted String.
     def scssify(input)
       site = @context.registers[:site]
-      converter = site.getConverterImpl(Jekyll::Converters::Scss)
+      converter = site.find_converter_instance(Jekyll::Converters::Scss)
       converter.convert(input)
     end
 
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 85c479bf6..83ab283c5 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -414,13 +414,8 @@ module Jekyll
     # klass - The Class of the Converter to fetch.
     #
     # Returns the Converter instance implementing the given Converter.
-    def getConverterImpl(klass)
-      matches = converters.select { |c| c.class == klass }
-      if impl = matches.first
-        impl
-      else
-        raise "Converter implementation not found for #{klass}"
-      end
+    def find_converter_instance(klass)
+      converters.find { |c| c.class == klass } || proc { raise "No converter for #{klass}" }.call
     end
 
     # Create array of instances of the subclasses of the class or module

From 232a58d5b43a257a338141c6e9a20d4006b2d101 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 28 Dec 2014 14:14:24 -0500
Subject: [PATCH 084/407] Fix test use of Site#getConverterImpl.

---
 test/test_sass.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_sass.rb b/test/test_sass.rb
index 102815a0d..50d174ba1 100644
--- a/test/test_sass.rb
+++ b/test/test_sass.rb
@@ -16,11 +16,11 @@ class TestSass < Test::Unit::TestCase
     end
 
     should "register the SCSS converter" do
-      assert !!@site.getConverterImpl(Jekyll::Converters::Scss), "SCSS converter implementation should exist."
+      assert !!@site.find_converter_instance(Jekyll::Converters::Scss), "SCSS converter implementation should exist."
     end
 
     should "register the Sass converter" do
-      assert !!@site.getConverterImpl(Jekyll::Converters::Sass), "Sass converter implementation should exist."
+      assert !!@site.find_converter_instance(Jekyll::Converters::Sass), "Sass converter implementation should exist."
     end
   end
 end

From ac41312c5d928d041be818f83802cd7450ba8642 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 28 Dec 2014 14:37:02 -0500
Subject: [PATCH 085/407] Separate jekyll-docs out into a separate gem & bless
 it

---
 bin/jekyll                  |  9 ++----
 lib/jekyll/commands/docs.rb | 30 -------------------
 lib/jekyll/external.rb      | 59 +++++++++++++++++++++++++++++++++++++
 site/_docs/usage.md         |  5 +++-
 4 files changed, 66 insertions(+), 37 deletions(-)
 delete mode 100644 lib/jekyll/commands/docs.rb
 create mode 100644 lib/jekyll/external.rb

diff --git a/bin/jekyll b/bin/jekyll
index 060c91251..3f2988bc9 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -6,12 +6,9 @@ $:.unshift File.join(File.dirname(__FILE__), *%w{ .. lib })
 require 'jekyll'
 require 'mercenary'
 
-%w[jekyll-import].each do |blessed_gem|
-  begin
-    require blessed_gem
-  rescue LoadError
-  end
-end
+Jekyll::External.require_if_present(
+  Jekyll::External.blessed_gems
+)
 
 Jekyll::PluginManager.require_from_bundler
 
diff --git a/lib/jekyll/commands/docs.rb b/lib/jekyll/commands/docs.rb
deleted file mode 100644
index 71c101601..000000000
--- a/lib/jekyll/commands/docs.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-module Jekyll
-  module Commands
-    class Docs < Command
-
-      class << self
-
-        def init_with_program(prog)
-          prog.command(:docs) do |c|
-            c.syntax 'docs'
-            c.description "Launch local server with docs for Jekyll v#{Jekyll::VERSION}"
-
-            c.option 'port', '-P', '--port [PORT]', 'Port to listen on'
-            c.option 'host', '-H', '--host [HOST]', 'Host to bind to'
-
-            c.action do |args, options|
-              options.merge!({
-                'source'      => File.expand_path("../../../site", File.dirname(__FILE__)),
-                'destination' => File.expand_path("../../../site/_site", File.dirname(__FILE__))
-              })
-              Jekyll::Commands::Build.process(options)
-              Jekyll::Commands::Serve.process(options)
-            end
-          end
-        end
-
-      end
-
-    end
-  end
-end
diff --git a/lib/jekyll/external.rb b/lib/jekyll/external.rb
new file mode 100644
index 000000000..e41bce27d
--- /dev/null
+++ b/lib/jekyll/external.rb
@@ -0,0 +1,59 @@
+module Jekyll
+  module External
+    class << self
+
+      #
+      # Gems that, if installed, should be loaded.
+      # Usually contain subcommands.
+      #
+      def blessed_gems
+        %w{
+          jekyll-docs
+          jekyll-import
+        }
+      end
+
+      #
+      # Require a gem or file if it's present, otherwise silently fail.
+      #
+      # names - a string gem name or array of gem names
+      #
+      def require_if_present(names)
+        Array(names).each do |name|
+          begin
+            require name
+          rescue LoadError
+            Jekyll.logger.debug "Couldn't load #{name}. Skipping."
+            false
+          end
+        end
+      end
+
+      #
+      # Require a gem or gems. If it's not present, show a very nice error
+      # message that explains everything and is much more helpful than the
+      # normal LoadError.
+      #
+      # names - a string gem name or array of gem names
+      #
+      def require_with_graceful_fail(names)
+        Array(names).each do |name|
+          begin
+            require name
+          rescue LoadError => e
+            Jekyll.logger.error "Dependency Error:", <<-MSG
+Yikes! It looks like you don't have #{name} or one of its dependencies installed.
+In order to use Jekyll as currently configured, you'll need to install this gem.
+
+The full error message from Ruby is: '#{e.message}'
+
+If you run into trouble, you can find helpful resources at http://jekyllrb.com/help/!
+            MSG
+            raise Jekyll::Errors::MissingDependencyException.new(name)
+          end
+        end
+      end
+
+    end
+  end
+end
diff --git a/site/_docs/usage.md b/site/_docs/usage.md
index 4959ad457..7d2d68e9f 100644
--- a/site/_docs/usage.md
+++ b/site/_docs/usage.md
@@ -81,4 +81,7 @@ $ jekyll build --source _source --destination _deploy
 {% endhighlight %}
 
 For more about the possible configuration options, see the
-[configuration](../configuration/) page.
\ No newline at end of file
+[configuration](../configuration/) page.
+
+If you're interested in browsing these docs on-the-go, install the
+`jekyll-docs` gem and run `jekyll docs` in your terminal.

From 8c19a6f43082deb1dabbf636e178f841c0ce1940 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 28 Dec 2014 14:37:14 -0500
Subject: [PATCH 086/407] Print an error message in bin/jekyll with no
 arguments

---
 bin/jekyll | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/jekyll b/bin/jekyll
index 3f2988bc9..6c968cecb 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -29,6 +29,7 @@ Mercenary.program(:jekyll) do |p|
 
   p.action do |args, options|
     if args.empty?
+      Jekyll.logger.error "A subcommand is required."
       puts p
     else
       unless p.has_command?(args.first)

From c576d239089ed301d0c003b8afd394271cca912c Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 28 Dec 2014 14:37:49 -0500
Subject: [PATCH 087/407] Use External instead of Deprecator for requiring
 gracefully

---
 lib/jekyll.rb                                   | 12 +++++-------
 lib/jekyll/commands/build.rb                    |  2 +-
 .../converters/markdown/rdiscount_parser.rb     |  2 +-
 .../converters/markdown/redcarpet_parser.rb     |  6 +++---
 lib/jekyll/deprecator.rb                        | 17 -----------------
 5 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index bde115815..3f01e4d0f 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -29,12 +29,6 @@ require 'liquid'
 require 'kramdown'
 require 'colorator'
 
-# Conditional optimizations
-begin
-  require 'liquid-c'
-rescue LoadError
-end
-
 SafeYAML::OPTIONS[:suppress_warnings] = true
 Liquid::Template.error_mode = :strict
 
@@ -51,6 +45,7 @@ module Jekyll
   autoload :EntryFilter,         'jekyll/entry_filter'
   autoload :Errors,              'jekyll/errors'
   autoload :Excerpt,             'jekyll/excerpt'
+  autoload :External,            'jekyll/external'
   autoload :Filters,             'jekyll/filters'
   autoload :FrontmatterDefaults, 'jekyll/frontmatter_defaults'
   autoload :Layout,              'jekyll/layout'
@@ -162,6 +157,9 @@ module Jekyll
       end
     end
 
+    # Conditional optimizations
+    Jekyll::External.require_if_present('liquid-c')
+
   end
 end
 
@@ -172,7 +170,7 @@ require_all 'jekyll/generators'
 require_all 'jekyll/tags'
 
 # Eventually remove these for 3.0 as non-core
-Jekyll::Deprecator.gracefully_require(%w[
+Jekyll::External.require_with_graceful_fail(%w[
   toml
   jekyll-paginate
   jekyll-gist
diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb
index 11f1f75e4..536324fce 100644
--- a/lib/jekyll/commands/build.rb
+++ b/lib/jekyll/commands/build.rb
@@ -66,7 +66,7 @@ module Jekyll
         #
         # Returns nothing.
         def watch(site, options)
-          Deprecator.gracefully_require 'jekyll-watch'
+          External.require_with_graceful_fail 'jekyll-watch'
           Jekyll::Watcher.watch(options)
         end
 
diff --git a/lib/jekyll/converters/markdown/rdiscount_parser.rb b/lib/jekyll/converters/markdown/rdiscount_parser.rb
index 0c8634e4b..fb5172e7a 100644
--- a/lib/jekyll/converters/markdown/rdiscount_parser.rb
+++ b/lib/jekyll/converters/markdown/rdiscount_parser.rb
@@ -3,7 +3,7 @@ module Jekyll
     class Markdown
       class RDiscountParser
         def initialize(config)
-          Jekyll::Deprecator.gracefully_require "rdiscount"
+          Jekyll::External.require_with_graceful_fail "rdiscount"
           @config = config
           @rdiscount_extensions = @config['rdiscount']['extensions'].map { |e| e.to_sym }
         end
diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb
index 468069e94..3be60739d 100644
--- a/lib/jekyll/converters/markdown/redcarpet_parser.rb
+++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb
@@ -14,7 +14,7 @@ module Jekyll
         module WithPygments
           include CommonMethods
           def block_code(code, lang)
-            Jekyll::Deprecator.gracefully_require("pygments")
+            Jekyll::External.require_with_graceful_fail("pygments")
             lang = lang && lang.split.first || "text"
             add_code_tags(
               Pygments.highlight(code, :lexer => lang, :options => { :encoding => 'utf-8' }),
@@ -55,7 +55,7 @@ module Jekyll
 
 
         def initialize(config)
-          Deprecator.gracefully_require("redcarpet")
+          External.require_with_graceful_fail("redcarpet")
           @config = config
           @redcarpet_extensions = {}
           @config['redcarpet']['extensions'].each { |e| @redcarpet_extensions[e.to_sym] = true }
@@ -71,7 +71,7 @@ module Jekyll
             end
           when "rouge"
             Class.new(Redcarpet::Render::HTML) do
-              Jekyll::Deprecator.gracefully_require(%w[
+              Jekyll::External.require_with_graceful_fail(%w[
                 rouge
                 rouge/plugins/redcarpet
               ])
diff --git a/lib/jekyll/deprecator.rb b/lib/jekyll/deprecator.rb
index 8e4daf9cc..9ec5857e1 100644
--- a/lib/jekyll/deprecator.rb
+++ b/lib/jekyll/deprecator.rb
@@ -40,22 +40,5 @@ module Jekyll
       Jekyll.logger.warn "Defaults:", "Please update your front-matter defaults to use 'type: #{current}'."
     end
 
-    def gracefully_require(gem_name)
-      Array(gem_name).each do |name|
-        begin
-          require name
-        rescue LoadError => e
-          Jekyll.logger.error "Dependency Error:", <<-MSG
-  Yikes! It looks like you don't have #{name} or one of its dependencies installed.
-  In order to use Jekyll as currently configured, you'll need to install this gem.
-
-  The full error message from Ruby is: '#{e.message}'
-
-  If you run into trouble, you can find helpful resources at http://jekyllrb.com/help/!
-MSG
-          raise Errors::MissingDependencyException.new(name)
-        end
-      end
-    end
   end
 end

From 1fad3a074f2f64bf30dfabe369b63934e47a8d74 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 28 Dec 2014 23:35:54 -0500
Subject: [PATCH 088/407] Update history to reflect merge of #3241 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index eb3780764..de11e647b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -9,6 +9,7 @@
 ### Minor Enhancements
 
   * Sort static files just once, and call `site_payload` once for all collections (#3204)
+  * Separate `jekyll docs` and optimize external gem handling (#3241)
 
 ### Bug Fixes
 

From eac3ac095fd32b21c5bf626974e80536b27f9650 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 28 Dec 2014 23:36:37 -0500
Subject: [PATCH 089/407] Update history to reflect merge of #3240 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index de11e647b..0c2e9d9c3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -10,6 +10,7 @@
 
   * Sort static files just once, and call `site_payload` once for all collections (#3204)
   * Separate `jekyll docs` and optimize external gem handling (#3241)
+  * Improve `Site#getConverterImpl` and call it `Site#find_converter_instance` (#3240)
 
 ### Bug Fixes
 

From 928be16fabf7aad9ddc40333a9529d2b9102fdfc Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 25 Dec 2014 14:28:03 -0500
Subject: [PATCH 090/407] Add Ruby 2.2 to Travis build matrix.

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

diff --git a/.travis.yml b/.travis.yml
index 72f0752d7..d8ba31005 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
+- 2.2
 - 2.1
 - 2.0
 env:

From be23e18555b1deb97cbdeea72778810966c01286 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 28 Dec 2014 23:54:03 -0500
Subject: [PATCH 091/407] Say 'since 2.0'

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

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 83ab283c5..58755f9ec 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -457,7 +457,7 @@ module Jekyll
 
     def relative_permalinks_deprecation_method
       if config['relative_permalinks'] && has_relative_page?
-        Jekyll.logger.warn "Deprecation:", "Starting in 2.0, permalinks for pages" +
+        Jekyll.logger.warn "Deprecation:", "Since v2.0, permalinks for pages" +
                                             " in subfolders must be relative to the" +
                                             " site source directory, not the parent" +
                                             " directory. Check http://jekyllrb.com/docs/upgrading/"+

From 5af7694f3b502e963fcc065c2712271b3d935f5c Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 00:23:57 -0500
Subject: [PATCH 092/407] Update history to reflect merge of #2790 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0c2e9d9c3..33bb468d5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -22,6 +22,7 @@
 ### Site Enhancements
 
   * Fixing the default host on docs (#3229)
+  * Add `jekyll-thumbnail-filter` to list of third-party plugins (#2790)
 
 ## 2.5.3 / 2014-12-22
 

From 191c2279d24ba8137baa18f29314a8863482343a Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 00:26:58 -0500
Subject: [PATCH 093/407] Update history to reflect merge of #2908 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 33bb468d5..a4a676f76 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
   * Sort static files just once, and call `site_payload` once for all collections (#3204)
   * Separate `jekyll docs` and optimize external gem handling (#3241)
   * Improve `Site#getConverterImpl` and call it `Site#find_converter_instance` (#3240)
+  * Use relative path for `path` Liquid variable in Documents for consistency (#2908)
 
 ### Bug Fixes
 

From 004f923644f16dba949143e92d0c74149d6140f5 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 18 Oct 2014 13:17:12 -0700
Subject: [PATCH 094/407] Revert "Revert "Make permalink parsing consistent
 with pages""

---
 features/permalinks.feature | 4 ++--
 lib/jekyll/post.rb          | 2 +-
 test/test_post.rb           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/permalinks.feature b/features/permalinks.feature
index 67dfbb471..c4494b4eb 100644
--- a/features/permalinks.feature
+++ b/features/permalinks.feature
@@ -39,7 +39,7 @@ Feature: Fancy permalinks
     And I have the following post:
       | title                   | category | date       | content         |
       | Custom Permalink Schema | stuff    | 2009-03-27 | Totally custom. |
-    And I have a configuration file with "permalink" set to "/blog/:year/:month/:day/:title"
+    And I have a configuration file with "permalink" set to "/blog/:year/:month/:day/:title/"
     When I run jekyll build
     Then the _site directory should exist
     And I should see "Totally custom." in "_site/blog/2009/03/27/custom-permalink-schema/index.html"
@@ -68,7 +68,7 @@ Feature: Fancy permalinks
     Given I have a _posts directory
     And I have the following post:
       | title     | date       | permalink       | content |
-      | Some post | 2013-04-14 | /custom/posts/1 | bla bla |
+      | Some post | 2013-04-14 | /custom/posts/1/ | bla bla |
     When I run jekyll build
     Then the _site directory should exist
     And the _site/custom/posts/1 directory should exist
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index c377e376e..7d11b0bff 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -269,7 +269,7 @@ module Jekyll
     def destination(dest)
       # The url needs to be unescaped in order to preserve the correct filename
       path = site.in_dest_dir(dest, URL.unescape_path(url))
-      path = File.join(path, "index.html") if path[/\.html?$/].nil?
+      path = File.join(path, "index.html") if self.url =~ /\/$/
       path
     end
 
diff --git a/test/test_post.rb b/test/test_post.rb
index 2592b9185..e6ecdaf3c 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -592,7 +592,7 @@ class TestPost < Test::Unit::TestCase
 
         should "write properly without html extension" do
           post = setup_post("2008-10-18-foo-bar.textile")
-          post.site.permalink_style = ":title"
+          post.site.permalink_style = ":title/"
           do_render(post)
           post.write(dest_dir)
 

From 6f7ea381b303892a2beca0078121cb9d8fc7f55f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 00:31:53 -0500
Subject: [PATCH 095/407] Update history to reflect merge of #3047 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a4a676f76..5ffd37950 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,7 @@
   * Separate `jekyll docs` and optimize external gem handling (#3241)
   * Improve `Site#getConverterImpl` and call it `Site#find_converter_instance` (#3240)
   * Use relative path for `path` Liquid variable in Documents for consistency (#2908)
+  * Generalize Utils#slugify for any scripts (#3047)
 
 ### Bug Fixes
 

From bab7ef4b1debc7611b9433beb46f1f0e25fd851d Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 00:32:14 -0500
Subject: [PATCH 096/407] Use backticks here. [ci skip].

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

diff --git a/History.markdown b/History.markdown
index 5ffd37950..e06343817 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,7 +12,7 @@
   * Separate `jekyll docs` and optimize external gem handling (#3241)
   * Improve `Site#getConverterImpl` and call it `Site#find_converter_instance` (#3240)
   * Use relative path for `path` Liquid variable in Documents for consistency (#2908)
-  * Generalize Utils#slugify for any scripts (#3047)
+  * Generalize `Utils#slugify` for any scripts (#3047)
 
 ### Bug Fixes
 

From a6781bda303dca2b6b48dc20ee12c50d89cddef8 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 00:37:16 -0500
Subject: [PATCH 097/407] Always, always rebuild (by default) in tests.

---
 test/helper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/helper.rb b/test/helper.rb
index 48bfc746b..132b1f620 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -35,7 +35,8 @@ class Test::Unit::TestCase
   def site_configuration(overrides = {})
     full_overrides = build_configs(overrides, build_configs({"destination" => dest_dir}))
     build_configs({
-      "source"      => source_dir,
+      "source"       => source_dir,
+      "full_rebuild" => true
     }, full_overrides)
   end
 

From d7d7d924f7999a9e34b6846bbdb030bb55285dc5 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 00:50:12 -0500
Subject: [PATCH 098/407] Update history to reflect merge of #3189 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e06343817..f2d400349 100644
--- a/History.markdown
+++ b/History.markdown
@@ -13,6 +13,7 @@
   * Improve `Site#getConverterImpl` and call it `Site#find_converter_instance` (#3240)
   * Use relative path for `path` Liquid variable in Documents for consistency (#2908)
   * Generalize `Utils#slugify` for any scripts (#3047)
+  * Added basic microdata to post template in site template (#3189)
 
 ### Bug Fixes
 

From 5f03314d85a4d8bd45e691721e675546078d50ef Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 00:50:57 -0500
Subject: [PATCH 099/407] Update history to reflect merge of #3186 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f2d400349..574d3c091 100644
--- a/History.markdown
+++ b/History.markdown
@@ -26,6 +26,7 @@
 
   * Fixing the default host on docs (#3229)
   * Add `jekyll-thumbnail-filter` to list of third-party plugins (#2790)
+  * Add link to 'Adding Ajax pagination to Jekyll' to Resources page (#3186)
 
 ## 2.5.3 / 2014-12-22
 

From e0a011c917f8bc1a7751a23f2cbbca2788cd7c67 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 00:52:47 -0500
Subject: [PATCH 100/407] Update history to reflect merge of #3185 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 574d3c091..cced5730d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -27,6 +27,7 @@
   * Fixing the default host on docs (#3229)
   * Add `jekyll-thumbnail-filter` to list of third-party plugins (#2790)
   * Add link to 'Adding Ajax pagination to Jekyll' to Resources page (#3186)
+  * Add a Resources link to tutorial on building dynamic navbars (#3185)
 
 ## 2.5.3 / 2014-12-22
 

From b2146e865992a143b1305c9e0a87025f061c1051 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 22 Jul 2014 14:08:11 -0400
Subject: [PATCH 101/407] Store log messages in an array of messages.

---
 lib/jekyll/log_adapter.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/log_adapter.rb b/lib/jekyll/log_adapter.rb
index 63e23fcd2..88a90d26e 100644
--- a/lib/jekyll/log_adapter.rb
+++ b/lib/jekyll/log_adapter.rb
@@ -87,7 +87,9 @@ module Jekyll
     #
     # Returns the formatted message
     def message(topic, message)
-      formatted_topic(topic) + message.to_s.gsub(/\s+/, ' ')
+      msg = formatted_topic(topic) + message.to_s.gsub(/\s+/, ' ')
+      messages << msg
+      msg
     end
 
     # Internal: Format the topic
@@ -98,5 +100,12 @@ module Jekyll
     def formatted_topic(topic)
       "#{topic} ".rjust(20)
     end
+
+    # Public: All the messages Stevenson has printed so far
+    #
+    # Returns an Array of all messages Stevenson has built so far using #message
+    def messages
+      @messages ||= Array.new
+    end
   end
 end

From 7fc47bfc4367da1612c02760e67d2e61c42708a3 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 01:08:42 -0500
Subject: [PATCH 102/407] Initialize @messages at instantiation time.

---
 lib/jekyll/log_adapter.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/jekyll/log_adapter.rb b/lib/jekyll/log_adapter.rb
index 88a90d26e..46e0fe1fb 100644
--- a/lib/jekyll/log_adapter.rb
+++ b/lib/jekyll/log_adapter.rb
@@ -1,6 +1,6 @@
 module Jekyll
   class LogAdapter
-    attr_reader :writer
+    attr_reader :writer, :messages
 
     LOG_LEVELS = {
       :debug => ::Logger::DEBUG,
@@ -16,6 +16,7 @@ module Jekyll
     #
     # Returns nothing
     def initialize(writer, level = :info)
+      @messages = []
       @writer = writer
       self.log_level = level
     end
@@ -100,12 +101,5 @@ module Jekyll
     def formatted_topic(topic)
       "#{topic} ".rjust(20)
     end
-
-    # Public: All the messages Stevenson has printed so far
-    #
-    # Returns an Array of all messages Stevenson has built so far using #message
-    def messages
-      @messages ||= Array.new
-    end
   end
 end

From 1fc99bdd9772d9c52ffc4d2aebdd04a998333f6b Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 01:14:13 -0500
Subject: [PATCH 103/407] Test LogAdapter#messages

---
 test/test_log_adapter.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/test/test_log_adapter.rb b/test/test_log_adapter.rb
index 3dd3465ea..712725694 100644
--- a/test/test_log_adapter.rb
+++ b/test/test_log_adapter.rb
@@ -3,6 +3,11 @@ require 'helper'
 class TestLogAdapter < Test::Unit::TestCase
   class LoggerDouble
     attr_accessor :level
+
+    def debug(*); end
+    def info(*); end
+    def warn(*); end
+    def error(*); end
   end
 
   context "#log_level=" do
@@ -56,4 +61,20 @@ class TestLogAdapter < Test::Unit::TestCase
       assert_raise(SystemExit) { logger.abort_with('topic', 'log message') }
     end
   end
+
+  context "#messages" do
+    should "return an array" do
+      assert_equal [], Jekyll::LogAdapter.new(LoggerDouble.new).messages
+    end
+
+    should "store each log value in the array" do
+      logger = Jekyll::LogAdapter.new(LoggerDouble.new)
+      values = %w{one two three four}
+      logger.debug(values[0])
+      logger.info(values[1])
+      logger.warn(values[2])
+      logger.error(values[3])
+      assert_equal values.map { |value| "#{value} ".rjust(20) }, logger.messages
+    end
+  end
 end

From 7f034f51e3d2d508a3a7942928b9eb19bad83bd7 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 02:16:04 -0500
Subject: [PATCH 104/407] Improvments to script/stackprof. [ci skip]

---
 script/stackprof | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/stackprof b/script/stackprof
index e0e2d4dbc..3399616f2 100755
--- a/script/stackprof
+++ b/script/stackprof
@@ -6,11 +6,11 @@ export BENCHMARK=true
 command -v stackprof > /dev/null || script/bootstrap
 
 TEST_SCRIPT="Jekyll::Commands::Build.process({'source' => 'site'})"
-PROF_OUTPUT_FILE=tmp/stackprof-$(date +%Y%m%d).dump
+PROF_OUTPUT_FILE=tmp/stackprof-$(date +%Y%m%d%H%M).dump
 
 test -f "$PROF_OUTPUT_FILE" || {
   bundle exec ruby -r./lib/jekyll -rstackprof \
-    -e "StackProf.run(mode: :cpu, out: '${PROF_OUTPUT_FILE}') { ${TEST_SCRIPT} }"
+    -e "StackProf.run(mode: :cpu, interval: 100, out: '${PROF_OUTPUT_FILE}') { ${TEST_SCRIPT} }"
 }
 
 bundle exec stackprof $PROF_OUTPUT_FILE $@

From 5e10958faab58d6f380f4b17aa0032aa5a6284ed Mon Sep 17 00:00:00 2001
From: nitoyon <nitoyon@gmail.com>
Date: Mon, 15 Sep 2014 02:20:09 +0900
Subject: [PATCH 105/407] Unescape Document output path

Document#destination wasn't unescaped properly.

For example, when we have a document named '_langs/c#.md',
we expect its url to be '/langs/c#.html',
but it was actually '/langs/c%23.html'.

We now unecape URL at Document#destination like Post#destination and
Page#destination.
---
 features/collections.feature            | 12 +++++-----
 lib/jekyll/document.rb                  |  2 +-
 test/source/_methods/escape-+ #%20[].md |  5 +++++
 test/test_collections.rb                |  1 +
 test/test_document.rb                   | 30 +++++++++++++++++++++++++
 5 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 test/source/_methods/escape-+ #%20[].md

diff --git a/features/collections.feature b/features/collections.feature
index 4f69e8b95..1cdbff4b8 100644
--- a/features/collections.feature
+++ b/features/collections.feature
@@ -9,7 +9,7 @@ Feature: Collections
     And I have a configuration file with "collections" set to "['methods']"
     When I run jekyll build
     Then the _site directory should exist
-    And I should see "Collections: <p>Use <code>Jekyll.configuration</code> to build a full configuration for use w/Jekyll.</p>\n\n<p>Whatever: foo.bar</p>\n<p><code>Jekyll.sanitized_path</code> is used to make sure your path is in your source.</p>\n<p>Run your generators! default</p>\n<p>Page without title.</p>\n<p>Run your generators! default</p>" in "_site/index.html"
+    And I should see "Collections: <p>Use <code>Jekyll.configuration</code> to build a full configuration for use w/Jekyll.</p>\n\n<p>Whatever: foo.bar</p>\n<p>Signs are nice</p>\n<p><code>Jekyll.sanitized_path</code> is used to make sure your path is in your source.</p>\n<p>Run your generators! default</p>\n<p>Page without title.</p>\n<p>Run your generators! default</p>" in "_site/index.html"
     And the "_site/methods/configuration.html" file should not exist
 
   Scenario: Rendered collection
@@ -70,7 +70,7 @@ Feature: Collections
     """
     When I run jekyll build
     Then the _site directory should exist
-    And I should see "Collections: _methods/configuration.md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
+    And I should see "Collections: _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
 
   Scenario: Collections specified as an hash
     Given I have an "index.html" page that contains "Collections: {% for method in site.methods %}{{ method.relative_path }} {% endfor %}"
@@ -82,7 +82,7 @@ Feature: Collections
     """
     When I run jekyll build
     Then the _site directory should exist
-    And I should see "Collections: _methods/configuration.md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
+    And I should see "Collections: _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
 
   Scenario: All the documents
     Given I have an "index.html" page that contains "All documents: {% for doc in site.documents %}{{ doc.relative_path }} {% endfor %}"
@@ -94,7 +94,7 @@ Feature: Collections
     """
     When I run jekyll build
     Then the _site directory should exist
-    And I should see "All documents: _methods/configuration.md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
+    And I should see "All documents: _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
 
   Scenario: Documents have an output attribute, which is the converted HTML
     Given I have an "index.html" page that contains "First document's output: {{ site.documents.first.output }}"
@@ -130,7 +130,7 @@ Feature: Collections
     """
     When I run jekyll build
     Then the _site directory should exist
-    And I should see "1. of 5: <p>Page without title.</p>" in "_site/index.html"
+    And I should see "1. of 6: <p>Page without title.</p>" in "_site/index.html"
 
   Scenario: Sort by relative_path
     Given I have an "index.html" page that contains "Collections: {% assign methods = site.methods | sort: 'relative_path' %}{% for method in methods %}{{ method.title }}, {% endfor %}"
@@ -142,4 +142,4 @@ Feature: Collections
     """
     When I run jekyll build
     Then the _site directory should exist
-    And I should see "Collections: Jekyll.configuration, Jekyll.sanitized_path, Site#generate, , Site#generate," in "_site/index.html"
+    And I should see "Collections: Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, , Site#generate," in "_site/index.html"
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 31317a46a..f01c15e21 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -167,7 +167,7 @@ module Jekyll
     # Returns the full path to the output file of this document.
     def destination(base_directory)
       dest = site.in_dest_dir(base_directory)
-      path = site.in_dest_dir(dest, url)
+      path = site.in_dest_dir(dest, URL.unescape_path(url))
       path = File.join(path, "index.html") if url =~ /\/$/
       path
     end
diff --git a/test/source/_methods/escape-+ #%20[].md b/test/source/_methods/escape-+ #%20[].md
new file mode 100644
index 000000000..528317a74
--- /dev/null
+++ b/test/source/_methods/escape-+ #%20[].md	
@@ -0,0 +1,5 @@
+---
+title: "Jekyll.escape"
+---
+
+Signs are nice
diff --git a/test/test_collections.rb b/test/test_collections.rb
index 1975e402c..e9f324eea 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -138,6 +138,7 @@ class TestCollections < Test::Unit::TestCase
           _methods/site/generate.md
           _methods/site/initialize.md
           _methods/um_hi.md
+          _methods/escape-+\ #%20[].md
         ], doc.relative_path
       end
     end
diff --git a/test/test_document.rb b/test/test_document.rb
index a4543148c..7ba17b04f 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -275,4 +275,34 @@ class TestDocument < Test::Unit::TestCase
     end
   end
 
+  context "a document in a collection with non-alphabetic file name" do
+    setup do
+      @site = Site.new(Jekyll.configuration({
+        "collections" => {
+          "methods" => {
+            "output" => true
+          }
+        },
+        "source"      => source_dir,
+        "destination" => dest_dir
+      }))
+      @site.process
+      @document = @site.collections["methods"].docs.find { |doc| doc.relative_path == "_methods/escape-+ #%20[].md" }
+      @dest_file = dest_dir("methods/escape-+ #%20[].html")
+    end
+
+    should "produce the right URL" do
+      assert_equal "/methods/escape-+%20%23%2520%5B%5D.html", @document.url
+    end
+
+    should "produce the right destination" do
+      assert_equal @dest_file, @document.destination(dest_dir)
+    end
+
+    should "be output in the correct place" do
+      assert_equal true, File.file?(@dest_file)
+    end
+
+  end
+
 end

From cb95a72f5a70fc0eda5d38320f1dac74aa4227f5 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 18:00:54 -0500
Subject: [PATCH 106/407] Update history to reflect merge of #2924 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index cced5730d..1a948269e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
 
   * Remove unneeded end tag for `link` in site template (#3236)
   * Kramdown: Use `enable_coderay` key instead of `use_coderay` (#3237)
+  * Unescape `Document` output path (#2924)
 
 ### Development Fixes
 

From f66862c508d5405006639c3dd63b4322b9483e30 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 25 Dec 2014 14:35:45 -0500
Subject: [PATCH 107/407] Install rake if the lib isn't there; upgrade to
 cucumber 1.3.18

---
 Gemfile                                   |  4 ++--
 features/markdown.feature                 |  2 +-
 features/site_configuration.feature       |  2 +-
 features/step_definitions/jekyll_steps.rb |  1 +
 script/bootstrap                          |  2 +-
 script/cucumber                           |  3 +++
 script/test                               | 10 +++++++++-
 7 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index c79afe7ce..2bc6abc32 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem 'rdoc', '~> 3.11'
 gem 'redgreen', '~> 1.2'
 gem 'shoulda', '~> 3.5'
 gem 'rr', '~> 1.1'
-gem 'cucumber', '1.3.11'
+gem 'cucumber', '1.3.18'
 gem 'RedCloth', '~> 4.2'
 gem 'maruku', '~> 0.7.0'
 gem 'rdiscount', '~> 1.6'
@@ -20,7 +20,7 @@ gem 'jekyll_test_plugin_malicious'
 gem 'rouge', '~> 1.7'
 gem 'liquid-c', '~> 0.0.3'
 gem 'minitest' if RUBY_PLATFORM =~ /cygwin/
-gem 'test-unit' if RUBY_PLATFORM =~ /cygwin/
+gem 'test-unit' if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2")
 
 if ENV['BENCHMARK']
   gem 'rbtrace'
diff --git a/features/markdown.feature b/features/markdown.feature
index 659eed0fa..895c927ad 100644
--- a/features/markdown.feature
+++ b/features/markdown.feature
@@ -47,7 +47,7 @@ Feature: Markdown
     And I should see "My awesome code" in "_site/index.html"
     And I should see "<pre><code>My awesome code</code></pre>" in "_site/index.html"
 
-  Scenario: Maruku fenced codeblocks
+  Scenario: Maruku fenced codeblocks with syntax highlighting
     Given I have a configuration file with "markdown" set to "maruku"
     And I have an "index.markdown" file with content:
        """
diff --git a/features/site_configuration.feature b/features/site_configuration.feature
index 1d067f0c9..13dd7aa12 100644
--- a/features/site_configuration.feature
+++ b/features/site_configuration.feature
@@ -180,7 +180,7 @@ Feature: Site configuration
       And I have an "index.html" page with layout "page" that contains "site index page"
       And I have a configuration file with:
         | key         | value               |
-        | timezone    | Australia/Melbourne |
+        | timezone    | Australia/Sydney |
       And I have a _posts directory
       And I have the following posts:
         | title     | date                   | layout  | content             |
diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index 069f93b0f..3b77d03b0 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -24,6 +24,7 @@ end
 After do
   FileUtils.rm_rf(TEST_DIR)   if File.exist?(TEST_DIR)
   FileUtils.rm(JEKYLL_COMMAND_OUTPUT_FILE) if File.exist?(JEKYLL_COMMAND_OUTPUT_FILE)
+  Dir.chdir(File.dirname(TEST_DIR))
 end
 
 World(Test::Unit::Assertions)
diff --git a/script/bootstrap b/script/bootstrap
index 097f3e27f..997560464 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 script/branding
-bundle install
+bundle install -j8
diff --git a/script/cucumber b/script/cucumber
index c69573560..aeb9032d3 100755
--- a/script/cucumber
+++ b/script/cucumber
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+ls /usr/share/zoneinfo
+ls /usr/share/zoneinfo/Australia
+
 time bundle exec cucumber \
   -f Features::Support::Overview \
   "$@"
diff --git a/script/test b/script/test
index 7bb742ef9..52dc4b927 100755
--- a/script/test
+++ b/script/test
@@ -10,7 +10,15 @@ else
   TEST_FILES="$@"
 fi
 
-RAKE_LIB_DIR=$(ruby -e "puts Gem::Specification.find_by_name('rake').gem_dir + '/lib'")
+# bundle exec gem env
+GEM_DIR=$(bundle exec gem env | grep -C 1 "GEM PATHS" | tail -1 | cut -d '-' -f2 | cut -d' ' -f2)
+RAKE_LIB_WITH_VERSION=$(bundle exec ruby -e "puts Gem::Specification.find_by_name('rake').gem_dir.split('/').last + '/lib'")
+RAKE_LIB_DIR="${GEM_DIR}/gems/${RAKE_LIB_WITH_VERSION}"
+
+test -d "${RAKE_LIB_DIR}" || {
+  echo "No ${RAKE_LIB_DIR}. Installing Rake."
+  bundle show rake | cut -d'/' -f12 | cut -d'-' -f 2 | xargs bundle exec gem install rake -v
+}
 
 set -x
 

From 7bcf8d689ef28b2d07e7196371ec1854f50c8f2a Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 19:15:19 -0500
Subject: [PATCH 108/407] Always call Time#localtime to translate to TZ'd time.

---
 features/site_configuration.feature       |  2 +-
 features/step_definitions/jekyll_steps.rb | 10 +++++++++-
 features/support/env.rb                   | 11 +++++++++++
 lib/jekyll/filters.rb                     |  2 +-
 lib/jekyll/utils.rb                       |  2 +-
 script/cucumber                           |  3 ---
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/features/site_configuration.feature b/features/site_configuration.feature
index 13dd7aa12..1d067f0c9 100644
--- a/features/site_configuration.feature
+++ b/features/site_configuration.feature
@@ -180,7 +180,7 @@ Feature: Site configuration
       And I have an "index.html" page with layout "page" that contains "site index page"
       And I have a configuration file with:
         | key         | value               |
-        | timezone    | Australia/Sydney |
+        | timezone    | Australia/Melbourne |
       And I have a _posts directory
       And I have the following posts:
         | title     | date                   | layout  | content             |
diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index 3b77d03b0..98f14ad15 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -193,7 +193,15 @@ Then /^I should see escaped "(.*)" in "(.*)"$/ do |text, file|
 end
 
 Then /^the "(.*)" file should +exist$/ do |file|
-  assert File.file?(file), "The file \"#{file}\" does not exist"
+  file_does_exist = File.file?(file)
+  unless file_does_exist
+    all_steps_to_path(file).each do |dir|
+      STDERR.puts ""
+      STDERR.puts "Dir #{dir}:"
+      STDERR.puts Dir["#{dir}/**/*"]
+    end
+  end
+  assert file_does_exist, "The file \"#{file}\" does not exist.\n"
 end
 
 Then /^the "(.*)" file should not exist$/ do |file|
diff --git a/features/support/env.rb b/features/support/env.rb
index ba4555fec..e995ba9b3 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -13,6 +13,17 @@ def source_dir(*files)
   File.join(TEST_DIR, *files)
 end
 
+def all_steps_to_path(path)
+  source = Pathname.new(source_dir('_site')).expand_path
+  dest   = Pathname.new(path).expand_path
+  paths  = []
+  dest.ascend do |f|
+    break if f.eql? source
+    paths.unshift f.to_s
+  end
+  paths
+end
+
 def jekyll_output_file
   JEKYLL_COMMAND_OUTPUT_FILE
 end
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 17a4142b4..fca03437c 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -309,7 +309,7 @@ module Jekyll
       else
         Jekyll.logger.error "Invalid Date:", "'#{input}' is not a valid datetime."
         exit(1)
-      end
+      end.localtime
     end
 
     def groupable?(element)
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 34861593a..0291c2e99 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -90,7 +90,7 @@ module Jekyll
     # Returns the parsed date if successful, throws a FatalException
     # if not
     def parse_date(input, msg = "Input could not be parsed.")
-      Time.parse(input)
+      Time.parse(input).localtime
     rescue ArgumentError
       raise Errors::FatalException.new("Invalid date '#{input}': " + msg)
     end
diff --git a/script/cucumber b/script/cucumber
index aeb9032d3..c69573560 100755
--- a/script/cucumber
+++ b/script/cucumber
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-ls /usr/share/zoneinfo
-ls /usr/share/zoneinfo/Australia
-
 time bundle exec cucumber \
   -f Features::Support::Overview \
   "$@"

From 9109da32f9c329219bf84cfc0f2192a2c5075e21 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 20:44:10 -0500
Subject: [PATCH 109/407] Update test for the date() Liquid filter.

---
 test/test_filters.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/test_filters.rb b/test/test_filters.rb
index a9fc951db..659b7a849 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -72,11 +72,11 @@ class TestFilters < Test::Unit::TestCase
         end
 
         should "format a time with xmlschema" do
-          assert_equal "2013-03-27T11:22:33Z", @filter.date_to_xmlschema(@sample_time)
+          assert_equal "2013-03-27T11:22:33+00:00", @filter.date_to_xmlschema(@sample_time)
         end
 
         should "format a time according to RFC-822" do
-          assert_equal "Wed, 27 Mar 2013 11:22:33 -0000", @filter.date_to_rfc822(@sample_time)
+          assert_equal "Wed, 27 Mar 2013 11:22:33 +0000", @filter.date_to_rfc822(@sample_time)
         end
       end
 
@@ -90,11 +90,11 @@ class TestFilters < Test::Unit::TestCase
         end
 
         should "format a time with xmlschema" do
-          assert_equal "2001-09-11T12:46:30Z", @filter.date_to_xmlschema(@time_as_string)
+          assert_equal "2001-09-11T12:46:30+00:00", @filter.date_to_xmlschema(@time_as_string)
         end
 
         should "format a time according to RFC-822" do
-          assert_equal "Tue, 11 Sep 2001 12:46:30 -0000", @filter.date_to_rfc822(@time_as_string)
+          assert_equal "Tue, 11 Sep 2001 12:46:30 +0000", @filter.date_to_rfc822(@time_as_string)
         end
       end
 

From 419aaba07cb9237e9f7a28d34f9516bf1136fbc2 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 20:48:31 -0500
Subject: [PATCH 110/407] Update history to reflect merge of #3244 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1a948269e..e11ea568d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -14,6 +14,7 @@
   * Use relative path for `path` Liquid variable in Documents for consistency (#2908)
   * Generalize `Utils#slugify` for any scripts (#3047)
   * Added basic microdata to post template in site template (#3189)
+  * Store log messages in an array of messages. (#3244)
 
 ### Bug Fixes
 

From e40e12fabd33fd6b9997e09ef7c022b61be05593 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 20:49:25 -0500
Subject: [PATCH 111/407] Update history to reflect merge of #3234 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e11ea568d..1c73ded3d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -5,6 +5,7 @@
   * Incremental regeneration (#3116)
   * Drop support for Ruby 1.9.3. (#3235)
   * Upgrade to Liquid 3.0.0 (#3002)
+  * Support Ruby v2.2 (#3234)
 
 ### Minor Enhancements
 

From 07bd3a3759d8f5b6a4854239cff347b5b23c581f Mon Sep 17 00:00:00 2001
From: Jesse Pinho <jesse@jessepinho.com>
Date: Thu, 1 Jan 2015 23:58:27 -0600
Subject: [PATCH 112/407] Clarify paragraph on the return value of `generate`

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

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 605cbf684..b5cf9543c 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -66,11 +66,8 @@ based on your own rules.
 
 A generator is a subclass of `Jekyll::Generator` that defines a `generate`
 method, which receives an instance of
-[`Jekyll::Site`]({{ site.repository }}/blob/master/lib/jekyll/site.rb).
-
-The return value of `generate` is ignored, since generation is triggered for
-its side effects. Jekyll does not expect any particular side effect to
-happen---it just runs the method.
+[`Jekyll::Site`]({{ site.repository }}/blob/master/lib/jekyll/site.rb). The
+return value of `generate` is ignored.
 
 Generators run after Jekyll has made an inventory of the existing content, and
 before the site is generated. Pages with YAML Front Matters are stored as

From 21bd3e6c5a996e207af7dd9fc8fb9e7a44a4c603 Mon Sep 17 00:00:00 2001
From: Seth Warburton <seth@internet-inspired.com>
Date: Fri, 2 Jan 2015 12:14:58 +0000
Subject: [PATCH 113/407] [imp] Semantic structure improvements

---
 lib/site_template/_layouts/page.html | 8 ++++----
 lib/site_template/_layouts/post.html | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/site_template/_layouts/page.html b/lib/site_template/_layouts/page.html
index 74c1a1184..ce233ad75 100644
--- a/lib/site_template/_layouts/page.html
+++ b/lib/site_template/_layouts/page.html
@@ -1,14 +1,14 @@
 ---
 layout: default
 ---
-<div class="post">
+<article class="post">
 
   <header class="post-header">
     <h1 class="post-title">{{ page.title }}</h1>
   </header>
 
-  <article class="post-content">
+  <div class="post-content">
     {{ content }}
-  </article>
+  </div>
 
-</div>
+</article>
diff --git a/lib/site_template/_layouts/post.html b/lib/site_template/_layouts/post.html
index 5a072b3ef..d34c02d20 100644
--- a/lib/site_template/_layouts/post.html
+++ b/lib/site_template/_layouts/post.html
@@ -1,15 +1,15 @@
 ---
 layout: default
 ---
-<div class="post"  itemscope itemtype="http://schema.org/BlogPosting">
+<article class="post"  itemscope itemtype="http://schema.org/BlogPosting">
 
   <header class="post-header">
     <h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>
     <p class="post-meta"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time>{% if page.author %} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
   </header>
 
-  <article class="post-content" itemprop="articleBody">
+  <div class="post-content" itemprop="articleBody">
     {{ content }}
-  </article>
+  </div>
 
-</div>
+</article>

From 86f7196ef51d31eb886910c8ecd3d9c232f119c7 Mon Sep 17 00:00:00 2001
From: Matt Rogers <codemattr@gmail.com>
Date: Fri, 2 Jan 2015 13:27:07 -0600
Subject: [PATCH 114/407] Update history to reflect merge of #3251 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1c73ded3d..c44857d71 100644
--- a/History.markdown
+++ b/History.markdown
@@ -31,6 +31,7 @@
   * Add `jekyll-thumbnail-filter` to list of third-party plugins (#2790)
   * Add link to 'Adding Ajax pagination to Jekyll' to Resources page (#3186)
   * Add a Resources link to tutorial on building dynamic navbars (#3185)
+  * Semantic structure improvements to the post and page layouts (#3251)
 
 ## 2.5.3 / 2014-12-22
 

From d29dd11ae33e1c6c999147b9862fb9d0eddeffa4 Mon Sep 17 00:00:00 2001
From: Matt Rogers <codemattr@gmail.com>
Date: Fri, 2 Jan 2015 13:38:59 -0600
Subject: [PATCH 115/407] Update history to reflect merge of #3233 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c44857d71..d7c5ef6e3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,8 @@
 
 ### Development Fixes
 
+  * Improve the grammar in the documentation (#3233)
+
 ### Site Enhancements
 
   * Fixing the default host on docs (#3229)

From d159684f87c97e4c5edbec4a0df21ed4480dfbce Mon Sep 17 00:00:00 2001
From: Suriyaa Kudo <SuriyaaKudoIsc@users.noreply.github.com>
Date: Sat, 3 Jan 2015 11:59:24 +0100
Subject: [PATCH 116/407] Update LICENSE

---
 LICENSE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/LICENSE b/LICENSE
index 0e5f84407..ce4e011dd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,9 +1,9 @@
-(The MIT License)
+The MIT License (MIT)
 
 Copyright (c) 2008-2014 Tom Preston-Werner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the 'Software'), to deal
+of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
@@ -12,7 +12,7 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

From 51951c43e823294ebc848eaaa8840d65b919e2fb Mon Sep 17 00:00:00 2001
From: Matt Rogers <codemattr@gmail.com>
Date: Sat, 3 Jan 2015 09:49:52 -0600
Subject: [PATCH 117/407] Update history to reflect merge of #3253 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d7c5ef6e3..971455389 100644
--- a/History.markdown
+++ b/History.markdown
@@ -26,6 +26,7 @@
 ### Development Fixes
 
   * Improve the grammar in the documentation (#3233)
+  * Update the LICENSE text to match the MIT license exactly (#3253)
 
 ### Site Enhancements
 

From 7f370cb82f6cd642230fc1ca7954485934d011f7 Mon Sep 17 00:00:00 2001
From: Alan Scherger <flyinprogrammer@gmail.com>
Date: Sat, 3 Jan 2015 19:43:55 -0800
Subject: [PATCH 118/407] Update rake task site:publish to fix minor bugs. * 
 Automate creating gh-pages directory *  Ensure gh-pages dir always has
 correct branch checked out *  Purge gh-pages of files so that a sync of site
 truly occurs *  Ensure dot files are synced *  Be exact with our exclusions
 to eliminate guess work

---
 Rakefile | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/Rakefile b/Rakefile
index 991f63e08..1f5668604 100644
--- a/Rakefile
+++ b/Rakefile
@@ -179,22 +179,32 @@ namespace :site do
     # Ensure the gh-pages dir exists so we can generate into it.
     puts "Checking for gh-pages dir..."
     unless File.exist?("./gh-pages")
-      puts "No gh-pages directory found. Run the following commands first:"
-      puts "  `git clone git@github.com:jekyll/jekyll gh-pages"
-      puts "  `cd gh-pages"
-      puts "  `git checkout gh-pages`"
-      exit(1)
+      puts "Creating gh-pages dir..."
+      sh "git clone git@github.com:jekyll/jekyll gh-pages"
     end
 
-    # Ensure gh-pages branch is up to date.
+    # Ensure latest gh-pages branch history.
     Dir.chdir('gh-pages') do
+      sh "git checkout gh-pages"
       sh "git pull origin gh-pages"
     end
 
-    # Copy to gh-pages dir.
+    # Proceed to purge all files in case we removed a file in this release.
+    puts "Cleaning gh-pages directory..."
+    Dir.glob("gh-pages/{*,.*}") do |path|
+      next if path.eql? "gh-pages/."
+      next if path.eql? "gh-pages/.."
+      next if path.eql? "gh-pages/.git"
+      sh "rm -rf #{path}"
+    end
+
+    # Copy site to gh-pages dir.
     puts "Copying site to gh-pages branch..."
-    Dir.glob("site/*") do |path|
-      next if path.include? "_site"
+    Dir.glob("site/{*,.*}") do |path|
+      next if path.eql? "site/."
+      next if path.eql? "site/.."
+      next if path.eql? "site/.jekyll-metadata"
+      next if path.eql? "site/_site"
       sh "cp -R #{path} gh-pages/"
     end
 

From 2f06f4aad70fb5c46f0eaa1c0d8041cab7d66e85 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 3 Jan 2015 23:06:17 -0800
Subject: [PATCH 119/407] Update history to reflect merge of #3254 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 971455389..6fb5e4695 100644
--- a/History.markdown
+++ b/History.markdown
@@ -27,6 +27,7 @@
 
   * Improve the grammar in the documentation (#3233)
   * Update the LICENSE text to match the MIT license exactly (#3253)
+  * Update rake task `site:publish` to fix minor bugs. (#3254)
 
 ### Site Enhancements
 

From b20a175c27716881e5ecb467559c1b29197ec65a Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Sun, 4 Jan 2015 13:09:16 +0200
Subject: [PATCH 120/407] Switch to shields.io for the README badges.

This way we have consistent badges.

[ci skip]
---
 README.markdown | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.markdown b/README.markdown
index b68166cbd..95c49bd74 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,9 +1,9 @@
 # [Jekyll](http://jekyllrb.com/)
 
-[![Gem Version](https://badge.fury.io/rb/jekyll.svg)](https://rubygems.org/gems/jekyll)
-[![Build Status](https://secure.travis-ci.org/jekyll/jekyll.svg?branch=master)](https://travis-ci.org/jekyll/jekyll)
-[![Code Climate](http://img.shields.io/codeclimate/github/jekyll/jekyll.svg)](https://codeclimate.com/github/jekyll/jekyll)
-[![Dependency Status](https://gemnasium.com/jekyll/jekyll.svg)](https://gemnasium.com/jekyll/jekyll)
+[![Gem Version](https://img.shields.io/gem/v/jekyll.svg)](https://rubygems.org/gems/jekyll)
+[![Build Status](https://img.shields.io/travis/jekyll/jekyll/master.svg)](https://travis-ci.org/jekyll/jekyll)
+[![Code Climate](https://img.shields.io/codeclimate/github/jekyll/jekyll.svg)](https://codeclimate.com/github/jekyll/jekyll)
+[![Dependency Status](https://img.shields.io/gemnasium/jekyll/jekyll.svg)](https://gemnasium.com/jekyll/jekyll)
 [![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)](https://hakiri.io/github/jekyll/jekyll/master)
 
 By Tom Preston-Werner, Nick Quaranto, Parker Moore, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)!

From fc0ea20a8550c927c6753c73f3eecb29197e6b1d Mon Sep 17 00:00:00 2001
From: Alan Scherger <flyinprogrammer@gmail.com>
Date: Sun, 4 Jan 2015 20:46:43 -0800
Subject: [PATCH 121/407] Use FileList instead of Dir.glob

---
 Rakefile | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/Rakefile b/Rakefile
index 1f5668604..31434cd41 100644
--- a/Rakefile
+++ b/Rakefile
@@ -191,20 +191,24 @@ namespace :site do
 
     # Proceed to purge all files in case we removed a file in this release.
     puts "Cleaning gh-pages directory..."
-    Dir.glob("gh-pages/{*,.*}") do |path|
-      next if path.eql? "gh-pages/."
-      next if path.eql? "gh-pages/.."
-      next if path.eql? "gh-pages/.git"
+    purge_exclude = %w[
+      gh-pages/.
+      gh-pages/..
+      gh-pages/.git
+    ]
+    FileList["gh-pages/{*,.*}"].exclude(*purge_exclude).each do |path|
       sh "rm -rf #{path}"
     end
 
     # Copy site to gh-pages dir.
     puts "Copying site to gh-pages branch..."
-    Dir.glob("site/{*,.*}") do |path|
-      next if path.eql? "site/."
-      next if path.eql? "site/.."
-      next if path.eql? "site/.jekyll-metadata"
-      next if path.eql? "site/_site"
+    copy_exclude = %w[
+      site/.
+      site/..
+      site/.jekyll-metadata
+      site/_site
+    ]
+    FileList["site/{*,.*}"].exclude(*copy_exclude).each do |path|
       sh "cp -R #{path} gh-pages/"
     end
 

From f7dafb1f04f7c39a6c5b3b81f68beb14b5dd23b3 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 5 Jan 2015 00:06:51 -0800
Subject: [PATCH 122/407] Update history to reflect merge of #3255 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6fb5e4695..531349e99 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * Improve the grammar in the documentation (#3233)
   * Update the LICENSE text to match the MIT license exactly (#3253)
   * Update rake task `site:publish` to fix minor bugs. (#3254)
+  * Switch to shields.io for the README badges. (#3255)
 
 ### Site Enhancements
 

From 620115a98656e2b8c98a60402fd8fd143e4f59e8 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 5 Jan 2015 00:08:08 -0800
Subject: [PATCH 123/407] Update history to reflect merge of #3261 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 531349e99..acc38791c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * Update the LICENSE text to match the MIT license exactly (#3253)
   * Update rake task `site:publish` to fix minor bugs. (#3254)
   * Switch to shields.io for the README badges. (#3255)
+  * Use `FileList` instead of `Dir.glob` in `site:publish` rake task (#3261)
 
 ### Site Enhancements
 

From a2b6aa263ecff76247ca039f66430f3bd52dd791 Mon Sep 17 00:00:00 2001
From: Mads Ohm Larsen <mads.ohm@gmail.com>
Date: Sun, 4 Jan 2015 18:25:19 +0100
Subject: [PATCH 124/407] Add local tmp folder

---
 .gitignore                | 2 +-
 script/test               | 4 ++++
 test/source/_includes/tmp | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index d9effd5b7..36da96562 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,5 @@ site/_site/
 coverage
 .ruby-version
 .sass-cache
-tmp/stackprof-*
+tmp/*
 .jekyll-metadata
diff --git a/script/test b/script/test
index 52dc4b927..eddb7f4b8 100755
--- a/script/test
+++ b/script/test
@@ -4,6 +4,10 @@
 #   script/test
 #   script/test <test_file>
 
+if [ ! -d tmp ]; then
+  mkdir tmp
+fi
+
 if [ -z "$1" ]; then
   TEST_FILES="./test/test_*.rb"
 else
diff --git a/test/source/_includes/tmp b/test/source/_includes/tmp
index cad230910..a846f50df 120000
--- a/test/source/_includes/tmp
+++ b/test/source/_includes/tmp
@@ -1 +1 @@
-/tmp
\ No newline at end of file
+../../../tmp/
\ No newline at end of file

From 1062fdf89fb913e8548b5208b499280103f5365d Mon Sep 17 00:00:00 2001
From: Mads Ohm Larsen <mads.ohm@gmail.com>
Date: Sun, 4 Jan 2015 18:25:29 +0100
Subject: [PATCH 125/407] Use local tmp folder for symlink tests

---
 test/test_tags.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_tags.rb b/test/test_tags.rb
index bc4b48cd7..bdfae6eaa 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -319,7 +319,7 @@ CONTENT
     context "with symlink'd include" do
 
       should "not allow symlink includes" do
-        File.open("/tmp/pages-test", 'w') { |file| file.write("SYMLINK TEST") }
+        File.open("tmp/pages-test", 'w') { |file| file.write("SYMLINK TEST") }
         assert_raise IOError do
           content = <<CONTENT
 ---
@@ -610,7 +610,7 @@ CONTENT
     context "with symlink'd include" do
 
       should "not allow symlink includes" do
-        File.open("/tmp/pages-test", 'w') { |file| file.write("SYMLINK TEST") }
+        File.open("tmp/pages-test", 'w') { |file| file.write("SYMLINK TEST") }
         assert_raise IOError do
           content = <<CONTENT
 ---

From b6c197d31213c0d3f3060b04027e91714339bd6d Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Tue, 25 Nov 2014 22:43:43 +0200
Subject: [PATCH 126/407] Docs: Assorted accessibility tweaks.

---
 site/_includes/anchor_links.html |  3 ++-
 site/_includes/footer.html       |  2 +-
 site/_includes/header.html       |  6 +++---
 site/_includes/news_item.html    |  2 +-
 site/_layouts/news_item.html     |  2 +-
 site/_sass/_style.scss           | 36 +++++++++++++++++++++-----------
 site/index.html                  |  2 +-
 7 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/site/_includes/anchor_links.html b/site/_includes/anchor_links.html
index 08e37b5b2..c584ce5d7 100644
--- a/site/_includes/anchor_links.html
+++ b/site/_includes/anchor_links.html
@@ -3,7 +3,8 @@
     var anchor = document.createElement("a");
     anchor.className = "header-link";
     anchor.href      = "#" + id;
-    anchor.innerHTML = "<i class=\"fa fa-link\"></i>";
+    anchor.innerHTML = "<span class=\"sr-only\">Permalink</span><i class=\"fa fa-link\"></i>";
+    anchor.title = "Permalink";
     return anchor;
   };
 
diff --git a/site/_includes/footer.html b/site/_includes/footer.html
index c42b1a469..09bab7375 100644
--- a/site/_includes/footer.html
+++ b/site/_includes/footer.html
@@ -1,4 +1,4 @@
-<footer>
+<footer role="contentinfo">
   <div class="grid">
     <div class="unit one-third center-on-mobiles">
       <p>The contents of this website are &copy;&nbsp;{{ site.time | date: '%Y' }} <a href="http://tom.preston-werner.com/">Tom Preston-Werner</a> under the terms of the <a href="{{ site.repository }}/blob/master/LICENSE">MIT&nbsp;License</a>.</p>
diff --git a/site/_includes/header.html b/site/_includes/header.html
index f55cff3df..517776706 100644
--- a/site/_includes/header.html
+++ b/site/_includes/header.html
@@ -1,4 +1,4 @@
-<header>
+<header role="banner">
   <nav class="mobile-nav show-on-mobiles">
     {% include primary-nav-items.html %}
   </nav>
@@ -6,8 +6,8 @@
     <div class="unit one-third center-on-mobiles">
       <h1>
         <a href="/">
-          <span>Jekyll</span>
-          <img src="/img/logo-2x.png" width="249" height="115" alt="Logo">
+          <span class="sr-only">Jekyll</span>
+          <img src="/img/logo-2x.png" width="249" height="115" alt="Jekyll Logo">
         </a>
       </h1>
     </div>
diff --git a/site/_includes/news_item.html b/site/_includes/news_item.html
index 60245d635..aaf052174 100644
--- a/site/_includes/news_item.html
+++ b/site/_includes/news_item.html
@@ -14,7 +14,7 @@
       {{ post.date | date_to_string }}
     </span>
     <a href="https://github.com/{{ post.author }}" class="post-author">
-      <img src="https://github.com/{{ post.author }}.png" class="avatar" alt="{{ post.author }}" width="24" height="24">
+      <img src="https://github.com/{{ post.author }}.png" class="avatar" alt="{{ post.author }} avatar" width="24" height="24">
       {{ post.author }}
     </a>
   </div>
diff --git a/site/_layouts/news_item.html b/site/_layouts/news_item.html
index 6d27976a1..57ba62228 100644
--- a/site/_layouts/news_item.html
+++ b/site/_layouts/news_item.html
@@ -17,7 +17,7 @@ layout: news
       {{ page.date | date_to_string }}
     </span>
     <a href="https://github.com/{{ page.author }}" class="post-author">
-      <img src="https://github.com/{{ page.author }}.png" class="avatar" alt="{{ page.author }}" width="24" height="24">
+      <img src="https://github.com/{{ page.author }}.png" class="avatar" alt="{{ page.author }} avatar" width="24" height="24">
       {{ page.author }}
     </a>
   </div>
diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss
index 38bf814ad..80b1d604e 100644
--- a/site/_sass/_style.scss
+++ b/site/_sass/_style.scss
@@ -44,9 +44,6 @@ header {
   h1,
   nav { display: inline-block; }
 
-  h1 {
-    span { display: none; }
-  }
 }
 
 nav {
@@ -165,10 +162,10 @@ h6:hover .header-link {
 /* Footer */
 
 footer {
-  background-color: #222;
+  background-color: #212121;
   font-size: 16px;
   padding-bottom: 5px;
-  color: #888;
+  color: #c0c0c0;
   margin-top: 40px;
 
   a {
@@ -230,7 +227,7 @@ footer {
 
   .content { padding: 0; }
 
-  h4 {
+  h3 {
     font-size: 24px;
     line-height: 24px;
     margin-top: 20px;
@@ -253,7 +250,7 @@ footer {
       float: right;
     }
 
-    h4 {
+    h3 {
       margin: 50px 0 0;
       text-align: center;
     }
@@ -295,7 +292,7 @@ footer {
       padding: 20px;
       text-shadow: none;
       margin: 0 20px;
-      background-color: #3d3d3d;
+      background-color: #171717;
       @include border-radius(0 0 5px 5px);
       @include box-shadow(0 5px 30px rgba(0,0,0,.3));
     }
@@ -333,7 +330,7 @@ footer {
 .free-hosting {
 
   .pane {
-    background-color: #444;
+    background-color: #3e3e3e;
     @include border-radius(10px);
     text-shadow: none;
     position: relative;
@@ -483,7 +480,7 @@ aside {
     @include border-radius(5px);
     /*border: 1px solid #333;*/
     @include box-shadow(0 1px 3px rgba(0,0,0,.3), inset 0 1px 1px rgba(255,255,255,.5));
-    background-color: #777;
+    background-color: #767676;
   }
 
   a:hover {
@@ -597,7 +594,7 @@ article h2:first-child { margin-top: 0; }
 
 .post-meta {
   padding: 5px 0;
-  color: #aaa;
+  color: #c0c0c0;
   font-weight: 600;
   text-shadow: 0 -1px 0 #000;
 }
@@ -635,7 +632,7 @@ p > nobr > code,
 li > code,
 h5 > code,
 .note > code {
-  background-color: #333;
+  background-color: #2b2b2b;
   color: #fff;
   @include border-radius(5px);
   @include box-shadow(inset 0 1px 10px rgba(0,0,0,.3),
@@ -971,3 +968,18 @@ code.output {
     display: inline !important;
   }
 }
+
+
+/* Helper class taken from Bootstrap.
+   Hides an element to all devices except screen readers.
+*/
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
diff --git a/site/index.html b/site/index.html
index d0dfaeab3..a8bda7428 100644
--- a/site/index.html
+++ b/site/index.html
@@ -38,7 +38,7 @@ overview: true
 <section class="quickstart">
   <div class="grid">
     <div class="unit golden-small center-on-mobiles">
-      <h4>Get up and running <em>in&nbsp;seconds</em>.</h4>
+      <h3>Get up and running <em>in&nbsp;seconds</em>.</h3>
     </div>
     <div class="unit golden-large code">
       <p class="title">Quick-start Instructions</p>

From 7655b533c9297c224e50eb00d75e5967fc54d4f5 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Sat, 29 Nov 2014 10:51:30 -0800
Subject: [PATCH 127/407] Allow documents to set `published` in front matter

---
 lib/jekyll/collection.rb                     | 13 ++++++++-
 test/source/_slides/non-outputted-slide.html |  7 +++++
 test/test_document.rb                        | 28 ++++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 test/source/_slides/non-outputted-slide.html

diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index 73e480dd1..f768b836f 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -40,7 +40,7 @@ module Jekyll
         if Utils.has_yaml_header? full_path
           doc = Jekyll::Document.new(full_path, { site: site, collection: self })
           doc.read
-          docs << doc
+          docs << doc if publisher.publish?(doc)
         else
           relative_dir = Jekyll.sanitized_path(relative_directory, File.dirname(file_path)).chomp("/.")
           files << StaticFile.new(site, site.source, relative_dir, File.basename(full_path), self)
@@ -184,5 +184,16 @@ module Jekyll
       end
     end
 
+
+    private
+
+    # A Publisher object used to determine which documents should be
+    # added to the docs list
+    #
+    # Returns a Publisher object.
+    def publisher
+      @publisher ||= Publisher.new(site)
+    end
+
   end
 end
diff --git a/test/source/_slides/non-outputted-slide.html b/test/source/_slides/non-outputted-slide.html
new file mode 100644
index 000000000..5eca15681
--- /dev/null
+++ b/test/source/_slides/non-outputted-slide.html
@@ -0,0 +1,7 @@
+---
+  title: Non outputted slide
+  layout: slide
+  published: false
+---
+
+This should not be output
diff --git a/test/test_document.rb b/test/test_document.rb
index 57c14c223..ba2c4d8c7 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -237,6 +237,34 @@ class TestDocument < Test::Unit::TestCase
     end
   end
 
+  context "documents in a collection" do
+    setup do
+      @site = Site.new(Jekyll.configuration({
+        "collections" => {
+          "slides" => {
+            "output" => true
+          }
+        },
+        "source"      => source_dir,
+        "destination" => dest_dir
+      }))
+      @site.process
+      @files = @site.collections["slides"].docs
+    end
+
+    context "without output overrides" do
+      should "be output according to collection defaults" do
+        assert_not_nil @files.find { |doc| doc.relative_path == "_slides/example-slide-4.html" }
+      end
+    end
+
+    context "with output overrides" do
+      should "be output according its front matter" do
+        assert_nil @files.find { |doc| doc.relative_path == "_slides/non-outputted-slide.html" }
+      end
+    end
+  end
+
   context "a static file in a collection" do
     setup do
       @site = Site.new(Jekyll.configuration({

From c58ac78a5e4c0c3a5d27f1540e4763656edc8fbe Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Sun, 30 Nov 2014 18:46:45 -0800
Subject: [PATCH 128/407] Expose Publisher in Site

---
 lib/jekyll/collection.rb | 14 +-------------
 lib/jekyll/site.rb       |  8 ++++----
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index f768b836f..b09a7ed93 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -40,7 +40,7 @@ module Jekyll
         if Utils.has_yaml_header? full_path
           doc = Jekyll::Document.new(full_path, { site: site, collection: self })
           doc.read
-          docs << doc if publisher.publish?(doc)
+          docs << doc if site.publisher.publish?(doc)
         else
           relative_dir = Jekyll.sanitized_path(relative_directory, File.dirname(file_path)).chomp("/.")
           files << StaticFile.new(site, site.source, relative_dir, File.basename(full_path), self)
@@ -183,17 +183,5 @@ module Jekyll
         {}
       end
     end
-
-
-    private
-
-    # A Publisher object used to determine which documents should be
-    # added to the docs list
-    #
-    # Returns a Publisher object.
-    def publisher
-      @publisher ||= Publisher.new(site)
-    end
-
   end
 end
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 7b8a4a00a..2754a6e5b 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -497,6 +497,10 @@ module Jekyll
       override['full_rebuild'] || config['full_rebuild']
     end
 
+    def publisher
+      @publisher ||= Publisher.new(self)
+    end
+
     private
 
     def has_relative_page?
@@ -517,9 +521,5 @@ module Jekyll
       name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
       name.gsub(/\s+/, '_')
     end
-
-    def publisher
-      @publisher ||= Publisher.new(self)
-    end
   end
 end

From f95d0ba84083dc1793cd47176db21e07ddf5aa81 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 5 Jan 2015 23:19:47 -0800
Subject: [PATCH 129/407] Update history to reflect merge of #3172 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index acc38791c..6182f4eac 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Generalize `Utils#slugify` for any scripts (#3047)
   * Added basic microdata to post template in site template (#3189)
   * Store log messages in an array of messages. (#3244)
+  * Allow collection documents to override `output` property in front matter (#3172)
 
 ### Bug Fixes
 

From c4d617e6aa0e37647c90dd07b34e61615c021a68 Mon Sep 17 00:00:00 2001
From: Tanguy Krotoff <tkrotoff@gmail.com>
Date: Wed, 7 Jan 2015 12:30:48 +0100
Subject: [PATCH 130/407] Fix nav items alignment when on multiple lines

---
 lib/site_template/_sass/_layout.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/site_template/_sass/_layout.scss b/lib/site_template/_sass/_layout.scss
index def56f896..5a9efab2e 100644
--- a/lib/site_template/_sass/_layout.scss
+++ b/lib/site_template/_sass/_layout.scss
@@ -35,9 +35,9 @@
         color: $text-color;
         line-height: $base-line-height;
 
-        // Gaps between nav items, but not on the first one
-        &:not(:first-child) {
-            margin-left: 20px;
+        // Gaps between nav items, but not on the last one
+        &:not(:last-child) {
+            margin-right: 20px;
         }
     }
 

From d47b882af217e7e707e62127c7c3bfc5b44a1a1b Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 7 Jan 2015 14:27:17 -0800
Subject: [PATCH 131/407] Update history to reflect merge of #3264 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6182f4eac..022794cc9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -23,6 +23,7 @@
   * Remove unneeded end tag for `link` in site template (#3236)
   * Kramdown: Use `enable_coderay` key instead of `use_coderay` (#3237)
   * Unescape `Document` output path (#2924)
+  * Fix nav items alignment when on multiple rows (#3264)
 
 ### Development Fixes
 

From 54d0bf47e88f8a3ae789b330b78c425a27ca7b08 Mon Sep 17 00:00:00 2001
From: Malo Skrylevo <majioa@yandex.ru>
Date: Thu, 8 Jan 2015 15:10:53 +0300
Subject: [PATCH 132/407] Added per post excerpt_separator functionality, so
 you are able to specify :excerpt_separator (as well as just :excerpt) key
 direct inside the post YAML, to make an excerpt based on the value in the
 post. Tests were also added.

---
 .gitignore                                       |  1 +
 lib/jekyll/excerpt.rb                            |  4 +++-
 lib/jekyll/post.rb                               | 10 +++++++++-
 site/_docs/posts.md                              | 10 ++++++++++
 .../2015-01-08-post-excerpt-separator.markdown   | 15 +++++++++++++++
 test/test_generated_site.rb                      |  2 +-
 test/test_post.rb                                | 16 ++++++++++++++++
 7 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 test/source/_posts/2015-01-08-post-excerpt-separator.markdown

diff --git a/.gitignore b/.gitignore
index d9effd5b7..8c1da7227 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ gh-pages/
 site/_site/
 coverage
 .ruby-version
+.ruby-gemset
 .sass-cache
 tmp/stackprof-*
 .jekyll-metadata
diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb
index 41d4976c9..6e328a303 100644
--- a/lib/jekyll/excerpt.rb
+++ b/lib/jekyll/excerpt.rb
@@ -105,7 +105,9 @@ module Jekyll
     #
     # Returns excerpt String
     def extract_excerpt(post_content)
-      separator     = site.config['excerpt_separator']
+      separator     = !post.excerpt_separator.empty? &&
+                       post.excerpt_separator ||
+                       site.config['excerpt_separator']
       head, _, tail = post_content.to_s.partition(separator)
 
       "" << head << "\n\n" << tail.scan(/^\[[^\]]+\]:.+$/).join("\n")
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index c377e376e..89d1c01aa 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -23,6 +23,7 @@ module Jekyll
     ATTRIBUTES_FOR_LIQUID = EXCERPT_ATTRIBUTES_FOR_LIQUID + %w[
       content
       excerpt
+      excerpt_separator
     ]
 
     # Post name validator. Post filenames must be like:
@@ -118,6 +119,13 @@ module Jekyll
       data.fetch('title') { titleized_slug }
     end
 
+    # Public: the Post excerpt_separator, from the YAML Front-Matter or empty string
+    #
+    # Returns the post excerpt_separator
+    def excerpt_separator
+      data.fetch('excerpt_separator') { "" }
+    end
+
     # Turns the post slug into a suitable title
     def titleized_slug
       slug.split('-').select {|w| w.capitalize! || w }.join(' ')
@@ -307,7 +315,7 @@ module Jekyll
     end
 
     def generate_excerpt?
-      !(site.config['excerpt_separator'].to_s.empty?)
+      !site.config['excerpt_separator'].to_s.empty? || !excerpt_separator.empty?
     end
   end
 end
diff --git a/site/_docs/posts.md b/site/_docs/posts.md
index 504ea2fba..7afd88dc5 100644
--- a/site/_docs/posts.md
+++ b/site/_docs/posts.md
@@ -171,6 +171,16 @@ your `excerpt_separator` to `""`.
 
 Also, as with any output generated by Liquid tags, you can pass the `| strip_html` flag to remove any html tags in the output. This is particularly helpful if you wish to output a post excerpt as a `meta="description"` tag within the post `head`, or anywhere else having html tags along with the content is not desirable.
 
+Additionally you are able to specify per-post `excerpt_separator` value if it is required just only the the selected post. Just specify the `excerpt_separator` with the same way as `excerpt` in the post's YAML head:
+
+    ---
+    excerpt_separator: <!--more-->
+    ---
+
+    Excerpt
+    <!--more-->
+    Out-of-excerpt
+
 ## Highlighting code snippets
 
 Jekyll also has built-in support for syntax highlighting of code snippets using
diff --git a/test/source/_posts/2015-01-08-post-excerpt-separator.markdown b/test/source/_posts/2015-01-08-post-excerpt-separator.markdown
new file mode 100644
index 000000000..e8b7ddd9c
--- /dev/null
+++ b/test/source/_posts/2015-01-08-post-excerpt-separator.markdown
@@ -0,0 +1,15 @@
+---
+layout: ~
+title:  Post Excerpt Separator
+excerpt_separator: "\n---\n"
+---
+
+First paragraph with [link ref][link].
+
+Second paragraph
+
+---
+
+Third paragraph
+
+[link]: http://www.jekyllrb.com/
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 0b157e85f..03669b904 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -14,7 +14,7 @@ class TestGeneratedSite < Test::Unit::TestCase
     end
 
     should "ensure post count is as expected" do
-      assert_equal 44, @site.posts.size
+      assert_equal 45, @site.posts.size
     end
 
     should "insert site.posts into the index" do
diff --git a/test/test_post.rb b/test/test_post.rb
index 2592b9185..1826674de 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -397,6 +397,22 @@ class TestPost < Test::Unit::TestCase
           end
         end
 
+        context "with page's excerpt_separator setting" do
+          setup do
+            file = "2015-01-08-post-excerpt-separator.markdown"
+
+            @post.process(file)
+            @post.read_yaml(@source, file)
+            @post.transform
+          end
+
+          should "respect given separator" do
+            assert @post.excerpt.include?("First paragraph"), "contains first paragraph"
+            assert @post.excerpt.include?("Second paragraph"), "contains second paragraph"
+            assert !@post.excerpt.include?("Third paragraph"), "does not contains third paragraph"
+          end
+        end
+
         context "with custom excerpt" do
           setup do
             file = "2013-04-11-custom-excerpt.markdown"

From e7c0e313a38190cc574420f242e14c89485760a5 Mon Sep 17 00:00:00 2001
From: Anna Debenham <anna@maban.co.uk>
Date: Thu, 8 Jan 2015 18:39:27 +0000
Subject: [PATCH 133/407] Change collection documentation based on #223

Clarifying what happens if no YAML front matter exists. The current explanation says that Jekyll will generate a file without Front Matter, but it appears this isn't the case.

I'm still not sure if this is the intended behaviour, but this clarifies how it currently works.
---
 site/_docs/collections.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/site/_docs/collections.md b/site/_docs/collections.md
index a132dc6de..2acf7daef 100644
--- a/site/_docs/collections.md
+++ b/site/_docs/collections.md
@@ -37,7 +37,7 @@ collections:
 ### Step 2: Add your content
 
 Create a corresponding folder (e.g. `<source>/_my_collection`) and add documents.
-YAML Front Matter is read in as data if it exists, if not, then everything is just stuck in the Document's `content` attribute.
+YAML Front Matter is read in as data if it exists, and everything after it is stuck in the Document's `content` attribute. If no YAML Front Matter is provided, Jekyll will not generate the file in your collection.
 
 Note: the folder must be named identically to the collection you defined in your `_config.yml` file, with the addition of the preceding `_` character.
 
@@ -211,8 +211,7 @@ In addition to any YAML Front Matter provided in the document's corresponding fi
       </td>
       <td>
         <p>
-          The (unrendered) content of the document. If no YAML Front Matter is provided,
-          this is the entirety of the file contents. If YAML Front Matter
+          The (unrendered) content of the document. If no YAML Front Matter is provided, Jekyll will not generate the file in your collection. If YAML Front Matter
           is used, then this is all the contents of the file after the terminating
           `---` of the front matter.
         </p>

From b92274b101abe67ade60bf78f5ce439334f105e8 Mon Sep 17 00:00:00 2001
From: Kevin Ushey <kevinushey@gmail.com>
Date: Fri, 9 Jan 2015 00:07:11 -0800
Subject: [PATCH 134/407] only strip newlines when rendering highlight blocks
 (#3265)

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

diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index b51712b65..e1ed4e54b 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -42,7 +42,7 @@ eos
       def render(context)
         prefix = context["highlighter_prefix"] || ""
         suffix = context["highlighter_suffix"] || ""
-        code = super.to_s.strip
+        code = super.to_s.gsub(/^\n+|\n+$/, '')
 
         is_safe = !!context.registers[:site].safe
 

From bce46801820ca4ad2d0fc88e1a29783b164c6973 Mon Sep 17 00:00:00 2001
From: Paul Rayner <paul@virtual-genius.com>
Date: Fri, 9 Jan 2015 15:41:45 -0700
Subject: [PATCH 135/407] Add new AsciiDoc plugin gem to list of Jekyll
 plugins.

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

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 79349b734..0bcbe3ab4 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -514,6 +514,7 @@ You can find a few useful plugins at the following locations:
 - [Org-mode Converter](https://gist.github.com/abhiyerra/7377603): Org-mode converter for Jekyll.
 - [Customized Kramdown Converter](https://github.com/mvdbos/kramdown-with-pygments): Enable Pygments syntax highlighting for Kramdown-parsed fenced code blocks.
 - [Bigfootnotes Plugin](https://github.com/TheFox/jekyll-bigfootnotes): Enables big footnotes for Kramdown.
+- [AsciiDoc Plugin](https://github.com/asciidoctor/jekyll-asciidoc): AsciiDoc convertor for Jekyll using [Asciidoctor](http://asciidoctor.org/).
 
 #### Filters
 

From a0f2b5f944cee9648e5931bd6d2502ce74af6d84 Mon Sep 17 00:00:00 2001
From: Malo Skrylevo <majioa@yandex.ru>
Date: Sat, 10 Jan 2015 03:58:02 +0300
Subject: [PATCH 136/407] get procedure for default excerpt separator for both
 cases site and page was moved to the post's specific method
 :excerpt_separator.

---
 lib/jekyll/excerpt.rb | 5 +----
 lib/jekyll/post.rb    | 7 ++++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb
index 6e328a303..347be2170 100644
--- a/lib/jekyll/excerpt.rb
+++ b/lib/jekyll/excerpt.rb
@@ -105,10 +105,7 @@ module Jekyll
     #
     # Returns excerpt String
     def extract_excerpt(post_content)
-      separator     = !post.excerpt_separator.empty? &&
-                       post.excerpt_separator ||
-                       site.config['excerpt_separator']
-      head, _, tail = post_content.to_s.partition(separator)
+      head, _, tail = post_content.to_s.partition(post.excerpt_separator)
 
       "" << head << "\n\n" << tail.scan(/^\[[^\]]+\]:.+$/).join("\n")
     end
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index 89d1c01aa..c94d66b6a 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -119,11 +119,12 @@ module Jekyll
       data.fetch('title') { titleized_slug }
     end
 
-    # Public: the Post excerpt_separator, from the YAML Front-Matter or empty string
+    # Public: the Post excerpt_separator, from the YAML Front-Matter or site default
+    #         excerpt_separator value
     #
     # Returns the post excerpt_separator
     def excerpt_separator
-      data.fetch('excerpt_separator') { "" }
+      data.fetch('excerpt_separator') { site.config['excerpt_separator'].to_s }
     end
 
     # Turns the post slug into a suitable title
@@ -315,7 +316,7 @@ module Jekyll
     end
 
     def generate_excerpt?
-      !site.config['excerpt_separator'].to_s.empty? || !excerpt_separator.empty?
+      !excerpt_separator.empty?
     end
   end
 end

From 8a9c48c7b426b8dcc4225ea5a88a6492369473ee Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 9 Jan 2015 23:33:21 -0800
Subject: [PATCH 137/407] Update history to reflect merge of #3277 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 022794cc9..e4731c161 100644
--- a/History.markdown
+++ b/History.markdown
@@ -40,6 +40,7 @@
   * Add link to 'Adding Ajax pagination to Jekyll' to Resources page (#3186)
   * Add a Resources link to tutorial on building dynamic navbars (#3185)
   * Semantic structure improvements to the post and page layouts (#3251)
+  * Add new AsciiDoc plugin to list of third-party plugins. (#3277)
 
 ## 2.5.3 / 2014-12-22
 

From cae9d96cc4ba43ae188a033f247e3dc58fcbf499 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 9 Jan 2015 23:51:34 -0800
Subject: [PATCH 138/407] Add test for stripping just newlines from code
 blocks.

Ref #3275.
---
 test/test_tags.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/test/test_tags.rb b/test/test_tags.rb
index bc4b48cd7..eb5477505 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -174,6 +174,21 @@ CONTENT
     end
   end
 
+  context "post content has highlight tag with preceding spaces" do
+    setup do
+      fill_post <<-EOS
+
+     [,1] [,2]
+[1,] FALSE TRUE
+[2,] FALSE TRUE
+EOS
+    end
+
+    should "only strip the preceding newlines" do
+      assert_match %{<pre><code class=\"language-text\" data-lang=\"text\">     [,1] [,2]}, @result
+    end
+  end
+
   context "simple post with markdown and pre tags" do
     setup do
       @content = <<CONTENT

From 4cbd8145466d4f650cd87370358fedc30e91a751 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 9 Jan 2015 23:55:47 -0800
Subject: [PATCH 139/407] Add support for Windows line feeds too.

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

diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index e1ed4e54b..0305f1cfc 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -42,7 +42,7 @@ eos
       def render(context)
         prefix = context["highlighter_prefix"] || ""
         suffix = context["highlighter_suffix"] || ""
-        code = super.to_s.gsub(/^\n+|\n+$/, '')
+        code = super.to_s.gsub(/^(\n|\r)+|(\n|\r)+$/, '')
 
         is_safe = !!context.registers[:site].safe
 
diff --git a/test/test_tags.rb b/test/test_tags.rb
index eb5477505..c910d12b6 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -174,10 +174,35 @@ CONTENT
     end
   end
 
-  context "post content has highlight tag with preceding spaces" do
+  context "post content has highlight tag with preceding spaces & lines" do
     setup do
       fill_post <<-EOS
 
+
+     [,1] [,2]
+[1,] FALSE TRUE
+[2,] FALSE TRUE
+EOS
+    end
+
+    should "only strip the preceding newlines" do
+      assert_match %{<pre><code class=\"language-text\" data-lang=\"text\">     [,1] [,2]}, @result
+    end
+  end
+
+  context "post content has highlight tag with preceding spaces & Windows-style newlines" do
+    setup do
+      fill_post "\r\n\r\n\r\n     [,1] [,2]"
+    end
+
+    should "only strip the preceding newlines" do
+      assert_match %{<pre><code class=\"language-text\" data-lang=\"text\">     [,1] [,2]}, @result
+    end
+  end
+
+  context "post content has highlight tag with only preceding spaces" do
+    setup do
+      fill_post <<-EOS
      [,1] [,2]
 [1,] FALSE TRUE
 [2,] FALSE TRUE

From 730aedd0a3206388cfc8f2e2b4c6704ce9b1289f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 9 Jan 2015 23:57:52 -0800
Subject: [PATCH 140/407] Add Rake's test loader because it is inconsistently
 installed.

---
 test/loader.rb | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 test/loader.rb

diff --git a/test/loader.rb b/test/loader.rb
new file mode 100644
index 000000000..f2c9c0d19
--- /dev/null
+++ b/test/loader.rb
@@ -0,0 +1,44 @@
+# Yoinked lovingly from Rake's source code.
+#
+# Copyright (c) Jim Weirich
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'rake'
+
+# Load the test files from the command line.
+argv = ARGV.select do |argument|
+  case argument
+  when /^-/ then
+    argument
+  when /\*/ then
+    FileList[argument].to_a.each do |file|
+      require File.expand_path file
+    end
+
+    false
+  else
+    require File.expand_path argument
+
+    false
+  end
+end
+
+ARGV.replace argv

From a6238c36d5300ef9d260a4e1144f1dfa973bd72e Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 9 Jan 2015 23:58:32 -0800
Subject: [PATCH 141/407] Fix script/test to be more cross-compatible with
 other platforms

---
 script/test | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/script/test b/script/test
index 52dc4b927..a6ae0f4d1 100755
--- a/script/test
+++ b/script/test
@@ -5,24 +5,11 @@
 #   script/test <test_file>
 
 if [ -z "$1" ]; then
-  TEST_FILES="./test/test_*.rb"
+  TEST_FILES=$(ruby -e "puts Dir.glob('test/test_*.rb')")
 else
   TEST_FILES="$@"
 fi
 
-# bundle exec gem env
-GEM_DIR=$(bundle exec gem env | grep -C 1 "GEM PATHS" | tail -1 | cut -d '-' -f2 | cut -d' ' -f2)
-RAKE_LIB_WITH_VERSION=$(bundle exec ruby -e "puts Gem::Specification.find_by_name('rake').gem_dir.split('/').last + '/lib'")
-RAKE_LIB_DIR="${GEM_DIR}/gems/${RAKE_LIB_WITH_VERSION}"
-
-test -d "${RAKE_LIB_DIR}" || {
-  echo "No ${RAKE_LIB_DIR}. Installing Rake."
-  bundle show rake | cut -d'/' -f12 | cut -d'-' -f 2 | xargs bundle exec gem install rake -v
-}
-
 set -x
 
-time bundle exec ruby -I"lib:test" \
-  -I"${RAKE_LIB_DIR}" \
-  "${RAKE_LIB_DIR}/rake/rake_test_loader.rb" \
-  $TEST_FILES
+time bundle exec ruby -I"lib:test" -rloader $TEST_FILES

From 989639256d226d4f886b533e00b20d67d70b65cc Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 10 Jan 2015 00:00:30 -0800
Subject: [PATCH 142/407] Update history to reflect merge of #3278 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e4731c161..45dda9b82 100644
--- a/History.markdown
+++ b/History.markdown
@@ -24,6 +24,7 @@
   * Kramdown: Use `enable_coderay` key instead of `use_coderay` (#3237)
   * Unescape `Document` output path (#2924)
   * Fix nav items alignment when on multiple rows (#3264)
+  * Highlight: Only Strip Newlines/Carriage Returns, not Spaces (#3278)
 
 ### Development Fixes
 

From 0a4bd99e6bcab922bafdf1b6d102233f0a6d20b8 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 10 Jan 2015 00:05:03 -0800
Subject: [PATCH 143/407] Update history to reflect merge of #3271 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 45dda9b82..c7536af7f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -42,6 +42,7 @@
   * Add a Resources link to tutorial on building dynamic navbars (#3185)
   * Semantic structure improvements to the post and page layouts (#3251)
   * Add new AsciiDoc plugin to list of third-party plugins. (#3277)
+  * Specify that all transformable collection documents must contain YAML front matter (#3271)
 
 ## 2.5.3 / 2014-12-22
 

From 4e9b0663be7ffcfe1b07f895fa2eea58ba4c81ab Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 10 Jan 2015 00:09:18 -0800
Subject: [PATCH 144/407] Update history to reflect merge of #3279 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c7536af7f..eed7a5a3e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -33,6 +33,7 @@
   * Update rake task `site:publish` to fix minor bugs. (#3254)
   * Switch to shields.io for the README badges. (#3255)
   * Use `FileList` instead of `Dir.glob` in `site:publish` rake task (#3261)
+  * Fix test script to be platform-independent (#3279)
 
 ### Site Enhancements
 

From 8b6a9d66ec3327d832dc03b267c3f45ebf014403 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 10 Jan 2015 00:12:40 -0800
Subject: [PATCH 145/407] Update history to reflect merge of #3258 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index eed7a5a3e..19fe30b87 100644
--- a/History.markdown
+++ b/History.markdown
@@ -34,6 +34,7 @@
   * Switch to shields.io for the README badges. (#3255)
   * Use `FileList` instead of `Dir.glob` in `site:publish` rake task (#3261)
   * Fix test script to be platform-independent (#3279)
+  * Instead of symlinking `/tmp`, create and symlink a local `tmp` in the tests (#3258)
 
 ### Site Enhancements
 

From e2a5a9dbc16dd4793470d029a52aff84e2fefbd4 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 10 Jan 2015 00:14:34 -0800
Subject: [PATCH 146/407] Update history to reflect merge of #3256 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 19fe30b87..4f954cb62 100644
--- a/History.markdown
+++ b/History.markdown
@@ -45,6 +45,7 @@
   * Semantic structure improvements to the post and page layouts (#3251)
   * Add new AsciiDoc plugin to list of third-party plugins. (#3277)
   * Specify that all transformable collection documents must contain YAML front matter (#3271)
+  * Assorted accessibility fixes (#3256)
 
 ## 2.5.3 / 2014-12-22
 

From 585a31d8aab0eb01a66b2b30ea57c17385589951 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 17 Aug 2014 18:17:17 -0400
Subject: [PATCH 147/407] Support RDiscount 2.

Fixes #2747.
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 2bc6abc32..5649d19fb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,7 @@ gem 'rr', '~> 1.1'
 gem 'cucumber', '1.3.18'
 gem 'RedCloth', '~> 4.2'
 gem 'maruku', '~> 0.7.0'
-gem 'rdiscount', '~> 1.6'
+gem 'rdiscount', '~> 2.0'
 gem 'launchy', '~> 2.3'
 gem 'simplecov', '~> 0.9'
 gem 'simplecov-gem-adapter', '~> 1.0.1'

From 7c8e4d46ebd09b2128371cdbcc02a44563220ed0 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 29 Dec 2014 00:11:13 -0500
Subject: [PATCH 148/407] Fix up new output for RDiscount 2.

---
 test/test_rdiscount.rb | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/test/test_rdiscount.rb b/test/test_rdiscount.rb
index ed2c6f989..da9401cfb 100644
--- a/test/test_rdiscount.rb
+++ b/test/test_rdiscount.rb
@@ -16,7 +16,24 @@ class TestRdiscount < Test::Unit::TestCase
     end
 
     should "render toc" do
-      assert_equal "<h1 id=\"Header+1\">Header 1</h1>\n\n<h2 id=\"Header+2\">Header 2</h2>\n\n<p>\n <ul>\n <li><a href=\"#Header+1\">Header 1</a>\n  <ul>\n  <li><a href=\"#Header+2\">Header 2</a>  </li>\n  </ul>\n </li>\n </ul>\n\n</p>", @markdown.convert("# Header 1\n\n## Header 2\n\n{:toc}").strip
+      toc = <<-TOC
+<a name="Header.1"></a>
+<h1>Header 1</h1>
+
+<a name="Header.2"></a>
+<h2>Header 2</h2>
+
+<p><ul>
+ <li><a href="#Header.1">Header 1</a>
+ <ul>
+  <li><a href="#Header.2">Header 2</a></li>
+ </ul>
+ </li>
+</ul>
+
+</p>
+TOC
+      assert_equal toc.strip, @markdown.convert("# Header 1\n\n## Header 2\n\n{:toc}").strip
     end
   end
 end

From 244310fbaa1afae4ab13d0c93ab7458f4e4db3af Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 10 Jan 2015 01:53:40 -0800
Subject: [PATCH 149/407] Update history to reflect merge of #2767 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4f954cb62..74e3e0e6f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,7 @@
   * Drop support for Ruby 1.9.3. (#3235)
   * Upgrade to Liquid 3.0.0 (#3002)
   * Support Ruby v2.2 (#3234)
+  * Support RDiscount 2 (#2767)
 
 ### Minor Enhancements
 

From f228b31c2e2d9138a97fc2b593a26f541ed39f98 Mon Sep 17 00:00:00 2001
From: "jaybe@jekyll" <jaybe-jekyll@users.noreply.github.com>
Date: Sun, 11 Jan 2015 13:11:29 -0600
Subject: [PATCH 150/407] Update configuration.md

Clarify ability to retain generated content in `destination` via the `keep_files` configuration directive.
---
 site/_docs/configuration.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index c9ddd915f..6fa4d79df 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -155,9 +155,11 @@ class="flag">flags</code> (specified on the command-line) that control them.
   <h5>Destination folders are cleaned on site builds</h5>
   <p>
     The contents of <code>&lt;destination&gt;</code> are automatically
-    cleaned when the site is built. Files or folders that are not
-    created by your site will be removed.  Do not use an important
-    location for <code>&lt;destination&gt;</code>; instead, use it as
+    cleaned, by default, when the site is built. Files or folders that are not
+    created by your site will be removed. The <code>&lt;keep_files&gt;</code> configuration directive can optionally retain generated content in `destination`.
+  </p>
+  <p>
+    Do not use an important location for <code>&lt;destination&gt;</code>; instead, use it as
     a staging area and copy files from there to your web server.
   </p>
 </div>

From 312717b56dcdcf364b763f818925e36a125c63ad Mon Sep 17 00:00:00 2001
From: "jaybe@jekyll" <jaybe-jekyll@users.noreply.github.com>
Date: Sun, 11 Jan 2015 18:08:05 -0600
Subject: [PATCH 151/407] Update configuration.md

Tweak and simplify language re: `keep_files` and `destination` directory.
---
 site/_docs/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index 6fa4d79df..7a75bd696 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -156,7 +156,7 @@ class="flag">flags</code> (specified on the command-line) that control them.
   <p>
     The contents of <code>&lt;destination&gt;</code> are automatically
     cleaned, by default, when the site is built. Files or folders that are not
-    created by your site will be removed. The <code>&lt;keep_files&gt;</code> configuration directive can optionally retain generated content in `destination`.
+    created by your site will be removed. Some files could be retained by specifying them within the  <code>&lt;keep_files&gt;</code> configuration directive.
   </p>
   <p>
     Do not use an important location for <code>&lt;destination&gt;</code>; instead, use it as

From 965e3a1173173c6a0cb719b34a36e76e27172ccc Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 11 Jan 2015 16:21:22 -0800
Subject: [PATCH 152/407] Update history to reflect merge of #3288 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 74e3e0e6f..a7d1dac7f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -47,6 +47,7 @@
   * Add new AsciiDoc plugin to list of third-party plugins. (#3277)
   * Specify that all transformable collection documents must contain YAML front matter (#3271)
   * Assorted accessibility fixes (#3256)
+  * Update configuration docs to mention `keep_files` for `destination` (#3288)
 
 ## 2.5.3 / 2014-12-22
 

From 5e9706e2aafbe47bbf4bfe6ea11bf1248d47d777 Mon Sep 17 00:00:00 2001
From: Alan Scherger <flyinprogrammer@gmail.com>
Date: Sun, 11 Jan 2015 20:42:34 -0800
Subject: [PATCH 153/407] Break when we successfully generate nav link.

---
 site/_includes/docs_ul.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/_includes/docs_ul.html b/site/_includes/docs_ul.html
index 366abe9d9..7cc54174e 100644
--- a/site/_includes/docs_ul.html
+++ b/site/_includes/docs_ul.html
@@ -13,6 +13,7 @@
   {% for p in site.docs %}
     {% if p.url == item_url %}
       <li class="{{ c }}"><a href="{{ site.url }}{{ p.url }}">{{ p.title }}</a></li>
+      {% break %}
     {% endif %}
   {% endfor %}
 

From c26f040bcf99849cbed6322ec090e3d3f3c61491 Mon Sep 17 00:00:00 2001
From: Alan Scherger <flyinprogrammer@gmail.com>
Date: Sun, 11 Jan 2015 21:04:00 -0800
Subject: [PATCH 154/407] Eliminate the need for prev_section and next_section
 metadata.

---
 site/_docs/assets.md                 |  2 -
 site/_docs/collections.md            |  2 -
 site/_docs/configuration.md          |  2 -
 site/_docs/continuous-integration.md |  2 -
 site/_docs/contributing.md           |  2 -
 site/_docs/datafiles.md              |  2 -
 site/_docs/deployment-methods.md     |  2 -
 site/_docs/drafts.md                 |  2 -
 site/_docs/extras.md                 |  2 -
 site/_docs/frontmatter.md            |  2 -
 site/_docs/github-pages.md           |  2 -
 site/_docs/history.md                |  1 -
 site/_docs/index.md                  |  1 -
 site/_docs/installation.md           |  2 -
 site/_docs/migrations.md             |  2 -
 site/_docs/pages.md                  |  2 -
 site/_docs/pagination.md             |  2 -
 site/_docs/permalinks.md             |  2 -
 site/_docs/plugins.md                |  2 -
 site/_docs/posts.md                  |  2 -
 site/_docs/quickstart.md             |  2 -
 site/_docs/resources.md              |  2 -
 site/_docs/sites.md                  |  2 -
 site/_docs/structure.md              |  2 -
 site/_docs/templates.md              |  2 -
 site/_docs/troubleshooting.md        |  2 -
 site/_docs/upgrading.md              |  2 -
 site/_docs/usage.md                  |  2 -
 site/_docs/variables.md              |  2 -
 site/_docs/windows.md                |  2 -
 site/_includes/section_nav.html      | 68 +++++++++++++++++++---------
 31 files changed, 47 insertions(+), 79 deletions(-)

diff --git a/site/_docs/assets.md b/site/_docs/assets.md
index c2965bdfe..e82ddb309 100644
--- a/site/_docs/assets.md
+++ b/site/_docs/assets.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Assets
-prev_section: datafiles
-next_section: migrations
 permalink: /docs/assets/
 ---
 
diff --git a/site/_docs/collections.md b/site/_docs/collections.md
index 2acf7daef..fcda98ba8 100644
--- a/site/_docs/collections.md
+++ b/site/_docs/collections.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Collections
-prev_section: variables
-next_section: datafiles
 permalink: /docs/collections/
 ---
 
diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index 7a75bd696..f7ca43e14 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Configuration
-prev_section: structure
-next_section: frontmatter
 permalink: /docs/configuration/
 ---
 
diff --git a/site/_docs/continuous-integration.md b/site/_docs/continuous-integration.md
index 0e2b3a5cf..5e8a700ba 100644
--- a/site/_docs/continuous-integration.md
+++ b/site/_docs/continuous-integration.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Continuous Integration
-prev_section: deployment-methods
-next_section: troubleshooting
 permalink: /docs/continuous-integration/
 ---
 
diff --git a/site/_docs/contributing.md b/site/_docs/contributing.md
index e3dbe807a..9f4a334ff 100644
--- a/site/_docs/contributing.md
+++ b/site/_docs/contributing.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Contributing
-prev_section: upgrading
-next_section: history
 permalink: /docs/contributing/
 ---
 
diff --git a/site/_docs/datafiles.md b/site/_docs/datafiles.md
index 7088fec46..7f54a2795 100644
--- a/site/_docs/datafiles.md
+++ b/site/_docs/datafiles.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Data Files
-prev_section: collections
-next_section: assets
 permalink: /docs/datafiles/
 ---
 
diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md
index 2ab929b22..ddf571d4d 100644
--- a/site/_docs/deployment-methods.md
+++ b/site/_docs/deployment-methods.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Deployment methods
-prev_section: github-pages
-next_section: continuous-integration
 permalink: /docs/deployment-methods/
 ---
 
diff --git a/site/_docs/drafts.md b/site/_docs/drafts.md
index 959964d0b..2f2f12b52 100644
--- a/site/_docs/drafts.md
+++ b/site/_docs/drafts.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Working with drafts
-prev_section: posts
-next_section: pages
 permalink: /docs/drafts/
 ---
 
diff --git a/site/_docs/extras.md b/site/_docs/extras.md
index 5bdf2c73c..2af6a3059 100644
--- a/site/_docs/extras.md
+++ b/site/_docs/extras.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Extras
-prev_section: plugins
-next_section: github-pages
 permalink: /docs/extras/
 ---
 
diff --git a/site/_docs/frontmatter.md b/site/_docs/frontmatter.md
index 998be5440..9ce032dfd 100644
--- a/site/_docs/frontmatter.md
+++ b/site/_docs/frontmatter.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Front Matter
-prev_section: configuration
-next_section: posts
 permalink: /docs/frontmatter/
 ---
 
diff --git a/site/_docs/github-pages.md b/site/_docs/github-pages.md
index 83af0b3cc..eac7d1ead 100644
--- a/site/_docs/github-pages.md
+++ b/site/_docs/github-pages.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: GitHub Pages
-prev_section: extras
-next_section: deployment-methods
 permalink: /docs/github-pages/
 ---
 
diff --git a/site/_docs/history.md b/site/_docs/history.md
index 6485dadae..01b77d273 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -2,7 +2,6 @@
 layout: docs
 title: History
 permalink: "/docs/history/"
-prev_section: contributing
 ---
 
 ## 2.5.3 / 2014-12-22
diff --git a/site/_docs/index.md b/site/_docs/index.md
index 27b2da25d..633d75349 100644
--- a/site/_docs/index.md
+++ b/site/_docs/index.md
@@ -1,7 +1,6 @@
 ---
 layout: docs
 title: Welcome
-next_section: quickstart
 permalink: /docs/home/
 ---
 
diff --git a/site/_docs/installation.md b/site/_docs/installation.md
index 058879e9e..0f4398b34 100644
--- a/site/_docs/installation.md
+++ b/site/_docs/installation.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Installation
-prev_section: quickstart
-next_section: usage
 permalink: /docs/installation/
 ---
 
diff --git a/site/_docs/migrations.md b/site/_docs/migrations.md
index a080c6c6e..0544341ac 100644
--- a/site/_docs/migrations.md
+++ b/site/_docs/migrations.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Blog migrations
-prev_section: assets
-next_section: templates
 permalink: /docs/migrations/
 ---
 
diff --git a/site/_docs/pages.md b/site/_docs/pages.md
index ea59649e9..d3008daf5 100644
--- a/site/_docs/pages.md
+++ b/site/_docs/pages.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Creating pages
-prev_section: drafts
-next_section: variables
 permalink: /docs/pages/
 ---
 
diff --git a/site/_docs/pagination.md b/site/_docs/pagination.md
index 245ba36f3..c2662f04d 100644
--- a/site/_docs/pagination.md
+++ b/site/_docs/pagination.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Pagination
-prev_section: permalinks
-next_section: plugins
 permalink: /docs/pagination/
 ---
 
diff --git a/site/_docs/permalinks.md b/site/_docs/permalinks.md
index dbcee2e27..7a47cc68e 100644
--- a/site/_docs/permalinks.md
+++ b/site/_docs/permalinks.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Permalinks
-prev_section: templates
-next_section: pagination
 permalink: /docs/permalinks/
 ---
 
diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 0bcbe3ab4..cf0aab6e1 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Plugins
-prev_section: pagination
-next_section: extras
 permalink: /docs/plugins/
 ---
 
diff --git a/site/_docs/posts.md b/site/_docs/posts.md
index 504ea2fba..b1508c3e4 100644
--- a/site/_docs/posts.md
+++ b/site/_docs/posts.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Writing posts
-prev_section: frontmatter
-next_section: drafts
 permalink: /docs/posts/
 ---
 
diff --git a/site/_docs/quickstart.md b/site/_docs/quickstart.md
index 66cd94502..666ac03dc 100644
--- a/site/_docs/quickstart.md
+++ b/site/_docs/quickstart.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Quick-start guide
-prev_section: home
-next_section: installation
 permalink: /docs/quickstart/
 ---
 
diff --git a/site/_docs/resources.md b/site/_docs/resources.md
index 6acba8377..71447b53b 100644
--- a/site/_docs/resources.md
+++ b/site/_docs/resources.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Resources
-prev_section: sites
-next_section: upgrading
 permalink: /docs/resources/
 ---
 
diff --git a/site/_docs/sites.md b/site/_docs/sites.md
index 4e57aba79..c11da820e 100644
--- a/site/_docs/sites.md
+++ b/site/_docs/sites.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Sites using Jekyll
-prev_section: troubleshooting
-next_section: resources
 permalink: /docs/sites/
 ---
 
diff --git a/site/_docs/structure.md b/site/_docs/structure.md
index 2dca3e6bb..848f1cce9 100644
--- a/site/_docs/structure.md
+++ b/site/_docs/structure.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Directory structure
-prev_section: usage
-next_section: configuration
 permalink: /docs/structure/
 ---
 
diff --git a/site/_docs/templates.md b/site/_docs/templates.md
index c0825702f..12a70fc4e 100644
--- a/site/_docs/templates.md
+++ b/site/_docs/templates.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Templates
-prev_section: migrations
-next_section: permalinks
 permalink: /docs/templates/
 ---
 
diff --git a/site/_docs/troubleshooting.md b/site/_docs/troubleshooting.md
index 4bb12be83..87da91fbf 100644
--- a/site/_docs/troubleshooting.md
+++ b/site/_docs/troubleshooting.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Troubleshooting
-prev_section: deployment-methods
-next_section: sites
 permalink: /docs/troubleshooting/
 ---
 
diff --git a/site/_docs/upgrading.md b/site/_docs/upgrading.md
index 3a3f16701..879546c67 100644
--- a/site/_docs/upgrading.md
+++ b/site/_docs/upgrading.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Upgrading
-prev_section: resources
-next_section: contributing
 permalink: /docs/upgrading/
 ---
 
diff --git a/site/_docs/usage.md b/site/_docs/usage.md
index 7d2d68e9f..01af33c52 100644
--- a/site/_docs/usage.md
+++ b/site/_docs/usage.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Basic Usage
-prev_section: installation
-next_section: structure
 permalink: /docs/usage/
 ---
 
diff --git a/site/_docs/variables.md b/site/_docs/variables.md
index 1c62bf833..628a9904b 100644
--- a/site/_docs/variables.md
+++ b/site/_docs/variables.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Variables
-prev_section: pages
-next_section: collections
 permalink: /docs/variables/
 ---
 
diff --git a/site/_docs/windows.md b/site/_docs/windows.md
index 81e909c9d..7642592c9 100644
--- a/site/_docs/windows.md
+++ b/site/_docs/windows.md
@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Jekyll on Windows
-prev_section: configuration
-next_section: posts
 permalink: /docs/windows/
 ---
 
diff --git a/site/_includes/section_nav.html b/site/_includes/section_nav.html
index edba19318..c7b606472 100644
--- a/site/_includes/section_nav.html
+++ b/site/_includes/section_nav.html
@@ -1,22 +1,48 @@
-<div class="section-nav">
-  <div class="left align-right">
-    {% if page.prev_section != null %}
-      <a href="/docs/{{ page.prev_section }}/" class="prev">
-        Back
-      </a>
-    {% else %}
-      <span class="prev disabled">Back</span>
-    {% endif %}
-  </div>
-  <div class="right align-left">
-    {% if page.next_section != null %}
-      <a href="/docs/{{ page.next_section }}/" class="next">
-        Next
-      </a>
-    {% else %}
-      <span class="next disabled">Next</span>
-    {% endif %}
-  </div>
-  <div class="clear"></div>
-</div>
+{% comment %}
+Lets turn our yaml into a structured list of documents without titles.
+{% endcomment %}
 
+{% assign docs = site.data.docs | map: 'docs' %}
+{% capture document_array_string %}
+{% for doc in docs %}
+  {% assign last_last = forloop.last %}
+  {% for title in doc %}
+    {{title}}{% unless forloop.last and last_last %},{% endunless %}
+  {% endfor %}
+{% endfor %}
+{% endcapture %}
+{% assign document_array = document_array_string | strip_newlines | split: ',' %}
+
+{% comment %}
+Because this is built for every page, lets find where we are in the document list by comparing url strings.
+Then if there's something previous or next, lets build links to it.
+Note: When arrays are accessed directly, they are zero based.
+{% endcomment %}
+
+{% for document in document_array %}
+  {% assign document_url = document | prepend:"/docs/" | append:"/" %}
+  {% if document_url == page.url %}
+    <div class="section-nav">
+      <div class="left align-right">
+          {% if forloop.first %}
+            <span class="prev disabled">Back</span>
+          {% else %}
+            {% assign previous = forloop.index0 | minus: 1 %}
+            {% assign previous_page = document_array[previous] | prepend:"/docs/" | append:"/" %}
+            <a href="{{ previous_page }}" class="prev">Back</a>
+          {% endif %}
+      </div>
+      <div class="right align-left">
+          {% if forloop.last %}
+            <span class="next disabled">Next</span>
+          {% else %}
+            {% assign next = forloop.index0 | plus: 1 %}
+            {% assign next_page = document_array[next] | prepend:"/docs/" | append:"/" %}
+            <a href="{{ next_page }}" class="next">Next</a>
+          {% endif %}
+      </div>
+    </div>
+    <div class="clear"></div>
+    {% break %}
+  {% endif %}
+{% endfor %}
\ No newline at end of file

From 7439d303c4a86a3ae491691fac632560351444a3 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 12 Jan 2015 00:34:06 -0800
Subject: [PATCH 155/407] Update history to reflect merge of #3291 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a7d1dac7f..f61ca57ae 100644
--- a/History.markdown
+++ b/History.markdown
@@ -48,6 +48,7 @@
   * Specify that all transformable collection documents must contain YAML front matter (#3271)
   * Assorted accessibility fixes (#3256)
   * Update configuration docs to mention `keep_files` for `destination` (#3288)
+  * Break when we successfully generate nav link to save CPU cycles. (#3291)
 
 ## 2.5.3 / 2014-12-22
 

From e7dcc2424ab4c7adb7356b8a7f7bf2c8e384ec94 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 12 Jan 2015 00:37:33 -0800
Subject: [PATCH 156/407] Don't copy the .sass-cache to the gh-pages dir.

---
 Rakefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Rakefile b/Rakefile
index 31434cd41..56d51815b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -195,6 +195,7 @@ namespace :site do
       gh-pages/.
       gh-pages/..
       gh-pages/.git
+      gh-pages/.gitignore
     ]
     FileList["gh-pages/{*,.*}"].exclude(*purge_exclude).each do |path|
       sh "rm -rf #{path}"
@@ -206,6 +207,7 @@ namespace :site do
       site/.
       site/..
       site/.jekyll-metadata
+      site/.sass-cache
       site/_site
     ]
     FileList["site/{*,.*}"].exclude(*copy_exclude).each do |path|

From 60921132c6896a8ce90ffa6ec1ffb415bdc745c4 Mon Sep 17 00:00:00 2001
From: Sylvester Keil <sylvester@keil.or.at>
Date: Fri, 19 Dec 2014 15:18:05 +0100
Subject: [PATCH 157/407] Preserve original mtime when copying static files

---
 lib/jekyll/static_file.rb | 1 +
 test/test_site.rb         | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index 02500b1d5..a8b09afca 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -81,6 +81,7 @@ module Jekyll
       FileUtils.mkdir_p(File.dirname(dest_path))
       FileUtils.rm(dest_path) if File.exist?(dest_path)
       FileUtils.cp(path, dest_path)
+      File.utime(@@mtimes[path], @@mtimes[path], dest_path)
 
       true
     end
diff --git a/test/test_site.rb b/test/test_site.rb
index a6ef5af8e..2ebf0b022 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -132,7 +132,6 @@ class TestSite < Test::Unit::TestCase
       @site.metadata.clear
 
       @site.process
-      some_static_file = @site.static_files[0].path
       dest = File.expand_path(@site.static_files[0].destination(@site.dest))
       mtime1 = File.stat(dest).mtime.to_i # first run must generate dest file
 
@@ -144,16 +143,17 @@ class TestSite < Test::Unit::TestCase
 
       # simulate destination file deletion
       File.unlink dest
+      refute File.exists?(dest)
 
       sleep 1
       @site.process
       mtime3 = File.stat(dest).mtime.to_i
-      assert_not_equal mtime2, mtime3 # must be regenerated and differ!
+      assert_equal mtime2, mtime3 # must be regenerated and with original mtime!
 
       sleep 1
       @site.process
       mtime4 = File.stat(dest).mtime.to_i
-      assert_equal mtime3, mtime4 # no modifications, so must be the same
+      assert_equal mtime3, mtime4 # no modifications, so remain the same
     end
 
     should "setup plugins in priority order" do

From d2b33144a7cea4895a1cd0308ad1cd2e04452f7b Mon Sep 17 00:00:00 2001
From: "jaybe@jekyll" <jaybe-jekyll@users.noreply.github.com>
Date: Mon, 12 Jan 2015 16:51:15 -0600
Subject: [PATCH 158/407] Update usage.md

Sync Destination folder cleansing language with Configuration docs page (i.e. adding `keep_files` directive)
---
 site/_docs/usage.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/site/_docs/usage.md b/site/_docs/usage.md
index 7d2d68e9f..115cf5e14 100644
--- a/site/_docs/usage.md
+++ b/site/_docs/usage.md
@@ -28,10 +28,13 @@ $ jekyll build --watch
   <h5>Destination folders are cleaned on site builds</h5>
   <p>
     The contents of <code>&lt;destination&gt;</code> are automatically
-    cleaned when the site is built.  Files or folders that are not
-    created by your site will be removed.  Do not use an important
-    location for <code>&lt;destination&gt;</code>; instead, use it as
-    a staging area and copy files from there to your web server.
+    cleaned, by default, when the site is built. Files or folders that are not
+    created by your site will be removed. Some files could be retained
+    by specifying them within the <code>&lt;keep_files&gt;</code> configuration directive.
+  </p>
+  <p>
+    Do not use an important location for <code>&lt;destination&gt;</code>; 
+    instead, use it as a staging area and copy files from there to your web server.
   </p>
 </div>
 

From 7be49c99c15ca6b0a85835768f756654801d73e0 Mon Sep 17 00:00:00 2001
From: "jaybe@jekyll" <jaybe-jekyll@users.noreply.github.com>
Date: Mon, 12 Jan 2015 16:52:13 -0600
Subject: [PATCH 159/407] Update configuration.md

Sync Destination folder cleansing language with Usage docs page (i.e. adding `keep_files` directive).
---
 site/_docs/configuration.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index 7a75bd696..488bb86e7 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -156,7 +156,8 @@ class="flag">flags</code> (specified on the command-line) that control them.
   <p>
     The contents of <code>&lt;destination&gt;</code> are automatically
     cleaned, by default, when the site is built. Files or folders that are not
-    created by your site will be removed. Some files could be retained by specifying them within the  <code>&lt;keep_files&gt;</code> configuration directive.
+    created by your site will be removed. Some files could be retained
+    by specifying them within the <code>&lt;keep_files&gt;</code> configuration directive.
   </p>
   <p>
     Do not use an important location for <code>&lt;destination&gt;</code>; instead, use it as

From aedff733e017f1ed07707fee5e6c65b50f16319a Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 12 Jan 2015 15:08:15 -0800
Subject: [PATCH 160/407] Update history to reflect merge of #3296 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f61ca57ae..38d0ab455 100644
--- a/History.markdown
+++ b/History.markdown
@@ -47,7 +47,7 @@
   * Add new AsciiDoc plugin to list of third-party plugins. (#3277)
   * Specify that all transformable collection documents must contain YAML front matter (#3271)
   * Assorted accessibility fixes (#3256)
-  * Update configuration docs to mention `keep_files` for `destination` (#3288)
+  * Update configuration docs to mention `keep_files` for `destination` (#3288, #3296)
   * Break when we successfully generate nav link to save CPU cycles. (#3291)
 
 ## 2.5.3 / 2014-12-22

From 12cbfa8cf43c1e638f228291cfecf2cbb5a8c58b Mon Sep 17 00:00:00 2001
From: "jaybe@jekyll" <jaybe-jekyll@users.noreply.github.com>
Date: Mon, 12 Jan 2015 18:20:17 -0600
Subject: [PATCH 161/407] Update usage.md

Clarity.
---
 site/_docs/usage.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/site/_docs/usage.md b/site/_docs/usage.md
index 115cf5e14..ae62a57f3 100644
--- a/site/_docs/usage.md
+++ b/site/_docs/usage.md
@@ -29,8 +29,9 @@ $ jekyll build --watch
   <p>
     The contents of <code>&lt;destination&gt;</code> are automatically
     cleaned, by default, when the site is built. Files or folders that are not
-    created by your site will be removed. Some files could be retained
-    by specifying them within the <code>&lt;keep_files&gt;</code> configuration directive.
+    created by your site will be removed. Files and folders you wish to be retain 
+    in <code>&lt;destination&gt;</code> may be specified within the <code>&lt;keep_files&gt;</code> 
+    configuration directive.
   </p>
   <p>
     Do not use an important location for <code>&lt;destination&gt;</code>; 

From e378b2efd39ea09be6f9f70af5c5be07cc47b2c8 Mon Sep 17 00:00:00 2001
From: "jaybe@jekyll" <jaybe-jekyll@users.noreply.github.com>
Date: Mon, 12 Jan 2015 18:21:00 -0600
Subject: [PATCH 162/407] Update usage.md

Correction; clarity.
---
 site/_docs/usage.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/usage.md b/site/_docs/usage.md
index ae62a57f3..7fb719eeb 100644
--- a/site/_docs/usage.md
+++ b/site/_docs/usage.md
@@ -29,7 +29,7 @@ $ jekyll build --watch
   <p>
     The contents of <code>&lt;destination&gt;</code> are automatically
     cleaned, by default, when the site is built. Files or folders that are not
-    created by your site will be removed. Files and folders you wish to be retain 
+    created by your site will be removed. Files and folders you wish to retain 
     in <code>&lt;destination&gt;</code> may be specified within the <code>&lt;keep_files&gt;</code> 
     configuration directive.
   </p>

From e13c800b3aa83b1adb1e9569dc32c4d025f97afd Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 12 Jan 2015 18:23:42 -0800
Subject: [PATCH 163/407] Update history to reflect merge of #3295 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 38d0ab455..d6b943dff 100644
--- a/History.markdown
+++ b/History.markdown
@@ -49,6 +49,7 @@
   * Assorted accessibility fixes (#3256)
   * Update configuration docs to mention `keep_files` for `destination` (#3288, #3296)
   * Break when we successfully generate nav link to save CPU cycles. (#3291)
+  * Update usage docs to mention `keep_files` and a warning about `destination` cleaning (#3295)
 
 ## 2.5.3 / 2014-12-22
 

From b31d8a1ecdba138bbb20ce37383df01d59388706 Mon Sep 17 00:00:00 2001
From: Alan Scherger <flyinprogrammer@gmail.com>
Date: Mon, 12 Jan 2015 22:05:25 -0800
Subject: [PATCH 164/407] more concise doc array creation

---
 site/_includes/section_nav.html | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/site/_includes/section_nav.html b/site/_includes/section_nav.html
index c7b606472..2016997e0 100644
--- a/site/_includes/section_nav.html
+++ b/site/_includes/section_nav.html
@@ -1,25 +1,16 @@
 {% comment %}
-Lets turn our yaml into a structured list of documents without titles.
+Map grabs the doc sections, giving us an array of arrays. Join, flattens all
+the items to a comma delimited string. Split turns it into an array again.
 {% endcomment %}
-
-{% assign docs = site.data.docs | map: 'docs' %}
-{% capture document_array_string %}
-{% for doc in docs %}
-  {% assign last_last = forloop.last %}
-  {% for title in doc %}
-    {{title}}{% unless forloop.last and last_last %},{% endunless %}
-  {% endfor %}
-{% endfor %}
-{% endcapture %}
-{% assign document_array = document_array_string | strip_newlines | split: ',' %}
+{% assign docs = site.data.docs | map: 'docs' | join: ',' | split: ',' %}
 
 {% comment %}
-Because this is built for every page, lets find where we are in the document list by comparing url strings.
-Then if there's something previous or next, lets build links to it.
-Note: When arrays are accessed directly, they are zero based.
+Because this is built for every page, lets find where we are in the ordered
+document list by comparing url strings. Then if there's something previous or
+next, lets build a link to it.
 {% endcomment %}
 
-{% for document in document_array %}
+{% for document in docs %}
   {% assign document_url = document | prepend:"/docs/" | append:"/" %}
   {% if document_url == page.url %}
     <div class="section-nav">
@@ -28,7 +19,7 @@ Note: When arrays are accessed directly, they are zero based.
             <span class="prev disabled">Back</span>
           {% else %}
             {% assign previous = forloop.index0 | minus: 1 %}
-            {% assign previous_page = document_array[previous] | prepend:"/docs/" | append:"/" %}
+            {% assign previous_page = docs[previous] | prepend:"/docs/" | append:"/" %}
             <a href="{{ previous_page }}" class="prev">Back</a>
           {% endif %}
       </div>
@@ -37,7 +28,7 @@ Note: When arrays are accessed directly, they are zero based.
             <span class="next disabled">Next</span>
           {% else %}
             {% assign next = forloop.index0 | plus: 1 %}
-            {% assign next_page = document_array[next] | prepend:"/docs/" | append:"/" %}
+            {% assign next_page = docs[next] | prepend:"/docs/" | append:"/" %}
             <a href="{{ next_page }}" class="next">Next</a>
           {% endif %}
       </div>

From 936c737a32769c45558da536e64d6aa9161535cd Mon Sep 17 00:00:00 2001
From: Ryan Burnette <ryan.burnette@gmail.com>
Date: Tue, 13 Jan 2015 02:21:28 -0500
Subject: [PATCH 165/407] Address #3298

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

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index fca03437c..5972aad65 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -302,6 +302,8 @@ module Jekyll
       case input
       when Time
         input
+      when Date
+        input.to_time
       when String
         Time.parse(input) rescue Time.at(input.to_i)
       when Numeric

From 588bba39adaa2ed001c693d4c5c74b7aaa296af0 Mon Sep 17 00:00:00 2001
From: Ryan Burnette <ryan.burnette@gmail.com>
Date: Tue, 13 Jan 2015 13:51:36 -0500
Subject: [PATCH 166/407] Add test for Date object in filters.rb

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

diff --git a/test/test_filters.rb b/test/test_filters.rb
index 659b7a849..a8cd9737b 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -17,6 +17,7 @@ class TestFilters < Test::Unit::TestCase
     setup do
       @filter = JekyllFilter.new({"source" => source_dir, "destination" => dest_dir, "timezone" => "UTC"})
       @sample_time = Time.utc(2013, 03, 27, 11, 22, 33)
+      @sample_date = Date.parse("2013-03-27")
       @time_as_string = "September 11, 2001 12:46:30 -0000"
       @time_as_numeric = 1399680607
       @array_of_objects = [
@@ -80,6 +81,24 @@ class TestFilters < Test::Unit::TestCase
         end
       end
 
+      context "with Date object" do
+        should "format a date with short format" do
+          assert_equal "27 Mar 2013", @filter.date_to_string(@sample_date)
+        end
+
+        should "format a date with long format" do
+          assert_equal "27 March 2013", @filter.date_to_long_string(@sample_date)
+        end
+
+        should "format a time with xmlschema" do
+          assert_equal "2013-03-27T00:00:00+00:00", @filter.date_to_xmlschema(@sample_date)
+        end
+
+        should "format a time according to RFC-822" do
+          assert_equal "Wed, 27 Mar 2013 00:00:00 +0000", @filter.date_to_rfc822(@sample_date)
+        end
+      end
+
       context "with String object" do
         should "format a date with short format" do
           assert_equal "11 Sep 2001", @filter.date_to_string(@time_as_string)

From 80465efff7485bdf9522c3bda3069ee761e09367 Mon Sep 17 00:00:00 2001
From: Ryan Burnette <ryan.burnette@gmail.com>
Date: Tue, 13 Jan 2015 13:51:47 -0500
Subject: [PATCH 167/407] Require date in filters.rb

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

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 5972aad65..e76fa7550 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -1,5 +1,6 @@
 require 'uri'
 require 'json'
+require 'date'
 
 module Jekyll
   module Filters

From 5b50687e221beb58e7f8cf9b38524d017242f72a Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 13 Jan 2015 12:01:11 -0800
Subject: [PATCH 168/407] Update history to reflect merge of #3299 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d6b943dff..5f344c3f7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -21,6 +21,7 @@
 
 ### Bug Fixes
 
+  * `time()`pre-filter method should accept a `Date` object (#3299)
   * Remove unneeded end tag for `link` in site template (#3236)
   * Kramdown: Use `enable_coderay` key instead of `use_coderay` (#3237)
   * Unescape `Document` output path (#2924)

From b2e114ed5b67767493fdb784d2826567cbb18607 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 13 Jan 2015 13:14:25 -0800
Subject: [PATCH 169/407] Update history to reflect merge of #3292 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5f344c3f7..7997d0616 100644
--- a/History.markdown
+++ b/History.markdown
@@ -51,6 +51,7 @@
   * Update configuration docs to mention `keep_files` for `destination` (#3288, #3296)
   * Break when we successfully generate nav link to save CPU cycles. (#3291)
   * Update usage docs to mention `keep_files` and a warning about `destination` cleaning (#3295)
+  * Add logic to automatically generate the `next_section` and `prev_section` navigation items (#3292)
 
 ## 2.5.3 / 2014-12-22
 

From 59e1e2dd8408fc4c0228e050a43ff38b63234813 Mon Sep 17 00:00:00 2001
From: Matt Rogers <codemattr@gmail.com>
Date: Tue, 13 Jan 2015 19:02:42 -0600
Subject: [PATCH 170/407] Update history to reflect merge of #3220 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7997d0616..00dc1a039 100644
--- a/History.markdown
+++ b/History.markdown
@@ -18,6 +18,7 @@
   * Added basic microdata to post template in site template (#3189)
   * Store log messages in an array of messages. (#3244)
   * Allow collection documents to override `output` property in front matter (#3172)
+  * Keep file modification times between builds for static files (#3220)
 
 ### Bug Fixes
 

From 99ae1023b4bc7c7cab18f8af4e384e8eee85da16 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Wed, 14 Jan 2015 05:45:49 -0600
Subject: [PATCH 171/407] Fix bad tabbing.

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

diff --git a/.travis.yml b/.travis.yml
index d8ba31005..d7960ce72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,8 @@ rvm:
 - 2.0
 env:
   matrix:
-  - TEST_SUITE=test
-  - TEST_SUITE=cucumber
+    - TEST_SUITE=test
+    - TEST_SUITE=cucumber
 before_script: bundle update
 script: script/cibuild
 notifications:
@@ -16,9 +16,9 @@ notifications:
     on_success: change
     on_failure: change
     channels:
-    - irc.freenode.org#jekyll
+      - irc.freenode.org#jekyll
     template:
-    - "%{repository}#%{build_number} (%{branch}) %{message} %{build_url}"
+      - "%{repository}#%{build_number} (%{branch}) %{message} %{build_url}"
   email:
     on_success: never
     on_failure: never

From 8e7d40ed909247ed10ca5ee439d5e6a3abfaa4d7 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Wed, 14 Jan 2015 05:59:12 -0600
Subject: [PATCH 172/407] Seriously, why was vendor/ not in the .gitignore?

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 36da96562..f5ad5bc24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ coverage
 .sass-cache
 tmp/*
 .jekyll-metadata
+/vendor

From 2547df81a154fafeb03a49870077b2ba67e26dd2 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Wed, 14 Jan 2015 05:59:40 -0600
Subject: [PATCH 173/407] Allow test to be aliased as spec.

---
 Rakefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Rakefile b/Rakefile
index 56d51815b..0b52c85d2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -89,6 +89,7 @@ end
 
 multitask :default => [:test, :features]
 
+task :spec => :test
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'

From 3cb0f4f59004b45cbe8c8daa860a3da151c8667c Mon Sep 17 00:00:00 2001
From: Adam Richeimer <adamzr@gmail.com>
Date: Wed, 14 Jan 2015 11:20:03 -0800
Subject: [PATCH 174/407] Formatting fixes

- Add command to list of types of plugins
- Made "command" plural to be consistent with other types
- Made the types into links within the page
---
 site/_docs/plugins.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index cf0aab6e1..36173caf8 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -53,9 +53,10 @@ You have 3 options for installing plugins:
 
 In general, plugins you make will fall into one of three categories:
 
-1. Generators
-2. Converters
-3. Tags
+1. [Generators](#Generators)
+2. [Converters](#Converters)
+3. [Commands](#Commands)
+4. [Tags](#Tags)
 
 ## Generators
 
@@ -248,7 +249,7 @@ In our example, `UpcaseConverter#matches` checks if our filename extension is
 simply uppercasing the entire content string. Finally, when it saves the page,
 it will do so with a `.html` extension.
 
-## Command
+## Commands
 
 As of version 2.5.0, Jekyll can be extended with plugins which provide
 subcommands for the `jekyll` executable. This is possible by including the

From b1fd7377fd00962d5abcb92e6a8e3c4acb3b5e22 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 14 Jan 2015 15:07:09 -0800
Subject: [PATCH 175/407] Update history to reflect merge of #3306 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 00dc1a039..67fdb9631 100644
--- a/History.markdown
+++ b/History.markdown
@@ -53,6 +53,7 @@
   * Break when we successfully generate nav link to save CPU cycles. (#3291)
   * Update usage docs to mention `keep_files` and a warning about `destination` cleaning (#3295)
   * Add logic to automatically generate the `next_section` and `prev_section` navigation items (#3292)
+  * Some small fixes for the Plugins TOC. (#3306)
 
 ## 2.5.3 / 2014-12-22
 

From 60da4ef010a129cebff0dec888a9d0bc5b60c478 Mon Sep 17 00:00:00 2001
From: Mads Ohm Larsen <mads.ohm@gmail.com>
Date: Thu, 15 Jan 2015 22:04:00 +0100
Subject: [PATCH 176/407] Fix weird spacing

---
 CONTRIBUTING.markdown                   |  2 +-
 History.markdown                        |  2 +-
 benchmark/string-replacement            |  4 ++--
 lib/site_template/_includes/footer.html | 10 +++++-----
 lib/site_template/_layouts/post.html    |  2 +-
 site/_sass/_style.scss                  |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTING.markdown b/CONTRIBUTING.markdown
index 94533415d..8bd2febee 100644
--- a/CONTRIBUTING.markdown
+++ b/CONTRIBUTING.markdown
@@ -67,7 +67,7 @@ You can find the documentation for jekyllrb.com in the
 [site](https://github.com/jekyll/jekyll/tree/master/site) directory of
 Jekyll's repo on GitHub.com.
 
-All documentation pull requests should be directed at `master`.  Pull
+All documentation pull requests should be directed at `master`. Pull
 requests directed at another branch will not be accepted.
 
 The [Jekyll wiki](https://github.com/jekyll/jekyll/wiki) on GitHub
diff --git a/History.markdown b/History.markdown
index 67fdb9631..a1eb3aa18 100644
--- a/History.markdown
+++ b/History.markdown
@@ -538,7 +538,7 @@
   * Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy
     looking up of variable values in a Liquid context. (#2253)
   * Remove literal lang name from class (#2292)
-  * Return `utf-8` encoding in header for  webrick error page response (#2289)
+  * Return `utf-8` encoding in header for webrick error page response (#2289)
   * Make template site easier to customize (#2268)
   * Add two-digit year to permalink template option (#2301)
   * Add `site.documents` to Liquid payload (list of all docs) (#2295)
diff --git a/benchmark/string-replacement b/benchmark/string-replacement
index 137153760..36de613c3 100644
--- a/benchmark/string-replacement
+++ b/benchmark/string-replacement
@@ -8,6 +8,6 @@ Benchmark.ips do |x|
   x.report('#tr')    { str.tr('some', 'a')    }
   x.report('#gsub')  { str.gsub('some', 'a')  }
   x.report('#gsub!') { str.gsub!('some', 'a') }
-  x.report('#sub')   { str.sub('some', 'a')  }
-  x.report('#sub!')  { str.sub!('some', 'a') }
+  x.report('#sub')   { str.sub('some', 'a')   }
+  x.report('#sub!')  { str.sub!('some', 'a')  }
 end
diff --git a/lib/site_template/_includes/footer.html b/lib/site_template/_includes/footer.html
index be3976f7e..ee8246a5b 100644
--- a/lib/site_template/_includes/footer.html
+++ b/lib/site_template/_includes/footer.html
@@ -5,19 +5,19 @@
     <h2 class="footer-heading">{{ site.title }}</h2>
 
     <div class="footer-col-wrapper">
-      <div class="footer-col  footer-col-1">
+      <div class="footer-col footer-col-1">
         <ul class="contact-list">
           <li>{{ site.title }}</li>
           <li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>
         </ul>
       </div>
 
-      <div class="footer-col  footer-col-2">
+      <div class="footer-col footer-col-2">
         <ul class="social-media-list">
           {% if site.github_username %}
           <li>
             <a href="https://github.com/{{ site.github_username }}">
-              <span class="icon  icon--github">
+              <span class="icon icon--github">
                 <svg viewBox="0 0 16 16">
                   <path fill="#828282" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/>
                 </svg>
@@ -31,7 +31,7 @@
           {% if site.twitter_username %}
           <li>
             <a href="https://twitter.com/{{ site.twitter_username }}">
-              <span class="icon  icon--twitter">
+              <span class="icon icon--twitter">
                 <svg viewBox="0 0 16 16">
                   <path fill="#828282" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809
                   c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27 c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767 c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206 C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271 c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469 c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/>
@@ -45,7 +45,7 @@
         </ul>
       </div>
 
-      <div class="footer-col  footer-col-3">
+      <div class="footer-col footer-col-3">
         <p class="text">{{ site.description }}</p>
       </div>
     </div>
diff --git a/lib/site_template/_layouts/post.html b/lib/site_template/_layouts/post.html
index d34c02d20..d4f8be3ed 100644
--- a/lib/site_template/_layouts/post.html
+++ b/lib/site_template/_layouts/post.html
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-<article class="post"  itemscope itemtype="http://schema.org/BlogPosting">
+<article class="post" itemscope itemtype="http://schema.org/BlogPosting">
 
   <header class="post-header">
     <h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>
diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss
index 80b1d604e..6c2a8158f 100644
--- a/site/_sass/_style.scss
+++ b/site/_sass/_style.scss
@@ -288,7 +288,7 @@ footer {
       border-bottom: 1px solid #111;
     }
 
-    .shell  {
+    .shell {
       padding: 20px;
       text-shadow: none;
       margin: 0 20px;

From f5fbf4ffd12982663b2335aa7ff98c841d35cf3c Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 15 Jan 2015 13:40:12 -0800
Subject: [PATCH 177/407] Update history to reflect merge of #3312 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a1eb3aa18..3614d718b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -38,6 +38,7 @@
   * Use `FileList` instead of `Dir.glob` in `site:publish` rake task (#3261)
   * Fix test script to be platform-independent (#3279)
   * Instead of symlinking `/tmp`, create and symlink a local `tmp` in the tests (#3258)
+  * Fix some spacing (#3312)
 
 ### Site Enhancements
 

From a1ea8b9798af3f1b81abbdc805319a72f17ca549 Mon Sep 17 00:00:00 2001
From: Joseph Anderson <janderson760@gmail.com>
Date: Fri, 16 Jan 2015 15:58:21 -0800
Subject: [PATCH 178/407] Added versioning comment to configuration file

# previously `post` in Jekyll 2.2.
---
 site/_docs/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index ad34fb68b..67dd25d41 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -388,7 +388,7 @@ defaults:
   -
     scope:
       path: "projects"
-      type: "pages"
+      type: "pages" # previously `page` in Jekyll 2.2.
     values:
       layout: "project" # overrides previous default layout
       author: "Mr. Hyde"

From 1fc3887d4ff5ffe7dca3c9e6afee5c2941473a65 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 14:56:13 -0800
Subject: [PATCH 179/407] Update history to reflect merge of #2571 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3614d718b..1265e3b1e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
   * Store log messages in an array of messages. (#3244)
   * Allow collection documents to override `output` property in front matter (#3172)
   * Keep file modification times between builds for static files (#3220)
+  * Only downcase mixed-case categories for the URL (#2571)
 
 ### Bug Fixes
 

From 8692822631f9203ac193dcec1bcba54ed3e98017 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 14:56:59 -0800
Subject: [PATCH 180/407] Update history to reflect merge of #3314 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1265e3b1e..e18643813 100644
--- a/History.markdown
+++ b/History.markdown
@@ -56,6 +56,7 @@
   * Update usage docs to mention `keep_files` and a warning about `destination` cleaning (#3295)
   * Add logic to automatically generate the `next_section` and `prev_section` navigation items (#3292)
   * Some small fixes for the Plugins TOC. (#3306)
+  * Added versioning comment to configuration file (#3314)
 
 ## 2.5.3 / 2014-12-22
 

From 18f3d7660357d352b20e9e20484f77a9b3e3659e Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 14:59:44 -0800
Subject: [PATCH 181/407] Ensure Post#excerpt_separator always returns a
 string.

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

diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index c94d66b6a..384a10ee5 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -124,7 +124,7 @@ module Jekyll
     #
     # Returns the post excerpt_separator
     def excerpt_separator
-      data.fetch('excerpt_separator') { site.config['excerpt_separator'].to_s }
+      (data['excerpt_separator'] || site.config['excerpt_separator']).to_s
     end
 
     # Turns the post slug into a suitable title

From 153db8a230da4919fd9f296c557739623415f535 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 15:01:08 -0800
Subject: [PATCH 182/407] Update site history. [ci skip]

---
 Rakefile              | 3 +--
 site/_docs/history.md | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index 0b52c85d2..1b3e7e676 100644
--- a/Rakefile
+++ b/Rakefile
@@ -238,8 +238,7 @@ namespace :site do
       front_matter = {
         "layout" => "docs",
         "title" => "History",
-        "permalink" => "/docs/history/",
-        "prev_section" => "contributing"
+        "permalink" => "/docs/history/"
       }
       Dir.chdir('site/_docs/') do
         File.open("history.md", "w") do |file|
diff --git a/site/_docs/history.md b/site/_docs/history.md
index 01b77d273..346dc1310 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -549,7 +549,7 @@ permalink: "/docs/history/"
 - Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy
     looking up of variable values in a Liquid context. ([#2253]({{ site.repository }}/issues/2253))
 - Remove literal lang name from class ([#2292]({{ site.repository }}/issues/2292))
-- Return `utf-8` encoding in header for  webrick error page response ([#2289]({{ site.repository }}/issues/2289))
+- Return `utf-8` encoding in header for webrick error page response ([#2289]({{ site.repository }}/issues/2289))
 - Make template site easier to customize ([#2268]({{ site.repository }}/issues/2268))
 - Add two-digit year to permalink template option ([#2301]({{ site.repository }}/issues/2301))
 - Add `site.documents` to Liquid payload (list of all docs) ([#2295]({{ site.repository }}/issues/2295))

From 3d69582d36b270cdc4c3b136c15e5fe7acaba7fb Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 15:01:58 -0800
Subject: [PATCH 183/407] Update history to reflect merge of #3274 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e18643813..fc3034d7c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -20,6 +20,7 @@
   * Allow collection documents to override `output` property in front matter (#3172)
   * Keep file modification times between builds for static files (#3220)
   * Only downcase mixed-case categories for the URL (#2571)
+  * Added per post `excerpt_separator` functionality (#3274)
 
 ### Bug Fixes
 

From 1715956baa4cf30ff75f65270476f939a8b48a27 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 15:13:46 -0800
Subject: [PATCH 184/407] Update history to reflect merge of #3014 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fc3034d7c..ec97ec12a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -24,6 +24,7 @@
 
 ### Bug Fixes
 
+  * Make permalink parsing consistent with pages (#3014)
   * `time()`pre-filter method should accept a `Date` object (#3299)
   * Remove unneeded end tag for `link` in site template (#3236)
   * Kramdown: Use `enable_coderay` key instead of `use_coderay` (#3237)

From 7f44500b4b67ea1d23d59ab2400f47bd81d1bbfd Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 15:17:26 -0800
Subject: [PATCH 185/407] Update history to reflect merge of #2774 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ec97ec12a..074e08df6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -31,6 +31,7 @@
   * Unescape `Document` output path (#2924)
   * Fix nav items alignment when on multiple rows (#3264)
   * Highlight: Only Strip Newlines/Carriage Returns, not Spaces (#3278)
+  * Find variables in front matter defaults by searching with relative file path. (#2774)
 
 ### Development Fixes
 

From c7d92c4e6d0ba4750c7955b43f51da4b30b3902f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 15:23:33 -0800
Subject: [PATCH 186/407] Move YAML Front Matter regexp into a constant.

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

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index babc974a3..a1287a20d 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -7,6 +7,8 @@ module Jekyll
     attr_reader   :path, :site, :extname
     attr_accessor :content, :collection, :output
 
+    YAML_FRONT_MATTER_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
+
     # Create a new Document.
     #
     # site - the Jekyll::Site instance to which this Document belongs
@@ -210,7 +212,7 @@ module Jekyll
             @data = defaults
           end
           @content = File.read(path, merged_file_read_opts(opts))
-          if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
+          if content =~ YAML_FRONT_MATTER_REGEXP
             @content = $POSTMATCH
             data_file = SafeYAML.load($1)
             unless data_file.nil?

From 57b43e2229d7ce12f18b4a02118df8684ab8f128 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 15:25:17 -0800
Subject: [PATCH 187/407] Update history to reflect merge of #3134 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 074e08df6..f8680c04d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -21,6 +21,7 @@
   * Keep file modification times between builds for static files (#3220)
   * Only downcase mixed-case categories for the URL (#2571)
   * Added per post `excerpt_separator` functionality (#3274)
+  * Allow collections YAML to end with three dots (#3134)
 
 ### Bug Fixes
 

From 3fe80929add3e7b99fefd66a2881aa66eb056443 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 15:28:03 -0800
Subject: [PATCH 188/407] We have 47 posts now in the tests.

---
 test/test_generated_site.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 03669b904..d3fbc8872 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -14,7 +14,7 @@ class TestGeneratedSite < Test::Unit::TestCase
     end
 
     should "ensure post count is as expected" do
-      assert_equal 45, @site.posts.size
+      assert_equal 47, @site.posts.size
     end
 
     should "insert site.posts into the index" do

From 5868ba16911ca7eed5a195b0044dc657ef40bcb9 Mon Sep 17 00:00:00 2001
From: Mike Callan <mcallan83@gmail.com>
Date: Thu, 29 May 2014 14:21:43 -0500
Subject: [PATCH 189/407] new test to prove permalinks in global config do not
 respect template variables

---
 features/permalink_default.feature | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 features/permalink_default.feature

diff --git a/features/permalink_default.feature b/features/permalink_default.feature
new file mode 100644
index 000000000..0e471d6b7
--- /dev/null
+++ b/features/permalink_default.feature
@@ -0,0 +1,9 @@
+Feature: postpermalink defaults
+  Scenario: Define permalink default for posts
+    Given I have a _posts directory
+    And I have the following post:
+      | title          | date       | category | content | 
+      | testpost       | 2013-10-14 | blog     | blabla  |
+    And I have a configuration file with "defaults" set to "[{scope: {path: "", type: "post"}, values: {permalink: ":categories/:title"}}]"
+    When I run jekyll build
+    Then I should see "blabla" in "blog/testpost/index.html"

From 87500addd5d6d89c0646ed7ca3c4ef781cc6b1d3 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 15:46:35 -0800
Subject: [PATCH 190/407] Move the test & fix it.

---
 features/frontmatter_defaults.feature | 9 +++++++++
 features/permalink_default.feature    | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 features/permalink_default.feature

diff --git a/features/frontmatter_defaults.feature b/features/frontmatter_defaults.feature
index 0d0578e27..3ebfd59ca 100644
--- a/features/frontmatter_defaults.feature
+++ b/features/frontmatter_defaults.feature
@@ -100,6 +100,15 @@ Feature: frontmatter defaults
     And I should see "nothing" in "_site/override.html"
     But the "_site/perma.html" file should not exist
 
+  Scenario: Define permalink default for posts
+    Given I have a _posts directory
+    And I have the following post:
+      | title          | date       | category | content |
+      | testpost       | 2013-10-14 | blog     | blabla  |
+    And I have a configuration file with "defaults" set to "[{scope: {path: "", type: "posts"}, values: {permalink: "/:categories/:title/"}}]"
+    When I run jekyll build
+    Then I should see "blabla" in "_site/blog/testpost/index.html"
+
   Scenario: Use frontmatter defaults in collections
     Given I have a _slides directory
     And I have a "index.html" file that contains "nothing"
diff --git a/features/permalink_default.feature b/features/permalink_default.feature
deleted file mode 100644
index 0e471d6b7..000000000
--- a/features/permalink_default.feature
+++ /dev/null
@@ -1,9 +0,0 @@
-Feature: postpermalink defaults
-  Scenario: Define permalink default for posts
-    Given I have a _posts directory
-    And I have the following post:
-      | title          | date       | category | content | 
-      | testpost       | 2013-10-14 | blog     | blabla  |
-    And I have a configuration file with "defaults" set to "[{scope: {path: "", type: "post"}, values: {permalink: ":categories/:title"}}]"
-    When I run jekyll build
-    Then I should see "blabla" in "blog/testpost/index.html"

From 18fb1bafa0268cd2ff4d49ded17bf707523c404f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 15:47:18 -0800
Subject: [PATCH 191/407] Update history to reflect merge of #3320 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f8680c04d..0992491a5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -33,6 +33,7 @@
   * Fix nav items alignment when on multiple rows (#3264)
   * Highlight: Only Strip Newlines/Carriage Returns, not Spaces (#3278)
   * Find variables in front matter defaults by searching with relative file path. (#2774)
+  * Allow variables (e.g `:categories`) in YAML front matter permalinks (#3320)
 
 ### Development Fixes
 

From 6081fcd75acdc31f45f2dddf7411d4857fda4d4e Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 16:00:35 -0800
Subject: [PATCH 192/407] Move the slugify options out to their own section so
 as to fix the formatting.

---
 site/_docs/templates.md | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/site/_docs/templates.md b/site/_docs/templates.md
index 36a06e4c4..cc1d9d874 100644
--- a/site/_docs/templates.md
+++ b/site/_docs/templates.md
@@ -214,14 +214,7 @@ common tasks easier.
     <tr>
       <td>
         <p class="name"><strong>Slugify</strong></p>
-        <p>Convert a string into a lowercase URL "slug".</p>
-	<p>Optional argument mode specify what characters are replaced with a hyphen. The default value is 'default'.</p>
-	<ul>
-	  <li>'none': no characters</li>
-	  <li>'raw': spaces</li>
-	  <li>'default': spaces and non-alphanumeric characters</li>
-	  <li>'pretty': spaces and non-alphanumeric characters except for <em>._~!$&amp;'()+,;=@</em></li>
-	</ul>
+        <p>Convert a string into a lowercase URL "slug". See below for options.</p>
       </td>
       <td class="align-center">
         <p>
@@ -270,6 +263,16 @@ common tasks easier.
 </table>
 </div>
 
+### Options for the `slugify` filter
+
+The `slugify` filter accepts an option, each specifying what to filter.
+The default is `default`. The are as follows (with what they filter):
+
+- `none`: no characters
+- `raw`: spaces
+- `default`: spaces and non-alphanumeric characters
+- `pretty`: spaces and non-alphanumeric characters except for `._~!$&'()+,;=@`
+
 ## Tags
 
 ### Includes

From aaea08e094f2f38f15727718dc7d6a5edb8bbd2f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 16:02:33 -0800
Subject: [PATCH 193/407] Remove superfluous Sass declarations.

---
 site/_sass/_style.scss | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss
index 8f635e3fa..16cc902fb 100644
--- a/site/_sass/_style.scss
+++ b/site/_sass/_style.scss
@@ -834,14 +834,10 @@ td {
   padding: .5em .75em;
 }
 
-td p, td ul, article td li {
+td p {
   margin: 0;
 }
 
-td ul {
-  padding: 0 0 0 1.2em;
-}
-
 th {
   text-transform: uppercase;
   font-size: 16px;
@@ -865,7 +861,7 @@ tbody td {
   filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1affffff', endColorstr='#00ffffff',GradientType=0 );
 }
 
-td p, td ul {
+td p {
   font-size: 16px;
 }
 

From f7271a6ef958d250d01d92784a28e7558b7452c5 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 16:06:55 -0800
Subject: [PATCH 194/407] Update history to reflect merge of #2918 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0992491a5..d995f2fcb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -22,6 +22,7 @@
   * Only downcase mixed-case categories for the URL (#2571)
   * Added per post `excerpt_separator` functionality (#3274)
   * Allow collections YAML to end with three dots (#3134)
+  * Add mode parameter to `slugify` Liquid filter (#2918)
 
 ### Bug Fixes
 

From ef2d558874d5fe24db751fec2a07a52166482360 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 16:25:10 -0800
Subject: [PATCH 195/407] Markdown#matches should avoid regexp

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

diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb
index f0d1afb07..39389874e 100644
--- a/lib/jekyll/converters/markdown.rb
+++ b/lib/jekyll/converters/markdown.rb
@@ -46,15 +46,12 @@ module Jekyll
         ].map(&:to_sym)
       end
 
-      def extname_matches_regexp
-        @extname_matches_regexp ||= Regexp.new(
-          '^\.(' + @config['markdown_ext'].gsub(',','|') +')$',
-          Regexp::IGNORECASE
-        )
+      def extname_list
+        @extname_list ||= @config['markdown_ext'].split(',').map { |e| ".#{e.downcase}" }
       end
 
       def matches(ext)
-        ext =~ extname_matches_regexp
+        extname_list.include? ext.downcase
       end
 
       def output_ext(ext)

From aaf0ba15ccbf9e2ded565b4115af9dd22b24ff8a Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 16:25:33 -0800
Subject: [PATCH 196/407] Use frozen regular expressions for Utils#slugify

---
 lib/jekyll/utils.rb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index ba0303a4b..bba8b148c 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -2,6 +2,12 @@ module Jekyll
   module Utils
     extend self
 
+    # Constants for use in #slugify
+    SLUGIFY_MODES = %w{raw default pretty}
+    SLUGIFY_RAW_REGEXP = Regexp.new('\\s+').freeze
+    SLUGIFY_DEFAULT_REGEXP = Regexp.new('[^[:alnum:]]+').freeze
+    SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze
+
     # Merges a master hash with another hash, recursively.
     #
     # master_hash - the "parent" hash whose values will be overridden
@@ -129,19 +135,18 @@ module Jekyll
     def slugify(string, mode=nil)
       mode ||= 'default'
       return nil if string.nil?
+      return string.downcase unless SLUGIFY_MODES.include?(mode)
 
       # Replace each character sequence with a hyphen
       re = case mode
       when 'raw'
-        Regexp.new('\\s+')
+        SLUGIFY_RAW_REGEXP
       when 'default'
-        Regexp.new('[^[:alnum:]]+')
+        SLUGIFY_DEFAULT_REGEXP
       when 'pretty'
         # "._~!$&'()+,;=@" is human readable (not URI-escaped) in URL
         # and is allowed in both extN and NTFS.
-        Regexp.new("[^a-zA-Z0-9._~!$&'()+,;=@]+")
-      else
-        return string.downcase
+        SLUGIFY_PRETTY_REGEXP
       end
 
       string.

From d28fb07bb9e3ed07bfe049b82ed0567afb4195fd Mon Sep 17 00:00:00 2001
From: Pascal Borreli <pascal@borreli.com>
Date: Sun, 18 Jan 2015 00:45:28 +0000
Subject: [PATCH 197/407] Fixed typo [ci skip]

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

diff --git a/lib/jekyll/frontmatter_defaults.rb b/lib/jekyll/frontmatter_defaults.rb
index 8355fa957..11eebf3f5 100644
--- a/lib/jekyll/frontmatter_defaults.rb
+++ b/lib/jekyll/frontmatter_defaults.rb
@@ -168,7 +168,7 @@ module Jekyll
       end.compact
     end
 
-    # Sanitizes the given path by removing a leading and addding a trailing slash
+    # Sanitizes the given path by removing a leading and adding a trailing slash
     def sanitize_path(path)
       if path.nil? || path.empty?
         ""

From f11837dd7b203f622b3b79b5c929b779acbf317a Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 16:48:12 -0800
Subject: [PATCH 198/407] Fix cucumber failures due to merge of #3134.

---
 features/collections.feature | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/collections.feature b/features/collections.feature
index 1cdbff4b8..91a271fcb 100644
--- a/features/collections.feature
+++ b/features/collections.feature
@@ -118,7 +118,7 @@ Feature: Collections
     """
     When I run jekyll build
     Then the _site directory should exist
-    And I should see "Item count: 1" in "_site/index.html"
+    And I should see "Item count: 2" in "_site/index.html"
 
   Scenario: Sort by title
     Given I have an "index.html" page that contains "{% assign items = site.methods | sort: 'title' %}1. of {{ items.size }}: {{ items.first.output }}"
@@ -130,7 +130,7 @@ Feature: Collections
     """
     When I run jekyll build
     Then the _site directory should exist
-    And I should see "1. of 6: <p>Page without title.</p>" in "_site/index.html"
+    And I should see "1. of 7: <p>Page without title.</p>" in "_site/index.html"
 
   Scenario: Sort by relative_path
     Given I have an "index.html" page that contains "Collections: {% assign methods = site.methods | sort: 'relative_path' %}{% for method in methods %}{{ method.title }}, {% endfor %}"

From 2547d8adf38b903fd83a2e4c5bf127dddb2a600f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 16:50:30 -0800
Subject: [PATCH 199/407] Update history to reflect merge of #3322 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d995f2fcb..10c6c7b81 100644
--- a/History.markdown
+++ b/History.markdown
@@ -46,6 +46,7 @@
   * Fix test script to be platform-independent (#3279)
   * Instead of symlinking `/tmp`, create and symlink a local `tmp` in the tests (#3258)
   * Fix some spacing (#3312)
+  * Fix comment typo in `lib/jekyll/frontmatter_defaults.rb` (#3322)
 
 ### Site Enhancements
 

From 877cba9811a092e1ce7100ef3cf14e7f17f98804 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 11:52:45 -0800
Subject: [PATCH 200/407] Remove direct baked-in support for Textile.

---
 Gemfile                          |  1 -
 lib/jekyll/converters/textile.rb | 56 --------------------------------
 2 files changed, 57 deletions(-)
 delete mode 100644 lib/jekyll/converters/textile.rb

diff --git a/Gemfile b/Gemfile
index 5649d19fb..88d5e641f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,6 @@ gem 'redgreen', '~> 1.2'
 gem 'shoulda', '~> 3.5'
 gem 'rr', '~> 1.1'
 gem 'cucumber', '1.3.18'
-gem 'RedCloth', '~> 4.2'
 gem 'maruku', '~> 0.7.0'
 gem 'rdiscount', '~> 2.0'
 gem 'launchy', '~> 2.3'
diff --git a/lib/jekyll/converters/textile.rb b/lib/jekyll/converters/textile.rb
deleted file mode 100644
index c8137a3a3..000000000
--- a/lib/jekyll/converters/textile.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-module Jekyll
-  module Converters
-    class Textile < Converter
-      safe true
-
-      highlighter_prefix '<notextile>'
-      highlighter_suffix '</notextile>'
-
-      def setup
-        return if @setup
-        require 'redcloth'
-        @setup = true
-      rescue LoadError
-        STDERR.puts 'You are missing a library required for Textile. Please run:'
-        STDERR.puts '  $ [sudo] gem install RedCloth'
-        raise Errors::FatalException.new("Missing dependency: RedCloth")
-      end
-
-      def extname_matches_regexp
-        @extname_matches_regexp ||= Regexp.new(
-          '(' + @config['textile_ext'].gsub(',','|') +')$',
-          Regexp::IGNORECASE
-        )
-      end
-
-      def matches(ext)
-        ext =~ extname_matches_regexp
-      end
-
-      def output_ext(ext)
-        ".html"
-      end
-
-      def convert(content)
-        setup
-
-        # Shortcut if config doesn't contain RedCloth section
-        return RedCloth.new(content).to_html if @config['redcloth'].nil?
-
-        # List of attributes defined on RedCloth
-        # (from https://github.com/jgarber/redcloth/blob/master/lib/redcloth/textile_doc.rb)
-        attrs = ['filter_classes', 'filter_html', 'filter_ids', 'filter_styles',
-                'hard_breaks', 'lite_mode', 'no_span_caps', 'sanitize_html']
-
-        r = RedCloth.new(content)
-
-        # Set attributes in r if they are NOT nil in the config
-        attrs.each do |attr|
-          r.instance_variable_set("@#{attr}".to_sym, @config['redcloth'][attr]) unless @config['redcloth'][attr].nil?
-        end
-
-        r.to_html
-      end
-    end
-  end
-end

From c1da91cf5c804de2a65704ee4ea168827acc39bc Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 13:32:45 -0800
Subject: [PATCH 201/407] Start removing mentions of Textile.

---
 features/step_definitions/jekyll_steps.rb |  2 +-
 lib/jekyll/configuration.rb               |  5 --
 lib/jekyll/filters.rb                     | 11 ---
 lib/jekyll/site.rb                        |  2 +-
 site/_docs/configuration.md               |  4 --
 site/_docs/index.md                       |  7 +-
 site/_docs/permalinks.md                  |  2 +-
 site/_docs/plugins.md                     |  6 +-
 site/_docs/posts.md                       | 23 +++---
 site/_docs/templates.md                   | 11 ---
 test/helper.rb                            |  2 -
 test/test_filters.rb                      |  4 --
 test/test_post.rb                         |  7 --
 test/test_redcloth.rb                     | 86 -----------------------
 test/test_tags.rb                         | 11 ---
 15 files changed, 22 insertions(+), 161 deletions(-)
 delete mode 100644 test/test_redcloth.rb

diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index 98f14ad15..c289df94f 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -84,7 +84,7 @@ end
 Given /^I have the following (draft|page|post)s?(?: (in|under) "([^"]+)")?:$/ do |status, direction, folder, table|
   table.hashes.each do |input_hash|
     title = slug(input_hash['title'])
-    ext = input_hash['type'] || 'textile'
+    ext = input_hash['type'] || 'markdown'
     before, after = location(folder, direction)
 
     case status
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 7ba9359b2..5277405ce 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -21,7 +21,6 @@ module Jekyll
       'keep_files'    => ['.git','.svn'],
       'encoding'      => 'utf-8',
       'markdown_ext'  => 'markdown,mkdown,mkdn,mkd,md',
-      'textile_ext'   => 'textile',
       'full_rebuild'  => false,
 
       # Filtering Content
@@ -90,10 +89,6 @@ module Jekyll
           'coderay_bold_every'        => 10,
           'coderay_css'               => 'style'
         }
-      },
-
-      'redcloth' => {
-        'hard_breaks' => true
       }
     }
 
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index ff13a2333..d9c84fe88 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -4,17 +4,6 @@ require 'date'
 
 module Jekyll
   module Filters
-    # Convert a Textile string into HTML output.
-    #
-    # input - The Textile String to convert.
-    #
-    # Returns the HTML formatted String.
-    def textilize(input)
-      site = @context.registers[:site]
-      converter = site.find_converter_instance(Jekyll::Converters::Textile)
-      converter.convert(input)
-    end
-
     # Convert a Markdown string into HTML output.
     #
     # input - The Markdown String to convert.
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 38ece4cac..b6ab70399 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -303,7 +303,7 @@ module Jekyll
       [posts, pages].flatten.each do |page_or_post|
         page_or_post.render(layouts, payload) if page_or_post.regenerate?
       end
-    rescue Errno::ENOENT => e
+    rescue Errno::ENOENT
       # ignore missing layout dir
     end
 
diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index 67dd25d41..6d59119d5 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -477,7 +477,6 @@ exclude:      []
 keep_files:   [".git", ".svn"]
 encoding:     "utf-8"
 markdown_ext: "markdown,mkdown,mkdn,mkd,md"
-textile_ext:  "textile"
 
 # Filtering Content
 show_drafts: null
@@ -542,9 +541,6 @@ kramdown:
     coderay_tab_width:         4
     coderay_bold_every:        10
     coderay_css:               style
-
-redcloth:
-  hard_breaks: true
 {% endhighlight %}
 
 ## Markdown Options
diff --git a/site/_docs/index.md b/site/_docs/index.md
index 633d75349..bbb180871 100644
--- a/site/_docs/index.md
+++ b/site/_docs/index.md
@@ -14,10 +14,9 @@ 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
-[Markdown](http://daringfireball.net/projects/markdown/) (or
-[Textile](http://redcloth.org/textile)) and
-[Liquid](https://github.com/Shopify/liquid/wiki)
-converters, and spits out a complete, ready-to-publish static website suitable
+a converter (like [Markdown](http://daringfireball.net/projects/markdown/))
+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](http://pages.github.com), which means you can use Jekyll
 to host your project’s page, blog, or website from GitHub’s servers **for
diff --git a/site/_docs/permalinks.md b/site/_docs/permalinks.md
index 7a47cc68e..703a2289f 100644
--- a/site/_docs/permalinks.md
+++ b/site/_docs/permalinks.md
@@ -149,7 +149,7 @@ enough to fix it all!
 
 ## Permalink style examples
 
-Given a post named: `/2009-04-29-slap-chop.textile`
+Given a post named: `/2009-04-29-slap-chop.md`
 
 <div class="mobile-side-scroller">
 <table>
diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 36173caf8..0748afacb 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -164,8 +164,9 @@ Generators are only required to implement one method:
 ## Converters
 
 If you have a new markup language you’d like to use with your site, you can
-include it by implementing your own converter. Both the Markdown and Textile
-markup languages are implemented using this method.
+include it by implementing your own converter. Both the Markdown and
+[Textile](https://github.com/jekyll/jekyll-textile-converter) markup
+languages are implemented using this method.
 
 <div class="note info">
   <h5>Remember your YAML Front Matter</h5>
@@ -495,6 +496,7 @@ You can find a few useful plugins at the following locations:
 
 #### Converters
 
+- [Textile converter](https://github.com/jekyll/jekyll-textile-converter): Convert `.textile` files into HTML. Also includes the `textilize` Liquid filter.
 - [Slim plugin](https://github.com/slim-template/jekyll-slim): Slim converter and includes for Jekyll with support for Liquid tags.
 - [Jade plugin by John Papandriopoulos](https://github.com/snappylabs/jade-jekyll-plugin): Jade converter for Jekyll.
 - [HAML plugin by Sam Z](https://gist.github.com/517556): HAML converter for Jekyll.
diff --git a/site/_docs/posts.md b/site/_docs/posts.md
index ccdd76add..c2d2e24d1 100644
--- a/site/_docs/posts.md
+++ b/site/_docs/posts.md
@@ -14,11 +14,12 @@ and web-based CMS systems, this will be a welcome change!
 ## The Posts Folder
 
 As explained on the [directory structure](../structure/) page, the `_posts`
-folder is where your blog posts will live. These files can be either
-[Markdown](http://daringfireball.net/projects/markdown/) or
-[Textile](http://redcloth.org/textile) formatted text files, and as long as
-they have [YAML Front Matter](../frontmatter/), they will be converted from their
-source format into an HTML page that is part of your static site.
+folder is where your blog posts will live. These files are generally
+[Markdown](http://daringfireball.net/projects/markdown/) or HTML, but can
+be other formats with the proper converter installed.
+All posts must have [YAML Front Matter](../frontmatter/), and they will be
+converted from their source format into an HTML page that is part of your
+static site.
 
 ### Creating Post Files
 
@@ -52,12 +53,12 @@ file. For example, the following are examples of valid post filenames:
 
 All blog post files must begin with [YAML Front Matter](../frontmatter/). After
 that, it's simply a matter of deciding which format you prefer. Jekyll supports
-two popular content markup formats:
-[Markdown](http://daringfireball.net/projects/markdown/) and
-[Textile](http://redcloth.org/textile). These formats each have their own way
-of marking up different types of content within a post, so you should
-familiarize yourself with these formats and decide which one best suits your
-needs.
+[Markdown](http://daringfireball.net/projects/markdown/) out of the box,
+and has [myriad extensions for other formats as well](/docs/plugins/#converters-1),
+including the popular [Textile](http://redcloth.org/textile) format. These
+formats each have their own way of marking up different types of content
+within a post, so you should familiarize yourself with these formats and
+decide which one best suits your needs.
 
 <div class="note info">
   <h5>Be aware of character sets</h5>
diff --git a/site/_docs/templates.md b/site/_docs/templates.md
index 1b2877b27..9cb3eeded 100644
--- a/site/_docs/templates.md
+++ b/site/_docs/templates.md
@@ -175,17 +175,6 @@ common tasks easier.
         </p>
       </td>
     </tr>
-    <tr>
-      <td>
-        <p class="name"><strong>Textilize</strong></p>
-        <p>Convert a Textile-formatted string into HTML, formatted via RedCloth</p>
-      </td>
-      <td class="align-center">
-        <p>
-         <code class="filter">{% raw %}{{ page.excerpt | textilize }}{% endraw %}</code>
-        </p>
-      </td>
-    </tr>
     <tr>
       <td>
         <p class="name"><strong>Markdownify</strong></p>
diff --git a/test/helper.rb b/test/helper.rb
index 132b1f620..fa546b97b 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -8,11 +8,9 @@ end
 require 'rubygems'
 require 'test/unit'
 require 'ostruct'
-gem 'RedCloth', '>= 4.2.1'
 
 require 'jekyll'
 
-require 'RedCloth'
 require 'rdiscount'
 require 'kramdown'
 require 'redcarpet'
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 0e18dc020..cb44b65ba 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -27,10 +27,6 @@ class TestFilters < Test::Unit::TestCase
       ]
     end
 
-    should "textilize with simple string" do
-      assert_equal "<p>something <strong>really</strong> simple</p>", @filter.textilize("something *really* simple")
-    end
-
     should "markdownify with simple string" do
       assert_equal "<p>something <strong>really</strong> simple</p>\n", @filter.markdownify("something **really** simple")
     end
diff --git a/test/test_post.rb b/test/test_post.rb
index 6fdea40d9..4a33bbc9c 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -746,13 +746,6 @@ class TestPost < Test::Unit::TestCase
       assert conv.kind_of?(Jekyll::Converters::Identity), "The converter for .Rmd should be the Identity converter."
     end
 
-    should "process .text as textile under alternate configuration" do
-      @site.config['textile_ext'] = 'textile,text'
-      post = setup_post '2011-04-12-text-extension.text'
-      conv = post.converters.first
-      assert conv.kind_of? Jekyll::Converters::Textile
-    end
-
   end
 
   context "site config with category" do
diff --git a/test/test_redcloth.rb b/test/test_redcloth.rb
deleted file mode 100644
index 964591bee..000000000
--- a/test/test_redcloth.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-class TestRedCloth < Test::Unit::TestCase
-
-  context "RedCloth default (no explicit config) hard_breaks enabled" do
-    setup do
-      @textile = Converters::Textile.new
-    end
-
-    should "preserve single line breaks in HTML output" do
-      assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
-    end
-  end
-
-  context "Default hard_breaks enabled w/ redcloth section, no hard_breaks value" do
-    setup do
-      config = {
-        'redcloth'      => {}
-        }
-      @textile = Converters::Textile.new config
-    end
-
-    should "preserve single line breaks in HTML output" do
-      assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
-    end
-  end
-
-  context "RedCloth with hard_breaks enabled" do
-    setup do
-      config = {
-        'redcloth'      => {
-          'hard_breaks' => true # default
-        }
-      }
-      @textile = Converters::Textile.new config
-    end
-
-    should "preserve single line breaks in HTML output" do
-      assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
-    end
-  end
-
-  context "RedCloth with hard_breaks disabled" do
-    setup do
-      config = {
-        'redcloth'      => {
-          'hard_breaks' => false
-        }
-      }
-      @textile = Converters::Textile.new config
-    end
-
-    should "not generate break tags in HTML output" do
-      assert_equal "<p>line1\nline2</p>", @textile.convert("p. line1\nline2").strip
-    end
-  end
-
-  context "RedCloth w/no_span_caps set to false" do
-    setup do
-      config = {
-        'redcloth'       => {
-          'no_span_caps' => false
-        }
-      }
-      @textile = Converters::Textile.new config
-    end
-    should "generate span tags around capitalized words" do
-      assert_equal "<p><span class=\"caps\">NSC</span></p>", @textile.convert("NSC").strip
-    end
-  end
-
-  context "RedCloth w/no_span_caps set to true" do
-    setup do
-      config = {
-        'redcloth'       => {
-          'no_span_caps' => true
-        }
-      }
-      @textile = Converters::Textile.new config
-    end
-
-    should "not generate span tags around capitalized words" do
-      assert_equal "<p>NSC</p>", @textile.convert("NSC").strip
-    end
-  end
-end
diff --git a/test/test_tags.rb b/test/test_tags.rb
index c6df3e05c..7b6b60f4d 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -231,17 +231,6 @@ puts "3..2..1.."
 CONTENT
     end
 
-    context "using Textile" do
-      setup do
-        create_post(@content, {}, Jekyll::Converters::Textile)
-      end
-
-      # Broken in RedCloth 4.1.9
-      should "not textilize highlight block" do
-        assert_no_match %r{3\.\.2\.\.1\.\.&quot;</span><br />}, @result
-      end
-    end
-
     context "using Maruku" do
       setup do
         create_post(@content)

From 9d547f74cc16f498779c602a9bb749dd5a5b082b Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 13:59:52 -0800
Subject: [PATCH 202/407] Make all the tests happy.

---
 test/helper.rb                                |  4 +
 ...ar.textile => 2008-10-18-foo-bar.markdown} |  4 +-
 ...ex.textile => 2008-11-21-complex.markdown} |  0
 .../source/_posts/2008-12-13-include.markdown |  2 +-
 ...tile => 2010-01-09-date-override.markdown} |  0
 ...tile => 2010-01-09-time-override.markdown} |  0
 ... => 2010-01-09-timezone-override.markdown} |  0
 test/test_cleaner.rb                          | 12 +--
 test/test_coffeescript.rb                     |  5 +-
 test/test_collections.rb                      | 10 --
 test/test_post.rb                             | 94 ++++++++-----------
 11 files changed, 51 insertions(+), 80 deletions(-)
 rename test/source/_posts/{2008-10-18-foo-bar.textile => 2008-10-18-foo-bar.markdown} (52%)
 rename test/source/_posts/{2008-11-21-complex.textile => 2008-11-21-complex.markdown} (100%)
 rename test/source/_posts/{2010-01-09-date-override.textile => 2010-01-09-date-override.markdown} (100%)
 rename test/source/_posts/{2010-01-09-time-override.textile => 2010-01-09-time-override.markdown} (100%)
 rename test/source/_posts/{2010-01-09-timezone-override.textile => 2010-01-09-timezone-override.markdown} (100%)

diff --git a/test/helper.rb b/test/helper.rb
index fa546b97b..13240e258 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -26,6 +26,10 @@ STDERR.reopen(test(?e, '/dev/null') ? '/dev/null' : 'NUL:')
 class Test::Unit::TestCase
   include RR::Adapters::TestUnit
 
+  def fixture_site(overrides = {})
+    Jekyll::Site.new(site_configuration(overrides))
+  end
+
   def build_configs(overrides, base_hash = Jekyll::Configuration::DEFAULTS)
     Utils.deep_merge_hashes(base_hash, overrides)
   end
diff --git a/test/source/_posts/2008-10-18-foo-bar.textile b/test/source/_posts/2008-10-18-foo-bar.markdown
similarity index 52%
rename from test/source/_posts/2008-10-18-foo-bar.textile
rename to test/source/_posts/2008-10-18-foo-bar.markdown
index 0ed8573e9..3bc219aaf 100644
--- a/test/source/_posts/2008-10-18-foo-bar.textile
+++ b/test/source/_posts/2008-10-18-foo-bar.markdown
@@ -3,6 +3,6 @@ layout: default
 title: Foo Bar
 ---
 
-h1. {{ page.title }}
+# {{ page.title }}
 
-Best *post* ever
\ No newline at end of file
+Best **post** ever
\ No newline at end of file
diff --git a/test/source/_posts/2008-11-21-complex.textile b/test/source/_posts/2008-11-21-complex.markdown
similarity index 100%
rename from test/source/_posts/2008-11-21-complex.textile
rename to test/source/_posts/2008-11-21-complex.markdown
diff --git a/test/source/_posts/2008-12-13-include.markdown b/test/source/_posts/2008-12-13-include.markdown
index 1b02ba2aa..28a93539e 100644
--- a/test/source/_posts/2008-12-13-include.markdown
+++ b/test/source/_posts/2008-12-13-include.markdown
@@ -5,4 +5,4 @@ title: Include
 
 {% include sig.markdown %}
 
-This _is_ cool
\ No newline at end of file
+This _is_ cool
diff --git a/test/source/_posts/2010-01-09-date-override.textile b/test/source/_posts/2010-01-09-date-override.markdown
similarity index 100%
rename from test/source/_posts/2010-01-09-date-override.textile
rename to test/source/_posts/2010-01-09-date-override.markdown
diff --git a/test/source/_posts/2010-01-09-time-override.textile b/test/source/_posts/2010-01-09-time-override.markdown
similarity index 100%
rename from test/source/_posts/2010-01-09-time-override.textile
rename to test/source/_posts/2010-01-09-time-override.markdown
diff --git a/test/source/_posts/2010-01-09-timezone-override.textile b/test/source/_posts/2010-01-09-timezone-override.markdown
similarity index 100%
rename from test/source/_posts/2010-01-09-timezone-override.textile
rename to test/source/_posts/2010-01-09-timezone-override.markdown
diff --git a/test/test_cleaner.rb b/test/test_cleaner.rb
index 304ce6231..74e59507d 100644
--- a/test/test_cleaner.rb
+++ b/test/test_cleaner.rb
@@ -9,11 +9,7 @@ class TestCleaner < Test::Unit::TestCase
       FileUtils.touch(File.join(dest_dir('to_keep'), 'index.html'))
       FileUtils.touch(File.join(dest_dir('to_keep/child_dir'), 'index.html'))
 
-      @site = Site.new(Jekyll.configuration({
-        "skip_config_files" => true,
-        "source" => source_dir,
-        "destination" => dest_dir
-      }))
+      @site = fixture_site
       @site.keep_files = ['to_keep/child_dir']
 
       @cleaner = Site::Cleaner.new(@site)
@@ -48,11 +44,7 @@ class TestCleaner < Test::Unit::TestCase
       FileUtils.mkdir_p(source_dir('no_files_inside/child_dir'))
       FileUtils.touch(File.join(source_dir('no_files_inside/child_dir'), 'index.html'))
 
-      @site = Site.new(Jekyll.configuration({
-        "skip_config_files" => true,
-        "source" => source_dir,
-        "destination" => dest_dir
-      }))
+      @site = fixture_site
       @site.process
 
       @cleaner = Site::Cleaner.new(@site)
diff --git a/test/test_coffeescript.rb b/test/test_coffeescript.rb
index 91fd6237d..2c589f81d 100644
--- a/test/test_coffeescript.rb
+++ b/test/test_coffeescript.rb
@@ -3,10 +3,7 @@ require 'helper'
 class TestCoffeeScript < Test::Unit::TestCase
   context "converting CoffeeScript" do
     setup do
-      @site = Jekyll::Site.new(Jekyll.configuration({
-        "source" => source_dir,
-        "destination" => dest_dir
-      }))
+      @site = fixture_site
       @site.process
       @test_coffeescript_file = dest_dir("js/coffeescript.js")
       @js_output = <<-JS
diff --git a/test/test_collections.rb b/test/test_collections.rb
index 118f8ddb0..a119de5fa 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -1,16 +1,6 @@
 require 'helper'
 
 class TestCollections < Test::Unit::TestCase
-
-  def fixture_site(overrides = {})
-    Jekyll::Site.new(Jekyll.configuration(
-      overrides.merge({
-        "source"      => source_dir,
-        "destination" => dest_dir
-      })
-    ))
-  end
-
   context "an evil collection" do
     setup do
       @collection = Jekyll::Collection.new(fixture_site, "../../etc/password")
diff --git a/test/test_post.rb b/test/test_post.rb
index 4a33bbc9c..63684241a 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -15,18 +15,17 @@ class TestPost < Test::Unit::TestCase
   context "A Post" do
     setup do
       clear_dest
-      @site = Site.new(Jekyll.configuration({
-        "skip_config_files" => true,
-        "source" => source_dir,
-        "destination" => dest_dir
-      }))
+      @site = fixture_site
     end
 
     should "ensure valid posts are valid" do
       assert Post.valid?("2008-09-09-foo-bar.textile")
       assert Post.valid?("foo/bar/2008-09-09-foo-bar.textile")
+      assert Post.valid?("2008-09-09-foo-bar.markdown")
+      assert Post.valid?("foo/bar/2008-09-09-foo-bar.markdown")
 
       assert !Post.valid?("lol2008-09-09-foo-bar.textile")
+      assert !Post.valid?("lol2008-09-09-foo-bar.markdown")
       assert !Post.valid?("blah")
     end
 
@@ -63,8 +62,8 @@ class TestPost < Test::Unit::TestCase
         @post = Post.allocate
         @post.site = @site
 
-        @real_file = "2008-10-18-foo-bar.textile"
-        @fake_file = "2008-09-09-foo-bar.textile"
+        @real_file = "2008-10-18-foo-bar.markdown"
+        @fake_file = "2008-09-09-foo-bar.markdown"
         @source = source_dir('_posts')
       end
 
@@ -74,7 +73,7 @@ class TestPost < Test::Unit::TestCase
 
         assert_equal Time.parse("2008-09-09"), @post.date
         assert_equal "foo-bar", @post.slug
-        assert_equal ".textile", @post.ext
+        assert_equal ".markdown", @post.ext
         assert_equal "/2008/09/09", @post.dir
         assert_equal "/2008/09/09/foo-bar", @post.id
       end
@@ -367,13 +366,13 @@ class TestPost < Test::Unit::TestCase
         @post.read_yaml(@source, @real_file)
 
         assert_equal({"title" => "Foo Bar", "layout" => "default"}, @post.data)
-        assert_equal "h1. {{ page.title }}\n\nBest *post* ever", @post.content
+        assert_equal "# {{ page.title }}\n\nBest **post** ever", @post.content
       end
 
       should "transform textile" do
         @post.process(@real_file)
         @post.read_yaml(@source, @real_file)
-        assert_equal "<h1>{{ page.title }}</h1>\n<p>Best <strong>post</strong> ever</p>", @post.transform
+        assert_equal "<h1 id=\"pagetitle-\">{{ page.title }}</h1>\n\n<p>Best <strong>post</strong> ever</p>", @post.transform.strip
       end
 
       context "#excerpt" do
@@ -461,8 +460,7 @@ class TestPost < Test::Unit::TestCase
     context "when in a site" do
       setup do
         clear_dest
-        stub(Jekyll).configuration { Jekyll::Configuration::DEFAULTS }
-        @site = Site.new(Jekyll.configuration)
+        @site = fixture_site
         @site.posts = [setup_post('2008-02-02-published.textile'),
                        setup_post('2009-01-27-categories.textile')]
       end
@@ -486,30 +484,30 @@ class TestPost < Test::Unit::TestCase
 
     context "initializing posts" do
       should "recognize date in yaml" do
-        post = setup_post("2010-01-09-date-override.textile")
+        post = setup_post("2010-01-09-date-override.markdown")
         do_render(post)
         assert_equal Time, post.date.class
         assert_equal Time, post.to_liquid["date"].class
         assert_equal "/2010/01/10/date-override.html", post.url
-        assert_equal "<p>Post with a front matter date</p>\n<p>10 Jan 2010</p>", post.output
+        assert_equal "<p>Post with a front matter date</p>\n\n<p>10 Jan 2010</p>", post.output.strip
       end
 
       should "recognize time in yaml" do
-        post = setup_post("2010-01-09-time-override.textile")
+        post = setup_post("2010-01-09-time-override.markdown")
         do_render(post)
         assert_equal Time, post.date.class
         assert_equal Time, post.to_liquid["date"].class
         assert_equal "/2010/01/10/time-override.html", post.url
-        assert_equal "<p>Post with a front matter time</p>\n<p>10 Jan 2010</p>", post.output
+        assert_equal "<p>Post with a front matter time</p>\n\n<p>10 Jan 2010</p>", post.output.strip
       end
 
       should "recognize time with timezone in yaml" do
-        post = setup_post("2010-01-09-timezone-override.textile")
+        post = setup_post("2010-01-09-timezone-override.markdown")
         do_render(post)
         assert_equal Time, post.date.class
         assert_equal Time, post.to_liquid["date"].class
         assert_equal "/2010/01/10/timezone-override.html", post.url
-        assert_equal "<p>Post with a front matter time with timezone</p>\n<p>10 Jan 2010</p>", post.output
+        assert_equal "<p>Post with a front matter time with timezone</p>\n\n<p>10 Jan 2010</p>", post.output.strip
       end
 
       should "to_liquid prioritizes post attributes over data" do
@@ -603,13 +601,13 @@ class TestPost < Test::Unit::TestCase
         end
 
         should "render properly" do
-          post = setup_post("2008-10-18-foo-bar.textile")
+          post = setup_post("2008-10-18-foo-bar.markdown")
           do_render(post)
-          assert_equal "<<< <h1>Foo Bar</h1>\n<p>Best <strong>post</strong> ever</p> >>>", post.output
+          assert_equal "<<< <h1 id=\"foo-bar\">Foo Bar</h1>\n\n<p>Best <strong>post</strong> ever</p>\n >>>", post.output
         end
 
         should "write properly" do
-          post = setup_post("2008-10-18-foo-bar.textile")
+          post = setup_post("2008-10-18-foo-bar.markdown")
           do_render(post)
           post.write(dest_dir)
 
@@ -652,7 +650,7 @@ class TestPost < Test::Unit::TestCase
         end
 
         should "write properly without html extension" do
-          post = setup_post("2008-10-18-foo-bar.textile")
+          post = setup_post("2008-10-18-foo-bar.markdown")
           post.site.permalink_style = ":title/"
           do_render(post)
           post.write(dest_dir)
@@ -662,32 +660,31 @@ class TestPost < Test::Unit::TestCase
         end
 
         should "insert data" do
-          post = setup_post("2008-11-21-complex.textile")
+          post = setup_post("2008-11-21-complex.markdown")
           do_render(post)
 
-          assert_equal "<<< <p>url: /2008/11/21/complex.html<br />\ndate: #{Time.parse("2008-11-21")}<br />\nid: /2008/11/21/complex</p> >>>", post.output
+          assert_equal "<<< <p>url: /2008/11/21/complex.html\ndate: #{Time.parse("2008-11-21")}\nid: /2008/11/21/complex</p>\n >>>", post.output
         end
 
         should "include templates" do
           post = setup_post("2008-12-13-include.markdown")
-          post.site.instance_variable_set(:@source, File.join(File.dirname(__FILE__), 'source'))
           do_render(post)
 
           assert_equal "<<< <hr />\n<p>Tom Preston-Werner\ngithub.com/mojombo</p>\n\n<p>This <em>is</em> cool</p>\n >>>", post.output
         end
 
         should "render date specified in front matter properly" do
-          post = setup_post("2010-01-09-date-override.textile")
+          post = setup_post("2010-01-09-date-override.markdown")
           do_render(post)
 
-          assert_equal "<p>Post with a front matter date</p>\n<p>10 Jan 2010</p>", post.output
+          assert_equal "<p>Post with a front matter date</p>\n\n<p>10 Jan 2010</p>", post.output.strip
         end
 
         should "render time specified in front matter properly" do
-          post = setup_post("2010-01-09-time-override.textile")
+          post = setup_post("2010-01-09-time-override.markdown")
           do_render(post)
 
-          assert_equal "<p>Post with a front matter time</p>\n<p>10 Jan 2010</p>", post.output
+          assert_equal "<p>Post with a front matter time</p>\n\n<p>10 Jan 2010</p>", post.output.strip
         end
 
       end
@@ -701,8 +698,7 @@ class TestPost < Test::Unit::TestCase
 
   context "converter file extension settings" do
     setup do
-      stub(Jekyll).configuration { Jekyll::Configuration::DEFAULTS }
-      @site = Site.new(Jekyll.configuration)
+      @site = fixture_site
     end
 
     should "process .md as markdown under default configuration" do
@@ -750,17 +746,13 @@ class TestPost < Test::Unit::TestCase
 
   context "site config with category" do
     setup do
-      config = site_configuration({
-        'defaults' => [
-          'scope' => {
-            'path' => ''
-          },
-          'values' => {
-            'category' => 'article'
-          }
-        ]
-      })
-      @site = Site.new(config)
+      front_matter_defaults = {
+        'defaults' => [{
+          'scope' =>  { 'path' => '' },
+          'values' => { 'category' => 'article' }
+        }]
+      }
+      @site = fixture_site(front_matter_defaults)
     end
 
     should "return category if post does not specify category" do
@@ -777,17 +769,13 @@ class TestPost < Test::Unit::TestCase
 
   context "site config with categories" do
     setup do
-      config = site_configuration({
-        'defaults' => [
-          'scope' => {
-            'path' => ''
-          },
-          'values' => {
-            'categories' => ['article']
-          }
-        ]
-      })
-      @site = Site.new(config)
+      front_matter_defaults = {
+        'defaults' => [{
+          'scope' =>  { 'path' => '' },
+          'values' => { 'categories' => ['article'] }
+        }]
+      }
+      @site = fixture_site(front_matter_defaults)
     end
 
     should "return categories if post does not specify categories" do

From 2b29e091777f90a2cb5769325edbde9eaefbcb02 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 14:46:43 -0800
Subject: [PATCH 203/407] Fix some cucumber features.

---
 features/drafts.feature                   |  2 +-
 features/embed_filters.feature            |  8 +++----
 features/include_tag.feature              | 26 +++++++++++------------
 features/post_excerpts.feature            |  4 ++--
 features/site_configuration.feature       | 18 ++++++++--------
 features/step_definitions/jekyll_steps.rb |  4 ++--
 6 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/features/drafts.feature b/features/drafts.feature
index c55edbb99..5d7982ecf 100644
--- a/features/drafts.feature
+++ b/features/drafts.feature
@@ -43,4 +43,4 @@ Feature: Draft Posts
       | Recipe | 2009-03-27 | simple | Post path: {{ page.path }} |
     When I run jekyll build --drafts
     Then the _site directory should exist
-    And I should see "Post path: _drafts/recipe.textile" in "_site/recipe.html"
+    And I should see "Post path: _drafts/recipe.markdown" in "_site/recipe.html"
diff --git a/features/embed_filters.feature b/features/embed_filters.feature
index 889a1fc7b..d6f99fc76 100644
--- a/features/embed_filters.feature
+++ b/features/embed_filters.feature
@@ -20,8 +20,6 @@ Feature: Embed filters
     And I have the following post:
       | title       | date       | layout  | content                                     |
       | Star & Wars | 2009-03-27 | default | These aren't the droids you're looking for. |
-
-
     And I have a default layout that contains "{{ page.title | xml_escape }}"
     When I run jekyll build
     Then the _site directory should exist
@@ -33,7 +31,7 @@ Feature: Embed filters
     And I have the following post:
       | title     | date       | layout  | content                                     |
       | Star Wars | 2009-03-27 | default | These aren't the droids you're looking for. |
-    And I have a default layout that contains "{{ content | xml_escape }}"
+    And I have a default layout that contains "{{ content | number_of_words }}"
     When I run jekyll build
     Then the _site directory should exist
     And I should see "7" in "_site/2009/03/27/star-wars.html"
@@ -49,13 +47,13 @@ Feature: Embed filters
     Then the _site directory should exist
     And I should see "scifi, movies, and force" in "_site/2009/03/27/star-wars.html"
 
-  Scenario: Textilize a given string
+  Scenario: Markdownify a given string
     Given I have a _posts directory
     And I have a _layouts directory
     And I have the following post:
       | title     | date       | layout  | content                                     |
       | Star Wars | 2009-03-27 | default | These aren't the droids you're looking for. |
-    And I have a default layout that contains "By {{ '_Obi-wan_' | textilize }}"
+    And I have a default layout that contains "By {{ '_Obi-wan_' | markdownify }}"
     When I run jekyll build
     Then the _site directory should exist
     And I should see "By <p><em>Obi-wan</em></p>" in "_site/2009/03/27/star-wars.html"
diff --git a/features/include_tag.feature b/features/include_tag.feature
index 22a834808..c7e03dedb 100644
--- a/features/include_tag.feature
+++ b/features/include_tag.feature
@@ -9,15 +9,15 @@ Feature: Include tags
     And I have an "_includes/params.html" file that contains "Parameters:<ul>{% for param in include %}<li>{{param[0]}} = {{param[1]}}</li>{% endfor %}</ul>"
     And I have an "_includes/ignore.html" file that contains "<footer>My blog footer</footer>"
     And I have a _posts directory
-    And I have the following post:
-      | title                               | date       | layout  | content                                                                                                                 |
-      | Include Files                       | 2013-03-21 | default | {% include header.html param="myparam" %}                                                                               |
-      | Ignore params if unused             | 2013-03-21 | default | {% include ignore.html date="today" %}                                                                                  |
-      | List multiple parameters            | 2013-03-21 | default | {% include params.html date="today" start="tomorrow" %}                                                                 |
-      | Dont keep parameters                | 2013-03-21 | default | {% include ignore.html param="test" %}\n{% include header.html %}                                                       |
-      | Allow params with spaces and quotes | 2013-04-07 | default | {% include params.html cool="param with spaces" super="\"quoted\"" single='has "quotes"' escaped='\'single\' quotes' %} |
-      | Parameter syntax                    | 2013-04-12 | default | {% include params.html param1_or_2="value" %}                                                                           |
-      | Pass a variable                     | 2013-06-22 | default | {% assign var = 'some text' %}{% include params.html local=var layout=page.layout %}                                    |
+    And I have the following posts:
+      | title                               | date       | type | content                                                                                                                 |
+      | Include Files                       | 2013-03-21 | html | {% include header.html param="myparam" %}                                                                               |
+      | Ignore params if unused             | 2013-03-21 | html | {% include ignore.html date="today" %}                                                                                  |
+      | List multiple parameters            | 2013-03-21 | html | {% include params.html date="today" start="tomorrow" %}                                                                 |
+      | Dont keep parameters                | 2013-03-21 | html | {% include ignore.html param="test" %}\n{% include header.html %}                                                       |
+      | Allow params with spaces and quotes | 2013-04-07 | html | {% include params.html cool="param with spaces" super="\"quoted\"" single='has "quotes"' escaped='\'single\' quotes' %} |
+      | Parameter syntax                    | 2013-04-12 | html | {% include params.html param1_or_2="value" %}                                                                           |
+      | Pass a variable                     | 2013-06-22 | html | {% assign var = 'some text' %}{% include params.html local=var title=page.title %}                                    |
     When I run jekyll build
     Then the _site directory should exist
     And I should see "<header>My awesome blog header: myparam</header>" in "_site/2013/03/21/include-files.html"
@@ -27,12 +27,12 @@ Feature: Include tags
     And I should not see "<header>My awesome blog header: myparam</header>" in "_site/2013/03/21/dont-keep-parameters.html"
     But I should see "<header>My awesome blog header: </header>" in "_site/2013/03/21/dont-keep-parameters.html"
     And I should see "<li>cool = param with spaces</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
-    And I should see "<li>super = &#8220;quoted&#8221;</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
-    And I should see "<li>single = has &#8220;quotes&#8221;</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
-    And I should see "<li>escaped = &#8216;single&#8217; quotes</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
+    And I should see "<li>super = \"quoted\"</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
+    And I should see "<li>single = has \"quotes\"</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
+    And I should see "<li>escaped = 'single' quotes</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
     And I should see "<li>param1_or_2 = value</li>" in "_site/2013/04/12/parameter-syntax.html"
     And I should see "<li>local = some text</li>" in "_site/2013/06/22/pass-a-variable.html"
-    And I should see "<li>layout = default</li>" in "_site/2013/06/22/pass-a-variable.html"
+    And I should see "<li>title = Pass a variable</li>" in "_site/2013/06/22/pass-a-variable.html"
 
   Scenario: Include a file from a variable
     Given I have an _includes directory
diff --git a/features/post_excerpts.feature b/features/post_excerpts.feature
index 4ad6d1286..e9d048bd3 100644
--- a/features/post_excerpts.feature
+++ b/features/post_excerpts.feature
@@ -46,5 +46,5 @@ Feature: Post excerpts
     And the _site/2007/12 directory should exist
     And the _site/2007/12/31 directory should exist
     And the "_site/2007/12/31/entry1.html" file should exist
-    And I should see exactly "<p>content for entry1.</p>" in "_site/index.html"
-    And I should see exactly "<html><head></head><body><p>content for entry1.</p></body></html>" in "_site/2007/12/31/entry1.html"
+    And I should see "<p>content for entry1.</p>" in "_site/index.html"
+    And I should see "<html><head></head><body><p>content for entry1.</p>\n\n</body></html>" in "_site/2007/12/31/entry1.html"
diff --git a/features/site_configuration.feature b/features/site_configuration.feature
index 1d067f0c9..d3dadd2ac 100644
--- a/features/site_configuration.feature
+++ b/features/site_configuration.feature
@@ -170,8 +170,8 @@ Feature: Site configuration
       When I run jekyll build
       Then the _site directory should exist
       And I should see "Page Layout: 2" in "_site/index.html"
-      And I should see "Post Layout: <p>content for entry1.</p> built at 2013-04-09T23:22:00-04:00" in "_site/2013/04/09/entry1.html"
-      And I should see "Post Layout: <p>content for entry2.</p> built at 2013-04-10T03:14:00-04:00" in "_site/2013/04/10/entry2.html"
+      And I should see "Post Layout: <p>content for entry1.</p>\n built at 2013-04-09T23:22:00-04:00" in "_site/2013/04/09/entry1.html"
+      And I should see "Post Layout: <p>content for entry2.</p>\n built at 2013-04-10T03:14:00-04:00" in "_site/2013/04/10/entry2.html"
 
     Scenario: Generate proper dates with explicitly set timezone (different than posts' time)
       Given I have a _layouts directory
@@ -180,19 +180,19 @@ Feature: Site configuration
       And I have an "index.html" page with layout "page" that contains "site index page"
       And I have a configuration file with:
         | key         | value               |
-        | timezone    | Australia/Melbourne |
+        | timezone    | Pacific/Honolulu    |
       And I have a _posts directory
       And I have the following posts:
         | title     | date                   | layout  | content             |
-        | entry1    | 2013-04-09 23:22 -0400 | post    | content for entry1. |
-        | entry2    | 2013-04-10 03:14 -0400 | post    | content for entry2. |
+        | entry1    | 2013-04-09 23:22 +0400 | post    | content for entry1. |
+        | entry2    | 2013-04-10 03:14 +0400 | post    | content for entry2. |
       When I run jekyll build
       Then the _site directory should exist
       And I should see "Page Layout: 2" in "_site/index.html"
-      And the "_site/2013/04/10/entry1.html" file should exist
-      And the "_site/2013/04/10/entry2.html" file should exist
-      And I should see escaped "Post Layout: <p>content for entry1.</p> built at 2013-04-10T13:22:00+10:00" in "_site/2013/04/10/entry1.html"
-      And I should see escaped "Post Layout: <p>content for entry2.</p> built at 2013-04-10T17:14:00+10:00" in "_site/2013/04/10/entry2.html"
+      And the "_site/2013/04/09/entry1.html" file should exist
+      And the "_site/2013/04/09/entry2.html" file should exist
+      And I should see "Post Layout: <p>content for entry1.</p>\n built at 2013-04-09T09:22:00-10:00" in "_site/2013/04/09/entry1.html"
+      And I should see "Post Layout: <p>content for entry2.</p>\n built at 2013-04-09T13:14:00-10:00" in "_site/2013/04/09/entry2.html"
 
   Scenario: Limit the number of posts generated by most recent date
     Given I have a _posts directory
diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index c289df94f..ee4f0d37b 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -8,7 +8,7 @@ def file_content_from_hash(input_hash)
     input_hash['content']
   end
 
-  <<EOF
+  <<-EOF
 ---
 #{matter}
 ---
@@ -40,7 +40,7 @@ end
 # Like "I have a foo file" but gives a yaml front matter so jekyll actually processes it
 Given /^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$/ do |file, key, value, text|
   File.open(file, 'w') do |f|
-    f.write <<EOF
+    f.write <<-EOF
 ---
 #{key || 'layout'}: #{value || 'nil'}
 ---

From dec27bc1669f1b3aa7cdf3f0754e5688d7ee58f0 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 14:48:14 -0800
Subject: [PATCH 204/407] Fix last feature

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

diff --git a/features/frontmatter_defaults.feature b/features/frontmatter_defaults.feature
index 3ebfd59ca..a9a64ae28 100644
--- a/features/frontmatter_defaults.feature
+++ b/features/frontmatter_defaults.feature
@@ -25,7 +25,7 @@ Feature: frontmatter defaults
     And I have a configuration file with "defaults" set to "[{scope: {path: ""}, values: {custom: "some special data", author: "Ben"}}]"
     When I run jekyll build
     Then the _site directory should exist
-    And I should see "<p>some special data</p><div>Ben</div>" in "_site/2013/09/11/default-data.html"
+    And I should see "<p>some special data</p>\n<div>Ben</div>" in "_site/2013/09/11/default-data.html"
     And I should see "just some special data by Ben" in "_site/index.html"
 
   Scenario: Override frontmatter defaults by path

From 6f440f55e00932506f9baa622a284c2693df9f60 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 16:56:24 -0800
Subject: [PATCH 205/407] Update history to reflect merge of #3321 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 10c6c7b81..8004df5b0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -23,6 +23,8 @@
   * Added per post `excerpt_separator` functionality (#3274)
   * Allow collections YAML to end with three dots (#3134)
   * Add mode parameter to `slugify` Liquid filter (#2918)
+  * Perf: `Markdown#matches` should avoid regexp (#3321)
+  * Perf: Use frozen regular expressions for `Utils#slugify` (#3321)
 
 ### Bug Fixes
 

From e58f8776b9fd9b2e03c0199119390dabdf524452 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 17:08:33 -0800
Subject: [PATCH 206/407] Update history to reflect merge of #3319 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8004df5b0..39da25094 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Add mode parameter to `slugify` Liquid filter (#2918)
   * Perf: `Markdown#matches` should avoid regexp (#3321)
   * Perf: Use frozen regular expressions for `Utils#slugify` (#3321)
+  * Split off Textile support into jekyll-textile-converter (#3319)
 
 ### Bug Fixes
 

From 589919d58a518f53edcbac3ce5a7a8b00fa9096e Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Sun, 18 Jan 2015 08:31:14 -0600
Subject: [PATCH 207/407] Strip slashes on nil url tokens

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

diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 6bed8d57a..60c965078 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -61,7 +61,12 @@ module Jekyll
     def generate_url(template)
       @placeholders.inject(template) do |result, token|
         break result if result.index(':').nil?
-        result.gsub(/:#{token.first}/, self.class.escape_path(token.last))
+        if token.last.nil?
+          # Remove leading '/' to avoid generating urls with `//`
+          result.gsub(/\/:#{token.first}/, '')
+        else
+          result.gsub(/:#{token.first}/, self.class.escape_path(token.last))
+        end
       end
     end
 

From fe5f0d124c8f20633014e92ecf254b77e655ce66 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Sun, 18 Jan 2015 11:05:06 -0800
Subject: [PATCH 208/407] Move all regenerate? checking to Regenerator

---
 lib/jekyll.rb                              |   2 +-
 lib/jekyll/cleaner.rb                      |   2 +-
 lib/jekyll/convertible.rb                  |  11 +-
 lib/jekyll/document.rb                     |   7 -
 lib/jekyll/{metadata.rb => regenerator.rb} |  32 +++-
 lib/jekyll/renderer.rb                     |   2 +-
 lib/jekyll/site.rb                         |  20 ++-
 lib/jekyll/static_file.rb                  |   2 -
 lib/jekyll/tags/include.rb                 |   2 +-
 test/test_metadata.rb                      | 140 ---------------
 test/test_regenerator.rb                   | 193 +++++++++++++++++++++
 test/test_site.rb                          |   6 +-
 12 files changed, 239 insertions(+), 180 deletions(-)
 rename lib/jekyll/{metadata.rb => regenerator.rb} (76%)
 delete mode 100644 test/test_metadata.rb
 create mode 100644 test/test_regenerator.rb

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 3f01e4d0f..dd4645036 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -51,11 +51,11 @@ module Jekyll
   autoload :Layout,              'jekyll/layout'
   autoload :LayoutReader,        'jekyll/layout_reader'
   autoload :LogAdapter,          'jekyll/log_adapter'
-  autoload :Metadata,            'jekyll/metadata'
   autoload :Page,                'jekyll/page'
   autoload :PluginManager,       'jekyll/plugin_manager'
   autoload :Post,                'jekyll/post'
   autoload :Publisher,           'jekyll/publisher'
+  autoload :Regenerator,         'jekyll/regenerator'
   autoload :RelatedPosts,        'jekyll/related_posts'
   autoload :Renderer,            'jekyll/renderer'
   autoload :Site,                'jekyll/site'
diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb
index bc5bd155f..0295fb92b 100644
--- a/lib/jekyll/cleaner.rb
+++ b/lib/jekyll/cleaner.rb
@@ -29,7 +29,7 @@ module Jekyll
       #
       # Returns an Array with the metdata file as the only item
       def metadata_file
-        [site.metadata.metadata_file]
+        [site.regenerator.metadata_file]
       end
 
       # Private: The list of existing files, apart from those included in keep_files and hidden files.
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index eb96dd35c..d587f8f31 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -168,15 +168,6 @@ module Jekyll
       true
     end
 
-    # Determine whether to regenerate the file based on metadata.
-    #
-    # Returns true if file needs to be regenerated
-    def regenerate?
-      asset_file? ||
-        data['regenerate'] ||
-        site.metadata.regenerate?(site.in_source_dir(relative_path))
-    end
-
     # Determine whether the file should be placed into layouts.
     #
     # Returns false if the document is an asset file.
@@ -217,7 +208,7 @@ module Jekyll
                                          File.join(site.config['layouts'], layout.name))
 
         # Add layout to dependency tree
-        site.metadata.add_dependency(
+        site.regenerator.add_dependency(
           site.in_source_dir(path),
           site.in_source_dir(layout.path)
         )
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index c272741fe..ec9ee7421 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -107,13 +107,6 @@ module Jekyll
       !(coffeescript_file? || yaml_file?)
     end
 
-    # Determine whether the document should be regenerated based on metadata.
-    #
-    # Returns true if the document needs to be regenerated.
-    def regenerate?
-      data['regenerate'] || site.metadata.regenerate?(path, write?)
-    end
-
     # Determine whether the file should be placed into layouts.
     #
     # Returns false if the document is either an asset file or a yaml file,
diff --git a/lib/jekyll/metadata.rb b/lib/jekyll/regenerator.rb
similarity index 76%
rename from lib/jekyll/metadata.rb
rename to lib/jekyll/regenerator.rb
index 953dd7c0d..d03c0ced7 100644
--- a/lib/jekyll/metadata.rb
+++ b/lib/jekyll/regenerator.rb
@@ -1,5 +1,5 @@
 module Jekyll
-  class Metadata
+  class Regenerator
     attr_reader :site, :metadata, :cache
 
     def initialize(site)
@@ -12,6 +12,25 @@ module Jekyll
       @cache = {}
     end
 
+    # Checks if a renderable object needs to be regenerated
+    #
+    # Returns a boolean.
+    def regenerate?(document)
+      case document
+      when Post, Page
+        document.asset_file? || document.data['regenerate'] ||
+          modified?(site.in_source_dir(document.relative_path))
+      when Document
+        !document.write? || document.data['regenerate'] || modified?(document.path)
+      else
+        if document.respond_to?(:path)
+          modified?(document.path)
+        else
+          true
+        end
+      end
+    end
+
     # Add a path to the metadata
     #
     # Returns true, also on failure.
@@ -40,10 +59,11 @@ module Jekyll
       @cache = {}
     end
 
-    # Checks if a path should be regenerated
+    # Checks if a path's (or one of its dependencies)
+    # mtime has changed
     #
     # Returns a boolean.
-    def regenerate?(path, add = true)
+    def modified?(path)
       return true if disabled?
 
       # Check for path in cache
@@ -55,19 +75,19 @@ module Jekyll
       data = metadata[path]
       if data
         data["deps"].each do |dependency|
-          if regenerate?(dependency)
+          if modified?(dependency)
             return cache[dependency] = cache[path] = true
           end
         end
         if data["mtime"].eql? File.mtime(path)
           return cache[path] = false
         else
-          return !add || add(path)
+          return add(path)
         end
       end
 
       # Path does not exist in metadata, add it
-      return !add || add(path)
+      return add(path)
     end
 
     # Add a dependency of a path
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index e0701fd5f..f25ca3431 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -140,7 +140,7 @@ module Jekyll
         )
 
         # Add layout to dependency tree
-        site.metadata.add_dependency(
+        site.regenerator.add_dependency(
           site.in_source_dir(document.path),
           site.in_source_dir(layout.path)
         ) if document.write?
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index b6ab70399..8f9c902dc 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -11,7 +11,7 @@ module Jekyll
                   :gems, :plugin_manager
 
     attr_accessor :converters, :generators
-    attr_reader   :metadata
+    attr_reader   :regenerator
 
     # Public: Initialize a new Site.
     #
@@ -28,8 +28,8 @@ module Jekyll
       @source              = File.expand_path(config['source']).freeze
       @dest                = File.expand_path(config['destination']).freeze
 
-      # Build metadata
-      @metadata = Metadata.new(self)
+      # Initialize incremental regenerator
+      @regenerator = Regenerator.new(self)
 
       self.plugin_manager = Jekyll::PluginManager.new(self)
       self.plugins        = plugin_manager.plugins_path
@@ -295,13 +295,17 @@ module Jekyll
       payload = site_payload
       collections.each do |label, collection|
         collection.docs.each do |document|
-          document.output = Jekyll::Renderer.new(self, document, payload).run if document.regenerate?
+          if regenerator.regenerate?(document)
+            document.output = Jekyll::Renderer.new(self, document, payload).run
+          end
         end
       end
 
       payload = site_payload
       [posts, pages].flatten.each do |page_or_post|
-        page_or_post.render(layouts, payload) if page_or_post.regenerate?
+        if regenerator.regenerate?(page_or_post)
+          page_or_post.render(layouts, payload)
+        end
       end
     rescue Errno::ENOENT
       # ignore missing layout dir
@@ -319,9 +323,9 @@ module Jekyll
     # Returns nothing.
     def write
       each_site_file { |item|
-        item.write(dest) if item.regenerate?
+        item.write(dest) if regenerator.regenerate?(item)
       }
-      metadata.write unless full_rebuild?
+      regenerator.write unless full_rebuild?
     end
 
     # Construct a Hash of Posts indexed by the specified Post attribute.
@@ -487,7 +491,7 @@ module Jekyll
       @frontmatter_defaults ||= FrontmatterDefaults.new(self)
     end
 
-    # Whether to perform a full rebuild without metadata
+    # Whether to perform a full rebuild without incremental regeneration
     #
     # Returns a Boolean: true for a full rebuild, false for normal build
     def full_rebuild?(override = {})
diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index a8b09afca..b83f4fae6 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -65,8 +65,6 @@ module Jekyll
       true
     end
 
-    alias_method :regenerate?, :write?
-
     # Write the static file to the destination directory (if modified).
     #
     # dest - The String path to the destination dir.
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index 16da6f499..c09460ff5 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -116,7 +116,7 @@ eos
 
         # Add include to dependency tree
         if context.registers[:page] and context.registers[:page].has_key? "path"
-          site.metadata.add_dependency(
+          site.regenerator.add_dependency(
             site.in_source_dir(context.registers[:page]["path"]),
             path
           )
diff --git a/test/test_metadata.rb b/test/test_metadata.rb
deleted file mode 100644
index 858b166ac..000000000
--- a/test/test_metadata.rb
+++ /dev/null
@@ -1,140 +0,0 @@
-require 'helper'
-
-class TestMetadata < Test::Unit::TestCase
-  context "The site metadata" do
-    setup do
-      FileUtils.rm_rf(source_dir(".jekyll-metadata"))
-
-      @site = Site.new(Jekyll.configuration({
-        "source" => source_dir,
-        "destination" => dest_dir
-      }))
-
-      @site.process
-      @path = @site.in_source_dir(@site.pages.first.path)
-      @metadata = @site.metadata
-    end
-
-    should "store modification times" do
-      assert_equal File.mtime(@path), @metadata.metadata[@path]["mtime"]
-    end
-
-    should "cache processed entries" do
-      assert @metadata.cache[@path]
-    end
-
-    should "write to the metadata file" do
-      @metadata.clear
-      @metadata.add(@path)
-      @metadata.write
-      assert File.file?(source_dir(".jekyll-metadata"))
-    end
-
-    should "read from the metadata file" do
-      @metadata = Metadata.new(@site)
-      assert_equal File.mtime(@path), @metadata.metadata[@path]["mtime"]
-    end
-
-    # Methods
-
-    should "be able to add a path to the metadata" do
-      @metadata.clear
-      @metadata.add(@path)
-      assert_equal File.mtime(@path), @metadata.metadata[@path]["mtime"]
-      assert_equal [], @metadata.metadata[@path]["deps"]
-      assert @metadata.cache[@path]
-    end
-
-    should "return true on nonexistent path" do
-      @metadata.clear
-      assert @metadata.add("/bogus/path.md")
-      assert @metadata.regenerate?("/bogus/path.md")
-    end
-
-    should "be able to force a path to regenerate" do
-      @metadata.clear
-      @metadata.force(@path)
-      assert @metadata.cache[@path]
-      assert @metadata.regenerate?(@path)
-    end
-
-    should "be able to clear metadata and cache" do
-      @metadata.clear
-      @metadata.add(@path)
-      assert_equal 1, @metadata.metadata.length
-      assert_equal 1, @metadata.cache.length
-      @metadata.clear
-      assert_equal 0, @metadata.metadata.length
-      assert_equal 0, @metadata.cache.length
-    end
-
-    should "not regenerate a path if it is not modified" do
-      @metadata.clear
-      @metadata.add(@path)
-      @metadata.write
-      @metadata = Metadata.new(@site)
-
-      assert !@metadata.regenerate?(@path)
-    end
-
-    should "not regenerate if path in cache is false" do
-      @metadata.clear
-      @metadata.add(@path)
-      @metadata.write
-      @metadata = Metadata.new(@site)
-
-      assert !@metadata.regenerate?(@path)
-      assert !@metadata.cache[@path]
-      assert !@metadata.regenerate?(@path)
-    end
-
-    should "regenerate if path in not in metadata" do
-      @metadata.clear
-      @metadata.add(@path)
-
-      assert @metadata.regenerate?(@path)
-    end
-
-    should "regenerate if path in cache is true" do
-      @metadata.clear
-      @metadata.add(@path)
-
-      assert @metadata.regenerate?(@path)
-      assert @metadata.cache[@path]
-      assert @metadata.regenerate?(@path)
-    end
-
-    should "regenerate if file is modified" do
-      @metadata.clear
-      @metadata.add(@path)
-      @metadata.metadata[@path]["mtime"] = Time.at(0)
-      @metadata.write
-      @metadata = Metadata.new(@site)
-
-      assert_not_same File.mtime(@path), @metadata.metadata[@path]["mtime"]
-      assert @metadata.regenerate?(@path)
-    end
-
-    should "regenerate if dependency is modified" do
-      @metadata.clear
-      @metadata.add(@path)
-      @metadata.write
-      @metadata = Metadata.new(@site)
-
-      @metadata.add_dependency(@path, "new.dependency")
-      assert_equal ["new.dependency"], @metadata.metadata[@path]["deps"]
-      assert @metadata.regenerate?("new.dependency")
-      assert @metadata.regenerate?(@path)
-    end
-
-    should "regenerate everything if metadata is disabled" do
-      @site.config["full_rebuild"] = true
-      @metadata.clear
-      @metadata.add(@path)
-      @metadata.write
-      @metadata = Metadata.new(@site)
-
-      assert @metadata.regenerate?(@path)
-    end
-  end
-end
diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb
new file mode 100644
index 000000000..74a6bb4f9
--- /dev/null
+++ b/test/test_regenerator.rb
@@ -0,0 +1,193 @@
+require 'helper'
+
+class TestRegenerator < Test::Unit::TestCase
+  context "The site regenerator" do
+    setup do
+      FileUtils.rm_rf(source_dir(".jekyll-metadata"))
+
+      @site = Site.new(Jekyll.configuration({
+        "source" => source_dir,
+        "destination" => dest_dir,
+        "collections" => {
+          "methods" => {
+            "output" => true
+          }
+        }
+      }))
+
+      @site.read
+      @page = @site.pages.first
+      @post = @site.posts.first
+      @document = @site.docs_to_write.first
+      @asset_file = @site.pages.find(&:asset_file?)
+      @regenerator = @site.regenerator
+    end
+
+    should "regenerate documents and assets if changed or not in metadata" do
+      assert @regenerator.regenerate?(@page)
+      assert @regenerator.regenerate?(@post)
+      assert @regenerator.regenerate?(@document)
+      assert @regenerator.regenerate?(@asset_file)
+    end
+
+    should "not regenerate if not changed" do
+      # Process files
+      @regenerator.regenerate?(@page)
+      @regenerator.regenerate?(@post)
+      @regenerator.regenerate?(@document)
+      @regenerator.regenerate?(@asset_file)
+
+      @regenerator.write
+      @regenerator = Regenerator.new(@site)
+
+      assert !@regenerator.regenerate?(@page)
+      assert !@regenerator.regenerate?(@post)
+      assert !@regenerator.regenerate?(@document)
+    end
+
+    should "always regenerate asset files" do
+      assert @regenerator.regenerate?(@asset_file)
+    end
+
+    should "always regenerate objects that don't respond to :path" do
+      assert @regenerator.regenerate?(Object.new)
+    end
+  end
+
+  context "The site metadata" do
+    setup do
+      FileUtils.rm_rf(source_dir(".jekyll-metadata"))
+
+      @site = Site.new(Jekyll.configuration({
+        "source" => source_dir,
+        "destination" => dest_dir
+      }))
+
+      @site.process
+      @path = @site.in_source_dir(@site.pages.first.path)
+      @regenerator = @site.regenerator
+    end
+
+    should "store modification times" do
+      assert_equal File.mtime(@path), @regenerator.metadata[@path]["mtime"]
+    end
+
+    should "cache processed entries" do
+      assert @regenerator.cache[@path]
+    end
+
+    should "write to the metadata file" do
+      @regenerator.clear
+      @regenerator.add(@path)
+      @regenerator.write
+      assert File.file?(source_dir(".jekyll-metadata"))
+    end
+
+    should "read from the metadata file" do
+      @regenerator = Regenerator.new(@site)
+      assert_equal File.mtime(@path), @regenerator.metadata[@path]["mtime"]
+    end
+
+    # Methods
+
+    should "be able to add a path to the metadata" do
+      @regenerator.clear
+      @regenerator.add(@path)
+      assert_equal File.mtime(@path), @regenerator.metadata[@path]["mtime"]
+      assert_equal [], @regenerator.metadata[@path]["deps"]
+      assert @regenerator.cache[@path]
+    end
+
+    should "return true on nonexistent path" do
+      @regenerator.clear
+      assert @regenerator.add("/bogus/path.md")
+      assert @regenerator.modified?("/bogus/path.md")
+    end
+
+    should "be able to force a path to regenerate" do
+      @regenerator.clear
+      @regenerator.force(@path)
+      assert @regenerator.cache[@path]
+      assert @regenerator.modified?(@path)
+    end
+
+    should "be able to clear metadata and cache" do
+      @regenerator.clear
+      @regenerator.add(@path)
+      assert_equal 1, @regenerator.metadata.length
+      assert_equal 1, @regenerator.cache.length
+      @regenerator.clear
+      assert_equal 0, @regenerator.metadata.length
+      assert_equal 0, @regenerator.cache.length
+    end
+
+    should "not regenerate a path if it is not modified" do
+      @regenerator.clear
+      @regenerator.add(@path)
+      @regenerator.write
+      @regenerator = Regenerator.new(@site)
+
+      assert !@regenerator.modified?(@path)
+    end
+
+    should "not regenerate if path in cache is false" do
+      @regenerator.clear
+      @regenerator.add(@path)
+      @regenerator.write
+      @regenerator = Regenerator.new(@site)
+
+      assert !@regenerator.modified?(@path)
+      assert !@regenerator.cache[@path]
+      assert !@regenerator.modified?(@path)
+    end
+
+    should "regenerate if path in not in metadata" do
+      @regenerator.clear
+      @regenerator.add(@path)
+
+      assert @regenerator.modified?(@path)
+    end
+
+    should "regenerate if path in cache is true" do
+      @regenerator.clear
+      @regenerator.add(@path)
+
+      assert @regenerator.modified?(@path)
+      assert @regenerator.cache[@path]
+      assert @regenerator.modified?(@path)
+    end
+
+    should "regenerate if file is modified" do
+      @regenerator.clear
+      @regenerator.add(@path)
+      @regenerator.metadata[@path]["mtime"] = Time.at(0)
+      @regenerator.write
+      @regenerator = Regenerator.new(@site)
+
+      assert_not_same File.mtime(@path), @regenerator.metadata[@path]["mtime"]
+      assert @regenerator.modified?(@path)
+    end
+
+    should "regenerate if dependency is modified" do
+      @regenerator.clear
+      @regenerator.add(@path)
+      @regenerator.write
+      @regenerator = Regenerator.new(@site)
+
+      @regenerator.add_dependency(@path, "new.dependency")
+      assert_equal ["new.dependency"], @regenerator.metadata[@path]["deps"]
+      assert @regenerator.modified?("new.dependency")
+      assert @regenerator.modified?(@path)
+    end
+
+    should "regenerate everything if metadata is disabled" do
+      @site.config["full_rebuild"] = true
+      @regenerator.clear
+      @regenerator.add(@path)
+      @regenerator.write
+      @regenerator = Regenerator.new(@site)
+
+      assert @regenerator.modified?(@path)
+    end
+  end
+end
diff --git a/test/test_site.rb b/test/test_site.rb
index cf5ee9bb5..1fe86b763 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -99,7 +99,7 @@ class TestSite < Test::Unit::TestCase
     should "write only modified static files" do
       clear_dest
       StaticFile.reset_cache
-      @site.metadata.clear
+      @site.regenerator.clear
 
       @site.process
       some_static_file = @site.static_files[0].path
@@ -129,7 +129,7 @@ class TestSite < Test::Unit::TestCase
     should "write static files if not modified but missing in destination" do
       clear_dest
       StaticFile.reset_cache
-      @site.metadata.clear
+      @site.regenerator.clear
 
       @site.process
       dest = File.expand_path(@site.static_files[0].destination(@site.dest))
@@ -243,7 +243,7 @@ class TestSite < Test::Unit::TestCase
     context 'with orphaned files in destination' do
       setup do
         clear_dest
-        @site.metadata.clear
+        @site.regenerator.clear
         @site.process
         # generate some orphaned files:
         # single file

From 382049d558b49ea60e308eab345ec942432866e2 Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Sun, 18 Jan 2015 15:51:21 -0600
Subject: [PATCH 209/407] Added a unit test for nil value in permalink template
 keys

---
 test/test_url.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/test_url.rb b/test/test_url.rb
index 15f989d88..ea11fb09f 100644
--- a/test/test_url.rb
+++ b/test/test_url.rb
@@ -47,5 +47,13 @@ class TestURL < Test::Unit::TestCase
       ).to_s
     end
 
+    should "handle nil values for keys in the template" do
+      assert_equal '/foo/bar/', URL.new(
+        :template => "/baz",
+        :permalink => "/:x/:y/:z/",
+        :placeholders => {:x => "foo", :y => "bar", :z => nil}
+      ).to_s
+    end
+
   end
 end

From 3d60299ea97f82558d3b69ac649771f162519298 Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Sun, 18 Jan 2015 23:03:27 -0600
Subject: [PATCH 210/407] Test updates: Removed permalink config, updated
 template

---
 test/test_url.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/test_url.rb b/test/test_url.rb
index ea11fb09f..b66e2f868 100644
--- a/test/test_url.rb
+++ b/test/test_url.rb
@@ -49,8 +49,7 @@ class TestURL < Test::Unit::TestCase
 
     should "handle nil values for keys in the template" do
       assert_equal '/foo/bar/', URL.new(
-        :template => "/baz",
-        :permalink => "/:x/:y/:z/",
+        :template => "/:x/:y/:z/",
         :placeholders => {:x => "foo", :y => "bar", :z => nil}
       ).to_s
     end

From 90eecc5da6d7888941c141a4d3de093d2e6b1273 Mon Sep 17 00:00:00 2001
From: Tanguy Krotoff <tkrotoff@gmail.com>
Date: Mon, 19 Jan 2015 20:55:32 +0100
Subject: [PATCH 211/407] Fix nav items alignment when in "burger" mode

---
 lib/site_template/_sass/_layout.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/site_template/_sass/_layout.scss b/lib/site_template/_sass/_layout.scss
index 5a9efab2e..d7f5559a1 100644
--- a/lib/site_template/_sass/_layout.scss
+++ b/lib/site_template/_sass/_layout.scss
@@ -82,6 +82,9 @@
         .page-link {
             display: block;
             padding: 5px 10px;
+
+            margin-right: 0 !important;
+            margin-left: 20px;
         }
     }
 }

From 29aabd84bdf6dd1d0ef5f0b19140f818f7d0812e Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Mon, 19 Jan 2015 16:23:51 -0800
Subject: [PATCH 212/407] Fix up tests

---
 test/helper.rb           | 3 +--
 test/test_regenerator.rb | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/test/helper.rb b/test/helper.rb
index 13240e258..ea30a855d 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -37,8 +37,7 @@ class Test::Unit::TestCase
   def site_configuration(overrides = {})
     full_overrides = build_configs(overrides, build_configs({"destination" => dest_dir}))
     build_configs({
-      "source"       => source_dir,
-      "full_rebuild" => true
+      "source" => source_dir
     }, full_overrides)
   end
 
diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb
index 74a6bb4f9..7eb48fb3e 100644
--- a/test/test_regenerator.rb
+++ b/test/test_regenerator.rb
@@ -5,15 +5,13 @@ class TestRegenerator < Test::Unit::TestCase
     setup do
       FileUtils.rm_rf(source_dir(".jekyll-metadata"))
 
-      @site = Site.new(Jekyll.configuration({
-        "source" => source_dir,
-        "destination" => dest_dir,
+      @site = fixture_site({
         "collections" => {
           "methods" => {
             "output" => true
           }
         }
-      }))
+      })
 
       @site.read
       @page = @site.pages.first

From 58e231ce40263f0b725ca024b1b7ea66965ae941 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Mon, 19 Jan 2015 16:24:18 -0800
Subject: [PATCH 213/407] Rename Regenerator#write to
 Regenerator#write_metadata

---
 lib/jekyll/regenerator.rb |  2 +-
 lib/jekyll/site.rb        |  2 +-
 test/test_regenerator.rb  | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb
index d03c0ced7..0616fdd9b 100644
--- a/lib/jekyll/regenerator.rb
+++ b/lib/jekyll/regenerator.rb
@@ -103,7 +103,7 @@ module Jekyll
     # Write the metadata to disk
     #
     # Returns nothing.
-    def write
+    def write_metadata
       File.open(metadata_file, 'w') do |f|
         f.write(metadata.to_yaml)
       end
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 8f9c902dc..85cdac189 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -325,7 +325,7 @@ module Jekyll
       each_site_file { |item|
         item.write(dest) if regenerator.regenerate?(item)
       }
-      regenerator.write unless full_rebuild?
+      regenerator.write_metadata unless full_rebuild?
     end
 
     # Construct a Hash of Posts indexed by the specified Post attribute.
diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb
index 7eb48fb3e..63ac3bd05 100644
--- a/test/test_regenerator.rb
+++ b/test/test_regenerator.rb
@@ -35,7 +35,7 @@ class TestRegenerator < Test::Unit::TestCase
       @regenerator.regenerate?(@document)
       @regenerator.regenerate?(@asset_file)
 
-      @regenerator.write
+      @regenerator.write_metadata
       @regenerator = Regenerator.new(@site)
 
       assert !@regenerator.regenerate?(@page)
@@ -77,7 +77,7 @@ class TestRegenerator < Test::Unit::TestCase
     should "write to the metadata file" do
       @regenerator.clear
       @regenerator.add(@path)
-      @regenerator.write
+      @regenerator.write_metadata
       assert File.file?(source_dir(".jekyll-metadata"))
     end
 
@@ -122,7 +122,7 @@ class TestRegenerator < Test::Unit::TestCase
     should "not regenerate a path if it is not modified" do
       @regenerator.clear
       @regenerator.add(@path)
-      @regenerator.write
+      @regenerator.write_metadata
       @regenerator = Regenerator.new(@site)
 
       assert !@regenerator.modified?(@path)
@@ -131,7 +131,7 @@ class TestRegenerator < Test::Unit::TestCase
     should "not regenerate if path in cache is false" do
       @regenerator.clear
       @regenerator.add(@path)
-      @regenerator.write
+      @regenerator.write_metadata
       @regenerator = Regenerator.new(@site)
 
       assert !@regenerator.modified?(@path)
@@ -159,7 +159,7 @@ class TestRegenerator < Test::Unit::TestCase
       @regenerator.clear
       @regenerator.add(@path)
       @regenerator.metadata[@path]["mtime"] = Time.at(0)
-      @regenerator.write
+      @regenerator.write_metadata
       @regenerator = Regenerator.new(@site)
 
       assert_not_same File.mtime(@path), @regenerator.metadata[@path]["mtime"]
@@ -169,7 +169,7 @@ class TestRegenerator < Test::Unit::TestCase
     should "regenerate if dependency is modified" do
       @regenerator.clear
       @regenerator.add(@path)
-      @regenerator.write
+      @regenerator.write_metadata
       @regenerator = Regenerator.new(@site)
 
       @regenerator.add_dependency(@path, "new.dependency")
@@ -182,7 +182,7 @@ class TestRegenerator < Test::Unit::TestCase
       @site.config["full_rebuild"] = true
       @regenerator.clear
       @regenerator.add(@path)
-      @regenerator.write
+      @regenerator.write_metadata
       @regenerator = Regenerator.new(@site)
 
       assert @regenerator.modified?(@path)

From 018f3339735d6efe818233d608afef4c27bafef1 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 19 Jan 2015 18:12:38 -0800
Subject: [PATCH 214/407] Update history to reflect merge of #3326 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 39da25094..fc87d9659 100644
--- a/History.markdown
+++ b/History.markdown
@@ -50,6 +50,7 @@
   * Instead of symlinking `/tmp`, create and symlink a local `tmp` in the tests (#3258)
   * Fix some spacing (#3312)
   * Fix comment typo in `lib/jekyll/frontmatter_defaults.rb` (#3322)
+  * Move all `regenerate?` checking to `Regenerator` (#3326)
 
 ### Site Enhancements
 

From 53a59544e87cc9ab2ff196180ca3b1c3118cb368 Mon Sep 17 00:00:00 2001
From: Tanguy Krotoff <tkrotoff@gmail.com>
Date: Wed, 21 Jan 2015 01:44:31 +0100
Subject: [PATCH 215/407] Fix site-nav alignment

---
 lib/site_template/_sass/_layout.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/site_template/_sass/_layout.scss b/lib/site_template/_sass/_layout.scss
index 5a9efab2e..3f9ff42b3 100644
--- a/lib/site_template/_sass/_layout.scss
+++ b/lib/site_template/_sass/_layout.scss
@@ -44,7 +44,7 @@
     @include media-query($on-palm) {
         position: absolute;
         top: 9px;
-        right: 30px;
+        right: $spacing-unit / 2;
         background-color: $background-color;
         border: 1px solid $grey-color-light;
         border-radius: 5px;

From 88348ae0eee21e479f2764d7be8a5afab4221a83 Mon Sep 17 00:00:00 2001
From: Matt Rogers <codemattr@gmail.com>
Date: Tue, 20 Jan 2015 19:54:50 -0600
Subject: [PATCH 216/407] Update history to reflect merge of #3331 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fc87d9659..01abc1c67 100644
--- a/History.markdown
+++ b/History.markdown
@@ -26,6 +26,8 @@
   * Perf: `Markdown#matches` should avoid regexp (#3321)
   * Perf: Use frozen regular expressions for `Utils#slugify` (#3321)
   * Split off Textile support into jekyll-textile-converter (#3319)
+  * Improve the navigation menu alignment in the site template on small
+    screens (#3331)
 
 ### Bug Fixes
 

From 5ed24cfd71fb8bddf4a4a7fcfc7cc3a3b42de861 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 20 Jan 2015 19:40:43 -0800
Subject: [PATCH 217/407] Add blog post about the meet up.

---
 .../2015-01-20-jekyll-meet-and-greet.markdown | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 site/_posts/2015-01-20-jekyll-meet-and-greet.markdown

diff --git a/site/_posts/2015-01-20-jekyll-meet-and-greet.markdown b/site/_posts/2015-01-20-jekyll-meet-and-greet.markdown
new file mode 100644
index 000000000..7c8e43fb2
--- /dev/null
+++ b/site/_posts/2015-01-20-jekyll-meet-and-greet.markdown
@@ -0,0 +1,20 @@
+---
+layout: news_item
+title: "Jekyll Meet & Greet at GitHub HQ"
+date: "2015-01-20 19:23:12 -0800"
+author: parkr
+categories: [meetup]
+---
+
+Hey! Our friends at GitHub have agreed to host a Jekyll meet & greet on
+**February 5, 2015 at 7pm**. The event will be hosted at [GitHub's
+Headquarters](https://www.google.com/maps/place/GitHub/@37.782084,-122.391403)
+here in San Francisco, CA. Pizza & beer will be available for those interested,
+and there will be much time to sit and chat about all things Jekyll. This would
+be an especially good time to get help with bugs you've encountered or to talk
+over a potential feature with the core team in attendance.
+
+A special thanks to [@gjtorikian](https://github.com/gjtorikian) for making this
+all possible! You rock.
+
+We look forward to meeting all you fine folks. Cheers!

From 5d750f5a71cd0004b139776c5eb54466461570c1 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 20 Jan 2015 20:12:41 -0800
Subject: [PATCH 218/407] Add a better link to GitHub HQ.

---
 site/_posts/2015-01-20-jekyll-meet-and-greet.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/_posts/2015-01-20-jekyll-meet-and-greet.markdown b/site/_posts/2015-01-20-jekyll-meet-and-greet.markdown
index 7c8e43fb2..fbd6a6341 100644
--- a/site/_posts/2015-01-20-jekyll-meet-and-greet.markdown
+++ b/site/_posts/2015-01-20-jekyll-meet-and-greet.markdown
@@ -7,8 +7,8 @@ categories: [meetup]
 ---
 
 Hey! Our friends at GitHub have agreed to host a Jekyll meet & greet on
-**February 5, 2015 at 7pm**. The event will be hosted at [GitHub's
-Headquarters](https://www.google.com/maps/place/GitHub/@37.782084,-122.391403)
+**February 5, 2015 at 7pm**. The event will be hosted at
+[GitHub's Headquarters](http://goo.gl/qMeBi5)
 here in San Francisco, CA. Pizza & beer will be available for those interested,
 and there will be much time to sit and chat about all things Jekyll. This would
 be an especially good time to get help with bugs you've encountered or to talk

From b9516961147a79c44de0a75384c7d164bb43406a Mon Sep 17 00:00:00 2001
From: DigitalSparky <matthew@spurrier.com.au>
Date: Wed, 21 Jan 2015 12:38:45 +0800
Subject: [PATCH 219/407] add jekyll-minifier

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

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 0748afacb..dc400e547 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -617,6 +617,7 @@ You can find a few useful plugins at the following locations:
 - [A layout that compresses HTML](https://github.com/penibelst/jekyll-compress-html) by [Anatol Broder](http://penibelst.de/): Github Pages compatible, configurable way to compress HTML files on site build.
 - [Jekyll CO₂](https://github.com/wdenton/jekyll-co2): Generates HTML showing the monthly change in atmospheric CO₂ at the Mauna Loa observatory in Hawaii.
 - [remote-include](http://www.northfieldx.co.uk/remote-include/): Includes files using remote URLs
+- [jekyll-minifier](https://github.com/digitalsparky/jekyll-minifier): Minifies HTML, XML, CSS, and Javascript both inline and as separate files utilising yui-compressor and htmlcompressor.
 
 #### Editors
 

From 053ba68a152f627875ed99e6d52a300fa2f8984b Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 20 Jan 2015 20:53:22 -0800
Subject: [PATCH 220/407] Update history to reflect merge of #3333 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 01abc1c67..8ec552e14 100644
--- a/History.markdown
+++ b/History.markdown
@@ -70,6 +70,7 @@
   * Add logic to automatically generate the `next_section` and `prev_section` navigation items (#3292)
   * Some small fixes for the Plugins TOC. (#3306)
   * Added versioning comment to configuration file (#3314)
+  * Add `jekyll-minifier` to list of third-party plugins (#3333)
 
 ## 2.5.3 / 2014-12-22
 

From d2c717c3c67515b4bd39b8d32e67486ccc1988e8 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 20 Jan 2015 20:53:58 -0800
Subject: [PATCH 221/407] Update history to reflect merge of #3332 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8ec552e14..61a09cbff 100644
--- a/History.markdown
+++ b/History.markdown
@@ -71,6 +71,7 @@
   * Some small fixes for the Plugins TOC. (#3306)
   * Added versioning comment to configuration file (#3314)
   * Add `jekyll-minifier` to list of third-party plugins (#3333)
+  * Add blog post about the Jekyll meet-up (#3332)
 
 ## 2.5.3 / 2014-12-22
 

From 3be90c7822d4259c39df9fe6c6ae519fb160d954 Mon Sep 17 00:00:00 2001
From: Joel Glovier <jglovier@github.com>
Date: Wed, 21 Jan 2015 10:57:24 -0500
Subject: [PATCH 222/407] :wrench: Google Maps link to GitHub HQ

Address was pointing to "85" Colin P Kelly, but should be "88"

cc @alfredxing (good :eyes:)
---
 site/_posts/2015-01-20-jekyll-meet-and-greet.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_posts/2015-01-20-jekyll-meet-and-greet.markdown b/site/_posts/2015-01-20-jekyll-meet-and-greet.markdown
index fbd6a6341..ed273f9d3 100644
--- a/site/_posts/2015-01-20-jekyll-meet-and-greet.markdown
+++ b/site/_posts/2015-01-20-jekyll-meet-and-greet.markdown
@@ -8,7 +8,7 @@ categories: [meetup]
 
 Hey! Our friends at GitHub have agreed to host a Jekyll meet & greet on
 **February 5, 2015 at 7pm**. The event will be hosted at
-[GitHub's Headquarters](http://goo.gl/qMeBi5)
+[GitHub's Headquarters](https://goo.gl/maps/Bmy7i)
 here in San Francisco, CA. Pizza & beer will be available for those interested,
 and there will be much time to sit and chat about all things Jekyll. This would
 be an especially good time to get help with bugs you've encountered or to talk

From ef54bfe5a134420ac7b40565efaa015689dd4950 Mon Sep 17 00:00:00 2001
From: Guillaume LARIVIERE <gui.lariviere@gmail.com>
Date: Wed, 21 Jan 2015 17:44:28 +0100
Subject: [PATCH 223/407] highlighting fix

---
 site/_docs/posts.md | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/site/_docs/posts.md b/site/_docs/posts.md
index c2d2e24d1..36b9fe1b8 100644
--- a/site/_docs/posts.md
+++ b/site/_docs/posts.md
@@ -172,13 +172,15 @@ Also, as with any output generated by Liquid tags, you can pass the `| strip_htm
 
 Additionally you are able to specify per-post `excerpt_separator` value if it is required just only the the selected post. Just specify the `excerpt_separator` with the same way as `excerpt` in the post's YAML head:
 
-    ---
-    excerpt_separator: <!--more-->
-    ---
+{% highlight text %}
+---
+excerpt_separator: <!--more-->
+---
 
-    Excerpt
-    <!--more-->
-    Out-of-excerpt
+Excerpt
+<!--more-->
+Out-of-excerpt
+{% endhighlight %}
 
 ## Highlighting code snippets
 

From b360154973fad4f774904d6875a4e31823e93887 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 21 Jan 2015 14:36:11 -0800
Subject: [PATCH 224/407] Update history to reflect merge of #3336 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 61a09cbff..0f80247c1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -72,6 +72,7 @@
   * Added versioning comment to configuration file (#3314)
   * Add `jekyll-minifier` to list of third-party plugins (#3333)
   * Add blog post about the Jekyll meet-up (#3332)
+  * Use `highlight` Liquid tag instead of the four-space tabs for code (#3336)
 
 ## 2.5.3 / 2014-12-22
 

From d20df4120d2c708030735fbf15a2a642eaa9c92e Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 24 Jan 2015 00:52:10 -0800
Subject: [PATCH 225/407] Add Jekyll 3.0.0.beta1 release post

---
 ...01-24-jekyll-3-0-0-beta1-released.markdown | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 site/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown

diff --git a/site/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown b/site/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown
new file mode 100644
index 000000000..28d4948ae
--- /dev/null
+++ b/site/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown
@@ -0,0 +1,36 @@
+---
+layout: news_item
+title: 'Jekyll 3.0.0.beta1 Released'
+date: 2015-01-24 00:42:31 -0800
+author: parkr
+version: 3.0.0.beta1
+categories: [release]
+---
+
+Hey!
+
+Exciting news! First beta for Jekyll 3 is out. Check out the [sizable
+changelog](https://github.com/jekyll/jekyll/blob/v3.0.0.beta1/History.markdown#head)
+to get a feel for what changes are afoot. Key features:
+
+1. **Speed.** Jekyll now features incremental regeneration and greatly
+   improved problematic code that caused slow-downs.
+2. **Reduced dependencies.** Hate installing 20 gems every time you want
+   Jekyll? Us too. So we stripped it down to 5 -- the bare essentials.
+3. Gobs of bugfixes and customization.
+4. Uniformity and sanity to Jekyll extensions of Liquid.
+
+Future versions will include [some awesome new
+features](https://github.com/jekyll/jekyll/issues/3324) that we haven't
+built yet. If you see one you want to tackle, submit a PR & you'll be
+featured in the Jekyll 3.0 release post as a contributor to that epic
+release.
+
+Please file bugs as you encounter them, being sure to include your version
+of Ruby, the Jekyll version, and (if possible) a link to your site so we
+can reproduce.
+
+If you think there's room for improvement in the UX, also do let us know.
+We're always looking to make Jekyll easier to use!
+
+Happy Jekylling!

From 980dbdbcc4fdb0675c01c1a8f8987c0a66636a2e Mon Sep 17 00:00:00 2001
From: Matt Rogers <codemattr@gmail.com>
Date: Sat, 24 Jan 2015 08:33:12 -0600
Subject: [PATCH 226/407] Update history to reflect merge of #3346 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0f80247c1..f44d0dfc0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -73,6 +73,7 @@
   * Add `jekyll-minifier` to list of third-party plugins (#3333)
   * Add blog post about the Jekyll meet-up (#3332)
   * Use `highlight` Liquid tag instead of the four-space tabs for code (#3336)
+  * 3.0.0.beta1 release post (#3346)
 
 ## 2.5.3 / 2014-12-22
 

From 317e2f460ea658780eaae4e3285049cce317de5d Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 24 Jan 2015 09:55:46 -0800
Subject: [PATCH 227/407] Release :gem: v3.0.0.beta1

---
 lib/jekyll/version.rb                                |  2 +-
 .../2015-01-24-jekyll-3-0-0-beta1-released.markdown  | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 91ff7408f..8b67d1cfd 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '2.5.3'
+  VERSION = '3.0.0-beta1'
 end
diff --git a/site/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown b/site/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown
index 28d4948ae..49b35b77d 100644
--- a/site/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown
+++ b/site/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown
@@ -15,10 +15,14 @@ to get a feel for what changes are afoot. Key features:
 
 1. **Speed.** Jekyll now features incremental regeneration and greatly
    improved problematic code that caused slow-downs.
-2. **Reduced dependencies.** Hate installing 20 gems every time you want
-   Jekyll? Us too. So we stripped it down to 5 -- the bare essentials.
-3. Gobs of bugfixes and customization.
-4. Uniformity and sanity to Jekyll extensions of Liquid.
+2. Gobs of bugfixes and customization.
+3. Uniformity and sanity to Jekyll extensions of Liquid.
+
+To install just run:
+
+{% highlight bash %}
+$ gem install jekyll --pre
+{% endhighlight %}
 
 Future versions will include [some awesome new
 features](https://github.com/jekyll/jekyll/issues/3324) that we haven't

From 97797cb24118068e0a28fedef19fabb5dd129b4d Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Sat, 24 Jan 2015 11:24:35 -0800
Subject: [PATCH 228/407] Update history to reflect merge of #3325 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f44d0dfc0..c360317a6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -40,6 +40,7 @@
   * Highlight: Only Strip Newlines/Carriage Returns, not Spaces (#3278)
   * Find variables in front matter defaults by searching with relative file path. (#2774)
   * Allow variables (e.g `:categories`) in YAML front matter permalinks (#3320)
+  * Handle nil URL placeholders in permalinks (#3325)
 
 ### Development Fixes
 

From 382c54e0578442e06a936fd0414e7423a66cfe7d Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 24 Jan 2015 11:57:10 -0800
Subject: [PATCH 229/407] Update history to reflect merge of #3329 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c360317a6..dc4a1388d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -41,6 +41,7 @@
   * Find variables in front matter defaults by searching with relative file path. (#2774)
   * Allow variables (e.g `:categories`) in YAML front matter permalinks (#3320)
   * Handle nil URL placeholders in permalinks (#3325)
+  * Template: Fix nav items alignment when in "burger" mode (#3329)
 
 ### Development Fixes
 

From 5e0341c9b3942be2a78f1d7981df878bb5e2f9b8 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 25 Jan 2015 19:10:28 -0800
Subject: [PATCH 230/407] Only write the latest_version.txt file if it's
 non-beta/alpha/rc.

---
 Rakefile                | 2 +-
 site/latest_version.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index 1b3e7e676..b0d82ac51 100644
--- a/Rakefile
+++ b/Rakefile
@@ -253,7 +253,7 @@ namespace :site do
 
   desc "Write the site latest_version.txt file"
   task :version_file do
-    File.open('site/latest_version.txt', 'wb') { |f| f.write(version) }
+    File.open('site/latest_version.txt', 'wb') { |f| f.puts(version) } unless version =~ /(beta|rc|alpha)/i
   end
 
   namespace :releases do
diff --git a/site/latest_version.txt b/site/latest_version.txt
index a4db534a2..aedc15bb0 100644
--- a/site/latest_version.txt
+++ b/site/latest_version.txt
@@ -1 +1 @@
-2.5.3
\ No newline at end of file
+2.5.3

From 69e8f1923c8568437465a96b4016caf0868982bf Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 25 Jan 2015 19:12:11 -0800
Subject: [PATCH 231/407] script/test: separate inclusion of lib and test. Ref:
 #3115

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

diff --git a/script/test b/script/test
index d69ad53b5..87df1f60d 100755
--- a/script/test
+++ b/script/test
@@ -16,4 +16,4 @@ fi
 
 set -x
 
-time bundle exec ruby -I"lib:test" -rloader $TEST_FILES
+time bundle exec ruby -Ilib -Itest -rloader $TEST_FILES

From 368b862ebb270f61b7422a4114b9f492e0a1723b Mon Sep 17 00:00:00 2001
From: Tanguy Krotoff <tkrotoff@gmail.com>
Date: Thu, 29 Jan 2015 16:18:22 +0100
Subject: [PATCH 232/407] Refactoring: replace !important with cleaner CSS

---
 lib/site_template/_sass/_layout.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/site_template/_sass/_layout.scss b/lib/site_template/_sass/_layout.scss
index d7f5559a1..a88e5d8d8 100644
--- a/lib/site_template/_sass/_layout.scss
+++ b/lib/site_template/_sass/_layout.scss
@@ -83,7 +83,9 @@
             display: block;
             padding: 5px 10px;
 
-            margin-right: 0 !important;
+            &:not(:last-child) {
+                margin-right: 0;
+            }
             margin-left: 20px;
         }
     }

From aa44c7f53db56b969005b2fb8ca9e2e21d7ecf1a Mon Sep 17 00:00:00 2001
From: Tanguy Krotoff <tkrotoff@gmail.com>
Date: Thu, 29 Jan 2015 16:38:12 +0100
Subject: [PATCH 233/407] Switch default font to Helvetica Neue

Helvetica Neue (1983) features multiple improvements over the original Helvetica font (1957), 'neue' means 'new' in German
---
 lib/site_template/css/main.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/site_template/css/main.scss b/lib/site_template/css/main.scss
index beee4e3da..52b6a691c 100755
--- a/lib/site_template/css/main.scss
+++ b/lib/site_template/css/main.scss
@@ -6,7 +6,7 @@
 
 
 // Our variables
-$base-font-family: Helvetica, Arial, sans-serif;
+$base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 $base-font-size:   16px;
 $small-font-size:  $base-font-size * 0.875;
 $base-line-height: 1.5;

From ff646738fc9463031988466c0a77cf9ff5a3573d Mon Sep 17 00:00:00 2001
From: kaatt <kaattt@gmail.com>
Date: Fri, 30 Jan 2015 01:32:00 +0530
Subject: [PATCH 234/407] Shows time after initial generation

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

diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb
index 536324fce..bf1975c42 100644
--- a/lib/jekyll/commands/build.rb
+++ b/lib/jekyll/commands/build.rb
@@ -48,6 +48,7 @@ module Jekyll
         #
         # Returns nothing.
         def build(site, options)
+          t = Time.now
           source      = options['source']
           destination = options['destination']
           full_build  = options['full_rebuild']
@@ -56,7 +57,7 @@ module Jekyll
           Jekyll.logger.info "Incremental build:", (full_build ? "disabled" : "enabled")
           Jekyll.logger.info "Generating..."
           process_site(site)
-          Jekyll.logger.info "", "done."
+          Jekyll.logger.info "", "done in #{Time.now - t} seconds."
         end
 
         # Private: Watch for file changes and rebuild the site.

From e1e60499b1ba7117ea9cee828db380dac13397ab Mon Sep 17 00:00:00 2001
From: Garen Torikian <gjtorikian@users.noreply.github.com>
Date: Thu, 29 Jan 2015 12:41:19 -0800
Subject: [PATCH 235/407] Factor out a `read_data_file` call to keep things
 clean

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

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 85cdac189..3af47672c 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -258,16 +258,23 @@ module Jekyll
         if File.directory?(path)
           read_data_to(path, data[key] = {})
         else
-          case File.extname(path).downcase
-          when '.csv'
-            data[key] = CSV.read(path, :headers => true).map(&:to_hash)
-          else
-            data[key] = SafeYAML.load_file(path)
-          end
+          data[key] = read_data_file(path)
         end
       end
     end
-
+    
+    # Determines how to read a data file.
+    #
+    # Returns the contents of the data file.
+    def read_data_file(path)
+      case File.extname(path).downcase
+      when '.csv'
+        CSV.read(path, :headers => true).map(&:to_hash)
+      else
+        SafeYAML.load_file(path)
+      end
+    end
+      
     # Read in all collections specified in the configuration
     #
     # Returns nothing.

From bfe28cbead89ee4bcd1d1c3a8f3dae4a6b8e6106 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Thu, 29 Jan 2015 14:09:49 -0800
Subject: [PATCH 236/407] Update history to reflect merge of #3375 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index dc4a1388d..5a6aebfec 100644
--- a/History.markdown
+++ b/History.markdown
@@ -42,6 +42,7 @@
   * Allow variables (e.g `:categories`) in YAML front matter permalinks (#3320)
   * Handle nil URL placeholders in permalinks (#3325)
   * Template: Fix nav items alignment when in "burger" mode (#3329)
+  * Template: Remove `!important` from nav SCSS introduced in #3329 (#3375)
 
 ### Development Fixes
 

From dcd3dafdbc084319ad6e52aa07be3aef0df2dbb8 Mon Sep 17 00:00:00 2001
From: Matt Rogers <codemattr@gmail.com>
Date: Thu, 29 Jan 2015 16:10:07 -0600
Subject: [PATCH 237/407] Update history to reflect merge of #3378 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5a6aebfec..90f4e3929 100644
--- a/History.markdown
+++ b/History.markdown
@@ -28,6 +28,7 @@
   * Split off Textile support into jekyll-textile-converter (#3319)
   * Improve the navigation menu alignment in the site template on small
     screens (#3331)
+  * Show the regeneration time after the initial generation (#3378)
 
 ### Bug Fixes
 

From b100b3b121f8893dda14d591799a9be47c330655 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 29 Jan 2015 18:54:57 -0800
Subject: [PATCH 238/407] Update history to reflect merge of #3376 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 90f4e3929..334fa5035 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * Improve the navigation menu alignment in the site template on small
     screens (#3331)
   * Show the regeneration time after the initial generation (#3378)
+  * Site template: Switch default font to Helvetica Neue (#3376)
 
 ### Bug Fixes
 

From 0c624eb11bc879a1df262290842f936ee7f36e71 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 30 Jan 2015 01:53:11 -0800
Subject: [PATCH 239/407] The :title URL placeholder for collections should be
 the filename slug.

This mimicks posts most closely. It can be overridden by the
YAML front matter.

Undoes some of #2864.
---
 lib/jekyll/document.rb                   |  2 +-
 site/_docs/permalinks.md                 |  5 ++++-
 test/source/_slides/example-slide-4.html |  2 +-
 test/source/_slides/example-slide-6.html | 15 +++++++++++++++
 test/test_document.rb                    | 13 +++++++++----
 5 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 test/source/_slides/example-slide-6.html

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index ec9ee7421..048dcdbf5 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -132,7 +132,7 @@ module Jekyll
         path:       cleaned_relative_path,
         output_ext: Jekyll::Renderer.new(site, self).output_ext,
         name:       Utils.slugify(basename_without_ext),
-        title:      Utils.slugify(data['title']) || Utils.slugify(basename_without_ext)
+        title:      Utils.slugify(data['slug']) || Utils.slugify(basename_without_ext)
       }
     end
 
diff --git a/site/_docs/permalinks.md b/site/_docs/permalinks.md
index 703a2289f..bf7e9481c 100644
--- a/site/_docs/permalinks.md
+++ b/site/_docs/permalinks.md
@@ -78,7 +78,10 @@ permalink is defined as `/:categories/:year/:month/:day/:title.html`.
         <p><code>title</code></p>
       </td>
       <td>
-        <p>Title from the Post’s filename</p>
+        <p>
+            Title from the document’s filename. May be overridden via the
+            document’s <code>slug</code> YAML front matter.
+        </p>
       </td>
     </tr>
     <tr>
diff --git a/test/source/_slides/example-slide-4.html b/test/source/_slides/example-slide-4.html
index 6cec4eaec..b4bdbe459 100644
--- a/test/source/_slides/example-slide-4.html
+++ b/test/source/_slides/example-slide-4.html
@@ -1,5 +1,5 @@
 ---
-  title: So what is Jekyll, exactly?
+  slug: so-what-is-jekyll-exactly
   layout: slide
 ---
 
diff --git a/test/source/_slides/example-slide-6.html b/test/source/_slides/example-slide-6.html
new file mode 100644
index 000000000..defbb52d7
--- /dev/null
+++ b/test/source/_slides/example-slide-6.html
@@ -0,0 +1,15 @@
+---
+  slug: Well, so what is Jekyll, then?
+  layout: slide
+---
+
+Jekyll is a simple, blog-aware, static site generator. It takes a template
+directory containing raw text files in various formats, runs it through
+[Markdown](http://daringfireball.net/projects/markdown/) (or
+[Textile](http://redcloth.org/textile)) and
+[Liquid](http://wiki.shopify.com/Liquid)
+converters, 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](http://pages.github.com), which means you can use Jekyll
+to host your project’s page, blog, or website from GitHub’s servers **for
+free**.
diff --git a/test/test_document.rb b/test/test_document.rb
index f8243aa19..aa4e2fa93 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -249,15 +249,20 @@ class TestDocument < Test::Unit::TestCase
       }))
       @site.process
       @document = @site.collections["slides"].docs[3]
-      @document_without_title = @site.collections["slides"].docs[4]
+      @document_without_slug = @site.collections["slides"].docs[4]
+      @document_with_strange_slug = @site.collections["slides"].docs[5]
     end
 
-    should "produce the right URL if they have a title" do
+    should "produce the right URL if they have a slug" do
       assert_equal "/slides/so-what-is-jekyll-exactly", @document.url
     end
 
-    should "produce the right URL if they don't have a title" do
-      assert_equal "/slides/example-slide-5", @document_without_title.url
+    should "produce the right URL if they don't have a slug" do
+      assert_equal "/slides/example-slide-5", @document_without_slug.url
+    end
+
+    should "produce the right URL if they have a wild slug" do
+      assert_equal "/slides/well-so-what-is-jekyll-then", @document_with_strange_slug.url
     end
   end
 

From 51d8d5e267bd826b399d04460a82d2ccbd23b050 Mon Sep 17 00:00:00 2001
From: Ezmyrelda Andrade <dj.ezmyrelda@gmail.com>
Date: Fri, 30 Jan 2015 10:41:21 -0800
Subject: [PATCH 240/407] Liquid tag plugin addition.

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

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index dc400e547..24a2261b0 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -584,7 +584,7 @@ You can find a few useful plugins at the following locations:
 - [Jekyll 500px Embed](https://github.com/lkorth/jekyll-500px-embed) by [Luke Korth](https://lukekorth.com/). A Liquid tag plugin that embeds [500px](https://500px.com/) photos.
 - [inline\_highlight](https://github.com/bdesham/inline_highlight): A tag for inline syntax highlighting.
 - [jekyll-mermaid](https://github.com/jasonbellamy/jekyll-mermaid): Simplify the creation of mermaid diagrams and flowcharts in your posts and pages.
-
+- [twa](https://github.com/Ezmyrelda/twa): Twemoji Awesome plugin for Jekyll. Liquid tag allowing you to use twitter emoji in your jekyll pages.
 #### Collections
 
 - [Jekyll Plugins by Recursive Design](http://recursive-design.com/projects/jekyll-plugins/): Plugins to generate Project pages from GitHub readmes, a Category page, and a Sitemap generator.

From 3bac8a20340d1124fb4a3d4b567c92b7921251f7 Mon Sep 17 00:00:00 2001
From: Garen Torikian <gjtorikian@gmail.com>
Date: Fri, 30 Jan 2015 15:21:45 -0800
Subject: [PATCH 241/407] Add test for new extracted method

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

diff --git a/test/test_site.rb b/test/test_site.rb
index 1fe86b763..1ea582f72 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -369,6 +369,16 @@ class TestSite < Test::Unit::TestCase
         assert_equal site.site_payload['site']['data']['members'], file_content
       end
 
+      should 'load yaml files from extracted method' do
+        site = Site.new(site_configuration)
+        site.process
+
+        file_content = site.read_data_file(File.join(source_dir, '_data', 'members.yaml'))
+
+        assert_equal site.data['members'], file_content
+        assert_equal site.site_payload['site']['data']['members'], file_content
+      end
+
       should 'auto load yml files' do
         site = Site.new(site_configuration)
         site.process

From 18893b828b378e9fcadb1ddbdff749e37533c707 Mon Sep 17 00:00:00 2001
From: Ezmyrelda Andrade <dj.ezmyrelda@gmail.com>
Date: Fri, 30 Jan 2015 23:11:24 -0800
Subject: [PATCH 242/407] Formatting change per request

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

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 24a2261b0..aa3d3d4a4 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -585,6 +585,7 @@ You can find a few useful plugins at the following locations:
 - [inline\_highlight](https://github.com/bdesham/inline_highlight): A tag for inline syntax highlighting.
 - [jekyll-mermaid](https://github.com/jasonbellamy/jekyll-mermaid): Simplify the creation of mermaid diagrams and flowcharts in your posts and pages.
 - [twa](https://github.com/Ezmyrelda/twa): Twemoji Awesome plugin for Jekyll. Liquid tag allowing you to use twitter emoji in your jekyll pages.
+- 
 #### Collections
 
 - [Jekyll Plugins by Recursive Design](http://recursive-design.com/projects/jekyll-plugins/): Plugins to generate Project pages from GitHub readmes, a Category page, and a Sitemap generator.

From 01f7b9ccef35a01f3b7400c310453d369f98de28 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 31 Jan 2015 00:04:45 -0800
Subject: [PATCH 243/407] Update history to reflect merge of #3384 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 334fa5035..086e420ef 100644
--- a/History.markdown
+++ b/History.markdown
@@ -79,6 +79,7 @@
   * Add blog post about the Jekyll meet-up (#3332)
   * Use `highlight` Liquid tag instead of the four-space tabs for code (#3336)
   * 3.0.0.beta1 release post (#3346)
+  * Add `twa` to the list of third-party plugins (#3384)
 
 ## 2.5.3 / 2014-12-22
 

From 9f4aeaddea07f2169a7c90072246e708404f0210 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 31 Jan 2015 00:07:31 -0800
Subject: [PATCH 244/407] Update history to reflect merge of #3383 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 086e420ef..f6d9df746 100644
--- a/History.markdown
+++ b/History.markdown
@@ -45,6 +45,7 @@
   * Handle nil URL placeholders in permalinks (#3325)
   * Template: Fix nav items alignment when in "burger" mode (#3329)
   * Template: Remove `!important` from nav SCSS introduced in #3329 (#3375)
+  * The `:title` URL placeholder for collections should be the filename slug. (#3383)
 
 ### Development Fixes
 

From 32a2e8b4ef5096f118dc88ba3bf839ff794e3f5c Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 31 Jan 2015 00:12:24 -0800
Subject: [PATCH 245/407] Use the source_dir() helper

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

diff --git a/test/test_site.rb b/test/test_site.rb
index 1ea582f72..409392fd7 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -373,7 +373,7 @@ class TestSite < Test::Unit::TestCase
         site = Site.new(site_configuration)
         site.process
 
-        file_content = site.read_data_file(File.join(source_dir, '_data', 'members.yaml'))
+        file_content = site.read_data_file(source_dir('_data', 'members.yaml'))
 
         assert_equal site.data['members'], file_content
         assert_equal site.site_payload['site']['data']['members'], file_content

From ec7d2ed5b6e3d74b2dfedf4f1085fe76c508cf54 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 31 Jan 2015 00:13:16 -0800
Subject: [PATCH 246/407] Update history to reflect merge of #3380 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f6d9df746..78ed61edc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -59,6 +59,7 @@
   * Fix some spacing (#3312)
   * Fix comment typo in `lib/jekyll/frontmatter_defaults.rb` (#3322)
   * Move all `regenerate?` checking to `Regenerator` (#3326)
+  * Factor out a `read_data_file` call to keep things clean (#3380)
 
 ### Site Enhancements
 

From ec397e1629e1262660c3750d2e7f5d589593f17b Mon Sep 17 00:00:00 2001
From: chrisfinazzo <chris.finazzo@gmail.com>
Date: Sat, 31 Jan 2015 12:27:28 -0500
Subject: [PATCH 247/407] Remove extra spaces

---
 site/_docs/contributing.md    | 2 +-
 site/_docs/drafts.md          | 2 +-
 site/_docs/troubleshooting.md | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/site/_docs/contributing.md b/site/_docs/contributing.md
index 9f4a334ff..2ff5cd4f6 100644
--- a/site/_docs/contributing.md
+++ b/site/_docs/contributing.md
@@ -97,7 +97,7 @@ You can find the documentation for jekyllrb.com in the
 [site]({{ site.repository }}/tree/master/site) directory of
 Jekyll's repo on GitHub.com.
 
-All documentation pull requests should be directed at `master`.  Pull
+All documentation pull requests should be directed at `master`. Pull
 requests directed at another branch will not be accepted.
 
 The [Jekyll wiki]({{ site.repository }}/wiki) on GitHub
diff --git a/site/_docs/drafts.md b/site/_docs/drafts.md
index 2f2f12b52..9e7f1c6f0 100644
--- a/site/_docs/drafts.md
+++ b/site/_docs/drafts.md
@@ -15,5 +15,5 @@ first draft:
 {% endhighlight %}
 
 To preview your site with drafts, simply run `jekyll serve` or `jekyll build` with
-the `--drafts` switch.  Each will be assigned the value modification time of the draft file
+the `--drafts` switch. Each will be assigned the value modification time of the draft file
 for its date, and thus you will see currently edited drafts as the latest posts.
diff --git a/site/_docs/troubleshooting.md b/site/_docs/troubleshooting.md
index 87da91fbf..e4c8120a0 100644
--- a/site/_docs/troubleshooting.md
+++ b/site/_docs/troubleshooting.md
@@ -101,9 +101,9 @@ http://localhost:4000/blog
 The order of precedence for conflicting [configuration settings](../configuration/)
 is as follows:
 
-1.  Command-line flags
-2.  Configuration file settings
-3.  Defaults
+1. Command-line flags
+2. Configuration file settings
+3. Defaults
 
 That is: defaults are overridden by options specified in `_config.yml`,
 and flags specified at the command-line will override all other settings

From 6883a0b39725646e8efe75977ea5e9395d56fd03 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 31 Jan 2015 11:26:43 -0800
Subject: [PATCH 248/407] Update history to reflect merge of #3388 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 78ed61edc..da43a67b3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -82,6 +82,7 @@
   * Use `highlight` Liquid tag instead of the four-space tabs for code (#3336)
   * 3.0.0.beta1 release post (#3346)
   * Add `twa` to the list of third-party plugins (#3384)
+  * Remove extra spaces (#3388)
 
 ## 2.5.3 / 2014-12-22
 

From 63792ad322183f159c530e9f1112b94bc333d200 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 31 Jan 2015 12:46:52 -0800
Subject: [PATCH 249/407] Always do a full rebuild.

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

diff --git a/script/stackprof b/script/stackprof
index 3399616f2..ee05a1dbc 100755
--- a/script/stackprof
+++ b/script/stackprof
@@ -5,7 +5,7 @@ set -e
 export BENCHMARK=true
 command -v stackprof > /dev/null || script/bootstrap
 
-TEST_SCRIPT="Jekyll::Commands::Build.process({'source' => 'site'})"
+TEST_SCRIPT="Jekyll::Commands::Build.process({'source' => 'site', 'full_rebuild' => true})"
 PROF_OUTPUT_FILE=tmp/stackprof-$(date +%Y%m%d%H%M).dump
 
 test -f "$PROF_OUTPUT_FILE" || {

From 18e0d2fe75d8ed807feb6c3eaa0de9276670b4a8 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 31 Jan 2015 12:59:25 -0800
Subject: [PATCH 250/407] Make the {% include %} tag a teensy bit faster.

---
 lib/jekyll/tags/include.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index c09460ff5..b809ffe71 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -101,7 +101,7 @@ eos
       end
 
       def tag_includes_dir
-        '_includes'
+        '_includes'.freeze
       end
 
       def render(context)
@@ -123,7 +123,7 @@ eos
         end
 
         begin
-          partial = Liquid::Template.parse(source(path, context))
+          partial = Liquid::Template.parse(read_file(path, context))
 
           context.stack do
             context['include'] = parse_params(context) if @params
@@ -135,7 +135,7 @@ eos
       end
 
       def resolved_includes_dir(context)
-        File.join(File.realpath(context.registers[:site].source), @includes_dir)
+        context.registers[:site].in_source_dir(@includes_dir)
       end
 
       def validate_path(path, dir, safe)
@@ -155,14 +155,14 @@ eos
       end
 
       # This method allows to modify the file content by inheriting from the class.
-      def source(file, context)
+      def read_file(file, context)
         File.read(file, file_read_opts(context))
       end
     end
 
     class IncludeRelativeTag < IncludeTag
       def tag_includes_dir
-        '.'
+        '.'.freeze
       end
 
       def page_path(context)

From 336bb447505392b7861c7d6c16c171451ebd0d15 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 31 Jan 2015 13:52:26 -0800
Subject: [PATCH 251/407] Use #require_with_graceful_fail in Highlight tag.

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

diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index 0305f1cfc..480c956cf 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -75,7 +75,7 @@ eos
       end
 
       def render_pygments(code, is_safe)
-        require 'pygments'
+        Jekyll::External.require_with_graceful_fail 'pygments'
 
         @options[:encoding] = 'utf-8'
 
@@ -100,7 +100,7 @@ eos
       end
 
       def render_rouge(code)
-        require 'rouge'
+        Jekyll::External.require_with_graceful_fail 'rouge'
         formatter = Rouge::Formatters::HTML.new(line_numbers: @options[:linenos], wrap: false)
         lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText
         code = formatter.format(lexer.lex(code))

From 057b8cae7ff7d4bf8d7e5765735ef331923017b8 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 16:42:38 -0800
Subject: [PATCH 252/407] Use `rouge` as the default syntax highlighter.

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

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 8a7e19fec..e24f7a91c 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -36,12 +36,12 @@ Gem::Specification.new do |s|
 
   # Before 3.0 drops, phase the following gems out as dev dependencies
   # and gracefully handle their absence.
-  s.add_runtime_dependency('pygments.rb', '~> 0.6.0')
   s.add_runtime_dependency('redcarpet', '~> 3.1')
   s.add_runtime_dependency('toml', '~> 0.1.0')
   s.add_runtime_dependency('jekyll-paginate', '~> 1.0')
   s.add_runtime_dependency('jekyll-gist', '~> 1.0')
   s.add_runtime_dependency('jekyll-coffeescript', '~> 1.0')
+  s.add_runtime_dependency('rouge', '~> 1.7')
   s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0')
   s.add_runtime_dependency('jekyll-watch', '~> 1.1')
   s.add_runtime_dependency('classifier-reborn', '~> 2.0')
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 5277405ce..b53f123a3 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -35,7 +35,7 @@ module Jekyll
 
       # Conversion
       'markdown'      => 'kramdown',
-      'highlighter'   => 'pygments',
+      'highlighter'   => 'rouge',
       'lsi'           => false,
       'excerpt_separator' => "\n\n",
 

From 65d43ef398b81127c692995664170e561bca8da7 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 16:43:07 -0800
Subject: [PATCH 253/407] Move previous runtime dependencies to development
 dependencies.

---
 Gemfile                      | 9 ++++++++-
 jekyll.gemspec               | 9 ---------
 lib/jekyll.rb                | 9 +--------
 lib/jekyll/configuration.rb  | 1 +
 lib/jekyll/related_posts.rb  | 2 +-
 lib/jekyll/tags/highlight.rb | 4 ++--
 site/_docs/configuration.md  | 2 +-
 test/test_coffeescript.rb    | 1 +
 test/test_configuration.rb   | 2 ++
 9 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/Gemfile b/Gemfile
index 88d5e641f..c7edecf70 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,14 @@
 source 'https://rubygems.org'
 gemspec
 
+gem 'pygments.rb', '~> 0.6.0'
+gem 'redcarpet', '~> 3.1'
+gem 'toml', '~> 0.1.0'
+gem 'jekyll-paginate', '~> 1.0'
+gem 'jekyll-gist', '~> 1.0'
+gem 'jekyll-coffeescript', '~> 1.0'
+gem 'classifier-reborn', '~> 2.0'
+
 gem 'rake', '~> 10.1'
 gem 'rdoc', '~> 3.11'
 gem 'redgreen', '~> 1.2'
@@ -16,7 +24,6 @@ gem 'mime-types', '~> 1.5'
 gem 'activesupport', '~> 3.2.13'
 gem 'jekyll_test_plugin'
 gem 'jekyll_test_plugin_malicious'
-gem 'rouge', '~> 1.7'
 gem 'liquid-c', '~> 0.0.3'
 gem 'minitest' if RUBY_PLATFORM =~ /cygwin/
 gem 'test-unit' if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2")
diff --git a/jekyll.gemspec b/jekyll.gemspec
index e24f7a91c..470781c78 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -33,16 +33,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('mercenary', '~> 0.3.3')
   s.add_runtime_dependency('safe_yaml', '~> 1.0')
   s.add_runtime_dependency('colorator', '~> 0.1')
-
-  # Before 3.0 drops, phase the following gems out as dev dependencies
-  # and gracefully handle their absence.
-  s.add_runtime_dependency('redcarpet', '~> 3.1')
-  s.add_runtime_dependency('toml', '~> 0.1.0')
-  s.add_runtime_dependency('jekyll-paginate', '~> 1.0')
-  s.add_runtime_dependency('jekyll-gist', '~> 1.0')
-  s.add_runtime_dependency('jekyll-coffeescript', '~> 1.0')
   s.add_runtime_dependency('rouge', '~> 1.7')
   s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0')
   s.add_runtime_dependency('jekyll-watch', '~> 1.1')
-  s.add_runtime_dependency('classifier-reborn', '~> 2.0')
 end
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index dd4645036..02aa40b1f 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -169,11 +169,4 @@ require_all 'jekyll/converters/markdown'
 require_all 'jekyll/generators'
 require_all 'jekyll/tags'
 
-# Eventually remove these for 3.0 as non-core
-Jekyll::External.require_with_graceful_fail(%w[
-  toml
-  jekyll-paginate
-  jekyll-gist
-  jekyll-coffeescript
-  jekyll-sass-converter
-])
+require 'jekyll-sass-converter'
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index b53f123a3..77cc90a7a 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -115,6 +115,7 @@ module Jekyll
     def safe_load_file(filename)
       case File.extname(filename)
       when /\.toml/i
+        Jekyll::External.require_with_graceful_fail('toml') unless defined?(TOML)
         TOML.load_file(filename)
       when /\.ya?ml/i
         SafeYAML.load_file(filename)
diff --git a/lib/jekyll/related_posts.rb b/lib/jekyll/related_posts.rb
index 041ee551a..b6899ec33 100644
--- a/lib/jekyll/related_posts.rb
+++ b/lib/jekyll/related_posts.rb
@@ -10,7 +10,7 @@ module Jekyll
     def initialize(post)
       @post = post
       @site = post.site
-      require 'classifier-reborn' if site.lsi
+      Jekyll::External.require_with_graceful_fail('classifier-reborn') if site.lsi
     end
 
     def build
diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index 480c956cf..adf6bcd75 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -75,7 +75,7 @@ eos
       end
 
       def render_pygments(code, is_safe)
-        Jekyll::External.require_with_graceful_fail 'pygments'
+        Jekyll::External.require_with_graceful_fail('pygments')
 
         @options[:encoding] = 'utf-8'
 
@@ -100,7 +100,7 @@ eos
       end
 
       def render_rouge(code)
-        Jekyll::External.require_with_graceful_fail 'rouge'
+        Jekyll::External.require_with_graceful_fail('rouge')
         formatter = Rouge::Formatters::HTML.new(line_numbers: @options[:linenos], wrap: false)
         lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText
         code = formatter.format(lexer.lex(code))
diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index 6d59119d5..d09c5ab7a 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -490,7 +490,7 @@ gems:      []
 
 # Conversion
 markdown:    kramdown
-highlighter: pygments
+highlighter: rouge
 lsi:         false
 excerpt_separator: "\n\n"
 
diff --git a/test/test_coffeescript.rb b/test/test_coffeescript.rb
index 2c589f81d..49b838a1e 100644
--- a/test/test_coffeescript.rb
+++ b/test/test_coffeescript.rb
@@ -3,6 +3,7 @@ require 'helper'
 class TestCoffeeScript < Test::Unit::TestCase
   context "converting CoffeeScript" do
     setup do
+      External.require_with_graceful_fail('jekyll-coffeescript')
       @site = fixture_site
       @site.process
       @test_coffeescript_file = dest_dir("js/coffeescript.js")
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 77247def2..fffbc2dbb 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -181,6 +181,8 @@ class TestConfiguration < Test::Unit::TestCase
     end
 
     should "load multiple config files" do
+      External.require_with_graceful_fail('toml')
+
       mock(SafeYAML).load_file(@paths[:default]) { Hash.new }
       mock(SafeYAML).load_file(@paths[:other]) { Hash.new }
       mock(TOML).load_file(@paths[:toml]) { Hash.new }

From a87cda4b128187740f6ee70c264cb8c4912e0451 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 31 Jan 2015 12:22:32 -0800
Subject: [PATCH 254/407] Add configuration fallback for paginate, and fix
 tests.

---
 features/markdown.feature                 |  5 ++++-
 features/pagination.feature               |  7 ++++++-
 features/rendering.feature                | 10 +++++++++-
 features/step_definitions/jekyll_steps.rb |  6 ++++++
 lib/jekyll/configuration.rb               |  6 ++++++
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/features/markdown.feature b/features/markdown.feature
index 895c927ad..2342951a1 100644
--- a/features/markdown.feature
+++ b/features/markdown.feature
@@ -17,7 +17,10 @@ Feature: Markdown
     And I should see "<h1 id=\"my-title\">My Title</h1>" in "_site/index.html"
 
   Scenario: Markdown in pagination on index
-    Given I have a configuration file with "paginate" set to "5"
+    Given I have a configuration file with:
+      | key      | value             |
+      | paginate | 5                 |
+      | gems     | [jekyll-paginate] |
     And I have an "index.html" page that contains "Index - {% for post in paginator.posts %} {{ post.content }} {% endfor %}"
     And I have a _posts directory
     And I have the following post:
diff --git a/features/pagination.feature b/features/pagination.feature
index 21b96b081..b8b89ed09 100644
--- a/features/pagination.feature
+++ b/features/pagination.feature
@@ -4,7 +4,10 @@ Feature: Site pagination
   I want divide the posts in several pages
 
   Scenario Outline: Paginate with N posts per page
-    Given I have a configuration file with "paginate" set to "<num>"
+    Given I have a configuration file with:
+      | key      | value             |
+      | paginate | <num>             |
+      | gems     | [jekyll-paginate] |
     And I have a _layouts directory
     And I have an "index.html" page that contains "{{ paginator.posts.size }}"
     And I have a _posts directory
@@ -32,6 +35,7 @@ Feature: Site pagination
       | paginate      | 1                              |
       | paginate_path | /blog/page-:num                |
       | permalink     | /blog/:year/:month/:day/:title |
+      | gems          | [jekyll-paginate]              |
     And I have a blog directory
     And I have an "blog/index.html" page that contains "{{ paginator.posts.size }}"
     And I have a _posts directory
@@ -59,6 +63,7 @@ Feature: Site pagination
       | paginate      | 1                              |
       | paginate_path | /blog/page/:num                |
       | permalink     | /blog/:year/:month/:day/:title |
+      | gems          | [jekyll-paginate]              |
     And I have a blog directory
     And I have an "blog/index.html" page that contains "{{ paginator.posts.size }}"
     And I have an "index.html" page that contains "Don't pick me!"
diff --git a/features/rendering.feature b/features/rendering.feature
index e0b9d8f0d..55a9d3d20 100644
--- a/features/rendering.feature
+++ b/features/rendering.feature
@@ -15,6 +15,7 @@ Feature: Rendering
   Scenario: Don't place asset files in layout
     Given I have an "index.scss" page with layout "simple" that contains ".foo-bar { color:black; }"
     And I have an "index.coffee" page with layout "simple" that contains "whatever()"
+    And I have a configuration file with "gems" set to "[jekyll-coffeescript]"
     And I have a simple layout that contains "{{ content }}Ahoy, indeed!"
     When I run jekyll build
     Then the _site directory should exist
@@ -28,8 +29,15 @@ Feature: Rendering
     Then the _site directory should exist
     And I should see ".foo-bar {\n  color: red; }" in "_site/index.css"
 
-  Scenario: Render liquid in CoffeeScript
+  Scenario: Not render liquid in CoffeeScript without explicitly including jekyll-coffeescript
     Given I have an "index.coffee" page with animal "cicada" that contains "hey='for {{page.animal}}'"
     When I run jekyll build
     Then the _site directory should exist
+    And the "_site/index.js" file should not exist
+
+  Scenario: Render liquid in CoffeeScript with jekyll-coffeescript enabled
+    Given I have an "index.coffee" page with animal "cicada" that contains "hey='for {{page.animal}}'"
+    And I have a configuration file with "gems" set to "[jekyll-coffeescript]"
+    When I run jekyll build
+    Then the _site directory should exist
     And I should see "hey = 'for cicada';" in "_site/index.js"
diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index ee4f0d37b..176629f67 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -168,6 +168,12 @@ When /^I delete the file "(.*)"$/ do |file|
   File.delete(file)
 end
 
+##################
+#
+# Checking stuff
+#
+##################
+
 Then /^the (.*) directory should +exist$/ do |dir|
   assert File.directory?(dir), "The directory \"#{dir}\" does not exist"
 end
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 77cc90a7a..f7f39cb51 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -261,6 +261,12 @@ module Jekyll
           "Markdown processor. Maruku support has been deprecated and will " +
           "be removed in 3.0.0. We recommend you switch to Kramdown."
       end
+
+      if config.key?('paginate') && config['paginate'] && !(config['gems'] || []).include?('jekyll-paginate')
+        Jekyll::Deprecator.deprecation_message "You appear to have pagination " +
+          "turned on, but you haven't included the `jekyll-paginate` gem. " +
+          "Ensure you have `gems: [jekyll-paginate]` in your configuration file."
+      end
       config
     end
 

From f55eb1f3fb0a9f871133144074e063c1bbb153f3 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 31 Jan 2015 14:03:27 -0800
Subject: [PATCH 255/407] Update history to reflect merge of #3323 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index da43a67b3..1e819a0d3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,8 @@
   * Upgrade to Liquid 3.0.0 (#3002)
   * Support Ruby v2.2 (#3234)
   * Support RDiscount 2 (#2767)
+  * Remove most runtime deps (#3323)
+  * Move to Rouge as default highlighter (#3323)
 
 ### Minor Enhancements
 

From 0154c580cd94941590cec4a6d5fdcac6e1d274d3 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 31 Jan 2015 15:42:04 -0800
Subject: [PATCH 256/407] Update history to reflect merge of #3391 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1e819a0d3..8a6512f6e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -32,6 +32,7 @@
     screens (#3331)
   * Show the regeneration time after the initial generation (#3378)
   * Site template: Switch default font to Helvetica Neue (#3376)
+  * Make the `include` tag a teensy bit faster. (#3391)
 
 ### Bug Fixes
 

From 8da7d1a5bcfd91f64663c5af1e6db1e27090da60 Mon Sep 17 00:00:00 2001
From: chrisfinazzo <chris.finazzo@gmail.com>
Date: Sat, 31 Jan 2015 22:52:46 -0500
Subject: [PATCH 257/407] Grammar, hard-wrap lines at 80 characters

---
 site/_docs/configuration.md          | 6 +++---
 site/_docs/continuous-integration.md | 4 ++--
 site/_docs/deployment-methods.md     | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index d09c5ab7a..50af0f8ca 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -448,9 +448,9 @@ The `projects/foo_project.md` would have the `layout` set to `foobar` instead of
 
 ## Default Configuration
 
-Jekyll runs with the following configuration options by default. Unless
-alternative settings for these options are explicitly specified in the
-configuration file or on the command-line, Jekyll will run using these options.
+Jekyll runs with the following configuration options by default. Alternative
+settings for these options can be explicitly specified in the Configuration
+file or on the command-line.
 
 <div class="note warning">
   <h5>There are two unsupported kramdown options</h5>
diff --git a/site/_docs/continuous-integration.md b/site/_docs/continuous-integration.md
index 5e8a700ba..17823e1bc 100644
--- a/site/_docs/continuous-integration.md
+++ b/site/_docs/continuous-integration.md
@@ -60,7 +60,7 @@ HTML::Proofer.new("./_site").run
 {% endhighlight %}
 
 Options are given as a second argument to `.new`, and are encoded in a
-symbol-keyed Ruby Hash. More information about the configuration options,
+symbol-keyed Ruby Hash. For more information about the configuration options,
 check out `html-proofer`'s README file.
 
 [2]: https://github.com/gjtorikian/html-proofer
@@ -69,7 +69,7 @@ check out `html-proofer`'s README file.
 
 This file is used to configure your Travis builds. Because Jekyll is built
 with Ruby and requires RubyGems to install, we use the Ruby language build
-environment. Below is a sample `.travis.yml` file, and what follows that is
+environment. Below is a sample `.travis.yml` file, followed by
 an explanation of each line.
 
 {% highlight yaml %}
diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md
index ddf571d4d..682bce20a 100644
--- a/site/_docs/deployment-methods.md
+++ b/site/_docs/deployment-methods.md
@@ -107,9 +107,9 @@ If you want to maintain Jekyll inside your existing Rails app, [Jekyll-Admin](ht
 
 ## Amazon S3
 
-If you want to host your site in Amazon S3, you can do so with
-[s3_website](https://github.com/laurilehmijoki/s3_website) application. It will
-push your site to Amazon S3 where it can be served like any web server,
+If you want to host your site in Amazon S3, you can do so by
+using [s3_website](https://github.com/laurilehmijoki/s3_website) application.
+It will push your site to Amazon S3 where it can be served like any web server,
 dynamically scaling to almost unlimited traffic. This approach has the
 benefit of being about the cheapest hosting option available for
 low-volume blogs as you only pay for what you use.

From 9815a7b0ee50046cb633aadd3934c4c3e603e6d5 Mon Sep 17 00:00:00 2001
From: chrisfinazzo <chris.finazzo@gmail.com>
Date: Sat, 31 Jan 2015 23:09:18 -0500
Subject: [PATCH 258/407] Add missing word, rewrap lines to fit

---
 site/_docs/deployment-methods.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md
index 682bce20a..04dda9f20 100644
--- a/site/_docs/deployment-methods.md
+++ b/site/_docs/deployment-methods.md
@@ -108,8 +108,9 @@ If you want to maintain Jekyll inside your existing Rails app, [Jekyll-Admin](ht
 ## Amazon S3
 
 If you want to host your site in Amazon S3, you can do so by
-using [s3_website](https://github.com/laurilehmijoki/s3_website) application.
-It will push your site to Amazon S3 where it can be served like any web server,
+using the [s3_website](https://github.com/laurilehmijoki/s3_website)
+application. It will push your site to Amazon S3 where it can be served like
+any web server,
 dynamically scaling to almost unlimited traffic. This approach has the
 benefit of being about the cheapest hosting option available for
 low-volume blogs as you only pay for what you use.

From 8f9d3c9647f4eb5648fa722c21123c101e4d2e49 Mon Sep 17 00:00:00 2001
From: chrisfinazzo <chris.finazzo@gmail.com>
Date: Sat, 31 Jan 2015 23:23:42 -0500
Subject: [PATCH 259/407] Dumb tab-completion is dumb

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

diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index 50af0f8ca..ac05a9892 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -449,7 +449,7 @@ The `projects/foo_project.md` would have the `layout` set to `foobar` instead of
 ## Default Configuration
 
 Jekyll runs with the following configuration options by default. Alternative
-settings for these options can be explicitly specified in the Configuration
+settings for these options can be explicitly specified in the configuration
 file or on the command-line.
 
 <div class="note warning">

From 9ba9c47cd6583c7d0763377d95300e4ace0605d1 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Sun, 1 Feb 2015 06:45:52 -0600
Subject: [PATCH 260/407] Fixes #3339 Add `pkill -f jekyll` to ways to kill.

This shows people how to kill Jekyll without knowing the PID using `pkill` (you could also do `kill -9 $(pgrep -f jekyll)` but that is just the long way around doing `pkill -f` so it shouldn't be shown in the Jekyll logger but can be documented here for people.
---
 lib/jekyll/commands/serve.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 2909f323d..6467c5aba 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -50,7 +50,7 @@ module Jekyll
           if options['detach'] # detach the server
             pid = Process.fork { s.start }
             Process.detach(pid)
-            Jekyll.logger.info "Server detached with pid '#{pid}'.", "Run `kill -9 #{pid}' to stop the server."
+            Jekyll.logger.info "Server detached with pid '#{pid}'.", "Run `pkill -f jekyll' or `kill -9 #{pid}' to stop the server."
           else # create a new server thread, then join it with current terminal
             t = Thread.new { s.start }
             trap("INT") { s.shutdown }

From 9e717a61e75557f7c96a4af90d18debf802bdca8 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Sun, 1 Feb 2015 10:36:51 -0600
Subject: [PATCH 261/407] Use Gem::Version to get version string. Fixes #3394

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index b0d82ac51..eac42ee33 100644
--- a/Rakefile
+++ b/Rakefile
@@ -26,7 +26,7 @@ def gemspec_file
 end
 
 def gem_file
-  "#{name}-#{version}.gem"
+  "#{name}-#{Gem::Version.new(version).to_s}.gem"
 end
 
 def normalize_bullets(markdown)

From 8e1b9fcdf59f4ea357fe114d723eb5a08012c9fe Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Sun, 1 Feb 2015 16:48:01 -0600
Subject: [PATCH 262/407] Update history to reflect merge of #3397 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8a6512f6e..5060462a3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,7 +11,6 @@
   * Move to Rouge as default highlighter (#3323)
 
 ### Minor Enhancements
-
   * Sort static files just once, and call `site_payload` once for all collections (#3204)
   * Separate `jekyll docs` and optimize external gem handling (#3241)
   * Improve `Site#getConverterImpl` and call it `Site#find_converter_instance` (#3240)
@@ -33,6 +32,7 @@
   * Show the regeneration time after the initial generation (#3378)
   * Site template: Switch default font to Helvetica Neue (#3376)
   * Make the `include` tag a teensy bit faster. (#3391)
+  * Add `pkill -f jekyll` to ways to kill. (#3397)
 
 ### Bug Fixes
 

From e71c23981d38844a2530137c599d23a79fb0ca9e Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 1 Feb 2015 17:44:24 -0800
Subject: [PATCH 263/407] Update history to reflect merge of #3396 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5060462a3..7ce4db80d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -86,6 +86,7 @@
   * 3.0.0.beta1 release post (#3346)
   * Add `twa` to the list of third-party plugins (#3384)
   * Remove extra spaces (#3388)
+  * Fix small grammar errors on a couple pages (#3396)
 
 ## 2.5.3 / 2014-12-22
 

From d24ea6693399b2d9b446dedb7cf1a452a0ea3c58 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 1 Feb 2015 22:37:10 -0800
Subject: [PATCH 264/407] The highlight tip should only clip the newlines
 before and after the *entire* block, not in between.

Ref: https://github.com/jneen/rouge/issues/230
---
 lib/jekyll/tags/highlight.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index adf6bcd75..5af5f2bd2 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -42,7 +42,7 @@ eos
       def render(context)
         prefix = context["highlighter_prefix"] || ""
         suffix = context["highlighter_suffix"] || ""
-        code = super.to_s.gsub(/^(\n|\r)+|(\n|\r)+$/, '')
+        code = super.to_s.gsub(/\A(\n|\r)+|(\n|\r)+\z/, '')
 
         is_safe = !!context.registers[:site].safe
 

From 32c48bb78d11087b04db3ce8404f094a2d06162b Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 1 Feb 2015 23:03:10 -0800
Subject: [PATCH 265/407] Highlight tag: add test for not removing interstitial
 newlines.

---
 test/test_tags.rb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/test/test_tags.rb b/test/test_tags.rb
index 7b6b60f4d..9fbd9e39a 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -190,6 +190,26 @@ EOS
     end
   end
 
+  context "post content has highlight tag with preceding spaces & lines in several places" do
+    setup do
+      fill_post <<-EOS
+
+
+     [,1] [,2]
+
+
+[1,] FALSE TRUE
+[2,] FALSE TRUE
+
+
+EOS
+    end
+
+    should "only strip the newlines which precede and succeed the entire block" do
+      assert_match "<pre><code class=\"language-text\" data-lang=\"text\">     [,1] [,2]\n\n\n[1,] FALSE TRUE\n[2,] FALSE TRUE</code></pre>", @result
+    end
+  end
+
   context "post content has highlight tag with preceding spaces & Windows-style newlines" do
     setup do
       fill_post "\r\n\r\n\r\n     [,1] [,2]"

From 2745be736ed5bed9c52db037f2b868f2726649a7 Mon Sep 17 00:00:00 2001
From: Seth Warburton <seth@internet-inspired.com>
Date: Mon, 26 Jan 2015 09:43:19 +0000
Subject: [PATCH 266/407] A lighter font declaration

Removes unnecessary Sass

Thanks @kleinfreund :)
---
 lib/site_template/_sass/_base.scss | 7 ++-----
 lib/site_template/css/main.scss    | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/site_template/_sass/_base.scss b/lib/site_template/_sass/_base.scss
index e5fd0fd8c..5433144c5 100644
--- a/lib/site_template/_sass/_base.scss
+++ b/lib/site_template/_sass/_base.scss
@@ -14,10 +14,7 @@ dl, dd, ol, ul, figure {
  * Basic styling
  */
 body {
-    font-family: $base-font-family;
-    font-size: $base-font-size;
-    line-height: $base-line-height;
-    font-weight: 300;
+    font: $base-font-weight #{$base-font-size}/#{$base-line-height} $base-font-family;
     color: $text-color;
     background-color: $background-color;
     -webkit-text-size-adjust: 100%;
@@ -80,7 +77,7 @@ li {
  * Headings
  */
 h1, h2, h3, h4, h5, h6 {
-    font-weight: 300;
+    font-weight: $base-font-weight;
 }
 
 
diff --git a/lib/site_template/css/main.scss b/lib/site_template/css/main.scss
index 52b6a691c..31dcfe0f4 100755
--- a/lib/site_template/css/main.scss
+++ b/lib/site_template/css/main.scss
@@ -8,6 +8,7 @@
 // Our variables
 $base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 $base-font-size:   16px;
+$base-font-weight: 300;
 $small-font-size:  $base-font-size * 0.875;
 $base-line-height: 1.5;
 

From 128427cc872e38a75a67d3ceb4b3d326533e855a Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 2 Feb 2015 09:58:42 -0800
Subject: [PATCH 267/407] Update history to reflect merge of #3360 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7ce4db80d..c115b832d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
   * Move to Rouge as default highlighter (#3323)
 
 ### Minor Enhancements
+
   * Sort static files just once, and call `site_payload` once for all collections (#3204)
   * Separate `jekyll docs` and optimize external gem handling (#3241)
   * Improve `Site#getConverterImpl` and call it `Site#find_converter_instance` (#3240)
@@ -33,6 +34,7 @@
   * Site template: Switch default font to Helvetica Neue (#3376)
   * Make the `include` tag a teensy bit faster. (#3391)
   * Add `pkill -f jekyll` to ways to kill. (#3397)
+  * Site template: collapsed, variable-driven font declaration (#3360)
 
 ### Bug Fixes
 

From 5e541b5eb09db72bc20db7f4fda38b4060a4dd38 Mon Sep 17 00:00:00 2001
From: eksperimental <eksperimental@users.noreply.github.com>
Date: Thu, 5 Feb 2015 16:48:59 +0700
Subject: [PATCH 268/407] fix quote

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

diff --git a/lib/jekyll/deprecator.rb b/lib/jekyll/deprecator.rb
index 9ec5857e1..dfd3183c0 100644
--- a/lib/jekyll/deprecator.rb
+++ b/lib/jekyll/deprecator.rb
@@ -21,7 +21,7 @@ module Jekyll
     def no_subcommand(args)
       if args.size > 0 && args.first =~ /^--/ && !%w[--help --version].include?(args.first)
         deprecation_message "Jekyll now uses subcommands instead of just \
-                            switches. Run `jekyll --help' to find out more."
+                            switches. Run `jekyll --help` to find out more."
       end
     end
 

From 120d3e07ca2757ddffe85d3353810ee794481211 Mon Sep 17 00:00:00 2001
From: Mark Tareshawty <tarebyte@gmail.com>
Date: Fri, 6 Feb 2015 13:27:23 -0500
Subject: [PATCH 269/407] added flags from docs

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

diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index 12fd66e66..45eb1d9c8 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -49,6 +49,8 @@ module Jekyll
       # Returns nothing
       def add_build_options(c)
         c.option 'config',  '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+        c.option 'destination', '--destination <destination>', 'The current folder will be generated into <destination>'
+        c.option 'source', '--source <source> --destination <destination>', 'The <source> folder will be generated into <destination>'
         c.option 'future',  '--future', 'Publishes posts with a future date'
         c.option 'limit_posts', '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
         c.option 'watch',   '-w', '--[no-]watch', 'Watch for changes and rebuild'

From 6521b84aac7415c33eed84ec66472ccfc83b7417 Mon Sep 17 00:00:00 2001
From: ChaYoung You <yousbe@gmail.com>
Date: Sat, 7 Feb 2015 06:21:21 +0900
Subject: [PATCH 270/407] Change `overflow-x` value to `auto`

`overflow-x: scroll;` makes scrollbar visible always whether the content
does overflow or not.
---
 lib/site_template/_sass/_base.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/site_template/_sass/_base.scss b/lib/site_template/_sass/_base.scss
index 5433144c5..a7cbadfe0 100644
--- a/lib/site_template/_sass/_base.scss
+++ b/lib/site_template/_sass/_base.scss
@@ -136,7 +136,7 @@ code {
 
 pre {
     padding: 8px 12px;
-    overflow-x: scroll;
+    overflow-x: auto;
 
     > code {
         border: 0;

From 4f078ee2e81eef88ab445ad92055b6a5df8e303c Mon Sep 17 00:00:00 2001
From: Nic West <nic@letolab.com>
Date: Sat, 7 Feb 2015 10:31:41 +0000
Subject: [PATCH 271/407] fix missing char in template docs

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

diff --git a/site/_docs/templates.md b/site/_docs/templates.md
index 9cb3eeded..023d26d3b 100644
--- a/site/_docs/templates.md
+++ b/site/_docs/templates.md
@@ -253,7 +253,7 @@ common tasks easier.
 ### Options for the `slugify` filter
 
 The `slugify` filter accepts an option, each specifying what to filter.
-The default is `default`. The are as follows (with what they filter):
+The default is `default`. They are as follows (with what they filter):
 
 - `none`: no characters
 - `raw`: spaces

From 7abc8c8025c6fef2a0dc23b1ddfb60f23e55a782 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Sat, 7 Feb 2015 09:05:53 -0800
Subject: [PATCH 272/407] Update history to reflect merge of #3420 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c115b832d..0b465fb2a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -89,6 +89,7 @@
   * Add `twa` to the list of third-party plugins (#3384)
   * Remove extra spaces (#3388)
   * Fix small grammar errors on a couple pages (#3396)
+  * Fix typo on Templates docs page (#3420)
 
 ## 2.5.3 / 2014-12-22
 

From 85a89d3e2259bb5c6e5a2c5c080ef4be83b002fb Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Sat, 7 Feb 2015 09:14:57 -0800
Subject: [PATCH 273/407] Update history to reflect merge of #3419 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0b465fb2a..8b8a7b5f4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -35,6 +35,7 @@
   * Make the `include` tag a teensy bit faster. (#3391)
   * Add `pkill -f jekyll` to ways to kill. (#3397)
   * Site template: collapsed, variable-driven font declaration (#3360)
+  * Site template: Don't always show the scrollbar in code blocks (#3419)
 
 ### Bug Fixes
 

From fbb766becc4d4c2fe1a343085074850d44b7445e Mon Sep 17 00:00:00 2001
From: Toddy69 <toddy69@gmx.de>
Date: Sun, 8 Feb 2015 05:55:03 +0100
Subject: [PATCH 274/407] Correction of documentation

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

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index aa3d3d4a4..84f4196ed 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -51,7 +51,7 @@ You have 3 options for installing plugins:
   </p>
 </div>
 
-In general, plugins you make will fall into one of three categories:
+In general, plugins you make will fall into one of four categories:
 
 1. [Generators](#Generators)
 2. [Converters](#Converters)

From 6d4a1ec4e6ed1a9b901588412f40c3c073588b09 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 7 Feb 2015 21:57:22 -0800
Subject: [PATCH 275/407] Update history to reflect merge of #3424 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8b8a7b5f4..b4f7f0782 100644
--- a/History.markdown
+++ b/History.markdown
@@ -91,6 +91,7 @@
   * Remove extra spaces (#3388)
   * Fix small grammar errors on a couple pages (#3396)
   * Fix typo on Templates docs page (#3420)
+  * s/three/four for plugin type list (#3424)
 
 ## 2.5.3 / 2014-12-22
 

From aec5ceb1844a941914364a4f4a4977d2c54ec797 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 7 Feb 2015 22:09:43 -0800
Subject: [PATCH 276/407] Release jekyllrb.com as a locally-compiled site.

---
 Rakefile | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/Rakefile b/Rakefile
index eac42ee33..98610a3c7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -203,26 +203,21 @@ namespace :site do
     end
 
     # Copy site to gh-pages dir.
-    puts "Copying site to gh-pages branch..."
-    copy_exclude = %w[
-      site/.
-      site/..
-      site/.jekyll-metadata
-      site/.sass-cache
-      site/_site
-    ]
-    FileList["site/{*,.*}"].exclude(*copy_exclude).each do |path|
-      sh "cp -R #{path} gh-pages/"
-    end
+    puts "Building site into gh-pages branch..."
+    ENV['JEKYLL_ENV'] = 'production'
+    require "jekyll"
+    Jekyll::Commands::Build.process({
+      "source"       => File.expand_path("site"),
+      "destination"  => File.expand_path("gh-pages"),
+      "sass"         => { "style" => "compressed" },
+      "full_rebuild" => true
+    })
 
-    # Change any configuration settings for production.
-    config = YAML.load_file("gh-pages/_config.yml")
-    config.merge!({'sass' => {'style' => 'compressed'}})
-    File.write('gh-pages/_config.yml', YAML.dump(config))
+    File.open('gh-pages/.nojekyll', 'wb') { |f| f.puts(":dog: food.") }
 
     # Commit and push.
     puts "Committing and pushing to GitHub Pages..."
-    sha = `git log`.match(/[a-z0-9]{40}/)[0]
+    sha = `git rev-parse HEAD`.strip
     Dir.chdir('gh-pages') do
       sh "git add ."
       sh "git commit --allow-empty -m 'Updating to #{sha}.'"

From fdc0e33ebc9e4861840e66374956c47c8f5fcd95 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 7 Feb 2015 23:02:41 -0800
Subject: [PATCH 277/407] Proof the site with CircleCI.

---
 Gemfile      |  4 ++++
 circle.yml   |  9 +++++++++
 script/proof | 34 +++++++++++++++++++---------------
 3 files changed, 32 insertions(+), 15 deletions(-)
 create mode 100644 circle.yml

diff --git a/Gemfile b/Gemfile
index c7edecf70..b92f100e0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,3 +32,7 @@ if ENV['BENCHMARK']
   gem 'rbtrace'
   gem 'stackprof'
 end
+
+if ENV['PROOF']
+  gem 'html-proofer', '~> 2.0'
+end
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 000000000..ff2a40b47
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,9 @@
+machine:
+  timezone: UTC
+  ruby:
+    version: 2.1.5
+  environment:
+    PROOF: true
+test:
+  override:
+    - script/proof -f
diff --git a/script/proof b/script/proof
index e5bc24b2b..11af6e55a 100755
--- a/script/proof
+++ b/script/proof
@@ -5,20 +5,24 @@
 
 set -e
 
-if [[ "$1" != "-f" ]]; then
-  git diff --name-only ..master | grep '^site/' || {
-    echo "No site files changed. We'll skip proofing. Run with -f to force."
-    exit 0
-  }
-fi
-
-echo "Some site files have been changed! Proofing..."
-
-command -v htmlproof || {
-    echo "Installing HTML::Proofer!"
-    gem install html-proofer -- --use-system-libraries
+function msg {
+	printf "\e[0;37m==> $1\e[0m\n"
 }
 
-bundle exec jekyll build -s site -d _site --trace
-printf "\e[0;36mProofing begins now!\e[0m\n"
-htmlproof ./_site
+SOURCE="site"
+DESTINATION="_site"
+
+export PROOF=true
+export NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+
+# 1.
+msg "Installing..."
+bundle install -j8 > /dev/null || bundle install > /dev/null
+
+# 2.
+msg "Building..."
+bundle exec jekyll build -s $SOURCE -d $DESTINATION --full-rebuild --trace
+
+# 3.
+msg "Proofing..."
+bundle exec htmlproof ./$DESTINATION --href-ignore /Chrononaut/,/twitter.com/

From 1fa428c6e4ea915035f4630908a19b8a25ea575f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 7 Feb 2015 23:31:15 -0800
Subject: [PATCH 278/407] Fix posts per htmlproofer.

---
 site/_docs/configuration.md                        |  2 +-
 site/_docs/deployment-methods.md                   |  2 +-
 site/_docs/plugins.md                              | 14 +++++++-------
 site/_docs/posts.md                                |  2 +-
 site/_docs/troubleshooting.md                      |  2 +-
 site/_posts/2014-05-06-jekyll-turns-2-0-0.markdown |  2 +-
 .../2014-07-29-jekyll-2-2-0-released.markdown      |  2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index ac05a9892..827d99bd0 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -410,7 +410,7 @@ defaults:
       layout: "default"
 {% endhighlight %}
 
-In this example the `layout` is set to `default` inside the [collection](../collections) with the name `my_collection`.
+In this example the `layout` is set to `default` inside the [collection](../collections/) with the name `my_collection`.
 
 ### Precedence
 
diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md
index 04dda9f20..d9dd7ea25 100644
--- a/site/_docs/deployment-methods.md
+++ b/site/_docs/deployment-methods.md
@@ -91,7 +91,7 @@ Another way to deploy your Jekyll site is to use [Rake](https://github.com/jimwe
 
 ### rsync
 
-Once you’ve generated the `_site` directory, you can easily rsync it using a `tasks/deploy` shell script similar to [this deploy script here](https://github.com/henrik/henrik.nyh.se/blob/master/tasks/deploy). You’d obviously need to change the values to reflect your site’s details. There is even [a matching TextMate command](http://gist.github.com/214959) that will help you run
+Once you’ve generated the `_site` directory, you can easily rsync it using a `tasks/deploy` shell script similar to [this deploy script here](https://github.com/henrik/henrik.nyh.se/blob/master/script/deploy). You’d obviously need to change the values to reflect your site’s details. There is even [a matching TextMate command](http://gist.github.com/214959) that will help you run
 this script from within Textmate.
 
 
diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 84f4196ed..b2f34d5e8 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -53,10 +53,10 @@ You have 3 options for installing plugins:
 
 In general, plugins you make will fall into one of four categories:
 
-1. [Generators](#Generators)
-2. [Converters](#Converters)
-3. [Commands](#Commands)
-4. [Tags](#Tags)
+1. [Generators](#generators)
+2. [Converters](#converters)
+3. [Commands](#commands)
+4. [Tags](#tags)
 
 ## Generators
 
@@ -273,7 +273,7 @@ class MyNewCommand < Jekyll::Command
         c.syntax "new [options]"
         c.description 'Create a new Jekyll site.'
 
-        c.option 'dest', '-d DEST, 'Where the site should go.'
+        c.option 'dest', '-d DEST', 'Where the site should go.'
 
         c.action do |args, options|
           Jekyll::Site.new_site_at(options['dest'])
@@ -560,7 +560,7 @@ You can find a few useful plugins at the following locations:
 - [Jekyll-citation](https://github.com/archome/jekyll-citation): Render BibTeX-formatted bibliographies/citations included in posts and pages (pure Ruby).
 - [Jekyll Dribbble Set Tag](https://github.com/ericdfields/Jekyll-Dribbble-Set-Tag): Builds Dribbble image galleries from any user.
 - [Debbugs](https://gist.github.com/2218470): Allows posting links to Debian BTS easily.
-- [Refheap_tag](https://github.com/aburdette/refheap_tag): Liquid tag that allows embedding pastes from [refheap](https://refheap.com).
+- [Refheap_tag](https://github.com/aburdette/refheap_tag): Liquid tag that allows embedding pastes from [refheap](https://www.refheap.com/).
 - [Jekyll-devonly_tag](https://gist.github.com/2403522): A block tag for including markup only during development.
 - [JekyllGalleryTag](https://github.com/redwallhp/JekyllGalleryTag) by [redwallhp](https://github.com/redwallhp): Generates thumbnails from a directory of images and displays them in a grid.
 - [Youku and Tudou Embed](https://gist.github.com/Yexiaoxing/5891929): Liquid plugin for embedding Youku and Tudou videos.
@@ -585,7 +585,7 @@ You can find a few useful plugins at the following locations:
 - [inline\_highlight](https://github.com/bdesham/inline_highlight): A tag for inline syntax highlighting.
 - [jekyll-mermaid](https://github.com/jasonbellamy/jekyll-mermaid): Simplify the creation of mermaid diagrams and flowcharts in your posts and pages.
 - [twa](https://github.com/Ezmyrelda/twa): Twemoji Awesome plugin for Jekyll. Liquid tag allowing you to use twitter emoji in your jekyll pages.
-- 
+-
 #### Collections
 
 - [Jekyll Plugins by Recursive Design](http://recursive-design.com/projects/jekyll-plugins/): Plugins to generate Project pages from GitHub readmes, a Category page, and a Sitemap generator.
diff --git a/site/_docs/posts.md b/site/_docs/posts.md
index 36b9fe1b8..0b0e8773e 100644
--- a/site/_docs/posts.md
+++ b/site/_docs/posts.md
@@ -43,7 +43,7 @@ file. For example, the following are examples of valid post filenames:
 <div class="note">
   <h5>ProTip™: Link to other posts</h5>
   <p>
-    Use the <a href="../templates#post-url"><code>post_url</code></a>
+    Use the <a href="../templates/#post-url"><code>post_url</code></a>
     tag to link to other posts without having to worry about the URL's
     breaking when the site permalink style changes.
   </p>
diff --git a/site/_docs/troubleshooting.md b/site/_docs/troubleshooting.md
index e4c8120a0..272084917 100644
--- a/site/_docs/troubleshooting.md
+++ b/site/_docs/troubleshooting.md
@@ -31,7 +31,7 @@ On Red Hat, CentOS, and Fedora systems you can do this by running:
 sudo yum install ruby-devel
 {% endhighlight %}
 
-On [NearlyFreeSpeech](http://nearlyfreespeech.net/) you need to run the
+On [NearlyFreeSpeech](https://www.nearlyfreespeech.net/) you need to run the
 following commands before installing Jekyll:
 
 {% highlight bash %}
diff --git a/site/_posts/2014-05-06-jekyll-turns-2-0-0.markdown b/site/_posts/2014-05-06-jekyll-turns-2-0-0.markdown
index 62c1208cd..82555514b 100644
--- a/site/_posts/2014-05-06-jekyll-turns-2-0-0.markdown
+++ b/site/_posts/2014-05-06-jekyll-turns-2-0-0.markdown
@@ -28,4 +28,4 @@ Happy developing!
 
 [changelog]: /docs/history/
 [@jglovier]: https://github.com/jglovier
-[jekyll-1]: /news/2013/05/06/jekyll-1-0-0-released/
+[jekyll-1]: {% post_url 2013-05-06-jekyll-1-0-0-released %}
diff --git a/site/_posts/2014-07-29-jekyll-2-2-0-released.markdown b/site/_posts/2014-07-29-jekyll-2-2-0-released.markdown
index 9410df62e..ca7aee488 100644
--- a/site/_posts/2014-07-29-jekyll-2-2-0-released.markdown
+++ b/site/_posts/2014-07-29-jekyll-2-2-0-released.markdown
@@ -16,4 +16,4 @@ Jekyll 2.2.0 contains a few key updates:
    will now work properly).
 
 As always, a full list of the updates are on the
-[history page](/docs/history#v2-2-0). Happy Jekylling!
+[history page](/docs/history/#v2-2-0). Happy Jekylling!

From 943070aac6a2cabe4059c7702590eb1cb35918b6 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 7 Feb 2015 23:33:24 -0800
Subject: [PATCH 279/407] Gain some time data from htmlproof. [ci skip]

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

diff --git a/script/proof b/script/proof
index 11af6e55a..0d087c999 100755
--- a/script/proof
+++ b/script/proof
@@ -25,4 +25,4 @@ bundle exec jekyll build -s $SOURCE -d $DESTINATION --full-rebuild --trace
 
 # 3.
 msg "Proofing..."
-bundle exec htmlproof ./$DESTINATION --href-ignore /Chrononaut/,/twitter.com/
+time bundle exec htmlproof ./$DESTINATION --href-ignore /Chrononaut/,/twitter.com/

From 6a74c09185bff199ac5deb860ddd2ed534ceca63 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 7 Feb 2015 23:39:48 -0800
Subject: [PATCH 280/407] Further fixes for htmlproofer.

---
 script/proof          | 7 ++++++-
 site/_docs/plugins.md | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/script/proof b/script/proof
index 0d087c999..47126fc1f 100755
--- a/script/proof
+++ b/script/proof
@@ -9,6 +9,11 @@ function msg {
 	printf "\e[0;37m==> $1\e[0m\n"
 }
 
+INGORE_HREFS=$(ruby -e 'puts %w{
+	Chrononaut
+	twitter.com
+	nearlyfreespeech.net
+}.map{|h| "/#{h}/"}.join(",")')
 SOURCE="site"
 DESTINATION="_site"
 
@@ -25,4 +30,4 @@ bundle exec jekyll build -s $SOURCE -d $DESTINATION --full-rebuild --trace
 
 # 3.
 msg "Proofing..."
-time bundle exec htmlproof ./$DESTINATION --href-ignore /Chrononaut/,/twitter.com/
+time bundle exec htmlproof ./$DESTINATION --href-ignore $INGORE_HREFS
diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index b2f34d5e8..7d13aac4e 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -579,9 +579,9 @@ You can find a few useful plugins at the following locations:
 - [Jekyll Github Sample Tag](https://github.com/bwillis/jekyll-github-sample): A liquid tag to include a sample of a github repo file in your Jekyll site.
 - [Jekyll Project Version Tag](https://github.com/rob-murray/jekyll-version-plugin): A Liquid tag plugin that renders a version identifier for your Jekyll site sourced from the git repository containing your code.
 - [Piwigo Gallery](https://github.com/AlessandroLorenzi/piwigo_gallery) by [Alessandro Lorenzi](http://www.alorenzi.eu/): Jekyll plugin to generate thumbnails from a Piwigo gallery and display them with a Liquid tag
-- [mathml.rb](https://github.com/tmthrgd/jekyll-plugins) by [Tom Thorogood](http://tomthorogood.co.uk/): A plugin to convert TeX mathematics into MathML for display.
+- [mathml.rb](https://github.com/tmthrgd/jekyll-plugins) by Tom Thorogood: A plugin to convert TeX mathematics into MathML for display.
 - [webmention_io.rb](https://github.com/aarongustafson/jekyll-webmention_io) by [Aaron Gustafson](http://aaron-gustafson.com/): A plugin to enable [webmention](http://indiewebcamp.com/webmention) integration using [Webmention.io](http://webmention.io). Includes an optional JavaScript for updating webmentions automatically between publishes and, if available, in realtime using WebSockets.
-- [Jekyll 500px Embed](https://github.com/lkorth/jekyll-500px-embed) by [Luke Korth](https://lukekorth.com/). A Liquid tag plugin that embeds [500px](https://500px.com/) photos.
+- [Jekyll 500px Embed](https://github.com/lkorth/jekyll-500px-embed) by Luke Korth. A Liquid tag plugin that embeds [500px](https://500px.com/) photos.
 - [inline\_highlight](https://github.com/bdesham/inline_highlight): A tag for inline syntax highlighting.
 - [jekyll-mermaid](https://github.com/jasonbellamy/jekyll-mermaid): Simplify the creation of mermaid diagrams and flowcharts in your posts and pages.
 - [twa](https://github.com/Ezmyrelda/twa): Twemoji Awesome plugin for Jekyll. Liquid tag allowing you to use twitter emoji in your jekyll pages.
@@ -594,7 +594,7 @@ You can find a few useful plugins at the following locations:
 
 #### Other
 
-- [ditaa-ditaa](https://github.com/tmthrgd/ditaa-ditaa) by [Tom Thorogood](http://tomthorogood.co.uk/): a drastic revision of jekyll-ditaa that renders diagrams drawn using ASCII art into PNG images.
+- [ditaa-ditaa](https://github.com/tmthrgd/ditaa-ditaa) by Tom Thorogood: a drastic revision of jekyll-ditaa that renders diagrams drawn using ASCII art into PNG images.
 - [Pygments Cache Path by Raimonds Simanovskis](https://github.com/rsim/blog.rayapps.com/blob/master/_plugins/pygments_cache_patch.rb): Plugin to cache syntax-highlighted code from Pygments.
 - [Draft/Publish Plugin by Michael Ivey](https://gist.github.com/49630): Save posts as drafts.
 - [Growl Notification Generator by Tate Johnson](https://gist.github.com/490101): Send Jekyll notifications to Growl.

From a87bf521c8b6653d5d2bf6bc978fdd8800cc4b27 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 7 Feb 2015 23:49:11 -0800
Subject: [PATCH 281/407] Update history to reflect merge of #3427 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b4f7f0782..2fb09c487 100644
--- a/History.markdown
+++ b/History.markdown
@@ -66,6 +66,7 @@
   * Fix comment typo in `lib/jekyll/frontmatter_defaults.rb` (#3322)
   * Move all `regenerate?` checking to `Regenerator` (#3326)
   * Factor out a `read_data_file` call to keep things clean (#3380)
+  * Proof the site with CircleCI. (#3427)
 
 ### Site Enhancements
 

From ea9b959c23dda84362455dbc5667c72ebb7c230f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 7 Feb 2015 22:58:53 -0800
Subject: [PATCH 282/407] Add a jekyllrb.com/help page which elucidates places
 from which to get help.

---
 site/_docs/troubleshooting.md         |  3 +--
 site/_includes/primary-nav-items.html |  2 +-
 site/_layouts/page.html               | 18 +++++++++++++++
 site/help/index.md                    | 32 +++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 site/_layouts/page.html
 create mode 100644 site/help/index.md

diff --git a/site/_docs/troubleshooting.md b/site/_docs/troubleshooting.md
index 272084917..eb65fd40a 100644
--- a/site/_docs/troubleshooting.md
+++ b/site/_docs/troubleshooting.md
@@ -6,8 +6,7 @@ permalink: /docs/troubleshooting/
 
 If you ever run into problems installing or using Jekyll, here are a few tips
 that might be of help. If the problem you’re experiencing isn’t covered below,
-please [report an issue]({{site.help_url}}/issues/new) so the
-Jekyll community can make everyone’s experience better.
+**please [check out our other help resources](/help/)** as well.
 
 - [Installation Problems](#installation-problems)
 - [Problems running Jekyll](#problems-running-jekyll)
diff --git a/site/_includes/primary-nav-items.html b/site/_includes/primary-nav-items.html
index f5628b7df..df5b939f9 100644
--- a/site/_includes/primary-nav-items.html
+++ b/site/_includes/primary-nav-items.html
@@ -9,7 +9,7 @@
     <a href="/news/">News</a>
   </li>
   <li>
-    <a href="{{ site.help_url }}">Help</a>
+    <a href="/help/">Help</a>
   </li>
   <li>
     <a href="{{ site.repository }}"><span class="hide-on-mobiles">View on </span>GitHub</a>
diff --git a/site/_layouts/page.html b/site/_layouts/page.html
new file mode 100644
index 000000000..bae31bb36
--- /dev/null
+++ b/site/_layouts/page.html
@@ -0,0 +1,18 @@
+---
+layout: default
+---
+
+<section class="standalone">
+  <div class="grid">
+
+    <div class="unit whole">
+      <article>
+        <h1>{{ page.title }}</h1>
+        {{ content }}
+      </article>
+    </div>
+
+    <div class="clear"></div>
+
+  </div>
+</section>
diff --git a/site/help/index.md b/site/help/index.md
new file mode 100644
index 000000000..0740f39fd
--- /dev/null
+++ b/site/help/index.md
@@ -0,0 +1,32 @@
+---
+layout: page
+title: Getting Help
+---
+
+Need help with Jekyll? Try these resources.
+
+### [Google](https://google.com)
+
+Add **jekyll** to almost any query, and you'll find just what you need.
+
+### [jekyll/jekyll-help]({{site.help_url}}#how-do-i-ask-a-question)
+
+Search through the issues that the fine folks on the **@jekyll/help** have answered, or
+ask your own.
+
+### [Jekyll on StackOverflow](http://stackoverflow.com/questions/tagged/jekyll)
+
+StackOverflow is a staple of any developer's diet. Check out the Jekyll tag on StackOverflow
+for an answer to your question. Not there? Ask a new question!
+
+### [Jekyll IRC Channel](irc:irc.freenode.net/jekyll)
+
+Get live support at **#jekyll** on **irc.freenode.net**, the official Jekyll IRC channel.
+
+### [jekyll/jekyll](https://github.com/jekyll/jekyll/issues)
+
+Search through the issues on the main Jekyll development. Think you've found a bug? File a new issue.
+
+### [@jekyllrb on Twitter](https://twitter.com)
+
+The official Jekyll Twitter account. It's not checked often, so try the above first.

From 2b95fb924e6aff4eb8358885fcf3be012f8acf61 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 7 Feb 2015 23:52:00 -0800
Subject: [PATCH 283/407] Don't duplicate work.

---
 circle.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/circle.yml b/circle.yml
index ff2a40b47..02259027f 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,3 +7,8 @@ machine:
 test:
   override:
     - script/proof -f
+general:
+  branches:
+    ignore:
+      - gh-pages # no proof script here
+      - master   # don't need to duplicate work

From bee4d9311453c2850f73111aba9e8290a92cfbc3 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 7 Feb 2015 23:53:11 -0800
Subject: [PATCH 284/407] Update history to reflect merge of #3426 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2fb09c487..75a07e55d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -93,6 +93,7 @@
   * Fix small grammar errors on a couple pages (#3396)
   * Fix typo on Templates docs page (#3420)
   * s/three/four for plugin type list (#3424)
+  * Release jekyllrb.com as a locally-compiled site. (#3426)
 
 ## 2.5.3 / 2014-12-22
 

From 90370c0d0b94fbf472213385ff4f409814257d61 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 7 Feb 2015 23:54:24 -0800
Subject: [PATCH 285/407] Update history to reflect merge of #3428 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 75a07e55d..c2b9f807b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -94,6 +94,7 @@
   * Fix typo on Templates docs page (#3420)
   * s/three/four for plugin type list (#3424)
   * Release jekyllrb.com as a locally-compiled site. (#3426)
+  * Add a jekyllrb.com/help page which elucidates places from which to get help (#3428)
 
 ## 2.5.3 / 2014-12-22
 

From dbc853006893f59311b1886c5f20ef70e31b4f22 Mon Sep 17 00:00:00 2001
From: eksperimental <eksperimental@users.noreply.github.com>
Date: Fri, 6 Feb 2015 11:45:20 +0700
Subject: [PATCH 286/407] Show only two decimals in time to generate pages

no need to display 10 decimals.
it feels up my screen with useless numbers! ;-p
---
 lib/jekyll/commands/build.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb
index bf1975c42..e97d70468 100644
--- a/lib/jekyll/commands/build.rb
+++ b/lib/jekyll/commands/build.rb
@@ -57,7 +57,7 @@ module Jekyll
           Jekyll.logger.info "Incremental build:", (full_build ? "disabled" : "enabled")
           Jekyll.logger.info "Generating..."
           process_site(site)
-          Jekyll.logger.info "", "done in #{Time.now - t} seconds."
+          Jekyll.logger.info "", "done in #{(Time.now - t).round 2} seconds."
         end
 
         # Private: Watch for file changes and rebuild the site.

From d795113e94003cab3144ea431068da0f57b4b3af Mon Sep 17 00:00:00 2001
From: eksperimental <eksperimental@users.noreply.github.com>
Date: Fri, 6 Feb 2015 13:59:41 +0700
Subject: [PATCH 287/407] Update build.rb

parenthesis added to round
---
 lib/jekyll/commands/build.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb
index e97d70468..19edaf594 100644
--- a/lib/jekyll/commands/build.rb
+++ b/lib/jekyll/commands/build.rb
@@ -57,7 +57,7 @@ module Jekyll
           Jekyll.logger.info "Incremental build:", (full_build ? "disabled" : "enabled")
           Jekyll.logger.info "Generating..."
           process_site(site)
-          Jekyll.logger.info "", "done in #{(Time.now - t).round 2} seconds."
+          Jekyll.logger.info "", "done in #{(Time.now - t).round(2)} seconds."
         end
 
         # Private: Watch for file changes and rebuild the site.

From 571800c8adcc7a5beda8eb0db1721808b323d017 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 7 Feb 2015 23:55:59 -0800
Subject: [PATCH 288/407] Use 3 places to the right of the decimal place
 instead of 2.

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

diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb
index 19edaf594..cc1e121f0 100644
--- a/lib/jekyll/commands/build.rb
+++ b/lib/jekyll/commands/build.rb
@@ -57,7 +57,7 @@ module Jekyll
           Jekyll.logger.info "Incremental build:", (full_build ? "disabled" : "enabled")
           Jekyll.logger.info "Generating..."
           process_site(site)
-          Jekyll.logger.info "", "done in #{(Time.now - t).round(2)} seconds."
+          Jekyll.logger.info "", "done in #{(Time.now - t).round(3)} seconds."
         end
 
         # Private: Watch for file changes and rebuild the site.

From 4d20462da5b164637c6fce5e1de20abff843b328 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 7 Feb 2015 23:57:03 -0800
Subject: [PATCH 289/407] Update history to reflect merge of #3415 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c2b9f807b..cc1b83535 100644
--- a/History.markdown
+++ b/History.markdown
@@ -52,6 +52,7 @@
   * Template: Fix nav items alignment when in "burger" mode (#3329)
   * Template: Remove `!important` from nav SCSS introduced in #3329 (#3375)
   * The `:title` URL placeholder for collections should be the filename slug. (#3383)
+  * Trim the generate time diff to just 3 places past the decimal place (#3415)
 
 ### Development Fixes
 

From 56102ce50c7722e0710484195ed08b630d11e6f4 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 8 Feb 2015 02:02:44 -0800
Subject: [PATCH 290/407] Add the omitted 'team'. [ci skip]

:top_hat:/t @kleinfreund
https://github.com/jekyll/jekyll/commit/ea9b959c23dda84362455dbc5667c72ebb7c230f#commitcomment-9639789
---
 site/help/index.md | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/site/help/index.md b/site/help/index.md
index 0740f39fd..ceceb8ef9 100644
--- a/site/help/index.md
+++ b/site/help/index.md
@@ -11,22 +11,26 @@ Add **jekyll** to almost any query, and you'll find just what you need.
 
 ### [jekyll/jekyll-help]({{site.help_url}}#how-do-i-ask-a-question)
 
-Search through the issues that the fine folks on the **@jekyll/help** have answered, or
-ask your own.
+Search through the issues that the fine folks on the **@jekyll/help** team
+have answered, or ask your own.
 
 ### [Jekyll on StackOverflow](http://stackoverflow.com/questions/tagged/jekyll)
 
-StackOverflow is a staple of any developer's diet. Check out the Jekyll tag on StackOverflow
-for an answer to your question. Not there? Ask a new question!
+StackOverflow is a staple of any developer's diet. Check out the Jekyll tag
+on StackOverflow for an answer to your question. Not there? Ask a new
+question!
 
 ### [Jekyll IRC Channel](irc:irc.freenode.net/jekyll)
 
-Get live support at **#jekyll** on **irc.freenode.net**, the official Jekyll IRC channel.
+Get live support at **#jekyll** on **irc.freenode.net**, the official
+Jekyll IRC channel.
 
 ### [jekyll/jekyll](https://github.com/jekyll/jekyll/issues)
 
-Search through the issues on the main Jekyll development. Think you've found a bug? File a new issue.
+Search through the issues on the main Jekyll development. Think you've
+found a bug? File a new issue.
 
 ### [@jekyllrb on Twitter](https://twitter.com)
 
-The official Jekyll Twitter account. It's not checked often, so try the above first.
+The official Jekyll Twitter account. It's not checked often, so try the
+above first.

From 4ce60741d9b57f61650a7b4b0acb90c9ad9074b8 Mon Sep 17 00:00:00 2001
From: Ezmyrelda Andrade <dj.ezmyrelda@gmail.com>
Date: Sun, 8 Feb 2015 13:34:45 -0800
Subject: [PATCH 291/407] Formatting adjustment

Deletion of a dash - between last entry of Tags and beginning of Collections.
---
 site/_docs/plugins.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 7d13aac4e..d48b45e9a 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -585,7 +585,7 @@ You can find a few useful plugins at the following locations:
 - [inline\_highlight](https://github.com/bdesham/inline_highlight): A tag for inline syntax highlighting.
 - [jekyll-mermaid](https://github.com/jasonbellamy/jekyll-mermaid): Simplify the creation of mermaid diagrams and flowcharts in your posts and pages.
 - [twa](https://github.com/Ezmyrelda/twa): Twemoji Awesome plugin for Jekyll. Liquid tag allowing you to use twitter emoji in your jekyll pages.
--
+
 #### Collections
 
 - [Jekyll Plugins by Recursive Design](http://recursive-design.com/projects/jekyll-plugins/): Plugins to generate Project pages from GitHub readmes, a Category page, and a Sitemap generator.

From 72e297366d1a0dedc5c1c67b874df026a7d52338 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 8 Feb 2015 14:51:46 -0800
Subject: [PATCH 292/407] Update history to reflect merge of #3431 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index cc1b83535..8c9e1be8b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -96,6 +96,7 @@
   * s/three/four for plugin type list (#3424)
   * Release jekyllrb.com as a locally-compiled site. (#3426)
   * Add a jekyllrb.com/help page which elucidates places from which to get help (#3428)
+  * Remove extraneous dash on Plugins doc page which caused a formatting error (#3431)
 
 ## 2.5.3 / 2014-12-22
 

From a0134dea4f2dc553b6c52fe4e3c0ab7a1361b27f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 9 Feb 2015 16:26:48 -0800
Subject: [PATCH 293/407] Update history to reflect merge of #3401 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8c9e1be8b..ceb52df17 100644
--- a/History.markdown
+++ b/History.markdown
@@ -53,6 +53,7 @@
   * Template: Remove `!important` from nav SCSS introduced in #3329 (#3375)
   * The `:title` URL placeholder for collections should be the filename slug. (#3383)
   * Trim the generate time diff to just 3 places past the decimal place (#3415)
+  * The highlight tag should only clip the newlines before and after the *entire* block, not in between (#3401)
 
 ### Development Fixes
 

From bf149a0b97187259cccb5323d3396f313b3461b0 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 9 Feb 2015 21:42:50 -0800
Subject: [PATCH 294/407] highlight: fix problem with linenos and rouge.

Found by @EdMcBane in https://github.com/jekyll/jekyll/pull/3435

The strange regexp we were doing to replace the <pre><code></pre></code>
bits in the Pygments output were wreaking havoc on Rouge output
because Rouge uses <pre>'s to wrap line numbers.

To be consistent, the output from render_* should *not* include
the wrapping <div> and <pre> tags. It should just be what was
inside. We can then wrap it in our own custom tags without using
any regular expressions, as God intended. Death to regular
expressions and HTML manipulation!
---
 lib/jekyll/tags/highlight.rb | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index 5af5f2bd2..5589d38ff 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -77,8 +77,6 @@ eos
       def render_pygments(code, is_safe)
         Jekyll::External.require_with_graceful_fail('pygments')
 
-        @options[:encoding] = 'utf-8'
-
         highlighted_code = Pygments.highlight(
           code,
           :lexer   => @lang,
@@ -96,26 +94,26 @@ eos
           raise ArgumentError.new("Pygments.rb returned an unacceptable value when attempting to highlight some code.")
         end
 
-        highlighted_code
+        highlighted_code.sub('<div class="highlight"><pre>', '').sub('</pre></div>', '')
       end
 
       def render_rouge(code)
         Jekyll::External.require_with_graceful_fail('rouge')
         formatter = Rouge::Formatters::HTML.new(line_numbers: @options[:linenos], wrap: false)
         lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText
-        code = formatter.format(lexer.lex(code))
-        "<div class=\"highlight\"><pre>#{code}</pre></div>"
+        formatter.format(lexer.lex(code))
       end
 
       def render_codehighlighter(code)
-        "<div class=\"highlight\"><pre>#{h(code).strip}</pre></div>"
+        h(code).strip
       end
 
       def add_code_tag(code)
-        # Add nested <code> tags to code blocks
-        code = code.sub(/<pre>\n*/,'<pre><code class="language-' + @lang.to_s.gsub("+", "-") + '" data-lang="' + @lang.to_s + '">')
-        code = code.sub(/\n*<\/pre>/,"</code></pre>")
-        code.strip
+        code_attributes = [
+          "class=\"language-#{@lang.to_s.gsub('+', '-')}\"",
+          "data-lang=\"#{@lang.to_s}\""
+        ].join(" ")
+        "<div class=\"highlight\"><pre><code #{code_attributes}>#{code.chomp}</code></pre></div>"
       end
 
     end

From 1f503b24b3e4597716d411fe7710a680880125f8 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 9 Feb 2015 21:57:43 -0800
Subject: [PATCH 295/407] highlight: duplicate tests for pygments for rouge

Ensure that the output we get for pygments will match
that we get for rouge in all cases except line numbers.
---
 test/test_tags.rb | 223 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 162 insertions(+), 61 deletions(-)

diff --git a/test/test_tags.rb b/test/test_tags.rb
index 9fbd9e39a..931c38303 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -7,7 +7,7 @@ class TestTags < Test::Unit::TestCase
   def create_post(content, override = {}, converter_class = Jekyll::Converters::Markdown)
     stub(Jekyll).configuration do
       site_configuration({
-        "highlighter" => "pygments"
+        "highlighter" => "rouge"
       }.merge(override))
     end
     site = Site.new(Jekyll.configuration)
@@ -136,63 +136,65 @@ CONTENT
     end
   end
 
-  context "post content has highlight tag" do
-    setup do
-      fill_post("test")
+  context "with the pygments highlighter" do
+    context "post content has highlight tag" do
+      setup do
+        fill_post("test", {'highlighter' => 'pygments'})
+      end
+
+      should "not cause a markdown error" do
+        assert_no_match /markdown\-html\-error/, @result
+      end
+
+      should "render markdown with pygments" do
+        assert_match %{<pre><code class="language-text" data-lang="text">test</code></pre>}, @result
+      end
+
+      should "render markdown with pygments with line numbers" do
+        assert_match %{<pre><code class="language-text" data-lang="text"><span class="lineno">1</span> test</code></pre>}, @result
+      end
     end
 
-    should "not cause a markdown error" do
-      assert_no_match /markdown\-html\-error/, @result
+    context "post content has highlight with file reference" do
+      setup do
+        fill_post("./jekyll.gemspec", {'highlighter' => 'pygments'})
+      end
+
+      should "not embed the file" do
+        assert_match %{<pre><code class="language-text" data-lang="text">./jekyll.gemspec</code></pre>}, @result
+      end
     end
 
-    should "render markdown with pygments" do
-      assert_match %{<pre><code class="language-text" data-lang="text">test</code></pre>}, @result
+    context "post content has highlight tag with UTF character" do
+      setup do
+        fill_post("Æ", {'highlighter' => 'pygments'})
+      end
+
+      should "render markdown with pygments line handling" do
+        assert_match %{<pre><code class="language-text" data-lang="text">Æ</code></pre>}, @result
+      end
     end
 
-    should "render markdown with pygments with line numbers" do
-      assert_match %{<pre><code class="language-text" data-lang="text"><span class="lineno">1</span> test</code></pre>}, @result
-    end
-  end
-
-  context "post content has highlight with file reference" do
-    setup do
-      fill_post("./jekyll.gemspec")
-    end
-
-    should "not embed the file" do
-      assert_match %{<pre><code class="language-text" data-lang="text">./jekyll.gemspec</code></pre>}, @result
-    end
-  end
-
-  context "post content has highlight tag with UTF character" do
-    setup do
-      fill_post("Æ")
-    end
-
-    should "render markdown with pygments line handling" do
-      assert_match %{<pre><code class="language-text" data-lang="text">Æ</code></pre>}, @result
-    end
-  end
-
-  context "post content has highlight tag with preceding spaces & lines" do
-    setup do
-      fill_post <<-EOS
+    context "post content has highlight tag with preceding spaces & lines" do
+      setup do
+        code = <<-EOS
 
 
      [,1] [,2]
 [1,] FALSE TRUE
 [2,] FALSE TRUE
 EOS
+        fill_post(code, {'highlighter' => 'pygments'})
+      end
+
+      should "only strip the preceding newlines" do
+        assert_match %{<pre><code class=\"language-text\" data-lang=\"text\">     [,1] [,2]}, @result
+      end
     end
 
-    should "only strip the preceding newlines" do
-      assert_match %{<pre><code class=\"language-text\" data-lang=\"text\">     [,1] [,2]}, @result
-    end
-  end
-
-  context "post content has highlight tag with preceding spaces & lines in several places" do
-    setup do
-      fill_post <<-EOS
+    context "post content has highlight tag with preceding spaces & lines in several places" do
+      setup do
+        code = <<-EOS
 
 
      [,1] [,2]
@@ -203,34 +205,133 @@ EOS
 
 
 EOS
+        fill_post(code, {'highlighter' => 'pygments'})
+      end
+
+      should "only strip the newlines which precede and succeed the entire block" do
+        assert_match "<pre><code class=\"language-text\" data-lang=\"text\">     [,1] [,2]\n\n\n[1,] FALSE TRUE\n[2,] FALSE TRUE</code></pre>", @result
+      end
     end
 
-    should "only strip the newlines which precede and succeed the entire block" do
-      assert_match "<pre><code class=\"language-text\" data-lang=\"text\">     [,1] [,2]\n\n\n[1,] FALSE TRUE\n[2,] FALSE TRUE</code></pre>", @result
-    end
-  end
+    context "post content has highlight tag with preceding spaces & Windows-style newlines" do
+      setup do
+        fill_post "\r\n\r\n\r\n     [,1] [,2]", {'highlighter' => 'pygments'}
+      end
 
-  context "post content has highlight tag with preceding spaces & Windows-style newlines" do
-    setup do
-      fill_post "\r\n\r\n\r\n     [,1] [,2]"
+      should "only strip the preceding newlines" do
+        assert_match %{<pre><code class=\"language-text\" data-lang=\"text\">     [,1] [,2]}, @result
+      end
     end
 
-    should "only strip the preceding newlines" do
-      assert_match %{<pre><code class=\"language-text\" data-lang=\"text\">     [,1] [,2]}, @result
-    end
-  end
-
-  context "post content has highlight tag with only preceding spaces" do
-    setup do
-      fill_post <<-EOS
+    context "post content has highlight tag with only preceding spaces" do
+      setup do
+        code = <<-EOS
      [,1] [,2]
 [1,] FALSE TRUE
 [2,] FALSE TRUE
 EOS
+        fill_post(code, {'highlighter' => 'pygments'})
+      end
+
+      should "only strip the preceding newlines" do
+        assert_match %{<pre><code class=\"language-text\" data-lang=\"text\">     [,1] [,2]}, @result
+      end
+    end
+  end
+
+  context "with the rouge highlighter" do
+    context "post content has highlight tag" do
+      setup do
+        fill_post("test")
+      end
+
+      should "render markdown with rouge" do
+        assert_match %{<pre><code class="language-text" data-lang="text">test</code></pre>}, @result
+      end
+
+      should "render markdown with rouge with line numbers" do
+        assert_match %{<table style="border-spacing: 0"><tbody><tr><td class="gutter gl" style="text-align: right"><pre class="lineno">1</pre></td><td class="code"><pre>test<span class="w">\n</span></pre></td></tr></tbody></table>}, @result
+      end
     end
 
-    should "only strip the preceding newlines" do
-      assert_match %{<pre><code class=\"language-text\" data-lang=\"text\">     [,1] [,2]}, @result
+    context "post content has highlight with file reference" do
+      setup do
+        fill_post("./jekyll.gemspec")
+      end
+
+      should "not embed the file" do
+        assert_match %{<pre><code class="language-text" data-lang="text">./jekyll.gemspec</code></pre>}, @result
+      end
+    end
+
+    context "post content has highlight tag with UTF character" do
+      setup do
+        fill_post("Æ")
+      end
+
+      should "render markdown with pygments line handling" do
+        assert_match %{<pre><code class="language-text" data-lang="text">Æ</code></pre>}, @result
+      end
+    end
+
+    context "post content has highlight tag with preceding spaces & lines" do
+      setup do
+        fill_post <<-EOS
+
+
+     [,1] [,2]
+[1,] FALSE TRUE
+[2,] FALSE TRUE
+EOS
+      end
+
+      should "only strip the preceding newlines" do
+        assert_match %{<pre><code class=\"language-text\" data-lang=\"text\">     [,1] [,2]}, @result
+      end
+    end
+
+    context "post content has highlight tag with preceding spaces & lines in several places" do
+      setup do
+        fill_post <<-EOS
+
+
+     [,1] [,2]
+
+
+[1,] FALSE TRUE
+[2,] FALSE TRUE
+
+
+EOS
+      end
+
+      should "only strip the newlines which precede and succeed the entire block" do
+        assert_match "<pre><code class=\"language-text\" data-lang=\"text\">     [,1] [,2]\n\n\n[1,] FALSE TRUE\n[2,] FALSE TRUE</code></pre>", @result
+      end
+    end
+
+    context "post content has highlight tag with preceding spaces & Windows-style newlines" do
+      setup do
+        fill_post "\r\n\r\n\r\n     [,1] [,2]"
+      end
+
+      should "only strip the preceding newlines" do
+        assert_match %{<pre><code class=\"language-text\" data-lang=\"text\">     [,1] [,2]}, @result
+      end
+    end
+
+    context "post content has highlight tag with only preceding spaces" do
+      setup do
+        fill_post <<-EOS
+     [,1] [,2]
+[1,] FALSE TRUE
+[2,] FALSE TRUE
+EOS
+      end
+
+      should "only strip the preceding newlines" do
+        assert_match %{<pre><code class=\"language-text\" data-lang=\"text\">     [,1] [,2]}, @result
+      end
     end
   end
 

From c08c7948019cfde1cc91f50f8a74910db13c60dc Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 9 Feb 2015 22:09:33 -0800
Subject: [PATCH 296/407] Update history to reflect merge of #3436 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ceb52df17..9eca2379e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -54,6 +54,7 @@
   * The `:title` URL placeholder for collections should be the filename slug. (#3383)
   * Trim the generate time diff to just 3 places past the decimal place (#3415)
   * The highlight tag should only clip the newlines before and after the *entire* block, not in between (#3401)
+  * highlight: fix problem with linenos and rouge. (#3436)
 
 ### Development Fixes
 

From 33c3b41f69ffe950325951b29d745c63bcf922ad Mon Sep 17 00:00:00 2001
From: Jordan Thornquest <me@jordanthornquest.com>
Date: Mon, 9 Feb 2015 23:58:22 -0700
Subject: [PATCH 297/407] Fix broken link in resources

`jordanthornque.st` should be `jordanthornquest.com`. That's been remedied!
---
 site/_docs/resources.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/resources.md b/site/_docs/resources.md
index 71447b53b..692ff58e5 100644
--- a/site/_docs/resources.md
+++ b/site/_docs/resources.md
@@ -43,4 +43,4 @@ A guide to implementing a tag cloud and per-tag content pages using Jekyll.
 
 - [Using your Rails layouts in Jekyll](http://numbers.brighterplanet.com/2010/08/09/sharing-rails-views-with-jekyll)
 - [Adding Ajax pagination to Jekyll](http://eduardoboucas.com/blog/2014/11/10/adding-ajax-pagination-to-jekyll.html)
-- [Using Jekyll’s Data Files to build a dynamic navbar](http://www.jordanthornque.st/blog/building-dynamic-navbars-with-jekyll/)
+- [Using Jekyll’s Data Files to build a dynamic navbar](http://www.jordanthornquest.com/blog/building-dynamic-navbars-with-jekyll/)

From 8fe9561f64d959def755c7323dcb6a8a690e4ebd Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 9 Feb 2015 23:24:47 -0800
Subject: [PATCH 298/407] Update history to reflect merge of #3438 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9eca2379e..a6a87bfed 100644
--- a/History.markdown
+++ b/History.markdown
@@ -99,6 +99,7 @@
   * Release jekyllrb.com as a locally-compiled site. (#3426)
   * Add a jekyllrb.com/help page which elucidates places from which to get help (#3428)
   * Remove extraneous dash on Plugins doc page which caused a formatting error (#3431)
+  * Fix broken link to Jordan Thornquest's website. (#3438)
 
 ## 2.5.3 / 2014-12-22
 

From c96abf7e820816bbe63ddc8e26e43f043d89ee0a Mon Sep 17 00:00:00 2001
From: Mark Tareshawty <tarebyte@gmail.com>
Date: Tue, 10 Feb 2015 11:08:22 -0500
Subject: [PATCH 299/407] added -s and -d

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

diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index 45eb1d9c8..421df8f0d 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -49,8 +49,8 @@ module Jekyll
       # Returns nothing
       def add_build_options(c)
         c.option 'config',  '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
-        c.option 'destination', '--destination <destination>', 'The current folder will be generated into <destination>'
-        c.option 'source', '--source <source> --destination <destination>', 'The <source> folder will be generated into <destination>'
+        c.option 'destination', '-d', '--destination <destination>', 'The current folder will be generated into <destination>'
+        c.option 'source', '-s', '--source <source> --destination <destination>', 'The <source> folder will be generated into <destination>'
         c.option 'future',  '--future', 'Publishes posts with a future date'
         c.option 'limit_posts', '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
         c.option 'watch',   '-w', '--[no-]watch', 'Watch for changes and rebuild'

From 091494809960f9e85f22a451f0c5911fb3d8cc5a Mon Sep 17 00:00:00 2001
From: Tanguy Krotoff <tkrotoff@gmail.com>
Date: Tue, 10 Feb 2015 17:09:06 +0100
Subject: [PATCH 300/407] Remove class="text"

There is no class text defined in the CSS
---
 lib/site_template/_includes/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/site_template/_includes/footer.html b/lib/site_template/_includes/footer.html
index ee8246a5b..8fa89ba92 100644
--- a/lib/site_template/_includes/footer.html
+++ b/lib/site_template/_includes/footer.html
@@ -46,7 +46,7 @@
       </div>
 
       <div class="footer-col footer-col-3">
-        <p class="text">{{ site.description }}</p>
+        <p>{{ site.description }}</p>
       </div>
     </div>
 

From f933164a2a5c2d8f9cfc290316bdd8248660d0c7 Mon Sep 17 00:00:00 2001
From: Mark Tareshawty <tarebyte@gmail.com>
Date: Tue, 10 Feb 2015 15:02:49 -0500
Subject: [PATCH 301/407] use SCREAMING_SNAKE_CASE and remove --destination
 from --source options

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

diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index 421df8f0d..a72640fb2 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -49,8 +49,8 @@ module Jekyll
       # Returns nothing
       def add_build_options(c)
         c.option 'config',  '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
-        c.option 'destination', '-d', '--destination <destination>', 'The current folder will be generated into <destination>'
-        c.option 'source', '-s', '--source <source> --destination <destination>', 'The <source> folder will be generated into <destination>'
+        c.option 'destination', '-d', '--destination DESTINATION', 'The current folder will be generated into DESTINATION'
+        c.option 'source', '-s', '--source SOURCE', 'Custom source directory'
         c.option 'future',  '--future', 'Publishes posts with a future date'
         c.option 'limit_posts', '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
         c.option 'watch',   '-w', '--[no-]watch', 'Watch for changes and rebuild'

From 7a5a90de825dc3908064ea549ed80e2d61df7922 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Wed, 11 Feb 2015 13:59:53 -0800
Subject: [PATCH 302/407] Update history to reflect merge of #3440 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a6a87bfed..64deb4503 100644
--- a/History.markdown
+++ b/History.markdown
@@ -36,6 +36,7 @@
   * Add `pkill -f jekyll` to ways to kill. (#3397)
   * Site template: collapsed, variable-driven font declaration (#3360)
   * Site template: Don't always show the scrollbar in code blocks (#3419)
+  * Site template: Remove undefined `text` class from `p` element (#3440)
 
 ### Bug Fixes
 

From a907addbe27d3a452c4ab8d968f7d79fc69ba5fb Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Wed, 11 Feb 2015 15:45:47 -0800
Subject: [PATCH 303/407] Optimize text rendering for legibility

---
 lib/site_template/_sass/_base.scss | 5 +++++
 site/_sass/_style.scss             | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/lib/site_template/_sass/_base.scss b/lib/site_template/_sass/_base.scss
index a7cbadfe0..0883c3cdb 100644
--- a/lib/site_template/_sass/_base.scss
+++ b/lib/site_template/_sass/_base.scss
@@ -18,6 +18,11 @@ body {
     color: $text-color;
     background-color: $background-color;
     -webkit-text-size-adjust: 100%;
+    -webkit-font-feature-settings: "kern" 1;
+    -moz-font-feature-settings: "kern" 1;
+    -o-font-feature-settings: "kern" 1;
+    font-feature-settings: "kern" 1;
+    font-kerning: normal;
 }
 
 
diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss
index 6c2a8158f..98ebebaaf 100644
--- a/site/_sass/_style.scss
+++ b/site/_sass/_style.scss
@@ -13,6 +13,11 @@ body {
   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;
+  -moz-font-feature-settings: "kern" 1;
+  -o-font-feature-settings: "kern" 1;
+  font-feature-settings: "kern" 1;
+  font-kerning: normal;
 }
 
 .clear {

From 249249f76b0bcfd9cdb4b12b10a5030ef4fcd5e1 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Wed, 11 Feb 2015 15:52:04 -0800
Subject: [PATCH 304/407] Update history to reflect merge of #3382 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 64deb4503..8ef969687 100644
--- a/History.markdown
+++ b/History.markdown
@@ -37,6 +37,7 @@
   * Site template: collapsed, variable-driven font declaration (#3360)
   * Site template: Don't always show the scrollbar in code blocks (#3419)
   * Site template: Remove undefined `text` class from `p` element (#3440)
+  * Site template: Optimize text rendering for legibility (#3382)
 
 ### Bug Fixes
 

From e99a9e5821a7ba16ce42a1f5de378012f22acae0 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <r@tomayko.com>
Date: Thu, 12 Feb 2015 21:53:13 -0500
Subject: [PATCH 305/407] Custom WEBrick FileHandler for stripping .html
 extension

This first performs the normal static file check at the exact
location. If no file is found, attempt the check again with an
".html" suffix.

See the following for base class search_file implementation:

https://github.com/ruby/ruby/blob/4607f95/lib/webrick/httpservlet/filehandler.rb#L363-L383
---
 lib/jekyll/commands/serve.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 6467c5aba..912f4f62d 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -40,7 +40,7 @@ module Jekyll
 
           s.mount(
             options['baseurl'],
-            WEBrick::HTTPServlet::FileHandler,
+            FileHandler,
             destination,
             file_handler_options
           )
@@ -131,6 +131,19 @@ module Jekyll
 
       end
 
+      # Custom WEBrick FileHandler servlet for serving "/file.html" at "/file"
+      # when no exact match is found. This mirrors the behavior of GitHub Pages
+      # and many static web server configs.
+      require 'webrick'
+      class FileHandler < ::WEBrick::HTTPServlet::FileHandler
+        def search_file(req, res, basename)
+          if file = super
+            file
+          else
+            super(req, res, "#{basename}.html")
+          end
+        end
+      end
     end
   end
 end

From 491cce7a99976a443e058b4aaa6655882d8f8427 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <r@tomayko.com>
Date: Thu, 12 Feb 2015 22:05:30 -0500
Subject: [PATCH 306/407] Avoid requiring webrick at boot time

This is a bit uglier but allows deferring loading webrick until the
serve command is invoked as opposed to when it's required.
---
 lib/jekyll/commands/serve.rb | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 912f4f62d..111d6709f 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -40,7 +40,7 @@ module Jekyll
 
           s.mount(
             options['baseurl'],
-            FileHandler,
+            custom_file_handler,
             destination,
             file_handler_options
           )
@@ -99,6 +99,21 @@ module Jekyll
           opts
         end
 
+        # Custom WEBrick FileHandler servlet for serving "/file.html" at "/file"
+        # when no exact match is found. This mirrors the behavior of GitHub
+        # Pages and many static web server configs.
+        def custom_file_handler
+          Class.new WEBrick::HTTPServlet::FileHandler do
+            def search_file(req, res, basename)
+              if file = super
+                file
+              else
+                super(req, res, "#{basename}.html")
+              end
+            end
+          end
+        end
+
         def start_callback(detached)
           unless detached
             Proc.new { Jekyll.logger.info "Server running...", "press ctrl-c to stop." }
@@ -131,19 +146,6 @@ module Jekyll
 
       end
 
-      # Custom WEBrick FileHandler servlet for serving "/file.html" at "/file"
-      # when no exact match is found. This mirrors the behavior of GitHub Pages
-      # and many static web server configs.
-      require 'webrick'
-      class FileHandler < ::WEBrick::HTTPServlet::FileHandler
-        def search_file(req, res, basename)
-          if file = super
-            file
-          else
-            super(req, res, "#{basename}.html")
-          end
-        end
-      end
     end
   end
 end

From 712d8d617d4f47914fc2ef47899428c33a11172d Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 13 Feb 2015 17:07:33 -0800
Subject: [PATCH 307/407] Update history to reflect merge of #3452 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8ef969687..0e0b07255 100644
--- a/History.markdown
+++ b/History.markdown
@@ -9,6 +9,7 @@
   * Support RDiscount 2 (#2767)
   * Remove most runtime deps (#3323)
   * Move to Rouge as default highlighter (#3323)
+  * Mimic GitHub Pages `.html` extension stripping behavior in WEBrick (#3452)
 
 ### Minor Enhancements
 

From c6d5a913f1d420c7da93f697a223bc02ef10a1be Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 13 Feb 2015 19:39:15 -0800
Subject: [PATCH 308/407] Site#read_data_file: read CSV's with proper file
 encoding

Fixes #3451.
---
 lib/jekyll/site.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 3af47672c..100f50f18 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -262,19 +262,22 @@ module Jekyll
         end
       end
     end
-    
+
     # Determines how to read a data file.
     #
     # Returns the contents of the data file.
     def read_data_file(path)
       case File.extname(path).downcase
       when '.csv'
-        CSV.read(path, :headers => true).map(&:to_hash)
+        CSV.read(path, {
+          :headers => true,
+          :encoding => config['encoding']
+        }).map(&:to_hash)
       else
         SafeYAML.load_file(path)
       end
     end
-      
+
     # Read in all collections specified in the configuration
     #
     # Returns nothing.

From 461ea2f147b1e4ad3e25b0a80ed838236582ce45 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 13 Feb 2015 20:53:18 -0800
Subject: [PATCH 309/407] Update history to reflect merge of #3455 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0e0b07255..461b47971 100644
--- a/History.markdown
+++ b/History.markdown
@@ -58,6 +58,7 @@
   * Trim the generate time diff to just 3 places past the decimal place (#3415)
   * The highlight tag should only clip the newlines before and after the *entire* block, not in between (#3401)
   * highlight: fix problem with linenos and rouge. (#3436)
+  * `Site#read_data_file`: read CSV's with proper file encoding (#3455)
 
 ### Development Fixes
 

From 58dc1f77e9084d8b147a39ad4ab4023e33aa8646 Mon Sep 17 00:00:00 2001
From: Will Norris <will@willnorris.com>
Date: Fri, 13 Feb 2015 23:56:37 -0800
Subject: [PATCH 310/407] add draft? method to identify if Post is a draft

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

diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index 64fd485f6..c74522a9f 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -24,6 +24,7 @@ module Jekyll
       content
       excerpt
       excerpt_separator
+      draft?
     ]
 
     # Post name validator. Post filenames must be like:
@@ -305,6 +306,11 @@ module Jekyll
       end
     end
 
+    # Returns if this Post is a Draft
+    def draft?
+      is_a?(Jekyll::Draft)
+    end
+
     protected
 
     def extract_excerpt

From 00ec13c11bf25585604af1bf6d89139087dfe26d Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 14 Feb 2015 01:35:00 -0800
Subject: [PATCH 311/407] Update history to reflect merge of #3456 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 461b47971..9bfae2e69 100644
--- a/History.markdown
+++ b/History.markdown
@@ -39,6 +39,7 @@
   * Site template: Don't always show the scrollbar in code blocks (#3419)
   * Site template: Remove undefined `text` class from `p` element (#3440)
   * Site template: Optimize text rendering for legibility (#3382)
+  * Add `draft?` method to identify if Post is a Draft & expose to Liquid (#3456)
 
 ### Bug Fixes
 

From 22759edf3e706f8c0c35bde9172b22026344d7b8 Mon Sep 17 00:00:00 2001
From: Anatol Broder <anatol@penibelst.de>
Date: Sat, 14 Feb 2015 14:50:35 +0100
Subject: [PATCH 312/407] Change the link

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

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index d48b45e9a..1ce5e2e1e 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -615,7 +615,7 @@ You can find a few useful plugins at the following locations:
 - [generator-jekyllrb](https://github.com/robwierzbowski/generator-jekyllrb): A generator that wraps Jekyll in [Yeoman](http://yeoman.io/), a tool collection and workflow for builing modern web apps.
 - [grunt-jekyll](https://github.com/dannygarcia/grunt-jekyll): A straightforward [Grunt](http://gruntjs.com/) plugin for Jekyll.
 - [jekyll-postfiles](https://github.com/indirect/jekyll-postfiles): Add `_postfiles` directory and {% raw %}`{{ postfile }}`{% endraw %} tag so the files a post refers to will always be right there inside your repo.
-- [A layout that compresses HTML](https://github.com/penibelst/jekyll-compress-html) by [Anatol Broder](http://penibelst.de/): Github Pages compatible, configurable way to compress HTML files on site build.
+- [A layout that compresses HTML](http://jch.penibelst.de/): Github Pages compatible, configurable way to compress HTML files on site build.
 - [Jekyll CO₂](https://github.com/wdenton/jekyll-co2): Generates HTML showing the monthly change in atmospheric CO₂ at the Mauna Loa observatory in Hawaii.
 - [remote-include](http://www.northfieldx.co.uk/remote-include/): Includes files using remote URLs
 - [jekyll-minifier](https://github.com/digitalsparky/jekyll-minifier): Minifies HTML, XML, CSS, and Javascript both inline and as separate files utilising yui-compressor and htmlcompressor.

From fa6981fb8c09cbf64107cb936d7aab40a52a24a7 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Sat, 14 Feb 2015 10:33:36 -0800
Subject: [PATCH 313/407] Update history to reflect merge of #3457 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9bfae2e69..b89ea845b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -105,6 +105,7 @@
   * Add a jekyllrb.com/help page which elucidates places from which to get help (#3428)
   * Remove extraneous dash on Plugins doc page which caused a formatting error (#3431)
   * Fix broken link to Jordan Thornquest's website. (#3438)
+  * Change the link to an extension (#3457)
 
 ## 2.5.3 / 2014-12-22
 

From 6e89c1c02bc9e7f9e17b50b8a967b156d6d093b0 Mon Sep 17 00:00:00 2001
From: Will Norris <will@willnorris.com>
Date: Sat, 14 Feb 2015 22:21:03 -0800
Subject: [PATCH 314/407] write .jekyll-metadata even on full_rebuild

For a full rebuild, we certainly don't want to *read* from
.jeykll-metadata, but we should still write it.  Otherwise, a subsequent
incremental build would have to do a full rebuild again since there is
no metadata file to start from.
---
 lib/jekyll/site.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 100f50f18..0e1063c18 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -335,7 +335,7 @@ module Jekyll
       each_site_file { |item|
         item.write(dest) if regenerator.regenerate?(item)
       }
-      regenerator.write_metadata unless full_rebuild?
+      regenerator.write_metadata
     end
 
     # Construct a Hash of Posts indexed by the specified Post attribute.

From 9f22749ebbfdcae20bf6cd5b50c7908133004a8d Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Sun, 15 Feb 2015 12:51:18 +0100
Subject: [PATCH 315/407] Change twitter link to link directly to @jekyllrb.

Changed the link on the help page to directly link to the Twitter
@jekyllrb account.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 site/help/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/help/index.md b/site/help/index.md
index ceceb8ef9..9a8484665 100644
--- a/site/help/index.md
+++ b/site/help/index.md
@@ -30,7 +30,7 @@ Jekyll IRC channel.
 Search through the issues on the main Jekyll development. Think you've
 found a bug? File a new issue.
 
-### [@jekyllrb on Twitter](https://twitter.com)
+### [@jekyllrb on Twitter](https://twitter.com/jekyllrb)
 
 The official Jekyll Twitter account. It's not checked often, so try the
 above first.

From 5fa1aadf7f01ff698d00515e13b37f359aa37b4d Mon Sep 17 00:00:00 2001
From: Jedd Ahyoung <jedd.ahyoung@gmail.com>
Date: Sun, 15 Feb 2015 18:28:52 -0500
Subject: [PATCH 316/407] docs: Add frontmatter date formatting information

---
 site/_docs/frontmatter.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/site/_docs/frontmatter.md b/site/_docs/frontmatter.md
index 9ce032dfd..8c08f7dfe 100644
--- a/site/_docs/frontmatter.md
+++ b/site/_docs/frontmatter.md
@@ -170,7 +170,9 @@ These are available out-of-the-box to be used in the front matter for a post.
       <td>
         <p>
           A date here overrides the date from the name of the post. This can be
-          used to ensure correct sorting of posts.
+          used to ensure correct sorting of posts. A date is specified in the format
+          <code>YYYY-MM-DD HH:MM:SS +/-TTTT</code>; hours, minutes, seconds, and timezone offset
+          are optional.
         </p>
       </td>
     </tr>

From 7fb3b096c3e10b489e7542c589054e56cb2e4326 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Mon, 16 Feb 2015 13:05:15 -0800
Subject: [PATCH 317/407] Update history to reflect merge of #3464 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b89ea845b..65cf16661 100644
--- a/History.markdown
+++ b/History.markdown
@@ -40,6 +40,7 @@
   * Site template: Remove undefined `text` class from `p` element (#3440)
   * Site template: Optimize text rendering for legibility (#3382)
   * Add `draft?` method to identify if Post is a Draft & expose to Liquid (#3456)
+  * Write regeneration metadata even on full rebuild (#3464)
 
 ### Bug Fixes
 

From 9caa47d164c2119df4f5a9aaa3be84e37aff8699 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Mon, 16 Feb 2015 16:25:21 -0800
Subject: [PATCH 318/407] Update history to reflect merge of #3466 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 65cf16661..3b39dae1e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -107,6 +107,7 @@
   * Remove extraneous dash on Plugins doc page which caused a formatting error (#3431)
   * Fix broken link to Jordan Thornquest's website. (#3438)
   * Change the link to an extension (#3457)
+  * Fix Twitter link on the help page (#3466)
 
 ## 2.5.3 / 2014-12-22
 

From dbead70168e4713027bd8d8cadcc0fdfc43f146b Mon Sep 17 00:00:00 2001
From: Mark Phelps <mark.aaron.phelps@gmail.com>
Date: Tue, 17 Feb 2015 08:17:45 -0500
Subject: [PATCH 319/407] Fix wording in code snippet highlighting section

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

diff --git a/site/_docs/templates.md b/site/_docs/templates.md
index 023d26d3b..f69943b49 100644
--- a/site/_docs/templates.md
+++ b/site/_docs/templates.md
@@ -324,9 +324,9 @@ on your system and set `highlighter` to `pygments` in your site's configuration
 file.
 
 Alternatively, you can use [Rouge](https://github.com/jayferd/rouge) to highlight
-your code snippets. It doesn't support as many languages as Pygments does but
-it should fit in most cases and it's written in pure Ruby ; you don't need Python
-on your system!
+your code snippets. It doesn't support as many languages as Pygments, however it
+should fit in most cases. Also, since [Rouge](https://github.com/jayferd/rouge)
+is written in pure Ruby, you don't need Python on your system!
 
 To render a code block with syntax highlighting, surround your code as follows:
 

From 9a0db42436298d97632d051d74d11f9a38c5c0c0 Mon Sep 17 00:00:00 2001
From: Mark Phelps <mark.aaron.phelps@gmail.com>
Date: Tue, 17 Feb 2015 15:27:15 -0500
Subject: [PATCH 320/407] Updating Rogue description text based on feedback.

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

diff --git a/site/_docs/templates.md b/site/_docs/templates.md
index f69943b49..8014a2ee4 100644
--- a/site/_docs/templates.md
+++ b/site/_docs/templates.md
@@ -325,7 +325,7 @@ file.
 
 Alternatively, you can use [Rouge](https://github.com/jayferd/rouge) to highlight
 your code snippets. It doesn't support as many languages as Pygments, however it
-should fit in most cases. Also, since [Rouge](https://github.com/jayferd/rouge)
+should suit most use cases. Also, since [Rouge](https://github.com/jayferd/rouge)
 is written in pure Ruby, you don't need Python on your system!
 
 To render a code block with syntax highlighting, surround your code as follows:

From 1beee0d59dbbaead169470c13bba52d93e089ecb Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 17 Feb 2015 13:12:27 -0800
Subject: [PATCH 321/407] Update history to reflect merge of #3475 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 3b39dae1e..5548810b2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -108,6 +108,7 @@
   * Fix broken link to Jordan Thornquest's website. (#3438)
   * Change the link to an extension (#3457)
   * Fix Twitter link on the help page (#3466)
+  * Fix wording in code snippet highlighting section (#3475)
 
 ## 2.5.3 / 2014-12-22
 

From cd1326d457123d7dab897913f7b3b070544a9332 Mon Sep 17 00:00:00 2001
From: Philipp Rudloff <phrudloff@gmail.com>
Date: Tue, 17 Feb 2015 22:17:25 +0100
Subject: [PATCH 322/407] Update LICENSE to 2015.

The future is now.
---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index ce4e011dd..527166b60 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2008-2014 Tom Preston-Werner
+Copyright (c) 2008-2015 Tom Preston-Werner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 705fdfb23d62b6ef7388f75db8da7df35647dbc1 Mon Sep 17 00:00:00 2001
From: Michael Tu <tuzhucheng@outlook.com>
Date: Wed, 18 Feb 2015 03:13:57 -0500
Subject: [PATCH 323/407] Add a '/' to paginate_path

If this '/' is not present, then the second pagination code snippet
under the "Render the paginated Posts" section will have a bug.

Let's say my page 1 is located at host:port/blog/index.html and my
paginate_path setting in _config.yml is "blog/page:num/". The
observation if the paginate_path does not start with a '/' is that the href generated for the page numbers will have 2 'blogs', i.e. for page 2 the href will
incorrectly appear as 'host:port/blog/blog/page2' instead of just
'host:port/blog/page2'.
---
 site/_docs/pagination.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/pagination.md b/site/_docs/pagination.md
index c2662f04d..9352827e9 100644
--- a/site/_docs/pagination.md
+++ b/site/_docs/pagination.md
@@ -33,7 +33,7 @@ page in the generated site.
 You may also specify the destination of the pagination pages:
 
 {% highlight yaml %}
-paginate_path: "blog/page:num/"
+paginate_path: "/blog/page:num/"
 {% endhighlight %}
 
 This will read in `blog/index.html`, send it each pagination page in Liquid as `paginator`

From 80f64dea8951e1563649ea71696c948a133d6b7c Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 18 Feb 2015 11:14:26 -0800
Subject: [PATCH 324/407] Update history to reflect merge of #3479 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5548810b2..b29f99841 100644
--- a/History.markdown
+++ b/History.markdown
@@ -109,6 +109,7 @@
   * Change the link to an extension (#3457)
   * Fix Twitter link on the help page (#3466)
   * Fix wording in code snippet highlighting section (#3475)
+  * Add a `/` to `paginate_path` in the Pagination documentation (#3479)
 
 ## 2.5.3 / 2014-12-22
 

From e240bbb1bf6743a35476157605fe96496e55b529 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 18 Feb 2015 11:17:50 -0800
Subject: [PATCH 325/407] Update history to reflect merge of #3477 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b29f99841..813896fce 100644
--- a/History.markdown
+++ b/History.markdown
@@ -76,6 +76,7 @@
   * Move all `regenerate?` checking to `Regenerator` (#3326)
   * Factor out a `read_data_file` call to keep things clean (#3380)
   * Proof the site with CircleCI. (#3427)
+  * Update LICENSE to 2015. (#3477)
 
 ### Site Enhancements
 

From 47ee5db5fca5a7e8b380e2d6657a32d2a56b1570 Mon Sep 17 00:00:00 2001
From: Tony Eichelberger <watkyn@gmail.com>
Date: Fri, 20 Feb 2015 07:06:12 -0600
Subject: [PATCH 326/407] Removed the trailing slash from the example "/blog/"
 basurl comment. Following the example would add two slashes into the url,
 i.e. http://yourdomain.com/blog//

---
 lib/site_template/_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
index 2f03e74d4..f41510112 100644
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -5,7 +5,7 @@ description: > # this means to ignore newlines until "baseurl:"
   Write an awesome description for your new site here. You can edit this
   line in _config.yml. It will appear in your document head meta (for
   Google search results) and in your feed.xml site description.
-baseurl: "" # the subpath of your site, e.g. /blog/
+baseurl: "" # the subpath of your site, e.g. /blog
 url: "http://yourdomain.com" # the base hostname & protocol for your site
 twitter_username: jekyllrb
 github_username:  jekyll

From d2b19963c139a3ebbb2b3ae8f5aec7492a7c4793 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 20 Feb 2015 13:34:51 -0800
Subject: [PATCH 327/407] Move from Test::Unit to Minitest.

---
 Gemfile        | 2 +-
 test/helper.rb | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index b92f100e0..17ecb7dd2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ gem 'activesupport', '~> 3.2.13'
 gem 'jekyll_test_plugin'
 gem 'jekyll_test_plugin_malicious'
 gem 'liquid-c', '~> 0.0.3'
-gem 'minitest' if RUBY_PLATFORM =~ /cygwin/
+gem 'minitest'
 gem 'test-unit' if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2")
 
 if ENV['BENCHMARK']
diff --git a/test/helper.rb b/test/helper.rb
index ea30a855d..6d86db2a3 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -6,8 +6,8 @@ SimpleCov.start('gem') do
 end
 
 require 'rubygems'
-require 'test/unit'
 require 'ostruct'
+require 'minitest/autorun'
 
 require 'jekyll'
 
@@ -23,9 +23,7 @@ include Jekyll
 # Send STDERR into the void to suppress program output messages
 STDERR.reopen(test(?e, '/dev/null') ? '/dev/null' : 'NUL:')
 
-class Test::Unit::TestCase
-  include RR::Adapters::TestUnit
-
+class Minitest::Test
   def fixture_site(overrides = {})
     Jekyll::Site.new(site_configuration(overrides))
   end

From 4b59eb417584ae3622fce7686f5c1f49d517fefe Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 20 Feb 2015 13:35:02 -0800
Subject: [PATCH 328/407] Fix the test inheritance for the tests.

---
 test/test_cleaner.rb               |  2 +-
 test/test_coffeescript.rb          |  2 +-
 test/test_collections.rb           | 20 +++++++++---------
 test/test_command.rb               |  6 +++---
 test/test_configuration.rb         |  2 +-
 test/test_convertible.rb           |  4 ++--
 test/test_document.rb              |  4 ++--
 test/test_draft.rb                 |  2 +-
 test/test_entry_filter.rb          |  6 +++---
 test/test_excerpt.rb               |  2 +-
 test/test_filters.rb               |  2 +-
 test/test_front_matter_defaults.rb |  2 +-
 test/test_generated_site.rb        |  6 +++---
 test/test_kramdown.rb              |  2 +-
 test/test_layout_reader.rb         |  2 +-
 test/test_liquid_extensions.rb     |  2 +-
 test/test_log_adapter.rb           |  4 ++--
 test/test_new_command.rb           |  6 +++---
 test/test_page.rb                  |  2 +-
 test/test_path_sanitization.rb     |  2 +-
 test/test_plugin_manager.rb        |  2 +-
 test/test_post.rb                  |  4 ++--
 test/test_rdiscount.rb             |  2 +-
 test/test_redcarpet.rb             |  2 +-
 test/test_regenerator.rb           |  4 ++--
 test/test_related_posts.rb         |  2 +-
 test/test_sass.rb                  |  2 +-
 test/test_site.rb                  | 18 ++++++++--------
 test/test_tags.rb                  | 34 +++++++++++++++---------------
 test/test_url.rb                   |  2 +-
 test/test_utils.rb                 | 10 ++++-----
 31 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/test/test_cleaner.rb b/test/test_cleaner.rb
index 74e59507d..fb36f59fc 100644
--- a/test/test_cleaner.rb
+++ b/test/test_cleaner.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestCleaner < Test::Unit::TestCase
+class TestCleaner < Minitest::Test
   context "directory in keep_files" do
     setup do
       clear_dest
diff --git a/test/test_coffeescript.rb b/test/test_coffeescript.rb
index 49b838a1e..e62fbc0cc 100644
--- a/test/test_coffeescript.rb
+++ b/test/test_coffeescript.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestCoffeeScript < Test::Unit::TestCase
+class TestCoffeeScript < Minitest::Test
   context "converting CoffeeScript" do
     setup do
       External.require_with_graceful_fail('jekyll-coffeescript')
diff --git a/test/test_collections.rb b/test/test_collections.rb
index a119de5fa..cdfc8ad40 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestCollections < Test::Unit::TestCase
+class TestCollections < Minitest::Test
   context "an evil collection" do
     setup do
       @collection = Jekyll::Collection.new(fixture_site, "../../etc/password")
@@ -114,7 +114,7 @@ class TestCollections < Test::Unit::TestCase
 
     should "create a Hash on Site with the label mapped to the instance of the Collection" do
       assert @site.collections.is_a?(Hash)
-      assert_not_nil @site.collections["methods"]
+      refute_nil @site.collections["methods"]
       assert @site.collections["methods"].is_a? Jekyll::Collection
     end
 
@@ -135,16 +135,16 @@ class TestCollections < Test::Unit::TestCase
     end
 
     should "not include files which start with an underscore in the base collection directory" do
-      assert_not_include @collection.filtered_entries, "_do_not_read_me.md"
+      refute_include @collection.filtered_entries, "_do_not_read_me.md"
     end
 
     should "not include files which start with an underscore in a subdirectory" do
-      assert_not_include @collection.filtered_entries, "site/_dont_include_me_either.md"
+      refute_include @collection.filtered_entries, "site/_dont_include_me_either.md"
     end
 
     should "not include the underscored files in the list of docs" do
-      assert_not_include @collection.docs.map(&:relative_path), "_methods/_do_not_read_me.md"
-      assert_not_include @collection.docs.map(&:relative_path), "_methods/site/_dont_include_me_either.md"
+      refute_include @collection.docs.map(&:relative_path), "_methods/_do_not_read_me.md"
+      refute_include @collection.docs.map(&:relative_path), "_methods/site/_dont_include_me_either.md"
     end
   end
 
@@ -178,12 +178,12 @@ class TestCollections < Test::Unit::TestCase
     end
 
     should "not allow symlinks" do
-      assert_not_include @collection.filtered_entries, "um_hi.md"
-      assert_not_include @collection.filtered_entries, "/um_hi.md"
+      refute_include @collection.filtered_entries, "um_hi.md"
+      refute_include @collection.filtered_entries, "/um_hi.md"
     end
 
     should "not include the symlinked file in the list of docs" do
-      assert_not_include @collection.docs.map(&:relative_path), "_methods/um_hi.md"
+      refute_include @collection.docs.map(&:relative_path), "_methods/um_hi.md"
     end
   end
 
@@ -198,7 +198,7 @@ class TestCollections < Test::Unit::TestCase
     end
 
     should "exist" do
-      assert_not_nil @collection
+      refute_nil @collection
     end
 
     should "contain one document" do
diff --git a/test/test_command.rb b/test/test_command.rb
index 10ecccc40..3f9d06fb0 100644
--- a/test/test_command.rb
+++ b/test/test_command.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestCommand < Test::Unit::TestCase
+class TestCommand < Minitest::Test
   context "when calling .add_build_options" do
     should "add common options" do
       cmd = Object.new
@@ -13,8 +13,8 @@ class TestCommand < Test::Unit::TestCase
       should "exit with non-zero error code" do
         site = Object.new
         stub(site).process { raise Jekyll::Errors::FatalException }
-        error = assert_raise(SystemExit) { Command.process_site(site) }
-        assert_not_equal 0, error.status
+        error = assert_raises(SystemExit) { Command.process_site(site) }
+        refute_equal 0, error.status
       end
     end
   end
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index fffbc2dbb..e03cb9019 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestConfiguration < Test::Unit::TestCase
+class TestConfiguration < Minitest::Test
   context "#stringify_keys" do
     setup do
       @mixed_keys = Configuration[{
diff --git a/test/test_convertible.rb b/test/test_convertible.rb
index 6482ad901..b8e809b41 100644
--- a/test/test_convertible.rb
+++ b/test/test_convertible.rb
@@ -1,7 +1,7 @@
 require 'helper'
 require 'ostruct'
 
-class TestConvertible < Test::Unit::TestCase
+class TestConvertible < Minitest::Test
   context "yaml front-matter" do
     setup do
       @convertible = OpenStruct.new(
@@ -37,7 +37,7 @@ class TestConvertible < Test::Unit::TestCase
       out = capture_stderr do
         @convertible.read_yaml(@base, 'exploit_front_matter.erb')
       end
-      assert_no_match /undefined class\/module DoesNotExist/, out
+      refute_match /undefined class\/module DoesNotExist/, out
     end
 
     should "not parse if there is encoding error in file" do
diff --git a/test/test_document.rb b/test/test_document.rb
index aa4e2fa93..59044a94b 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestDocument < Test::Unit::TestCase
+class TestDocument < Minitest::Test
 
   context "a document in a collection" do
     setup do
@@ -283,7 +283,7 @@ class TestDocument < Test::Unit::TestCase
 
     context "without output overrides" do
       should "be output according to collection defaults" do
-        assert_not_nil @files.find { |doc| doc.relative_path == "_slides/example-slide-4.html" }
+        refute_nil @files.find { |doc| doc.relative_path == "_slides/example-slide-4.html" }
       end
     end
 
diff --git a/test/test_draft.rb b/test/test_draft.rb
index 5843665b5..127060c1f 100644
--- a/test/test_draft.rb
+++ b/test/test_draft.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestDraft < Test::Unit::TestCase
+class TestDraft < Minitest::Test
   def setup_draft(file)
     Draft.new(@site, source_dir, '', file)
   end
diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb
index 5c5711cb0..d31266b63 100644
--- a/test/test_entry_filter.rb
+++ b/test/test_entry_filter.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestEntryFilter < Test::Unit::TestCase
+class TestEntryFilter < Minitest::Test
   context "Filtering entries" do
     setup do
       @site = Site.new(site_configuration)
@@ -71,8 +71,8 @@ class TestEntryFilter < Test::Unit::TestCase
       site = Site.new(site_configuration)
 
       site.read_directories("symlink-test")
-      assert_not_equal [], site.pages
-      assert_not_equal [], site.static_files
+      refute_equal [], site.pages
+      refute_equal [], site.static_files
     end
   end
 
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index c9a0fdc7f..3ab31f91e 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestExcerpt < Test::Unit::TestCase
+class TestExcerpt < Minitest::Test
   def setup_post(file)
     Post.new(@site, source_dir, '', file)
   end
diff --git a/test/test_filters.rb b/test/test_filters.rb
index cb44b65ba..65d53357e 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -2,7 +2,7 @@
 
 require 'helper'
 
-class TestFilters < Test::Unit::TestCase
+class TestFilters < Minitest::Test
   class JekyllFilter
     include Jekyll::Filters
     attr_accessor :site, :context
diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb
index 2c7930954..2bfd34c62 100644
--- a/test/test_front_matter_defaults.rb
+++ b/test/test_front_matter_defaults.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestFrontMatterDefaults < Test::Unit::TestCase
+class TestFrontMatterDefaults < Minitest::Test
 
   context "A site with full front matter defaults" do
     setup do
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index d3fbc8872..40bcd8c18 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestGeneratedSite < Test::Unit::TestCase
+class TestGeneratedSite < Minitest::Test
   context "generated sites" do
     setup do
       clear_dest
@@ -73,7 +73,7 @@ OUTPUT
     end
 
     should "ensure limit posts is 0 or more" do
-      assert_raise ArgumentError do
+      assert_raises ArgumentError do
         clear_dest
         stub(Jekyll).configuration do
           Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => -1})
@@ -84,7 +84,7 @@ OUTPUT
     end
 
     should "acceptable limit post is 0" do
-      assert_nothing_raised ArgumentError do
+      refute_raises ArgumentError do
         clear_dest
         stub(Jekyll).configuration do
           Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 0})
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index 3998e9d3f..a2954403d 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -2,7 +2,7 @@
 
 require 'helper'
 
-class TestKramdown < Test::Unit::TestCase
+class TestKramdown < Minitest::Test
   context "kramdown" do
     setup do
       @config = {
diff --git a/test/test_layout_reader.rb b/test/test_layout_reader.rb
index ff979c2b1..cd658739e 100644
--- a/test/test_layout_reader.rb
+++ b/test/test_layout_reader.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestLayoutReader < Test::Unit::TestCase
+class TestLayoutReader < Minitest::Test
   context "reading layouts" do
     setup do
       stub(Jekyll).configuration do
diff --git a/test/test_liquid_extensions.rb b/test/test_liquid_extensions.rb
index 2395a8de6..dec13ef69 100644
--- a/test/test_liquid_extensions.rb
+++ b/test/test_liquid_extensions.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestLiquidExtensions < Test::Unit::TestCase
+class TestLiquidExtensions < Minitest::Test
 
   context "looking up a variable in a Liquid context" do
     class SayHi < Liquid::Tag
diff --git a/test/test_log_adapter.rb b/test/test_log_adapter.rb
index 712725694..ad006e1df 100644
--- a/test/test_log_adapter.rb
+++ b/test/test_log_adapter.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestLogAdapter < Test::Unit::TestCase
+class TestLogAdapter < Minitest::Test
   class LoggerDouble
     attr_accessor :level
 
@@ -58,7 +58,7 @@ class TestLogAdapter < Test::Unit::TestCase
     should "call #error and abort" do
       logger = Jekyll::LogAdapter.new(LoggerDouble.new)
       stub(logger).error('topic', 'log message') { true }
-      assert_raise(SystemExit) { logger.abort_with('topic', 'log message') }
+      assert_raises(SystemExit) { logger.abort_with('topic', 'log message') }
     end
   end
 
diff --git a/test/test_new_command.rb b/test/test_new_command.rb
index 544a10c41..6fffb49f7 100644
--- a/test/test_new_command.rb
+++ b/test/test_new_command.rb
@@ -1,7 +1,7 @@
 require 'helper'
 require 'jekyll/commands/new'
 
-class TestNewCommand < Test::Unit::TestCase
+class TestNewCommand < Minitest::Test
   def dir_contents(path)
     Dir["#{path}/**/*"].each do |file|
       file.gsub! path, ''
@@ -79,7 +79,7 @@ class TestNewCommand < Test::Unit::TestCase
 
     should 'force created folder' do
       capture_stdout { Jekyll::Commands::New.process(@args) }
-      assert_nothing_raised(SystemExit) do
+      refute_raises(SystemExit) do
         capture_stdout {Jekyll::Commands::New.process(@args, '--force') }
       end
     end
@@ -108,7 +108,7 @@ class TestNewCommand < Test::Unit::TestCase
     end
 
     should 'raise an ArgumentError' do
-      exception = assert_raise ArgumentError do
+      exception = assert_raises ArgumentError do
         Jekyll::Commands::New.process(@empty_args)
       end
       assert_equal 'You must specify a path.', exception.message
diff --git a/test/test_page.rb b/test/test_page.rb
index 20ed31980..2b5fbbc04 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestPage < Test::Unit::TestCase
+class TestPage < Minitest::Test
   def setup_page(*args)
     dir, file = args
     dir, file = ['', dir] if file.nil?
diff --git a/test/test_path_sanitization.rb b/test/test_path_sanitization.rb
index fa10e8762..bb5a00bea 100644
--- a/test/test_path_sanitization.rb
+++ b/test/test_path_sanitization.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestPathSanitization < Test::Unit::TestCase
+class TestPathSanitization < Minitest::Test
   context "on Windows with absolute source" do
     setup do
       @source = "C:/Users/xmr/Desktop/mpc-hc.org"
diff --git a/test/test_plugin_manager.rb b/test/test_plugin_manager.rb
index 0d12a2547..c4a52889f 100644
--- a/test/test_plugin_manager.rb
+++ b/test/test_plugin_manager.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestPluginManager < Test::Unit::TestCase
+class TestPluginManager < Minitest::Test
   def with_no_gemfile
     FileUtils.mv "Gemfile", "Gemfile.old"
     yield
diff --git a/test/test_post.rb b/test/test_post.rb
index 63684241a..124f0a85a 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -2,7 +2,7 @@
 
 require 'helper'
 
-class TestPost < Test::Unit::TestCase
+class TestPost < Minitest::Test
   def setup_post(file)
     Post.new(@site, source_dir, '', file)
   end
@@ -103,7 +103,7 @@ class TestPost < Test::Unit::TestCase
       end
 
       should "raise a good error on invalid post date" do
-        assert_raise Jekyll::Errors::FatalException do
+        assert_raises Jekyll::Errors::FatalException do
           @post.process("2009-27-03-foo-bar.textile")
         end
       end
diff --git a/test/test_rdiscount.rb b/test/test_rdiscount.rb
index da9401cfb..5eade6b5b 100644
--- a/test/test_rdiscount.rb
+++ b/test/test_rdiscount.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestRdiscount < Test::Unit::TestCase
+class TestRdiscount < Minitest::Test
 
   context "rdiscount" do
     setup do
diff --git a/test/test_redcarpet.rb b/test/test_redcarpet.rb
index ebf3b187f..ff4585f8e 100644
--- a/test/test_redcarpet.rb
+++ b/test/test_redcarpet.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestRedcarpet < Test::Unit::TestCase
+class TestRedcarpet < Minitest::Test
   context "redcarpet" do
     setup do
       @config = {
diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb
index 63ac3bd05..feb5c6479 100644
--- a/test/test_regenerator.rb
+++ b/test/test_regenerator.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestRegenerator < Test::Unit::TestCase
+class TestRegenerator < Minitest::Test
   context "The site regenerator" do
     setup do
       FileUtils.rm_rf(source_dir(".jekyll-metadata"))
@@ -162,7 +162,7 @@ class TestRegenerator < Test::Unit::TestCase
       @regenerator.write_metadata
       @regenerator = Regenerator.new(@site)
 
-      assert_not_same File.mtime(@path), @regenerator.metadata[@path]["mtime"]
+      refute_same File.mtime(@path), @regenerator.metadata[@path]["mtime"]
       assert @regenerator.modified?(@path)
     end
 
diff --git a/test/test_related_posts.rb b/test/test_related_posts.rb
index 054ef9aec..73a8a1ca4 100644
--- a/test/test_related_posts.rb
+++ b/test/test_related_posts.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestRelatedPosts < Test::Unit::TestCase
+class TestRelatedPosts < Minitest::Test
   context "building related posts without lsi" do
     setup do
       stub(Jekyll).configuration do
diff --git a/test/test_sass.rb b/test/test_sass.rb
index 50d174ba1..867b2dccb 100644
--- a/test/test_sass.rb
+++ b/test/test_sass.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestSass < Test::Unit::TestCase
+class TestSass < Minitest::Test
   context "importing partials" do
     setup do
       @site = Jekyll::Site.new(Jekyll.configuration({
diff --git a/test/test_site.rb b/test/test_site.rb
index 409392fd7..a1a24e604 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestSite < Test::Unit::TestCase
+class TestSite < Minitest::Test
   context "configuring sites" do
     should "have an array for plugins by default" do
       site = Site.new(Jekyll::Configuration::DEFAULTS)
@@ -71,7 +71,7 @@ class TestSite < Test::Unit::TestCase
       @site = Site.new(site_configuration)
       @site.read
       @site.generate
-      assert_not_equal 0, @site.pages.size
+      refute_equal 0, @site.pages.size
       assert_equal 'hi', @site.file_read_opts[:secret_message]
     end
 
@@ -118,7 +118,7 @@ class TestSite < Test::Unit::TestCase
       sleep 1
       @site.process
       mtime3 = File.stat(dest).mtime.to_i
-      assert_not_equal mtime2, mtime3 # must be regenerated!
+      refute_equal mtime2, mtime3 # must be regenerated!
 
       sleep 1
       @site.process
@@ -228,13 +228,13 @@ class TestSite < Test::Unit::TestCase
 
     context 'error handling' do
       should "raise if destination is included in source" do
-        assert_raise Jekyll::Errors::FatalException do
+        assert_raises Jekyll::Errors::FatalException do
           site = Site.new(site_configuration('destination' => source_dir))
         end
       end
 
       should "raise if destination is source" do
-        assert_raise Jekyll::Errors::FatalException do
+        assert_raises Jekyll::Errors::FatalException do
           site = Site.new(site_configuration('destination' => File.join(source_dir, "..")))
         end
       end
@@ -309,7 +309,7 @@ class TestSite < Test::Unit::TestCase
 
         custom_processor = "CustomMarkdown"
         s = Site.new(site_configuration('markdown' => custom_processor))
-        assert_nothing_raised do
+        refute_raises do
           s.process
         end
 
@@ -332,7 +332,7 @@ class TestSite < Test::Unit::TestCase
 
         bad_processor = "Custom::Markdown"
         s = Site.new(site_configuration('markdown' => bad_processor, 'full_rebuild' => true))
-        assert_raise Jekyll::Errors::FatalException do
+        assert_raises Jekyll::Errors::FatalException do
           s.process
         end
 
@@ -344,7 +344,7 @@ class TestSite < Test::Unit::TestCase
     context 'with an invalid markdown processor in the configuration' do
       should 'not throw an error at initialization time' do
         bad_processor = 'not a processor name'
-        assert_nothing_raised do
+        refute_raises do
           Site.new(site_configuration('markdown' => bad_processor))
         end
       end
@@ -352,7 +352,7 @@ class TestSite < Test::Unit::TestCase
       should 'throw FatalException at process time' do
         bad_processor = 'not a processor name'
         s = Site.new(site_configuration('markdown' => bad_processor, 'full_rebuild' => true))
-        assert_raise Jekyll::Errors::FatalException do
+        assert_raises Jekyll::Errors::FatalException do
           s.process
         end
       end
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 931c38303..883a6af65 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -2,7 +2,7 @@
 
 require 'helper'
 
-class TestTags < Test::Unit::TestCase
+class TestTags < Minitest::Test
 
   def create_post(content, override = {}, converter_class = Jekyll::Converters::Markdown)
     stub(Jekyll).configuration do
@@ -56,7 +56,7 @@ CONTENT
       assert_match r, "x.y"
       assert_match r, "coffee-script"
 
-      assert_no_match r, "blah^"
+      refute_match r, "blah^"
 
       assert_match r, "ruby key=val"
       assert_match r, "ruby a=b c=d"
@@ -143,7 +143,7 @@ CONTENT
       end
 
       should "not cause a markdown error" do
-        assert_no_match /markdown\-html\-error/, @result
+        refute_match /markdown\-html\-error/, @result
       end
 
       should "render markdown with pygments" do
@@ -410,7 +410,7 @@ CONTENT
     end
 
     should "not cause an error" do
-      assert_no_match /markdown\-html\-error/, @result
+      refute_match /markdown\-html\-error/, @result
     end
 
     should "have the url to the \"complex\" post from 2008-11-21" do
@@ -434,7 +434,7 @@ CONTENT
     end
 
     should "not cause an error" do
-      assert_no_match /markdown\-html\-error/, @result
+      refute_match /markdown\-html\-error/, @result
     end
 
     should "have the url to the \"complex\" post from 2008-11-21" do
@@ -458,7 +458,7 @@ title: Invalid post name linking
 {% post_url abc2008-11-21-complex %}
 CONTENT
 
-      assert_raise ArgumentError do
+      assert_raises ArgumentError do
         create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
       end
     end
@@ -470,7 +470,7 @@ CONTENT
 
       should "not allow symlink includes" do
         File.open("tmp/pages-test", 'w') { |file| file.write("SYMLINK TEST") }
-        assert_raise IOError do
+        assert_raises IOError do
           content = <<CONTENT
 ---
 title: Include symlink
@@ -481,11 +481,11 @@ title: Include symlink
 CONTENT
           create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true, 'safe' => true })
         end
-        assert_no_match /SYMLINK TEST/, @result
+        refute_match /SYMLINK TEST/, @result
       end
 
       should "not expose the existence of symlinked files" do
-        ex = assert_raise IOError do
+        ex = assert_raises IOError do
           content = <<CONTENT
 ---
 title: Include symlink
@@ -532,7 +532,7 @@ title: Invalid parameter syntax
 
 {% include params.html param s="value" %}
 CONTENT
-        assert_raise ArgumentError, 'Did not raise exception on invalid "include" syntax' do
+        assert_raises ArgumentError, 'Did not raise exception on invalid "include" syntax' do
           create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
         end
 
@@ -543,7 +543,7 @@ title: Invalid parameter syntax
 
 {% include params.html params="value %}
 CONTENT
-        assert_raise ArgumentError, 'Did not raise exception on invalid "include" syntax' do
+        assert_raises ArgumentError, 'Did not raise exception on invalid "include" syntax' do
           create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
         end
       end
@@ -636,7 +636,7 @@ CONTENT
       end
 
       should "raise error relative to source directory" do
-        exception = assert_raise IOError do
+        exception = assert_raises IOError do
           create_post(@content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
         end
         assert_equal 'Included file \'_includes/missing.html\' not found', exception.message
@@ -730,7 +730,7 @@ CONTENT
         end
 
         should "raise error relative to source directory" do
-          exception = assert_raise IOError do
+          exception = assert_raises IOError do
             create_post(@content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
           end
           assert_equal 'Included file \'./missing.html\' not found', exception.message
@@ -749,7 +749,7 @@ CONTENT
         end
 
         should "raise error relative to source directory" do
-          exception = assert_raise ArgumentError do
+          exception = assert_raises ArgumentError do
             create_post(@content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
           end
           assert_equal "Invalid syntax for include tag. File contains invalid characters or sequences:\n\n  ../README.markdown\n\nValid syntax:\n\n  {% include_relative file.ext param='value' param2='value' %}\n\n", exception.message
@@ -761,7 +761,7 @@ CONTENT
 
       should "not allow symlink includes" do
         File.open("tmp/pages-test", 'w') { |file| file.write("SYMLINK TEST") }
-        assert_raise IOError do
+        assert_raises IOError do
           content = <<CONTENT
 ---
 title: Include symlink
@@ -772,11 +772,11 @@ title: Include symlink
 CONTENT
           create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true, 'safe' => true })
         end
-        assert_no_match /SYMLINK TEST/, @result
+        refute_match /SYMLINK TEST/, @result
       end
 
       should "not expose the existence of symlinked files" do
-        ex = assert_raise IOError do
+        ex = assert_raises IOError do
           content = <<CONTENT
 ---
 title: Include symlink
diff --git a/test/test_url.rb b/test/test_url.rb
index b66e2f868..462ee0b73 100644
--- a/test/test_url.rb
+++ b/test/test_url.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestURL < Test::Unit::TestCase
+class TestURL < Minitest::Test
   context "The URL class" do
 
     should "throw an exception if neither permalink or template is specified" do
diff --git a/test/test_utils.rb b/test/test_utils.rb
index 594281eb6..50d8d17b4 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestUtils < Test::Unit::TestCase
+class TestUtils < Minitest::Test
   context "hash" do
 
     context "pluralized_array" do
@@ -70,20 +70,20 @@ class TestUtils < Test::Unit::TestCase
     end
 
     should "throw an error if the input contains no date data" do
-      assert_raise Jekyll::Errors::FatalException do
+      assert_raises Jekyll::Errors::FatalException do
         Utils.parse_date("Blah")
       end
     end
 
     should "throw an error if the input is out of range" do
-      assert_raise Jekyll::Errors::FatalException do
+      assert_raises Jekyll::Errors::FatalException do
         Utils.parse_date("9999-99-99")
       end
     end
 
     should "throw an error with the default message if no message is passed in" do
       date = "Blah this is invalid"
-      assert_raise Jekyll::Errors::FatalException, "Invalid date '#{date}': Input could not be parsed." do
+      assert_raises Jekyll::Errors::FatalException, "Invalid date '#{date}': Input could not be parsed." do
         Utils.parse_date(date)
       end
     end
@@ -91,7 +91,7 @@ class TestUtils < Test::Unit::TestCase
     should "throw an error with the provided message if a message is passed in" do
       date = "Blah this is invalid"
       message = "Aaaah, the world has exploded!"
-      assert_raise Jekyll::Errors::FatalException, "Invalid date '#{date}': #{message}" do
+      assert_raises Jekyll::Errors::FatalException, "Invalid date '#{date}': #{message}" do
         Utils.parse_date(date, message)
       end
     end

From 8186873e27324749fe2e7d0533cb1b401545348c Mon Sep 17 00:00:00 2001
From: Merlos <merlos@users.noreply.github.com>
Date: Sat, 21 Feb 2015 03:17:32 +0100
Subject: [PATCH 329/407] Updated plugins: added jekyll-auto-image generator

Added to the plugin list: jekyll-auto-image. A generator that makes available the first image of a post.

By installing the plugin you will be able to access the first image with {{ @page.image }}. This plugin is useful to Include an image on your list of posts or to set a twitter card for each post/page.
---
 site/_docs/plugins.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 1ce5e2e1e..df1f391e3 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -493,6 +493,7 @@ You can find a few useful plugins at the following locations:
 - [Jekyll::AutolinkEmail by Ivan Tse](https://github.com/ivantsepp/jekyll-autolink_email): Autolink your emails.
 - [Jekyll::GitMetadata by Ivan Tse](https://github.com/ivantsepp/jekyll-git_metadata): Expose Git metadata for your templates.
 - [Jekyll Http Basic Auth Plugin](https://gist.github.com/snrbrnjna/422a4b7e017192c284b3): Plugin to manage http basic auth for jekyll generated pages and directories.
+- [Jekyll Auto Image by Merlos](https://github.com/merlos/jekyll-auto-image): Gets the first image of a post. Useful to list your posts with images or to add [twitter cards](https://dev.twitter.com/cards/overview) to your site.
 
 #### Converters
 

From 52c4ce2a5a4b4bf9db03af646bc041a62e89f617 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 21 Feb 2015 00:31:07 -0800
Subject: [PATCH 330/407] Finish of moving the unit tests over to Minitest

---
 Gemfile                     |   1 +
 lib/jekyll/cleaner.rb       | 178 ++++++++++++++++++------------------
 script/test                 |   4 +
 test/helper.rb              |   9 +-
 test/suite.rb               |  11 ---
 test/test_cleaner.rb        |   4 +-
 test/test_coffeescript.rb   |  16 ++--
 test/test_collections.rb    |  16 ++--
 test/test_generated_site.rb |  12 +--
 test/test_new_command.rb    |   5 +-
 test/test_regenerator.rb    |   3 +-
 test/test_site.rb           |   8 +-
 12 files changed, 130 insertions(+), 137 deletions(-)
 delete mode 100644 test/suite.rb

diff --git a/Gemfile b/Gemfile
index 17ecb7dd2..d695524bb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,6 +26,7 @@ gem 'jekyll_test_plugin'
 gem 'jekyll_test_plugin_malicious'
 gem 'liquid-c', '~> 0.0.3'
 gem 'minitest'
+gem 'minitest-reporters'
 gem 'test-unit' if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2")
 
 if ENV['BENCHMARK']
diff --git a/lib/jekyll/cleaner.rb b/lib/jekyll/cleaner.rb
index 0295fb92b..a8b269f45 100644
--- a/lib/jekyll/cleaner.rb
+++ b/lib/jekyll/cleaner.rb
@@ -1,103 +1,101 @@
 require 'set'
 
 module Jekyll
-  class Site
-    # Handles the cleanup of a site's destination before it is built.
-    class Cleaner
-      attr_reader :site
+  # Handles the cleanup of a site's destination before it is built.
+  class Cleaner
+    attr_reader :site
 
-      def initialize(site)
-        @site = site
+    def initialize(site)
+      @site = site
+    end
+
+    # Cleans up the site's destination directory
+    def cleanup!
+      FileUtils.rm_rf(obsolete_files)
+      FileUtils.rm_rf(metadata_file) if @site.full_rebuild?
+    end
+
+    private
+
+    # Private: The list of files and directories to be deleted during cleanup process
+    #
+    # Returns an Array of the file and directory paths
+    def obsolete_files
+      (existing_files - new_files - new_dirs + replaced_files).to_a
+    end
+
+    # Private: The metadata file storing dependency tree and build history
+    #
+    # Returns an Array with the metdata file as the only item
+    def metadata_file
+      [site.regenerator.metadata_file]
+    end
+
+    # Private: The list of existing files, apart from those included in keep_files and hidden files.
+    #
+    # Returns a Set with the file paths
+    def existing_files
+      files = Set.new
+      Dir.glob(site.in_dest_dir("**", "*"), File::FNM_DOTMATCH) do |file|
+        files << file unless file =~ /\/\.{1,2}$/ || file =~ keep_file_regex || keep_dirs.include?(file)
       end
+      files
+    end
 
-      # Cleans up the site's destination directory
-      def cleanup!
-        FileUtils.rm_rf(obsolete_files)
-        FileUtils.rm_rf(metadata_file) if @site.full_rebuild?
+    # Private: The list of files to be created when site is built.
+    #
+    # Returns a Set with the file paths
+    def new_files
+      files = Set.new
+      site.each_site_file { |item| files << item.destination(site.dest) }
+      files
+    end
+
+    # Private: The list of directories to be created when site is built.
+    # These are the parent directories of the files in #new_files.
+    #
+    # Returns a Set with the directory paths
+    def new_dirs
+      new_files.map { |file| parent_dirs(file) }.flatten.to_set
+    end
+
+    # Private: The list of parent directories of a given file
+    #
+    # Returns an Array with the directory paths
+    def parent_dirs(file)
+      parent_dir = File.dirname(file)
+      if parent_dir == site.dest
+        []
+      else
+        [parent_dir] + parent_dirs(parent_dir)
       end
+    end
 
-      private
+    # Private: The list of existing files that will be replaced by a directory during build
+    #
+    # Returns a Set with the file paths
+    def replaced_files
+      new_dirs.select { |dir| File.file?(dir) }.to_set
+    end
 
-      # Private: The list of files and directories to be deleted during cleanup process
-      #
-      # Returns an Array of the file and directory paths
-      def obsolete_files
-        (existing_files - new_files - new_dirs + replaced_files).to_a
-      end
+    # Private: The list of directories that need to be kept because they are parent directories
+    # of files specified in keep_files
+    #
+    # Returns a Set with the directory paths
+    def keep_dirs
+      site.keep_files.map { |file| parent_dirs(site.in_dest_dir(file)) }.flatten.to_set
+    end
 
-      # Private: The metadata file storing dependency tree and build history
-      #
-      # Returns an Array with the metdata file as the only item
-      def metadata_file
-        [site.regenerator.metadata_file]
-      end
-
-      # Private: The list of existing files, apart from those included in keep_files and hidden files.
-      #
-      # Returns a Set with the file paths
-      def existing_files
-        files = Set.new
-        Dir.glob(site.in_dest_dir("**", "*"), File::FNM_DOTMATCH) do |file|
-          files << file unless file =~ /\/\.{1,2}$/ || file =~ keep_file_regex || keep_dirs.include?(file)
-        end
-        files
-      end
-
-      # Private: The list of files to be created when site is built.
-      #
-      # Returns a Set with the file paths
-      def new_files
-        files = Set.new
-        site.each_site_file { |item| files << item.destination(site.dest) }
-        files
-      end
-
-      # Private: The list of directories to be created when site is built.
-      # These are the parent directories of the files in #new_files.
-      #
-      # Returns a Set with the directory paths
-      def new_dirs
-        new_files.map { |file| parent_dirs(file) }.flatten.to_set
-      end
-
-      # Private: The list of parent directories of a given file
-      #
-      # Returns an Array with the directory paths
-      def parent_dirs(file)
-        parent_dir = File.dirname(file)
-        if parent_dir == site.dest
-          []
-        else
-          [parent_dir] + parent_dirs(parent_dir)
-        end
-      end
-
-      # Private: The list of existing files that will be replaced by a directory during build
-      #
-      # Returns a Set with the file paths
-      def replaced_files
-        new_dirs.select { |dir| File.file?(dir) }.to_set
-      end
-
-      # Private: The list of directories that need to be kept because they are parent directories
-      # of files specified in keep_files
-      #
-      # Returns a Set with the directory paths
-      def keep_dirs
-        site.keep_files.map { |file| parent_dirs(site.in_dest_dir(file)) }.flatten.to_set
-      end
-
-      # Private: Creates a regular expression from the config's keep_files array
-      #
-      # Examples
-      #   ['.git','.svn'] creates the following regex: /\/(\.git|\/.svn)/
-      #
-      # Returns the regular expression
-      def keep_file_regex
-        or_list = site.keep_files.join("|")
-        pattern = "\/(#{or_list.gsub(".", "\.")})"
-        Regexp.new pattern
-      end
+    # Private: Creates a regular expression from the config's keep_files array
+    #
+    # Examples
+    #   ['.git','.svn'] creates the following regex: /\/(\.git|\/.svn)/
+    #
+    # Returns the regular expression
+    def keep_file_regex
+      or_list = site.keep_files.join("|")
+      pattern = "\/(#{or_list.gsub(".", "\.")})"
+      Regexp.new pattern
     end
   end
 end
diff --git a/script/test b/script/test
index 87df1f60d..38ae46b63 100755
--- a/script/test
+++ b/script/test
@@ -8,6 +8,10 @@ if [ ! -d tmp ]; then
   mkdir tmp
 fi
 
+if [ -d test/dest ]; then
+  rm -r test/dest
+fi
+
 if [ -z "$1" ]; then
   TEST_FILES=$(ruby -e "puts Dir.glob('test/test_*.rb')")
 else
diff --git a/test/helper.rb b/test/helper.rb
index 6d86db2a3..71133559e 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -8,6 +8,7 @@ end
 require 'rubygems'
 require 'ostruct'
 require 'minitest/autorun'
+require 'minitest/reporters'
 
 require 'jekyll'
 
@@ -23,6 +24,9 @@ include Jekyll
 # Send STDERR into the void to suppress program output messages
 STDERR.reopen(test(?e, '/dev/null') ? '/dev/null' : 'NUL:')
 
+# Report with color.
+Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(:color => true)]
+
 class Minitest::Test
   def fixture_site(overrides = {})
     Jekyll::Site.new(site_configuration(overrides))
@@ -33,7 +37,10 @@ class Minitest::Test
   end
 
   def site_configuration(overrides = {})
-    full_overrides = build_configs(overrides, build_configs({"destination" => dest_dir}))
+    full_overrides = build_configs(overrides, build_configs({
+      "destination" => dest_dir,
+      "full_rebuild" => true
+    }))
     build_configs({
       "source" => source_dir
     }, full_overrides)
diff --git a/test/suite.rb b/test/suite.rb
deleted file mode 100644
index 81b617194..000000000
--- a/test/suite.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'rubygems'
-gem 'test-unit'
-require 'test/unit'
-
-# for some reason these tests fail when run via TextMate
-# but succeed when run on the command line.
-
-tests = Dir[File.expand_path("#{File.dirname(__FILE__)}/test_*.rb")]
-tests.each do |file|
-  require file
-end
diff --git a/test/test_cleaner.rb b/test/test_cleaner.rb
index fb36f59fc..3b45fad75 100644
--- a/test/test_cleaner.rb
+++ b/test/test_cleaner.rb
@@ -12,7 +12,7 @@ class TestCleaner < Minitest::Test
       @site = fixture_site
       @site.keep_files = ['to_keep/child_dir']
 
-      @cleaner = Site::Cleaner.new(@site)
+      @cleaner = Cleaner.new(@site)
       @cleaner.cleanup!
     end
 
@@ -47,7 +47,7 @@ class TestCleaner < Minitest::Test
       @site = fixture_site
       @site.process
 
-      @cleaner = Site::Cleaner.new(@site)
+      @cleaner = Cleaner.new(@site)
       @cleaner.cleanup!
     end
 
diff --git a/test/test_coffeescript.rb b/test/test_coffeescript.rb
index e62fbc0cc..edf6c7d0d 100644
--- a/test/test_coffeescript.rb
+++ b/test/test_coffeescript.rb
@@ -19,16 +19,16 @@ class TestCoffeeScript < Minitest::Test
       return square(x) * x;
     };
     cubes = (function() {
-      var _i, _len, _results;
-      _results = [];
-      for (_i = 0, _len = list.length; _i < _len; _i++) {
-        num = list[_i];
-        _results.push(math.cube(num));
+      var i, len, results;
+      results = [];
+      for (i = 0, len = list.length; i < len; i++) {
+        num = list[i];
+        results.push(math.cube(num));
       }
-      return _results;
+      return results;
     })();
-    if (typeof elvis !== \"undefined\" && elvis !== null) {
-      return alert(\"I knew it!\");
+    if (typeof elvis !== "undefined" && elvis !== null) {
+      return alert("I knew it!");
     }
   });
 
diff --git a/test/test_collections.rb b/test/test_collections.rb
index cdfc8ad40..3e64022ac 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -122,7 +122,7 @@ class TestCollections < Minitest::Test
       assert @site.collections["methods"].docs.is_a? Array
       @site.collections["methods"].docs.each do |doc|
         assert doc.is_a? Jekyll::Document
-        assert_include %w[
+        assert_includes %w[
           _methods/configuration.md
           _methods/sanitized_path.md
           _methods/site/generate.md
@@ -135,16 +135,16 @@ class TestCollections < Minitest::Test
     end
 
     should "not include files which start with an underscore in the base collection directory" do
-      refute_include @collection.filtered_entries, "_do_not_read_me.md"
+      refute_includes @collection.filtered_entries, "_do_not_read_me.md"
     end
 
     should "not include files which start with an underscore in a subdirectory" do
-      refute_include @collection.filtered_entries, "site/_dont_include_me_either.md"
+      refute_includes @collection.filtered_entries, "site/_dont_include_me_either.md"
     end
 
     should "not include the underscored files in the list of docs" do
-      refute_include @collection.docs.map(&:relative_path), "_methods/_do_not_read_me.md"
-      refute_include @collection.docs.map(&:relative_path), "_methods/site/_dont_include_me_either.md"
+      refute_includes @collection.docs.map(&:relative_path), "_methods/_do_not_read_me.md"
+      refute_includes @collection.docs.map(&:relative_path), "_methods/site/_dont_include_me_either.md"
     end
   end
 
@@ -178,12 +178,12 @@ class TestCollections < Minitest::Test
     end
 
     should "not allow symlinks" do
-      refute_include @collection.filtered_entries, "um_hi.md"
-      refute_include @collection.filtered_entries, "/um_hi.md"
+      refute_includes @collection.filtered_entries, "um_hi.md"
+      refute_includes @collection.filtered_entries, "/um_hi.md"
     end
 
     should "not include the symlinked file in the list of docs" do
-      refute_include @collection.docs.map(&:relative_path), "_methods/um_hi.md"
+      refute_includes @collection.docs.map(&:relative_path), "_methods/um_hi.md"
     end
   end
 
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 40bcd8c18..e9c1efbd5 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -84,14 +84,12 @@ OUTPUT
     end
 
     should "acceptable limit post is 0" do
-      refute_raises ArgumentError do
-        clear_dest
-        stub(Jekyll).configuration do
-          Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 0})
-        end
-
-        @site = Site.new(Jekyll.configuration)
+      clear_dest
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 0})
       end
+
+      assert Site.new(Jekyll.configuration), "Couldn't create a site with the given limit_posts."
     end
   end
 end
diff --git a/test/test_new_command.rb b/test/test_new_command.rb
index 6fffb49f7..09332cf94 100644
--- a/test/test_new_command.rb
+++ b/test/test_new_command.rb
@@ -79,9 +79,8 @@ class TestNewCommand < Minitest::Test
 
     should 'force created folder' do
       capture_stdout { Jekyll::Commands::New.process(@args) }
-      refute_raises(SystemExit) do
-        capture_stdout {Jekyll::Commands::New.process(@args, '--force') }
-      end
+      output = capture_stdout { Jekyll::Commands::New.process(@args, '--force') }
+      assert_match /New jekyll site installed in/, output
     end
   end
 
diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb
index feb5c6479..371e711d6 100644
--- a/test/test_regenerator.rb
+++ b/test/test_regenerator.rb
@@ -10,7 +10,8 @@ class TestRegenerator < Minitest::Test
           "methods" => {
             "output" => true
           }
-        }
+        },
+        "full_rebuild" => false
       })
 
       @site.read
diff --git a/test/test_site.rb b/test/test_site.rb
index a1a24e604..6cbfe5be6 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -309,9 +309,7 @@ class TestSite < Minitest::Test
 
         custom_processor = "CustomMarkdown"
         s = Site.new(site_configuration('markdown' => custom_processor))
-        refute_raises do
-          s.process
-        end
+        assert !!s.process
 
         # Do some cleanup, we don't like straggling stuff's.
         Jekyll::Converters::Markdown.send(:remove_const, :CustomMarkdown)
@@ -344,9 +342,7 @@ class TestSite < Minitest::Test
     context 'with an invalid markdown processor in the configuration' do
       should 'not throw an error at initialization time' do
         bad_processor = 'not a processor name'
-        refute_raises do
-          Site.new(site_configuration('markdown' => bad_processor))
-        end
+        assert Site.new(site_configuration('markdown' => bad_processor))
       end
 
       should 'throw FatalException at process time' do

From ace1b6b8d20a78d1ef78542c3d7e0a4b86961fce Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 21 Feb 2015 00:31:25 -0800
Subject: [PATCH 331/407] Migrate the integration tests to minitest, too

---
 features/step_definitions/jekyll_steps.rb | 4 ++--
 features/support/env.rb                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index 176629f67..5e0509e1e 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -27,7 +27,7 @@ After do
   Dir.chdir(File.dirname(TEST_DIR))
 end
 
-World(Test::Unit::Assertions)
+World(Minitest::Assertions)
 
 Given /^I have a blank site in "(.*)"$/ do |path|
   FileUtils.mkdir_p(path) unless File.exist?(path)
@@ -191,7 +191,7 @@ Then /^I should see exactly "(.*)" in "(.*)"$/ do |text, file|
 end
 
 Then /^I should not see "(.*)" in "(.*)"$/ do |text, file|
-  assert_no_match Regexp.new(text, Regexp::MULTILINE), file_contents(file)
+  refute_match Regexp.new(text, Regexp::MULTILINE), file_contents(file)
 end
 
 Then /^I should see escaped "(.*)" in "(.*)"$/ do |text, file|
diff --git a/features/support/env.rb b/features/support/env.rb
index e995ba9b3..8f33ff63d 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -1,7 +1,7 @@
 require 'fileutils'
 require 'posix-spawn'
 require 'rr'
-require 'test/unit'
+require 'minitest/assertions'
 require 'time'
 
 JEKYLL_SOURCE_DIR = File.dirname(File.dirname(File.dirname(__FILE__)))

From 7ad0597bff367fe78154fac09091d3041ee7b63f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 21 Feb 2015 00:33:47 -0800
Subject: [PATCH 332/407] Make our own Minitest::Test subclass for further
 subclassing

---
 test/helper.rb                     | 2 +-
 test/test_cleaner.rb               | 2 +-
 test/test_coffeescript.rb          | 2 +-
 test/test_collections.rb           | 2 +-
 test/test_command.rb               | 2 +-
 test/test_configuration.rb         | 2 +-
 test/test_convertible.rb           | 2 +-
 test/test_document.rb              | 2 +-
 test/test_draft.rb                 | 2 +-
 test/test_entry_filter.rb          | 2 +-
 test/test_excerpt.rb               | 2 +-
 test/test_filters.rb               | 2 +-
 test/test_front_matter_defaults.rb | 2 +-
 test/test_generated_site.rb        | 2 +-
 test/test_kramdown.rb              | 2 +-
 test/test_layout_reader.rb         | 2 +-
 test/test_liquid_extensions.rb     | 2 +-
 test/test_log_adapter.rb           | 2 +-
 test/test_new_command.rb           | 2 +-
 test/test_page.rb                  | 2 +-
 test/test_path_sanitization.rb     | 2 +-
 test/test_plugin_manager.rb        | 2 +-
 test/test_post.rb                  | 2 +-
 test/test_rdiscount.rb             | 2 +-
 test/test_redcarpet.rb             | 2 +-
 test/test_regenerator.rb           | 2 +-
 test/test_related_posts.rb         | 2 +-
 test/test_sass.rb                  | 2 +-
 test/test_site.rb                  | 2 +-
 test/test_tags.rb                  | 2 +-
 test/test_url.rb                   | 2 +-
 test/test_utils.rb                 | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/test/helper.rb b/test/helper.rb
index 71133559e..257b2db9c 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -27,7 +27,7 @@ STDERR.reopen(test(?e, '/dev/null') ? '/dev/null' : 'NUL:')
 # Report with color.
 Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(:color => true)]
 
-class Minitest::Test
+class JekyllUnitTest < Minitest::Test
   def fixture_site(overrides = {})
     Jekyll::Site.new(site_configuration(overrides))
   end
diff --git a/test/test_cleaner.rb b/test/test_cleaner.rb
index 3b45fad75..819dbf5cd 100644
--- a/test/test_cleaner.rb
+++ b/test/test_cleaner.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestCleaner < Minitest::Test
+class TestCleaner < JekyllUnitTest
   context "directory in keep_files" do
     setup do
       clear_dest
diff --git a/test/test_coffeescript.rb b/test/test_coffeescript.rb
index edf6c7d0d..68e19a52a 100644
--- a/test/test_coffeescript.rb
+++ b/test/test_coffeescript.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestCoffeeScript < Minitest::Test
+class TestCoffeeScript < JekyllUnitTest
   context "converting CoffeeScript" do
     setup do
       External.require_with_graceful_fail('jekyll-coffeescript')
diff --git a/test/test_collections.rb b/test/test_collections.rb
index 3e64022ac..3cae5c30d 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestCollections < Minitest::Test
+class TestCollections < JekyllUnitTest
   context "an evil collection" do
     setup do
       @collection = Jekyll::Collection.new(fixture_site, "../../etc/password")
diff --git a/test/test_command.rb b/test/test_command.rb
index 3f9d06fb0..fb9e247bd 100644
--- a/test/test_command.rb
+++ b/test/test_command.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestCommand < Minitest::Test
+class TestCommand < JekyllUnitTest
   context "when calling .add_build_options" do
     should "add common options" do
       cmd = Object.new
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index e03cb9019..7e14a4189 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestConfiguration < Minitest::Test
+class TestConfiguration < JekyllUnitTest
   context "#stringify_keys" do
     setup do
       @mixed_keys = Configuration[{
diff --git a/test/test_convertible.rb b/test/test_convertible.rb
index b8e809b41..09c697374 100644
--- a/test/test_convertible.rb
+++ b/test/test_convertible.rb
@@ -1,7 +1,7 @@
 require 'helper'
 require 'ostruct'
 
-class TestConvertible < Minitest::Test
+class TestConvertible < JekyllUnitTest
   context "yaml front-matter" do
     setup do
       @convertible = OpenStruct.new(
diff --git a/test/test_document.rb b/test/test_document.rb
index 59044a94b..654532daf 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestDocument < Minitest::Test
+class TestDocument < JekyllUnitTest
 
   context "a document in a collection" do
     setup do
diff --git a/test/test_draft.rb b/test/test_draft.rb
index 127060c1f..7312c8c9a 100644
--- a/test/test_draft.rb
+++ b/test/test_draft.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestDraft < Minitest::Test
+class TestDraft < JekyllUnitTest
   def setup_draft(file)
     Draft.new(@site, source_dir, '', file)
   end
diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb
index d31266b63..e3a7e8c02 100644
--- a/test/test_entry_filter.rb
+++ b/test/test_entry_filter.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestEntryFilter < Minitest::Test
+class TestEntryFilter < JekyllUnitTest
   context "Filtering entries" do
     setup do
       @site = Site.new(site_configuration)
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index 3ab31f91e..ac4771762 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestExcerpt < Minitest::Test
+class TestExcerpt < JekyllUnitTest
   def setup_post(file)
     Post.new(@site, source_dir, '', file)
   end
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 65d53357e..eec08564f 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -2,7 +2,7 @@
 
 require 'helper'
 
-class TestFilters < Minitest::Test
+class TestFilters < JekyllUnitTest
   class JekyllFilter
     include Jekyll::Filters
     attr_accessor :site, :context
diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb
index 2bfd34c62..0c7f5bf49 100644
--- a/test/test_front_matter_defaults.rb
+++ b/test/test_front_matter_defaults.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestFrontMatterDefaults < Minitest::Test
+class TestFrontMatterDefaults < JekyllUnitTest
 
   context "A site with full front matter defaults" do
     setup do
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index e9c1efbd5..fee492bc3 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestGeneratedSite < Minitest::Test
+class TestGeneratedSite < JekyllUnitTest
   context "generated sites" do
     setup do
       clear_dest
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index a2954403d..7101baaae 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -2,7 +2,7 @@
 
 require 'helper'
 
-class TestKramdown < Minitest::Test
+class TestKramdown < JekyllUnitTest
   context "kramdown" do
     setup do
       @config = {
diff --git a/test/test_layout_reader.rb b/test/test_layout_reader.rb
index cd658739e..fc2f1fc3f 100644
--- a/test/test_layout_reader.rb
+++ b/test/test_layout_reader.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestLayoutReader < Minitest::Test
+class TestLayoutReader < JekyllUnitTest
   context "reading layouts" do
     setup do
       stub(Jekyll).configuration do
diff --git a/test/test_liquid_extensions.rb b/test/test_liquid_extensions.rb
index dec13ef69..0ab95e94e 100644
--- a/test/test_liquid_extensions.rb
+++ b/test/test_liquid_extensions.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestLiquidExtensions < Minitest::Test
+class TestLiquidExtensions < JekyllUnitTest
 
   context "looking up a variable in a Liquid context" do
     class SayHi < Liquid::Tag
diff --git a/test/test_log_adapter.rb b/test/test_log_adapter.rb
index ad006e1df..99b243bcd 100644
--- a/test/test_log_adapter.rb
+++ b/test/test_log_adapter.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestLogAdapter < Minitest::Test
+class TestLogAdapter < JekyllUnitTest
   class LoggerDouble
     attr_accessor :level
 
diff --git a/test/test_new_command.rb b/test/test_new_command.rb
index 09332cf94..2e0fd45ce 100644
--- a/test/test_new_command.rb
+++ b/test/test_new_command.rb
@@ -1,7 +1,7 @@
 require 'helper'
 require 'jekyll/commands/new'
 
-class TestNewCommand < Minitest::Test
+class TestNewCommand < JekyllUnitTest
   def dir_contents(path)
     Dir["#{path}/**/*"].each do |file|
       file.gsub! path, ''
diff --git a/test/test_page.rb b/test/test_page.rb
index 2b5fbbc04..1c8dc215d 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestPage < Minitest::Test
+class TestPage < JekyllUnitTest
   def setup_page(*args)
     dir, file = args
     dir, file = ['', dir] if file.nil?
diff --git a/test/test_path_sanitization.rb b/test/test_path_sanitization.rb
index bb5a00bea..2a3182e30 100644
--- a/test/test_path_sanitization.rb
+++ b/test/test_path_sanitization.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestPathSanitization < Minitest::Test
+class TestPathSanitization < JekyllUnitTest
   context "on Windows with absolute source" do
     setup do
       @source = "C:/Users/xmr/Desktop/mpc-hc.org"
diff --git a/test/test_plugin_manager.rb b/test/test_plugin_manager.rb
index c4a52889f..9cdb45d88 100644
--- a/test/test_plugin_manager.rb
+++ b/test/test_plugin_manager.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestPluginManager < Minitest::Test
+class TestPluginManager < JekyllUnitTest
   def with_no_gemfile
     FileUtils.mv "Gemfile", "Gemfile.old"
     yield
diff --git a/test/test_post.rb b/test/test_post.rb
index 124f0a85a..ef5b4a46a 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -2,7 +2,7 @@
 
 require 'helper'
 
-class TestPost < Minitest::Test
+class TestPost < JekyllUnitTest
   def setup_post(file)
     Post.new(@site, source_dir, '', file)
   end
diff --git a/test/test_rdiscount.rb b/test/test_rdiscount.rb
index 5eade6b5b..ea1756d71 100644
--- a/test/test_rdiscount.rb
+++ b/test/test_rdiscount.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestRdiscount < Minitest::Test
+class TestRdiscount < JekyllUnitTest
 
   context "rdiscount" do
     setup do
diff --git a/test/test_redcarpet.rb b/test/test_redcarpet.rb
index ff4585f8e..909df7bf7 100644
--- a/test/test_redcarpet.rb
+++ b/test/test_redcarpet.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestRedcarpet < Minitest::Test
+class TestRedcarpet < JekyllUnitTest
   context "redcarpet" do
     setup do
       @config = {
diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb
index 371e711d6..158194878 100644
--- a/test/test_regenerator.rb
+++ b/test/test_regenerator.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestRegenerator < Minitest::Test
+class TestRegenerator < JekyllUnitTest
   context "The site regenerator" do
     setup do
       FileUtils.rm_rf(source_dir(".jekyll-metadata"))
diff --git a/test/test_related_posts.rb b/test/test_related_posts.rb
index 73a8a1ca4..645f2bfbb 100644
--- a/test/test_related_posts.rb
+++ b/test/test_related_posts.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestRelatedPosts < Minitest::Test
+class TestRelatedPosts < JekyllUnitTest
   context "building related posts without lsi" do
     setup do
       stub(Jekyll).configuration do
diff --git a/test/test_sass.rb b/test/test_sass.rb
index 867b2dccb..153c339af 100644
--- a/test/test_sass.rb
+++ b/test/test_sass.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestSass < Minitest::Test
+class TestSass < JekyllUnitTest
   context "importing partials" do
     setup do
       @site = Jekyll::Site.new(Jekyll.configuration({
diff --git a/test/test_site.rb b/test/test_site.rb
index 6cbfe5be6..c460d873f 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestSite < Minitest::Test
+class TestSite < JekyllUnitTest
   context "configuring sites" do
     should "have an array for plugins by default" do
       site = Site.new(Jekyll::Configuration::DEFAULTS)
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 883a6af65..4db4ab856 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -2,7 +2,7 @@
 
 require 'helper'
 
-class TestTags < Minitest::Test
+class TestTags < JekyllUnitTest
 
   def create_post(content, override = {}, converter_class = Jekyll::Converters::Markdown)
     stub(Jekyll).configuration do
diff --git a/test/test_url.rb b/test/test_url.rb
index 462ee0b73..e4529be7c 100644
--- a/test/test_url.rb
+++ b/test/test_url.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestURL < Minitest::Test
+class TestURL < JekyllUnitTest
   context "The URL class" do
 
     should "throw an exception if neither permalink or template is specified" do
diff --git a/test/test_utils.rb b/test/test_utils.rb
index 50d8d17b4..ddb63d4bf 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestUtils < Minitest::Test
+class TestUtils < JekyllUnitTest
   context "hash" do
 
     context "pluralized_array" do

From c40272cebd4a923fd5c0006b39323a7d94b4f32c Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 21 Feb 2015 14:45:42 -0800
Subject: [PATCH 333/407] Update history to reflect merge of #3492 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 813896fce..1ccfd93f8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -77,6 +77,7 @@
   * Factor out a `read_data_file` call to keep things clean (#3380)
   * Proof the site with CircleCI. (#3427)
   * Update LICENSE to 2015. (#3477)
+  * Upgrade tests to use Minitest (#3492)
 
 ### Site Enhancements
 

From ae244c442579ce384ae6d1fdce047e01ae45287a Mon Sep 17 00:00:00 2001
From: ChaYoung You <yousbe@gmail.com>
Date: Sun, 22 Feb 2015 18:31:46 +0900
Subject: [PATCH 334/407] Ignore .jekyll-metadata

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

diff --git a/lib/site_template/.gitignore b/lib/site_template/.gitignore
index badbc02f6..45c150536 100644
--- a/lib/site_template/.gitignore
+++ b/lib/site_template/.gitignore
@@ -1,2 +1,3 @@
 _site
 .sass-cache
+.jekyll-metadata

From 7db9397a9d8b435bf9daad30803cd66ecdddae4f Mon Sep 17 00:00:00 2001
From: ChaYoung You <yousbe@gmail.com>
Date: Sun, 22 Feb 2015 20:27:15 +0900
Subject: [PATCH 335/407] Remove trailing whitespace

---
 benchmark/flat-map                                        | 1 -
 lib/jekyll/commands/new.rb                                | 6 +++---
 site/_docs/usage.md                                       | 6 +++---
 site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown | 2 --
 site/_posts/2013-12-09-jekyll-1-4-1-released.markdown     | 2 --
 test/fixtures/broken_front_matter3.erb                    | 1 -
 test/source/+/%# +.md                                     | 2 +-
 test/source/_posts/2008-02-02-published.textile           | 1 -
 test/source/deal.with.dots.html                           | 1 -
 9 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/benchmark/flat-map b/benchmark/flat-map
index b10c5c9a8..547bcee12 100644
--- a/benchmark/flat-map
+++ b/benchmark/flat-map
@@ -14,4 +14,3 @@ Benchmark.ips do |x|
   x.report('.map.flatten with no nested arrays') { enum.map { |i| do_thing(i) }.flatten(1) }
   x.report('.flat_map with no nested arrays')    { enum.flat_map { |i| do_thing(i) } }
 end
-
diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index 724a1d8d9..433d33b79 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -3,7 +3,7 @@ require 'erb'
 module Jekyll
   module Commands
     class New < Command
-      class << self 
+      class << self
         def init_with_program(prog)
           prog.command(:new) do |c|
             c.syntax 'new PATH'
@@ -11,7 +11,7 @@ module Jekyll
 
             c.option 'force', '--force', 'Force creation even if PATH already exists'
             c.option 'blank', '--blank', 'Creates scaffolding but with empty files'
-            
+
             c.action do |args, options|
               Jekyll::Commands::New.process(args, options)
             end
@@ -76,7 +76,7 @@ module Jekyll
         def scaffold_path
           "_posts/0000-00-00-welcome-to-jekyll.markdown.erb"
         end
-      end  
+      end
     end
   end
 end
diff --git a/site/_docs/usage.md b/site/_docs/usage.md
index 38dabf7f5..7a424bd43 100644
--- a/site/_docs/usage.md
+++ b/site/_docs/usage.md
@@ -27,12 +27,12 @@ $ jekyll build --watch
   <p>
     The contents of <code>&lt;destination&gt;</code> are automatically
     cleaned, by default, when the site is built. Files or folders that are not
-    created by your site will be removed. Files and folders you wish to retain 
-    in <code>&lt;destination&gt;</code> may be specified within the <code>&lt;keep_files&gt;</code> 
+    created by your site will be removed. Files and folders you wish to retain
+    in <code>&lt;destination&gt;</code> may be specified within the <code>&lt;keep_files&gt;</code>
     configuration directive.
   </p>
   <p>
-    Do not use an important location for <code>&lt;destination&gt;</code>; 
+    Do not use an important location for <code>&lt;destination&gt;</code>;
     instead, use it as a staging area and copy files from there to your web server.
   </p>
 </div>
diff --git a/site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown b/site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
index 5a64cfc95..1e3e44cee 100644
--- a/site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
+++ b/site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
@@ -15,5 +15,3 @@ greatest code a spin without having to clone a repository from git.
 Please take this prerelease for a spin and [let us
 know](https://github.com/jekyll/jekyll/issues/new) if you run into any
 issues!
-
-
diff --git a/site/_posts/2013-12-09-jekyll-1-4-1-released.markdown b/site/_posts/2013-12-09-jekyll-1-4-1-released.markdown
index 509571b36..634071582 100644
--- a/site/_posts/2013-12-09-jekyll-1-4-1-released.markdown
+++ b/site/_posts/2013-12-09-jekyll-1-4-1-released.markdown
@@ -16,5 +16,3 @@ keep on writing without any problems.
 
 As always, you can find the full list of fixes in this release in the
 [change log](/docs/history/)!
-
-
diff --git a/test/fixtures/broken_front_matter3.erb b/test/fixtures/broken_front_matter3.erb
index 5fff53b75..0672ae433 100644
--- a/test/fixtures/broken_front_matter3.erb
+++ b/test/fixtures/broken_front_matter3.erb
@@ -4,4 +4,3 @@ test: good
 Real content starts here
 
 ������� �����
-
diff --git a/test/source/+/%# +.md b/test/source/+/%# +.md
index a850f4dce..18e9cccc2 100644
--- a/test/source/+/%# +.md	
+++ b/test/source/+/%# +.md	
@@ -1,6 +1,6 @@
 ---
 layout: default
-title : Page name with non-alphabetic character 
+title : Page name with non-alphabetic character
 ---
 Line 1
 {{ page.title }}
diff --git a/test/source/_posts/2008-02-02-published.textile b/test/source/_posts/2008-02-02-published.textile
index 786514084..5b2428e48 100644
--- a/test/source/_posts/2008-02-02-published.textile
+++ b/test/source/_posts/2008-02-02-published.textile
@@ -5,4 +5,3 @@ category: publish_test
 ---
 
 This should be published.
-
diff --git a/test/source/deal.with.dots.html b/test/source/deal.with.dots.html
index a69dac8c3..afe2aa11c 100644
--- a/test/source/deal.with.dots.html
+++ b/test/source/deal.with.dots.html
@@ -4,4 +4,3 @@ permalink: /deal.with.dots/
 ---
 
 Let's test if jekyll deals properly with dots.
-

From 6bc3dee98dd996c04a3ef9c5a6309649c10e91a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joop=20Au=C3=A9?= <joopaue@gmail.com>
Date: Sun, 22 Feb 2015 18:42:12 +0100
Subject: [PATCH 336/407] Changed doc link in template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changed the doc link in the template to link to /docs/home instead of /

Signed-off-by: Joop Aué <joopaue@gmail.com>
---
 .../_posts/0000-00-00-welcome-to-jekyll.markdown.erb          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb b/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
index 7b633992e..4e0dd691e 100644
--- a/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
+++ b/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
@@ -18,8 +18,8 @@ print_hi('Tom')
 #=> prints 'Hi, Tom' to STDOUT.
 {% endhighlight %}
 
-Check out the [Jekyll docs][jekyll] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll’s dedicated Help repository][jekyll-help].
+Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll’s dedicated Help repository][jekyll-help].
 
-[jekyll]:      http://jekyllrb.com
+[jekyll-docs]:      http://jekyllrb.com/docs/home
 [jekyll-gh]:   https://github.com/jekyll/jekyll
 [jekyll-help]: https://github.com/jekyll/jekyll-help

From 1923fc39df1c279a69b00c3a9f472a4d57b777f2 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 22 Feb 2015 21:20:57 -0800
Subject: [PATCH 337/407] Update history to reflect merge of #3497 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1ccfd93f8..2d57ad7bb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -78,6 +78,7 @@
   * Proof the site with CircleCI. (#3427)
   * Update LICENSE to 2015. (#3477)
   * Upgrade tests to use Minitest (#3492)
+  * Remove trailing whitespace (#3497)
 
 ### Site Enhancements
 

From 6cc298d615f043861e195a87027d618dece76da4 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 22 Feb 2015 21:21:31 -0800
Subject: [PATCH 338/407] Update history to reflect merge of #3496 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 2d57ad7bb..b50a42a74 100644
--- a/History.markdown
+++ b/History.markdown
@@ -61,6 +61,7 @@
   * The highlight tag should only clip the newlines before and after the *entire* block, not in between (#3401)
   * highlight: fix problem with linenos and rouge. (#3436)
   * `Site#read_data_file`: read CSV's with proper file encoding (#3455)
+  * Ignore `.jekyll-metadata` in site template (#3496)
 
 ### Development Fixes
 

From faa5a446ba3f63c4737a8d61d9f9170704b1ce20 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 23 Feb 2015 01:25:42 -0800
Subject: [PATCH 339/407] Update history to reflect merge of #3502 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b50a42a74..e0fde4e95 100644
--- a/History.markdown
+++ b/History.markdown
@@ -62,6 +62,7 @@
   * highlight: fix problem with linenos and rouge. (#3436)
   * `Site#read_data_file`: read CSV's with proper file encoding (#3455)
   * Ignore `.jekyll-metadata` in site template (#3496)
+  * Template: Point documentation link to the documentation pages (#3502)
 
 ### Development Fixes
 

From 5c388309b29a8822b1bb50807b770aaa692ef438 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 23 Feb 2015 01:25:58 -0800
Subject: [PATCH 340/407] Spacing. [ci skip]

---
 .../_posts/0000-00-00-welcome-to-jekyll.markdown.erb            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb b/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
index 4e0dd691e..945562f4d 100644
--- a/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
+++ b/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
@@ -20,6 +20,6 @@ print_hi('Tom')
 
 Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll’s dedicated Help repository][jekyll-help].
 
-[jekyll-docs]:      http://jekyllrb.com/docs/home
+[jekyll-docs]: http://jekyllrb.com/docs/home
 [jekyll-gh]:   https://github.com/jekyll/jekyll
 [jekyll-help]: https://github.com/jekyll/jekyll-help

From 13f822787783fa7a16e16d7468969054b7293e6c Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Tue, 24 Feb 2015 22:04:49 +0100
Subject: [PATCH 341/407] Implemented the "Improve this page" feature. #3495

Created an "Improve this page" link for all the documentation headers. The
feature uses the fa-pencil icon of font awesome. Improvement over #3504(closed).

See issue #3495 for more information.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 site/_layouts/docs.html       | 3 +++
 site/_sass/_font-awesome.scss | 3 +++
 site/_sass/_style.scss        | 6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/site/_layouts/docs.html b/site/_layouts/docs.html
index a0a8a5c14..d4d080263 100644
--- a/site/_layouts/docs.html
+++ b/site/_layouts/docs.html
@@ -9,6 +9,9 @@ layout: default
 
       <div class="unit four-fifths">
         <article>
+          <div class="improve right">
+            <a href="https://github.com/jekyll/jekyll/edit/master/site/{{ page.path }}">Improve this page <i class="fa fa-pencil"></i></a>
+          </div>
           <h1>{{ page.title }}</h1>
           {{ content }}
           {% include section_nav.html %}
diff --git a/site/_sass/_font-awesome.scss b/site/_sass/_font-awesome.scss
index 24ae2b613..d90676c2b 100644
--- a/site/_sass/_font-awesome.scss
+++ b/site/_sass/_font-awesome.scss
@@ -20,3 +20,6 @@
 .fa-link:before {
   content: "\f0c1";
 }
+.fa-pencil:before {
+  content: "\f040";
+}
diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss
index 98ebebaaf..154887dcd 100644
--- a/site/_sass/_style.scss
+++ b/site/_sass/_style.scss
@@ -528,6 +528,12 @@ aside {
   }
 }
 
+.improve {
+  margin-top: 0;
+  padding: 25px 0 0;
+  font-size: 16px;
+}
+
 .docs-nav-mobile select {
   color: #000;
   width: 100%;

From e2306ed79bf9f01bbee83608c2892b80185ba557 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Tue, 24 Feb 2015 22:12:05 +0100
Subject: [PATCH 342/407] Removed unnecessary margin and simplified padding.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 site/_sass/_style.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss
index 154887dcd..0b8ff267d 100644
--- a/site/_sass/_style.scss
+++ b/site/_sass/_style.scss
@@ -529,8 +529,7 @@ aside {
 }
 
 .improve {
-  margin-top: 0;
-  padding: 25px 0 0;
+  padding-top: 25px;
   font-size: 16px;
 }
 

From a4db7ec63c4692ff7d279955110ac11a6f794fb2 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 25 Feb 2015 00:00:57 +0100
Subject: [PATCH 343/407] Put the pencil icon in front of the improve link.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 site/_layouts/docs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_layouts/docs.html b/site/_layouts/docs.html
index d4d080263..5388a213f 100644
--- a/site/_layouts/docs.html
+++ b/site/_layouts/docs.html
@@ -10,7 +10,7 @@ layout: default
       <div class="unit four-fifths">
         <article>
           <div class="improve right">
-            <a href="https://github.com/jekyll/jekyll/edit/master/site/{{ page.path }}">Improve this page <i class="fa fa-pencil"></i></a>
+            <a href="https://github.com/jekyll/jekyll/edit/master/site/{{ page.path }}"><i class="fa fa-pencil"></i> &nbsp;Improve this page</a>
           </div>
           <h1>{{ page.title }}</h1>
           {{ content }}

From 422fd7d3043919f14d3acae1e5b73be7efc43697 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Tue, 24 Feb 2015 20:30:18 -0800
Subject: [PATCH 344/407] Use `fixture_site` for Document tests

Should fix #3500
---
 test/test_document.rb | 79 +++++++++++++++----------------------------
 1 file changed, 27 insertions(+), 52 deletions(-)

diff --git a/test/test_document.rb b/test/test_document.rb
index 654532daf..b6160bdc4 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -4,11 +4,9 @@ class TestDocument < JekyllUnitTest
 
   context "a document in a collection" do
     setup do
-      @site = Site.new(Jekyll.configuration({
-        "collections" => ["methods"],
-        "source"      => source_dir,
-        "destination" => dest_dir
-      }))
+      @site = fixture_site({
+        "collections" => ["methods"]
+      })
       @site.process
       @document = @site.collections["methods"].docs.first
     end
@@ -47,11 +45,9 @@ class TestDocument < JekyllUnitTest
     context "with YAML ending in three dots" do
 
       setup do
-        @site = Site.new(Jekyll.configuration({
+        @site = fixture_site({
           "collections" => ["methods"],
-          "source"      => source_dir,
-          "destination" => dest_dir
-        }))
+        })
         @site.process
         @document = @site.collections["methods"].docs.last
       end
@@ -76,10 +72,8 @@ class TestDocument < JekyllUnitTest
 
   context "a document as part of a collection with frontmatter defaults" do
     setup do
-      @site = Site.new(Jekyll.configuration({
+      @site = fixture_site({
         "collections" => ["slides"],
-        "source"      => source_dir,
-        "destination" => dest_dir,
         "defaults" => [{
           "scope"=> {"path"=>"", "type"=>"slides"},
           "values"=> {
@@ -88,7 +82,7 @@ class TestDocument < JekyllUnitTest
             }
           }
         }]
-      }))
+      })
       @site.process
       @document = @site.collections["slides"].docs.select{|d| d.is_a?(Document) }.first
     end
@@ -106,10 +100,8 @@ class TestDocument < JekyllUnitTest
 
   context "a document as part of a collection with overriden default values" do
     setup do
-      @site = Site.new(Jekyll.configuration({
+      @site = fixture_site({
         "collections" => ["slides"],
-        "source"      => source_dir,
-        "destination" => dest_dir,
         "defaults" => [{
           "scope"=> {"path"=>"", "type"=>"slides"},
           "values"=> {
@@ -119,7 +111,7 @@ class TestDocument < JekyllUnitTest
             }
           }
         }]
-      }))
+      })
       @site.process
       @document = @site.collections["slides"].docs[1]
     end
@@ -138,10 +130,8 @@ class TestDocument < JekyllUnitTest
 
   context "a document as part of a collection with valid path" do
     setup do
-      @site = Site.new(Jekyll.configuration({
+      @site = fixture_site({
         "collections" => ["slides"],
-        "source"      => source_dir,
-        "destination" => dest_dir,
         "defaults" => [{
           "scope"=> {"path"=>"slides", "type"=>"slides"},
           "values"=> {
@@ -150,7 +140,7 @@ class TestDocument < JekyllUnitTest
             }
           }
         }]
-      }))
+      })
       @site.process
       @document = @site.collections["slides"].docs.first
     end
@@ -168,10 +158,8 @@ class TestDocument < JekyllUnitTest
 
   context "a document as part of a collection with invalid path" do
     setup do
-      @site = Site.new(Jekyll.configuration({
+      @site = fixture_site({
         "collections" => ["slides"],
-        "source"      => source_dir,
-        "destination" => dest_dir,
         "defaults" => [{
           "scope"=> {"path"=>"somepath", "type"=>"slides"},
           "values"=> {
@@ -180,7 +168,7 @@ class TestDocument < JekyllUnitTest
             }
           }
         }]
-      }))
+      })
       @site.process
       @document = @site.collections["slides"].docs.first
     end
@@ -195,11 +183,9 @@ class TestDocument < JekyllUnitTest
 
   context "a document in a collection with a custom permalink" do
     setup do
-      @site = Site.new(Jekyll.configuration({
-        "collections" => ["slides"],
-        "source"      => source_dir,
-        "destination" => dest_dir
-      }))
+      @site = fixture_site({
+        "collections" => ["slides"]
+      })
       @site.process
       @document = @site.collections["slides"].docs[2]
       @dest_file = dest_dir("slide/3/index.html")
@@ -216,16 +202,14 @@ class TestDocument < JekyllUnitTest
 
   context "a document in a collection with custom filename permalinks" do
     setup do
-      @site = Site.new(Jekyll.configuration({
+      @site = fixture_site({
         "collections" => {
           "slides" => {
             "output"    => true,
             "permalink" => "/slides/test/:name"
           }
         },
-        "source"      => source_dir,
-        "destination" => dest_dir
-      }))
+      })
       @site.process
       @document = @site.collections["slides"].docs[0]
     end
@@ -237,16 +221,14 @@ class TestDocument < JekyllUnitTest
 
   context "documents in a collection with custom title permalinks" do
     setup do
-      @site = Site.new(Jekyll.configuration({
+      @site = fixture_site({
         "collections" => {
           "slides" => {
             "output"    => true,
             "permalink" => "/slides/:title"
           }
         },
-        "source"      => source_dir,
-        "destination" => dest_dir
-      }))
+      })
       @site.process
       @document = @site.collections["slides"].docs[3]
       @document_without_slug = @site.collections["slides"].docs[4]
@@ -268,15 +250,13 @@ class TestDocument < JekyllUnitTest
 
   context "documents in a collection" do
     setup do
-      @site = Site.new(Jekyll.configuration({
+      @site = fixture_site({
         "collections" => {
           "slides" => {
             "output" => true
           }
         },
-        "source"      => source_dir,
-        "destination" => dest_dir
-      }))
+      })
       @site.process
       @files = @site.collections["slides"].docs
     end
@@ -296,16 +276,13 @@ class TestDocument < JekyllUnitTest
 
   context "a static file in a collection" do
     setup do
-      @site = Site.new(Jekyll.configuration({
+      @site = fixture_site({
         "collections" => {
           "slides" => {
             "output" => true
           }
-        },
-        "source"       => source_dir,
-        "destination"  => dest_dir,
-        "full_rebuild" => true
-      }))
+        }
+      })
       @site.process
       @document = @site.collections["slides"].files.find { |doc| doc.relative_path == "_slides/octojekyll.png" }
       @dest_file = dest_dir("slides/octojekyll.png")
@@ -330,15 +307,13 @@ class TestDocument < JekyllUnitTest
 
   context "a document in a collection with non-alphabetic file name" do
     setup do
-      @site = Site.new(Jekyll.configuration({
+      @site = fixture_site({
         "collections" => {
           "methods" => {
             "output" => true
           }
         },
-        "source"      => source_dir,
-        "destination" => dest_dir
-      }))
+      })
       @site.process
       @document = @site.collections["methods"].docs.find { |doc| doc.relative_path == "_methods/escape-+ #%20[].md" }
       @dest_file = dest_dir("methods/escape-+ #%20[].html")

From 5d97ec917474df4164c1945b0971e562a51c7253 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 24 Feb 2015 21:10:53 -0800
Subject: [PATCH 345/407] Update history to reflect merge of #3511 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e0fde4e95..47e40976d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -81,6 +81,7 @@
   * Update LICENSE to 2015. (#3477)
   * Upgrade tests to use Minitest (#3492)
   * Remove trailing whitespace (#3497)
+  * Use `fixture_site` for Document tests (#3511)
 
 ### Site Enhancements
 

From a43d3d1dc89400dee6361f8a27c56ac0837e9145 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 24 Feb 2015 21:19:47 -0800
Subject: [PATCH 346/407] Make the .improve callout a light grey.

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

diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss
index 0b8ff267d..5980d248b 100644
--- a/site/_sass/_style.scss
+++ b/site/_sass/_style.scss
@@ -531,6 +531,9 @@ aside {
 .improve {
   padding-top: 25px;
   font-size: 16px;
+  a {
+    color: #999;
+  }
 }
 
 .docs-nav-mobile select {

From 9e0bad72554bdc1e5c893854641b370b0d6e34fe Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 24 Feb 2015 21:21:14 -0800
Subject: [PATCH 347/407] Update history to reflect merge of #3510 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 47e40976d..43b296b6f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -116,6 +116,7 @@
   * Fix Twitter link on the help page (#3466)
   * Fix wording in code snippet highlighting section (#3475)
   * Add a `/` to `paginate_path` in the Pagination documentation (#3479)
+  * Add a link on all the docs pages to "Improve this page". (#3510)
 
 ## 2.5.3 / 2014-12-22
 

From 7fb71871cf6723b896550a90e0efcda225e4f707 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 24 Feb 2015 23:01:34 -0800
Subject: [PATCH 348/407] Update history to reflect merge of #3485 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 43b296b6f..43cb0ae49 100644
--- a/History.markdown
+++ b/History.markdown
@@ -63,6 +63,7 @@
   * `Site#read_data_file`: read CSV's with proper file encoding (#3455)
   * Ignore `.jekyll-metadata` in site template (#3496)
   * Template: Point documentation link to the documentation pages (#3502)
+  * Removed the trailing slash from the example `/blog` baseurl comment (#3485)
 
 ### Development Fixes
 

From 03d21b0cd1eb8111620eebc05cea067541c9bdf6 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 24 Feb 2015 23:02:48 -0800
Subject: [PATCH 349/407] Update history to reflect merge of #3489 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 43cb0ae49..4607b379f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -118,6 +118,7 @@
   * Fix wording in code snippet highlighting section (#3475)
   * Add a `/` to `paginate_path` in the Pagination documentation (#3479)
   * Add a link on all the docs pages to "Improve this page". (#3510)
+  * Add jekyll-auto-image generator to the list of third-party plugins (#3489)
 
 ## 2.5.3 / 2014-12-22
 

From 21fa47f92b36d7ed24151d716f713a6b7bc64258 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 25 Feb 2015 11:57:35 -0800
Subject: [PATCH 350/407] Add benchmark-ips to Gemfile.

---
 Gemfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Gemfile b/Gemfile
index d695524bb..d5c970c07 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,7 @@ gem 'toml', '~> 0.1.0'
 gem 'jekyll-paginate', '~> 1.0'
 gem 'jekyll-gist', '~> 1.0'
 gem 'jekyll-coffeescript', '~> 1.0'
+gem 'jekyll-textile-converter', '~> 0.1.0'
 gem 'classifier-reborn', '~> 2.0'
 
 gem 'rake', '~> 10.1'
@@ -32,6 +33,7 @@ gem 'test-unit' if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2")
 if ENV['BENCHMARK']
   gem 'rbtrace'
   gem 'stackprof'
+  gem 'benchmark-ips'
 end
 
 if ENV['PROOF']

From 4da6bfd81ae1369eb2d1222293a266ab3c3f9369 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 25 Feb 2015 11:57:49 -0800
Subject: [PATCH 351/407] Add benchmark for end_with? vs regexp

---
 benchmark/end-with-vs-regexp | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 benchmark/end-with-vs-regexp

diff --git a/benchmark/end-with-vs-regexp b/benchmark/end-with-vs-regexp
new file mode 100644
index 000000000..cb849f422
--- /dev/null
+++ b/benchmark/end-with-vs-regexp
@@ -0,0 +1,13 @@
+require 'benchmark/ips'
+
+Benchmark.ips do |x|
+  path_without_ending_slash = '/some/very/very/long/path/to/a/file/i/like'
+  x.report('no slash regexp')    { path_without_ending_slash =~ /\/$/ }
+  x.report('no slash end_with?') { path_without_ending_slash.end_with?("/")  }
+end
+
+Benchmark.ips do |x|
+  path_with_ending_slash = '/some/very/very/long/path/to/a/file/i/like/'
+  x.report('slash regexp')    { path_with_ending_slash =~ /\/$/ }
+  x.report('slash end_with?') { path_with_ending_slash.end_with?("/")  }
+end

From 3f3b20399277624b169cc2d1c7e42d015d5cf76e Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 25 Feb 2015 11:59:27 -0800
Subject: [PATCH 352/407] Use end_with? instead of regexp for adding index.html

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

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 048dcdbf5..e22e8cf12 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -163,7 +163,7 @@ module Jekyll
     def destination(base_directory)
       dest = site.in_dest_dir(base_directory)
       path = site.in_dest_dir(dest, URL.unescape_path(url))
-      path = File.join(path, "index.html") if url =~ /\/$/
+      path = File.join(path, "index.html") if url.end_with?("/")
       path
     end
 
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 98f730bfb..2db391412 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -141,7 +141,7 @@ module Jekyll
     # Returns the destination file path String.
     def destination(dest)
       path = site.in_dest_dir(dest, URL.unescape_path(url))
-      path = File.join(path, "index.html") if url =~ /\/$/
+      path = File.join(path, "index.html") if url.end_with?("/")
       path
     end
 
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index c74522a9f..45b6d0d20 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -279,7 +279,7 @@ module Jekyll
     def destination(dest)
       # The url needs to be unescaped in order to preserve the correct filename
       path = site.in_dest_dir(dest, URL.unescape_path(url))
-      path = File.join(path, "index.html") if self.url =~ /\/$/
+      path = File.join(path, "index.html") if self.url.end_with?("/")
       path
     end
 

From 90c974c4e28a1b05dc498e8377813bae1eb46255 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 25 Feb 2015 16:10:11 -0800
Subject: [PATCH 353/407] Hide the 'Improve this page' message on mobile. /cc
 #3510 [ci skip]

---
 site/_layouts/docs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_layouts/docs.html b/site/_layouts/docs.html
index 5388a213f..0456c4cc9 100644
--- a/site/_layouts/docs.html
+++ b/site/_layouts/docs.html
@@ -9,7 +9,7 @@ layout: default
 
       <div class="unit four-fifths">
         <article>
-          <div class="improve right">
+          <div class="improve right hide-on-mobiles">
             <a href="https://github.com/jekyll/jekyll/edit/master/site/{{ page.path }}"><i class="fa fa-pencil"></i> &nbsp;Improve this page</a>
           </div>
           <h1>{{ page.title }}</h1>

From a6217524255a35972160639bcd24a0d8da969fd4 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Wed, 25 Feb 2015 16:09:41 -0800
Subject: [PATCH 354/407] Add Jekyll Talk to Help page on site

---
 site/help/index.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/site/help/index.md b/site/help/index.md
index 9a8484665..cdc2ea572 100644
--- a/site/help/index.md
+++ b/site/help/index.md
@@ -14,6 +14,11 @@ Add **jekyll** to almost any query, and you'll find just what you need.
 Search through the issues that the fine folks on the **@jekyll/help** team
 have answered, or ask your own.
 
+### [Jekyll Talk](https://talk.jekyllrb.com/)
+
+Jekyll Talk is our official Discourse forum. Here, users and contributors
+can ask questions and discuss all aspects of Jekyll.
+
 ### [Jekyll on StackOverflow](http://stackoverflow.com/questions/tagged/jekyll)
 
 StackOverflow is a staple of any developer's diet. Check out the Jekyll tag

From 14fa3287b72473ae2d6bd02952d6204474c751f4 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 25 Feb 2015 16:16:16 -0800
Subject: [PATCH 355/407] Update history to reflect merge of #3518 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4607b379f..1b31a858b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -86,6 +86,7 @@
 
 ### Site Enhancements
 
+  * Add Jekyll Talk to Help page on site (#3518)
   * Fixing the default host on docs (#3229)
   * Add `jekyll-thumbnail-filter` to list of third-party plugins (#2790)
   * Add link to 'Adding Ajax pagination to Jekyll' to Resources page (#3186)

From 531d0fb261f428accfc0659b1232d9bf3c6ca873 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Thu, 26 Feb 2015 22:12:06 +0100
Subject: [PATCH 356/407] Sort will now raise error on nil object array input.

Sort will now throw an error when a nil object array is given as input.
See issue #3491 for more information.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/filters.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index d9c84fe88..e71710c9d 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -222,6 +222,9 @@ module Jekyll
     #
     # Returns the filtered array of objects
     def sort(input, property = nil, nils = "first")
+      if input.nil?
+          raise ArgumentError.new("Invalid object array given. Object array is null.")
+      end
       if property.nil?
         input.sort
       else

From e56f2414ae065a7fbedf42c9a98bde419d15c530 Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Thu, 26 Feb 2015 21:23:21 -0800
Subject: [PATCH 357/407] Add blog post introducing Jekyll Talk

---
 .../2015-02-26-introducing-jekyll-talk.markdown   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 site/_posts/2015-02-26-introducing-jekyll-talk.markdown

diff --git a/site/_posts/2015-02-26-introducing-jekyll-talk.markdown b/site/_posts/2015-02-26-introducing-jekyll-talk.markdown
new file mode 100644
index 000000000..90863c12e
--- /dev/null
+++ b/site/_posts/2015-02-26-introducing-jekyll-talk.markdown
@@ -0,0 +1,15 @@
+---
+layout: news_item
+title: 'Join the Discussion at Jekyll Talk'
+date: 2015-02-26 21:06:51 -0800
+author: alfredxing
+categories: [community]
+---
+
+We're super excited to announce the launch of [Jekyll Talk](https://talk.jekyllrb.com), a Discourse forum for anything related to Jekyll!
+
+The forum was set up by [@envygeeks](https://github.com/envygeeks) to build a community more accessible to Jekyll users and more suitable for general discussion.
+
+There's already been a lot of interesting topics, including a [site showcase](https://talk.jekyllrb.com/t/showcase-sites-made-using-jekyll/18) and [a poll for Jekyll 3.0 priorities](https://talk.jekyllrb.com/t/poll-installation-priorities-for-3-0/106/9).
+
+Come join the fun!
\ No newline at end of file

From ed953e6e1ff11d8251b1bbe89c9356ec717ad546 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 27 Feb 2015 13:07:12 -0800
Subject: [PATCH 358/407] Update history to reflect merge of #3523 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1b31a858b..e290741ee 100644
--- a/History.markdown
+++ b/History.markdown
@@ -86,6 +86,7 @@
 
 ### Site Enhancements
 
+  * Add blog post announcing Jekyll Help (#3523)
   * Add Jekyll Talk to Help page on site (#3518)
   * Fixing the default host on docs (#3229)
   * Add `jekyll-thumbnail-filter` to list of third-party plugins (#2790)

From a25f2d7dd680de7e4f0d5406f867f78a0a9f3afa Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Fri, 27 Feb 2015 15:33:08 -0600
Subject: [PATCH 359/407] Ask people to use talk.jekyllrb.com for non bugs.

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

diff --git a/CONTRIBUTING.markdown b/CONTRIBUTING.markdown
index 8bd2febee..2145db65c 100644
--- a/CONTRIBUTING.markdown
+++ b/CONTRIBUTING.markdown
@@ -4,6 +4,7 @@ Contribute
 So you've got an awesome idea to throw into Jekyll. Great! Please keep the
 following in mind:
 
+* **Use https://talk.jekyllrb.com for non-technical or indirect Jekyll questions that are not bugs.**
 * **Contributions will not be accepted without tests or necessary documentation updates.**
 * If you're creating a small fix or patch to an existing feature, just a simple
   test will do. Please stay in the confines of the current test suite and use

From cd7b3f54f1617294decc70f0858bcf180db7fba4 Mon Sep 17 00:00:00 2001
From: Fabian Rodriguez <fabianrbz@gmail.com>
Date: Fri, 27 Feb 2015 22:41:32 -0200
Subject: [PATCH 360/407] Removes the following deprecation warning: 'method
 adapters is deprecated. use profiles instead'

This warning was showing up because the project was using
the gem 'simplecov-gem-adapter' which uses the old syntax.

* Remove the gem dependency
* Add a profile with the same setup that the gem has
---
 Gemfile                         |  1 -
 lib/simplecov_custom_profile.rb | 13 +++++++++++++
 test/helper.rb                  |  3 +--
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 lib/simplecov_custom_profile.rb

diff --git a/Gemfile b/Gemfile
index d695524bb..f29e4abd2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,6 @@ gem 'maruku', '~> 0.7.0'
 gem 'rdiscount', '~> 2.0'
 gem 'launchy', '~> 2.3'
 gem 'simplecov', '~> 0.9'
-gem 'simplecov-gem-adapter', '~> 1.0.1'
 gem 'mime-types', '~> 1.5'
 gem 'activesupport', '~> 3.2.13'
 gem 'jekyll_test_plugin'
diff --git a/lib/simplecov_custom_profile.rb b/lib/simplecov_custom_profile.rb
new file mode 100644
index 000000000..eebb8fbeb
--- /dev/null
+++ b/lib/simplecov_custom_profile.rb
@@ -0,0 +1,13 @@
+require 'simplecov'
+
+SimpleCov.profiles.define 'gem' do
+  add_filter '/test/'
+  add_filter '/features/'
+  add_filter '/spec/'
+  add_filter '/autotest/'
+
+  add_group 'Binaries', '/bin/'
+  add_group 'Libraries', '/lib/'
+  add_group 'Extensions', '/ext/'
+  add_group 'Vendor Libraries', '/vendor/'
+end
diff --git a/test/helper.rb b/test/helper.rb
index 257b2db9c..4efa1f96b 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,5 +1,4 @@
-require 'simplecov'
-require 'simplecov-gem-adapter'
+require 'simplecov_custom_profile'
 SimpleCov.start('gem') do
   add_filter "/vendor/bundle"
   add_filter "/vendor/gem"

From e4b1382bfdfaa5737b5d203dd73d1c7c1eb6666c Mon Sep 17 00:00:00 2001
From: Fabian Rodriguez <fabianrbz@gmail.com>
Date: Fri, 27 Feb 2015 23:09:33 -0200
Subject: [PATCH 361/407] Remove unused groups from simplecov's profile

---
 lib/simplecov_custom_profile.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/simplecov_custom_profile.rb b/lib/simplecov_custom_profile.rb
index eebb8fbeb..d7f4914cb 100644
--- a/lib/simplecov_custom_profile.rb
+++ b/lib/simplecov_custom_profile.rb
@@ -3,11 +3,8 @@ require 'simplecov'
 SimpleCov.profiles.define 'gem' do
   add_filter '/test/'
   add_filter '/features/'
-  add_filter '/spec/'
   add_filter '/autotest/'
 
   add_group 'Binaries', '/bin/'
   add_group 'Libraries', '/lib/'
-  add_group 'Extensions', '/ext/'
-  add_group 'Vendor Libraries', '/vendor/'
 end

From dae77e9a632a02933937dfaa38ffb871c31753e2 Mon Sep 17 00:00:00 2001
From: Will Norris <will@willnorris.com>
Date: Fri, 27 Feb 2015 17:31:24 -0800
Subject: [PATCH 362/407] switch remaining textile test files to markdown

Textile support was removed from jekyll core in #3319, and most of the
tests switched to markdown at that time.  This changes the remaining
tests to use markdown as well.  The vast majority of the test cases were
testing things in the file name or front matter, so it doesn't really
matter what markup format they use.  The one test that was claiming to
test that textile was transformed had actually been moved to markdown as
well, just not renamed.

Fixes #3507
---
 ...tile => 2008-02-02-not-published.markdown} |  0
 ....textile => 2008-02-02-published.markdown} |  0
 ...e => 2008-12-03-permalinked-post.markdown} |  0
 ...e => 2009-01-27-array-categories.markdown} |  0
 ...textile => 2009-01-27-categories.markdown} |  0
 ...y.textile => 2009-01-27-category.markdown} |  0
 ...e => 2009-01-27-empty-categories.markdown} |  0
 ...ile => 2009-01-27-empty-category.markdown} |  0
 ...extile => 2009-01-27-no-category.markdown} |  0
 ....textile => 2009-05-18-empty-tag.markdown} |  0
 ...textile => 2009-05-18-empty-tags.markdown} |  0
 ...18-tag.textile => 2009-05-18-tag.markdown} |  0
 ...-tags.textile => 2009-05-18-tags.markdown} |  0
 ...textile => 2009-06-22-empty-yaml.markdown} |  0
 ...ml.textile => 2009-06-22-no-yaml.markdown} |  0
 ...tile => 2010-01-16-override-data.markdown} |  0
 ...textile => 2013-01-12-nil-layout.markdown} |  0
 ....textile => 2013-01-12-no-layout.markdown} |  0
 ...le => 2013-05-10-number-category.markdown} |  0
 ...ted.textile => 2008-11-21-nested.markdown} |  0
 ....textile => 2008-9-23-categories.markdown} |  0
 ...xtile => 2008-12-12-topical-post.markdown} |  0
 ....textile => 2008-9-23-categories.markdown} |  0
 test/test_excerpt.rb                          |  2 +-
 test/test_post.rb                             | 52 +++++++++----------
 25 files changed, 27 insertions(+), 27 deletions(-)
 rename test/source/_posts/{2008-02-02-not-published.textile => 2008-02-02-not-published.markdown} (100%)
 rename test/source/_posts/{2008-02-02-published.textile => 2008-02-02-published.markdown} (100%)
 rename test/source/_posts/{2008-12-03-permalinked-post.textile => 2008-12-03-permalinked-post.markdown} (100%)
 rename test/source/_posts/{2009-01-27-array-categories.textile => 2009-01-27-array-categories.markdown} (100%)
 rename test/source/_posts/{2009-01-27-categories.textile => 2009-01-27-categories.markdown} (100%)
 rename test/source/_posts/{2009-01-27-category.textile => 2009-01-27-category.markdown} (100%)
 rename test/source/_posts/{2009-01-27-empty-categories.textile => 2009-01-27-empty-categories.markdown} (100%)
 rename test/source/_posts/{2009-01-27-empty-category.textile => 2009-01-27-empty-category.markdown} (100%)
 rename test/source/_posts/{2009-01-27-no-category.textile => 2009-01-27-no-category.markdown} (100%)
 rename test/source/_posts/{2009-05-18-empty-tag.textile => 2009-05-18-empty-tag.markdown} (100%)
 rename test/source/_posts/{2009-05-18-empty-tags.textile => 2009-05-18-empty-tags.markdown} (100%)
 rename test/source/_posts/{2009-05-18-tag.textile => 2009-05-18-tag.markdown} (100%)
 rename test/source/_posts/{2009-05-18-tags.textile => 2009-05-18-tags.markdown} (100%)
 rename test/source/_posts/{2009-06-22-empty-yaml.textile => 2009-06-22-empty-yaml.markdown} (100%)
 rename test/source/_posts/{2009-06-22-no-yaml.textile => 2009-06-22-no-yaml.markdown} (100%)
 rename test/source/_posts/{2010-01-16-override-data.textile => 2010-01-16-override-data.markdown} (100%)
 rename test/source/_posts/{2013-01-12-nil-layout.textile => 2013-01-12-nil-layout.markdown} (100%)
 rename test/source/_posts/{2013-01-12-no-layout.textile => 2013-01-12-no-layout.markdown} (100%)
 rename test/source/_posts/{2013-05-10-number-category.textile => 2013-05-10-number-category.markdown} (100%)
 rename test/source/_posts/es/{2008-11-21-nested.textile => 2008-11-21-nested.markdown} (100%)
 rename test/source/category/_posts/{2008-9-23-categories.textile => 2008-9-23-categories.markdown} (100%)
 rename test/source/foo/_posts/bar/{2008-12-12-topical-post.textile => 2008-12-12-topical-post.markdown} (100%)
 rename test/source/z_category/_posts/{2008-9-23-categories.textile => 2008-9-23-categories.markdown} (100%)

diff --git a/test/source/_posts/2008-02-02-not-published.textile b/test/source/_posts/2008-02-02-not-published.markdown
similarity index 100%
rename from test/source/_posts/2008-02-02-not-published.textile
rename to test/source/_posts/2008-02-02-not-published.markdown
diff --git a/test/source/_posts/2008-02-02-published.textile b/test/source/_posts/2008-02-02-published.markdown
similarity index 100%
rename from test/source/_posts/2008-02-02-published.textile
rename to test/source/_posts/2008-02-02-published.markdown
diff --git a/test/source/_posts/2008-12-03-permalinked-post.textile b/test/source/_posts/2008-12-03-permalinked-post.markdown
similarity index 100%
rename from test/source/_posts/2008-12-03-permalinked-post.textile
rename to test/source/_posts/2008-12-03-permalinked-post.markdown
diff --git a/test/source/_posts/2009-01-27-array-categories.textile b/test/source/_posts/2009-01-27-array-categories.markdown
similarity index 100%
rename from test/source/_posts/2009-01-27-array-categories.textile
rename to test/source/_posts/2009-01-27-array-categories.markdown
diff --git a/test/source/_posts/2009-01-27-categories.textile b/test/source/_posts/2009-01-27-categories.markdown
similarity index 100%
rename from test/source/_posts/2009-01-27-categories.textile
rename to test/source/_posts/2009-01-27-categories.markdown
diff --git a/test/source/_posts/2009-01-27-category.textile b/test/source/_posts/2009-01-27-category.markdown
similarity index 100%
rename from test/source/_posts/2009-01-27-category.textile
rename to test/source/_posts/2009-01-27-category.markdown
diff --git a/test/source/_posts/2009-01-27-empty-categories.textile b/test/source/_posts/2009-01-27-empty-categories.markdown
similarity index 100%
rename from test/source/_posts/2009-01-27-empty-categories.textile
rename to test/source/_posts/2009-01-27-empty-categories.markdown
diff --git a/test/source/_posts/2009-01-27-empty-category.textile b/test/source/_posts/2009-01-27-empty-category.markdown
similarity index 100%
rename from test/source/_posts/2009-01-27-empty-category.textile
rename to test/source/_posts/2009-01-27-empty-category.markdown
diff --git a/test/source/_posts/2009-01-27-no-category.textile b/test/source/_posts/2009-01-27-no-category.markdown
similarity index 100%
rename from test/source/_posts/2009-01-27-no-category.textile
rename to test/source/_posts/2009-01-27-no-category.markdown
diff --git a/test/source/_posts/2009-05-18-empty-tag.textile b/test/source/_posts/2009-05-18-empty-tag.markdown
similarity index 100%
rename from test/source/_posts/2009-05-18-empty-tag.textile
rename to test/source/_posts/2009-05-18-empty-tag.markdown
diff --git a/test/source/_posts/2009-05-18-empty-tags.textile b/test/source/_posts/2009-05-18-empty-tags.markdown
similarity index 100%
rename from test/source/_posts/2009-05-18-empty-tags.textile
rename to test/source/_posts/2009-05-18-empty-tags.markdown
diff --git a/test/source/_posts/2009-05-18-tag.textile b/test/source/_posts/2009-05-18-tag.markdown
similarity index 100%
rename from test/source/_posts/2009-05-18-tag.textile
rename to test/source/_posts/2009-05-18-tag.markdown
diff --git a/test/source/_posts/2009-05-18-tags.textile b/test/source/_posts/2009-05-18-tags.markdown
similarity index 100%
rename from test/source/_posts/2009-05-18-tags.textile
rename to test/source/_posts/2009-05-18-tags.markdown
diff --git a/test/source/_posts/2009-06-22-empty-yaml.textile b/test/source/_posts/2009-06-22-empty-yaml.markdown
similarity index 100%
rename from test/source/_posts/2009-06-22-empty-yaml.textile
rename to test/source/_posts/2009-06-22-empty-yaml.markdown
diff --git a/test/source/_posts/2009-06-22-no-yaml.textile b/test/source/_posts/2009-06-22-no-yaml.markdown
similarity index 100%
rename from test/source/_posts/2009-06-22-no-yaml.textile
rename to test/source/_posts/2009-06-22-no-yaml.markdown
diff --git a/test/source/_posts/2010-01-16-override-data.textile b/test/source/_posts/2010-01-16-override-data.markdown
similarity index 100%
rename from test/source/_posts/2010-01-16-override-data.textile
rename to test/source/_posts/2010-01-16-override-data.markdown
diff --git a/test/source/_posts/2013-01-12-nil-layout.textile b/test/source/_posts/2013-01-12-nil-layout.markdown
similarity index 100%
rename from test/source/_posts/2013-01-12-nil-layout.textile
rename to test/source/_posts/2013-01-12-nil-layout.markdown
diff --git a/test/source/_posts/2013-01-12-no-layout.textile b/test/source/_posts/2013-01-12-no-layout.markdown
similarity index 100%
rename from test/source/_posts/2013-01-12-no-layout.textile
rename to test/source/_posts/2013-01-12-no-layout.markdown
diff --git a/test/source/_posts/2013-05-10-number-category.textile b/test/source/_posts/2013-05-10-number-category.markdown
similarity index 100%
rename from test/source/_posts/2013-05-10-number-category.textile
rename to test/source/_posts/2013-05-10-number-category.markdown
diff --git a/test/source/_posts/es/2008-11-21-nested.textile b/test/source/_posts/es/2008-11-21-nested.markdown
similarity index 100%
rename from test/source/_posts/es/2008-11-21-nested.textile
rename to test/source/_posts/es/2008-11-21-nested.markdown
diff --git a/test/source/category/_posts/2008-9-23-categories.textile b/test/source/category/_posts/2008-9-23-categories.markdown
similarity index 100%
rename from test/source/category/_posts/2008-9-23-categories.textile
rename to test/source/category/_posts/2008-9-23-categories.markdown
diff --git a/test/source/foo/_posts/bar/2008-12-12-topical-post.textile b/test/source/foo/_posts/bar/2008-12-12-topical-post.markdown
similarity index 100%
rename from test/source/foo/_posts/bar/2008-12-12-topical-post.textile
rename to test/source/foo/_posts/bar/2008-12-12-topical-post.markdown
diff --git a/test/source/z_category/_posts/2008-9-23-categories.textile b/test/source/z_category/_posts/2008-9-23-categories.markdown
similarity index 100%
rename from test/source/z_category/_posts/2008-9-23-categories.textile
rename to test/source/z_category/_posts/2008-9-23-categories.markdown
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index ac4771762..ecd42148f 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -88,7 +88,7 @@ class TestExcerpt < JekyllUnitTest
         assert_gets_called = false
         klass.send(:define_method, :assert_gets_called) { assert_gets_called = true }
         klass.const_set(:EXCERPT_ATTRIBUTES_FOR_LIQUID, Jekyll::Post::EXCERPT_ATTRIBUTES_FOR_LIQUID + ['assert_gets_called'])
-        post = klass.new(@site, source_dir, '', "2008-02-02-published.textile")
+        post = klass.new(@site, source_dir, '', "2008-02-02-published.markdown")
         Jekyll::Excerpt.new(post).to_liquid
 
         assert assert_gets_called, 'assert_gets_called did not get called on post.'
diff --git a/test/test_post.rb b/test/test_post.rb
index ef5b4a46a..20ea65248 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -82,14 +82,14 @@ class TestPost < JekyllUnitTest
         post = Post.allocate
         post.categories = ['foo']
         post.site = @site
-        post.process("cat1/2008-09-09-foo-bar.textile")
+        post.process("cat1/2008-09-09-foo-bar.markdown")
         assert_equal 1, post.categories.size
         assert_equal "foo", post.categories[0]
 
         post = Post.allocate
         post.categories = ['foo', 'bar']
         post.site = @site
-        post.process("cat2/CAT3/2008-09-09-foo-bar.textile")
+        post.process("cat2/CAT3/2008-09-09-foo-bar.markdown")
         assert_equal 2, post.categories.size
         assert_equal "foo", post.categories[0]
         assert_equal "bar", post.categories[1]
@@ -104,7 +104,7 @@ class TestPost < JekyllUnitTest
 
       should "raise a good error on invalid post date" do
         assert_raises Jekyll::Errors::FatalException do
-          @post.process("2009-27-03-foo-bar.textile")
+          @post.process("2009-27-03-foo-bar.markdown")
         end
       end
 
@@ -131,7 +131,7 @@ class TestPost < JekyllUnitTest
       end
 
       should "respect permalink in yaml front matter" do
-        file = "2008-12-03-permalinked-post.textile"
+        file = "2008-12-03-permalinked-post.markdown"
         @post.process(file)
         @post.read_yaml(@source, file)
 
@@ -230,7 +230,7 @@ class TestPost < JekyllUnitTest
 
         context "with specified layout of nil" do
           setup do
-            file = '2013-01-12-nil-layout.textile'
+            file = '2013-01-12-nil-layout.markdown'
             @post = setup_post(file)
             @post.process(file)
           end
@@ -369,7 +369,7 @@ class TestPost < JekyllUnitTest
         assert_equal "# {{ page.title }}\n\nBest **post** ever", @post.content
       end
 
-      should "transform textile" do
+      should "transform markdown" do
         @post.process(@real_file)
         @post.read_yaml(@source, @real_file)
         assert_equal "<h1 id=\"pagetitle-\">{{ page.title }}</h1>\n\n<p>Best <strong>post</strong> ever</p>", @post.transform.strip
@@ -461,8 +461,8 @@ class TestPost < JekyllUnitTest
       setup do
         clear_dest
         @site = fixture_site
-        @site.posts = [setup_post('2008-02-02-published.textile'),
-                       setup_post('2009-01-27-categories.textile')]
+        @site.posts = [setup_post('2008-02-02-published.markdown'),
+                       setup_post('2009-01-27-categories.markdown')]
       end
 
       should "have next post" do
@@ -511,7 +511,7 @@ class TestPost < JekyllUnitTest
       end
 
       should "to_liquid prioritizes post attributes over data" do
-        post = setup_post("2010-01-16-override-data.textile")
+        post = setup_post("2010-01-16-override-data.markdown")
         assert_equal Array, post.tags.class
         assert_equal Array, post.to_liquid["tags"].class
         assert_equal Time, post.date.class
@@ -523,36 +523,36 @@ class TestPost < JekyllUnitTest
         assert_gets_called = false
         klass.send(:define_method, :assert_gets_called) { assert_gets_called = true }
         klass.const_set(:EXCERPT_ATTRIBUTES_FOR_LIQUID, Jekyll::Post::EXCERPT_ATTRIBUTES_FOR_LIQUID + ['assert_gets_called'])
-        post = klass.new(@site, source_dir, '', "2008-02-02-published.textile")
+        post = klass.new(@site, source_dir, '', "2008-02-02-published.markdown")
         do_render(post)
 
         assert assert_gets_called, 'assert_gets_called did not get called on post.'
       end
 
       should "recognize category in yaml" do
-        post = setup_post("2009-01-27-category.textile")
+        post = setup_post("2009-01-27-category.markdown")
         assert post.categories.include?('foo')
       end
 
       should "recognize several categories in yaml" do
-        post = setup_post("2009-01-27-categories.textile")
+        post = setup_post("2009-01-27-categories.markdown")
         assert post.categories.include?('foo')
         assert post.categories.include?('bar')
         assert post.categories.include?('baz')
       end
 
       should "recognize empty category in yaml" do
-        post = setup_post("2009-01-27-empty-category.textile")
+        post = setup_post("2009-01-27-empty-category.markdown")
         assert_equal [], post.categories
       end
 
       should "recognize empty categories in yaml" do
-        post = setup_post("2009-01-27-empty-categories.textile")
+        post = setup_post("2009-01-27-empty-categories.markdown")
         assert_equal [], post.categories
       end
 
       should "recognize number category in yaml" do
-        post = setup_post("2013-05-10-number-category.textile")
+        post = setup_post("2013-05-10-number-category.markdown")
         assert post.categories.include?('2013')
         assert !post.categories.include?(2013)
       end
@@ -564,34 +564,34 @@ class TestPost < JekyllUnitTest
       end
 
       should "recognize tag in yaml" do
-        post = setup_post("2009-05-18-tag.textile")
+        post = setup_post("2009-05-18-tag.markdown")
         assert post.tags.include?('code')
       end
 
       should "recognize tags in yaml" do
-        post = setup_post("2009-05-18-tags.textile")
+        post = setup_post("2009-05-18-tags.markdown")
         assert post.tags.include?('food')
         assert post.tags.include?('cooking')
         assert post.tags.include?('pizza')
       end
 
       should "recognize empty tag in yaml" do
-        post = setup_post("2009-05-18-empty-tag.textile")
+        post = setup_post("2009-05-18-empty-tag.markdown")
         assert_equal [], post.tags
       end
 
       should "recognize empty tags in yaml" do
-        post = setup_post("2009-05-18-empty-tags.textile")
+        post = setup_post("2009-05-18-empty-tags.markdown")
         assert_equal [], post.tags
       end
 
       should "allow no yaml" do
-        post = setup_post("2009-06-22-no-yaml.textile")
+        post = setup_post("2009-06-22-no-yaml.markdown")
         assert_equal "No YAML.", post.content
       end
 
       should "allow empty yaml" do
-        post = setup_post("2009-06-22-empty-yaml.textile")
+        post = setup_post("2009-06-22-empty-yaml.markdown")
         assert_equal "Empty YAML.", post.content
       end
 
@@ -691,7 +691,7 @@ class TestPost < JekyllUnitTest
     end
 
     should "generate categories and topics" do
-      post = Post.new(@site, File.join(File.dirname(__FILE__), *%w[source]), 'foo', 'bar/2008-12-12-topical-post.textile')
+      post = Post.new(@site, File.join(File.dirname(__FILE__), *%w[source]), 'foo', 'bar/2008-12-12-topical-post.markdown')
       assert_equal ['foo'], post.categories
     end
   end
@@ -756,12 +756,12 @@ class TestPost < JekyllUnitTest
     end
 
     should "return category if post does not specify category" do
-      post = setup_post("2009-01-27-no-category.textile")
+      post = setup_post("2009-01-27-no-category.markdown")
       assert post.categories.include?('article'), "Expected post.categories to include 'article' but did not."
     end
 
     should "override site category if set on post" do
-      post = setup_post("2009-01-27-category.textile")
+      post = setup_post("2009-01-27-category.markdown")
       assert post.categories.include?('foo'), "Expected post.categories to include 'foo' but did not."
       assert !post.categories.include?('article'), "Did not expect post.categories to include 'article' but it did."
     end
@@ -779,12 +779,12 @@ class TestPost < JekyllUnitTest
     end
 
     should "return categories if post does not specify categories" do
-      post = setup_post("2009-01-27-no-category.textile")
+      post = setup_post("2009-01-27-no-category.markdown")
       assert post.categories.include?('article'), "Expected post.categories to include 'article' but did not."
     end
 
     should "override site categories if set on post" do
-      post = setup_post("2009-01-27-categories.textile")
+      post = setup_post("2009-01-27-categories.markdown")
       ['foo', 'bar', 'baz'].each do |category|
         assert post.categories.include?(category), "Expected post.categories to include '#{category}' but did not."
       end

From d79c0fc4dd32b9357a0326706d3cbf15a92c868d Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Sat, 28 Feb 2015 15:10:05 +0100
Subject: [PATCH 363/407] Replaced a picture element link with @parkr's
 suggestion.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 site/_docs/plugins.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index df1f391e3..9f4afb97d 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -566,7 +566,7 @@ You can find a few useful plugins at the following locations:
 - [JekyllGalleryTag](https://github.com/redwallhp/JekyllGalleryTag) by [redwallhp](https://github.com/redwallhp): Generates thumbnails from a directory of images and displays them in a grid.
 - [Youku and Tudou Embed](https://gist.github.com/Yexiaoxing/5891929): Liquid plugin for embedding Youku and Tudou videos.
 - [Jekyll-swfobject](https://github.com/sectore/jekyll-swfobject): Liquid plugin for embedding Adobe Flash files (.swf) using [SWFObject](http://code.google.com/p/swfobject/).
-- [Jekyll Picture Tag](https://github.com/robwierzbowski/jekyll-picture-tag): Easy responsive images for Jekyll. Based on the proposed [`<picture>`](http://picture.responsiveimages.org/) element, polyfilled with Scott Jehl’s [Picturefill](https://github.com/scottjehl/picturefill).
+- [Jekyll Picture Tag](https://github.com/robwierzbowski/jekyll-picture-tag): Easy responsive images for Jekyll. Based on the proposed [`<picture>`](https://html.spec.whatwg.org/multipage/embedded-content.html#the-picture-element) element, polyfilled with Scott Jehl’s [Picturefill](https://github.com/scottjehl/picturefill).
 - [Jekyll Image Tag](https://github.com/robwierzbowski/jekyll-image-tag): Better images for Jekyll. Save image presets, generate resized images, and add classes, alt text, and other attributes.
 - [Ditaa Tag](https://github.com/matze/jekyll-ditaa) by [matze](https://github.com/matze): Renders ASCII diagram art into PNG images and inserts a figure tag.
 - [Jekyll Suggested Tweet](https://github.com/davidensinger/jekyll-suggested-tweet) by [David Ensinger](https://github.com/davidensinger/): A Liquid tag for Jekyll that allows for the embedding of suggested tweets via Twitter’s Web Intents API.

From 8e87e9ebece836563a64a57062917f39c8b27017 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 28 Feb 2015 17:28:43 -0800
Subject: [PATCH 364/407] Update history to reflect merge of #3530 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e290741ee..aff4d002c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -121,6 +121,7 @@
   * Add a `/` to `paginate_path` in the Pagination documentation (#3479)
   * Add a link on all the docs pages to "Improve this page". (#3510)
   * Add jekyll-auto-image generator to the list of third-party plugins (#3489)
+  * Replace link to the proposed `picture` element spec (#3530)
 
 ## 2.5.3 / 2014-12-22
 

From 6c073ec476b667202b528158a175f84c218340d7 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 28 Feb 2015 17:29:39 -0800
Subject: [PATCH 365/407] Remove reference to jekyll-textile-converter.

---
 Gemfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index d5c970c07..2b39c8f07 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,6 @@ gem 'toml', '~> 0.1.0'
 gem 'jekyll-paginate', '~> 1.0'
 gem 'jekyll-gist', '~> 1.0'
 gem 'jekyll-coffeescript', '~> 1.0'
-gem 'jekyll-textile-converter', '~> 0.1.0'
 gem 'classifier-reborn', '~> 2.0'
 
 gem 'rake', '~> 10.1'

From 6b09d1818da5a3a2ac388608012d88bdff9df0e8 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 28 Feb 2015 18:56:13 -0800
Subject: [PATCH 366/407] Update history to reflect merge of #3516 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index aff4d002c..ebb0edd8f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -41,6 +41,7 @@
   * Site template: Optimize text rendering for legibility (#3382)
   * Add `draft?` method to identify if Post is a Draft & expose to Liquid (#3456)
   * Write regeneration metadata even on full rebuild (#3464)
+  * Perf: Use `String#end_with?("/")` instead of regexp when checking paths (#3516)
 
 ### Bug Fixes
 

From 60f0977a50d191e1ccf336ee4c4a0d434050cc7f Mon Sep 17 00:00:00 2001
From: Matt Rogers <codemattr@gmail.com>
Date: Sat, 28 Feb 2015 21:44:29 -0600
Subject: [PATCH 367/407] Update history to reflect merge of #3528 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ebb0edd8f..da92f66d8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -287,6 +287,7 @@
   * Allow Travis to 'parallelize' our tests (#2859)
   * Fix test for Liquid rendering in Sass (#2856)
   * Fixing "vertycal" typo in site template's `_base.scss` (#2889)
+  * Convert remaining textile test documents to markdown (#3528)
 
 ### Site Enhancements
 

From fbe52bca85b66ad89040ecd1519dc9021ab5a532 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 1 Mar 2015 00:36:20 -0800
Subject: [PATCH 368/407] Move simplecov_custom_profile to test/ & gate with
 TRAVIS env

---
 test/helper.rb                            | 10 ++++++----
 {lib => test}/simplecov_custom_profile.rb |  0
 2 files changed, 6 insertions(+), 4 deletions(-)
 rename {lib => test}/simplecov_custom_profile.rb (100%)

diff --git a/test/helper.rb b/test/helper.rb
index 4efa1f96b..dd6b38daa 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,7 +1,9 @@
-require 'simplecov_custom_profile'
-SimpleCov.start('gem') do
-  add_filter "/vendor/bundle"
-  add_filter "/vendor/gem"
+unless ENV['TRAVIS']
+  require File.expand_path('../simplecov_custom_profile', __FILE__)
+  SimpleCov.start('gem') do
+    add_filter "/vendor/bundle"
+    add_filter "/vendor/gem"
+  end
 end
 
 require 'rubygems'
diff --git a/lib/simplecov_custom_profile.rb b/test/simplecov_custom_profile.rb
similarity index 100%
rename from lib/simplecov_custom_profile.rb
rename to test/simplecov_custom_profile.rb

From f1edf9e692389f445eabbf45198722758026dd9d Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 1 Mar 2015 00:36:40 -0800
Subject: [PATCH 369/407] Add minitest/profile to profile 10 slowest tests

---
 Gemfile        | 1 +
 script/test    | 2 +-
 test/helper.rb | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index f29e4abd2..625cd5f95 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,6 +26,7 @@ gem 'jekyll_test_plugin_malicious'
 gem 'liquid-c', '~> 0.0.3'
 gem 'minitest'
 gem 'minitest-reporters'
+gem 'minitest-profile'
 gem 'test-unit' if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2")
 
 if ENV['BENCHMARK']
diff --git a/script/test b/script/test
index 38ae46b63..7da787d59 100755
--- a/script/test
+++ b/script/test
@@ -20,4 +20,4 @@ fi
 
 set -x
 
-time bundle exec ruby -Ilib -Itest -rloader $TEST_FILES
+time bundle exec ruby -Ilib -Itest -rloader $TEST_FILES --profile
diff --git a/test/helper.rb b/test/helper.rb
index dd6b38daa..e4a50db09 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -10,6 +10,7 @@ require 'rubygems'
 require 'ostruct'
 require 'minitest/autorun'
 require 'minitest/reporters'
+require 'minitest/profile'
 
 require 'jekyll'
 

From 9437bd46699491c31b9bf253db4d2188d45ee653 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 1 Mar 2015 00:37:44 -0800
Subject: [PATCH 370/407] Update history to reflect merge of #3529 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index da92f66d8..7c4d06254 100644
--- a/History.markdown
+++ b/History.markdown
@@ -84,6 +84,7 @@
   * Upgrade tests to use Minitest (#3492)
   * Remove trailing whitespace (#3497)
   * Use `fixture_site` for Document tests (#3511)
+  * Remove adapters deprecation warning (#3529)
 
 ### Site Enhancements
 

From 0565308ce67be10530227997cabb58a55fb4f730 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Sun, 1 Mar 2015 09:40:32 +0100
Subject: [PATCH 371/407] Added test to check on nil input for sort filter.

 - Added a test to check if the sort filter will raise the correct
   exception on given nil input.
 - Improved error message and used "nil" consistently.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/filters.rb | 2 +-
 test/test_filters.rb  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index e71710c9d..ffdc3b732 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -223,7 +223,7 @@ module Jekyll
     # Returns the filtered array of objects
     def sort(input, property = nil, nils = "first")
       if input.nil?
-          raise ArgumentError.new("Invalid object array given. Object array is null.")
+          raise ArgumentError.new("Nil object array given. Sort cannot process an empty object array.")
       end
       if property.nil?
         input.sort
diff --git a/test/test_filters.rb b/test/test_filters.rb
index eec08564f..642a61144 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -280,6 +280,12 @@ class TestFilters < JekyllUnitTest
     end
 
     context "sort filter" do
+      should "raise Exception when input is nil" do
+        err = assert_raises ArgumentError do
+          @filter.sort(nil)
+        end
+        assert_equal "Nil object array given. Sort cannot process an empty object array.", err.message
+      end
       should "return sorted numbers" do
         assert_equal [1, 2, 2.2, 3], @filter.sort([3, 2.2, 2, 1])
       end

From 78af3c5018337368ee113b4b690b2b1c9ae55f2b Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Sun, 1 Mar 2015 09:51:59 +0100
Subject: [PATCH 372/407] Improved clarity of sort nil input error message.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/filters.rb | 2 +-
 test/test_filters.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index ffdc3b732..5ca87edc7 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -223,7 +223,7 @@ module Jekyll
     # Returns the filtered array of objects
     def sort(input, property = nil, nils = "first")
       if input.nil?
-          raise ArgumentError.new("Nil object array given. Sort cannot process an empty object array.")
+          raise ArgumentError.new("Sort: cannot sort a null object.")
       end
       if property.nil?
         input.sort
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 642a61144..be8ba373f 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -284,7 +284,7 @@ class TestFilters < JekyllUnitTest
         err = assert_raises ArgumentError do
           @filter.sort(nil)
         end
-        assert_equal "Nil object array given. Sort cannot process an empty object array.", err.message
+        assert_equal "Sort: cannot sort a null object.", err.message
       end
       should "return sorted numbers" do
         assert_equal [1, 2, 2.2, 3], @filter.sort([3, 2.2, 2, 1])

From 92a9582733dfee0f359e491a8fae236e91087a54 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Sun, 1 Mar 2015 11:16:08 +0100
Subject: [PATCH 373/407] Corrected error message as suggested by @parkr.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/filters.rb | 2 +-
 test/test_filters.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 5ca87edc7..12d4eb5a5 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -223,7 +223,7 @@ module Jekyll
     # Returns the filtered array of objects
     def sort(input, property = nil, nils = "first")
       if input.nil?
-          raise ArgumentError.new("Sort: cannot sort a null object.")
+          raise ArgumentError.new("Cannot sort a null object.")
       end
       if property.nil?
         input.sort
diff --git a/test/test_filters.rb b/test/test_filters.rb
index be8ba373f..82d319226 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -284,7 +284,7 @@ class TestFilters < JekyllUnitTest
         err = assert_raises ArgumentError do
           @filter.sort(nil)
         end
-        assert_equal "Sort: cannot sort a null object.", err.message
+        assert_equal "Cannot sort a null object.", err.message
       end
       should "return sorted numbers" do
         assert_equal [1, 2, 2.2, 3], @filter.sort([3, 2.2, 2, 1])

From c2b613d05e6f7452d2be358624e3c22c2bc9c594 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 1 Mar 2015 16:05:53 -0800
Subject: [PATCH 374/407] Update history to reflect merge of #3469 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7c4d06254..67e3b5e35 100644
--- a/History.markdown
+++ b/History.markdown
@@ -124,6 +124,7 @@
   * Add a link on all the docs pages to "Improve this page". (#3510)
   * Add jekyll-auto-image generator to the list of third-party plugins (#3489)
   * Replace link to the proposed `picture` element spec (#3530)
+  * Add frontmatter date formatting information (#3469)
 
 ## 2.5.3 / 2014-12-22
 

From 2b1b7b977ba7d55ab894e5125543949b7a58841f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 1 Mar 2015 16:07:29 -0800
Subject: [PATCH 375/407] Upgrade liquid-c to 3.x

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 6935f90b8..ef78622c5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ gem 'mime-types', '~> 1.5'
 gem 'activesupport', '~> 3.2.13'
 gem 'jekyll_test_plugin'
 gem 'jekyll_test_plugin_malicious'
-gem 'liquid-c', '~> 0.0.3'
+gem 'liquid-c', '~> 3.0'
 gem 'minitest'
 gem 'minitest-reporters'
 gem 'minitest-profile'

From f251848283789103759d03ed2b359299a2b0a857 Mon Sep 17 00:00:00 2001
From: Will Norris <will@willnorris.com>
Date: Sun, 1 Mar 2015 17:27:56 -0800
Subject: [PATCH 376/407] document 'ordinal' built-in permalink style

ordinal was actually added back in April 2013 in ea753130
---
 site/_docs/permalinks.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/site/_docs/permalinks.md b/site/_docs/permalinks.md
index bf7e9481c..bc9633b9f 100644
--- a/site/_docs/permalinks.md
+++ b/site/_docs/permalinks.md
@@ -138,6 +138,14 @@ enough to fix it all!
         <p><code>/:categories/:year/:month/:day/:title/</code></p>
       </td>
     </tr>
+    <tr>
+      <td>
+        <p><code>ordinal</code></p>
+      </td>
+      <td>
+        <p><code>/:categories/:year/:y_day/:title.html</code></p>
+      </td>
+    </tr>
     <tr>
       <td>
         <p><code>none</code></p>

From dae5d30096ee09decf024d03531916e187679ddd Mon Sep 17 00:00:00 2001
From: Will Norris <will@willnorris.com>
Date: Sun, 1 Mar 2015 18:16:49 -0800
Subject: [PATCH 377/407] Update history to reflect merge of #3532 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 67e3b5e35..542d8a162 100644
--- a/History.markdown
+++ b/History.markdown
@@ -42,6 +42,7 @@
   * Add `draft?` method to identify if Post is a Draft & expose to Liquid (#3456)
   * Write regeneration metadata even on full rebuild (#3464)
   * Perf: Use `String#end_with?("/")` instead of regexp when checking paths (#3516)
+  * Docs: document 'ordinal' built-in permalink style (#3532)
 
 ### Bug Fixes
 

From 48bf711ec79e4b7131d0332e26eeabb1f5db48e2 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 2 Mar 2015 09:40:05 -0800
Subject: [PATCH 378/407] Update history to reflect merge of #3531 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 542d8a162..683e48d13 100644
--- a/History.markdown
+++ b/History.markdown
@@ -43,6 +43,7 @@
   * Write regeneration metadata even on full rebuild (#3464)
   * Perf: Use `String#end_with?("/")` instead of regexp when checking paths (#3516)
   * Docs: document 'ordinal' built-in permalink style (#3532)
+  * Upgrade liquid-c to 3.x (#3531)
 
 ### Bug Fixes
 

From 7a31029c79355795bcd97215000dc4be802f57a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joop=20Au=C3=A9?= <joopaue@gmail.com>
Date: Mon, 2 Mar 2015 21:54:05 +0100
Subject: [PATCH 379/407] Removed deprecation inconsistency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replaced occasions where the logger was used to report deprecations.
Deprecator is now used instead.

Signed-off-by: Joop Aué <joopaue@gmail.com>
---
 lib/jekyll/commands/doctor.rb |  2 +-
 lib/jekyll/configuration.rb   | 10 +++++-----
 lib/jekyll/site.rb            |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb
index 0fab8b3a7..e0ae36a10 100644
--- a/lib/jekyll/commands/doctor.rb
+++ b/lib/jekyll/commands/doctor.rb
@@ -39,7 +39,7 @@ module Jekyll
           contains_deprecated_pages = false
           site.pages.each do |page|
             if page.uses_relative_permalinks
-              Jekyll.logger.warn "Deprecation:", "'#{page.path}' uses relative" +
+              Jekyll::Deprecator.deprecation_message "'#{page.path}' uses relative" +
                                   " permalinks which will be deprecated in" +
                                   " Jekyll v2.0.0 and beyond."
               contains_deprecated_pages = true
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index f7f39cb51..e4855a9d7 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -206,7 +206,7 @@ module Jekyll
       config = clone
       # Provide backwards-compatibility
       if config.key?('auto') || config.key?('watch')
-        Jekyll.logger.warn "Deprecation:", "Auto-regeneration can no longer" +
+        Jekyll::Deprecator.deprecation_message "Auto-regeneration can no longer" +
                             " be set from your configuration file(s). Use the"+
                             " --[no-]watch/-w command-line option instead."
         config.delete('auto')
@@ -214,14 +214,14 @@ module Jekyll
       end
 
       if config.key? 'server'
-        Jekyll.logger.warn "Deprecation:", "The 'server' configuration option" +
+        Jekyll::Deprecator.deprecation_message "The 'server' configuration option" +
                             " is no longer accepted. Use the 'jekyll serve'" +
                             " subcommand to serve your site with WEBrick."
         config.delete('server')
       end
 
       if config.key? 'server_port'
-        Jekyll.logger.warn "Deprecation:", "The 'server_port' configuration option" +
+        Jekyll::Deprecator.deprecation_message "The 'server_port' configuration option" +
                             " has been renamed to 'port'. Please update your config" +
                             " file accordingly."
         # copy but don't overwrite:
@@ -230,7 +230,7 @@ module Jekyll
       end
 
       if config.key? 'pygments'
-        Jekyll.logger.warn "Deprecation:", "The 'pygments' configuration option" +
+        Jekyll::Deprecator.deprecation_message "The 'pygments' configuration option" +
                             " has been renamed to 'highlighter'. Please update your" +
                             " config file accordingly. The allowed values are 'rouge', " +
                             "'pygments' or null."
@@ -241,7 +241,7 @@ module Jekyll
 
       %w[include exclude].each do |option|
         if config.fetch(option, []).is_a?(String)
-          Jekyll.logger.warn "Deprecation:", "The '#{option}' configuration option" +
+          Jekyll::Deprecator.deprecation_message "The '#{option}' configuration option" +
             " must now be specified as an array, but you specified" +
             " a string. For now, we've treated the string you provided" +
             " as a list of comma-separated values."
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 0e1063c18..aadfb8d0a 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -471,7 +471,7 @@ module Jekyll
 
     def relative_permalinks_deprecation_method
       if config['relative_permalinks'] && has_relative_page?
-        Jekyll.logger.warn "Deprecation:", "Since v2.0, permalinks for pages" +
+        Jekyll::Deprecator.deprecation_message "Since v2.0, permalinks for pages" +
                                             " in subfolders must be relative to the" +
                                             " site source directory, not the parent" +
                                             " directory. Check http://jekyllrb.com/docs/upgrading/"+

From 8917ef011cae1ff54a5d7d631113104d5f89a8bb Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Mon, 2 Mar 2015 15:05:37 -0800
Subject: [PATCH 380/407] Update history to reflect merge of #3535 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 683e48d13..308d3ffae 100644
--- a/History.markdown
+++ b/History.markdown
@@ -44,6 +44,7 @@
   * Perf: Use `String#end_with?("/")` instead of regexp when checking paths (#3516)
   * Docs: document 'ordinal' built-in permalink style (#3532)
   * Upgrade liquid-c to 3.x (#3531)
+  * Use consistent syntax for deprecation warning (#3535)
 
 ### Bug Fixes
 

From 669c80391278c3ed9b7431eac4c56fedbc50614d Mon Sep 17 00:00:00 2001
From: Will Norris <will@willnorris.com>
Date: Sat, 21 Feb 2015 19:51:28 -0800
Subject: [PATCH 381/407] always include file extension on destination files

This ensures that destination files for HTML posts, pages and
collections always include the proper file extension (as defined by
output_ext) regardless of permalink structure.  This allows for URLs
that contain no extension or trailing slash to still result in proper
destination files with .html extensions.

Because this change relies so heavily on output_ext accurately
identifying the extension of the destination file, this change also
removes the feature test that tested support for permalinks with a .htm
extension.  In order to support alternate file extensions, a future
patch or plugin will need to modify the output_ext value, at which point
everything else should work as expected.
---
 features/permalinks.feature                   | 10 ----------
 lib/jekyll/document.rb                        |  6 ++++--
 lib/jekyll/page.rb                            |  1 +
 lib/jekyll/post.rb                            |  1 +
 ...015-02-20-extensionless-permalink.markdown |  7 +++++++
 test/source/deal.with.dots.html               |  2 +-
 test/test_document.rb                         | 17 ++++++++++++++++
 test/test_generated_site.rb                   |  2 +-
 test/test_page.rb                             | 16 +++++++++++----
 test/test_post.rb                             | 20 +++++++++++++++++++
 10 files changed, 64 insertions(+), 18 deletions(-)
 create mode 100644 test/source/_posts/2015-02-20-extensionless-permalink.markdown

diff --git a/features/permalinks.feature b/features/permalinks.feature
index c4494b4eb..cb90d1f76 100644
--- a/features/permalinks.feature
+++ b/features/permalinks.feature
@@ -83,13 +83,3 @@ Feature: Fancy permalinks
     Then the _site directory should exist
     And the _site/custom/posts directory should exist
     And I should see "bla bla" in "_site/custom/posts/some.html"
-
-  Scenario: Use per-post ending in .htm
-    Given I have a _posts directory
-    And I have the following post:
-      | title     | date       | permalink               | content |
-      | Some post | 2013-04-14 | /custom/posts/some.htm  | bla bla |
-    When I run jekyll build
-    Then the _site directory should exist
-    And the _site/custom/posts directory should exist
-    And I should see "bla bla" in "_site/custom/posts/some.htm"
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index e22e8cf12..cd407dfaa 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -4,7 +4,7 @@ module Jekyll
   class Document
     include Comparable
 
-    attr_reader   :path, :site, :extname
+    attr_reader   :path, :site, :extname, :output_ext
     attr_accessor :content, :collection, :output
 
     YAML_FRONT_MATTER_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
@@ -19,6 +19,7 @@ module Jekyll
       @site = relations[:site]
       @path = path
       @extname = File.extname(path)
+      @output_ext = Jekyll::Renderer.new(site, self).output_ext
       @collection = relations[:collection]
       @has_yaml_header = nil
     end
@@ -130,7 +131,7 @@ module Jekyll
       {
         collection: collection.label,
         path:       cleaned_relative_path,
-        output_ext: Jekyll::Renderer.new(site, self).output_ext,
+        output_ext: output_ext,
         name:       Utils.slugify(basename_without_ext),
         title:      Utils.slugify(data['slug']) || Utils.slugify(basename_without_ext)
       }
@@ -164,6 +165,7 @@ module Jekyll
       dest = site.in_dest_dir(base_directory)
       path = site.in_dest_dir(dest, URL.unescape_path(url))
       path = File.join(path, "index.html") if url.end_with?("/")
+      path << output_ext unless path.end_with?(output_ext)
       path
     end
 
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 2db391412..ca824245b 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -142,6 +142,7 @@ module Jekyll
     def destination(dest)
       path = site.in_dest_dir(dest, URL.unescape_path(url))
       path = File.join(path, "index.html") if url.end_with?("/")
+      path << output_ext unless path.end_with?(output_ext)
       path
     end
 
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index 45b6d0d20..780f40f7a 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -280,6 +280,7 @@ module Jekyll
       # The url needs to be unescaped in order to preserve the correct filename
       path = site.in_dest_dir(dest, URL.unescape_path(url))
       path = File.join(path, "index.html") if self.url.end_with?("/")
+      path << output_ext unless path.end_with?(output_ext)
       path
     end
 
diff --git a/test/source/_posts/2015-02-20-extensionless-permalink.markdown b/test/source/_posts/2015-02-20-extensionless-permalink.markdown
new file mode 100644
index 000000000..f92b21f2f
--- /dev/null
+++ b/test/source/_posts/2015-02-20-extensionless-permalink.markdown
@@ -0,0 +1,7 @@
+---
+layout: ~
+title:  Extensionless Permalink
+permalink: /:title
+---
+
+{{ page.url }}
diff --git a/test/source/deal.with.dots.html b/test/source/deal.with.dots.html
index afe2aa11c..6c87d8062 100644
--- a/test/source/deal.with.dots.html
+++ b/test/source/deal.with.dots.html
@@ -1,6 +1,6 @@
 ---
 title: Deal with dots
-permalink: /deal.with.dots/
+permalink: /deal.with.dots
 ---
 
 Let's test if jekyll deals properly with dots.
diff --git a/test/test_document.rb b/test/test_document.rb
index b6160bdc4..56d6a6713 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -212,11 +212,16 @@ class TestDocument < JekyllUnitTest
       })
       @site.process
       @document = @site.collections["slides"].docs[0]
+      @dest_file = dest_dir("slides/test/example-slide-1.html")
     end
 
     should "produce the right URL" do
       assert_equal "/slides/test/example-slide-1", @document.url
     end
+
+    should "produce the right destination" do
+      assert_equal @dest_file, @document.destination(dest_dir)
+    end
   end
 
   context "documents in a collection with custom title permalinks" do
@@ -238,14 +243,26 @@ class TestDocument < JekyllUnitTest
     should "produce the right URL if they have a slug" do
       assert_equal "/slides/so-what-is-jekyll-exactly", @document.url
     end
+    should "produce the right destination file if they have a slug" do
+      dest_file = dest_dir("slides/so-what-is-jekyll-exactly.html")
+      assert_equal dest_file, @document.destination(dest_dir)
+    end
 
     should "produce the right URL if they don't have a slug" do
       assert_equal "/slides/example-slide-5", @document_without_slug.url
     end
+    should "produce the right destination file if they don't have a slug" do
+      dest_file = dest_dir("slides/example-slide-5.html")
+      assert_equal dest_file, @document_without_slug.destination(dest_dir)
+    end
 
     should "produce the right URL if they have a wild slug" do
       assert_equal "/slides/well-so-what-is-jekyll-then", @document_with_strange_slug.url
     end
+    should "produce the right destination file if they have a wild slug" do
+      dest_file = dest_dir("/slides/well-so-what-is-jekyll-then.html")
+      assert_equal dest_file, @document_with_strange_slug.destination(dest_dir)
+    end
   end
 
   context "documents in a collection" do
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index fee492bc3..519b8f3aa 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -14,7 +14,7 @@ class TestGeneratedSite < JekyllUnitTest
     end
 
     should "ensure post count is as expected" do
-      assert_equal 47, @site.posts.size
+      assert_equal 48, @site.posts.size
     end
 
     should "insert site.posts into the index" do
diff --git a/test/test_page.rb b/test/test_page.rb
index 1c8dc215d..9918442fe 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -57,7 +57,11 @@ class TestPage < JekyllUnitTest
 
       should "deal properly with dots" do
         @page = setup_page('deal.with.dots.html')
+        @dest_file = dest_dir("deal.with.dots.html")
+
         assert_equal "deal.with.dots", @page.basename
+        assert_equal "/deal.with.dots", @page.url
+        assert_equal @dest_file, @page.destination(dest_dir)
       end
 
       should "make properties accessible through #[]" do
@@ -83,14 +87,18 @@ class TestPage < JekyllUnitTest
         end
       end
 
-      context "with pretty url style" do
+      context "with pretty permalink style" do
         setup do
           @site.permalink_style = :pretty
         end
 
-        should "return dir correctly" do
+        should "return dir, url, and destination correctly" do
           @page = setup_page('contacts.html')
+          @dest_file = dest_dir("contacts/index.html")
+
           assert_equal '/contacts/', @page.dir
+          assert_equal '/contacts/', @page.url
+          assert_equal @dest_file, @page.destination(dest_dir)
         end
 
         should "return dir correctly for index page" do
@@ -121,7 +129,7 @@ class TestPage < JekyllUnitTest
         end
       end
 
-      context "with any other url style" do
+      context "with any other permalink style" do
         should "return dir correctly" do
           @site.permalink_style = nil
           @page = setup_page('contacts.html')
@@ -179,7 +187,7 @@ class TestPage < JekyllUnitTest
         page.write(dest_dir)
 
         assert File.directory?(dest_dir)
-        assert File.exist?(File.join(dest_dir, '+', 'plus+in+url'))
+        assert File.exist?(File.join(dest_dir, '+', 'plus+in+url.html'))
       end
 
       should "write even when permalink has '%# +'" do
diff --git a/test/test_post.rb b/test/test_post.rb
index 20ea65248..2956309fc 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -659,6 +659,26 @@ class TestPost < JekyllUnitTest
           assert File.exist?(File.join(dest_dir, 'foo-bar', 'index.html'))
         end
 
+        should "write properly with extensionless site permalink" do
+          post = setup_post("2008-10-18-foo-bar.markdown")
+          post.site.permalink_style = ":title"
+          do_render(post)
+          post.write(dest_dir)
+
+          assert File.directory?(dest_dir)
+          assert File.exist?(File.join(dest_dir, 'foo-bar.html'))
+        end
+
+        should "write properly with extensionless post permalink" do
+          post = setup_post("2015-02-20-extensionless-permalink.markdown")
+          do_render(post)
+          post.write(dest_dir)
+
+          assert File.directory?(dest_dir)
+          assert File.exist?(File.join(dest_dir, 'extensionless-permalink.html'))
+          assert_equal "<p>/extensionless-permalink</p>\n", post.content
+        end
+
         should "insert data" do
           post = setup_post("2008-11-21-complex.markdown")
           do_render(post)

From d56df7592cb7cb766f26acbd5e9d0d6fb26bac4f Mon Sep 17 00:00:00 2001
From: Philipp Rudloff <phrudloff@gmail.com>
Date: Tue, 3 Mar 2015 09:52:23 +0100
Subject: [PATCH 382/407] Removing unused code from post layout

The post from the site template does not have `meta` in its front matter.

Related to #3536.
---
 lib/site_template/_layouts/post.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/site_template/_layouts/post.html b/lib/site_template/_layouts/post.html
index d4f8be3ed..3a0fb52ec 100644
--- a/lib/site_template/_layouts/post.html
+++ b/lib/site_template/_layouts/post.html
@@ -5,7 +5,7 @@ layout: default
 
   <header class="post-header">
     <h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>
-    <p class="post-meta"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time>{% if page.author %} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
+    <p class="post-meta"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time>{% if page.author %} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{% endif %}</p>
   </header>
 
   <div class="post-content" itemprop="articleBody">

From 5e9b7343bf505319b97eb1094266bb06a58c2589 Mon Sep 17 00:00:00 2001
From: Will Norris <will@willnorris.com>
Date: Tue, 3 Mar 2015 10:54:13 -0800
Subject: [PATCH 383/407] Update history to reflect merge of #3490 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 308d3ffae..23f81a0e7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -10,6 +10,7 @@
   * Remove most runtime deps (#3323)
   * Move to Rouge as default highlighter (#3323)
   * Mimic GitHub Pages `.html` extension stripping behavior in WEBrick (#3452)
+  * Always include file extension on output files (#3490)
 
 ### Minor Enhancements
 

From fa31fcb3bf3e18078fd6f471b67e4ff07a97ddd4 Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Wed, 4 Mar 2015 05:22:29 -0600
Subject: [PATCH 384/407] Update history.md to reflect the merger of #3418 [ci
 skip]

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

diff --git a/History.markdown b/History.markdown
index 23f81a0e7..f4a88eda6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -46,6 +46,7 @@
   * Docs: document 'ordinal' built-in permalink style (#3532)
   * Upgrade liquid-c to 3.x (#3531)
   * Use consistent syntax for deprecation warning (#3535)
+  * Added build --destination and --source flags (#3418)
 
 ### Bug Fixes
 

From 2ef9bae75a5aa6d6a0843c1c5582fc047d4ee5df Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 14:16:55 +0100
Subject: [PATCH 385/407] Refactored url.rb to compliant with Ruby Style Guide.

 - Single Quotes
 - Fixed Typo's in variable names.
 - Removed Redundant Escaping in Regular Expressions.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/url.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 60c965078..4bbbf92e5 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -29,7 +29,7 @@ module Jekyll
       @permalink    = options[:permalink]
 
       if (@template || @permalink).nil?
-        raise ArgumentError, "One of :template or :permalink must be supplied."
+        raise ArgumentError, 'One of :template or :permalink must be supplied.'
       end
     end
 
@@ -44,12 +44,12 @@ module Jekyll
     #
     # Returns the _unsanitized String URL
     def generated_permalink
-      (@generated_permlink ||= generate_url(@permalink)) if @permalink
+      (@generated_permalink ||= generate_url(@permalink)) if @permalink
     end
 
     # Generates a URL from the template
     #
-    # Returns the _unsanitized String URL
+    # Returns the unsanitized String URL
     def generated_url
       @generated_url ||= generate_url(@template)
     end
@@ -57,7 +57,7 @@ module Jekyll
     # Internal: Generate the URL by replacing all placeholders with their
     # respective values in the given template
     #
-    # Returns the _unsanitizied_ String URL
+    # Returns the unsanitized String URL
     def generate_url(template)
       @placeholders.inject(template) do |result, token|
         break result if result.index(':').nil?
@@ -81,7 +81,7 @@ module Jekyll
         .gsub(/\A([^\/])/, '/\1')
 
       # Append a trailing slash to the URL if the unsanitized URL had one
-      url << "/" if in_url[-1].eql?('/')
+      url << '/' if in_url[-1].eql?('/')
 
       url
     end
@@ -107,7 +107,7 @@ module Jekyll
       #   pct-encoded   = "%" HEXDIG HEXDIG
       #   sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
       #                 / "*" / "+" / "," / ";" / "="
-      URI.escape(path, /[^a-zA-Z\d\-._~!$&\'()*+,;=:@\/]/).encode('utf-8')
+      URI.escape(path, /[^a-zA-Z\d\-._~!$&'()*+,;=:@\/]/).encode('utf-8')
     end
 
     # Unescapes a URL path segment

From 0d1586a5c471d322a79177e3e9c2f5813c697c32 Mon Sep 17 00:00:00 2001
From: Will Norris <will@willnorris.com>
Date: Sat, 28 Feb 2015 22:23:08 -0800
Subject: [PATCH 386/407] Improved permalinks for pages and collections

This updates the default permalink style for pages and collections to
match the site-wide 'permalink' setting.  If the permalink setting
contains a trailing slash, either explicitly or by being set to
':pretty', then pages and collections permalinks will contain trailing
slashes by default as well.  Similarly, if the permalink setting
contains a trailing ':output_ext', so will pages and collections.  If
the permalink setting contains neither a trailing slash or extension,
neither will pages or collections.

This impacts only the default permalink structure for pages and
collections.  Permalinks set in the frontmatter of an individual page
take precedence, as does the permalink setting for a specific
collection.

Fixes #2691
---
 lib/jekyll/collection.rb |  4 ++-
 lib/jekyll/page.rb       | 14 ++++-------
 lib/jekyll/utils.rb      | 40 +++++++++++++++++++++++++++++
 test/test_document.rb    | 26 ++++++++++++++++++-
 test/test_page.rb        | 54 +++++++++++++++++++++++++++++++++++++++-
 test/test_utils.rb       | 14 +++++++++++
 6 files changed, 140 insertions(+), 12 deletions(-)

diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index b09a7ed93..e8740cf66 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -170,7 +170,9 @@ module Jekyll
     #
     # Returns the URL template to render collection's documents at.
     def url_template
-      metadata.fetch('permalink', "/:collection/:path:output_ext")
+      metadata.fetch('permalink') do
+          Utils.add_permalink_suffix("/:collection/:path", site.permalink_style)
+      end
     end
 
     # Extract options for this collection from the site configuration.
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index ca824245b..a4ddb6984 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -63,16 +63,12 @@ module Jekyll
     #
     # Returns the template String.
     def template
-      if site.permalink_style == :pretty
-        if index? && html?
-          "/:path/"
-        elsif html?
-          "/:path/:basename/"
-        else
-          "/:path/:basename:output_ext"
-        end
-      else
+      if !html?
         "/:path/:basename:output_ext"
+      elsif index?
+        "/:path/"
+      else
+        Utils.add_permalink_suffix("/:path/:basename", site.permalink_style)
       end
     end
 
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index bba8b148c..393027906 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -158,5 +158,45 @@ module Jekyll
         downcase
     end
 
+    # Add an appropriate suffix to template so that it matches the specified
+    # permalink style.
+    #
+    # template - permalink template without trailing slash or file extension
+    # permalink_style - permalink style, either built-in or custom
+    #
+    # The returned permalink template will use the same ending style as
+    # specified in permalink_style.  For example, if permalink_style contains a
+    # trailing slash (or is :pretty, which indirectly has a trailing slash),
+    # then so will the returned template.  If permalink_style has a trailing
+    # ":output_ext" (or is :none, :date, or :ordinal) then so will the returned
+    # template.  Otherwise, template will be returned without modification.
+    #
+    # Examples:
+    #   add_permalink_suffix("/:basename", :pretty)
+    #   # => "/:basename/"
+    #
+    #   add_permalink_suffix("/:basename", :date)
+    #   # => "/:basename:output_ext"
+    #
+    #   add_permalink_suffix("/:basename", "/:year/:month/:title/")
+    #   # => "/:basename/"
+    #
+    #   add_permalink_suffix("/:basename", "/:year/:month/:title")
+    #   # => "/:basename"
+    #
+    # Returns the updated permalink template
+    def add_permalink_suffix(template, permalink_style)
+      case permalink_style
+      when :pretty
+        template << "/"
+      when :date, :ordinal, :none
+        template << ":output_ext"
+      else
+        template << "/" if permalink_style.to_s.end_with?("/")
+        template << ":output_ext" if permalink_style.to_s.end_with?(":output_ext")
+      end
+      template
+    end
+
   end
 end
diff --git a/test/test_document.rb b/test/test_document.rb
index 56d6a6713..f8b9db664 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -219,7 +219,31 @@ class TestDocument < JekyllUnitTest
       assert_equal "/slides/test/example-slide-1", @document.url
     end
 
-    should "produce the right destination" do
+    should "produce the right destination file" do
+      assert_equal @dest_file, @document.destination(dest_dir)
+    end
+  end
+
+  context "a document in a collection with pretty permalink style" do
+    setup do
+      @site = fixture_site({
+        "collections" => {
+          "slides" => {
+            "output"    => true,
+          }
+        },
+      })
+      @site.permalink_style = :pretty
+      @site.process
+      @document = @site.collections["slides"].docs[0]
+      @dest_file = dest_dir("slides/example-slide-1/index.html")
+    end
+
+    should "produce the right URL" do
+      assert_equal "/slides/example-slide-1/", @document.url
+    end
+
+    should "produce the right destination file" do
       assert_equal @dest_file, @document.destination(dest_dir)
     end
   end
diff --git a/test/test_page.rb b/test/test_page.rb
index 9918442fe..1e4d3da62 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -46,7 +46,7 @@ class TestPage < JekyllUnitTest
 
         should "create index url based on filename" do
           @page = setup_page('/contacts', 'index.html')
-          assert_equal "/contacts/index.html", @page.url
+          assert_equal "/contacts/", @page.url
         end
       end
 
@@ -129,6 +129,58 @@ class TestPage < JekyllUnitTest
         end
       end
 
+      context "with date permalink style" do
+        setup do
+          @site.permalink_style = :date
+        end
+
+        should "return url and destination correctly" do
+          @page = setup_page('contacts.html')
+          @dest_file = dest_dir("contacts.html")
+          assert_equal '/contacts.html', @page.url
+          assert_equal @dest_file, @page.destination(dest_dir)
+        end
+      end
+
+      context "with custom permalink style with trailing slash" do
+        setup do
+          @site.permalink_style = "/:title/"
+        end
+
+        should "return url and destination correctly" do
+          @page = setup_page('contacts.html')
+          @dest_file = dest_dir("contacts/index.html")
+          assert_equal '/contacts/', @page.url
+          assert_equal @dest_file, @page.destination(dest_dir)
+        end
+      end
+
+      context "with custom permalink style with file extension" do
+        setup do
+          @site.permalink_style = "/:title:output_ext"
+        end
+
+        should "return url and destination correctly" do
+          @page = setup_page('contacts.html')
+          @dest_file = dest_dir("contacts.html")
+          assert_equal '/contacts.html', @page.url
+          assert_equal @dest_file, @page.destination(dest_dir)
+        end
+      end
+
+      context "with custom permalink style with no extension" do
+        setup do
+          @site.permalink_style = "/:title"
+        end
+
+        should "return url and destination correctly" do
+          @page = setup_page('contacts.html')
+          @dest_file = dest_dir("contacts.html")
+          assert_equal '/contacts', @page.url
+          assert_equal @dest_file, @page.destination(dest_dir)
+        end
+      end
+
       context "with any other permalink style" do
         should "return dir correctly" do
           @site.permalink_style = nil
diff --git a/test/test_utils.rb b/test/test_utils.rb
index ddb63d4bf..9d4a5a4df 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -166,4 +166,18 @@ class TestUtils < JekyllUnitTest
     end
   end
 
+  context "The \`Utils.add_permalink_suffix\` method" do
+    should "handle built-in permalink styles" do
+      assert_equal "/:basename/", Utils.add_permalink_suffix("/:basename", :pretty)
+      assert_equal "/:basename:output_ext", Utils.add_permalink_suffix("/:basename", :date)
+      assert_equal "/:basename:output_ext", Utils.add_permalink_suffix("/:basename", :ordinal)
+      assert_equal "/:basename:output_ext", Utils.add_permalink_suffix("/:basename", :none)
+    end
+
+    should "handle custom permalink styles" do
+      assert_equal "/:basename/", Utils.add_permalink_suffix("/:basename", "/:title/")
+      assert_equal "/:basename:output_ext", Utils.add_permalink_suffix("/:basename", "/:title:output_ext")
+      assert_equal "/:basename", Utils.add_permalink_suffix("/:basename", "/:title")
+    end
+  end
 end

From c1562c8997397cc8ed6e1448767fbfc2bb8b7c63 Mon Sep 17 00:00:00 2001
From: Fabian Tamp <fabian.tamp@gmail.com>
Date: Wed, 4 Mar 2015 21:20:08 +0000
Subject: [PATCH 387/407] Improve consistency in site/_docs/plugins.md

Three plugin strategies are listed, but then only two were referenced in the following note. I've updated this doc so that all three are referenced.
---
 site/_docs/plugins.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 9f4afb97d..4958add3a 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -42,12 +42,12 @@ You have 3 options for installing plugins:
 
 <div class="note info">
   <h5>
-    <code>_plugins</code> and <code>gems</code>
+    <code>_plugins</code>, <code>_config.yml</code> and <code>Gemfile</code>
     can be used simultaneously
   </h5>
   <p>
-    You may use both of the aforementioned plugin options simultaneously in the
-    same site if you so choose. Use of one does not restrict the use of the other
+    You may use any of the aforementioned plugin options simultaneously in the
+    same site if you so choose. Use of one does not restrict the use of the others.
   </p>
 </div>
 

From ca7375a51b779e754553c4bb5bd98cbf14aca490 Mon Sep 17 00:00:00 2001
From: Martin Jorn Rogalla <martin@martinrogalla.com>
Date: Wed, 4 Mar 2015 22:31:19 +0100
Subject: [PATCH 388/407] Corrected quote-usage. Replaced [-1].eql with
 end_with.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
---
 lib/jekyll/url.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 4bbbf92e5..14b70631b 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -29,7 +29,7 @@ module Jekyll
       @permalink    = options[:permalink]
 
       if (@template || @permalink).nil?
-        raise ArgumentError, 'One of :template or :permalink must be supplied.'
+        raise ArgumentError, "One of :template or :permalink must be supplied."
       end
     end
 
@@ -81,7 +81,7 @@ module Jekyll
         .gsub(/\A([^\/])/, '/\1')
 
       # Append a trailing slash to the URL if the unsanitized URL had one
-      url << '/' if in_url[-1].eql?('/')
+      url << "/" if in_url.end_with?("/")
 
       url
     end

From c8d23ffee25f42e844bc31e667ce41416f8ae307 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 4 Mar 2015 15:14:18 -0800
Subject: [PATCH 389/407] Update history to reflect merge of #3544 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f4a88eda6..29085385a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -90,6 +90,7 @@
   * Remove trailing whitespace (#3497)
   * Use `fixture_site` for Document tests (#3511)
   * Remove adapters deprecation warning (#3529)
+  * Minor fixes to `url.rb` to follow GitHub style guide (#3544)
 
 ### Site Enhancements
 

From 252665ddc66c9b85f79875f7171423aff32d41d0 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 4 Mar 2015 15:16:07 -0800
Subject: [PATCH 390/407] Update history to reflect merge of #3546 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 29085385a..dd0e61df8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -131,6 +131,7 @@
   * Add jekyll-auto-image generator to the list of third-party plugins (#3489)
   * Replace link to the proposed `picture` element spec (#3530)
   * Add frontmatter date formatting information (#3469)
+  * Improve consistency and clarity of plugins options note (#3546)
 
 ## 2.5.3 / 2014-12-22
 

From a608494e18cec86637c1d72cbcb5d038b6d18207 Mon Sep 17 00:00:00 2001
From: Will Norris <will@willnorris.com>
Date: Wed, 4 Mar 2015 15:20:25 -0800
Subject: [PATCH 391/407] Update history to reflect merge of #3538 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index dd0e61df8..fb95cca6d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
   * Move to Rouge as default highlighter (#3323)
   * Mimic GitHub Pages `.html` extension stripping behavior in WEBrick (#3452)
   * Always include file extension on output files (#3490)
+  * Improved permalinks for pages and collections (#3538)
 
 ### Minor Enhancements
 

From 117bd8a6f07646c2b7b17b6e79fdb015d77f7e25 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 4 Mar 2015 18:33:22 -0800
Subject: [PATCH 392/407] Update history to reflect merge of #3537 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fb95cca6d..1808818ba 100644
--- a/History.markdown
+++ b/History.markdown
@@ -48,6 +48,7 @@
   * Upgrade liquid-c to 3.x (#3531)
   * Use consistent syntax for deprecation warning (#3535)
   * Added build --destination and --source flags (#3418)
+  * Site template: remove unused `page.meta` attribute (#3537)
 
 ### Bug Fixes
 

From 489da6784a216b1eb1789b618d6aa96f815114b2 Mon Sep 17 00:00:00 2001
From: ChaYoung You <yousbe@gmail.com>
Date: Thu, 5 Mar 2015 18:19:32 +0900
Subject: [PATCH 393/407] Remove duplicated range from regex

`/\w/` is equivalent to `[a-zA-Z0-9_]`. See
http://ruby-doc.org/core-2.2.0/doc/regexp_rdoc.html#label-Character+Classes.
---
 lib/jekyll/site.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index aadfb8d0a..969102558 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -528,7 +528,7 @@ module Jekyll
     end
 
     def sanitize_filename(name)
-      name.gsub!(/[^\w\s_-]+/, '')
+      name.gsub!(/[^\w\s-]+/, '')
       name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
       name.gsub(/\s+/, '_')
     end

From 7806f9ed52e5f506736f78a5be5757aa87a4dbc5 Mon Sep 17 00:00:00 2001
From: ChaYoung You <yousbe@gmail.com>
Date: Thu, 5 Mar 2015 18:21:52 +0900
Subject: [PATCH 394/407] Replace `File.exists?` with `File.exist?`

`File.exists?` is deprecated method. See
http://ruby-doc.org//core-2.2.0/File.html#exists-3F-method.
---
 lib/jekyll/configuration.rb | 2 +-
 test/test_configuration.rb  | 6 +++---
 test/test_site.rb           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index e4855a9d7..ca5d48390 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -137,7 +137,7 @@ module Jekyll
       config_files = override.delete('config')
       if config_files.to_s.empty?
         default = %w[yml yaml].find(Proc.new { 'yml' }) do |ext|
-          File.exists? Jekyll.sanitized_path(source(override), "_config.#{ext}")
+          File.exist?(Jekyll.sanitized_path(source(override), "_config.#{ext}"))
         end
         config_files = Jekyll.sanitized_path(source(override), "_config.#{default}")
         @default_config_file = true
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 7e14a4189..8de8ac29d 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -42,12 +42,12 @@ class TestConfiguration < JekyllUnitTest
       assert_equal [source_dir("_config.yml")], @config.config_files(@no_override)
     end
     should "return .yaml if it exists but .yml does not" do
-      mock(File).exists?(source_dir("_config.yml")) { false }
-      mock(File).exists?(source_dir("_config.yaml")) { true }
+      mock(File).exist?(source_dir("_config.yml")) { false }
+      mock(File).exist?(source_dir("_config.yaml")) { true }
       assert_equal [source_dir("_config.yaml")], @config.config_files(@no_override)
     end
     should "return .yml if both .yml and .yaml exist" do
-      mock(File).exists?(source_dir("_config.yml")) { true }
+      mock(File).exist?(source_dir("_config.yml")) { true }
       assert_equal [source_dir("_config.yml")], @config.config_files(@no_override)
     end
     should "return the config if given one config file" do
diff --git a/test/test_site.rb b/test/test_site.rb
index c460d873f..76ce9ce16 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -143,7 +143,7 @@ class TestSite < JekyllUnitTest
 
       # simulate destination file deletion
       File.unlink dest
-      refute File.exists?(dest)
+      refute File.exist?(dest)
 
       sleep 1
       @site.process

From 3a4d826852db59b85c1d83d4890f4bfe4b495c4c Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 5 Mar 2015 11:20:13 -0800
Subject: [PATCH 395/407] Update history to reflect merge of #3547 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1808818ba..aa414666f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -93,6 +93,7 @@
   * Use `fixture_site` for Document tests (#3511)
   * Remove adapters deprecation warning (#3529)
   * Minor fixes to `url.rb` to follow GitHub style guide (#3544)
+  * Minor changes to resolve deprecation warnings (#3547)
 
 ### Site Enhancements
 

From b41ddbb8a92934e9b02ba0b4dd715496a519e59e Mon Sep 17 00:00:00 2001
From: Matt Rogers <codemattr@gmail.com>
Date: Thu, 5 Mar 2015 14:35:40 -0600
Subject: [PATCH 396/407] Update history to reflect merge of #3520 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index aa414666f..1375f45e0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -49,6 +49,7 @@
   * Use consistent syntax for deprecation warning (#3535)
   * Added build --destination and --source flags (#3418)
   * Site template: remove unused `page.meta` attribute (#3537)
+  * Improve the error message when sorting null objects (#3520)
 
 ### Bug Fixes
 

From bb4d47b905a474052cdbd9719750764df14450b0 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 5 Mar 2015 13:14:15 -0800
Subject: [PATCH 397/407] Move History declaration for #3528 back up to HEAD.

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

diff --git a/History.markdown b/History.markdown
index aa414666f..605036932 100644
--- a/History.markdown
+++ b/History.markdown
@@ -94,6 +94,7 @@
   * Remove adapters deprecation warning (#3529)
   * Minor fixes to `url.rb` to follow GitHub style guide (#3544)
   * Minor changes to resolve deprecation warnings (#3547)
+  * Convert remaining textile test documents to markdown (#3528)
 
 ### Site Enhancements
 
@@ -299,7 +300,6 @@
   * Allow Travis to 'parallelize' our tests (#2859)
   * Fix test for Liquid rendering in Sass (#2856)
   * Fixing "vertycal" typo in site template's `_base.scss` (#2889)
-  * Convert remaining textile test documents to markdown (#3528)
 
 ### Site Enhancements
 

From 6d9258bcdcd7537920a87889a69d8ddc003ed6c5 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 5 Mar 2015 13:40:10 -0800
Subject: [PATCH 398/407] Release :gem: v3.0.0.beta2

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

diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 8b67d1cfd..64cdaba2f 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.0.0-beta1'
+  VERSION = '3.0.0.beta2'
 end

From 66785b43ba55d55db77f1e6983324c54013d1f3c Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 5 Mar 2015 13:40:18 -0800
Subject: [PATCH 399/407] Release :gem: 3.0.0.beta2


From 013f7edc833cf59af21644f6a1ea799d61f70d86 Mon Sep 17 00:00:00 2001
From: Cory Simmons <csimmonswork@gmail.com>
Date: Fri, 6 Mar 2015 01:17:02 -0500
Subject: [PATCH 400/407] Add permalink warning to pagination docs

Fixes https://github.com/jekyll/jekyll-paginate/issues/25
---
 site/_docs/pagination.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/site/_docs/pagination.md b/site/_docs/pagination.md
index 9352827e9..71403d2af 100644
--- a/site/_docs/pagination.md
+++ b/site/_docs/pagination.md
@@ -42,6 +42,13 @@ starting with `2`. If a site has 12 posts and specifies `paginate: 5`, Jekyll wi
 `blog/index.html` with the first 5 posts, `blog/page2/index.html` with the next 5 posts
 and `blog/page3/index.html` with the last 2 posts into the destination directory.
 
+<div class="note warning">
+  <h5>Don't set a permalink</h5>
+  <p>
+    Setting a permalink in the front matter of your blog page will cause pagination to break. Just omit the permalink.
+  </p>
+</div>
+
 ## Liquid Attributes Available
 
 The pagination plugin exposes the `paginator` liquid object with the following

From 269bcbb7a83af13c48970b2d3d2ca0a58e18ff13 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 6 Mar 2015 16:23:36 -0800
Subject: [PATCH 401/407] Update history to reflect merge of #3551 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9bcf00f83..f2c462650 100644
--- a/History.markdown
+++ b/History.markdown
@@ -137,6 +137,7 @@
   * Replace link to the proposed `picture` element spec (#3530)
   * Add frontmatter date formatting information (#3469)
   * Improve consistency and clarity of plugins options note (#3546)
+  * Add permalink warning to pagination docs (#3551)
 
 ## 2.5.3 / 2014-12-22
 

From 67ba8ad0cbd851caf82efc7f6290126edece1c3c Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Fri, 6 Mar 2015 19:49:12 -0500
Subject: [PATCH 402/407] Use rspec-mock instead of rr

---
 Gemfile                        |  2 +-
 features/support/env.rb        |  1 -
 test/helper.rb                 | 16 +++++++++-
 test/test_command.rb           |  4 +--
 test/test_configuration.rb     | 56 +++++++++++++++++-----------------
 test/test_entry_filter.rb      |  4 +--
 test/test_generated_site.rb    | 25 +++++----------
 test/test_layout_reader.rb     | 10 +++---
 test/test_log_adapter.rb       | 10 +++---
 test/test_new_command.rb       |  2 +-
 test/test_path_sanitization.rb |  2 +-
 test/test_related_posts.rb     | 22 ++++---------
 test/test_site.rb              |  3 +-
 test/test_tags.rb              | 19 ++----------
 14 files changed, 78 insertions(+), 98 deletions(-)

diff --git a/Gemfile b/Gemfile
index ef78622c5..4299c72e7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,6 @@ gem 'rake', '~> 10.1'
 gem 'rdoc', '~> 3.11'
 gem 'redgreen', '~> 1.2'
 gem 'shoulda', '~> 3.5'
-gem 'rr', '~> 1.1'
 gem 'cucumber', '1.3.18'
 gem 'maruku', '~> 0.7.0'
 gem 'rdiscount', '~> 2.0'
@@ -28,6 +27,7 @@ gem 'minitest'
 gem 'minitest-reporters'
 gem 'minitest-profile'
 gem 'test-unit' if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2")
+gem 'rspec-mocks'
 
 if ENV['BENCHMARK']
   gem 'rbtrace'
diff --git a/features/support/env.rb b/features/support/env.rb
index 8f33ff63d..43d74ab91 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -1,6 +1,5 @@
 require 'fileutils'
 require 'posix-spawn'
-require 'rr'
 require 'minitest/assertions'
 require 'time'
 
diff --git a/test/helper.rb b/test/helper.rb
index e4a50db09..9c5a1eb01 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -11,6 +11,7 @@ require 'ostruct'
 require 'minitest/autorun'
 require 'minitest/reporters'
 require 'minitest/profile'
+require 'rspec/mocks'
 
 require 'jekyll'
 
@@ -19,7 +20,6 @@ require 'kramdown'
 require 'redcarpet'
 
 require 'shoulda'
-require 'rr'
 
 include Jekyll
 
@@ -30,6 +30,20 @@ STDERR.reopen(test(?e, '/dev/null') ? '/dev/null' : 'NUL:')
 Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(:color => true)]
 
 class JekyllUnitTest < Minitest::Test
+  include ::RSpec::Mocks::ExampleMethods
+
+  def before_setup
+    ::RSpec::Mocks.setup
+    super
+  end
+
+  def after_teardown
+    super
+    ::RSpec::Mocks.verify
+  ensure
+    ::RSpec::Mocks.teardown
+  end
+
   def fixture_site(overrides = {})
     Jekyll::Site.new(site_configuration(overrides))
   end
diff --git a/test/test_command.rb b/test/test_command.rb
index fb9e247bd..f7c3e2378 100644
--- a/test/test_command.rb
+++ b/test/test_command.rb
@@ -4,7 +4,7 @@ class TestCommand < JekyllUnitTest
   context "when calling .add_build_options" do
     should "add common options" do
       cmd = Object.new
-      mock(cmd).option.with_any_args.at_least(1)
+      expect(cmd).to receive(:option).at_least(:once)
       Command.add_build_options(cmd)
     end
   end
@@ -12,7 +12,7 @@ class TestCommand < JekyllUnitTest
     context "when fatal error occurs" do
       should "exit with non-zero error code" do
         site = Object.new
-        stub(site).process { raise Jekyll::Errors::FatalException }
+        def site.process; raise Jekyll::Errors::FatalException; end
         error = assert_raises(SystemExit) { Command.process_site(site) }
         refute_equal 0, error.status
       end
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 8de8ac29d..ce54223ce 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -42,12 +42,12 @@ class TestConfiguration < JekyllUnitTest
       assert_equal [source_dir("_config.yml")], @config.config_files(@no_override)
     end
     should "return .yaml if it exists but .yml does not" do
-      mock(File).exist?(source_dir("_config.yml")) { false }
-      mock(File).exist?(source_dir("_config.yaml")) { true }
+      allow(File).to receive(:exist?).with(source_dir("_config.yml")).and_return(false)
+      allow(File).to receive(:exist?).with(source_dir("_config.yaml")).and_return(true)
       assert_equal [source_dir("_config.yaml")], @config.config_files(@no_override)
     end
     should "return .yml if both .yml and .yaml exist" do
-      mock(File).exist?(source_dir("_config.yml")) { true }
+      allow(File).to receive(:exist?).with(source_dir("_config.yml")).and_return(true)
       assert_equal [source_dir("_config.yml")], @config.config_files(@no_override)
     end
     should "return the config if given one config file" do
@@ -115,27 +115,27 @@ class TestConfiguration < JekyllUnitTest
     end
 
     should "fire warning with no _config.yml" do
-      mock(SafeYAML).load_file(@path) { raise SystemCallError, "No such file or directory - #{@path}" }
-      mock($stderr).puts("Configuration file: none".yellow)
+      allow(SafeYAML).to receive(:load_file).with(@path) { raise SystemCallError, "No such file or directory - #{@path}" }
+      allow($stderr).to receive(:puts).with("Configuration file: none".yellow)
       assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({})
     end
 
     should "load configuration as hash" do
-      mock(SafeYAML).load_file(@path) { Hash.new }
-      mock($stdout).puts("Configuration file: #{@path}")
+      allow(SafeYAML).to receive(:load_file).with(@path).and_return(Hash.new)
+      allow($stdout).to receive(:puts).with("Configuration file: #{@path}")
       assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({})
     end
 
     should "fire warning with bad config" do
-      mock(SafeYAML).load_file(@path) { Array.new }
-      mock($stderr).puts(("WARNING: ".rjust(20) + "Error reading configuration. Using defaults (and options).").yellow)
-      mock($stderr).puts("Configuration file: (INVALID) #{@path}".yellow)
+      allow(SafeYAML).to receive(:load_file).with(@path).and_return(Array.new)
+      allow($stderr).to receive(:puts).and_return(("WARNING: ".rjust(20) + "Error reading configuration. Using defaults (and options).").yellow)
+      allow($stderr).to receive(:puts).and_return("Configuration file: (INVALID) #{@path}".yellow)
       assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({})
     end
 
     should "fire warning when user-specified config file isn't there" do
-      mock(SafeYAML).load_file(@user_config) { raise SystemCallError, "No such file or directory - #{@user_config}" }
-      mock($stderr).puts(("Fatal: ".rjust(20) + "The configuration file '#{@user_config}' could not be found.").red)
+      allow(SafeYAML).to receive(:load_file).with(@user_config) { raise SystemCallError, "No such file or directory - #{@user_config}" }
+      allow($stderr).to receive(:puts).with(("Fatal: ".rjust(20) + "The configuration file '#{@user_config}' could not be found.").red)
       assert_raises LoadError do
         Jekyll.configuration({'config' => [@user_config]})
       end
@@ -157,20 +157,20 @@ class TestConfiguration < JekyllUnitTest
     end
 
     should "load default config if no config_file is set" do
-      mock(SafeYAML).load_file(@paths[:default]) { Hash.new }
-      mock($stdout).puts("Configuration file: #{@paths[:default]}")
+      allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return({})
+      allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}")
       assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({})
     end
 
     should "load different config if specified" do
-      mock(SafeYAML).load_file(@paths[:other]) { {"baseurl" => "http://wahoo.dev"} }
-      mock($stdout).puts("Configuration file: #{@paths[:other]}")
+      allow(SafeYAML).to receive(:load_file).with(@paths[:other]).and_return({"baseurl" => "http://wahoo.dev"})
+      allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}")
       assert_equal Utils.deep_merge_hashes(Jekyll::Configuration::DEFAULTS, { "baseurl" => "http://wahoo.dev" }), Jekyll.configuration({ "config" => @paths[:other] })
     end
 
     should "load default config if path passed is empty" do
-      mock(SafeYAML).load_file(@paths[:default]) { Hash.new }
-      mock($stdout).puts("Configuration file: #{@paths[:default]}")
+      allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return({})
+      allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}")
       assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({ "config" => @paths[:empty] })
     end
 
@@ -183,20 +183,20 @@ class TestConfiguration < JekyllUnitTest
     should "load multiple config files" do
       External.require_with_graceful_fail('toml')
 
-      mock(SafeYAML).load_file(@paths[:default]) { Hash.new }
-      mock(SafeYAML).load_file(@paths[:other]) { Hash.new }
-      mock(TOML).load_file(@paths[:toml]) { Hash.new }
-      mock($stdout).puts("Configuration file: #{@paths[:default]}")
-      mock($stdout).puts("Configuration file: #{@paths[:other]}")
-      mock($stdout).puts("Configuration file: #{@paths[:toml]}")
+      allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return(Hash.new)
+      allow(SafeYAML).to receive(:load_file).with(@paths[:other]).and_return(Hash.new)
+      allow(TOML).to receive(:load_file).with(@paths[:toml]).and_return(Hash.new)
+      allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}")
+      allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}")
+      allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:toml]}")
       assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({ "config" => [@paths[:default], @paths[:other], @paths[:toml]] })
     end
 
     should "load multiple config files and last config should win" do
-      mock(SafeYAML).load_file(@paths[:default]) { {"baseurl" => "http://example.dev"} }
-      mock(SafeYAML).load_file(@paths[:other]) { {"baseurl" => "http://wahoo.dev"} }
-      mock($stdout).puts("Configuration file: #{@paths[:default]}")
-      mock($stdout).puts("Configuration file: #{@paths[:other]}")
+      allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return({"baseurl" => "http://example.dev"})
+      allow(SafeYAML).to receive(:load_file).with(@paths[:other]).and_return({"baseurl" => "http://wahoo.dev"})
+      allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}")
+      allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}")
       assert_equal Utils.deep_merge_hashes(Jekyll::Configuration::DEFAULTS, { "baseurl" => "http://wahoo.dev" }), Jekyll.configuration({ "config" => [@paths[:default], @paths[:other]] })
     end
   end
diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb
index e3a7e8c02..e5a5dc663 100644
--- a/test/test_entry_filter.rb
+++ b/test/test_entry_filter.rb
@@ -48,13 +48,13 @@ class TestEntryFilter < JekyllUnitTest
 
     should "filter symlink entries when safe mode enabled" do
       site = Site.new(site_configuration('safe' => true))
-      stub(File).symlink?('symlink.js') {true}
+      allow(File).to receive(:symlink?).with('symlink.js').and_return(true)
       files = %w[symlink.js]
       assert_equal [], site.filter_entries(files)
     end
 
     should "not filter symlink entries when safe mode disabled" do
-      stub(File).symlink?('symlink.js') {true}
+      allow(File).to receive(:symlink?).with('symlink.js').and_return(true)
       files = %w[symlink.js]
       assert_equal files, @site.filter_entries(files)
     end
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 519b8f3aa..b3fe811f0 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -4,11 +4,9 @@ class TestGeneratedSite < JekyllUnitTest
   context "generated sites" do
     setup do
       clear_dest
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
-      end
+      config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
 
-      @site = Site.new(Jekyll.configuration)
+      @site = fixture_site config
       @site.process
       @index = File.read(dest_dir('index.html'))
     end
@@ -59,11 +57,8 @@ OUTPUT
   context "generating limited posts" do
     setup do
       clear_dest
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 5})
-      end
-
-      @site = Site.new(Jekyll.configuration)
+      config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 5})
+      @site = fixture_site config
       @site.process
       @index = File.read(dest_dir('index.html'))
     end
@@ -75,21 +70,17 @@ OUTPUT
     should "ensure limit posts is 0 or more" do
       assert_raises ArgumentError do
         clear_dest
-        stub(Jekyll).configuration do
-          Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => -1})
-        end
+        config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => -1})
 
-        @site = Site.new(Jekyll.configuration)
+        @site = fixture_site config
       end
     end
 
     should "acceptable limit post is 0" do
       clear_dest
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 0})
-      end
+      config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 0})
 
-      assert Site.new(Jekyll.configuration), "Couldn't create a site with the given limit_posts."
+      assert Site.new(config), "Couldn't create a site with the given limit_posts."
     end
   end
 end
diff --git a/test/test_layout_reader.rb b/test/test_layout_reader.rb
index fc2f1fc3f..88f352207 100644
--- a/test/test_layout_reader.rb
+++ b/test/test_layout_reader.rb
@@ -3,10 +3,8 @@ require 'helper'
 class TestLayoutReader < JekyllUnitTest
   context "reading layouts" do
     setup do
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
-      end
-      @site = Site.new(Jekyll.configuration)
+      config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
+      @site = fixture_site config
     end
 
     should "read layouts" do
@@ -22,8 +20,8 @@ class TestLayoutReader < JekyllUnitTest
 
     context "when a _layouts directory exists in CWD" do
       setup do
-        stub(File).directory? { true }
-        stub(Dir).pwd { source_dir("blah") }
+        allow(File).to receive(:directory?).and_return(true)
+        allow(Dir).to receive(:pwd).and_return(source_dir("blah"))
       end
 
       should "know to use the layout directory relative to CWD" do
diff --git a/test/test_log_adapter.rb b/test/test_log_adapter.rb
index 99b243bcd..dee5df3ed 100644
--- a/test/test_log_adapter.rb
+++ b/test/test_log_adapter.rb
@@ -22,7 +22,7 @@ class TestLogAdapter < JekyllUnitTest
     should "call #debug on writer return true" do
       writer = LoggerDouble.new
       logger = Jekyll::LogAdapter.new(writer)
-      stub(writer).debug('topic '.rjust(20) + 'log message') { true }
+      allow(writer).to receive(:debug).with('topic '.rjust(20) + 'log message').and_return(true)
       assert logger.debug('topic', 'log message')
     end
   end
@@ -31,7 +31,7 @@ class TestLogAdapter < JekyllUnitTest
     should "call #info on writer return true" do
       writer = LoggerDouble.new
       logger = Jekyll::LogAdapter.new(writer)
-      stub(writer).info('topic '.rjust(20) + 'log message') { true }
+      allow(writer).to receive(:info).with('topic '.rjust(20) + 'log message').and_return(true)
       assert logger.info('topic', 'log message')
     end
   end
@@ -40,7 +40,7 @@ class TestLogAdapter < JekyllUnitTest
     should "call #warn on writer return true" do
       writer = LoggerDouble.new
       logger = Jekyll::LogAdapter.new(writer)
-      stub(writer).warn('topic '.rjust(20) + 'log message') { true }
+      allow(writer).to receive(:warn).with('topic '.rjust(20) + 'log message').and_return(true)
       assert logger.warn('topic', 'log message')
     end
   end
@@ -49,7 +49,7 @@ class TestLogAdapter < JekyllUnitTest
     should "call #error on writer return true" do
       writer = LoggerDouble.new
       logger = Jekyll::LogAdapter.new(writer)
-      stub(writer).error('topic '.rjust(20) + 'log message') { true }
+      allow(writer).to receive(:error).with('topic '.rjust(20) + 'log message').and_return(true)
       assert logger.error('topic', 'log message')
     end
   end
@@ -57,7 +57,7 @@ class TestLogAdapter < JekyllUnitTest
   context "#abort_with" do
     should "call #error and abort" do
       logger = Jekyll::LogAdapter.new(LoggerDouble.new)
-      stub(logger).error('topic', 'log message') { true }
+      allow(logger).to receive(:error).with('topic', 'log message').and_return(true)
       assert_raises(SystemExit) { logger.abort_with('topic', 'log message') }
     end
   end
diff --git a/test/test_new_command.rb b/test/test_new_command.rb
index 2e0fd45ce..7321b462a 100644
--- a/test/test_new_command.rb
+++ b/test/test_new_command.rb
@@ -55,7 +55,7 @@ class TestNewCommand < JekyllUnitTest
       end
 
       stubbed_date = '2013-01-01'
-      stub.instance_of(Time).strftime { stubbed_date }
+      allow_any_instance_of(Time).to receive(:strftime) { stubbed_date }
 
       erb_template_files.each do |f|
         f.chomp! '.erb'
diff --git a/test/test_path_sanitization.rb b/test/test_path_sanitization.rb
index 2a3182e30..b04a2badd 100644
--- a/test/test_path_sanitization.rb
+++ b/test/test_path_sanitization.rb
@@ -5,7 +5,7 @@ class TestPathSanitization < JekyllUnitTest
     setup do
       @source = "C:/Users/xmr/Desktop/mpc-hc.org"
       @dest   = "./_site/"
-      stub(Dir).pwd { "C:/Users/xmr/Desktop/mpc-hc.org" }
+      allow(Dir).to receive(:pwd).and_return("C:/Users/xmr/Desktop/mpc-hc.org")
     end
     should "strip drive name from path" do
       assert_equal "C:/Users/xmr/Desktop/mpc-hc.org/_site", Jekyll.sanitized_path(@source, @dest)
diff --git a/test/test_related_posts.rb b/test/test_related_posts.rb
index 645f2bfbb..42c582793 100644
--- a/test/test_related_posts.rb
+++ b/test/test_related_posts.rb
@@ -3,11 +3,7 @@ require 'helper'
 class TestRelatedPosts < JekyllUnitTest
   context "building related posts without lsi" do
     setup do
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir,
-                                               'destination' => dest_dir})
-      end
-      @site = Site.new(Jekyll.configuration)
+      @site = fixture_site
     end
 
     should "use the most recent posts for related posts" do
@@ -24,23 +20,17 @@ class TestRelatedPosts < JekyllUnitTest
 
   context "building related posts with lsi" do
     setup do
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir,
-                                               'destination' => dest_dir,
-                                               'lsi' => true})
-      end
-      any_instance_of(Jekyll::RelatedPosts) { |i| stub(i).display }
-      @site = Site.new(Jekyll.configuration)
+      allow_any_instance_of(Jekyll::RelatedPosts).to receive(:display)
+      @site = fixture_site({"lsi" => true})
     end
 
     should "use lsi for the related posts" do
       @site.reset
       @site.read
       require 'classifier-reborn'
-      any_instance_of(::ClassifierReborn::LSI) do |c|
-        stub(c).find_related { @site.posts[-1..-9] }
-        stub(c).build_index
-      end
+      allow_any_instance_of(::ClassifierReborn::LSI).to receive(:find_related).and_return(@site.posts[-1..-9])
+      allow_any_instance_of(::ClassifierReborn::LSI).to receive(:build_index)
+
       assert_equal @site.posts[-1..-9], Jekyll::RelatedPosts.new(@site.posts.last).build
     end
   end
diff --git a/test/test_site.rb b/test/test_site.rb
index 76ce9ce16..4bc7ddb29 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -162,7 +162,8 @@ class TestSite < JekyllUnitTest
     end
 
     should "sort pages alphabetically" do
-      stub.proxy(Dir).entries { |entries| entries.reverse }
+      method = Dir.method(:entries)
+      allow(Dir).to receive(:entries) { |*args, &block| method.call(*args, &block).reverse }
       @site.process
       # files in symlinked directories may appear twice
       sorted_pages = %w(
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 4db4ab856..0460f3f6a 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -5,12 +5,7 @@ require 'helper'
 class TestTags < JekyllUnitTest
 
   def create_post(content, override = {}, converter_class = Jekyll::Converters::Markdown)
-    stub(Jekyll).configuration do
-      site_configuration({
-        "highlighter" => "rouge"
-      }.merge(override))
-    end
-    site = Site.new(Jekyll.configuration)
+    site = fixture_site({"highlighter" => "rouge"}.merge(override))
 
     if override['read_posts']
       site.read_posts('')
@@ -645,11 +640,7 @@ CONTENT
 
     context "include tag with variable and liquid filters" do
       setup do
-        stub(Jekyll).configuration do
-          site_configuration({'pygments' => true})
-        end
-
-        site = Site.new(Jekyll.configuration)
+        site = fixture_site({'pygments' => true})
         post = Post.new(site, source_dir, '', "2013-12-17-include-variable-filters.markdown")
         layouts = { "default" => Layout.new(site, source_dir('_layouts'), "simple.html")}
         post.render(layouts, {"site" => {"posts" => []}})
@@ -681,11 +672,7 @@ CONTENT
 
   context "relative include tag with variable and liquid filters" do
     setup do
-      stub(Jekyll).configuration do
-        site_configuration({'pygments' => true})
-      end
-
-      site = Site.new(Jekyll.configuration)
+      site = fixture_site('pygments' => true)
       post = Post.new(site, source_dir, '', "2014-09-02-relative-includes.markdown")
       layouts = { "default" => Layout.new(site, source_dir('_layouts'), "simple.html")}
       post.render(layouts, {"site" => {"posts" => []}})

From 0e1050325921dc0419dd2d9b9b18a51e16baaa41 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 6 Mar 2015 18:29:10 -0800
Subject: [PATCH 403/407] Update history to reflect merge of #3552 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f2c462650..93e601a39 100644
--- a/History.markdown
+++ b/History.markdown
@@ -96,6 +96,7 @@
   * Minor fixes to `url.rb` to follow GitHub style guide (#3544)
   * Minor changes to resolve deprecation warnings (#3547)
   * Convert remaining textile test documents to markdown (#3528)
+  * Migrate the tests to use rspec-mocks (#3552)
 
 ### Site Enhancements
 

From 1100ca0782750134d03b552aa8a53f3b9e6b5296 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 7 Mar 2015 17:27:17 -0800
Subject: [PATCH 404/407] Update link to sublime text plugin.

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

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 4958add3a..e70b1d452 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -623,7 +623,7 @@ You can find a few useful plugins at the following locations:
 
 #### 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://sublime.wbond.net/packages/Jekyll).
+- [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.

From 0d96ad21d2f8aff65b2c50aaf50855e6b081a5b7 Mon Sep 17 00:00:00 2001
From: Max Beizer <max.beizer@gmail.com>
Date: Mon, 9 Mar 2015 13:13:21 -0500
Subject: [PATCH 405/407] Fix grammar on collections docs warning

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

diff --git a/site/_docs/collections.md b/site/_docs/collections.md
index fcda98ba8..81d0074bf 100644
--- a/site/_docs/collections.md
+++ b/site/_docs/collections.md
@@ -7,7 +7,7 @@ permalink: /docs/collections/
 <div class="note warning">
   <h5>Collections support is unstable and may change</h5>
   <p>
-    This is an experimental feature and that the API may likely change until the feature stabilizes.
+    This is an experimental feature and the API may change until the feature stabilizes.
   </p>
 </div>
 

From 007c0593153bd2cf931efefa35470d78d4cfd10b Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 9 Mar 2015 11:38:56 -0700
Subject: [PATCH 406/407] Update history to reflect merge of #3560 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 93e601a39..7d69a616e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -139,6 +139,7 @@
   * Add frontmatter date formatting information (#3469)
   * Improve consistency and clarity of plugins options note (#3546)
   * Add permalink warning to pagination docs (#3551)
+  * Fix grammar in Collections docs API stability warning (#3560)
 
 ## 2.5.3 / 2014-12-22
 

From dac2b17123b71c83aa9f74e4511c234b039e1c3c Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 9 Mar 2015 14:15:30 -0700
Subject: [PATCH 407/407] Fix link to @recurser's jekyll plugins. [ci skip]

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

diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index e70b1d452..6b62d3fe0 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -589,7 +589,7 @@ You can find a few useful plugins at the following locations:
 
 #### Collections
 
-- [Jekyll Plugins by Recursive Design](http://recursive-design.com/projects/jekyll-plugins/): Plugins to generate Project pages from GitHub readmes, a Category page, and a Sitemap generator.
+- [Jekyll Plugins by Recursive Design](https://github.com/recurser/jekyll-plugins): Plugins to generate Project pages from GitHub readmes, a Category page, and a Sitemap generator.
 - [Company website and blog plugins](https://github.com/flatterline/jekyll-plugins) by Flatterline, a [Ruby on Rails development company](http://flatterline.com/): Portfolio/project page generator, team/individual page generator, an author bio liquid tag for use on posts, and a few other smaller plugins.
 - [Jekyll plugins by Aucor](https://github.com/aucor/jekyll-plugins): Plugins for trimming unwanted newlines/whitespace and sorting pages by weight attribute.