Merge pull request #587 from Mkaysi/readme-contributing

Update CONTRIBUTING.md and README.md.
This commit is contained in:
Valentin Lorentz 2014-04-10 19:11:48 +02:00
commit 6e3a6907db
2 changed files with 15 additions and 9 deletions

View File

@ -1,11 +1,15 @@
# Contributing to Limnoria
When you send pull request, please send it to the testing branch. It's merged to master when it's considered to be enough stable to be supported.
When you send pull request, please send it to the testing branch.
It will be merged to master when it's considered to be enough stable to be
supported.
Don't fear that you spam Limnoria by sending many pull requests. According to @ProgVal, it's easier for him to accept pull requests than to cherry-pick everything manually.
Don't fear that you spam Limnoria by sending many pull requests. According
to @ProgVal, it's easier for them to accept pull requests than to
cherry-pick everything manually.
See also [Contributing to Limnoria] at [Limnoria documentation].
[Contributing to Limnoria]:http://supybot.fr.cr/doc/contribute/index.html#contributing-to-limnoria
[Contributing to Limnoria]:http://supybot.aperio.fr/doc/contribute/index.html#contributing-to-limnoria
[Limnoria documentation]:http://supybot.fr.cr/doc/index.html
[Limnoria documentation]:http://supybot.aperio.fr/doc/index.html

View File

@ -33,10 +33,12 @@ time to write it, you should take the time to read it.
[supybot.aperio.fr]:http://supybot.aperio.fr/doc
[Gribble wiki]:https://sourceforge.net/apps/mediawiki/gribble/index.php?title=Main_Page
## English-speaking support channels
## IRC channels
If you have any trouble, feel free to swing by [#supybot and #limnoria](irc://irc.freenode.net/#supybot,#limnoria) on
[irc.freenode.net](irc://irc.freenode.net) or [#supybot](irc://irc.oftc.net/#supybot) at [irc.oftc.net](irc://irc.oftc.net) (we have a Limnoria there relaying,
### In English
If you have any trouble, feel free to swing by [#supybot and #limnoria](irc://chat.freenode.net/#supybot,#limnoria) on
[irc.freenode.net](irc://chat.freenode.net) or [#supybot](irc://irc.oftc.net/#supybot) at [irc.oftc.net](irc://irc.oftc.net) (we have a Limnoria there relaying,
so either network works) and ask questions. We'll be happy to help
wherever we can. And by all means, if you find anything hard to
understand or think you know of a better way to do something,
@ -45,7 +47,7 @@ understand or think you know of a better way to do something,
[issue tracker]:https://github.com/ProgVal/Limnoria/issues
## Support channels in other languages
### In Other languages
Only French yet, at [#supybot-fr on freenode](irc://irc.freenode.net/#supybot-fr).
Only in French at the moment, located at [#supybot-fr on freenode](irc://chat.freenode.net/#supybot-fr).