aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-03-17 11:45:21 -0700
committerMark Otto <[email protected]>2013-03-17 11:45:21 -0700
commit160ff23c852608f58c5142b7d156c26fac88ed13 (patch)
tree1ccb27d3aa246891b8f42c5b034a10a8aa3b5be8
parent4aba489cfdc113682d2f1b18421eb58a229d66da (diff)
parent8d5a9371be9c727fefc6299d265475df625bc762 (diff)
downloadbootstrap-160ff23c852608f58c5142b7d156c26fac88ed13.tar.xz
bootstrap-160ff23c852608f58c5142b7d156c26fac88ed13.zip
Merge branch 'jfroom-2.3.1-jfroom-wip' into 3.0.0-wip
-rw-r--r--README.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/README.md b/README.md
index 1b3e3bd66..321e0e460 100644
--- a/README.md
+++ b/README.md
@@ -55,16 +55,16 @@ $ npm install
When completed, you'll be able to run the various make commands provided:
-#### build - `make`
-Runs the recess compiler to rebuild the `/less` files and compiles the docs. Requires recess and uglify-js.
+#### build - `make` or `make bootstrap`
+`make` runs the Recess compiler to rebuild the `/less` files and compile the docs. `make bootstrap` creates the `/bootstrap` directory with compiled files. **Requires recess and uglify-js.**
#### test - `make test`
-Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.
+Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). **Requires phantomjs.**
#### watch - `make watch`
-This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem.
+This is a convenience method for watching just Less files and automatically building them whenever you save. **Requires the Watchr gem.**
-Should you encounter problems with installing dependencies or running the makefile commands, be sure to first uninstall any previous versions (global and local) you may have installed, and then rerun `npm install`.
+Should you encounter problems with installing dependencies or running the makefile commands, uninstall any previous versions (global and local) you may have installed, and then rerun `npm install`.