Merge pull request scala#2319 from SethTisue/jekyll-updates

Author: SethTisue

Gemfile

@@ -13,3 +13,5 @@ gem 'kramdown-parser-gfm'
 # browser during development. To use, uncomment
 # and do:
 # bundle exec jekyll liveserve --incremental
+
+gem "webrick", "~> 1.7"

Gemfile.lock

@@ -79,6 +79,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
+    webrick (1.7.0)
     yell (2.2.2)
 
 PLATFORMS
@@ -89,6 +90,7 @@ DEPENDENCIES
   jekyll-redirect-from
   jekyll-scalafiddle
   kramdown-parser-gfm
+  webrick (~> 1.7)
 
 BUNDLED WITH
-   1.17.2
+   2.3.6

README.md

@@ -8,8 +8,7 @@ This repository contains the source for the Scala documentation website, as well
 
 To build and view the site locally:
 
-    gem install bundler
-    bundle install
+    gem install --user-install bundler jekyll
     bundle exec jekyll serve -I
 
 ([Trouble on MacOS?](https://github.com/scala/docs.scala-lang/issues/1150))
@@ -18,11 +17,13 @@ For more details, read on.
 
 ## Quickstart with Docker ##
 
-To build and view site with docker:
+To build and view site with Docker:
 
     docker-compose up
 
-It will incrementally build and serve site at `http://localhost:4000`
+It will incrementally build and serve site at `http://localhost:4000`.
+
+For more details on the Docker option, see [this issue](https://github.com/scala/docs.scala-lang/issues/1286).
 
 ## Contributing ##