Set Jekyll encoding and tweak Windows notes

diff --git a/README.md b/README.md
index 2732bd85ca66b1e4fc5474eaf716f08f131b037a..54fdef5e9ee31de7fadb485b9ded99becc9f87e0 100644 (file)
--- 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 <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 6415d3a2e3d36b8d9eaf3ea1fc32d500e899242d..f2d7505df5d3d963f4bae2924173b30f8d198fc2 100644 (file)
--- 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