From d3b8966db415a73de7eb370c345cfe38cf3c482d Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel.kempkens@gmail.com>
Date: Sat, 10 May 2014 17:57:51 +0200
Subject: [PATCH] Update to jekyll 2.0

---
 Gemfile      |  6 +++---
 Gemfile.lock | 61 ++++++++++++++++++++++++++++++++--------------------
 _config.yml  |  2 +-
 3 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1396022..13edc40 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
-ruby '2.1.1'
+ruby '2.1.2'
 
-gem 'jekyll', '~> 1.4.3'
-gem 'jekyll-assets', '~> 0.7.7'
+gem 'jekyll', '~> 2.0.3'
+gem 'jekyll-assets', '~> 0.7.8'
 
 gem 'kramdown', '~> 1.3.3'
 gem 'therubyracer', '~> 0.12.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index ded00d5..053e016 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,43 +2,58 @@ GEM
   remote: https://rubygems.org/
   specs:
     blankslate (2.1.2.4)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
     classifier (1.3.4)
       fast-stemmer (>= 1.0.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.7.0)
     colorator (0.1)
-    commander (4.1.6)
-      highline (~> 1.6.11)
     commonjs (0.2.7)
     execjs (2.0.2)
     fast-stemmer (1.0.2)
     ffi (1.9.3)
-    highline (1.6.21)
     hike (1.2.3)
-    jekyll (1.4.3)
+    jekyll (2.0.3)
       classifier (~> 1.3)
       colorator (~> 0.1)
-      commander (~> 4.1.3)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      kramdown (~> 1.3)
       liquid (~> 2.5.5)
-      listen (~> 1.3)
-      maruku (~> 0.7.0)
+      listen (~> 2.5)
+      mercenary (~> 0.3.3)
       pygments.rb (~> 0.5.0)
-      redcarpet (~> 2.3.0)
-      safe_yaml (~> 0.9.7)
+      redcarpet (~> 3.1)
+      safe_yaml (~> 1.0)
       toml (~> 0.1.0)
-    jekyll-assets (0.7.7)
-      jekyll (~> 1.0)
+    jekyll-assets (0.7.8)
+      jekyll (>= 1.0.0, < 3.0.0)
+      sass
       sprockets (~> 2.10)
+    jekyll-coffeescript (1.0.0)
+      coffee-script (~> 2.2)
+    jekyll-sass-converter (1.0.0)
+      sass (~> 3.2)
     json (1.8.1)
     kramdown (1.3.3)
     less (2.5.0)
       commonjs (~> 0.2.7)
     libv8 (3.16.14.3)
     liquid (2.5.5)
-    listen (1.3.1)
+    listen (2.7.4)
+      celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    maruku (0.7.1)
-    multi_json (1.9.2)
+    mercenary (0.3.3)
+    multi_json (1.10.0)
+    nio4r (1.0.0)
     parslet (1.5.0)
       blankslate (~> 2.0)
     posix-spawn (0.3.8)
@@ -47,14 +62,13 @@ GEM
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.4)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.2)
-      ffi (>= 0.5.0)
-    redcarpet (2.3.0)
+    redcarpet (3.1.1)
     ref (1.0.5)
-    safe_yaml (0.9.7)
-    sprockets (2.12.0)
+    safe_yaml (1.0.3)
+    sass (3.3.7)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -63,6 +77,7 @@ GEM
       libv8 (~> 3.16.14.0)
       ref
     tilt (1.4.1)
+    timers (1.1.0)
     toml (0.1.1)
       parslet (~> 1.5.0)
     uglifier (2.5.0)
@@ -75,8 +90,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (~> 1.4.3)
-  jekyll-assets (~> 0.7.7)
+  jekyll (~> 2.0.3)
+  jekyll-assets (~> 0.7.8)
   kramdown (~> 1.3.3)
   less (~> 2.5.0)
   therubyracer (~> 0.12.1)
diff --git a/_config.yml b/_config.yml
index 0655da2..f42efa6 100644
--- a/_config.yml
+++ b/_config.yml
@@ -43,7 +43,7 @@ links:
 # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 timezone:    Europe/Berlin
 future:      true
-pygments:    true
+highlighter: pygments
 markdown:    kramdown
 
 # https://github.com/mojombo/jekyll/wiki/Permalinks