From 3b461c073d0f05253baad951122d8da0fffc2739 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 28 Mar 2016 12:14:10 -0400 Subject: [PATCH] Add Code of Conduct, remove translation chart, other minor cleanups --- CONTRIBUTING.md | 5 ++--- README.md | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 910adb2d1..992e60023 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 diff --git a/README.md b/README.md index cf98d0eb6..f17471ae5 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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