Revert "Revert "Merge pull #793: Dev Docs: New Glossary & JS Search Box""

This reverts commit 961d6c988f.
This commit is contained in:
David A. Harding 2015-04-14 08:06:08 -04:00
parent ceaf266040
commit a2a5f454cb
No known key found for this signature in database
GPG key ID: 4B29C30FF29EC4B7
126 changed files with 3827 additions and 470 deletions

View file

@ -22,7 +22,7 @@ of data to create transactions with the same attributes as those
described below.
In order to use this tutorial, you will need to setup [Bitcoin Core][core executable]
and create a [regression test mode][] environment with 50 BTC in your test
and create a regression test mode environment with 50 BTC in your test
wallet.
{% endautocrossref %}
@ -915,7 +915,7 @@ way to reference the underlying full (unhashed) public keys it knows
about, so we get the three new addresses above in order to use their
public keys.
[Recall from the Guide][address] that the hashed public keys used in addresses
Recall from the Guide that the hashed public keys used in addresses
obfuscate the full public key, so you cannot give an address to another
person or device as part of creating a typical multisig output or P2SH multisig
redeem script. You must give them a full public key.