Merge pull request #852 from rating89us/patch-59

ch10: add hard/soft forks to tip
3 years ago · 947f18ca69
parent 99a0114ad5 b1d987ee51
commit 947f18ca69
1 changed files with 1 additions and 1 deletions
--- a/ch10.asciidoc
+++ b/ch10.asciidoc
@ -767,7 +767,7 @@ In the next section we will look at how discrepancies between competing chains (

 [TIP]
 ====
-The blockchain forks described in this section occur naturally as a result of transmission delays in the global network. We will also look at deliberately induced forks later in this chapter.
+The blockchain forks described in this section occur naturally (accidentally) as a result of transmission delays in the global network. Later in this chapter, we will also look at deliberately induced forks (hard forks and soft forks), which are used to modify the consensus rules.
 ====

 In the next few diagrams, we follow the progress of a "fork" event across the network. The diagram is a simplified representation of the bitcoin network. For illustration purposes, different blocks are shown as different shapes (star, triangle, upside-down triangle, rhombus), spreading across the network. Each node in the network is represented as a circle.