Update to Jekyll v.3.0.0.

[skip sauce]

diff --git a/.gitignore b/.gitignore
index 0aaa46c82b799f4dc00b844c842f680313be5934..bcd85b4a1b3f9df8cb36f880d6769d9e8e5c21fb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,9 @@ Thumbs.db
 .komodotools
 *.komodoproject
 
+# Jekyll metadata
+docs/.jekyll-metadata
+
 # Folders to ignore
 bower_components
 node_modules

diff --git a/.travis.yml b/.travis.yml
index 6fa443c71d1caefa9611322def6d85a0d3b49a97..9044842927a11c3b49a77a942504cad83e2604c7 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ after_script:
   - if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ] && [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi
 env:
   global:
-    - JEKYLL_VERSION="2.5.3"
+    - JEKYLL_VERSION="3.0.0"
     - ROUGE_VERSION="1.8.0"
     - SAUCE_USERNAME="bootstrap"
     - secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="

diff --git a/README.md b/README.md
index 8656c1c6527e14559a5f6ec47fe4ba0134d67574..5785e922399420465e045b5337f7f394f10ef602 100644 (file)
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ Bootstrap's documentation, included in this repo in the root directory, is built
 
 ### Running documentation locally
 
-1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.5.x).
+1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v3.0.x).
    **Note for Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems.
 2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`.
 3. From the root `/bootstrap` directory, run `jekyll serve` in the command line.