Merge branch '3.0.0-wip' of https://github.com/jojohess/bootstrap into jojohess-3.0.0-wip

README.md

@@ -31,7 +31,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.x).
-2. From the `/bootstrap` directory, run `jekyll serve` in the command line.
+2. From the `/bootstrap` directory, run `jekyll serve` in the command line. (on Windows, run `chcp 65001` before `jekyll serve`)
 3. Open [http://localhost:9001](http://localhost:9001) in your browser, and voilà.
 
 Learn more about using Jekyll by reading their [documentation](http://jekyllrb.com/docs/home/).
@@ -64,8 +64,8 @@ When completed, you'll be able to run the various grunt commands provided.
 #### Build - `grunt`
 `grunt` runs the Recess compiler to rebuild the `/less` files and compile the docs. **Requires recess and uglify-js.**
 
-#### Compile CSS, and JavaScript - `grunt bootstrap`
-`grunt bootstrap` creates the `/bootstrap` directory with compiled files. **Requires recess and uglify-js.**
+#### Compile CSS, and JavaScript - `grunt dist`
+`grunt dist` creates the `/dist` directory with compiled files. **Requires recess and uglify-js.**
 
 #### Tests - `grunt test`
 Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). **Requires phantomjs.**