From fe095d17a28b78279498bb6439b6b7f3cac06b72 Mon Sep 17 00:00:00 2001 From: Jordan Hess Date: Fri, 26 Jul 2013 03:16:27 -0600 Subject: [PATCH 1/2] Changed old reference to "grunt bootstrap" to "grunt dist" --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ab4c2b2da8..2a885599b8 100644 --- a/README.md +++ b/README.md @@ -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.** From cd23ae00ddfb7246ba56000a2ec6f83f9c82554f Mon Sep 17 00:00:00 2001 From: Jordan Hess Date: Fri, 26 Jul 2013 03:25:12 -0600 Subject: [PATCH 2/2] Added windows hint to jekyll documentation instructions. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a885599b8..30bc60a63a 100644 --- a/README.md +++ b/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/).