diff options
| author | Mark Otto <[email protected]> | 2013-03-17 11:45:13 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-03-17 11:45:13 -0700 |
| commit | 8d5a9371be9c727fefc6299d265475df625bc762 (patch) | |
| tree | b229e430053ace6c9b003bbbfde3ef9d904f0261 | |
| parent | eb24718add4dd36fe92fdbdb79e6ff4ce5919300 (diff) | |
| parent | ba8ba1fe7298a91ee44db6afceb77d82fc711d93 (diff) | |
| download | bootstrap-8d5a9371be9c727fefc6299d265475df625bc762.tar.xz bootstrap-8d5a9371be9c727fefc6299d265475df625bc762.zip | |
update readme to resolve conflict
| -rw-r--r-- | README.md | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -65,16 +65,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`. |