From: XhmikosR Date: Tue, 10 Jun 2014 05:14:09 +0000 (+0300) Subject: Update docs for Jekyll 2.x. X-Git-Tag: v3.2.0~100^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13771%2Fhead;p=thirdparty%2Fbootstrap.git Update docs for Jekyll 2.x. --- diff --git a/.travis.yml b/.travis.yml index 6a778cf747..a2be177a20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ after_script: - if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi env: global: - - JEKYLL_VERSION: 1.5.0 + - JEKYLL_VERSION: 2.0.3 - SAUCE_USERNAME: bootstrap - secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ=" - secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY=" diff --git a/README.md b/README.md index 9173ca5ad5..3f41637011 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,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 v1.5.x). +1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.0.x). - **Windows users:** Read [this unofficial guide](https://github.com/juthilo/run-jekyll-on-windows/) to get Jekyll up and running without problems. We use Pygments for syntax highlighting, so make sure to read the sections on installing Python and Pygments. 2. From the root `/bootstrap` directory, run `jekyll serve` in the command line. 3. Open in your browser, and voilà. diff --git a/_config.yml b/_config.yml index 085568a25a..d1003a810f 100644 --- a/_config.yml +++ b/_config.yml @@ -1,5 +1,5 @@ # Dependencies -markdown: rdiscount +markdown: kramdown highlighter: pygments # Permalinks