diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 2e070d47..bd7579c3 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,8 +1,8 @@
 <!--
-  Hi! Thanks for considering to file a bug with Jekyll.  Please take the time to
+  Hi! Thanks for considering to file a bug with Jekyll. Please take the time to
   answer the basic questions. You can convert `[ ]` into `[x]` to check boxes (or submit
   and check.) If there is no need for certain fields like output and redirection, please delete
-  those headers before submitting.  We know not all tickets require those steps.
+  those headers before submitting. We know not all tickets require those steps.
   Otherwise, please try to be as detailed as possible.
   
   If you are unsure this is a bug in Jekyll, or this is a bug caused
diff --git a/History.markdown b/History.markdown
index 3ac64bab..64ac1e8e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -105,7 +105,7 @@
   * Add timings for each scenario in cucumber & print worst offenders (#4908)
   * rubocop: jekyll/lib/filters.rb (#4993)
   * Fix rubocop offenses in exe/jekyll (#5017)
-  * Rubocop: lib/jekyll/command.rb  (#5018)
+  * Rubocop: lib/jekyll/command.rb (#5018)
   * rubocop: lib/jekyll/static_file.rb (#5019)
   * rubocop: lib/jekyll/utils.rb (#5026)
   * rubocop: lib/jekyll/regenerator.rb (#5025)
diff --git a/docs/triaging-an-issue.md b/docs/triaging-an-issue.md
index 10da324a..405dffaf 100644
--- a/docs/triaging-an-issue.md
+++ b/docs/triaging-an-issue.md
@@ -48,4 +48,4 @@ Is what they wanted to get something we want to happen? Sometimes a bug report i
 
 ### Staleness and automatic closure
 
-@jekyllbot will automatically mark issues as `stale` if no  activity occurs for at least one month. @jekyllbot leaves a comment asking for information about reproducibility in current versions. If no one responds after another month, the issue is automatically closed.
+@jekyllbot will automatically mark issues as `stale` if no activity occurs for at least one month. @jekyllbot leaves a comment asking for information about reproducibility in current versions. If no one responds after another month, the issue is automatically closed.
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 1f0af762..ce9800df 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -146,7 +146,7 @@ module Jekyll
     #
     # string - the filename or title to slugify
     # mode - how string is slugified
-    # cased - whether to replace all  uppercase letters with their
+    # cased - whether to replace all uppercase letters with their
     # lowercase counterparts
     #
     # When mode is "none", return the given string.
diff --git a/script/cibuild b/script/cibuild
index d30fd36b..11c6b50c 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -6,7 +6,7 @@ set -e
 
 if [[ -z "$TEST_SUITE" ]]
 then
-  script/test  ci
+  script/test ci
   script/cucumber
 elif [[ -x "script/$TEST_SUITE" ]]
 then
diff --git a/script/proof b/script/proof
index a5de7fd6..95cffc0b 100755
--- a/script/proof
+++ b/script/proof
@@ -6,7 +6,7 @@
 set -e
 
 function msg {
-	printf "\e[0;37m==> $1\e[0m\n"
+  printf "\e[0;37m==> $1\e[0m\n"
 }
 
 INGORE_HREFS=$(ruby -e 'puts %w{
diff --git a/site/_data/jekyllconf-talks.yml b/site/_data/jekyllconf-talks.yml
index e5881682..93bf6252 100644
--- a/site/_data/jekyllconf-talks.yml
+++ b/site/_data/jekyllconf-talks.yml
@@ -159,7 +159,7 @@
   youtube_id: BRB5DgAE5nM
   topic: Deploy Jekyll Like A Boss
   year: 2016
-  
+
 - speaker: Tom Johnson
   twitter_handle: tomjohnson
   youtube_id: nq1AUB72GCQ
diff --git a/site/_docs/assets.md b/site/_docs/assets.md
index 8e850548..fd163e06 100644
--- a/site/_docs/assets.md
+++ b/site/_docs/assets.md
@@ -4,9 +4,9 @@ title: Assets
 permalink: /docs/assets/
 ---
 
-Jekyll provides built-in support for Sass and can work with CoffeeScript via 
-a Ruby gem. In order to use them, you must first create a file with the 
-proper extension name (one of `.sass`, `.scss`, or `.coffee`) and ***start the 
+Jekyll provides built-in support for Sass and can work with CoffeeScript via
+a Ruby gem. In order to use them, you must first create a file with the
+proper extension name (one of `.sass`, `.scss`, or `.coffee`) and ***start the
 file with two lines of triple dashes***, like this:
 
 {% highlight sass %}
diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index aaf82951..11915621 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -436,7 +436,7 @@ Using [YAML Front Matter](../frontmatter/) is one way that you can specify confi
 
 Often times, you will find that you are repeating a lot of configuration options. Setting the same layout in each file, adding the same category - or categories - to a post, etc. You can even add custom variables like author names, which might be the same for the majority of posts on your blog.
 
-Instead of repeating this configuration each time you create a new post or page, Jekyll provides a way to set these defaults in the site configuration. To do this, you can specify  site-wide defaults using the `defaults` key in the `_config.yml` file in your project's root directory.
+Instead of repeating this configuration each time you create a new post or page, Jekyll provides a way to set these defaults in the site configuration. To do this, you can specify site-wide defaults using the `defaults` key in the `_config.yml` file in your project's root directory.
 
 The `defaults` key holds an array of scope/values pairs that define what defaults should be set for a particular file path, and optionally, a file type in that path.
 
diff --git a/site/_docs/continuous-integration.md b/site/_docs/continuous-integration.md
index 4bd01e2b..c01d1d1b 100644
--- a/site/_docs/continuous-integration.md
+++ b/site/_docs/continuous-integration.md
@@ -204,7 +204,7 @@ environment variable `NOKOGIRI_USE_SYSTEM_LIBRARIES` to `true`.
 exclude: [vendor]
 {% endhighlight %}
 
-By default you should supply the `sudo: false` command to Travis. This command 
+By default you should supply the `sudo: false` command to Travis. This command
 explicitly tells Travis to run your build on Travis's [container-based
  infrastructure](https://docs.travis-ci.com/user/workers/container-based-infrastructure/#Routing-your-build-to-container-based-infrastructure). Running on the container-based infrastructure can often times
 speed up your build. If you have any trouble with your build, or if your build
diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md
index af57119b..787089f5 100644
--- a/site/_docs/deployment-methods.md
+++ b/site/_docs/deployment-methods.md
@@ -99,7 +99,7 @@ Another way to deploy your Jekyll site is to use [Rake](https://github.com/ruby/
 
 Once you’ve generated the `_site` directory, you can easily scp it using a
 `tasks/deploy` shell script similar to [this deploy script][]. You’d obviously
-need to change the values to reflect your site’s details. There is even [a 
+need to change the values to reflect your site’s details. There is even [a
 matching TextMate command][] that will help you run this script.
 
 [this deploy script here]: https://github.com/henrik/henrik.nyh.se/blob/master/script/deploy
@@ -156,7 +156,7 @@ your host uses a different port than the default (e.g, HostGator)
 Using this setup, you might run the following command:
 
 {% highlight shell %}
-rsync -crvz --rsh='ssh -p2222' --delete-after --delete-excluded   _site/ hostuser@example.org:
+rsync -crvz --rsh='ssh -p2222' --delete-after --delete-excluded _site/ hostuser@example.org:
 {% endhighlight %}
 
 Don't forget the column `:` after server name!
@@ -178,7 +178,7 @@ Alternatively, you can use an `rsync-exclude.txt` file to control which files wi
 
 #### Done!
 
-Now it's possible to publish your website simply by running the  `deploy` 
+Now it's possible to publish your website simply by running the `deploy`
 script. If your SSH certificate  is [passphrase-protected](https://martin.kleppmann.com/2013/05/24/improving-security-of-ssh-private-keys.html), you will be asked to enter it when the
 script executes.
 
diff --git a/site/_docs/github-pages.md b/site/_docs/github-pages.md
index b4a0b02e..4a4c3895 100644
--- a/site/_docs/github-pages.md
+++ b/site/_docs/github-pages.md
@@ -76,7 +76,7 @@ gem 'github-pages'
 {% endhighlight %}
 
     And be sure to run <code>bundle update</code> often.
-    
+
     If you like to install <code>pages-gem</code> on Windows you can find instructions by Jens Willmer on <a href="http://jwillmer.de/blog/tutorial/how-to-install-jekyll-and-pages-gem-on-windows-10-x46#github-pages-and-plugins">how to install github-pages gem on Windows (x64)</a>.
   </p>
 </div>
@@ -84,8 +84,8 @@ gem 'github-pages'
 <div class="note info">
   <h5>Installing <code>github-pages</code> gem on Windows</h5>
   <p>
-    While Windows is not officially supported, it is possible 
-    to install <code>github-pages</code> gem on Windows. 
+    While Windows is not officially supported, it is possible
+    to install <code>github-pages</code> gem on Windows.
     Special instructions can be found on our
     <a href="../windows/#installation">Windows-specific docs page</a>.
   </p>
diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md
index 775937fd..f9390a21 100644
--- a/site/_docs/upgrading/2-to-3.md
+++ b/site/_docs/upgrading/2-to-3.md
@@ -125,6 +125,6 @@ date: 2016-02-06 19:32:10 -0800
 
 ### My categories have stopped working!
 
-If you organized your categories as  `/_posts/code/2008-12-24-closures.md`, you will need to restructure your directories to put the categories _above_ the `_posts` directories, as follows: `/code/_posts/2008-12-24-closures.md`.
+If you organized your categories as `/_posts/code/2008-12-24-closures.md`, you will need to restructure your directories to put the categories _above_ the `_posts` directories, as follows: `/code/_posts/2008-12-24-closures.md`.
 
 _Did we miss something? Please click "Improve this page" above and add a section. Thanks!_
diff --git a/site/_docs/windows.md b/site/_docs/windows.md
index 6c668ba5..72f0029e 100644
--- a/site/_docs/windows.md
+++ b/site/_docs/windows.md
@@ -55,14 +55,14 @@ This section is part of an article written by [Jens Willmer][jwillmerPost]. To f
 
 Open a command prompt and execute the following commands:
 
- * `choco install ruby -version 2.2.4` 
+ * `choco install ruby -version 2.2.4`
  * `choco install ruby2.devkit` - _needed for compilation of json gem_
- 
-#### Configure Ruby development kit 
+
+#### Configure Ruby development kit
 
 The development kit did not set the environment path for Ruby so we need to do it.
- 
- * Open command prompt in `C:\tools\DevKit2` 
+
+ * Open command prompt in `C:\tools\DevKit2`
  * Execute `ruby dk.rb init` to create a file called `config.yml`
  * Edit the `config.yml` file and include the path to Ruby `- C:/tools/ruby22`
  * Execute the following command to set the path: `ruby dk.rb install`
@@ -80,7 +80,7 @@ This gem is also needed in the github-pages and to get it running on Windows x64
 `cinst -Source "https://go.microsoft.com/fwlink/?LinkID=230477" libxslt`{:.language-ruby}
 
 `cinst -Source "https://go.microsoft.com/fwlink/?LinkID=230477" libiconv`{:.language-ruby}
- 
+
 ```language-ruby
  gem install nokogiri --^
    --with-xml2-include=C:\Chocolatey\lib\libxml2.2.7.8.7\build\native\include^
@@ -96,8 +96,8 @@ This gem is also needed in the github-pages and to get it running on Windows x64
  * Open command prompt and install [Bundler][]: `gem install bundler`
  * Create a file called `Gemfile` without any extension in your root directory of your blog
  * Copy & past the two lines into the file:
- 
- 
+
+
 ```language-ruby
 source 'http://rubygems.org'
 gem 'github-pages'
@@ -106,12 +106,12 @@ gem 'github-pages'
  * **Note:** We use an unsecure connection because SSL throws exceptions in the version of Ruby
  * Open a command prompt, target your local blog repository root, and install github-pages: `bundle install`
 
- 
+
 After this process you should have github-pages installed on your system and you can host your blog again with `jekyll s`. \\
 There will be a warning on startup that you should include `gem 'wdm', '>= 0.1.0' if Gem.win_platform?` to your `Gemfile` but I could not get `jekyll s` working if I include that line so for the moment I ignore that warning.
 
-In the future the installation process of the github-pages should be as simple as the setup of the blog. But as long as the new version of the Nokogiri ([v1.6.8][nokogiriReleases]) is not stable and referenced, it is work to get it up and running on Windows. 
- 
+In the future the installation process of the github-pages should be as simple as the setup of the blog. But as long as the new version of the Nokogiri ([v1.6.8][nokogiriReleases]) is not stable and referenced, it is work to get it up and running on Windows.
+
 [jwillmerPost]: http://jwillmer.de/blog/tutorial/how-to-install-jekyll-and-pages-gem-on-windows-10-x46 "Installation instructions by Jens Willmer"
 [Chocolatey]: https://chocolatey.org/install "Package manager for Windows"
 [Bundler]: http://bundler.io/ "Ruby Dependencie Manager"
diff --git a/site/community/index.md b/site/community/index.md
index 981a465b..3df84c37 100644
--- a/site/community/index.md
+++ b/site/community/index.md
@@ -4,7 +4,7 @@ title: Community
 permalink: /community/
 ---
 
-[JekyllConf](http://jekyllconf.com) is a free, online conference for all things Jekyll hosted by [CloudCannon](http://cloudcannon.com). Each year members of the Jekyll community speak about interesting use cases, tricks they've learned, or meta Jekyll topics. 
+[JekyllConf](http://jekyllconf.com) is a free, online conference for all things Jekyll hosted by [CloudCannon](http://cloudcannon.com). Each year members of the Jekyll community speak about interesting use cases, tricks they've learned, or meta Jekyll topics.
 
 ## Featured
 {% assign random = site.time | date: "%s%N" | modulo: site.data.jekyllconf-talks.size %}
@@ -12,13 +12,13 @@ permalink: /community/
 
 {{ featured.topic }} - [{{ featured.speaker }}](https://twitter.com/{{ featured.twitter_handle }})
 <div class="videoWrapper">
-	<iframe width="420" height="315" src="https://www.youtube.com/embed/{{ featured.youtube_id }}" frameborder="0" allowfullscreen></iframe>
+    <iframe width="420" height="315" src="https://www.youtube.com/embed/{{ featured.youtube_id }}" frameborder="0" allowfullscreen></iframe>
 </div>
 
 {% assign talks = site.data.jekyllconf-talks | group_by: 'year' %}
 {% for year in talks reversed %}
 ## {{ year.name }}
-	{% for talk in year.items %}
+    {% for talk in year.items %}
  * [{{ talk.topic }}](https://youtu.be/{{ talk.youtube_id }}) - [{{ talk.speaker }}](https://twitter.com/{{ talk.twitter_handle }})
-	{% endfor %}
+    {% endfor %}
 {% endfor %}