aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2014-06-10 08:14:09 +0300
committerXhmikosR <[email protected]>2014-06-10 08:14:09 +0300
commitff9ab6ce21571094ae6aee219c7694f7ae2f04d5 (patch)
tree219b4a09d8d55485f909865c01a52a7891fa2e75
parent6a2482447dbc33519a966753e47607be9f199182 (diff)
downloadbootstrap-ff9ab6ce21571094ae6aee219c7694f7ae2f04d5.tar.xz
bootstrap-ff9ab6ce21571094ae6aee219c7694f7ae2f04d5.zip
Update docs for Jekyll 2.x.
-rw-r--r--.travis.yml2
-rw-r--r--README.md2
-rw-r--r--_config.yml2
3 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 6a778cf74..a2be177a2 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 9173ca5ad..3f4163701 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 <http://localhost:9001> in your browser, and voilĂ .
diff --git a/_config.yml b/_config.yml
index 085568a25..d1003a810 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,5 +1,5 @@
# Dependencies
-markdown: rdiscount
+markdown: kramdown
highlighter: pygments
# Permalinks