From 4eb0bcf0ab4f0aceaa8957362d05a4e0fe17c2eb Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Thu, 10 Apr 2014 17:06:02 +0300 Subject: [PATCH 1/2] CONTRIBUTING.md: use proper language && fix links. The links went to supybot.fr.cr where the website moved away long time ago. --- CONTRIBUTING.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b3454d8d3..9a8ae21df 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 From 431e76c0ad90589da51cad1357bab1c86054e810 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Thu, 10 Apr 2014 17:09:41 +0300 Subject: [PATCH 2/2] README.md: Sanify topis & fix IRC links. IRC links were going to irc.freenode.net which is CNAME for chat.freenode.net . --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ae598bddc..b8180c5e6 100644 --- a/README.md +++ b/README.md @@ -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).