Docs: Commit will be squashed

Author: lukeapage

CONTRIBUTING.md

@@ -20,61 +20,74 @@ Every week (unless otherwise noted) the jQuery UI team has a meeting to discuss
 
 ### Environment: minimum required
 
-The tests can run in any local web server. Ideally you should test your patch in appropriate web browsers and if possible run `grunt` to lint the code and run automated tests (this will happen automatically when you create a pull request).
+If you are contributing you will need a fork of jquery (see Getting the source). If you just want the source code you could clone jquery ui directly:
 
-### Environment: Recommended setup
-
-jQuery UI uses Node.js & Grunt to automate the building and validation of source code.
-
-The tests require a local web server and the samples contain some PHP, so a PHP web server may be useful.
-
-* Get [Node.js](http://nodejs.org/) (includes NPM, necessary for the next step)
-* Install Grunt cli (install with: `npm install -g grunt`)
-* Install local modules (`npm install` in the root directory)
-* Install a web server (PHP support optional - such as [XAMPP](http://www.apachefriends.org/en/xampp.html) or [MAMP](http://www.mamp.info/en/index.html) or for node you can use [http-server](https://www.npmjs.com/package/http-server))
+```bash
+$ git clone git://github.com/jquery/jquery-ui.git
+$ cd jquery-ui
+```
 
-### Build a Local Copy of jQuery UI
+The tests can run in any local web server. Ideally you should test your patch in appropriate web browsers and if possible run `grunt` to lint the code and run automated tests (this will happen automatically when you create a pull request). See below for setting up Node.js so that the grunt command works.
 
-Create a fork of the jQuery UI repo on GitHub at http://github.com/jquery/jquery-ui.
+### Environment: Getting the source
 
-Change directory to your web root directory, whatever that might be:
+* Create a fork of the jQuery UI repo on GitHub at http://github.com/jquery/jquery-ui. This will create a fork of jquery-ui at your username.
+* You may want to clone jquery-ui under the path to your web server. If so, change to the required directory
 
 ```bash
 $ cd /path/to/your/www/root/
 ```
 
-Clone your jQuery UI fork to work locally.
-
-*Note: be sure to replace `[USERNAME]` with your GitHub username.*
+* Clone your jQuery UI git repo.
 
 ```bash
-$ git clone git@github.com:[USERNAME]/jquery-ui.git
+$ git clone git://github.com/[USERNAME]/jquery-ui.git
+$ cd jquery-ui
 ```
 
-Change to the newly created directory.
+*Note: be sure to replace `[USERNAME]` with your GitHub username.*
+
+* Add the official jQuery repository as a remote. We recommend naming it "upstream".
 
 ```bash
-$ cd jquery-ui
+$ git remote add upstream git://github.com/jquery/jquery-ui.git
 ```
 
-Add the official jQuery repository as a remote. We recommend naming it "upstream".
+* Get in the habit of pulling in the "upstream" master to stay up to date as jQuery UI receives new commits.
 
 ```bash
-$ git remote add upstream git://github.com/jquery/jquery-ui.git
+$ git pull upstream master
 ```
 
-Get in the habit of pulling in the "upstream" master to stay up to date as jQuery UI receives new commits.
+### Environment: Recommended setup
+
+jQuery UI uses Node.js & Grunt to automate the building and validation of source code. Here is how to set that up:
+
+* Get [Node.js](http://nodejs.org/) (includes NPM, necessary for the next step)
+* Install Grunt cli:
 
 ```bash
-$ git pull upstream master
+$ npm install -g grunt-cli
 ```
 
-Install the dependencies.
+* Install local Node.js modules
 
 ```bash
-npm install
+$ npm install
 ```
 
+The tests require a local web server and the samples contain some PHP, so a PHP web server may be useful.
+
+* Install a web server. Here are some you could use:
+
+- Windows: [WAMP download](http://www.wampserver.com/en/)
+- Mac: [MAMP download](http://www.mamp.info/en/index.html)
+- Linux: [Setting up LAMP](https://www.linux.com/learn/tutorials/288158-easy-lamp-server-installation)
+- [Mongoose (most platforms)](http://code.google.com/p/mongoose/)
+- [http-server](https://www.npmjs.com/package/http-server)
+
+### Running the tests
+
 To lint the JavaScript, HTML, and CSS, as well as run a smoke test in PhantomJS, run grunt:
 
 ```bash
@@ -85,4 +98,6 @@ To run the tests for a specific plugin in your browser, open the appropriate fil
 
 Ideally you would test in all of our [supported browsers](http://jqueryui.com/browser-support/), but if you don't have all of these browsers available, that's ok.
 
+### Before making a pull request
+
 Make sure to read our [commits and pull requests documentation](http://dev.contribute.jquery.org/commits-and-pull-requests/) for full details on working with branches and forks, as well as our commit guidelines.

README.md

@@ -25,33 +25,17 @@ For more detailed information, see the [contributing page](CONTRIBUTING.md).
 
 ## Running the Unit Tests
 
-Run the unit tests manually with appropriate browsers and any local web server. Here are a selection you could use.
-- Windows: [WAMP download](http://www.wampserver.com/en/)
-- Mac: [MAMP download](http://www.mamp.info/en/index.html)
-- Linux: [Setting up LAMP](https://www.linux.com/learn/tutorials/288158-easy-lamp-server-installation)
-- [Mongoose (most platforms)](http://code.google.com/p/mongoose/)
-- [http-server](https://www.npmjs.com/package/http-server)
+Run the unit tests manually with appropriate browsers and any local web server. See our environment setup and information on running tests.
 
-You can also run the unit tests inside phantomjs by [installing node](http://nodejs.org/) and the required modules(`npm install`) and then running `grunt test`.
+You can also run the unit tests inside phantomjs by [setting up your environment](CONTRIBUTING.md#user-content-environment-recommended-setup).
 
 ## Building jQuery UI
 
 jQuery UI uses the [Grunt](http://github.com/gruntjs/grunt) build system.
 
-To build jQuery UI, you must have [node.js](http://nodejs.org/) installed and then run the following commands:
+To build jQuery UI, [setup your environment]([setting up your environment](CONTRIBUTING.md#user-content-environment-recommended-setup)) and then run the following commands:
 
 ```sh
-
-# Install the Grunt CLI
-npm install -g grunt-cli
-
-# Clone the jQuery UI git repo
-git clone git://github.com/jquery/jquery-ui.git
-cd jquery-ui
-
-# Install the node module dependencies
-npm install
-
 # Run the concat task to concatenate files
 grunt concat