diff --git a/docs/jp/CONTRIBUTING.jp.markdown b/docs/jp/CONTRIBUTING.jp.markdown
index 51e05942..1c66d01a 100644
--- a/docs/jp/CONTRIBUTING.jp.markdown
+++ b/docs/jp/CONTRIBUTING.jp.markdown
@@ -83,7 +83,7 @@ GitHub の [Jekyll wiki](https://github.com/jekyll/jekyll/wiki) は、
   それは適用するためのあなたの仕事で、メンテナがしなければならないことを少なくするのは
   とてもよいことです。
 * あなたの GitHub issue で [fix], [feature] などのタグをつけないでください。
-  メンテナは積極的に issue を読み、彼らが問題に出くわしたらラベルをつけるでしょう。 
+  メンテナは積極的に issue を読み、彼らが問題に出くわしたらラベルをつけるでしょう。
 
 最後に…
 ----------
diff --git a/docs/jp/README.jp.markdown b/docs/jp/README.jp.markdown
index 6ab3464f..0085c3f1 100644
--- a/docs/jp/README.jp.markdown
+++ b/docs/jp/README.jp.markdown
@@ -39,7 +39,7 @@ Jekyll あなたがするように伝えたことをします ― それ以上
 * [変数](http://jekyllrb.com/docs/variables/)を使ってサイトに情報を表示する
 * posts が生成される時の[パーマリンク](http://jekyllrb.com/docs/permalinks/)をカスタマイズ
 * 人生を容易にするために、組み込みの [Liquid 拡張](http://jekyllrb.com/docs/templates/)を使用する
-* あなたのサイト固有のコンテンツを生成するために、カスタム[プラグイン](http://jekyllrb.com/docs/plugins/)を使用する 
+* あなたのサイト固有のコンテンツを生成するために、カスタム[プラグイン](http://jekyllrb.com/docs/plugins/)を使用する
 
 ## 実行時の依存関係
 
diff --git a/lib/jekyll/stevenson.rb b/lib/jekyll/stevenson.rb
index 87652200..57fba827 100644
--- a/lib/jekyll/stevenson.rb
+++ b/lib/jekyll/stevenson.rb
@@ -15,7 +15,7 @@ module Jekyll
     def initialize(level = INFO)
       @log_level = level
     end
-    
+
     # Public: Print a jekyll debug message to stdout
     #
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index aa608bc0..1d655af2 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -55,11 +55,11 @@ module Jekyll
             raise ArgumentError.new <<-eos
 Invalid syntax for include tag. File contains invalid characters or sequences:
 
-	#{file}
+  #{file}
 
 Valid syntax:
 
-	#{SYNTAX_EXAMPLE}
+  #{SYNTAX_EXAMPLE}
 
 eos
         end
@@ -71,11 +71,11 @@ eos
           raise ArgumentError.new <<-eos
 Invalid syntax for include tag:
 
-	#{@params}
+  #{@params}
 
 Valid syntax:
 
-	#{SYNTAX_EXAMPLE}
+  #{SYNTAX_EXAMPLE}
 
 eos
         end
diff --git a/script/rebund b/script/rebund
index 7aa2db2c..2e8d3b1f 100755
--- a/script/rebund
+++ b/script/rebund
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # rebund(1)
-# 
+#
 # Author: Julien Letessier
 # Homepage: https://github.com/mezis/rebund
 # License:
diff --git a/site/_posts/2013-07-25-jekyll-1-0-4-released.markdown b/site/_posts/2013-07-25-jekyll-1-0-4-released.markdown
index faf81ddc..b61d9fce 100644
--- a/site/_posts/2013-07-25-jekyll-1-0-4-released.markdown
+++ b/site/_posts/2013-07-25-jekyll-1-0-4-released.markdown
@@ -9,7 +9,7 @@ categories: [release]
 
 Version 1.0.4 fixes a minor, but nonetheless important security vulnerability affecting several third-party Jekyll plugins. If your Jekyll site does not use plugins, you may, but are not required to upgrade at this time.
 
-Community and custom plugins extending the `Liquid::Drop` class may inadvertently disclose some system information such as directory structure or software configuration to users with access to the Liquid templating system. 
+Community and custom plugins extending the `Liquid::Drop` class may inadvertently disclose some system information such as directory structure or software configuration to users with access to the Liquid templating system.
 
 We recommend you upgrade to Jekyll v1.0.4 immediately if you use `Liquid::Drop` plugins on your Jekyll site.
 
diff --git a/site/_posts/2013-07-25-jekyll-1-1-2-released.markdown b/site/_posts/2013-07-25-jekyll-1-1-2-released.markdown
index 54a8c873..63e78d98 100644
--- a/site/_posts/2013-07-25-jekyll-1-1-2-released.markdown
+++ b/site/_posts/2013-07-25-jekyll-1-1-2-released.markdown
@@ -9,7 +9,7 @@ categories: [release]
 
 Version 1.1.2 fixes a minor, but nonetheless important security vulnerability affecting several third-party Jekyll plugins. If your Jekyll site does not use plugins, you may, but are not required to upgrade at this time.
 
-Community and custom plugins extending the `Liquid::Drop` class may inadvertently disclose some system information such as directory structure or software configuration to users with access to the Liquid templating system. 
+Community and custom plugins extending the `Liquid::Drop` class may inadvertently disclose some system information such as directory structure or software configuration to users with access to the Liquid templating system.
 
 We recommend you upgrade to Jekyll v1.1.2 immediately if you use `Liquid::Drop` plugins on your Jekyll site.
 
diff --git a/site/_posts/2013-09-14-jekyll-1-2-1-released.markdown b/site/_posts/2013-09-14-jekyll-1-2-1-released.markdown
index f6e01f94..832dbd06 100644
--- a/site/_posts/2013-09-14-jekyll-1-2-1-released.markdown
+++ b/site/_posts/2013-09-14-jekyll-1-2-1-released.markdown
@@ -9,7 +9,7 @@ categories: [release]
 
 Quick turnover, anyone? A [recent incompatibility with Liquid
 v2.5.2](https://github.com/jekyll/jekyll/pull/1525) produced a nasty bug in
-which `include` tags were not rendered properly within `if` blocks. 
+which `include` tags were not rendered properly within `if` blocks.
 
 This release also includes a better handling of detached servers (prints pid and
 the command for killing the process). **Note**: the `--detach` flag and
diff --git a/site/docs/contributing.md b/site/docs/contributing.md
index 1bb717f5..909ab925 100644
--- a/site/docs/contributing.md
+++ b/site/docs/contributing.md
@@ -102,8 +102,8 @@ Jekyll's repo on GitHub.com.
 All documentation pull requests should be directed at `master`.  Pull
 requests directed at another branch will not be accepted.
 
-The [Jekyll wiki]({{ site.repository }}/wiki) on GitHub 
-can be freely updated without a pull request as all 
+The [Jekyll wiki]({{ site.repository }}/wiki) on GitHub
+can be freely updated without a pull request as all
 GitHub users have access.
 
 If you want to add your plugin to the [list of plugins](/docs/plugins/#available_plugins),
diff --git a/site/docs/structure.md b/site/docs/structure.md
index c178a65f..44bf27b1 100644
--- a/site/docs/structure.md
+++ b/site/docs/structure.md
@@ -130,9 +130,9 @@ An overview of what each of these does:
       <td>
         <p>
 
-          Well-formatted site data should be placed here. The jekyll engine will 
-          autoload all yaml files (ends with <code>.yml</code> or <code>.yaml</code>) 
-          in this directory. If there's a file <code>members.yml</code> under the directory, 
+          Well-formatted site data should be placed here. The jekyll engine will
+          autoload all yaml files (ends with <code>.yml</code> or <code>.yaml</code>)
+          in this directory. If there's a file <code>members.yml</code> under the directory,
           then you can access contents of the file through <code>site.data.members</code>.
 
         </p>
diff --git a/site/docs/usage.md b/site/docs/usage.md
index 6f5c9a3b..7538de00 100644
--- a/site/docs/usage.md
+++ b/site/docs/usage.md
@@ -31,7 +31,7 @@ $ jekyll build --watch
     cleaned when the site is built.  Files or folders that are not
     created by your site will be removed.  Do not use an important
     location for <code>&lt;destination&gt;</code>; instead, use it as
-    a staging area and copy files from there to your web server. 
+    a staging area and copy files from there to your web server.
   </p>
 </div>
 
diff --git a/site/docs/variables.md b/site/docs/variables.md
index 92a794f5..2c6d3849 100644
--- a/site/docs/variables.md
+++ b/site/docs/variables.md
@@ -261,7 +261,7 @@ following is a reference of the available data.
       <td><p><code>page.next</code></p></td>
       <td><p>
 
-        The next post relative to the position of the current post in 
+        The next post relative to the position of the current post in
         <code>site.posts</code>. Returns <code>nil</code> for the last entry.
 
       </p></td>
@@ -270,7 +270,7 @@ following is a reference of the available data.
       <td><p><code>page.previous</code></p></td>
       <td><p>
 
-        The previous post relative to the position of the current post in 
+        The previous post relative to the position of the current post in
         <code>site.posts</code>. Returns <code>nil</code> for the first entry.
 
       </p></td>
diff --git a/test/source/_posts/2011-04-12-md-extension.md b/test/source/_posts/2011-04-12-md-extension.md
index 163e9133..2d2ae939 100644
--- a/test/source/_posts/2011-04-12-md-extension.md
+++ b/test/source/_posts/2011-04-12-md-extension.md
@@ -2,6 +2,6 @@
 date: 2011-04-12 13:07:09
 ---
 
-under default configuration, this post should get processed by the identity converter. By changing 
+under default configuration, this post should get processed by the identity converter. By changing
 textile extension or markdown extension configuration parameters, you should be able to associate
 it with either of those converters
\ No newline at end of file
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index 43fe9b43..ba5f0fe1 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -36,7 +36,7 @@ class TestExcerpt < Test::Unit::TestCase
     end
 
     context "#include(string)" do
-      
+
       setup do
         @excerpt.output = "Here is a fake output stub"
       end
@@ -61,7 +61,7 @@ class TestExcerpt < Test::Unit::TestCase
         assert_equal @excerpt.content, @excerpt.to_s
       end
 
-      should "return its output if output present" do  
+      should "return its output if output present" do
         @excerpt.output = "Fake Output"
         assert_equal @excerpt.output, @excerpt.to_s
       end