Commit graph

9 commits

Author SHA1 Message Date
Saivann
64a6f780be Merge branch 'license' 2014-11-28 10:54:28 -05:00
David A. Harding
b9ee23615a
Dev Docs: Change MerkleBlock To Merkle Block (But Not P2P Message Form) 2014-11-27 21:13:14 -05:00
Saivann
2a139a51a1 Set license files and headers for bitcoin.org's content 2014-11-21 19:09:12 -05:00
David A. Harding
e29104fb82
Dev Docs: Fix Broken BitcoinJ Link
The makefile tests caught this, but it looks like I broke it back in
4553439e. Strangely, I did a full build before merging that commit---and
several more full builds since---and this is the first I'm noticing the
error. I'm fixing the broken link now; I'll look into the tests later.
2014-11-16 13:35:16 -05:00
Luke Dashjr
78962123fa Bugfix: "merkle root" and "merkle tree" are common nouns, so generally lowercase 2014-10-02 01:19:05 +00:00
David A. Harding
6afc6835bf
Use Terms "Pubkey Script" And "Signature Script"
This modifies commits provided by @petertodd to use the terms "pubkey
script" and "signature script" instead of other terms.

* Rename "scriptPubKey" and "output script" to "pubkey script"
  (suggested by @luke-jr). We leave a token "scriptPubKey" at the point
  where we define pubkey script so that searchers can find it.

* Rename "scriptSig" to "signature script" (suggested by @luke-jr). We
  also leave a token "scriptSig" at this definition point.

* Rename "redeemScript" to "redeem script"

* Defined ECDSA on secp256k1 curve as the crypto used in the Transaction
  section and added references to secp256k1 private/public keys and
  signatures.

* Removed "The Parts Of A Transaction" illustration by commenting it out
  in the HTML. Shoehorning the pubkey/signature script terms into this
  image was becoming difficult, and I'm not very fond of that
  illustration anyway. I'll see if I can think of a nicer replacement
  illustration for some point in the future.

* Add a short paraphrased version @petertodd's description of scripts as
  generalized crypto.

* Updated all the illustrations which referred to either pubkey scripts
  or signature scripts to use these terms.
2014-09-20 15:07:42 -04:00
Peter Todd
9183f98bc1 Fix incorrect usage of 'script' rather than 'scriptPubKey'
This is causing quite a bit of confusion, for example by people looking
in the Bitcoin Core sourcecode and seeing the term 'scriptPubKey'
instead.
2014-09-20 08:35:39 -04:00
Peter Todd
15100adb37
s/Unused Output Tree (UOT)/Unspent Transaction Output (UTXO)
Change wording to use the standard "#bitcoin-wizards" terminology.
2014-09-01 20:05:32 -04:00
instagibbs
82378ddcb4 Contributions by @instagibbs to devel docs
Thanks also (in alphabetical order) to @cbeams, @mikehearn, and
@tgeller, among others.

The last pre-squash commit was: c2b8d562aa107c7b68c60946cea14cdccc5159ad
2014-05-09 22:13:59 -04:00