From f67f7f3db43e64c9fc174d3a8e6e6651cffe93f8 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Tue, 7 May 2013 22:27:38 -0500
Subject: [PATCH 01/68] Move the building of related posts into their own class

---
 lib/jekyll/post.rb          | 26 ++--------------
 lib/jekyll/related_posts.rb | 59 +++++++++++++++++++++++++++++++++++++
 lib/jekyll/site.rb          |  2 --
 3 files changed, 62 insertions(+), 25 deletions(-)
 create mode 100644 lib/jekyll/related_posts.rb

diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index 571d854d5..287bade09 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -1,3 +1,5 @@
+require 'jekyll/related_posts'
+
 module Jekyll
   class Post
     include Comparable
@@ -244,29 +246,7 @@ module Jekyll
     #
     # Returns an Array of related Posts.
     def related_posts(posts)
-      return [] unless posts.size > 1
-
-      if self.site.lsi
-        build_index
-
-        related = self.class.lsi.find_related(self.content, 11)
-        related - [self]
-      else
-        (posts - [self])[0..9]
-      end
-    end
-
-    def build_index
-      self.class.lsi ||= begin
-        puts "Starting the classifier..."
-        lsi = Classifier::LSI.new(:auto_rebuild => false)
-        $stdout.print("  Populating LSI... "); $stdout.flush
-        self.site.posts.each { |x| $stdout.print("."); $stdout.flush; lsi.add_item(x) }
-        $stdout.print("\n  Rebuilding LSI index... ")
-        lsi.build_index
-        puts ""
-        lsi
-      end
+      Jekyll::RelatedPosts.new(self).build
     end
 
     # Add any necessary layouts to this post.
diff --git a/lib/jekyll/related_posts.rb b/lib/jekyll/related_posts.rb
new file mode 100644
index 000000000..7c5a597d0
--- /dev/null
+++ b/lib/jekyll/related_posts.rb
@@ -0,0 +1,59 @@
+module Jekyll
+  class RelatedPosts
+
+    class << self
+      attr_accessor :lsi
+    end
+
+    attr_reader :post, :site
+
+    def initialize(post)
+      @post = post
+      @site = post.site
+      require 'classifier' if site.lsi
+    end
+
+    def build
+      return [] unless self.site.posts.size > 1
+
+      if self.site.lsi
+        build_index
+        lsi_related_posts
+      else
+        most_recent_posts
+      end
+    end
+
+    def build_index
+      self.class.lsi ||= begin
+        puts "Starting the classifier..."
+        lsi = Classifier::LSI.new(:auto_rebuild => false)
+        display("  Populating LSI... ")
+
+        self.site.posts.each do |x|
+          display(".")
+          lsi.add_item(x)
+        end
+
+        display("\n  Rebuilding LSI index... ")
+        lsi.build_index
+        puts ""
+        lsi
+      end
+    end
+
+    def lsi_related_posts
+      lsi.find_related(post.content, 11) - [self.post]
+    end
+
+    def most_recent_posts
+      (self.site.posts - [self.post])[0..9]
+    end
+
+    def display(output)
+      $stdout.print(output)
+      $stdout.flush
+    end
+
+  end
+end
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index d8a36e1be..f9b223fd7 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -71,8 +71,6 @@ module Jekyll
     #
     # Returns nothing.
     def setup
-      require 'classifier' if self.lsi
-
       # Check that the destination dir isn't the source dir or a directory
       # parent to the source dir.
       if self.source =~ /^#{self.dest}/

From 09fafd641898e7c26d1c9b4b5e77052a1f800b74 Mon Sep 17 00:00:00 2001
From: Christopher Giroir <kelsin@valefor.com>
Date: Tue, 7 May 2013 23:24:10 -0700
Subject: [PATCH 02/68] Fixing paginate_path on windows

---
 lib/jekyll/generators/pagination.rb | 5 +++--
 test/test_pager.rb                  | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/generators/pagination.rb b/lib/jekyll/generators/pagination.rb
index 0cd934c56..cfcd9c304 100644
--- a/lib/jekyll/generators/pagination.rb
+++ b/lib/jekyll/generators/pagination.rb
@@ -92,8 +92,9 @@ module Jekyll
     # Returns the pagination path as a string
     def self.paginate_path(site_config, num_page)
       return nil if num_page.nil? || num_page <= 1
-      format = File.basename(site_config['paginate_path'])
-      format.sub(':num', num_page.to_s)
+      format = site_config['paginate_path']
+      format = format.sub(':num', num_page.to_s)
+      File.basename(format)
     end
 
     # Initialize a new Pager.
diff --git a/test/test_pager.rb b/test/test_pager.rb
index 7e153ea49..608a78d10 100644
--- a/test/test_pager.rb
+++ b/test/test_pager.rb
@@ -11,6 +11,11 @@ class TestPager < Test::Unit::TestCase
     assert_equal(3, Pager.calculate_pages([1,2,3,4,5], '2'))
   end
 
+  should "determine the pagination path" do
+    assert_nil(Pager.paginate_path(Jekyll::Configuration::DEFAULTS, 1))
+    assert_equal("page2", Pager.paginate_path(Jekyll::Configuration::DEFAULTS, 2))
+  end
+
   context "pagination disabled" do
     setup do
       stub(Jekyll).configuration do

From 64f8a7b2289c17f8de1bf6e091d94580857cca48 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Wed, 8 May 2013 07:39:00 -0500
Subject: [PATCH 03/68] Move the require for related_posts to jekyll.rb

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

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 4f3bc1ccf..0728a8b57 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -40,6 +40,7 @@ require 'jekyll/draft'
 require 'jekyll/filters'
 require 'jekyll/static_file'
 require 'jekyll/errors'
+require 'jekyll/related_posts'
 
 # extensions
 require 'jekyll/plugin'
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index 287bade09..c5f5dc5e6 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -1,5 +1,3 @@
-require 'jekyll/related_posts'
-
 module Jekyll
   class Post
     include Comparable

From b0c04c89f44a92161becf86f9614ce074b3811b1 Mon Sep 17 00:00:00 2001
From: Christopher Giroir <cgiroir@blizzard.com>
Date: Wed, 8 May 2013 14:08:03 -0700
Subject: [PATCH 04/68] Further clarify what paginate_path should do in the
 case of directories in the path

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

diff --git a/test/test_pager.rb b/test/test_pager.rb
index 608a78d10..990d28ebe 100644
--- a/test/test_pager.rb
+++ b/test/test_pager.rb
@@ -14,6 +14,8 @@ class TestPager < Test::Unit::TestCase
   should "determine the pagination path" do
     assert_nil(Pager.paginate_path(Jekyll::Configuration::DEFAULTS, 1))
     assert_equal("page2", Pager.paginate_path(Jekyll::Configuration::DEFAULTS, 2))
+    assert_nil(Pager.paginate_path(Jekyll::Configuration::DEFAULTS.merge('paginate_path' => '/blog/page-:num'), 1))
+    assert_equal("page-2", Pager.paginate_path(Jekyll::Configuration::DEFAULTS.merge('paginate_path' => '/blog/page-:num'), 2))
   end
 
   context "pagination disabled" do

From 1aa49fa734c38c42ec14a1847ab9319e8ede3adc Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Wed, 8 May 2013 21:57:10 -0500
Subject: [PATCH 05/68] Wrap tests around Jekyll::RelatedPosts

This gives me more confidence that we're doing the right things when it
comes to both the LSI and non-LSI cases and prevents regressions.
---
 test/test_related_posts.rb | 40 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 test/test_related_posts.rb

diff --git a/test/test_related_posts.rb b/test/test_related_posts.rb
new file mode 100644
index 000000000..cff43362b
--- /dev/null
+++ b/test/test_related_posts.rb
@@ -0,0 +1,40 @@
+require 'helper'
+
+class TestRelatedPosts < Test::Unit::TestCase
+  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)
+    end
+
+    should "use the most recent posts for related posts" do
+      @site.reset
+      @site.read
+      assert_equal @site.posts[0..9], Jekyll::RelatedPosts.new(@site.posts.last).build
+    end
+  end
+
+  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
+      @site = Site.new(Jekyll.configuration)
+    end
+
+    should "use lsi for the related posts" do
+      @site.reset
+      @site.read
+      require 'classifier'
+      any_instance_of(::Classifier::LSI) do |c|
+        stub(c).find_related { @site.posts[-1..-9] }
+      end
+      assert_equal @site.posts[-1..-9], Jekyll::RelatedPosts.new(@site.posts.last).build
+    end
+  end
+end

From 08b49ec9db3d814dc84f4b397741f2799b042c82 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Wed, 8 May 2013 22:02:23 -0500
Subject: [PATCH 06/68] Update the display of the LSI progress output

It now fits more in line with what the other messages display.
---
 lib/jekyll/related_posts.rb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/jekyll/related_posts.rb b/lib/jekyll/related_posts.rb
index 7c5a597d0..ab13a968d 100644
--- a/lib/jekyll/related_posts.rb
+++ b/lib/jekyll/related_posts.rb
@@ -24,26 +24,25 @@ module Jekyll
       end
     end
 
+
     def build_index
       self.class.lsi ||= begin
-        puts "Starting the classifier..."
         lsi = Classifier::LSI.new(:auto_rebuild => false)
-        display("  Populating LSI... ")
+        display("\n  Populating LSI... ")
 
         self.site.posts.each do |x|
-          display(".")
           lsi.add_item(x)
         end
 
-        display("\n  Rebuilding LSI index... ")
+        display("\nRebuilding index... ")
         lsi.build_index
-        puts ""
+        display("")
         lsi
       end
     end
 
     def lsi_related_posts
-      lsi.find_related(post.content, 11) - [self.post]
+      self.class.lsi.find_related(post.content, 11) - [self.post]
     end
 
     def most_recent_posts
@@ -54,6 +53,5 @@ module Jekyll
       $stdout.print(output)
       $stdout.flush
     end
-
   end
 end

From 770402d91269a4e6271582bbef98bd762fc8e260 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Wed, 8 May 2013 22:33:20 -0500
Subject: [PATCH 07/68] Also stub the building of the index

Since we don't actually use the index in getting the related posts from
the tests there's no need to build an index, which can take a long time
if the ruby bindings for the GSL library are not installed.
---
 test/test_related_posts.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/test_related_posts.rb b/test/test_related_posts.rb
index cff43362b..98833f2fb 100644
--- a/test/test_related_posts.rb
+++ b/test/test_related_posts.rb
@@ -33,6 +33,7 @@ class TestRelatedPosts < Test::Unit::TestCase
       require 'classifier'
       any_instance_of(::Classifier::LSI) do |c|
         stub(c).find_related { @site.posts[-1..-9] }
+        stub(c).build_index
       end
       assert_equal @site.posts[-1..-9], Jekyll::RelatedPosts.new(@site.posts.last).build
     end

From 1646c223c4fa035d79753258c91116866c6e2101 Mon Sep 17 00:00:00 2001
From: Rusty Geldmacher <rgeldmacher@sermo.com>
Date: Thu, 9 May 2013 10:09:12 -0400
Subject: [PATCH 08/68] Added jekyll-contentblocks to the plugins list

---
 site/_posts/2012-07-01-plugins.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/_posts/2012-07-01-plugins.md b/site/_posts/2012-07-01-plugins.md
index 52229a0ec..d73b02760 100644
--- a/site/_posts/2012-07-01-plugins.md
+++ b/site/_posts/2012-07-01-plugins.md
@@ -403,6 +403,7 @@ There are a few useful, prebuilt plugins at the following locations:
 - [jekyll-rendering](https://github.com/blackwinter/jekyll-rendering): Jekyll plugin to provide alternative rendering engines.
 - [jekyll-pagination](https://github.com/blackwinter/jekyll-pagination): Jekyll plugin to extend the pagination generator.
 - [jekyll-tagging](https://github.com/pattex/jekyll-tagging): Jekyll plugin to automatically generate a tag cloud and tag pages.
+- [jekyll-contentblocks](https://github.com/rustygeldmacher/jekyll-contentblocks): Lets you use Rails-like content_for tags in your templates, for passing content from your posts up to your layouts.
 - [Generate YouTube Embed (tag)](https://gist.github.com/1805814) by [joelverhagen](https://github.com/joelverhagen): Jekyll plugin which allows you to embed a YouTube video in your page with the YouTube ID. Optionally specify width and height dimensions. Like “oEmbed Tag” but just for YouTube.
 - [JSON Filter](https://gist.github.com/1850654) by [joelverhagen](https://github.com/joelverhagen): filter that takes input text and outputs it as JSON. Great for rendering JavaScript.
 - [jekyll-beastiepress](https://github.com/okeeblow/jekyll-beastiepress): FreeBSD utility tags for Jekyll sites.

From f1c5579c5b2043448f75c86e1e56bd9c28118b12 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 12 May 2013 17:54:15 +0200
Subject: [PATCH 09/68] Add docs for post excerpt #1072

---
 History.markdown   |  1 +
 site/docs/posts.md | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/History.markdown b/History.markdown
index 8dbe1ccff..6e9f8041a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,7 @@
 ### Bug Fixes
 
 ### Site Enhancements
+  * Add docs for post excerpt (#1072)
   * Add docs for gist tag (#1072)
 
 ### Development Fixes
diff --git a/site/docs/posts.md b/site/docs/posts.md
index 2eaa1566d..9ad420d2d 100644
--- a/site/docs/posts.md
+++ b/site/docs/posts.md
@@ -113,6 +113,28 @@ Of course, you have full control over how (and where) you display your posts,
 and how you structure your site. You should read more about [how templates
 work](../templates) with Jekyll if you want to know more.
 
+## Post excerpts
+
+Posts automatically take the first block of text, from the beginning of the content
+to the first occurrence of `excerpt_separator`, and sets it as the `post.excerpt`.
+Take the above example of an index of posts for example. Maybe you want to include
+a little hint about the post's content by adding the first paragraph of each of your
+posts:
+
+{% highlight html %}
+<ul>
+  {% raw %}{% for post in site.posts %}{% endraw %}
+    <li>
+      <a href="{% raw %}{{ post.url }}{% endraw %}">{% raw %}{{ post.title }}{% endraw %}</a>
+      <p>{% raw %}{{ post.excerpt }}{% endraw %}</p>
+    </li>
+  {% raw %}{% endfor %}{% endraw %}
+</ul>
+{% endhighlight %}
+
+If you don't like the automatically-generated post excerpt, it can be overridden by adding
+`excerpt` to your post's YAML front-matter.
+
 ## Highlighting code snippets
 
 Jekyll also has built-in support for syntax highlighting of code snippets using

From 6aaf631fcf06251b9417ea7e43c1dafd093205e1 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 12 May 2013 23:18:25 +0200
Subject: [PATCH 10/68] Fix some language problems, props @maul-esel

---
 site/docs/posts.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/docs/posts.md b/site/docs/posts.md
index 9ad420d2d..a03d93502 100644
--- a/site/docs/posts.md
+++ b/site/docs/posts.md
@@ -116,8 +116,8 @@ work](../templates) with Jekyll if you want to know more.
 ## Post excerpts
 
 Posts automatically take the first block of text, from the beginning of the content
-to the first occurrence of `excerpt_separator`, and sets it as the `post.excerpt`.
-Take the above example of an index of posts for example. Maybe you want to include
+to the first occurrence of `excerpt_separator`, and set it as the `post.excerpt`.
+Take the above example of an index of posts. Perhaps you want to include
 a little hint about the post's content by adding the first paragraph of each of your
 posts:
 

From d99b4324e70760d09cfe3ae537cf849f113f92b1 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 12 May 2013 23:19:38 +0200
Subject: [PATCH 11/68] When talking about post excerpts, be singular about it.

---
 site/docs/posts.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/docs/posts.md b/site/docs/posts.md
index a03d93502..f465a1312 100644
--- a/site/docs/posts.md
+++ b/site/docs/posts.md
@@ -115,8 +115,8 @@ work](../templates) with Jekyll if you want to know more.
 
 ## Post excerpts
 
-Posts automatically take the first block of text, from the beginning of the content
-to the first occurrence of `excerpt_separator`, and set it as the `post.excerpt`.
+Each post automatically takes the first block of text, from the beginning of the content
+to the first occurrence of `excerpt_separator`, and sets it as the `post.excerpt`.
 Take the above example of an index of posts. Perhaps you want to include
 a little hint about the post's content by adding the first paragraph of each of your
 posts:

From 47e1a449e10b4c4aa1d677718111b4dcfcd71638 Mon Sep 17 00:00:00 2001
From: David Briggs <godamonra@gmail.com>
Date: Tue, 14 May 2013 00:12:48 -0400
Subject: [PATCH 12/68] fix upgrade docs

---
 site/docs/upgrading.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/docs/upgrading.md b/site/docs/upgrading.md
index cea5a9231..0999ce01a 100644
--- a/site/docs/upgrading.md
+++ b/site/docs/upgrading.md
@@ -40,8 +40,8 @@ Until v1.1, it is **opt-in**. Starting with v1.1, however, absolute permalinks
 will become **opt-out**, meaning Jekyll will default to using absolute permalinks
 instead of relative permalinks.
 
-* To use absolute permalinks, set `relative_permalinks: true` in your configuration file.
-* To continue using relative permalinks, set `relative_permalinks: false` in your configuration file.
+* To use absolute permalinks, set `relative_permalinks: false` in your configuration file.
+* To continue using relative permalinks, set `relative_permalinks: true` in your configuration file.
 
 <div class="note warning" id="absolute-permalinks-warning">
   <h5 markdown="1">Absolute permalinks will be default in v1.1 and on</h5>

From f2d7cdea89d849c39507e838ed4382c3827e8567 Mon Sep 17 00:00:00 2001
From: zachgersh <zdgman@gmail.com>
Date: Mon, 13 May 2013 23:31:05 -0700
Subject: [PATCH 13/68] Fixed shading on notes, made it less apparent.

---
 site/css/style.css | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/site/css/style.css b/site/css/style.css
index 3f5c3c643..9a196b0a5 100644
--- a/site/css/style.css
+++ b/site/css/style.css
@@ -519,7 +519,7 @@ pre, code {
   }
 }
 
-.highlight, p > pre, p > code, p > nobr > code, li > code {
+.highlight, p > pre, p > code, p > nobr > code, li > code, h5 > code {
   background: #333;
   color: #fff;
   border-radius: 5px;
@@ -528,6 +528,16 @@ pre, code {
     0 -1px 0 rgba(0,0,0,.5);
 }
 
+.note code {
+  background-color: rgba(0,0,0,0.2);
+  margin-left: 2.5px;
+  margin-right: 2.5px;
+  font-size: 0.8em;
+  box-shadow: inset 0 1px 10px rgba(0,0,0,.4),
+    0 1px 0 rgba(255,255,255,.1),
+    0 -1px 0 rgba(0,0,0,.5);
+}
+
 .highlight {
   padding: 10px 0;
   width: 100%;

From 1ce36fb1ffdf200dc9878fecfe912d3d8ce99f98 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 14 May 2013 12:40:04 +0200
Subject: [PATCH 14/68] Update history to reflect merge of #1101.

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

diff --git a/History.markdown b/History.markdown
index 6e9f8041a..3f6e8bd97 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,7 @@
 ### Bug Fixes
 
 ### Site Enhancements
+  * Fix logic for `relative_permalinks` instructions on Upgrading page (#1101)
   * Add docs for post excerpt (#1072)
   * Add docs for gist tag (#1072)
 

From fed4f516bf1aeeffcffceb93935feba62a414988 Mon Sep 17 00:00:00 2001
From: zachgersh <zdgman@gmail.com>
Date: Tue, 14 May 2013 08:25:54 -0700
Subject: [PATCH 15/68] Simplified based on cobyism suggestion.

---
 site/css/style.css | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/site/css/style.css b/site/css/style.css
index 9a196b0a5..e2cef8e72 100644
--- a/site/css/style.css
+++ b/site/css/style.css
@@ -519,7 +519,7 @@ pre, code {
   }
 }
 
-.highlight, p > pre, p > code, p > nobr > code, li > code, h5 > code {
+.highlight, p > pre, p > code, p > nobr > code, li > code, h5 > code, .note > code {
   background: #333;
   color: #fff;
   border-radius: 5px;
@@ -533,9 +533,6 @@ pre, code {
   margin-left: 2.5px;
   margin-right: 2.5px;
   font-size: 0.8em;
-  box-shadow: inset 0 1px 10px rgba(0,0,0,.4),
-    0 1px 0 rgba(255,255,255,.1),
-    0 -1px 0 rgba(0,0,0,.5);
 }
 
 .highlight {

From 03887262a3950843e87de8109435ad19a3820528 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 14 May 2013 19:58:48 +0200
Subject: [PATCH 16/68] Update history to reflect merge of #1089.

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

diff --git a/History.markdown b/History.markdown
index 3f6e8bd97..035d79c55 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,7 @@
 ### Bug Fixes
 
 ### Site Enhancements
+  * Make code bits in notes look more natural, more readable (#1089)
   * Fix logic for `relative_permalinks` instructions on Upgrading page (#1101)
   * Add docs for post excerpt (#1072)
   * Add docs for gist tag (#1072)

From 3f21f87ccfb99c879e4c0fad94a10988c83a3664 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 14 May 2013 20:27:17 +0200
Subject: [PATCH 17/68] Make MaRuKu bend to our will.

---
 site/docs/upgrading.md | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/site/docs/upgrading.md b/site/docs/upgrading.md
index 0999ce01a..b2e44f5e6 100644
--- a/site/docs/upgrading.md
+++ b/site/docs/upgrading.md
@@ -73,14 +73,14 @@ to one or more config files (comma-delimited, no spaces).
 * `--paginate`
 
 <div class="note info">
-  <h5 markdown="1">The `--config` explicitly specifies your configuration file(s)</h5>
-  <p markdown="1">If you use the `--config` flag, Jekyll will ignore your
-    `config.yml` file. Want to merge a custom configuration with the normal
+  <h5>The config flag explicitly specifies your configuration file(s)</h5>
+  <p markdown="1">If you use the `&#45;&#45;config` flag, Jekyll will ignore your
+    `&#95;config.yml` file. Want to merge a custom configuration with the normal
     configuration? No problem. Jekyll will accept more than one custom config
     file via the command line. Config files cascade from right to left, such
-    that if I run `jekyll serve --config config.yml,config-dev.yml`,
-    the values in the config files on the right (`config-dev.yml`) overwrite
-    those on the left (`config.yml`) when both contain the same key.</p>
+    that if I run `jekyll serve &#45;&#45;config &#95;config.yml,&#95;config-dev.yml`,
+    the values in the config files on the right (`&#95;config-dev.yml`) overwrite
+    those on the left (`&#95;config.yml`) when both contain the same key.</p>
 </div>
 
 ### Draft posts
@@ -93,10 +93,11 @@ and add a new markdown file to it. To preview your new post, simply run the
 
 <div class="note info">
   <h5 markdown="1">Drafts don't have dates</h5>
-  <p markdown="1">Unlike posts, drafts don't have a date, since they haven't
-  been published yet. Rather than naming your draft something like
-  `2013-07-01-my-draft-post.md`, simply name the file what you'd like your
-  post to eventually be titled, here `my-draft-post.md`.</p>
+  <p markdown="1">
+    Unlike posts, drafts don't have a date, since they haven't
+    been published yet. Rather than naming your draft something like
+    `2013-07-01-my-draft-post.md`, simply name the file what you'd like your
+    post to eventually be titled, here `my-draft-post.md`.</p>
 </div>
 
 ### Baseurl

From 8793048add54bca48ece126da94c683d80d36638 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 14 May 2013 20:29:14 +0200
Subject: [PATCH 18/68] The CLI command isn't capitalized :)

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

diff --git a/site/docs/upgrading.md b/site/docs/upgrading.md
index b2e44f5e6..23f52d26c 100644
--- a/site/docs/upgrading.md
+++ b/site/docs/upgrading.md
@@ -89,7 +89,7 @@ Jekyll now lets you write draft posts, and allows you to easily preview how
 they will look prior to publishing. To start a draft, simply create a folder
 called `_drafts` in your site's source directory (e.g., alongside `_posts`),
 and add a new markdown file to it. To preview your new post, simply run the
-`Jekyll serve` command with the `--drafts` flag.
+`jekyll serve` command with the `--drafts` flag.
 
 <div class="note info">
   <h5 markdown="1">Drafts don't have dates</h5>

From 7611b936b102daed30d9c56a74d08948b4a3baaf Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 14 May 2013 20:58:28 +0200
Subject: [PATCH 19/68] The --watch has two dashes. Prevent MaRuKu blending
 them into an emdash.

---
 site/docs/upgrading.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/docs/upgrading.md b/site/docs/upgrading.md
index 23f52d26c..3f4412ff0 100644
--- a/site/docs/upgrading.md
+++ b/site/docs/upgrading.md
@@ -25,11 +25,11 @@ and `jekyll serve` to do the same. And if you want Jekyll to automatically
 rebuild each time a file changes, just add the `--watch` flag at the end.
 
 <div class="note info">
-  <h5 markdown="1">Watching and Serving</h5>
+  <h5>Watching and Serving</h5>
   <p markdown="1">With the new subcommands, the way sites are previewed locally
    changed a bit. Instead of specifying `server: true` in the site's
    configuration file, use `jekyll serve`. The same hold's true for
-   `watch: true`. Instead, use the `--watch` flag with either `jekyll serve`
+   `watch: true`. Instead, use the `&#45;&#45;watch` flag with either `jekyll serve`
     or `jekyll build`.</p>
 </div>
 

From 7186a557f62c1ed5bffa6bd67c464ea8e146a26d Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 14 May 2013 21:01:06 +0200
Subject: [PATCH 20/68] Update history to reflect merge of #1068.

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

diff --git a/History.markdown b/History.markdown
index 035d79c55..ff13f8af2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,7 @@
 ### Bug Fixes
 
 ### Site Enhancements
+  * Add jekyll-contentblocks plugin to docs (#1068)
   * Make code bits in notes look more natural, more readable (#1089)
   * Fix logic for `relative_permalinks` instructions on Upgrading page (#1101)
   * Add docs for post excerpt (#1072)

From 35f4f09c3ebf559a3333a839a544c515ab165e89 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 14 May 2013 21:07:02 +0200
Subject: [PATCH 21/68] Rename Jekyll::Logger ~> Jekyll::Stevenson to fix
 inheritance problem

Problem described here: ca888cad76b7816bbe3b004b0b9e7064cfb5215b
---
 lib/jekyll/command.rb         |  6 +++---
 lib/jekyll/commands/build.rb  | 10 +++++-----
 lib/jekyll/commands/doctor.rb |  4 ++--
 lib/jekyll/commands/new.rb    |  2 +-
 lib/jekyll/configuration.rb   | 12 ++++++------
 lib/jekyll/convertible.rb     |  2 +-
 lib/jekyll/deprecator.rb      |  4 ++--
 lib/jekyll/filters.rb         |  2 +-
 lib/jekyll/logger.rb          |  2 +-
 lib/jekyll/site.rb            |  4 ++--
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index a352028b2..b9d1b841d 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -18,9 +18,9 @@ module Jekyll
       site.process
     rescue Jekyll::FatalException => e
       puts
-      Jekyll::Logger.error "ERROR:", "YOUR SITE COULD NOT BE BUILT:"
-      Jekyll::Logger.error "", "------------------------------------"
-      Jekyll::Logger.error "", e.message
+      Jekyll::Stevenson.error "ERROR:", "YOUR SITE COULD NOT BE BUILT:"
+      Jekyll::Stevenson.error "", "------------------------------------"
+      Jekyll::Stevenson.error "", e.message
       exit(1)
     end
   end
diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb
index 148869dfd..3c1c5f62e 100644
--- a/lib/jekyll/commands/build.rb
+++ b/lib/jekyll/commands/build.rb
@@ -17,9 +17,9 @@ module Jekyll
       def self.build(site, options)
         source = options['source']
         destination = options['destination']
-        Jekyll::Logger.info "Source:", source
-        Jekyll::Logger.info "Destination:", destination
-        print Jekyll::Logger.formatted_topic "Generating..."
+        Jekyll::Stevenson.info "Source:", source
+        Jekyll::Stevenson.info "Destination:", destination
+        print Jekyll::Stevenson.formatted_topic "Generating..."
         self.process_site(site)
         puts "done."
       end
@@ -36,14 +36,14 @@ module Jekyll
         source = options['source']
         destination = options['destination']
 
-        Jekyll::Logger.info "Auto-regeneration:", "enabled"
+        Jekyll::Stevenson.info "Auto-regeneration:", "enabled"
 
         dw = DirectoryWatcher.new(source, :glob => self.globs(source, destination), :pre_load => true)
         dw.interval = 1
 
         dw.add_observer do |*args|
           t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-          print Jekyll::Logger.formatted_topic("Regenerating:") + "#{args.size} files at #{t} "
+          print Jekyll::Stevenson.formatted_topic("Regenerating:") + "#{args.size} files at #{t} "
           self.process_site(site)
           puts  "...done."
         end
diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb
index 1819e0c71..d6648a2ba 100644
--- a/lib/jekyll/commands/doctor.rb
+++ b/lib/jekyll/commands/doctor.rb
@@ -7,7 +7,7 @@ module Jekyll
           site.read
 
           unless deprecated_relative_permalinks(site)
-            Jekyll::Logger.info "Your test results", "are in. Everything looks fine."
+            Jekyll::Stevenson.info "Your test results", "are in. Everything looks fine."
           end
         end
 
@@ -15,7 +15,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::Stevenson.warn "Deprecation:", "'#{page.path}' uses relative" +
                                   " permalinks which will be deprecated in" +
                                   " Jekyll v1.1 and beyond."
               contains_deprecated_pages = true
diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index c5219e139..f6c38fc71 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -9,7 +9,7 @@ module Jekyll
         new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
         FileUtils.mkdir_p new_blog_path
         unless Dir["#{new_blog_path}/**/*"].empty?
-          Jekyll::Logger.error "Conflict:", "#{new_blog_path} exists and is not empty."
+          Jekyll::Stevenson.error "Conflict:", "#{new_blog_path} exists and is not empty."
           exit(1)
         end
 
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 0db188d36..06b9c7677 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -115,7 +115,7 @@ module Jekyll
     def read_config_file(file)
       next_config = YAML.safe_load_file(file)
       raise "Configuration file: (INVALID) #{file}".yellow if !next_config.is_a?(Hash)
-      Jekyll::Logger.info "Configuration file:", file
+      Jekyll::Stevenson.info "Configuration file:", file
       next_config
     end
 
@@ -135,9 +135,9 @@ module Jekyll
         end
       rescue SystemCallError
         # Errno:ENOENT = file not found
-        Jekyll::Logger.warn "Configuration file:", "none"
+        Jekyll::Stevenson.warn "Configuration file:", "none"
       rescue => err
-        Jekyll::Logger.warn "WARNING:", "Error reading configuration. " +
+        Jekyll::Stevenson.warn "WARNING:", "Error reading configuration. " +
                      "Using defaults (and options)."
         $stderr.puts "#{err}"
       end
@@ -153,7 +153,7 @@ module Jekyll
       config = clone
       # Provide backwards-compatibility
       if config.has_key?('auto') || config.has_key?('watch')
-        Jekyll::Logger.warn "Deprecation:", "Auto-regeneration can no longer" +
+        Jekyll::Stevenson.warn "Deprecation:", "Auto-regeneration can no longer" +
                             " be set from your configuration file(s). Use the"+
                             " --watch/-w command-line option instead."
         config.delete('auto')
@@ -161,14 +161,14 @@ module Jekyll
       end
 
       if config.has_key? 'server'
-        Jekyll::Logger.warn "Deprecation:", "The 'server' configuration option" +
+        Jekyll::Stevenson.warn "Deprecation:", "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.has_key? 'server_port'
-        Jekyll::Logger.warn "Deprecation:", "The 'server_port' configuration option" +
+        Jekyll::Stevenson.warn "Deprecation:", "The 'server_port' configuration option" +
                             " has been renamed to 'port'. Please update your config" +
                             " file accordingly."
         # copy but don't overwrite:
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index acdb0be03..aa02068d8 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -76,7 +76,7 @@ module Jekyll
     def render_liquid(content, payload, info)
       Liquid::Template.parse(content).render!(payload, info)
     rescue Exception => e
-      Jekyll::Logger.error "Liquid Exception:", "#{e.message} in #{payload[:file]}"
+      Jekyll::Stevenson.error "Liquid Exception:", "#{e.message} in #{payload[:file]}"
       e.backtrace.each do |backtrace|
         puts backtrace
       end
diff --git a/lib/jekyll/deprecator.rb b/lib/jekyll/deprecator.rb
index 5b88fbf07..bd189e0fd 100644
--- a/lib/jekyll/deprecator.rb
+++ b/lib/jekyll/deprecator.rb
@@ -18,14 +18,14 @@ module Jekyll
 
     def self.no_subcommand(args)
       if args.size > 0 && args.first =~ /^--/ && !%w[--help --version].include?(args.first)
-        Jekyll::Logger.error "Deprecation:", "Jekyll now uses subcommands instead of just \
+        Jekyll::Stevenson.error "Deprecation:", "Jekyll now uses subcommands instead of just \
                             switches. Run `jekyll help' to find out more."
       end
     end
 
     def self.deprecation_message(args, deprecated_argument, message)
       if args.include?(deprecated_argument)
-        Jekyll::Logger.error "Deprecation:", message
+        Jekyll::Stevenson.error "Deprecation:", message
       end
     end
   end
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index 1886194b8..ef720f78e 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -146,7 +146,7 @@ module Jekyll
       when String
         Time.parse(input)
       else
-        Jekyll::Logger.error "Invalid Date:", "'#{input}' is not a valid datetime."
+        Jekyll::Stevenson.error "Invalid Date:", "'#{input}' is not a valid datetime."
         exit(1)
       end
     end
diff --git a/lib/jekyll/logger.rb b/lib/jekyll/logger.rb
index ffe1954f2..7eb53474a 100644
--- a/lib/jekyll/logger.rb
+++ b/lib/jekyll/logger.rb
@@ -1,7 +1,7 @@
 require 'logger'
 
 module Jekyll
-  class Logger < Logger
+  class Stevenson < Logger
     # Public: Print a jekyll message to stdout
     #
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 16ccd7e98..0b77b5e6e 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -423,12 +423,12 @@ module Jekyll
     def relative_permalinks_deprecation_method
       if config['relative_permalinks'] && !@deprecated_relative_permalinks
         $stderr.puts # Places newline after "Generating..."
-        Jekyll::Logger.warn "Deprecation:", "Starting in 1.1, permalinks for pages" +
+        Jekyll::Stevenson.warn "Deprecation:", "Starting in 1.1, permalinks for pages" +
                                             " in subfolders must be relative to the" +
                                             " site source directory, not the parent" +
                                             " directory. Check http://jekyllrb.com/docs/upgrading/"+
                                             " for more info."
-        $stderr.print Jekyll::Logger.formatted_topic("") + "..." # for "done."
+        $stderr.print Jekyll::Stevenson.formatted_topic("") + "..." # for "done."
         @deprecated_relative_permalinks = true
       end
     end

From 8877d0db6649596db00b09ca9090d28290364ba5 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 14 May 2013 22:03:37 +0200
Subject: [PATCH 22/68] Update history to reflect merge of #1106

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

diff --git a/History.markdown b/History.markdown
index ff13f8af2..6e35c2e00 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,7 @@
 ### Minor Enhancements
 
 ### Bug Fixes
+  * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)
 
 ### Site Enhancements
   * Add jekyll-contentblocks plugin to docs (#1068)

From 98aff03595130eea9b4e37e2de65515156b19bad Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Tue, 14 May 2013 22:04:34 -0500
Subject: [PATCH 23/68] Use Jekyll::Stevenson#formatted_topic for printing
 messages

Beats trying to line them up yourself. :-)
---
 lib/jekyll/related_posts.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/related_posts.rb b/lib/jekyll/related_posts.rb
index ab13a968d..8de5dc78f 100644
--- a/lib/jekyll/related_posts.rb
+++ b/lib/jekyll/related_posts.rb
@@ -28,13 +28,13 @@ module Jekyll
     def build_index
       self.class.lsi ||= begin
         lsi = Classifier::LSI.new(:auto_rebuild => false)
-        display("\n  Populating LSI... ")
+        display("Populating LSI...")
 
         self.site.posts.each do |x|
           lsi.add_item(x)
         end
 
-        display("\nRebuilding index... ")
+        display("Rebuilding index...")
         lsi.build_index
         display("")
         lsi
@@ -50,7 +50,8 @@ module Jekyll
     end
 
     def display(output)
-      $stdout.print(output)
+      $stdout.print("\n")
+      $stdout.print(Jekyll::Stevenson.formatted_topic(output))
       $stdout.flush
     end
   end

From 98f8ee31e39b7e3b862710bc7411c95aa7d11733 Mon Sep 17 00:00:00 2001
From: Paul Oppenheim <paul@pauloppenheim.com>
Date: Wed, 15 May 2013 03:32:17 -0700
Subject: [PATCH 24/68] doc fix: migrations - wordpressdotcom command

The new paths are what just worked for me. Was frustrating figuring it out, figured I'd share.
---
 site/docs/migrations.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/docs/migrations.md b/site/docs/migrations.md
index b8875e423..330be602c 100644
--- a/site/docs/migrations.md
+++ b/site/docs/migrations.md
@@ -55,8 +55,8 @@ Next, export your blog using the Wordpress export utility. Assuming that the
 exported file is saved as `wordpress.xml`, here is the command you need to run:
 
 {% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/migrators/wordpressdotcom";
-    Jekyll::WordpressDotCom.process("wordpress.xml")'
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpressdotcom";
+    JekyllImport::WordpressDotCom.process("wordpress.xml")'
 {% endhighlight %}
 
 <div class="note">

From 8537c6770ea908fa79ec2f31a163f697d32d1541 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 15 May 2013 13:45:16 +0200
Subject: [PATCH 25/68] Update history to reflect merge of #1107

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

diff --git a/History.markdown b/History.markdown
index 6e35c2e00..d8d5390b7 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
   * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)
 
 ### Site Enhancements
+  * Fix prefix for WordpressDotCom importer in docs (#1107)
   * Add jekyll-contentblocks plugin to docs (#1068)
   * Make code bits in notes look more natural, more readable (#1089)
   * Fix logic for `relative_permalinks` instructions on Upgrading page (#1101)

From 7b22502c94fa5805e6a7b0a0623c32d54f4c2292 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 15 May 2013 13:57:30 +0200
Subject: [PATCH 26/68] Quick patch for migration docs.

---
 History.markdown        |  1 +
 site/docs/migrations.md | 35 ++++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/History.markdown b/History.markdown
index d8d5390b7..b4b9ba45e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
   * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)
 
 ### Site Enhancements
+  * Quick patch for importers documentation
   * Fix prefix for WordpressDotCom importer in docs (#1107)
   * Add jekyll-contentblocks plugin to docs (#1068)
   * Make code bits in notes look more natural, more readable (#1089)
diff --git a/site/docs/migrations.md b/site/docs/migrations.md
index 330be602c..f3e7ca019 100644
--- a/site/docs/migrations.md
+++ b/site/docs/migrations.md
@@ -15,12 +15,13 @@ the foreign system.
 ## Preparing for migrations
 
 Because the importers have many of their own dependencies, they are made
-available via a separate gem called `jekyll-import`. To use them, all you need
-to do is install the gem, and they will become available as part of Jekyll's
-standard command line interface.
+available via a separate gem called
+[`jekyll-import`](https://github.com/jekyll/jekyll-import). To use them, all
+you need to do is install the gem, and they will become available as part of
+Jekyll's standard command line interface.
 
 {% highlight bash %}
-$ gem install jekyll-import
+$ gem install jekyll-import [--pre]
 {% endhighlight %}
 
 You should now be all set to run the importers below. If you ever get stuck, you
@@ -61,7 +62,7 @@ $ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpressdotcom";
 
 <div class="note">
   <h5>ProTip™: Wordpress.com Export Tool</h5>
-  <p>If you are migrating from a Wordpress.com account, you can access the export tool at the following URL: `https://YOUR-USER-NAME.wordpress.com/wp-admin/export.php`.</p>
+  <p markdown="1">If you are migrating from a Wordpress.com account, you can access the export tool at the following URL: `https://YOUR-USER-NAME.wordpress.com/wp-admin/export.php`.</p>
 </div>
 
 ### Using Wordpress MySQL server connection
@@ -70,7 +71,7 @@ If you want to import using a direct connection to the Wordpress MySQL server, h
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/migrators/wordpress";
-    Jekyll::WordPress.process("database", "user", "pass")'
+    JekyllImport::WordPress.process("database", "user", "pass")'
 {% endhighlight %}
 
 If you are using Webfaction and have to set up an [SSH
@@ -81,7 +82,7 @@ authentication system:
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/migrators/wordpress";
-    Jekyll::WordPress.process("database", "user", "pass", "127.0.0.1")'
+    JekyllImport::WordPress.process("database", "user", "pass", "127.0.0.1")'
 {% endhighlight %}
 
 ### Further Wordpress migration alternatives
@@ -110,7 +111,7 @@ for you too:
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/migrators/drupal";
-    Jekyll::Drupal.process("database", "user", "pass")'
+    JekyllImport::Drupal.process("database", "user", "pass")'
 {% endhighlight %}
 
 <div class="note warning">
@@ -126,7 +127,7 @@ To import posts from Movable Type:
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/migrators/mt";
-    Jekyll::MT.process("database", "user", "pass")'
+    JekyllImport::MT.process("database", "user", "pass")'
 {% endhighlight %}
 
 ## Typo
@@ -135,7 +136,7 @@ To import posts from Typo:
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/migrators/typo";
-    Jekyll::Typo.process("database", "user", "pass")'
+    JekyllImport::Typo.process("database", "user", "pass")'
 {% endhighlight %}
 
 This code has only been tested with Typo version 4+.
@@ -146,7 +147,7 @@ To import posts from TextPattern:
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/migrators/textpattern";
-    Jekyll::TextPattern.process("database_name", "username", "password", "hostname")'
+    JekyllImport::TextPattern.process("database_name", "username", "password", "hostname")'
 {% endhighlight %}
 
 You will need to run the above from the parent directory of your `_import`
@@ -162,14 +163,14 @@ To import posts from Mephisto:
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/migrators/mephisto";
-    Jekyll::Mephisto.process("database", "user", "password")'
+    JekyllImport::Mephisto.process("database", "user", "password")'
 {% endhighlight %}
 
 If your data is in Postgres, you should do this instead:
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/migrators/mephisto";
-    Jekyll::Mephisto.postgres({:database => "database", :username=>"username", :password =>"password"})'
+    JekyllImport::Mephisto.postgres({:database => "database", :username=>"username", :password =>"password"})'
 {% endhighlight %}
 
 ## Blogger (Blogspot)
@@ -197,7 +198,7 @@ To import posts from your primary Posterous blog:
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/migrators/posterous";
-    Jekyll::Posterous.process("my_email", "my_pass")'
+    JekyllImport::Posterous.process("my_email", "my_pass")'
 {% endhighlight %}
 
 For any other Posterous blog on your account, you will need to specify the
@@ -205,7 +206,7 @@ For any other Posterous blog on your account, you will need to specify the
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/migrators/posterous";
-    Jekyll::Posterous.process("my_email", "my_pass", "blog_id")'
+    JekyllImport::Posterous.process("my_email", "my_pass", "blog_id")'
 {% endhighlight %}
 
 There is also an [alternative Posterous
@@ -218,7 +219,7 @@ To import posts from Tumblr:
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/migrators/tumblr";
-    Jekyll::Tumblr.process("http://www.your_blog_url.com", true)'
+    JekyllImport::Tumblr.process("http://www.your_blog_url.com", true)'
 {% endhighlight %}
 
 There is also [a modified Tumblr
@@ -237,7 +238,7 @@ Once installed, simply use the format argument:
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/migrators/tumblr";
-    Jekyll::Tumblr.process("http://www.your_blog_url.com", format="md")'
+    JekyllImport::Tumblr.process("http://www.your_blog_url.com", format="md")'
 {% endhighlight %}
 
 ## Other Systems

From 5258e3afa3fd76ec283dd8e357225fd363004d20 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 15 May 2013 15:15:00 +0200
Subject: [PATCH 27/68] Logger ~> Stevenson and don't inherit from Ruby Logger.
 #1106.

---
 lib/jekyll.rb                          | 2 +-
 lib/jekyll/{logger.rb => stevenson.rb} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/jekyll/{logger.rb => stevenson.rb} (98%)

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index d909373be..2b4f127a2 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -28,7 +28,7 @@ require 'colorator'
 
 # internal requires
 require 'jekyll/core_ext'
-require 'jekyll/logger'
+require 'jekyll/stevenson'
 require 'jekyll/deprecator'
 require 'jekyll/configuration'
 require 'jekyll/site'
diff --git a/lib/jekyll/logger.rb b/lib/jekyll/stevenson.rb
similarity index 98%
rename from lib/jekyll/logger.rb
rename to lib/jekyll/stevenson.rb
index 7eb53474a..75a6471bc 100644
--- a/lib/jekyll/logger.rb
+++ b/lib/jekyll/stevenson.rb
@@ -1,7 +1,7 @@
 require 'logger'
 
 module Jekyll
-  class Stevenson < Logger
+  class Stevenson
     # Public: Print a jekyll message to stdout
     #
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.

From 98923f87b59bb5e59b7c66743a035a60224134ca Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 15 May 2013 16:26:41 +0200
Subject: [PATCH 28/68] Update history to reflect merge of #1057 :+1:

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

diff --git a/History.markdown b/History.markdown
index b4b9ba45e..7af92a8d8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -2,6 +2,7 @@
 ### Major Enhancements
 
 ### Minor Enhancements
+  * Move the building of related posts into their own class (#1057)
 
 ### Bug Fixes
   * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)

From fb28c0292bbc15c34c47cd49fac25306ec0b6672 Mon Sep 17 00:00:00 2001
From: Tuomas Kareinen <tkareine@gmail.com>
Date: Tue, 7 May 2013 00:06:38 +0300
Subject: [PATCH 29/68] Add link to jekyll-minibundle in the doc's 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 e8e7075d4..36d932eb9 100644
--- a/site/docs/plugins.md
+++ b/site/docs/plugins.md
@@ -427,6 +427,7 @@ There are a few useful, prebuilt plugins at the following locations:
 - [File compressor](https://gist.github.com/2758691) by [mytharcher](https://github.com/mytharcher): Compress HTML (\*.html) and JavaScript(\*.js) files when output.
 - [smilify](https://github.com/SaswatPadhi/jekyll_smilify) by [SaswatPadhi](https://github.com/SaswatPadhi): Convert text emoticons in your content to themeable smiley pics. [Demo](http://saswatpadhi.github.com/)
 - [excerpts](http://blog.darkrefraction.com/2012/jekyll-excerpt-plugin.html) by [drawoc](https://github.com/drawoc): provides a nice way to implement page excerpts.
+- [jekyll-minibundle](https://github.com/tkareine/jekyll-minibundle): Asset bundling and cache busting using external minification tool of your choice, no gem dependencies.
 
 <div class="note info">
   <h5>Jekyll Plugins Wanted</h5>

From 784aaee40ab9f85c8f2fffa661035af26a737817 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 15 May 2013 23:58:32 +0200
Subject: [PATCH 30/68] Update gemspec with new files.

---
 jekyll.gemspec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 516bc700d..2d1a3af4f 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -92,13 +92,14 @@ Gem::Specification.new do |s|
     lib/jekyll/generator.rb
     lib/jekyll/generators/pagination.rb
     lib/jekyll/layout.rb
-    lib/jekyll/logger.rb
     lib/jekyll/mime.types
     lib/jekyll/page.rb
     lib/jekyll/plugin.rb
     lib/jekyll/post.rb
+    lib/jekyll/related_posts.rb
     lib/jekyll/site.rb
     lib/jekyll/static_file.rb
+    lib/jekyll/stevenson.rb
     lib/jekyll/tags/gist.rb
     lib/jekyll/tags/highlight.rb
     lib/jekyll/tags/include.rb
@@ -235,6 +236,7 @@ Gem::Specification.new do |s|
     test/test_rdiscount.rb
     test/test_redcarpet.rb
     test/test_redcloth.rb
+    test/test_related_posts.rb
     test/test_site.rb
     test/test_tags.rb
   ]

From d1c626f2e26afae1684ac8aad21b9d21b06c8c51 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 15 May 2013 23:59:51 +0200
Subject: [PATCH 31/68] Update history to reflect merge of #1035

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

diff --git a/History.markdown b/History.markdown
index 7af92a8d8..e96952cc6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,7 @@
   * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)
 
 ### Site Enhancements
+  * Add link to jekyll-minibundle in the doc's plugins list (#1035)
   * Quick patch for importers documentation
   * Fix prefix for WordpressDotCom importer in docs (#1107)
   * Add jekyll-contentblocks plugin to docs (#1068)

From 8e3ab9ea36045e1a171ee09fb214c6786f7efbbd Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 16 May 2013 00:25:16 +0200
Subject: [PATCH 32/68] Backwards-compatibilize 'exclude' and 'include' config
 tags. Fixes #1109

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

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 06b9c7677..0bb520968 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -145,6 +145,15 @@ module Jekyll
       configuration.backwards_compatibilize
     end
 
+    # Public: Split a CSV string into an array containing its values
+    #
+    # csv - the string of comma-separated values
+    #
+    # Returns an array of the values contained in the CSV
+    def csv_to_array(csv)
+      csv.split(",").map(&:strip)
+    end
+
     # Public: Ensure the proper options are set in the configuration to allow for
     # backwards-compatibility with Jekyll pre-1.0
     #
@@ -176,6 +185,22 @@ module Jekyll
         config.delete('server_port')
       end
 
+      if config.has_key?('exclude') && config['exclude'].is_a?(String)
+        Jekyll::Stevenson.warn "Deprecation:", "The 'exclude' configuration option" +
+                               " must now be specified as an array, but you specified" +
+                               " a string. For now, we've treated the string you provided" +
+                               " as a list of comma-separated values."
+        config['exclude'] = csv_to_array(config['exclude'])
+      end
+
+      if config.has_key?('include') && config['include'].is_a?(String)
+        Jekyll::Stevenson.warn "Deprecation:", "The 'include' configuration option" +
+                               " must now be specified as an array, but you specified" +
+                               " a string. For now, we've treated the string you provided" +
+                               " as a list of comma-separated values."
+        config['include'] = csv_to_array(config['include'])
+      end
+
       config
     end
 

From 2ce39bc20a0a310c3773deeea73a7e369ce0ff85 Mon Sep 17 00:00:00 2001
From: Casey Lang <clang1234@gmail.com>
Date: Wed, 15 May 2013 17:29:27 -0500
Subject: [PATCH 33/68] Add '--force' to 'new' command. Implements #1104

---
 bin/jekyll                 | 4 +++-
 lib/jekyll/commands/new.rb | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 bin/jekyll

diff --git a/bin/jekyll b/bin/jekyll
old mode 100755
new mode 100644
index 2e631bbb3..b2c6fab9f
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -37,8 +37,10 @@ command :new do |c|
   c.syntax = 'jekyll new PATH'
   c.description = 'Creates a new Jekyll site scaffold in PATH'
 
+  c.option '--force', 'Force creation even if PATH already exists'
+
   c.action do |args, options|
-    Jekyll::Commands::New.process(args)
+    Jekyll::Commands::New.process(args, options.__hash__)
   end
 end
 
diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index f6c38fc71..fc8a96f79 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -3,12 +3,12 @@ require 'erb'
 module Jekyll
   module Commands
     class New < Command
-      def self.process(args)
+      def self.process(args, options = {})
         raise ArgumentError.new('You must specify a path.') if args.empty?
 
         new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
         FileUtils.mkdir_p new_blog_path
-        unless Dir["#{new_blog_path}/**/*"].empty?
+        if !options[:force] && !Dir["#{new_blog_path}/**/*"].empty?
           Jekyll::Stevenson.error "Conflict:", "#{new_blog_path} exists and is not empty."
           exit(1)
         end

From 294437fbf10160b321aa56867ed257789b8807b9 Mon Sep 17 00:00:00 2001
From: Casey Lang <clang1234@gmail.com>
Date: Wed, 15 May 2013 17:36:48 -0500
Subject: [PATCH 34/68] Merge latest commits from mojombo/jekyll

---
 History.markdown     | 1 +
 jekyll.gemspec       | 4 +++-
 site/docs/plugins.md | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/History.markdown b/History.markdown
index 7af92a8d8..e96952cc6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,7 @@
   * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)
 
 ### Site Enhancements
+  * Add link to jekyll-minibundle in the doc's plugins list (#1035)
   * Quick patch for importers documentation
   * Fix prefix for WordpressDotCom importer in docs (#1107)
   * Add jekyll-contentblocks plugin to docs (#1068)
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 516bc700d..2d1a3af4f 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -92,13 +92,14 @@ Gem::Specification.new do |s|
     lib/jekyll/generator.rb
     lib/jekyll/generators/pagination.rb
     lib/jekyll/layout.rb
-    lib/jekyll/logger.rb
     lib/jekyll/mime.types
     lib/jekyll/page.rb
     lib/jekyll/plugin.rb
     lib/jekyll/post.rb
+    lib/jekyll/related_posts.rb
     lib/jekyll/site.rb
     lib/jekyll/static_file.rb
+    lib/jekyll/stevenson.rb
     lib/jekyll/tags/gist.rb
     lib/jekyll/tags/highlight.rb
     lib/jekyll/tags/include.rb
@@ -235,6 +236,7 @@ Gem::Specification.new do |s|
     test/test_rdiscount.rb
     test/test_redcarpet.rb
     test/test_redcloth.rb
+    test/test_related_posts.rb
     test/test_site.rb
     test/test_tags.rb
   ]
diff --git a/site/docs/plugins.md b/site/docs/plugins.md
index e8e7075d4..36d932eb9 100644
--- a/site/docs/plugins.md
+++ b/site/docs/plugins.md
@@ -427,6 +427,7 @@ There are a few useful, prebuilt plugins at the following locations:
 - [File compressor](https://gist.github.com/2758691) by [mytharcher](https://github.com/mytharcher): Compress HTML (\*.html) and JavaScript(\*.js) files when output.
 - [smilify](https://github.com/SaswatPadhi/jekyll_smilify) by [SaswatPadhi](https://github.com/SaswatPadhi): Convert text emoticons in your content to themeable smiley pics. [Demo](http://saswatpadhi.github.com/)
 - [excerpts](http://blog.darkrefraction.com/2012/jekyll-excerpt-plugin.html) by [drawoc](https://github.com/drawoc): provides a nice way to implement page excerpts.
+- [jekyll-minibundle](https://github.com/tkareine/jekyll-minibundle): Asset bundling and cache busting using external minification tool of your choice, no gem dependencies.
 
 <div class="note info">
   <h5>Jekyll Plugins Wanted</h5>

From 151ffab6fef28e6d35380e696c22e3a004952b79 Mon Sep 17 00:00:00 2001
From: Sebastian Morr <sebastian@morr.cc>
Date: Thu, 16 May 2013 20:27:27 +0200
Subject: [PATCH 35/68] Removed space characters in empty lines

---
 features/drafts.feature                 |  2 +-
 features/post_data.feature              |  4 ++--
 lib/site_template/_layouts/default.html |  2 +-
 test/source/_layouts/default.html       |  2 +-
 test/test_page.rb                       |  2 +-
 test/test_post.rb                       | 22 +++++++++++-----------
 test/test_redcloth.rb                   |  6 +++---
 test/test_site.rb                       | 12 ++++++------
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/features/drafts.feature b/features/drafts.feature
index 27832fc4b..27b3f0745 100644
--- a/features/drafts.feature
+++ b/features/drafts.feature
@@ -2,7 +2,7 @@ Feature: Draft Posts
   As a hacker who likes to blog
   I want to be able to preview drafts locally
   In order to see if they look alright before publishing
-  
+
   Scenario: Preview a draft
     Given I have a configuration file with "permalink" set to "none"
     And I have a _drafts directory
diff --git a/features/post_data.feature b/features/post_data.feature
index 5ed7e8622..3ba37062a 100644
--- a/features/post_data.feature
+++ b/features/post_data.feature
@@ -117,7 +117,7 @@ Feature: Post data
     When I run jekyll
     Then the _site directory should exist
     And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"
-    
+
   Scenario: Use post.categories variable when category is in YAML and is mixed-case
     Given I have a _posts directory
     And I have a _layouts directory
@@ -128,7 +128,7 @@ Feature: Post data
     When I run jekyll
     Then the _site directory should exist
     And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"
-    
+
   Scenario: Use post.categories variable when category is in YAML
     Given I have a _posts directory
     And I have a _layouts directory
diff --git a/lib/site_template/_layouts/default.html b/lib/site_template/_layouts/default.html
index 46ebc1090..364e27ee5 100644
--- a/lib/site_template/_layouts/default.html
+++ b/lib/site_template/_layouts/default.html
@@ -21,7 +21,7 @@
               <h1 class="title"><a href="/">{{ site.name }}</a></h1>
               <a class="extra" href="/">home</a>
             </div>
-     
+
                 {{ content }}
 
             <div class="footer">
diff --git a/test/source/_layouts/default.html b/test/source/_layouts/default.html
index f3422d39e..1d51c4967 100644
--- a/test/source/_layouts/default.html
+++ b/test/source/_layouts/default.html
@@ -19,7 +19,7 @@
   <div class="title">
     Tom Preston-Werner
   </div>
-  
+
   {{ content }}
 </div>
 
diff --git a/test/test_page.rb b/test/test_page.rb
index db8224054..2d8c98ee4 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -102,7 +102,7 @@ class TestPage < Test::Unit::TestCase
         assert_equal "/about/", @page.dir
       end
     end
-        
+
     context "with specified layout of nil" do
       setup do
         @page = setup_page('sitemap.xml')
diff --git a/test/test_post.rb b/test/test_post.rb
index 9ea972a8d..903e48c55 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -139,7 +139,7 @@ class TestPost < Test::Unit::TestCase
             assert_equal "/2013/2008/09/09/foo-bar.html", @post.url
           end
         end
-        
+
         context "with specified layout of nil" do
           setup do
             file = '2013-01-12-nil-layout.textile'
@@ -422,7 +422,7 @@ class TestPost < Test::Unit::TestCase
         post = setup_post("2009-01-27-empty-categories.textile")
         assert_equal [], post.categories
       end
-      
+
       should "recognize number category in yaml" do
         post = setup_post("2013-05-10-number-category.textile")
         assert post.categories.include?('2013')
@@ -440,7 +440,7 @@ class TestPost < Test::Unit::TestCase
         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")
         assert_equal [], post.tags
@@ -528,46 +528,46 @@ class TestPost < Test::Unit::TestCase
       assert_equal ['foo'], post.categories
     end
   end
-  
+
   context "converter file extension settings" do
     setup do
       stub(Jekyll).configuration { Jekyll::Configuration::DEFAULTS }
       @site = Site.new(Jekyll.configuration)
     end
-    
+
     should "process .md as markdown under default configuration" do
       post = setup_post '2011-04-12-md-extension.md'
       conv = post.converter
       assert conv.kind_of? Jekyll::Converters::Markdown
     end
-    
+
     should "process .text as identity under default configuration" do
       post = setup_post '2011-04-12-text-extension.text'
       conv = post.converter
       assert conv.kind_of? Jekyll::Converters::Identity
     end
-    
+
     should "process .text as markdown under alternate configuration" do
       @site.config['markdown_ext'] = 'markdown,mdw,mdwn,md,text'
       post = setup_post '2011-04-12-text-extension.text'
       conv = post.converter
       assert conv.kind_of? Jekyll::Converters::Markdown
     end
-    
+
     should "process .md as markdown under alternate configuration" do
       @site.config['markdown_ext'] = 'markdown,mkd,mkdn,md,text'
       post = setup_post '2011-04-12-text-extension.text'
       conv = post.converter
       assert conv.kind_of? Jekyll::Converters::Markdown
     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.converter
       assert conv.kind_of? Jekyll::Converters::Textile
     end
-    
+
   end
-  
+
 end
diff --git a/test/test_redcloth.rb b/test/test_redcloth.rb
index 6e635b968..94cc9f493 100644
--- a/test/test_redcloth.rb
+++ b/test/test_redcloth.rb
@@ -6,7 +6,7 @@ class TestRedCloth < Test::Unit::TestCase
     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
@@ -19,7 +19,7 @@ class TestRedCloth < Test::Unit::TestCase
         }
       @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
@@ -34,7 +34,7 @@ class TestRedCloth < Test::Unit::TestCase
       }
       @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
diff --git a/test/test_site.rb b/test/test_site.rb
index 4e46ba7f3..b4d062399 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -195,7 +195,7 @@ class TestSite < Test::Unit::TestCase
       @site.exclude = excludes + ["exclude*"]
       assert_equal files, @site.filter_entries(excludes + files + ["excludeA"])
     end
-    
+
     should "not filter entries within include" do
       includes = %w[_index.html .htaccess include*]
       files = %w[index.html _index.html .htaccess includeA]
@@ -284,7 +284,7 @@ class TestSite < Test::Unit::TestCase
         File.open(dest_dir('.svn/HEAD'), 'w')
         File.open(dest_dir('.hg/HEAD'), 'w')
       end
-      
+
       teardown do
         FileUtils.rm_f(dest_dir('obsolete.html'))
         FileUtils.rm_rf(dest_dir('qux'))
@@ -293,7 +293,7 @@ class TestSite < Test::Unit::TestCase
         FileUtils.rm_rf(dest_dir('.svn'))
         FileUtils.rm_rf(dest_dir('.hg'))
       end
-      
+
       should 'remove orphaned files in destination' do
         @site.process
         assert !File.exist?(dest_dir('obsolete.html'))
@@ -317,7 +317,7 @@ class TestSite < Test::Unit::TestCase
         assert File.exist?(dest_dir('.svn/HEAD'))
       end
     end
-    
+
     context 'with an invalid markdown processor in the configuration' do
       should 'not throw an error at initialization time' do
         bad_processor = 'not a processor name'
@@ -325,7 +325,7 @@ class TestSite < Test::Unit::TestCase
           Site.new(Jekyll.configuration.merge({ 'markdown' => bad_processor }))
         end
       end
-      
+
       should 'throw FatalException at process time' do
         bad_processor = 'not a processor name'
         s = Site.new(Jekyll.configuration.merge({ 'markdown' => bad_processor }))
@@ -334,6 +334,6 @@ class TestSite < Test::Unit::TestCase
         end
       end
     end
-    
+
   end
 end

From 4123406bd2531695adddb5c4a3b23233e02e0080 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Thu, 16 May 2013 15:27:50 -0500
Subject: [PATCH 36/68] Update history to reflect merge of #1116

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

diff --git a/History.markdown b/History.markdown
index e96952cc6..efcc7cf84 100644
--- a/History.markdown
+++ b/History.markdown
@@ -3,6 +3,7 @@
 
 ### Minor Enhancements
   * Move the building of related posts into their own class (#1057)
+  * Removed trailing spaces in several places throughout the code (#1116)
 
 ### Bug Fixes
   * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)

From 00dd37d2e41f3cd0b9196b8b28073ba10c9eaae8 Mon Sep 17 00:00:00 2001
From: Casey Lang <clang1234@gmail.com>
Date: Thu, 16 May 2013 16:13:13 -0500
Subject: [PATCH 37/68] Extract check for force to improve readability

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

diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index fc8a96f79..7021e7d2a 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -8,7 +8,7 @@ module Jekyll
 
         new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
         FileUtils.mkdir_p new_blog_path
-        if !options[:force] && !Dir["#{new_blog_path}/**/*"].empty?
+        if preserve_source_location(new_blog_path, options)
           Jekyll::Stevenson.error "Conflict:", "#{new_blog_path} exists and is not empty."
           exit(1)
         end
@@ -33,6 +33,11 @@ module Jekyll
       end
 
       private
+      
+      def self.preserve_source_location(path, options)
+        !options[:force] && !Dir["#{path}/**/*"].empty?
+      end
+
       def self.create_sample_files(path)
         FileUtils.cp_r site_template + '/.', path
         FileUtils.rm File.expand_path(scaffold_path, path)

From fafacc43ca69dd6d57bd1d3ad2100c3fb47a81b3 Mon Sep 17 00:00:00 2001
From: Casey Lang <clang1234@gmail.com>
Date: Thu, 16 May 2013 16:15:21 -0500
Subject: [PATCH 38/68] Add ? to preserve_source_location

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

diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
index 7021e7d2a..ea35ef40f 100644
--- a/lib/jekyll/commands/new.rb
+++ b/lib/jekyll/commands/new.rb
@@ -8,7 +8,7 @@ module Jekyll
 
         new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
         FileUtils.mkdir_p new_blog_path
-        if preserve_source_location(new_blog_path, options)
+        if preserve_source_location?(new_blog_path, options)
           Jekyll::Stevenson.error "Conflict:", "#{new_blog_path} exists and is not empty."
           exit(1)
         end
@@ -33,8 +33,8 @@ module Jekyll
       end
 
       private
-      
-      def self.preserve_source_location(path, options)
+
+      def self.preserve_source_location?(path, options)
         !options[:force] && !Dir["#{path}/**/*"].empty?
       end
 

From 3e7b0bbe47f78103174d5c5c96958a1e79b96444 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 17 May 2013 20:44:29 +0200
Subject: [PATCH 39/68] Pygments does not need to be installed. Fixes #1099
 #1119

---
 site/docs/installation.md | 6 ++----
 site/docs/posts.md        | 4 ++--
 site/docs/templates.md    | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/site/docs/installation.md b/site/docs/installation.md
index 8c830b752..1ba2fc3b7 100644
--- a/site/docs/installation.md
+++ b/site/docs/installation.md
@@ -50,10 +50,8 @@ community can improve the experience for everyone.
 
 There are a number of (optional) extra features that Jekyll supports that you
 may want to install, depending on how you plan to use Jekyll. These extras
-include syntax highlighting of code snippets using
-[Pygments](http://pygments.org/), LaTeX support, and the use of alternative
-content rendering engines. Check out [the extras page](../extras) for more
-information.
+include LaTeX support, and the use of alternative content rendering engines.
+Check out [the extras page](../extras) for more information.
 
 <div class="note">
   <h5>ProTip™: Enable Syntax Highlighting</h5>
diff --git a/site/docs/posts.md b/site/docs/posts.md
index f465a1312..ed048f10b 100644
--- a/site/docs/posts.md
+++ b/site/docs/posts.md
@@ -138,8 +138,8 @@ If you don't like the automatically-generated post excerpt, it can be overridden
 ## Highlighting code snippets
 
 Jekyll also has built-in support for syntax highlighting of code snippets using
-[Pygments](../extras), and including a code snippet in any post is easy. Just
-use the dedicated Liquid tag as follows:
+Pygments, and including a code snippet in any post is easy. Just use the
+dedicated Liquid tag as follows:
 
 {% highlight text %}
 {% raw %}{% highlight ruby %}{% endraw %}
diff --git a/site/docs/templates.md b/site/docs/templates.md
index 64cbdb2e8..08929eeea 100644
--- a/site/docs/templates.md
+++ b/site/docs/templates.md
@@ -166,9 +166,8 @@ root of your source directory. This will embed the contents of
 
 Jekyll has built in support for syntax highlighting of [over 100
 languages](http://pygments.org/languages/) thanks to
-[Pygments](http://pygments.org/). In order to take advantage of this you’ll need
-to have Pygments installed, and the `pygmentize` binary must be in your `$PATH`.
-When you run Jekyll, make sure you run it with [Pygments enabled](../extras).
+[Pygments](http://pygments.org/). When you run Jekyll, make sure you run it
+with `pygments` set to `true` in your configuration file.
 
 To render a code block with syntax highlighting, surround your code as follows:
 

From 63dc56362196ae18abf8842d50ff4e159f575128 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 17 May 2013 21:05:09 +0200
Subject: [PATCH 40/68] Add tests for exclude/include backwards-compatibility

---
 test/test_configuration.rb | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index f94b159a4..0f1976439 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -51,9 +51,11 @@ class TestConfiguration < Test::Unit::TestCase
   context "#backwards_compatibilize" do
     setup do
       @config = Configuration[{
-        "auto" => true,
-        "watch" => true,
-        "server" => true
+        "auto"    => true,
+        "watch"   => true,
+        "server"  => true,
+        "exclude" => "READ-ME.md, Gemfile,CONTRIBUTING.hello.markdown",
+        "include" => "STOP_THE_PRESSES.txt,.heloses, .git"
       }]
     end
     should "unset 'auto' and 'watch'" do
@@ -66,6 +68,16 @@ class TestConfiguration < Test::Unit::TestCase
       assert @config.has_key?("server")
       assert !@config.backwards_compatibilize.has_key?("server")
     end
+    should "transform string exclude into an array" do
+      assert @config.has_key?("exclude")
+      assert @config.backwards_compatibilize.has_key?("exclude")
+      assert_equal @config.backwards_compatibilize["exclude"], %w[READ-ME.md Gemfile CONTRIBUTING.hello.markdown]
+    end
+    should "transform string include into an array" do
+      assert @config.has_key?("include")
+      assert @config.backwards_compatibilize.has_key?("include")
+      assert_equal @config.backwards_compatibilize["include"], %w[STOP_THE_PRESSES.txt .heloses .git]
+    end
   end
   context "loading configuration" do
     setup do

From a95fa70d729a7ef4177f2eedbeaba8e2f2a49726 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 17 May 2013 22:44:46 +0200
Subject: [PATCH 41/68] raise things when there's a yaml exception (non-zero
 exit code

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

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index aa02068d8..f71d6b790 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -35,7 +35,7 @@ module Jekyll
           self.data = YAML.safe_load($1)
         end
       rescue SyntaxError => e
-        puts "YAML Exception reading #{File.join(base, name)}: #{e.message}"        
+        puts "YAML Exception reading #{File.join(base, name)}: #{e.message}"
       rescue Exception => e
         puts "Error reading file #{File.join(base, name)}: #{e.message}"
       end
@@ -77,10 +77,7 @@ module Jekyll
       Liquid::Template.parse(content).render!(payload, info)
     rescue Exception => e
       Jekyll::Stevenson.error "Liquid Exception:", "#{e.message} in #{payload[:file]}"
-      e.backtrace.each do |backtrace|
-        puts backtrace
-      end
-      abort("Build Failed")
+      raise e
     end
 
     # Recursively render layouts

From ff8cf7c8680b1b39eac362e5e3d07591b5ef0dad Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 17 May 2013 22:45:39 +0200
Subject: [PATCH 42/68] provide access to the layout name so when shit goes
 down we get the name of the layout which couldn't be processed

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

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index f71d6b790..fcfac9e9d 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -96,7 +96,7 @@ module Jekyll
         payload = payload.deep_merge({"content" => self.output, "page" => layout.data})
 
         self.output = self.render_liquid(layout.content,
-                                         payload.merge({:file => self.data["layout"]}),
+                                         payload.merge({:file => layout.name}),
                                          info)
 
         if layout = layouts[layout.data["layout"]]
diff --git a/lib/jekyll/layout.rb b/lib/jekyll/layout.rb
index 1db6fe945..f75a4780e 100644
--- a/lib/jekyll/layout.rb
+++ b/lib/jekyll/layout.rb
@@ -5,6 +5,9 @@ module Jekyll
     # Gets the Site object.
     attr_reader :site
 
+    # Gets the name of this layout.
+    attr_reader :name
+
     # Gets/Sets the extension of this layout.
     attr_accessor :ext
 

From d9fd0fd7ad8a25f59d35ce8a53217031c6419630 Mon Sep 17 00:00:00 2001
From: Octavian Damiean <odamiean@linux.com>
Date: Sat, 18 May 2013 01:12:17 +0200
Subject: [PATCH 43/68] Fix for issue #1122.

---
 site/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/css/style.css b/site/css/style.css
index e2cef8e72..5acea8132 100644
--- a/site/css/style.css
+++ b/site/css/style.css
@@ -538,7 +538,7 @@ pre, code {
 .highlight {
   padding: 10px 0;
   width: 100%;
-  overflow: scroll;
+  overflow: auto;
 }
 
 /* HTML Elements */

From 9614d516f03151b91e1a7ab51fa9d03699faa705 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Fri, 17 May 2013 22:43:56 -0500
Subject: [PATCH 44/68] Update history to reflect merge of #1121

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

diff --git a/History.markdown b/History.markdown
index efcc7cf84..0b5662391 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
 
 ### Bug Fixes
   * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)
+  * Exit with a non-zero exit code when dealing with a Liquid error (#1121)
 
 ### Site Enhancements
   * Add link to jekyll-minibundle in the doc's plugins list (#1035)

From 6a7ed52b37635660e68ab427fa6b6a1773641404 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Fri, 17 May 2013 22:46:11 -0500
Subject: [PATCH 45/68] Update history to reflect merge of #1114

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

diff --git a/History.markdown b/History.markdown
index 0b5662391..2ee70bedc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,8 @@
 ### Bug Fixes
   * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)
   * Exit with a non-zero exit code when dealing with a Liquid error (#1121)
+  * Make the `exclude` and `include` options backwards compatible with
+    versions of Jekyll prior to 1.0 (#1114)
 
 ### Site Enhancements
   * Add link to jekyll-minibundle in the doc's plugins list (#1035)

From 786a120b5154c9f6f87649b98cb37b738e76834b Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Fri, 17 May 2013 22:49:09 -0500
Subject: [PATCH 46/68] Update history to reflect fixing of #1099 and #1119

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

diff --git a/History.markdown b/History.markdown
index 2ee70bedc..02ae255f9 100644
--- a/History.markdown
+++ b/History.markdown
@@ -20,6 +20,8 @@
   * Fix logic for `relative_permalinks` instructions on Upgrading page (#1101)
   * Add docs for post excerpt (#1072)
   * Add docs for gist tag (#1072)
+  * Add docs indicating that Pygments does not need to be installed
+    separately (#1099, #1119)
 
 ### Development Fixes
 

From 70d38c70f7f16484d3a56781cd2737765f229222 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Fri, 17 May 2013 23:16:26 -0500
Subject: [PATCH 47/68] Update history to reflect merge of #1115

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

diff --git a/History.markdown b/History.markdown
index 02ae255f9..41f5aadae 100644
--- a/History.markdown
+++ b/History.markdown
@@ -4,6 +4,7 @@
 ### Minor Enhancements
   * Move the building of related posts into their own class (#1057)
   * Removed trailing spaces in several places throughout the code (#1116)
+  * Add a `--force` option to `jekyll new` (#1115)
 
 ### Bug Fixes
   * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)

From 9ab2448e5a32e44460bd093764a74dcbe850668d Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 18 May 2013 14:09:05 +0200
Subject: [PATCH 48/68] Update history to reflect merge of #1123

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

diff --git a/History.markdown b/History.markdown
index 41f5aadae..05ad9fe59 100644
--- a/History.markdown
+++ b/History.markdown
@@ -13,6 +13,7 @@
     versions of Jekyll prior to 1.0 (#1114)
 
 ### Site Enhancements
+  * Documentation highlight boxes shouldn't show scrollbars if not necessary (#1123)
   * Add link to jekyll-minibundle in the doc's plugins list (#1035)
   * Quick patch for importers documentation
   * Fix prefix for WordpressDotCom importer in docs (#1107)

From 19461bc186406e125a3da380e7c6b916282137e7 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 21 May 2013 15:36:29 +0200
Subject: [PATCH 49/68] Install jekyll-import with the --pre flag for now.

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

diff --git a/site/docs/migrations.md b/site/docs/migrations.md
index f3e7ca019..e8acc4f9a 100644
--- a/site/docs/migrations.md
+++ b/site/docs/migrations.md
@@ -21,7 +21,7 @@ you need to do is install the gem, and they will become available as part of
 Jekyll's standard command line interface.
 
 {% highlight bash %}
-$ gem install jekyll-import [--pre]
+$ gem install jekyll-import --pre
 {% endhighlight %}
 
 You should now be all set to run the importers below. If you ever get stuck, you

From cbc0e72847ac3e208a78929f02e99acc9d0484b8 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Wed, 22 May 2013 14:42:18 -0500
Subject: [PATCH 50/68] Update history to reflect merge of #1063

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

diff --git a/History.markdown b/History.markdown
index 05ad9fe59..b68131fb6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
   * Exit with a non-zero exit code when dealing with a Liquid error (#1121)
   * Make the `exclude` and `include` options backwards compatible with
     versions of Jekyll prior to 1.0 (#1114)
+  * Fix pagination on Windows (#1063)
 
 ### Site Enhancements
   * Documentation highlight boxes shouldn't show scrollbars if not necessary (#1123)

From 9aca84c55b2a8f2a0c1e9bb7c1485694b66af148 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 22 May 2013 23:43:10 +0200
Subject: [PATCH 51/68] Updated the docs for migrators so they're at least a
 bit more helpful.

---
 site/docs/migrations.md | 82 ++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 42 deletions(-)

diff --git a/site/docs/migrations.md b/site/docs/migrations.md
index e8acc4f9a..c5dec2b76 100644
--- a/site/docs/migrations.md
+++ b/site/docs/migrations.md
@@ -70,7 +70,7 @@ $ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpressdotcom";
 If you want to import using a direct connection to the Wordpress MySQL server, here's how:
 
 {% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/migrators/wordpress";
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpress";
     JekyllImport::WordPress.process("database", "user", "pass")'
 {% endhighlight %}
 
@@ -81,7 +81,7 @@ your access based on `localhost` and `127.0.0.1` not being equivalent in its
 authentication system:
 
 {% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/migrators/wordpress";
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpress";
     JekyllImport::WordPress.process("database", "user", "pass", "127.0.0.1")'
 {% endhighlight %}
 
@@ -105,28 +105,37 @@ might be useful to you:
 
 ## Drupal
 
-If you’re migrating from [Drupal](http://drupal.org), there is [a
-migrator](https://github.com/mojombo/jekyll/blob/master/lib/jekyll/migrators/drupal.rb)
-for you too:
+If you’re migrating from [Drupal](http://drupal.org), there are two migrators
+for you, depending upon your Drupal version:
+- [Drupal 6](https://github.com/jekyll/jekyll-import/blob/v0.1.0.beta1/lib/jekyll/jekyll-import/drupal6.rb)
+- [Drupal 7](https://github.com/jekyll/jekyll-import/blob/v0.1.0.beta1/lib/jekyll/jekyll-import/drupal7.rb)
 
 {% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/migrators/drupal";
-    JekyllImport::Drupal.process("database", "user", "pass")'
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/drupal6";
+    JekyllImport::Drupal6.process("dbname", "user", "pass"))'
+# ... or ...
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/drupal7";
+    JekyllImport::Drupal7.process("database", "user", "pass")'
 {% endhighlight %}
 
-<div class="note warning">
-  <h5>Warning: Drupal Version Compatibility</h5>
-  <p>This migrator was written for Drupal 6.1 and may not work as expected with
-  newer versions of Drupal. Please update it and send us a pull request if
-  necessary.</p>
-</div>
+If you are connecting to a different host or need to specify a table prefix for
+your database, you may optionally add those two parameters to the end of either
+Drupal migrator execution:
+
+{% highlight bash %}
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/drupal6";
+    JekyllImport::Drupal6.process("dbname", "user", "pass", "host", "table_prefix"))'
+# ... or ...
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/drupal7";
+    JekyllImport::Drupal7.process("database", "user", "pass", "host", "table_prefix")'
+{% endhighlight %}
 
 ## Movable Type
 
 To import posts from Movable Type:
 
 {% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/migrators/mt";
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/mt";
     JekyllImport::MT.process("database", "user", "pass")'
 {% endhighlight %}
 
@@ -135,7 +144,7 @@ $ ruby -rubygems -e 'require "jekyll/migrators/mt";
 To import posts from Typo:
 
 {% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/migrators/typo";
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/typo";
     JekyllImport::Typo.process("database", "user", "pass")'
 {% endhighlight %}
 
@@ -146,7 +155,7 @@ This code has only been tested with Typo version 4+.
 To import posts from TextPattern:
 
 {% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/migrators/textpattern";
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/textpattern";
     JekyllImport::TextPattern.process("database_name", "username", "password", "hostname")'
 {% endhighlight %}
 
@@ -162,14 +171,14 @@ sticky.
 To import posts from Mephisto:
 
 {% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/migrators/mephisto";
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/mephisto";
     JekyllImport::Mephisto.process("database", "user", "password")'
 {% endhighlight %}
 
 If your data is in Postgres, you should do this instead:
 
 {% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/migrators/mephisto";
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/mephisto";
     JekyllImport::Mephisto.postgres({:database => "database", :username=>"username", :password =>"password"})'
 {% endhighlight %}
 
@@ -197,7 +206,7 @@ alternatives:
 To import posts from your primary Posterous blog:
 
 {% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/migrators/posterous";
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/posterous";
     JekyllImport::Posterous.process("my_email", "my_pass")'
 {% endhighlight %}
 
@@ -205,7 +214,7 @@ For any other Posterous blog on your account, you will need to specify the
 `blog_id` for the blog:
 
 {% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/migrators/posterous";
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/posterous";
     JekyllImport::Posterous.process("my_email", "my_pass", "blog_id")'
 {% endhighlight %}
 
@@ -218,30 +227,19 @@ that maintains permalinks and attempts to import images too.
 To import posts from Tumblr:
 
 {% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/migrators/tumblr";
-    JekyllImport::Tumblr.process("http://www.your_blog_url.com", true)'
-{% endhighlight %}
-
-There is also [a modified Tumblr
-migrator](https://github.com/stephenmcd/jekyll/blob/master/lib/jekyll/migrators/tumblr.rb)
-that exports posts as Markdown and preserves post tags.
-
-The migrator above requires the `json` gem and Python's `html2text` to be
-installed as follows:
-
-{% highlight bash %}
-$ gem install json
-$ pip install html2text
-{% endhighlight %}
-
-Once installed, simply use the format argument:
-
-{% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/migrators/tumblr";
-    JekyllImport::Tumblr.process("http://www.your_blog_url.com", format="md")'
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/tumblr";
+    JekyllImport::Tumblr.process(url, format, grab_images, add_highlights, rewrite_urls)'
+# url    - String: your blog's URL
+# format - String: the output file extension. Use "md" to have your content
+#          converted from HTML to Markdown. Defaults to "html".
+# grab_images    - Boolean: whether to download images as well. Defaults to false.
+# add_highlights - Boolean: whether to wrap code blocks (indented 4 spaces) in a Liquid
+                   "highlight" tag. Defaults to false.
+# rewrite_urls   - Boolean: whether to write pages that redirect from the old Tumblr paths
+                   to the new Jekyll paths. Defaults to false.
 {% endhighlight %}
 
 ## Other Systems
 
 If you have a system for which there is currently no migrator, consider writing
-one and sending us a pull request.
+one and sending us [a pull request](https://github.com/jekyll/jekyll-import).

From 8ab49151822f72146d38499bfc302682ea2c83f8 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Wed, 22 May 2013 16:51:53 -0500
Subject: [PATCH 52/68] Update history to reflect merge of #1136

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

diff --git a/History.markdown b/History.markdown
index b68131fb6..f20d15504 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Add docs for gist tag (#1072)
   * Add docs indicating that Pygments does not need to be installed
     separately (#1099, #1119)
+  * Update the migrator docs to be current (#1136)
 
 ### Development Fixes
 

From afc5cf098a189e3cd3dafa9c332f71fdf0170b6d Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 23 May 2013 00:00:40 +0200
Subject: [PATCH 53/68] Fix syntax errors in Drupal migration docs.

---
 site/docs/migrations.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/site/docs/migrations.md b/site/docs/migrations.md
index c5dec2b76..3ef79ce27 100644
--- a/site/docs/migrations.md
+++ b/site/docs/migrations.md
@@ -112,10 +112,10 @@ for you, depending upon your Drupal version:
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/jekyll-import/drupal6";
-    JekyllImport::Drupal6.process("dbname", "user", "pass"))'
+    JekyllImport::Drupal6.process("dbname", "user", "pass")'
 # ... or ...
 $ ruby -rubygems -e 'require "jekyll/jekyll-import/drupal7";
-    JekyllImport::Drupal7.process("database", "user", "pass")'
+    JekyllImport::Drupal7.process("dbname", "user", "pass")'
 {% endhighlight %}
 
 If you are connecting to a different host or need to specify a table prefix for
@@ -124,10 +124,10 @@ Drupal migrator execution:
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/jekyll-import/drupal6";
-    JekyllImport::Drupal6.process("dbname", "user", "pass", "host", "table_prefix"))'
+    JekyllImport::Drupal6.process("dbname", "user", "pass", "host", "table_prefix")'
 # ... or ...
 $ ruby -rubygems -e 'require "jekyll/jekyll-import/drupal7";
-    JekyllImport::Drupal7.process("database", "user", "pass", "host", "table_prefix")'
+    JekyllImport::Drupal7.process("dbname", "user", "pass", "host", "table_prefix")'
 {% endhighlight %}
 
 ## Movable Type

From 5cc65de6288713b4168f4e39b188d4a6790ac5c1 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Thu, 23 May 2013 12:16:02 -0500
Subject: [PATCH 54/68] Stick to the 1.0.x versions of rr

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

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 2d1a3af4f..8b6cc5bb2 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rdoc', "~> 3.11")
   s.add_development_dependency('redgreen', "~> 1.2")
   s.add_development_dependency('shoulda', "~> 3.3.2")
-  s.add_development_dependency('rr', "~> 1.0")
+  s.add_development_dependency('rr', "~> 1.0.0")
   s.add_development_dependency('cucumber', "~> 1.2.1", '!= 1.2.4')
   s.add_development_dependency('RedCloth', "~> 4.2")
   s.add_development_dependency('rdiscount', "~> 1.6")

From 09d229de33aea740381e011ea6beff1b55005687 Mon Sep 17 00:00:00 2001
From: scribu <mail@scribu.net>
Date: Thu, 23 May 2013 19:42:47 +0300
Subject: [PATCH 55/68] make bin/jekyll executable

`bundle install` makes it executable and it should be anyway, since it
has the hashbang at the top.
---
 bin/jekyll | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 bin/jekyll

diff --git a/bin/jekyll b/bin/jekyll
old mode 100644
new mode 100755

From 7579c1c42d69c0017a8f7dc2f82e02cca69899e9 Mon Sep 17 00:00:00 2001
From: scribu <mail@scribu.net>
Date: Thu, 23 May 2013 19:44:02 +0300
Subject: [PATCH 56/68] cucumber: don't manually include assertions

It causes hard to debug infinite loops and it's done automatically
in recent versions of Cucumber anyway.
---
 features/support/env.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/features/support/env.rb b/features/support/env.rb
index 38bab9502..c64b93115 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -2,10 +2,6 @@ require 'fileutils'
 require 'rr'
 require 'test/unit'
 
-World do
-  include Test::Unit::Assertions
-end
-
 TEST_DIR    = File.join('/', 'tmp', 'jekyll')
 JEKYLL_PATH = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'jekyll')
 

From 6936bbded8171d0a42be875e61ed40bfd080e297 Mon Sep 17 00:00:00 2001
From: John Piasetzki <john@piasetzki.name>
Date: Sat, 18 May 2013 00:24:14 -0400
Subject: [PATCH 57/68] Changed the jekyll steps to write only the date and
 time for tests. This avoids timezone issues.

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

diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index 75330738e..b818d2a19 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -68,7 +68,7 @@ Given /^I have the following (draft|post)s?(?: (.*) "(.*)")?:$/ do |status, dire
         '%m/%d/%Y' # why even
       end
       parsed_date = DateTime.strptime(post['date'], format)
-      post['date'] = parsed_date.to_s
+      post['date'] = parsed_date.strftime('%Y-%m-%d %H:%M')
       date = parsed_date.strftime('%Y-%m-%d')
       path = File.join(before || '.', '_posts', after || '.', "#{date}-#{title}.#{ext}")
     end

From c4750cf48f7e3dda95958234903cf9cec55b2180 Mon Sep 17 00:00:00 2001
From: John Piasetzki <john@piasetzki.name>
Date: Sat, 18 May 2013 10:14:00 -0400
Subject: [PATCH 58/68] Fixes so that the timezone gets written when it
 explicit is specificied in a test

---
 features/step_definitions/jekyll_steps.rb | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index b818d2a19..0ee76ea2c 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -62,14 +62,17 @@ Given /^I have the following (draft|post)s?(?: (.*) "(.*)")?:$/ do |status, dire
     if "draft" == status
       path = File.join(before || '.', '_drafts', after || '.', "#{title}.#{ext}")
     else
-      format = if has_time_component?(post['date'])
-        '%Y-%m-%d %H:%M %z'
+      if has_time_component?(post['date'])
+        format = '%Y-%m-%d %H:%M %z'
+        parsed_date = DateTime.strptime(post['date'], format)
+        post['date'] = parsed_date.to_s
+        date = parsed_date.strftime('%Y-%m-%d')
       else
-        '%m/%d/%Y' # why even
+        format = '%m/%d/%Y' # why even
+        parsed_date = DateTime.strptime(post['date'], format)
+        post['date'] = parsed_date.strftime('%Y-%m-%d %H:%M')
+        date = parsed_date.strftime('%Y-%m-%d')
       end
-      parsed_date = DateTime.strptime(post['date'], format)
-      post['date'] = parsed_date.strftime('%Y-%m-%d %H:%M')
-      date = parsed_date.strftime('%Y-%m-%d')
       path = File.join(before || '.', '_posts', after || '.', "#{date}-#{title}.#{ext}")
     end
 

From 008a094e95b79e136c321d50c89f8230744d5a64 Mon Sep 17 00:00:00 2001
From: Mikael Konutgan <mkonutgan@gmail.com>
Date: Thu, 23 May 2013 20:07:25 +0200
Subject: [PATCH 59/68] Document Jekyll's date_to_rfc822 and uri_escape filters
 on the site

---
 site/docs/templates.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/site/docs/templates.md b/site/docs/templates.md
index 08929eeea..6402970d8 100644
--- a/site/docs/templates.md
+++ b/site/docs/templates.md
@@ -37,6 +37,20 @@ common tasks easier.
         </p>
       </td>
     </tr>
+    <tr>
+      <td>
+        <p class='name'><strong>Date to RFC-822 Format</strong></p>
+        <p>Convert a Date into the RFC-822 format used for RSS feeds.</p>
+      </td>
+      <td class='align-center'>
+        <p>
+         <code class='filter'>{% raw %}{{ site.time | date_to_rfc822 }}{% endraw %}</code>
+        </p>
+        <p>
+          <code class='output'>Mon, 17 Nov 2008 13:07:54 -0800</code>
+        </p>
+      </td>
+    </tr>
     <tr>
       <td>
         <p class='name'><strong>Date to String</strong></p>
@@ -93,6 +107,22 @@ common tasks easier.
         </p>
       </td>
     </tr>
+    <tr>
+      <td>
+        <p class='name'><strong>URI Escape</strong></p>
+        <p>
+          URI escape a string.
+        </p>
+      </td>
+      <td class='align-center'>
+        <p>
+         <code class='filter'>{% raw %}{{ “'foo, bar \\baz?'” | uri_escape }}{% endraw %}</code>
+        </p>
+        <p>
+          <code class='output'>foo,%20bar%20%5Cbaz?</code>
+        </p>
+      </td>
+    </tr>
     <tr>
       <td>
         <p class='name'><strong>Number of Words</strong></p>

From 9adfd6ddeb900e2b93dca0aa0620f64beeb3e55d Mon Sep 17 00:00:00 2001
From: Mikael Konutgan <mkonutgan@gmail.com>
Date: Thu, 23 May 2013 20:18:08 +0200
Subject: [PATCH 60/68] Document uri_escape

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

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index ef720f78e..45c123b48 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -99,7 +99,17 @@ module Jekyll
     def cgi_escape(input)
       CGI::escape(input)
     end
-
+    
+    # URI escape a string.
+    #
+    # input - The String to escape.
+    #
+    # Examples
+    #
+    #   uri_escape('foo, bar \\baz?')
+    #   # => "foo,%20bar%20%5Cbaz?"
+    #
+    # Returns the escaped String.
     def uri_escape(input)
       URI.escape(input)
     end

From e043c419f5f2e0690e280428743e82f55ed5f08a Mon Sep 17 00:00:00 2001
From: John Piasetzki <john@piasetzki.name>
Date: Thu, 23 May 2013 16:49:43 -0400
Subject: [PATCH 61/68] Trying to edit my history to remove the mistakes

---
 features/step_definitions/jekyll_steps.rb | 51 ++++++++++-------------
 features/support/env.rb                   | 20 +++++++++
 2 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index 0ee76ea2c..696ddcb89 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -47,47 +47,38 @@ Given /^I have an? (.*) directory$/ do |dir|
   FileUtils.mkdir_p(dir)
 end
 
-Given /^I have the following (draft|post)s?(?: (.*) "(.*)")?:$/ do |status, direction, folder, table|
+Given /^I have the following (draft|post)s?(?: (in|under) "([^"]+)")?:$/ do |status, direction, folder, table|
   table.hashes.each do |post|
-    title = post['title'].downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
-
-    if direction && direction == "in"
-      before = folder || '.'
-    elsif direction && direction == "under"
-      after = folder || '.'
-    end
-
+    title = slug(post['title'])
     ext = post['type'] || 'textile'
+    before, after = location(folder, direction)
+
+    if post['date']
+      in_format, out_format = time_format(post['date'])
+      parsed_date = DateTime.strptime(post['date'], in_format)
+      post['date'] = parsed_date.strftime(out_format)
+    end
 
     if "draft" == status
-      path = File.join(before || '.', '_drafts', after || '.', "#{title}.#{ext}")
-    else
-      if has_time_component?(post['date'])
-        format = '%Y-%m-%d %H:%M %z'
-        parsed_date = DateTime.strptime(post['date'], format)
-        post['date'] = parsed_date.to_s
-        date = parsed_date.strftime('%Y-%m-%d')
-      else
-        format = '%m/%d/%Y' # why even
-        parsed_date = DateTime.strptime(post['date'], format)
-        post['date'] = parsed_date.strftime('%Y-%m-%d %H:%M')
-        date = parsed_date.strftime('%Y-%m-%d')
-      end
-      path = File.join(before || '.', '_posts', after || '.', "#{date}-#{title}.#{ext}")
+      folder_post = '_drafts'
+      filename = "#{title}.#{ext}"
+    elsif "post" == status
+      folder_post = '_posts'
+      filename = "#{parsed_date.strftime('%Y-%m-%d')}-#{title}.#{ext}"
     end
 
+    path = File.join(before, folder_post, after, filename)
+
     matter_hash = {}
-    %w(title layout tag tags category categories published author path).each do |key|
+    %w(title layout tag tags category categories published author path date).each do |key|
       matter_hash[key] = post[key] if post[key]
     end
-    if "post" == status
-      matter_hash["date"] = post["date"] if post["date"]
-    end
     matter = matter_hash.map { |k, v| "#{k}: #{v}\n" }.join.chomp
 
-    content = post['content']
-    if post['input'] && post['filter']
-      content = "{{ #{post['input']} | #{post['filter']} }}"
+    content = if post['input'] && post['filter']
+      "{{ #{post['input']} | #{post['filter']} }}"
+    else
+      post['content']
     end
 
     File.open(path, 'w') do |f|
diff --git a/features/support/env.rb b/features/support/env.rb
index 38bab9502..26e03d715 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -17,9 +17,29 @@ def run_jekyll(opts = {})
   system command
 end
 
+def time_format(date)
+  if has_time_component?(date)
+    ['%Y-%m-%d %H:%M %z'] * 2
+  else
+    ['%m/%d/%Y', '%Y-%m-%d %H:%M']
+  end
+end
+
 def has_time_component?(date_string)
   date_string.split(" ").size > 1
 end
 
+def slug(title)
+  title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
+end
+
+def location(folder, direction)
+  if folder
+    before = folder if direction == "in"
+    after = folder if direction == "under"
+  end
+  [before || '.', after || '.']
+end
+
 # work around "invalid option: --format" cucumber bug (see #296)
 Test::Unit.run = true if RUBY_VERSION < '1.9'

From 23d0c130a5622193d116d7161e6ace43eb826e9e Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 23 May 2013 23:27:06 +0200
Subject: [PATCH 62/68] Update history to reflect merge of #1142.

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

diff --git a/History.markdown b/History.markdown
index f20d15504..d73338840 100644
--- a/History.markdown
+++ b/History.markdown
@@ -14,6 +14,7 @@
   * Fix pagination on Windows (#1063)
 
 ### Site Enhancements
+  * Documentation for `date_to_rfc822` and `uri_escape` (#1142)
   * Documentation highlight boxes shouldn't show scrollbars if not necessary (#1123)
   * Add link to jekyll-minibundle in the doc's plugins list (#1035)
   * Quick patch for importers documentation

From d454abf3863f666a28f7a9d3093ba66f36ad93f9 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Thu, 23 May 2013 16:29:26 -0500
Subject: [PATCH 63/68] Update history to reflect merge of #1124

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

diff --git a/History.markdown b/History.markdown
index d73338840..72891a135 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * Update the migrator docs to be current (#1136)
 
 ### Development Fixes
+  * Do not write posts with timezones in Cucumber tests (#1124)
 
 ## 1.0.2 / 2013-05-12
 

From da7e44cd4697f4a41179b4b1c4014867fb01a579 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 23 May 2013 23:29:46 +0200
Subject: [PATCH 64/68] Update history to reflect merge of #1139. Fixes #622.

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

diff --git a/History.markdown b/History.markdown
index d73338840..34a6b6c36 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * Update the migrator docs to be current (#1136)
 
 ### Development Fixes
+  * Fix pesky Cucumber infinite loop (#1139)
 
 ## 1.0.2 / 2013-05-12
 

From 0e8e2fd3ca57affbc8a10bae7888791272b55e3d Mon Sep 17 00:00:00 2001
From: redwallhp <matt@ntugo.com>
Date: Thu, 23 May 2013 19:28:07 -0400
Subject: [PATCH 65/68] Added JekyllGalleryTag to plugins.md

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

diff --git a/site/docs/plugins.md b/site/docs/plugins.md
index 36d932eb9..cd8dce61b 100644
--- a/site/docs/plugins.md
+++ b/site/docs/plugins.md
@@ -428,6 +428,7 @@ There are a few useful, prebuilt plugins at the following locations:
 - [smilify](https://github.com/SaswatPadhi/jekyll_smilify) by [SaswatPadhi](https://github.com/SaswatPadhi): Convert text emoticons in your content to themeable smiley pics. [Demo](http://saswatpadhi.github.com/)
 - [excerpts](http://blog.darkrefraction.com/2012/jekyll-excerpt-plugin.html) by [drawoc](https://github.com/drawoc): provides a nice way to implement page excerpts.
 - [jekyll-minibundle](https://github.com/tkareine/jekyll-minibundle): Asset bundling and cache busting using external minification tool of your choice, no gem dependencies.
+- [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 with a Liquid tag.
 
 <div class="note info">
   <h5>Jekyll Plugins Wanted</h5>

From 8eec9f7759d7cebcc2ac77fffa7bf9b88598f96c Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Thu, 23 May 2013 20:32:40 -0500
Subject: [PATCH 66/68] Update history to reflect merge of #1143

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

diff --git a/History.markdown b/History.markdown
index d0bcaa404..70c788f82 100644
--- a/History.markdown
+++ b/History.markdown
@@ -27,6 +27,7 @@
   * Add docs indicating that Pygments does not need to be installed
     separately (#1099, #1119)
   * Update the migrator docs to be current (#1136)
+  * Add the Jekyll Gallery Plugin to the plugin list (#1143)
 
 ### Development Fixes
   * Fix pesky Cucumber infinite loop (#1139)

From 2cfc70735daa391b5073841da918a8bf495b18a2 Mon Sep 17 00:00:00 2001
From: Nathan Youngman <git@nathany.com>
Date: Sun, 26 May 2013 19:51:05 -0600
Subject: [PATCH 67/68] Qualify .go class for Pygments, fixes #1153

---
 site/css/pygments.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/css/pygments.css b/site/css/pygments.css
index e1df641b9..408a44f3a 100644
--- a/site/css/pygments.css
+++ b/site/css/pygments.css
@@ -18,7 +18,7 @@
 .highlight .gr { color: #c0c0c0; font-weight: bold; background-color: #c00000 } /* Generic.Error */
 .highlight .gh { color: #cd5c5c} /* Generic.Heading */
 .highlight .gi { color: #ffffff; background-color: #0000c0 } /* Generic.Inserted */
-.highlight .go { color: #add8e6; font-weight: bold; background-color: #4d4d4d } /* Generic.Output */
+.highlight span.go { color: #add8e6; font-weight: bold; background-color: #4d4d4d } /* Generic.Output, qualified with span to prevent applying this style to the Go language, see #1153. */
 .highlight .gp { color: #ffffff} /* Generic.Prompt */
 .highlight .gs { color: #ffffff} /* Generic.Strong */
 .highlight .gu { color: #cd5c5c} /* Generic.Subheading */

From 2defdad3ae3e7a919d3e51d024f5da9f2c23f4b9 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Tue, 28 May 2013 21:38:19 -0500
Subject: [PATCH 68/68] Update history to reflect merge of #1156

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

diff --git a/History.markdown b/History.markdown
index 70c788f82..9a19a1ccd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,8 @@
   * Make the `exclude` and `include` options backwards compatible with
     versions of Jekyll prior to 1.0 (#1114)
   * Fix pagination on Windows (#1063)
+  * Fix the application of Pygments' Generic Output style to Go code
+    (#1156)
 
 ### Site Enhancements
   * Documentation for `date_to_rfc822` and `uri_escape` (#1142)