aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-09-30 17:12:00 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-09-30 17:13:34 +0200
commit1119cc3f5918575ca397518c9fd31a64704c7e4f (patch)
tree33f615e160814b4b5f035a589793ed4e14a67023
parent4f44530bc38fb8367c2b9bde21492b545e7f7f26 (diff)
parent5424d416c2d0fd692ac55d4a2fd761a35333597d (diff)
Merge pull request #6741
5424d41 doc: Change #bitcoin-dev IRC channel to #bitcoin-core-dev (Wladimir J. van der Laan)
-rw-r--r--README.md2
-rw-r--r--doc/README.md3
-rw-r--r--doc/translation_process.md2
3 files changed, 4 insertions, 3 deletions
diff --git a/README.md b/README.md
index baf0457418..275367ebbb 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ The developer [mailing list](https://lists.linuxfoundation.org/mailman/listinfo/
should be used to discuss complicated or controversial changes before working
on a patch set.
-Developer IRC can be found on Freenode at #bitcoin-dev.
+Developer IRC can be found on Freenode at #bitcoin-core-dev.
Testing
-------
diff --git a/doc/README.md b/doc/README.md
index 7b0c39d383..3e3f4a294f 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -64,7 +64,8 @@ The Bitcoin repo's [root README](https://github.com/bitcoin/bitcoin/blob/master/
### Resources
* Discuss on the [BitcoinTalk](https://bitcointalk.org/) forums, in the [Development & Technical Discussion board](https://bitcointalk.org/index.php?board=6.0).
-* Discuss on [#bitcoin-dev](http://webchat.freenode.net/?channels=bitcoin) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net/?channels=bitcoin-dev).
+* Discuss project-specific development on #bitcoin-core-dev on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net/?channels=bitcoin-core-dev).
+* Discuss general Bitcoin development on #bitcoin-dev on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net/?channels=bitcoin-dev).
### Miscellaneous
- [Assets Attribution](assets-attribution.md)
diff --git a/doc/translation_process.md b/doc/translation_process.md
index 3653e53021..b06975e1d8 100644
--- a/doc/translation_process.md
+++ b/doc/translation_process.md
@@ -106,6 +106,6 @@ To create a new language template, you will need to edit the languages manifest
**Note:** that the language translation file **must end in `.qm`** (the compiled extension), and not `.ts`.
### Questions and general assistance
-The Bitcoin-Core translation maintainers include *tcatm, seone, Diapolo, wumpus and luke-jr*.You can find them, and others, in the Freenode IRC chatroom - `irc.freenode.net #bitcoin-dev`.
+The Bitcoin-Core translation maintainers include *tcatm, seone, Diapolo, wumpus and luke-jr*. You can find them, and others, in the Freenode IRC chatroom - `irc.freenode.net #bitcoin-core-dev`.
If you are a translator, you should also subscribe to the mailing list, https://groups.google.com/forum/#!forum/bitcoin-translators. Announcements will be posted during application pre-releases to notify translators to check for updates.