Merge branch 'devhelp' (pull #595)

This commit is contained in:
David A. Harding 2014-10-06 18:09:09 -04:00
commit 2147b830f1
No known key found for this signature in database
GPG key ID: 4B29C30FF29EC4B7
5 changed files with 21 additions and 2 deletions

View file

@ -5,7 +5,8 @@ Bitcoin and start building Bitcoin-based applications. To make the best use of
this documentation, you may want to install the current version of Bitcoin
Core, either from [source][core git] or from a [pre-compiled executable][core executable].
Questions about Bitcoin development are best asked in the Bitcoin [IRC channels][].
Questions about Bitcoin development are best asked in one of the
[Bitcoin development communities][dev communities].
Errors or suggestions related to
documentation on Bitcoin.org can be [submitted as an issue][docs issue]
or posted to the [bitcoin-documentation mailing list][].

View file

@ -5,7 +5,8 @@ to help you start building Bitcoin-based applications. To make the best use of
this documentation, you may want to install the current version of Bitcoin
Core, either from [source][core git] or from a [pre-compiled executable][core executable].
Questions about Bitcoin development are best asked in the Bitcoin [IRC channels][].
Questions about Bitcoin development are best asked in one of the
[Bitcoin development communities][dev communities].
Errors or suggestions related to
documentation on Bitcoin.org can be [submitted as an issue][docs issue]
or posted to the [bitcoin-documentation mailing list][].

View file

@ -178,6 +178,7 @@
[core script.h]: https://github.com/bitcoin/bitcoin/blob/master/src/script.h
[CVE-2012-2459]: https://en.bitcoin.it/wiki/CVEs#CVE-2012-2459
[DER]: https://en.wikipedia.org/wiki/Abstract_Syntax_Notation_One
[dev communities]: /en/development#devcommunities
[devex complex raw transaction]: /en/developer-examples#complex-raw-transaction
[devex payment protocol]: /en/developer-examples#payment-protocol
[devexamples]: /en/developer-examples

View file

@ -63,6 +63,17 @@ id: development
<li class="more"><a href="#" onclick="librariesShow(event)">{% translate moremore %}</a></li>
</ul>
<section id="devcommunities">
<h2>{% translate devcommunities %}</h2>
<p>{% translate devcommunitiesintro %}</p>
<ul>
<li>{% translate ircjoin %}</li>
<li>{% translate stackexchange %}</li>
<li>{% translate bitcointalkdev %}</li>
</ul>
</section>
<section id="contributors">
<h2>{% translate contributors %}</h2>
<p>{% translate contributorsorder %}</p>

View file

@ -211,6 +211,11 @@ en:
moremore: "Show more..."
contributors: "Bitcoin Core contributors"
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: "<a href=\"https://webchat.freenode.net/?channels=bitcoin-dev\">IRC Channel #bitcoin-dev</a> on freenode."
stackexchange: "<a href=\"https://bitcoin.stackexchange.com/\">Bitcoin StackExchange</a>"
bitcointalkdev: "<a href=\"https://bitcointalk.org/index.php?board=6.0\">BitcoinTalk Development & Technical Discussion Forum</a>"
download:
title: "Download - Bitcoin"
pagetitle: "Download Bitcoin Core"