From: Mark Otto <otto@github.com>
Date: Sun, 17 Mar 2013 18:45:13 +0000 (-0700)
Subject: update readme to resolve conflict
X-Git-Tag: v3.0.0-rc1~570^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d5a9371be9c727fefc6299d265475df625bc762;p=thirdparty%2Fbootstrap.git

update readme to resolve conflict
---

8d5a9371be9c727fefc6299d265475df625bc762
diff --cc README.md
index 45b151e15f,654c8f17c9..1a3dc8c954
--- a/README.md
+++ b/README.md
@@@ -55,26 -55,27 +55,26 @@@ Keep track of development and communit
  
  
  
 -## Developers
 +## Compiling CSS and JavaScript
  
 -We have included a makefile with convenience methods for working with the Bootstrap library.
 -
 -+ **dependencies**
 -Our makefile depends on you having recess, connect, uglify.js, and jshint installed. To install, just run the following command in npm:
 +Bootstrap includes a [makefile](Makefile) with convenient methods for working with the framework. Before getting started, be sure to install [the necessary local dependencies](package.json):
  
  ```
 -$ npm install recess connect uglify-js jshint -g
 +$ npm install
  ```
  
 -+ **build**
 -  + `make` - Runs the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. 
 -  + `make bootstrap` - Creates  `/bootstrap` folder with deployment only files in it.
 -  + <a href="http://twitter.github.com/bootstrap/extend.html#compiling">Read more in our docs &raquo;</a>  
 +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.**
  
 -+ **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.
 +#### 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`.
 -+ **watch** - `make watch`
 -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, uninstall any previous versions (global and local) you may have installed, and then rerun `npm install`.