Merge branch 'master' into themes-asset-folder

* master:
  Update history to reflect merge of #5381 [ci skip]
  Update history to reflect merge of #5383 [ci skip]
  run features on windows
  Appease Rubocop
  Update history to reflect merge of #5372 [ci skip]
  Add missing period to sentence in first paragraph.

History.markdown

@@ -47,6 +47,7 @@
   * Explain how to copy a theme's files (#5335)
   * [docs] .md as default extension in examples (#5316)
   * Fix small typo in docs (#5347)
+  * Add missing period to sentence in first paragraph. (#5372)
 
 ### Development Fixes
 
@@ -60,6 +61,8 @@
   * Execute jekyll from clone instead of defined binary when running 'script/default-site' (#5295)
   * rubocop: lib/jekyll/document.rb complexity fixes (#5045)
   * Proxy a number of Convertible methods to Renderer (#5308)
+  * Run executable for Cucumber via Ruby instead of Shell (#5383)
+  * Appease Rubocop (#5381)
 
 ## 3.2.1 / 2016-08-02
 

exe/jekyll

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 STDOUT.sync = true
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w(.. lib)))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
 require "jekyll"
 require "mercenary"

features/support/helpers.rb

@@ -90,7 +90,7 @@ end
 
 def run_jekyll(args)
   args = args.strip.split(" ") # Shellwords?
-  process = run_in_shell(Paths.jekyll_bin.to_s, *args, "--trace")
+  process = run_in_shell("ruby", Paths.jekyll_bin.to_s, *args, "--trace")
   process.exitstatus.zero?
 end
 

lib/jekyll/hooks.rb

@@ -54,7 +54,7 @@ module Jekyll
 
     # Ensure the priority is a Fixnum
     def self.priority_value(priority)
-      return priority if priority.is_a?(Fixnum)
+      return priority if priority.is_a?(Integer)
       PRIORITY_MAP[priority] || DEFAULT_PRIORITY
     end
 

site/_docs/installation.md

@@ -7,7 +7,7 @@ permalink: /docs/installation/
 Getting Jekyll installed and ready-to-go should only take a few minutes.
 If it ever becomes a pain, please [file an issue]({{ site.repository }}/issues/new)
 (or submit a pull request) describing the issue you
-encountered and how we might make the process easier
+encountered and how we might make the process easier.
 
 ### Requirements
 

test/test_related_posts.rb

@@ -13,8 +13,8 @@ class TestRelatedPosts < JekyllUnitTest
       last_post     = @site.posts.last
       related_posts = Jekyll::RelatedPosts.new(last_post).build
 
-      last_10_recent_posts = (@site.posts.docs.reverse - [last_post]).first(10)
+      last_ten_recent_posts = (@site.posts.docs.reverse - [last_post]).first(10)
-      assert_equal last_10_recent_posts, related_posts
+      assert_equal last_ten_recent_posts, related_posts
     end
   end