From 9cd4be7e552c2e5be6e6e581146d571325966e02 Mon Sep 17 00:00:00 2001 From: "kristen@oreilly.com" Date: Wed, 14 Mar 2018 10:25:34 -0700 Subject: [PATCH] Edited glossary.asciidoc with Atlas code editor --- glossary.asciidoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glossary.asciidoc b/glossary.asciidoc index 8a9dbaee..e5add549 100644 --- a/glossary.asciidoc +++ b/glossary.asciidoc @@ -146,7 +146,7 @@ OP_RETURN:: OP_RETURN transaction:: A transaction type 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. Not to be confused with stale block. orphan transactions:: @@ -226,8 +226,8 @@ soft fork:: soft fork or Soft-Forking Change is a temporary fork in the blockchain which commonly occurs when miners using non-upgraded nodes don't follow a new consensus rule their nodes don’t know about. Not to be confused with fork, hard fork, software fork or Git fork. -Stale Block:: - Block which was successfully mined but which isn’t included on the current best block chain, likely because some other block at the same height had its chain extended first. Not to be confused with orphan block. +stale block:: + Block that was successfully mined but that isn’t included on the current best block chain, likely because some other block at the same height had its chain extended first. Not to be confused with orphan block. timelocks:: A timelock is a type of encumbrance that restricts the spending of some bitcoin until a specified future time or block height. Timelocks feature prominently in many Bitcoin contracts, including payment channels and hashed timelock contracts.