From c9403734653cb890aa787c04625dde4f0f8be89f Mon Sep 17 00:00:00 2001 From: Mirobit <13236924+Mirobit@users.noreply.github.com> Date: Mon, 21 Aug 2017 18:35:08 +0200 Subject: [PATCH] IRC/Slack update --- _templates/development.html | 1 + _translations/en.yml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/_templates/development.html b/_templates/development.html index a7f74624..049fb8e2 100755 --- a/_templates/development.html +++ b/_templates/development.html @@ -76,6 +76,7 @@ improvement in mind? Here are a few ideas: diff --git a/_translations/en.yml b/_translations/en.yml index 37bb4bd0..23536213 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -308,7 +308,7 @@ en: disclosuretxt: "If you find a vulnerability related to Bitcoin, non-critical vulnerabilities can be emailed in English to any of the core developers or sent to the private bitcoin-security mailing list listed above. An example of a non-critical vulnerability would be an expensive-to-carry-out denial of service attack. Critical vulnerabilities that are too sensitive for unencrypted email should be sent to one or more of the core developers, encrypted with their PGP key(s)." involve: "Get involved" involvetxt1: "Bitcoin is free software and any developer can contribute to the project. Everything you need is in the GitHub repository. Please make sure to read and follow the development process described in the README, as well as to provide good quality code and respect all guidelines." - involvetxt2: "Development discussion takes place on GitHub and the bitcoin-dev mailing list. Less formal development discussion happens on irc.freenode.net #bitcoin-dev (web interface, logs)." + involvetxt2: "Development discussion takes place on GitHub and the bitcoin-dev mailing list. Less formal development discussion happens on irc.freenode.net #bitcoin-core-dev (web interface, logs)." more: "More free software projects" morewant: "Want to contribute to a different project?" morechoose: "You can choose a project to contribute to by answering a few questions about your skills." @@ -317,7 +317,8 @@ en: contributorsorder: "(Ordered by number of commits)" devcommunities: "Developer communities" devcommunitiesintro: "The following chatrooms and websites host discussions about Bitcoin development. Please be sure to read their rules of conduct before posting." - ircjoin: "IRC Channel #bitcoin-dev on freenode." + ircjoin: "IRC Channel #bitcoin-core-dev on freenode." + slack: "Bitcoin Core Slack Channel" stackexchange: "Bitcoin StackExchange" bitcointalkdev: "BitcoinTalk Development & Technical Discussion Forum" download: