diff options
| author | Mark Otto <[email protected]> | 2014-06-09 23:14:00 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-06-09 23:14:00 -0700 |
| commit | 1666d55953820a25c0e8e33c28460e095a7cb044 (patch) | |
| tree | 240880627f069caf5e79b9cf5c6e22245786b086 | |
| parent | 9e1652aa50a9d315d333362b68de88e931dc872b (diff) | |
| parent | ff9ab6ce21571094ae6aee219c7694f7ae2f04d5 (diff) | |
| download | bootstrap-1666d55953820a25c0e8e33c28460e095a7cb044.tar.xz bootstrap-1666d55953820a25c0e8e33c28460e095a7cb044.zip | |
Merge pull request #13771 from twbs/jekyll-2.x
Update docs for Jekyll 2.x.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | README.md | 2 |
2 files changed, 2 insertions, 2 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=" @@ -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à. |