From: Julian Thilo Date: Wed, 15 Jan 2014 21:18:35 +0000 (+0100) Subject: Set Jekyll encoding and tweak Windows notes X-Git-Tag: v3.1.0~100^2~2^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F12241%2Fhead;p=thirdparty%2Fbootstrap.git Set Jekyll encoding and tweak Windows notes --- diff --git a/README.md b/README.md index 2732bd85ca..54fdef5e9e 100644 --- a/README.md +++ b/README.md @@ -64,9 +64,9 @@ 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.x). - - **Windows users:** read [this unofficial guide](https://github.com/juthilo/run-jekyll-on-windows/) to get Jekyll up and running without problems. + - **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. - - **Windows users:** For Ruby 2.0.0 run `chcp 65001` first 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 1.9.3 you can alternatively do `SET LANG=en_EN.UTF-8`. In addition, ensure you have Python installed and added in your `PATH` or the build will fail due to our Pygments dependency. + - **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.0.0 run `chcp 65001` first. For Ruby 1.9.3 you can alternatively do `SET LANG=en_EN.UTF-8`. 3. Open in your browser, and voilà. Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com/docs/home/). diff --git a/_config.yml b/_config.yml index 6415d3a2e3..f2d7505df5 100644 --- a/_config.yml +++ b/_config.yml @@ -12,6 +12,7 @@ host: 0.0.0.0 port: 9001 baseurl: / url: http://localhost:9001 +encoding: UTF-8 # Custom vars current_version: 3.0.3