Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Blockchain is one word #1060

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions _alerts/2013-03-11-chain-fork.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ <h2 id="what-happened">What happened</h2>
with earlier versions of Bitcoin.
</p>
<p>
The result was a block chain fork, with miners, merchants and users running the new version of bitcoin
The result was a blockchain fork, with miners, merchants and users running the new version of bitcoin
accepting, and building on, that block, and miners, merchants and users running older versions of bitcoin
rejecting it and creating their own block chain.
rejecting it and creating their own blockchain.
</p>
<h2 id="what-is-being-done">What is being done</h2>
<p>
Large mining pools running version 0.8.0 were asked to switch back to version 0.7, to create a
single block chain compatible with all bitcoin software.
single blockchain compatible with all bitcoin software.
</p>
<h2 id="questions-and-answers">Questions &amp; Answers</h2>
<h3 id="what-should-i-do">I'm not a miner or a merchant, what should I do?</h3>
Expand Down
2 changes: 1 addition & 1 deletion _alerts/2013-03-15-upgrade-deadline.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ <h2 id="miners">Miners/mining pool operators</h2>
</p>
<h2 id="why-necessary">Why this is necessary</h2>
<p>
A bug caused a <a href="/chainfork">temporary block chain fork on 11 March, 2013</a>.
A bug caused a <a href="/chainfork">temporary blockchain fork on 11 March, 2013</a>.
After investigating
that bug, we determined that the bug can happen even if the entire network was
still running old versions of Bitcoin-Qt/bitcoind. Therefore, the only option is to
Expand Down
14 changes: 7 additions & 7 deletions _data/glossary/en/block-chain.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@

required:
#-------------40 characters-------------#
title_max_40_characters_no_formatting: Block Chain
title_max_40_characters_no_formatting: Blockchain

summary_max_255_characters_no_formatting: >
A chain of blocks with each block referencing the block
that preceded it. The most-difficult-to-recreate chain is
the best block chain.
the best blockchain.

synonyms_shown_in_glossary_capitalize_first_letter:
- Block chain
- Best block chain ## this could be moved into its own entry
- Blockchain
- Best blockchain ## this could be moved into its own entry

optional:
synonyms_and_pluralizations_not_shown_in_glossary:
- block chain
- block chains
- blocks chain
- block-chain
- block-chains
- blockchain
- blockchains
- best block chain
- best blockchain
Expand All @@ -30,7 +30,7 @@ optional:
- Header chain

links_html_or_markdown_style_capitalize_first_letter:
- "[Block chain](/en/developer-guide#block-chain) --- Bitcoin.org Developer Guide"
- "[Block chain](https://en.bitcoin.it/wiki/Block_chain) --- Bitcoin Wiki"
- "[Blockchain](/en/developer-guide#block-chain) --- Bitcoin.org Developer Guide"
- "[Blockchain](https://en.bitcoin.it/wiki/Block_chain) --- Bitcoin Wiki"

---
6 changes: 3 additions & 3 deletions _data/glossary/en/block-height.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

required:
#-------------40 characters-------------#
title_max_40_characters_no_formatting: Block Chain Height, Block Height
title_max_40_characters_no_formatting: Blockchain Height, Block Height

summary_max_255_characters_no_formatting: >
The number of blocks preceding a particular block on a block
Expand All @@ -19,8 +19,8 @@ optional:
synonyms_and_pluralizations_not_shown_in_glossary:
- heights
- block heights
- block chain height
- block chain heights
- blockchain height
- blockchain heights

not_to_be_confused_with_capitalize_first_letter:

Expand Down
2 changes: 1 addition & 1 deletion _data/glossary/en/block.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ required:
summary_max_255_characters_no_formatting: >
One or more transactions prefaced by a block header and
protected by proof of work. Blocks are the data stored on the
block chain.
blockchain.

synonyms_shown_in_glossary_capitalize_first_letter:
- Block
Expand Down
2 changes: 1 addition & 1 deletion _data/glossary/en/blocks-first-sync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ required:
title_max_40_characters_no_formatting: Blocks-First, Blocks-First Sync

summary_max_255_characters_no_formatting: >
Synchronizing the block chain by downloading each block from a
Synchronizing the blockchain by downloading each block from a
peer and then validating it.

synonyms_shown_in_glossary_capitalize_first_letter:
Expand Down
2 changes: 1 addition & 1 deletion _data/glossary/en/confirmation-score.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ required:
title_max_40_characters_no_formatting: Confirmation Score, Confirmed Transaction

summary_max_255_characters_no_formatting: >
A score indicating the number of blocks on the best block chain
A score indicating the number of blocks on the best blockchain
that would need to be modified to remove or modify a particular
transaction. A confirmed transaction has a confirmation score of
one or higher.
Expand Down
4 changes: 2 additions & 2 deletions _data/glossary/en/consensus-rules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ required:
optional:
synonyms_and_pluralizations_not_shown_in_glossary:
- consensus rule
- block chain validation rule
- Block chain validation rules
- blockchain validation rule
- Blockchain validation rules
- validation rule
- validation rules

Expand Down
4 changes: 2 additions & 2 deletions _data/glossary/en/consensus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ required:

summary_max_255_characters_no_formatting: >
When several nodes (usually most nodes on the network) all have
the same blocks in their locally-validated best block chain.
the same blocks in their locally-validated best blockchain.

synonyms_shown_in_glossary_capitalize_first_letter:
- Consensus

optional:
synonyms_and_pluralizations_not_shown_in_glossary:
- block chain consensus
- blockchain consensus

not_to_be_confused_with_capitalize_first_letter:
- Social consensus (often used in discussion among developers to indicate that most people agree with a particular plan)
Expand Down
4 changes: 2 additions & 2 deletions _data/glossary/en/fork.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ required:

summary_max_255_characters_no_formatting: >
When two or more blocks have the same block height, forking the
block chain. Typically occurs when two or more miners find
blockchain. Typically occurs when two or more miners find
blocks at nearly the same time. Can also happen as part of an
attack.

Expand All @@ -28,6 +28,6 @@ optional:

links_html_or_markdown_style_capitalize_first_letter:
- "[Fork](/en/developer-guide#term-fork) --- Bitcoin.org Developer Guide"
- "[What is the longest block chain fork that has been made stale so far?](http://bitcoin.stackexchange.com/q/3343) --- Bitcoin StackExchange"
- "[What is the longest blockchain fork that has been made stale so far?](http://bitcoin.stackexchange.com/q/3343) --- Bitcoin StackExchange"

---
2 changes: 1 addition & 1 deletion _data/glossary/en/genesis-block.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ required:
title_max_40_characters_no_formatting: Genesis Block, Block 0

summary_max_255_characters_no_formatting: >
The first block in the Bitcoin block chain.
The first block in the Bitcoin blockchain.

synonyms_shown_in_glossary_capitalize_first_letter:
- Genesis block
Expand Down
4 changes: 2 additions & 2 deletions _data/glossary/en/hard-fork.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ required:
title_max_40_characters_no_formatting: Hard Fork, Hard-Forking Change

summary_max_255_characters_no_formatting: >
A permanent divergence in the the block chain, commonly occurs
A permanent divergence in the the blockchain, commonly occurs
when non-upgraded nodes can't validate blocks created by
upgraded nodes that follow newer consensus rules.

Expand All @@ -22,7 +22,7 @@ optional:

not_to_be_confused_with_capitalize_first_letter:
- Fork (a regular fork where all nodes follow the same consensus rules, so the fork is resolved once one chain has more proof of work than another)
- Soft fork (a temporary divergence in the block chain caused by non-upgraded nodes not following new consensus rules)
- Soft fork (a temporary divergence in the blockchain caused by non-upgraded nodes not following new consensus rules)
- Software fork (when one or more developers permanently develops a codebase separately from other developers)
- Git fork (when one or more developers temporarily develops a codebase separately from other developers

Expand Down
2 changes: 1 addition & 1 deletion _data/glossary/en/header-chain.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ optional:
- best headerchain

not_to_be_confused_with_capitalize_first_letter:
- Block chain
- Blockchain

links_html_or_markdown_style_capitalize_first_letter:
- "[Header chain](/en/developer-guide#term-header-chain) --- Bitcoin.org Developer Guide"
Expand Down
2 changes: 1 addition & 1 deletion _data/glossary/en/headers-first-sync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ required:
title_max_40_characters_no_formatting: Headers-First, Headers-First Sync

summary_max_255_characters_no_formatting: >
Synchronizing the block chain by downloading block headers
Synchronizing the blockchain by downloading block headers
before downloading the full blocks.

synonyms_shown_in_glossary_capitalize_first_letter:
Expand Down
2 changes: 1 addition & 1 deletion _data/glossary/en/initial-block-download.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ required:
summary_max_255_characters_no_formatting: >
The process used by a new node (or long-offline node) to
download a large number of blocks to catch up to the tip of the
best block chain.
best blockchain.

synonyms_shown_in_glossary_capitalize_first_letter:
- Initial block download
Expand Down
2 changes: 1 addition & 1 deletion _data/glossary/en/locktime.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ required:
summary_max_255_characters_no_formatting: >
Part of a transaction which indicates the earliest time or
earliest block when that transaction may be added to the
block chain.
blockchain.

synonyms_shown_in_glossary_capitalize_first_letter:
- Locktime
Expand Down
2 changes: 1 addition & 1 deletion _data/glossary/en/null-data-transaction.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ required:

summary_max_255_characters_no_formatting: >
A standard transaction type which allows adding 40 bytes of
arbitrary data to the block chain up to once per transaction.
arbitrary data to the blockchain up to once per transaction.

synonyms_shown_in_glossary_capitalize_first_letter:
- Null data transaction
Expand Down
4 changes: 2 additions & 2 deletions _data/glossary/en/soft-fork.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ required:
title_max_40_characters_no_formatting: Soft Fork, Soft-Forking Change

summary_max_255_characters_no_formatting: >
A temporary fork in the block chain which commonly occurs when
A temporary fork in the blockchain which commonly occurs when
miners using non-upgraded nodes violate a new consensus rule
their nodes don't know about.

Expand All @@ -22,7 +22,7 @@ optional:

not_to_be_confused_with_capitalize_first_letter:
- Fork (a regular fork where all nodes follow the same consensus rules, so the fork is resolved once one chain has more proof of work than another)
- Hard fork (a permanent divergence in the block chain caused by non-upgraded nodes not following new consensus rules)
- Hard fork (a permanent divergence in the blockchain caused by non-upgraded nodes not following new consensus rules)
- Software fork (when one or more developers permanently develops a codebase separately from other developers)
- Git fork (when one or more developers temporarily develops a codebase separately from other developers

Expand Down
2 changes: 1 addition & 1 deletion _data/glossary/en/stale-block.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ required:

summary_max_255_characters_no_formatting: >
Blocks which were successfully mined but which aren't included
on the current best block chain, likely because some other block
on the current best blockchain, likely because some other block
at the same height had its chain extended first.

synonyms_shown_in_glossary_capitalize_first_letter:
Expand Down
2 changes: 1 addition & 1 deletion _data/glossary/en/wallet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ required:
title_max_40_characters_no_formatting: Wallet

summary_max_255_characters_no_formatting: >
Software that stores private keys and monitors the block chain
Software that stores private keys and monitors the blockchain
(sometimes as a client of a server that does the processing) to
allow users to spend and receive satoshis.

Expand Down
2 changes: 1 addition & 1 deletion _includes/bitcoin-core/bitcoin-core-possible-problems.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ http://opensource.org/licenses/MIT.
upload limit.

- **Anti-virus:** Several people have placed parts of known computer
viruses in the Bitcoin block chain. This block chain data can't infect
viruses in the Bitcoin blockchain. This blockchain data can't infect
your computer, but some anti-virus programs quarantine the data
anyway, making it more difficult to run Bitcoin Core. This problem mostly
affects computers running Windows.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ GET /block/notxdetails/<hash>.<format>
- n: "→<br>`confirmations`"
t: "number (int)"
p: "Required<br>(exactly 1)"
d: "The number of confirmations the transactions in this block have, starting at 1 when this block is at the tip of the best block chain. This score will be -1 if the the block is not part of the best block chain"
d: "The number of confirmations the transactions in this block have, starting at 1 when this block is at the tip of the best blockchain. This score will be -1 if the the block is not part of the best blockchain"

- n: "→<br>`size`"
t: "number (int)"
Expand All @@ -65,7 +65,7 @@ GET /block/notxdetails/<hash>.<format>
- n: "→<br>`height`"
t: "number (int)"
p: "Required<br>(exactly 1)"
d: "The height of this block on its block chain"
d: "The height of this block on its blockchain"

- n: "→<br>`version`"
t: "number (int)"
Expand Down Expand Up @@ -95,7 +95,7 @@ GET /block/notxdetails/<hash>.<format>
- n: "→<br>`nonce`"
t: "number (int)"
p: "Required<br>(exactly 1)"
d: "The nonce which was successful at turning this particular block into one that could be added to the best block chain"
d: "The nonce which was successful at turning this particular block into one that could be added to the best blockchain"

- n: "→<br>`bits`"
t: "string (hex)"
Expand All @@ -120,7 +120,7 @@ GET /block/notxdetails/<hash>.<format>
- n: "→<br>`nextblockhash`"
t: "string (hex)"
p: "Optional<br>(0 or 1)"
d: "The hash of the next block on the best block chain, if known, encoded as hex in RPC byte order"
d: "The hash of the next block on the best blockchain, if known, encoded as hex in RPC byte order"

{% enditemplate %}

Expand Down
8 changes: 4 additions & 4 deletions _includes/devdoc/bitcoin-core/rest/requests/get_block.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ GET /block/<hash>.<format>
- n: "→<br>`confirmations`"
t: "number (int)"
p: "Required<br>(exactly 1)"
d: "The number of confirmations the transactions in this block have, starting at 1 when this block is at the tip of the best block chain. This score will be -1 if the the block is not part of the best block chain"
d: "The number of confirmations the transactions in this block have, starting at 1 when this block is at the tip of the best blockchain. This score will be -1 if the the block is not part of the best blockchain"

- n: "→<br>`size`"
t: "number (int)"
Expand All @@ -68,7 +68,7 @@ GET /block/<hash>.<format>
- n: "→<br>`height`"
t: "number (int)"
p: "Required<br>(exactly 1)"
d: "The height of this block on its block chain"
d: "The height of this block on its blockchain"

- n: "→<br>`version`"
t: "number (int)"
Expand Down Expand Up @@ -99,7 +99,7 @@ GET /block/<hash>.<format>
- n: "→<br>`nonce`"
t: "number (int)"
p: "Required<br>(exactly 1)"
d: "The nonce which was successful at turning this particular block into one that could be added to the best block chain"
d: "The nonce which was successful at turning this particular block into one that could be added to the best blockchain"

- n: "→<br>`bits`"
t: "string (hex)"
Expand All @@ -124,7 +124,7 @@ GET /block/<hash>.<format>
- n: "→<br>`nextblockhash`"
t: "string (hex)"
p: "Optional<br>(0 or 1)"
d: "The hash of the next block on the best block chain, if known, encoded as hex in RPC byte order"
d: "The hash of the next block on the best blockchain, if known, encoded as hex in RPC byte order"

{% enditemplate %}

Expand Down
6 changes: 3 additions & 3 deletions _includes/devdoc/bitcoin-core/rest/requests/get_tx.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@ GET /tx/<txid>.<format>
- n: "→<br>`blockhash`"
t: "string (hex)"
p: "Optional<br>(0 or 1)"
d: "If the transaction has been included in a block on the local best block chain, this is the hash of that block encoded as hex in RPC byte order"
d: "If the transaction has been included in a block on the local best blockchain, this is the hash of that block encoded as hex in RPC byte order"

- n: "→<br>`confirmations`"
t: "number (int)"
p: "Required<br>(exactly 1)"
d: "If the transaction has been included in a block on the local best block chain, this is how many confirmations it has. Otherwise, this is `0`"
d: "If the transaction has been included in a block on the local best blockchain, this is how many confirmations it has. Otherwise, this is `0`"

- n: "→<br>`time`"
t: "number (int)"
p: "Optional<br>(0 or 1)"
d: "If the transaction has been included in a block on the local best block chain, this is the block header time of that block (may be in the future)"
d: "If the transaction has been included in a block on the local best blockchain, this is the block header time of that block (may be in the future)"

- n: "→<br>`blocktime`"
t: "number (int)"
Expand Down
4 changes: 2 additions & 2 deletions _includes/devdoc/bitcoin-core/rpcs/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ http://opensource.org/licenses/MIT.
{% autocrossref %}

Bitcoin Core provides a remote procedure call (RPC) interface for various
administrative tasks, wallet operations, and queries about network and block
chain data.
administrative tasks, wallet operations, and queries about network and
blockchain data.

If you start Bitcoin Core using `bitcoin-qt`, the RPC interface is disabled by
default. To enable it, set `server=1` in `bitcoin.conf` or supply the `-server`
Expand Down
2 changes: 1 addition & 1 deletion _includes/devdoc/bitcoin-core/rpcs/quick-ref.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Use v0.n.n in abbreviation title to prevent autocrossrefing.
_includes/rpc/getbestblockhash.md and run `make manual-update-summaries`. -->
{% include helpers/summaries.md %}

#### Block Chain RPCs
#### Blockchain RPCs
{:.no_toc}
<!-- no subhead-links here -->

Expand Down
Loading