diff options
| author | Chris Rebert <[email protected]> | 2014-01-15 13:43:12 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-01-15 13:43:12 -0800 |
| commit | 208df78971a6d0b5b8fd6e44c071cced03e9b169 (patch) | |
| tree | 6ce5879a36fd5d332ca47cb15bd33bd496b3dc5a | |
| parent | 14975e4ee949a64413bde6d934d2198450c4478c (diff) | |
| parent | 00239f6034edce116634c9b11565704a19ab157b (diff) | |
| download | bootstrap-208df78971a6d0b5b8fd6e44c071cced03e9b169.tar.xz bootstrap-208df78971a6d0b5b8fd6e44c071cced03e9b169.zip | |
Merge pull request #12241 from twbs/jekyll-encoding
Set Jekyll encoding and tweak Windows notes
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | _config.yml | 1 |
2 files changed, 3 insertions, 2 deletions
@@ -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 <http://localhost:9001> 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 14d1f6455..8e0a0b31c 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 |
