From 54a978311a0a1ca59723ad6c9992633974e022b8 Mon Sep 17 00:00:00 2001 From: nadams Date: Tue, 18 Jul 2017 07:09:16 -0700 Subject: [PATCH] Edited glossary.asciidoc with Atlas code editor --- glossary.asciidoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/glossary.asciidoc b/glossary.asciidoc index 6705b921..9b6635a5 100644 --- a/glossary.asciidoc +++ b/glossary.asciidoc @@ -146,20 +146,20 @@ OP_RETURN:: OP_RETURN transaction:: A transaction type relayed and mined by default in Bitcoin Core 0.9.0 and later that adds arbitrary data to a provably unspendable pubkey script that full nodes don’t have to store in their UTXO database. Not to be confused with OP_RETURN opcode. -Orphan Block:: +orphan block:: Blocks whose parent block has not been processed by the local node, so they can’t be fully validated yet. -Orphan Transactions:: +orphan transactions:: Transactions that can't go into the pool due to one or more missing input transactions. -Output:: - Output, Transaction Output or TxOut is an output in a transaction which contains two fields: a value field for transferring zero or more satoshis and a pubkey script for indicating what conditions must be fulfilled for those satoshis to be further spent. +output:: + Output, transaction output, or TxOut is an output in a transaction which contains two fields: a value field for transferring zero or more satoshis and a pubkey script for indicating what conditions must be fulfilled for those satoshis to be further spent. P2PKH:: Transactions that pay a bitcoin address contain P2PKH or Pay To PubKey Hash scripts. An output locked by a P2PKH script can be unlocked (spent) by presenting a public key and a digital signature created by the corresponding private key. P2SH:: - P2SH or Pay To Script Hash is a powerful new type of transaction that greatly simplifies the use of complex transaction scripts. With P2SH the complex script that details the conditions for spending the output (redeem script) is not presented in the locking script. Instead, only a hash of it is in the locking script. + P2SH or Pay-to-Script Hash is a powerful new type of transaction that greatly simplifies the use of complex transaction scripts. With P2SH the complex script that details the conditions for spending the output (redeem script) is not presented in the locking script. Instead, only a hash of it is in the locking script. P2SH address:: P2SH addresses are Base58Check encodings of the 20-byte hash of a script, P2SH addresses use the version prefix "5", which results in Base58Check-encoded addresses that start with a "3". P2SH addresses hide all of the complexity, so that the person making a payment does not see the script.