diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a7ad8099a..bd4f08173 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -23,14 +23,14 @@ follow the [Code of Conduct](https://github.com/xi-editor/xi-editor/blob/master/ ### Very first steps Not sure where to start? If you haven't already, take a look at the -[docs](http://xi-editor.github.io/xi-editor/docs.html) to get a better -sense of the project. Read through some issues and some open PRs, to -get a sense for the habits of existing contributors. Drop by the #xi -channel on [Zulip](https://xi.zulipchat.com) to follow -ongoing discussions or ask questions. Clone the repos you're -interested in, and make sure you can build and run the tests. If you -can't, open an issue, and someone will try to help. Once you're up and -running, there are a a number of ways to participate: +[docs](http://xi-editor.github.io/xi-editor/docs.html) to get a better sense of +the project. Read through some issues and some open PRs, to get a sense for the +habits of existing contributors. Drop by the #xi-editor stream on +[Zulip](https://xi.zulipchat.com) (anyone with a Github account can easily +signup), or the #xi channel on irc.mozilla.org, to follow ongoing discussions or +ask questions. Clone the repos you're interested in, and make sure you can build +and run the tests. If you can't, open an issue, and someone will try to help. +Once you're up and running, there are a a number of ways to participate: ### Opening issues @@ -93,7 +93,7 @@ issues that are labeled [help wanted](https://github.com/xi-editor/xi-editor/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) and/or [easy](https://github.com/xi-editor/xi-editor/issues?q=is%3Aissue+is%3Aopen+label%3Aeasy) are good places to start. If you can't find anything there, feel free to ask -on Zulip, or play around with the editor and try to identify something that +on Zulip or IRC, or play around with the editor and try to identify something that _you_ think is missing. ### Before you start work diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 1ebeaa195..47236a39d 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -7,7 +7,7 @@ The xi-editor project follows the Rust Code of Conduct, reproduced below. **Contact**: [mods@xi-editor.io](mailto:mods@xi-editor.io) * We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, nationality, or other similar characteristic. -* On Zulip, please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and welcoming environment for all. +* On chat platforms (like Zulip and IRC), please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and welcoming environment for all. * Please be kind and courteous. There's no need to be mean or rude. * Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer. * Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works. @@ -36,8 +36,6 @@ In the Rust community we strive to go the extra step to look out for each other. And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing what it was they complained about and apologize. Even if you feel you were misinterpreted or unfairly accused, chances are good there was something you could've communicated better — remember that it's your responsibility to make your fellow Rustaceans comfortable. Everyone wants to get along and we are all here first and foremost because we want to talk about cool technology. You will find that people will be eager to assume good intent and forgive as long as you earn their trust. -The enforcement policies listed above apply to all official xi-editor venues, -including the #xi-editor Zulip channel and the repositories under the xi-editor -organization. +The enforcement policies listed above apply to all official xi-editor venues, including Zulip, the #xi channel on IRC, and the repositories under the xi-editor organization. *Adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) as well as the [Contributor Covenant v1.3.0](https://www.contributor-covenant.org/version/1/3/0/).* diff --git a/README.md b/README.md index cd0149ad5..d9442a016 100644 --- a/README.md +++ b/README.md @@ -167,5 +167,6 @@ We gladly accept contributions via GitHub pull requests. Please see [CONTRIBUTING.md](.github/CONTRIBUTING.md) for more details. If you are interested in contributing but not sure where to start, there is an -active Zulip channel at #xi-editor on https://xi.zulipchat.com. There is also a -subreddit at [/r/xi_editor](https://www.reddit.com/r/xi_editor/). +active Zulip channel at #xi-editor on https://xi.zulipchat.com. There is also +a #xi channel on irc.mozilla.org. Finally, there is a subreddit at +[/r/xi_editor](https://www.reddit.com/r/xi_editor/).