Skip to content

Commit

Permalink
Merge pull request #514 from twbs/jekyll-1.5.0
Browse files Browse the repository at this point in the history
Update to Jekyll ~>1.5.0.
  • Loading branch information
XhmikosR committed Mar 25, 2014
2 parents d3feb69 + 2608f9f commit 95356f4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ before_install:
install:
- travis_retry npm install -g grunt-cli
- travis_retry npm install
- travis_retry gem install --no-document "jekyll:1.4.2" "sass:~>3.3.0"
- travis_retry gem install --no-document "jekyll:~>1.5.0" "sass:~>3.3.0"
matrix:
fast_finish: true
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ Ratchet's documentation is built with [Jekyll](http://jekyllrb.com) and publicly
1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation).
- **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 `/ratchet/docs` directory, run `jekyll serve` in the command line.
- **Windows users:** While we use Jekyll's `encoding` setting, you might still need to change the command prompt's character encoding ([code page](http://en.wikipedia.org/wiki/Windows_code_page)) to UTF-8 so Jekyll runs without errors. For Ruby 2.x, run `chcp 65001` first. For Ruby 1.9.3, you can alternatively do `SET LANG=en_EN.UTF-8`.
3. Open <http://localhost:4000> in your browser, and boom!

Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com/docs/home/).
Expand Down

0 comments on commit 95356f4

Please sign in to comment.