Skip to content

Commit 1bfe35e

Browse files
committed
Merge pull request #209 from ryanttb/master
rc1!
2 parents e3332c8 + a4b01c3 commit 1bfe35e

12 files changed

Lines changed: 7664 additions & 3985 deletions

CONTRIBUTING.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
# jQuery Geo
1+
# Contributing to jQuery Geo
22

3-
## Contributing
3+
## Important notes
44

5-
### Important notes
6-
Please don't edit files in the `dist` subdirectory as they are generated via Grunt. You'll find source code in the `js` subdirectory.
5+
Please do not edit files in the `dist` subdirectory as they are generated via Grunt. You will find source code in the `js` subdirectory.
6+
7+
## Code style
78

8-
### Code style
99
Regarding code style like indentation and whitespace, **follow the conventions you see used in the source already.**
1010

11-
Please follow jQuery Foundation's [JavaScript Style Guide](http://contribute.jquery.org/style-guide/js/) and/or [idomatic.js](https://github.com/rwldrn/idiomatic.js/).
11+
Please follow jQuery Foundation [JavaScript Style Guide](http://contribute.jquery.org/style-guide/js/) and/or [idomatic.js](https://github.com/rwldrn/idiomatic.js/).
1212

13-
### Submitting pull requests
13+
## Submitting pull requests
1414

15-
1. Create a new branch, please don't work in your `master` branch directly.
15+
1. Create a new branch, please do not work in your `master` branch directly.
1616
1. Fix stuff.
1717
1. Run `grunt` to verify that your code is lint-free. Repeat steps 2-3 until done.
1818
1. Update the documentation to reflect any changes.
1919
1. Push to your fork and submit a pull request.
2020

21-
### Building with grunt
21+
## Building with grunt
2222

2323
* install node.js ~0.8
2424
* install grunt-cli ([info](http://gruntjs.com/getting-started#installing-the-cli)):
@@ -41,7 +41,6 @@ npm install grunt
4141
npm install grunt-contrib-clean
4242
npm install grunt-contrib-concat
4343
npm install grunt-contrib-uglify
44-
npm install grunt-contrib-qunit
4544
npm install grunt-contrib-jshint
4645
```
4746

@@ -53,4 +52,3 @@ grunt
5352

5453
Unless you have downloaded a tagged release, grunt will create a test version of jQuery Geo: dist/jquery.geo-1.0.0-test.min.js
5554

56-

LICENSE-GPL

Lines changed: 0 additions & 278 deletions
This file was deleted.

0 commit comments

Comments
 (0)