Merge branch 'master' of github.com:jekyll/jekyll

* 'master' of github.com:jekyll/jekyll:
  Make our .travis.yml a little easier to maintain.
  Update History.markdown to reflect the merger of #4394
  Minor spelling error

.travis.yml

@@ -1,23 +1,23 @@
-bundler_args: --without benchmark:site:development
 before_script: bundle update
+bundler_args: --without benchmark:site:development
 script: script/cibuild
 cache: bundler
 language: ruby
 sudo: false
 
 rvm:
-- 2.0.0-p648
-- 2.1.8
-- 2.2.4
-- 2.3.0
-- jruby-9.0.4.0
-- ruby-head
+  - &ruby1 2.3.0
+  - &ruby2 2.2.4
+  - &ruby3 2.1.8
+  - &ruby4 2.0.0-p648
+  - &jruby jruby-9.0.4.0
+  - &rhead ruby-head
 
 matrix:
   fast_finish: true
   allow_failures:
-    - rvm: jruby-9.0.4.0
-    - rvm: ruby-head
+    - rvm: *jruby
+    - rvm: *rhead
 env:
   matrix:
     - TEST_SUITE=test

History.markdown

@@ -92,6 +92,7 @@
   * Add @jmcglone's guide to github-pages doc page (#4364)
   * Added the Wordpress2Jekyll Wordpress plugin (#4377)
   * Add Contentful Extension to list of third-party plugins (#4390)
+  * Correct Minor spelling error (#4394)
 
 ## 3.0.2 / 2016-01-20
 

site/_docs/plugins.md

@@ -870,7 +870,7 @@ LESS.js files during generation.
 - [File compressor](https://gist.github.com/2758691) by [mytharcher](https://github.com/mytharcher): Compress HTML and JavaScript files on site build.
 - [Jekyll-minibundle](https://github.com/tkareine/jekyll-minibundle): Asset bundling and cache busting using external minification tool of your choice. No gem dependencies.
 - [Singlepage-jekyll](https://github.com/JCB-K/singlepage-jekyll) by [JCB-K](https://github.com/JCB-K): Turns Jekyll into a dynamic one-page website.
-- [generator-jekyllrb](https://github.com/robwierzbowski/generator-jekyllrb): A generator that wraps Jekyll in [Yeoman](http://yeoman.io/), a tool collection and workflow for builing modern web apps.
+- [generator-jekyllrb](https://github.com/robwierzbowski/generator-jekyllrb): A generator that wraps Jekyll in [Yeoman](http://yeoman.io/), a tool collection and workflow for building modern web apps.
 - [grunt-jekyll](https://github.com/dannygarcia/grunt-jekyll): A straightforward [Grunt](http://gruntjs.com/) plugin for Jekyll.
 - [jekyll-postfiles](https://github.com/indirect/jekyll-postfiles): Add `_postfiles` directory and {% raw %}`{{ postfile }}`{% endraw %} tag so the files a post refers to will always be right there inside your repo.
 - [A layout that compresses HTML](http://jch.penibelst.de/): GitHub Pages compatible, configurable way to compress HTML files on site build.