Merge branch 'master' into coinapult

Conflicts:
	_translations/en.yml

COPYING

@@ -1,9 +1,5 @@
-Various picture files inside the folders listed above are subjected to copyright restrictions. The use of these materials is not permitted unless otherwise specified by their copyright owner.
-
-img/brand
-img/wallets
-img/screenshots
-img/faq
-img/innovation
-img/press
-img/os
+The intellectual property rights in the files are owned by the respective
+authors. Some of the files can be licensed under MIT License (MIT) available on
+http://opensource.org/licenses/MIT or other licenses. Appropriate licensing
+information can be found in the header of the file or in the folder containing
+the file.

Makefile

@@ -37,7 +37,8 @@ pre-build-tests-fast: check-for-non-ascii-urls
 
 ## Post-build tests which, aggregated together, take less than 5 seconds to run on a typical PC
 post-build-tests-fast: check-for-build-errors ensure-each-svg-has-a-png check-for-liquid-errors \
-    check-for-missing-anchors check-for-broken-markdown-reference-links
+    check-for-missing-anchors check-for-broken-markdown-reference-links \
+    check-for-broken-kramdown-tables
 
 ## All pre-build tests, including those which might take multiple minutes
 pre-build-tests: pre-build-tests-fast
@@ -107,3 +108,9 @@ check-for-non-ascii-urls:
 	    ; do grep -H . $$file | sed -n -e '/url:/,$$p' \
 	    | grep -P '[^\x00-\x7f]|[a-z\-] [a-z\-]' \
 	; done | eval $(ERROR_ON_OUTPUT)
+
+check-for-broken-kramdown-tables:
+## Kramdown tables are easy to break. When broken, they produce a
+## paragraph starting with a | (pipe). I can't imagine any reason we'd
+## have a regular paragraph starting with a pipe, so error on any occurences.
+	$S grep '<p>|' _site/en/developer-* | eval $(ERROR_ON_OUTPUT)

_autocrossref.yaml

@@ -1,14 +1,20 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
 ## List of words to match with references in _includes/references.md
 ## in developer documentation, used by autocrossref.rb plugin.
 ## "pattern to match in file" => "reference to give it"
 #
 ## To prevent a ref for term, use: "term: DO NOT AUTOCROSSREF"
 
 51 percent attack:
-'`addr`': addr message
+'`addr` message': addr message
+'`addr` messages': addr message
 address: 
 addresses: address
+'`alert` message': alert message
+'`alert` messages': alert message
 '`amount`': pp amount
 base-58: base58check
 base58: base58check
@@ -26,6 +32,7 @@ block-chain: block chain
 block header:
 block height:
 '`block` message': block message
+'`block` messages': block message
 block reward:
 block time:
 block version:
@@ -79,17 +86,27 @@ extended keys: extended key
 extended private key:
 extended public key:
 fiat:
+'`filteradd` message': filteradd message
+'`filteradd` messages': filteradd message
+'`filterclear` message': filterclear message
+'`filterclear` messages': filterclear message
 fork:
 forks: fork
+genesis block:
 '`getblocks` message': getblocks message
+'`getblocks` messages': getblocks message
 '`getdata` message': getdata message
+'`getdata` messages': getdata message
 '`getheaders` message': getheaders message
-genesis block:
+'`getheaders` messages': getheaders message
+'`getaddr` message': getaddr message
+'`getaddr` messages': getaddr message
 hard fork:
 hard forks: hard fork
 hardened extended private key:
 HD protocol:
 '`headers` message': headers message
+'`headers` messages': headers message
 high-priority transaction: high-priority transactions
 high-priority transactions:
 inputs: input
@@ -98,8 +115,13 @@ intermediate certificate:
 intermediate certificates: intermediate certificate
 internal byte order:
 '`inv` message': inv message
+'`inv` messages': inv message
 IP address: DO NOT AUTOCROSSREF
 IP addresses: DO NOT AUTOCROSSREF
+IPv4 address: DO NOT AUTOCROSSREF
+IPv4 addresses: DO NOT AUTOCROSSREF
+IPv6 address: DO NOT AUTOCROSSREF
+IPv6 addresses: DO NOT AUTOCROSSREF
 inventories: inventory
 inventory:
 key index:
@@ -115,12 +137,15 @@ master chain code:
 master private key:
 '`memo`': pp memo
 '`mempool` message': mempool message
+'`mempool` messages': mempool message
 '`message`': message
 message header:
+message headers: message header
 message payload:
 '`merchant_data`': pp merchant data
-merkleblock: merkleblock message
+merkle block:
 '`merkleblock` message': merkleblock message
+'`merkleblock` messages': merkleblock message
 merkle root:
 merkle tree:
 merge:
@@ -141,6 +166,7 @@ multisig:
 nbits:
 network:
 '`notfound` message': notfound message
+'`notfound` messages': notfound message
 null data: 
 '`op_checkmultisig`': op_checkmultisig
 '`op_checksig`': op_checksig
@@ -172,15 +198,23 @@ peer:
 peers: peer
 peer-to-peer: network
 peer-to-peer network: network
+'`ping` message': ping message
+'`ping` messages': ping message
 pki:
 '`pki_type`': pp pki type
 '`point()`': point function
+'`pong` message': pong message
+'`pong` messages': pong message
 private key:
 private keys: private key
 proof of work:
 proof-of-work: proof of work
 protocol buffer: protobuf
 protocol buffers: protobuf
+protocol version 106: section protocol versions
+protocol version 209: section protocol versions
+protocol version 311: section protocol versions
+protocol version 31402: section protocol versions
 protocol version 60000: section protocol versions
 protocol version 60001: section protocol versions
 protocol version 60002: section protocol versions
@@ -208,6 +242,8 @@ refund:
 refunds: refund
 regression test mode:
 regtest: regression test mode
+'`reject` message': reject message
+'`reject` messages': reject message
 root certificate:
 root seed:
 RPCs: rpc
@@ -253,6 +289,7 @@ transaction object format:
 transaction version number:
 '`transactions`': pp transactions
 '`tx` message': tx message
+'`tx` messages': tx message
 txid:
 txids: txid
 unconfirmed:
@@ -263,22 +300,30 @@ unique address: unique addresses
 unique addresses:
 utxo:
 utxos: utxo
+'`verack` message': verack message
+'`verack` messages': verack message
 verified payments:
 version 2 blocks: v2 block
+'`version` message': version message
+'`version` messages': version message
 wallet:
 wallets: wallet
 wallet import format:
 x.509: x509
 X509Certificates:
 
 ## BIPs in numerical order; don't use padding zeros (e.g. BIP70 not BIP0070)
+BIP14:
 BIP16:
 BIP21:
 BIP30:
+BIP31:
 BIP32:
 BIP34:
+BIP37:
 BIP39:
 BIP50:
+BIP61:
 BIP62:
 BIP70:
 BIP71:
@@ -364,6 +409,10 @@ CVE-2012-2459:
 '`walletpassphrasechange`': rpc walletpassphrasechange
 
 ## Versions of Bitcoin Core (linked to Bitcoin.org release notes)
+Bitcoin Core 0.1.6:
+Bitcoin Core 0.2.9:
+Bitcoin Core 0.3.11:
+Bitcoin Core 0.3.15:
 Bitcoin Core 0.6.0:
 Bitcoin Core 0.6.1:
 Bitcoin Core 0.7.0:

_config.yml

@@ -103,11 +103,12 @@ redirects:
   /en/bitcoin-for-press: /en/press
   /de/ueber: /de/faq
   /en/about: /en/faq
-  /zh_CN/about: /zh_CN/faq
   /es/acerca-de: /es/faq
   /fr/a-propos: /fr/faq
   /it/a-proposito: /it/faq
   /nl/over-bitcoin: /nl/faq
+  /zh_CN/about: /zh_CN/faq
+  /zh_TW/about: /zh_TW/faq
   /de/bitcoin-fuer-enthusiasten: /de/innovation
   /en/bitcoin-for-enthusiasts: /en/innovation
   /es/bitcoin-para-entusiastas: /es/innovacion

_contrib/comparelinks.rb

@@ -1,3 +1,6 @@
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
 ## This script is used to compare all links between two branches of the
 ## website. Each branches are built and compared.
 

_contrib/updatetx.rb

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
 #Drop outdated fallback HTML code in all layouts for specified language.
 #Example: ./_contrib/updatetx.rb
 

_events.yml

@@ -1,28 +1,3 @@
-- date: 2014-11-18
-  title: "Cryptocurrencies: The Challenges & Opportunities Ahead"
-  venue: swissnex Boston
-  address: 420 Broadway
-  city: Cambridge, MA
-  country: United States
-  link: http://goo.gl/EdzG2r
-
-- date: 2014-11-20
-  title: "Inside Bitcoins Paris"
-  venue: "Espaces Cap 15"
-  address: "1/13 Quai de Grenelle, 75015 PARIS"
-  city: "Paris"
-  country: "France"
-  link: "http://insidebitcoins.fr/?utm_source=bitcoinorg&utm_medium=eventlisting&utm_campaign=bitcoinorgeventlistingibpar"
-
-- date: 2014-11-21
-  title: "Bangkok Bitcoin Expo"
-  venue: "Queen Sirikit National Convention Center (QSNCC)"
-  address: "60 New Rachadapisek Road, Klongtoey,
-  Bangkok 10110, Thailand"
-  city: "Bangkok"
-  country: "Thailand"
-  link: "http://bangkok-bitcoin-expo.com/"
-
 - date: 2014-11-22
   title: "Bitcoin - Evoluzione in corso | Tecnologie all'orizzonte e presentazione ATM opensource"
   venue: "Working Capital Accelerator - Bologna"
@@ -63,6 +38,14 @@
   country: "New Zealand"
   link: "http://bitcoinsouth.co"
 
+- date: 2014-12-07
+  title: "2014比特幣年會：首屆臺灣比特幣及加密數位貨幣產業峰會"
+  venue: "台灣金融研訓院"
+  address: "台北市中正區羅斯福路三段62號"
+  city: "台北 Taipei"
+  country: "台灣 Taiwan"
+  link: http://www.accupass.com/go/bitcoin
+
 - date: 2014-12-04
   title: "Bitcoin Conference Saint Petersburg"
   venue: "Creative claster ArtMuze"

_includes/example_intro.md

@@ -1,3 +1,8 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
 {% autocrossref %}
 
 The following guide aims to provide examples to help you start

_includes/example_p2p_networking.md

@@ -1,13 +1,18 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
 ## P2P Network
 
 ### Retrieving A MerkleBlock
 
 {% autocrossref %}
 
 For the `merkleblock` message documentation on the reference page, an
-actual merkleblock was retrieved from the network and manually
+actual merkle block was retrieved from the network and manually
 processed.  This section walks through each step of the process,
-demonstrating basic network communication and merkleblock processing.
+demonstrating basic network communication and merkle block processing.
 
 {% highlight python %}
 
@@ -93,7 +98,7 @@ send("getdata",
 )
 {% endhighlight %}
 
-We request a merkleblock for transactions matching our filter,
+We request a merkle block for transactions matching our filter,
 completing our script.
 
 To run the script, we simply pipe it to the Unix [`netcat`
@@ -114,7 +119,7 @@ Part of the response is shown in the section below.
 
 {% autocrossref %}
 
-In the section above, we retrieved a merkleblock from the network; now
+In the section above, we retrieved a merkle block from the network; now
 we will parse it. Most of the block header has been omitted. For
 a more complete hexdump, see the example in the [`merkleblock` message
 section][merkleblock message].

_includes/example_payment_processing.md

@@ -1,3 +1,8 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
 ## Payment Processing
 
 ### Payment Protocol

_includes/example_testing.md

@@ -1,3 +1,8 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
 ## Testing Applications
 
 {% autocrossref %}