Merge branch 'master' into coinapult

Conflicts:
	_translations/es.yml

README.md

@@ -119,6 +119,14 @@ commands:
     ## Or build the site and run all tests
     make all
 
+#### Partial build for faster preview
+
+In order to preview some changes faster, you can disable all plugins and
+languages but those you need by prefixing the `ENABLED_LANGS` and `ENABLED_PLUGINS`
+environment variables:
+
+    ENABLED_PLUGINS="events autocrossref" ENABLED_LANGS="en fr" make all
+
 ## Developer Documentation
 
 Each part of the documentation can be found in the [_includes](https://github.com/bitcoin/bitcoin.org/tree/master/_includes)

_autocrossref.yaml

@@ -43,9 +43,13 @@ child private and public keys: child key
 child public key:
 child public keys: child public key
 coinbase: coinbase transaction
+coinbase block height:
 coinbase transaction:
 coinbase transactions: coinbase transaction
 coinbase field:
+compactsize uint: compactsize unsigned integer
+compactsize unsigned integer:
+compactsize unsigned integers: compactsize unsigned integer
 confirm:
 confirmed:
 confirmation:
@@ -65,6 +69,7 @@ double-spend: double spend
 double spending: double spend
 double-spent: double spend
 ECDSA:
+epoch time: unix epoch time
 escrow contract:
 '`expires`': pp expires
 extended key:
@@ -79,7 +84,6 @@ hard fork:
 hard forks: hard fork
 hardened extended private key:
 HD protocol:
-header nonce:
 high-priority transaction: high-priority transactions
 high-priority transactions:
 inputs: input
@@ -117,6 +121,7 @@ mining: mine
 millibit: millibits
 millibits:
 multisig:
+nbits:
 network:
 null data: 
 '`op_checkmultisig`': op_checkmultisig
@@ -168,6 +173,9 @@ public keys: public key
 public key infrastructure: pki
 '`r`': r
 raw format:
+raw transaction: raw format
+raw transactions: raw format
+raw transaction format: raw format
 rawtransaction format: raw format
 receipt:
 recurrent rebilling:
@@ -223,6 +231,8 @@ txid:
 txids: txid
 unconfirmed:
 unconfirmed transactions:
+unix epoch time:
+unix time: unix epoch time
 unique address: unique addresses
 unique addresses:
 utxo:
@@ -243,6 +253,7 @@ BIP32:
 BIP34:
 BIP39:
 BIP50:
+BIP62:
 BIP70:
 BIP71:
 BIP72:
@@ -325,3 +336,6 @@ CVE-2012-2459:
 '`walletlock`': rpc walletlock
 '`walletpassphrase`': rpc walletpassphrase
 '`walletpassphrasechange`': rpc walletpassphrasechange
+
+Bitcoin Core 0.9.3:
+Bitcoin Core 0.7.0:

_config.yml

@@ -105,6 +105,7 @@ redirects:
   /es/acerca-de: /es/faq
   /fr/a-propos: /fr/faq
   /it/a-proposito: /it/faq
+  /nl/over-bitcoin: /nl/faq
   /de/bitcoin-fuer-enthusiasten: /de/innovation
   /en/bitcoin-for-enthusiasts: /en/innovation
   /es/bitcoin-para-entusiastas: /es/innovacion

_contrib/updatetx.rb

@@ -32,7 +32,7 @@ def prompt(*args)
     contents.gsub!(Regexp.new("{% when '" + lang + "' %}((?!{% endcase %}).)*?{% else %}", Regexp::MULTILINE),'{% else %}')
     contents.gsub!(Regexp.new("{% when '" + lang + "' %}.*?{% endcase %}", Regexp::MULTILINE),'{% endcase %}')
     # Drop complete {% case / endcase %} statements when not used by any language anymore
-    contents.gsub!(Regexp.new("{% case page.lang %}(((?!{% when ).)*?){% else %}(.*?){% endcase %}", Regexp::MULTILINE),'\1 \3')
+    contents.gsub!(Regexp.new("{% case page.lang %}(((?!{% endcase %})(?!{% when ).)*?){% else %}(.*?){% endcase %}", Regexp::MULTILINE),'\1 \3')
     contents.gsub!(Regexp.new("{% case page.lang %}(((?!{% when ).)*?){% endcase %}", Regexp::MULTILINE),'\1')
     # Drop language in statements applied to many languages ( e.g. {% when 'ar' or 'fr' .. %} )
     contents.gsub!(Regexp.new("{% when '" + lang + "' or (.*?) %}"),'{% when \1 %}')

_includes/guide_transactions.md

@@ -575,7 +575,7 @@ maximum. Since sequence numbers are not used by the network for any
 other purpose, setting any sequence number to zero is sufficient to
 enable locktime.
 
-Locktime itself is an unsigned 4-byte number which can be parsed two ways:
+<span id="locktime_parsing_rules">Locktime itself is an unsigned 4-byte integer which can be parsed two ways:</span>
 
 * If less than 500 million, locktime is parsed as a block height. The
   transaction can be added to any block which has this height or higher.