From ef60a77e2ab2fd377064f1fe1823a3d8d1ff5efa Mon Sep 17 00:00:00 2001 From: Michael Rotarius Date: Wed, 14 Dec 2016 19:37:32 +0100 Subject: [PATCH 1/2] New softfork description As suggested in #1431 --- _data/glossary/en/soft-fork.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/_data/glossary/en/soft-fork.yaml b/_data/glossary/en/soft-fork.yaml index 65c6ab82..45454fd8 100644 --- a/_data/glossary/en/soft-fork.yaml +++ b/_data/glossary/en/soft-fork.yaml @@ -7,9 +7,12 @@ 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 - miners using non-upgraded nodes violate a new consensus rule - their nodes don't know about. + A softfork is a change to the bitcoin protocol + wherein only previously valid blocks/transactions + are made invalid. Since old nodes will recognise + the new blocks as valid, a softfork is backward-compatible. + This kind of fork requires only a majority of the miners + upgrading to enforce the new rules. synonyms_shown_in_glossary_capitalize_first_letter: - Soft fork From 1283e200c62a59e9eb2c3b76b756d41687471ddc Mon Sep 17 00:00:00 2001 From: Michael Rotarius Date: Thu, 9 Feb 2017 11:34:12 +0100 Subject: [PATCH 2/2] removed last sentence --- _data/glossary/en/soft-fork.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/_data/glossary/en/soft-fork.yaml b/_data/glossary/en/soft-fork.yaml index 45454fd8..afc5dace 100644 --- a/_data/glossary/en/soft-fork.yaml +++ b/_data/glossary/en/soft-fork.yaml @@ -10,9 +10,7 @@ required: A softfork is a change to the bitcoin protocol wherein only previously valid blocks/transactions are made invalid. Since old nodes will recognise - the new blocks as valid, a softfork is backward-compatible. - This kind of fork requires only a majority of the miners - upgrading to enforce the new rules. + the new blocks as valid, a softfork is backward-compatible. synonyms_shown_in_glossary_capitalize_first_letter: - Soft fork