Merge commit 'd3f7825977550225fd8fab05e727ea46864fb05a'

* commit 'd3f7825977550225fd8fab05e727ea46864fb05a':
  Add version 1.5.0 changelog notes
  Remove multiple language example from readme, users should just check wiki for instructions
  Typo Fix (#693)
  Update to middleman 4.2.1 for ruby 2.4 fix
  Allow Ruby 2.4.0 to fail for now
  Switch theme from Monokai to the less neon MonokaiSublime
  Update code highlighting theme from Base16::Monokai to just Monokai
  Update middleman and middleman-sprokets, run bundle update
  Add Ruby 2.4.0 to .travis.yml
  Updated Mozilla localForage link (#665)
  Update redcarpet gem to 3.4.0 which will solve the unicode error with (#660)
  Latest middleman - fixing startup arguments (#653)
  Add multiple-tabs-per-language test
  Add Ruby 2.3.3 to tested rubies
  Adding Scale to the list of companies. (#694)

# Conflicts:
#	Gemfile.lock

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## Version 1.5.0
+
+*February 23, 2017*
+
+- Add [multiple tabs per programming language](https://github.com/lord/slate/wiki/Multiple-language-tabs-per-programming-language) feature
+- Upgrade Middleman to add Ruby 1.4.0 compatibility
+- Switch default code highlighting color scheme to better highlight JSON
+- Various small typo and bug fixes
+
 ## Version 1.4.0
 
 *November 24, 2016*

Gemfile.lock

@@ -8,7 +8,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
-    autoprefixer-rails (6.7.2)
+    autoprefixer-rails (6.6.1)
       execjs
     backports (3.6.8)
     coffee-script (2.4.1)

README.md

@@ -79,6 +79,7 @@ Companies Using Slate
 * [Coinbase](https://developers.coinbase.com/api)
 * [Parrot Drones](http://developer.parrot.com/docs/bebop/)
 * [Fidor Bank](http://docs.fidor.de/)
+* [Scale](https://docs.scaleapi.com/)
 
 You can view more in [the list on the wiki](https://github.com/lord/slate/wiki/Slate-in-the-Wild).
 

source/includes/_errors.md

@@ -21,4 +21,4 @@ Error Code | Meaning
 403 | Forbidden -- The requested is forbidden
 404 | Not Found -- The specified item could not be foun
 500 | Internal Server Error -- We had a problem with our server. Try again later.
-503 | Service Unavailable -- We're temporarially offline for maintanance. Please try again later.
+503 | Service Unavailable -- We're temporarily offline for maintenance. Please try again later.

source/layouts/layout.erb

@@ -23,7 +23,7 @@ under the License.
     <title><%= current_page.data.title || "API Documentation" %></title>
 
     <style>
-      <%= Rouge::Themes::Base16::Monokai.render(:scope => '.highlight') %>
+      <%= Rouge::Themes::MonokaiSublime.render(:scope => '.highlight') %>
     </style>
     <%= stylesheet_link_tag :screen, media: :screen %>
     <%= stylesheet_link_tag :print, media: :print %>