From ae36bc2731f7f2b71df43810f205ad657aa9352e Mon Sep 17 00:00:00 2001
From: WasabiFan <wasabifan@outlook.com>
Date: Wed, 20 Aug 2014 21:34:19 -0700
Subject: [PATCH 1/2] Add instructions for Jekyll on Windows, and update
 gemfile to play nicer with Windows

---
 Gemfile   |  3 +++
 README.md | 23 ++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 053c27dc3..9c0465324 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,2 +1,5 @@
 source 'https://rubygems.org'
 gem 'github-pages'
+
+require 'rbconfig'
+gem 'wdm', '~> 0.1.0' if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
diff --git a/README.md b/README.md
index f6a6fbae4..22296516e 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,8 @@ Feel free to fork and make a pull request.
 
 You can view your changes locally by installing [jekyll](https://help.github.com/articles/using-jekyll-with-pages).
 
-In ubuntu 14.04:
+Installing Jekyll in Ubuntu 14.04
+---
 
     sudo apt-get install git ruby1.9.1 ruby1.9.1-dev nodejs
     sudo gem install bundle
@@ -18,6 +19,26 @@ In ubuntu 14.04:
     www-browser http://localhost:4000 &
     # work, work, work
 
+Installing Jekyll in  Windows
+---
+
+- Follow the instructions in step 1 [here](http://jekyll-windows.juthilo.com/1-ruby-and-devkit/) (Installing Ruby and the Ruby DevKit).
+
+Then run:
+
+    gem install jekyll
+    gem install wdm
+    gem install bundle
+    git clone https://github.com/<user>/ev3dev.github.io
+    cd ev3dev.github.io
+    bundle install
+    bundle exec jekyll serve --watch
+
+Now you should be able to visit your page at: [http://localhost:4000](http://localhost:4000). It should auto-update when you change the source files, so all you have to do is refresh your browser.
+
+Previewing Your Changes Online
+---
+
 Alternately, when forking, you can create a new branch called `gh-pages`, then your
 changes can be viewed as `http://<user>.github.io/ev3dev.github.io`. When you do this
 though, GitHub will send you lots of email like this, which you should ignore.

From 051ff9834ef40f4a765cbcf5e84d3fa1c4b56d84 Mon Sep 17 00:00:00 2001
From: WasabiFan <wasabifan@outlook.com>
Date: Thu, 21 Aug 2014 12:52:54 -0700
Subject: [PATCH 2/2] Removed some redundancy in the Windows Jekyll
 instructions

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 22296516e..1e4e8e0b6 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,6 @@ Installing Jekyll in  Windows
 
 Then run:
 
-    gem install jekyll
-    gem install wdm
     gem install bundle
     git clone https://github.com/<user>/ev3dev.github.io
     cd ev3dev.github.io
@@ -39,7 +37,7 @@ Now you should be able to visit your page at: [http://localhost:4000](http://loc
 Previewing Your Changes Online
 ---
 
-Alternately, when forking, you can create a new branch called `gh-pages`, then your
+When forking, you can create a new branch called `gh-pages`, then your
 changes can be viewed as `http://<user>.github.io/ev3dev.github.io`. When you do this
 though, GitHub will send you lots of email like this, which you should ignore.