Skip to content

Commit

Permalink
Add Code of Conduct, remove translation chart, other minor cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
bhousel committed Mar 28, 2016
1 parent 04a754c commit 3b461c0
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
5 changes: 2 additions & 3 deletions CONTRIBUTING.md
Expand Up @@ -5,9 +5,8 @@ so that you can write code that fits in perfectly.

## Code of Conduct

We want everyone to feel comfortable contributing to iD. Please read the
[CODE_OF_CONDUCT.md](https://github.com/openstreetmap/iD/blob/master/CODE_OF_CONDUCT.md)
document and remember to be nice to one another.
We want everyone to feel comfortable contributing to iD. Please read the project
[Code of Conduct](CODE_OF_CONDUCT.md) and remember to be nice to one another.

## Reporting Issues

Expand Down
20 changes: 11 additions & 9 deletions README.md
Expand Up @@ -7,16 +7,21 @@
* iD is a JavaScript [OpenStreetMap](http://www.openstreetmap.org/) editor.
* It's intentionally simple. It lets you do the most basic tasks while
not breaking other people's data.
* It supports modern browsers. Data is rendered with [d3](http://d3js.org/).
* It supports modern browsers. Data is rendered with [d3.js](http://d3js.org/).

## Participate!

* [Try out the latest stable release](http://openstreetmap.us/iD/release)
* [Read up on Contributing and the code style of iD](CONTRIBUTING.md)
* See [open issues in the issue tracker](https://github.com/openstreetmap/iD/issues?state=open) if you're looking for something to do
* Read the project [Code of Conduct](CODE_OF_CONDUCT.md) and remember to be nice to one another.
* Read up on [Contributing and the code style of iD](CONTRIBUTING.md).
* See [open issues in the issue tracker](https://github.com/openstreetmap/iD/issues?state=open) if you're looking for something to do.
* [Translate!](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating)
* Test a prerelease version of iD:
* Stable mirror of `release` branch: http://openstreetmap.us/iD/release
* Development mirror of `master` branch: http://openstreetmap.us/iD/master

[![translation chart](https://www.transifex.com/projects/p/id-editor/chart/image_png)](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating)
Come on in, the water's lovely. More help? Ping `jfire` or `bhousel` on
[OpenStreetMap IRC](http://wiki.openstreetmap.org/wiki/IRC)
(`irc.oftc.net`, in `#iD` or `#osm-dev` or `#osm`) or on the [OpenStreetMap `dev` mailing list](http://wiki.openstreetmap.org/wiki/Mailing_lists).

## Prerequisites

Expand All @@ -35,16 +40,13 @@ To run the current development version of iD on your own computer:
4. Start a local web server, e.g. `python -m SimpleHTTPServer`
5. Open `http://localhost:8000/` in a web browser

Come on in, the water's lovely. More help? Ping tmcw, jfire, or bhousel on IRC
(`irc.oftc.net`, in `#iD` or `#osm-dev` or `#osm`) or on the OSM mailing lists.

For guidance on building a packaged version, running tests, and contributing to
development, see [CONTRIBUTING.md](CONTRIBUTING.md).

## License

iD is available under the [ISC License](https://opensource.org/licenses/ISC).
It includes [d3js](http://d3js.org/), which BSD-licensed.
It includes [d3.js](http://d3js.org/), which BSD-licensed.

## Thank you

Expand Down

0 comments on commit 3b461c0

Please sign in to comment.